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

INTEGRATION: CWS impressodf12 (1.21.6); FILE MERGED

Browse source 
2008/05/29 12:30:16 cl 1.21.6.3: #i75927# bullet rework
2008/04/25 08:49:07 cl 1.21.6.2: RESYNC: (1.21-1.23); FILE MERGED
2008/04/24 15:31:08 cl 1.21.6.1: #i87588# fixed empty api name problem and set parent problem
This commit is contained in:
Rüdiger Timm 2008-06-06 10:58:23 +00:00
parent 0d1dfb4e3c
commit 6842538b16
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sd/source/core/stlsheet.cxx
View file

@ -7,7 +7,7 @@
* OpenOffice.org - a multi-platform office productivity suite
*
* $RCSfile: stlsheet.cxx,v $
* $Revision: 1.23 $
* $Revision: 1.24 $
*
* This file is part of OpenOffice.org.
*
@ -66,6 +66,7 @@
#include "glob.hxx"
#include "helpids.h"
#include "../ui/inc/DrawViewShell.hxx"
#include "../ui/inc/ViewShellBase.hxx"
using ::rtl::OUString;
using ::osl::MutexGuard;
@ -409,7 +410,12 @@ SdStyleSheet* SdStyleSheet::GetRealStyleSheet() const
SdStyleSheet* pRealStyle = NULL;
SdDrawDocument* pDoc = ((SdStyleSheetPool&) rPool).GetDoc();
::sd::DrawViewShell* pDrawViewShell = dynamic_cast< ::sd::DrawViewShell* >( SfxViewShell::Current() );
::sd::DrawViewShell* pDrawViewShell = 0;
::sd::ViewShellBase* pBase = dynamic_cast< ::sd::ViewShellBase* >( SfxViewShell::Current() );
if( pBase )
pDrawViewShell = dynamic_cast< ::sd::DrawViewShell* >( pBase->GetMainViewShell().get() );
if (pDrawViewShell && pDrawViewShell->GetDoc() == pDoc)
{
SdPage* pPage = pDrawViewShell->getCurrentPage();