diff options
183 files changed, 356 insertions, 356 deletions
diff --git a/svl/inc/PasswordHelper.hxx b/svl/inc/PasswordHelper.hxx index 7139a3ebe361..c915ebe3854a 100644 --- a/svl/inc/PasswordHelper.hxx +++ b/svl/inc/PasswordHelper.hxx @@ -31,7 +31,7 @@ #ifndef _SVTOOLS_PASSWORDHELPER_HXX #define _SVTOOLS_PASSWORDHELPER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include "sal/types.h" #include "com/sun/star/uno/Sequence.hxx" diff --git a/svl/inc/adrparse.hxx b/svl/inc/adrparse.hxx index 439168441057..a317e27b2779 100644 --- a/svl/inc/adrparse.hxx +++ b/svl/inc/adrparse.hxx @@ -31,7 +31,7 @@ #ifndef _ADRPARSE_HXX #define _ADRPARSE_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/list.hxx> #include <tools/string.hxx> diff --git a/svl/inc/broadcast.hxx b/svl/inc/broadcast.hxx index e3e409c46e96..e80a2e446ebf 100644 --- a/svl/inc/broadcast.hxx +++ b/svl/inc/broadcast.hxx @@ -30,7 +30,7 @@ #ifndef _SVT_BROADCAST_HXX #define _SVT_BROADCAST_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/rtti.hxx> class SvtListener; diff --git a/svl/inc/converter.hxx b/svl/inc/converter.hxx index f6a5d67ca966..d012a56e7416 100644 --- a/svl/inc/converter.hxx +++ b/svl/inc/converter.hxx @@ -30,7 +30,7 @@ #ifndef _SV_CONVERTER_HXX_ #define _SV_CONVERTER_HXX_ -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> class SvDbaseConverter diff --git a/svl/inc/filenotation.hxx b/svl/inc/filenotation.hxx index 460d425d471a..c74c6c39c803 100644 --- a/svl/inc/filenotation.hxx +++ b/svl/inc/filenotation.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_FILENOTATION_HXX #define SVTOOLS_FILENOTATION_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <rtl/ustring.hxx> //......................................................................... diff --git a/svl/inc/folderrestriction.hxx b/svl/inc/folderrestriction.hxx index f7e683b31ad6..82fb4e1efef5 100644 --- a/svl/inc/folderrestriction.hxx +++ b/svl/inc/folderrestriction.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_FOLDER_RESTRICTION_HXX #define SVTOOLS_FOLDER_RESTRICTION_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/string.hxx> #ifndef INCLUDED_VECTOR diff --git a/svl/inc/fstathelper.hxx b/svl/inc/fstathelper.hxx index b9761d7131a0..1e613782b4e6 100644 --- a/svl/inc/fstathelper.hxx +++ b/svl/inc/fstathelper.hxx @@ -31,7 +31,7 @@ #ifndef _SVTOOLS_FSTATHELPER_HXX #define _SVTOOLS_FSTATHELPER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> class UniString; diff --git a/svl/inc/instrm.hxx b/svl/inc/instrm.hxx index 58a70fcc6917..add43d4cc380 100644 --- a/svl/inc/instrm.hxx +++ b/svl/inc/instrm.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_INSTRM_HXX #define SVTOOLS_INSTRM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <com/sun/star/uno/Reference.h> #include <tools/stream.hxx> diff --git a/svl/inc/listener.hxx b/svl/inc/listener.hxx index 6d70f135eb92..a121197b1dd0 100644 --- a/svl/inc/listener.hxx +++ b/svl/inc/listener.hxx @@ -30,7 +30,7 @@ #ifndef _SVT_LISTENER_HXX #define _SVT_LISTENER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/rtti.hxx> class SvtBroadcaster; diff --git a/svl/inc/listeneriter.hxx b/svl/inc/listeneriter.hxx index e531ead6bf5d..a2ac5693f741 100644 --- a/svl/inc/listeneriter.hxx +++ b/svl/inc/listeneriter.hxx @@ -30,7 +30,7 @@ #ifndef _SVT_LISTENERITER_HXX #define _SVT_LISTENERITER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/rtti.hxx> class SvtListener; diff --git a/svl/inc/lngmisc.hxx b/svl/inc/lngmisc.hxx index 6bfe7b1c737c..55322246f773 100644 --- a/svl/inc/lngmisc.hxx +++ b/svl/inc/lngmisc.hxx @@ -31,7 +31,7 @@ #ifndef _SVTOOLS_LNGMISC_HXX_ #define _SVTOOLS_LNGMISC_HXX_ -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> #include <sal/types.h> #include <rtl/ustring.hxx> diff --git a/svl/inc/misccfg.hxx b/svl/inc/misccfg.hxx index 9689b04cef89..7b89361b7390 100644 --- a/svl/inc/misccfg.hxx +++ b/svl/inc/misccfg.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_MISCCFG_HXX #define _SFX_MISCCFG_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include "tools/solar.h" #include "unotools/configitem.hxx" diff --git a/svl/inc/numuno.hxx b/svl/inc/numuno.hxx index d6f5621246fd..d243c49a3113 100644 --- a/svl/inc/numuno.hxx +++ b/svl/inc/numuno.hxx @@ -30,7 +30,7 @@ #ifndef _NUMUNO_HXX #define _NUMUNO_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <com/sun/star/util/XNumberFormatsSupplier.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <cppuhelper/implbase2.hxx> diff --git a/svl/inc/outstrm.hxx b/svl/inc/outstrm.hxx index e11c7ed1c1a9..c01d8f460c58 100644 --- a/svl/inc/outstrm.hxx +++ b/svl/inc/outstrm.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_OUTSTRM_HXX #define SVTOOLS_OUTSTRM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <com/sun/star/uno/Reference.h> #include <tools/stream.hxx> diff --git a/svl/inc/pch/precompiled_svl.cxx b/svl/inc/pch/precompiled_svl.cxx index da41b68a5eae..27b37170856c 100644 --- a/svl/inc/pch/precompiled_svl.cxx +++ b/svl/inc/pch/precompiled_svl.cxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: precompiled_svtools.cxx,v $ + * $RCSfile: precompiled_svl.cxx,v $ * $Revision: 1.3 $ * * This file is part of OpenOffice.org. diff --git a/svl/inc/pch/precompiled_svl.hxx b/svl/inc/pch/precompiled_svl.hxx index b41e2ca89fc6..3a813a2db2dd 100644 --- a/svl/inc/pch/precompiled_svl.hxx +++ b/svl/inc/pch/precompiled_svl.hxx @@ -6,7 +6,7 @@ * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: precompiled_svtools.hxx,v $ + * $RCSfile: precompiled_svl.hxx,v $ * $Revision: 1.4 $ * * This file is part of OpenOffice.org. diff --git a/svl/inc/pickerhelper.hxx b/svl/inc/pickerhelper.hxx index 4be84296c678..e8ef23e145d4 100644 --- a/svl/inc/pickerhelper.hxx +++ b/svl/inc/pickerhelper.hxx @@ -31,7 +31,7 @@ #ifndef _PICKERHELPER_HXX #define _PICKERHELPER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include "sal/types.h" #include "com/sun/star/uno/Reference.hxx" diff --git a/svl/inc/pickerhistory.hxx b/svl/inc/pickerhistory.hxx index f99ad5dcc0f1..e67729a1bbd8 100644 --- a/svl/inc/pickerhistory.hxx +++ b/svl/inc/pickerhistory.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_PICKERHISTORY_HXX #define SVTOOLS_PICKERHISTORY_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <com/sun/star/uno/XInterface.hpp> //......................................................................... diff --git a/svl/inc/pickerhistoryaccess.hxx b/svl/inc/pickerhistoryaccess.hxx index 983b0c416ef3..210fd9b92139 100644 --- a/svl/inc/pickerhistoryaccess.hxx +++ b/svl/inc/pickerhistoryaccess.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_PICKERHISTORYACCESS_HXX #define SVTOOLS_PICKERHISTORYACCESS_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #ifndef _COM_SUN_STAR_UNO_REFERENX_HXX_ #include <com/sun/star/uno/Reference.hxx> diff --git a/svl/inc/poolcach.hxx b/svl/inc/poolcach.hxx index 8e7cf3ddbfa7..21cfec4662a0 100644 --- a/svl/inc/poolcach.hxx +++ b/svl/inc/poolcach.hxx @@ -30,7 +30,7 @@ #ifndef _SFXPOOLCACH_HXX #define _SFXPOOLCACH_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> class SfxItemModifyArr_Impl; diff --git a/svl/inc/strmadpt.hxx b/svl/inc/strmadpt.hxx index 7a080c1c7bcc..2fd190f9adef 100644 --- a/svl/inc/strmadpt.hxx +++ b/svl/inc/strmadpt.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_STRMADPT_HXX #define SVTOOLS_STRMADPT_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <com/sun/star/io/XInputStream.hpp> #include <com/sun/star/io/XOutputStream.hpp> #include <com/sun/star/io/XSeekable.hpp> diff --git a/svl/inc/stylepool.hxx b/svl/inc/stylepool.hxx index 1b1f129d7f4c..d69bb928e432 100644 --- a/svl/inc/stylepool.hxx +++ b/svl/inc/stylepool.hxx @@ -32,7 +32,7 @@ #include <boost/shared_ptr.hpp> #include <rtl/ustring.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> class StylePoolImpl; class StylePoolIterImpl; diff --git a/svl/inc/svl/aeitem.hxx b/svl/inc/svl/aeitem.hxx index e10b3f7a8e70..446d9b8aeeb7 100644 --- a/svl/inc/svl/aeitem.hxx +++ b/svl/inc/svl/aeitem.hxx @@ -30,9 +30,9 @@ #ifndef _AEITEM_HXX #define _AEITEM_HXX -#include "svtools/svldllapi.h" -#include <svtools/poolitem.hxx> -#include <svtools/eitem.hxx> +#include "svl/svldllapi.h" +#include <svl/poolitem.hxx> +#include <svl/eitem.hxx> class SfxAllEnumValueArr; class SvUShorts; diff --git a/svl/inc/svl/bintitem.hxx b/svl/inc/svl/bintitem.hxx index 83119d9f3b18..4c969c0a29c7 100644 --- a/svl/inc/svl/bintitem.hxx +++ b/svl/inc/svl/bintitem.hxx @@ -36,7 +36,7 @@ #include <tools/bigint.hxx> #include <tools/debug.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SfxArguments; class SvStream; diff --git a/svl/inc/svl/brdcst.hxx b/svl/inc/svl/brdcst.hxx index 2f9270f3cd4b..cfa45d5aa89a 100644 --- a/svl/inc/svl/brdcst.hxx +++ b/svl/inc/svl/brdcst.hxx @@ -30,9 +30,9 @@ #ifndef _SFXBRDCST_HXX #define _SFXBRDCST_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/rtti.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> class SfxListener; class SfxHint; diff --git a/svl/inc/svl/cancel.hxx b/svl/inc/svl/cancel.hxx index 5929fc4db47a..2808b77d3139 100644 --- a/svl/inc/svl/cancel.hxx +++ b/svl/inc/svl/cancel.hxx @@ -30,16 +30,16 @@ #ifndef _SFXCANCEL_HXX #define _SFXCANCEL_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/string.hxx> #include <tools/ref.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/smplhint.hxx> +#include <svl/brdcst.hxx> +#include <svl/smplhint.hxx> class SfxCancellable; #ifdef _SFX_CANCEL_CXX -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> SV_DECL_PTRARR( SfxCancellables_Impl, SfxCancellable*, 0, 4 ) diff --git a/svl/inc/svl/cenumitm.hxx b/svl/inc/svl/cenumitm.hxx index d65825849869..3d354899cd9d 100644 --- a/svl/inc/svl/cenumitm.hxx +++ b/svl/inc/svl/cenumitm.hxx @@ -31,9 +31,9 @@ #ifndef _SVTOOLS_CENUMITM_HXX #define _SVTOOLS_CENUMITM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/debug.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //============================================================================ DBG_NAMEEX(SfxEnumItemInterface) diff --git a/svl/inc/svl/cintitem.hxx b/svl/inc/svl/cintitem.hxx index a944e2139818..72421f93e0cb 100644 --- a/svl/inc/svl/cintitem.hxx +++ b/svl/inc/svl/cintitem.hxx @@ -31,9 +31,9 @@ #ifndef _SVTOOLS_CINTITEM_HXX #define _SVTOOLS_CINTITEM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/debug.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //============================================================================ DBG_NAMEEX_VISIBILITY(CntByteItem, SVL_DLLPUBLIC) diff --git a/svl/inc/svl/cjkoptions.hxx b/svl/inc/svl/cjkoptions.hxx index 03a4e0216e82..720ead5422f0 100644 --- a/svl/inc/svl/cjkoptions.hxx +++ b/svl/inc/svl/cjkoptions.hxx @@ -30,7 +30,7 @@ #ifndef _SVTOOLS_CJKOPTIONS_HXX #define _SVTOOLS_CJKOPTIONS_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <sal/types.h> #include <unotools/options.hxx> diff --git a/svl/inc/svl/cnclhint.hxx b/svl/inc/svl/cnclhint.hxx index 38781a6c2143..a2ce75ac1a4b 100644 --- a/svl/inc/svl/cnclhint.hxx +++ b/svl/inc/svl/cnclhint.hxx @@ -30,8 +30,8 @@ #ifndef _SFXCNCLHINT_HXX #define _SFXCNCLHINT_HXX -#include <svtools/hint.hxx> -#include <svtools/cancel.hxx> +#include <svl/hint.hxx> +#include <svl/cancel.hxx> #include <tools/rtti.hxx> #define SFXCANCELHINT_REMOVED 1 diff --git a/svl/inc/svl/cntwall.hxx b/svl/inc/svl/cntwall.hxx index 51b2982fe1dd..dca27f2284e6 100644 --- a/svl/inc/svl/cntwall.hxx +++ b/svl/inc/svl/cntwall.hxx @@ -30,14 +30,14 @@ #ifndef _CNTWALL_HXX #define _CNTWALL_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #ifndef SHL_HXX #include <tools/shl.hxx> #endif #include <tools/rtti.hxx> #include <tools/color.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/cstitem.hxx b/svl/inc/svl/cstitem.hxx index 654ee9c15a75..001731d68b41 100644 --- a/svl/inc/svl/cstitem.hxx +++ b/svl/inc/svl/cstitem.hxx @@ -33,7 +33,7 @@ #include <tools/rtti.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/ctloptions.hxx b/svl/inc/svl/ctloptions.hxx index fae5e13dfbb8..10fc4bb98446 100644 --- a/svl/inc/svl/ctloptions.hxx +++ b/svl/inc/svl/ctloptions.hxx @@ -30,10 +30,10 @@ #ifndef _SVTOOLS_CTLOPTIONS_HXX #define _SVTOOLS_CTLOPTIONS_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <sal/types.h> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> #include <unotools/options.hxx> class SvtCTLOptions_Impl; diff --git a/svl/inc/svl/ctypeitm.hxx b/svl/inc/svl/ctypeitm.hxx index 2592c6e0f388..808596397aa0 100644 --- a/svl/inc/svl/ctypeitm.hxx +++ b/svl/inc/svl/ctypeitm.hxx @@ -30,8 +30,8 @@ #ifndef _SVTOOLS_CTYPEITM_HXX #define _SVTOOLS_CTYPEITM_HXX -#include <svtools/inettype.hxx> -#include <svtools/custritm.hxx> +#include <svl/inettype.hxx> +#include <svl/custritm.hxx> //========================================================================= diff --git a/svl/inc/svl/custritm.hxx b/svl/inc/svl/custritm.hxx index 83a88b1f240f..8a3344f6dc0b 100644 --- a/svl/inc/svl/custritm.hxx +++ b/svl/inc/svl/custritm.hxx @@ -31,9 +31,9 @@ #ifndef _SVTOOLS_CUSTRITM_HXX #define _SVTOOLS_CUSTRITM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/debug.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //============================================================================ DBG_NAMEEX_VISIBILITY(CntUnencodedStringItem, SVL_DLLPUBLIC) diff --git a/svl/inc/svl/dateitem.hxx b/svl/inc/svl/dateitem.hxx index 073c1a6ef825..c66c9a84285d 100644 --- a/svl/inc/svl/dateitem.hxx +++ b/svl/inc/svl/dateitem.hxx @@ -33,7 +33,7 @@ #include <tools/rtti.hxx> #include <tools/datetime.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/documentlockfile.hxx b/svl/inc/svl/documentlockfile.hxx index 91074908cf8a..c62f81bc77ef 100644 --- a/svl/inc/svl/documentlockfile.hxx +++ b/svl/inc/svl/documentlockfile.hxx @@ -32,7 +32,7 @@ #ifndef _SVT_DOCUMENTLOCKFILE_HXX #define _SVT_DOCUMENTLOCKFILE_HXX -#include <svtools/svldllapi.h> +#include <svl/svldllapi.h> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -41,7 +41,7 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <svtools/lockfilecommon.hxx> +#include <svl/lockfilecommon.hxx> namespace svt { diff --git a/svl/inc/svl/dtritem.hxx b/svl/inc/svl/dtritem.hxx index 87666a306a43..406cc5ee6af1 100644 --- a/svl/inc/svl/dtritem.hxx +++ b/svl/inc/svl/dtritem.hxx @@ -34,7 +34,7 @@ #include <tools/rtti.hxx> #include <tools/datetime.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/eitem.hxx b/svl/inc/svl/eitem.hxx index 1a9aa8fd63a0..55ed3c47ee33 100644 --- a/svl/inc/svl/eitem.hxx +++ b/svl/inc/svl/eitem.hxx @@ -31,8 +31,8 @@ #ifndef _SFXENUMITEM_HXX #define _SFXENUMITEM_HXX -#include "svtools/svldllapi.h" -#include <svtools/cenumitm.hxx> +#include "svl/svldllapi.h" +#include <svl/cenumitm.hxx> //============================================================================ class SVL_DLLPUBLIC SfxEnumItem: public CntEnumItem diff --git a/svl/inc/svl/filerec.hxx b/svl/inc/svl/filerec.hxx index 77ba6c1b5c52..d28bb3033b56 100644 --- a/svl/inc/svl/filerec.hxx +++ b/svl/inc/svl/filerec.hxx @@ -33,10 +33,10 @@ //========================================================================= -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/debug.hxx> #include <tools/stream.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> SV_DECL_VARARR( SfxUINT32s, UINT32, 8, 8 ) diff --git a/svl/inc/svl/flagitem.hxx b/svl/inc/svl/flagitem.hxx index 1ea04db955c5..fa056bb00488 100644 --- a/svl/inc/svl/flagitem.hxx +++ b/svl/inc/svl/flagitem.hxx @@ -30,10 +30,10 @@ #ifndef _SFXFLAGITEM_HXX #define _SFXFLAGITEM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> #include <tools/rtti.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/frqitem.hxx b/svl/inc/svl/frqitem.hxx index 11b2d31a1123..8d11c20610e2 100644 --- a/svl/inc/svl/frqitem.hxx +++ b/svl/inc/svl/frqitem.hxx @@ -36,7 +36,7 @@ #include <tools/datetime.hxx> #include <tools/string.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/globalnameitem.hxx b/svl/inc/svl/globalnameitem.hxx index 7e01d3487d95..4422220fe640 100644 --- a/svl/inc/svl/globalnameitem.hxx +++ b/svl/inc/svl/globalnameitem.hxx @@ -30,11 +30,11 @@ #ifndef _GLOBALNAMEITEM_HXX #define _GLOBALNAMEITEM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> #include <tools/rtti.hxx> #include <tools/globname.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> // ----------------------------------------------------------------------- diff --git a/svl/inc/svl/hint.hxx b/svl/inc/svl/hint.hxx index 9417b2bc1702..e2d43ea602ca 100644 --- a/svl/inc/svl/hint.hxx +++ b/svl/inc/svl/hint.hxx @@ -30,7 +30,7 @@ #ifndef _SFXHINT_HXX #define _SFXHINT_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/rtti.hxx> class SVL_DLLPUBLIC SfxHint diff --git a/svl/inc/svl/httpcook.hxx b/svl/inc/svl/httpcook.hxx index 354680a86f30..09769396eb11 100644 --- a/svl/inc/svl/httpcook.hxx +++ b/svl/inc/svl/httpcook.hxx @@ -34,7 +34,7 @@ #include <tools/datetime.hxx> #include <tools/stream.hxx> #include <tools/string.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> /*======================================================================= * diff --git a/svl/inc/svl/ilstitem.hxx b/svl/inc/svl/ilstitem.hxx index 0bc76f1d0627..c581f938197f 100644 --- a/svl/inc/svl/ilstitem.hxx +++ b/svl/inc/svl/ilstitem.hxx @@ -31,8 +31,8 @@ #ifndef _SFXILSTITEM_HXX #define _SFXILSTITEM_HXX -#include "svtools/svldllapi.h" -#include <svtools/poolitem.hxx> +#include "svl/svldllapi.h" +#include <svl/poolitem.hxx> #include <com/sun/star/uno/Sequence.hxx> class SvULongs; diff --git a/svl/inc/svl/imageitm.hxx b/svl/inc/svl/imageitm.hxx index ec5552e3d217..bfd888bdd944 100644 --- a/svl/inc/svl/imageitm.hxx +++ b/svl/inc/svl/imageitm.hxx @@ -31,8 +31,8 @@ #ifndef _SVT_IMAGEITM_HXX #define _SVT_IMAGEITM_HXX -#include "svtools/svldllapi.h" -#include <svtools/intitem.hxx> +#include "svl/svldllapi.h" +#include <svl/intitem.hxx> class String; diff --git a/svl/inc/svl/inethist.hxx b/svl/inc/svl/inethist.hxx index ad64e1131bf3..7d4577897faf 100644 --- a/svl/inc/svl/inethist.hxx +++ b/svl/inc/svl/inethist.hxx @@ -30,12 +30,12 @@ #ifndef _INETHIST_HXX #define _INETHIST_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> #include <tools/string.hxx> #include <tools/urlobj.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/hint.hxx> +#include <svl/brdcst.hxx> +#include <svl/hint.hxx> /*======================================================================== * diff --git a/svl/inc/svl/inettype.hxx b/svl/inc/svl/inettype.hxx index 2d9f0ba8694c..5f3bfbaab225 100644 --- a/svl/inc/svl/inettype.hxx +++ b/svl/inc/svl/inettype.hxx @@ -31,7 +31,7 @@ #ifndef _INETTYPE_HXX #define _INETTYPE_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/inetmime.hxx> #include <com/sun/star/lang/Locale.hpp> diff --git a/svl/inc/svl/intitem.hxx b/svl/inc/svl/intitem.hxx index d54267eb4de1..7bfa3433c6b6 100644 --- a/svl/inc/svl/intitem.hxx +++ b/svl/inc/svl/intitem.hxx @@ -31,8 +31,8 @@ #ifndef _SFXINTITEM_HXX #define _SFXINTITEM_HXX -#include "svtools/svldllapi.h" -#include <svtools/cintitem.hxx> +#include "svl/svldllapi.h" +#include <svl/cintitem.hxx> //============================================================================ class SVL_DLLPUBLIC SfxByteItem: public CntByteItem diff --git a/svl/inc/svl/isethint.hxx b/svl/inc/svl/isethint.hxx index d30fc4a65b27..d08819723f43 100644 --- a/svl/inc/svl/isethint.hxx +++ b/svl/inc/svl/isethint.hxx @@ -30,10 +30,10 @@ #ifndef _SFXISETHINT_HXX #define _SFXISETHINT_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #ifndef _HINT_HXX -#include <svtools/hint.hxx> +#include <svl/hint.hxx> #endif class SfxItemSet; diff --git a/svl/inc/svl/itemiter.hxx b/svl/inc/svl/itemiter.hxx index 6a9b5e212720..50bbe7902e83 100644 --- a/svl/inc/svl/itemiter.hxx +++ b/svl/inc/svl/itemiter.hxx @@ -30,9 +30,9 @@ #ifndef _SFXITEMITER_HXX #define _SFXITEMITER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> class SfxPoolItem; class SfxItemSet; diff --git a/svl/inc/svl/itempool.hxx b/svl/inc/svl/itempool.hxx index 81407cee2d0c..d99f29626d38 100644 --- a/svl/inc/svl/itempool.hxx +++ b/svl/inc/svl/itempool.hxx @@ -31,7 +31,7 @@ #ifndef _SFXITEMPOOL_HXX #define _SFXITEMPOOL_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #ifndef INCLUDED_LIMITS_H #include <limits.h> @@ -39,8 +39,8 @@ #endif #include <tools/solar.h> #include <tools/string.hxx> -#include <svtools/svarray.hxx> -#include <svtools/poolitem.hxx> +#include <svl/svarray.hxx> +#include <svl/poolitem.hxx> #include <vector> class SvStream; diff --git a/svl/inc/svl/itemprop.hxx b/svl/inc/svl/itemprop.hxx index feab0eab004b..873c34785d5f 100644 --- a/svl/inc/svl/itemprop.hxx +++ b/svl/inc/svl/itemprop.hxx @@ -30,10 +30,10 @@ #ifndef _SFX_ITEMPROP_HXX #define _SFX_ITEMPROP_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> #include <tools/string.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/beans/XPropertySetInfo.hpp> #include <com/sun/star/beans/PropertyState.hpp> diff --git a/svl/inc/svl/itemset.hxx b/svl/inc/svl/itemset.hxx index 4cc3edcf65c7..a09cfbc2bbb2 100644 --- a/svl/inc/svl/itemset.hxx +++ b/svl/inc/svl/itemset.hxx @@ -30,14 +30,14 @@ #ifndef _SFXITEMSET_HXX #define _SFXITEMSET_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #if STLPORT_VERSION<321 #include <stdarg.h> #else #include <cstdarg> // std::va_list and friends #endif -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/rtti.hxx> #include <tools/solar.h> diff --git a/svl/inc/svl/languageoptions.hxx b/svl/inc/svl/languageoptions.hxx index 52ec53089b8a..77682ce69765 100644 --- a/svl/inc/svl/languageoptions.hxx +++ b/svl/inc/svl/languageoptions.hxx @@ -30,10 +30,10 @@ #ifndef _SVTOOLS_LANGUAGEOPTIONS_HXX #define _SVTOOLS_LANGUAGEOPTIONS_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <sal/types.h> -#include <svtools/brdcst.hxx> -#include <svtools/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/lstner.hxx> #include <unotools/configitem.hxx> #include <i18npool/lang.h> diff --git a/svl/inc/svl/lckbitem.hxx b/svl/inc/svl/lckbitem.hxx index b21e91a3fd46..77cb63414f4e 100644 --- a/svl/inc/svl/lckbitem.hxx +++ b/svl/inc/svl/lckbitem.hxx @@ -30,11 +30,11 @@ #ifndef _LCKBITEM_HXX #define _LCKBITEM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/solar.h> #include <tools/rtti.hxx> #include <tools/stream.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> // ----------------------------------------------------------------------- diff --git a/svl/inc/svl/lockfilecommon.hxx b/svl/inc/svl/lockfilecommon.hxx index 7d97d6c952cd..c1e18aac7e14 100644 --- a/svl/inc/svl/lockfilecommon.hxx +++ b/svl/inc/svl/lockfilecommon.hxx @@ -32,7 +32,7 @@ #ifndef _SVT_LOCKFILECOMMON_HXX #define _SVT_LOCKFILECOMMON_HXX -#include <svtools/svldllapi.h> +#include <svl/svldllapi.h> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/svl/inc/svl/lstner.hxx b/svl/inc/svl/lstner.hxx index 99a6e10701f5..c9993834b42a 100644 --- a/svl/inc/svl/lstner.hxx +++ b/svl/inc/svl/lstner.hxx @@ -30,9 +30,9 @@ #ifndef _SFXLSTNER_HXX #define _SFXLSTNER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/rtti.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> class SfxBroadcaster; class SfxHint; diff --git a/svl/inc/svl/macitem.hxx b/svl/inc/svl/macitem.hxx index f1790bf5f294..747b9ec0bf17 100644 --- a/svl/inc/svl/macitem.hxx +++ b/svl/inc/svl/macitem.hxx @@ -32,8 +32,8 @@ // class SvxMacroItem ---------------------------------------------------- -#include "svtools/svldllapi.h" -#include <svtools/poolitem.hxx> +#include "svl/svldllapi.h" +#include <svl/poolitem.hxx> #include <tools/rtti.hxx> #include <tools/debug.hxx> #include <tools/string.hxx> diff --git a/svl/inc/svl/metitem.hxx b/svl/inc/svl/metitem.hxx index 0289d5cb8e00..5a1e6627542f 100644 --- a/svl/inc/svl/metitem.hxx +++ b/svl/inc/svl/metitem.hxx @@ -30,8 +30,8 @@ #ifndef _SFXMETRICITEM_HXX #define _SFXMETRICITEM_HXX -#include "svtools/svldllapi.h" -#include <svtools/intitem.hxx> +#include "svl/svldllapi.h" +#include <svl/intitem.hxx> DBG_NAMEEX_VISIBILITY(SfxMetricItem, SVL_DLLPUBLIC) diff --git a/svl/inc/svl/nranges.hxx b/svl/inc/svl/nranges.hxx index 6996669cdeb1..e527a456a014 100644 --- a/svl/inc/svl/nranges.hxx +++ b/svl/inc/svl/nranges.hxx @@ -40,12 +40,12 @@ #define NUMTYPE USHORT #define SfxNumRanges SfxUShortRanges -#include <svtools/nranges.hxx> +#include <svl/nranges.hxx> #undef NUMTYPE #define NUMTYPE ULONG #define SfxNumRanges SfxULongRanges -#include <svtools/nranges.hxx> +#include <svl/nranges.hxx> #define _SFXNRANGES_HXX diff --git a/svl/inc/svl/ondemand.hxx b/svl/inc/svl/ondemand.hxx index e8361307eb9e..76fd9efe3672 100644 --- a/svl/inc/svl/ondemand.hxx +++ b/svl/inc/svl/ondemand.hxx @@ -31,7 +31,7 @@ #ifndef INCLUDED_SVTOOLS_ONDEMAND_HXX #define INCLUDED_SVTOOLS_ONDEMAND_HXX -#include <svtools/syslocale.hxx> +#include <svl/syslocale.hxx> #include <i18npool/lang.h> #include <unotools/localedatawrapper.hxx> #include <unotools/calendarwrapper.hxx> diff --git a/svl/inc/svl/ownlist.hxx b/svl/inc/svl/ownlist.hxx index 397e4f532521..21e9ffa74210 100644 --- a/svl/inc/svl/ownlist.hxx +++ b/svl/inc/svl/ownlist.hxx @@ -31,7 +31,7 @@ #ifndef _OWNLIST_HXX #define _OWNLIST_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/stream.hxx> #include <tools/ownlist.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svl/inc/svl/poolitem.hxx b/svl/inc/svl/poolitem.hxx index 7e0fea44b87a..1d0a2e982fae 100644 --- a/svl/inc/svl/poolitem.hxx +++ b/svl/inc/svl/poolitem.hxx @@ -30,7 +30,7 @@ #ifndef _SFXPOOLITEM_HXX #define _SFXPOOLITEM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <com/sun/star/uno/Any.hxx> #define TF_POOLABLE @@ -40,8 +40,8 @@ #include <tools/solar.h> #include <tools/debug.hxx> #include <tools/string.hxx> -#include <svtools/svarray.hxx> -#include <svtools/hint.hxx> +#include <svl/svarray.hxx> +#include <svl/hint.hxx> typedef long SfxArgumentError; diff --git a/svl/inc/svl/ptitem.hxx b/svl/inc/svl/ptitem.hxx index 5ce99c09b98f..b0deff81e884 100644 --- a/svl/inc/svl/ptitem.hxx +++ b/svl/inc/svl/ptitem.hxx @@ -30,8 +30,8 @@ #ifndef _SFXPTITEM_HXX #define _SFXPTITEM_HXX -#include "svtools/svldllapi.h" -#include <svtools/poolitem.hxx> +#include "svl/svldllapi.h" +#include <svl/poolitem.hxx> #include <tools/gen.hxx> class SvStream; diff --git a/svl/inc/svl/rectitem.hxx b/svl/inc/svl/rectitem.hxx index b71705fc2047..1f944bab4102 100644 --- a/svl/inc/svl/rectitem.hxx +++ b/svl/inc/svl/rectitem.hxx @@ -30,10 +30,10 @@ #ifndef _SFXRECTITEM_HXX #define _SFXRECTITEM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/debug.hxx> #include <tools/gen.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/restrictedpaths.hxx b/svl/inc/svl/restrictedpaths.hxx index 057c83cac7d1..a3ced1b93019 100644 --- a/svl/inc/svl/restrictedpaths.hxx +++ b/svl/inc/svl/restrictedpaths.hxx @@ -31,8 +31,8 @@ #ifndef SVTOOLS_RESTRICTEDPATHS_HXX #define SVTOOLS_RESTRICTEDPATHS_HXX -#include <svtools/urlfilter.hxx> -#include <svtools/svldllapi.h> +#include <svl/urlfilter.hxx> +#include <svl/svldllapi.h> #include <tools/string.hxx> #include <vector> diff --git a/svl/inc/svl/rngitem.hxx b/svl/inc/svl/rngitem.hxx index 92ab50b751e6..d55ba25a06c2 100644 --- a/svl/inc/svl/rngitem.hxx +++ b/svl/inc/svl/rngitem.hxx @@ -35,7 +35,7 @@ #define NUMTYPE USHORT #define SfxXRangeItem SfxRangeItem #define SfxXRangesItem SfxUShortRangesItem -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #undef NUMTYPE #undef SfxXRangeItem #undef SfxXRangesItem @@ -44,7 +44,7 @@ #define NUMTYPE ULONG #define SfxXRangeItem SfxULongRangeItem #define SfxXRangesItem SfxULongRangesItem -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #undef NUMTYPE #undef SfxXRangeItem #undef SfxXRangesItem @@ -53,8 +53,8 @@ #define _SFXRNGITEM_HXX #else -#include "svtools/svldllapi.h" -#include <svtools/poolitem.hxx> +#include "svl/svldllapi.h" +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/sfontitm.hxx b/svl/inc/svl/sfontitm.hxx index e1394dec91b3..a12466519d1b 100644 --- a/svl/inc/svl/sfontitm.hxx +++ b/svl/inc/svl/sfontitm.hxx @@ -34,7 +34,7 @@ #include <tools/color.hxx> #include <tools/gen.hxx> #include <i18npool/lang.h> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //============================================================================ class SfxFontItem: public SfxPoolItem diff --git a/svl/inc/svl/sharecontrolfile.hxx b/svl/inc/svl/sharecontrolfile.hxx index a926e6124e8c..1febb4e77583 100644 --- a/svl/inc/svl/sharecontrolfile.hxx +++ b/svl/inc/svl/sharecontrolfile.hxx @@ -31,7 +31,7 @@ #ifndef _SVT_SHARECONTROLFILE_HXX #define _SVT_SHARECONTROLFILE_HXX -#include <svtools/svldllapi.h> +#include <svl/svldllapi.h> #include <com/sun/star/io/XStream.hpp> #include <com/sun/star/io/XInputStream.hpp> @@ -40,7 +40,7 @@ #include <com/sun/star/io/XTruncate.hpp> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <svtools/lockfilecommon.hxx> +#include <svl/lockfilecommon.hxx> #define SHARED_OOOUSERNAME_ID LOCKFILE_OOOUSERNAME_ID #define SHARED_SYSUSERNAME_ID LOCKFILE_SYSUSERNAME_ID diff --git a/svl/inc/svl/slstitm.hxx b/svl/inc/svl/slstitm.hxx index 742d437fb842..9b1c0050cf6b 100644 --- a/svl/inc/svl/slstitm.hxx +++ b/svl/inc/svl/slstitm.hxx @@ -30,10 +30,10 @@ #ifndef _SFXSLSTITM_HXX #define _SFXSLSTITM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/rtti.hxx> #include <tools/list.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/uno/Sequence.h> class SfxImpStringList; diff --git a/svl/inc/svl/smplhint.hxx b/svl/inc/svl/smplhint.hxx index 9858fefd86f0..089a86dae3f2 100644 --- a/svl/inc/svl/smplhint.hxx +++ b/svl/inc/svl/smplhint.hxx @@ -30,8 +30,8 @@ #ifndef _SFXSMPLHINT_HXX #define _SFXSMPLHINT_HXX -#include "svtools/svldllapi.h" -#include <svtools/hint.hxx> +#include "svl/svldllapi.h" +#include <svl/hint.hxx> #include <tools/rtti.hxx> #define SFX_HINT_DYING 0x00000001 diff --git a/svl/inc/svl/stritem.hxx b/svl/inc/svl/stritem.hxx index 84a0be6b9fd1..21ee9fadd1ec 100644 --- a/svl/inc/svl/stritem.hxx +++ b/svl/inc/svl/stritem.hxx @@ -31,8 +31,8 @@ #ifndef _SFXSTRITEM_HXX #define _SFXSTRITEM_HXX -#include "svtools/svldllapi.h" -#include <svtools/custritm.hxx> +#include "svl/svldllapi.h" +#include <svl/custritm.hxx> //============================================================================ class SVL_DLLPUBLIC SfxStringItem: public CntUnencodedStringItem diff --git a/svl/inc/svl/style.hxx b/svl/inc/svl/style.hxx index f560c10e8901..66c130d346dd 100644 --- a/svl/inc/svl/style.hxx +++ b/svl/inc/svl/style.hxx @@ -38,16 +38,16 @@ #include <vector> #include <comphelper/weak.hxx> #include <cppuhelper/implbase2.hxx> -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <rsc/rscsfx.hxx> #include <tools/string.hxx> -#include <svtools/hint.hxx> -#include <svtools/lstner.hxx> -#include <svtools/brdcst.hxx> -#include <svtools/poolitem.hxx> +#include <svl/hint.hxx> +#include <svl/lstner.hxx> +#include <svl/brdcst.hxx> +#include <svl/poolitem.hxx> #ifndef _SFX_STYLE_HRC -#include <svtools/style.hrc> +#include <svl/style.hrc> #endif class SfxItemSet; diff --git a/svl/inc/svl/svarray.hxx b/svl/inc/svl/svarray.hxx index 3ab3676fa5e0..d2479cd5364f 100644 --- a/svl/inc/svl/svarray.hxx +++ b/svl/inc/svl/svarray.hxx @@ -101,7 +101,7 @@ *********************************************************************** #endif -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #ifndef INCLUDED_STRING_H #include <string.h> // memmove() diff --git a/svl/inc/svl/svdde.hxx b/svl/inc/svl/svdde.hxx index 4e0063e2477b..96a1ffa6bf22 100644 --- a/svl/inc/svl/svdde.hxx +++ b/svl/inc/svl/svdde.hxx @@ -31,7 +31,7 @@ #ifndef _SVDDE_HXX #define _SVDDE_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <sot/exchange.hxx> #include <tools/string.hxx> #include <tools/list.hxx> diff --git a/svl/inc/svl/svstdarr.hxx b/svl/inc/svl/svstdarr.hxx index 050b228be4ab..869c70e1cac6 100644 --- a/svl/inc/svl/svstdarr.hxx +++ b/svl/inc/svl/svstdarr.hxx @@ -43,8 +43,8 @@ *********************************************************************** #endif -#include "svtools/svldllapi.h" -#include <svtools/svarray.hxx> +#include "svl/svldllapi.h" +#include <svl/svarray.hxx> //#ifdef _SVSTDARR_BOOLS #ifndef _SVSTDARR_BOOLS_DECL diff --git a/svl/inc/svl/svtools.hrc b/svl/inc/svl/svtools.hrc index 245d31a2dd21..2bccf2ee74c4 100644 --- a/svl/inc/svl/svtools.hrc +++ b/svl/inc/svl/svtools.hrc @@ -30,7 +30,7 @@ #ifndef _SVTOOLS_HRC #define _SVTOOLS_HRC "$Revision: 1.0" -#include <svtools/solar.hrc> +#include <svl/solar.hrc> #define RID_SVTOOLS_BITMAP_START (RID_SVTOOLS_START + 0) #define RID_SVTOOLS_IMAGELIST_START (RID_SVTOOLS_START + 0) diff --git a/svl/inc/svl/syslocale.hxx b/svl/inc/svl/syslocale.hxx index de5962fa0d1a..e655f2eb3006 100644 --- a/svl/inc/svl/syslocale.hxx +++ b/svl/inc/svl/syslocale.hxx @@ -31,7 +31,7 @@ #ifndef INCLUDED_SVTOOLS_SYSLOCALE_HXX #define INCLUDED_SVTOOLS_SYSLOCALE_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <unotools/localedatawrapper.hxx> #include <unotools/charclass.hxx> #include <sal/types.h> diff --git a/svl/inc/svl/syslocaleoptions.hxx b/svl/inc/svl/syslocaleoptions.hxx index a5884c7bbcaa..4570f7453ec0 100644 --- a/svl/inc/svl/syslocaleoptions.hxx +++ b/svl/inc/svl/syslocaleoptions.hxx @@ -31,7 +31,7 @@ #ifndef INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX #define INCLUDED_SVTOOLS_SYSLOCALEOPTIONS_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <sal/types.h> #include <rtl/ustring.hxx> #include <tools/solar.h> diff --git a/svl/inc/svl/szitem.hxx b/svl/inc/svl/szitem.hxx index d3fb920aa012..c4b52d4939c0 100644 --- a/svl/inc/svl/szitem.hxx +++ b/svl/inc/svl/szitem.hxx @@ -32,7 +32,7 @@ #include <tools/gen.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SfxArguments; class SvStream; diff --git a/svl/inc/svl/tfrmitem.hxx b/svl/inc/svl/tfrmitem.hxx index 93e245a731a2..82f08eccdf24 100644 --- a/svl/inc/svl/tfrmitem.hxx +++ b/svl/inc/svl/tfrmitem.hxx @@ -32,7 +32,7 @@ #include <tools/rtti.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> class SvStream; diff --git a/svl/inc/svl/tresitem.hxx b/svl/inc/svl/tresitem.hxx index 6282d3a7d4ff..c0254a1bf1fc 100644 --- a/svl/inc/svl/tresitem.hxx +++ b/svl/inc/svl/tresitem.hxx @@ -32,7 +32,7 @@ #define SVTOOLS_TRESITEM_HXX #include <com/sun/star/ucb/TransferResult.hpp> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> //============================================================================ class CntTransferResultItem: public SfxPoolItem diff --git a/svl/inc/svl/undo.hxx b/svl/inc/svl/undo.hxx index 5bd48342f530..354de8b451c7 100644 --- a/svl/inc/svl/undo.hxx +++ b/svl/inc/svl/undo.hxx @@ -30,10 +30,10 @@ #ifndef _UNDO_HXX #define _UNDO_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/rtti.hxx> #include <tools/string.hxx> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> //==================================================================== diff --git a/svl/inc/svl/visitem.hxx b/svl/inc/svl/visitem.hxx index 9ace1212d967..1a3918526def 100644 --- a/svl/inc/svl/visitem.hxx +++ b/svl/inc/svl/visitem.hxx @@ -31,9 +31,9 @@ #ifndef _SFXVISIBILITYITEM_HXX #define _SFXVISIBILITYITEM_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/debug.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/frame/status/Visibility.hpp> //============================================================================ diff --git a/svl/inc/svl/zforlist.hxx b/svl/inc/svl/zforlist.hxx index 5862a1312039..4e653caf0238 100644 --- a/svl/inc/svl/zforlist.hxx +++ b/svl/inc/svl/zforlist.hxx @@ -30,20 +30,20 @@ #ifndef _ZFORLIST_HXX #define _ZFORLIST_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/string.hxx> #ifndef _TABLE_HXX //autogen #include <tools/table.hxx> #endif #include <i18npool/lang.h> -#include <svtools/svarray.hxx> +#include <svl/svarray.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/lang/Locale.hpp> #include <com/sun/star/i18n/NumberFormatCode.hpp> #include <unotools/localedatawrapper.hxx> -#include <svtools/ondemand.hxx> +#include <svl/ondemand.hxx> #include <tools/link.hxx> -#include <svtools/nfkeytab.hxx> +#include <svl/nfkeytab.hxx> #include <map> diff --git a/svl/inc/svl/zformat.hxx b/svl/inc/svl/zformat.hxx index 208c876bfbfc..991460015e6d 100644 --- a/svl/inc/svl/zformat.hxx +++ b/svl/inc/svl/zformat.hxx @@ -30,12 +30,12 @@ #ifndef _ZFORMAT_HXX #define _ZFORMAT_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include <tools/string.hxx> #include <i18npool/mslangid.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/nfversi.hxx> -#include <svtools/nfkeytab.hxx> +#include <svl/zforlist.hxx> +#include <svl/nfversi.hxx> +#include <svl/nfkeytab.hxx> // We need ImpSvNumberformatScan for the private SvNumberformat definitions. #ifdef _ZFORMAT_CXX diff --git a/svl/inc/urihelper.hxx b/svl/inc/urihelper.hxx index e68e8f0ee54f..8be500e438ce 100644 --- a/svl/inc/urihelper.hxx +++ b/svl/inc/urihelper.hxx @@ -31,7 +31,7 @@ #ifndef SVTOOLS_URIHELPER_HXX #define SVTOOLS_URIHELPER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #include "com/sun/star/uno/Reference.hxx" #include <com/sun/star/uno/RuntimeException.hpp> #include <rtl/textenc.h> diff --git a/svl/inc/whiter.hxx b/svl/inc/whiter.hxx index 87ed2cbc76f0..d2bd7c88d521 100644 --- a/svl/inc/whiter.hxx +++ b/svl/inc/whiter.hxx @@ -30,7 +30,7 @@ #ifndef _SFX_WHITER_HXX #define _SFX_WHITER_HXX -#include "svtools/svldllapi.h" +#include "svl/svldllapi.h" #ifndef INCLUDED_LIMITS_H #include <limits.h> diff --git a/svl/qa/complex/ConfigItems/CheckConfigItems.java b/svl/qa/complex/ConfigItems/CheckConfigItems.java index 97cc21fdec9f..6f4d0ba3d945 100644 --- a/svl/qa/complex/ConfigItems/CheckConfigItems.java +++ b/svl/qa/complex/ConfigItems/CheckConfigItems.java @@ -102,7 +102,7 @@ public class CheckConfigItems extends ComplexTestCase // create module manager m_xTest = (XJob)UnoRuntime.queryInterface( XJob.class, - m_xSmgr.createInstance("com.sun.star.comp.svtools.ConfigItemTest")); + m_xSmgr.createInstance("com.sun.star.comp.svl.ConfigItemTest")); } //------------------------------------------- diff --git a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx index fc2f4681e4fe..58bb58f8c215 100644 --- a/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx +++ b/svl/qa/complex/ConfigItems/helper/AccessibilityOptTest.hxx @@ -37,7 +37,7 @@ #define SVTOOLS_ACCESSIBILITYOPTTEST_HXX #include <com/sun/star/container/XNameAccess.hpp> -#include <svtools/accessibilityoptions.hxx> +#include <svl/accessibilityoptions.hxx> namespace css = ::com::sun::star; diff --git a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx index b21d9d76755e..ad9dda313a5c 100644 --- a/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx +++ b/svl/qa/complex/ConfigItems/helper/ConfigItemTest.cxx @@ -51,7 +51,7 @@ //============================================================================= namespace css = ::com::sun::star; -namespace svtools{ +namespace svl{ //============================================================================= static const ::rtl::OUString PROP_TEST = ::rtl::OUString::createFromAscii("Test"); @@ -196,7 +196,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ConfigItemTest::getSupportedServi //============================================================================= ::rtl::OUString SAL_CALL ConfigItemTest::st_getImplementationName() { - return ::rtl::OUString::createFromAscii("com.sun.star.comp.svtools.ConfigItemTest"); + return ::rtl::OUString::createFromAscii("com.sun.star.comp.svl.ConfigItemTest"); } //============================================================================= @@ -215,15 +215,15 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL ConfigItemTest::st_create(c return xObject; } -} // namespace svtools +} // namespace svl //============================================================================= static ::cppu::ImplementationEntry const lRegEntries[] = { { - &::svtools::ConfigItemTest::st_create, - &::svtools::ConfigItemTest::st_getImplementationName, - &::svtools::ConfigItemTest::st_getSupportedServiceNames, + &::svl::ConfigItemTest::st_create, + &::svl::ConfigItemTest::st_getImplementationName, + &::svl::ConfigItemTest::st_getSupportedServiceNames, &::cppu::createSingleComponentFactory, 0, 0 }, diff --git a/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx index 14d4267b8878..79505a4e6faf 100644 --- a/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx +++ b/svl/qa/complex/ConfigItems/helper/PrintOptTest.hxx @@ -37,7 +37,7 @@ #define SVTOOLS_PRINTOPTTEST_HXX #include <com/sun/star/container/XNameAccess.hpp> -#include <svtools/printoptions.hxx> +#include <svl/printoptions.hxx> namespace css = ::com::sun::star; diff --git a/svl/source/config/cjkoptions.cxx b/svl/source/config/cjkoptions.cxx index 8483614d63dd..7ce2a45ce7a0 100644 --- a/svl/source/config/cjkoptions.cxx +++ b/svl/source/config/cjkoptions.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/cjkoptions.hxx> +#include <svl/cjkoptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <i18npool/lang.h> #include <unotools/configitem.hxx> #include <tools/debug.hxx> diff --git a/svl/source/config/ctloptions.cxx b/svl/source/config/ctloptions.cxx index 3174577ea64f..f2f82425e7de 100644 --- a/svl/source/config/ctloptions.cxx +++ b/svl/source/config/ctloptions.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/ctloptions.hxx> +#include <svl/ctloptions.hxx> -#include <svtools/languageoptions.hxx> +#include <svl/languageoptions.hxx> #include <i18npool/mslangid.hxx> #include <unotools/configitem.hxx> #include <tools/debug.hxx> @@ -41,7 +41,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <osl/mutex.hxx> #include <vos/mutex.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <vcl/svapp.hxx> #include <rtl/instance.hxx> diff --git a/svl/source/config/itemholder2.cxx b/svl/source/config/itemholder2.cxx index 3796d9b45d75..f8fc8a8427e7 100644 --- a/svl/source/config/itemholder2.cxx +++ b/svl/source/config/itemholder2.cxx @@ -38,11 +38,11 @@ #include <comphelper/processfactory.hxx> #include <com/sun/star/lang/XComponent.hpp> -#include <svtools/cjkoptions.hxx> -#include <svtools/ctloptions.hxx> -#include <svtools/languageoptions.hxx> -#include <svtools/misccfg.hxx> -#include <svtools/syslocaleoptions.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/ctloptions.hxx> +#include <svl/languageoptions.hxx> +#include <misccfg.hxx> +#include <svl/syslocaleoptions.hxx> #include <unotools/options.hxx> #include <tools/debug.hxx> diff --git a/svl/source/config/languageoptions.cxx b/svl/source/config/languageoptions.cxx index 57beb23053b2..fa01996b6a82 100644 --- a/svl/source/config/languageoptions.cxx +++ b/svl/source/config/languageoptions.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/languageoptions.hxx> -#include <svtools/cjkoptions.hxx> -#include <svtools/ctloptions.hxx> +#include <svl/languageoptions.hxx> +#include <svl/cjkoptions.hxx> +#include <svl/ctloptions.hxx> #include <vcl/svapp.hxx> #include <i18npool/mslangid.hxx> #include <vos/mutex.hxx> diff --git a/svl/source/config/misccfg.cxx b/svl/source/config/misccfg.cxx index fd531b16a4f5..b7a9f230c849 100644 --- a/svl/source/config/misccfg.cxx +++ b/svl/source/config/misccfg.cxx @@ -32,7 +32,7 @@ #include "precompiled_svl.hxx" #include "misccfg.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <tools/debug.hxx> #include <rtl/logfile.hxx> @@ -57,7 +57,7 @@ SfxMiscCfg::SfxMiscCfg() : bNotFound (FALSE), nYear2000( SvNumberFormatter::GetYear2000Default() ) { - RTL_LOGFILE_CONTEXT(aLog, "svtools SfxMiscCfg::SfxMiscCfg()"); + RTL_LOGFILE_CONTEXT(aLog, "svl SfxMiscCfg::SfxMiscCfg()"); Load(); } diff --git a/svl/source/config/syslocaleoptions.cxx b/svl/source/config/syslocaleoptions.cxx index 48b3981067df..dc6f7d630d40 100644 --- a/svl/source/config/syslocaleoptions.cxx +++ b/svl/source/config/syslocaleoptions.cxx @@ -31,10 +31,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/syslocaleoptions.hxx> +#include <svl/syslocaleoptions.hxx> #include <broadcast.hxx> #include <listener.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <i18npool/mslangid.hxx> #include <tools/string.hxx> #include <rtl/ustrbuf.hxx> @@ -445,7 +445,7 @@ SvtSysLocaleOptions::SvtSysLocaleOptions() MutexGuard aGuard( GetMutex() ); if ( !pOptions ) { - RTL_LOGFILE_CONTEXT(aLog, "svtools ( ??? ) ::SvtSysLocaleOptions_Impl::ctor()"); + RTL_LOGFILE_CONTEXT(aLog, "svl ( ??? ) ::SvtSysLocaleOptions_Impl::ctor()"); pOptions = new SvtSysLocaleOptions_Impl; ItemHolder2::holdConfigItem(E_SYSLOCALEOPTIONS); @@ -475,7 +475,7 @@ Mutex& SvtSysLocaleOptions::GetMutex() if( !pMutex ) { // #i77768# Due to a static reference in the toolkit lib - // we need a mutex that lives longer than the svtools library. + // we need a mutex that lives longer than the svl library. // Otherwise the dtor would use a destructed mutex!! pMutex = new Mutex; } diff --git a/svl/source/filerec/filerec.cxx b/svl/source/filerec/filerec.cxx index 5bb1a95c9a02..ac35a748eef7 100644 --- a/svl/source/filerec/filerec.cxx +++ b/svl/source/filerec/filerec.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/filerec.hxx> +#include <svl/filerec.hxx> #include <osl/endian.h> //======================================================================== diff --git a/svl/source/inc/poolio.hxx b/svl/source/inc/poolio.hxx index fb30fc04832d..0018b403796f 100644 --- a/svl/source/inc/poolio.hxx +++ b/svl/source/inc/poolio.hxx @@ -27,7 +27,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> #ifndef DELETEZ diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx index 54ce914d09fe..55dc818d0160 100644 --- a/svl/source/items/aeitem.cxx +++ b/svl/source/items/aeitem.cxx @@ -36,9 +36,9 @@ #include <tools/string.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> -#include <svtools/svarray.hxx> -#include <svtools/aeitem.hxx> +#include <svl/svstdarr.hxx> +#include <svl/svarray.hxx> +#include <svl/aeitem.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/bintitem.cxx b/svl/source/items/bintitem.cxx index 1ee0ebe224e1..5236f36504f8 100644 --- a/svl/source/items/bintitem.cxx +++ b/svl/source/items/bintitem.cxx @@ -33,7 +33,7 @@ #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> #include <tools/bigint.hxx> -#include <svtools/bintitem.hxx> +#include <svl/bintitem.hxx> // STATIC DATA diff --git a/svl/source/items/cenumitm.cxx b/svl/source/items/cenumitm.cxx index 65cc4a78be54..3c2f7764a351 100644 --- a/svl/source/items/cenumitm.cxx +++ b/svl/source/items/cenumitm.cxx @@ -32,7 +32,7 @@ #include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> -#include <svtools/cenumitm.hxx> +#include <svl/cenumitm.hxx> #include <whassert.hxx> #ifndef _CPPUHELPER_EXTRACT_HXX_ diff --git a/svl/source/items/cintitem.cxx b/svl/source/items/cintitem.cxx index a20c947b56de..9d9d58421fc4 100644 --- a/svl/source/items/cintitem.cxx +++ b/svl/source/items/cintitem.cxx @@ -32,7 +32,7 @@ #include "precompiled_svl.hxx" #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> -#include <svtools/cintitem.hxx> +#include <svl/cintitem.hxx> //============================================================================ // diff --git a/svl/source/items/cntwall.cxx b/svl/source/items/cntwall.cxx index 5d4941981ec4..824ad6b2b5b0 100644 --- a/svl/source/items/cntwall.cxx +++ b/svl/source/items/cntwall.cxx @@ -36,7 +36,7 @@ #include <tools/stream.hxx> #include <tools/vcompat.hxx> -#include <svtools/cntwall.hxx> +#include <svl/cntwall.hxx> #define CNTWALLPAPERITEM_STREAM_MAGIC ( (UINT32)0xfefefefe ) #define CNTWALLPAPERITEM_STREAM_SEEKREL (-( (long)( sizeof( UINT32 ) ) ) ) diff --git a/svl/source/items/cstitem.cxx b/svl/source/items/cstitem.cxx index eb9092828060..af2bfbc18fb9 100644 --- a/svl/source/items/cstitem.cxx +++ b/svl/source/items/cstitem.cxx @@ -38,10 +38,10 @@ #include <tools/debug.hxx> #include <tools/datetime.hxx> -#include <svtools/svldata.hxx> -#include <svtools/cstitem.hxx> +#include <svl/svldata.hxx> +#include <svl/cstitem.hxx> -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #include <com/sun/star/lang/Locale.hpp> DBG_NAME( SfxCrawlStatusItem ) diff --git a/svl/source/items/cstitem.src b/svl/source/items/cstitem.src index 8d6e2d0280c0..b25b980e39cf 100644 --- a/svl/source/items/cstitem.src +++ b/svl/source/items/cstitem.src @@ -28,7 +28,7 @@ * ************************************************************************/ -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> String STR_CSTAT_NEVER_UPD { Text [ en-US ] = "No update has occurred" ; diff --git a/svl/source/items/ctypeitm.cxx b/svl/source/items/ctypeitm.cxx index a5c12d49dda5..69302ebdb868 100644 --- a/svl/source/items/ctypeitm.cxx +++ b/svl/source/items/ctypeitm.cxx @@ -34,7 +34,7 @@ #include <unotools/intlwrapper.hxx> #include <tools/stream.hxx> -#include <svtools/ctypeitm.hxx> +#include <svl/ctypeitm.hxx> //============================================================================ // The following defines are copied from chaos/source/items/cstritem.cxx: diff --git a/svl/source/items/custritm.cxx b/svl/source/items/custritm.cxx index 5e2be8469922..8687aafbae49 100644 --- a/svl/source/items/custritm.cxx +++ b/svl/source/items/custritm.cxx @@ -34,7 +34,7 @@ #include <unotools/intlwrapper.hxx> #include <tools/stream.hxx> -#include <svtools/custritm.hxx> +#include <svl/custritm.hxx> //============================================================================ // diff --git a/svl/source/items/dateitem.cxx b/svl/source/items/dateitem.cxx index 5ce66349c0a3..7f901dac9cd8 100644 --- a/svl/source/items/dateitem.cxx +++ b/svl/source/items/dateitem.cxx @@ -34,7 +34,7 @@ // include --------------------------------------------------------------- #define _DATETIMEITEM_CXX -#include <svtools/dateitem.hxx> +#include <svl/dateitem.hxx> #include <unotools/intlwrapper.hxx> #include <comphelper/processfactory.hxx> @@ -50,8 +50,8 @@ #include <vcl/svapp.hxx> -#include <svtools/svldata.hxx> -#include <svtools/svtools.hrc> +#include <svl/svldata.hxx> +#include <svl/svtools.hrc> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/dtritem.cxx b/svl/source/items/dtritem.cxx index 5159631f713a..32a7fdc1c60d 100644 --- a/svl/source/items/dtritem.cxx +++ b/svl/source/items/dtritem.cxx @@ -43,7 +43,7 @@ #include <vcl/svapp.hxx> -#include <svtools/dtritem.hxx> +#include <svl/dtritem.hxx> DBG_NAME( SfxDateTimeRangeItem ) diff --git a/svl/source/items/eitem.cxx b/svl/source/items/eitem.cxx index 1dc137f32467..16d5aae5a16f 100644 --- a/svl/source/items/eitem.cxx +++ b/svl/source/items/eitem.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/eitem.hxx> +#include <svl/eitem.hxx> //============================================================================ // // class SfxEnumItem diff --git a/svl/source/items/flagitem.cxx b/svl/source/items/flagitem.cxx index e2e0bd55f919..537632db04ff 100644 --- a/svl/source/items/flagitem.cxx +++ b/svl/source/items/flagitem.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/flagitem.hxx> -#include <svtools/poolitem.hxx> +#include <svl/flagitem.hxx> +#include <svl/poolitem.hxx> #include <tools/stream.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/frqitem.cxx b/svl/source/items/frqitem.cxx index b7d47e4e3ac9..cfa1db17ef65 100644 --- a/svl/source/items/frqitem.cxx +++ b/svl/source/items/frqitem.cxx @@ -39,7 +39,7 @@ #include <tools/debug.hxx> #include <tools/datetime.hxx> -#include <svtools/frqitem.hxx> +#include <svl/frqitem.hxx> DBG_NAME( SfxFrequencyItem ) diff --git a/svl/source/items/globalnameitem.cxx b/svl/source/items/globalnameitem.cxx index e8beb9a62b9e..1b676a95bf71 100644 --- a/svl/source/items/globalnameitem.cxx +++ b/svl/source/items/globalnameitem.cxx @@ -38,7 +38,7 @@ #include <comphelper/processfactory.hxx> -#include <svtools/globalnameitem.hxx> +#include <svl/globalnameitem.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/ilstitem.cxx b/svl/source/items/ilstitem.cxx index 3d600632118f..4d2cb0a3b5b9 100644 --- a/svl/source/items/ilstitem.cxx +++ b/svl/source/items/ilstitem.cxx @@ -35,10 +35,10 @@ #include <comphelper/processfactory.hxx> -#include <svtools/ilstitem.hxx> +#include <svl/ilstitem.hxx> #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> TYPEINIT1_AUTOFACTORY(SfxIntegerListItem, SfxPoolItem); diff --git a/svl/source/items/imageitm.cxx b/svl/source/items/imageitm.cxx index 276e7445ae3f..dec2626472cc 100644 --- a/svl/source/items/imageitm.cxx +++ b/svl/source/items/imageitm.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/imageitm.hxx> +#include <svl/imageitm.hxx> #include <com/sun/star/uno/Sequence.hxx> TYPEINIT1( SfxImageItem, SfxInt16Item ); diff --git a/svl/source/items/intitem.cxx b/svl/source/items/intitem.cxx index 245e9734aa89..1133cdf553d1 100644 --- a/svl/source/items/intitem.cxx +++ b/svl/source/items/intitem.cxx @@ -31,11 +31,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/intitem.hxx> +#include <svl/intitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <tools/bigint.hxx> #include <tools/stream.hxx> -#include <svtools/metitem.hxx> +#include <svl/metitem.hxx> //============================================================================ // diff --git a/svl/source/items/itemiter.cxx b/svl/source/items/itemiter.cxx index 3bd616054149..c8c6eea67c82 100644 --- a/svl/source/items/itemiter.cxx +++ b/svl/source/items/itemiter.cxx @@ -34,9 +34,9 @@ #ifndef GCC #endif -#include <svtools/itemiter.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemiter.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/itempool.cxx b/svl/source/items/itempool.cxx index 50f5c1fee817..5f34560e8471 100644 --- a/svl/source/items/itempool.cxx +++ b/svl/source/items/itempool.cxx @@ -36,10 +36,10 @@ #ifndef GCC #endif -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include "whassert.hxx" -#include <svtools/brdcst.hxx> -#include <svtools/smplhint.hxx> +#include <svl/brdcst.hxx> +#include <svl/smplhint.hxx> #include "poolio.hxx" #include <algorithm> diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx index cf2677dd988c..cd50c1c51794 100644 --- a/svl/source/items/itemprop.cxx +++ b/svl/source/items/itemprop.cxx @@ -31,9 +31,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/itemprop.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itemprop.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include <com/sun/star/beans/PropertyAttribute.hpp> #include <hash_map> /************************************************************************* diff --git a/svl/source/items/itemset.cxx b/svl/source/items/itemset.cxx index 05873c0d5b41..45516660ee21 100644 --- a/svl/source/items/itemset.cxx +++ b/svl/source/items/itemset.cxx @@ -43,12 +43,12 @@ #define _SVSTDARR_USHORTS #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> -#include <svtools/itemiter.hxx> +#include <svl/svstdarr.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemiter.hxx> #include "whiter.hxx" -#include <svtools/nranges.hxx> +#include <svl/nranges.hxx> #include "whassert.hxx" #include <tools/stream.hxx> diff --git a/svl/source/items/lckbitem.cxx b/svl/source/items/lckbitem.cxx index 695a80ecf0a4..04e2edb70026 100644 --- a/svl/source/items/lckbitem.cxx +++ b/svl/source/items/lckbitem.cxx @@ -32,8 +32,8 @@ #include "precompiled_svl.hxx" #define _LCKBITEM_CXX -#include <svtools/lckbitem.hxx> -#include <svtools/poolitem.hxx> +#include <svl/lckbitem.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <tools/cachestr.hxx> diff --git a/svl/source/items/macitem.cxx b/svl/source/items/macitem.cxx index 4837f9cb88e0..511ca2bba57c 100644 --- a/svl/source/items/macitem.cxx +++ b/svl/source/items/macitem.cxx @@ -35,7 +35,7 @@ #ifndef GCC #endif -#include <svtools/macitem.hxx> +#include <svl/macitem.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/poolcach.cxx b/svl/source/items/poolcach.cxx index 634b1cae1c14..e64325213ff4 100644 --- a/svl/source/items/poolcach.cxx +++ b/svl/source/items/poolcach.cxx @@ -36,8 +36,8 @@ #ifndef GCC #endif -#include <svtools/itempool.hxx> -#include <svtools/itemset.hxx> +#include <svl/itempool.hxx> +#include <svl/itemset.hxx> #include "poolcach.hxx" // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/poolio.cxx b/svl/source/items/poolio.cxx index bee7bc04ae23..4383ac99d2ed 100644 --- a/svl/source/items/poolio.cxx +++ b/svl/source/items/poolio.cxx @@ -38,11 +38,11 @@ #endif #include <tools/solar.h> -#include <svtools/itempool.hxx> +#include <svl/itempool.hxx> #include "whassert.hxx" -#include <svtools/brdcst.hxx> -#include <svtools/filerec.hxx> -#include <svtools/svldata.hxx> +#include <svl/brdcst.hxx> +#include <svl/filerec.hxx> +#include <svl/svldata.hxx> #include "poolio.hxx" // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/poolitem.cxx b/svl/source/items/poolitem.cxx index 8946175a0dd2..4957c5c16945 100644 --- a/svl/source/items/poolitem.cxx +++ b/svl/source/items/poolitem.cxx @@ -31,7 +31,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include <tools/stream.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/ptitem.cxx b/svl/source/items/ptitem.cxx index 5d8497dd0ada..30fef0227397 100644 --- a/svl/source/items/ptitem.cxx +++ b/svl/source/items/ptitem.cxx @@ -31,12 +31,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/ptitem.hxx> +#include <svl/ptitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/Point.hpp> #include <tools/stream.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "memberid.hrc" using namespace ::com::sun::star; diff --git a/svl/source/items/rectitem.cxx b/svl/source/items/rectitem.cxx index e88d2886b7c0..26c4876d8c2c 100644 --- a/svl/source/items/rectitem.cxx +++ b/svl/source/items/rectitem.cxx @@ -31,12 +31,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/rectitem.hxx> +#include <svl/rectitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/Rectangle.hpp> #include <tools/stream.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "memberid.hrc" // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/rngitem.cxx b/svl/source/items/rngitem.cxx index 17ff38a01382..b6340d662112 100644 --- a/svl/source/items/rngitem.cxx +++ b/svl/source/items/rngitem.cxx @@ -37,13 +37,13 @@ #define NUMTYPE USHORT #define SfxXRangeItem SfxRangeItem #define SfxXRangesItem SfxUShortRangesItem -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #include "rngitem_inc.cxx" #define NUMTYPE sal_uInt32 #define SfxXRangeItem SfxULongRangeItem #define SfxXRangesItem SfxULongRangesItem -#include <svtools/rngitem.hxx> +#include <svl/rngitem.hxx> #include "rngitem_inc.cxx" #else diff --git a/svl/source/items/sfontitm.cxx b/svl/source/items/sfontitm.cxx index 6413cbc8d1cc..9ec06bc5a105 100644 --- a/svl/source/items/sfontitm.cxx +++ b/svl/source/items/sfontitm.cxx @@ -32,7 +32,7 @@ #include "precompiled_svl.hxx" #include <tools/stream.hxx> #include <tools/vcompat.hxx> -#include <svtools/sfontitm.hxx> +#include <svl/sfontitm.hxx> //============================================================================ // diff --git a/svl/source/items/sitem.cxx b/svl/source/items/sitem.cxx index 04ae8becfde0..52f0931c9eae 100644 --- a/svl/source/items/sitem.cxx +++ b/svl/source/items/sitem.cxx @@ -38,8 +38,8 @@ #include <tools/string.hxx> #include <tools/stream.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/itemset.hxx> +#include <svl/poolitem.hxx> +#include <svl/itemset.hxx> // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/slstitm.cxx b/svl/source/items/slstitm.cxx index 12b2aa2dbd4b..d0dd801bb6f9 100644 --- a/svl/source/items/slstitm.cxx +++ b/svl/source/items/slstitm.cxx @@ -31,8 +31,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/slstitm.hxx> -#include <svtools/poolitem.hxx> +#include <svl/slstitm.hxx> +#include <svl/poolitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/uno/Sequence.hxx> #include <tools/stream.hxx> diff --git a/svl/source/items/stritem.cxx b/svl/source/items/stritem.cxx index 4b24b5712fe1..5f6b692106a3 100644 --- a/svl/source/items/stritem.cxx +++ b/svl/source/items/stritem.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/stritem.hxx> +#include <svl/stritem.hxx> //============================================================================ // diff --git a/svl/source/items/style.cxx b/svl/source/items/style.cxx index 68bae3f8142e..7ed44f7a9694 100644 --- a/svl/source/items/style.cxx +++ b/svl/source/items/style.cxx @@ -43,15 +43,15 @@ #include <tools/tenccvt.hxx> #include <comphelper/processfactory.hxx> #include <unotools/intlwrapper.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/poolitem.hxx> -#include <svtools/itemset.hxx> -#include <svtools/itempool.hxx> +#include <svl/smplhint.hxx> +#include <svl/poolitem.hxx> +#include <svl/itemset.hxx> +#include <svl/itempool.hxx> #include <poolio.hxx> -#include <svtools/filerec.hxx> -#include <svtools/itemiter.hxx> -#include <svtools/style.hxx> -#include <svtools/svstdarr.hxx> +#include <svl/filerec.hxx> +#include <svl/itemiter.hxx> +#include <svl/style.hxx> +#include <svl/svstdarr.hxx> #include <vcl/svapp.hxx> #include <algorithm> @@ -702,11 +702,11 @@ SfxStyleSheetBase* SfxStyleSheetBasePool::Create( const SfxStyleSheetBase& r ) SfxStyleSheetBase& SfxStyleSheetBasePool::Make( const XubString& rName, SfxStyleFamily eFam, USHORT mask, USHORT nPos) { - DBG_ASSERT( eFam != SFX_STYLE_FAMILY_ALL, "svtools::SfxStyleSheetBasePool::Make(), FamilyAll is not a allowed Familie" ); + DBG_ASSERT( eFam != SFX_STYLE_FAMILY_ALL, "svl::SfxStyleSheetBasePool::Make(), FamilyAll is not a allowed Familie" ); SfxStyleSheetIterator aIter(this, eFam, mask); rtl::Reference< SfxStyleSheetBase > xStyle( aIter.Find( rName ) ); - DBG_ASSERT( !xStyle.is(), "svtools::SfxStyleSheetBasePool::Make(), StyleSheet already exists" ); + DBG_ASSERT( !xStyle.is(), "svl::SfxStyleSheetBasePool::Make(), StyleSheet already exists" ); SfxStyleSheetIterator& rIter = GetIterator_Impl(); if( !xStyle.is() ) @@ -820,15 +820,15 @@ void SfxStyleSheetBasePool::Remove( SfxStyleSheetBase* p ) void SfxStyleSheetBasePool::Insert( SfxStyleSheetBase* p ) { - DBG_ASSERT( p, "svtools::SfxStyleSheetBasePool::Insert(), no stylesheet?" ); + DBG_ASSERT( p, "svl::SfxStyleSheetBasePool::Insert(), no stylesheet?" ); SfxStyleSheetIterator aIter(this, p->GetFamily(), p->GetMask()); SfxStyleSheetBase* pOld = aIter.Find( p->GetName() ); - DBG_ASSERT( !pOld, "svtools::SfxStyleSheetBasePool::Insert(), StyleSheet already inserted" ); + DBG_ASSERT( !pOld, "svl::SfxStyleSheetBasePool::Insert(), StyleSheet already inserted" ); if( p->GetParent().Len() ) { pOld = aIter.Find( p->GetParent() ); - DBG_ASSERT( pOld, "svtools::SfxStyleSheetBasePool::Insert(), Parent not found!" ); + DBG_ASSERT( pOld, "svl::SfxStyleSheetBasePool::Insert(), Parent not found!" ); } aStyles.push_back( rtl::Reference< SfxStyleSheetBase >( p ) ); Broadcast( SfxStyleSheetHint( SFX_STYLESHEET_CREATED, *p ) ); diff --git a/svl/source/items/stylepool.cxx b/svl/source/items/stylepool.cxx index 5f31500be73c..57ba991afcb4 100644 --- a/svl/source/items/stylepool.cxx +++ b/svl/source/items/stylepool.cxx @@ -36,8 +36,8 @@ #include <map> #include "stylepool.hxx" -#include <svtools/itemiter.hxx> -#include <svtools/itempool.hxx> +#include <svl/itemiter.hxx> +#include <svl/itempool.hxx> using namespace boost; diff --git a/svl/source/items/szitem.cxx b/svl/source/items/szitem.cxx index de18e13b04d7..a7667a25a97c 100644 --- a/svl/source/items/szitem.cxx +++ b/svl/source/items/szitem.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/szitem.hxx> +#include <svl/szitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <com/sun/star/awt/Size.hpp> #include <tools/stream.hxx> #include <tools/gen.hxx> -#include <svtools/poolitem.hxx> +#include <svl/poolitem.hxx> #include "memberid.hrc" // STATIC DATA ----------------------------------------------------------- diff --git a/svl/source/items/tfrmitem.cxx b/svl/source/items/tfrmitem.cxx index d4909aca049c..636b3e9eb0a1 100644 --- a/svl/source/items/tfrmitem.cxx +++ b/svl/source/items/tfrmitem.cxx @@ -36,7 +36,7 @@ #include <tools/debug.hxx> #include <tools/string.hxx> -#include <svtools/tfrmitem.hxx> +#include <svl/tfrmitem.hxx> DBG_NAME( SfxTargetFrameItem ) TYPEINIT1( SfxTargetFrameItem, SfxPoolItem ); diff --git a/svl/source/items/tresitem.cxx b/svl/source/items/tresitem.cxx index 4ad6fa3c1b77..3fdf3f750180 100644 --- a/svl/source/items/tresitem.cxx +++ b/svl/source/items/tresitem.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/tresitem.hxx> +#include <svl/tresitem.hxx> using namespace com::sun::star; diff --git a/svl/source/items/visitem.cxx b/svl/source/items/visitem.cxx index a4f10b98303c..e4ff302541fe 100644 --- a/svl/source/items/visitem.cxx +++ b/svl/source/items/visitem.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/visitem.hxx> +#include <svl/visitem.hxx> #include <com/sun/star/uno/Any.hxx> #include <tools/stream.hxx> diff --git a/svl/source/items/whiter.cxx b/svl/source/items/whiter.cxx index 4b582900d152..b5e53e0bc278 100644 --- a/svl/source/items/whiter.cxx +++ b/svl/source/items/whiter.cxx @@ -35,7 +35,7 @@ #endif #include "whiter.hxx" -#include <svtools/itemset.hxx> +#include <svl/itemset.hxx> DBG_NAME(SfxWhichIter) diff --git a/svl/source/memtools/svarray.cxx b/svl/source/memtools/svarray.cxx index 40a77aefd711..e2fa809c1b52 100644 --- a/svl/source/memtools/svarray.cxx +++ b/svl/source/memtools/svarray.cxx @@ -59,7 +59,7 @@ #define _SVSTDARR_XUB_STRLEN #define _SVSTDARR_XUB_STRLENSORT -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #include <tools/string.hxx> #include <tools/debug.hxx> diff --git a/svl/source/misc/adrparse.cxx b/svl/source/misc/adrparse.cxx index 2dcece9e2671..b45650846df5 100644 --- a/svl/source/misc/adrparse.cxx +++ b/svl/source/misc/adrparse.cxx @@ -33,12 +33,12 @@ #include <tools/inetmime.hxx> #include <adrparse.hxx> -namespace unnamed_svtools_adrparse {} -using namespace unnamed_svtools_adrparse; +namespace unnamed_svl_adrparse {} +using namespace unnamed_svl_adrparse; // unnamed namespaces don't work well yet //============================================================================ -namespace unnamed_svtools_adrparse { +namespace unnamed_svl_adrparse { enum ElementType { ELEMENT_START, ELEMENT_DELIM, ELEMENT_ITEM, ELEMENT_END }; diff --git a/svl/source/misc/documentlockfile.cxx b/svl/source/misc/documentlockfile.cxx index 3de51f2fc8c6..b0c4148749e7 100644 --- a/svl/source/misc/documentlockfile.cxx +++ b/svl/source/misc/documentlockfile.cxx @@ -58,7 +58,7 @@ #include <unotools/useroptions.hxx> -#include <svtools/documentlockfile.hxx> +#include <svl/documentlockfile.hxx> using namespace ::com::sun::star; diff --git a/svl/source/misc/flbytes.cxx b/svl/source/misc/flbytes.cxx index ce414be8e838..b8a124f8ec3b 100644 --- a/svl/source/misc/flbytes.cxx +++ b/svl/source/misc/flbytes.cxx @@ -35,15 +35,15 @@ #ifndef _SVSTDARR_ULONGS_DECL #define _SVSTDARR_ULONGS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #undef _SVSTDARR_ULONGS #endif -namespace unnamed_svtools_flbytes {} using namespace unnamed_svtools_flbytes; +namespace unnamed_svl_flbytes {} using namespace unnamed_svl_flbytes; // unnamed namespaces don't work well yet //============================================================================ -namespace unnamed_svtools_flbytes { +namespace unnamed_svl_flbytes { inline ULONG MyMin( long a, long b ) { diff --git a/svl/source/misc/inethist.cxx b/svl/source/misc/inethist.cxx index 5dfc2744f67a..290312c0efd8 100644 --- a/svl/source/misc/inethist.cxx +++ b/svl/source/misc/inethist.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/inethist.hxx> +#include <svl/inethist.hxx> #ifndef INCLUDED_ALGORITHM #include <algorithm> diff --git a/svl/source/misc/inettype.cxx b/svl/source/misc/inettype.cxx index f0e62b798cff..47183be1d7b2 100644 --- a/svl/source/misc/inettype.cxx +++ b/svl/source/misc/inettype.cxx @@ -32,24 +32,24 @@ #include "precompiled_svl.hxx" #include <tools/table.hxx> #include <tools/wldcrd.hxx> -#include <svtools/inettype.hxx> -#include <svtools/svldata.hxx> +#include <svl/inettype.hxx> +#include <svl/svldata.hxx> #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif #ifndef _SVSTDARR_STRINGSSORT_DECL #define _SVSTDARR_STRINGSSORT -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #undef _SVSTDARR_STRINGSSORT #endif -namespace unnamed_svtools_inettype {} -using namespace unnamed_svtools_inettype; +namespace unnamed_svl_inettype {} +using namespace unnamed_svl_inettype; // unnamed namespaces don't work well yet //============================================================================ -namespace unnamed_svtools_inettype { +namespace unnamed_svl_inettype { //============================================================================ struct MediaTypeEntry @@ -804,7 +804,7 @@ INetContentType Registration::GetContentType4Extension(UniString const & // //============================================================================ -namespace unnamed_svtools_inettype { +namespace unnamed_svl_inettype { MediaTypeEntry const * seekEntry(UniString const & rTypeName, MediaTypeEntry const * pMap, sal_Size nSize) diff --git a/svl/source/misc/lockfilecommon.cxx b/svl/source/misc/lockfilecommon.cxx index 8d0bc0f26415..f13ed574a87f 100644 --- a/svl/source/misc/lockfilecommon.cxx +++ b/svl/source/misc/lockfilecommon.cxx @@ -59,7 +59,7 @@ #include <unotools/useroptions.hxx> -#include <svtools/lockfilecommon.hxx> +#include <svl/lockfilecommon.hxx> using namespace ::com::sun::star; diff --git a/svl/source/misc/mediatyp.src b/svl/source/misc/mediatyp.src index c7acdf8efc45..63033af29d03 100644 --- a/svl/source/misc/mediatyp.src +++ b/svl/source/misc/mediatyp.src @@ -35,7 +35,7 @@ //============================================================================ #ifndef _SVTOOLS_HRC -#include <svtools/svtools.hrc> +#include <svl/svtools.hrc> #endif String STR_SVT_MIMETYPE_APP_OCTSTREAM diff --git a/svl/source/misc/ownlist.cxx b/svl/source/misc/ownlist.cxx index e642f00ba826..def341d57b7c 100644 --- a/svl/source/misc/ownlist.cxx +++ b/svl/source/misc/ownlist.cxx @@ -34,7 +34,7 @@ #include <stdio.h> #include <com/sun/star/beans/PropertyValues.hpp> -#include <svtools/ownlist.hxx> +#include <svl/ownlist.hxx> using namespace com::sun::star; diff --git a/svl/source/misc/restrictedpaths.cxx b/svl/source/misc/restrictedpaths.cxx index 286b046a5067..3c45d43bdd5b 100644 --- a/svl/source/misc/restrictedpaths.cxx +++ b/svl/source/misc/restrictedpaths.cxx @@ -30,13 +30,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/restrictedpaths.hxx> +#include <svl/restrictedpaths.hxx> #include <algorithm> #include <osl/process.h> #include <tools/urlobj.hxx> #include <unotools/localfilehelper.hxx> -#include <svtools/syslocale.hxx> +#include <svl/syslocale.hxx> namespace svt { diff --git a/svl/source/misc/sharecontrolfile.cxx b/svl/source/misc/sharecontrolfile.cxx index 2a151b24fd26..9249fa3f33de 100644 --- a/svl/source/misc/sharecontrolfile.cxx +++ b/svl/source/misc/sharecontrolfile.cxx @@ -59,7 +59,7 @@ #include <unotools/useroptions.hxx> -#include <svtools/sharecontrolfile.hxx> +#include <svl/sharecontrolfile.hxx> using namespace ::com::sun::star; diff --git a/svl/source/misc/svldata.cxx b/svl/source/misc/svldata.cxx index d791e9d9a560..0ba8075069cd 100644 --- a/svl/source/misc/svldata.cxx +++ b/svl/source/misc/svldata.cxx @@ -35,7 +35,7 @@ #include <tools/resmgr.hxx> #include <tools/shl.hxx> #include <vos/process.hxx> -#include <svtools/svldata.hxx> +#include <svl/svldata.hxx> namespace unnamed_svl_svldata {} using namespace unnamed_svl_svldata; diff --git a/svl/source/misc/urihelper.cxx b/svl/source/misc/urihelper.cxx index 58e21f425bf6..5473bf1c995d 100644 --- a/svl/source/misc/urihelper.cxx +++ b/svl/source/misc/urihelper.cxx @@ -67,8 +67,8 @@ #include <unotools/charclass.hxx> #include "rtl/instance.hxx" -namespace unnamed_svtools_urihelper {} -using namespace unnamed_svtools_urihelper; +namespace unnamed_svl_urihelper {} +using namespace unnamed_svl_urihelper; // unnamed namespaces don't work well yet... namespace css = com::sun::star; @@ -80,7 +80,7 @@ using namespace com::sun::star; // //============================================================================ -namespace unnamed_svtools_urihelper { +namespace unnamed_svl_urihelper { inline UniString toUniString(ByteString const & rString) { @@ -425,7 +425,7 @@ rtl::OUString URIHelper::simpleNormalizedMakeRelative( // //============================================================================ -namespace unnamed_svtools_urihelper { +namespace unnamed_svl_urihelper { inline xub_StrLen nextChar(UniString const & rStr, xub_StrLen nPos) { diff --git a/svl/source/notify/brdcst.cxx b/svl/source/notify/brdcst.cxx index 928ec79fe328..08562fe9fece 100644 --- a/svl/source/notify/brdcst.cxx +++ b/svl/source/notify/brdcst.cxx @@ -35,14 +35,14 @@ #endif #include <tools/debug.hxx> -#include <svtools/hint.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/lstner.hxx> +#include <svl/hint.hxx> +#include <svl/smplhint.hxx> +#include <svl/lstner.hxx> SV_DECL_PTRARR( SfxListenerArr_Impl, SfxListener*, 0, 2 ) #define _SFX_BRDCST_CXX -#include <svtools/brdcst.hxx> +#include <svl/brdcst.hxx> //==================================================================== DBG_NAME(SfxBroadcaster) diff --git a/svl/source/notify/broadcast.cxx b/svl/source/notify/broadcast.cxx index 62c00ff8c414..ede14e4171b2 100644 --- a/svl/source/notify/broadcast.cxx +++ b/svl/source/notify/broadcast.cxx @@ -38,7 +38,7 @@ #include "listener.hxx" #include "listeneriter.hxx" #include "broadcast.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> //==================================================================== diff --git a/svl/source/notify/cancel.cxx b/svl/source/notify/cancel.cxx index 12969a4f8e6a..1df3abb22776 100644 --- a/svl/source/notify/cancel.cxx +++ b/svl/source/notify/cancel.cxx @@ -31,13 +31,13 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" #define _SFX_CANCEL_CXX -#include <svtools/cancel.hxx> +#include <svl/cancel.hxx> #include <vos/mutex.hxx> #include <tools/debug.hxx> -#include <svtools/smplhint.hxx> -#include <svtools/cnclhint.hxx> +#include <svl/smplhint.hxx> +#include <svl/cnclhint.hxx> #include <rtl/instance.hxx> namespace { struct lclMutex : public rtl::Static< ::vos::OMutex, lclMutex >{}; } diff --git a/svl/source/notify/hint.cxx b/svl/source/notify/hint.cxx index 8f48ba28f895..36bcfb9990d9 100644 --- a/svl/source/notify/hint.cxx +++ b/svl/source/notify/hint.cxx @@ -33,7 +33,7 @@ #ifndef GCC #endif -#include <svtools/hint.hxx> +#include <svl/hint.hxx> //==================================================================== diff --git a/svl/source/notify/isethint.cxx b/svl/source/notify/isethint.cxx index 77c630cd2148..5138fb2a9ad9 100644 --- a/svl/source/notify/isethint.cxx +++ b/svl/source/notify/isethint.cxx @@ -34,8 +34,8 @@ #ifndef GCC #endif -#include <svtools/isethint.hxx> -#include <svtools/itemset.hxx> +#include <svl/isethint.hxx> +#include <svl/itemset.hxx> //==================================================================== diff --git a/svl/source/notify/lstner.cxx b/svl/source/notify/lstner.cxx index 87afd96365cc..4be2020967b5 100644 --- a/svl/source/notify/lstner.cxx +++ b/svl/source/notify/lstner.cxx @@ -37,13 +37,13 @@ #include <tools/debug.hxx> #endif -#include <svtools/hint.hxx> -#include <svtools/brdcst.hxx> +#include <svl/hint.hxx> +#include <svl/brdcst.hxx> SV_DECL_PTRARR( SfxBroadcasterArr_Impl, SfxBroadcaster*, 0, 2 ) #define _SFX_LSTNER_CXX -#include <svtools/lstner.hxx> +#include <svl/lstner.hxx> //==================================================================== DBG_NAME(SfxListener) diff --git a/svl/source/notify/smplhint.cxx b/svl/source/notify/smplhint.cxx index bd9933d2dece..454710a1b79f 100644 --- a/svl/source/notify/smplhint.cxx +++ b/svl/source/notify/smplhint.cxx @@ -33,7 +33,7 @@ #ifndef GCC #endif -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> //==================================================================== diff --git a/svl/source/numbers/numfmuno.cxx b/svl/source/numbers/numfmuno.cxx index 598680c4da75..65ea024a7e34 100644 --- a/svl/source/numbers/numfmuno.cxx +++ b/svl/source/numbers/numfmuno.cxx @@ -45,9 +45,9 @@ #include "numfmuno.hxx" #include "numuno.hxx" -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> -#include <svtools/itemprop.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> +#include <svl/itemprop.hxx> using namespace com::sun::star; diff --git a/svl/source/numbers/numuno.cxx b/svl/source/numbers/numuno.cxx index a66a48f0a3f5..e909fb2fd4e8 100644 --- a/svl/source/numbers/numuno.cxx +++ b/svl/source/numbers/numuno.cxx @@ -44,7 +44,7 @@ #include "numuno.hxx" #include "numfmuno.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> using namespace com::sun::star; diff --git a/svl/source/numbers/supservs.hxx b/svl/source/numbers/supservs.hxx index df48d6567ecc..7dbbfe27177d 100644 --- a/svl/source/numbers/supservs.hxx +++ b/svl/source/numbers/supservs.hxx @@ -32,7 +32,7 @@ #define _SVTOOLS_NUMBERS_SUPPLIERSERVICE_HXX_ #include "numuno.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include <com/sun/star/lang/XInitialization.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/io/XPersistObject.hpp> diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx index b5719f7ac868..372ae2b15abf 100644 --- a/svl/source/numbers/zforfind.cxx +++ b/svl/source/numbers/zforfind.cxx @@ -44,9 +44,9 @@ #include <com/sun/star/i18n/CalendarFieldIndex.hpp> #include <unotools/digitgroupingiterator.hxx> -#include <svtools/zforlist.hxx> // NUMBERFORMAT_XXX +#include <svl/zforlist.hxx> // NUMBERFORMAT_XXX #include "zforscan.hxx" -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #define _ZFORFIND_CXX #include "zforfind.hxx" diff --git a/svl/source/numbers/zforlist.cxx b/svl/source/numbers/zforlist.cxx index 885a6df53533..76bc6bad2bc0 100644 --- a/svl/source/numbers/zforlist.cxx +++ b/svl/source/numbers/zforlist.cxx @@ -50,21 +50,21 @@ #include <comphelper/processfactory.hxx> #define _SVSTDARR_USHORTS -#include <svtools/svstdarr.hxx> +#include <svl/svstdarr.hxx> #define _ZFORLIST_CXX #include <osl/mutex.hxx> -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #undef _ZFORLIST_CXX #include "zforscan.hxx" #include "zforfind.hxx" -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #include "numhead.hxx" -#include <svtools/syslocaleoptions.hxx> +#include <svl/syslocaleoptions.hxx> #include "listener.hxx" -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <unotools/digitgroupingiterator.hxx> #include <rtl/logfile.hxx> #include <rtl/instance.hxx> @@ -237,7 +237,7 @@ SvNumberFormatter::~SvNumberFormatter() void SvNumberFormatter::ImpConstruct( LanguageType eLang ) { - RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svtools", "er93726", "SvNumberFormatter::ImpConstruct" ); + RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svl", "er93726", "SvNumberFormatter::ImpConstruct" ); if ( eLang == LANGUAGE_DONTKNOW ) eLang = UNKNOWN_SUBSTITUTE; @@ -307,7 +307,7 @@ void SvNumberFormatter::ChangeIntl(LanguageType eLnge) if( !pMutex ) { // #i77768# Due to a static reference in the toolkit lib - // we need a mutex that lives longer than the svtools library. + // we need a mutex that lives longer than the svl library. // Otherwise the dtor would use a destructed mutex!! pMutex = new ::osl::Mutex; } @@ -3547,7 +3547,7 @@ void SvNumberFormatter::ImpInitCurrencyTable() return ; bInitializing = TRUE; - RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svtools", "er93726", "SvNumberFormatter::ImpInitCurrencyTable" ); + RTL_LOGFILE_CONTEXT_AUTHOR( aTimeLog, "svl", "er93726", "SvNumberFormatter::ImpInitCurrencyTable" ); LanguageType eSysLang = Application::GetSettings().GetLanguage(); LocaleDataWrapper* pLocaleData = new LocaleDataWrapper( diff --git a/svl/source/numbers/zformat.cxx b/svl/source/numbers/zformat.cxx index 7c7cf6bcc524..52d37b9cd26f 100644 --- a/svl/source/numbers/zformat.cxx +++ b/svl/source/numbers/zformat.cxx @@ -49,11 +49,11 @@ #include <com/sun/star/i18n/AmPmValue.hpp> #define _ZFORMAT_CXX -#include <svtools/zformat.hxx> +#include <svl/zformat.hxx> #include "zforscan.hxx" #include "zforfind.hxx" -#include <svtools/zforlist.hxx> +#include <svl/zforlist.hxx> #include "numhead.hxx" #include <unotools/digitgroupingiterator.hxx> #include "nfsymbol.hxx" diff --git a/svl/source/numbers/zforscan.cxx b/svl/source/numbers/zforscan.cxx index 9eb939403afd..5c0d45a53ed2 100644 --- a/svl/source/numbers/zforscan.cxx +++ b/svl/source/numbers/zforscan.cxx @@ -41,8 +41,8 @@ #include <unotools/numberformatcodewrapper.hxx> #include <rtl/instance.hxx> -#include <svtools/zforlist.hxx> -#include <svtools/zformat.hxx> +#include <svl/zforlist.hxx> +#include <svl/zformat.hxx> #include <unotools/digitgroupingiterator.hxx> #define _ZFORSCAN_CXX diff --git a/svl/source/numbers/zforscan.hxx b/svl/source/numbers/zforscan.hxx index bc19ac5b633f..300715dfeaa5 100644 --- a/svl/source/numbers/zforscan.hxx +++ b/svl/source/numbers/zforscan.hxx @@ -34,7 +34,7 @@ #include <tools/date.hxx> #include <i18npool/lang.h> #include <tools/color.hxx> -#include <svtools/nfkeytab.hxx> +#include <svl/nfkeytab.hxx> #include "nfsymbol.hxx" class SvNumberFormatter; diff --git a/svl/source/passwordcontainer/passwordcontainer.cxx b/svl/source/passwordcontainer/passwordcontainer.cxx index d5f3c62173e4..237a493452c7 100644 --- a/svl/source/passwordcontainer/passwordcontainer.cxx +++ b/svl/source/passwordcontainer/passwordcontainer.cxx @@ -1480,7 +1480,7 @@ Sequence< ::rtl::OUString > SAL_CALL PasswordContainer::impl_getStaticSupportedS ::rtl::OUString SAL_CALL PasswordContainer::impl_getStaticImplementationName() throw(uno::RuntimeException) { - return ::rtl::OUString::createFromAscii("stardiv.svtools.PasswordContainer"); + return ::rtl::OUString::createFromAscii("stardiv.svl.PasswordContainer"); } //------------------------------------------------------------------------- @@ -1563,7 +1563,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( Reference< XRegistryKey > xNewKey; xNewKey = xRegistryKey->createKey( - ::rtl::OUString::createFromAscii( "/stardiv.svtools.PasswordContainer/UNO/SERVICES" )); + ::rtl::OUString::createFromAscii( "/stardiv.svl.PasswordContainer/UNO/SERVICES" )); xNewKey->createKey( ::rtl::OUString::createFromAscii("com.sun.star.task.PasswordContainer")); return sal_True; diff --git a/svl/source/passwordcontainer/syscreds.cxx b/svl/source/passwordcontainer/syscreds.cxx index b8c223040e6d..ae43c1c70e6b 100644 --- a/svl/source/passwordcontainer/syscreds.cxx +++ b/svl/source/passwordcontainer/syscreds.cxx @@ -112,7 +112,7 @@ void SysCredentialsConfigItem::setSystemCredentialsURLs( namespace { - // TODO: This code is actually copied from svtools/source/passwordcontainer.cxx + // TODO: This code is actually copied from svl/source/passwordcontainer.cxx bool removeLastSegment( ::rtl::OUString & aURL ) { sal_Int32 aInd = aURL.lastIndexOf( sal_Unicode( '/' ) ); @@ -134,7 +134,7 @@ namespace bool findURL( StringSet const & rContainer, rtl::OUString const & aURL, rtl::OUString & aResult ) { - // TODO: This code is actually copied from svtools/source/passwordcontainer.cxx + // TODO: This code is actually copied from svl/source/passwordcontainer.cxx if( !rContainer.empty() && aURL.getLength() ) { ::rtl::OUString aUrl( aURL ); diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index 8f6f72c655df..3c224efe89a1 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -34,7 +34,7 @@ #define UNICODE #include <string.h> // memset #include "ddeimp.hxx" -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #include <osl/thread.h> #include <tools/debug.hxx> diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index 765c5feff0ba..8ae22a8cfb20 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -40,7 +40,7 @@ #include <string.h> #include "ddeimp.hxx" -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #include <osl/thread.h> diff --git a/svl/source/svdde/ddeinf.cxx b/svl/source/svdde/ddeinf.cxx index 923f1a725046..b5154e1f7530 100644 --- a/svl/source/svdde/ddeinf.cxx +++ b/svl/source/svdde/ddeinf.cxx @@ -35,7 +35,7 @@ #include <string.h> #include "ddeimp.hxx" -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> // --- DdeInternal::InfCallback() ---------------------------------- diff --git a/svl/source/svdde/ddestrg.cxx b/svl/source/svdde/ddestrg.cxx index 27e36162a187..9cd594a7920d 100644 --- a/svl/source/svdde/ddestrg.cxx +++ b/svl/source/svdde/ddestrg.cxx @@ -34,7 +34,7 @@ #define UNICODE #include "ddeimp.hxx" -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #if defined( WIN ) && defined( MSC ) #pragma code_seg( "SVDDE_MISC_CODE" ) diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 45461cf0006c..9b7a4b4e15bf 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -33,8 +33,8 @@ #define UNICODE #include "ddeimp.hxx" -#include <svtools/svdde.hxx> -#include <svtools/svarray.hxx> +#include <svl/svdde.hxx> +#include <svl/svarray.hxx> #include <tools/debug.hxx> #include <osl/thread.h> diff --git a/svl/source/syslocale/syslocale.cxx b/svl/source/syslocale/syslocale.cxx index 97db482f4409..074e900ea9ab 100644 --- a/svl/source/syslocale/syslocale.cxx +++ b/svl/source/syslocale/syslocale.cxx @@ -33,13 +33,13 @@ #ifndef GCC #endif -#include <svtools/syslocale.hxx> +#include <svl/syslocale.hxx> #include <broadcast.hxx> #include <listener.hxx> -#include <svtools/smplhint.hxx> +#include <svl/smplhint.hxx> #include <vcl/svapp.hxx> #include <tools/string.hxx> -#include <svtools/syslocaleoptions.hxx> +#include <svl/syslocaleoptions.hxx> #include <unotools/localedatawrapper.hxx> #include <comphelper/processfactory.hxx> @@ -143,7 +143,7 @@ Mutex& SvtSysLocale::GetMutex() if( !pMutex ) { // #i77768# Due to a static reference in the toolkit lib - // we need a mutex that lives longer than the svtools library. + // we need a mutex that lives longer than the svl library. // Otherwise the dtor would use a destructed mutex!! pMutex = new Mutex; } diff --git a/svl/source/undo/undo.cxx b/svl/source/undo/undo.cxx index 49999834a8ff..a8442098237e 100644 --- a/svl/source/undo/undo.cxx +++ b/svl/source/undo/undo.cxx @@ -35,7 +35,7 @@ #include <tools/debug.hxx> -#include <svtools/undo.hxx> +#include <svl/undo.hxx> using ::com::sun::star::uno::Exception; @@ -313,7 +313,7 @@ USHORT SfxUndoManager::GetUndoActionCount() const XubString SfxUndoManager::GetUndoActionComment( USHORT nNo ) const { - DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svtools::SfxUndoManager::GetUndoActionComment(), illegal id!" ); + DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svl::SfxUndoManager::GetUndoActionComment(), illegal id!" ); if( nNo < pActUndoArray->nCurUndoAction ) { return pActUndoArray->aUndoActions[pActUndoArray->nCurUndoAction-1-nNo]->GetComment(); //! @@ -329,7 +329,7 @@ XubString SfxUndoManager::GetUndoActionComment( USHORT nNo ) const USHORT SfxUndoManager::GetUndoActionId( USHORT nNo ) const { - DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svtools::SfxUndoManager::GetUndoActionId(), illegal id!" ); + DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svl::SfxUndoManager::GetUndoActionId(), illegal id!" ); if( nNo < pActUndoArray->nCurUndoAction ) { return pActUndoArray->aUndoActions[pActUndoArray->nCurUndoAction-1-nNo]->GetId(); //! @@ -344,7 +344,7 @@ USHORT SfxUndoManager::GetUndoActionId( USHORT nNo ) const SfxUndoAction* SfxUndoManager::GetUndoAction( USHORT nNo ) const { - DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svtools::SfxUndoManager::GetUndoAction(), illegal id!" ); + DBG_ASSERT( nNo < pActUndoArray->nCurUndoAction, "svl::SfxUndoManager::GetUndoAction(), illegal id!" ); if( nNo < pActUndoArray->nCurUndoAction ) { return pActUndoArray->aUndoActions[pActUndoArray->nCurUndoAction-1-nNo]; //! @@ -360,7 +360,7 @@ SfxUndoAction* SfxUndoManager::GetUndoAction( USHORT nNo ) const /** clears the redo stack and removes the top undo action */ void SfxUndoManager::RemoveLastUndoAction() { - DBG_ASSERT( pActUndoArray->nCurUndoAction, "svtools::SfxUndoManager::RemoveLastUndoAction(), no action to remove?!" ); + DBG_ASSERT( pActUndoArray->nCurUndoAction, "svl::SfxUndoManager::RemoveLastUndoAction(), no action to remove?!" ); if( pActUndoArray->nCurUndoAction ) { pActUndoArray->nCurUndoAction--; @@ -387,7 +387,7 @@ BOOL SfxUndoManager::Undo( USHORT ) try { - DBG_ASSERT( pActUndoArray == pUndoArray, "svtools::SfxUndoManager::Undo(), LeaveListAction() not yet called!" ); + DBG_ASSERT( pActUndoArray == pUndoArray, "svl::SfxUndoManager::Undo(), LeaveListAction() not yet called!" ); if ( pActUndoArray->nCurUndoAction ) { Undo( *pActUndoArray->aUndoActions[ --pActUndoArray->nCurUndoAction ] ); @@ -587,11 +587,11 @@ void SfxUndoManager::LeaveListAction() if( pActUndoArray == pUndoArray ) { - DBG_ERROR( "svtools::SfxUndoManager::LeaveListAction(), called without calling EnterListAction()!" ); + DBG_ERROR( "svl::SfxUndoManager::LeaveListAction(), called without calling EnterListAction()!" ); return; } - DBG_ASSERT(pActUndoArray->pFatherUndoArray,"svtools::SfxUndoManager::LeaveListAction(), no father undo array!?"); + DBG_ASSERT(pActUndoArray->pFatherUndoArray,"svl::SfxUndoManager::LeaveListAction(), no father undo array!?"); SfxUndoArray* pTmp=pActUndoArray; pActUndoArray=pActUndoArray->pFatherUndoArray; diff --git a/svl/source/uno/pathservice.cxx b/svl/source/uno/pathservice.cxx index e54a96bf30ce..78c339773aec 100644 --- a/svl/source/uno/pathservice.cxx +++ b/svl/source/uno/pathservice.cxx @@ -54,7 +54,7 @@ public: virtual OUString SAL_CALL getImplementationName() throw(css::uno::RuntimeException) { - return OUString::createFromAscii("com.sun.star.comp.svtools.PathService"); + return OUString::createFromAscii("com.sun.star.comp.svl.PathService"); } virtual sal_Bool SAL_CALL supportsService ( diff --git a/svl/source/uno/registerservices.cxx b/svl/source/uno/registerservices.cxx index 1f761123ae56..daaf799bffea 100644 --- a/svl/source/uno/registerservices.cxx +++ b/svl/source/uno/registerservices.cxx @@ -84,7 +84,7 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo ( OUString::createFromAscii( "com.sun.star.util.NumberFormatter" ) ); xNewKey = xRegistryKey->createKey( - OUString::createFromAscii( "/com.sun.star.comp.svtools.PathService/UNO/SERVICES" ) ); + OUString::createFromAscii( "/com.sun.star.comp.svl.PathService/UNO/SERVICES" ) ); xNewKey->createKey ( OUString::createFromAscii( "com.sun.star.config.SpecialConfigManager" ) ); @@ -129,7 +129,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory ( aServiceNames); } else if (rtl_str_compare ( - pImplementationName, "com.sun.star.comp.svtools.PathService") == 0) + pImplementationName, "com.sun.star.comp.svl.PathService") == 0) { Sequence< OUString > aServiceNames(1); aServiceNames.getArray()[0] = diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index aa1ccad80630..2aec705bc7ef 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -30,7 +30,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svl.hxx" -#include <svtools/svdde.hxx> +#include <svl/svdde.hxx> #include <rtl/instance.hxx> DdeData::DdeData() |