diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-29 15:36:30 +0200 |
| commit | 4f40fd2727a826d5d0b06617e5179829d66df5d2 (patch) | |
| tree | bb3fbdb8fd94c48653a3b642b7d59dd10972b439 /framework/source | |
| parent | 83d7b776fba6a9b6be8e52f221b237b49ff7612d (diff) | |
CWS gnumake2: resolve conflicts and make sources buildable on Linux
Diffstat (limited to 'framework/source')
| -rw-r--r-- | framework/source/dispatch/closedispatcher.cxx | 2 | ||||
| -rw-r--r-- | framework/source/dispatch/startmoduledispatcher.cxx | 2 | ||||
| -rw-r--r-- | framework/source/fwe/classes/framelistanalyzer.cxx (renamed from framework/source/fwi/classes/framelistanalyzer.cxx) | 2 | ||||
| -rw-r--r-- | framework/source/loadenv/loadenv.cxx | 2 | ||||
| -rw-r--r-- | framework/source/services/frame.cxx | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/framework/source/dispatch/closedispatcher.cxx b/framework/source/dispatch/closedispatcher.cxx index ee84de9d7dd4..57355eaa6398 100644 --- a/framework/source/dispatch/closedispatcher.cxx +++ b/framework/source/dispatch/closedispatcher.cxx @@ -34,7 +34,7 @@ #include <pattern/frame.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -#include <classes/framelistanalyzer.hxx> +#include <framework/framelistanalyzer.hxx> #include <services.h> #include <general.h> diff --git a/framework/source/dispatch/startmoduledispatcher.cxx b/framework/source/dispatch/startmoduledispatcher.cxx index 40def3f98488..0e49b2818e56 100644 --- a/framework/source/dispatch/startmoduledispatcher.cxx +++ b/framework/source/dispatch/startmoduledispatcher.cxx @@ -36,7 +36,7 @@ #include <pattern/frame.hxx> #include <threadhelp/readguard.hxx> #include <threadhelp/writeguard.hxx> -#include <classes/framelistanalyzer.hxx> +#include <framework/framelistanalyzer.hxx> #include <dispatchcommands.h> #include <targets.h> #include <services.h> diff --git a/framework/source/fwi/classes/framelistanalyzer.cxx b/framework/source/fwe/classes/framelistanalyzer.cxx index 22f019e78df5..1a33ebf91d7e 100644 --- a/framework/source/fwi/classes/framelistanalyzer.cxx +++ b/framework/source/fwe/classes/framelistanalyzer.cxx @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_framework.hxx" -#include "classes/framelistanalyzer.hxx" +#include "framework/framelistanalyzer.hxx" //_______________________________________________ // my own includes diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx index d4fb22c4f7f8..cf37e1d8129f 100644 --- a/framework/source/loadenv/loadenv.cxx +++ b/framework/source/loadenv/loadenv.cxx @@ -34,7 +34,7 @@ #ifndef __FRAMEWORK_LOADENV_TARGETHELPER_HXX_ #include <loadenv/targethelper.hxx> #endif -#include <classes/framelistanalyzer.hxx> +#include <framework/framelistanalyzer.hxx> #ifndef __FRAMEWORK_CONSTANT_FRAMELOADER_HXX_ #include <constant/frameloader.hxx> diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index dfc6225b4572..a6567b218369 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -46,7 +46,7 @@ #include <classes/droptargetlistener.hxx> #include <classes/taskcreator.hxx> #include <loadenv/targethelper.hxx> -#include <classes/framelistanalyzer.hxx> +#include <framework/framelistanalyzer.hxx> #include <helper/dockingareadefaultacceptor.hxx> #include <dispatch/dispatchinformationprovider.hxx> #include <threadhelp/transactionguard.hxx> |