diff options
| author | Matthias Huetsch [mhu] <matthias.huetsch@sun.com> | 2010-06-18 19:00:23 +0200 |
|---|---|---|
| committer | Matthias Huetsch [mhu] <matthias.huetsch@sun.com> | 2010-06-18 19:00:23 +0200 |
| commit | 5232da202ed61f4583a45b8c068043718d34800e (patch) | |
| tree | da71b177164b9587681ef83f3e6b29287081e89c /slideshow | |
| parent | f3b2db1efb379596f0269e439a35b5575b616b2c (diff) | |
Update from master repository (DEV300_m82).
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/animationnodes/basenode.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/drawshape.hxx | 2 | ||||
| -rw-r--r-- | slideshow/source/engine/slide/slideimpl.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index 2bbd9d9b51e8..0ca893b5287a 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -89,7 +89,7 @@ class BaseContainerNode; file-private accessor methods. */ class BaseNode : public AnimationNode, - protected ::osl::DebugBase<BaseNode>, + public ::osl::DebugBase<BaseNode>, private ::boost::noncopyable { public: diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index b3c985d3fddc..db9a052d8d6a 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -65,7 +65,7 @@ namespace slideshow class DrawShape : public AttributableShape, public DocTreeNodeSupplier, public HyperlinkArea, - protected ::osl::DebugBase<DrawShape> + public ::osl::DebugBase<DrawShape> { public: /** Create a shape for the given XShape diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 55831ba1609f..6e71d6ca4c42 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -94,7 +94,7 @@ namespace class SlideImpl : public Slide, public CursorManager, public ViewEventHandler, - protected ::osl::DebugBase<SlideImpl> + public ::osl::DebugBase<SlideImpl> { public: SlideImpl( const uno::Reference<drawing::XDrawPage>& xDrawPage, |