diff options
| author | Michael Stahl <mst@openoffice.org> | 2010-01-05 16:37:49 +0100 |
|---|---|---|
| committer | Michael Stahl <mst@openoffice.org> | 2010-01-05 16:37:49 +0100 |
| commit | 7e156d00e9e09e3329856c685a9c6c0138db1253 (patch) | |
| tree | 24f61dd99d8d4c93770388f7afcf7ad42da8aa88 /sw/source/ui/app | |
| parent | 80c54710e69437a743c9a0213c4e76eed6286945 (diff) | |
swunolocking1: #i105557#: unoobj.hxx: move misc stuff:
move GetPageDescByName_Impl from unoobj.hxx to pagedesc.hxx.
move UnoActionContext, UnoActionRemoveContext, ClientModify,
CreateUnoTunnelId from unoobj.hxx to unobaseclass.hxx.
move UnoActionContext, UnoActionRemoveContext from unoobj.cxx to unoobj2.cxx.
Diffstat (limited to 'sw/source/ui/app')
| -rw-r--r-- | sw/source/ui/app/docsh2.cxx | 35 |
1 files changed, 3 insertions, 32 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx index 3fd1e879b063..4dad964fafca 100644 --- a/sw/source/ui/app/docsh2.cxx +++ b/sw/source/ui/app/docsh2.cxx @@ -30,30 +30,19 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" -#ifndef _COM_SUN_STAR_LANG_XMultiServiceFactory_HPP_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif -#ifndef _UNOTOOLS_PROCESSFACTORY_HXX -#include <comphelper/processfactory.hxx> -#endif +#include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <com/sun/star/frame/XDispatchHelper.hpp> +#include <comphelper/processfactory.hxx> #include <hintids.hxx> #include <tools/urlobj.hxx> #include <unotools/tempfile.hxx> -#ifndef _WRKWIN_HXX //autogen #include <vcl/wrkwin.hxx> -#endif -#ifndef _MSGBOX_HXX //autogen #include <vcl/msgbox.hxx> -#endif #include <svtools/lckbitem.hxx> #include <svtools/eitem.hxx> -/* -#include <svtools/macitem.hxx> -*/ #include <svtools/zforlist.hxx> #include <svtools/zformat.hxx> #include <svtools/pathoptions.hxx> @@ -90,51 +79,33 @@ #include <swunodef.hxx> #include <fmtcol.hxx> #include <swevent.hxx> -#ifndef _VIEW_HXX #include <view.hxx> // fuer die aktuelle Sicht -#endif -#ifndef _DOCSH_HXX #include <docsh.hxx> // Dokumenterzeugung -#endif #include <wrtsh.hxx> #include <fldbas.hxx> #include <viewopt.hxx> -#ifndef _GLOBDOC_HXX #include <globdoc.hxx> -#endif #include <fldwrap.hxx> -#ifndef _REDLNDLG_HXX #include <redlndlg.hxx> -#endif #include <docstyle.hxx> #include <doc.hxx> #include <pagedesc.hxx> #include <shellio.hxx> -#ifndef _PVIEW_HXX #include <pview.hxx> -#endif -#ifndef _SRCVIEW_HXX #include <srcview.hxx> -#endif #include <poolfmt.hxx> #include <usrpref.hxx> -#ifndef _WDOCSH_HXX #include <wdocsh.hxx> -#endif #include <unotxdoc.hxx> #include <acmplwrd.hxx> #include <swmodule.hxx> -#include <unoobj.hxx> +#include <unobaseclass.hxx> #include <swwait.hxx> #include <swcli.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <globals.h> -#ifndef _HELPID_H #include <helpid.h> -#endif #ifndef _APP_HRC #include <app.hrc> #endif |