INTEGRATION: CWS impress15 (1.23.8); FILE MERGED

2004/10/20 12:06:18 bm 1.23.8.1: #i34536# switch on guides if dragging on ruler is done

1 files changed, 8 insertions, 6 deletions

diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index f0c2726de040..4bd73bbaf047 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: drviews4.cxx,v $
  *
- *  $Revision: 1.23 $
+ *  $Revision: 1.24 $
  *
- *  last change: $Author: kz $ $Date: 2004-10-04 18:43:49 $
+ *  last change: $Author: obo $ $Date: 2004-11-16 16:16:43 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -352,9 +352,6 @@ void DrawViewShell::StartRulerDrag (
     const Ruler& rRuler,
     const MouseEvent& rMEvt)
 {
-    if(!pDrView->IsHlplVisible())
-        return;
-
     GetActiveWindow()->CaptureMouse();
 
     Point aWPos = GetActiveWindow()->PixelToLogic(GetActiveWindow()->GetPointerPosPixel());
@@ -362,9 +359,14 @@ void DrawViewShell::StartRulerDrag (
     if ( rRuler.GetExtraRect().IsInside(rMEvt.GetPosPixel()) )
     {
         pDrView->BegSetPageOrg(aWPos);
+        bIsRulerDrag = TRUE;
     }
     else
     {
+        // #i34536# if no guide-lines are visible yet, that show them
+        if( ! pDrView->IsHlplVisible())
+            pDrView->SetHlplVisible( TRUE );
+
         SdrHelpLineKind eKind;
 
         if ( rMEvt.IsMod1() )
@@ -375,8 +377,8 @@ void DrawViewShell::StartRulerDrag (
             eKind = SDRHELPLINE_VERTICAL;
 
         pDrView->BegDragHelpLine(aWPos, eKind);
+        bIsRulerDrag = TRUE;
     }
-    bIsRulerDrag = TRUE;
 }
 
 /*************************************************************************