chart2/source/controller/chartapiwrapper/WrappedSymbolProperties.cxx

   1 /*************************************************************************
   2  *
   3  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
   4  *
   5  * Copyright 2008 by Sun Microsystems, Inc.
   6  *
   7  * OpenOffice.org - a multi-platform office productivity suite
   8  *
   9  * $RCSfile: WrappedSymbolProperties.cxx,v $
  10  * $Revision: 1.7 $
  11  *
  12  * This file is part of OpenOffice.org.
  13  *
  14  * OpenOffice.org is free software: you can redistribute it and/or modify
  15  * it under the terms of the GNU Lesser General Public License version 3
  16  * only, as published by the Free Software Foundation.
  17  *
  18  * OpenOffice.org is distributed in the hope that it will be useful,
  19  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  20  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  21  * GNU Lesser General Public License version 3 for more details
  22  * (a copy is included in the LICENSE file that accompanied this code).
  23  *
  24  * You should have received a copy of the GNU Lesser General Public License
  25  * version 3 along with OpenOffice.org.  If not, see
  26  * <http://www.openoffice.org/license.html>
  27  * for a copy of the LGPLv3 License.
  28  *
  29  ************************************************************************/
  30
  31 // MARKER(update_precomp.py): autogen include statement, do not remove
  32 #include "precompiled_chart2.hxx"
  33
  34 #include "WrappedSymbolProperties.hxx"
  35 #include "WrappedSeriesOrDiagramProperty.hxx"
  36 #include "macros.hxx"
  37 #include "FastPropertyIdRanges.hxx"
  38 #include "ChartTypeHelper.hxx"
  39 #include <com/sun/star/chart2/Symbol.hpp>
  40 #include <com/sun/star/chart2/SymbolStyle.hpp>
  41 #include <com/sun/star/awt/Size.hpp>
  42 #include <com/sun/star/beans/PropertyAttribute.hpp>
  43 #include <com/sun/star/chart/ChartSymbolType.hpp>
  44 #include <com/sun/star/drawing/LineStyle.hpp>
  45
  46 #include <com/sun/star/graphic/XGraphicProvider.hpp>
  47
  48 // for UNO_NAME_GRAPHOBJ_URLPREFIX
  49 #include <svx/unoprnms.hxx>
  50
  51 // for Graphic
  52 #include <vcl/graph.hxx>
  53 // for GraphicObject
  54 #include <goodies/grfmgr.hxx>
  55 #include <vcl/outdev.hxx>
  56
  57 #include <comphelper/processfactory.hxx>
  58
  59 using namespace ::com::sun::star;
  60 using ::com::sun::star::uno::Any;
  61 using ::com::sun::star::uno::Reference;
  62 using ::com::sun::star::uno::Sequence;
  63 using ::com::sun::star::beans::Property;
  64 using ::rtl::OUString;
  65
  66 //.............................................................................
  67 namespace chart
  68 {
  69 namespace wrapper
  70 {
  71
  72
  73 //-----------------------------------------------------------------------------
  74 //-----------------------------------------------------------------------------
  75 //-----------------------------------------------------------------------------
  76
  77 class WrappedSymbolTypeProperty : public WrappedSeriesOrDiagramProperty< sal_Int32 >
  78 {
  79 public:
  80     virtual sal_Int32 getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const;
  81     virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, sal_Int32 aNewValue ) const;
  82
  83     virtual Any getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
  84                             throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException);
  85     virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
  86                         throw (beans::UnknownPropertyException, uno::RuntimeException);
  87
  88     explicit WrappedSymbolTypeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
  89                                         tSeriesOrDiagramPropertyType ePropertyType );
  90     virtual ~WrappedSymbolTypeProperty();
  91 };
  92
  93 class WrappedSymbolBitmapURLProperty : public WrappedSeriesOrDiagramProperty< OUString >
  94 {
  95 public:
  96     virtual OUString getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const;
  97     virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, OUString aNewGraphicURL ) const;
  98
  99     explicit WrappedSymbolBitmapURLProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
 100                                              tSeriesOrDiagramPropertyType ePropertyType );
 101     virtual ~WrappedSymbolBitmapURLProperty();
 102 };
 103
 104 // this operator is not defined by default
 105 bool operator!=( const awt::Size & rSize1, const awt::Size & rSize2 )
 106 {
 107     return (rSize1.Width != rSize2.Width) || (rSize1.Height != rSize2.Height);
 108 }
 109
 110 class WrappedSymbolSizeProperty : public WrappedSeriesOrDiagramProperty< awt::Size >
 111 {
 112 public:
 113     virtual awt::Size getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const;
 114     virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, awt::Size aNewSize ) const;
 115     virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
 116                         throw (beans::UnknownPropertyException, uno::RuntimeException);
 117
 118     explicit WrappedSymbolSizeProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
 119                                         tSeriesOrDiagramPropertyType ePropertyType );
 120     virtual ~WrappedSymbolSizeProperty();
 121 };
 122
 123 class WrappedSymbolAndLinesProperty : public WrappedSeriesOrDiagramProperty< sal_Bool >
 124 {
 125 public:
 126     virtual sal_Bool getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const;
 127     virtual void setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, sal_Bool bDrawLines ) const;
 128     virtual beans::PropertyState getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
 129                         throw (beans::UnknownPropertyException, uno::RuntimeException);
 130
 131     explicit WrappedSymbolAndLinesProperty( ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
 132                                             tSeriesOrDiagramPropertyType ePropertyType );
 133     virtual ~WrappedSymbolAndLinesProperty();
 134 };
 135
 136 namespace
 137 {
 138 enum
 139 {
 140     //symbol properties
 141     PROP_CHART_SYMBOL_TYPE = FAST_PROPERTY_ID_START_CHART_SYMBOL_PROP,
 142     PROP_CHART_SYMBOL_BITMAP_URL,
 143     PROP_CHART_SYMBOL_SIZE,
 144     PROP_CHART_SYMBOL_AND_LINES
 145 };
 146
 147 sal_Int32 lcl_getSymbolType( const ::com::sun::star::chart2::Symbol& rSymbol )
 148 {
 149     sal_Int32 nSymbol = ::com::sun::star::chart::ChartSymbolType::NONE;
 150     switch( rSymbol.Style )
 151     {
 152         case chart2::SymbolStyle_NONE:
 153             break;
 154         case chart2::SymbolStyle_AUTO:
 155             nSymbol = ::com::sun::star::chart::ChartSymbolType::AUTO;
 156             break;
 157         case chart2::SymbolStyle_STANDARD:
 158             nSymbol = rSymbol.StandardSymbol%8;
 159             break;
 160         case chart2::SymbolStyle_POLYGON://new feature
 161             nSymbol = ::com::sun::star::chart::ChartSymbolType::AUTO;
 162             break;
 163         case chart2::SymbolStyle_GRAPHIC:
 164             nSymbol = ::com::sun::star::chart::ChartSymbolType::BITMAPURL;
 165             break;
 166         default:
 167             nSymbol = ::com::sun::star::chart::ChartSymbolType::AUTO;
 168             break;
 169     }
 170     return nSymbol;
 171 }
 172 void lcl_setSymbolTypeToSymbol( sal_Int32 nSymbolType, chart2::Symbol& rSymbol )
 173 {
 174     switch( nSymbolType )
 175     {
 176         case ::com::sun::star::chart::ChartSymbolType::NONE:
 177             rSymbol.Style = chart2::SymbolStyle_NONE;
 178             break;
 179         case ::com::sun::star::chart::ChartSymbolType::AUTO:
 180             rSymbol.Style = chart2::SymbolStyle_AUTO;
 181             break;
 182         case ::com::sun::star::chart::ChartSymbolType::BITMAPURL:
 183             rSymbol.Style = chart2::SymbolStyle_GRAPHIC;
 184             break;
 185         default:
 186             rSymbol.Style = chart2::SymbolStyle_STANDARD;
 187             rSymbol.StandardSymbol = nSymbolType;
 188             break;
 189     }
 190 }
 191
 192 void lcl_addWrappedProperties( std::vector< WrappedProperty* >& rList
 193                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact
 194                                     , tSeriesOrDiagramPropertyType ePropertyType )
 195 {
 196     rList.push_back( new WrappedSymbolTypeProperty( spChart2ModelContact, ePropertyType ) );
 197     rList.push_back( new WrappedSymbolBitmapURLProperty( spChart2ModelContact, ePropertyType ) );
 198     rList.push_back( new WrappedSymbolSizeProperty( spChart2ModelContact, ePropertyType  ) );
 199     rList.push_back( new WrappedSymbolAndLinesProperty( spChart2ModelContact, ePropertyType  ) );
 200 }
 201
 202 }//anonymous namespace
 203
 204 //-----------------------------------------------------------------------------
 205 //-----------------------------------------------------------------------------
 206 //-----------------------------------------------------------------------------
 207 //static
 208 void WrappedSymbolProperties::addProperties( ::std::vector< Property > & rOutProperties )
 209 {
 210     rOutProperties.push_back(
 211         Property( C2U( "SymbolType" ),
 212                   PROP_CHART_SYMBOL_TYPE,
 213                   ::getCppuType( reinterpret_cast< sal_Int32 * >(0)),
 214                   beans::PropertyAttribute::BOUND
 215                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 216
 217     rOutProperties.push_back(
 218         Property( C2U( "SymbolBitmapURL" ),
 219                   PROP_CHART_SYMBOL_BITMAP_URL,
 220                   ::getCppuType( reinterpret_cast< ::rtl::OUString * >(0)),
 221                   beans::PropertyAttribute::BOUND
 222                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 223
 224     rOutProperties.push_back(
 225         Property( C2U( "SymbolSize" ),
 226                   PROP_CHART_SYMBOL_SIZE,
 227                   ::getCppuType( reinterpret_cast< awt::Size * >(0)),
 228                   beans::PropertyAttribute::BOUND
 229                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 230
 231     rOutProperties.push_back(
 232         Property( C2U( "Lines" ),
 233                   PROP_CHART_SYMBOL_AND_LINES,
 234                   ::getBooleanCppuType(),
 235                   beans::PropertyAttribute::BOUND
 236                   | beans::PropertyAttribute::MAYBEDEFAULT ));
 237 }
 238
 239 //-----------------------------------------------------------------------------
 240 //-----------------------------------------------------------------------------
 241
 242 //static
 243 void WrappedSymbolProperties::addWrappedPropertiesForSeries( std::vector< WrappedProperty* >& rList
 244                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 245 {
 246     lcl_addWrappedProperties( rList, spChart2ModelContact, DATA_SERIES );
 247 }
 248
 249 //-----------------------------------------------------------------------------
 250 //-----------------------------------------------------------------------------
 251
 252 //static
 253 void WrappedSymbolProperties::addWrappedPropertiesForDiagram( std::vector< WrappedProperty* >& rList
 254                                     , ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact )
 255 {
 256     lcl_addWrappedProperties( rList, spChart2ModelContact, DIAGRAM );
 257 }
 258
 259 //-----------------------------------------------------------------------------
 260 //-----------------------------------------------------------------------------
 261 //-----------------------------------------------------------------------------
 262
 263 WrappedSymbolTypeProperty::WrappedSymbolTypeProperty(
 264     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
 265     tSeriesOrDiagramPropertyType ePropertyType )
 266         : WrappedSeriesOrDiagramProperty< sal_Int32 >( C2U("SymbolType")
 267             , uno::makeAny( ::com::sun::star::chart::ChartSymbolType::NONE )
 268             , spChart2ModelContact
 269             , ePropertyType )
 270 {
 271 }
 272 WrappedSymbolTypeProperty::~WrappedSymbolTypeProperty()
 273 {
 274 }
 275
 276 sal_Int32 WrappedSymbolTypeProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const
 277 {
 278     sal_Int32 aRet = 0;
 279     m_aDefaultValue >>= aRet;
 280     chart2::Symbol aSymbol;
 281     if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(C2U("Symbol")) >>= aSymbol ) )
 282         aRet = lcl_getSymbolType( aSymbol );
 283     return aRet;
 284 }
 285
 286 void WrappedSymbolTypeProperty::setValueToSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet, sal_Int32 nSymbolType ) const
 287 {
 288     if(!xSeriesPropertySet.is())
 289         return;
 290
 291     chart2::Symbol aSymbol;
 292     xSeriesPropertySet->getPropertyValue(C2U("Symbol")) >>= aSymbol;
 293
 294     lcl_setSymbolTypeToSymbol( nSymbolType, aSymbol );
 295     xSeriesPropertySet->setPropertyValue( C2U("Symbol"), uno::makeAny( aSymbol ) );
 296 }
 297
 298 Any WrappedSymbolTypeProperty::getPropertyValue( const Reference< beans::XPropertySet >& xInnerPropertySet ) const
 299                             throw ( beans::UnknownPropertyException, lang::WrappedTargetException, uno::RuntimeException)
 300 {
 301     //the old chart (< OOo 2.3) needs symbol-type="automatic" at the plot-area if any of the series should be able to have symbols
 302     if( m_ePropertyType == DIAGRAM )
 303     {
 304         bool bHasAmbiguousValue = false;
 305         sal_Int32 aValue = 0;
 306         if( detectInnerValue( aValue, bHasAmbiguousValue ) )
 307         {
 308             if(bHasAmbiguousValue)
 309             {
 310                 m_aOuterValue = uno::makeAny( ::com::sun::star::chart::ChartSymbolType::AUTO );
 311             }
 312             else
 313             {
 314                 if( ::com::sun::star::chart::ChartSymbolType::NONE == aValue )
 315                     m_aOuterValue = uno::makeAny( ::com::sun::star::chart::ChartSymbolType::NONE );
 316                 else
 317                     m_aOuterValue = uno::makeAny( ::com::sun::star::chart::ChartSymbolType::AUTO );
 318             }
 319         }
 320         return m_aOuterValue;
 321     }
 322     else
 323     {
 324         ::com::sun::star::uno::Any aRet( m_aDefaultValue );
 325         aRet <<= getValueFromSeries( xInnerPropertySet );
 326         return aRet;
 327     }
 328 }
 329
 330 beans::PropertyState WrappedSymbolTypeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
 331                         throw (beans::UnknownPropertyException, uno::RuntimeException)
 332 {
 333     //the special situation for this property here is that the diagram default can be
 334     //different from the normal default and different from all sinlges series values
 335     //so we need to return PropertyState_DIRECT_VALUE for more cases
 336
 337     if( m_ePropertyType == DATA_SERIES && //single series or point
 338         m_spChart2ModelContact.get())
 339     {
 340         Reference< chart2::XDiagram > xDiagram( m_spChart2ModelContact->getChart2Diagram() );
 341         Reference< chart2::XDataSeries > xSeries( xInnerPropertyState, uno::UNO_QUERY );
 342         Reference< chart2::XChartType > xChartType( DiagramHelper::getChartTypeOfSeries( xDiagram, xSeries ) );
 343         if( ChartTypeHelper::isSupportingSymbolProperties( xChartType, 2 ) )
 344             return beans::PropertyState_DIRECT_VALUE;
 345     }
 346     return WrappedProperty::getPropertyState( xInnerPropertyState );
 347 }
 348
 349 //-----------------------------------------------------------------------------
 350 //-----------------------------------------------------------------------------
 351 //-----------------------------------------------------------------------------
 352
 353 WrappedSymbolBitmapURLProperty::WrappedSymbolBitmapURLProperty(
 354     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
 355     tSeriesOrDiagramPropertyType ePropertyType )
 356         : WrappedSeriesOrDiagramProperty< OUString >( C2U("SymbolBitmapURL")
 357             , uno::makeAny( OUString() ), spChart2ModelContact, ePropertyType  )
 358 {
 359 }
 360
 361 WrappedSymbolBitmapURLProperty::~WrappedSymbolBitmapURLProperty()
 362 {
 363 }
 364
 365 OUString WrappedSymbolBitmapURLProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const
 366 {
 367     OUString aRet;
 368     m_aDefaultValue >>= aRet;
 369     chart2::Symbol aSymbol;
 370     if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(C2U("Symbol")) >>= aSymbol )
 371         && aSymbol.Graphic.is())
 372     {
 373         GraphicObject aGrObj( Graphic( aSymbol.Graphic ));
 374         aRet = OUString( RTL_CONSTASCII_USTRINGPARAM( UNO_NAME_GRAPHOBJ_URLPREFIX ));
 375         aRet += OUString::createFromAscii( aGrObj.GetUniqueID().GetBuffer());
 376     }
 377     return aRet;
 378 }
 379
 380 void WrappedSymbolBitmapURLProperty::setValueToSeries(
 381     const Reference< beans::XPropertySet >& xSeriesPropertySet,
 382     OUString aNewGraphicURL ) const
 383 {
 384     if(!xSeriesPropertySet.is())
 385         return;
 386
 387     chart2::Symbol aSymbol;
 388     if( xSeriesPropertySet->getPropertyValue(C2U("Symbol")) >>= aSymbol )
 389     {
 390         bool bMatchesPrefix =
 391             aNewGraphicURL.matchAsciiL( RTL_CONSTASCII_STRINGPARAM( UNO_NAME_GRAPHOBJ_URLPREFIX ));
 392         OSL_ENSURE( bMatchesPrefix, "Invalid URL for Symbol Bitmap" );
 393         if( bMatchesPrefix )
 394         {
 395             GraphicObject aGrObj = GraphicObject(
 396                 ByteString( U2C( aNewGraphicURL.copy( sizeof( UNO_NAME_GRAPHOBJ_URLPREFIX ) - 1 ))));
 397             aSymbol.Graphic.set( aGrObj.GetGraphic().GetXGraphic());
 398             xSeriesPropertySet->setPropertyValue( C2U("Symbol"), uno::makeAny( aSymbol ) );
 399         }
 400         else
 401         {
 402             try
 403             {
 404                 // @todo: get factory from some context?
 405                 Reference< lang::XMultiServiceFactory > xFact( comphelper::getProcessServiceFactory(), uno::UNO_QUERY_THROW );
 406                 Reference< graphic::XGraphicProvider > xGraphProv(
 407                     xFact->createInstance( C2U("com.sun.star.graphic.GraphicProvider")), uno::UNO_QUERY_THROW );
 408                 Sequence< beans::PropertyValue > aArgs(1);
 409                 aArgs[0] = beans::PropertyValue(
 410                     C2U("URL"), -1, uno::makeAny( aNewGraphicURL ),
 411                     beans::PropertyState_DIRECT_VALUE );
 412                 aSymbol.Graphic.set( xGraphProv->queryGraphic( aArgs ));
 413                 xSeriesPropertySet->setPropertyValue( C2U("Symbol"), uno::makeAny( aSymbol ) );
 414             }
 415             catch( const uno::Exception & ex )
 416             {
 417                 ASSERT_EXCEPTION( ex );
 418             }
 419         }
 420     }
 421 }
 422
 423
 424 //-----------------------------------------------------------------------------
 425 //-----------------------------------------------------------------------------
 426 //-----------------------------------------------------------------------------
 427
 428 namespace
 429 {
 430
 431 void lcl_correctSymbolSizeForBitmaps( chart2::Symbol& rSymbol )
 432 {
 433     if( rSymbol.Style != chart2::SymbolStyle_GRAPHIC )
 434         return;
 435     if( rSymbol.Size.Width != -1 )
 436         return;
 437     if( rSymbol.Size.Height != -1 )
 438         return;
 439
 440     //find a good automatic size
 441     try
 442     {
 443         const awt::Size aDefaultSize(250,250);
 444         awt::Size aSize = aDefaultSize;
 445         uno::Reference< beans::XPropertySet > xProp( rSymbol.Graphic, uno::UNO_QUERY );
 446         if( xProp.is() )
 447         {
 448             bool bFoundSize = false;
 449             try
 450             {
 451                 if( (xProp->getPropertyValue( C2U( "Size100thMM" ) ) >>= aSize) )
 452                 {
 453                     if( aSize.Width == 0 && aSize.Height == 0 )
 454                         aSize = aDefaultSize;
 455                     else
 456                         bFoundSize = true;
 457                 }
 458             }
 459             catch( uno::Exception& e )
 460             {
 461                 ASSERT_EXCEPTION( e );
 462             }
 463
 464             if(!bFoundSize)
 465             {
 466                 awt::Size aAWTPixelSize(10,10);
 467                 if(  (xProp->getPropertyValue( C2U( "SizePixel" ) ) >>= aAWTPixelSize) )
 468                 {
 469                     Size aPixelSize(aAWTPixelSize.Width,aAWTPixelSize.Height);
 470                     Size aNewSize = ( OutputDevice::LogicToLogic( aPixelSize, MAP_PIXEL, MAP_100TH_MM ));
 471                     aSize = awt::Size( aNewSize.Width(), aNewSize.Height() );
 472
 473                     if( aSize.Width == 0 && aSize.Height == 0 )
 474                         aSize = aDefaultSize;
 475                 }
 476             }
 477         }
 478         rSymbol.Size = aSize;
 479     }
 480     catch( uno::Exception& e )
 481     {
 482         ASSERT_EXCEPTION( e );
 483     }
 484 }
 485
 486 }//end anonymous namespace
 487
 488 WrappedSymbolSizeProperty::WrappedSymbolSizeProperty(
 489     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
 490     tSeriesOrDiagramPropertyType ePropertyType )
 491         : WrappedSeriesOrDiagramProperty< awt::Size >( C2U("SymbolSize")
 492             , uno::makeAny( awt::Size(250,250) ), spChart2ModelContact, ePropertyType  )
 493 {
 494 }
 495
 496 WrappedSymbolSizeProperty::~WrappedSymbolSizeProperty()
 497 {
 498 }
 499
 500 awt::Size WrappedSymbolSizeProperty::getValueFromSeries( const Reference< beans::XPropertySet >& xSeriesPropertySet ) const
 501 {
 502     awt::Size aRet;
 503     m_aDefaultValue >>= aRet;
 504     chart2::Symbol aSymbol;
 505     if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(C2U("Symbol")) >>= aSymbol ))
 506         aRet = aSymbol.Size;
 507     return aRet;
 508 }
 509
 510 void WrappedSymbolSizeProperty::setValueToSeries(
 511     const Reference< beans::XPropertySet >& xSeriesPropertySet,
 512     awt::Size aNewSize ) const
 513 {
 514     if(!xSeriesPropertySet.is())
 515         return;
 516
 517     chart2::Symbol aSymbol;
 518     if( xSeriesPropertySet->getPropertyValue(C2U("Symbol")) >>= aSymbol )
 519     {
 520         aSymbol.Size = aNewSize;
 521         lcl_correctSymbolSizeForBitmaps(aSymbol);
 522         xSeriesPropertySet->setPropertyValue( C2U("Symbol"), uno::makeAny( aSymbol ) );
 523     }
 524 }
 525
 526 beans::PropertyState WrappedSymbolSizeProperty::getPropertyState( const Reference< beans::XPropertyState >& xInnerPropertyState ) const
 527                         throw (beans::UnknownPropertyException, uno::RuntimeException)
 528 {
 529     //only export symbol size if necessary
 530     if( m_ePropertyType == DIAGRAM )
 531         return beans::PropertyState_DEFAULT_VALUE;
 532
 533     try
 534     {
 535         chart2::Symbol aSymbol;
 536         Reference< beans::XPropertySet > xSeriesPropertySet( xInnerPropertyState, uno::UNO_QUERY );
 537         if( xSeriesPropertySet.is() && ( xSeriesPropertySet->getPropertyValue(C2U("Symbol")) >>= aSymbol ))
 538         {
 539             if(  chart2::SymbolStyle_NONE != aSymbol.Style )
 540                 return beans::PropertyState_DIRECT_VALUE;
 541         }
 542     }
 543     catch( const uno::Exception & ex )
 544     {
 545         ASSERT_EXCEPTION( ex );
 546     }
 547     return beans::PropertyState_DEFAULT_VALUE;
 548 }
 549
 550 //-----------------------------------------------------------------------------
 551 //-----------------------------------------------------------------------------
 552 //-----------------------------------------------------------------------------
 553
 554 WrappedSymbolAndLinesProperty::WrappedSymbolAndLinesProperty(
 555     ::boost::shared_ptr< Chart2ModelContact > spChart2ModelContact,
 556     tSeriesOrDiagramPropertyType ePropertyType )
 557         : WrappedSeriesOrDiagramProperty< sal_Bool >( C2U("Lines")
 558             , uno::makeAny( sal_True ), spChart2ModelContact, ePropertyType  )
 559 {
 560 }
 561
 562 WrappedSymbolAndLinesProperty::~WrappedSymbolAndLinesProperty()
 563 {
 564 }
 565
 566 sal_Bool WrappedSymbolAndLinesProperty::getValueFromSeries( const Reference< beans::XPropertySet >& /*xSeriesPropertySet*/ ) const
 567 {
 568     //do not export this property anymore, instead use a linestyle none for no lines
 569     return sal_True;
 570 }
 571
 572 void WrappedSymbolAndLinesProperty::setValueToSeries(
 573     const Reference< beans::XPropertySet >& xSeriesPropertySet,
 574     sal_Bool bDrawLines ) const
 575 {
 576     if(!xSeriesPropertySet.is())
 577         return;
 578
 579     drawing::LineStyle eLineStyle( bDrawLines ? drawing::LineStyle_SOLID : drawing::LineStyle_NONE  );
 580     xSeriesPropertySet->setPropertyValue( C2U("LineStyle"), uno::makeAny( eLineStyle ) );
 581 }
 582
 583 beans::PropertyState WrappedSymbolAndLinesProperty::getPropertyState( const Reference< beans::XPropertyState >& /*xInnerPropertyState*/ ) const
 584                         throw (beans::UnknownPropertyException, uno::RuntimeException)
 585 {
 586     //do not export this property anymore, instead use a linestyle none for no lines
 587     return beans::PropertyState_DEFAULT_VALUE;
 588 }
 589
 590 //-----------------------------------------------------------------------------
 591 //-----------------------------------------------------------------------------
 592 //-----------------------------------------------------------------------------
 593
 594 } //namespace wrapper
 595 } //namespace chart
 596 //.............................................................................