[ooo-build-commit] .: patches/dev300

Thorsten Behrens thorsten at kemper.freedesktop.org
Thu Feb 4 08:00:02 PST 2010 

 patches/dev300/svx-sound.diff |  105 ++++++++++++++++++++++++------------------
 1 file changed, 60 insertions(+), 45 deletions(-)

New commits:
commit c4f882141c37f4923fb4e2c6c1bbb42a7a2b4b3e
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Feb 4 16:56:56 2010 +0100

    Updated depending patch to impressmedia embedding backport
    
    * patches/dev300/svx-sound.diff: re-generated patch against
      applied cws-impressmedia01

diff --git a/patches/dev300/svx-sound.diff b/patches/dev300/svx-sound.diff
index dee2a2a..e44e6c4 100644
--- a/patches/dev300/svx-sound.diff
+++ b/patches/dev300/svx-sound.diff
@@ -1,7 +1,23 @@
-diff -rup svx-orig/inc/svx/svdomedia.hxx svx/inc/svx/svdomedia.hxx
---- svx-orig/inc/svx/svdomedia.hxx	2009-10-04 23:14:33.000000000 +0200
-+++ svx/inc/svx/svdomedia.hxx	2009-10-05 11:24:04.000000000 +0200
-@@ -71,6 +71,9 @@ public:
+Sounds in slideshow fix
+
+From: rodo
+
+
+---
+
+ svx/inc/svx/svdomedia.hxx       |    5 +++++
+ svx/inc/svx/unoshprp.hxx        |    2 ++
+ svx/source/svdraw/svdomedia.cxx |   16 ++++++++++++++++
+ svx/source/unodraw/unoprov.cxx  |    1 +
+ svx/source/unodraw/unoshap4.cxx |   19 +++++++++++++++++--
+ 5 files changed, 41 insertions(+), 2 deletions(-)
+
+
+diff --git svx/inc/svx/svdomedia.hxx svx/inc/svx/svdomedia.hxx
+index cf82e82..8fd0a5e 100644
+--- svx/inc/svx/svdomedia.hxx
++++ svx/inc/svx/svdomedia.hxx
+@@ -79,6 +79,9 @@ public:
          void						setURL( const ::rtl::OUString& rURL );
          const ::rtl::OUString&		getURL() const;
  
@@ -11,19 +27,19 @@ diff -rup svx-orig/inc/svx/svdomedia.hxx svx/inc/svx/svdomedia.hxx
          void						setMediaProperties( const ::avmedia::MediaItem& rState );
          const ::avmedia::MediaItem& getMediaProperties() const;
  
-@@ -90,6 +93,8 @@ private:
- 
-         ::avmedia::MediaItem		maMediaProperties;
+@@ -108,6 +111,8 @@ private:
          ::std::auto_ptr< Graphic >  mapGraphic;
+         ::rtl::Reference< sdr::media::MediaLink > mxMediaLink;
+ 		SdrMediaLink*				mpSdrMediaLink;
 +
-+	sal_uInt16 mnSlidesNumber;
++        sal_uInt16                  mnSlidesNumber;
  };
  
  #endif //_SVDOMEDIA_HXX
-Only in svx/inc/svx: svdomedia.hxx~
-diff -rup svx-orig/inc/svx/unoshprp.hxx svx/inc/svx/unoshprp.hxx
---- svx-orig/inc/svx/unoshprp.hxx	2009-10-04 23:14:33.000000000 +0200
-+++ svx/inc/svx/unoshprp.hxx	2009-10-05 11:35:59.000000000 +0200
+diff --git svx/inc/svx/unoshprp.hxx svx/inc/svx/unoshprp.hxx
+index 7366f1a..e425ef9 100644
+--- svx/inc/svx/unoshprp.hxx
++++ svx/inc/svx/unoshprp.hxx
 @@ -194,6 +194,8 @@
  
  #define OWN_ATTR_EDGE_POLYPOLYGONBEZIER			(OWN_ATTR_VALUE_START+88)
@@ -33,33 +49,30 @@ diff -rup svx-orig/inc/svx/unoshprp.hxx svx/inc/svx/unoshprp.hxx
  #define OWN_ATTR_VALUE_END                      OWN_ATTR_EDGE_POLYPOLYGONBEZIER // WARNING: ee items start at 3991!
  
  // #FontWork#
