diff options
author | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-11-25 16:04:27 +0100 |
---|---|---|
committer | Matthias Huetsch [mhu] <matthias.huetsch@oracle.com> | 2010-11-25 16:04:27 +0100 |
commit | 3dd16dcf3fe9b2da2dbfb49bbfccb95fc8b1a56f (patch) | |
tree | 6485e3bae005bc06b9ec04982b3fbc762cdae7f4 /slideshow | |
parent | b3ae35891f2323835237f04a54bb53d2b30546f0 (diff) | |
parent | 99c174ea869bc4e2b862b394fb3d29ca837da270 (diff) |
Update from sibling repository.
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, |