diff options
| author | Michael Stahl <mstahl@redhat.com> | 2011-11-02 21:58:35 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2011-11-02 21:58:35 +0100 |
| commit | 543c57eb87cf3f37c36c0f3d8cf669d9acbb9286 (patch) | |
| tree | 5a86aaf9e42c8765aa3b61e9a22ce1791d66468a /sc/source/ui/view/gridwin2.cxx | |
| parent | 75fe0e01d9ea7f6c832c75e3d074bea3f17a36ae (diff) | |
| parent | 75f77e63189607142d0a90047ac04cd415072174 (diff) | |
Merge branch 'master' of git://anongit.freedesktop.org/libreoffice/core
Diffstat (limited to 'sc/source/ui/view/gridwin2.cxx')
| -rw-r--r-- | sc/source/ui/view/gridwin2.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sc/source/ui/view/gridwin2.cxx b/sc/source/ui/view/gridwin2.cxx index bf983922ce45..8377fdf68c26 100644 --- a/sc/source/ui/view/gridwin2.cxx +++ b/sc/source/ui/view/gridwin2.cxx @@ -118,12 +118,12 @@ DataPilotFieldOrientation ScGridWindow::GetDPFieldOrientation( SCCOL nCol, SCROW } // private method for mouse button handling -sal_Bool ScGridWindow::DoPageFieldSelection( SCCOL nCol, SCROW nRow ) +bool ScGridWindow::DoPageFieldSelection( SCCOL nCol, SCROW nRow ) { if (GetDPFieldOrientation( nCol, nRow ) == sheet::DataPilotFieldOrientation_PAGE) { LaunchPageFieldMenu( nCol, nRow ); - return sal_True; + return true; } return false; } @@ -186,7 +186,7 @@ void ScGridWindow::DoPushButton( SCCOL nCol, SCROW nRow, const MouseEvent& rMEvt long nField = pDPObj->GetHeaderDim( aPos, nOrient ); if ( nField >= 0 ) { - bDPMouse = sal_True; + bDPMouse = true; nDPField = nField; pDragDPObj = pDPObj; @@ -547,7 +547,7 @@ void ScGridWindow::UpdateDPFromFieldPopupMenu() typedef boost::unordered_map<OUString, OUString, OUStringHash> MemNameMapType; typedef boost::unordered_map<OUString, bool, OUStringHash> MemVisibilityType; - if (!mpDPFieldPopup.get()) + if (!mpDPFieldPopup) return; DPFieldPopupData* pDPData = static_cast<DPFieldPopupData*>(mpDPFieldPopup->getExtendedData()); @@ -627,7 +627,7 @@ void ScGridWindow::DPMouseButtonUp( const MouseEvent& rMEvt ) // ----------------------------------------------------------------------- -void ScGridWindow::UpdateDragRect( sal_Bool bShowRange, const Rectangle& rPosRect ) +void ScGridWindow::UpdateDragRect( bool bShowRange, const Rectangle& rPosRect ) { SCCOL nStartX = ( rPosRect.Left() >= 0 ) ? static_cast<SCCOL>(rPosRect.Left()) : SCCOL_MAX; SCROW nStartY = ( rPosRect.Top() >= 0 ) ? static_cast<SCROW>(rPosRect.Top()) : SCROW_MAX; |