-Only in svx/inc/svx: unoshprp.hxx~
-diff -rup svx-orig/source/svdraw/svdomedia.cxx svx/source/svdraw/svdomedia.cxx
---- svx-orig/source/svdraw/svdomedia.cxx	2009-10-04 23:14:34.000000000 +0200
-+++ svx/source/svdraw/svdomedia.cxx	2009-10-05 12:24:27.000000000 +0200
-@@ -45,14 +45,15 @@ TYPEINIT1( SdrMediaObj, SdrRectObj );
- 
- // ------------------------------------------------------------------------------
- 
--SdrMediaObj::SdrMediaObj()
-+SdrMediaObj::SdrMediaObj() : mnSlidesNumber( 1 )
+diff --git svx/source/svdraw/svdomedia.cxx svx/source/svdraw/svdomedia.cxx
+index 884d71f..40da1e5 100644
+--- svx/source/svdraw/svdomedia.cxx
++++ svx/source/svdraw/svdomedia.cxx
+@@ -117,6 +117,7 @@ TYPEINIT1( SdrMediaObj, SdrRectObj );
+ 
+ SdrMediaObj::SdrMediaObj()
+ : mpSdrMediaLink( 0 )
++, mnSlidesNumber( 1 )
  {
  }
  
- // ------------------------------------------------------------------------------
- 
- SdrMediaObj::SdrMediaObj( const Rectangle& rRect ) :
--    SdrRectObj( rRect )
-+    SdrRectObj( rRect ),
-+    mnSlidesNumber( 1 )
+@@ -125,6 +126,7 @@ SdrMediaObj::SdrMediaObj()
+ SdrMediaObj::SdrMediaObj( const Rectangle& rRect )
+ : SdrRectObj( rRect )
+ , mpSdrMediaLink( 0 )
++, mnSlidesNumber( 1 )
  {
  }
  
-@@ -166,6 +167,20 @@ const ::rtl::OUString& SdrMediaObj::getU
- }
+@@ -275,6 +277,20 @@ const ::rtl::OUString& SdrMediaObj::getURL() const
  
  // ------------------------------------------------------------------------------
-+
+ 
 +void SdrMediaObj::setSlidesNumber( sal_uInt16 nSlidesNumber )
 +{
 +    mnSlidesNumber = nSlidesNumber;
@@ -73,14 +86,15 @@ diff -rup svx-orig/source/svdraw/svdomedia.cxx svx/source/svdraw/svdomedia.cxx
 +}
 +
 +// ------------------------------------------------------------------------------
