diff options
| author | jp <jp@openoffice.org> | 2001-08-20 08:46:38 +0000 |
|---|---|---|
| committer | jp <jp@openoffice.org> | 2001-08-20 08:46:38 +0000 |
| commit | f622fb53b99ab170a5cd3489dd5aa4ef3ee105c7 (patch) | |
| tree | 6bacb38e0df26a5f45c9450146abde99cf87b63d /sw/source/ui/utlui/unotools.cxx | |
| parent | 9537e33da57ba3fe025fc348459af8fc36a1ab84 (diff) | |
Bug #90115#: TimeOutHdl - set onlinelayout after set the zoom
Diffstat (limited to 'sw/source/ui/utlui/unotools.cxx')
| -rw-r--r-- | sw/source/ui/utlui/unotools.cxx | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/sw/source/ui/utlui/unotools.cxx b/sw/source/ui/utlui/unotools.cxx index d294f834af54..8d6b47ddb891 100644 --- a/sw/source/ui/utlui/unotools.cxx +++ b/sw/source/ui/utlui/unotools.cxx @@ -2,9 +2,9 @@ * * $RCSfile: unotools.cxx,v $ * - * $Revision: 1.11 $ + * $Revision: 1.12 $ * - * last change: $Author: os $ $Date: 2001-07-10 07:33:14 $ + * last change: $Author: jp $ $Date: 2001-08-20 09:46:38 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -417,17 +417,11 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_TEXT_BOUNDARIES )), aFalseSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_TEXT_FIELD_BACKGROUND)), aTrueSet); xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_VERT_RULER )), aFalseSet); - xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), - (nStyleFlags&EX_SHOW_ONLINE_LAYOUT) ? aTrueSet : aFalseSet ); if(0 ==(nStyleFlags&EX_SHOW_ONLINE_LAYOUT)) { uno::Any aZoom; -#if SUPD<631 - aZoom <<= (sal_Int16)4; -#else aZoom <<= (sal_Int16)view::DocumentZoomType::PAGE_WIDTH_EXACT; -#endif xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_ZOOM_TYPE)), aZoom); } else @@ -444,6 +438,9 @@ IMPL_LINK( SwOneExampleFrame, TimeoutHdl, Timer*, pTimer ) aZoom <<= nZoomValue; xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_ZOOM_VALUE)), aZoom); } + // set onlinelayout property behind setting the zoom + xViewProps->setPropertyValue(C2U(SW_PROP_NAME_STR(UNO_NAME_SHOW_ONLINE_LAYOUT)), + (nStyleFlags&EX_SHOW_ONLINE_LAYOUT) ? aTrueSet : aFalseSet ); bIsInitialized = sal_True; } |