summaryrefslogtreecommitdiff
path: root/sdext/source/presenter/PresenterScreen.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:07:48 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:07:48 +0200
commit0650647ed5196ab6f65875eacc99be87e6994d6f (patch)
tree0053ac989727ef4a17ddcaa86e72f4406ef5a7f4 /sdext/source/presenter/PresenterScreen.cxx
parentf76f752dc908cfbab1cade605fe4f742233dfa6d (diff)
recreated tag libreoffice-3.3.1.1 which had these commits:
commit a9475f3ee585c2d8667a8823f46cb04a96da84b5 (tag: refs/tags/libreoffice-3.3.1.1) Author: Petr Mladek <pmladek@suse.cz> Date: Tue Feb 8 18:07:42 2011 +0100 Version 3.3.1.1, tag libreoffice-3.3.1.1 (3.3.1-rc1) commit 215bfd8724f8ebc7bdcd7c589dcd3ee2fc3cdef2 Author: Andras Timar <timar@fsf.hu> Date: Mon Feb 7 23:18:59 2011 +0100 Added/modified NLPsolver translations from Pootle nlpsolver/locale/NLPSolverCommon_de.properties | 2 +- nlpsolver/locale/NLPSolverCommon_fa.properties | 14 +++--- nlpsolver/locale/NLPSolverCommon_fr.properties | 4 +- nlpsolver/locale/NLPSolverCommon_nl.properties | 2 +- nlpsolver/locale/NLPSolverCommon_ru.properties | 21 +++++++++ nlpsolver/locale/NLPSolverCommon_zh_TW.properties | 2 +- .../locale/NLPSolverStatusDialog_ast.properties | 4 +- .../locale/NLPSolverStatusDialog_de.properties | 12 +++--- .../locale/NLPSolverStatusDialog_en_GB.properties | 2 +- .../locale/NLPSolverStatusDialog_fa.properties | 46 ++++++++++---------- .../locale/NLPSolverStatusDialog_is.properties | 27 +++++++++++ .../locale/NLPSolverStatusDialog_ru.properties | 27 +++++++++++ 12 files changed, 119 insertions(+), 44 deletions(-) commit 740c46dbb713dcc3b4a07d69ccf7ff7a634cce24 Author: Jan Holesovsky <kendy@suse.cz> Date: Mon Feb 7 21:23:23 2011 +0100 Branch libreoffice-3-3-1 This is 'libreoffice-3-3-1' - the stable branch for the 3.3.1 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. commit 6e673b3b275a5008c654c4bbfb41709d30cd62af 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 c6d30578f94bebfe154237496eceedd338d5982b Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 23:05:56 2011 +0100 Please, ignore the previous message; it was for the libreoffice-3-3-0 branch This is 'libreoffice-3-3' - the stable branch for the 3.3.x releases. Only safe changes, reviewed by anoter person are allowed. If you want to build something cool, unstable, and risky, use master. commit d36f5922c12c793b156396d68daffb55feb3b182 Author: Petr Mladek <pmladek@suse.cz> Date: Tue Jan 11 22:39:06 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
Notes: split repo tag: extensions_libreoffice-3.3.1.1
Diffstat (limited to 'sdext/source/presenter/PresenterScreen.cxx')
-rw-r--r--sdext/source/presenter/PresenterScreen.cxx32
1 files changed, 16 insertions, 16 deletions
diff --git a/sdext/source/presenter/PresenterScreen.cxx b/sdext/source/presenter/PresenterScreen.cxx
index 951c4610b8be..89f8fd3a3da6 100644
--- a/sdext/source/presenter/PresenterScreen.cxx
+++ b/sdext/source/presenter/PresenterScreen.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
@@ -88,11 +88,11 @@ namespace {
virtual void SAL_CALL disposing (void);
// document::XEventListener
-
+
virtual void SAL_CALL notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException);
// XEventListener
-
+
virtual void SAL_CALL disposing ( const css::lang::EventObject& rEvent) throw (css::uno::RuntimeException);
private:
@@ -251,7 +251,7 @@ void SAL_CALL PresenterScreenListener::disposing (void)
xDocBroadcaster->removeEventListener(
Reference<document::XEventListener>(
static_cast<document::XEventListener*>(this), UNO_QUERY));
-
+
if (mpPresenterScreen.is())
{
mpPresenterScreen->RequestShutdownPresenterScreen();
@@ -263,7 +263,7 @@ void SAL_CALL PresenterScreenListener::disposing (void)
// document::XEventListener
-
+
void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventObject& Event ) throw (css::uno::RuntimeException)
{
ThrowIfDisposed();
@@ -287,12 +287,12 @@ void SAL_CALL PresenterScreenListener::notifyEvent( const css::document::EventOb
// XEventListener
-
+
void SAL_CALL PresenterScreenListener::disposing (const css::lang::EventObject& rEvent)
throw (css::uno::RuntimeException)
{
(void)rEvent;
-
+
if (mpPresenterScreen.is())
{
mpPresenterScreen->RequestShutdownPresenterScreen();
@@ -510,7 +510,7 @@ sal_Int32 PresenterScreen::GetScreenNumber (
UNO_QUERY);
if ( ! xDisplayProperties.is())
return -1;
-
+
if (nDisplayNumber > 0)
{
nScreenNumber = nDisplayNumber - 1;
@@ -523,7 +523,7 @@ sal_Int32 PresenterScreen::GetScreenNumber (
if (nDisplayNumber <= 0 && xDisplayProperties.is())
xDisplayProperties->getPropertyValue(A2S("DefaultDisplay")) >>= nScreenNumber;
}
-
+
// We still have to determine the number of screens to decide
// whether the presenter screen may be shown at all.
Reference<container::XIndexAccess> xIndexAccess (xDisplayProperties, UNO_QUERY);
@@ -572,7 +572,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
const sal_Int32 nScreenNumber(GetScreenNumber(rxPresentation));
if (nScreenNumber < 0)
return NULL;
-
+
// Setup the resource id of the full screen background pane so that
// it is displayed on another screen than the presentation.
sal_Int32 nPresenterScreenNumber (1);
@@ -585,7 +585,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
case 1:
nPresenterScreenNumber = 0;
break;
-
+
default:
// When the full screen presentation is displayed on a screen
// other than 0 or 1 then place the presenter on the first
@@ -593,7 +593,7 @@ Reference<drawing::framework::XResourceId> PresenterScreen::GetMainPaneId (
nPresenterScreenNumber = 0;
break;
}
-
+
return ResourceId::create(
Reference<XComponentContext>(mxContextWeak),
PresenterHelper::msFullScreenPaneURL
@@ -639,7 +639,7 @@ void PresenterScreen::ShutdownPresenterScreen (void)
if (xViewFactoryComponent.is())
xViewFactoryComponent->dispose();
mxViewFactory = NULL;
-
+
Reference<lang::XComponent> xPaneFactoryComponent (mxPaneFactory, UNO_QUERY);
if (xPaneFactoryComponent.is())
xPaneFactoryComponent->dispose();
@@ -713,7 +713,7 @@ void PresenterScreen::SetupConfiguration (
}
catch (RuntimeException&)
{
- }
+ }
}
@@ -770,7 +770,7 @@ void PresenterScreen::ProcessLayout (
}
catch (RuntimeException&)
{
- }
+ }
}
@@ -799,7 +799,7 @@ void PresenterScreen::ProcessViewDescriptions (
catch (RuntimeException&)
{
OSL_ASSERT(false);
- }
+ }
}