Kaydet (Commit) 0f60ab5e authored tarafından Noel Grandin's avatar Noel Grandin

editeng: sal_Bool->bool

Change-Id: I4fc276e320294d57eb667b6db8e5eff078bc28b3
üst 074a2af8
...@@ -1202,14 +1202,14 @@ Point SvxAccessibleTextEditViewAdapter::PixelToLogic( const Point& rPoint, const ...@@ -1202,14 +1202,14 @@ Point SvxAccessibleTextEditViewAdapter::PixelToLogic( const Point& rPoint, const
return mpViewForwarder->PixelToLogic(rPoint, rMapMode); return mpViewForwarder->PixelToLogic(rPoint, rMapMode);
} }
sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) const bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) const
{ {
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder"); DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
ESelection aSelection; ESelection aSelection;
if( !mpViewForwarder->GetSelection( aSelection ) ) if( !mpViewForwarder->GetSelection( aSelection ) )
return sal_False; return false;
SvxAccessibleTextIndex aStartIndex; SvxAccessibleTextIndex aStartIndex;
SvxAccessibleTextIndex aEndIndex; SvxAccessibleTextIndex aEndIndex;
...@@ -1224,10 +1224,10 @@ sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) cons ...@@ -1224,10 +1224,10 @@ sal_Bool SvxAccessibleTextEditViewAdapter::GetSelection( ESelection& rSel ) cons
rSel = ESelection( aStartIndex.GetParagraph(), aStartIndex.GetIndex(), rSel = ESelection( aStartIndex.GetParagraph(), aStartIndex.GetIndex(),
aEndIndex.GetParagraph(), aEndIndex.GetIndex() ); aEndIndex.GetParagraph(), aEndIndex.GetIndex() );
return sal_True; return true;
} }
sal_Bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel ) bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel )
{ {
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder"); DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
...@@ -1240,21 +1240,21 @@ sal_Bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel ...@@ -1240,21 +1240,21 @@ sal_Bool SvxAccessibleTextEditViewAdapter::SetSelection( const ESelection& rSel
return mpViewForwarder->SetSelection( MakeEESelection(aStartIndex, aEndIndex) ); return mpViewForwarder->SetSelection( MakeEESelection(aStartIndex, aEndIndex) );
} }
sal_Bool SvxAccessibleTextEditViewAdapter::Copy() bool SvxAccessibleTextEditViewAdapter::Copy()
{ {
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder"); DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
return mpViewForwarder->Copy(); return mpViewForwarder->Copy();
} }
sal_Bool SvxAccessibleTextEditViewAdapter::Cut() bool SvxAccessibleTextEditViewAdapter::Cut()
{ {
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder"); DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
return mpViewForwarder->Cut(); return mpViewForwarder->Cut();
} }
sal_Bool SvxAccessibleTextEditViewAdapter::Paste() bool SvxAccessibleTextEditViewAdapter::Paste()
{ {
DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder"); DBG_ASSERT(mpViewForwarder, "SvxAccessibleTextEditViewAdapter: no forwarder");
......
...@@ -124,34 +124,34 @@ Point SvxDrawOutlinerViewForwarder::PixelToLogic( const Point& rPoint, const Map ...@@ -124,34 +124,34 @@ Point SvxDrawOutlinerViewForwarder::PixelToLogic( const Point& rPoint, const Map
return Point(); return Point();
} }
sal_Bool SvxDrawOutlinerViewForwarder::GetSelection( ESelection& rSelection ) const bool SvxDrawOutlinerViewForwarder::GetSelection( ESelection& rSelection ) const
{ {
rSelection = mrOutlinerView.GetSelection(); rSelection = mrOutlinerView.GetSelection();
return sal_True; return true;
} }
sal_Bool SvxDrawOutlinerViewForwarder::SetSelection( const ESelection& rSelection ) bool SvxDrawOutlinerViewForwarder::SetSelection( const ESelection& rSelection )
{ {
mrOutlinerView.SetSelection( rSelection ); mrOutlinerView.SetSelection( rSelection );
return sal_True; return true;
} }
sal_Bool SvxDrawOutlinerViewForwarder::Copy() bool SvxDrawOutlinerViewForwarder::Copy()
{ {
mrOutlinerView.Copy(); mrOutlinerView.Copy();
return sal_True; return true;
} }
sal_Bool SvxDrawOutlinerViewForwarder::Cut() bool SvxDrawOutlinerViewForwarder::Cut()
{ {
mrOutlinerView.Cut(); mrOutlinerView.Cut();
return sal_True; return true;
} }
sal_Bool SvxDrawOutlinerViewForwarder::Paste() bool SvxDrawOutlinerViewForwarder::Paste()
{ {
mrOutlinerView.Paste(); mrOutlinerView.Paste();
return sal_True; return true;
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -123,11 +123,11 @@ public: ...@@ -123,11 +123,11 @@ public:
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
// SvxEditViewForwarder interface // SvxEditViewForwarder interface
virtual sal_Bool GetSelection( ESelection& rSelection ) const; virtual bool GetSelection( ESelection& rSelection ) const;
virtual sal_Bool SetSelection( const ESelection& rSelection ); virtual bool SetSelection( const ESelection& rSelection );
virtual sal_Bool Copy(); virtual bool Copy();
virtual sal_Bool Cut(); virtual bool Cut();
virtual sal_Bool Paste(); virtual bool Paste();
void SetForwarder( SvxEditViewForwarder&, SvxAccessibleTextAdapter& ); void SetForwarder( SvxEditViewForwarder&, SvxAccessibleTextAdapter& );
......
...@@ -503,37 +503,37 @@ public: ...@@ -503,37 +503,37 @@ public:
@param rSelection @param rSelection
Contains the current selection after method call Contains the current selection after method call
@return sal_False, if there is no view or no selection (the empty selection _is_ a selection) @return false, if there is no view or no selection (the empty selection _is_ a selection)
*/ */
virtual sal_Bool GetSelection( ESelection& rSelection ) const = 0; virtual bool GetSelection( ESelection& rSelection ) const = 0;
/** Set selection in view. /** Set selection in view.
@param rSelection @param rSelection
The selection to set The selection to set
@return sal_False, if there is no view or selection is invalid @return false, if there is no view or selection is invalid
*/ */
virtual sal_Bool SetSelection( const ESelection& rSelection ) = 0; virtual bool SetSelection( const ESelection& rSelection ) = 0;
/** Copy current selection to clipboard. /** Copy current selection to clipboard.
@return sal_False if no selection or no view (the empty selection _is_ a selection) @return false if no selection or no view (the empty selection _is_ a selection)
*/ */
virtual sal_Bool Copy() = 0; virtual bool Copy() = 0;
/** Cut current selection to clipboard. /** Cut current selection to clipboard.
@eturn sal_False if no selection or no view (the empty selection _is_ a selection) @eturn balse if no selection or no view (the empty selection _is_ a selection)
*/ */
virtual sal_Bool Cut() = 0; virtual bool Cut() = 0;
/** Paste clipboard into current selection. /** Paste clipboard into current selection.
@return sal_False if no view or no selection (the empty selection _is_ a selection) @return false if no view or no selection (the empty selection _is_ a selection)
*/ */
virtual sal_Bool Paste() = 0; virtual bool Paste() = 0;
virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; }; virtual sal_Bool IsWrongSpelledWordAtPos( sal_Int32, sal_Int32 ) { return sal_False; };
virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; }; virtual sal_Bool IsShapeParaFocusable( ) { return sal_True; };
......
...@@ -45,11 +45,11 @@ public: ...@@ -45,11 +45,11 @@ public:
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
virtual sal_Bool GetSelection( ESelection& rSelection ) const; virtual bool GetSelection( ESelection& rSelection ) const;
virtual sal_Bool SetSelection( const ESelection& rSelection ); virtual bool SetSelection( const ESelection& rSelection );
virtual sal_Bool Copy(); virtual bool Copy();
virtual sal_Bool Cut(); virtual bool Cut();
virtual sal_Bool Paste(); virtual bool Paste();
}; };
#endif #endif
......
...@@ -560,11 +560,11 @@ public: ...@@ -560,11 +560,11 @@ public:
virtual Rectangle GetVisArea() const; virtual Rectangle GetVisArea() const;
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
virtual sal_Bool GetSelection( ESelection& rSelection ) const; virtual bool GetSelection( ESelection& rSelection ) const;
virtual sal_Bool SetSelection( const ESelection& rSelection ); virtual bool SetSelection( const ESelection& rSelection );
virtual sal_Bool Copy(); virtual bool Copy();
virtual sal_Bool Cut(); virtual bool Cut();
virtual sal_Bool Paste(); virtual bool Paste();
void GrabFocus(); void GrabFocus();
...@@ -625,13 +625,13 @@ Point ScEditViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMa ...@@ -625,13 +625,13 @@ Point ScEditViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMa
return Point(); return Point();
} }
sal_Bool ScEditViewForwarder::GetSelection( ESelection& rSelection ) const bool ScEditViewForwarder::GetSelection( ESelection& rSelection ) const
{ {
sal_Bool bResult(false); bool bResult(false);
if (IsValid()) if (IsValid())
{ {
rSelection = mpEditView->GetSelection(); rSelection = mpEditView->GetSelection();
bResult = sal_True; bResult = true;
} }
else else
{ {
...@@ -640,13 +640,13 @@ sal_Bool ScEditViewForwarder::GetSelection( ESelection& rSelection ) const ...@@ -640,13 +640,13 @@ sal_Bool ScEditViewForwarder::GetSelection( ESelection& rSelection ) const
return bResult; return bResult;
} }
sal_Bool ScEditViewForwarder::SetSelection( const ESelection& rSelection ) bool ScEditViewForwarder::SetSelection( const ESelection& rSelection )
{ {
sal_Bool bResult(false); bool bResult(false);
if (IsValid()) if (IsValid())
{ {
mpEditView->SetSelection(rSelection); mpEditView->SetSelection(rSelection);
bResult = sal_True; bResult = true;
} }
else else
{ {
...@@ -655,13 +655,13 @@ sal_Bool ScEditViewForwarder::SetSelection( const ESelection& rSelection ) ...@@ -655,13 +655,13 @@ sal_Bool ScEditViewForwarder::SetSelection( const ESelection& rSelection )
return bResult; return bResult;
} }
sal_Bool ScEditViewForwarder::Copy() bool ScEditViewForwarder::Copy()
{ {
sal_Bool bResult(false); bool bResult(false);
if (IsValid()) if (IsValid())
{ {
mpEditView->Copy(); mpEditView->Copy();
bResult = sal_True; bResult = true;
} }
else else
{ {
...@@ -670,13 +670,13 @@ sal_Bool ScEditViewForwarder::Copy() ...@@ -670,13 +670,13 @@ sal_Bool ScEditViewForwarder::Copy()
return bResult; return bResult;
} }
sal_Bool ScEditViewForwarder::Cut() bool ScEditViewForwarder::Cut()
{ {
sal_Bool bResult(false); bool bResult(false);
if (IsValid()) if (IsValid())
{ {
mpEditView->Cut(); mpEditView->Cut();
bResult = sal_True; bResult = true;
} }
else else
{ {
...@@ -685,13 +685,13 @@ sal_Bool ScEditViewForwarder::Cut() ...@@ -685,13 +685,13 @@ sal_Bool ScEditViewForwarder::Cut()
return bResult; return bResult;
} }
sal_Bool ScEditViewForwarder::Paste() bool ScEditViewForwarder::Paste()
{ {
sal_Bool bResult(false); bool bResult(false);
if (IsValid()) if (IsValid())
{ {
mpEditView->Paste(); mpEditView->Paste();
bResult = sal_True; bResult = true;
} }
else else
{ {
......
...@@ -1561,62 +1561,62 @@ Point SmEditViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMa ...@@ -1561,62 +1561,62 @@ Point SmEditViewForwarder::PixelToLogic( const Point& rPoint, const MapMode& rMa
return Point(); return Point();
} }
sal_Bool SmEditViewForwarder::GetSelection( ESelection& rSelection ) const bool SmEditViewForwarder::GetSelection( ESelection& rSelection ) const
{ {
sal_Bool bRes = sal_False; bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView(); EditView *pEditView = rEditAcc.GetEditView();
if (pEditView) if (pEditView)
{ {
rSelection = pEditView->GetSelection(); rSelection = pEditView->GetSelection();
bRes = sal_True; bRes = true;
} }
return bRes; return bRes;
} }
sal_Bool SmEditViewForwarder::SetSelection( const ESelection& rSelection ) bool SmEditViewForwarder::SetSelection( const ESelection& rSelection )
{ {
sal_Bool bRes = sal_False; bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView(); EditView *pEditView = rEditAcc.GetEditView();
if (pEditView) if (pEditView)
{ {
pEditView->SetSelection( rSelection ); pEditView->SetSelection( rSelection );
bRes = sal_True; bRes = true;
} }
return bRes; return bRes;
} }
sal_Bool SmEditViewForwarder::Copy() bool SmEditViewForwarder::Copy()
{ {
sal_Bool bRes = sal_False; bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView(); EditView *pEditView = rEditAcc.GetEditView();
if (pEditView) if (pEditView)
{ {
pEditView->Copy(); pEditView->Copy();
bRes = sal_True; bRes = true;
} }
return bRes; return bRes;
} }
sal_Bool SmEditViewForwarder::Cut() bool SmEditViewForwarder::Cut()
{ {
sal_Bool bRes = sal_False; bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView(); EditView *pEditView = rEditAcc.GetEditView();
if (pEditView) if (pEditView)
{ {
pEditView->Cut(); pEditView->Cut();
bRes = sal_True; bRes = true;
} }
return bRes; return bRes;
} }
sal_Bool SmEditViewForwarder::Paste() bool SmEditViewForwarder::Paste()
{ {
sal_Bool bRes = sal_False; bool bRes = false;
EditView *pEditView = rEditAcc.GetEditView(); EditView *pEditView = rEditAcc.GetEditView();
if (pEditView) if (pEditView)
{ {
pEditView->Paste(); pEditView->Paste();
bRes = sal_True; bRes = true;
} }
return bRes; return bRes;
} }
......
...@@ -274,11 +274,11 @@ public: ...@@ -274,11 +274,11 @@ public:
virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point LogicToPixel( const Point& rPoint, const MapMode& rMapMode ) const;
virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const; virtual Point PixelToLogic( const Point& rPoint, const MapMode& rMapMode ) const;
virtual sal_Bool GetSelection( ESelection& rSelection ) const; virtual bool GetSelection( ESelection& rSelection ) const;
virtual sal_Bool SetSelection( const ESelection& rSelection ); virtual bool SetSelection( const ESelection& rSelection );
virtual sal_Bool Copy(); virtual bool Copy();
virtual sal_Bool Cut(); virtual bool Cut();
virtual sal_Bool Paste(); virtual bool Paste();
}; };
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment