*** orig/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx	Wed Jul 25 16:40:28 2007
--- new/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx	Tue Feb 26 14:53:24 2008
***************
*** 75,81 ****
      static ::comphelper::ItemPropertyMapType aCharacterPropertyMap(
          ::comphelper::MakeItemPropertyMap
          IPM_MAP_ENTRY( EE_CHAR_COLOR, "CharColor", 0 )
!         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE, "CharLocale", 0 )
  //         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT, "CharHeight", 0 )
  //         IPM_MAP_ENTRY( EE_CHAR_ITALIC, "CharPosture", 0 )
  //         IPM_MAP_ENTRY( EE_CHAR_WEIGHT, "CharWeight", 0 )
--- 75,81 ----
      static ::comphelper::ItemPropertyMapType aCharacterPropertyMap(
          ::comphelper::MakeItemPropertyMap
          IPM_MAP_ENTRY( EE_CHAR_COLOR, "CharColor", 0 )
!         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE, "CharLocale", MID_LANG_LOCALE )
  //         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT, "CharHeight", 0 )
  //         IPM_MAP_ENTRY( EE_CHAR_ITALIC, "CharPosture", 0 )
  //         IPM_MAP_ENTRY( EE_CHAR_WEIGHT, "CharWeight", 0 )
***************
*** 87,94 ****
          IPM_MAP_ENTRY( EE_CHAR_OUTLINE, "CharContoured", 0 )
          IPM_MAP_ENTRY( EE_CHAR_EMPHASISMARK, "CharEmphasis", 0 )
  
!         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CJK, "CharLocaleAsian", 0 )
!         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CTL, "CharLocaleComplex", 0 )
  
  //         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CJK, "CharHeightAsian", 0 )
  //         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CTL, "CharHeightComplex", 0 )
--- 87,94 ----
          IPM_MAP_ENTRY( EE_CHAR_OUTLINE, "CharContoured", 0 )
          IPM_MAP_ENTRY( EE_CHAR_EMPHASISMARK, "CharEmphasis", 0 )
  
!         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CJK, "CharLocaleAsian", MID_LANG_LOCALE )
!         IPM_MAP_ENTRY( EE_CHAR_LANGUAGE_CTL, "CharLocaleComplex", MID_LANG_LOCALE )
  
  //         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CJK, "CharHeightAsian", 0 )
  //         IPM_MAP_ENTRY( EE_CHAR_FONTHEIGHT_CTL, "CharHeightComplex", 0 )
*** orig/chart2/source/tools/characterproperties.cxx	Tue Sep 18 23:07:36 2007
--- new/chart2/source/tools/characterproperties.cxx	Mon Mar  3 14:27:13 2008
***************
*** 39,44 ****
--- 39,48 ----
  #include "ContainerHelper.hxx"
  #include "macros.hxx"
  
+ #ifndef _SV_OUTDEV_HXX
+ #include <vcl/outdev.hxx>
+ #endif
+ 
  #include <com/sun/star/beans/PropertyAttribute.hpp>
  #include <com/sun/star/style/XStyle.hpp>
  #include <com/sun/star/awt/FontSlant.hpp>
***************
*** 455,461 ****
  {
      const float fDefaultFontHeight = 13.0;
  
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, C2U( "Albany" ));
      //todo correct font default:
      //see static Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang, ULONG nFlags, const OutputDevice* pOutDev = NULL );
      //or  SvxFontItem ... (old chart source/core/chtmodel.cxx :Font aCJKFont )
--- 459,472 ----
  {
      const float fDefaultFontHeight = 13.0;
  
!     Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_LATIN_TEXT, LANGUAGE_ENGLISH_US, DEFAULTFONT_FLAGS_ONLYONE, 0 );   
!     Font aFontCJK = OutputDevice::GetDefaultFont( DEFAULTFONT_CJK_TEXT, LANGUAGE_CHINESE_SIMPLIFIED, DEFAULTFONT_FLAGS_ONLYONE, 0 );
!     Font aFontCTL = OutputDevice::GetDefaultFont( DEFAULTFONT_CTL_TEXT, LANGUAGE_FARSI, DEFAULTFONT_FLAGS_ONLYONE, 0 );
!     OUString aFontName = aFont.GetName();
!     OUString aFontNameCJK = aFontCJK.GetName();
!     OUString aFontNameCTL = aFontCTL.GetName();
! 
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FONT_NAME, uno::makeAny( aFontName ) );
      //todo correct font default:
      //see static Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang, ULONG nFlags, const OutputDevice* pOutDev = NULL );
      //or  SvxFontItem ... (old chart source/core/chtmodel.cxx :Font aCJKFont )
