diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:11:31 +0200 |
| commit | 4f30c816fa0fb66e650d4e85304292b5ec72b22d (patch) | |
| tree | 2c6ae8d7c2f6eb55686bb306afe1b1fce5172be8 /sd/source/ui/presenter/PresenterHelper.hxx | |
| parent | 2ebf6456709b2345fcd340137b10ff7bb47a3263 (diff) | |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 40849a63d4ca6da479ef28e129b15109a42e8617 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:18 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 2764d5adfcd646794593cda200fca9d4988d0d06
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:37 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: impress_libreoffice-3.3.0.4
Diffstat (limited to 'sd/source/ui/presenter/PresenterHelper.hxx')
| -rw-r--r-- | sd/source/ui/presenter/PresenterHelper.hxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sd/source/ui/presenter/PresenterHelper.hxx b/sd/source/ui/presenter/PresenterHelper.hxx index b3c7a336824a..f9d814c0c858 100644 --- a/sd/source/ui/presenter/PresenterHelper.hxx +++ b/sd/source/ui/presenter/PresenterHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -65,7 +65,7 @@ public: virtual void SAL_CALL initialize (const css::uno::Sequence<css::uno::Any>& rArguments) throw(css::uno::Exception,css::uno::RuntimeException); - + // XPresenterHelper @@ -76,7 +76,7 @@ public: sal_Bool bEnableChildTransparentMode, sal_Bool bEnableParentClip) throw (css::uno::RuntimeException); - + virtual css::uno::Reference<css::rendering::XCanvas> SAL_CALL createSharedCanvas ( const css::uno::Reference<css::rendering::XSpriteCanvas>& rxUpdateCanvas, const css::uno::Reference<css::awt::XWindow>& rxUpdateWindow, @@ -110,7 +110,7 @@ public: const css::uno::Reference<css::awt::XWindow>& rxChildWindow, const css::uno::Reference<css::awt::XWindow>& rxParentWindow) throw (css::uno::RuntimeException); - + private: css::uno::Reference<css::uno::XComponentContext> mxComponentContext; ::boost::scoped_ptr<GraphicFilter> mpGraphicFilter; |