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/fmtui/tmpdlg.cxx | |
| parent | 257f1ae021145a109f184cd15105e08362abf99b (diff) | |
| parent | c84af0cedc1c407d5e1a92fe172e134c08b130f6 (diff) | |
CWS gnumake2: rebase to DEV300_m76; fix build problems
Diffstat (limited to 'sw/source/ui/fmtui/tmpdlg.cxx')
| -rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index ef33935f1b6f..c78f51f4796f 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.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: tmpdlg.cxx,v $ - * $Revision: 1.25 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -45,9 +42,9 @@ #include <vcl/msgbox.hxx> #include <sfx2/viewfrm.hxx> #include <svx/hdft2.hxx> -#include <svx/flstitem.hxx> +#include <editeng/flstitem.hxx> #include <svx/htmlmode.hxx> -#include <svx/htmlcfg.hxx> +#include <svtools/htmlcfg.hxx> #include <svl/cjkoptions.hxx> #include <numpara.hxx> #include <fmtclds.hxx> @@ -570,7 +567,7 @@ void SwTemplateDlg::PageCreated( USHORT nId, SfxTabPage &rPage ) SfxAllItemSet aNewSet(*aSet.GetPool()); aNewSet.Put( SwMacroAssignDlg::AddEvents(MACASSGN_ALLFRM) ); if ( pWrtShell ) - rPage.SetFrame( pWrtShell->GetView().GetViewFrame()->GetFrame()->GetFrameInterface() ); + rPage.SetFrame( pWrtShell->GetView().GetViewFrame()->GetFrame().GetFrameInterface() ); rPage.PageCreated(aNewSet); break; } |