diff options
| author | Kurt Zenker <kz@openoffice.org> | 2003-10-15 08:59:59 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2003-10-15 08:59:59 +0000 |
| commit | 8a37f8a1f91c2c25ffa6f8431574402c9347589a (patch) | |
| tree | 84bbfd56acd26fa8635a30b103d56acaa08682ac /sw/source/ui/app/appopt.cxx | |
| parent | 06a9ee1ca96c6228af337fb84176c97b7fab0170 (diff) | |
INTEGRATION: CWS extleading (1.21.92); FILE MERGED
2003/10/01 14:28:22 pb 1.21.92.1: fix: #112516# compatibility page added
Diffstat (limited to 'sw/source/ui/app/appopt.cxx')
| -rw-r--r-- | sw/source/ui/app/appopt.cxx | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/sw/source/ui/app/appopt.cxx b/sw/source/ui/app/appopt.cxx index aa911c3d043a..d4f1e67a47c7 100644 --- a/sw/source/ui/app/appopt.cxx +++ b/sw/source/ui/app/appopt.cxx @@ -2,9 +2,9 @@ * * $RCSfile: appopt.cxx,v $ * - * $Revision: 1.21 $ + * $Revision: 1.22 $ * - * last change: $Author: vg $ $Date: 2003-04-17 15:10:58 $ + * last change: $Author: kz $ $Date: 2003-10-15 09:59:59 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -119,6 +119,9 @@ #ifndef _OPTLOAD_HXX #include <optload.hxx> #endif +#ifndef _OPTCOMP_HXX +#include <optcomp.hxx> +#endif #ifndef _EDTWIN_HXX #include <edtwin.hxx> #endif @@ -321,7 +324,7 @@ SfxItemSet* SwModule::CreateItemSet( USHORT nId ) pRet->Put( SfxUInt16Item( SID_ATTR_DEFTABSTOP, (USHORT)::GetTabDist(rDefTabs))); } else - pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, pPref->GetDefTab())); + pRet->Put(SfxUInt16Item( SID_ATTR_DEFTABSTOP, (UINT16)pPref->GetDefTab())); } /*-----------------01.02.97 11.13------------------- @@ -596,11 +599,11 @@ void SwModule::ApplyItemSet( USHORT nId, const SfxItemSet& rSet ) /* -----------------12.02.99 12:28------------------- * * --------------------------------------------------*/ -SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ) +SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItemSet& rSet ) { - SfxTabPage* pRet = 0; + SfxTabPage* pRet = NULL; - switch(nId) + switch( nId ) { case RID_SW_TP_CONTENT_OPT: case RID_SW_TP_HTML_CONTENT_OPT: @@ -657,12 +660,14 @@ SfxTabPage* SwModule::CreateTabPage( USHORT nId, Window* pParent, const SfxItem break; case RID_SW_TP_REDLINE_OPT: pRet = SwRedlineOptionsTabPage::Create(pParent, rSet); break; case RID_SW_TP_OPTLOAD_PAGE: pRet = SwLoadOptPage::Create(pParent, rSet); break; + case RID_SW_TP_OPTCOMPATIBILITY_PAGE: pRet = SwCompatibilityOptPage::Create(pParent, rSet); break; #ifndef PRODUCT case RID_SW_TP_OPTTEST_PAGE: pRet = SwTestTabPage::Create(pParent, rSet); break; #endif case RID_SW_TP_BACKGROUND: pRet = SvxBackgroundTabPage::Create(pParent, rSet); break; } - DBG_ASSERT(pRet, "Id unbekannt") + + DBG_ASSERT( pRet, "SwModule::CreateTabPage(): Unknown tabpage id" ) return pRet; } |