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

[Thorsten Behrens]

 patches/dev300/cws-impressmedia01-backport.diff |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit a496fa1f12a2d343dbeb366f90a3038aac642384
Author: Thorsten Behrens <tbehrens at novell.com>
Date:   Thu Feb 4 18:14:36 2010 +0100

    Fixed case of media substream, fixed build
    
    * patches/dev300/cws-impressmedia01-backport.diff:

diff --git a/patches/dev300/cws-impressmedia01-backport.diff b/patches/dev300/cws-impressmedia01-backport.diff
index 033c218..1f3026c 100644
--- a/patches/dev300/cws-impressmedia01-backport.diff
+++ b/patches/dev300/cws-impressmedia01-backport.diff
@@ -1484,7 +1484,7 @@ index 0000000..c5e1c6f
 +.INCLUDE :  target.mk
 diff --git svx/source/sdr/media/mediamanager.cxx svx/source/sdr/media/mediamanager.cxx
 new file mode 100644
-index 0000000..98dff8b
+index 0000000..c9e4cae
 --- /dev/null
 +++ svx/source/sdr/media/mediamanager.cxx
 @@ -0,0 +1,445 @@
@@ -1662,7 +1662,7 @@ index 0000000..98dff8b
 +MediaManager::MediaManager( SfxObjectShell* pObjectShell )
 +: mpObjectShell( pObjectShell )
 +, msPackagePrefix( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) )
-+, msMedia( RTL_CONSTASCII_USTRINGPARAM( "Media" ))
++, msMedia( RTL_CONSTASCII_USTRINGPARAM( "media" ))
 +, msMediaType( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ))
 +, msStorageMediaType( RTL_CONSTASCII_USTRINGPARAM( "application/vnd.sun.star.media" ))
 +{
@@ -1996,7 +1996,7 @@ index 991582d..3339e5e 100644
  
  TYPEINIT1(SdrHint,SfxHint);
 diff --git svx/source/svdraw/svdomedia.cxx svx/source/svdraw/svdomedia.cxx
-index ee8352b..884d71f 100644
+index ee8352b..b816df4 100644
 --- svx/source/svdraw/svdomedia.cxx
 +++ svx/source/svdraw/svdomedia.cxx
 @@ -31,11 +31,81 @@
@@ -2014,7 +2014,7 @@ index ee8352b..884d71f 100644
 +#include "svx/sdr/media/mediamanager.hxx"
 +#include "svx/svdmodel.hxx"
 +#include "svx/svdomedia.hxx"
-+#include "svx/linkmgr.hxx"
++#include "linkmgr.hxx"
 +
  #include "svdglob.hxx"
  #include "svdstr.hrc"