From bce20674745eaba6e2e68f09f5eac9a6a15a43a1 Mon Sep 17 00:00:00 2001
From: Thomas Benisch <tbe@openoffice.org>
Date: Fri, 29 May 2009 09:10:08 +0000
Subject: #i12587# Inserting/editing arbitrary text objects in chart

---
 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 9 +++++++++
 1 file changed, 9 insertions(+)

(limited to 'chart2/source/controller/drawinglayer/DrawViewWrapper.cxx')

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 7ed9a93073bd..5d2c37b6fdfa 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -54,6 +54,7 @@
 
 // header for class SvxShape
 #include <svx/unoshape.hxx>
+#include <svx/fhgtitem.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -165,6 +166,14 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool
 
     SetPagePaintingAllowed(bPaintPageForEditMode);
 
+    // #i12587# set font height without changing SdrEngineDefaults
+    SdrOutliner* pOutliner = getOutliner();
+    SfxItemPool* pOutlinerPool = ( pOutliner ? pOutliner->GetEditTextObjectPool() : NULL );
+    if ( pOutlinerPool )
+    {
+        pOutlinerPool->SetPoolDefaultItem( SvxFontHeightItem( 423, 100, EE_CHAR_FONTHEIGHT ) );  // 12pt
+    }
+
     ReInit();
 }
 
-- 
cgit 


From 1deb103bcaef084671dd319d941465a1336fc2ac Mon Sep 17 00:00:00 2001
From: Thomas Benisch <tbe@openoffice.org>
Date: Fri, 31 Jul 2009 11:25:20 +0000
Subject: #i12587# Inserting/editing arbitrary text objects in chart

---
 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 14 +++++++++++++-
 1 file changed, 13 insertions(+), 1 deletion(-)

(limited to 'chart2/source/controller/drawinglayer/DrawViewWrapper.cxx')

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index 3480c58ac4b6..d91ba9d2377f 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -34,6 +34,8 @@
 #include "chartview/DrawModelWrapper.hxx"
 #include "ConfigurationAccess.hxx"
 
+#include <svtools/lingucfg.hxx>
+#include <svx/langitem.hxx>
 // header for class SdrPage
 #include <svx/svdpage.hxx>
 //header for class SdrPageView
@@ -166,11 +168,21 @@ DrawViewWrapper::DrawViewWrapper( SdrModel* pSdrModel, OutputDevice* pOut, bool
 
     SetPagePaintingAllowed(bPaintPageForEditMode);
 
-    // #i12587# set font height without changing SdrEngineDefaults
+    // #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
     }
 
-- 
cgit 


From ed1b30ca81d1b33c5466e1b0e9173b8c88b5f146 Mon Sep 17 00:00:00 2001
From: Thomas Benisch <tbe@openoffice.org>
Date: Wed, 3 Mar 2010 10:11:57 +0100
Subject: chartshapes: merge with DEV300_m72

---
 chart2/source/controller/drawinglayer/DrawViewWrapper.cxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'chart2/source/controller/drawinglayer/DrawViewWrapper.cxx')

diff --git a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
index e8b2ae3fb766..fbcca6a26bde 100644
--- a/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
+++ b/chart2/source/controller/drawinglayer/DrawViewWrapper.cxx
@@ -31,8 +31,8 @@
 #include "chartview/DrawModelWrapper.hxx"
 #include "ConfigurationAccess.hxx"
 
-#include <svtools/lingucfg.hxx>
-#include <svx/langitem.hxx>
+#include <unotools/lingucfg.hxx>
+#include <editeng/langitem.hxx>
 // header for class SdrPage
 #include <svx/svdpage.hxx>
 //header for class SdrPageView
@@ -53,7 +53,7 @@
 
 // header for class SvxShape
 #include <svx/unoshape.hxx>
-#include <svx/fhgtitem.hxx>
+#include <editeng/fhgtitem.hxx>
 
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
-- 
cgit