diff options
89 files changed, 147 insertions, 165 deletions
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..91efb1034762 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> 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..9f34f1dd7327 100644 --- a/framework/inc/classes/menuextensionsupplier.hxx +++ b/framework/inc/framework/menuextensionsupplier.hxx 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/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/d.lst b/framework/prj/d.lst index bf17da0a7164..1afa9dd09637 100644 --- a/framework/prj/d.lst +++ b/framework/prj/d.lst @@ -27,26 +27,8 @@ mkdir: %_DEST%\xml%_EXT%\uiconfig\modules\StartModule\statusbar ..\%__SRC%\lib\ifwe.lib %_DEST%\lib%_EXT%\ifwe.lib ..\%__SRC%\lib\ifwi.lib %_DEST%\lib%_EXT%\ifwi.lib -..\inc\fwedllapi.h %_DEST%\inc%_EXT%\fwedllapi.h -..\inc\fwidllapi.h %_DEST%\inc%_EXT%\fwidllapi.h -..\inc\fwkdllapi.h %_DEST%\inc%_EXT%\fwkdllapi.h -..\inc\helper\imageproducer.hxx %_DEST%\inc%_EXT%\framework\imageproducer.hxx -..\inc\helper\acceleratorinfo.hxx %_DEST%\inc%_EXT%\framework\acceleratorinfo.hxx -..\inc\helper\actiontriggerhelper.hxx %_DEST%\inc%_EXT%\framework\actiontriggerhelper.hxx -..\inc\xml\menuconfiguration.hxx %_DEST%\inc%_EXT%\framework\menuconfiguration.hxx -..\inc\classes\bmkmenu.hxx %_DEST%\inc%_EXT%\framework\bmkmenu.hxx -..\inc\xml\toolboxconfiguration.hxx %_DEST%\inc%_EXT%\framework\toolboxconfiguration.hxx -..\inc\xml\statusbarconfiguration.hxx %_DEST%\inc%_EXT%\framework\statusbarconfiguration.hxx -..\inc\xml\eventsconfiguration.hxx %_DEST%\inc%_EXT%\framework\eventsconfiguration.hxx -..\inc\xml\imagesconfiguration.hxx %_DEST%\inc%_EXT%\framework\imagesconfiguration.hxx -..\inc\classes\addonsoptions.hxx %_DEST%\inc%_EXT%\framework\addonsoptions.hxx -..\inc\dispatch\interaction.hxx %_DEST%\inc%_EXT%\framework\interaction.hxx -..\inc\classes\addonmenu.hxx %_DEST%\inc%_EXT%\framework\addonmenu.hxx -..\inc\classes\sfxhelperfunctions.hxx %_DEST%\inc%_EXT%\framework\sfxhelperfunctions.hxx -..\inc\helper\configimporter.hxx %_DEST%\inc%_EXT%\framework\configimporter.hxx -..\inc\classes\menuextensionsupplier.hxx %_DEST%\inc%_EXT%\framework\menuextensionsupplier.hxx -..\inc\interaction\preventduplicateinteraction.hxx %_DEST%\inc%_EXT%\framework\preventduplicateinteraction.hxx -..\inc\helper\titlehelper.hxx %_DEST%\inc%_EXT%\framework\titlehelper.hxx +..\inc\framework/*.h %_DEST%\inc%_EXT%\*.h +..\inc\framework/*.hxx %_DEST%\inc%_EXT%\*.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 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> |