***************
*** 483,489 ****
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_WORD_MODE, false );
  //     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FLASH, false );
  
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_LOCALE, lang::Locale( C2U( "US" ), C2U( "en" ), OUString())); // todo correct default
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_SHADOWED, false );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CONTOURED, false );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RELIEF, text::FontRelief::NONE );
--- 494,500 ----
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_WORD_MODE, false );
  //     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_FLASH, false );
  
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_LOCALE, lang::Locale( C2U( "en" ), C2U( "US" ), OUString())); // todo correct default
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_SHADOWED, false );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_CONTOURED, false );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_RELIEF, text::FontRelief::NONE );
***************
*** 499,506 ****
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultFontHeight );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_WEIGHT, awt::FontWeight::NORMAL );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_POSTURE, awt::FontSlant_NONE );
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_LOCALE, lang::Locale( C2U( "US" ), C2U( "en" ), OUString())); //todo correct default
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_FONT_NAME, C2U( "Andale Sans UI" ));
  
      //todo correct font default:
      //see static Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang, ULONG nFlags, const OutputDevice* pOutDev = NULL );
--- 510,517 ----
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_CHAR_HEIGHT, fDefaultFontHeight );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_WEIGHT, awt::FontWeight::NORMAL );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_POSTURE, awt::FontSlant_NONE );
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_LOCALE, lang::Locale( C2U( "zh" ), C2U( "CN" ), OUString())); //todo correct default
! 	::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_ASIAN_FONT_NAME, uno::makeAny( aFontNameCJK ) );
  
      //todo correct font default:
      //see static Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang, ULONG nFlags, const OutputDevice* pOutDev = NULL );
***************
*** 513,520 ****
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultFontHeight );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_WEIGHT, awt::FontWeight::NORMAL );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_POSTURE, awt::FontSlant_NONE );
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_LOCALE, lang::Locale( C2U( "US" ), C2U( "en" ), OUString())); //todo correct default
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_NAME, C2U( "Tahoma" )); //todo correct default
  
      //todo correct font default:
      //see static Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang, ULONG nFlags, const OutputDevice* pOutDev = NULL );
--- 524,531 ----
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_CHAR_HEIGHT, fDefaultFontHeight );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_WEIGHT, awt::FontWeight::NORMAL );
      ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_POSTURE, awt::FontSlant_NONE );
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_LOCALE, lang::Locale( C2U( "fa" ), C2U( "IR" ), OUString())); //todo correct default
!     ::chart::PropertyHelper::setPropertyValueDefault( rOutMap, PROP_CHAR_COMPLEX_FONT_NAME, uno::makeAny( aFontNameCTL )); //todo correct default
  
      //todo correct font default:
      //see static Font OutputDevice::GetDefaultFont( USHORT nType, LanguageType eLang, ULONG nFlags, const OutputDevice* pOutDev = NULL );
*** orig/chart2/source/tools/makefile.mk	Fri Nov 23 20:09:04 2007
--- new/chart2/source/tools/makefile.mk	Mon Mar  3 13:43:17 2008
***************
*** 155,168 ****
  				$(SALLIB)			\
  				$(TOOLSLIB)			\
  				$(BASEGFXLIB) 		\
! 				$(UNOTOOLSLIB)
  
  #				$(SVLIB)			\
  #				$(SVLLIB)			\
  #				$(SVTOOLLIB)		\
  #				$(SVXLIB)			\
  #				$(TKLIB)			\
- #				$(VCLLIB)           \
  #			    $(SFXLIB)
  
  #--------exports
--- 155,168 ----
  				$(SALLIB)			\
  				$(TOOLSLIB)			\
  				$(BASEGFXLIB) 		\
! 				$(UNOTOOLSLIB)      \
! 				$(VCLLIB)           
  
  #				$(SVLIB)			\
  #				$(SVLLIB)			\
  #				$(SVTOOLLIB)		\
  #				$(SVXLIB)			\
  #				$(TKLIB)			\
  #			    $(SFXLIB)
  
  #--------exports