From 2ae6c0eb709ed2ffdbb5229f822a3183afca67ff Mon Sep 17 00:00:00 2001 From: Niklas Nebel Date: Mon, 21 May 2001 17:16:16 +0000 Subject: #44993# Tools/Hyphenation --- sc/source/core/data/documen3.cxx | 6 +- sc/source/core/data/documen9.cxx | 17 +- sc/source/core/data/drwlayer.cxx | 574 ++------------------------------------- 3 files changed, 38 insertions(+), 559 deletions(-) (limited to 'sc') diff --git a/sc/source/core/data/documen3.cxx b/sc/source/core/data/documen3.cxx index e023fe7a9..369e520a5 100644 --- a/sc/source/core/data/documen3.cxx +++ b/sc/source/core/data/documen3.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen3.cxx,v $ * - * $Revision: 1.14 $ + * $Revision: 1.15 $ * - * last change: $Author: er $ $Date: 2001-04-18 12:33:50 $ + * last change: $Author: nn $ $Date: 2001-05-21 18:16:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -1676,6 +1676,8 @@ void ScDocument::SetLanguage( LanguageType eLatin, LanguageType eCjk, LanguageTy pPool->SetPoolDefaultItem( SvxLanguageItem( eCjkLanguage, ATTR_CJK_FONT_LANGUAGE ) ); pPool->SetPoolDefaultItem( SvxLanguageItem( eCtlLanguage, ATTR_CTL_FONT_LANGUAGE ) ); } + + UpdateDrawLanguages(); // set edit engine defaults in drawing layer pool } Rectangle ScDocument::GetMMRect( USHORT nStartCol, USHORT nStartRow, diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index f48ae4a04..81ee0f839 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -2,9 +2,9 @@ * * $RCSfile: documen9.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: nn $ $Date: 2001-04-06 14:31:24 $ + * last change: $Author: nn $ $Date: 2001-05-21 18:16:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -71,6 +71,7 @@ #include #include #include +#include #include #include #include @@ -282,6 +283,7 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) } UpdateDrawPrinter(); + UpdateDrawLanguages(); if (bImportingXML) pDrawLayer->EnableAdjust(FALSE); @@ -289,6 +291,17 @@ void ScDocument::InitDrawLayer( SfxObjectShell* pDocShell ) } } +void ScDocument::UpdateDrawLanguages() +{ + if (pDrawLayer) + { + SfxItemPool& rDrawPool = pDrawLayer->GetItemPool(); + rDrawPool.SetPoolDefaultItem( SvxLanguageItem( eLanguage, EE_CHAR_LANGUAGE ) ); + rDrawPool.SetPoolDefaultItem( SvxLanguageItem( eCjkLanguage, EE_CHAR_LANGUAGE_CJK ) ); + rDrawPool.SetPoolDefaultItem( SvxLanguageItem( eCtlLanguage, EE_CHAR_LANGUAGE_CTL ) ); + } +} + void ScDocument::UpdateDrawPrinter() { if (pDrawLayer) diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx index f3e4b42dd..f01fa5336 100644 --- a/sc/source/core/data/drwlayer.cxx +++ b/sc/source/core/data/drwlayer.cxx @@ -2,9 +2,9 @@ * * $RCSfile: drwlayer.cxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: nn $ $Date: 2001-04-18 15:05:38 $ + * last change: $Author: nn $ $Date: 2001-05-21 18:16:16 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -65,558 +65,6 @@ #pragma hdrstop -//------------------------------------------------------------------------ - -// TOOLS -#define _BIGINT_HXX -#define _SFXMULTISEL_HXX -#define _STACK_HXX -#define _QUEUE_HXX -#define _DYNARR_HXX -#define _TREELIST_HXX -#define _CACHESTR_HXX -#define _NEW_HXX -//#define _SHL_HXX -//#define _LINK_HXX -//#define _ERRCODE_HXX -//#define _GEN_HXX -//#define _FRACT_HXX -//#define _STRING_HXX -//#define _MTF_HXX -//#define _CONTNR_HXX -//#define _LIST_HXX -//#define _TABLE_HXX -#define _DYNARY_HXX -//#define _UNQIDX_HXX -#define _SVMEMPOOL_HXX -//#define _UNQID_HXX -//#define _DEBUG_HXX -//#define _DATE_HXX -//#define _TIME_HXX -//#define _DATETIME_HXX -//#define _INTN_HXX -//#define _WLDCRD_HXX -//#define _FSYS_HXX -//#define _STREAM_HXX -#define _SV_MULTISEL_HXX - -//SV -//#define _CLIP_HXX *** -//#define _CONFIG_HXX *** -#define _CURSOR_HXX -#define _FONTDLG_HXX -#define _PRVWIN_HXX -//#define _COLOR_HXX -//#define _PAL_HXX -//#define _BITMAP_HXX -//#define _GDIOBJ_HXX -//#define _POINTR_HXX -//#define _ICON_HXX -//#define _IMAGE_HXX -//#define _KEYCOD_HXX -//#define _EVENT_HXX -#define _HELP_HXX -//#define _APP_HXX -//#define _MDIAPP_HXX -//#define _TIMER_HXX -//#define _METRIC_HXX -//#define _REGION_HXX -//#define _OUTDEV_HXX -//#define _SYSTEM_HXX -//#define _VIRDEV_HXX -//#define _JOBSET_HXX -//#define _PRINT_HXX -//#define _WINDOW_HXX -//#define _SYSWIN_HXX -//#define _WRKWIN_HXX -#define _MDIWIN_HXX -//#define _FLOATWIN_HXX -//#define _DOCKWIN_HXX -//#define _CTRL_HXX -//#define _SCRBAR_HXX -//#define _BUTTON_HXX -//#define _IMAGEBTN_HXX -//#define _FIXED_HXX -//#define _GROUP_HXX -//#define _EDIT_HXX -//#define _COMBOBOX_HXX -//#define _LSTBOX_HXX -//#define _SELENG_HXX *** -//#define _SPLIT_HXX -#define _SPIN_HXX -//#define _FIELD_HXX -//#define _MOREBTN_HXX *** -//#define _TOOLBOX_HXX -//#define _STATUS_HXX *** -//#define _DIALOG_HXX -//#define _MSGBOX_HXX -//#define _SYSDLG_HXX -#define _FILDLG_HXX -//#define _PRNDLG_HXX -#define _COLDLG_HXX -//#define _TABDLG_HXX -//#define _MENU_HXX -//#define _GDIMTF_HXX -//#define _POLY_HXX -//#define _ACCEL_HXX -//#define _GRAPH_HXX -#define _SOUND_HXX - -#if defined WIN -#define _MENUBTN_HXX -#endif - -//svtools -#define _SCRWIN_HXX -#define _RULER_HXX -//#define _TABBAR_HXX -//#define _VALUESET_HXX -#define _STDMENU_HXX -//#define _STDCTRL_HXX -//#define _CTRLBOX_HXX -#define _CTRLTOOL_HXX -#define _EXTATTR_HXX -#define _FRM3D_HXX -#define _EXTATTR_HXX - -//SVTOOLS -//#define _SVTREELIST_HXX *** -#define _FILTER_HXX -//#define _SVLBOXITM_HXX *** -//#define _SVTREEBOX_HXX *** -#define _SVICNVW_HXX -#define _SVTABBX_HXX - -//sfxcore.hxx -//#define _SFXINIMGR_HXX *** -//#define _SFXCFGITEM_HXX -//#define _SFX_PRINTER_HXX -#define _SFXGENLINK_HXX -#define _SFXHINTPOST_HXX -//#define _SFXDOCINF_HXX -#define _SFXLINKHDL_HXX -//#define _SFX_PROGRESS_HXX - -//sfxsh.hxx -//#define _SFX_SHELL_HXX -//#define _SFXAPP_HXX -//#define _SFXDISPATCH_HXX -//#define _SFXMSG_HXX *** -//#define _SFXOBJFACE_HXX *** -//#define _SFXREQUEST_HXX -#define _SFXMACRO_HXX - -// SFX -//#define _SFXAPPWIN_HXX *** -#define _SFX_SAVEOPT_HXX -//#define _SFX_CHILDWIN_HXX -//#define _SFXCTRLITEM_HXX -#define _SFXPRNMON_HXX -#define _INTRO_HXX -#define _SFXMSGDESCR_HXX -#define _SFXMSGPOOL_HXX -#define _SFXFILEDLG_HXX -#define _PASSWD_HXX -#define _SFXTBXCTRL_HXX -#define _SFXSTBITEM_HXX -#define _SFXMNUITEM_HXX -#define _SFXIMGMGR_HXX -#define _SFXTBXMGR_HXX -#define _SFXSTBMGR_HXX -#define _SFX_MINFITEM_HXX -#define _SFXEVENT_HXX - -//sfxdoc.hxx -//#define _SFX_OBJSH_HXX -//#define _SFX_CLIENTSH_HXX -//#define _SFXDOCINF_HXX -//#define _SFX_OBJFAC_HXX -//#define _SFX_DOCFILT_HXX -//#define _SFXDOCFILE_HXX *** -//define _VIEWFAC_HXX -//#define _SFXVIEWFRM_HXX -//#define _SFXVIEWSH_HXX -//#define _MDIFRM_HXX *** -#define _SFX_IPFRM_HXX -//#define _SFX_INTERNO_HXX - -//sfxdlg.hxx -//#define _SFXTABDLG_HXX -//#define _BASEDLGS_HXX *** -#define _SFX_DINFDLG_HXX -#define _SFXDINFEDT_HXX -#define _SFX_MGETEMPL_HXX -#define _SFX_TPLPITEM_HXX -//#define _SFX_STYLEDLG_HXX -#define _NEWSTYLE_HXX -//#define _SFXDOCTEMPL_HXX *** -//#define _SFXDOCTDLG_HXX *** -//#define _SFX_TEMPLDLG_HXX *** -//#define _SFXNEW_HXX *** -#define _SFXDOCMAN_HXX -//#define _SFXDOCKWIN_HXX - -//sfxitems.hxx -#define _SFX_WHMAP_HXX -//#define _ARGS_HXX *** -//#define _SFXPOOLITEM_HXX -//#define _SFXINTITEM_HXX -//#define _SFXENUMITEM_HXX -#define _SFXFLAGITEM_HXX -//#define _SFXSTRITEM_HXX -#define _SFXPTITEM_HXX -#define _SFXRECTITEM_HXX -//#define _SFXITEMPOOL_HXX -//#define _SFXITEMSET_HXX -#define _SFXITEMITER_HXX -#define _SFX_WHITER_HXX -#define _SFXPOOLCACH_HXX -//#define _AEITEM_HXX -#define _SFXRNGITEM_HXX -//#define _SFXSLSTITM_HXX -//#define _SFXSTYLE_HXX - -//xout.hxx -//#define _XENUM_HXX -//#define _XPOLY_HXX -//#define _XATTR_HXX -//#define _XOUTX_HXX -//#define _XPOOL_HXX -//#define _XTABLE_HXX - -//svdraw.hxx -#define _SDR_NOITEMS -#define _SDR_NOTOUCH -#define _SDR_NOTRANSFORM -//#define _SDR_NOOBJECTS -//#define _SDR_NOVIEWS - -//#define SI_NOITEMS -//#define SI_NODRW -#define _SI_NOSBXCONTROLS -//#define _VCATTR_HXX -#define _VCONT_HXX -//#define _VCSBX_HXX -#define _SI_NOOTHERFORMS -#define _VCTRLS_HXX -//#define _VCDRWOBJ_HXX -#define _SI_NOCONTROL -#define _SETBRW_HXX -#define _VCBRW_HXX -#define _SI_NOSBXCONTROLS -//#define _SIDLL_HXX *** - -#define _SVX_DAILDLL_HXX -#define _SVX_HYPHEN_HXX -#define _SVX_IMPGRF_HXX -#define _SVX_OPTITEMS_HXX -#define _SVX_OPTGERL_HXX -#define _SVX_OPTSAVE_HXX -#define _SVX_OPTSPELL_HXX -#define _SVX_OPTPATH_HXX -#define _SVX_OPTLINGU_HXX -#define _SVX_RULER_HXX -#define _SVX_RULRITEM_HXX -#define _SVX_SPLWRAP_HXX -#define _SVX_SPLDLG_HXX -#define _SVX_THESDLG_HXX - -// neu -#define _BIGINT_HXX -#define _SFXMULTISEL_HXX -#define _STACK_HXX -#define _QUEUE_HXX -#define _DYNARR_HXX -#define _TREELIST_HXX -#define _CACHESTR_HXX -#define _NEW_HXX -//#define _SHL_HXX -//#define _LINK_HXX -//#define _ERRCODE_HXX -//#define _GEN_HXX -//#define _FRACT_HXX -//#define _STRING_HXX -//#define _MTF_HXX -//#define _CONTNR_HXX -//#define _LIST_HXX -//#define _TABLE_HXX -#define _DYNARY_HXX -//#define _UNQIDX_HXX -#define _SVMEMPOOL_HXX -//#define _UNQID_HXX -//#define _DEBUG_HXX -//#define _DATE_HXX -//#define _TIME_HXX -//#define _DATETIME_HXX -//#define _INTN_HXX -//#define _WLDCRD_HXX -//#define _FSYS_HXX -//#define _STREAM_HXX -#define _CACHESTR_HXX -#define _SV_MULTISEL_HXX - -//SV -//#define _CLIP_HXX *** -//#define _CONFIG_HXX *** -#define _CURSOR_HXX -#define _FONTDLG_HXX -#define _PRVWIN_HXX -//#define _COLOR_HXX -//#define _PAL_HXX -//#define _BITMAP_HXX -//#define _GDIOBJ_HXX -//#define _POINTR_HXX -//#define _ICON_HXX -//#define _IMAGE_HXX -//#define _KEYCOD_HXX -//#define _EVENT_HXX -#define _HELP_HXX -//#define _APP_HXX -//#define _MDIAPP_HXX -//#define _TIMER_HXX -//#define _METRIC_HXX -//#define _REGION_HXX -//#define _OUTDEV_HXX -//#define _SYSTEM_HXX -//#define _VIRDEV_HXX -//#define _JOBSET_HXX -//#define _PRINT_HXX -//#define _WINDOW_HXX -//#define _SYSWIN_HXX -//#define _WRKWIN_HXX -#define _MDIWIN_HXX -//#define _FLOATWIN_HXX -//#define _DOCKWIN_HXX -//#define _CTRL_HXX -//#define _SCRBAR_HXX -//#define _BUTTON_HXX -//#define _IMAGEBTN_HXX -//#define _FIXED_HXX -//#define _GROUP_HXX -//#define _EDIT_HXX -//#define _COMBOBOX_HXX -//#define _LSTBOX_HXX -//#define _SELENG_HXX *** -//#define _SPLIT_HXX -#define _SPIN_HXX -//#define _FIELD_HXX -//#define _MOREBTN_HXX *** -//#define _TOOLBOX_HXX -//#define _STATUS_HXX *** -//#define _DIALOG_HXX -//#define _MSGBOX_HXX -//#define _SYSDLG_HXX -#define _FILDLG_HXX -//#define _PRNDLG_HXX -#define _COLDLG_HXX -//#define _TABDLG_HXX -//#define _MENU_HXX *** -//#define _GDIMTF_HXX -//#define _POLY_HXX -//#define _ACCEL_HXX -//#define _GRAPH_HXX -#define _SOUND_HXX - - - - - -#define _BIGINT_HXX -#define _SFXMULTISEL_HXX -#define _STACK_HXX -#define _QUEUE_HXX -#define _DYNARR_HXX -#define _TREELIST_HXX -#define _CACHESTR_HXX -#define _NEW_HXX -//#define _SHL_HXX -//#define _LINK_HXX -//#define _ERRCODE_HXX -//#define _GEN_HXX -//#define _FRACT_HXX -//#define _STRING_HXX -//#define _MTF_HXX -//#define _CONTNR_HXX -//#define _LIST_HXX -//#define _TABLE_HXX -#define _DYNARY_HXX -//#define _UNQIDX_HXX -#define _SVMEMPOOL_HXX -//#define _UNQID_HXX -//#define _DEBUG_HXX -//#define _DATE_HXX -//#define _TIME_HXX -//#define _DATETIME_HXX -//#define _INTN_HXX -//#define _WLDCRD_HXX -//#define _FSYS_HXX -//#define _STREAM_HXX -#define _CACHESTR_HXX -#define _SV_MULTISEL_HXX - -//SV -//#define _CLIP_HXX *** -//#define _CONFIG_HXX *** -#define _CURSOR_HXX -#define _FONTDLG_HXX -#define _PRVWIN_HXX -//#define _COLOR_HXX -//#define _PAL_HXX -//#define _BITMAP_HXX -//#define _GDIOBJ_HXX -//#define _POINTR_HXX -//#define _ICON_HXX -//#define _IMAGE_HXX -//#define _KEYCOD_HXX -//#define _EVENT_HXX -#define _HELP_HXX -//#define _APP_HXX -//#define _MDIAPP_HXX -//#define _TIMER_HXX -//#define _METRIC_HXX -//#define _REGION_HXX -//#define _OUTDEV_HXX -//#define _SYSTEM_HXX -//#define _VIRDEV_HXX -//#define _JOBSET_HXX -//#define _PRINT_HXX -//#define _WINDOW_HXX -//#define _SYSWIN_HXX -//#define _WRKWIN_HXX -#define _MDIWIN_HXX -//#define _FLOATWIN_HXX -//#define _DOCKWIN_HXX -//#define _CTRL_HXX -//#define _SCRBAR_HXX -//#define _BUTTON_HXX -//#define _IMAGEBTN_HXX -//#define _FIXED_HXX -//#define _GROUP_HXX -//#define _EDIT_HXX -//#define _COMBOBOX_HXX -//#define _LSTBOX_HXX -//#define _SELENG_HXX *** -//#define _SPLIT_HXX -#define _SPIN_HXX -//#define _FIELD_HXX -//#define _MOREBTN_HXX *** -//#define _TOOLBOX_HXX -//#define _STATUS_HXX *** -//#define _DIALOG_HXX -//#define _MSGBOX_HXX -//#define _SYSDLG_HXX -//#define _FILDLG_HXX -//#define _PRNDLG_HXX -#define _COLDLG_HXX -//#define _TABDLG_HXX -//#define _MENU_HXX -//#define _GDIMTF_HXX -//#define _POLY_HXX -//#define _ACCEL_HXX -//#define _GRAPH_HXX -#define _SOUND_HXX - -#if defined WIN -#define _MENUBTN_HXX -#endif - -//svtools -#define _SCRWIN_HXX -#define _RULER_HXX -//#define _TABBAR_HXX -//#define _VALUESET_HXX -#define _STDMENU_HXX -//#define _STDCTRL_HXX -//#define _CTRLBOX_HXX -#define _CTRLTOOL_HXX -#define _EXTATTR_HXX -#define _FRM3D_HXX -#define _EXTATTR_HXX - -//SVTOOLS -//#define _SVTREELIST_HXX *** -#define _FILTER_HXX -//#define _SVLBOXITM_HXX *** -//#define _SVTREEBOX_HXX *** -#define _SVICNVW_HXX -#define _SVTABBX_HXX - -//sfxcore.hxx -//#define _SFXINIMGR_HXX *** -//#define _SFXCFGITEM_HXX -//#define _SFX_PRINTER_HXX -#define _SFXGENLINK_HXX -#define _SFXHINTPOST_HXX -// #define _SFXDOCINF_HXX -#define _SFXLINKHDL_HXX -//#define _SFX_PROGRESS_HXX - -//sfxsh.hxx -//#define _SFX_SHELL_HXX -//#define _SFXAPP_HXX -//#define _SFXDISPATCH_HXX -//#define _SFXMSG_HXX *** -//#define _SFXOBJFACE_HXX *** -//#define _SFXREQUEST_HXX -#define _SFXMACRO_HXX - -// SFX -//#define _SFXAPPWIN_HXX *** -#define _SFX_SAVEOPT_HXX -//#define _SFX_CHILDWIN_HXX -//#define _SFXCTRLITEM_HXX -#define _SFXPRNMON_HXX -#define _INTRO_HXX -#define _SFXMSGDESCR_HXX -#define _SFXMSGPOOL_HXX -#define _SFXFILEDLG_HXX -#define _PASSWD_HXX -#define _SFXTBXCTRL_HXX -#define _SFXSTBITEM_HXX -#define _SFXMNUITEM_HXX -#define _SFXIMGMGR_HXX -#define _SFXTBXMGR_HXX -#define _SFXSTBMGR_HXX -#define _SFX_MINFITEM_HXX -#define _SFXEVENT_HXX - - -#define _SFXFILEDLG_HXX -#define _SFXIMGMGR_HXX -#define _SFXIPFRM_HXX -#define _SFX_MACRO_HXX -#define _SFXMNUITEM_HXX -#define _SFXMNUMGR_HXX -#define _SFXMULTISEL_HXX -#define _SFXMSG_HXX -#define _SFXMSGDESCR_HXX -#define _SFXMSGPOOL_HXX -#define _SFX_MINFITEM_HXX -#define _SFXOBJFACE_HXX -#define _SFXOBJFAC_HXX -//#define _SFXREQUEST_HXX -#define _SFX_SAVEOPT_HXX -#define _SFXSTBITEM_HXX -#define _SFXSTBMGR_HXX -#define _SFXTBXCTRL_HXX -#define _SFXTBXMGR_HXX - -#define _SVX_DAILDLL_HXX -#define _SVX_HYPHEN_HXX -#define _SVX_IMPGRF_HXX -#define _SVX_OPTITEMS_HXX -#define _SVX_OPTGERL_HXX -#define _SVX_OPTSAVE_HXX -#define _SVX_OPTSPELL_HXX -#define _SVX_OPTPATH_HXX -#define _SVX_OPTLINGU_HXX -#define _SVX_RULER_HXX -#define _SVX_RULRITEM_HXX -#define _SVX_SPLWRAP_HXX -#define _SVX_SPLDLG_HXX -#define _SVX_THESDLG_HXX - - // INCLUDE --------------------------------------------------------------- @@ -630,6 +78,7 @@ #include #include #include +#include #include #include #include @@ -804,7 +253,8 @@ ScDrawLayer::ScDrawLayer( ScDocument* pDocument, const String& rName ) : pDoc( pDocument ), pUndoGroup( NULL ), bRecording( FALSE ), - bAdjustEnabled( TRUE ) + bAdjustEnabled( TRUE ), + bHyphenatorSet( FALSE ) { pGlobalDrawPersist = NULL; // nur einmal benutzen @@ -865,6 +315,20 @@ __EXPORT ScDrawLayer::~ScDrawLayer() } } +void ScDrawLayer::UseHyphenator() +{ + if (!bHyphenatorSet) + { + com::sun::star::uno::Reference< com::sun::star::linguistic2::XHyphenator > + xHyphenator = LinguMgr::GetHyphenator(); + + GetDrawOutliner().SetHyphenator( xHyphenator ); + GetHitTestOutliner().SetHyphenator( xHyphenator ); + + bHyphenatorSet = TRUE; + } +} + SdrPage* __EXPORT ScDrawLayer::AllocPage(FASTBOOL bMasterPage) { // don't create basic until it is needed -- cgit v1.2.3