Ruler::StartDrag return type wants to be bool

Change-Id: Ica4957a5575a6ec5d6ff2b6fddaa3d637426d851

4 files changed, 10 insertions, 10 deletions

diff --git a/include/svtools/ruler.hxx b/include/svtools/ruler.hxx
index 76a7bc57889d..e19b05a72c61 100644
--- a/include/svtools/ruler.hxx
+++ b/include/svtools/ruler.hxx
@@ -717,7 +717,7 @@ public:
     virtual void    StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
-    virtual long    StartDrag();
+    virtual bool    StartDrag();
     virtual void    Drag();
     virtual void    EndDrag();
     virtual void    Click();
diff --git a/include/svx/ruler.hxx b/include/svx/ruler.hxx
index 2cef64f3691d..267758ab5cb2 100644
--- a/include/svx/ruler.hxx
+++ b/include/svx/ruler.hxx
@@ -212,7 +212,7 @@ class SVX_DLLPUBLIC SvxRuler: public Ruler, public SfxListener
 protected:
     virtual void    Command( const CommandEvent& rCEvt ) SAL_OVERRIDE;
     virtual void    Click() SAL_OVERRIDE;
-    virtual long    StartDrag() SAL_OVERRIDE;
+    virtual bool    StartDrag() SAL_OVERRIDE;
     virtual void    Drag() SAL_OVERRIDE;
     virtual void    EndDrag() SAL_OVERRIDE;
     virtual void    ExtraDown() SAL_OVERRIDE;
diff --git a/svtools/source/control/ruler.cxx b/svtools/source/control/ruler.cxx
index d65875ce26f9..1ade3818682d 100644
--- a/svtools/source/control/ruler.cxx
+++ b/svtools/source/control/ruler.cxx
@@ -2287,12 +2287,12 @@ void Ruler::DataChanged( const DataChangedEvent& rDCEvt )
     }
 }
 
-long Ruler::StartDrag()
+bool Ruler::StartDrag()
 {
     if ( maStartDragHdl.IsSet() )
         return maStartDragHdl.Call( this );
     else
-        return sal_False;
+        return false;
 }
 
 void Ruler::Drag()
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 9c8146dd2ba8..20f0b9b53272 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -3174,7 +3174,7 @@ void SvxRuler::CalcMinMax()
     }
 }
 
-long SvxRuler::StartDrag()
+bool SvxRuler::StartDrag()
 {
     /*
        Beginning of a drag operation (SV-handler) evaluates modifier and
@@ -3189,12 +3189,12 @@ long SvxRuler::StartDrag()
     bool bContentProtected = mxRulerImpl->aProtectItem.IsCntntProtected();
 
     if(!bValid)
-        return sal_False;
+        return false;
 
     mxRulerImpl->lLastLMargin = GetMargin1();
     mxRulerImpl->lLastRMargin = GetMargin2();
 
-    long bOk = 1;
+    bool bOk = true;
 
     if(GetStartDragHdl().IsSet())
         bOk = Ruler::StartDrag();
@@ -3215,7 +3215,7 @@ long SvxRuler::StartDrag()
                 }
                 else
                 {
-                    bOk = sal_False;
+                    bOk = false;
                 }
                 break;
             case RULER_TYPE_BORDER: // Table, column (Modifier)
@@ -3232,7 +3232,7 @@ long SvxRuler::StartDrag()
             case RULER_TYPE_INDENT: // Paragraph indents (Modifier)
             {
                 if( bContentProtected )
-                    return sal_False;
+                    return false;
                 sal_uInt16 nIndent = INDENT_LEFT_MARGIN;
                 if((nIndent) == GetDragAryPos() + INDENT_GAP) {  // Left paragraph indent
                     mpIndents[0] = mpIndents[INDENT_FIRST_LINE];
@@ -3249,7 +3249,7 @@ long SvxRuler::StartDrag()
             }
             case RULER_TYPE_TAB: // Tabs (Modifier)
                 if( bContentProtected )
-                    return sal_False;
+                    return false;
                 EvalModifier();
                 mpTabs[0] = mpTabs[GetDragAryPos() + 1];
                 mpTabs[0].nStyle |= RULER_STYLE_DONTKNOW;