diff options
author | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 15:40:39 +0000 |
---|---|---|
committer | Jens-Heiner Rechtien <hr@openoffice.org> | 2004-02-03 15:40:39 +0000 |
commit | ab8cc2669bc1945fae4870b91f00f433de3e06ee (patch) | |
tree | e0725ae81481eb2fc56eb75033e87951e3b84fa5 /sw/source/ui/fmtui | |
parent | 516e1587707b871576f9c5ba54d745ed429a7ad6 (diff) |
INTEGRATION: CWS dialogdiet (1.14.276); FILE MERGED
2003/12/01 09:12:46 mba 1.14.276.1: #i22972#: options moved from offmgr
Diffstat (limited to 'sw/source/ui/fmtui')
-rw-r--r-- | sw/source/ui/fmtui/tmpdlg.cxx | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/sw/source/ui/fmtui/tmpdlg.cxx b/sw/source/ui/fmtui/tmpdlg.cxx index 66eea0be3374..452e12bcefcd 100644 --- a/sw/source/ui/fmtui/tmpdlg.cxx +++ b/sw/source/ui/fmtui/tmpdlg.cxx @@ -2,9 +2,9 @@ * * $RCSfile: tmpdlg.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: vg $ $Date: 2003-04-17 15:29:24 $ + * last change: $Author: hr $ $Date: 2004-02-03 16:40:39 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -106,12 +106,7 @@ #ifndef _SVX_NUMPAGES_HXX //autogen #include <svx/numpages.hxx> #endif -#ifndef _OFA_HTMLCFG_HXX //autogen -#include <offmgr/htmlcfg.hxx> -#endif -#ifndef _OFF_APP_HXX //autogen -#include <offmgr/app.hxx> -#endif +#include <svx/htmlcfg.hxx> #ifndef _SVTOOLS_CJKOPTIONS_HXX #include <svtools/cjkoptions.hxx> #endif @@ -297,7 +292,7 @@ SwTemplateDlg::SwTemplateDlg(Window* pParent, SvtCJKOptions aCJKOptions; if(nHtmlMode & HTMLMODE_ON) { - OfaHtmlOptions* pHtmlOpt = OFF_APP()->GetHtmlOptions(); + SvxHtmlOptions* pHtmlOpt = SvxHtmlOptions::Get(); if (!pHtmlOpt->IsPrintLayoutExtension()) RemoveTabPage(TP_PARA_EXT); RemoveTabPage(TP_PARA_ASIAN); |