summaryrefslogtreecommitdiff
path: root/sc/source
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-02-17 14:02:07 +0200
committerNoel Grandin <noel@peralex.com>2014-02-18 10:07:58 +0200
commit788b42b384d6a0796ad076f19be5551971fdf4f0 (patch)
tree0779d29301bf91a3c824e7b4ad8565e4e0caaa89 /sc/source
parentd858c06847edfbde900e1fc216bd7d7c65eeece2 (diff)
sal_Bool->bool
Change-Id: I0dfcf547944529d04cbabc3026c1e088e39b99f8
Diffstat (limited to 'sc/source')
-rw-r--r--sc/source/ui/app/seltrans.cxx2
-rw-r--r--sc/source/ui/inc/drawview.hxx12
-rw-r--r--sc/source/ui/view/drawvie4.cxx14
-rw-r--r--sc/source/ui/view/drawview.cxx12
4 files changed, 20 insertions, 20 deletions
diff --git a/sc/source/ui/app/seltrans.cxx b/sc/source/ui/app/seltrans.cxx
index 679a21e9e0c3..7fc771f15b41 100644
--- a/sc/source/ui/app/seltrans.cxx
+++ b/sc/source/ui/app/seltrans.cxx
@@ -330,7 +330,7 @@ void ScSelectionTransferObj::CreateDrawData()
ScDrawView* pDrawView = pView->GetScDrawView();
if ( pDrawView )
{
- sal_Bool bAnyOle, bOneOle;
+ bool bAnyOle, bOneOle;
const SdrMarkList& rMarkList = pDrawView->GetMarkedObjectList();
ScDrawView::CheckOle( rMarkList, bAnyOle, bOneOle );
diff --git a/sc/source/ui/inc/drawview.hxx b/sc/source/ui/inc/drawview.hxx
index 419749deabf2..2b7100a70e41 100644
--- a/sc/source/ui/inc/drawview.hxx
+++ b/sc/source/ui/inc/drawview.hxx
@@ -41,7 +41,7 @@ class ScDrawView: public FmFormView
Fraction aScaleY;
SdrDropMarkerOverlay* pDropMarker;
SdrObject* pDropMarkObj;
- sal_Bool bInConstruct;
+ bool bInConstruct;
void Construct();
void UpdateBrowser();
@@ -90,7 +90,7 @@ public:
void InvalidateAttribs();
void InvalidateDrawTextAttrs();
- sal_Bool BeginDrag( Window* pWindow, const Point& rStartPos );
+ bool BeginDrag( Window* pWindow, const Point& rStartPos );
void DoCut();
void DoCopy();
@@ -115,7 +115,7 @@ public:
void SetMarkedOriginalSize();
- sal_Bool SelectObject( const OUString& rName );
+ bool SelectObject( const OUString& rName );
bool HasMarkedControl() const;
bool HasMarkedInternal() const;
@@ -147,8 +147,8 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > CopyToTransferable();
SdrObject* GetObjectByName(const OUString& rName);
- sal_Bool GetObjectIsMarked( SdrObject * pObject );
- sal_Bool SelectCurrentViewObject( const OUString& rName );
+ bool GetObjectIsMarked( SdrObject * pObject );
+ bool SelectCurrentViewObject( const OUString& rName );
// #i123922# helper which checks if a Graphic may be appied to an existing
// SdrObject; if it's a SdrGrafObj the fill will be replaced. If it's a
@@ -160,7 +160,7 @@ public:
const OUString& rFile,
const OUString& rFilter);
- static void CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle );
+ static void CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle );
virtual void SyncForGrid( SdrObject* pObj );
};
diff --git a/sc/source/ui/view/drawvie4.cxx b/sc/source/ui/view/drawvie4.cxx
index 418ca87dae6f..94ccd3e33e80 100644
--- a/sc/source/ui/view/drawvie4.cxx
+++ b/sc/source/ui/view/drawvie4.cxx
@@ -56,7 +56,7 @@ Point aDragStartDiff;
// -----------------------------------------------------------------------
-void ScDrawView::CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_Bool& rOneOle )
+void ScDrawView::CheckOle( const SdrMarkList& rMarkList, bool& rAnyOle, bool& rOneOle )
{
rAnyOle = rOneOle = false;
sal_uLong nCount = rMarkList.GetMarkCount();
@@ -67,7 +67,7 @@ void ScDrawView::CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_
sal_uInt16 nSdrObjKind = pObj->GetObjIdentifier();
if (nSdrObjKind == OBJ_OLE2)
{
- rAnyOle = sal_True;
+ rAnyOle = true;
rOneOle = (nCount == 1);
break;
}
@@ -79,7 +79,7 @@ void ScDrawView::CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_
{
if ( pSubObj->GetObjIdentifier() == OBJ_OLE2 )
{
- rAnyOle = sal_True;
+ rAnyOle = true;
// rOneOle remains sal_False - a group isn't treated like a single OLE object
return;
}
@@ -89,9 +89,9 @@ void ScDrawView::CheckOle( const SdrMarkList& rMarkList, sal_Bool& rAnyOle, sal_
}
}
-sal_Bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
+bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
{
- sal_Bool bReturn = false;
+ bool bReturn = false;
if ( AreObjectsMarked() )
{
@@ -102,7 +102,7 @@ sal_Bool ScDrawView::BeginDrag( Window* pWindow, const Point& rStartPos )
aDragStartDiff = rStartPos - aMarkedRect.TopLeft();
- sal_Bool bAnyOle, bOneOle;
+ bool bAnyOle, bOneOle;
const SdrMarkList& rMarkList = GetMarkedObjectList();
CheckOle( rMarkList, bAnyOle, bOneOle );
@@ -404,7 +404,7 @@ void ScDrawView::DoCopy()
uno::Reference<datatransfer::XTransferable> ScDrawView::CopyToTransferable()
{
- sal_Bool bAnyOle, bOneOle;
+ bool bAnyOle, bOneOle;
const SdrMarkList& rMarkList = GetMarkedObjectList();
CheckOle( rMarkList, bAnyOle, bOneOle );
diff --git a/sc/source/ui/view/drawview.cxx b/sc/source/ui/view/drawview.cxx
index 7f6a7569eb06..d0966c3c14e6 100644
--- a/sc/source/ui/view/drawview.cxx
+++ b/sc/source/ui/view/drawview.cxx
@@ -663,11 +663,11 @@ SdrObject* ScDrawView::GetObjectByName(const OUString& rName)
//realize multi-selection of objects
//==================================================
-sal_Bool ScDrawView::SelectCurrentViewObject( const OUString& rName )
+bool ScDrawView::SelectCurrentViewObject( const OUString& rName )
{
sal_uInt16 nObjectTab = 0;
SdrObject* pFound = NULL;
- sal_Bool bUnMark=sal_False;
+ bool bUnMark = false;
SfxObjectShell* pShell = pDoc->GetDocumentShell();
if (pShell)
{
@@ -713,10 +713,10 @@ sal_Bool ScDrawView::SelectCurrentViewObject( const OUString& rName )
bUnMark = IsObjMarked(pFound);
MarkObj( pFound, pPV, bUnMark);
}
- return ( bUnMark );
+ return bUnMark;
}
-sal_Bool ScDrawView::SelectObject( const OUString& rName )
+bool ScDrawView::SelectObject( const OUString& rName )
{
UnmarkAll();
@@ -778,9 +778,9 @@ sal_Bool ScDrawView::SelectObject( const OUString& rName )
}
//If object is marked , return true , else return false .
-sal_Bool ScDrawView::GetObjectIsMarked( SdrObject* pObject )
+bool ScDrawView::GetObjectIsMarked( SdrObject* pObject )
{
- sal_Bool bisMarked =false;
+ bool bisMarked = false;
if (pObject )
{
bisMarked = IsObjMarked(pObject);