diff options
author | Kai Sommerfeld <kso@openoffice.org> | 2010-01-07 17:58:13 +0100 |
---|---|---|
committer | Kai Sommerfeld <kso@openoffice.org> | 2010-01-07 17:58:13 +0100 |
commit | e5d0376c47d22195bab569da37248f1715c189e2 (patch) | |
tree | 7ac9a0e1f8fb3af00ceef8f5794b21d7ee8c559c /sfx2/source/appl/appmain.cxx | |
parent | 93551bdf06411cbb37acf68192c94a41c146a03c (diff) | |
parent | b0c799c7fbaa93f707bf18a87eb9aef5d86be52c (diff) |
rebase to dev300 m69.
Diffstat (limited to 'sfx2/source/appl/appmain.cxx')
-rw-r--r-- | sfx2/source/appl/appmain.cxx | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/sfx2/source/appl/appmain.cxx b/sfx2/source/appl/appmain.cxx index a65a16e3b518..253311c54f3d 100644 --- a/sfx2/source/appl/appmain.cxx +++ b/sfx2/source/appl/appmain.cxx @@ -37,12 +37,11 @@ #include <stdio.h> #include <tools/urlobj.hxx> -#include <svtools/cstitem.hxx> #include <tools/config.hxx> #include <svtools/ehdl.hxx> -#include <svtools/startoptions.hxx> -#include <svtools/itempool.hxx> -#include <svtools/urihelper.hxx> +#include <unotools/startoptions.hxx> +#include <svl/itempool.hxx> +#include <svl/urihelper.hxx> #include <svtools/helpopt.hxx> #include <vos/process.hxx> #include <framework/sfxhelperfunctions.hxx> @@ -124,7 +123,7 @@ void SfxApplication::Init */ { #ifdef DDE_AVAILABLE -#ifdef PRODUCT +#ifndef DBG_UTIL InitializeDde(); #else if( !InitializeDde() ) |