diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2010-08-03 11:46:23 +0200 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2010-08-03 11:46:23 +0200 |
| commit | 427ee90b689821e68eb19457982fa117cf61d03c (patch) | |
| tree | 2008e79a712d1f5018d6e704b397d8fd3515d3c6 /slideshow/source/engine/shapes/viewmediashape.hxx | |
| parent | e8af7005f7d30c025c546f0da90b260be1cff27b (diff) | |
| parent | f0072466a6c06f6ea0516b021eb53176128b13d3 (diff) | |
merge with DEV300_m86
Diffstat (limited to 'slideshow/source/engine/shapes/viewmediashape.hxx')
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.hxx | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index 5e2568bbd98e..8e024ae75bbe 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -36,7 +36,7 @@ #include "viewlayer.hxx" -class JavaChildWindow; +class SystemChildWindow; namespace com { namespace sun { namespace star { namespace drawing { class XShape; @@ -155,7 +155,7 @@ namespace slideshow const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rDXDeviceParams ); ViewLayerSharedPtr mpViewLayer; - ::std::auto_ptr< JavaChildWindow > mpMediaWindow; + ::std::auto_ptr< SystemChildWindow > mpMediaWindow; mutable ::com::sun::star::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; |