diff options
| author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-04-21 15:24:28 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2010-04-21 15:24:28 +0200 |
| commit | 83beefc9ba770d6ab4a74cb16c11f4dce53fb64a (patch) | |
| tree | 63066ecae353af2136b06c07c14d4aa1cbc6bfcf | |
| parent | 1aeb4427c8b6f174fd0f5280f4023209ab07af0a (diff) | |
| parent | b38f6eda0e9f9d4dced4357b11bcffaf1e52f746 (diff) | |
CWS gnumake2: merging minibranches
514 files changed, 885 insertions, 1559 deletions
diff --git a/basic/inc/modsizeexceeded.hxx b/basic/inc/basic/modsizeexceeded.hxx index e2d716259f09..e2d716259f09 100644 --- a/basic/inc/modsizeexceeded.hxx +++ b/basic/inc/basic/modsizeexceeded.hxx diff --git a/basic/inc/svtmsg.hrc b/basic/inc/basic/svtmsg.hrc index ff215d3fc9cb..ff215d3fc9cb 100644 --- a/basic/inc/svtmsg.hrc +++ b/basic/inc/basic/svtmsg.hrc diff --git a/basic/inc/testtool.hrc b/basic/inc/basic/testtool.hrc index 075b462944c9..075b462944c9 100644 --- a/basic/inc/testtool.hrc +++ b/basic/inc/basic/testtool.hrc diff --git a/basic/inc/ttmsg.hrc b/basic/inc/basic/ttmsg.hrc index 26f250bc6a6a..26f250bc6a6a 100644 --- a/basic/inc/ttmsg.hrc +++ b/basic/inc/basic/ttmsg.hrc diff --git a/basic/prj/d.lst b/basic/prj/d.lst index d2a083ebcb1e..ee5aae9acbf2 100644 --- a/basic/prj/d.lst +++ b/basic/prj/d.lst @@ -20,40 +20,7 @@ mkdir: %COMMON_DEST%\res%_EXT% ..\%__SRC%\lib\libsample.a %_DEST%\lib%_EXT%\libsample.a mkdir: %_DEST%\inc%_EXT%\basic -..\inc\testtool.hrc %_DEST%\inc%_EXT%\basic\testtool.hrc -..\inc\ttmsg.hrc %_DEST%\inc%_EXT%\basic\ttmsg.hrc -..\inc\basic\ttglobal.hrc %_DEST%\inc%_EXT%\basic\ttglobal.hrc -..\inc\svtmsg.hrc %_DEST%\inc%_EXT%\basic\svtmsg.hrc +..\inc\basic\*.hxx %_DEST%\inc%_EXT%\basic\*.hxx +..\inc\basic\*.hrc %_DEST%\inc%_EXT%\basic\*.hrc +..\inc\basic\*.h %_DEST%\inc%_EXT%\basic\*.h -..\inc\basic\sbdef.hxx %_DEST%\inc%_EXT%\basic\sbdef.hxx -..\inc\basic\sbmod.hxx %_DEST%\inc%_EXT%\basic\sbmod.hxx -..\inc\basic\sbjsmod.hxx %_DEST%\inc%_EXT%\basic\sbjsmod.hxx -..\inc\basic\sbmeth.hxx %_DEST%\inc%_EXT%\basic\sbmeth.hxx -..\inc\basic\sbprop.hxx %_DEST%\inc%_EXT%\basic\sbprop.hxx -..\inc\basic\sbstar.hxx %_DEST%\inc%_EXT%\basic\sbstar.hxx -..\inc\basic\sbuno.hxx %_DEST%\inc%_EXT%\basic\sbuno.hxx -..\inc\basic\basmgr.hxx %_DEST%\inc%_EXT%\basic\basmgr.hxx -..\inc\basic\sberrors.hxx %_DEST%\inc%_EXT%\basic\sberrors.hxx -..\inc\basic\basrdll.hxx %_DEST%\inc%_EXT%\basic\basrdll.hxx -..\inc\basic\sbstdobj.hxx %_DEST%\inc%_EXT%\basic\sbstdobj.hxx -..\inc\basic\process.hxx %_DEST%\inc%_EXT%\basic\process.hxx -..\inc\basic\mybasic.hxx %_DEST%\inc%_EXT%\basic\mybasic.hxx -..\inc\basic\testtool.hxx %_DEST%\inc%_EXT%\basic\testtool.hxx -..\inc\basic\basicrt.hxx %_DEST%\inc%_EXT%\basic\basicrt.hxx -..\inc\basic\dispdefs.hxx %_DEST%\inc%_EXT%\basic\dispdefs.hxx -..\inc\basic\ttstrhlp.hxx %_DEST%\inc%_EXT%\basic\ttstrhlp.hxx - -..\inc\basic\sbx.hxx %_DEST%\inc%_EXT%\basic\sbx.hxx -..\inc\basic\sbxcore.hxx %_DEST%\inc%_EXT%\basic\sbxcore.hxx -..\inc\basic\sbxdef.hxx %_DEST%\inc%_EXT%\basic\sbxdef.hxx -..\inc\basic\sbxform.hxx %_DEST%\inc%_EXT%\basic\sbxform.hxx -..\inc\basic\sbxmeth.hxx %_DEST%\inc%_EXT%\basic\sbxmeth.hxx -..\inc\basic\sbxobj.hxx %_DEST%\inc%_EXT%\basic\sbxobj.hxx -..\inc\basic\sbxprop.hxx %_DEST%\inc%_EXT%\basic\sbxprop.hxx -..\inc\basic\sbxvar.hxx %_DEST%\inc%_EXT%\basic\sbxvar.hxx -..\inc\basic\sbxbase.hxx %_DEST%\inc%_EXT%\basic\sbxbase.hxx -..\inc\basic\sbxfac.hxx %_DEST%\inc%_EXT%\basic\sbxfac.hxx -..\inc\basic\sbxmstrm.hxx %_DEST%\inc%_EXT%\basic\sbxmstrm.hxx - -..\inc\basic\basicmanagerrepository.hxx %_DEST%\inc%_EXT%\basic\basicmanagerrepository.hxx -..\inc\modsizeexceeded.hxx %_DEST%\inc%_EXT%\basic\modsizeexceeded.hxx diff --git a/basic/source/app/svtmsg.src b/basic/source/app/svtmsg.src index 89686ebfc0ee..748256bb5564 100644 --- a/basic/source/app/svtmsg.src +++ b/basic/source/app/svtmsg.src @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "svtmsg.hrc" +#include "basic/svtmsg.hrc" // Hier sind die Messages aus dem Verzeichnis /basic/source/app enhalten diff --git a/basic/source/app/testtool.src b/basic/source/app/testtool.src index 245cff6c7917..090cb735c139 100644 --- a/basic/source/app/testtool.src +++ b/basic/source/app/testtool.src @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "testtool.hrc" +#include "basic/testtool.hrc" /////////////////////////////// diff --git a/basic/source/app/ttmsg.src b/basic/source/app/ttmsg.src index 63a6643f3cf1..076ee83fd879 100644 --- a/basic/source/app/ttmsg.src +++ b/basic/source/app/ttmsg.src @@ -24,7 +24,7 @@ * for a copy of the LGPLv3 License. * ************************************************************************/ -#include "ttmsg.hrc" +#include "basic/ttmsg.hrc" // Hier sind die Messages aus dem Verzeichnis /basic/source/testtool enhalten diff --git a/basic/source/uno/modsizeexceeded.cxx b/basic/source/uno/modsizeexceeded.cxx index 408b0f3f8dd4..95c5b0ac2a83 100644 --- a/basic/source/uno/modsizeexceeded.cxx +++ b/basic/source/uno/modsizeexceeded.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_basic.hxx" -#include "modsizeexceeded.hxx" +#include "basic/modsizeexceeded.hxx" #include <framework/interaction.hxx> #include <com/sun/star/script/ModuleSizeExceededRequest.hpp> diff --git a/basic/source/uno/scriptcont.cxx b/basic/source/uno/scriptcont.cxx index 096d497a4c50..88caeac1facf 100644 --- a/basic/source/uno/scriptcont.cxx +++ b/basic/source/uno/scriptcont.cxx @@ -60,7 +60,7 @@ #include <svtools/ehdl.hxx> #include <basic/basmgr.hxx> #include <basic/sbmod.hxx> -#include "modsizeexceeded.hxx" +#include "basic/modsizeexceeded.hxx" #include <xmlscript/xmlmod_imexp.hxx> #include <cppuhelper/factory.hxx> #include <com/sun/star/util/VetoException.hpp> diff --git a/editeng/inc/pch/precompiled_editeng.hxx b/editeng/inc/pch/precompiled_editeng.hxx index d82ecc6cb6b5..d2a8837911ad 100644 --- a/editeng/inc/pch/precompiled_editeng.hxx +++ b/editeng/inc/pch/precompiled_editeng.hxx @@ -694,7 +694,6 @@ #include "svtools/apearcfg.hxx" #include "svl/brdcst.hxx" #include "unotools/cacheoptions.hxx" -#include "svl/cancel.hxx" #include "svl/cjkoptions.hxx" #include "unotools/cmdoptions.hxx" #include "svl/cntwall.hxx" diff --git a/framework/inc/classes/actiontriggercontainer.hxx b/framework/inc/classes/actiontriggercontainer.hxx index 56ab8e8e7583..936f6cf0cdbb 100644 --- a/framework/inc/classes/actiontriggercontainer.hxx +++ b/framework/inc/classes/actiontriggercontainer.hxx @@ -32,7 +32,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #define SERVICENAME_ACTIONTRIGGERCONTAINER "com.sun.star.ui.ActionTriggerContainer" #define IMPLEMENTATIONNAME_ACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.ActionTriggerContainer" diff --git a/framework/inc/classes/actiontriggerpropertyset.hxx b/framework/inc/classes/actiontriggerpropertyset.hxx index 37f71438f4b6..a02794891634 100644 --- a/framework/inc/classes/actiontriggerpropertyset.hxx +++ b/framework/inc/classes/actiontriggerpropertyset.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #define SERVICENAME_ACTIONTRIGGER "com.sun.star.ui.ActionTrigger" #define IMPLEMENTATIONNAME_ACTIONTRIGGER "com.sun.star.comp.ui.ActionTrigger" diff --git a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx index be62ea962f05..f3579e98fcc1 100644 --- a/framework/inc/classes/actiontriggerseparatorpropertyset.hxx +++ b/framework/inc/classes/actiontriggerseparatorpropertyset.hxx @@ -37,7 +37,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/IllegalArgumentException.hpp> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #define SERVICENAME_ACTIONTRIGGERSEPARATOR "com.sun.star.ui.ActionTriggerSeparator" #define IMPLEMENTATIONNAME_ACTIONTRIGGERSEPARATOR "com.sun.star.comp.ui.ActionTriggerSeparator" diff --git a/framework/inc/classes/fwkresid.hxx b/framework/inc/classes/fwkresid.hxx index 2efd1dee3ad9..6cfe3fc7a0dd 100644 --- a/framework/inc/classes/fwkresid.hxx +++ b/framework/inc/classes/fwkresid.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_CLASSES_FWKRESID_HXX_ #include <tools/resid.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/inc/classes/imagewrapper.hxx b/framework/inc/classes/imagewrapper.hxx index 9b54a149bb53..2001314e9edb 100644 --- a/framework/inc/classes/imagewrapper.hxx +++ b/framework/inc/classes/imagewrapper.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XTypeProvider.hpp> #include <cppuhelper/implbase2.hxx> #include <vcl/image.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/inc/classes/rootactiontriggercontainer.hxx b/framework/inc/classes/rootactiontriggercontainer.hxx index 2c5fa9afa071..e3c26d190ce9 100644 --- a/framework/inc/classes/rootactiontriggercontainer.hxx +++ b/framework/inc/classes/rootactiontriggercontainer.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #define IMPLEMENTATIONNAME_ROOTACTIONTRIGGERCONTAINER "com.sun.star.comp.ui.RootActionTriggerContainer" diff --git a/framework/inc/helper/acceleratorinfo.hxx b/framework/inc/framework/acceleratorinfo.hxx index e133149cbe7a..6b0519ceed98 100644 --- a/framework/inc/helper/acceleratorinfo.hxx +++ b/framework/inc/framework/acceleratorinfo.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <vcl/keycod.hxx> #include <rtl/ustring.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/inc/helper/actiontriggerhelper.hxx b/framework/inc/framework/actiontriggerhelper.hxx index 883f2cd7b281..67c4115a3621 100644 --- a/framework/inc/helper/actiontriggerhelper.hxx +++ b/framework/inc/framework/actiontriggerhelper.hxx @@ -33,7 +33,7 @@ // #110897# #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <vcl/menu.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework diff --git a/framework/inc/classes/addonmenu.hxx b/framework/inc/framework/addonmenu.hxx index b85c8c5a8d52..183c6937b39e 100644 --- a/framework/inc/classes/addonmenu.hxx +++ b/framework/inc/framework/addonmenu.hxx @@ -40,7 +40,7 @@ //_________________________________________________________________________________________________________________ #include <vcl/menu.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #define ADDONMENU_ITEMID_START 2000 #define ADDONMENU_ITEMID_END 3000 diff --git a/framework/inc/classes/addonsoptions.hxx b/framework/inc/framework/addonsoptions.hxx index 42428a97b398..6e41fcbafdd1 100644 --- a/framework/inc/classes/addonsoptions.hxx +++ b/framework/inc/framework/addonsoptions.hxx @@ -38,7 +38,7 @@ #include <vcl/svapp.hxx> #include <com/sun/star/uno/Sequence.h> #include <com/sun/star/beans/PropertyValue.hpp> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // types, enums, ... //_________________________________________________________________________________________________________________ diff --git a/framework/inc/classes/bmkmenu.hxx b/framework/inc/framework/bmkmenu.hxx index 846a9d8b9ba4..db6e2977f8b5 100644 --- a/framework/inc/classes/bmkmenu.hxx +++ b/framework/inc/framework/bmkmenu.hxx @@ -27,13 +27,13 @@ #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX #define __FRAMEWORK_CLASSES_BMKMENU_HXX -#include "classes/addonmenu.hxx" +#include "framework/addonmenu.hxx" //_________________________________________________________________________________________________________________ // interface includes //_________________________________________________________________________________________________________________ #include <com/sun/star/frame/XFrame.hpp> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ diff --git a/framework/inc/helper/configimporter.hxx b/framework/inc/framework/configimporter.hxx index 8a8660cd0bb9..6038f7bdd325 100644 --- a/framework/inc/helper/configimporter.hxx +++ b/framework/inc/framework/configimporter.hxx @@ -34,7 +34,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <rtl/ustring.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/inc/xml/eventsconfiguration.hxx b/framework/inc/framework/eventsconfiguration.hxx index 5b5b7080e450..4c07be58d1c7 100644 --- a/framework/inc/xml/eventsconfiguration.hxx +++ b/framework/inc/framework/eventsconfiguration.hxx @@ -28,7 +28,7 @@ #ifndef __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ #define __FRAMEWORK_XML_EVENTSCONFIGURATION_HXX_ -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/stream.hxx> diff --git a/framework/inc/fwedllapi.h b/framework/inc/framework/fwedllapi.h index 2742d09ab134..2742d09ab134 100644 --- a/framework/inc/fwedllapi.h +++ b/framework/inc/framework/fwedllapi.h diff --git a/framework/inc/helper/imageproducer.hxx b/framework/inc/framework/imageproducer.hxx index 72e5636f5359..7fe78f0a78b6 100644 --- a/framework/inc/helper/imageproducer.hxx +++ b/framework/inc/framework/imageproducer.hxx @@ -35,7 +35,7 @@ #include <com/sun/star/frame/XFrame.hpp> #include <vcl/image.hxx> #include <rtl/ustring.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/inc/xml/imagesconfiguration.hxx b/framework/inc/framework/imagesconfiguration.hxx index 4598f2e8ae58..0771e2d8f7f1 100644 --- a/framework/inc/xml/imagesconfiguration.hxx +++ b/framework/inc/framework/imagesconfiguration.hxx @@ -28,7 +28,7 @@ #ifndef __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ #define __FRAMEWORK_XML_IMAGESCONFIGURATION_HXX_ -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/stream.hxx> @@ -44,7 +44,7 @@ namespace framework { -enum FWE_DLLPUBLIC ImageMaskMode +enum ImageMaskMode { ImageMaskMode_Color, ImageMaskMode_Bitmap diff --git a/framework/inc/dispatch/interaction.hxx b/framework/inc/framework/interaction.hxx index f55f8ed39402..05c4303f4b8e 100644 --- a/framework/inc/dispatch/interaction.hxx +++ b/framework/inc/framework/interaction.hxx @@ -54,7 +54,7 @@ #include <cppuhelper/implbase1.hxx> #include <com/sun/star/uno/Reference.hxx> #include <com/sun/star/uno/Sequence.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/inc/xml/menuconfiguration.hxx b/framework/inc/framework/menuconfiguration.hxx index e48f6b144c8f..dee6c23a8f8e 100644 --- a/framework/inc/xml/menuconfiguration.hxx +++ b/framework/inc/framework/menuconfiguration.hxx @@ -40,7 +40,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/container/XIndexAccess.hpp> #include <com/sun/star/frame/XDispatchProvider.hpp> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // includes of other projects diff --git a/framework/inc/classes/menuextensionsupplier.hxx b/framework/inc/framework/menuextensionsupplier.hxx index 9f34f1dd7327..f6ca60d4fecc 100644 --- a/framework/inc/classes/menuextensionsupplier.hxx +++ b/framework/inc/framework/menuextensionsupplier.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_CLASSES_MENUEXTENSIONSUPPLIER_HXX_ #include <rtl/ustring.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> struct FWE_DLLPUBLIC MenuExtensionItem { diff --git a/framework/inc/interaction/preventduplicateinteraction.hxx b/framework/inc/framework/preventduplicateinteraction.hxx index be5fea63da48..e7f26b354f28 100644 --- a/framework/inc/interaction/preventduplicateinteraction.hxx +++ b/framework/inc/framework/preventduplicateinteraction.hxx @@ -28,7 +28,7 @@ #ifndef __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_ #define __FRAMEWORK_INTERACTION_PREVENTDUPLICATEINTERACTION_HXX_ -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ diff --git a/framework/inc/classes/sfxhelperfunctions.hxx b/framework/inc/framework/sfxhelperfunctions.hxx index ecc05621a41a..7e58c375aa2c 100644 --- a/framework/inc/classes/sfxhelperfunctions.hxx +++ b/framework/inc/framework/sfxhelperfunctions.hxx @@ -28,7 +28,7 @@ #ifndef __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ #define __FRAMEWORK_CLASSES_SFXHELPERFUNCTIONS_HXX_ -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #include <com/sun/star/frame/XFrame.hpp> #include <rtl/ustring.hxx> #include <vcl/toolbox.hxx> diff --git a/framework/inc/xml/statusbarconfiguration.hxx b/framework/inc/framework/statusbarconfiguration.hxx index e1e20d5093d4..bd93831cba7a 100644 --- a/framework/inc/xml/statusbarconfiguration.hxx +++ b/framework/inc/framework/statusbarconfiguration.hxx @@ -27,7 +27,7 @@ #ifndef __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ #define __FRAMEWORK_CLASSES_STATUSBARCONFIGURATION_HXX_ -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #include <svl/svarray.hxx> #include <tools/string.hxx> #include <tools/stream.hxx> diff --git a/framework/inc/helper/titlehelper.hxx b/framework/inc/framework/titlehelper.hxx index 8d7b361fcb76..592a419e0b75 100644 --- a/framework/inc/helper/titlehelper.hxx +++ b/framework/inc/framework/titlehelper.hxx @@ -51,7 +51,7 @@ #include <rtl/ustrbuf.hxx> #include <hash_map> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_______________________________________________ // namespace diff --git a/framework/inc/xml/toolboxconfiguration.hxx b/framework/inc/framework/toolboxconfiguration.hxx index 2bf94c55b36a..453d94810fbc 100644 --- a/framework/inc/xml/toolboxconfiguration.hxx +++ b/framework/inc/framework/toolboxconfiguration.hxx @@ -27,7 +27,7 @@ #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ #define __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #include <svl/svarray.hxx> #include <vcl/bitmap.hxx> #include <tools/string.hxx> diff --git a/framework/inc/helper/propertysetcontainer.hxx b/framework/inc/helper/propertysetcontainer.hxx index 2ca9db63aaa9..d1c50d3d9a14 100644 --- a/framework/inc/helper/propertysetcontainer.hxx +++ b/framework/inc/helper/propertysetcontainer.hxx @@ -37,7 +37,7 @@ #include <com/sun/star/container/XIndexContainer.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <threadhelp/threadhelpbase.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/inc/helper/uiconfigelementwrapperbase.hxx b/framework/inc/helper/uiconfigelementwrapperbase.hxx index b79d3d89b94f..d85f5ac295d0 100644 --- a/framework/inc/helper/uiconfigelementwrapperbase.hxx +++ b/framework/inc/helper/uiconfigelementwrapperbase.hxx @@ -58,7 +58,7 @@ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/inc/helper/uielementwrapperbase.hxx b/framework/inc/helper/uielementwrapperbase.hxx index bb2ebbd99aea..242a2553f47a 100644 --- a/framework/inc/helper/uielementwrapperbase.hxx +++ b/framework/inc/helper/uielementwrapperbase.hxx @@ -53,7 +53,7 @@ #include <cppuhelper/propshlp.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <cppuhelper/weak.hxx> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 2ccba9e7ffde..0e62cd9f6aaf 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -49,7 +49,7 @@ #include <stdtypes.h> #include <uielement/menubarmanager.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/inc/threadhelp/lockhelper.hxx b/framework/inc/threadhelp/lockhelper.hxx index 8604477c88b6..d6ebae6d4b9c 100644 --- a/framework/inc/threadhelp/lockhelper.hxx +++ b/framework/inc/threadhelp/lockhelper.hxx @@ -64,7 +64,7 @@ namespace framework{ of your implementation - because base classes are initialized by his order and before your member! Thats why ist a good place to declare your thread help member so. *//*-*************************************************************************************************************/ -enum FWI_DLLPUBLIC ELockType +enum ELockType { E_NOTHING = 0 , E_OWNMUTEX = 1 , diff --git a/framework/inc/uielement/menubarmanager.hxx b/framework/inc/uielement/menubarmanager.hxx index 773efafa52fe..f201c70d7bb0 100644 --- a/framework/inc/uielement/menubarmanager.hxx +++ b/framework/inc/uielement/menubarmanager.hxx @@ -72,7 +72,7 @@ #include <toolkit/awt/vclxmenu.hxx> #include <cppuhelper/weak.hxx> #include <cppuhelper/interfacecontainer.hxx> -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> namespace framework { diff --git a/framework/inc/xml/eventsdocumenthandler.hxx b/framework/inc/xml/eventsdocumenthandler.hxx index cac5c46b56ca..ffce5c1a348b 100644 --- a/framework/inc/xml/eventsdocumenthandler.hxx +++ b/framework/inc/xml/eventsdocumenthandler.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_XML_EVENTSDOCUMENTHANDLER_HXX_ #ifndef __FRAMEWORK_XML_TOOLBOXCONFIGURATION_HXX_ -#include <xml/eventsconfiguration.hxx> +#include <framework/eventsconfiguration.hxx> #endif //_________________________________________________________________________________________________________________ @@ -50,7 +50,7 @@ #include <hash_map> #include <stdtypes.h> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace //_________________________________________________________________________________________________________________ diff --git a/framework/inc/xml/imagesdocumenthandler.hxx b/framework/inc/xml/imagesdocumenthandler.hxx index dbd5106e3441..59d1e4abdb3a 100644 --- a/framework/inc/xml/imagesdocumenthandler.hxx +++ b/framework/inc/xml/imagesdocumenthandler.hxx @@ -28,7 +28,7 @@ #ifndef __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_IMAGEDOCUMENTHANDLER_HXX_ -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // interface includes @@ -41,7 +41,7 @@ //_________________________________________________________________________________________________________________ // other includes //_________________________________________________________________________________________________________________ -#include <xml/imagesconfiguration.hxx> +#include <framework/imagesconfiguration.hxx> #include <threadhelp/threadhelpbase.hxx> #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> diff --git a/framework/inc/xml/menudocumenthandler.hxx b/framework/inc/xml/menudocumenthandler.hxx index 6a085aca3ec6..5c6064cdd4f1 100644 --- a/framework/inc/xml/menudocumenthandler.hxx +++ b/framework/inc/xml/menudocumenthandler.hxx @@ -48,7 +48,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> #include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/inc/xml/saxnamespacefilter.hxx b/framework/inc/xml/saxnamespacefilter.hxx index 33e08f0e3f6a..f4bdfcf677e9 100644 --- a/framework/inc/xml/saxnamespacefilter.hxx +++ b/framework/inc/xml/saxnamespacefilter.hxx @@ -36,7 +36,7 @@ #include <cppuhelper/implbase1.hxx> #include <stack> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index d91e4d5f0e6d..82c2d0c55111 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -29,7 +29,7 @@ #define __FRAMEWORK_XML_STATUSBARDOCUMENTHANDLER_HXX_ #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ -#include <xml/statusbarconfiguration.hxx> +#include <framework/statusbarconfiguration.hxx> #endif //_________________________________________________________________________________________________________________ @@ -49,7 +49,7 @@ #include <hash_map> #include <stdtypes.h> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/inc/xml/toolboxdocumenthandler.hxx b/framework/inc/xml/toolboxdocumenthandler.hxx index 297e6e24ccec..d90d91cee036 100644 --- a/framework/inc/xml/toolboxdocumenthandler.hxx +++ b/framework/inc/xml/toolboxdocumenthandler.hxx @@ -28,7 +28,7 @@ #ifndef __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_TOOLBOXDOCUMENTHANDLER_HXX_ -#include <xml/toolboxconfiguration.hxx> +#include <framework/toolboxconfiguration.hxx> //_________________________________________________________________________________________________________________ // interface includes @@ -43,7 +43,7 @@ #include <rtl/ustring.hxx> #include <cppuhelper/implbase1.hxx> #include <stdtypes.h> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx b/framework/inc/xml/toolboxlayoutdocumenthandler.hxx index 71a7843a0a9e..1aba4d192b85 100644 --- a/framework/inc/xml/toolboxlayoutdocumenthandler.hxx +++ b/framework/inc/xml/toolboxlayoutdocumenthandler.hxx @@ -28,7 +28,7 @@ #ifndef __FRAMEWORK_XML_TOOLBOXLAYOUTDOCUMENTHANDLER_HXX_ #define __FRAMEWORK_XML_TOOLBOXLAYOUTDOCUMENTHANDLER_HXX_ -#include <xml/toolboxconfiguration.hxx> +#include <framework/toolboxconfiguration.hxx> //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/inc/xml/xmlnamespaces.hxx b/framework/inc/xml/xmlnamespaces.hxx index a086af82e51f..bcb9ec4cb5e3 100644 --- a/framework/inc/xml/xmlnamespaces.hxx +++ b/framework/inc/xml/xmlnamespaces.hxx @@ -31,7 +31,7 @@ #include <com/sun/star/xml/sax/SAXException.hpp> #include <map> -#include <fwedllapi.h> +#include <framework/fwedllapi.h> namespace framework { diff --git a/framework/prj/build.lst b/framework/prj/build.lst index 3591f5b29a63..12e597204710 100644 --- a/framework/prj/build.lst +++ b/framework/prj/build.lst @@ -1,3 +1,31 @@ -fr framework : l10n svtools NULL -fr framework usr1 - all fr_mkout NULL -fr framework\prj nmake - all fr_all NULL +fr framework : l10n svtools NULL +fr framework usr1 - all fr_mkout NULL +fr framework\inc nmake - all fr_inc NULL +fr framework\source\accelerators nmake - all fr_accelerators fr_threadhelp fr_inc NULL +fr framework\source\classes nmake - all fr_classes fr_threadhelp fr_constant fr_inc NULL +fr framework\source\constant nmake - all fr_constant fr_inc NULL +fr framework\source\dispatch nmake - all fr_dispatch fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwe\classes nmake - all fr_fweclasses fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwe\dispatch nmake - all fr_fwedispatch fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwe\helper nmake - all fr_fwehelper fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwe\interaction nmake - all fr_fweinteraction fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwe\xml nmake - all fr_fwexml fr_threadhelp fr_inc NULL +fr framework\source\fwi\classes nmake - all fr_fwiclasses fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwi\helper nmake - all fr_fwihelper fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwi\jobs nmake - all fr_fwijobs fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwi\threadhelp nmake - all fr_threadhelp fr_constant fr_inc NULL +fr framework\source\fwi\uielement nmake - all fr_fwiuielement fr_threadhelp fr_inc NULL +fr framework\source\helper nmake - all fr_helper fr_threadhelp fr_constant fr_inc NULL +fr framework\source\interaction nmake - all fr_interaction fr_threadhelp fr_constant fr_inc NULL +fr framework\source\jobs nmake - all fr_jobs fr_threadhelp fr_constant fr_inc NULL +fr framework\source\layoutmanager nmake - all fr_layoutmanager fr_threadhelp fr_inc NULL +fr framework\source\loadenv nmake - all fr_loadenv fr_threadhelp fr_constant fr_inc NULL +fr framework\source\recording nmake - all fr_recording fr_threadhelp fr_constant fr_inc NULL +fr framework\source\register nmake - all fr_register fr_threadhelp fr_constant fr_inc NULL +fr framework\source\services nmake - all fr_services fr_threadhelp fr_constant fr_inc NULL +fr framework\source\tabwin nmake - all fr_tabwin fr_threadhelp fr_inc NULL +fr framework\source\uiconfiguration nmake - all fr_uiconfiguration fr_threadhelp fr_inc NULL +fr framework\source\uielement nmake - all fr_uielement fr_threadhelp fr_inc NULL +fr framework\source\uifactory nmake - all fr_uifactory fr_threadhelp fr_inc NULL +fr framework\source\xml nmake - all fr_xml fr_threadhelp fr_inc NULL +fr framework\util nmake - all fr_util fr_constant fr_threadhelp fr_classes fr_loadenv fr_jobs fr_interaction fr_helper fr_dispatch fr_services fr_register fr_recording fr_layoutmanager fr_uielement fr_uifactory fr_xml fr_uiconfiguration fr_accelerators fr_tabwin fr_fweclasses fr_fwedispatch fr_fwehelper fr_fweinteraction fr_fwexml fr_fwiclasses fr_fwihelper fr_fwijobs fr_fwiuielement NULL diff --git a/framework/prj/d.lst b/framework/prj/d.lst index 8b137891791f..cffe72a703d6 100644 --- a/framework/prj/d.lst +++ b/framework/prj/d.lst @@ -1 +1,39 @@ +mkdir: %COMMON_DEST%\bin%_EXT%\hid +mkdir: %_DEST%\inc%_EXT%\framework +mkdir: %_DEST%\xml%_EXT%\uiconfig +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US +mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar + +..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid +..\%__SRC%\bin\*.res %_DEST%\bin%_EXT%\* +..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\* +..\%__SRC%\bin\*.exe %_DEST%\bin%_EXT%\* +..\%__SRC%\bin\login %_DEST%\bin%_EXT%\login.bin +..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\lib*.dylib %_DEST%\lib%_EXT% + +..\dtd\menubar.dtd %_DEST%\bin%_EXT%\menubar.dtd +..\dtd\toolbar.dtd %_DEST%\bin%_EXT%\toolbar.dtd +..\dtd\statusbar.dtd %_DEST%\bin%_EXT%\statusbar.dtd +..\dtd\event.dtd %_DEST%\bin%_EXT%\event.dtd +..\dtd\accelerator.dtd %_DEST%\bin%_EXT%\accelerator.dtd +..\dtd\image.dtd %_DEST%\bin%_EXT%\image.dtd +..\dtd\groupuinames.dtd %_DEST%\bin%_EXT%\groupuinames.dtd + +..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib +..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib +..\inc\framework/*.h %_DEST%\inc%_EXT%\framework\*.h +..\inc\framework/*.hxx %_DEST%\inc%_EXT%\framework\*.hxx + +..\uiconfig\startmodule\menubar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\menubar\*.xml +..\uiconfig\startmodule\toolbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\toolbar\*.xml +..\uiconfig\startmodule\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\accelerator\en-US\*.xml +..\uiconfig\startmodule\statusbar\*.xml %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar\*.xml + +..\source\unotypes\fw?.xml %_DEST%\xml%_EXT%\*.xml diff --git a/framework/prj/target_package_inc.mk b/framework/prj/target_package_inc.mk index 32ae89b7b1be..e087c6038001 100644 --- a/framework/prj/target_package_inc.mk +++ b/framework/prj/target_package_inc.mk @@ -26,22 +26,22 @@ #************************************************************************* $(eval $(call gb_Package_Package,framework_inc,$(SRCDIR)/framework/inc)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,helper/acceleratorinfo.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,helper/actiontriggerhelper.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,classes/addonmenu.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,classes/addonsoptions.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,classes/bmkmenu.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,helper/configimporter.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,xml/eventsconfiguration.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,helper/imageproducer.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,xml/imagesconfiguration.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,dispatch/interaction.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,xml/menuconfiguration.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,classes/menuextensionsupplier.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,interaction/preventduplicateinteraction.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,classes/sfxhelperfunctions.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,helper/titlehelper.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,xml/toolboxconfiguration.hxx)) -$(eval $(call gb_Package_add_file,framework_inc,inc/fwedllapi.h,fwedllapi.h)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/acceleratorinfo.hxx,framework/acceleratorinfo.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/actiontriggerhelper.hxx,framework/actiontriggerhelper.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonmenu.hxx,framework/addonmenu.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/addonsoptions.hxx,framework/addonsoptions.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/bmkmenu.hxx,framework/bmkmenu.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/configimporter.hxx,framework/configimporter.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/eventsconfiguration.hxx,framework/eventsconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imageproducer.hxx,framework/imageproducer.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/imagesconfiguration.hxx,framework/imagesconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/interaction.hxx,framework/interaction.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuconfiguration.hxx,framework/menuconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/menuextensionsupplier.hxx,framework/menuextensionsupplier.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/preventduplicateinteraction.hxx,framework/preventduplicateinteraction.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/sfxhelperfunctions.hxx,framework/sfxhelperfunctions.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/titlehelper.hxx,framework/titlehelper.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/toolboxconfiguration.hxx,framework/toolboxconfiguration.hxx)) +$(eval $(call gb_Package_add_file,framework_inc,inc/framework/fwedllapi.h,fwedllapi.h)) $(eval $(call gb_Package_add_file,framework_inc,inc/fwkdllapi.h,fwkdllapi.h)) $(eval $(call gb_Package_add_file,framework_inc,inc/fwidllapi.h,fwidllapi.h)) diff --git a/framework/source/classes/menumanager.cxx b/framework/source/classes/menumanager.cxx index 0b2f30093ca8..3979d72b1e62 100644 --- a/framework/source/classes/menumanager.cxx +++ b/framework/source/classes/menumanager.cxx @@ -33,12 +33,12 @@ // my own includes //_________________________________________________________________________________________________________________ #include <classes/menumanager.hxx> -#include <xml/menuconfiguration.hxx> -#include <classes/bmkmenu.hxx> -#include <classes/addonmenu.hxx> -#include <helper/imageproducer.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/bmkmenu.hxx> +#include <framework/addonmenu.hxx> +#include <framework/imageproducer.hxx> #include <threadhelp/resetableguard.hxx> -#include "classes/addonsoptions.hxx" +#include "framework/addonsoptions.hxx" #include <classes/fwkresid.hxx> #include <services.h> #include "classes/resource.hrc" diff --git a/framework/source/dispatch/menudispatcher.cxx b/framework/source/dispatch/menudispatcher.cxx index 718830545db2..d55556b23f65 100644 --- a/framework/source/dispatch/menudispatcher.cxx +++ b/framework/source/dispatch/menudispatcher.cxx @@ -33,8 +33,8 @@ //_________________________________________________________________________________________________________________ #include <dispatch/menudispatcher.hxx> #include <general.h> -#include <xml/menuconfiguration.hxx> -#include <classes/addonmenu.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/addonmenu.hxx> #include <services.h> //_________________________________________________________________________________________________________________ diff --git a/framework/source/dispatch/popupmenudispatcher.cxx b/framework/source/dispatch/popupmenudispatcher.cxx index 834d11017ec8..8437b82961ea 100644 --- a/framework/source/dispatch/popupmenudispatcher.cxx +++ b/framework/source/dispatch/popupmenudispatcher.cxx @@ -34,8 +34,8 @@ #include <dispatch/popupmenudispatcher.hxx> #include <general.h> -#include <xml/menuconfiguration.hxx> -#include <classes/addonmenu.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/addonmenu.hxx> #include <services.h> #include <properties.h> diff --git a/framework/source/fwe/classes/addonmenu.cxx b/framework/source/fwe/classes/addonmenu.cxx index 4961a8f7c1f2..c3c328c3626e 100644 --- a/framework/source/fwe/classes/addonmenu.cxx +++ b/framework/source/fwe/classes/addonmenu.cxx @@ -31,12 +31,12 @@ //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#include "classes/addonmenu.hxx" -#include "classes/addonsoptions.hxx" +#include "framework/addonmenu.hxx" +#include "framework/addonsoptions.hxx" #include <general.h> #include <macros/debug/assertion.hxx> -#include <helper/imageproducer.hxx> -#include <xml/menuconfiguration.hxx> +#include <framework/imageproducer.hxx> +#include <framework/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx index 9bdaeb7dfda3..1d947c651a67 100644 --- a/framework/source/fwe/classes/addonsoptions.cxx +++ b/framework/source/fwe/classes/addonsoptions.cxx @@ -31,7 +31,7 @@ //_________________________________________________________________________________________________________________ // includes //_________________________________________________________________________________________________________________ -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> #include <unotools/configmgr.hxx> #include <unotools/configitem.hxx> #include <unotools/ucbstreamhelper.hxx> diff --git a/framework/source/fwe/classes/bmkmenu.cxx b/framework/source/fwe/classes/bmkmenu.cxx index aa2aef3b9d2b..78ddb606585b 100644 --- a/framework/source/fwe/classes/bmkmenu.cxx +++ b/framework/source/fwe/classes/bmkmenu.cxx @@ -34,11 +34,11 @@ #include <limits.h> -#include "classes/bmkmenu.hxx" +#include "framework/bmkmenu.hxx" #include <general.h> #include <macros/debug/assertion.hxx> -#include <helper/imageproducer.hxx> -#include <xml/menuconfiguration.hxx> +#include <framework/imageproducer.hxx> +#include <framework/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/fwe/classes/menuextensionsupplier.cxx b/framework/source/fwe/classes/menuextensionsupplier.cxx index 07991c61f90f..3849a34d5425 100644 --- a/framework/source/fwe/classes/menuextensionsupplier.cxx +++ b/framework/source/fwe/classes/menuextensionsupplier.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <classes/menuextensionsupplier.hxx> +#include <framework/menuextensionsupplier.hxx> #include <osl/mutex.hxx> static pfunc_setMenuExtensionSupplier pMenuExtensionSupplierFunc = NULL; diff --git a/framework/source/fwe/classes/rootactiontriggercontainer.cxx b/framework/source/fwe/classes/rootactiontriggercontainer.cxx index c78d398b39a7..cdcc9aea5e1f 100644 --- a/framework/source/fwe/classes/rootactiontriggercontainer.cxx +++ b/framework/source/fwe/classes/rootactiontriggercontainer.cxx @@ -32,7 +32,7 @@ #include <classes/actiontriggercontainer.hxx> #include <classes/actiontriggerpropertyset.hxx> #include <classes/actiontriggerseparatorpropertyset.hxx> -#include <helper/actiontriggerhelper.hxx> +#include <framework/actiontriggerhelper.hxx> #include <threadhelp/resetableguard.hxx> #include <osl/mutex.hxx> #include <vcl/svapp.hxx> diff --git a/framework/source/fwe/classes/sfxhelperfunctions.cxx b/framework/source/fwe/classes/sfxhelperfunctions.cxx index 9ea0ced2c955..a6171f4219b6 100644 --- a/framework/source/fwe/classes/sfxhelperfunctions.cxx +++ b/framework/source/fwe/classes/sfxhelperfunctions.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <classes/sfxhelperfunctions.hxx> +#include <framework/sfxhelperfunctions.hxx> static pfunc_setToolBoxControllerCreator pToolBoxControllerCreator = NULL; static pfunc_setStatusBarControllerCreator pStatusBarControllerCreator = NULL; diff --git a/framework/source/fwe/dispatch/interaction.cxx b/framework/source/fwe/dispatch/interaction.cxx index bb17b23eb2a1..528bf855ab58 100644 --- a/framework/source/fwe/dispatch/interaction.cxx +++ b/framework/source/fwe/dispatch/interaction.cxx @@ -31,7 +31,7 @@ //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#include <dispatch/interaction.hxx> +#include <framework/interaction.hxx> #include <general.h> //_________________________________________________________________________________________________________________ diff --git a/framework/source/fwe/helper/acceleratorinfo.cxx b/framework/source/fwe/helper/acceleratorinfo.cxx index 3db17cf1db89..5774bc35a253 100644 --- a/framework/source/fwe/helper/acceleratorinfo.cxx +++ b/framework/source/fwe/helper/acceleratorinfo.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <helper/acceleratorinfo.hxx> +#include <framework/acceleratorinfo.hxx> namespace framework { diff --git a/framework/source/fwe/helper/actiontriggerhelper.cxx b/framework/source/fwe/helper/actiontriggerhelper.cxx index b1c4e50dfe00..7de57599dd4b 100644 --- a/framework/source/fwe/helper/actiontriggerhelper.cxx +++ b/framework/source/fwe/helper/actiontriggerhelper.cxx @@ -27,11 +27,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <helper/actiontriggerhelper.hxx> +#include <framework/actiontriggerhelper.hxx> #include <classes/actiontriggerseparatorpropertyset.hxx> #include <classes/rootactiontriggercontainer.hxx> #include <classes/imagewrapper.hxx> -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/awt/XBitmap.hpp> diff --git a/framework/source/fwe/helper/configimporter.cxx b/framework/source/fwe/helper/configimporter.cxx index 6f2c402da1e8..0b7571416c9d 100644 --- a/framework/source/fwe/helper/configimporter.cxx +++ b/framework/source/fwe/helper/configimporter.cxx @@ -28,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <helper/configimporter.hxx> -#include <xml/toolboxconfiguration.hxx> +#include <framework/configimporter.hxx> +#include <framework/toolboxconfiguration.hxx> #include <com/sun/star/embed/ElementModes.hpp> #include <rtl/ustrbuf.hxx> diff --git a/framework/source/fwe/helper/imageproducer.cxx b/framework/source/fwe/helper/imageproducer.cxx index 7870697f42a1..97ad3063fb3c 100644 --- a/framework/source/fwe/helper/imageproducer.cxx +++ b/framework/source/fwe/helper/imageproducer.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <helper/imageproducer.hxx> +#include <framework/imageproducer.hxx> namespace framework { diff --git a/framework/source/fwe/helper/titlehelper.cxx b/framework/source/fwe/helper/titlehelper.cxx index 1ca884c27ca7..d9191da2be2e 100644 --- a/framework/source/fwe/helper/titlehelper.cxx +++ b/framework/source/fwe/helper/titlehelper.cxx @@ -31,7 +31,7 @@ //_______________________________________________ // includes -#include <helper/titlehelper.hxx> +#include <framework/titlehelper.hxx> #include <services.h> #include <properties.h> diff --git a/framework/source/fwe/interaction/preventduplicateinteraction.cxx b/framework/source/fwe/interaction/preventduplicateinteraction.cxx index 6d0185a48080..7bc2201a3a27 100644 --- a/framework/source/fwe/interaction/preventduplicateinteraction.cxx +++ b/framework/source/fwe/interaction/preventduplicateinteraction.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include "interaction/preventduplicateinteraction.hxx" +#include "framework/preventduplicateinteraction.hxx" //_________________________________________________________________________________________________________________ // my own includes diff --git a/framework/source/fwe/xml/eventsconfiguration.cxx b/framework/source/fwe/xml/eventsconfiguration.cxx index 75a024eb8405..873682f60345 100644 --- a/framework/source/fwe/xml/eventsconfiguration.cxx +++ b/framework/source/fwe/xml/eventsconfiguration.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <xml/eventsconfiguration.hxx> +#include <framework/eventsconfiguration.hxx> #include <xml/eventsdocumenthandler.hxx> #include <services.h> diff --git a/framework/source/fwe/xml/eventsdocumenthandler.cxx b/framework/source/fwe/xml/eventsdocumenthandler.cxx index 30d584ca71ad..ad21937fcc5d 100644 --- a/framework/source/fwe/xml/eventsdocumenthandler.cxx +++ b/framework/source/fwe/xml/eventsdocumenthandler.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <fwedllapi.h> +#include <framework/fwedllapi.h> #include <stdio.h> //_________________________________________________________________________________________________________________ diff --git a/framework/source/fwe/xml/imagesconfiguration.cxx b/framework/source/fwe/xml/imagesconfiguration.cxx index 75517d2766dd..d561a76d5995 100644 --- a/framework/source/fwe/xml/imagesconfiguration.cxx +++ b/framework/source/fwe/xml/imagesconfiguration.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <xml/imagesconfiguration.hxx> +#include <framework/imagesconfiguration.hxx> #include <services.h> #ifndef __FRAMEWORK_CLASSES_IMAGESDOCUMENTHANDLER_HXX_ diff --git a/framework/source/fwe/xml/menuconfiguration.cxx b/framework/source/fwe/xml/menuconfiguration.cxx index 010c96349d8c..4493d5f80ec9 100644 --- a/framework/source/fwe/xml/menuconfiguration.cxx +++ b/framework/source/fwe/xml/menuconfiguration.cxx @@ -31,12 +31,12 @@ //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#include <xml/menuconfiguration.hxx> +#include <framework/menuconfiguration.hxx> #ifndef __FRAMEWORK_CLASSES_BMKMENU_HXX_ -#include <classes/bmkmenu.hxx> +#include <framework/bmkmenu.hxx> #endif -#include <classes/addonmenu.hxx> +#include <framework/addonmenu.hxx> #include <xml/menudocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> #include <services.h> diff --git a/framework/source/fwe/xml/menudocumenthandler.cxx b/framework/source/fwe/xml/menudocumenthandler.cxx index 90f5fb25dec3..b3decdde9859 100644 --- a/framework/source/fwe/xml/menudocumenthandler.cxx +++ b/framework/source/fwe/xml/menudocumenthandler.cxx @@ -34,8 +34,8 @@ // my own includes //_________________________________________________________________________________________________________________ #include <xml/menudocumenthandler.hxx> -#include <xml/menuconfiguration.hxx> -#include <classes/addonmenu.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/addonmenu.hxx> //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/fwe/xml/statusbarconfiguration.cxx b/framework/source/fwe/xml/statusbarconfiguration.cxx index 2b9d3e5baa58..0d79ef8fd461 100644 --- a/framework/source/fwe/xml/statusbarconfiguration.cxx +++ b/framework/source/fwe/xml/statusbarconfiguration.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <xml/statusbarconfiguration.hxx> +#include <framework/statusbarconfiguration.hxx> #include <xml/statusbardocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> #include <services.h> diff --git a/framework/source/fwe/xml/toolboxconfiguration.cxx b/framework/source/fwe/xml/toolboxconfiguration.cxx index 9cd1f25c3df5..00ef4111ad55 100644 --- a/framework/source/fwe/xml/toolboxconfiguration.cxx +++ b/framework/source/fwe/xml/toolboxconfiguration.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include <xml/toolboxconfiguration.hxx> +#include <framework/toolboxconfiguration.hxx> #include <xml/toolboxdocumenthandler.hxx> #include <xml/toolboxlayoutdocumenthandler.hxx> #include <xml/saxnamespacefilter.hxx> diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 458368bd6581..d4db2d70e771 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -40,9 +40,9 @@ #include <threadhelp/resetableguard.hxx> #include <services.h> -#include <classes/sfxhelperfunctions.hxx> +#include <framework/sfxhelperfunctions.hxx> #include <uielement/menubarwrapper.hxx> -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> #include <classes/fwkresid.hxx> diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index b9f1d2c8a09a..365ac2efacbc 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -39,7 +39,7 @@ #ifndef __FRAMEWORK_CONSTANT_FILTER_HXX_ #include <constant/filter.hxx> #endif -#include <dispatch/interaction.hxx> +#include <framework/interaction.hxx> #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ #include <constant/frameloader.hxx> @@ -59,7 +59,7 @@ #include <properties.h> #include <protocols.h> #include <services.h> -#include <dispatch/interaction.hxx> +#include <framework/interaction.hxx> //_______________________________________________ // includes of uno interface diff --git a/framework/source/services/backingcomp.cxx b/framework/source/services/backingcomp.cxx index 13c5647341e6..627f26e0549c 100644 --- a/framework/source/services/backingcomp.cxx +++ b/framework/source/services/backingcomp.cxx @@ -37,7 +37,7 @@ #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> #include <classes/droptargetlistener.hxx> -#include <helper/acceleratorinfo.hxx> +#include <framework/acceleratorinfo.hxx> #include <targets.h> #include <properties.h> #include <services.h> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 18d5a1c31bef..dbdc3875df9b 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -42,7 +42,7 @@ #include <loadenv/loadenv.hxx> #include <helper/oframes.hxx> #include <helper/statusindicatorfactory.hxx> -#include <helper/titlehelper.hxx> +#include <framework/titlehelper.hxx> #include <classes/droptargetlistener.hxx> #include <classes/taskcreator.hxx> #include <loadenv/targethelper.hxx> diff --git a/framework/source/services/menudocumenthandler.cxx b/framework/source/services/menudocumenthandler.cxx index 8741fff39320..addf79a965a5 100644 --- a/framework/source/services/menudocumenthandler.cxx +++ b/framework/source/services/menudocumenthandler.cxx @@ -31,7 +31,7 @@ #include <stdio.h> #include <services/menudocumenthandler.hxx> #include <classes/menuconfiguration.hxx> -#include <classes/addonmenu.hxx> +#include <framework/addonmenu.hxx> #ifndef __FRAMEWORK_SERVICES_ATTRIBUTELIST_HXX_ #include <services/attributelist.hxx> diff --git a/framework/source/uiconfiguration/imagemanager.cxx b/framework/source/uiconfiguration/imagemanager.cxx index fc18c2ac95ce..2a57e72e1ce4 100644 --- a/framework/source/uiconfiguration/imagemanager.cxx +++ b/framework/source/uiconfiguration/imagemanager.cxx @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" #include <uiconfiguration/imagemanager.hxx> #include <threadhelp/resetableguard.hxx> -#include <xml/imagesconfiguration.hxx> +#include <framework/imagesconfiguration.hxx> #include <uiconfiguration/graphicnameaccess.hxx> #include <services.h> #include "imagemanagerimpl.hxx" diff --git a/framework/source/uiconfiguration/imagemanagerimpl.cxx b/framework/source/uiconfiguration/imagemanagerimpl.cxx index 24e19977c680..a5304a9d64df 100755 --- a/framework/source/uiconfiguration/imagemanagerimpl.cxx +++ b/framework/source/uiconfiguration/imagemanagerimpl.cxx @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" #include <imagemanagerimpl.hxx> #include <threadhelp/resetableguard.hxx> -#include <xml/imagesconfiguration.hxx> +#include <framework/imagesconfiguration.hxx> #include <uiconfiguration/graphicnameaccess.hxx> #include <services.h> diff --git a/framework/source/uiconfiguration/moduleimagemanager.cxx b/framework/source/uiconfiguration/moduleimagemanager.cxx index d76fdcf4c67f..fc90dd102912 100644 --- a/framework/source/uiconfiguration/moduleimagemanager.cxx +++ b/framework/source/uiconfiguration/moduleimagemanager.cxx @@ -30,7 +30,7 @@ #include <rtl/logfile.hxx> #include <uiconfiguration/moduleimagemanager.hxx> #include <threadhelp/resetableguard.hxx> -#include <xml/imagesconfiguration.hxx> +#include <framework/imagesconfiguration.hxx> #include <uiconfiguration/graphicnameaccess.hxx> #include <services.h> #include "imagemanagerimpl.hxx" diff --git a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx index 8840aee6a634..d262c344d711 100644 --- a/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/moduleuiconfigurationmanager.cxx @@ -33,11 +33,11 @@ #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/uielementtypenames.hxx> -#include <xml/menuconfiguration.hxx> -#include <xml/toolboxconfiguration.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/toolboxconfiguration.hxx> #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ -#include <xml/statusbarconfiguration.hxx> +#include <framework/statusbarconfiguration.hxx> #endif //_________________________________________________________________________________________________________________ diff --git a/framework/source/uiconfiguration/uiconfigurationmanager.cxx b/framework/source/uiconfiguration/uiconfigurationmanager.cxx index 4adebdd36c47..df2495dd6bb1 100644 --- a/framework/source/uiconfiguration/uiconfigurationmanager.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanager.cxx @@ -33,11 +33,11 @@ #include <uielement/rootitemcontainer.hxx> #include <uielement/constitemcontainer.hxx> #include <uielement/uielementtypenames.hxx> -#include <xml/menuconfiguration.hxx> -#include <xml/toolboxconfiguration.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/toolboxconfiguration.hxx> #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ -#include <xml/statusbarconfiguration.hxx> +#include <framework/statusbarconfiguration.hxx> #endif //_________________________________________________________________________________________________________________ diff --git a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx index 5b875d82f25a..eee01dad72c7 100755 --- a/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx +++ b/framework/source/uiconfiguration/uiconfigurationmanagerimpl.cxx @@ -33,12 +33,12 @@ #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/uielementtypenames.hxx> -#include <xml/menuconfiguration.hxx> -#include <xml/toolboxconfiguration.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/toolboxconfiguration.hxx> #include <uiconfiguration/imagemanager.hxx> #ifndef __FRAMEWORK_XML_STATUSBARCONFIGURATION_HXX_ -#include <xml/statusbarconfiguration.hxx> +#include <framework/statusbarconfiguration.hxx> #endif //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/addonstoolbarmanager.cxx b/framework/source/uielement/addonstoolbarmanager.cxx index 0c4c610bd4b0..c4ba41372cd5 100644 --- a/framework/source/uielement/addonstoolbarmanager.cxx +++ b/framework/source/uielement/addonstoolbarmanager.cxx @@ -43,13 +43,13 @@ #endif #include <threadhelp/resetableguard.hxx> #include "services.h" -#include <helper/imageproducer.hxx> -#include <classes/sfxhelperfunctions.hxx> +#include <framework/imageproducer.hxx> +#include <framework/sfxhelperfunctions.hxx> #include <classes/fwkresid.hxx> #ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_ #include <classes/resource.hrc> #endif -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> #ifndef __FRAMEWORK_UIELEMENT_COMBOBOXTOOLBARCONTROLLER_HXX #include <uielement/comboboxtoolbarcontroller.hxx> #endif diff --git a/framework/source/uielement/addonstoolbarwrapper.cxx b/framework/source/uielement/addonstoolbarwrapper.cxx index 315d1b6e0bf8..52478f278544 100644 --- a/framework/source/uielement/addonstoolbarwrapper.cxx +++ b/framework/source/uielement/addonstoolbarwrapper.cxx @@ -35,7 +35,7 @@ #include <uielement/addonstoolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> -#include <helper/actiontriggerhelper.hxx> +#include <framework/actiontriggerhelper.hxx> #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/addonstoolbarmanager.hxx> diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 3f37050e6780..6b3b06071e90 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -65,7 +65,7 @@ #include <classes/fwkresid.hxx> #include <dispatch/uieventloghelper.hxx> -#include <xml/menuconfiguration.hxx> +#include <framework/menuconfiguration.hxx> #include <uielement/menubarmanager.hxx> using namespace ::com::sun::star::awt; diff --git a/framework/source/uielement/imagebuttontoolbarcontroller.cxx b/framework/source/uielement/imagebuttontoolbarcontroller.cxx index d9af2fb4f9f9..887002335ff8 100644 --- a/framework/source/uielement/imagebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/imagebuttontoolbarcontroller.cxx @@ -35,7 +35,7 @@ //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> #ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" #endif diff --git a/framework/source/uielement/macrosmenucontroller.cxx b/framework/source/uielement/macrosmenucontroller.cxx index f0f5d52a47d6..7424b871a05f 100644 --- a/framework/source/uielement/macrosmenucontroller.cxx +++ b/framework/source/uielement/macrosmenucontroller.cxx @@ -34,7 +34,7 @@ #include "services.h" #include <classes/resource.hrc> #include <classes/fwkresid.hxx> -#include <helper/imageproducer.hxx> +#include <framework/imageproducer.hxx> #include <com/sun/star/awt/MenuItemStyle.hpp> #include <com/sun/star/beans/PropertyValue.hpp> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 9fbdf87336cc..40473d0775a1 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -33,17 +33,17 @@ // my own includes //_________________________________________________________________________________________________________________ #include <uielement/menubarmanager.hxx> -#include <xml/menuconfiguration.hxx> -#include <classes/bmkmenu.hxx> -#include <classes/addonmenu.hxx> -#include <helper/imageproducer.hxx> +#include <framework/menuconfiguration.hxx> +#include <framework/bmkmenu.hxx> +#include <framework/addonmenu.hxx> +#include <framework/imageproducer.hxx> #include <threadhelp/resetableguard.hxx> -#include "classes/addonsoptions.hxx" +#include "framework/addonsoptions.hxx" #include <classes/fwkresid.hxx> #include <classes/menumanager.hxx> -#include <helper/acceleratorinfo.hxx> +#include <framework/acceleratorinfo.hxx> #include <helper/mischelper.hxx> -#include <classes/menuextensionsupplier.hxx> +#include <framework/menuextensionsupplier.hxx> #include <classes/resource.hrc> #include <services.h> @@ -97,7 +97,7 @@ #include <svtools/acceleratorexecute.hxx> #include <rtl/logfile.hxx> #include "svtools/miscopt.hxx" -#include <classes/addonmenu.hxx> +#include <framework/addonmenu.hxx> #include <uielement/menubarmerger.hxx> #include <dispatch/uieventloghelper.hxx> diff --git a/framework/source/uielement/menubarmerger.cxx b/framework/source/uielement/menubarmerger.cxx index f82253345778..d1d3b9b427e0 100644 --- a/framework/source/uielement/menubarmerger.cxx +++ b/framework/source/uielement/menubarmerger.cxx @@ -29,7 +29,7 @@ #include "precompiled_framework.hxx" #include <uielement/menubarmerger.hxx> -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> using namespace ::com::sun::star; diff --git a/framework/source/uielement/menubarwrapper.cxx b/framework/source/uielement/menubarwrapper.cxx index da3092c2c725..887a1c388752 100644 --- a/framework/source/uielement/menubarwrapper.cxx +++ b/framework/source/uielement/menubarwrapper.cxx @@ -33,7 +33,7 @@ //_________________________________________________________________________________________________________________ #include <uielement/menubarwrapper.hxx> #include <threadhelp/resetableguard.hxx> -#include <helper/actiontriggerhelper.hxx> +#include <framework/actiontriggerhelper.hxx> #include <services.h> //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 3ac78726d799..3007816ad888 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -38,9 +38,9 @@ #include <classes/resource.hrc> #endif #include <classes/fwkresid.hxx> -#include <classes/bmkmenu.hxx> -#include <helper/imageproducer.hxx> -#include <xml/menuconfiguration.hxx> +#include <framework/bmkmenu.hxx> +#include <framework/imageproducer.hxx> +#include <framework/menuconfiguration.hxx> //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index cb9cbb2896f7..b6c4251ffaf9 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -35,7 +35,7 @@ //_________________________________________________________________________________________________________________ #include <threadhelp/threadhelpbase.hxx> #include <threadhelp/resetableguard.hxx> -#include <classes/sfxhelperfunctions.hxx> +#include <framework/sfxhelperfunctions.hxx> #include <macros/generic.hxx> #include <macros/xinterface.hxx> #include <macros/xtypeprovider.hxx> diff --git a/framework/source/uielement/statusbarwrapper.cxx b/framework/source/uielement/statusbarwrapper.cxx index 030a790b35e3..3002a340dfef 100644 --- a/framework/source/uielement/statusbarwrapper.cxx +++ b/framework/source/uielement/statusbarwrapper.cxx @@ -34,7 +34,7 @@ // my own includes //_________________________________________________________________________________________________________________ #include <threadhelp/resetableguard.hxx> -#include <helper/actiontriggerhelper.hxx> +#include <framework/actiontriggerhelper.hxx> #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/statusbar.hxx> diff --git a/framework/source/uielement/togglebuttontoolbarcontroller.cxx b/framework/source/uielement/togglebuttontoolbarcontroller.cxx index a5e4263385fa..5230cf9bbd6e 100644 --- a/framework/source/uielement/togglebuttontoolbarcontroller.cxx +++ b/framework/source/uielement/togglebuttontoolbarcontroller.cxx @@ -35,7 +35,7 @@ //_________________________________________________________________________________________________________________ // my own includes //_________________________________________________________________________________________________________________ -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> #ifndef __FRAMEWORK_TOOLBAR_HXX_ #include "uielement/toolbar.hxx" #endif diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index d89b81c0f9b6..b6ce3a526156 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -44,13 +44,13 @@ #include "services.h" #include "general.h" #include "properties.h" -#include <helper/imageproducer.hxx> -#include <classes/sfxhelperfunctions.hxx> +#include <framework/imageproducer.hxx> +#include <framework/sfxhelperfunctions.hxx> #include <classes/fwkresid.hxx> #ifndef __FRAMEWORK_CLASES_RESOURCE_HRC_ #include <classes/resource.hrc> #endif -#include <classes/addonsoptions.hxx> +#include <framework/addonsoptions.hxx> #include <uielement/toolbarmerger.hxx> //_________________________________________________________________________________________________________________ diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 83f280cb46a7..d1cfdac9090a 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -30,7 +30,7 @@ #include <uielement/toolbarmerger.hxx> #include <uielement/generictoolbarcontroller.hxx> -#include <helper/imageproducer.hxx> +#include <framework/imageproducer.hxx> #include <svtools/miscopt.hxx> diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 02402205bd1c..90c372a9ff62 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -41,8 +41,8 @@ #endif #include <classes/fwkresid.hxx> #include <uiconfiguration/windowstateconfiguration.hxx> -#include <helper/imageproducer.hxx> -#include <classes/sfxhelperfunctions.hxx> +#include <framework/imageproducer.hxx> +#include <framework/sfxhelperfunctions.hxx> //_________________________________________________________________________________________________________________ // interface includes diff --git a/framework/source/uielement/toolbarwrapper.cxx b/framework/source/uielement/toolbarwrapper.cxx index 0e73b5616aa7..9f5593183e09 100644 --- a/framework/source/uielement/toolbarwrapper.cxx +++ b/framework/source/uielement/toolbarwrapper.cxx @@ -34,7 +34,7 @@ #include <uielement/toolbarwrapper.hxx> #include <threadhelp/resetableguard.hxx> -#include <helper/actiontriggerhelper.hxx> +#include <framework/actiontriggerhelper.hxx> #include <uielement/constitemcontainer.hxx> #include <uielement/rootitemcontainer.hxx> #include <uielement/toolbarmanager.hxx> diff --git a/linguistic/inc/hyphdta.hxx b/linguistic/inc/linguistic/hyphdta.hxx index 167c11dcc65d..167c11dcc65d 100644 --- a/linguistic/inc/hyphdta.hxx +++ b/linguistic/inc/linguistic/hyphdta.hxx diff --git a/linguistic/inc/lngprophelp.hxx b/linguistic/inc/linguistic/lngprophelp.hxx index 18d125af560e..18d125af560e 100644 --- a/linguistic/inc/lngprophelp.hxx +++ b/linguistic/inc/linguistic/lngprophelp.hxx diff --git a/linguistic/inc/lngprops.hxx b/linguistic/inc/linguistic/lngprops.hxx index 68f599d50a8c..68f599d50a8c 100644 --- a/linguistic/inc/lngprops.hxx +++ b/linguistic/inc/linguistic/lngprops.hxx diff --git a/linguistic/inc/misc.hxx b/linguistic/inc/linguistic/misc.hxx index f40a0ae55803..f40a0ae55803 100644 --- a/linguistic/inc/misc.hxx +++ b/linguistic/inc/linguistic/misc.hxx diff --git a/linguistic/inc/spelldta.hxx b/linguistic/inc/linguistic/spelldta.hxx index f4d0f5c660ce..f4d0f5c660ce 100644 --- a/linguistic/inc/spelldta.hxx +++ b/linguistic/inc/linguistic/spelldta.hxx diff --git a/linguistic/prj/d.lst b/linguistic/prj/d.lst index 01a755e53cc6..c0641294a333 100644 --- a/linguistic/prj/d.lst +++ b/linguistic/prj/d.lst @@ -7,4 +7,4 @@ ..\xml\*.xml %_DEST%\xml%_EXT%\*.xml mkdir: %_DEST%\inc%_EXT%\linguistic -..\inc\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx +..\inc\linguistic\*.hxx %_DEST%\inc%_EXT%\linguistic\*.hxx diff --git a/linguistic/source/convdic.cxx b/linguistic/source/convdic.cxx index 0b7245eb3019..e7c52b500817 100644 --- a/linguistic/source/convdic.cxx +++ b/linguistic/source/convdic.cxx @@ -66,7 +66,7 @@ #include "convdic.hxx" #include "convdicxml.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" using namespace std; diff --git a/linguistic/source/convdic.hxx b/linguistic/source/convdic.hxx index c0a22da8a1f1..983b06704653 100644 --- a/linguistic/source/convdic.hxx +++ b/linguistic/source/convdic.hxx @@ -38,7 +38,7 @@ #include <hash_map> #include <set> #include <memory> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" // text conversion dictionary extension diff --git a/linguistic/source/convdiclist.cxx b/linguistic/source/convdiclist.cxx index c1280fc799b0..86c8e25b787c 100644 --- a/linguistic/source/convdiclist.cxx +++ b/linguistic/source/convdiclist.cxx @@ -52,7 +52,7 @@ #include "convdiclist.hxx" #include "convdic.hxx" #include "hhconvdic.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" //using namespace utl; diff --git a/linguistic/source/convdiclist.hxx b/linguistic/source/convdiclist.hxx index d1c0740d991f..dec9103d1d51 100644 --- a/linguistic/source/convdiclist.hxx +++ b/linguistic/source/convdiclist.hxx @@ -36,7 +36,7 @@ #include <svl/svarray.hxx> #include <tools/debug.hxx> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "lngopt.hxx" diff --git a/linguistic/source/convdicxml.cxx b/linguistic/source/convdicxml.cxx index f3d56f7024a9..30ced3ca02cb 100644 --- a/linguistic/source/convdicxml.cxx +++ b/linguistic/source/convdicxml.cxx @@ -58,7 +58,7 @@ #include "convdic.hxx" #include "convdicxml.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" using namespace std; diff --git a/linguistic/source/convdicxml.hxx b/linguistic/source/convdicxml.hxx index eca7e9e48ce6..d005d51a4b28 100644 --- a/linguistic/source/convdicxml.hxx +++ b/linguistic/source/convdicxml.hxx @@ -38,7 +38,7 @@ #include <cppuhelper/interfacecontainer.h> #include <tools/string.hxx> #include <rtl/ustring.hxx> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" diff --git a/linguistic/source/dicimp.hxx b/linguistic/source/dicimp.hxx index eca18c2166d3..5952c6ca0247 100644 --- a/linguistic/source/dicimp.hxx +++ b/linguistic/source/dicimp.hxx @@ -40,7 +40,7 @@ #include <tools/stream.hxx> #include "defs.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" /////////////////////////////////////////////////////////////////////////// diff --git a/linguistic/source/dlistimp.hxx b/linguistic/source/dlistimp.hxx index c93cd6b907c6..0674210d8494 100644 --- a/linguistic/source/dlistimp.hxx +++ b/linguistic/source/dlistimp.hxx @@ -41,7 +41,7 @@ #include <vector> #include <memory> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "lngopt.hxx" class DicEvtListenerHelper; diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx index 6485e6e841b7..7fbeecad0622 100644 --- a/linguistic/source/gciterator.cxx +++ b/linguistic/source/gciterator.cxx @@ -67,7 +67,7 @@ #include <map> #include <vector> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" #include "lngopt.hxx" diff --git a/linguistic/source/grammarchecker.cxx b/linguistic/source/grammarchecker.cxx index 21e1b7a58a3c..5dc23d6f2a0f 100644 --- a/linguistic/source/grammarchecker.cxx +++ b/linguistic/source/grammarchecker.cxx @@ -34,7 +34,7 @@ #include <cppuhelper/implbase4.hxx> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" #include <cppuhelper/factory.hxx> #include <com/sun/star/registry/XRegistryKey.hpp> diff --git a/linguistic/source/hhconvdic.cxx b/linguistic/source/hhconvdic.cxx index 207284230b4c..8f0e1f8736b8 100644 --- a/linguistic/source/hhconvdic.cxx +++ b/linguistic/source/hhconvdic.cxx @@ -48,7 +48,7 @@ #include <com/sun/star/registry/XRegistryKey.hpp> #include "hhconvdic.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" using namespace utl; diff --git a/linguistic/source/hhconvdic.hxx b/linguistic/source/hhconvdic.hxx index 9bdecf0903fc..8d30ea2fd812 100644 --- a/linguistic/source/hhconvdic.hxx +++ b/linguistic/source/hhconvdic.hxx @@ -35,7 +35,7 @@ #include <cppuhelper/interfacecontainer.h> #include <tools/string.hxx> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" #include "convdic.hxx" diff --git a/linguistic/source/hyphdsp.cxx b/linguistic/source/hyphdsp.cxx index 441d3ff449e9..2d234fdc15fa 100644 --- a/linguistic/source/hyphdsp.cxx +++ b/linguistic/source/hyphdsp.cxx @@ -42,8 +42,8 @@ #include <osl/mutex.hxx> #include "hyphdsp.hxx" -#include "hyphdta.hxx" -#include "lngprops.hxx" +#include "linguistic/hyphdta.hxx" +#include "linguistic/lngprops.hxx" #include "lngsvcmgr.hxx" diff --git a/linguistic/source/hyphdsp.hxx b/linguistic/source/hyphdsp.hxx index a722e9046c3c..416715943c9e 100644 --- a/linguistic/source/hyphdsp.hxx +++ b/linguistic/source/hyphdsp.hxx @@ -45,7 +45,7 @@ #include <map> #include "lngopt.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" class LngSvcMgr; diff --git a/linguistic/source/hyphdta.cxx b/linguistic/source/hyphdta.cxx index 66c3ca3f7775..503d646de117 100644 --- a/linguistic/source/hyphdta.cxx +++ b/linguistic/source/hyphdta.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_linguistic.hxx" -#include "hyphdta.hxx" -#include "lngprops.hxx" -#include "misc.hxx" +#include "linguistic/hyphdta.hxx" +#include "linguistic/lngprops.hxx" +#include "linguistic/misc.hxx" #include <osl/mutex.hxx> diff --git a/linguistic/source/iprcache.cxx b/linguistic/source/iprcache.cxx index e4c50686afcf..6556fc71d052 100644 --- a/linguistic/source/iprcache.cxx +++ b/linguistic/source/iprcache.cxx @@ -31,7 +31,7 @@ #include <string.h> #include "iprcache.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include <com/sun/star/linguistic2/DictionaryListEventFlags.hpp> #include <tools/debug.hxx> @@ -57,7 +57,7 @@ #endif #include <unotools/processfactory.hxx> -#include <lngprops.hxx> +#include <linguistic/lngprops.hxx> using namespace utl; using namespace osl; diff --git a/linguistic/source/lngopt.cxx b/linguistic/source/lngopt.cxx index 77a1fcbd57b0..cc4f60e3b16f 100644 --- a/linguistic/source/lngopt.cxx +++ b/linguistic/source/lngopt.cxx @@ -29,8 +29,8 @@ #include "precompiled_linguistic.hxx" #include "lngopt.hxx" -#include "lngprops.hxx" -#include "misc.hxx" +#include "linguistic/lngprops.hxx" +#include "linguistic/misc.hxx" #include <tools/debug.hxx> #include <unotools/lingucfg.hxx> diff --git a/linguistic/source/lngopt.hxx b/linguistic/source/lngopt.hxx index 7e86f31fc437..7f14142a4519 100644 --- a/linguistic/source/lngopt.hxx +++ b/linguistic/source/lngopt.hxx @@ -45,7 +45,7 @@ #include <tools/solar.h> #include <svl/itemprop.hxx> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" #include <vos/refernce.hxx> diff --git a/linguistic/source/lngprophelp.cxx b/linguistic/source/lngprophelp.cxx index 91b1a7ff8ebc..0efcf94a0b13 100644 --- a/linguistic/source/lngprophelp.cxx +++ b/linguistic/source/lngprophelp.cxx @@ -36,10 +36,10 @@ #include <com/sun/star/beans/XPropertySet.hpp> #include <osl/mutex.hxx> -#include <misc.hxx> -#include <lngprops.hxx> +#include <linguistic/misc.hxx> +#include <linguistic/lngprops.hxx> -#include <lngprophelp.hxx> +#include <linguistic/lngprophelp.hxx> //using namespace utl; diff --git a/linguistic/source/lngsvcmgr.cxx b/linguistic/source/lngsvcmgr.cxx index 90e433f50f07..db423e5725ec 100644 --- a/linguistic/source/lngsvcmgr.cxx +++ b/linguistic/source/lngsvcmgr.cxx @@ -47,7 +47,7 @@ #include "lngsvcmgr.hxx" #include "lngopt.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "spelldsp.hxx" #include "hyphdsp.hxx" #include "thesdsp.hxx" diff --git a/linguistic/source/lngsvcmgr.hxx b/linguistic/source/lngsvcmgr.hxx index 953e531960bf..b8e0427ae328 100644 --- a/linguistic/source/lngsvcmgr.hxx +++ b/linguistic/source/lngsvcmgr.hxx @@ -42,7 +42,7 @@ //#include <vcl/timer.hxx> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" class SpellCheckerDispatcher; diff --git a/linguistic/source/misc.cxx b/linguistic/source/misc.cxx index 7fb35b26a908..25c2a7f6b374 100644 --- a/linguistic/source/misc.cxx +++ b/linguistic/source/misc.cxx @@ -53,10 +53,10 @@ #include <rtl/instance.hxx> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "defs.hxx" -#include "lngprops.hxx" -#include "hyphdta.hxx" +#include "linguistic/lngprops.hxx" +#include "linguistic/hyphdta.hxx" #include <i18npool/mslangid.hxx> using namespace utl; diff --git a/linguistic/source/misc2.cxx b/linguistic/source/misc2.cxx index df7bc2f9f636..16874c4ff830 100644 --- a/linguistic/source/misc2.cxx +++ b/linguistic/source/misc2.cxx @@ -44,7 +44,7 @@ #include <com/sun/star/uno/Sequence.hxx> #include <com/sun/star/uno/Reference.h> -#include "misc.hxx" +#include "linguistic/misc.hxx" using namespace com::sun::star; diff --git a/linguistic/source/spelldsp.cxx b/linguistic/source/spelldsp.cxx index 2c9c99296ad7..9f1f969f7237 100644 --- a/linguistic/source/spelldsp.cxx +++ b/linguistic/source/spelldsp.cxx @@ -43,9 +43,9 @@ #include <vector> #include "spelldsp.hxx" -#include "spelldta.hxx" +#include "linguistic/spelldta.hxx" #include "lngsvcmgr.hxx" -#include "lngprops.hxx" +#include "linguistic/lngprops.hxx" using namespace utl; diff --git a/linguistic/source/spelldsp.hxx b/linguistic/source/spelldsp.hxx index 28807ac7a800..7ae83d3dbc6f 100644 --- a/linguistic/source/spelldsp.hxx +++ b/linguistic/source/spelldsp.hxx @@ -29,7 +29,7 @@ #define _LINGUISTIC_SPELLDSP_HXX_ #include "lngopt.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "iprcache.hxx" #include <uno/lbnames.h> // CPPU_CURRENT_LANGUAGE_BINDING_NAME macro, which specify the environment type diff --git a/linguistic/source/spelldta.cxx b/linguistic/source/spelldta.cxx index cb7578f54852..fb4c11c892c6 100644 --- a/linguistic/source/spelldta.cxx +++ b/linguistic/source/spelldta.cxx @@ -37,7 +37,7 @@ #include <vector> -#include "spelldta.hxx" +#include "linguistic/spelldta.hxx" #include "lngsvcmgr.hxx" diff --git a/linguistic/source/thesdsp.cxx b/linguistic/source/thesdsp.cxx index 6bd61ef408dd..91aab5c0997e 100644 --- a/linguistic/source/thesdsp.cxx +++ b/linguistic/source/thesdsp.cxx @@ -38,7 +38,7 @@ #include <osl/mutex.hxx> #include "thesdsp.hxx" -#include "lngprops.hxx" +#include "linguistic/lngprops.hxx" using namespace utl; using namespace osl; diff --git a/linguistic/source/thesdta.cxx b/linguistic/source/thesdta.cxx index 85a57e000f3e..e7aa3bf310f8 100644 --- a/linguistic/source/thesdta.cxx +++ b/linguistic/source/thesdta.cxx @@ -30,7 +30,7 @@ #include <tools/debug.hxx> #include <osl/mutex.hxx> -#include <misc.hxx> +#include <linguistic/misc.hxx> #include "thesdta.hxx" diff --git a/linguistic/workben/sprophelp.cxx b/linguistic/workben/sprophelp.cxx index 0a02bc22bb58..dcfa1d240cde 100644 --- a/linguistic/workben/sprophelp.cxx +++ b/linguistic/workben/sprophelp.cxx @@ -28,10 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_linguistic.hxx" -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "sprophelp.hxx" -#include "lngprops.hxx" +#include "linguistic/lngprops.hxx" #include <tools/debug.hxx> #include <com/sun/star/linguistic2/LinguServiceEvent.hpp> diff --git a/linguistic/workben/sspellimp.cxx b/linguistic/workben/sspellimp.cxx index 81981093e2f8..38123a144655 100644 --- a/linguistic/workben/sspellimp.cxx +++ b/linguistic/workben/sspellimp.cxx @@ -41,8 +41,8 @@ #include <sspellimp.hxx> #endif -#include "lngprops.hxx" -#include "spelldta.hxx" +#include "linguistic/lngprops.hxx" +#include "linguistic/spelldta.hxx" using namespace utl; using namespace osl; diff --git a/linguistic/workben/sspellimp.hxx b/linguistic/workben/sspellimp.hxx index df37c403572f..e6796afc6356 100644 --- a/linguistic/workben/sspellimp.hxx +++ b/linguistic/workben/sspellimp.hxx @@ -42,7 +42,7 @@ #include <com/sun/star/linguistic2/XLinguServiceEventBroadcaster.hpp> #include <tools/table.hxx> -#include "misc.hxx" +#include "linguistic/misc.hxx" #include "sprophelp.hxx" using namespace ::rtl; diff --git a/sfx2/prj/build.lst b/sfx2/prj/build.lst index 7dc2a95cb994..89e618e8fc12 100644 --- a/sfx2/prj/build.lst +++ b/sfx2/prj/build.lst @@ -1,4 +1,23 @@ sf sfx2 : l10n idl basic xmlscript framework shell setup_native sax SYSTRAY_GTK:libegg LIBXML2:libxml2 NULL sf sfx2 usr1 - all sf_mkout NULL -sf sfx2\prj nmake - all sf_prj NULL - +sf sfx2\inc nmake - all sf_inc NULL +sf sfx2\prj get - all sf_prj NULL +sf sfx2\win\res get - all sf_wres NULL +sf sfx2\mac\res get - all sf_mres NULL +sf sfx2\source\inc get - all sf_sinc NULL +sf sfx2\sdi nmake - all sf_sdi NULL +sf sfx2\source\appl nmake - all sf_appl sf_sdi sf_inc NULL +sf sfx2\source\view nmake - all sf_view sf_sdi sf_inc NULL +sf sfx2\source\bastyp nmake - all sf_bast sf_sdi sf_inc NULL +sf sfx2\source\config nmake - all sf_cnfg sf_sdi sf_inc NULL +sf sfx2\source\control nmake - all sf_ctrl sf_sdi sf_inc NULL +sf sfx2\source\dialog nmake - all sf_dlg sf_sdi sf_inc NULL +sf sfx2\source\doc nmake - all sf_doc sf_sdi sf_inc NULL +sf sfx2\source\layout nmake - all sf_layout sf_sdi sf_inc NULL +sf sfx2\source\menu nmake - all sf_menu sf_sdi sf_inc NULL +sf sfx2\source\notify nmake - all sf_noti sf_sdi sf_inc NULL +sf sfx2\source\statbar nmake - all sf_sbar sf_sdi sf_inc NULL +sf sfx2\source\toolbox nmake - all sf_tbox sf_sdi sf_inc NULL +sf sfx2\source\inet nmake - all sf_inet sf_sdi sf_inc NULL +sf sfx2\source\explorer nmake - all sf_expl sf_sdi sf_inc NULL +sf sfx2\util nmake - all sf_util sf_appl sf_bast sf_cnfg sf_ctrl sf_dlg sf_doc sf_expl sf_inet sf_menu sf_layout sf_noti sf_sbar sf_tbox sf_view NULL diff --git a/sfx2/prj/d.lst b/sfx2/prj/d.lst index 8b137891791f..2b956707606a 100644 --- a/sfx2/prj/d.lst +++ b/sfx2/prj/d.lst @@ -1 +1,32 @@ +mkdir: %COMMON_DEST%\bin%_EXT%\hid +mkdir: %COMMON_DEST%\res%_EXT% +mkdir: %_DEST%\inc%_EXT%\sfx2 + +..\%COMMON_OUTDIR%\misc\*.hid %COMMON_DEST%\bin%_EXT%\hid\*.hid +..\%__SRC%\lib\sfx.lib %_DEST%\lib%_EXT%\sfx.lib +..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT% +..\%__SRC%\lib\*.a %_DEST%\lib%_EXT%\*.a +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib +..\%__SRC%\slb\sfx.lib %_DEST%\lib%_EXT%\xsfx.lib +..\%__SRC%\lib\isfx.lib %_DEST%\lib%_EXT%\isfx.lib +..\%__SRC%\lib\debug.lib %_DEST%\lib%_EXT%\sfxdebug.lib +..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym +..\%__SRC%\bin\sfx?????.dll %_DEST%\bin%_EXT%\sfx?????.dll +..\%__SRC%\bin\sfx*.res %_DEST%\bin%_EXT%\sfx*.res +..\%__SRC%\bin\sfx?????.sym %_DEST%\bin%_EXT%\sfx?????.sym +..\%__SRC%\misc\sfx?????.map %_DEST%\bin%_EXT%\sfx?????.map +..\%__SRC%\bin\elc?????.dll %_DEST%\bin%_EXT%\elc?????.dll +..\%__SRC%\srs\sfx.srs %_DEST%\res%_EXT%\sfx.srs +..\%COMMON_OUTDIR%\srs\sfx_srs.hid %COMMON_DEST%\res%_EXT%\sfx_srs.hid +..\%__SRC%\srs\sfxslots.srs %_DEST%\res%_EXT%\sfxslots.srs +..\%COMMON_OUTDIR%\srs\sfxslots_srs.hid %COMMON_DEST%\res%_EXT%\sfxslots_srs.hid +..\util\sfx.xml %_DEST%\xml%_EXT%\sfx.xml +..\%__SRC%\misc\sfx2.csv %_DEST%\inc%_EXT%\sfx2.csv + +..\inc\sfx2\*.h %_DEST%\inc%_EXT%\sfx2\*.h +..\inc\sfx2\*.hxx %_DEST%\inc%_EXT%\sfx2\*.hxx +..\inc\sfx2\*.hrc %_DEST%\inc%_EXT%\sfx2\*.hrc + +..\sdi\sfx.sdi %_DEST%\inc%_EXT%\sfx2\sfx.sdi +..\sdi\sfxitems.sdi %_DEST%\inc%_EXT%\sfx2\sfxitems.sdi diff --git a/svx/inc/galbrws2.hxx b/svx/inc/galbrws2.hxx index 38f6daffee19..d1038641c841 100644 --- a/svx/inc/galbrws2.hxx +++ b/svx/inc/galbrws2.hxx @@ -36,7 +36,7 @@ #include <svtools/transfer.hxx> #include <svl/lstner.hxx> #include <svtools/miscopt.hxx> -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ---------------------- // - GalleryBrowserMode - diff --git a/svx/inc/globlac.hrc b/svx/inc/globlac.hrc deleted file mode 100644 index f72d4c1d31a8..000000000000 --- a/svx/inc/globlac.hrc +++ /dev/null @@ -1,223 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ - -#ifndef _GLOBALACC_SRC -#define _GLOBALACC_SRC - -#define ACC_CODE( Id, c, bSh, bM1, bM2 ) \ - AcceleratorItem { Identifier = Id; \ - Key = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; }; - -#define ACC_FUNC( Id, f ) \ - AcceleratorItem { Identifier = Id; \ - Key = KeyCode { Function = f ; }; }; - -#define ACC_KEY( language, c, bSh, bM1, bM2 ) \ - Key[ language ] = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; - -#define ACC_DEF_KEY( c, bSh, bM1, bM2 ) \ - Key = KeyCode { Code = c ; \ - Shift = bSh ; Modifier1 = bM1 ; Modifier2 = bM2 ; }; - - -#define AI_HELPINDEX ACC_CODE( SID_HELPINDEX, KEY_F1, FALSE, TRUE, FALSE ) - -#define AI_ATTR_CHAR ACC_CODE( SID_ATTR_CHAR, KEY_F2, FALSE, FALSE, FALSE ) -// new shortcut F9 for starting slide-show (see #73417#) -#define AI_PRESENTATION ACC_CODE( SID_PRESENTATION, KEY_F9, FALSE, FALSE, FALSE ) -// formerly used shortcut Ctrl-F2. Still used (in sd) for compatibility -#define AI_PRESENTATION_COMPAT ACC_CODE( SID_PRESENTATION, KEY_F2, FALSE, TRUE, FALSE ) -#define AI_ENTER_GROUP ACC_CODE( SID_ENTER_GROUP, KEY_F3, FALSE, FALSE, FALSE ) -#define AI_COPYOBJECTS ACC_CODE( SID_COPYOBJECTS, KEY_F3, TRUE, FALSE, FALSE ) -#define AI_LEAVE_GROUP ACC_CODE( SID_LEAVE_GROUP, KEY_F3, FALSE, TRUE, FALSE ) -#define AI_ATTR_TRANSFORM ACC_CODE( SID_ATTR_TRANSFORM, KEY_F4, FALSE, FALSE, FALSE ) -#define AI_NAVIGATOR ACC_CODE( SID_NAVIGATOR, KEY_F5, FALSE, FALSE, FALSE ) -#define AI_SPELLING ACC_CODE( SID_SPELL_DIALOG, KEY_F7, FALSE, FALSE, FALSE ) -#define AI_THESAURUS ACC_CODE( SID_THESAURUS, KEY_F7, FALSE, TRUE, FALSE ) -#define AI_BEZIER_EDIT ACC_CODE( SID_BEZIER_EDIT, KEY_F8, FALSE, FALSE, FALSE ) -#define AI_ATTR_TEXT_FITTOSIZE ACC_CODE( SID_ATTR_TEXT_FITTOSIZE, KEY_F8, TRUE, TRUE, FALSE ) -#define AI_STYLE_DESIGNER ACC_CODE( SID_STYLE_DESIGNER, KEY_F11, FALSE, FALSE, FALSE ) -#define AI_OUTLINEMODE ACC_CODE( SID_OUTLINEMODE, KEY_F12, FALSE, FALSE, FALSE ) -#define AI_DRAWINGMODE ACC_CODE( SID_DRAWINGMODE, KEY_F12, FALSE, TRUE, FALSE ) - -#define AI_ATTR_PARA_LINESPACE_10 ACC_CODE( SID_ATTR_PARA_LINESPACE_10, KEY_1, FALSE, TRUE, FALSE ) -#define AI_ATTR_PARA_LINESPACE_20 ACC_CODE( SID_ATTR_PARA_LINESPACE_20, KEY_2, FALSE, TRUE, FALSE ) -#define AI_ATTR_PARA_LINESPACE_15 ACC_CODE( SID_ATTR_PARA_LINESPACE_15, KEY_5, FALSE, TRUE, FALSE ) -#define AI_SHOW_ITEMBROWSER ACC_CODE( SID_SHOW_ITEMBROWSER, KEY_9, TRUE, TRUE, TRUE ) - -#define AI_ATTR_PARA_ADJUST_BLOCK AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_BLOCK;\ - ACC_DEF_KEY( KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_J, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_J, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_PARA_ADJUST_CENTER AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_CENTER;\ - ACC_DEF_KEY( KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_E, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_C, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_J, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_WEIGHT AcceleratorItem { Identifier = SID_ATTR_CHAR_WEIGHT;\ - ACC_DEF_KEY( KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_N, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( da , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru, KEY_B, FALSE, TRUE, FALSE ) }; - -#define AI_SEARCH_DLG AcceleratorItem { Identifier = SID_SEARCH_DLG;\ - ACC_DEF_KEY( KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_B, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_G, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_F, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_F, FALSE, TRUE, FALSE ) }; - -#define AI_GROUP ACC_CODE( SID_GROUP, KEY_G, TRUE, TRUE, FALSE ) -#define AI_UNGROUP ACC_CODE( SID_UNGROUP, KEY_G, TRUE, TRUE, TRUE ) - -// Weitersuchen ... -#define AI_SET_SUPER_SCRIPT AcceleratorItem { Identifier = SID_SET_SUPER_SCRIPT;\ - ACC_DEF_KEY( KEY_P, TRUE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_P, TRUE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_H, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_H, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_POSTURE AcceleratorItem { Identifier = SID_ATTR_CHAR_POSTURE;\ - ACC_DEF_KEY( KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( da , KEY_K, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_I, FALSE, TRUE, FALSE ) }; - -#define AI_COMBINE ACC_CODE( SID_COMBINE, KEY_K, TRUE, TRUE, FALSE ) -#define AI_DISMANTLE ACC_CODE( SID_DISMANTLE, KEY_K, TRUE, TRUE, TRUE ) -#define AI_ATTR_PARA_ADJUST_LEFT AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_LEFT;\ - ACC_DEF_KEY( KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_L, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_I, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_G, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_L, FALSE, TRUE, FALSE ) }; - -#define AI_ATTR_PARA_ADJUST_RIGHT AcceleratorItem { Identifier = SID_ATTR_PARA_ADJUST_RIGHT;\ - ACC_DEF_KEY( KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_R, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_D, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_D, TRUE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_R, FALSE, TRUE, FALSE ) }; - -#define AI_SET_SUB_SCRIPT AcceleratorItem { Identifier = SID_SET_SUB_SCRIPT;\ - ACC_DEF_KEY( KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_B, TRUE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_T, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_P, TRUE, TRUE, FALSE ) }; - -#define AI_ATTR_CHAR_UNDERLINE AcceleratorItem { Identifier = SID_ATTR_CHAR_UNDERLINE;\ - ACC_DEF_KEY( KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( de , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( en-US , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( it , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( es , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( fr , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( nl , KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( da, KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( pl, KEY_U, FALSE, TRUE, FALSE ) \ - ACC_KEY( ru , KEY_U, FALSE, TRUE, FALSE ) }; - -#define AI_STYLE_CATALOG ACC_CODE( SID_STYLE_CATALOG, KEY_F11, FALSE, TRUE, FALSE ) -#define AI_WIN_FULLSCREEN ACC_CODE( SID_WIN_FULLSCREEN, KEY_J, TRUE, TRUE, FALSE ) - -#define AI_FOCUSURLBOX ACC_CODE( SID_FOCUSURLBOX, KEY_O, TRUE, TRUE, FALSE ) -#define AI_SELECTALL ACC_CODE( SID_SELECTALL, KEY_A, FALSE, TRUE, FALSE ) - -// Anordnung -#define AI_FRAME_TO_TOP ACC_CODE( SID_FRAME_TO_TOP, KEY_ADD, TRUE, TRUE, FALSE ) -#define AI_MOREFRONT ACC_CODE( SID_MOREFRONT, KEY_ADD, FALSE, TRUE, FALSE ) -#define AI_FRAME_TO_BOTTOM ACC_CODE( SID_FRAME_TO_BOTTOM, KEY_SUBTRACT, TRUE, TRUE, FALSE ) -#define AI_MOREBACK ACC_CODE( SID_MOREBACK, KEY_SUBTRACT, FALSE, TRUE, FALSE ) - -// sonstige Acceleratoren -#define AI_NEWDOC ACC_CODE( SID_NEWDOC, KEY_N, TRUE, TRUE, FALSE ) -#define AI_NEWDOCDIRECT ACC_CODE( SID_NEWDOCDIRECT, KEY_N, FALSE, TRUE, FALSE ) -#define AI_OPENDOC ACC_CODE( SID_OPENDOC, KEY_O, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_OPENDOC, KEY_OPEN, FALSE, FALSE, FALSE ) -#define AI_CLOSEWIN ACC_CODE( SID_CLOSEWIN, KEY_W, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_CLOSEWIN, KEY_F4, FALSE, TRUE, FALSE ) -#define AI_SAVEDOC ACC_CODE( SID_SAVEDOC, KEY_S, FALSE, TRUE, FALSE ) -#define AI_PRINTDOC ACC_CODE( SID_PRINTDOC, KEY_P, FALSE, TRUE, FALSE ) -#define AI_QUITAPP ACC_CODE( SID_QUITAPP, KEY_Q, FALSE, TRUE, FALSE ) -#define AI_CUT ACC_CODE( SID_CUT, KEY_X, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_CUT, KEY_DELETE, TRUE, FALSE, FALSE ) \ - ACC_CODE( SID_CUT, KEY_CUT, FALSE, FALSE, FALSE ) -#define AI_COPY ACC_CODE( SID_COPY, KEY_C, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_COPY, KEY_INSERT, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_COPY, KEY_COPY, FALSE, FALSE, FALSE ) -#define AI_PASTE ACC_CODE( SID_PASTE, KEY_V, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_PASTE, KEY_INSERT, TRUE, FALSE, FALSE ) \ - ACC_CODE( SID_PASTE, KEY_PASTE, FALSE, FALSE, FALSE ) -#define AI_UNDO ACC_CODE( SID_UNDO, KEY_Z, FALSE, TRUE, FALSE ) \ - ACC_CODE( SID_UNDO, KEY_BACKSPACE, FALSE, FALSE, TRUE ) \ - ACC_CODE( SID_UNDO, KEY_UNDO, FALSE, FALSE, FALSE ) -#define AI_REDO ACC_CODE( SID_REDO, KEY_Y, FALSE, TRUE, FALSE ) -#define AI_REPEAT ACC_CODE( SID_REPEAT, KEY_REPEAT, FALSE, FALSE, FALSE ) -#define AI_DELETE ACC_CODE( SID_DELETE, KEY_DELETE, FALSE, FALSE, FALSE ) - -#endif // _GLOBLACC_SRC - - - - diff --git a/svx/inc/srchitem.hxx b/svx/inc/srchitem.hxx deleted file mode 100644 index fceb5f009953..000000000000 --- a/svx/inc/srchitem.hxx +++ /dev/null @@ -1,34 +0,0 @@ -/************************************************************************* - * - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * Copyright 2000, 2010 Oracle and/or its affiliates. - * - * OpenOffice.org - a multi-platform office productivity suite - * - * This file is part of OpenOffice.org. - * - * OpenOffice.org is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License version 3 - * only, as published by the Free Software Foundation. - * - * OpenOffice.org is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU Lesser General Public License version 3 for more details - * (a copy is included in the LICENSE file that accompanied this code). - * - * You should have received a copy of the GNU Lesser General Public License - * version 3 along with OpenOffice.org. If not, see - * <http://www.openoffice.org/license.html> - * for a copy of the LGPLv3 License. - * - ************************************************************************/ -#ifndef _SVX_SRCHITEM_HXX -#define _SVX_SRCHITEM_HXX - -#include <svl/srchitem.hxx> - -#endif - - diff --git a/svx/inc/ActionDescriptionProvider.hxx b/svx/inc/svx/ActionDescriptionProvider.hxx index 5b6e0ab9ab35..5b6e0ab9ab35 100644 --- a/svx/inc/ActionDescriptionProvider.hxx +++ b/svx/inc/svx/ActionDescriptionProvider.hxx diff --git a/svx/inc/DescriptionGenerator.hxx b/svx/inc/svx/DescriptionGenerator.hxx index 501b350eef05..501b350eef05 100644 --- a/svx/inc/DescriptionGenerator.hxx +++ b/svx/inc/svx/DescriptionGenerator.hxx diff --git a/svx/source/customshapes/EnhancedCustomShape2d.hxx b/svx/inc/svx/EnhancedCustomShape2d.hxx index 00df4b04f389..00df4b04f389 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.hxx +++ b/svx/inc/svx/EnhancedCustomShape2d.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx index 2ee9824ce547..2ee9824ce547 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.hxx +++ b/svx/inc/svx/EnhancedCustomShapeGeometry.hxx diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx index 054af2e3af41..054af2e3af41 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.hxx +++ b/svx/inc/svx/EnhancedCustomShapeTypeNames.hxx diff --git a/svx/inc/ParseContext.hxx b/svx/inc/svx/ParseContext.hxx index 6b0ec247a39e..6b0ec247a39e 100644 --- a/svx/inc/ParseContext.hxx +++ b/svx/inc/svx/ParseContext.hxx diff --git a/svx/inc/UnoNamespaceMap.hxx b/svx/inc/svx/UnoNamespaceMap.hxx index 7e3a1be005b8..7e3a1be005b8 100644 --- a/svx/inc/UnoNamespaceMap.hxx +++ b/svx/inc/svx/UnoNamespaceMap.hxx diff --git a/svx/inc/XPropertyTable.hxx b/svx/inc/svx/XPropertyTable.hxx index 59ca1e1e086a..59ca1e1e086a 100644 --- a/svx/inc/XPropertyTable.hxx +++ b/svx/inc/svx/XPropertyTable.hxx diff --git a/svx/inc/anchorid.hxx b/svx/inc/svx/anchorid.hxx index 976d0dc504c6..976d0dc504c6 100644 --- a/svx/inc/anchorid.hxx +++ b/svx/inc/svx/anchorid.hxx diff --git a/svx/inc/chrtitem.hxx b/svx/inc/svx/chrtitem.hxx index 1cb9c2068f01..1cb9c2068f01 100644 --- a/svx/inc/chrtitem.hxx +++ b/svx/inc/svx/chrtitem.hxx diff --git a/svx/inc/clipboardctl.hxx b/svx/inc/svx/clipboardctl.hxx index 22480ab1e728..22480ab1e728 100644 --- a/svx/inc/clipboardctl.hxx +++ b/svx/inc/svx/clipboardctl.hxx diff --git a/svx/inc/clipfmtitem.hxx b/svx/inc/svx/clipfmtitem.hxx index 74687d56d38b..74687d56d38b 100644 --- a/svx/inc/clipfmtitem.hxx +++ b/svx/inc/svx/clipfmtitem.hxx diff --git a/svx/inc/connctrl.hxx b/svx/inc/svx/connctrl.hxx index 468fffcc43b7..468fffcc43b7 100644 --- a/svx/inc/connctrl.hxx +++ b/svx/inc/svx/connctrl.hxx diff --git a/svx/inc/databaseregistrationui.hxx b/svx/inc/svx/databaseregistrationui.hxx index 123e5af7d5a8..123e5af7d5a8 100644 --- a/svx/inc/databaseregistrationui.hxx +++ b/svx/inc/svx/databaseregistrationui.hxx diff --git a/svx/inc/dbexch.hrc b/svx/inc/svx/dbexch.hrc index faa2274987cd..faa2274987cd 100644 --- a/svx/inc/dbexch.hrc +++ b/svx/inc/svx/dbexch.hrc diff --git a/svx/inc/dialcontrol.hxx b/svx/inc/svx/dialcontrol.hxx index 3b63ac1f4b4d..3b63ac1f4b4d 100644 --- a/svx/inc/dialcontrol.hxx +++ b/svx/inc/svx/dialcontrol.hxx diff --git a/svx/inc/dlgutil.hxx b/svx/inc/svx/dlgutil.hxx index 9f0d5190daed..9f0d5190daed 100644 --- a/svx/inc/dlgutil.hxx +++ b/svx/inc/svx/dlgutil.hxx diff --git a/svx/inc/drawitem.hxx b/svx/inc/svx/drawitem.hxx index 9bfdb5cfd87a..9bfdb5cfd87a 100644 --- a/svx/inc/drawitem.hxx +++ b/svx/inc/svx/drawitem.hxx diff --git a/svx/inc/extrusioncontrols.hxx b/svx/inc/svx/extrusioncontrols.hxx index 4560c7463bc9..4560c7463bc9 100644 --- a/svx/inc/extrusioncontrols.hxx +++ b/svx/inc/svx/extrusioncontrols.hxx diff --git a/svx/inc/flagsdef.hxx b/svx/inc/svx/flagsdef.hxx index 43fd292ddb36..43fd292ddb36 100644 --- a/svx/inc/flagsdef.hxx +++ b/svx/inc/svx/flagsdef.hxx diff --git a/svx/inc/svx/float3d.hxx b/svx/inc/svx/float3d.hxx index 432d78b211ad..4b6fd22b2587 100644 --- a/svx/inc/svx/float3d.hxx +++ b/svx/inc/svx/float3d.hxx @@ -37,7 +37,7 @@ #endif #include <sfx2/dockwin.hxx> #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #include <svtools/valueset.hxx> #include <svtools/stdctrl.hxx> diff --git a/svx/inc/fmgridif.hxx b/svx/inc/svx/fmgridif.hxx index 886db3280d60..886db3280d60 100644 --- a/svx/inc/fmgridif.hxx +++ b/svx/inc/svx/fmgridif.hxx diff --git a/svx/inc/fmobjfac.hxx b/svx/inc/svx/fmobjfac.hxx index 7d10ea2ab7b4..7d10ea2ab7b4 100644 --- a/svx/inc/fmobjfac.hxx +++ b/svx/inc/svx/fmobjfac.hxx diff --git a/svx/source/inc/fmresids.hrc b/svx/inc/svx/fmresids.hrc index f6843801e522..f6843801e522 100644 --- a/svx/source/inc/fmresids.hrc +++ b/svx/inc/svx/fmresids.hrc diff --git a/svx/source/inc/fmsrccfg.hxx b/svx/inc/svx/fmsrccfg.hxx index 3705f32b7494..3705f32b7494 100644 --- a/svx/source/inc/fmsrccfg.hxx +++ b/svx/inc/svx/fmsrccfg.hxx diff --git a/svx/source/inc/fmsrcimp.hxx b/svx/inc/svx/fmsrcimp.hxx index e620c34bdd4a..e620c34bdd4a 100644 --- a/svx/source/inc/fmsrcimp.hxx +++ b/svx/inc/svx/fmsrcimp.hxx diff --git a/svx/inc/fontlb.hxx b/svx/inc/svx/fontlb.hxx index 813b01ba390f..813b01ba390f 100644 --- a/svx/inc/fontlb.hxx +++ b/svx/inc/svx/fontlb.hxx diff --git a/svx/inc/fontworkgallery.hxx b/svx/inc/svx/fontworkgallery.hxx index 9f6b1f9f4b2f..9f6b1f9f4b2f 100644 --- a/svx/inc/fontworkgallery.hxx +++ b/svx/inc/svx/fontworkgallery.hxx diff --git a/svx/inc/formatpaintbrushctrl.hxx b/svx/inc/svx/formatpaintbrushctrl.hxx index b380e051daf8..b380e051daf8 100644 --- a/svx/inc/formatpaintbrushctrl.hxx +++ b/svx/inc/svx/formatpaintbrushctrl.hxx diff --git a/svx/inc/galbrws.hxx b/svx/inc/svx/galbrws.hxx index f54901db543d..f54901db543d 100644 --- a/svx/inc/galbrws.hxx +++ b/svx/inc/svx/galbrws.hxx diff --git a/svx/inc/galctrl.hxx b/svx/inc/svx/galctrl.hxx index 3acf53dbeddb..3acf53dbeddb 100644 --- a/svx/inc/galctrl.hxx +++ b/svx/inc/svx/galctrl.hxx diff --git a/svx/inc/gallery.hxx b/svx/inc/svx/gallery.hxx index 68a5c68539f1..68a5c68539f1 100644 --- a/svx/inc/gallery.hxx +++ b/svx/inc/svx/gallery.hxx diff --git a/svx/inc/galtheme.hxx b/svx/inc/svx/galtheme.hxx index aa77bba25d26..aa77bba25d26 100644 --- a/svx/inc/galtheme.hxx +++ b/svx/inc/svx/galtheme.hxx diff --git a/svx/inc/globl3d.hxx b/svx/inc/svx/globl3d.hxx index 1560f96dc1f5..1560f96dc1f5 100644 --- a/svx/inc/globl3d.hxx +++ b/svx/inc/svx/globl3d.hxx diff --git a/svx/inc/grafctrl.hxx b/svx/inc/svx/grafctrl.hxx index 0c68f73f48f6..0c68f73f48f6 100644 --- a/svx/inc/grafctrl.hxx +++ b/svx/inc/svx/grafctrl.hxx diff --git a/svx/inc/hlnkitem.hxx b/svx/inc/svx/hlnkitem.hxx index b9540e8845ca..b9540e8845ca 100644 --- a/svx/inc/hlnkitem.hxx +++ b/svx/inc/svx/hlnkitem.hxx diff --git a/svx/inc/htmlmode.hxx b/svx/inc/svx/htmlmode.hxx index a1c5bf0cdf11..a1c5bf0cdf11 100644 --- a/svx/inc/htmlmode.hxx +++ b/svx/inc/svx/htmlmode.hxx diff --git a/svx/inc/hyperdlg.hxx b/svx/inc/svx/hyperdlg.hxx index fc129763e63f..fc129763e63f 100644 --- a/svx/inc/hyperdlg.hxx +++ b/svx/inc/svx/hyperdlg.hxx diff --git a/svx/source/dialog/hyprlink.hxx b/svx/inc/svx/hyprlink.hxx index 0a5af0afae82..0a5af0afae82 100644 --- a/svx/source/dialog/hyprlink.hxx +++ b/svx/inc/svx/hyprlink.hxx diff --git a/svx/inc/imapdlg.hxx b/svx/inc/svx/imapdlg.hxx index d1a6961453a5..d1a6961453a5 100644 --- a/svx/inc/imapdlg.hxx +++ b/svx/inc/svx/imapdlg.hxx diff --git a/svx/inc/insctrl.hxx b/svx/inc/svx/insctrl.hxx index e7fa02c70d91..e7fa02c70d91 100644 --- a/svx/inc/insctrl.hxx +++ b/svx/inc/svx/insctrl.hxx diff --git a/svx/inc/layctrl.hxx b/svx/inc/svx/layctrl.hxx index 1bbdc714b7c9..1bbdc714b7c9 100644 --- a/svx/inc/layctrl.hxx +++ b/svx/inc/svx/layctrl.hxx diff --git a/svx/inc/lboxctrl.hxx b/svx/inc/svx/lboxctrl.hxx index 36c82c64f44b..36c82c64f44b 100644 --- a/svx/inc/lboxctrl.hxx +++ b/svx/inc/svx/lboxctrl.hxx diff --git a/svx/inc/linectrl.hxx b/svx/inc/svx/linectrl.hxx index 43c96f128671..43c96f128671 100644 --- a/svx/inc/linectrl.hxx +++ b/svx/inc/svx/linectrl.hxx diff --git a/svx/inc/measctrl.hxx b/svx/inc/svx/measctrl.hxx index d45dc134cf19..d45dc134cf19 100644 --- a/svx/inc/measctrl.hxx +++ b/svx/inc/svx/measctrl.hxx diff --git a/svx/inc/modctrl.hxx b/svx/inc/svx/modctrl.hxx index fd9e085c826e..fd9e085c826e 100644 --- a/svx/inc/modctrl.hxx +++ b/svx/inc/svx/modctrl.hxx diff --git a/svx/inc/numvset.hxx b/svx/inc/svx/numvset.hxx index d174e1d6fba5..d174e1d6fba5 100644 --- a/svx/inc/numvset.hxx +++ b/svx/inc/svx/numvset.hxx diff --git a/svx/inc/objfac3d.hxx b/svx/inc/svx/objfac3d.hxx index 6ce30853f441..6ce30853f441 100644 --- a/svx/inc/objfac3d.hxx +++ b/svx/inc/svx/objfac3d.hxx diff --git a/svx/inc/ofaitem.hxx b/svx/inc/svx/ofaitem.hxx index 50f18ccb9ed9..50f18ccb9ed9 100644 --- a/svx/inc/ofaitem.hxx +++ b/svx/inc/svx/ofaitem.hxx diff --git a/svx/inc/optgenrl.hxx b/svx/inc/svx/optgenrl.hxx index 50520aac0204..50520aac0204 100644 --- a/svx/inc/optgenrl.hxx +++ b/svx/inc/svx/optgenrl.hxx diff --git a/svx/inc/optgrid.hxx b/svx/inc/svx/optgrid.hxx index 6dd2a5f9371d..6dd2a5f9371d 100644 --- a/svx/inc/optgrid.hxx +++ b/svx/inc/svx/optgrid.hxx diff --git a/svx/inc/orienthelper.hxx b/svx/inc/svx/orienthelper.hxx index 7508740b62d6..7508740b62d6 100644 --- a/svx/inc/orienthelper.hxx +++ b/svx/inc/svx/orienthelper.hxx diff --git a/svx/inc/passwd.hxx b/svx/inc/svx/passwd.hxx index 9a6b14f0144a..9a6b14f0144a 100644 --- a/svx/inc/passwd.hxx +++ b/svx/inc/svx/passwd.hxx diff --git a/svx/inc/pfiledlg.hxx b/svx/inc/svx/pfiledlg.hxx index 646575ac4e0c..646575ac4e0c 100644 --- a/svx/inc/pfiledlg.hxx +++ b/svx/inc/svx/pfiledlg.hxx diff --git a/svx/inc/postattr.hxx b/svx/inc/svx/postattr.hxx index 840312cf0c46..840312cf0c46 100644 --- a/svx/inc/postattr.hxx +++ b/svx/inc/svx/postattr.hxx diff --git a/svx/inc/prtqry.hxx b/svx/inc/svx/prtqry.hxx index ce7ae239215f..ce7ae239215f 100644 --- a/svx/inc/prtqry.hxx +++ b/svx/inc/svx/prtqry.hxx diff --git a/svx/inc/pszctrl.hxx b/svx/inc/svx/pszctrl.hxx index 54ec2788521f..54ec2788521f 100644 --- a/svx/inc/pszctrl.hxx +++ b/svx/inc/svx/pszctrl.hxx diff --git a/svx/inc/relfld.hxx b/svx/inc/svx/relfld.hxx index 02d9ca20a5d3..02d9ca20a5d3 100644 --- a/svx/inc/relfld.hxx +++ b/svx/inc/svx/relfld.hxx diff --git a/svx/inc/rotmodit.hxx b/svx/inc/svx/rotmodit.hxx index 8177713e6013..8177713e6013 100644 --- a/svx/inc/rotmodit.hxx +++ b/svx/inc/svx/rotmodit.hxx diff --git a/svx/inc/rubydialog.hxx b/svx/inc/svx/rubydialog.hxx index e8deecfed145..e8deecfed145 100644 --- a/svx/inc/rubydialog.hxx +++ b/svx/inc/svx/rubydialog.hxx diff --git a/svx/inc/rulritem.hxx b/svx/inc/svx/rulritem.hxx index f6b81e1eedb8..f6b81e1eedb8 100644 --- a/svx/inc/rulritem.hxx +++ b/svx/inc/svx/rulritem.hxx diff --git a/svx/inc/sdrpaintwindow.hxx b/svx/inc/svx/sdrpaintwindow.hxx index fef8c2e604d0..fef8c2e604d0 100644 --- a/svx/inc/sdrpaintwindow.hxx +++ b/svx/inc/svx/sdrpaintwindow.hxx diff --git a/svx/inc/selctrl.hxx b/svx/inc/svx/selctrl.hxx index 5d7fac4f4a5e..5d7fac4f4a5e 100644 --- a/svx/inc/selctrl.hxx +++ b/svx/inc/svx/selctrl.hxx diff --git a/svx/inc/svx/splitcelldlg.hxx b/svx/inc/svx/splitcelldlg.hxx index bd1d3e8f60d0..85ba02eb0e41 100644 --- a/svx/inc/svx/splitcelldlg.hxx +++ b/svx/inc/svx/splitcelldlg.hxx @@ -29,7 +29,7 @@ #include <vcl/fixed.hxx> #include <vcl/field.hxx> -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #include <vcl/button.hxx> #include <svx/stddlg.hxx> diff --git a/svx/inc/srchdlg.hxx b/svx/inc/svx/srchdlg.hxx index 29aec84fae24..0253f61a7785 100644 --- a/svx/inc/srchdlg.hxx +++ b/svx/inc/svx/srchdlg.hxx @@ -118,7 +118,7 @@ public: // class SvxSearchDialog ------------------------------------------------- /* - {k:\svx\prototyp\dialog\srchdlg.hxx} + {k:\svx\prototyp\dialog\svx/srchdlg.hxx} [Beschreibung] In diesem Modeless-Dialog werden die Attribute einer Suche eingestellt diff --git a/svx/inc/svdglob.hxx b/svx/inc/svx/svdglob.hxx index 588869ff9890..588869ff9890 100644 --- a/svx/inc/svdglob.hxx +++ b/svx/inc/svx/svdglob.hxx diff --git a/svx/inc/svditer.hxx b/svx/inc/svx/svditer.hxx index 8ab6c32ea061..8ab6c32ea061 100644 --- a/svx/inc/svditer.hxx +++ b/svx/inc/svx/svditer.hxx diff --git a/svx/source/svdraw/svditext.hxx b/svx/inc/svx/svditext.hxx index b181b4046f9e..b181b4046f9e 100644 --- a/svx/source/svdraw/svditext.hxx +++ b/svx/inc/svx/svditext.hxx diff --git a/svx/inc/svdstr.hrc b/svx/inc/svx/svdstr.hrc index f1c19b4e0895..f1c19b4e0895 100644 --- a/svx/inc/svdstr.hrc +++ b/svx/inc/svx/svdstr.hrc diff --git a/svx/inc/svdviter.hxx b/svx/inc/svx/svdviter.hxx index 884733bc2d84..884733bc2d84 100644 --- a/svx/inc/svdviter.hxx +++ b/svx/inc/svx/svdviter.hxx diff --git a/svx/inc/svimbase.hxx b/svx/inc/svx/svimbase.hxx index 3d43e5fb9aac..3d43e5fb9aac 100644 --- a/svx/inc/svimbase.hxx +++ b/svx/inc/svx/svimbase.hxx diff --git a/svx/inc/svxerr.hxx b/svx/inc/svx/svxerr.hxx index 0fd197f1a5f5..0fd197f1a5f5 100644 --- a/svx/inc/svxerr.hxx +++ b/svx/inc/svx/svxerr.hxx diff --git a/svx/inc/svxgrahicitem.hxx b/svx/inc/svx/svxgrahicitem.hxx index fdd757b1a91b..fdd757b1a91b 100644 --- a/svx/inc/svxgrahicitem.hxx +++ b/svx/inc/svx/svxgrahicitem.hxx diff --git a/svx/inc/swframeexample.hxx b/svx/inc/svx/swframeexample.hxx index 843ff2a487af..843ff2a487af 100644 --- a/svx/inc/swframeexample.hxx +++ b/svx/inc/svx/swframeexample.hxx diff --git a/svx/inc/swframeposstrings.hxx b/svx/inc/svx/swframeposstrings.hxx index 7ba005dc1e76..7ba005dc1e76 100644 --- a/svx/inc/swframeposstrings.hxx +++ b/svx/inc/svx/swframeposstrings.hxx diff --git a/svx/inc/swframevalidation.hxx b/svx/inc/svx/swframevalidation.hxx index 600479718050..600479718050 100644 --- a/svx/inc/swframevalidation.hxx +++ b/svx/inc/svx/swframevalidation.hxx diff --git a/svx/inc/svx/tabarea.hxx b/svx/inc/svx/tabarea.hxx index 873dbc576f7c..a197e110f8ab 100644 --- a/svx/inc/svx/tabarea.hxx +++ b/svx/inc/svx/tabarea.hxx @@ -31,7 +31,7 @@ #include <svtools/valueset.hxx> #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #ifndef _FIXED_HXX //autogen #include <vcl/fixed.hxx> diff --git a/svx/inc/svx/tabline.hxx b/svx/inc/svx/tabline.hxx index 7ccc189b0083..dd4d6033960c 100644 --- a/svx/inc/svx/tabline.hxx +++ b/svx/inc/svx/tabline.hxx @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- #ifndef _IMAGEBTN_HXX //autogen -#include <vcl/imagebtn.hxx> +#include <vcl/button.hxx> #endif #ifndef _GROUP_HXX //autogen #include <vcl/group.hxx> diff --git a/svx/inc/tbxalign.hxx b/svx/inc/svx/tbxalign.hxx index 669b03e87c73..669b03e87c73 100644 --- a/svx/inc/tbxalign.hxx +++ b/svx/inc/svx/tbxalign.hxx diff --git a/svx/inc/tbxcolor.hxx b/svx/inc/svx/tbxcolor.hxx index 848c015c2995..848c015c2995 100644 --- a/svx/inc/tbxcolor.hxx +++ b/svx/inc/svx/tbxcolor.hxx diff --git a/svx/inc/tbxctl.hxx b/svx/inc/svx/tbxctl.hxx index 39bfc09cf8b1..39bfc09cf8b1 100644 --- a/svx/inc/tbxctl.hxx +++ b/svx/inc/svx/tbxctl.hxx diff --git a/svx/inc/tbxcustomshapes.hxx b/svx/inc/svx/tbxcustomshapes.hxx index 21aa3ea871ed..21aa3ea871ed 100644 --- a/svx/inc/tbxcustomshapes.hxx +++ b/svx/inc/svx/tbxcustomshapes.hxx diff --git a/svx/inc/tbxdraw.hxx b/svx/inc/svx/tbxdraw.hxx index 8f071f38792b..8f071f38792b 100644 --- a/svx/inc/tbxdraw.hxx +++ b/svx/inc/svx/tbxdraw.hxx diff --git a/svx/inc/txencbox.hxx b/svx/inc/svx/txencbox.hxx index e24716f8c953..e24716f8c953 100644 --- a/svx/inc/txencbox.hxx +++ b/svx/inc/svx/txencbox.hxx diff --git a/svx/inc/txenctab.hxx b/svx/inc/svx/txenctab.hxx index e04428717c53..e04428717c53 100644 --- a/svx/inc/txenctab.hxx +++ b/svx/inc/svx/txenctab.hxx diff --git a/svx/inc/unoapi.hxx b/svx/inc/svx/unoapi.hxx index 6a990a8d1c70..6a990a8d1c70 100644 --- a/svx/inc/unoapi.hxx +++ b/svx/inc/svx/unoapi.hxx diff --git a/svx/inc/unofill.hxx b/svx/inc/svx/unofill.hxx index 8c1a196b00d7..8c1a196b00d7 100644 --- a/svx/inc/unofill.hxx +++ b/svx/inc/svx/unofill.hxx diff --git a/svx/inc/unomaster.hxx b/svx/inc/svx/unomaster.hxx index 06f716705233..06f716705233 100644 --- a/svx/inc/unomaster.hxx +++ b/svx/inc/svx/unomaster.hxx diff --git a/svx/inc/unopool.hxx b/svx/inc/svx/unopool.hxx index c34105efb448..c34105efb448 100644 --- a/svx/inc/unopool.hxx +++ b/svx/inc/svx/unopool.hxx diff --git a/svx/inc/unoshcol.hxx b/svx/inc/svx/unoshcol.hxx index 422f6fc24029..422f6fc24029 100644 --- a/svx/inc/unoshcol.hxx +++ b/svx/inc/svx/unoshcol.hxx diff --git a/svx/inc/verttexttbxctrl.hxx b/svx/inc/svx/verttexttbxctrl.hxx index 8c350e31918b..8c350e31918b 100644 --- a/svx/inc/verttexttbxctrl.hxx +++ b/svx/inc/svx/verttexttbxctrl.hxx diff --git a/svx/inc/wrapfield.hxx b/svx/inc/svx/wrapfield.hxx index 1b4d745c55f8..1b4d745c55f8 100644 --- a/svx/inc/wrapfield.hxx +++ b/svx/inc/svx/wrapfield.hxx diff --git a/svx/inc/xattr.hxx b/svx/inc/svx/xattr.hxx index 20035f7743e7..20035f7743e7 100644 --- a/svx/inc/xattr.hxx +++ b/svx/inc/svx/xattr.hxx diff --git a/svx/inc/xexch.hxx b/svx/inc/svx/xexch.hxx index ff317f0a7541..ff317f0a7541 100644 --- a/svx/inc/xexch.hxx +++ b/svx/inc/svx/xexch.hxx diff --git a/svx/inc/xmleohlp.hxx b/svx/inc/svx/xmleohlp.hxx index 211e17ca1801..211e17ca1801 100644 --- a/svx/inc/xmleohlp.hxx +++ b/svx/inc/svx/xmleohlp.hxx diff --git a/svx/inc/xmlexchg.hxx b/svx/inc/svx/xmlexchg.hxx index f4820e0eb6fe..f4820e0eb6fe 100644 --- a/svx/inc/xmlexchg.hxx +++ b/svx/inc/svx/xmlexchg.hxx diff --git a/svx/inc/xmlgrhlp.hxx b/svx/inc/svx/xmlgrhlp.hxx index e17c78cd5ccb..e17c78cd5ccb 100644 --- a/svx/inc/xmlgrhlp.hxx +++ b/svx/inc/svx/xmlgrhlp.hxx diff --git a/svx/inc/xmlsecctrl.hxx b/svx/inc/svx/xmlsecctrl.hxx index aa1a38f183bd..aa1a38f183bd 100644 --- a/svx/inc/xmlsecctrl.hxx +++ b/svx/inc/svx/xmlsecctrl.hxx diff --git a/svx/inc/xoutbmp.hxx b/svx/inc/svx/xoutbmp.hxx index 726eb2f83d9c..726eb2f83d9c 100644 --- a/svx/inc/xoutbmp.hxx +++ b/svx/inc/svx/xoutbmp.hxx diff --git a/svx/inc/zoom_def.hxx b/svx/inc/svx/zoom_def.hxx index 7788bb1023f1..7788bb1023f1 100644 --- a/svx/inc/zoom_def.hxx +++ b/svx/inc/svx/zoom_def.hxx diff --git a/svx/inc/zoomctrl.hxx b/svx/inc/svx/zoomctrl.hxx index ea3ecdb33025..ea3ecdb33025 100644 --- a/svx/inc/zoomctrl.hxx +++ b/svx/inc/svx/zoomctrl.hxx diff --git a/svx/prj/d.lst b/svx/prj/d.lst index 7d2f508d9d21..be04e229f593 100644 --- a/svx/prj/d.lst +++ b/svx/prj/d.lst @@ -22,568 +22,12 @@ mkdir: %_DEST%\inc%_EXT%\svx ..\sdi\svxitems.sdi %_DEST%\inc%_EXT%\svx\svxitems.sdi ..\sdi\xoitems.sdi %_DEST%\inc%_EXT%\svx\xoitems.sdi -..\source\inc\fmsrccfg.hxx %_DEST%\inc%_EXT%\svx\fmsrccfg.hxx -..\source\inc\fmsrcimp.hxx %_DEST%\inc%_EXT%\svx\fmsrcimp.hxx -..\inc\galtheme.hxx %_DEST%\inc%_EXT%\svx\galtheme.hxx -..\inc\galctrl.hxx %_DEST%\inc%_EXT%\svx\galctrl.hxx -..\inc\svx\galmisc.hxx %_DEST%\inc%_EXT%\svx\galmisc.hxx -..\inc\svx\gallery1.hxx %_DEST%\inc%_EXT%\svx\gallery1.hxx -..\inc\svx\fmtools.hxx %_DEST%\inc%_EXT%\svx\fmtools.hxx -..\inc\svx\exthelpid.hrc %_DEST%\inc%_EXT%\svx\exthelpid.hrc +..\inc\svx\*.hxx %_DEST%\inc%_EXT%\svx\*.hxx +..\inc\svx\*.h %_DEST%\inc%_EXT%\svx\*.h +..\inc\svx\*.hrc %_DEST%\inc%_EXT%\svx\*.hrc -..\inc\flagsdef.hxx %_DEST%\inc%_EXT%\svx\flagsdef.hxx ..\%__SRC%\inc\svxslots.hxx %_DEST%\inc%_EXT%\svx\svxslots.hxx ..\%__SRC%\inc\globlmn.hrc %_DEST%\inc%_EXT%\svx\globlmn.hrc -..\source\inc\fmresids.hrc %_DEST%\inc%_EXT%\svx\fmresids.hrc -..\source\items\boxobj.hxx %_DEST%\inc%_EXT%\svx\boxobj.hxx -..\source\dialog\hyprlink.hxx %_DEST%\inc%_EXT%\svx\hyprlink.hxx - -../source/customshapes/EnhancedCustomShapeTypeNames.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeTypeNames.hxx -../source/customshapes/EnhancedCustomShapeGeometry.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeGeometry.hxx -../inc/svx/EnhancedCustomShapeFunctionParser.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShapeFunctionParser.hxx -../source/customshapes/EnhancedCustomShape2d.hxx %_DEST%\inc%_EXT%\svx\EnhancedCustomShape2d.hxx -../inc/xattr.hxx %_DEST%\inc%_EXT%\svx\xattr.hxx -../inc/svdglob.hxx %_DEST%\inc%_EXT%\svx\svdglob.hxx -../source/svdraw/svditext.hxx %_DEST%\inc%_EXT%\svx\svditext.hxx - -..\inc\AccessibleSelectionBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleSelectionBase.hxx -..\inc\AccessibleStaticTextBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleStaticTextBase.hxx -..\inc\acorrcfg.hxx %_DEST%\inc%_EXT%\svx\acorrcfg.hxx -..\inc\ActionDescriptionProvider.hxx %_DEST%\inc%_EXT%\svx\ActionDescriptionProvider.hxx -..\inc\anchorid.hxx %_DEST%\inc%_EXT%\svx\anchorid.hxx -..\inc\asiancfg.hxx %_DEST%\inc%_EXT%\svx\asiancfg.hxx -..\inc\bolnitem.hxx %_DEST%\inc%_EXT%\svx\bolnitem.hxx -..\inc\bulitem.hxx %_DEST%\inc%_EXT%\svx\bulitem.hxx -..\inc\charhiddenitem.hxx %_DEST%\inc%_EXT%\svx\charhiddenitem.hxx -..\inc\chrtitem.hxx %_DEST%\inc%_EXT%\svx\chrtitem.hxx -..\inc\clipboardctl.hxx %_DEST%\inc%_EXT%\svx\clipboardctl.hxx -..\inc\clipfmtitem.hxx %_DEST%\inc%_EXT%\svx\clipfmtitem.hxx -..\inc\connctrl.hxx %_DEST%\inc%_EXT%\svx\connctrl.hxx -..\inc\countryid.hxx %_DEST%\inc%_EXT%\svx\countryid.hxx -..\inc\databaseregistrationui.hxx %_DEST%\inc%_EXT%\svx\databaseregistrationui.hxx -..\inc\dbexch.hrc %_DEST%\inc%_EXT%\svx\dbexch.hrc -..\inc\DescriptionGenerator.hxx %_DEST%\inc%_EXT%\svx\DescriptionGenerator.hxx -..\inc\dialcontrol.hxx %_DEST%\inc%_EXT%\svx\dialcontrol.hxx -..\inc\dlgutil.hxx %_DEST%\inc%_EXT%\svx\dlgutil.hxx -..\inc\drawitem.hxx %_DEST%\inc%_EXT%\svx\drawitem.hxx -..\inc\editstat.hxx %_DEST%\inc%_EXT%\svx\editstat.hxx -..\inc\editund2.hxx %_DEST%\inc%_EXT%\svx\editund2.hxx -..\inc\eerdll.hxx %_DEST%\inc%_EXT%\svx\editdll.hxx -..\inc\extrusioncontrols.hxx %_DEST%\inc%_EXT%\svx\extrusioncontrols.hxx -..\inc\flstitem.hxx %_DEST%\inc%_EXT%\svx\flstitem.hxx -..\inc\fmgridif.hxx %_DEST%\inc%_EXT%\svx\fmgridif.hxx -..\inc\fmobjfac.hxx %_DEST%\inc%_EXT%\svx\fmobjfac.hxx -..\inc\fontitem.hxx %_DEST%\inc%_EXT%\svx\fontitem.hxx -..\inc\fontlb.hxx %_DEST%\inc%_EXT%\svx\fontlb.hxx -..\inc\fontworkgallery.hxx %_DEST%\inc%_EXT%\svx\fontworkgallery.hxx -..\inc\forbiddencharacterstable.hxx %_DEST%\inc%_EXT%\svx\forbiddencharacterstable.hxx -..\inc\formatpaintbrushctrl.hxx %_DEST%\inc%_EXT%\svx\formatpaintbrushctrl.hxx -..\inc\fwdtitem.hxx %_DEST%\inc%_EXT%\svx\fwdtitem.hxx -..\inc\gallery.hxx %_DEST%\inc%_EXT%\svx\gallery.hxx -..\inc\galbrws.hxx %_DEST%\inc%_EXT%\svx\galbrws.hxx -..\inc\globlac.hrc %_DEST%\inc%_EXT%\svx\globlac.hrc -..\inc\globl3d.hxx %_DEST%\inc%_EXT%\svx\globl3d.hxx -..\inc\grafctrl.hxx %_DEST%\inc%_EXT%\svx\grafctrl.hxx -..\inc\hlnkitem.hxx %_DEST%\inc%_EXT%\svx\hlnkitem.hxx -..\inc\htmlcfg.hxx %_DEST%\inc%_EXT%\svx\htmlcfg.hxx -..\inc\htmlmode.hxx %_DEST%\inc%_EXT%\svx\htmlmode.hxx -..\inc\hyperdlg.hxx %_DEST%\inc%_EXT%\svx\hyperdlg.hxx -..\inc\imapdlg.hxx %_DEST%\inc%_EXT%\svx\imapdlg.hxx -..\inc\opengrf.hxx %_DEST%\inc%_EXT%\svx\opengrf.hxx -..\inc\insctrl.hxx %_DEST%\inc%_EXT%\svx\insctrl.hxx -..\inc\layctrl.hxx %_DEST%\inc%_EXT%\svx\layctrl.hxx -..\inc\lboxctrl.hxx %_DEST%\inc%_EXT%\svx\lboxctrl.hxx -..\inc\linectrl.hxx %_DEST%\inc%_EXT%\svx\linectrl.hxx -..\inc\linkmgr.hxx %_DEST%\inc%_EXT%\svx\linkmgr.hxx -..\inc\measctrl.hxx %_DEST%\inc%_EXT%\svx\measctrl.hxx -..\inc\modctrl.hxx %_DEST%\inc%_EXT%\svx\modctrl.hxx -..\inc\mscodec.hxx %_DEST%\inc%_EXT%\svx\mscodec.hxx -..\inc\msoleexp.hxx %_DEST%\inc%_EXT%\svx\msoleexp.hxx -..\inc\nlbkitem.hxx %_DEST%\inc%_EXT%\svx\nlbkitem.hxx -..\inc\numvset.hxx %_DEST%\inc%_EXT%\svx\numvset.hxx -..\inc\objfac3d.hxx %_DEST%\inc%_EXT%\svx\objfac3d.hxx -..\inc\ofaitem.hxx %_DEST%\inc%_EXT%\svx\ofaitem.hxx -..\inc\opaqitem.hxx %_DEST%\inc%_EXT%\svx\opaqitem.hxx -..\inc\optgenrl.hxx %_DEST%\inc%_EXT%\svx\optgenrl.hxx -..\inc\optgrid.hxx %_DEST%\inc%_EXT%\svx\optgrid.hxx -..\inc\optitems.hxx %_DEST%\inc%_EXT%\svx\optitems.hxx -..\inc\orienthelper.hxx %_DEST%\inc%_EXT%\svx\orienthelper.hxx -..\inc\ParseContext.hxx %_DEST%\inc%_EXT%\svx\ParseContext.hxx -..\inc\passwd.hxx %_DEST%\inc%_EXT%\svx\passwd.hxx -..\inc\pfiledlg.hxx %_DEST%\inc%_EXT%\svx\pfiledlg.hxx -..\inc\pgrditem.hxx %_DEST%\inc%_EXT%\svx\pgrditem.hxx -..\inc\postattr.hxx %_DEST%\inc%_EXT%\svx\postattr.hxx -..\inc\prntitem.hxx %_DEST%\inc%_EXT%\svx\prntitem.hxx -..\inc\protitem.hxx %_DEST%\inc%_EXT%\svx\protitem.hxx -..\inc\prtqry.hxx %_DEST%\inc%_EXT%\svx\prtqry.hxx -..\inc\pszctrl.hxx %_DEST%\inc%_EXT%\svx\pszctrl.hxx -..\inc\relfld.hxx %_DEST%\inc%_EXT%\svx\relfld.hxx -..\inc\rotmodit.hxx %_DEST%\inc%_EXT%\svx\rotmodit.hxx -..\inc\rubydialog.hxx %_DEST%\inc%_EXT%\svx\rubydialog.hxx -..\inc\rulritem.hxx %_DEST%\inc%_EXT%\svx\rulritem.hxx -..\inc\sdrpaintwindow.hxx %_DEST%\inc%_EXT%\svx\sdrpaintwindow.hxx -..\inc\selctrl.hxx %_DEST%\inc%_EXT%\svx\selctrl.hxx -..\inc\srchcfg.hxx %_DEST%\inc%_EXT%\svx\srchcfg.hxx -..\inc\srchdlg.hxx %_DEST%\inc%_EXT%\svx\srchdlg.hxx -..\inc\srchitem.hxx %_DEST%\inc%_EXT%\svx\srchitem.hxx -..\inc\svditer.hxx %_DEST%\inc%_EXT%\svx\svditer.hxx -..\inc\svdstr.hrc %_DEST%\inc%_EXT%\svx\svdstr.hrc -..\inc\svdviter.hxx %_DEST%\inc%_EXT%\svx\svdviter.hxx -..\inc\svimbase.hxx %_DEST%\inc%_EXT%\svx\svimbase.hxx -..\inc\svxerr.hxx %_DEST%\inc%_EXT%\svx\svxerr.hxx -..\inc\svxgrahicitem.hxx %_DEST%\inc%_EXT%\svx\svxgrahicitem.hxx -..\inc\svxmsbas.hxx %_DEST%\inc%_EXT%\svx\svxmsbas.hxx -..\inc\svxrtf.hxx %_DEST%\inc%_EXT%\svx\svxrtf.hxx -..\inc\swframeposstrings.hxx %_DEST%\inc%_EXT%\svx\swframeposstrings.hxx -..\inc\swframevalidation.hxx %_DEST%\inc%_EXT%\svx\swframevalidation.hxx -..\inc\swframeexample.hxx %_DEST%\inc%_EXT%\svx\swframeexample.hxx -..\inc\tbxalign.hxx %_DEST%\inc%_EXT%\svx\tbxalign.hxx -..\inc\tbxcolor.hxx %_DEST%\inc%_EXT%\svx\tbxcolor.hxx -..\inc\tbxctl.hxx %_DEST%\inc%_EXT%\svx\tbxctl.hxx -..\inc\tbxcustomshapes.hxx %_DEST%\inc%_EXT%\svx\tbxcustomshapes.hxx -..\inc\tbxdraw.hxx %_DEST%\inc%_EXT%\svx\tbxdraw.hxx -..\inc\txencbox.hxx %_DEST%\inc%_EXT%\svx\txencbox.hxx -..\inc\txenctab.hxx %_DEST%\inc%_EXT%\svx\txenctab.hxx -..\inc\txtrange.hxx %_DEST%\inc%_EXT%\svx\txtrange.hxx -..\inc\unoapi.hxx %_DEST%\inc%_EXT%\svx\unoapi.hxx -..\inc\unoedhlp.hxx %_DEST%\inc%_EXT%\svx\unoedhlp.hxx -..\inc\unofdesc.hxx %_DEST%\inc%_EXT%\svx\unofdesc.hxx -..\inc\unofill.hxx %_DEST%\inc%_EXT%\svx\unofill.hxx -..\inc\UnoForbiddenCharsTable.hxx %_DEST%\inc%_EXT%\svx\UnoForbiddenCharsTable.hxx -..\inc\unolingu.hxx %_DEST%\inc%_EXT%\svx\unolingu.hxx -..\inc\unomaster.hxx %_DEST%\inc%_EXT%\svx\unomaster.hxx -..\inc\UnoNamespaceMap.hxx %_DEST%\inc%_EXT%\svx\UnoNamespaceMap.hxx -..\inc\unonrule.hxx %_DEST%\inc%_EXT%\svx\unonrule.hxx -..\inc\unopool.hxx %_DEST%\inc%_EXT%\svx\unopool.hxx -..\inc\unoshcol.hxx %_DEST%\inc%_EXT%\svx\unoshcol.hxx -..\inc\verttexttbxctrl.hxx %_DEST%\inc%_EXT%\svx\verttexttbxctrl.hxx -..\inc\wrapfield.hxx %_DEST%\inc%_EXT%\svx\wrapfield.hxx -..\inc\xexch.hxx %_DEST%\inc%_EXT%\svx\xexch.hxx -..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\svx\xmlcnitm.hxx -..\inc\xmleohlp.hxx %_DEST%\inc%_EXT%\svx\xmleohlp.hxx -..\inc\xmlexchg.hxx %_DEST%\inc%_EXT%\svx\xmlexchg.hxx -..\inc\xmlgrhlp.hxx %_DEST%\inc%_EXT%\svx\xmlgrhlp.hxx -..\inc\xmlsecctrl.hxx %_DEST%\inc%_EXT%\svx\xmlsecctrl.hxx -..\inc\xoutbmp.hxx %_DEST%\inc%_EXT%\svx\xoutbmp.hxx -..\inc\XPropertyTable.hxx %_DEST%\inc%_EXT%\svx\XPropertyTable.hxx -..\inc\zoom_def.hxx %_DEST%\inc%_EXT%\svx\zoom_def.hxx -..\inc\zoomctrl.hxx %_DEST%\inc%_EXT%\svx\zoomctrl.hxx - -..\inc\svx\xlinjoit.hxx %_DEST%\inc%_EXT%\svx\xlinjoit.hxx -..\inc\svx\impgrf.hxx %_DEST%\inc%_EXT%\svx\impgrf.hxx -..\inc\svx\dstribut_enum.hxx %_DEST%\inc%_EXT%\svx\dstribut_enum.hxx -..\inc\svx\svdfield.hxx %_DEST%\inc%_EXT%\svx\svdfield.hxx -..\inc\svx\svxitems.hrc %_DEST%\inc%_EXT%\svx\svxitems.hrc -..\inc\svx\svddef.hxx %_DEST%\inc%_EXT%\svx\svddef.hxx -..\inc\svx\svdfppt.hxx %_DEST%\inc%_EXT%\svx\svdfppt.hxx -..\inc\svx\ipolypolygoneditorcontroller.hxx %_DEST%\inc%_EXT%\svx\ipolypolygoneditorcontroller.hxx -..\inc\svx\polypolygoneditor.hxx %_DEST%\inc%_EXT%\svx\polypolygoneditor.hxx -..\inc\svx\svdsob.hxx %_DEST%\inc%_EXT%\svx\svdsob.hxx -..\inc\svx\svdlayer.hxx %_DEST%\inc%_EXT%\svx\svdlayer.hxx -..\inc\svx\adjitem.hxx %_DEST%\inc%_EXT%\svx\adjitem.hxx -..\inc\svx\akrnitem.hxx %_DEST%\inc%_EXT%\svx\akrnitem.hxx -..\inc\svx\algitem.hxx %_DEST%\inc%_EXT%\svx\algitem.hxx -..\inc\svx\simptabl.hxx %_DEST%\inc%_EXT%\svx\simptabl.hxx -..\inc\svx\ctredlin.hxx %_DEST%\inc%_EXT%\svx\ctredlin.hxx -..\inc\svx\blnkitem.hxx %_DEST%\inc%_EXT%\svx\blnkitem.hxx -..\inc\svx\bmpmask.hxx %_DEST%\inc%_EXT%\svx\bmpmask.hxx -..\inc\svx\borderline.hxx %_DEST%\inc%_EXT%\svx\borderline.hxx -..\inc\svx\boxitem.hxx %_DEST%\inc%_EXT%\svx\boxitem.hxx -..\inc\svx\brkitem.hxx %_DEST%\inc%_EXT%\svx\brkitem.hxx -..\inc\svx\brshitem.hxx %_DEST%\inc%_EXT%\svx\brshitem.hxx -..\inc\svx\camera3d.hxx %_DEST%\inc%_EXT%\svx\camera3d.hxx -..\inc\svx\charmap.hxx %_DEST%\inc%_EXT%\svx\charmap.hxx -..\inc\svx\checklbx.hxx %_DEST%\inc%_EXT%\svx\checklbx.hxx -..\inc\svx\cmapitem.hxx %_DEST%\inc%_EXT%\svx\cmapitem.hxx -..\inc\svx\cntritem.hxx %_DEST%\inc%_EXT%\svx\cntritem.hxx -..\inc\svx\colritem.hxx %_DEST%\inc%_EXT%\svx\colritem.hxx -..\inc\svx\contdlg.hxx %_DEST%\inc%_EXT%\svx\contdlg.hxx -..\inc\svx\tabarea.hxx %_DEST%\inc%_EXT%\svx\tabarea.hxx -..\inc\svx\tabline.hxx %_DEST%\inc%_EXT%\svx\tabline.hxx -..\inc\svx\crsditem.hxx %_DEST%\inc%_EXT%\svx\crsditem.hxx -..\inc\svx\cscoitem.hxx %_DEST%\inc%_EXT%\svx\cscoitem.hxx -..\inc\svx\colrctrl.hxx %_DEST%\inc%_EXT%\svx\colrctrl.hxx -..\inc\svx\cube3d.hxx %_DEST%\inc%_EXT%\svx\cube3d.hxx -..\inc\svx\polygn3d.hxx %_DEST%\inc%_EXT%\svx\polygn3d.hxx -..\inc\svx\lathe3d.hxx %_DEST%\inc%_EXT%\svx\lathe3d.hxx -..\inc\svx\e3ditem.hxx %_DEST%\inc%_EXT%\svx\e3ditem.hxx -..\inc\svx\def3d.hxx %_DEST%\inc%_EXT%\svx\def3d.hxx -..\inc\svx\svdtypes.hxx %_DEST%\inc%_EXT%\svx\svdtypes.hxx -..\inc\svx\volume3d.hxx %_DEST%\inc%_EXT%\svx\volume3d.hxx -..\inc\svx\xenum.hxx %_DEST%\inc%_EXT%\svx\xenum.hxx -..\inc\svx\dialmgr.hxx %_DEST%\inc%_EXT%\svx\dialmgr.hxx -..\inc\svx\dlgctl3d.hxx %_DEST%\inc%_EXT%\svx\dlgctl3d.hxx -..\inc\svx\dlgctrl.hxx %_DEST%\inc%_EXT%\svx\dlgctrl.hxx -..\inc\svx\dialogs.hrc %_DEST%\inc%_EXT%\svx\dialogs.hrc -..\inc\svx\escpitem.hxx %_DEST%\inc%_EXT%\svx\escpitem.hxx -..\inc\svx\extrud3d.hxx %_DEST%\inc%_EXT%\svx\extrud3d.hxx -..\inc\svx\escherex.hxx %_DEST%\inc%_EXT%\svx\escherex.hxx -..\inc\svx\f3dchild.hxx %_DEST%\inc%_EXT%\svx\f3dchild.hxx -..\inc\svx\fhgtitem.hxx %_DEST%\inc%_EXT%\svx\fhgtitem.hxx -..\inc\svx\fillctrl.hxx %_DEST%\inc%_EXT%\svx\fillctrl.hxx -..\inc\svx\float3d.hxx %_DEST%\inc%_EXT%\svx\float3d.hxx -..\inc\svx\flditem.hxx %_DEST%\inc%_EXT%\svx\flditem.hxx -..\inc\svx\fntctl.hxx %_DEST%\inc%_EXT%\svx\fntctl.hxx -..\inc\svx\fntctrl.hxx %_DEST%\inc%_EXT%\svx\fntctrl.hxx -..\inc\svx\fntszctl.hxx %_DEST%\inc%_EXT%\svx\fntszctl.hxx -..\inc\svx\fontwork.hxx %_DEST%\inc%_EXT%\svx\fontwork.hxx -..\inc\svx\framebordertype.hxx %_DEST%\inc%_EXT%\svx\framebordertype.hxx -..\inc\svx\framelink.hxx %_DEST%\inc%_EXT%\svx\framelink.hxx -..\inc\svx\framelinkarray.hxx %_DEST%\inc%_EXT%\svx\framelinkarray.hxx -..\inc\svx\frmsel.hxx %_DEST%\inc%_EXT%\svx\frmsel.hxx -..\inc\svx\graphctl.hxx %_DEST%\inc%_EXT%\svx\graphctl.hxx -..\inc\svx\hdft.hxx %_DEST%\inc%_EXT%\svx\hdft2.hxx -..\inc\svx\hyznitem.hxx %_DEST%\inc%_EXT%\svx\hyznitem.hxx -..\inc\svx\ifaceids.hxx %_DEST%\inc%_EXT%\svx\ifaceids.hxx -..\inc\svx\itemwin.hxx %_DEST%\inc%_EXT%\svx\itemwin.hxx -..\inc\svx\keepitem.hxx %_DEST%\inc%_EXT%\svx\keepitem.hxx -..\inc\svx\kernitem.hxx %_DEST%\inc%_EXT%\svx\kernitem.hxx -..\inc\svx\langbox.hxx %_DEST%\inc%_EXT%\svx\langbox.hxx -..\inc\svx\langitem.hxx %_DEST%\inc%_EXT%\svx\langitem.hxx -..\inc\svx\lcolitem.hxx %_DEST%\inc%_EXT%\svx\lcolitem.hxx -..\inc\svx\lrspitem.hxx %_DEST%\inc%_EXT%\svx\lrspitem.hxx -..\inc\svx\lspcitem.hxx %_DEST%\inc%_EXT%\svx\lspcitem.hxx -..\inc\svx\nhypitem.hxx %_DEST%\inc%_EXT%\svx\nhypitem.hxx -..\inc\svx\numinf.hxx %_DEST%\inc%_EXT%\svx\numinf.hxx -..\inc\svx\numfmtsh.hxx %_DEST%\inc%_EXT%\svx\numfmtsh.hxx -..\inc\svx\obj3d.hxx %_DEST%\inc%_EXT%\svx\obj3d.hxx -..\inc\svx\optlingu.hxx %_DEST%\inc%_EXT%\svx\optlingu.hxx -..\inc\svx\orphitem.hxx %_DEST%\inc%_EXT%\svx\orphitem.hxx -..\inc\svx\pagectrl.hxx %_DEST%\inc%_EXT%\svx\pagectrl.hxx -..\inc\svx\pageitem.hxx %_DEST%\inc%_EXT%\svx\pageitem.hxx -..\inc\svx\paperinf.hxx %_DEST%\inc%_EXT%\svx\paperinf.hxx -..\inc\svx\paraprev.hxx %_DEST%\inc%_EXT%\svx\paraprev.hxx -..\inc\svx\pbinitem.hxx %_DEST%\inc%_EXT%\svx\pbinitem.hxx -..\inc\svx\pmdlitem.hxx %_DEST%\inc%_EXT%\svx\pmdlitem.hxx -..\inc\svx\polysc3d.hxx %_DEST%\inc%_EXT%\svx\polysc3d.hxx -..\inc\svx\postitem.hxx %_DEST%\inc%_EXT%\svx\postitem.hxx -..\inc\svx\prszitem.hxx %_DEST%\inc%_EXT%\svx\prszitem.hxx -..\inc\svx\rectenum.hxx %_DEST%\inc%_EXT%\svx\rectenum.hxx -..\inc\svx\ruler.hxx %_DEST%\inc%_EXT%\svx\ruler.hxx -..\inc\svx\scene3d.hxx %_DEST%\inc%_EXT%\svx\scene3d.hxx -..\inc\svx\e3dsceneupdater.hxx %_DEST%\inc%_EXT%\svx\e3dsceneupdater.hxx -..\inc\svx\sdangitm.hxx %_DEST%\inc%_EXT%\svx\sdangitm.hxx -..\inc\svx\sderitm.hxx %_DEST%\inc%_EXT%\svx\sderitm.hxx -..\inc\svx\sdgcoitm.hxx %_DEST%\inc%_EXT%\svx\sdgcoitm.hxx -..\inc\svx\sdgcpitm.hxx %_DEST%\inc%_EXT%\svx\sdgcpitm.hxx -..\inc\svx\sdgluitm.hxx %_DEST%\inc%_EXT%\svx\sdgluitm.hxx -..\inc\svx\sdginitm.hxx %_DEST%\inc%_EXT%\svx\sdginitm.hxx -..\inc\svx\sdggaitm.hxx %_DEST%\inc%_EXT%\svx\sdggaitm.hxx -..\inc\svx\sdgmoitm.hxx %_DEST%\inc%_EXT%\svx\sdgmoitm.hxx -..\inc\svx\sdgtritm.hxx %_DEST%\inc%_EXT%\svx\sdgtritm.hxx -..\inc\svx\sdmetitm.hxx %_DEST%\inc%_EXT%\svx\sdmetitm.hxx -..\inc\svx\sdooitm.hxx %_DEST%\inc%_EXT%\svx\sdooitm.hxx -..\inc\svx\sdprcitm.hxx %_DEST%\inc%_EXT%\svx\sdprcitm.hxx -..\inc\svx\sdshcitm.hxx %_DEST%\inc%_EXT%\svx\sdshcitm.hxx -..\inc\svx\sdshitm.hxx %_DEST%\inc%_EXT%\svx\sdshitm.hxx -..\inc\svx\sdshtitm.hxx %_DEST%\inc%_EXT%\svx\sdshtitm.hxx -..\inc\svx\sdsxyitm.hxx %_DEST%\inc%_EXT%\svx\sdsxyitm.hxx -..\inc\svx\sdtaaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaaitm.hxx -..\inc\svx\sdtacitm.hxx %_DEST%\inc%_EXT%\svx\sdtacitm.hxx -..\inc\svx\sdtaditm.hxx %_DEST%\inc%_EXT%\svx\sdtaditm.hxx -..\inc\svx\sdtagitm.hxx %_DEST%\inc%_EXT%\svx\sdtagitm.hxx -..\inc\svx\sdtaiitm.hxx %_DEST%\inc%_EXT%\svx\sdtaiitm.hxx -..\inc\svx\sdtfchim.hxx %_DEST%\inc%_EXT%\svx\sdtfchim.hxx -..\inc\svx\sdtaitm.hxx %_DEST%\inc%_EXT%\svx\sdtaitm.hxx -..\inc\svx\sdtakitm.hxx %_DEST%\inc%_EXT%\svx\sdtakitm.hxx -..\inc\svx\sdtayitm.hxx %_DEST%\inc%_EXT%\svx\sdtayitm.hxx -..\inc\svx\sdtcfitm.hxx %_DEST%\inc%_EXT%\svx\sdtcfitm.hxx -..\inc\svx\sdtditm.hxx %_DEST%\inc%_EXT%\svx\sdtditm.hxx -..\inc\svx\sdtfsitm.hxx %_DEST%\inc%_EXT%\svx\sdtfsitm.hxx -..\inc\svx\sdtmfitm.hxx %_DEST%\inc%_EXT%\svx\sdtmfitm.hxx -..\inc\svx\sdynitm.hxx %_DEST%\inc%_EXT%\svx\sdynitm.hxx -..\inc\svx\shaditem.hxx %_DEST%\inc%_EXT%\svx\shaditem.hxx -..\inc\svx\shdditem.hxx %_DEST%\inc%_EXT%\svx\shdditem.hxx -..\inc\svx\sizeitem.hxx %_DEST%\inc%_EXT%\svx\sizeitem.hxx -..\inc\svx\sphere3d.hxx %_DEST%\inc%_EXT%\svx\sphere3d.hxx -..\inc\svx\spltitem.hxx %_DEST%\inc%_EXT%\svx\spltitem.hxx -..\inc\svx\hangulhanja.hxx %_DEST%\inc%_EXT%\svx\hangulhanja.hxx -..\inc\svx\SpellPortions.hxx %_DEST%\inc%_EXT%\svx\SpellPortions.hxx -..\inc\svx\SpellDialogChildWindow.hxx %_DEST%\inc%_EXT%\svx\SpellDialogChildWindow.hxx -..\inc\svx\splwrap.hxx %_DEST%\inc%_EXT%\svx\splwrap.hxx -..\inc\svx\stddlg.hxx %_DEST%\inc%_EXT%\svx\stddlg.hxx -..\inc\svx\strarray.hxx %_DEST%\inc%_EXT%\svx\strarray.hxx -..\inc\svx\svdattr.hxx %_DEST%\inc%_EXT%\svx\svdattr.hxx -..\inc\svx\svdattrx.hxx %_DEST%\inc%_EXT%\svx\svdattrx.hxx -..\inc\svx\svdcrtv.hxx %_DEST%\inc%_EXT%\svx\svdcrtv.hxx -..\inc\svx\svddrag.hxx %_DEST%\inc%_EXT%\svx\svddrag.hxx -..\inc\svx\svddrgmt.hxx %_DEST%\inc%_EXT%\svx\svddrgmt.hxx -..\inc\svx\svddrgv.hxx %_DEST%\inc%_EXT%\svx\svddrgv.hxx -..\inc\svx\svdedtv.hxx %_DEST%\inc%_EXT%\svx\svdedtv.hxx -..\inc\svx\svdedxv.hxx %_DEST%\inc%_EXT%\svx\svdedxv.hxx -..\inc\svx\svdetc.hxx %_DEST%\inc%_EXT%\svx\svdetc.hxx -..\inc\svx\sdrhittesthelper.hxx %_DEST%\inc%_EXT%\svx\sdrhittesthelper.hxx -..\inc\svx\svdglev.hxx %_DEST%\inc%_EXT%\svx\svdglev.hxx -..\inc\svx\svdglue.hxx %_DEST%\inc%_EXT%\svx\svdglue.hxx -..\inc\svx\svdhdl.hxx %_DEST%\inc%_EXT%\svx\svdhdl.hxx -..\inc\svx\svdhlpln.hxx %_DEST%\inc%_EXT%\svx\svdhlpln.hxx -..\inc\svx\svdmark.hxx %_DEST%\inc%_EXT%\svx\svdmark.hxx -..\inc\svx\svdmodel.hxx %_DEST%\inc%_EXT%\svx\svdmodel.hxx -..\inc\svx\svdmrkv.hxx %_DEST%\inc%_EXT%\svx\svdmrkv.hxx -..\inc\svx\svdoattr.hxx %_DEST%\inc%_EXT%\svx\svdoattr.hxx -..\inc\svx\svdobj.hxx %_DEST%\inc%_EXT%\svx\svdobj.hxx -..\inc\svx\sdrobjectuser.hxx %_DEST%\inc%_EXT%\svx\sdrobjectuser.hxx -..\inc\svx\svdocapt.hxx %_DEST%\inc%_EXT%\svx\svdocapt.hxx -..\inc\svx\svdocirc.hxx %_DEST%\inc%_EXT%\svx\svdocirc.hxx -..\inc\svx\svdoedge.hxx %_DEST%\inc%_EXT%\svx\svdoedge.hxx -..\inc\svx\svdograf.hxx %_DEST%\inc%_EXT%\svx\svdograf.hxx -..\inc\svx\svdogrp.hxx %_DEST%\inc%_EXT%\svx\svdogrp.hxx -..\inc\svx\svdomeas.hxx %_DEST%\inc%_EXT%\svx\svdomeas.hxx -..\inc\svx\svdomedia.hxx %_DEST%\inc%_EXT%\svx\svdomedia.hxx -..\inc\svx\svdoole2.hxx %_DEST%\inc%_EXT%\svx\svdoole2.hxx -..\inc\svx\svdopage.hxx %_DEST%\inc%_EXT%\svx\svdopage.hxx -..\inc\svx\svdopath.hxx %_DEST%\inc%_EXT%\svx\svdopath.hxx -..\inc\svx\svdorect.hxx %_DEST%\inc%_EXT%\svx\svdorect.hxx -..\inc\svx\svdotext.hxx %_DEST%\inc%_EXT%\svx\svdotext.hxx -..\inc\svx\svdovirt.hxx %_DEST%\inc%_EXT%\svx\svdovirt.hxx -..\inc\svx\svdpage.hxx %_DEST%\inc%_EXT%\svx\svdpage.hxx -..\inc\svx\sdrmasterpagedescriptor.hxx %_DEST%\inc%_EXT%\svx\sdrmasterpagedescriptor.hxx -..\inc\svx\sdrcomment.hxx %_DEST%\inc%_EXT%\svx\sdrcomment.hxx -..\inc\svx\sdrpageuser.hxx %_DEST%\inc%_EXT%\svx\sdrpageuser.hxx -..\inc\svx\svdpagv.hxx %_DEST%\inc%_EXT%\svx\svdpagv.hxx -..\inc\svx\sdrpagewindow.hxx %_DEST%\inc%_EXT%\svx\sdrpagewindow.hxx -..\inc\svx\svdpntv.hxx %_DEST%\inc%_EXT%\svx\svdpntv.hxx -..\inc\svx\svdpoev.hxx %_DEST%\inc%_EXT%\svx\svdpoev.hxx -..\inc\svx\svdpool.hxx %_DEST%\inc%_EXT%\svx\svdpool.hxx -..\inc\svx\svdsnpv.hxx %_DEST%\inc%_EXT%\svx\svdsnpv.hxx -..\inc\svx\svdtrans.hxx %_DEST%\inc%_EXT%\svx\svdtrans.hxx -..\inc\svx\svdundo.hxx %_DEST%\inc%_EXT%\svx\svdundo.hxx -..\inc\svx\svdoutl.hxx %_DEST%\inc%_EXT%\svx\svdoutl.hxx -..\inc\svx\svdview.hxx %_DEST%\inc%_EXT%\svx\svdview.hxx -..\inc\svx\svdxcgv.hxx %_DEST%\inc%_EXT%\svx\svdxcgv.hxx -..\inc\svx\svxbox.hxx %_DEST%\inc%_EXT%\svx\svxbox.hxx -..\inc\svx\svxfont.hxx %_DEST%\inc%_EXT%\svx\svxfont.hxx -..\inc\svx\svxenum.hxx %_DEST%\inc%_EXT%\svx\svxenum.hxx -..\inc\svx\svxids.hrc %_DEST%\inc%_EXT%\svx\svxids.hrc -..\inc\svx\sxallitm.hxx %_DEST%\inc%_EXT%\svx\sxallitm.hxx -..\inc\svx\sxcaitm.hxx %_DEST%\inc%_EXT%\svx\sxcaitm.hxx -..\inc\svx\sxcecitm.hxx %_DEST%\inc%_EXT%\svx\sxcecitm.hxx -..\inc\svx\sxcgitm.hxx %_DEST%\inc%_EXT%\svx\sxcgitm.hxx -..\inc\svx\sxciaitm.hxx %_DEST%\inc%_EXT%\svx\sxciaitm.hxx -..\inc\svx\sxcikitm.hxx %_DEST%\inc%_EXT%\svx\sxcikitm.hxx -..\inc\svx\sxcllitm.hxx %_DEST%\inc%_EXT%\svx\sxcllitm.hxx -..\inc\svx\sxctitm.hxx %_DEST%\inc%_EXT%\svx\sxctitm.hxx -..\inc\svx\sxekitm.hxx %_DEST%\inc%_EXT%\svx\sxekitm.hxx -..\inc\svx\sxelditm.hxx %_DEST%\inc%_EXT%\svx\sxelditm.hxx -..\inc\svx\sxenditm.hxx %_DEST%\inc%_EXT%\svx\sxenditm.hxx -..\inc\svx\sxfiitm.hxx %_DEST%\inc%_EXT%\svx\sxfiitm.hxx -..\inc\svx\sxlayitm.hxx %_DEST%\inc%_EXT%\svx\sxlayitm.hxx -..\inc\svx\sxlogitm.hxx %_DEST%\inc%_EXT%\svx\sxlogitm.hxx -..\inc\svx\sxmbritm.hxx %_DEST%\inc%_EXT%\svx\sxmbritm.hxx -..\inc\svx\sxmfsitm.hxx %_DEST%\inc%_EXT%\svx\sxmfsitm.hxx -..\inc\svx\sxmkitm.hxx %_DEST%\inc%_EXT%\svx\sxmkitm.hxx -..\inc\svx\sxmlhitm.hxx %_DEST%\inc%_EXT%\svx\sxmlhitm.hxx -..\inc\svx\sxmoitm.hxx %_DEST%\inc%_EXT%\svx\sxmoitm.hxx -..\inc\svx\sxmovitm.hxx %_DEST%\inc%_EXT%\svx\sxmovitm.hxx -..\inc\svx\sxmsitm.hxx %_DEST%\inc%_EXT%\svx\sxmsitm.hxx -..\inc\svx\sxmspitm.hxx %_DEST%\inc%_EXT%\svx\sxmspitm.hxx -..\inc\svx\sxmsuitm.hxx %_DEST%\inc%_EXT%\svx\sxmsuitm.hxx -..\inc\svx\sxmtaitm.hxx %_DEST%\inc%_EXT%\svx\sxmtaitm.hxx -..\inc\svx\sxmtfitm.hxx %_DEST%\inc%_EXT%\svx\sxmtfitm.hxx -..\inc\svx\sxmtpitm.hxx %_DEST%\inc%_EXT%\svx\sxmtpitm.hxx -..\inc\svx\sxmtritm.hxx %_DEST%\inc%_EXT%\svx\sxmtritm.hxx -..\inc\svx\sxmuitm.hxx %_DEST%\inc%_EXT%\svx\sxmuitm.hxx -..\inc\svx\sxoneitm.hxx %_DEST%\inc%_EXT%\svx\sxoneitm.hxx -..\inc\svx\sxonitm.hxx %_DEST%\inc%_EXT%\svx\sxonitm.hxx -..\inc\svx\sxopitm.hxx %_DEST%\inc%_EXT%\svx\sxopitm.hxx -..\inc\svx\sxraitm.hxx %_DEST%\inc%_EXT%\svx\sxraitm.hxx -..\inc\svx\sxreaitm.hxx %_DEST%\inc%_EXT%\svx\sxreaitm.hxx -..\inc\svx\sxreoitm.hxx %_DEST%\inc%_EXT%\svx\sxreoitm.hxx -..\inc\svx\sxroaitm.hxx %_DEST%\inc%_EXT%\svx\sxroaitm.hxx -..\inc\svx\sxrooitm.hxx %_DEST%\inc%_EXT%\svx\sxrooitm.hxx -..\inc\svx\sxsaitm.hxx %_DEST%\inc%_EXT%\svx\sxsaitm.hxx -..\inc\svx\sxsalitm.hxx %_DEST%\inc%_EXT%\svx\sxsalitm.hxx -..\inc\svx\sxsiitm.hxx %_DEST%\inc%_EXT%\svx\sxsiitm.hxx -..\inc\svx\sxsoitm.hxx %_DEST%\inc%_EXT%\svx\sxsoitm.hxx -..\inc\svx\sxtraitm.hxx %_DEST%\inc%_EXT%\svx\sxtraitm.hxx -..\inc\svx\tbcontrl.hxx %_DEST%\inc%_EXT%\svx\tbcontrl.hxx -..\inc\svx\thesdlg.hxx %_DEST%\inc%_EXT%\svx\thesdlg.hxx -..\inc\svx\tstpitem.hxx %_DEST%\inc%_EXT%\svx\tstpitem.hxx -..\inc\svx\udlnitem.hxx %_DEST%\inc%_EXT%\svx\udlnitem.hxx -..\inc\svx\ulspitem.hxx %_DEST%\inc%_EXT%\svx\ulspitem.hxx -..\inc\svx\unomid.hxx %_DEST%\inc%_EXT%\svx\unomid.hxx -..\inc\svx\unopage.hxx %_DEST%\inc%_EXT%\svx\unopage.hxx -..\inc\svx\unoprnms.hxx %_DEST%\inc%_EXT%\svx\unoprnms.hxx -..\inc\svx\unoshape.hxx %_DEST%\inc%_EXT%\svx\unoshape.hxx -..\inc\svx\shapepropertynotifier.hxx %_DEST%\inc%_EXT%\svx\shapepropertynotifier.hxx -..\inc\svx\shapeproperty.hxx %_DEST%\inc%_EXT%\svx\shapeproperty.hxx -..\inc\svx\unoipset.hxx %_DEST%\inc%_EXT%\svx\unoipset.hxx -..\inc\svx\unoprov.hxx %_DEST%\inc%_EXT%\svx\unoprov.hxx -..\inc\svx\unomod.hxx %_DEST%\inc%_EXT%\svx\unomod.hxx -..\inc\svx\unomodel.hxx %_DEST%\inc%_EXT%\svx\unomodel.hxx -..\inc\svx\fmdpage.hxx %_DEST%\inc%_EXT%\svx\fmdpage.hxx -..\inc\svx\fmsearch.hxx %_DEST%\inc%_EXT%\svx\fmsearch.hxx -..\inc\svx\view3d.hxx %_DEST%\inc%_EXT%\svx\view3d.hxx -..\inc\svx\viewpt3d.hxx %_DEST%\inc%_EXT%\svx\viewpt3d.hxx -..\inc\svx\wghtitem.hxx %_DEST%\inc%_EXT%\svx\wghtitem.hxx -..\inc\svx\widwitem.hxx %_DEST%\inc%_EXT%\svx\widwitem.hxx -..\inc\svx\wrlmitem.hxx %_DEST%\inc%_EXT%\svx\wrlmitem.hxx -..\inc\svx\xbitmap.hxx %_DEST%\inc%_EXT%\svx\xbitmap.hxx -..\inc\svx\xbtmpit.hxx %_DEST%\inc%_EXT%\svx\xbtmpit.hxx -..\inc\svx\xcolit.hxx %_DEST%\inc%_EXT%\svx\xcolit.hxx -..\inc\svx\xdef.hxx %_DEST%\inc%_EXT%\svx\xdef.hxx -..\inc\svx\xdash.hxx %_DEST%\inc%_EXT%\svx\xdash.hxx -..\inc\svx\xfillit.hxx %_DEST%\inc%_EXT%\svx\xfillit.hxx -..\inc\svx\xfillit0.hxx %_DEST%\inc%_EXT%\svx\xfillit0.hxx -..\inc\svx\xflasit.hxx %_DEST%\inc%_EXT%\svx\xflasit.hxx -..\inc\svx\xflbckit.hxx %_DEST%\inc%_EXT%\svx\xflbckit.hxx -..\inc\svx\xflbmpit.hxx %_DEST%\inc%_EXT%\svx\xflbmpit.hxx -..\inc\svx\xflbmsli.hxx %_DEST%\inc%_EXT%\svx\xflbmsli.hxx -..\inc\svx\xflbmsxy.hxx %_DEST%\inc%_EXT%\svx\xflbmsxy.hxx -..\inc\svx\xflbmtit.hxx %_DEST%\inc%_EXT%\svx\xflbmtit.hxx -..\inc\svx\xflboxy.hxx %_DEST%\inc%_EXT%\svx\xflboxy.hxx -..\inc\svx\xflbstit.hxx %_DEST%\inc%_EXT%\svx\xflbstit.hxx -..\inc\svx\xflbtoxy.hxx %_DEST%\inc%_EXT%\svx\xflbtoxy.hxx -..\inc\svx\xflclit.hxx %_DEST%\inc%_EXT%\svx\xflclit.hxx -..\inc\svx\xsflclit.hxx %_DEST%\inc%_EXT%\svx\xsflclit.hxx -..\inc\svx\xflgrit.hxx %_DEST%\inc%_EXT%\svx\xflgrit.hxx -..\inc\svx\xflftrit.hxx %_DEST%\inc%_EXT%\svx\xflftrit.hxx -..\inc\svx\xflhtit.hxx %_DEST%\inc%_EXT%\svx\xflhtit.hxx -..\inc\svx\xfltrit.hxx %_DEST%\inc%_EXT%\svx\xfltrit.hxx -..\inc\svx\xftadit.hxx %_DEST%\inc%_EXT%\svx\xftadit.hxx -..\inc\svx\xftdiit.hxx %_DEST%\inc%_EXT%\svx\xftdiit.hxx -..\inc\svx\xftmrit.hxx %_DEST%\inc%_EXT%\svx\xftmrit.hxx -..\inc\svx\xftouit.hxx %_DEST%\inc%_EXT%\svx\xftouit.hxx -..\inc\svx\xftsfit.hxx %_DEST%\inc%_EXT%\svx\xftsfit.hxx -..\inc\svx\xftshcit.hxx %_DEST%\inc%_EXT%\svx\xftshcit.hxx -..\inc\svx\xftshit.hxx %_DEST%\inc%_EXT%\svx\xftshit.hxx -..\inc\svx\xftshtit.hxx %_DEST%\inc%_EXT%\svx\xftshtit.hxx -..\inc\svx\xftshxy.hxx %_DEST%\inc%_EXT%\svx\xftshxy.hxx -..\inc\svx\xftstit.hxx %_DEST%\inc%_EXT%\svx\xftstit.hxx -..\inc\svx\xgrad.hxx %_DEST%\inc%_EXT%\svx\xgrad.hxx -..\inc\svx\xgrscit.hxx %_DEST%\inc%_EXT%\svx\xgrscit.hxx -..\inc\svx\xhatch.hxx %_DEST%\inc%_EXT%\svx\xhatch.hxx -..\inc\svx\xit.hxx %_DEST%\inc%_EXT%\svx\xit.hxx -..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx -..\inc\svx\xlineit.hxx %_DEST%\inc%_EXT%\svx\xlineit.hxx -..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx -..\inc\svx\xlineit0.hxx %_DEST%\inc%_EXT%\svx\xlineit0.hxx -..\inc\svx\xlnasit.hxx %_DEST%\inc%_EXT%\svx\xlnasit.hxx -..\inc\svx\xlnclit.hxx %_DEST%\inc%_EXT%\svx\xlnclit.hxx -..\inc\svx\xlndsit.hxx %_DEST%\inc%_EXT%\svx\xlndsit.hxx -..\inc\svx\xlnedcit.hxx %_DEST%\inc%_EXT%\svx\xlnedcit.hxx -..\inc\svx\xlnedit.hxx %_DEST%\inc%_EXT%\svx\xlnedit.hxx -..\inc\svx\xlnedwit.hxx %_DEST%\inc%_EXT%\svx\xlnedwit.hxx -..\inc\svx\xlnstcit.hxx %_DEST%\inc%_EXT%\svx\xlnstcit.hxx -..\inc\svx\xlnstit.hxx %_DEST%\inc%_EXT%\svx\xlnstit.hxx -..\inc\svx\xlnstwit.hxx %_DEST%\inc%_EXT%\svx\xlnstwit.hxx -..\inc\svx\xlntrit.hxx %_DEST%\inc%_EXT%\svx\xlntrit.hxx -..\inc\svx\xlnwtit.hxx %_DEST%\inc%_EXT%\svx\xlnwtit.hxx -..\inc\svx\xpoly.hxx %_DEST%\inc%_EXT%\svx\xpoly.hxx -..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\svx\xpool.hxx -..\inc\svx\xpool.hxx %_DEST%\inc%_EXT%\xpool.hxx -..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\svx\xsetit.hxx -..\inc\svx\xsetit.hxx %_DEST%\inc%_EXT%\xsetit.hxx -..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\svx\xtable.hxx -..\inc\svx\xtable.hxx %_DEST%\inc%_EXT%\xtable.hxx -..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\svx\xtextit.hxx -..\inc\svx\xtextit.hxx %_DEST%\inc%_EXT%\xtextit.hxx -..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\svx\xtextit0.hxx -..\inc\svx\xtextit0.hxx %_DEST%\inc%_EXT%\xtextit0.hxx -..\inc\svx\zoomitem.hxx %_DEST%\inc%_EXT%\svx\zoomitem.hxx -..\inc\svx\viewlayoutitem.hxx %_DEST%\inc%_EXT%\svx\viewlayoutitem.hxx -..\inc\svx\zoomslideritem.hxx %_DEST%\inc%_EXT%\svx\zoomslideritem.hxx -..\inc\svx\zoomsliderctrl.hxx %_DEST%\inc%_EXT%\svx\zoomsliderctrl.hxx - - -..\inc\svx\itemtype.hxx %_DEST%\inc%_EXT%\svx\itemtype.hxx -..\inc\svx\outliner.hxx %_DEST%\inc%_EXT%\svx\outliner.hxx -..\inc\svx\paragraphdata.hxx %_DEST%\inc%_EXT%\svx\paragraphdata.hxx -..\inc\svx\outlobj.hxx %_DEST%\inc%_EXT%\svx\outlobj.hxx -..\inc\svx\editdata.hxx %_DEST%\inc%_EXT%\svx\editdata.hxx -..\inc\svx\editeng.hxx %_DEST%\inc%_EXT%\svx\editeng.hxx -..\inc\svx\eedata.hxx %_DEST%\inc%_EXT%\svx\eedata.hxx -..\inc\svx\editobj.hxx %_DEST%\inc%_EXT%\svx\editobj.hxx -..\inc\svx\editview.hxx %_DEST%\inc%_EXT%\svx\editview.hxx -..\inc\svx\eeitem.hxx %_DEST%\inc%_EXT%\svx\eeitem.hxx -..\inc\svx\eeitemid.hxx %_DEST%\inc%_EXT%\svx\eeitemid.hxx -..\inc\svx\svxacorr.hxx %_DEST%\inc%_EXT%\svx\svxacorr.hxx -..\inc\svx\swafopt.hxx %_DEST%\inc%_EXT%\svx\swafopt.hxx -..\inc\svx\fmmodel.hxx %_DEST%\inc%_EXT%\svx\fmmodel.hxx -..\inc\svx\fmpage.hxx %_DEST%\inc%_EXT%\svx\fmpage.hxx -..\inc\svx\fmview.hxx %_DEST%\inc%_EXT%\svx\fmview.hxx -..\inc\svx\fmglob.hxx %_DEST%\inc%_EXT%\svx\fmglob.hxx -..\inc\svx\fmshell.hxx %_DEST%\inc%_EXT%\svx\fmshell.hxx -..\inc\svx\svdouno.hxx %_DEST%\inc%_EXT%\svx\svdouno.hxx -..\inc\svx\deflt3d.hxx %_DEST%\inc%_EXT%\svx\deflt3d.hxx -..\inc\svx\unotext.hxx %_DEST%\inc%_EXT%\svx\unotext.hxx -..\inc\svx\unofield.hxx %_DEST%\inc%_EXT%\svx\unofield.hxx -..\inc\svx\mutxhelp.hxx %_DEST%\inc%_EXT%\svx\mutxhelp.hxx -..\inc\svx\AccessibleTextHelper.hxx %_DEST%\inc%_EXT%\svx\AccessibleTextHelper.hxx -..\inc\svx\unoviwed.hxx %_DEST%\inc%_EXT%\svx\unoviwed.hxx -..\inc\svx\unoviwou.hxx %_DEST%\inc%_EXT%\svx\unoviwou.hxx -..\inc\svx\unoedsrc.hxx %_DEST%\inc%_EXT%\svx\unoedsrc.hxx -..\inc\svx\unofored.hxx %_DEST%\inc%_EXT%\svx\unofored.hxx -..\inc\svx\unoforou.hxx %_DEST%\inc%_EXT%\svx\unoforou.hxx -..\inc\svx\e3dundo.hxx %_DEST%\inc%_EXT%\svx\e3dundo.hxx -..\inc\svx\msdffimp.hxx %_DEST%\inc%_EXT%\svx\msdffimp.hxx -..\inc\svx\msdffdef.hxx %_DEST%\inc%_EXT%\svx\msdffdef.hxx -..\inc\svx\msfiltertracer.hxx %_DEST%\inc%_EXT%\svx\msfiltertracer.hxx -..\inc\svx\unoshtxt.hxx %_DEST%\inc%_EXT%\svx\unoshtxt.hxx -..\inc\svx\numitem.hxx %_DEST%\inc%_EXT%\svx\numitem.hxx -..\inc\svx\numdef.hxx %_DEST%\inc%_EXT%\svx\numdef.hxx -..\inc\svx\fmdmod.hxx %_DEST%\inc%_EXT%\svx\fmdmod.hxx -..\inc\svx\fmgridcl.hxx %_DEST%\inc%_EXT%\svx\fmgridcl.hxx -..\inc\svx\gridctrl.hxx %_DEST%\inc%_EXT%\svx\gridctrl.hxx -..\inc\svx\unoshprp.hxx %_DEST%\inc%_EXT%\svx\unoshprp.hxx -..\inc\svx\sdasaitm.hxx %_DEST%\inc%_EXT%\svx\sdasaitm.hxx -..\inc\svx\sdasitm.hxx %_DEST%\inc%_EXT%\svx\sdasitm.hxx -..\inc\svx\grfcrop.hxx %_DEST%\inc%_EXT%\svx\grfcrop.hxx -..\inc\svx\grfflt.hxx %_DEST%\inc%_EXT%\svx\grfflt.hxx -..\inc\svx\svx3ditems.hxx %_DEST%\inc%_EXT%\svx\svx3ditems.hxx -..\inc\svx\msocximex.hxx %_DEST%\inc%_EXT%\svx\msocximex.hxx -..\inc\svx\emphitem.hxx %_DEST%\inc%_EXT%\svx\emphitem.hxx -..\inc\svx\twolinesitem.hxx %_DEST%\inc%_EXT%\svx\twolinesitem.hxx -..\inc\svx\scripttypeitem.hxx %_DEST%\inc%_EXT%\svx\scripttypeitem.hxx -..\inc\svx\scriptspaceitem.hxx %_DEST%\inc%_EXT%\svx\scriptspaceitem.hxx -..\inc\svx\hngpnctitem.hxx %_DEST%\inc%_EXT%\svx\hngpnctitem.hxx -..\inc\svx\forbiddenruleitem.hxx %_DEST%\inc%_EXT%\svx\forbiddenruleitem.hxx -..\inc\svx\charscaleitem.hxx %_DEST%\inc%_EXT%\svx\charscaleitem.hxx -..\inc\svx\charrotateitem.hxx %_DEST%\inc%_EXT%\svx\charrotateitem.hxx -..\inc\svx\charreliefitem.hxx %_DEST%\inc%_EXT%\svx\charreliefitem.hxx -..\inc\svx\paravertalignitem.hxx %_DEST%\inc%_EXT%\svx\paravertalignitem.hxx -..\inc\svx\dbaexchange.hxx %_DEST%\inc%_EXT%\svx\dbaexchange.hxx -..\inc\svx\dbaobjectex.hxx %_DEST%\inc%_EXT%\svx\dbaobjectex.hxx -..\inc\svx\ucsubset.hxx %_DEST%\inc%_EXT%\svx\ucsubset.hxx -..\inc\svx\ucsubset.hrc %_DEST%\inc%_EXT%\svx\ucsubset.hrc -..\inc\svx\dataaccessdescriptor.hxx %_DEST%\inc%_EXT%\svx\dataaccessdescriptor.hxx -..\inc\svx\frmdir.hxx %_DEST%\inc%_EXT%\svx\frmdir.hxx -..\inc\svx\frmdiritem.hxx %_DEST%\inc%_EXT%\svx\frmdiritem.hxx -..\inc\svx\frmdirlbox.hxx %_DEST%\inc%_EXT%\svx\frmdirlbox.hxx -..\inc\svx\AccessibleContextBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleContextBase.hxx -..\inc\svx\AccessibleComponentBase.hxx %_DEST%\inc%_EXT%\svx\AccessibleComponentBase.hxx -..\inc\svx\AccessibleShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleShape.hxx -..\inc\svx\AccessibleGraphicShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleGraphicShape.hxx -..\inc\svx\AccessibleOLEShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleOLEShape.hxx -..\inc\svx\AccessibleShapeTreeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeTreeInfo.hxx -..\inc\svx\AccessibleShapeInfo.hxx %_DEST%\inc%_EXT%\svx\AccessibleShapeInfo.hxx -..\inc\svx\AccessibleControlShape.hxx %_DEST%\inc%_EXT%\svx\AccessibleControlShape.hxx -..\inc\svx\IAccessibleViewForwarder.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarder.hxx -..\inc\svx\IAccessibleViewForwarderListener.hxx %_DEST%\inc%_EXT%\svx\IAccessibleViewForwarderListener.hxx -..\inc\svx\IAccessibleParent.hxx %_DEST%\inc%_EXT%\svx\IAccessibleParent.hxx -..\inc\svx\ChildrenManager.hxx %_DEST%\inc%_EXT%\svx\ChildrenManager.hxx -..\inc\svx\ShapeTypeHandler.hxx %_DEST%\inc%_EXT%\svx\ShapeTypeHandler.hxx -..\inc\svx\SvxShapeTypes.hxx %_DEST%\inc%_EXT%\svx\SvxShapeTypes.hxx -..\inc\svx\writingmodeitem.hxx %_DEST%\inc%_EXT%\svx\writingmodeitem.hxx -..\inc\svx\svdoashp.hxx %_DEST%\inc%_EXT%\svx\svdoashp.hxx -..\inc\svx\extrusionbar.hxx %_DEST%\inc%_EXT%\svx\extrusionbar.hxx -..\inc\svx\fontworkbar.hxx %_DEST%\inc%_EXT%\svx\fontworkbar.hxx -..\inc\svx\svxdlg.hxx %_DEST%\inc%_EXT%\svx\svxdlg.hxx -..\inc\svx\tbxcolorupdate.hxx %_DEST%\inc%_EXT%\svx\tbxcolorupdate.hxx -..\inc\svx\svxdllapi.h %_DEST%\inc%_EXT%\svx\svxdllapi.h -..\inc\svx\SmartTagMgr.hxx %_DEST%\inc%_EXT%\svx\SmartTagMgr.hxx -..\inc\svx\SmartTagItem.hxx %_DEST%\inc%_EXT%\svx\SmartTagItem.hxx -..\inc\svx\SmartTagCtl.hxx %_DEST%\inc%_EXT%\svx\SmartTagCtl.hxx -..\inc\svx\databaselocationinput.hxx %_DEST%\inc%_EXT%\svx\databaselocationinput.hxx -..\inc\svx\dbcharsethelper.hxx %_DEST%\inc%_EXT%\svx\dbcharsethelper.hxx -..\inc\svx\dbtoolsclient.hxx %_DEST%\inc%_EXT%\svx\dbtoolsclient.hxx - -..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx -..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx -..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx -..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx -..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx -..\inc\svx\optimprove.hxx %_DEST%\inc%_EXT%\svx\optimprove.hxx mkdir: %_DEST%\inc%_EXT%\svx\sdr mkdir: %_DEST%\inc%_EXT%\svx\sdr\properties @@ -683,12 +127,4 @@ mkdir: %_DEST%\inc%_EXT%\svx\sdr\table ..\uiconfig\accelerator\en-US\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\en-US\*.xml ..\uiconfig\accelerator\es\*.xml %_DEST%\xml%_EXT%\uiconfig\global\accelerator\es\*.xml -..\inc\svx\subtoolboxcontrol.hxx %_DEST%\inc%_EXT%\svx\subtoolboxcontrol.hxx -..\inc\svx\svdtext.hxx %_DEST%\inc%_EXT%\svx\svdtext.hxx -..\inc\svx\svdotable.hxx %_DEST%\inc%_EXT%\svx\svdotable.hxx -..\inc\svx\selectioncontroller.hxx %_DEST%\inc%_EXT%\svx\selectioncontroller.hxx -..\inc\svx\helperhittest3d.hxx %_DEST%\inc%_EXT%\svx\helperhittest3d.hxx -..\inc\svx\optimprove.hxx %_DEST%\inc%_EXT%\svx\optimprove.hxx -..\inc\svx\msvbahelper.hxx %_DEST%\inc%_EXT%\svx\msvbahelper.hxx - ..\%__SRC%\bin\*-layout.zip %_DEST%\pck%_EXT%\*.* diff --git a/svx/source/accessibility/AccessibleControlShape.cxx b/svx/source/accessibility/AccessibleControlShape.cxx index 610f219c21cf..2bca7593f423 100644 --- a/svx/source/accessibility/AccessibleControlShape.cxx +++ b/svx/source/accessibility/AccessibleControlShape.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <svx/AccessibleControlShape.hxx> #include <svx/AccessibleShapeInfo.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/drawing/XControlShape.hpp> #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> @@ -39,14 +39,14 @@ #include <comphelper/processfactory.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <svx/svdouno.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <comphelper/accessiblewrapper.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <algorithm> using namespace ::comphelper; diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 28cdb8b0882b..4c1869f6997a 100755 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/AccessibleShape.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <svx/AccessibleShapeInfo.hxx> #include <com/sun/star/view/XSelectionSupplier.hpp> #include <rtl/uuid.h> @@ -51,7 +51,7 @@ #include <svx/unoshtxt.hxx> #include <svx/svdobj.hxx> #include <svx/svdmodel.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <com/sun/star/uno/Exception.hpp> #include <svx/ShapeTypeHandler.hxx> #include <svx/SvxShapeTypes.hxx> @@ -59,7 +59,7 @@ #ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" #endif -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> #include <vcl/svapp.hxx> #include <unotools/accessiblestatesethelper.hxx> diff --git a/svx/source/accessibility/DescriptionGenerator.cxx b/svx/source/accessibility/DescriptionGenerator.cxx index 010bc5decfeb..8587639fa1fa 100644 --- a/svx/source/accessibility/DescriptionGenerator.cxx +++ b/svx/source/accessibility/DescriptionGenerator.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/beans/PropertyState.hpp> #include <com/sun/star/beans/XPropertySet.hpp> #include <com/sun/star/beans/XPropertyState.hpp> @@ -52,12 +52,12 @@ #ifndef _SVX_ACCESSIBILITY_HRC #include "accessibility.hrc" #endif -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/dialmgr.hxx> #include <tools/string.hxx> #include <svx/xdef.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "accessibility.hrc" #include "DGColorNameLookUp.hxx" diff --git a/svx/source/accessibility/GraphCtlAccessibleContext.cxx b/svx/source/accessibility/GraphCtlAccessibleContext.cxx index b0523bda67e1..0119e7c71cbf 100644 --- a/svx/source/accessibility/GraphCtlAccessibleContext.cxx +++ b/svx/source/accessibility/GraphCtlAccessibleContext.cxx @@ -45,7 +45,7 @@ #include <toolkit/helper/convert.hxx> #include <svtools/colorcfg.hxx> #include <comphelper/accessibleeventnotifier.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //===== local includes ======================================================== #include <svx/ShapeTypeHandler.hxx> diff --git a/svx/source/accessibility/ShapeTypeHandler.cxx b/svx/source/accessibility/ShapeTypeHandler.cxx index 228f2ed50492..4a4cad786b58 100755 --- a/svx/source/accessibility/ShapeTypeHandler.cxx +++ b/svx/source/accessibility/ShapeTypeHandler.cxx @@ -35,7 +35,7 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <svx/dialmgr.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" using namespace ::rtl; diff --git a/svx/source/customshapes/EnhancedCustomShape2d.cxx b/svx/source/customshapes/EnhancedCustomShape2d.cxx index 28ad49c6b65f..9ae86971a432 100644 --- a/svx/source/customshapes/EnhancedCustomShape2d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape2d.cxx @@ -27,9 +27,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShape2d.hxx" -#include "EnhancedCustomShapeGeometry.hxx" -#include "EnhancedCustomShapeTypeNames.hxx" +#include "svx/EnhancedCustomShape2d.hxx" +#include "svx/EnhancedCustomShapeGeometry.hxx" +#include "svx/EnhancedCustomShapeTypeNames.hxx" #include <svx/svdoashp.hxx> #include <svx/svdtrans.hxx> #include <svx/svdocirc.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShape3d.cxx b/svx/source/customshapes/EnhancedCustomShape3d.cxx index 059bb8f43b5c..3545805f4966 100644 --- a/svx/source/customshapes/EnhancedCustomShape3d.cxx +++ b/svx/source/customshapes/EnhancedCustomShape3d.cxx @@ -31,7 +31,7 @@ #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> #include <tools/poly.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> #include <svl/poolitem.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx index 237a0537d472..ae7a1398c9e7 100644 --- a/svx/source/customshapes/EnhancedCustomShapeEngine.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeEngine.cxx @@ -28,16 +28,16 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "EnhancedCustomShapeEngine.hxx" -#include "EnhancedCustomShape2d.hxx" +#include "svx/EnhancedCustomShape2d.hxx" #include "EnhancedCustomShape3d.hxx" #include "EnhancedCustomShapeFontWork.hxx" #include "EnhancedCustomShapeHandle.hxx" -#include "EnhancedCustomShapeGeometry.hxx" +#include "svx/EnhancedCustomShapeGeometry.hxx" #include <svx/unoshape.hxx> #ifndef _SVX_UNOPAGE_HXX #include "svx/unopage.hxx" #endif -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdobj.hxx> #include <svx/svdoashp.hxx> #include <svx/svdogrp.hxx> @@ -49,7 +49,7 @@ #include <svx/svdopath.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "unopolyhelper.hxx" #include <uno/mapping.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx index 06c7098400a3..5a24cb1fd75d 100644 --- a/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFontWork.cxx @@ -38,7 +38,7 @@ #include <svx/sdasaitm.hxx> #include <svx/sdtfsitm.hxx> #include <vcl/virdev.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <vcl/metric.hxx> #include <editeng/eeitem.hxx> #include <editeng/frmdiritem.hxx> @@ -46,7 +46,7 @@ #include <editeng/postitem.hxx> #include <editeng/wghtitem.hxx> #include <editeng/charscaleitem.hxx> -#include "EnhancedCustomShapeTypeNames.hxx" +#include "svx/EnhancedCustomShapeTypeNames.hxx" #include <svx/svdorect.hxx> #include <svx/svdoashp.hxx> #include <editeng/outliner.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx index a00a625693c4..dafd0d868963 100755 --- a/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeFunctionParser.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShape2d.hxx" +#include "svx/EnhancedCustomShape2d.hxx" #include <rtl/ustring.hxx> #include <tools/fract.hxx> diff --git a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx index aa8d7c253e6e..2bf28c81ca18 100644 --- a/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeGeometry.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShapeGeometry.hxx" +#include "svx/EnhancedCustomShapeGeometry.hxx" #include <com/sun/star/drawing/EnhancedCustomShapeGluePointType.hpp> /* static const SvxMSDffVertPair Vert[] = diff --git a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx index 0a87ad57d660..92104f0ae82e 100644 --- a/svx/source/customshapes/EnhancedCustomShapeHandle.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeHandle.cxx @@ -28,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "EnhancedCustomShapeHandle.hxx" -#include "EnhancedCustomShape2d.hxx" -#include "unoapi.hxx" +#include "svx/EnhancedCustomShape2d.hxx" +#include "svx/unoapi.hxx" // ----------------------------------------------------------------------------- diff --git a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx index c3651f3b54cf..093bae0d2a2d 100644 --- a/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx +++ b/svx/source/customshapes/EnhancedCustomShapeTypeNames.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "EnhancedCustomShapeTypeNames.hxx" +#include "svx/EnhancedCustomShapeTypeNames.hxx" #include <osl/mutex.hxx> #include <hash_map> diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx index b3c4645a58f9..4cec80db354d 100644 --- a/svx/source/customshapes/tbxcustomshapes.cxx +++ b/svx/source/customshapes/tbxcustomshapes.cxx @@ -43,7 +43,7 @@ #include <sfx2/imagemgr.hxx> #include <vcl/svapp.hxx> -#include "tbxcustomshapes.hxx" +#include "svx/tbxcustomshapes.hxx" SFX_IMPL_TOOLBOX_CONTROL(SvxTbxCtlCustomShapes, SfxBoolItem); diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 2eee0268816a..26dc3137aa52 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -52,7 +52,7 @@ #define _XOUTBMP_STATICS_ONLY #include <svx/dialmgr.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <svx/contdlg.hxx> @@ -61,7 +61,7 @@ #include "contwnd.hxx" #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <vcl/svapp.hxx> /******************************************************************************/ diff --git a/svx/source/dialog/connctrl.cxx b/svx/source/dialog/connctrl.cxx index 79e563510dbc..84670ee32418 100644 --- a/svx/source/dialog/connctrl.cxx +++ b/svx/source/dialog/connctrl.cxx @@ -37,9 +37,9 @@ #include <svx/svdpage.hxx> // SdrObjList -#include "connctrl.hxx" +#include "svx/connctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" // #110094# #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> diff --git a/svx/source/dialog/contwnd.cxx b/svx/source/dialog/contwnd.cxx index 590408bf6707..5019be9f9472 100644 --- a/svx/source/dialog/contwnd.cxx +++ b/svx/source/dialog/contwnd.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> #include <contdlg.hrc> @@ -40,7 +40,7 @@ #include <basegfx/polygon/b2dpolypolygontools.hxx> // #i75482# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #define TRANSCOL Color( COL_WHITE ) diff --git a/svx/source/dialog/databaseregistrationui.cxx b/svx/source/dialog/databaseregistrationui.cxx index fb7b4a6903ef..68c7d970fecb 100644 --- a/svx/source/dialog/databaseregistrationui.cxx +++ b/svx/source/dialog/databaseregistrationui.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" // === includes (declaration) ============================================ -#include "databaseregistrationui.hxx" +#include "svx/databaseregistrationui.hxx" // === includes (UNO) ==================================================== // === /includes (UNO) =================================================== diff --git a/svx/source/dialog/dialcontrol.cxx b/svx/source/dialog/dialcontrol.cxx index 0d5e6ed4bd6f..562b194ab56a 100644 --- a/svx/source/dialog/dialcontrol.cxx +++ b/svx/source/dialog/dialcontrol.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" #include <math.h> #include <vcl/virdev.hxx> diff --git a/svx/source/dialog/dlgutil.cxx b/svx/source/dialog/dlgutil.cxx index 6c7a42f90970..dede78faef1d 100644 --- a/svx/source/dialog/dlgutil.cxx +++ b/svx/source/dialog/dlgutil.cxx @@ -30,7 +30,7 @@ // include --------------------------------------------------------------- -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svl/itemset.hxx> #include <sfx2/sfxsids.hrc> #include <sfx2/module.hxx> diff --git a/svx/source/dialog/fontlb.cxx b/svx/source/dialog/fontlb.cxx index 6443c12b427b..a6b03a17d890 100644 --- a/svx/source/dialog/fontlb.cxx +++ b/svx/source/dialog/fontlb.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fontlb.hxx" +#include "svx/fontlb.hxx" #include <vcl/svapp.hxx> // ============================================================================ diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 054a76fec493..c62cea74c69a 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -41,7 +41,7 @@ #include <svx/xtextit.hxx> #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialogs.hrc> #include "fontwork.hrc" diff --git a/svx/source/dialog/graphctl.cxx b/svx/source/dialog/graphctl.cxx index a50bc6247a5f..7c0794d8bb6e 100644 --- a/svx/source/dialog/graphctl.cxx +++ b/svx/source/dialog/graphctl.cxx @@ -41,12 +41,12 @@ #include <svx/graphctl.hxx> #include "GraphCtlAccessibleContext.hxx" -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svx/svxids.hrc> #include <svx/svdpage.hxx> // #i72889# -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" /************************************************************************* |* diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx index 729d4f748921..de6924c3147b 100644 --- a/svx/source/dialog/hdft.cxx +++ b/svx/source/dialog/hdft.cxx @@ -46,9 +46,9 @@ #include <svx/hdft.hxx> #include <svx/pageitem.hxx> //CHINA001 #include "bbdlg.hxx" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> -#include "htmlmode.hxx" +#include "svx/htmlmode.hxx" #include <editeng/brshitem.hxx> #include <editeng/lrspitem.hxx> diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 6828f222facc..dcca52044531 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- #include <vcl/settings.hxx> #include <unotools/viewoptions.hxx> -#include "hyperdlg.hxx" +#include "svx/hyperdlg.hxx" #include <svx/svxdlg.hxx> //CHINA001 #include <sfx2/app.hxx> #include <sfx2/sfxsids.hrc> diff --git a/svx/source/dialog/hyprlink.cxx b/svx/source/dialog/hyprlink.cxx index c7c9f7a22939..b8f150736ea1 100644 --- a/svx/source/dialog/hyprlink.cxx +++ b/svx/source/dialog/hyprlink.cxx @@ -43,11 +43,11 @@ #include <sfx2/objsh.hxx> #include <comphelper/processfactory.hxx> -#include "hlnkitem.hxx" +#include "svx/hlnkitem.hxx" #include <svx/dialogs.hrc> #include "hyprlink.hrc" #include <svx/dialmgr.hxx> -#include "hyprlink.hxx" +#include "svx/hyprlink.hxx" #include "hyprdlg.hxx" using namespace ::rtl; diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index e876431b13ec..df396bf99f41 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -68,7 +68,7 @@ #endif #define _IMAPDLG_PRIVATE -#include "imapdlg.hxx" +#include "svx/imapdlg.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> @@ -76,7 +76,7 @@ #include "imapdlg.hrc" #include "imapwnd.hxx" #include "imapimp.hxx" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/svdtrans.hxx> #include <svx/svdopath.hxx> #include <vcl/svapp.hxx> diff --git a/svx/source/dialog/imapwnd.cxx b/svx/source/dialog/imapwnd.cxx index b4da78cabe59..4442cb76bad4 100644 --- a/svx/source/dialog/imapwnd.cxx +++ b/svx/source/dialog/imapwnd.cxx @@ -37,7 +37,7 @@ #include <svtools/imappoly.hxx> #include <svl/urlbmk.hxx> -#include <xoutbmp.hxx> +#include <svx/xoutbmp.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include <svx/svxids.hrc> diff --git a/svx/source/dialog/measctrl.cxx b/svx/source/dialog/measctrl.cxx index 3b56b443e2fe..13f29089b784 100644 --- a/svx/source/dialog/measctrl.cxx +++ b/svx/source/dialog/measctrl.cxx @@ -33,9 +33,9 @@ #include <svx/svdomeas.hxx> #include <svx/svdmodel.hxx> -#include "measctrl.hxx" +#include "svx/measctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" /************************************************************************* |* diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx index 7565539578df..f281580b93db 100644 --- a/svx/source/dialog/optgrid.cxx +++ b/svx/source/dialog/optgrid.cxx @@ -38,10 +38,10 @@ #include <svx/svxids.hrc> #include <svx/dialmgr.hxx> -#include "optgrid.hxx" +#include "svx/optgrid.hxx" #include <svx/dialogs.hrc> #include "optgrid.hrc" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" /* -----------------18.08.98 17:41------------------- * local functions diff --git a/svx/source/dialog/orienthelper.cxx b/svx/source/dialog/orienthelper.cxx index f546bb95dc21..95b6e5b4ca08 100644 --- a/svx/source/dialog/orienthelper.cxx +++ b/svx/source/dialog/orienthelper.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "orienthelper.hxx" +#include "svx/orienthelper.hxx" #include <vector> #include <utility> @@ -35,7 +35,7 @@ #ifndef _SV_BUTTON_HXX #include <vcl/button.hxx> #endif -#include "dialcontrol.hxx" +#include "svx/dialcontrol.hxx" namespace svx { diff --git a/svx/source/dialog/passwd.cxx b/svx/source/dialog/passwd.cxx index 19d97d368496..bb689c3fb8fa 100644 --- a/svx/source/dialog/passwd.cxx +++ b/svx/source/dialog/passwd.cxx @@ -36,7 +36,7 @@ #define _SVX_PASSWD_CXX -#include "passwd.hxx" +#include "svx/passwd.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> #include "passwd.hrc" diff --git a/svx/source/dialog/pfiledlg.cxx b/svx/source/dialog/pfiledlg.cxx index aa6e0b835e2c..6dd6f443aa6f 100644 --- a/svx/source/dialog/pfiledlg.cxx +++ b/svx/source/dialog/pfiledlg.cxx @@ -35,7 +35,7 @@ #include <comphelper/processfactory.hxx> -#include "pfiledlg.hxx" +#include "svx/pfiledlg.hxx" #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/dialog/prtqry.cxx b/svx/source/dialog/prtqry.cxx index 07f4d2fe9928..0a19d52958e3 100644 --- a/svx/source/dialog/prtqry.cxx +++ b/svx/source/dialog/prtqry.cxx @@ -31,7 +31,7 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#include <prtqry.hxx> +#include <svx/prtqry.hxx> #include <svx/dialmgr.hxx> #include <tools/shl.hxx> diff --git a/svx/source/dialog/relfld.cxx b/svx/source/dialog/relfld.cxx index 8cdb6ee5ba3f..1224de5ba6ea 100644 --- a/svx/source/dialog/relfld.cxx +++ b/svx/source/dialog/relfld.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- #include <tools/ref.hxx> -#include "relfld.hxx" +#include "svx/relfld.hxx" // ----------------------------------------------------------------------- diff --git a/svx/source/dialog/rlrcitem.cxx b/svx/source/dialog/rlrcitem.cxx index 38223bcb8893..23d62d4de85e 100644 --- a/svx/source/dialog/rlrcitem.cxx +++ b/svx/source/dialog/rlrcitem.cxx @@ -44,7 +44,7 @@ #include <editeng/tstpitem.hxx> #include "editeng/protitem.hxx" #include "rlrcitem.hxx" -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <svl/eitem.hxx> // class SvxRulerItem ---------------------------------------------------- diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 5a5839443170..d281802ac40e 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <rubydialog.hxx> +#include <svx/rubydialog.hxx> #include <tools/shl.hxx> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/dialog/rulritem.cxx b/svx/source/dialog/rulritem.cxx index fd0007cce8e5..331c38d6bdd6 100644 --- a/svx/source/dialog/rulritem.cxx +++ b/svx/source/dialog/rulritem.cxx @@ -30,7 +30,7 @@ #include <tools/string.hxx> #include <svx/dialogs.hrc> -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <com/sun/star/awt/Rectangle.hpp> #include <com/sun/star/frame/status/LeftRightMargin.hpp> #include <com/sun/star/frame/status/UpperLowerMargin.hpp> diff --git a/svx/source/dialog/srchctrl.cxx b/svx/source/dialog/srchctrl.cxx index 993288bcd622..479888463a5c 100644 --- a/svx/source/dialog/srchctrl.cxx +++ b/svx/source/dialog/srchctrl.cxx @@ -40,7 +40,7 @@ #include "srchctrl.hxx" -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svl/srchitem.hxx> // class SvxSearchFamilyControllerItem ----------------------------------- diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 5f3aa24394a3..ccf326ca77b1 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -56,7 +56,7 @@ #include <toolkit/unohlp.hxx> #define _SVX_SRCHDLG_CXX -#include "srchdlg.hxx" +#include "svx/srchdlg.hxx" #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> @@ -69,7 +69,7 @@ #include <svx/pageitem.hxx> #include "srchctrl.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <editeng/brshitem.hxx> #include <tools/resary.hxx> #include <svx/svxdlg.hxx> //CHINA001 diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx index cbf5a39997bd..482dc467d66c 100644 --- a/svx/source/dialog/svxbmpnumvalueset.cxx +++ b/svx/source/dialog/svxbmpnumvalueset.cxx @@ -41,7 +41,7 @@ #include <editeng/numitem.hxx> #include <svl/eitem.hxx> #include <vcl/svapp.hxx> -#include <gallery.hxx> +#include <svx/gallery.hxx> #include <svl/urihelper.hxx> #include <editeng/brshitem.hxx> #include <svl/intitem.hxx> @@ -49,14 +49,14 @@ #include <vcl/graph.hxx> #include <vcl/msgbox.hxx> #include <editeng/flstitem.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> #ifndef _XTABLE_HXX //autogen #include <svx/xtable.hxx> #endif -#include <drawitem.hxx> -#include <numvset.hxx> -#include <htmlmode.hxx> +#include <svx/drawitem.hxx> +#include <svx/numvset.hxx> +#include <svx/htmlmode.hxx> #include <unotools/pathoptions.hxx> #include <svtools/ctrltool.hxx> #include <editeng/unolingu.hxx> diff --git a/svx/source/dialog/svxgrahicitem.cxx b/svx/source/dialog/svxgrahicitem.cxx index 07daea2064ab..6d6d2cb126db 100644 --- a/svx/source/dialog/svxgrahicitem.cxx +++ b/svx/source/dialog/svxgrahicitem.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svxgrahicitem.hxx" +#include "svx/svxgrahicitem.hxx" TYPEINIT1(SvxGraphicItem,SfxPoolItem); SvxGraphicItem::SvxGraphicItem( USHORT _nWhich, const Graphic& rGraphic ) : SfxPoolItem( _nWhich ), aGraphic( rGraphic ) diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx index 00c1edaa7f04..36067cc78221 100644 --- a/svx/source/dialog/svxruler.cxx +++ b/svx/source/dialog/svxruler.cxx @@ -48,7 +48,7 @@ #include <svx/dialmgr.hxx> #include <svx/ruler.hxx> #include "rlrcitem.hxx" -#include "rulritem.hxx" +#include "svx/rulritem.hxx" #include <editeng/tstpitem.hxx> #include <editeng/lrspitem.hxx> #include "editeng/protitem.hxx" diff --git a/svx/source/dialog/swframeexample.cxx b/svx/source/dialog/swframeexample.cxx index f79e009bb332..8ba911fb90c0 100644 --- a/svx/source/dialog/swframeexample.cxx +++ b/svx/source/dialog/swframeexample.cxx @@ -33,7 +33,7 @@ #include <vcl/metric.hxx> #include <vcl/svapp.hxx> #include <svtools/colorcfg.hxx> -#include <swframeexample.hxx> +#include <svx/swframeexample.hxx> #include <com/sun/star/text/TextContentAnchorType.hpp> #include <com/sun/star/text/HoriOrientation.hpp> #include <com/sun/star/text/VertOrientation.hpp> diff --git a/svx/source/dialog/swframeposstrings.cxx b/svx/source/dialog/swframeposstrings.cxx index 7faa97230c92..03b2746ae3fd 100644 --- a/svx/source/dialog/swframeposstrings.cxx +++ b/svx/source/dialog/swframeposstrings.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <swframeposstrings.hxx> +#include <svx/swframeposstrings.hxx> #include <tools/rc.hxx> #include <tools/debug.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/dialog/swframeposstrings.src b/svx/source/dialog/swframeposstrings.src index 3c9788fa8c9e..c6a164630c5e 100644 --- a/svx/source/dialog/swframeposstrings.src +++ b/svx/source/dialog/swframeposstrings.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/dialogs.hrc> -//the following defines have to match the (enum values + 1) in swframeposstrings.hxx! +//the following defines have to match the (enum values + 1) in svx/swframeposstrings.hxx! #define STR_LEFT 1 #define STR_RIGHT 2 #define STR_FROMLEFT 3 diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx index 718989b84450..751184e929c7 100644 --- a/svx/source/dialog/txencbox.cxx +++ b/svx/source/dialog/txencbox.cxx @@ -28,8 +28,8 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "txencbox.hxx" -#include "txenctab.hxx" +#include "svx/txencbox.hxx" +#include "svx/txenctab.hxx" #include <svx/dialogs.hrc> #include "svx/dbcharsethelper.hxx" #include <vcl/svapp.hxx> diff --git a/svx/source/dialog/txenctab.cxx b/svx/source/dialog/txenctab.cxx index 3fc82705141c..74b60a08d2bd 100644 --- a/svx/source/dialog/txenctab.cxx +++ b/svx/source/dialog/txenctab.cxx @@ -30,7 +30,7 @@ #include <svx/dialogs.hrc> // -> RID_SVXSTR_TEXTENCODING_TABLE #include <svx/dialmgr.hxx> -#include "txenctab.hxx" +#include "svx/txenctab.hxx" #include <tools/shl.hxx> //------------------------------------------------------------------------ diff --git a/svx/source/dialog/wrapfield.cxx b/svx/source/dialog/wrapfield.cxx index 8c6da9f1ff81..ee152439254c 100644 --- a/svx/source/dialog/wrapfield.cxx +++ b/svx/source/dialog/wrapfield.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "wrapfield.hxx" +#include "svx/wrapfield.hxx" namespace svx { diff --git a/svx/source/engine3d/cube3d.cxx b/svx/source/engine3d/cube3d.cxx index 626ee80d46e3..b78d464d4897 100644 --- a/svx/source/engine3d/cube3d.cxx +++ b/svx/source/engine3d/cube3d.cxx @@ -28,10 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/cube3d.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <basegfx/point/b3dpoint.hxx> #include <basegfx/polygon/b3dpolygon.hxx> #include <svx/sdr/contact/viewcontactofe3dcube.hxx> diff --git a/svx/source/engine3d/extrud3d.cxx b/svx/source/engine3d/extrud3d.cxx index 7261586947c4..423a846d86a1 100644 --- a/svx/source/engine3d/extrud3d.cxx +++ b/svx/source/engine3d/extrud3d.cxx @@ -28,10 +28,10 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/extrud3d.hxx> #include <svx/scene3d.hxx> diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index 8ff6af906eaa..e1e90d88c22f 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -37,7 +37,7 @@ #include <tools/shl.hxx> #include <svx/xflclit.hxx> #include <svx/svdmodel.hxx> -#include <globl3d.hxx> +#include <svx/globl3d.hxx> #include <svx/view3d.hxx> #include <svx/obj3d.hxx> #include <svx/sphere3d.hxx> @@ -48,9 +48,9 @@ #include <svx/polysc3d.hxx> #include <editeng/eeitem.hxx> #include <svl/style.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> #include <svx/dialmgr.hxx> #include <svx/viewpt3d.hxx> // ProjectionType @@ -60,7 +60,7 @@ #include <editeng/colritem.hxx> #include <svx/e3ditem.hxx> -#include <gallery.hxx> +#include <svx/gallery.hxx> #define GALLERY_THEME "3D" #include <svl/whiter.hxx> diff --git a/svx/source/engine3d/helperhittest3d.cxx b/svx/source/engine3d/helperhittest3d.cxx index 78324c22ed27..c5e77870a073 100644 --- a/svx/source/engine3d/helperhittest3d.cxx +++ b/svx/source/engine3d/helperhittest3d.cxx @@ -32,7 +32,7 @@ #include <basegfx/point/b2dpoint.hxx> #include <svx/svdpage.hxx> #include <svx/scene3d.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <drawinglayer/processor3d/cutfindprocessor3d.hxx> #include <svx/sdr/contact/viewcontactofe3d.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> diff --git a/svx/source/engine3d/lathe3d.cxx b/svx/source/engine3d/lathe3d.cxx index e6953f96f766..4d88dce0fb4d 100644 --- a/svx/source/engine3d/lathe3d.cxx +++ b/svx/source/engine3d/lathe3d.cxx @@ -28,11 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <tools/poly.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/lathe3d.hxx> #include <svx/xpoly.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/engine3d/obj3d.cxx b/svx/source/engine3d/obj3d.cxx index 9f284d826d9f..c9ceb1ef78a6 100644 --- a/svx/source/engine3d/obj3d.cxx +++ b/svx/source/engine3d/obj3d.cxx @@ -28,14 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdview.hxx> #include <svx/svdattr.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> -#include "svditer.hxx" -#include "globl3d.hxx" +#include "svx/svditer.hxx" +#include "svx/globl3d.hxx" #include <svx/camera3d.hxx> #include <svx/scene3d.hxx> #include <svx/polysc3d.hxx> diff --git a/svx/source/engine3d/objfac3d.cxx b/svx/source/engine3d/objfac3d.cxx index 3b06b249558e..493e5260cd7e 100644 --- a/svx/source/engine3d/objfac3d.cxx +++ b/svx/source/engine3d/objfac3d.cxx @@ -28,14 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/cube3d.hxx> #include <svx/sphere3d.hxx> #include <svx/extrud3d.hxx> #include <svx/lathe3d.hxx> #include <svx/polygn3d.hxx> -#include "objfac3d.hxx" +#include "svx/objfac3d.hxx" #include <svx/svdobj.hxx> /************************************************************************* diff --git a/svx/source/engine3d/polygn3d.cxx b/svx/source/engine3d/polygn3d.cxx index e91689424e18..0ec26903d2c0 100644 --- a/svx/source/engine3d/polygn3d.cxx +++ b/svx/source/engine3d/polygn3d.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <svx/polygn3d.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <basegfx/point/b3dpoint.hxx> #include <svx/sdr/contact/viewcontactofe3dpolygon.hxx> #include <basegfx/polygon/b3dpolygon.hxx> diff --git a/svx/source/engine3d/polysc3d.cxx b/svx/source/engine3d/polysc3d.cxx index 3c002e2533b8..212f5ccae44a 100644 --- a/svx/source/engine3d/polysc3d.cxx +++ b/svx/source/engine3d/polysc3d.cxx @@ -30,14 +30,14 @@ #include <svx/xfillit.hxx> #include <svx/svdopath.hxx> #include <svx/svdogrp.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdetc.hxx> #include <vcl/virdev.hxx> #include <vcl/svapp.hxx> #include <svx/svdpage.hxx> #include <svx/svdpool.hxx> #include <svl/style.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/xlnclit.hxx> #include <svl/metitem.hxx> diff --git a/svx/source/engine3d/scene3d.cxx b/svx/source/engine3d/scene3d.cxx index d799aec38eb7..ae81680ca5be 100644 --- a/svx/source/engine3d/scene3d.cxx +++ b/svx/source/engine3d/scene3d.cxx @@ -28,14 +28,14 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" -#include "svditer.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svditer.hxx" #if defined( UNX ) || defined( ICC ) #include <stdlib.h> #endif -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/svdpage.hxx> #include <svl/style.hxx> #include <svx/scene3d.hxx> diff --git a/svx/source/engine3d/sphere3d.cxx b/svx/source/engine3d/sphere3d.cxx index ab9e3bc87f79..316c353ad7bb 100644 --- a/svx/source/engine3d/sphere3d.cxx +++ b/svx/source/engine3d/sphere3d.cxx @@ -28,11 +28,11 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/sphere3d.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/engine3d/view3d.cxx b/svx/source/engine3d/view3d.cxx index 97fee2250658..cb1165267739 100644 --- a/svx/source/engine3d/view3d.cxx +++ b/svx/source/engine3d/view3d.cxx @@ -32,7 +32,7 @@ #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> #include <tools/shl.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpool.hxx> #include <svx/svdorect.hxx> #include <svx/svdmodel.hxx> @@ -43,7 +43,7 @@ #include <svx/svdview.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/obj3d.hxx> #include <svx/lathe3d.hxx> #include <svx/sphere3d.hxx> @@ -64,7 +64,7 @@ #include <svx/xlnwtit.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/viewcontactofe3dscene.hxx> #include <drawinglayer/geometry/viewinformation3d.hxx> #include <svx/sdrpagewindow.hxx> diff --git a/svx/source/engine3d/view3d1.cxx b/svx/source/engine3d/view3d1.cxx index dce003fe90ae..121696d8ed6b 100644 --- a/svx/source/engine3d/view3d1.cxx +++ b/svx/source/engine3d/view3d1.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <tools/shl.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpool.hxx> #include <svx/svdmodel.hxx> #include <svx/svxids.hrc> @@ -37,7 +37,7 @@ #include <svx/fmview.hxx> #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/obj3d.hxx> #include <svx/polysc3d.hxx> #include <svx/e3ditem.hxx> diff --git a/svx/source/fmcomp/fmgridcl.cxx b/svx/source/fmcomp/fmgridcl.cxx index cbe9b49b81f1..82d0b538ce38 100644 --- a/svx/source/fmcomp/fmgridcl.cxx +++ b/svx/source/fmcomp/fmgridcl.cxx @@ -28,12 +28,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "dbexch.hrc" -#include "fmgridif.hxx" +#include "svx/dbexch.hrc" +#include "svx/fmgridif.hxx" #include "fmitems.hxx" #include "fmprop.hrc" #include "svx/fmtools.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmurl.hxx" #include "formcontrolfactory.hxx" diff --git a/svx/source/fmcomp/fmgridif.cxx b/svx/source/fmcomp/fmgridif.cxx index 2cc87eb9e648..b5ef21a0ae6f 100644 --- a/svx/source/fmcomp/fmgridif.cxx +++ b/svx/source/fmcomp/fmgridif.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmgridif.hxx" +#include "svx/fmgridif.hxx" #include "fmprop.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx index 6a3e4a17f5d7..debc0c8da2b1 100644 --- a/svx/source/fmcomp/gridcell.cxx +++ b/svx/source/fmcomp/gridcell.cxx @@ -30,7 +30,7 @@ #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmtools.hxx" #include "gridcell.hxx" #include "gridcols.hxx" diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx index 8cc52e4c0b7d..fa5a407f76dc 100644 --- a/svx/source/fmcomp/gridctrl.cxx +++ b/svx/source/fmcomp/gridctrl.cxx @@ -59,7 +59,7 @@ #include <vcl/menu.hxx> #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #ifndef _SVX_SVXIDS_HRC diff --git a/svx/source/fmcomp/gridctrl.src b/svx/source/fmcomp/gridctrl.src index e974f5b28b1a..46936200e712 100644 --- a/svx/source/fmcomp/gridctrl.src +++ b/svx/source/fmcomp/gridctrl.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include "globlmn.hrc" #include "fmhelp.hrc" diff --git a/svx/source/fmcomp/xmlexchg.cxx b/svx/source/fmcomp/xmlexchg.cxx index 5356e7c2b7dd..1026356e08c2 100644 --- a/svx/source/fmcomp/xmlexchg.cxx +++ b/svx/source/fmcomp/xmlexchg.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" #include <sot/formats.hxx> #include <sot/exchange.hxx> #include <tools/debug.hxx> diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx index 7b00319cb164..e1f069be96a6 100644 --- a/svx/source/form/ParseContext.cxx +++ b/svx/source/form/ParseContext.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" #include "stringlistresource.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/dialmgr.hxx> diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx index 7c23c0a2020d..c6df77774c77 100644 --- a/svx/source/form/databaselocationinput.cxx +++ b/svx/source/form/databaselocationinput.cxx @@ -31,7 +31,7 @@ #include "svx/databaselocationinput.hxx" #include "svx/dialmgr.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /** === begin UNO includes === **/ #include <com/sun/star/ui/dialogs/TemplateDescription.hpp> diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index e22ee66e0ea2..015d19407cc0 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -32,12 +32,12 @@ #include "fmservs.hxx" #include "datanavi.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" #include <svx/svxids.hrc> #include <tools/rcid.h> #include <tools/diagnose_ex.h> -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" #include <svx/dialmgr.hxx> #include <svx/fmshell.hxx> #include <svtools/miscopt.hxx> diff --git a/svx/source/form/datanavi.src b/svx/source/form/datanavi.src index 1b300c279312..4ddcba5d8ba8 100644 --- a/svx/source/form/datanavi.src +++ b/svx/source/form/datanavi.src @@ -27,7 +27,7 @@ #include "datanavi.hrc" #include "globlmn.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmhelp.hrc" #define MASKCOLOR MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; }; diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index 9d1b65208fdf..3b910652a96b 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -34,7 +34,7 @@ #include "fmhelp.hrc" #include "fmitems.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "gridcell.hxx" /** === begin UNO includes === **/ diff --git a/svx/source/form/filtnav.src b/svx/source/form/filtnav.src index 82b74e84331c..45aa7ef1721a 100644 --- a/svx/source/form/filtnav.src +++ b/svx/source/form/filtnav.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" Menu RID_FM_FILTER_MENU { ItemList = diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index bcc275896410..6768acfbe1f2 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -31,7 +31,7 @@ #include "fmhelp.hrc" #include "fmprop.hrc" #include "fmPropBrw.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmpgeimp.hxx" diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx index c50dcb398928..1481a1846a36 100644 --- a/svx/source/form/fmexch.cxx +++ b/svx/source/form/fmexch.cxx @@ -33,7 +33,7 @@ #include <svl/itempool.hxx> #ifndef _SVX_DBEXCH_HRC -#include <dbexch.hrc> +#include <svx/dbexch.hrc> #endif #include <sot/formats.hxx> #include <svtools/svtreebx.hxx> diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index c27b5b69d075..039c3361491d 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #ifndef _SVX_FMEXPL_HRC #include "fmexpl.hrc" @@ -54,7 +54,7 @@ #include "fmprop.hrc" #endif #include <svx/dialmgr.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <fmundo.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/form/fmexpl.src b/svx/source/form/fmexpl.src index 17881727cd5f..45c721d47972 100644 --- a/svx/source/form/fmexpl.src +++ b/svx/source/form/fmexpl.src @@ -26,7 +26,7 @@ ************************************************************************/ #include <svx/svxids.hrc> -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmexpl.hrc" #include "globlmn.hrc" Menu RID_FMEXPLORER_POPUPMENU diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx index e679779887a2..2b7ad83f7f5f 100644 --- a/svx/source/form/fmobj.cxx +++ b/svx/source/form/fmobj.cxx @@ -31,7 +31,7 @@ #include "fmprop.hrc" #include "fmvwimp.hxx" #include "fmpgeimp.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmview.hxx" #include "svx/fmglob.hxx" #include "svx/fmpage.hxx" diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx index ca96a9957ba7..1c7da93dfd95 100644 --- a/svx/source/form/fmobjfac.cxx +++ b/svx/source/form/fmobjfac.cxx @@ -33,7 +33,7 @@ #include "fmservs.hxx" #ifndef _FM_FMOBJFAC_HXX -#include "fmobjfac.hxx" +#include "svx/fmobjfac.hxx" #endif #ifndef _FM_FMGLOB_HXX @@ -56,7 +56,7 @@ #include <tools/resid.hxx> #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include <tools/shl.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx index 0a5c7da9ea3c..2c2999ee34ea 100644 --- a/svx/source/form/fmpage.cxx +++ b/svx/source/form/fmpage.cxx @@ -44,7 +44,7 @@ #ifndef SVX_LIGHT #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #endif #include <tools/shl.hxx> @@ -61,7 +61,7 @@ #include <sfx2/objsh.hxx> #endif #endif -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdview.hxx> #include <tools/urlobj.hxx> #include <vcl/help.hxx> diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx index 3ade4bdd3091..e239e982dd66 100644 --- a/svx/source/form/fmpgeimp.cxx +++ b/svx/source/form/fmpgeimp.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include "fmpgeimp.hxx" #include "fmundo.hxx" #include "svx/fmtools.hxx" @@ -36,8 +36,8 @@ #include "fmservs.hxx" #include "fmobj.hxx" #include "formcontrolfactory.hxx" -#include "svditer.hxx" -#include "fmresids.hrc" +#include "svx/svditer.hxx" +#include "svx/fmresids.hrc" #include "svx/dbtoolsclient.hxx" #include "treevisitor.hxx" diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx index 828791a3d035..e554a4dbf611 100644 --- a/svx/source/form/fmshell.cxx +++ b/svx/source/form/fmshell.cxx @@ -64,7 +64,7 @@ #include <sfx2/objsh.hxx> #include <svx/svdobj.hxx> #include <svx/fmpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #ifndef _SVX_SVXIDS_HRC @@ -72,7 +72,7 @@ #endif #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "fmexch.hxx" #include <svx/fmglob.hxx> @@ -285,7 +285,7 @@ void FmFormShell::NotifyMarkListChanged(FmFormView* pWhichView) } //------------------------------------------------------------------------ -sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool bForBrowsing) +sal_uInt16 FmFormShell::PrepareClose(sal_Bool bUI, sal_Bool /*bForBrowsing*/) { if ( GetImpl()->didPrepareClose() ) // we already did a PrepareClose for the current modifications of the current form diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index 463749b68364..888c30969f6b 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -33,7 +33,7 @@ #include "fmpgeimp.hxx" #include "svx/fmtools.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "fmtextcontrolshell.hxx" @@ -42,7 +42,7 @@ #include "fmvwimp.hxx" #include "formtoolbars.hxx" #include "gridcols.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "svx/dialmgr.hxx" #include "svx/dialogs.hrc" #include "svx/fmglob.hxx" diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx index 243b45e099fb..dc396feec29f 100644 --- a/svx/source/form/fmsrccfg.cxx +++ b/svx/source/form/fmsrccfg.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <svl/filerec.hxx> #include <com/sun/star/i18n/TransliterationModules.hpp> #include <comphelper/processfactory.hxx> diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx index a4bb5753e8bb..fcb6261f4106 100644 --- a/svx/source/form/fmsrcimp.cxx +++ b/svx/source/form/fmsrcimp.cxx @@ -29,10 +29,10 @@ #include "precompiled_svx.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <tools/debug.hxx> #include <tools/diagnose_ex.h> #include <tools/wldcrd.hxx> @@ -63,7 +63,7 @@ #include "fmprop.hrc" #endif #include "fmservs.hxx" -#include "fmsrcimp.hxx" +#include "svx/fmsrcimp.hxx" #include <svx/fmsearch.hxx> #include <comphelper/numbers.hxx> diff --git a/svx/source/form/fmstring.src b/svx/source/form/fmstring.src index 8e3df1a8cdf5..91b5d28203a0 100644 --- a/svx/source/form/fmstring.src +++ b/svx/source/form/fmstring.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" /* Strings fuer Uebersetzung */ String RID_ERR_CONTEXT_ADDFORM { diff --git a/svx/source/form/fmtextcontroldialogs.cxx b/svx/source/form/fmtextcontroldialogs.cxx index c10bdfe14ec5..d758b5622e0b 100644 --- a/svx/source/form/fmtextcontroldialogs.cxx +++ b/svx/source/form/fmtextcontroldialogs.cxx @@ -44,7 +44,7 @@ //#include "tabstpge.hxx" #endif -#include "flagsdef.hxx" +#include "svx/flagsdef.hxx" #include <svl/intitem.hxx> #include <com/sun/star/uno/Sequence.hxx> diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx index 430c52cfa4db..98eeb3927e69 100644 --- a/svx/source/form/fmtextcontrolshell.cxx +++ b/svx/source/form/fmtextcontrolshell.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmtextcontroldialogs.hxx" #include "fmtextcontrolfeature.hxx" #include "fmtextcontrolshell.hxx" diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx index ba7ba492c2fb..c777fe4da28e 100644 --- a/svx/source/form/fmundo.cxx +++ b/svx/source/form/fmundo.cxx @@ -31,10 +31,10 @@ #include "fmundo.hxx" #include "fmpgeimp.hxx" #include "svx/dbtoolsclient.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmobj.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "svx/fmglob.hxx" #include "svx/dialmgr.hxx" #include "svx/fmmodel.hxx" diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index fd7da1f7eb8f..462e95d38514 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -50,7 +50,7 @@ #include <basic/sbx.hxx> #include "fmitems.hxx" #include "fmobj.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpagv.hxx> #include <svx/svdogrp.hxx> #include <svx/fmview.hxx> @@ -76,7 +76,7 @@ #include <vcl/stdtext.hxx> #include <svx/fmglob.hxx> #include <svx/sdrpagewindow.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" using namespace ::com::sun::star; using namespace ::com::sun::star::uno; diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx index 1b5c7daf371c..dae216753d22 100644 --- a/svx/source/form/fmvwimp.cxx +++ b/svx/source/form/fmvwimp.cxx @@ -32,15 +32,15 @@ #include "fmobj.hxx" #include "fmpgeimp.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "fmshimp.hxx" #include "svx/fmtools.hxx" #include "fmundo.hxx" #include "fmvwimp.hxx" #include "formcontrolfactory.hxx" -#include "sdrpaintwindow.hxx" -#include "svditer.hxx" +#include "svx/sdrpaintwindow.hxx" +#include "svx/svditer.hxx" #include "svx/dataaccessdescriptor.hxx" #include "svx/dialmgr.hxx" #include "svx/fmglob.hxx" @@ -51,7 +51,7 @@ #include "svx/sdrpagewindow.hxx" #include "svx/svdogrp.hxx" #include "svx/svdpagv.hxx" -#include "xmlexchg.hxx" +#include "svx/xmlexchg.hxx" /** === begin UNO includes === **/ #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp> diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx index 5d222e7f5e88..32a234396c54 100644 --- a/svx/source/form/formcontrolfactory.cxx +++ b/svx/source/form/formcontrolfactory.cxx @@ -31,7 +31,7 @@ #include "formcontrolfactory.hxx" #include "fmcontrollayout.hxx" #include "fmprop.hrc" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "svx/dialmgr.hxx" #include "svx/svdouno.hxx" diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx index b8292785b457..a91b18b29cda 100644 --- a/svx/source/form/formcontroller.cxx +++ b/svx/source/form/formcontroller.cxx @@ -36,7 +36,7 @@ #include "formcontrolling.hxx" #include "fmprop.hrc" #include "svx/dialmgr.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmservs.hxx" #include "svx/fmtools.hxx" #include "fmurl.hxx" diff --git a/svx/source/form/formshell.src b/svx/source/form/formshell.src index 5a7e25e14f13..65171bd07646 100644 --- a/svx/source/form/formshell.src +++ b/svx/source/form/formshell.src @@ -25,7 +25,7 @@ * ************************************************************************/ -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include <svx/svxids.hrc> #include <svx/dialogs.hrc> #include <sfx2/sfxsids.hrc> diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx index 0c83655042d2..d4249e5fa4ec 100644 --- a/svx/source/form/navigatortree.cxx +++ b/svx/source/form/navigatortree.cxx @@ -32,12 +32,12 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/svdpagv.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "fmhelp.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmservs.hxx" #include "fmundo.hxx" @@ -57,7 +57,7 @@ #include <com/sun/star/script/XEventAttacherManager.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> #include <com/sun/star/datatransfer/XTransferable.hpp> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svxdlg.hxx> //CHINA001 #include <svx/dialogs.hrc> //CHINA001 diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx index 24a7d2c5d3d7..2065295006e9 100644 --- a/svx/source/form/navigatortreemodel.cxx +++ b/svx/source/form/navigatortreemodel.cxx @@ -32,7 +32,7 @@ #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svx/fmglob.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdogrp.hxx> #include <svx/svdpagv.hxx> @@ -42,7 +42,7 @@ #include "fmhelp.hrc" #include "fmexpl.hrc" #include "fmexpl.hxx" -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #include "fmshimp.hxx" #include "fmobj.hxx" #include <sfx2/objsh.hxx> diff --git a/svx/source/form/sqlparserclient.cxx b/svx/source/form/sqlparserclient.cxx index 4b187bbb2b7d..a63db6e96d62 100644 --- a/svx/source/form/sqlparserclient.cxx +++ b/svx/source/form/sqlparserclient.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include "sqlparserclient.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" //........................................................................ namespace svxform diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index 7a51348dfaa3..aeb62d79f3f7 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -61,7 +61,7 @@ #endif #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include <svx/dialmgr.hxx> #include <tools/shl.hxx> diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx index f275fd9efd72..fb13eddd15f0 100644 --- a/svx/source/form/tbxform.cxx +++ b/svx/source/form/tbxform.cxx @@ -45,11 +45,11 @@ #ifndef _SVX_DIALOGS_HRC #include <svx/dialogs.hrc> #endif -#include "tbxctl.hxx" -#include "tbxdraw.hxx" +#include "svx/tbxctl.hxx" +#include "svx/tbxdraw.hxx" #include "tbxform.hxx" #ifndef _SVX_FMRESIDS_HRC -#include "fmresids.hrc" +#include "svx/fmresids.hrc" #endif #include "fmitems.hxx" #ifndef _SVX_FMHELP_HRC diff --git a/svx/source/form/typemap.cxx b/svx/source/form/typemap.cxx index f465e9d88dad..c12bb313f862 100644 --- a/svx/source/form/typemap.cxx +++ b/svx/source/form/typemap.cxx @@ -38,7 +38,7 @@ #include <editeng/shdditem.hxx> #include <editeng/postitem.hxx> #ifndef _SVX_CLIPBOARDCTL_HXX_ -#include "clipfmtitem.hxx" +#include "svx/clipfmtitem.hxx" #endif #include <editeng/fhgtitem.hxx> #include "editeng/fontitem.hxx" diff --git a/svx/source/gallery2/galbrws.cxx b/svx/source/gallery2/galbrws.cxx index b048da9bf022..b972dccd9ab7 100644 --- a/svx/source/gallery2/galbrws.cxx +++ b/svx/source/gallery2/galbrws.cxx @@ -38,7 +38,7 @@ #include "svx/gallery1.hxx" #include "galbrws1.hxx" #include "galbrws2.hxx" -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ------------------- // - GallerySplitter - diff --git a/svx/source/gallery2/galbrws1.cxx b/svx/source/gallery2/galbrws1.cxx index ccbcd40862de..04f402804b0c 100644 --- a/svx/source/gallery2/galbrws1.cxx +++ b/svx/source/gallery2/galbrws1.cxx @@ -35,7 +35,7 @@ #include <sfx2/app.hxx> #include "helpid.hrc" #include "svx/gallery1.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include "galbrws1.hxx" #include <com/sun/star/util/DateTime.hpp> diff --git a/svx/source/gallery2/galbrws1.hxx b/svx/source/gallery2/galbrws1.hxx index 91740fafcb14..2903dcabef59 100644 --- a/svx/source/gallery2/galbrws1.hxx +++ b/svx/source/gallery2/galbrws1.hxx @@ -30,7 +30,7 @@ #include <vcl/menu.hxx> #include <svl/lstner.hxx> #include <vector> -#include "galbrws.hxx" +#include "svx/galbrws.hxx" // ----------------- // - GalleryButton - diff --git a/svx/source/gallery2/galbrws2.cxx b/svx/source/gallery2/galbrws2.cxx index 0483a1bc1425..045b52aa2e53 100644 --- a/svx/source/gallery2/galbrws2.cxx +++ b/svx/source/gallery2/galbrws2.cxx @@ -44,11 +44,11 @@ #include "svtools/filter.hxx" #include <editeng/brshitem.hxx> #include "helpid.hrc" -#include "gallery.hxx" +#include "svx/gallery.hxx" #include "galobj.hxx" #include "svx/gallery1.hxx" -#include "galtheme.hxx" -#include "galctrl.hxx" +#include "svx/galtheme.hxx" +#include "svx/galctrl.hxx" #include "svx/galmisc.hxx" #include "galbrws2.hxx" #include "gallery.hrc" diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx index 8022cecc0fbe..d6817134fefb 100644 --- a/svx/source/gallery2/galctrl.cxx +++ b/svx/source/gallery2/galctrl.cxx @@ -34,9 +34,9 @@ #include <avmedia/mediaplayer.hxx> #include "helpid.hrc" #include "galbrws2.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" -#include "galctrl.hxx" +#include "svx/galctrl.hxx" #include "editeng/AccessibleStringWrap.hxx" #include <editeng/svxfont.hxx> #include "galobj.hxx" diff --git a/svx/source/gallery2/galexpl.cxx b/svx/source/gallery2/galexpl.cxx index 7e5b6fe5e3a9..cad6780f11f7 100644 --- a/svx/source/gallery2/galexpl.cxx +++ b/svx/source/gallery2/galexpl.cxx @@ -31,9 +31,9 @@ #include <unotools/pathoptions.hxx> #include <sfx2/viewfrm.hxx> #include "svx/gallery1.hxx" -#include "galtheme.hxx" -#include "galbrws.hxx" -#include "gallery.hxx" +#include "svx/galtheme.hxx" +#include "svx/galbrws.hxx" +#include "svx/gallery.hxx" #include "galobj.hxx" // ----------- diff --git a/svx/source/gallery2/gallery1.cxx b/svx/source/gallery2/gallery1.cxx index 419e160e6765..32ad01aca4a2 100644 --- a/svx/source/gallery2/gallery1.cxx +++ b/svx/source/gallery2/gallery1.cxx @@ -35,10 +35,10 @@ #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> #include <sfx2/docfile.hxx> -#include "gallery.hxx" +#include "svx/gallery.hxx" #include "gallery.hrc" #include "svx/galmisc.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/gallery1.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> diff --git a/svx/source/gallery2/galmisc.cxx b/svx/source/gallery2/galmisc.cxx index 10dd5949dee2..835c7dc3e731 100644 --- a/svx/source/gallery2/galmisc.cxx +++ b/svx/source/gallery2/galmisc.cxx @@ -51,7 +51,7 @@ #include "codec.hxx" #include "gallery.hrc" #include "svx/gallery1.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> diff --git a/svx/source/gallery2/galtheme.cxx b/svx/source/gallery2/galtheme.cxx index 8fd38025f4a5..730c1179a07e 100644 --- a/svx/source/gallery2/galtheme.cxx +++ b/svx/source/gallery2/galtheme.cxx @@ -52,7 +52,7 @@ #include <svx/fmmodel.hxx> #include <svx/fmview.hxx> #include "svx/galmisc.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include <com/sun/star/sdbc/XResultSet.hpp> #include <com/sun/star/ucb/XContentAccess.hpp> #include <com/sun/star/io/XInputStream.hpp> diff --git a/svx/source/gengal/gengal.cxx b/svx/source/gengal/gengal.cxx index bc8e6ef7c4bd..566aac738dd1 100644 --- a/svx/source/gengal/gengal.cxx +++ b/svx/source/gengal/gengal.cxx @@ -67,7 +67,7 @@ #include <osl/process.h> #include <rtl/bootstrap.hxx> -#include <galtheme.hxx> +#include <svx/galtheme.hxx> #include <svx/gallery1.hxx> using namespace ::vos; diff --git a/svx/source/inc/fmshimp.hxx b/svx/source/inc/fmshimp.hxx index 3f89adb42626..a97793a64ea9 100644 --- a/svx/source/inc/fmshimp.hxx +++ b/svx/source/inc/fmshimp.hxx @@ -65,7 +65,7 @@ #include <svl/svstdarr.hxx> #include <sfx2/mnuitem.hxx> #include "svx/fmtools.hxx" -#include "fmsrccfg.hxx" +#include "svx/fmsrccfg.hxx" #include <osl/mutex.hxx> #include <vos/thread.hxx> #include <tools/debug.hxx> diff --git a/svx/source/inc/sqlparserclient.hxx b/svx/source/inc/sqlparserclient.hxx index ced2a0708b9c..01e175d51e4e 100644 --- a/svx/source/inc/sqlparserclient.hxx +++ b/svx/source/inc/sqlparserclient.hxx @@ -29,7 +29,7 @@ #define SVX_SQLPARSERCLIENT_HXX #include "svx/dbtoolsclient.hxx" -#include "ParseContext.hxx" +#include "svx/ParseContext.hxx" #include <com/sun/star/lang/XMultiServiceFactory.hpp> //........................................................................ diff --git a/svx/source/items/chrtitem.cxx b/svx/source/items/chrtitem.cxx index 8957bd2e3ba0..474bf19f7bd6 100644 --- a/svx/source/items/chrtitem.cxx +++ b/svx/source/items/chrtitem.cxx @@ -44,7 +44,7 @@ #include <float.h> #include <rtl/math.hxx> -#include "chrtitem.hxx" +#include "svx/chrtitem.hxx" using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/items/clipfmtitem.cxx b/svx/source/items/clipfmtitem.cxx index 086cd1cff161..bc3ca621635b 100644 --- a/svx/source/items/clipfmtitem.cxx +++ b/svx/source/items/clipfmtitem.cxx @@ -32,7 +32,7 @@ #define _SVSTDARR_STRINGSDTOR #include <svl/svstdarr.hxx> -#include <clipfmtitem.hxx> +#include <svx/clipfmtitem.hxx> #include <com/sun/star/frame/status/ClipboardFormats.hpp> struct SvxClipboardFmtItem_Impl diff --git a/svx/source/items/drawitem.cxx b/svx/source/items/drawitem.cxx index 27d7dba45c49..f02848835ffd 100644 --- a/svx/source/items/drawitem.cxx +++ b/svx/source/items/drawitem.cxx @@ -33,7 +33,7 @@ #include <svx/svxids.hrc> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/xtable.hxx> using namespace ::com::sun::star; diff --git a/svx/source/items/hlnkitem.cxx b/svx/source/items/hlnkitem.cxx index a67a87021d31..987f5aa6df08 100644 --- a/svx/source/items/hlnkitem.cxx +++ b/svx/source/items/hlnkitem.cxx @@ -44,7 +44,7 @@ #include <basic/sbxvar.hxx> #endif -#include "hlnkitem.hxx" +#include "svx/hlnkitem.hxx" // ----------------------------------------------------------------------- diff --git a/svx/source/items/ofaitem.cxx b/svx/source/items/ofaitem.cxx index 4a3680cbe58b..e996373eb48e 100644 --- a/svx/source/items/ofaitem.cxx +++ b/svx/source/items/ofaitem.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ofaitem.hxx" +#include "svx/ofaitem.hxx" OfaPtrItem::OfaPtrItem( USHORT _nWhich, void *_pPtr ) : SfxPoolItem( _nWhich ), pPtr( _pPtr ) diff --git a/svx/source/items/postattr.cxx b/svx/source/items/postattr.cxx index 5b03bbd6be2d..cab4207d56c5 100644 --- a/svx/source/items/postattr.cxx +++ b/svx/source/items/postattr.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- #define _SVX_POSTATTR_CXX -#include "postattr.hxx" +#include "svx/postattr.hxx" #include <editeng/itemtype.hxx> #include <svx/svxitems.hrc> #include <svx/dialmgr.hxx> diff --git a/svx/source/items/rotmodit.cxx b/svx/source/items/rotmodit.cxx index 10a0adf3f0c9..6e6f46cdc373 100644 --- a/svx/source/items/rotmodit.cxx +++ b/svx/source/items/rotmodit.cxx @@ -42,7 +42,7 @@ #include <com/sun/star/table/CellOrientation.hpp> #include <com/sun/star/table/CellAddress.hpp> -#include "rotmodit.hxx" +#include "svx/rotmodit.hxx" using namespace ::rtl; using namespace ::com::sun::star; diff --git a/svx/source/items/svxerr.cxx b/svx/source/items/svxerr.cxx index 317514601aa5..89b4266a1339 100644 --- a/svx/source/items/svxerr.cxx +++ b/svx/source/items/svxerr.cxx @@ -31,7 +31,7 @@ // include --------------------------------------------------------------- #include <tools/shl.hxx> -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/items/svxerr.src b/svx/source/items/svxerr.src index 382027a12b51..890e5687021d 100644 --- a/svx/source/items/svxerr.src +++ b/svx/source/items/svxerr.src @@ -26,7 +26,7 @@ ************************************************************************/ // include --------------------------------------------------------------- #define __RSC -#include "svxerr.hxx" +#include "svx/svxerr.hxx" #include <svx/dialogs.hrc> #include <editeng/editerr.hxx> diff --git a/svx/source/mnuctrls/clipboardctl.cxx b/svx/source/mnuctrls/clipboardctl.cxx index f6b95067c5e2..db92fd66d425 100644 --- a/svx/source/mnuctrls/clipboardctl.cxx +++ b/svx/source/mnuctrls/clipboardctl.cxx @@ -36,8 +36,8 @@ #include <sot/exchange.hxx> #include <svl/eitem.hxx> #include <vcl/toolbox.hxx> -#include <clipboardctl.hxx> -#include <clipfmtitem.hxx> +#include <svx/clipboardctl.hxx> +#include <svx/clipfmtitem.hxx> #include <svtools/insdlg.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/mnuctrls/fntszctl.cxx b/svx/source/mnuctrls/fntszctl.cxx index 68e7c4d32472..48c1a1158c4c 100644 --- a/svx/source/mnuctrls/fntszctl.cxx +++ b/svx/source/mnuctrls/fntszctl.cxx @@ -43,7 +43,7 @@ #include "editeng/fontitem.hxx" #include "editeng/flstitem.hxx" -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> #define LOGIC OutputDevice::LogicToLogic diff --git a/svx/source/mnuctrls/makefile.mk b/svx/source/mnuctrls/makefile.mk index 9c208d9a787c..31c8e532143f 100644 --- a/svx/source/mnuctrls/makefile.mk +++ b/svx/source/mnuctrls/makefile.mk @@ -56,7 +56,7 @@ HXX1TARGET=mnuctrls HXX1EXT= hxx HXX1EXCL= -E:*include* HXX1DEPN=\ - $(INC)$/clipboardctl.hxx \ + $(INC)$/svx/clipboardctl.hxx \ $(INC)$/fntctl.hxx \ $(INC)$/fntszctl.hxx \ $(INC)$/SmartTagCtl.hxx diff --git a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx index da8518d7f1a1..c1204ed1bdf6 100644 --- a/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx +++ b/svx/source/sdr/contact/objectcontactofobjlistpainter.cxx @@ -37,7 +37,7 @@ #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/contact/objectcontacttools.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/objectcontactofpageview.cxx b/svx/source/sdr/contact/objectcontactofpageview.cxx index 1652855d84a8..d2264e219c48 100644 --- a/svx/source/sdr/contact/objectcontactofpageview.cxx +++ b/svx/source/sdr/contact/objectcontactofpageview.cxx @@ -38,13 +38,13 @@ #include <svx/sdr/animation/objectanimator.hxx> #include <svx/sdr/event/eventhandler.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <drawinglayer/processor2d/vclprocessor2d.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <drawinglayer/primitive2d/transformprimitive2d.hxx> #include <svx/sdr/contact/objectcontacttools.hxx> #include <com/sun/star/rendering/XSpriteCanvas.hpp> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofgraphic.cxx b/svx/source/sdr/contact/viewcontactofgraphic.cxx index 7172b0840476..d4748a14ed98 100644 --- a/svx/source/sdr/contact/viewcontactofgraphic.cxx +++ b/svx/source/sdr/contact/viewcontactofgraphic.cxx @@ -44,8 +44,8 @@ #include <svx/sdr/event/eventhandler.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/sdr/primitive2d/sdrgrafprimitive2d.hxx> -#include "svdstr.hrc" -#include <svdglob.hxx> +#include "svx/svdstr.hrc" +#include <svx/svdglob.hxx> #include <vcl/svapp.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx index 6d609108e580..3b002e406be1 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx @@ -40,7 +40,7 @@ #include <drawinglayer/primitive2d/markerarrayprimitive2d.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/primitive2d/sdrprimitivetools.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx index 6fa63f7c073e..5ddd74004461 100644 --- a/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx +++ b/svx/source/sdr/contact/viewcontactofsdrobjcustomshape.cxx @@ -31,7 +31,7 @@ #include <svx/svdoashp.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <svx/sdr/primitive2d/sdrattributecreator.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <svx/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/sdr/contact/viewcontactofunocontrol.cxx b/svx/source/sdr/contact/viewcontactofunocontrol.cxx index 2a4d527fdcdd..fb57864903d1 100644 --- a/svx/source/sdr/contact/viewcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewcontactofunocontrol.cxx @@ -41,7 +41,7 @@ #include <com/sun/star/awt/XWindow2.hpp> /** === end UNO includes === **/ -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #include <tools/diagnose_ex.h> #include <vcl/pdfextoutdevdata.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx index 5ef26193d4b3..bc73fd523437 100644 --- a/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofpageobj.cxx @@ -38,7 +38,7 @@ #include <svx/sdr/contact/objectcontactofobjlistpainter.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <svx/svdpage.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/primitive2d/pagepreviewprimitive2d.hxx> #include <drawinglayer/primitive2d/sdrdecompositiontools2d.hxx> diff --git a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx index ce8d0c79a5f9..6785f69f556b 100644 --- a/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofsdrmediaobj.cxx @@ -39,7 +39,7 @@ #include <avmedia/mediaitem.hxx> #include "sdrmediawindow.hxx" #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx index 5d00418a5729..81450d42a50a 100644 --- a/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx +++ b/svx/source/sdr/contact/viewobjectcontactofunocontrol.cxx @@ -38,7 +38,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdview.hxx> #include <svx/sdrpagewindow.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" /** === begin UNO includes === **/ #include <com/sun/star/lang/XMultiServiceFactory.hpp> diff --git a/svx/source/sdr/primitive2d/primitivefactory2d.cxx b/svx/source/sdr/primitive2d/primitivefactory2d.cxx index d6a6867b819e..d148f76576aa 100644 --- a/svx/source/sdr/primitive2d/primitivefactory2d.cxx +++ b/svx/source/sdr/primitive2d/primitivefactory2d.cxx @@ -30,7 +30,7 @@ #include <drawinglayer/primitive2d/baseprimitive2d.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/sdr/contact/viewcontact.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx index 2320944afd03..5af4f316ccc0 100644 --- a/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx +++ b/svx/source/sdr/primitive2d/sdrtextprimitive2d.cxx @@ -35,7 +35,7 @@ #include <editeng/editobj.hxx> #include <editeng/flditem.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> #include <svx/svdoutl.hxx> diff --git a/svx/source/sdr/properties/e3dsceneproperties.cxx b/svx/source/sdr/properties/e3dsceneproperties.cxx index 41a3294b2a01..3ee3189ac4a8 100644 --- a/svx/source/sdr/properties/e3dsceneproperties.cxx +++ b/svx/source/sdr/properties/e3dsceneproperties.cxx @@ -32,7 +32,7 @@ #include <svl/whiter.hxx> #include <svx/svddef.hxx> #include <svx/scene3d.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/sdr/properties/itemsettools.cxx b/svx/source/sdr/properties/itemsettools.cxx index eab977681490..37678966bc07 100644 --- a/svx/source/sdr/properties/itemsettools.cxx +++ b/svx/source/sdr/properties/itemsettools.cxx @@ -34,7 +34,7 @@ #include <vector> #include <svx/svdogrp.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// // class to remember broadcast start positions diff --git a/svx/source/sdr/properties/properties.cxx b/svx/source/sdr/properties/properties.cxx index 576f9745e167..f8c307f26309 100644 --- a/svx/source/sdr/properties/properties.cxx +++ b/svx/source/sdr/properties/properties.cxx @@ -31,7 +31,7 @@ #include <svx/sdr/properties/itemsettools.hxx> #include <svl/itemset.hxx> #include <svx/svdogrp.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> ////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/stbctrls/insctrl.cxx b/svx/source/stbctrls/insctrl.cxx index 241ffeb8bc36..036d01e1e21b 100644 --- a/svx/source/stbctrls/insctrl.cxx +++ b/svx/source/stbctrls/insctrl.cxx @@ -41,7 +41,7 @@ #include <svx/dialogs.hrc> -#include "insctrl.hxx" +#include "svx/insctrl.hxx" #include <svx/dialmgr.hxx> #define PAINT_OFFSET 5 diff --git a/svx/source/stbctrls/makefile.mk b/svx/source/stbctrls/makefile.mk index 4e125adcd9d8..71c639cecdd3 100644 --- a/svx/source/stbctrls/makefile.mk +++ b/svx/source/stbctrls/makefile.mk @@ -61,12 +61,12 @@ HXX1TARGET=stbctrls HXX1EXT= hxx HXX1EXCL= -E:*include* HXX1DEPN=\ - $(INC)$/insctrl.hxx \ - $(INC)$/zoomctrl.hxx \ - $(INC)$/pszctrl.hxx \ - $(INC)$/selctrl.hxx \ - $(INC)$/modctrl.hxx \ - $(INC)$/xmlsecctrl.hxx \ + $(INC)$/svx/insctrl.hxx \ + $(INC)$/svx/zoomctrl.hxx \ + $(INC)$/svx/pszctrl.hxx \ + $(INC)$/svx/selctrl.hxx \ + $(INC)$/svx/modctrl.hxx \ + $(INC)$/svx/xmlsecctrl.hxx \ $(INC)$/zoomsliderctrl.hxx \ # --- Targets ------------------------------------------------------- diff --git a/svx/source/stbctrls/modctrl.cxx b/svx/source/stbctrls/modctrl.cxx index fbb212e131f0..986b84f7b8dc 100644 --- a/svx/source/stbctrls/modctrl.cxx +++ b/svx/source/stbctrls/modctrl.cxx @@ -40,7 +40,7 @@ #include <svx/dialogs.hrc> -#include "modctrl.hxx" +#include "svx/modctrl.hxx" #include <svx/dialmgr.hxx> SFX_IMPL_STATUSBAR_CONTROL(SvxModifyControl, SfxBoolItem); diff --git a/svx/source/stbctrls/pszctrl.cxx b/svx/source/stbctrls/pszctrl.cxx index edb72ab05eac..4a622aa6ebc0 100644 --- a/svx/source/stbctrls/pszctrl.cxx +++ b/svx/source/stbctrls/pszctrl.cxx @@ -45,13 +45,13 @@ #include <svl/intitem.hxx> #define _SVX_PSZCTRL_CXX -#include "pszctrl.hxx" +#include "svx/pszctrl.hxx" #define PAINT_OFFSET 5 #include <editeng/sizeitem.hxx> #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include "stbctrls.h" #include "sfx2/module.hxx" diff --git a/svx/source/stbctrls/selctrl.cxx b/svx/source/stbctrls/selctrl.cxx index 980216ce17bf..e56ba9aeaef9 100644 --- a/svx/source/stbctrls/selctrl.cxx +++ b/svx/source/stbctrls/selctrl.cxx @@ -39,7 +39,7 @@ #define _SVX_SELCTRL_CXX -#include "selctrl.hxx" +#include "svx/selctrl.hxx" #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> diff --git a/svx/source/stbctrls/xmlsecctrl.cxx b/svx/source/stbctrls/xmlsecctrl.cxx index 06d1e9642b9e..ece7682fb2e1 100644 --- a/svx/source/stbctrls/xmlsecctrl.cxx +++ b/svx/source/stbctrls/xmlsecctrl.cxx @@ -53,14 +53,14 @@ #include <svx/dialogs.hrc> #include <svx/dialmgr.hxx> -#include "xmlsecctrl.hxx" +#include "svx/xmlsecctrl.hxx" #include <tools/urlobj.hxx> #define PAINT_OFFSET 5 //#include <editeng/sizeitem.hxx> //#include <svx/dialmgr.hxx> -//#include "dlgutil.hxx" +//#include "svx/dlgutil.hxx" //#include "stbctrls.h" //#include <svx/dialogs.hrc> diff --git a/svx/source/stbctrls/zoomctrl.cxx b/svx/source/stbctrls/zoomctrl.cxx index 63cbbb969d2d..fb9fc65583e3 100644 --- a/svx/source/stbctrls/zoomctrl.cxx +++ b/svx/source/stbctrls/zoomctrl.cxx @@ -39,7 +39,7 @@ #include <svx/dialogs.hrc> -#include "zoomctrl.hxx" +#include "svx/zoomctrl.hxx" //CHINA001 #include "zoom.hxx" #include <svx/zoomitem.hxx> #include "stbctrls.h" diff --git a/svx/source/svdraw/ActionDescriptionProvider.cxx b/svx/source/svdraw/ActionDescriptionProvider.cxx index acd60e27680b..ffc753e61276 100644 --- a/svx/source/svdraw/ActionDescriptionProvider.cxx +++ b/svx/source/svdraw/ActionDescriptionProvider.cxx @@ -28,9 +28,9 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "ActionDescriptionProvider.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/ActionDescriptionProvider.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" ::rtl::OUString ActionDescriptionProvider::createDescription( ActionType eActionType , const ::rtl::OUString& rObjectName ) diff --git a/svx/source/svdraw/sdrpagewindow.cxx b/svx/source/svdraw/sdrpagewindow.cxx index 85513fb3b926..ae3b1520c310 100644 --- a/svx/source/svdraw/sdrpagewindow.cxx +++ b/svx/source/svdraw/sdrpagewindow.cxx @@ -39,7 +39,7 @@ #include <svx/svdpage.hxx> #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/contact/objectcontactofpageview.hxx> #include <svx/sdr/contact/displayinfo.hxx> #include <vos/mutex.hxx> diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx index d173c1eea4d5..656ab9f2f27a 100644 --- a/svx/source/svdraw/sdrpaintwindow.cxx +++ b/svx/source/svdraw/sdrpaintwindow.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdr/overlay/overlaymanagerbuffered.hxx> #include <svx/svdpntv.hxx> #include <vcl/gdimtf.hxx> diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx index d831906fa94c..b81e1c0db009 100644 --- a/svx/source/svdraw/svdattr.cxx +++ b/svx/source/svdraw/svdattr.cxx @@ -54,11 +54,11 @@ #include <svx/svxids.hrc> #include <svx/xtable.hxx> // fuer RGB_Color() -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer DEGREE_CHAR #include <svx/svdtrans.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" #include <svx/sdgcpitm.hxx> #include <editeng/adjitem.hxx> #include <svx/sdtfchim.hxx> diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx index 9fd0edd3aac0..7980668c0b9a 100644 --- a/svx/source/svdraw/svdcrtv.cxx +++ b/svx/source/svdraw/svdcrtv.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <svx/svdcrtv.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/svdundo.hxx> #include <svx/svdocapt.hxx> // Spezialbehandlung: Nach dem Create transparente Fuellung #include <svx/svdoedge.hxx> @@ -45,7 +45,7 @@ #include <svx/svdopath.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include "fmobj.hxx" #include <svx/svdocirc.hxx> #include <svx/sdr/contact/viewcontact.hxx> diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx index d04bf8851795..d41b5b1a1c34 100644 --- a/svx/source/svdraw/svddrgmt.cxx +++ b/svx/source/svdraw/svddrgmt.cxx @@ -37,7 +37,7 @@ #include <tools/bigint.hxx> #include <vcl/svapp.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -45,8 +45,8 @@ #include <svx/svdmark.hxx> #include <svx/svdocapt.hxx> #include <svx/svdpagv.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svddrgv.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -59,7 +59,7 @@ #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svx/sdr/contact/viewobjectcontact.hxx> @@ -68,7 +68,7 @@ #include <svx/sdr/overlay/overlayprimitive2dsequenceobject.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <svx/sdr/contact/objectcontact.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdopath.hxx> #include <svx/polypolygoneditor.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> diff --git a/svx/source/svdraw/svddrgv.cxx b/svx/source/svdraw/svddrgv.cxx index f1b84ac5f98e..f47d30fb3bdd 100644 --- a/svx/source/svdraw/svddrgv.cxx +++ b/svx/source/svdraw/svddrgv.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <svx/svddrgv.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpoly.hxx> #include <svx/svdetc.hxx> #include <svx/svdtrans.hxx> @@ -38,12 +38,12 @@ #include <svx/svdpagv.hxx> #include <svx/svdopath.hxx> #include <svx/svdoedge.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "svddrgm1.hxx" #include <svx/obj3d.hxx> #include <svx/svdoashp.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> #include <svx/polypolygoneditor.hxx> diff --git a/svx/source/svdraw/svdedtv.cxx b/svx/source/svdraw/svdedtv.cxx index 3b878ce93138..5e89bfbdb8f5 100644 --- a/svx/source/svdraw/svdedtv.cxx +++ b/svx/source/svdraw/svdedtv.cxx @@ -40,8 +40,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include <svx/svdpoev.hxx> // fuer die PolyPossiblities -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/e3dsceneupdater.hxx> // #i13033# diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx index 48870cda0e02..30af84a1aebe 100644 --- a/svx/source/svdraw/svdedtv1.cxx +++ b/svx/source/svdraw/svdedtv1.cxx @@ -40,8 +40,8 @@ #include <svx/rectenum.hxx> #include <svx/svxids.hrc> // fuer SID_ATTR_TRANSFORM_... #include <svx/svdattr.hxx> // fuer Get/SetGeoAttr -#include "svditext.hxx" -#include "svditer.hxx" +#include "svx/svditext.hxx" +#include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdundo.hxx> #include <svx/svdpage.hxx> @@ -50,8 +50,8 @@ #include <svx/svdattrx.hxx> // fuer MergeNotPersistAttr #include <svx/svdetc.hxx> // fuer SearchOutlinerItems #include <svx/svdopath.hxx> // fuer Crook -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <editeng/eeitem.hxx> #include <svl/aeitem.hxx> #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdedtv2.cxx b/svx/source/svdraw/svdedtv2.cxx index e31ea11be7d6..c49b0a8aa68f 100644 --- a/svx/source/svdraw/svdedtv2.cxx +++ b/svx/source/svdraw/svdedtv2.cxx @@ -36,11 +36,11 @@ #include <svx/svdopath.hxx> // fuer CombineObjects #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdograf.hxx> // fuer Possibilities #include <svx/svdoole2.hxx> // und Mtf-Import -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include "svdfmtf.hxx" #include <svx/svdetc.hxx> #include <sfx2/basedlgs.hxx> diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 76bcb828bb24..9744e9764488 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -50,12 +50,12 @@ #include <editeng/editobj.hxx> #include <editeng/outlobj.hxx> #include <editeng/scripttypeitem.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdoutl.hxx> #include <svx/sdtfchim.hxx> #include <svx/svdotext.hxx> #include <svx/svdundo.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include "svx/svdpagv.hxx" #include "svx/svdpage.hxx" #include "svx/svdetc.hxx" // fuer GetDraftFillColor @@ -67,16 +67,16 @@ #include <svx/svdoutl.hxx> #include <svx/svddrgv.hxx> // fuer SetSolidDragging() -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache -#include "globl3d.hxx" +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/globl3d.hxx" #include <editeng/outliner.hxx> #include <editeng/adjitem.hxx> // #98988# #include <svtools/colorcfg.hxx> #include <vcl/svapp.hxx> //add CHINA001 -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx index 8a4245919821..74d0cf6046da 100644 --- a/svx/source/svdraw/svdetc.cxx +++ b/svx/source/svdraw/svdetc.cxx @@ -31,12 +31,12 @@ #include <com/sun/star/embed/XEmbeddedObject.hpp> #include <com/sun/star/embed/EmbedStates.hpp> #include <svx/svdetc.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdtrans.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" -#include "svdviter.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include <svx/svdoutl.hxx> #include <vcl/bmpacc.hxx> diff --git a/svx/source/svdraw/svdfmtf.cxx b/svx/source/svdraw/svdfmtf.cxx index 445fe60c0670..633d82d67816 100644 --- a/svx/source/svdraw/svdfmtf.cxx +++ b/svx/source/svdraw/svdfmtf.cxx @@ -57,7 +57,7 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdorect.hxx> #include <svx/svdocirc.hxx> diff --git a/svx/source/svdraw/svdglev.cxx b/svx/source/svdraw/svdglev.cxx index 6eab2ea7ecfa..e90d1972a4cd 100644 --- a/svx/source/svdraw/svdglev.cxx +++ b/svx/source/svdraw/svdglev.cxx @@ -32,8 +32,8 @@ #include <math.h> #include <svx/svdundo.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdpagv.hxx> #include <svx/svdglue.hxx> #include <svx/svdtrans.hxx> diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx index 3d90eae6d68c..271c466017d0 100644 --- a/svx/source/svdraw/svdhdl.cxx +++ b/svx/source/svdraw/svdhdl.cxx @@ -41,8 +41,8 @@ #include <vcl/bmpacc.hxx> #include <svx/sxekitm.hxx> -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include <svx/svdmodel.hxx> #include "gradtrns.hxx" @@ -62,7 +62,7 @@ #include <svx/sdr/overlay/overlaytriangle.hxx> #include <svx/sdr/overlay/overlayhatchrect.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <vcl/svapp.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <vcl/lazydelete.hxx> diff --git a/svx/source/svdraw/svdibrow.cxx b/svx/source/svdraw/svdibrow.cxx index fa3dbe852b3a..3ded3a1f90c3 100644 --- a/svx/source/svdraw/svdibrow.cxx +++ b/svx/source/svdraw/svdibrow.cxx @@ -36,7 +36,7 @@ #define _STDLIB_H #endif -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/flditem.hxx> #include <editeng/editdata.hxx> #include <svx/svdpool.hxx> @@ -66,7 +66,7 @@ #include <svl/rectitem.hxx> #include <svl/rngitem.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svditer.cxx b/svx/source/svdraw/svditer.cxx index 30c423c7178c..0e7bc872c5a6 100644 --- a/svx/source/svdraw/svditer.cxx +++ b/svx/source/svdraw/svditer.cxx @@ -27,7 +27,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpage.hxx> #include <svx/svdogrp.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/svdraw/svdlayer.cxx b/svx/source/svdraw/svdlayer.cxx index 098c036dcad7..2c12a7b5d06c 100644 --- a/svx/source/svdraw/svdlayer.cxx +++ b/svx/source/svdraw/svdlayer.cxx @@ -31,8 +31,8 @@ #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> // fuer Broadcasting -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource //////////////////////////////////////////////////////////////////////////////////////////////////// // SetOfByte diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx index c871865ac87b..d61654e674ea 100644 --- a/svx/source/svdraw/svdmark.cxx +++ b/svx/source/svdraw/svdmark.cxx @@ -34,13 +34,13 @@ #include <svx/svdetc.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdpagv.hxx> #include <svx/svdopath.hxx> // zur Abschaltung #include <svx/svdogrp.hxx> // des Cache bei #include <svx/svdorect.hxx> // GetMarkDescription -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache //////////////////////////////////////////////////////////////////////////////////////////////////// #include <svx/obj3d.hxx> diff --git a/svx/source/svdraw/svdmodel.cxx b/svx/source/svdraw/svdmodel.cxx index 2fcdfdffbb8a..d9966a26755b 100644 --- a/svx/source/svdraw/svdmodel.cxx +++ b/svx/source/svdraw/svdmodel.cxx @@ -49,12 +49,12 @@ #include <svx/xflhtit.hxx> #include <svx/xlnstit.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <editeng/editeng.hxx> // Fuer EditEngine::CreatePool() #include <svx/xtable.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdtrans.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> @@ -65,8 +65,8 @@ #include <svx/svdetc.hxx> #include <svx/svdoutl.hxx> #include <svx/svdoole2.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include "svdoutlinercache.hxx" diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx index b9598cef4ceb..0c29815584c0 100644 --- a/svx/source/svdraw/svdmrkv.cxx +++ b/svx/source/svdraw/svdmrkv.cxx @@ -31,8 +31,8 @@ #include <svx/svdmrkv.hxx> #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> -#include "svdglob.hxx" -#include "svditext.hxx" +#include "svx/svdglob.hxx" +#include "svx/svditext.hxx" #include <svx/svdview.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> @@ -48,14 +48,14 @@ #include "gradtrns.hxx" #include <svx/xflftrit.hxx> #include <svx/dialmgr.hxx> -#include "svdstr.hrc" +#include "svx/svdstr.hrc" #include <svx/svdundo.hxx> #include <svx/svdopath.hxx> #include <svx/scene3d.hxx> #include <svx/svdovirt.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> diff --git a/svx/source/svdraw/svdmrkv1.cxx b/svx/source/svdraw/svdmrkv1.cxx index fe271c80534d..f67b35bfdf67 100644 --- a/svx/source/svdraw/svdmrkv1.cxx +++ b/svx/source/svdraw/svdmrkv1.cxx @@ -31,7 +31,7 @@ #include <svx/svdmrkv.hxx> #include <svx/svdetc.hxx> #include <svx/svdoedge.hxx> -#include "svdglob.hxx" +#include "svx/svdglob.hxx" #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> #include "svddrgm1.hxx" diff --git a/svx/source/svdraw/svdoashp.cxx b/svx/source/svdraw/svdoashp.cxx index 58e0b7bdb425..2f255850e811 100644 --- a/svx/source/svdraw/svdoashp.cxx +++ b/svx/source/svdraw/svdoashp.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" #include <svx/svdoashp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/unoshape.hxx> #include <ucbhelper/content.hxx> #include <ucbhelper/contentbroker.hxx> @@ -52,22 +52,22 @@ #include <svx/xpoly.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> #include "editeng/editstat.hxx" #include <svx/svdoutl.hxx> #include <editeng/outlobj.hxx> #include <svx/sdtfchim.hxx> -#include "../customshapes/EnhancedCustomShapeGeometry.hxx" -#include "../customshapes/EnhancedCustomShapeTypeNames.hxx" -#include "../customshapes/EnhancedCustomShape2d.hxx" +#include "../svx/EnhancedCustomShapeGeometry.hxx" +#include "../svx/EnhancedCustomShapeTypeNames.hxx" +#include "../svx/EnhancedCustomShape2d.hxx" #include <com/sun/star/beans/PropertyValues.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeAdjustmentValue.hpp> #include <com/sun/star/drawing/EnhancedCustomShapeParameterPair.hpp> diff --git a/svx/source/svdraw/svdoattr.cxx b/svx/source/svdraw/svdoattr.cxx index 81c1ca029ede..09965a1b98a6 100644 --- a/svx/source/svdraw/svdoattr.cxx +++ b/svx/source/svdraw/svdoattr.cxx @@ -30,7 +30,7 @@ #include <svx/svdoattr.hxx> #include <svx/xpool.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdattr.hxx> diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx index 6eb96fe4f088..6e1660761dc0 100644 --- a/svx/source/svdraw/svdobj.cxx +++ b/svx/source/svdraw/svdobj.cxx @@ -48,8 +48,8 @@ #include <svx/svdovirt.hxx> // Fuer Add/Del Ref #include <svx/svdview.hxx> // fuer Dragging (Ortho abfragen) #include "svdscrol.hxx" -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdogrp.hxx> // Factory #include <svx/svdopath.hxx> // Factory #include <svx/svdoedge.hxx> // Factory @@ -75,7 +75,7 @@ #include <svx/xlndsit.hxx> #include <svx/xlnclit.hxx> #include <svx/xflclit.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/xlntrit.hxx> #include <svx/xfltrit.hxx> #include <svx/xfltrit.hxx> diff --git a/svx/source/svdraw/svdocapt.cxx b/svx/source/svdraw/svdocapt.cxx index b92157823081..fd9ee15b8f2c 100644 --- a/svx/source/svdraw/svdocapt.cxx +++ b/svx/source/svdraw/svdocapt.cxx @@ -41,8 +41,8 @@ #include <svx/svddrag.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> // fuer RectSnap -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdogrp.hxx> #include <svx/svdpage.hxx> #include <svx/xflhtit.hxx> diff --git a/svx/source/svdraw/svdocirc.cxx b/svx/source/svdraw/svdocirc.cxx index 12cdeac9ef85..67d01159a72d 100644 --- a/svx/source/svdraw/svdocirc.cxx +++ b/svx/source/svdraw/svdocirc.cxx @@ -47,8 +47,8 @@ #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> // fuer die Objektkonvertierung #include <svx/svdview.hxx> // Zum Draggen (Ortho) -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <editeng/eeitem.hxx> #include "svdoimp.hxx" #include <svx/sdr/properties/circleproperties.hxx> diff --git a/svx/source/svdraw/svdoedge.cxx b/svx/source/svdraw/svdoedge.cxx index dc76855f05cc..027cca425437 100644 --- a/svx/source/svdraw/svdoedge.cxx +++ b/svx/source/svdraw/svdoedge.cxx @@ -43,8 +43,8 @@ #include <svx/svdhdl.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> #include <editeng/eeitem.hxx> diff --git a/svx/source/svdraw/svdograf.cxx b/svx/source/svdraw/svdograf.cxx index 1924235e7003..c9686eecb7db 100644 --- a/svx/source/svdraw/svdograf.cxx +++ b/svx/source/svdraw/svdograf.cxx @@ -46,14 +46,14 @@ #include <sfx2/linkmgr.hxx> #include <svx/svdetc.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" #include <svx/svdpool.hxx> #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include "svtools/filter.hxx" #include <svx/svdograf.hxx> diff --git a/svx/source/svdraw/svdogrp.cxx b/svx/source/svdraw/svdogrp.cxx index 4060369f8016..56c49ac7ddee 100644 --- a/svx/source/svdraw/svdogrp.cxx +++ b/svx/source/svdraw/svdogrp.cxx @@ -45,14 +45,14 @@ #include <svx/svdmodel.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdobj.hxx> #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdattrx.hxx> // NotPersistItems #include <svx/svdoedge.hxx> // #32383# Die Verbinder nach Move nochmal anbroadcasten -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svx/svxids.hrc> #include <svl/whiter.hxx> diff --git a/svx/source/svdraw/svdomeas.cxx b/svx/source/svdraw/svdomeas.cxx index 2bcf016d0e4a..ade79ec70878 100644 --- a/svx/source/svdraw/svdomeas.cxx +++ b/svx/source/svdraw/svdomeas.cxx @@ -30,7 +30,7 @@ #include <svx/svdomeas.hxx> #include <math.h> -#include "svditext.hxx" // +#include "svx/svditext.hxx" // #include <svx/xpoly.hxx> #include <svx/svdtrans.hxx> #include <svx/svdhdl.hxx> @@ -40,8 +40,8 @@ #include <svx/svdattrx.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> -#include "svdglob.hxx" // StringCache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Objektname #include <svl/style.hxx> #include <svl/smplhint.hxx> #include <editeng/eeitem.hxx> diff --git a/svx/source/svdraw/svdomedia.cxx b/svx/source/svdraw/svdomedia.cxx index 4008e9494f2e..fbce08fdfaa8 100644 --- a/svx/source/svdraw/svdomedia.cxx +++ b/svx/source/svdraw/svdomedia.cxx @@ -29,8 +29,8 @@ #include "precompiled_svx.hxx" #include <svx/svdomedia.hxx> -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" #include <svx/sdr/contact/viewcontactofsdrmediaobj.hxx> #include <avmedia/mediawindow.hxx> diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx index 88d9aba87673..4973388ea6d4 100644 --- a/svx/source/svdraw/svdoole2.cxx +++ b/svx/source/svdraw/svdoole2.cxx @@ -77,8 +77,8 @@ #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include "unomlstr.hxx" diff --git a/svx/source/svdraw/svdopage.cxx b/svx/source/svdraw/svdopage.cxx index a2d21e6e2269..dbe19ac40efe 100644 --- a/svx/source/svdraw/svdopage.cxx +++ b/svx/source/svdraw/svdopage.cxx @@ -29,8 +29,8 @@ #include "precompiled_svx.hxx" #include <svx/svdopage.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdtrans.hxx> #include <svx/svdetc.hxx> #include <svx/svdmodel.hxx> diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx index 2b495725c006..c9b16f726785 100644 --- a/svx/source/svdraw/svdopath.cxx +++ b/svx/source/svdraw/svdopath.cxx @@ -41,8 +41,8 @@ #include <svx/svdpage.hxx> #include <svx/svdhdl.hxx> #include <svx/svdview.hxx> // fuer MovCreate bei Freihandlinien -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #ifdef _MSC_VER #pragma optimize ("",off) diff --git a/svx/source/svdraw/svdorect.cxx b/svx/source/svdraw/svdorect.cxx index b03dbf5b903a..84dab2cfb165 100644 --- a/svx/source/svdraw/svdorect.cxx +++ b/svx/source/svdraw/svdorect.cxx @@ -45,8 +45,8 @@ #include <svx/svdview.hxx> // das #include <svx/svdundo.hxx> // Macro-Beispiel #include <svx/svdopath.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/xflclit.hxx> #include <svx/xlnclit.hxx> #include <svx/xlnwtit.hxx> diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx index a2b7e8c0490c..dad8c1f205e3 100644 --- a/svx/source/svdraw/svdotext.cxx +++ b/svx/source/svdraw/svdotext.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdpagv.hxx> // fuer Abfrage im Paint, ob das #include <svx/svdview.hxx> // Objekt gerade editiert wird #include <svx/svdpage.hxx> // und fuer AnimationHandler (Laufschrift) @@ -37,8 +37,8 @@ #include <svx/svdoutl.hxx> #include "svdscrol.hxx" // fuer Laufschrift #include <svx/svdmodel.hxx> // OutlinerDefaults -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <editeng/writingmodeitem.hxx> #include <svx/sdtfchim.hxx> #include <svtools/colorcfg.hxx> diff --git a/svx/source/svdraw/svdotextdecomposition.cxx b/svx/source/svdraw/svdotextdecomposition.cxx index 3675c7becac4..9bc3bbb4958c 100644 --- a/svx/source/svdraw/svdotextdecomposition.cxx +++ b/svx/source/svdraw/svdotextdecomposition.cxx @@ -53,7 +53,7 @@ #include <drawinglayer/primitive2d/wrongspellprimitive2d.hxx> #include <drawinglayer/primitive2d/graphicprimitive2d.hxx> #include <drawinglayer/primitive2d/textlayoutdevice.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/svdraw/svdotextpathdecomposition.cxx b/svx/source/svdraw/svdotextpathdecomposition.cxx index f6780bd7c90d..639f4382a572 100644 --- a/svx/source/svdraw/svdotextpathdecomposition.cxx +++ b/svx/source/svdraw/svdotextpathdecomposition.cxx @@ -64,7 +64,7 @@ #include <drawinglayer/primitive2d/polygonprimitive2d.hxx> #include <drawinglayer/primitive2d/unifiedtransparenceprimitive2d.hxx> #include <editeng/editstat.hxx> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <drawinglayer/geometry/viewinformation2d.hxx> #include <svx/sdr/attribute/sdrformtextoutlineattribute.hxx> diff --git a/svx/source/svdraw/svdotxat.cxx b/svx/source/svdraw/svdotxat.cxx index 13064e890313..8b6dab72d5e9 100644 --- a/svx/source/svdraw/svdotxat.cxx +++ b/svx/source/svdraw/svdotxat.cxx @@ -30,7 +30,7 @@ #include <svl/style.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize und GetStyleSheetPool #include <svx/svdoutl.hxx> #include <svx/svdorect.hxx> // fuer SetDirty bei NbcAdjustTextFrameWidthAndHeight diff --git a/svx/source/svdraw/svdotxdr.cxx b/svx/source/svdraw/svdotxdr.cxx index 97da16876ac0..0e4feeedd2f3 100644 --- a/svx/source/svdraw/svdotxdr.cxx +++ b/svx/source/svdraw/svdotxdr.cxx @@ -33,8 +33,8 @@ #include <svx/svddrag.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> // fuer SetXPolyDirty in MovCreate bei SolidDragging -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdoashp.hxx> #include <tools/bigint.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/svdraw/svdotxed.cxx b/svx/source/svdraw/svdotxed.cxx index c7715f37764c..6f749a297aef 100644 --- a/svx/source/svdraw/svdotxed.cxx +++ b/svx/source/svdraw/svdotxed.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> // fuer GetMaxObjSize #include <svx/svdoutl.hxx> #include <editeng/outliner.hxx> diff --git a/svx/source/svdraw/svdotxln.cxx b/svx/source/svdraw/svdotxln.cxx index 7d176fbfe811..57bcc7a22ae8 100644 --- a/svx/source/svdraw/svdotxln.cxx +++ b/svx/source/svdraw/svdotxln.cxx @@ -34,7 +34,7 @@ #include <ucbhelper/contentbroker.hxx> #include <unotools/datetime.hxx> #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdmodel.hxx> #include <editeng/editdata.hxx> #include <sfx2/lnkbase.hxx> diff --git a/svx/source/svdraw/svdotxtr.cxx b/svx/source/svdraw/svdotxtr.cxx index bd1564ab3f4e..4559dacb31d8 100644 --- a/svx/source/svdraw/svdotxtr.cxx +++ b/svx/source/svdraw/svdotxtr.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <svx/svdotext.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdtrans.hxx> #include <svx/svdogrp.hxx> #include <svx/svdopath.hxx> @@ -41,7 +41,7 @@ #include <svx/sdr/properties/properties.hxx> #include <basegfx/polygon/b2dpolypolygontools.hxx> #include <svl/itemset.hxx> -#include <svditer.hxx> +#include <svx/svditer.hxx> #include <drawinglayer/processor2d/textaspolygonextractor2d.hxx> #include <svx/sdr/contact/viewcontact.hxx> #include <svx/xflclit.hxx> diff --git a/svx/source/svdraw/svdouno.cxx b/svx/source/svdraw/svdouno.cxx index b98e5ba5c1c6..894a5c72926f 100644 --- a/svx/source/svdraw/svdouno.cxx +++ b/svx/source/svdraw/svdouno.cxx @@ -47,17 +47,17 @@ #include <svx/svdouno.hxx> #include <svx/svdpagv.hxx> #include <svx/svdmodel.hxx> -#include "svdglob.hxx" // Stringcache -#include "svdstr.hrc" // Objektname +#include "svx/svdglob.hxx" // Stringcache +#include "svx/svdstr.hrc" // Objektname #include <svx/svdetc.hxx> #include <svx/svdview.hxx> #include <svx/svdorect.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <rtl/ref.hxx> #include <set> #include <memory> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <tools/diagnose_ex.h> #include <svx/svdograf.hxx> diff --git a/svx/source/svdraw/svdpage.cxx b/svx/source/svdraw/svdpage.cxx index 6dd816d429da..872d88bc180b 100644 --- a/svx/source/svdraw/svdpage.cxx +++ b/svx/source/svdraw/svdpage.cxx @@ -49,7 +49,7 @@ #include <svx/svdograf.hxx> // fuer SwapInAll() #include <svx/svdoedge.hxx> // Zum kopieren der Konnektoren #include <svx/svdoole2.hxx> // Sonderbehandlung OLE beim SdrExchangeFormat -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdmodel.hxx> #include <svx/svdlayer.hxx> #include <svx/svdotext.hxx> diff --git a/svx/source/svdraw/svdpagv.cxx b/svx/source/svdraw/svdpagv.cxx index 6239708394bd..c594813f4292 100644 --- a/svx/source/svdraw/svdpagv.cxx +++ b/svx/source/svdraw/svdpagv.cxx @@ -47,7 +47,7 @@ #include <svx/svdouno.hxx> #include <svx/svdpage.hxx> #include <svx/svdview.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdogrp.hxx> #include <svx/svdtypes.hxx> @@ -66,7 +66,7 @@ using namespace ::rtl; using namespace ::com::sun::star; #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> TYPEINIT1(SdrPageView, SfxListener); DBG_NAME(SdrPageView); diff --git a/svx/source/svdraw/svdpntv.cxx b/svx/source/svdraw/svdpntv.cxx index 998c687608fc..e936d43c4552 100755 --- a/svx/source/svdraw/svdpntv.cxx +++ b/svx/source/svdraw/svdpntv.cxx @@ -30,7 +30,7 @@ #include <com/sun/star/awt/XWindow.hpp> #include <svx/svdpntv.hxx> #include <vcl/msgbox.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svtools/grfmgr.hxx> #include <svx/svdmodel.hxx> @@ -54,7 +54,7 @@ #include <svx/svdograf.hxx> #include <svx/svdattrx.hxx> #include "svdibrow.hxx" -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/svdouno.hxx> #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlayrollingrectangle.hxx> diff --git a/svx/source/svdraw/svdpoev.cxx b/svx/source/svdraw/svdpoev.cxx index 27e2884bb90c..3a3942319661 100644 --- a/svx/source/svdraw/svdpoev.cxx +++ b/svx/source/svdraw/svdpoev.cxx @@ -34,8 +34,8 @@ #include <svx/svdpage.hxx> #include <svx/svdopath.hxx> #include <svx/svdundo.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdtrans.hxx> #include <basegfx/polygon/b2dpolygon.hxx> #include <basegfx/polygon/b2dpolygontools.hxx> diff --git a/svx/source/svdraw/svdsnpv.cxx b/svx/source/svdraw/svdsnpv.cxx index 1a8f735887cf..a58081ad0ee0 100644 --- a/svx/source/svdraw/svdsnpv.cxx +++ b/svx/source/svdraw/svdsnpv.cxx @@ -35,13 +35,13 @@ #include <svx/svdobj.hxx> #include <svx/svdpagv.hxx> #include <svx/svdpage.hxx> -#include "svditer.hxx" +#include "svx/svditer.hxx" #include <svx/sdr/overlay/overlayobjectlist.hxx> #include <svx/sdr/overlay/overlaycrosshair.hxx> #include <svx/sdr/overlay/overlayhelpline.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// // #114409#-1 Migrate PageOrigin diff --git a/svx/source/svdraw/svdstr.src b/svx/source/svdraw/svdstr.src index ee6cbaea9632..ce024291241b 100644 --- a/svx/source/svdraw/svdstr.src +++ b/svx/source/svdraw/svdstr.src @@ -26,7 +26,7 @@ ************************************************************************/ /* StarView resource file */ -#include "svdstr.hrc" +#include "svx/svdstr.hrc" // Ab hier gecachte Strings String STR_ObjNameSingulNONE { diff --git a/svx/source/svdraw/svdundo.cxx b/svx/source/svdraw/svdundo.cxx index 667dd3a340b5..a20ebd9baf65 100644 --- a/svx/source/svdraw/svdundo.cxx +++ b/svx/source/svdraw/svdundo.cxx @@ -29,15 +29,15 @@ #include "precompiled_svx.hxx" #include <svx/svdundo.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdotext.hxx> #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> #include <svx/svdlayer.hxx> #include <svx/svdmodel.hxx> #include <svx/svdview.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/scene3d.hxx> #include <editeng/outlobj.hxx> #include <svx/svdogrp.hxx> @@ -47,7 +47,7 @@ #include <svl/whiter.hxx> #include <svx/e3dsceneupdater.hxx> -#include "svdviter.hxx" +#include "svx/svdviter.hxx" //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdview.cxx b/svx/source/svdraw/svdview.cxx index 856820b6d864..960c440d5973 100644 --- a/svx/source/svdraw/svdview.cxx +++ b/svx/source/svdraw/svdview.cxx @@ -29,8 +29,8 @@ #include "precompiled_svx.hxx" #include <editeng/eeitem.hxx> -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache #include <svx/svdpagv.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdedxv.hxx> @@ -55,7 +55,7 @@ #include <tools/tenccvt.hxx> #include <svx/sdr/overlay/overlaypolypolygon.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/sdrpagewindow.hxx> #include <svx/sdrhittesthelper.hxx> diff --git a/svx/source/svdraw/svdviter.cxx b/svx/source/svdraw/svdviter.cxx index 9c52ee87cf23..ceb192e85683 100644 --- a/svx/source/svdraw/svdviter.cxx +++ b/svx/source/svdraw/svdviter.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdobj.hxx> #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> @@ -36,7 +36,7 @@ #include <svx/svdpagv.hxx> #include <svx/svdsob.hxx> #include <svl/brdcst.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> //////////////////////////////////////////////////////////////////////////////////////////////////// diff --git a/svx/source/svdraw/svdxcgv.cxx b/svx/source/svdraw/svdxcgv.cxx index d19b190b3d6a..181b086988db 100644 --- a/svx/source/svdraw/svdxcgv.cxx +++ b/svx/source/svdraw/svdxcgv.cxx @@ -30,11 +30,11 @@ #include <vector> #include <editeng/editeng.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" #include <svx/xflclit.hxx> #include <svx/svdxcgv.hxx> #include <svx/svdoutl.hxx> -#include "svditext.hxx" +#include "svx/svditext.hxx" #include <svx/svdetc.hxx> #include <svx/svdundo.hxx> #include <svx/svdograf.hxx> @@ -45,9 +45,9 @@ #include <svx/svdpage.hxx> #include <svx/svdpagv.hxx> #include <svx/svdtrans.hxx> // Fuer GetMapFactor zum umskalieren bei PasteModel -#include "svdstr.hrc" // Namen aus der Resource -#include "svdglob.hxx" // StringCache -#include "xoutbmp.hxx" +#include "svx/svdstr.hrc" // Namen aus der Resource +#include "svx/svdglob.hxx" // StringCache +#include "svx/xoutbmp.hxx" #include <vcl/metaact.hxx> #include <svl/poolitem.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 71b94d021650..ce04c9f6307a 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -30,7 +30,7 @@ #include <accessiblecell.hxx> -#include "DescriptionGenerator.hxx" +#include "svx/DescriptionGenerator.hxx" #include <com/sun/star/accessibility/AccessibleRole.hpp> #include <com/sun/star/accessibility/AccessibleStateType.hpp> diff --git a/svx/source/table/cellcursor.cxx b/svx/source/table/cellcursor.cxx index 70329213d01a..7fb3a7ffcf70 100644 --- a/svx/source/table/cellcursor.cxx +++ b/svx/source/table/cellcursor.cxx @@ -33,8 +33,8 @@ #include "tablelayouter.hxx" #include "cell.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" // ----------------------------------------------------------------------------- diff --git a/svx/source/table/celleditsource.cxx b/svx/source/table/celleditsource.cxx index 218d8631cb75..4b49088be6e2 100644 --- a/svx/source/table/celleditsource.cxx +++ b/svx/source/table/celleditsource.cxx @@ -55,7 +55,7 @@ #include "svx/svdpage.hxx" #include "editeng/editeng.hxx" #include "editeng/unotext.hxx" -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" //------------------------------------------------------------------------ diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index d7f16cd15d3c..71e48ff06cb0 100644 --- a/svx/source/table/svdotable.cxx +++ b/svx/source/table/svdotable.cxx @@ -63,8 +63,8 @@ #include "svx/framelink.hxx" #include "svx/sdr/table/tabledesign.hxx" #include "svx/svdundo.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "editeng/writingmodeitem.hxx" #include "editeng/frmdiritem.hxx" #include "svx/xflhtit.hxx" diff --git a/svx/source/table/tablecontroller.cxx b/svx/source/table/tablecontroller.cxx index 4a0432c0c15f..a4ba47047efe 100644 --- a/svx/source/table/tablecontroller.cxx +++ b/svx/source/table/tablecontroller.cxx @@ -59,15 +59,15 @@ #include "svx/sdrpagewindow.hxx" #include <svx/selectioncontroller.hxx> #include <svx/svdmodel.hxx> -#include "sdrpaintwindow.hxx" +#include "svx/sdrpaintwindow.hxx" #include <svx/svxdlg.hxx> #include <editeng/boxitem.hxx> #include "cell.hxx" #include <editeng/borderline.hxx> #include <editeng/colritem.hxx> #include "editeng/bolnitem.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" #include "svx/svdpage.hxx" #include "tableundo.hxx" #include "tablelayouter.hxx" diff --git a/svx/source/table/tablehandles.cxx b/svx/source/table/tablehandles.cxx index 33833f8b81b1..46df8c681db5 100644 --- a/svx/source/table/tablehandles.cxx +++ b/svx/source/table/tablehandles.cxx @@ -42,7 +42,7 @@ #include <svx/sdr/overlay/overlayobject.hxx> #include <svx/sdr/overlay/overlaymanager.hxx> #include <svx/sdrpagewindow.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svdmrkv.hxx> #include <svx/svdpagv.hxx> #include <drawinglayer/primitive2d/polypolygonprimitive2d.hxx> diff --git a/svx/source/table/tablelayouter.cxx b/svx/source/table/tablelayouter.cxx index 5e13bce7101e..7f855752dcf2 100644 --- a/svx/source/table/tablelayouter.cxx +++ b/svx/source/table/tablelayouter.cxx @@ -44,8 +44,8 @@ #include "editeng/borderline.hxx" #include "editeng/boxitem.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" using ::rtl::OUString; using ::com::sun::star::awt::XLayoutConstrains; diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 1c8d0aa60dc8..b62d1187e14c 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -46,8 +46,8 @@ #include "tableundo.hxx" #include "svx/svdotable.hxx" #include "svx/svdmodel.hxx" -#include "svdstr.hrc" -#include "svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/svdglob.hxx" //#define PLEASE_DEBUG_THE_TABLES 1 diff --git a/svx/source/tbxctrls/colrctrl.cxx b/svx/source/tbxctrls/colrctrl.cxx index bf3612e55250..260a2e2e646c 100644 --- a/svx/source/tbxctrls/colrctrl.cxx +++ b/svx/source/tbxctrls/colrctrl.cxx @@ -40,12 +40,12 @@ #include <svx/colrctrl.hxx> #include <svx/svdview.hxx> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <editeng/colritem.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" #include <vcl/svapp.hxx> SFX_IMPL_DOCKINGWINDOW( SvxColorChildWindow, SID_COLOR_CONTROL ) diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx index a4cab5f3ef16..45a53ee7758a 100644 --- a/svx/source/tbxctrls/extrusioncontrols.cxx +++ b/svx/source/tbxctrls/extrusioncontrols.cxx @@ -42,7 +42,7 @@ #include <vcl/settings.hxx> #include <svl/intitem.hxx> #include <editeng/colritem.hxx> -#include "chrtitem.hxx" +#include "svx/chrtitem.hxx" #include <tools/urlobj.hxx> #include <svx/dialogs.hrc> @@ -50,7 +50,7 @@ #include <svx/svdtrans.hxx> #include <svx/dialmgr.hxx> -#include "extrusioncontrols.hxx" +#include "svx/extrusioncontrols.hxx" #include "extrusioncontrols.hrc" #include <svx/sdasitm.hxx> #include "toolbarmenu.hxx" diff --git a/svx/source/tbxctrls/fillctrl.cxx b/svx/source/tbxctrls/fillctrl.cxx index 31c77e221d62..5b740dbef004 100644 --- a/svx/source/tbxctrls/fillctrl.cxx +++ b/svx/source/tbxctrls/fillctrl.cxx @@ -44,8 +44,8 @@ #define TMP_STR_BEGIN '[' #define TMP_STR_END ']' -#include "drawitem.hxx" -#include "xattr.hxx" +#include "svx/drawitem.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/fillctrl.hxx> #include <svx/itemwin.hxx> diff --git a/svx/source/tbxctrls/fontworkgallery.cxx b/svx/source/tbxctrls/fontworkgallery.cxx index 1b4f89ca1e8c..c1dd5443e610 100644 --- a/svx/source/tbxctrls/fontworkgallery.cxx +++ b/svx/source/tbxctrls/fontworkgallery.cxx @@ -32,12 +32,12 @@ #include <svl/itempool.hxx> #include <svx/fmmodel.hxx> #include <sfx2/dispatch.hxx> -#include <dlgutil.hxx> +#include <svx/dlgutil.hxx> #include <svx/svxids.hrc> #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "gallery.hxx" +#include "svx/gallery.hxx" #include <svx/svdpage.hxx> #include <svx/svdobj.hxx> #include <svx/svdview.hxx> @@ -46,7 +46,7 @@ #include <editeng/frmdiritem.hxx> #include "toolbarmenu.hxx" -#include "fontworkgallery.hxx" +#include "svx/fontworkgallery.hxx" #include "fontworkgallery.hrc" #include <algorithm> diff --git a/svx/source/tbxctrls/formatpaintbrushctrl.cxx b/svx/source/tbxctrls/formatpaintbrushctrl.cxx index 0333cc62a374..45e76f8ae6e9 100644 --- a/svx/source/tbxctrls/formatpaintbrushctrl.cxx +++ b/svx/source/tbxctrls/formatpaintbrushctrl.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "formatpaintbrushctrl.hxx" +#include "svx/formatpaintbrushctrl.hxx" // header for class SfxBoolItem #include <svl/eitem.hxx> diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx index fa5ddd579dee..5fb37a5fe319 100644 --- a/svx/source/tbxctrls/grafctrl.cxx +++ b/svx/source/tbxctrls/grafctrl.cxx @@ -64,8 +64,8 @@ #include <svx/svdograf.hxx> #include <svx/svdundo.hxx> #include <svx/svdtrans.hxx> -#include "grafctrl.hxx" -#include "tbxcolor.hxx" +#include "svx/grafctrl.hxx" +#include "svx/tbxcolor.hxx" // namespaces using ::rtl::OUString; diff --git a/svx/source/tbxctrls/itemwin.cxx b/svx/source/tbxctrls/itemwin.cxx index 9415ddaf1814..26b5a508491e 100644 --- a/svx/source/tbxctrls/itemwin.cxx +++ b/svx/source/tbxctrls/itemwin.cxx @@ -49,11 +49,11 @@ #include <svx/xlineit0.hxx> #include <svx/xlndsit.hxx> #include <svx/xtable.hxx> -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/dialmgr.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/itemwin.hxx> -#include "linectrl.hxx" +#include "svx/linectrl.hxx" #include <svtools/colorcfg.hxx> #include "linectrl.hrc" diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index 139506028292..04e7e3dc543a 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -40,7 +40,7 @@ #include <sfx2/app.hxx> #include <svx/dialogs.hrc> -#include "layctrl.hxx" +#include "svx/layctrl.hxx" #include <svx/dialmgr.hxx> #include <comphelper/processfactory.hxx> #include <svtools/colorcfg.hxx> diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index 6d05c8bdb946..4fe822f94955 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -46,7 +46,7 @@ #include <svl/slstitm.hxx> #include <svl/stritem.hxx> #include <svx/dialmgr.hxx> -#include <lboxctrl.hxx> +#include <svx/lboxctrl.hxx> #ifndef _VCL_MNEMONIC_HXX_ #include <vcl/mnemonic.hxx> #endif diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 6deab3eca30b..0b7e6fe7182b 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -42,10 +42,10 @@ #include <svx/dialogs.hrc> #include "helpid.hrc" -#include "drawitem.hxx" -#include "xattr.hxx" +#include "svx/drawitem.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> -#include "linectrl.hxx" +#include "svx/linectrl.hxx" #include <svx/itemwin.hxx> #include <svx/dialmgr.hxx> diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index 5c99e84e6a47..8e100c083814 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -72,7 +72,7 @@ #include <svx/dialogs.hrc> #include <svx/svxitems.hrc> #include "helpid.hrc" -#include "htmlmode.hxx" +#include "svx/htmlmode.hxx" #include <svx/xtable.hxx> #include "editeng/fontitem.hxx" #include <editeng/fhgtitem.hxx> @@ -81,9 +81,9 @@ #include <editeng/colritem.hxx> #include "editeng/flstitem.hxx" #include "editeng/bolnitem.hxx" -#include "drawitem.hxx" +#include "svx/drawitem.hxx" #include <svx/tbcontrl.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/dialmgr.hxx> #include "colorwindow.hxx" #include <memory> diff --git a/svx/source/tbxctrls/tbxalign.cxx b/svx/source/tbxctrls/tbxalign.cxx index 3d9d6881eec7..e0bcd03b62fc 100644 --- a/svx/source/tbxctrls/tbxalign.cxx +++ b/svx/source/tbxctrls/tbxalign.cxx @@ -32,8 +32,8 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "tbxalign.hxx" -#include "tbxdraw.hxx" +#include "svx/tbxalign.hxx" +#include "svx/tbxdraw.hxx" #include "tbxdraw.hrc" #include <tools/shl.hxx> #ifndef _SFX_IMAGEMGR_HXX diff --git a/svx/source/tbxctrls/tbxcolor.cxx b/svx/source/tbxctrls/tbxcolor.cxx index 57d791f1babd..83b48b9e57b7 100644 --- a/svx/source/tbxctrls/tbxcolor.cxx +++ b/svx/source/tbxctrls/tbxcolor.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "tbxcolor.hxx" +#include "svx/tbxcolor.hxx" #include <sfx2/viewfrm.hxx> #include <com/sun/star/beans/XPropertySet.hpp> diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx index 5160c78ead27..34969ca00bc2 100644 --- a/svx/source/tbxctrls/tbxdrctl.cxx +++ b/svx/source/tbxctrls/tbxdrctl.cxx @@ -42,9 +42,9 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include "tbxctl.hxx" -#include "tbxdraw.hxx" -#include "tbxcolor.hxx" +#include "svx/tbxctl.hxx" +#include "svx/tbxdraw.hxx" +#include "svx/tbxcolor.hxx" #include "tbxdraw.hrc" #include <com/sun/star/frame/XLayoutManager.hpp> diff --git a/svx/source/tbxctrls/verttexttbxctrl.cxx b/svx/source/tbxctrls/verttexttbxctrl.cxx index 579fe9f511cf..14ffdc778361 100644 --- a/svx/source/tbxctrls/verttexttbxctrl.cxx +++ b/svx/source/tbxctrls/verttexttbxctrl.cxx @@ -30,7 +30,7 @@ #include <svx/dialmgr.hxx> #include <svx/dialogs.hrc> -#include <verttexttbxctrl.hxx> +#include <svx/verttexttbxctrl.hxx> #include <svl/languageoptions.hxx> #include <sfx2/app.hxx> #include <svl/eitem.hxx> diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx index daf1f23d4442..cf1c7dd50e3e 100644 --- a/svx/source/toolbars/extrusionbar.cxx +++ b/svx/source/toolbars/extrusionbar.cxx @@ -50,10 +50,10 @@ #endif #include <svx/svdview.hxx> #include <editeng/colritem.hxx> -#include "chrtitem.hxx" +#include "svx/chrtitem.hxx" #include <svx/extrusionbar.hxx> -#include "extrusioncontrols.hxx" +#include "svx/extrusioncontrols.hxx" using namespace ::svx; using namespace ::rtl; diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index 777aead3fa1a..49a4f62609a9 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -32,7 +32,7 @@ #include <sfx2/request.hxx> #include <sfx2/objface.hxx> #include <sfx2/viewsh.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <com/sun/star/drawing/XShape.hpp> #include <com/sun/star/drawing/XEnhancedCustomShapeDefaulter.hpp> #include <svx/dialmgr.hxx> @@ -48,11 +48,11 @@ #include <editeng/eeitem.hxx> #include <editeng/charscaleitem.hxx> #include <editeng/kernitem.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> #include <svx/svxids.hrc> #include <svx/fontworkbar.hxx> -#include "fontworkgallery.hxx" +#include "svx/fontworkgallery.hxx" using ::rtl::OUString; @@ -349,7 +349,7 @@ static void impl_execute( SdrView*, SfxRequest& rReq, SdrCustomShapeGeometryItem } } -#include "gallery.hxx" +#include "svx/gallery.hxx" #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <svl/itempool.hxx> diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx b/svx/source/unodraw/UnoGraphicExporter.cxx index b80be1076b7e..a2cb2fa29ca4 100644 --- a/svx/source/unodraw/UnoGraphicExporter.cxx +++ b/svx/source/unodraw/UnoGraphicExporter.cxx @@ -65,9 +65,9 @@ #include <editeng/numitem.hxx> #include <svx/svdpagv.hxx> #include <svx/svdograf.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include "svtools/filter.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdpage.hxx> #include <svx/svdmodel.hxx> #include <svx/fmview.hxx> diff --git a/svx/source/unodraw/UnoNameItemTable.cxx b/svx/source/unodraw/UnoNameItemTable.cxx index a802af33fbbd..e2f508ff224a 100644 --- a/svx/source/unodraw/UnoNameItemTable.cxx +++ b/svx/source/unodraw/UnoNameItemTable.cxx @@ -39,7 +39,7 @@ #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/UnoNamespaceMap.cxx b/svx/source/unodraw/UnoNamespaceMap.cxx index 5c7ad5226aff..0a26b0291890 100644 --- a/svx/source/unodraw/UnoNamespaceMap.cxx +++ b/svx/source/unodraw/UnoNamespaceMap.cxx @@ -30,7 +30,7 @@ #include <set> -#include "UnoNamespaceMap.hxx" +#include "svx/UnoNamespaceMap.hxx" #include <com/sun/star/container/XNameAccess.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> @@ -41,7 +41,7 @@ #include <osl/mutex.hxx> #include <comphelper/stl_types.hxx> #include <svl/itempool.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "editeng/xmlcnitm.hxx" diff --git a/svx/source/unodraw/XPropertyTable.cxx b/svx/source/unodraw/XPropertyTable.cxx index 6f69b1405d0e..617d1737a482 100644 --- a/svx/source/unodraw/XPropertyTable.cxx +++ b/svx/source/unodraw/XPropertyTable.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_svx.hxx" -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp> #include <com/sun/star/drawing/LineDash.hpp> #include <com/sun/star/awt/Gradient.hpp> @@ -42,7 +42,7 @@ #include "unopolyhelper.hxx" #include <svx/xdef.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <editeng/unoprnms.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/unodraw/unobtabl.cxx b/svx/source/unodraw/unobtabl.cxx index 70576f4fab95..793e9a6d858b 100644 --- a/svx/source/unodraw/unobtabl.cxx +++ b/svx/source/unodraw/unobtabl.cxx @@ -36,10 +36,10 @@ #include <svx/xbtmpit.hxx> #include <svx/svdmodel.hxx> #include <svx/xflhtit.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/unomid.hxx> #include <editeng/unoprnms.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <editeng/memberids.hrc> using namespace ::com::sun::star; diff --git a/svx/source/unodraw/unoctabl.cxx b/svx/source/unodraw/unoctabl.cxx index 5dd4814c6ab5..31e8dbc49c35 100644 --- a/svx/source/unodraw/unoctabl.cxx +++ b/svx/source/unodraw/unoctabl.cxx @@ -35,9 +35,9 @@ #include "../customshapes/EnhancedCustomShapeEngine.hxx" #include <svx/xtable.hxx> -#include "unoshcol.hxx" +#include "svx/unoshcol.hxx" #include "recoveryui.hxx" -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "tbunocontroller.hxx" using namespace ::com::sun::star; diff --git a/svx/source/unodraw/unodtabl.cxx b/svx/source/unodraw/unodtabl.cxx index 19663ab08ade..9c7637c4d5a9 100644 --- a/svx/source/unodraw/unodtabl.cxx +++ b/svx/source/unodraw/unodtabl.cxx @@ -38,7 +38,7 @@ #include <svx/xdash.hxx> #include <svx/svdmodel.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unogtabl.cxx b/svx/source/unodraw/unogtabl.cxx index 3cd4b13ac38e..bbb575a06410 100644 --- a/svx/source/unodraw/unogtabl.cxx +++ b/svx/source/unodraw/unogtabl.cxx @@ -36,7 +36,7 @@ #include <svx/svdmodel.hxx> #include <svx/xdef.hxx> #include <svx/xflgrit.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <svx/unomid.hxx> using namespace ::com::sun::star; diff --git a/svx/source/unodraw/unohtabl.cxx b/svx/source/unodraw/unohtabl.cxx index b774afe5c7ad..64fbdae052a0 100644 --- a/svx/source/unodraw/unohtabl.cxx +++ b/svx/source/unodraw/unohtabl.cxx @@ -37,7 +37,7 @@ #include <svx/xdef.hxx> #include <svx/xflhtit.hxx> #include <svx/unomid.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unomod.cxx b/svx/source/unodraw/unomod.cxx index a10d097981f5..195411b1e944 100644 --- a/svx/source/unodraw/unomod.cxx +++ b/svx/source/unodraw/unomod.cxx @@ -41,17 +41,17 @@ #include <comphelper/serviceinfohelper.hxx> #include <cppuhelper/implbase2.hxx> -#include <unofill.hxx> +#include <svx/unofill.hxx> #include <editeng/unonrule.hxx> #include <svtools/unoimap.hxx> #include <svx/fmdpage.hxx> #include <svx/fmmodel.hxx> #include <svx/fmpage.hxx> #include <sfx2/sfx.hrc> -#include <unoapi.hxx> +#include <svx/unoapi.hxx> #include <svx/svdmodel.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/svdtypes.hxx> #include <svx/unoprov.hxx> #include <svx/unopage.hxx> diff --git a/svx/source/unodraw/unomtabl.cxx b/svx/source/unodraw/unomtabl.cxx index dbb7269c1318..297acff8d382 100644 --- a/svx/source/unodraw/unomtabl.cxx +++ b/svx/source/unodraw/unomtabl.cxx @@ -50,9 +50,9 @@ #include <vcl/svapp.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" using namespace ::com::sun::star; using namespace ::rtl; diff --git a/svx/source/unodraw/unopage.cxx b/svx/source/unodraw/unopage.cxx index 9fea6a6fda5d..294d621b8ff8 100644 --- a/svx/source/unodraw/unopage.cxx +++ b/svx/source/unodraw/unopage.cxx @@ -49,11 +49,11 @@ #include <svx/svdpagv.hxx> #include <svx/unopage.hxx> #include "shapeimpl.hxx" -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/polysc3d.hxx> #include <svx/unoprov.hxx> #include <svx/svdopath.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdomeas.hxx> #include <svx/extrud3d.hxx> #include <svx/lathe3d.hxx> diff --git a/svx/source/unodraw/unopool.cxx b/svx/source/unodraw/unopool.cxx index 8c2d7ecde19a..17c32389e311 100644 --- a/svx/source/unodraw/unopool.cxx +++ b/svx/source/unodraw/unopool.cxx @@ -36,7 +36,7 @@ #include <rtl/uuid.h> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> -#include "unopool.hxx" +#include "svx/unopool.hxx" #include <svx/svdmodel.hxx> #include <svx/svdpool.hxx> #include <svx/unoprov.hxx> @@ -48,7 +48,7 @@ #include <svx/svdetc.hxx> #include <editeng/editeng.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <memory> using namespace ::com::sun::star; diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx index 9a9717b34495..b682d19dd1af 100644 --- a/svx/source/unodraw/unoprov.cxx +++ b/svx/source/unodraw/unoprov.cxx @@ -45,11 +45,11 @@ #include <vcl/svapp.hxx> #include <comphelper/propertysetinfo.hxx> #include <svx/dialmgr.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <editeng/unotext.hxx> #include <svx/unoshprp.hxx> #include <editeng/editeng.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/dialogs.hrc> #include <svx/svdpool.hxx> #include <svx/svdobj.hxx> diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx index 1f2d4fd3145b..cc608c8d9dcb 100644 --- a/svx/source/unodraw/unoshap2.cxx +++ b/svx/source/unodraw/unoshap2.cxx @@ -65,7 +65,7 @@ #include "unopolyhelper.hxx" // #i29181# -#include "svdviter.hxx" +#include "svx/svdviter.hxx" #include <svx/svdview.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/polygon/b2dpolygon.hxx> diff --git a/svx/source/unodraw/unoshap3.cxx b/svx/source/unodraw/unoshap3.cxx index 92d1706d4e6a..fd8f9dd1d2d9 100644 --- a/svx/source/unodraw/unoshap3.cxx +++ b/svx/source/unodraw/unoshap3.cxx @@ -45,7 +45,7 @@ #include <svx/unopage.hxx> #include <editeng/unoprnms.hxx> #include <svx/polysc3d.hxx> -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include <svx/cube3d.hxx> #include <svx/sphere3d.hxx> #include <svx/lathe3d.hxx> @@ -324,7 +324,7 @@ static void ConvertObjectToHomogenMatric( E3dObject* pObject, Any& rValue ) } //---------------------------------------------------------------------- -#include <svditer.hxx> +#include <svx/svditer.hxx> struct ImpRememberTransAndRect { diff --git a/svx/source/unodraw/unoshap4.cxx b/svx/source/unodraw/unoshap4.cxx index cf3bdc6621f0..5085dd72fe57 100644 --- a/svx/source/unodraw/unoshap4.cxx +++ b/svx/source/unodraw/unoshap4.cxx @@ -60,11 +60,11 @@ #include <svx/unoshprp.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "svx/svdpagv.hxx" #include "svx/svdview.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" /////////////////////////////////////////////////////////////////////// diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx index 1e79962736aa..99a378f0ceb4 100644 --- a/svx/source/unodraw/unoshape.cxx +++ b/svx/source/unodraw/unoshape.cxx @@ -61,7 +61,7 @@ #include "svx/svdogrp.hxx" #include "svx/scene3d.hxx" #include "svx/svdmodel.hxx" -#include "globl3d.hxx" +#include "svx/globl3d.hxx" #include "svx/fmglob.hxx" #include "svx/unopage.hxx" #include "svx/view3d.hxx" @@ -72,7 +72,7 @@ #include "svx/unoshprp.hxx" #include "svx/sxciaitm.hxx" // todo: remove #include "svx/svdograf.hxx" -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include "svx/svdomeas.hxx" #include "svx/svdpagv.hxx" #include "svx/svdpool.hxx" @@ -90,9 +90,9 @@ #include "svx/xlnedit.hxx" #include "svx/xlnstit.hxx" #include "svx/xlndsit.hxx" -#include "svdglob.hxx" -#include "svdstr.hrc" -#include "unomaster.hxx" +#include "svx/svdglob.hxx" +#include "svx/svdstr.hrc" +#include "svx/unomaster.hxx" #include <editeng/outlobj.hxx> #include <basegfx/matrix/b2dhommatrix.hxx> #include <basegfx/matrix/b2dhommatrixtools.hxx> diff --git a/svx/source/unodraw/unoshcol.cxx b/svx/source/unodraw/unoshcol.cxx index 3b45753175e6..f42e06cd8619 100644 --- a/svx/source/unodraw/unoshcol.cxx +++ b/svx/source/unodraw/unoshcol.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <com/sun/star/document/EventObject.hpp> -#include "unoshcol.hxx" +#include "svx/unoshcol.hxx" #include <svx/unoprov.hxx> #include <comphelper/serviceinfohelper.hxx> diff --git a/svx/source/unodraw/unoshtxt.cxx b/svx/source/unodraw/unoshtxt.cxx index 05551414507c..04770faf694b 100644 --- a/svx/source/unodraw/unoshtxt.cxx +++ b/svx/source/unodraw/unoshtxt.cxx @@ -55,7 +55,7 @@ #include <com/sun/star/linguistic2/XLinguServiceManager.hpp> #include <comphelper/processfactory.hxx> #include <vos/mutex.hxx> -#include <sdrpaintwindow.hxx> +#include <svx/sdrpaintwindow.hxx> using namespace ::osl; using namespace ::vos; diff --git a/svx/source/unodraw/unottabl.cxx b/svx/source/unodraw/unottabl.cxx index 58dcbc39d03c..46a84bf52fad 100644 --- a/svx/source/unodraw/unottabl.cxx +++ b/svx/source/unodraw/unottabl.cxx @@ -35,7 +35,7 @@ #include <svx/svdmodel.hxx> #include <svx/xflhtit.hxx> -#include "unofill.hxx" +#include "svx/unofill.hxx" #include <svx/unomid.hxx> #include "UnoNameItemTable.hxx" diff --git a/svx/source/unogallery/unogalitem.cxx b/svx/source/unogallery/unogalitem.cxx index 53bd6b99e5fc..ac90eb5ee362 100644 --- a/svx/source/unogallery/unogalitem.cxx +++ b/svx/source/unogallery/unogalitem.cxx @@ -30,7 +30,7 @@ #include "unogalitem.hxx" #include "unogaltheme.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/galmisc.hxx" #include <svx/fmmodel.hxx> #include <rtl/uuid.h> diff --git a/svx/source/unogallery/unogaltheme.cxx b/svx/source/unogallery/unogaltheme.cxx index e2596eba84ec..1145be7e3f5e 100644 --- a/svx/source/unogallery/unogaltheme.cxx +++ b/svx/source/unogallery/unogaltheme.cxx @@ -32,7 +32,7 @@ #include "unogaltheme.hxx" #include "unogalitem.hxx" -#include "galtheme.hxx" +#include "svx/galtheme.hxx" #include "svx/gallery1.hxx" #include "svx/galmisc.hxx" #include <svx/fmmodel.hxx> diff --git a/svx/source/xml/xmleohlp.cxx b/svx/source/xml/xmleohlp.cxx index ff161c0a1b2b..fdeda1dd726b 100644 --- a/svx/source/xml/xmleohlp.cxx +++ b/svx/source/xml/xmleohlp.cxx @@ -56,7 +56,7 @@ #include <sot/clsids.hxx> #endif #include <map> -#include "xmleohlp.hxx" +#include "svx/xmleohlp.hxx" // ----------- // - Defines - diff --git a/svx/source/xml/xmlexport.cxx b/svx/source/xml/xmlexport.cxx index 55a80ec40d89..c3b5bc5e55d0 100644 --- a/svx/source/xml/xmlexport.cxx +++ b/svx/source/xml/xmlexport.cxx @@ -44,8 +44,8 @@ #include <unotools/streamwrap.hxx> #include <sot/storage.hxx> #include <svx/svdmodel.hxx> -#include <xmleohlp.hxx> -#include <xmlgrhlp.hxx> +#include <svx/xmleohlp.hxx> +#include <svx/xmlgrhlp.hxx> #include <svx/unomodel.hxx> diff --git a/svx/source/xml/xmlgrhlp.cxx b/svx/source/xml/xmlgrhlp.cxx index bda709dc4abd..a3495d40b2d8 100644 --- a/svx/source/xml/xmlgrhlp.cxx +++ b/svx/source/xml/xmlgrhlp.cxx @@ -47,7 +47,7 @@ #include <tools/zcodec.hxx> #include "svtools/filter.hxx" -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include <algorithm> diff --git a/svx/source/xml/xmlxtexp.cxx b/svx/source/xml/xmlxtexp.cxx index 58860317040c..b04b083f486b 100644 --- a/svx/source/xml/xmlxtexp.cxx +++ b/svx/source/xml/xmlxtexp.cxx @@ -54,7 +54,7 @@ #include <com/sun/star/embed/XTransactedObject.hpp> #include <comphelper/processfactory.hxx> #include <unotools/streamwrap.hxx> -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "xmlxtexp.hxx" diff --git a/svx/source/xml/xmlxtimp.cxx b/svx/source/xml/xmlxtimp.cxx index 58cf00441520..c2071d4bd252 100644 --- a/svx/source/xml/xmlxtimp.cxx +++ b/svx/source/xml/xmlxtimp.cxx @@ -60,7 +60,7 @@ #include "xmloff/ImageStyle.hxx" #include "xmloff/MarkerStyle.hxx" #include <xmloff/xmlictxt.hxx> -#include "xmlgrhlp.hxx" +#include "svx/xmlgrhlp.hxx" #include "xmloff/attrlist.hxx" #include "xmlxtimp.hxx" diff --git a/svx/source/xoutdev/_xoutbmp.cxx b/svx/source/xoutdev/_xoutbmp.cxx index 1f9bec471c8f..6b3419c7b04e 100644 --- a/svx/source/xoutdev/_xoutbmp.cxx +++ b/svx/source/xoutdev/_xoutbmp.cxx @@ -38,7 +38,7 @@ #include <svl/solar.hrc> #include <sfx2/docfile.hxx> #include <sfx2/app.hxx> -#include "xoutbmp.hxx" +#include "svx/xoutbmp.hxx" #include <svtools/FilterConfigItem.hxx> #include <svtools/filter.hxx> diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx index a301e47e5c25..2de5f4a19e67 100644 --- a/svx/source/xoutdev/xattr.cxx +++ b/svx/source/xoutdev/xattr.cxx @@ -44,15 +44,15 @@ #include <editeng/memberids.hrc> #include <tools/stream.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svl/style.hxx> #include "unopolyhelper.hxx" #include <tools/bigint.hxx> #include <svl/itemset.hxx> #include <svx/dialogs.hrc> -#include "svdstr.hrc" -#include "xattr.hxx" +#include "svx/svdstr.hrc" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include <editeng/itemtype.hxx> diff --git a/svx/source/xoutdev/xattr2.cxx b/svx/source/xoutdev/xattr2.cxx index ea91bc120201..0c8fc3e9cbec 100644 --- a/svx/source/xoutdev/xattr2.cxx +++ b/svx/source/xoutdev/xattr2.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/uno/Any.hxx> #include <svx/dialogs.hrc> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/dialmgr.hxx> #include <editeng/itemtype.hxx> diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx index 486602e28256..57c894e00475 100644 --- a/svx/source/xoutdev/xattrbmp.cxx +++ b/svx/source/xoutdev/xattrbmp.cxx @@ -38,13 +38,13 @@ #include <editeng/memberids.hrc> #include <svx/dialogs.hrc> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xtable.hxx> #include <svx/xdef.hxx> #include <svx/unomid.hxx> #include <editeng/unoprnms.hxx> -#include "unoapi.hxx" +#include "svx/unoapi.hxx" #include <svx/svdmodel.hxx> #include <com/sun/star/beans/PropertyValue.hpp> diff --git a/svx/source/xoutdev/xexch.cxx b/svx/source/xoutdev/xexch.cxx index eec20c0fe80c..8b658918069a 100644 --- a/svx/source/xoutdev/xexch.cxx +++ b/svx/source/xoutdev/xexch.cxx @@ -43,7 +43,7 @@ #endif #include <svl/itemset.hxx> #include <svx/xdef.hxx> -#include "xexch.hxx" +#include "svx/xexch.hxx" TYPEINIT1_AUTOFACTORY( XFillExchangeData, SvDataCopyStream ); diff --git a/svx/source/xoutdev/xpool.cxx b/svx/source/xoutdev/xpool.cxx index 47dda35245a4..3d377c88fa4d 100644 --- a/svx/source/xoutdev/xpool.cxx +++ b/svx/source/xoutdev/xpool.cxx @@ -29,7 +29,7 @@ #include "precompiled_svx.hxx" #include <svx/xtable.hxx> -#include "xattr.hxx" +#include "svx/xattr.hxx" #include <svx/xpool.hxx> #include <svx/svdattr.hxx> #include <svx/svxids.hrc> diff --git a/svx/source/xoutdev/xtabbtmp.cxx b/svx/source/xoutdev/xtabbtmp.cxx index b4a426b0cf11..d61c339f762d 100644 --- a/svx/source/xoutdev/xtabbtmp.cxx +++ b/svx/source/xoutdev/xtabbtmp.cxx @@ -31,7 +31,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" diff --git a/svx/source/xoutdev/xtabcolr.cxx b/svx/source/xoutdev/xtabcolr.cxx index 853d397010b7..2b3ac7ab850b 100644 --- a/svx/source/xoutdev/xtabcolr.cxx +++ b/svx/source/xoutdev/xtabcolr.cxx @@ -31,7 +31,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include <unotools/pathoptions.hxx> diff --git a/svx/source/xoutdev/xtabdash.cxx b/svx/source/xoutdev/xtabdash.cxx index 88cec422f49a..3455ed4d3588 100644 --- a/svx/source/xoutdev/xtabdash.cxx +++ b/svx/source/xoutdev/xtabdash.cxx @@ -33,7 +33,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" diff --git a/svx/source/xoutdev/xtabgrdt.cxx b/svx/source/xoutdev/xtabgrdt.cxx index 2a64d4b8855a..3a9f24c6d15a 100644 --- a/svx/source/xoutdev/xtabgrdt.cxx +++ b/svx/source/xoutdev/xtabgrdt.cxx @@ -33,7 +33,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" diff --git a/svx/source/xoutdev/xtabhtch.cxx b/svx/source/xoutdev/xtabhtch.cxx index 703b2db16b1f..ef5beece8dc8 100644 --- a/svx/source/xoutdev/xtabhtch.cxx +++ b/svx/source/xoutdev/xtabhtch.cxx @@ -33,7 +33,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include <vcl/svapp.hxx> @@ -50,7 +50,7 @@ #include <svx/dialmgr.hxx> #include <svx/xtable.hxx> #include <svx/xpool.hxx> -#include "dlgutil.hxx" +#include "svx/dlgutil.hxx" #include <svx/xflhtit.hxx> #include <svx/xflclit.hxx> #include <svx/xfillit0.hxx> diff --git a/svx/source/xoutdev/xtablend.cxx b/svx/source/xoutdev/xtablend.cxx index 54d359506f77..ac5dcc739e41 100644 --- a/svx/source/xoutdev/xtablend.cxx +++ b/svx/source/xoutdev/xtablend.cxx @@ -33,7 +33,7 @@ #ifndef SVX_LIGHT #include <com/sun/star/container/XNameContainer.hpp> -#include "XPropertyTable.hxx" +#include "svx/XPropertyTable.hxx" #include <unotools/ucbstreamhelper.hxx> #include "xmlxtexp.hxx" diff --git a/xmloff/prj/build.lst b/xmloff/prj/build.lst index 4dcebafb0386..8817d4590715 100644 --- a/xmloff/prj/build.lst +++ b/xmloff/prj/build.lst @@ -1,4 +1,16 @@ xo xmloff : offapi svl vos NULL xo xmloff usr1 - all xo_mkout NULL -xo xmloff\prj nmake - all xo_prj NULL - +xo xmloff\prj get - all xo_prj NULL +xo xmloff\inc nmake - all xo_inc NULL +xo xmloff\source\core nmake - all xo_core xo_inc NULL +xo xmloff\source\meta nmake - all xo_meta xo_inc NULL +xo xmloff\source\style nmake - all xo_style xo_inc NULL +xo xmloff\source\text nmake - all xo_text xo_inc NULL +xo xmloff\source\draw nmake - all xo_draw xo_inc NULL +xo xmloff\source\chart nmake - all xo_chart xo_inc NULL +xo xmloff\source\forms nmake - all xo_forms xo_inc NULL +xo xmloff\source\script nmake - all xo_script xo_inc NULL +xo xmloff\source\transform nmake - all xo_transform xo_util xo_inc NULL +xo xmloff\source\xforms nmake - all xo_xforms xo_inc NULL +xo xmloff\source\table nmake - all xo_table xo_inc NULL +xo xmloff\util nmake - all xo_util xo_chart xo_core xo_draw xo_forms xo_meta xo_script xo_style xo_text xo_xforms xo_table NULL diff --git a/xmloff/prj/d.lst b/xmloff/prj/d.lst index 8b137891791f..658ce7454d5b 100644 --- a/xmloff/prj/d.lst +++ b/xmloff/prj/d.lst @@ -1 +1,54 @@ +mkdir: %_DEST%\inc%_EXT%\xmloff +..\%__SRC%\misc\*.map %_DEST%\bin%_EXT%\*.map +..\%__SRC%\lib\ixo.lib %_DEST%\lib%_EXT%\ixo.lib +..\%__SRC%\lib\xol.lib %_DEST%\lib%_EXT%\xol.lib +..\%__SRC%\lib\libxol.a %_DEST%\lib%_EXT%\libxol.a +..\%__SRC%\bin\*.dll %_DEST%\bin%_EXT%\*.dll +..\%__SRC%\lib\lib*.so %_DEST%\lib%_EXT%\lib*.so +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib + +..\dtd\* %_DEST%\bin%_EXT% + +..\inc\xmloff\odffields.hxx %_DEST%\inc%_EXT%\xmloff\odffields.hxx +..\inc\xmloff\dllapi.h %_DEST%\inc%_EXT%\xmloff\dllapi.h +..\inc\xmloff\attrlist.hxx %_DEST%\inc%_EXT%\xmloff\attrlist.hxx +..\inc\i18nmap.hxx %_DEST%\inc%_EXT%\xmloff\i18nmap.hxx +..\inc\unoatrcn.hxx %_DEST%\inc%_EXT%\xmloff\unoatrcn.hxx +..\inc\xmlkywd.hxx %_DEST%\inc%_EXT%\xmloff\xmlkywd.hxx +..\inc\xmlcnitm.hxx %_DEST%\inc%_EXT%\xmloff\xmlcnitm.hxx +..\inc\xmlnmspe.hxx %_DEST%\inc%_EXT%\xmloff\xmlnmspe.hxx +..\inc\xmlreg.hxx %_DEST%\inc%_EXT%\xmloff\xmlreg.hxx +..\inc\xmltabe.hxx %_DEST%\inc%_EXT%\xmloff\xmltabe.hxx +..\inc\numehelp.hxx %_DEST%\inc%_EXT%\xmloff\numehelp.hxx +..\inc\XMLTextListAutoStylePool.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextListAutoStylePool.hxx +..\inc\functional.hxx %_DEST%\inc%_EXT%\xmloff\functional.hxx +..\inc\VisAreaExport.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaExport.hxx +..\inc\VisAreaContext.hxx %_DEST%\inc%_EXT%\xmloff\VisAreaContext.hxx +..\inc\DashStyle.hxx %_DEST%\inc%_EXT%\xmloff\DashStyle.hxx +..\inc\GradientStyle.hxx %_DEST%\inc%_EXT%\xmloff\GradientStyle.hxx +..\inc\MarkerStyle.hxx %_DEST%\inc%_EXT%\xmloff\MarkerStyle.hxx +..\inc\HatchStyle.hxx %_DEST%\inc%_EXT%\xmloff\HatchStyle.hxx +..\inc\ImageStyle.hxx %_DEST%\inc%_EXT%\xmloff\ImageStyle.hxx +..\source\text\XMLTextShapeImportHelper.hxx %_DEST%\inc%_EXT%\xmloff\XMLTextShapeImportHelper.hxx +..\inc\xmloff\SettingsExportHelper.hxx %_DEST%\inc%_EXT%\xmloff\SettingsExportHelper.hxx +..\inc\xmloff\XMLSettingsExportContext.hxx %_DEST%\inc%_EXT%\xmloff\XMLSettingsExportContext.hxx +..\inc\xmloff\DocumentSettingsContext.hxx %_DEST%\inc%_EXT%\xmloff\DocumentSettingsContext.hxx +..\inc\xmloff\XMLGraphicsDefaultStyle.hxx %_DEST%\inc%_EXT%\xmloff\XMLGraphicsDefaultStyle.hxx +..\inc\XMLEmbeddedObjectExportFilter.hxx %_DEST%\inc%_EXT%\xmloff\XMLEmbeddedObjectExportFilter.hxx +..\inc\XMLFilterServiceNames.h %_DEST%\inc%_EXT%\xmloff\XMLFilterServiceNames.h +..\inc\xmlerror.hxx %_DEST%\inc%_EXT%\xmloff\xmlerror.hxx +..\inc\xformsimport.hxx %_DEST%\inc%_EXT%\xmloff\xformsimport.hxx +..\inc\xformsexport.hxx %_DEST%\inc%_EXT%\xmloff\xformsexport.hxx +..\inc\txtimppr.hxx %_DEST%\inc%_EXT%\xmloff\txtimppr.hxx + +..\inc\xmloff\*.hxx %_DEST%\inc%_EXT%\xmloff\*.hxx +..\inc\xmloff\*.h %_DEST%\inc%_EXT%\xmloff\*.h + +..\xml\components.xml %_DEST%\xml%_EXT%\components.xml + +mkdir: %_DEST%\inc%_EXT%\xmloff\table +..\inc\xmloff\table\XMLTableExport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableExport.hxx +..\inc\xmloff\table\XMLTableImport.hxx %_DEST%\inc%_EXT%\xmloff\table\XMLTableImport.hxx + +..\%__SRC%\lib\*.dylib %_DEST%\lib%_EXT%\*.dylib |