- 
++
  void SdrMediaObj::setMediaProperties( const ::avmedia::MediaItem& rState )
  {
-Only in svx/source/svdraw: svdomedia.cxx~
-diff -rup svx-orig/source/unodraw/unoprov.cxx svx/source/unodraw/unoprov.cxx
---- svx-orig/source/unodraw/unoprov.cxx	2009-10-04 23:14:34.000000000 +0200
-+++ svx/source/unodraw/unoprov.cxx	2009-10-04 23:23:14.000000000 +0200
-@@ -750,6 +750,7 @@ SfxItemPropertyMap* ImplGetSvxMediaShape
+     mediaPropertiesChanged( rState );
+diff --git svx/source/unodraw/unoprov.cxx svx/source/unodraw/unoprov.cxx
+index 0ab785b..bf56f64 100644
+--- svx/source/unodraw/unoprov.cxx
++++ svx/source/unodraw/unoprov.cxx
+@@ -750,6 +750,7 @@ SfxItemPropertyMapEntry* ImplGetSvxMediaShapePropertyMap()
          { MAP_CHAR_LEN(UNO_NAME_LINKDISPLAYNAME), OWN_ATTR_LDNAME, &::getCppuType(( const ::rtl::OUString*)0),	::com::sun::star::beans::PropertyAttribute::READONLY, 0},
          { MAP_CHAR_LEN("Transformation"), OWN_ATTR_TRANSFORMATION, &::getCppuType((const struct com::sun::star::drawing::HomogenMatrix3*)0), 0, 0 },
          { MAP_CHAR_LEN("MediaURL"),	OWN_ATTR_MEDIA_URL, &::getCppuType((const ::rtl::OUString*)0), 0, 0},
@@ -88,19 +102,20 @@ diff -rup svx-orig/source/unodraw/unoprov.cxx svx/source/unodraw/unoprov.cxx
          { MAP_CHAR_LEN("PreferredSize"), OWN_ATTR_MEDIA_PREFERREDSIZE, &::getCppuType((const ::com::sun::star::awt::Size*)0), ::com::sun::star::beans::PropertyAttribute::READONLY, 0},
          { MAP_CHAR_LEN("Loop"),	OWN_ATTR_MEDIA_LOOP, &::getCppuType((const sal_Bool*)0), 0, 0},
          { MAP_CHAR_LEN("Mute"),	OWN_ATTR_MEDIA_MUTE, &::getCppuType((const sal_Bool*)0), 0, 0},
-diff -rup svx-orig/source/unodraw/unoshap4.cxx svx/source/unodraw/unoshap4.cxx
---- svx-orig/source/unodraw/unoshap4.cxx	2009-10-04 23:14:34.000000000 +0200
-+++ svx/source/unodraw/unoshap4.cxx	2009-10-05 11:37:12.000000000 +0200
+diff --git svx/source/unodraw/unoshap4.cxx svx/source/unodraw/unoshap4.cxx
+index 96c2cae..9ea08e2 100644
+--- svx/source/unodraw/unoshap4.cxx
++++ svx/source/unodraw/unoshap4.cxx
 @@ -865,7 +865,7 @@ SvxMediaShape::~SvxMediaShape() throw()
  
- bool SvxMediaShape::setPropertyValueImpl( const SfxItemPropertyMap* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ bool SvxMediaShape::setPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, const ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
  {
 -    if( (pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM) )
 +    if( (pProperty->nWID >= OWN_ATTR_MEDIA_URL) && (pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM) || pProperty->nWID == OWN_ATTR_MEDIA_SLIDES_NUMBER )
      {
          SdrMediaObj* pMedia = static_cast< SdrMediaObj* >( mpObj.get() );
          ::avmedia::MediaItem aItem;
-@@ -884,6 +884,17 @@ bool SvxMediaShape::setPropertyValueImpl
+@@ -884,6 +884,17 @@ bool SvxMediaShape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sf
          }
          break;
  
@@ -118,16 +133,16 @@ diff -rup svx-orig/source/unodraw/unoshap4.cxx svx/source/unodraw/unoshap4.cxx
          case( OWN_ATTR_MEDIA_LOOP ):
          {
              sal_Bool bLoop = sal_Bool();
-@@ -954,7 +965,7 @@ bool SvxMediaShape::setPropertyValueImpl
+@@ -954,7 +965,7 @@ bool SvxMediaShape::setPropertyValueImpl( const ::rtl::OUString& rName, const Sf
  
- bool SvxMediaShape::getPropertyValueImpl( const SfxItemPropertyMap* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
+ bool SvxMediaShape::getPropertyValueImpl( const ::rtl::OUString& rName, const SfxItemPropertySimpleEntry* pProperty, ::com::sun::star::uno::Any& rValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException)
  {
 -    if( ( pProperty->nWID >= OWN_ATTR_MEDIA_URL ) && ( pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM ) )
 +    if( ( pProperty->nWID >= OWN_ATTR_MEDIA_URL ) && ( pProperty->nWID <= OWN_ATTR_MEDIA_ZOOM ) || pProperty->nWID == OWN_ATTR_MEDIA_SLIDES_NUMBER )
      {
          SdrMediaObj* pMedia = static_cast< SdrMediaObj* >( mpObj.get() );
          const ::avmedia::MediaItem aItem( pMedia->getMediaProperties() );
-@@ -965,6 +976,10 @@ bool SvxMediaShape::getPropertyValueImpl
+@@ -965,6 +976,10 @@ bool SvxMediaShape::getPropertyValueImpl( const ::rtl::OUString& rName, const Sf
                  rValue <<= aItem.getURL();
                  break;

More information about the ooo-build-commit mailing list