diff options
| author | Mathias Bauer <mba@openoffice.org> | 2009-10-08 16:59:48 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2009-10-08 16:59:48 +0200 |
| commit | 80a5eff607808252c7fa7024793d445191d928a5 (patch) | |
| tree | 19082f53c3a634c407d64001401f99479d067e2a /svl/inc | |
| parent | cf2b56f39d57c62b17c444025f8dfe14e6149cba (diff) | |
#i103496#: make svl buildable with internal inc/svl directory
Diffstat (limited to 'svl/inc')
90 files changed, 153 insertions, 153 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> |