diff options
| -rw-r--r-- | sw/source/ui/fldui/fldmgr.cxx | 9 | ||||
| -rw-r--r-- | sw/source/ui/misc/numberingtypelistbox.cxx | 10 | ||||
| -rw-r--r-- | sw/source/ui/misc/outline.cxx | 6 |
3 files changed, 16 insertions, 9 deletions
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx index b70711fb0ddd..02b1f7183a20 100644 --- a/sw/source/ui/fldui/fldmgr.cxx +++ b/sw/source/ui/fldui/fldmgr.cxx @@ -2,9 +2,9 @@ * * $RCSfile: fldmgr.cxx,v $ * - * $Revision: 1.20 $ + * $Revision: 1.21 $ * - * last change: $Author: jp $ $Date: 2002-02-01 12:44:57 $ + * last change: $Author: os $ $Date: 2002-10-16 09:16:36 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -75,6 +75,9 @@ #ifndef _SFXSTRITEM_HXX #include <svtools/stritem.hxx> #endif +#ifndef _SVTOOLS_CJKOPTIONS_HXX +#include <svtools/cjkoptions.hxx> +#endif #ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ #include <com/sun/star/lang/XMultiServiceFactory.hpp> @@ -849,7 +852,7 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co { USHORT nCount = (USHORT)(nEnd - nStart); GetNumberingInfo(); - if(xNumberingInfo.is()) + if(xNumberingInfo.is() && SvtCJKOptions().IsCJKFontEnabled()) { Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes(); const sal_Int16* pTypes = aTypes.getConstArray(); diff --git a/sw/source/ui/misc/numberingtypelistbox.cxx b/sw/source/ui/misc/numberingtypelistbox.cxx index e6a47911e516..071b7d40cf76 100644 --- a/sw/source/ui/misc/numberingtypelistbox.cxx +++ b/sw/source/ui/misc/numberingtypelistbox.cxx @@ -2,9 +2,9 @@ * * $RCSfile: numberingtypelistbox.cxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: os $ $Date: 2002-09-05 12:57:14 $ + * last change: $Author: os $ $Date: 2002-10-16 09:16:31 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -88,6 +88,9 @@ #ifndef _COM_SUN_STAR_TEXT_XNUMBERINGTYPEINFO_HPP_ #include <com/sun/star/text/XNumberingTypeInfo.hpp> #endif +#ifndef _SVTOOLS_CJKOPTIONS_HXX +#include <svtools/cjkoptions.hxx> +#endif using namespace com::sun::star::uno; using namespace com::sun::star::text; @@ -156,7 +159,8 @@ void SwNumberingTypeListBox::Reload(USHORT nTypeFlags) SetEntryData( nEntry, (void*)nValue ); } } - if(0 != (nTypeFlags&INSERT_NUM_EXTENDED_TYPES)) + //#104079# extended numberings are only insert when CJK support is switched on + if(0 != (nTypeFlags&INSERT_NUM_EXTENDED_TYPES) && SvtCJKOptions().IsCJKFontEnabled()) { if(pImpl->xInfo.is()) { diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx index 1759407eb55d..9e4a719d7bf7 100644 --- a/sw/source/ui/misc/outline.cxx +++ b/sw/source/ui/misc/outline.cxx @@ -2,9 +2,9 @@ * * $RCSfile: outline.cxx,v $ * - * $Revision: 1.17 $ + * $Revision: 1.18 $ * - * last change: $Author: oj $ $Date: 2002-07-22 08:52:54 $ + * last change: $Author: os $ $Date: 2002-10-16 09:16:29 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -526,7 +526,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte aCollLbl(this, SW_RES(FT_COLL)), aCollBox(this, SW_RES(LB_COLL)), aNumberLbl(this, SW_RES(FT_NUMBER)), - aNumberBox(this, SW_RES(LB_NUMBER), INSERT_NUM_TYPE_NO_NUMBERING), + aNumberBox(this, SW_RES(LB_NUMBER), INSERT_NUM_TYPE_NO_NUMBERING|INSERT_NUM_EXTENDED_TYPES), aCharFmtFT(this, SW_RES(FT_CHARFMT)), aCharFmtLB(this, SW_RES(LB_CHARFMT)), aAllLevelFT( this, ResId(FT_ALL_LEVEL)), |