diff options
author | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-19 16:36:58 +0100 |
---|---|---|
committer | Bjoern Michaelsen <b_michaelsen@openoffice.org> | 2011-01-19 16:36:58 +0100 |
commit | b379e8f426b8cb01091e778787b16f44e1a4828e (patch) | |
tree | 3391b5c92fb12c9a5a7366d92c06f2660bc5498a /framework | |
parent | gnumake3: enabling unoapi test in svx (diff) | |
parent | CWS-TOOLING: integrate CWS ause129 (diff) | |
download | core-b379e8f426b8cb01091e778787b16f44e1a4828e.tar.gz core-b379e8f426b8cb01091e778787b16f44e1a4828e.zip |
gnumake3: mergeing changes from DEV300_m97, fixing jars for svl complex test, deliver globlmn.hrc for now, adding component registration for svx libraries, still misses gengal and friends when packing
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/pch/precompiled_framework.hxx | 4 | ||||
-rw-r--r-- | framework/inc/services/layoutmanager.hxx | 2 | ||||
-rw-r--r-- | framework/source/helper/tagwindowasmodified.cxx | 2 | ||||
-rw-r--r-- | framework/source/uielement/fontsizemenucontroller.cxx | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/framework/inc/pch/precompiled_framework.hxx b/framework/inc/pch/precompiled_framework.hxx index 45919a31047b..b4afb017ebab 100644 --- a/framework/inc/pch/precompiled_framework.hxx +++ b/framework/inc/pch/precompiled_framework.hxx @@ -463,7 +463,7 @@ #include "vcl/keycod.hxx" #include "vcl/keycodes.hxx" #include "vcl/lstbox.hxx" -#include "vcl/mapunit.hxx" +#include "tools/mapunit.hxx" #include "vcl/menu.hxx" #include "vcl/mnemonic.hxx" #include "vcl/morebtn.hxx" @@ -482,7 +482,7 @@ #include "vcl/timer.hxx" #include "vcl/wall.hxx" #include "vcl/window.hxx" -#include "vcl/wintypes.hxx" +#include "tools/wintypes.hxx" #include "vos/mutex.hxx" #include "vos/process.hxx" diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index 0110a0b40b9e..e6a638c654e9 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -85,7 +85,7 @@ #include <cppuhelper/implbase8.hxx> #include <cppuhelper/interfacecontainer.hxx> #include <comphelper/propertycontainer.hxx> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> #include <svtools/miscopt.hxx> #include <vcl/toolbox.hxx> #include <vcl/timer.hxx> diff --git a/framework/source/helper/tagwindowasmodified.cxx b/framework/source/helper/tagwindowasmodified.cxx index a71c5263455b..67c047dfefd4 100644 --- a/framework/source/helper/tagwindowasmodified.cxx +++ b/framework/source/helper/tagwindowasmodified.cxx @@ -61,7 +61,7 @@ #include <vcl/syswin.hxx> #include <vcl/svapp.hxx> #include <vcl/wrkwin.hxx> -#include <vcl/wintypes.hxx> +#include <tools/wintypes.hxx> //_________________________________________________________________________________________________________________ // namespace diff --git a/framework/source/uielement/fontsizemenucontroller.cxx b/framework/source/uielement/fontsizemenucontroller.cxx index 58cf3a3b02be..0b1a0d003133 100644 --- a/framework/source/uielement/fontsizemenucontroller.cxx +++ b/framework/source/uielement/fontsizemenucontroller.cxx @@ -51,7 +51,7 @@ #ifndef _VCL_MENU_HXX_ #include <vcl/menu.hxx> #endif -#include <vcl/mapunit.hxx> +#include <tools/mapunit.hxx> #ifndef _VCL_SVAPP_HXX_ #include <vcl/svapp.hxx> #endif |