diff options
| author | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:53:14 +0000 |
|---|---|---|
| committer | Ivo Hinkelmann <ihi@openoffice.org> | 2006-11-14 12:53:14 +0000 |
| commit | d9decec3ecf4044b4160417c87843080e1b3f94b (patch) | |
| tree | 9cb1cb6531139ce7867a5be52a8fa04c632b35ce /svx/source/toolbars | |
| parent | 7da9deb0a3abd9ad8919a8c91849600d024cec54 (diff) | |
INTEGRATION: CWS aw024 (1.11.78); FILE MERGED
2006/09/21 19:39:42 aw 1.11.78.6: RESYNC: (1.15-1.16); FILE MERGED
2006/08/03 15:28:02 aw 1.11.78.5: RESYNC: (1.14-1.15); FILE MERGED
2006/07/04 13:24:19 aw 1.11.78.4: RESYNC: (1.13-1.14); FILE MERGED
2006/01/26 22:13:08 aw 1.11.78.3: RESYNC: (1.12-1.13); FILE MERGED
2005/09/18 05:19:59 aw 1.11.78.2: RESYNC: (1.11-1.12); FILE MERGED
2005/05/19 12:31:46 aw 1.11.78.1: #i39529#
Diffstat (limited to 'svx/source/toolbars')
| -rw-r--r-- | svx/source/toolbars/fontworkbar.cxx | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx index ed387ba591ad..a047f2cf5a76 100644 --- a/svx/source/toolbars/fontworkbar.cxx +++ b/svx/source/toolbars/fontworkbar.cxx @@ -4,9 +4,9 @@ * * $RCSfile: fontworkbar.cxx,v $ * - * $Revision: 1.16 $ + * $Revision: 1.17 $ * - * last change: $Author: obo $ $Date: 2006-09-17 06:08:28 $ + * last change: $Author: ihi $ $Date: 2006-11-14 13:53:14 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -88,6 +88,10 @@ #include <kernitem.hxx> #endif +#ifndef _SDRPAINTWINDOW_HXX +#include <sdrpaintwindow.hxx> +#endif + #include "svxids.hrc" #include "fontworkbar.hxx" #include "fontworkgallery.hxx" @@ -270,14 +274,18 @@ static Window* ImpGetViewWin(SdrView* pView) { if( pView ) { - USHORT nAnz=pView->GetWinCount(); - for (USHORT nNum=0; nNum<nAnz; nNum++) { - OutputDevice* pOut=pView->GetWin(nNum); - if (pOut->GetOutDevType()==OUTDEV_WINDOW) { + const sal_uInt32 nAnz(pView->PaintWindowCount()); + for(sal_uInt32 nNum(0L); nNum < nAnz; nNum++) + { + OutputDevice* pOut = &(pView->GetPaintWindow(nNum)->GetOutputDevice()); + + if(OUTDEV_WINDOW == pOut->GetOutDevType()) + { return (Window*)pOut; } } } + return 0L; } |