strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS components1 (1.12.96); FILE MERGED

Browse source 
2007/01/25 15:18:59 af 1.12.96.3: RESYNC: (1.13-1.15); FILE MERGED
2006/09/25 17:23:28 af 1.12.96.2: RESYNC: (1.12-1.13); FILE MERGED
2006/08/22 11:39:32 af 1.12.96.1: #i68075# Adaption to change of signature of ViewShellBase::Get(Main)ViewShell().
This commit is contained in:
Rüdiger Timm 2007-04-03 15:17:22 +00:00
parent 8796dfd542
commit 6bd28ed72b
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sd/source/ui/slidesorter/controller/SlsListener.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: SlsListener.cxx,v $ * $RCSfile: SlsListener.cxx,v $
* *
* $Revision: 1.15 $ * $Revision: 1.16 $
* *
* last change: $Author: vg $ $Date: 2007-01-09 11:29:40 $ * last change: $Author: rt $ $Date: 2007-04-03 16:17:22 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -129,7 +129,7 @@ Listener::Listener (SlideSorterController& rController)
// Listen for hints of the MainViewShell as well. If that is not yet // Listen for hints of the MainViewShell as well. If that is not yet
// present then the EventMultiplexer will tell us when it is available. // present then the EventMultiplexer will tell us when it is available.
ViewShell* pMainViewShell = rBase.GetMainViewShell(); ViewShell* pMainViewShell = rBase.GetMainViewShell().get();
if (pMainViewShell != NULL if (pMainViewShell != NULL
&& pMainViewShell!=static_cast<ViewShell*>(&mrController.GetViewShell())) && pMainViewShell!=static_cast<ViewShell*>(&mrController.GetViewShell()))
{ {
@ -357,7 +357,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent
case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED: case tools::EventMultiplexerEvent::EID_MAIN_VIEW_REMOVED:
{ {
ViewShell* pMainViewShell ViewShell* pMainViewShell
= mrController.GetViewShell().GetViewShellBase().GetMainViewShell(); = mrController.GetViewShell().GetViewShellBase().GetMainViewShell().get();
if (pMainViewShell != NULL) if (pMainViewShell != NULL)
EndListening(*pMainViewShell); EndListening(*pMainViewShell);
} }
@ -367,7 +367,7 @@ IMPL_LINK(Listener, EventMultiplexerCallback, ::sd::tools::EventMultiplexerEvent
case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED: case tools::EventMultiplexerEvent::EID_MAIN_VIEW_ADDED:
{ {
ViewShell* pMainViewShell ViewShell* pMainViewShell
= mrController.GetViewShell().GetViewShellBase().GetMainViewShell(); = mrController.GetViewShell().GetViewShellBase().GetMainViewShell().get();
if (pMainViewShell != NULL if (pMainViewShell != NULL
&& pMainViewShell!=static_cast<ViewShell*>(&mrController.GetViewShell())) && pMainViewShell!=static_cast<ViewShell*>(&mrController.GetViewShell()))
{ {