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

INTEGRATION: CWS components1 (1.34.36); FILE MERGED

Browse source 
2007/02/16 15:14:11 af 1.34.36.6: RESYNC: (1.38-1.39); FILE MERGED
2007/01/25 15:18:11 af 1.34.36.5: RESYNC: (1.36-1.38); FILE MERGED
2007/01/22 16:19:48 af 1.34.36.4: #i68075 Introduction of XResourceId interface.
2006/11/21 16:22:39 af 1.34.36.3: RESYNC: (1.35-1.36); FILE MERGED
2006/09/25 17:22:55 af 1.34.36.2: RESYNC: (1.34-1.35); FILE MERGED
2006/08/22 11:38:28 af 1.34.36.1: #i68075# Adaption to change of signature of ViewShellBase::Get(Main)ViewShell().
This commit is contained in:
Rüdiger Timm 2007-04-03 15:16:37 +00:00
parent e106150824
commit 079cc8a6d0
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
sd/source/ui/slidesorter/controller/SlideSorterController.cxx
View file

@ -4,9 +4,9 @@
*
* $RCSfile: SlideSorterController.cxx,v $
*
* $Revision: 1.39 $
* $Revision: 1.40 $
*
* last change: $Author: rt $ $Date: 2007-01-29 14:51:59 $
* last change: $Author: rt $ $Date: 2007-04-03 16:16:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@ -349,7 +349,7 @@ SdPage* SlideSorterController::GetActualPage (void)
// (if we are that not ourself).
if ( ! GetViewShell().IsMainViewShell())
{
ViewShell* pMainViewShell = GetViewShell().GetViewShellBase().GetMainViewShell();
ViewShell* pMainViewShell = GetViewShell().GetViewShellBase().GetMainViewShell().get();
if (pMainViewShell != NULL)
pCurrentPage = pMainViewShell->GetActualPage();
}
@ -424,7 +424,11 @@ bool SlideSorterController::Command (
// Choose the popup menu depending on a) the type of the main
// view shell, b) the edit mode, and c) on whether the selection
// is empty or not.
switch (GetViewShell().GetViewShellBase().GetMainViewShell()->GetShellType())
::boost::shared_ptr<ViewShell> pMainViewShell;
ViewShell::ShellType eMainViewShellType (ViewShell::ST_NONE);
if (pMainViewShell.get() != NULL)
eMainViewShellType = pMainViewShell->GetShellType();
switch (eMainViewShellType)
{
case ViewShell::ST_DRAW:
if (pPage != NULL)