rpms/openoffice.org/devel ooo-build.ooo2497.filter.svg.patch, NONE, 1.1 ooo-build.ooo68717.gstreamer.video.patch, NONE, 1.1 openoffice.org.spec, 1.1862, 1.1863 openoffice.org-2.2.0.ooo68717.gstreamer.video.patch, 1.15, NONE
Caolan McNamara
caolanm at fedoraproject.org
Wed Mar 18 12:36:57 UTC 2009
- Previous message (by thread): comps comps-f10.xml.in,1.226,1.227 comps-f11.xml.in,1.163,1.164
- Next message (by thread): rpms/kernel/devel kernel.spec, 1.1441, 1.1442 linux-2.6-hdpvr.patch, 1.5, 1.6 linux-2.6-v4l-dvb-experimental.patch, 1.2, 1.3 linux-2.6-v4l-dvb-update.patch, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: caolanm
Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7533
Modified Files:
openoffice.org.spec
Added Files:
ooo-build.ooo2497.filter.svg.patch
ooo-build.ooo68717.gstreamer.video.patch
Removed Files:
openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
Log Message:
add thb's svg importer
ooo-build.ooo2497.filter.svg.patch:
--- NEW FILE ooo-build.ooo2497.filter.svg.patch ---
diff -ruN OOO310_m6.orig/filter/source/config/fragments/fcfg_drawgraphics.mk OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk
--- OOO310_m6.orig/filter/source/config/fragments/fcfg_drawgraphics.mk 2009-03-17 14:58:31.000000000 +0000
+++ OOO310_m6/filter/source/config/fragments/fcfg_drawgraphics.mk 2009-03-17 14:59:37.000000000 +0000
@@ -54,6 +54,7 @@
SGF___StarOffice_Writer_SGF \
SGV___StarDraw_2_0 \
SVM___StarView_Metafile \
+ SVG___Scalable_Vector_Graphics \
TGA___Truevision_TARGA \
TIF___Tag_Image_File \
WMF___MS_Windows_Metafile \
diff -ruN OOO310_m6.orig/filter/source/config/fragments/fcfg_internalgraphics.mk OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk
--- OOO310_m6.orig/filter/source/config/fragments/fcfg_internalgraphics.mk 2009-03-17 14:58:31.000000000 +0000
+++ OOO310_m6/filter/source/config/fragments/fcfg_internalgraphics.mk 2009-03-17 14:59:37.000000000 +0000
@@ -68,6 +68,7 @@
sgf_Import \
sgv_Import \
svg_Export \
+ svg_Import \
svm_Export \
svm_Import \
tga_Import \
diff -ruN OOO310_m6.orig/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu
--- OOO310_m6.orig/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu 1970-01-01 01:00:00.000000000 +0100
+++ OOO310_m6/filter/source/config/fragments/filters/SVG___Scalable_Vector_Graphics.xcu 2009-03-17 14:59:37.000000000 +0000
@@ -0,0 +1,13 @@
+ <node oor:name="SVG - Scalable Vector Graphics" oor:op="replace">
+ <prop oor:name="Flags"><value>IMPORT ALIEN USESOPTIONS 3RDPARTYFILTER PREFERRED</value></prop>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="FilterService"><value>com.sun.star.comp.Draw.SVGFilter</value></prop>
+ <prop oor:name="UserData"><value></value></prop>
+ <prop oor:name="UIName">
+ <value xml:lang="x-default">SVG - Scalable Vector Graphics</value>
+ </prop>
+ <prop oor:name="FileFormatVersion"><value>0</value></prop>
+ <prop oor:name="Type"><value>svg_Scalable_Vector_Graphics</value></prop>
+ <prop oor:name="TemplateName"/>
+ <prop oor:name="DocumentService"><value>com.sun.star.drawing.DrawingDocument</value></prop>
+ </node>
diff -ruN OOO310_m6.orig/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu
--- OOO310_m6.orig/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu 1970-01-01 01:00:00.000000000 +0100
+++ OOO310_m6/filter/source/config/fragments/internalgraphicfilters/svg_Import.xcu 2009-03-17 14:59:37.000000000 +0000
@@ -0,0 +1,10 @@
+ <node oor:name="svg_Import" oor:op="replace" >
+ <prop oor:name="Type"><value>svg_Scalable_Vector_Graphics</value></prop>
+ <prop oor:name="FormatName"><value>svgfilter</value></prop>
+ <prop oor:name="RealFilterName"/>
+ <prop oor:name="UIComponent"/>
+ <prop oor:name="UIName">
+ <value xml:lang="en-US">SVG - Scalable Vector Graphics</value>
+ </prop>
+ <prop oor:name="Flags"><value>IMPORT</value></prop>
+ </node>
diff -ruN OOO310_m6.orig/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu
--- OOO310_m6.orig/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu 2009-03-17 14:58:31.000000000 +0000
+++ OOO310_m6/filter/source/config/fragments/types/svg_Scalable_Vector_Graphics.xcu 2009-03-17 14:59:37.000000000 +0000
@@ -1,10 +1,10 @@
<node oor:name="svg_Scalable_Vector_Graphics" oor:op="replace" >
- <prop oor:name="DetectService"/>
+ <prop oor:name="DetectService"><value>com.sun.star.comp.Draw.SVGFilter</value></prop>
<prop oor:name="URLPattern"/>
<prop oor:name="Extensions"><value>svg</value></prop>
<prop oor:name="MediaType"><value>image/svg+xml</value></prop>
- <prop oor:name="Preferred"><value>false</value></prop>
- <prop oor:name="PreferredFilter"/>
+ <prop oor:name="Preferred"><value>true</value></prop>
+ <prop oor:name="PreferredFilter"><value>SVG - Scalable Vector Graphics</value></prop>
<prop oor:name="UIName">
<value>SVG - Scalable Vector Graphics</value>
</prop>
diff -ruN OOO310_m6.orig/filter/source/svg/b2dellipse.cxx OOO310_m6/filter/source/svg/b2dellipse.cxx
--- OOO310_m6.orig/filter/source/svg/b2dellipse.cxx 1970-01-01 01:00:00.000000000 +0100
+++ OOO310_m6/filter/source/svg/b2dellipse.cxx 2009-03-17 14:59:37.000000000 +0000
@@ -0,0 +1,139 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * Author:
+ * Fridrich Strba <fridrich.strba at bluewin.ch>
+ * Thorsten Behrens <tbehrens at novell.com>
+ *
+ * Copyright (C) 2008, Novell Inc.
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ ************************************************************************/
+
+#include "b2dellipse.hxx"
+
+#include <osl/diagnose.h>
+
+#include <basegfx/point/b2dpoint.hxx>
+
+#include <basegfx/matrix/b2dhommatrix.hxx>
+
+#include <rtl/instance.hxx>
+
+#include <boost/scoped_ptr.hpp>
+#include <vector>
+#include <algorithm>
+
+class ImplB2DEllipse
+{
+ basegfx::B2DPoint maCenter;
+ basegfx::B2DTuple maRadius;
+
+public:
+ ImplB2DEllipse()
+ : maCenter(0.0f, 0.0f),
+ maRadius(0.0f, 0.0f)
+ {}
+
+ ImplB2DEllipse(const ImplB2DEllipse& rToBeCopied)
+ : maCenter(rToBeCopied.maCenter),
+ maRadius(rToBeCopied.maRadius)
+ {}
+
+ ImplB2DEllipse& operator=( const ImplB2DEllipse& rToBeCopied )
+ {
+ maCenter = rToBeCopied.maCenter;
+ maRadius = rToBeCopied.maRadius;
+
+ return *this;
+ }
+
+ bool isEqual(const ImplB2DEllipse& rCandidate) const
+ {
+ return (maCenter == rCandidate.maCenter)
+ && (maRadius == rCandidate.maRadius);
+ }
+
+ basegfx::B2DPoint getCenter() const
+ {
+ return maCenter;
+ }
+
+ void setCenter(const basegfx::B2DPoint& rCenter)
+ {
+ maCenter = rCenter;
+ }
+
+ basegfx::B2DTuple getRadius() const
+ {
+ return maRadius;
+ }
+
+ void setRadius(const basegfx::B2DTuple& rRadius)
+ {
+ maRadius = rRadius;
+ }
+
+
+ void transform(const basegfx::B2DHomMatrix& /* rMatrix */)
+ {
+ }
+};
+
+//////////////////////////////////////////////////////////////////////////////
+
+namespace basegfx
+{
+
+ B2DEllipse::B2DEllipse()
+ {}
+
+ B2DEllipse::B2DEllipse(const basegfx::B2DPoint& rCenter, const basegfx::B2DTuple& rRadius)
+ : maCenter(rCenter), maRadius(rRadius)
+ {
+ }
+
+ B2DEllipse::~B2DEllipse()
+ {
+ }
+
+ bool B2DEllipse::operator==(const B2DEllipse& rEllipse) const
+ {
+ return (maCenter == rEllipse.maCenter) && (maRadius == rEllipse.maRadius);
+ }
+
+ bool B2DEllipse::operator!=(const B2DEllipse& rEllipse) const
+ {
+ return !(*this == rEllipse);
+ }
+
+ basegfx::B2DPoint B2DEllipse::getB2DEllipseCenter() const
+ {
+ return maCenter;
+ }
+
+ void B2DEllipse::setB2DEllipseCenter(const basegfx::B2DPoint& rCenter)
+ {
+ maCenter = rCenter;
+ }
+
+ basegfx::B2DTuple B2DEllipse::getB2DEllipseRadius() const
+ {
+ return maRadius;
[...5836 lines suppressed...]
+royalblue
+saddlebrown
+salmon
+sandybrown
+seagreen
+seashell
+sienna
+silver
+skyblue
+slateblue
+slategray
+slategrey
+snow
+springgreen
+steelblue
+tan
+teal
+thistle
+tomato
+turquoise
+violet
+wheat
+white
+whitesmoke
+yellow
+yellowgreen
+#######################################
+#
+# Gradient units values
+#
+#######################################
+userSpaceOnUse
+objectBoundingBox
diff -ruN OOO310_m6.orig/filter/source/svg/units.cxx OOO310_m6/filter/source/svg/units.cxx
--- OOO310_m6.orig/filter/source/svg/units.cxx 1970-01-01 01:00:00.000000000 +0100
+++ OOO310_m6/filter/source/svg/units.cxx 2009-03-17 14:59:37.000000000 +0000
@@ -0,0 +1,99 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * Author:
+ * Jan Holesovsky <kendy at suse.cz>
+ * Fridrich Strba <fridrich.strba at bluewin.ch>
+ * Thorsten Behrens <tbehrens at novell.com>
+ *
+ * Copyright (C) 2008, Novell Inc.
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ ************************************************************************/
+
+// MARKER(update_precomp.py): autogen include statement, do not remove
+#include "precompiled_filter.hxx"
+
+#include "units.hxx"
+#include "gfxtypes.hxx"
+#include "spirit_supplements.hxx"
+
+#include <string.h>
+#include <rtl/ustring.hxx>
+
+#include <boost/bind.hpp>
+// workaround. spirit uses INT_MAX.
+#include <limits.h>
+#include <boost/spirit.hpp>
+
+
+namespace svgi
+{
+
+double convLength( double value, SvgUnit unit, const State& rState, char dir )
+{
+ const double fBoxLen( dir=='h' ? rState.maViewBox.getWidth() :
+ (dir=='v' ? rState.maViewBox.getHeight() :
+ rState.maViewBox.getRange().getLength()));
+
+ // convert svg unit to internal coordinates ("pixel"). Since the
+ // OOo drawing layer is still largely integer-based, the initial
+ // viewport transformation includes a certain scale factor
+ double fRet(value);
+ switch ( unit )
+ {
+ case SVG_LENGTH_UNIT_CM: fRet *= 72.0/2.54; break;
+ case SVG_LENGTH_UNIT_IN: fRet *= 72.0; break;
+ case SVG_LENGTH_UNIT_MM: fRet *= 72.0/25.4; break;
+ case SVG_LENGTH_UNIT_PC: fRet *= 72.0/6.0; break;
+ case SVG_LENGTH_UNIT_USER:
+ case SVG_LENGTH_UNIT_PX: // no unit defaults to PX in svg,
+ // assume display to have 72DPI
+ case SVG_LENGTH_UNIT_PT: break;
+ case SVG_LENGTH_UNIT_EM: fRet *= rState.mnFontSize; break;
+ case SVG_LENGTH_UNIT_EX: fRet *= rState.mnFontSize / 2.0; break;
+ case SVG_LENGTH_UNIT_PERCENTAGE: fRet *= fBoxLen; break;
+ default: OSL_TRACE( "Unknown length type" ); break;
+ }
+
+ return fRet;
+}
+
+double convLength( const rtl::OUString& sValue, const State& rState, char dir )
+{
+ using namespace ::boost::spirit;
+
+ rtl::OString aUTF8 = rtl::OUStringToOString( sValue,
+ RTL_TEXTENCODING_UTF8 );
+
+ double nVal=0.0;
+ SvgUnit eUnit=SVG_LENGTH_UNIT_PX;
+ const bool bRes = parse(aUTF8.getStr(),
+ // Begin grammar
+ (
+ real_p[assign_a(nVal)]
+ >> ( str_p("cm") [assign_a(eUnit,SVG_LENGTH_UNIT_CM)]
+ | str_p("em") [assign_a(eUnit,SVG_LENGTH_UNIT_EM)]
+ | str_p("ex") [assign_a(eUnit,SVG_LENGTH_UNIT_EX)]
+ | str_p("in") [assign_a(eUnit,SVG_LENGTH_UNIT_IN)]
+ | str_p("mm") [assign_a(eUnit,SVG_LENGTH_UNIT_MM)]
+ | str_p("pc") [assign_a(eUnit,SVG_LENGTH_UNIT_PC)]
+ | str_p("pt") [assign_a(eUnit,SVG_LENGTH_UNIT_PT)]
+ | str_p("px") [assign_a(eUnit,SVG_LENGTH_UNIT_PX)]
+ | str_p("%") [assign_a(eUnit,SVG_LENGTH_UNIT_PERCENTAGE)]
+ | str_p("") [assign_a(eUnit,SVG_LENGTH_UNIT_USER)]
+ | end_p)
+ ),
+ // End grammar
+ space_p).full;
+
+ if( !bRes )
+ return 0.0;
+
+ return convLength(nVal,eUnit,rState,dir);
+}
+
+} // namespace svgi
diff -ruN OOO310_m6.orig/filter/source/svg/units.hxx OOO310_m6/filter/source/svg/units.hxx
--- OOO310_m6.orig/filter/source/svg/units.hxx 1970-01-01 01:00:00.000000000 +0100
+++ OOO310_m6/filter/source/svg/units.hxx 2009-03-17 14:59:37.000000000 +0000
@@ -0,0 +1,60 @@
+/*************************************************************************
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * Author:
+ * Jan Holesovsky <kendy at suse.cz>
+ * Fridrich Strba <fridrich.strba at bluewin.ch>
+ * Thorsten Behrens <tbehrens at novell.com>
+ *
+ * Copyright (C) 2008, Novell Inc.
+ *
+ * The Contents of this file are made available subject to
+ * the terms of GNU Lesser General Public License Version 2.1.
+ *
+ ************************************************************************/
+
+#ifndef INCLUDED_UNITS_HXX
+#define INCLUDED_UNITS_HXX
+
+#include <sal/config.h>
+
+namespace rtl{ class OUString; }
+namespace svgi
+{
+ struct State;
+ enum SvgUnit
+ {
+ SVG_LENGTH_UNIT_CM,
+ SVG_LENGTH_UNIT_EM,
+ SVG_LENGTH_UNIT_EX,
+ SVG_LENGTH_UNIT_IN,
+ SVG_LENGTH_UNIT_MM,
+ SVG_LENGTH_UNIT_PC,
+ SVG_LENGTH_UNIT_PT,
+ SVG_LENGTH_UNIT_PX,
+ SVG_LENGTH_UNIT_PERCENTAGE,
+ SVG_LENGTH_UNIT_USER
+ };
+
+ /** return svg_length_t in 100th's of mm
+ @param fVal value to convert
+ @param unit unit the value is in
+ @param rState current state (needed for viewport dimensions etc.)
+ @param dir direction - either 'h' or 'v' for horizonal or vertical, resp.
+ */
+ double convLength( double fVal, SvgUnit unit, const State& rState, char dir );
+
+ /** return svg_length_t in 100th's of mm
+ @param sValue value to convert
+ @param rState current state (needed for viewport dimensions etc.)
+ @param dir direction - either 'h' or 'v' for horizonal or vertical, resp.
+ */
+ double convLength( const rtl::OUString& sValue, const State& rState, char dir );
+
+ inline double pt2mm(double fVal) { return fVal*25.4/72.0; }
+ inline double pt100thmm(double fVal) { return fVal*2540.0/72.0; }
+
+} // namespace svgi
+
+#endif
ooo-build.ooo68717.gstreamer.video.patch:
--- NEW FILE ooo-build.ooo68717.gstreamer.video.patch ---
diff -rup avmedia-orig/prj/build.lst avmedia/prj/build.lst
--- avmedia-orig/prj/build.lst 2006-08-17 16:04:56.000000000 +0200
+++ avmedia/prj/build.lst 2006-08-17 16:05:01.000000000 +0200
@@ -8,4 +8,5 @@
av avmedia\source\java nmake - all av_java NULL
av avmedia\source\xine nmake - all av_xine NULL
av avmedia\source\quicktime nmake - all av_quicktime NULL
-av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_xine NULL
+av avmedia\source\gstreamer nmake - all av_gstreamer NULL
+av avmedia\util nmake - all av_util av_viewer av_framework av_win av_java av_quicktime av_xine av_gstreamer NULL
diff -rup avmedia-orig/source/inc/mediamisc.hxx avmedia/source/inc/mediamisc.hxx
--- avmedia-orig/source/inc/mediamisc.hxx 2006-08-17 16:04:56.000000000 +0200
+++ avmedia/source/inc/mediamisc.hxx 2006-08-17 16:06:41.000000000 +0200
@@ -37,6 +37,9 @@
#define AVMEDIA_RESID( nId ) ResId( nId, * ::avmedia::GetResMgr() )
+#ifdef GSTREAMER
+#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_GStreamer"
+#else
#ifdef WNT
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_DirectX"
#else
@@ -46,6 +49,7 @@
#define AVMEDIA_MANAGER_SERVICE_NAME "com.sun.star.media.Manager_Java"
#endif
#endif
+#endif
namespace avmedia
{
Index: mediawindow_impl.cxx
===================================================================
RCS file: /cvs/graphics/avmedia/source/viewer/mediawindow_impl.cxx,v
retrieving revision 1.7
diff -u -u -r1.7 mediawindow_impl.cxx
--- avmedia/source/viewer/mediawindow_impl.cxx 19 Jun 2006 13:59:09 -0000 1.7
+++ avmedia/source/viewer/mediawindow_impl.cxx 24 Aug 2006 14:17:41 -0000
@@ -44,6 +44,11 @@
#include <osl/mutex.hxx>
#include <tools/time.hxx>
#include <vcl/svapp.hxx>
+#ifdef UNX
+#ifndef _SV_SYSDATA_HXX
+#include <vcl/sysdata.hxx>
+#endif
+#endif
#ifndef _COM_SUN_STAR_AWT_SYSTEMPOINTER_HDL_
#include <com/sun/star/awt/SystemPointer.hdl>
@@ -102,7 +107,11 @@
// --------------------
MediaChildWindow::MediaChildWindow( Window* pParent ) :
+#ifdef GSTREAMER
+ SystemChildWindow( pParent, WB_CLIPCHILDREN )
+#else
JavaChildWindow( pParent, WB_CLIPCHILDREN )
+#endif
{
}
@@ -119,7 +128,11 @@
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+#ifdef GSTREAMER
+ SystemChildWindow::MouseMove( rMEvt );
+#else
JavaChildWindow::MouseMove( rMEvt );
+#endif
GetParent()->MouseMove( aTransformedEvent );
}
@@ -130,7 +143,11 @@
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
+#ifdef GSTREAMER
+ SystemChildWindow::MouseButtonDown( rMEvt );
+#else
JavaChildWindow::MouseButtonDown( rMEvt );
+#endif
GetParent()->MouseButtonDown( aTransformedEvent );
}
@@ -140,8 +157,12 @@
{
const MouseEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rMEvt.GetPosPixel() ) ),
rMEvt.GetClicks(), rMEvt.GetMode(), rMEvt.GetButtons(), rMEvt.GetModifier() );
-
+
+#ifdef GSTREAMER
+ SystemChildWindow::MouseButtonUp( rMEvt );
+#else
JavaChildWindow::MouseButtonUp( rMEvt );
+#endif
GetParent()->MouseButtonUp( aTransformedEvent );
}
@@ -149,7 +170,11 @@
void MediaChildWindow::KeyInput( const KeyEvent& rKEvt )
{
+#ifdef GSTREAMER
+ SystemChildWindow::KeyInput( rKEvt );
+#else
JavaChildWindow::KeyInput( rKEvt );
+#endif
GetParent()->KeyInput( rKEvt );
}
@@ -157,7 +182,11 @@
void MediaChildWindow::KeyUp( const KeyEvent& rKEvt )
{
+#ifdef GSTREAMER
+ SystemChildWindow::KeyUp( rKEvt );
+#else
JavaChildWindow::KeyUp( rKEvt );
+#endif
GetParent()->KeyUp( rKEvt );
}
@@ -168,7 +197,11 @@
const CommandEvent aTransformedEvent( GetParent()->ScreenToOutputPixel( OutputToScreenPixel( rCEvt.GetMousePosPixel() ) ),
rCEvt.GetCommand(), rCEvt.IsMouseEvent(), rCEvt.GetData() );
+#ifdef GSTREAMER
+ SystemChildWindow::Command( rCEvt );
+#else
JavaChildWindow::Command( rCEvt );
+#endif
GetParent()->Command( aTransformedEvent );
}
@@ -237,18 +270,31 @@
{
if( getPlayer().is() )
{
- uno::Sequence< uno::Any > aArgs( 2 );
+ uno::Sequence< uno::Any > aArgs( 3 );
uno::Reference< media::XPlayerWindow > xPlayerWindow;
const Point aPoint;
const Size aSize( maChildWindow.GetSizePixel() );
+#ifndef GSTREAMER
const sal_IntPtr nWndHandle = static_cast< sal_IntPtr >( maChildWindow.getParentWindowHandleForJava() );
+#else
+ const sal_IntPtr nWndHandle = 0;
+#endif
aArgs[ 0 ] = uno::makeAny( nWndHandle );
aArgs[ 1 ] = uno::makeAny( awt::Rectangle( aPoint.X(), aPoint.Y(), aSize.Width(), aSize.Height() ) );
+#ifdef GSTREAMER
+ const SystemEnvData *pSystemData = maChildWindow.GetSystemData();
+ OSL_TRACE( "MediaWindowImpl::onURLChanged xwindow id: %ld", pSystemData->aWindow );
+ aArgs[ 2 ] = uno::makeAny( pSystemData->aWindow );
+#endif
try
{
- if( nWndHandle != 0 )
+#ifdef GSTREAMER
+ if( pSystemData->aWindow != 0 )
+#else
+ if( nWndHandle != 0 )
+#endif
xPlayerWindow = getPlayer()->createPlayerWindow( aArgs );
}
catch( uno::RuntimeException )
Index: mediawindow_impl.hxx
===================================================================
RCS file: /cvs/graphics/avmedia/source/viewer/mediawindow_impl.hxx,v
retrieving revision 1.2
diff -u -u -r1.2 mediawindow_impl.hxx
--- avmedia/source/viewer/mediawindow_impl.hxx 7 Sep 2005 19:43:57 -0000 1.2
+++ avmedia/source/viewer/mediawindow_impl.hxx 24 Aug 2006 14:17:41 -0000
@@ -37,7 +37,11 @@
#define _AVMEDIA_MEDIAWINDOW_IMPL_HXX
#include <svtools/transfer.hxx>
+#ifdef GSTREAMER
+#include <vcl/syschild.hxx>
+#else
#include <vcl/javachild.hxx>
+#endif
#include "mediawindowbase_impl.hxx"
#include "mediacontrol.hxx"
@@ -69,7 +73,11 @@
// - MediaChildWindow -
// --------------------
+#ifdef GSTREAMER
+ class MediaChildWindow : public SystemChildWindow
+#else
class MediaChildWindow : public JavaChildWindow
+#endif
{
[...2870 lines suppressed...]
+ ::com::sun::star::media::ZoomLevel meZoomLevel;
+ Player& mrPlayer;
+ int mnPointerType;
+
+ void ImplLayoutVideoWindow();
+};
+
+} // namespace gstreamer
+} // namespace avmedia
+
+#endif // _WINDOW_HXX
--- /dev/null 2006-08-13 17:52:05.000000000 +0200
+++ avmedia/source/gstreamer/makefile.mk 2006-08-22 11:38:56.000000000 +0200
@@ -0,0 +1,85 @@
+#*************************************************************************
+#
+# OpenOffice.org - a multi-platform office productivity suite
+#
+# $RCSfile$
+#
+# $Revision: 7654 $
+#
+# last change: $Author: rodo $ $Date: 2006-09-19 09:24:25 +0100 (Tue, 19 Sep 2006) $
+#
+# The Contents of this file are made available subject to
+# the terms of GNU Lesser General Public License Version 2.1.
+#
+#
+# GNU Lesser General Public License Version 2.1
+# =============================================
+# Copyright 2005 by Sun Microsystems, Inc.
+# 901 San Antonio Road, Palo Alto, CA 94303, USA
+#
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License version 2.1, as published by the Free Software Foundation.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+# MA 02111-1307 USA
+#
+#*************************************************************************
+
+PRJ=..$/..
+PRJNAME=avmedia
+TARGET=avmediagst
+
+# --- Settings ----------------------------------
+
+.INCLUDE : settings.mk
+
+.IF "$(ENABLE_GSTREAMER)" == "TRUE"
+
+.IF "$(verbose)"!="" || "$(VERBOSE)"!=""
+CDEFS+= -DVERBOSE
+.ENDIF
+
+PKGCONFIG_MODULES=gstreamer-0.10, gstreamer-plugins-base-0.10
+.INCLUDE: pkg_config.mk
+PKGCONFIG_LIBS+=-lgstinterfaces-0.10
+
+# --- Files ----------------------------------
+
+.IF "$(GUI)" == "UNX" || "$(GUI)" == "WNT"
+
+.IF "$(GUI)" == "WNT"
+CDEFS+= -DWINNT
+.ENDIF
+
+SLOFILES= \
+ $(SLO)$/gstuno.obj \
+ $(SLO)$/gstmanager.obj \
+ $(SLO)$/gstplayer.obj \
+ $(SLO)$/gstwindow.obj
+
+
+EXCEPTIONSFILES= \
+ $(SLO)$/gstuno.obj \
+
+SHL1TARGET=$(TARGET)
+SHL1STDLIBS= $(CPPULIB) $(SALLIB) $(COMPHELPERLIB) $(CPPUHELPERLIB) $(PKGCONFIG_LIBS) $(TOOLSLIB)
+SHL1IMPLIB=i$(TARGET)
+SHL1LIBS=$(SLB)$/$(TARGET).lib
+SHL1DEF=$(MISC)$/$(SHL1TARGET).def
+
+DEF1NAME=$(SHL1TARGET)
+DEF1EXPORTFILE=exports.dxp
+
+.ENDIF
+
+.ENDIF
+
+.INCLUDE : target.mk
Index: com/sun/star/wizards/letter/LocaleCodes.java
===================================================================
RCS file: /cvs/installation/wizards/com/sun/star/wizards/letter/LocaleCodes.java,v
retrieving revision 1.5
diff -u -r1.5 LocaleCodes.java
--- wizards.orig/com/sun/star/wizards/letter/LocaleCodes.java 23 Nov 2007 16:52:56 -0000 1.5
+++ wizards/com/sun/star/wizards/letter/LocaleCodes.java 5 Feb 2008 08:57:11 -0000
@@ -45,7 +45,7 @@
public LocaleCodes(XMultiServiceFactory xmsf)
{
super(xmsf, UNIT_NAME, MODULE_NAME);
- allLanguageStrings = getStringList(16300); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
+ allLanguageStrings = getStringList(16302); // STR_ARR_SVT_LANGUAGE_TABLE from svtools/source/misc/langtab.src
}
public String getLanguageString(String MSID)
diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.cxx source/gstreamer/gstplayer.cxx
--- avmedia.orig/source/gstreamer/gstplayer.cxx 2007-08-07 19:50:02.000000000 +0100
+++ avmedia/source/gstreamer/gstplayer.cxx 2007-08-07 17:14:52.000000000 +0100
@@ -67,6 +67,7 @@
mpPlaybin( NULL ),
mbFakeVideo (sal_False ),
mnUnmutedVolume( 0 ),
+ mbPlayPending ( false ),
mbMuted( false ),
mbLooping( false ),
mbInitialized( false ),
@@ -140,6 +141,7 @@
case GST_MESSAGE_EOS:
//DBG( "EOS, reset state to NULL" );
gst_element_set_state( mpPlaybin, GST_STATE_READY );
+ mbPlayPending = false;
break;
case GST_MESSAGE_STATE_CHANGED:
if( message->src == GST_OBJECT( mpPlaybin ) ) {
@@ -151,6 +153,9 @@
pendingstate == GST_STATE_VOID_PENDING &&
mpXOverlay )
gst_x_overlay_expose( mpXOverlay );
+
+ if (mbPlayPending)
+ mbPlayPending = ((newstate == GST_STATE_READY) || (newstate == GST_STATE_PAUSED));
}
default:
break;
@@ -250,6 +255,7 @@
if( mpPlaybin != NULL ) {
gst_element_set_state( mpPlaybin, GST_STATE_NULL );
+ mbPlayPending = false;
g_object_unref( mpPlaybin );
}
@@ -281,6 +287,7 @@
preparePlaybin( rURL, true );
gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+ mbPlayPending = false;
bRet = true;
}
@@ -305,6 +312,7 @@
if( mbInitialized && NULL != mpPlaybin )
{
gst_element_set_state( mpPlaybin, GST_STATE_PLAYING );
+ mbPlayPending = true;
}
}
@@ -317,6 +325,7 @@
if( mpPlaybin )
gst_element_set_state( mpPlaybin, GST_STATE_PAUSED );
+ mbPlayPending = false;
DBG( "stop %p", mpPlaybin );
}
@@ -325,10 +334,10 @@
sal_Bool SAL_CALL Player::isPlaying()
throw (uno::RuntimeException)
{
- bool bRet = false;
+ bool bRet = mbPlayPending;
// return whether the pipeline is in PLAYING STATE or not
- if( mbInitialized && mpPlaybin )
+ if( !mbPlayPending && mbInitialized && mpPlaybin )
{
bRet = GST_STATE_PLAYING == GST_STATE( mpPlaybin );
}
diff -ru /usr/src/redhat/BUILD/OOF680_m18/avmedia/source/gstreamer/gstplayer.hxx source/gstreamer/gstplayer.hxx
--- avmedia.orig/source/gstreamer/gstplayer.hxx 2007-08-07 19:50:02.000000000 +0100
+++ avmedia/source/gstreamer/gstplayer.hxx 2007-08-07 10:30:45.000000000 +0100
@@ -101,6 +101,7 @@
sal_Bool mbFakeVideo;
gdouble mnUnmutedVolume;
+ sal_Bool mbPlayPending;
sal_Bool mbMuted;
sal_Bool mbLooping;
sal_Bool mbInitialized;
Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1862
retrieving revision 1.1863
diff -u -r1.1862 -r1.1863
--- openoffice.org.spec 17 Mar 2009 14:27:08 -0000 1.1862
+++ openoffice.org.spec 18 Mar 2009 12:36:27 -0000 1.1863
@@ -86,7 +86,7 @@
Patch12: openoffice.org-2.0.3.rh127576.gtkunixprintdialog.localize
%endif
Patch13: openoffice.org-2.2.0.ooo74188.sw.cursorinsideglyph.patch
-Patch14: openoffice.org-2.2.0.ooo68717.gstreamer.video.patch
+Patch14: ooo-build.ooo68717.gstreamer.video.patch
Patch15: openoffice.org-2.2.0.ooo63159.sal.dtype.patch
Patch16: openoffice.org-2.2.0.ooo76393.sal.dynamicsection.patch
Patch17: openoffice.org-2.2.1.ooo7065.sw.titlepagedialog.patch
@@ -130,6 +130,7 @@
Patch55: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
Patch56: workspace.rptfix06.patch
Patch57: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
+Patch58: ooo-build.ooo2497.filter.svg.patch
%define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
%define instdir %{_libdir}
@@ -1618,6 +1619,7 @@
%patch55 -p1 -b .gccXXXXX.sw.typeillness.patch
%patch56 -p0 -b .workspace.rptfix06.patch
%patch57 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
+%patch58 -p1 -b .ooo2497.filter.svg.patch
%build
echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4108,6 +4110,7 @@
* Tue Mar 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-6.2
- Resolves: ooo#100273 fix utf-8 hyphenation for potential Indic
hyphenation patterns
+- add thb's svg importer
* Tue Mar 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-6.1
- drop integrated workspace.cl12.patch
--- openoffice.org-2.2.0.ooo68717.gstreamer.video.patch DELETED ---
- Previous message (by thread): comps comps-f10.xml.in,1.226,1.227 comps-f11.xml.in,1.163,1.164
- Next message (by thread): rpms/kernel/devel kernel.spec, 1.1441, 1.1442 linux-2.6-hdpvr.patch, 1.5, 1.6 linux-2.6-v4l-dvb-experimental.patch, 1.2, 1.3 linux-2.6-v4l-dvb-update.patch, 1.8, 1.9
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list