mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

INTEGRATION: CWS viewswitch (1.68.46); FILE MERGED

Browse Source 
2006/01/19 17:11:35 af 1.68.46.2: RESYNC: (1.68-1.70); FILE MERGED
2005/11/29 10:52:36 af 1.68.46.1: #i57552# Using sub controller to notify page change.
This commit is contained in:
Oliver Bolte
2006-03-21 16:14:37 +00:00
parent 5a3f367304
commit cc8c330b8f
1 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
sd/source/ui/docshell/docshel4.cxx
View File

@@ -4,9 +4,9 @@
*
* $RCSfile: docshel4.cxx,v $
*
* $Revision: 1.71 $
* $Revision: 1.72 $
*
* last change: $Author: rt $ $Date: 2006-03-10 16:18:21 $
* last change: $Author: obo $ $Date: 2006-03-21 17:14:37 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -107,12 +107,12 @@
#ifndef INCLUDED_SVTOOLS_SAVEOPT_HXX
#include <svtools/saveopt.hxx>
#endif
#ifndef _SD_UNODRAWVIEW_HXX
#include "SdUnoDrawView.hxx"
#endif
#ifndef _COM_SUN_STAR_DRAWING_XDRAWPAGE_HPP_
#include <com/sun/star/drawing/XDrawPage.hpp>
#endif
#ifndef _COM_SUN_STAR_DRAWING_XDRAWVIEW_HPP_
#include <com/sun/star/drawing/XDrawView.hpp>
#endif
#pragma hdrstop
@@ -891,19 +891,19 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark)
// things to be done. Especially writing the view data to the
// frame view (see bug #107803#).
USHORT nSdPgNum = (nPgNum - 1) / 2;
SdUnoDrawView* pUnoDrawView = static_cast<SdUnoDrawView*>(
pDrViewSh->GetController());
if (pUnoDrawView != NULL)
uno::Reference<drawing::XDrawView> xController (
pDrViewSh->GetViewShellBase().GetController(), uno::UNO_QUERY);
if (xController.is())
{
::com::sun::star::uno::Reference<
::com::sun::star::drawing::XDrawPage> xDrawPage (
pPage->getUnoPage(), ::com::sun::star::uno::UNO_QUERY);
pUnoDrawView->setCurrentPage (xDrawPage);
xController->setCurrentPage (xDrawPage);
}
else
{
// As a fall back switch to the page via the core.
DBG_ASSERT (pUnoDrawView!=NULL,
DBG_ASSERT (xController.is(),
"DrawDocShell::GotoBookmark: can't switch page via API");
pDrViewSh->SwitchPage(nSdPgNum);
}