diff options
| author | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-01-12 12:37:55 +0100 |
|---|---|---|
| committer | Joerg Skottke [jsk] <jsk@openoffice.org> | 2010-01-12 12:37:55 +0100 |
| commit | 5b3b6a84c0b42698f07dafdf72b92cd3bfa99bb9 (patch) | |
| tree | 429d29f73ea482c98e9917b60eba4c73bde2127a /sfx2/source/appl/appserv.cxx | |
| parent | d9164f354a8951ad220d5ae937517228296d1922 (diff) | |
| parent | e13e02de323f6660a2fd6bb5c54cd036a46205c5 (diff) | |
sb111: Local merge
Diffstat (limited to 'sfx2/source/appl/appserv.cxx')
| -rw-r--r-- | sfx2/source/appl/appserv.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index 184ecb9f1a5c..4580a11270e0 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -62,7 +62,7 @@ #ifndef _SVT_DOC_ADDRESSTEMPLATE_HXX_ #include <svtools/addresstemplate.hxx> #endif -#include <svtools/visitem.hxx> +#include <svl/visitem.hxx> #include <unotools/intlwrapper.hxx> #ifndef _UNOTOOLS_CONFIGMGR_HXX_ @@ -71,10 +71,10 @@ #include <tools/config.hxx> #include <tools/diagnose_ex.h> #include <vcl/msgbox.hxx> -#include <svtools/cancel.hxx> -#include <svtools/intitem.hxx> -#include <svtools/eitem.hxx> -#include <svtools/stritem.hxx> +#include <svl/cancel.hxx> +#include <svl/intitem.hxx> +#include <svl/eitem.hxx> +#include <svl/stritem.hxx> #include <basic/sbstar.hxx> #include <basic/basmgr.hxx> #include <basic/basrdll.hxx> @@ -84,9 +84,9 @@ #include <vcl/stdtext.hxx> #include <rtl/ustrbuf.hxx> -#include <svtools/pathoptions.hxx> -#include <svtools/moduleoptions.hxx> -#include <svtools/regoptions.hxx> +#include <unotools/pathoptions.hxx> +#include <unotools/moduleoptions.hxx> +#include <unotools/regoptions.hxx> #include <svtools/helpopt.hxx> #include <toolkit/helper/vclunohelper.hxx> #include <tools/shl.hxx> @@ -1209,7 +1209,7 @@ void SfxApplication::OfaState_Impl(SfxItemSet &rSet) { case SID_ONLINE_REGISTRATION: { - ::svt::RegOptions aOptions; + ::utl::RegOptions aOptions; if ( !aOptions.allowMenu() ) rSet.DisableItem( SID_ONLINE_REGISTRATION ); } |