summaryrefslogtreecommitdiff
path: root/sdext/source/presenter/PresenterViewFactory.cxx
diff options
context:
space:
mode:
authorBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:07:20 +0200
committerBjoern Michaelsen <bjoern.michaelsen@canonical.com>2011-08-23 15:07:20 +0200
commit18b27513f13bda279f2fe4cb93f0df56b1928864 (patch)
tree1b8597320c9b2e8389cce9016e45631a23d648c8 /sdext/source/presenter/PresenterViewFactory.cxx
parentc8e1c7822ef95330737b5f820b66e20e1d5dc23c (diff)
recreated tag OOO_BUILD_3_2_98_1 which had these commits:
commit 14dabe1c7117cf14295b3435228b6f24f0143f0d (tag: refs/tags/OOO_BUILD_3_2_98_1) Author: Petr Mladek <pmladek@walk.suse.cz> Date: Wed Sep 15 19:03:25 2010 +0200 Release ooo-build-3.2.98.1, tag OOO_BUILD_3_2_98_1 (3.3-alpha1) commit f0ba077fb96691d302489a28c1cb67c9bf150f39 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 17:27:42 2010 +0200 moving languagetool to the right repository .../languagetool/JLanguageTool-1.0.0.patch | 137 ++++++++++++++++++++ languagetool/languagetool/makefile.mk | 67 ++++++++++ languagetool/languagetool/prj/build.lst | 3 + languagetool/languagetool/prj/d.lst | 1 + 4 files changed, 208 insertions(+), 0 deletions(-) commit f62b698d7387ddd78bf205bc44af3fb3adbed295 Author: Kalman Szalai - KAMI <kamihir@freemail.hu> Date: Tue Sep 14 16:57:26 2010 +0200 extensions_deliver.diff: Deliver extensions to the solver sdext/prj/d.lst | 3 +++ swext/prj/d.lst | 1 + 2 files changed, 4 insertions(+), 0 deletions(-) commit 7553ed5a48ee9d1eff4dce30509ce0d682687b20 Author: Fridrich Štrba <fridrich.strba@bluewin.ch> Date: Tue Sep 14 10:50:46 2010 +0200 win32-pdfimport-use-temporary-file.diff: avoid locking issues on win32 sdext/source/pdfimport/pdfiadaptor.cxx | 2 +- sdext/source/pdfimport/wrapper/wrapper.cxx | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) commit 8483892bd836c37b4e4a171745e37ceae88d0a16 Merge: 6a13c46 89ba628 Author: Jan Holesovsky <kendy@suse.cz> Date: Tue Sep 7 09:33:01 2010 +0200 Merge commit 'ooo/OOO330_m6' commit 89ba628baeac602f71f4b096e08d50b16c715c47 (tag: refs/tags/ooo/OOO330_m7, tag: refs/tags/ooo/OOO330_m6, tag: refs/tags/ooo/OOO330_m5) Merge: 4571732 ed49424 Author: Kurt Zenker <kz@openoffice.org> Date: Wed Aug 18 16:59:10 2010 +0200 CWS-TOOLING: integrate CWS txtl10n commit ed494241621de2f1c37b632d2d970f259df8deef Merge: f1aba18 4571732 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Tue Jul 27 16:50:00 2010 +0200 merged OOO330 m2 commit f1aba18563ab79ae2c3ca594d43130adf70f72c1 Author: Ivo Hinkelmann <ihi@openoffice.org> Date: Fri Jul 23 13:02:53 2010 +0200 txtl10n: removal of verbose switch swext/mediawiki/help/makefile.mk | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Notes
Notes: split repo tag: extensions_OOO_BUILD_3_2_98_1
Diffstat (limited to 'sdext/source/presenter/PresenterViewFactory.cxx')
-rw-r--r--sdext/source/presenter/PresenterViewFactory.cxx30
1 files changed, 15 insertions, 15 deletions
diff --git a/sdext/source/presenter/PresenterViewFactory.cxx b/sdext/source/presenter/PresenterViewFactory.cxx
index 31c9b5453211..900f7ae78ecc 100644
--- a/sdext/source/presenter/PresenterViewFactory.cxx
+++ b/sdext/source/presenter/PresenterViewFactory.cxx
@@ -1,7 +1,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
@@ -92,7 +92,7 @@ public:
virtual Reference<XResourceId> SAL_CALL getResourceId (void) throw (RuntimeException)
{ return mxResourceId; };
-
+
private:
Reference<XResourceId> mxResourceId;
};
@@ -267,7 +267,7 @@ void SAL_CALL PresenterViewFactory::disposing (void)
//----- XViewFactory ----------------------------------------------------------
-
+
Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
const Reference<XResourceId>& rxViewId)
throw (RuntimeException)
@@ -275,7 +275,7 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
ThrowIfDisposed();
Reference<XResource> xView;
-
+
if (rxViewId.is())
{
Reference<XPane> xAnchorPane (
@@ -291,7 +291,7 @@ Reference<XResource> SAL_CALL PresenterViewFactory::createResource (
if (pDescriptor.get() != NULL)
pDescriptor->SetActivationState(true);
}
-
+
return xView;
}
@@ -397,7 +397,7 @@ Reference<XResource> PresenterViewFactory::CreateView(
const Reference<XPane>& rxAnchorPane)
{
Reference<XView> xView;
-
+
try
{
const OUString sResourceURL (rxViewId->getResourceURL());
@@ -426,7 +426,7 @@ Reference<XResource> PresenterViewFactory::CreateView(
{
xView = CreateHelpView(rxViewId);
}
-
+
// Activate it.
CachablePresenterView* pView = dynamic_cast<CachablePresenterView*>(xView.get());
if (pView != NULL)
@@ -447,12 +447,12 @@ Reference<XView> PresenterViewFactory::CreateSlideShowView(
const Reference<XResourceId>& rxViewId) const
{
Reference<XView> xView;
-
+
if ( ! mxConfigurationController.is())
return xView;
if ( ! mxComponentContext.is())
return xView;
-
+
try
{
rtl::Reference<PresenterSlideShowView> pShowView (
@@ -480,12 +480,12 @@ Reference<XView> PresenterViewFactory::CreateSlidePreviewView(
const Reference<XPane>& rxAnchorPane) const
{
Reference<XView> xView;
-
+
if ( ! mxConfigurationController.is())
return xView;
if ( ! mxComponentContext.is())
return xView;
-
+
try
{
xView = Reference<XView>(
@@ -526,12 +526,12 @@ Reference<XView> PresenterViewFactory::CreateNotesView(
{
(void)rxAnchorPane;
Reference<XView> xView;
-
+
if ( ! mxConfigurationController.is())
return xView;
if ( ! mxComponentContext.is())
return xView;
-
+
try
{
xView = Reference<XView>(static_cast<XWeak*>(
@@ -557,12 +557,12 @@ Reference<XView> PresenterViewFactory::CreateSlideSorterView(
const Reference<XResourceId>& rxViewId) const
{
Reference<XView> xView;
-
+
if ( ! mxConfigurationController.is())
return xView;
if ( ! mxComponentContext.is())
return xView;
-
+
try
{
rtl::Reference<PresenterSlideSorter> pView (