diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-04-17 20:34:49 +0200 |
| commit | 7fede8929ac21327faaf6ff874ba9d151e9c9941 (patch) | |
| tree | 86835e460bc225c527da931a820d281deee55ad2 /sw/source/ui/shells/tabsh.cxx | |
| parent | 257f1ae021145a109f184cd15105e08362abf99b (diff) | |
| parent | c84af0cedc1c407d5e1a92fe172e134c08b130f6 (diff) | |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'sw/source/ui/shells/tabsh.cxx')
| -rw-r--r-- | sw/source/ui/shells/tabsh.cxx | 37 |
1 files changed, 15 insertions, 22 deletions
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx index 20b548efaf91..5f3389791122 100644 --- a/sw/source/ui/shells/tabsh.cxx +++ b/sw/source/ui/shells/tabsh.cxx @@ -2,13 +2,10 @@ * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * Copyright 2008 by Sun Microsystems, Inc. + * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite * - * $RCSfile: tabsh.cxx,v $ - * $Revision: 1.46.212.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -40,18 +37,18 @@ #include <svl/whiter.hxx> #include <unotools/moduleoptions.hxx> #include <svx/rulritem.hxx> -#include <svx/srchitem.hxx> -#include <svx/lrspitem.hxx> -#include <svx/ulspitem.hxx> -#include <svx/brshitem.hxx> -#include <svx/boxitem.hxx> -#include <svx/shaditem.hxx> -#include <svx/spltitem.hxx> -#include <svx/langitem.hxx> -#include <svx/keepitem.hxx> -#include <svx/bolnitem.hxx> -#include <svx/colritem.hxx> -#include <svx/frmdiritem.hxx> +#include <svl/srchitem.hxx> +#include <editeng/lrspitem.hxx> +#include <editeng/ulspitem.hxx> +#include <editeng/brshitem.hxx> +#include <editeng/boxitem.hxx> +#include <editeng/shaditem.hxx> +#include <editeng/spltitem.hxx> +#include <editeng/langitem.hxx> +#include <editeng/keepitem.hxx> +#include <editeng/bolnitem.hxx> +#include <editeng/colritem.hxx> +#include <editeng/frmdiritem.hxx> #include <svx/numinf.hxx> #include <svx/svddef.hxx> #include <svx/svxdlg.hxx> @@ -108,16 +105,12 @@ #ifndef _TABLE_HRC #include <table.hrc> #endif -#ifndef _CMDID_H #include <cmdid.h> -#endif #ifndef _GLOBALS_HRC #include <globals.hrc> #endif -#ifndef _HELPID_H #include <helpid.h> -#endif -#include <unoobj.hxx> +#include <unobaseclass.hxx> #define SwTableShell #include <sfx2/msg.hxx> @@ -736,7 +729,7 @@ void SwTableShell::Execute(SfxRequest &rReq) DBG_ASSERT(pFact, "SwAbstractDialogFactory fail!"); SfxAbstractDialog* pDlg = pFact->CreateSfxDialog( GetView().GetWindow(),aCoreSet, - pView->GetViewFrame()->GetFrame()->GetFrameInterface(), + pView->GetViewFrame()->GetFrame().GetFrameInterface(), RC_DLG_SWNUMFMTDLG ); DBG_ASSERT(pDlg, "Dialogdiet fail!"); |