diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-03-11 11:26:05 +0100 |
| commit | ad94448ef29913539688de6a685b301b1fcb2d42 (patch) | |
| tree | f94c35e05b88315aed4db72e6850167e675ace43 /chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | |
| parent | ee1f6cd078236f695133fa24fd881b74920b26e6 (diff) | |
| parent | bd26f484336d86a10dcac5fc0fdbb3d35cb77f06 (diff) | |
autorecovery: merged changes from m74. Still need to find out how to re-do two patches (to module_hidden_ooo.scp and file_ooo.scp in scp2/source/ooo) which do not apply anymore.
Diffstat (limited to 'chart2/source/controller/drawinglayer/DrawViewWrapper.cxx')
| -rw-r--r-- | chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 28 |
1 files changed, 23 insertions, 5 deletions
diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx index fa285f98d991..fbcca6a26bde 100644 --- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx +++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.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: DrawViewWrapper.cxx,v $ - * $Revision: 1.20.6.1 $ - * * This file is part of OpenOffice.org. * * OpenOffice.org is free software: you can redistribute it and/or modify @@ -34,6 +31,8 @@ #include "chartview/DrawModelWrapper.hxx" #include "ConfigurationAccess.hxx" +#include <unotools/lingucfg.hxx> +#include <editeng/langitem.hxx> // header for class SdrPage #include <svx/svdpage.hxx> //header for class SdrPageView @@ -46,7 +45,7 @@ #include <svx/svdoutl.hxx> // header for class SvxForbiddenCharactersTable -#include <svx/forbiddencharacterstable.hxx> +#include <editeng/forbiddencharacterstable.hxx> #ifndef _SVX_SVXIDS_HRC #include <svx/svxids.hrc> @@ -54,6 +53,7 @@ // header for class SvxShape #include <svx/unoshape.hxx> +#include <editeng/fhgtitem.hxx> #include <com/sun/star/container/XChild.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> @@ -165,6 +165,24 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool SetPagePaintingAllowed(bPaintPageForEditMode); + // #i12587# support for shapes in chart + SdrOutliner* pOutliner = getOutliner(); + SfxItemPool* pOutlinerPool = ( pOutliner ? pOutliner->GetEditTextObjectPool() : NULL ); + if ( pOutlinerPool ) + { + SvtLinguConfig aLinguConfig; + SvtLinguOptions aLinguOptions; + if ( aLinguConfig.GetOptions( aLinguOptions ) ) + { + pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage, EE_CHAR_LANGUAGE ) ); + pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CJK, EE_CHAR_LANGUAGE_CJK ) ); + pOutlinerPool->SetPoolDefaultItem( SvxLanguageItem( aLinguOptions.nDefaultLanguage_CTL, EE_CHAR_LANGUAGE_CTL ) ); + } + + // set font height without changing SdrEngineDefaults + pOutlinerPool->SetPoolDefaultItem( SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT ) ); // 12pt + } + ReInit(); } |