*** orig/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx Wed May 23 01:52:24 2007 --- new/chart2/source/controller/inc/CharacterPropertyItemConverter.hxx Thu Apr 10 13:52:06 2008 *************** *** 61,67 **** CharacterPropertyItemConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropertySet, ! SfxItemPool& rItemPool ); CharacterPropertyItemConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropertySet, --- 61,68 ---- CharacterPropertyItemConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropertySet, ! SfxItemPool& rItemPool, ! bool bAffectMultipleObjects = false ); CharacterPropertyItemConverter( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > & rPropertySet, *************** *** 90,95 **** --- 91,97 ---- ::rtl::OUString m_aRefSizePropertyName; ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > m_xRefSizePropSet; + bool m_bAffectsMultipleObjects; }; } // namespace wrapper *** orig/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx Wed Jul 25 16:40:28 2007 --- new/chart2/source/controller/itemsetwrapper/CharacterPropertyItemConverter.cxx Thu Apr 10 13:47:24 2008 *************** *** 65,70 **** --- 65,76 ---- #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSTATE_HPP_ #include #endif + #ifndef _SFXSTRITEM_HXX + #include + #endif + #ifndef _COM_SUN_STAR_CHART2_XFORMATTEDSTRING_HPP_ + #include + #endif using namespace ::com::sun::star; *************** *** 112,119 **** CharacterPropertyItemConverter::CharacterPropertyItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, ! SfxItemPool& rItemPool ) : ! ItemConverter( rPropertySet, rItemPool ) {} CharacterPropertyItemConverter::CharacterPropertyItemConverter( --- 118,127 ---- CharacterPropertyItemConverter::CharacterPropertyItemConverter( const uno::Reference< beans::XPropertySet > & rPropertySet, ! SfxItemPool& rItemPool, ! bool bAffectsMultipleObjects ) : ! ItemConverter( rPropertySet, rItemPool ), ! m_bAffectsMultipleObjects( bAffectsMultipleObjects ) {} CharacterPropertyItemConverter::CharacterPropertyItemConverter( *************** *** 125,131 **** ItemConverter( rPropertySet, rItemPool ), m_pRefSize( pRefSize ), m_aRefSizePropertyName( rRefSizePropertyName ), ! m_xRefSizePropSet( rRefSizePropSet.is() ? rRefSizePropSet : rPropertySet ) {} CharacterPropertyItemConverter::~CharacterPropertyItemConverter() --- 133,140 ---- ItemConverter( rPropertySet, rItemPool ), m_pRefSize( pRefSize ), m_aRefSizePropertyName( rRefSizePropertyName ), ! m_xRefSizePropSet( rRefSizePropSet.is() ? rRefSizePropSet : rPropertySet ), ! m_bAffectsMultipleObjects( false ) {} CharacterPropertyItemConverter::~CharacterPropertyItemConverter() *************** *** 295,300 **** --- 304,322 ---- } } break; + + case SID_CHAR_DLG_PREVIEW_STRING: + { + uno::Reference< chart2::XFormattedString > xFormattedString( GetPropertySet(), uno::UNO_QUERY ); + if( xFormattedString.is() && !m_bAffectsMultipleObjects ) + { + ::rtl::OUString aString = xFormattedString->getString(); + rOutItemSet.Put( SfxStringItem( nWhichId, aString ) ); + } + else + rOutItemSet.Put( SfxStringItem( nWhichId, C2U( "" ) ) ); + } + break; } } *** orig/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx Fri Nov 23 19:52:40 2007 --- new/chart2/source/controller/itemsetwrapper/SchWhichPairs.hxx Thu Apr 10 14:04:49 2008 *************** *** 54,59 **** --- 54,63 ---- namespace { + #define CHART_CHAR_WHICHPAIRS \ + EE_ITEMS_START, EE_ITEMS_END, \ + SID_CHAR_DLG_PREVIEW_STRING, SID_CHAR_DLG_PREVIEW_STRING + const USHORT nTitleWhichPairs[] = { SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx *************** *** 61,74 **** XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx ! EE_ITEMS_START, EE_ITEMS_END, // 3994 - 4037 svx/eeitem.hxx 0 }; const USHORT nAxisWhichPairs[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - EE_ITEMS_START, EE_ITEMS_END, // 3994 - 4037 svx/eeitem.hxx SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, // 11432 svx/svxids.hrc SCHATTR_AXISTYPE, SCHATTR_AXISTYPE, // 39 sch/schattr.hxx --- 65,77 ---- XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx ! CHART_CHAR_WHICHPAIRS, 0 }; const USHORT nAxisWhichPairs[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, // 11432 svx/svxids.hrc SCHATTR_AXISTYPE, SCHATTR_AXISTYPE, // 39 sch/schattr.hxx *************** *** 77,94 **** SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx SCHATTR_AXIS_START, SCHATTR_AXIS_END, // 70 - 95 sch/schattr.hxx SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx 0 }; const USHORT nAllAxisWhichPairs[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx - EE_ITEMS_START, EE_ITEMS_END, // 3994 - 4037 svx/eeitem.hxx SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx SCHATTR_AXIS_SHOWDESCR, SCHATTR_AXIS_SHOWDESCR, // 85 sch/schattr.hxx SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx 0 }; --- 80,98 ---- SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx SCHATTR_AXIS_START, SCHATTR_AXIS_END, // 70 - 95 sch/schattr.hxx SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx + CHART_CHAR_WHICHPAIRS, 0 }; const USHORT nAllAxisWhichPairs[] = { XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx SCHATTR_TEXT_START, SCHATTR_TEXT_END, // 4 - 6 sch/schattr.hxx SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx SCHATTR_TEXT_OVERLAP, SCHATTR_TEXT_OVERLAP, // 54 sch/schattr.hxx SCHATTR_AXIS_SHOWDESCR, SCHATTR_AXIS_SHOWDESCR, // 85 sch/schattr.hxx SCHATTR_TEXTBREAK, SCHATTR_TEXTBREAK, // 30587 sch/schattr.hxx + CHART_CHAR_WHICHPAIRS, 0 }; *************** *** 124,131 **** XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx - EE_ITEMS_START, EE_ITEMS_END, // 3994 - 4037 svx/eeitem.hxx SCHATTR_LEGEND_START, SCHATTR_LEGEND_END, // 3 - 3 sch/schattr.hxx 0 }; --- 128,135 ---- XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx SCHATTR_LEGEND_START, SCHATTR_LEGEND_END, // 3 - 3 sch/schattr.hxx + CHART_CHAR_WHICHPAIRS, 0 }; *************** *** 144,150 **** #define CHART_POINT_WHICHPAIRS \ XATTR_LINE_FIRST, XATTR_LINE_LAST, /* 1000 - 1016 svx/xdef.hxx */ \ XATTR_FILL_FIRST, XATTR_FILL_LAST, /* 1018 - 1046 svx/xdef.hxx */ \ - EE_ITEMS_START, EE_ITEMS_END, /* 3994 - 4037 svx/eeitem.hxx */ \ SCHATTR_DATADESCR_START, SCHATTR_DATADESCR_END, /* 1 - 2 sch/schattr.hxx*/ \ SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_INFO, /* 10585 - 10585 svx/svxids.hrc */ \ SID_ATTR_NUMBERFORMAT_SOURCE, SID_ATTR_NUMBERFORMAT_SOURCE, /* 11432 svx/svxids.hrc */ \ --- 148,153 ---- *************** *** 160,165 **** --- 163,169 ---- const USHORT nDataPointWhichPairs[] = { CHART_POINT_WHICHPAIRS, + CHART_CHAR_WHICHPAIRS, 0 }; *************** *** 180,185 **** --- 184,190 ---- CHART_POINT_WHICHPAIRS, SCHATTR_STAT_START, SCHATTR_STAT_END, /* 45 - 52 sch/schattr.hxx*/ \ CHART_SERIES_OPTIONS_WHICHPAIRS, + CHART_CHAR_WHICHPAIRS, 0 }; *************** *** 193,209 **** const USHORT nTextWhichPairs[] = { - EE_ITEMS_START, EE_ITEMS_END, // 3994 - 4037 svx/eeitem.hxx SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx 0 }; const USHORT nTextOrientWhichPairs[] = { - EE_ITEMS_START, EE_ITEMS_END, // 3994 - 4037 svx/eeitem.hxx SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx 0 }; --- 198,214 ---- const USHORT nTextWhichPairs[] = { SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + CHART_CHAR_WHICHPAIRS, 0 }; const USHORT nTextOrientWhichPairs[] = { SCHATTR_TEXT_STACKED, SCHATTR_TEXT_STACKED, // 4 sch/schattr.hxx SCHATTR_TEXT_DEGREES,SCHATTR_TEXT_DEGREES, // 53 sch/schattr.hxx + CHART_CHAR_WHICHPAIRS, 0 }; *************** *** 217,223 **** const USHORT nCharacterPropertyWhichPairs[] = { ! EE_ITEMS_START, EE_ITEMS_END, // 3994 - 4037 svx/eeitem.hxx 0 }; --- 222,228 ---- const USHORT nCharacterPropertyWhichPairs[] = { ! CHART_CHAR_WHICHPAIRS, 0 }; *************** *** 264,271 **** XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx - EE_ITEMS_START, EE_ITEMS_END, // 3994 - 4037 svx/eeitem.hxx SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc 0 }; --- 269,276 ---- XATTR_LINE_FIRST, XATTR_LINE_LAST, // 1000 - 1016 svx/xdef.hxx XATTR_FILL_FIRST, XATTR_FILL_LAST, // 1018 - 1046 svx/xdef.hxx SDRATTR_SHADOW_FIRST, SDRATTR_SHADOW_LAST, // 1067 - 1078 svx/svddef.hxx SID_ATTR_NUMBERFORMAT_VALUE, SID_ATTR_NUMBERFORMAT_VALUE, // 10585 - 10585 svx/svxids.hrc + CHART_CHAR_WHICHPAIRS, 0 }; *** orig/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx Fri Aug 3 20:35:16 2007 --- new/chart2/source/controller/itemsetwrapper/TitleItemConverter.cxx Thu Apr 10 13:45:05 2008 *************** *** 113,119 **** C2U( "ReferencePageSize" ), xParentProp )); else ! m_aConverters.push_back( new CharacterPropertyItemConverter( xProp, rItemPool )); } } } --- 113,119 ---- C2U( "ReferencePageSize" ), xParentProp )); else ! m_aConverters.push_back( new CharacterPropertyItemConverter( xProp, rItemPool, true )); } } }