diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:32 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:07:32 +0200 |
| commit | 99effbc418feee675b6fd54a07c2f68d927de469 (patch) | |
| tree | b9a415494780c6cb86d0dfcf2d69a9da9cc436bd /sdext/source/presenter/PresenterPaneFactory.cxx | |
| parent | f76f752dc908cfbab1cade605fe4f742233dfa6d (diff) | |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit 01c917c0bdbb833cda4a0a77bc10264c4d40fcd5 (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:16 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit 983cd7d8b4d9c87f872472343f8399cb640cfb9a
Author: Rene Engelhard <rene@debian.org>
Date: Wed Jan 12 10:03:30 2011 +0100
fix presenter screens description.xml build
sdext/source/presenter/makefile.mk | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
commit cb68579984b772fcbccd673f9cf930b4828d6fde
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:36 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: extensions_libreoffice-3.3.0.4
Diffstat (limited to 'sdext/source/presenter/PresenterPaneFactory.cxx')
| -rw-r--r-- | sdext/source/presenter/PresenterPaneFactory.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sdext/source/presenter/PresenterPaneFactory.cxx b/sdext/source/presenter/PresenterPaneFactory.cxx index 4763893698df..bd6c7c4e0894 100644 --- a/sdext/source/presenter/PresenterPaneFactory.cxx +++ b/sdext/source/presenter/PresenterPaneFactory.cxx @@ -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 @@ -149,7 +149,7 @@ void SAL_CALL PresenterPaneFactory::disposing (void) if (xCC.is()) xCC->removeResourceFactoryForReference(this); mxConfigurationControllerWeak = WeakReference<XConfigurationController>(); - + // Dispose the panes in the cache. if (mpResourceCache.get() != NULL) { @@ -169,7 +169,7 @@ void SAL_CALL PresenterPaneFactory::disposing (void) //----- XPaneFactory ---------------------------------------------------------- - + Reference<XResource> SAL_CALL PresenterPaneFactory::createResource ( const Reference<XResourceId>& rxPaneId) throw (RuntimeException, IllegalArgumentException, WrappedTargetException) @@ -260,11 +260,11 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( { if ( ! rxPaneId.is()) return NULL; - + Reference<XConfigurationController> xCC (mxConfigurationControllerWeak); if ( ! xCC.is()) return NULL; - + Reference<XComponentContext> xContext (mxComponentContextWeak); if ( ! xContext.is()) return NULL; @@ -329,7 +329,7 @@ Reference<XResource> PresenterPaneFactory::CreatePane ( UNO_QUERY); aArguments[5] <<= bIsSpritePane ? false : true; xPane->initialize(aArguments); - + // Store pane and canvases and windows in container. ::rtl::Reference<PresenterPaneContainer> pContainer ( mpPresenterController->GetPaneContainer()); |