summaryrefslogtreecommitdiff
path: root/sd
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-24 15:42:28 +0200
committerNoel Grandin <noel@peralex.com>2014-03-25 14:32:56 +0200
commit436cd900956b5fd0b6583954c002f8c28ca32698 (patch)
tree00bf0fb7c6daa0041670ce5209e5912780520a66 /sd
parentc849d750eb751d3f2b99d23cca1c8c08672ff379 (diff)
svtools: sal_Bool->bool
Change-Id: Ifd3e643dbc6755839ad4af73ae141fd115ddb4f4
Diffstat (limited to 'sd')
-rw-r--r--sd/source/ui/animations/CustomAnimationList.cxx8
-rw-r--r--sd/source/ui/animations/CustomAnimationList.hxx2
-rw-r--r--sd/source/ui/animations/CustomAnimationPane.cxx2
-rw-r--r--sd/source/ui/dlg/custsdlg.cxx2
-rw-r--r--sd/source/ui/dlg/navigatr.cxx4
-rw-r--r--sd/source/ui/dlg/sdtreelb.cxx36
-rw-r--r--sd/source/ui/dlg/tpaction.cxx2
7 files changed, 28 insertions, 28 deletions
diff --git a/sd/source/ui/animations/CustomAnimationList.cxx b/sd/source/ui/animations/CustomAnimationList.cxx
index 0e946f04115e..ffb38577b9dc 100644
--- a/sd/source/ui/animations/CustomAnimationList.cxx
+++ b/sd/source/ui/animations/CustomAnimationList.cxx
@@ -589,7 +589,7 @@ void stl_append_effect_func::operator()(CustomAnimationEffectPtr pEffect)
void CustomAnimationList::update()
{
mbIgnorePaint = true;
- SetUpdateMode( sal_False );
+ SetUpdateMode( false );
CustomAnimationListEntry* pEntry = 0;
@@ -752,7 +752,7 @@ void CustomAnimationList::update()
}
mbIgnorePaint = false;
- SetUpdateMode( sal_True );
+ SetUpdateMode( true );
Invalidate();
}
@@ -830,7 +830,7 @@ void CustomAnimationList::onSelectionChanged( Any aSelection )
{
try
{
- SelectAll(sal_False);
+ SelectAll(false);
if( aSelection.hasValue() )
{
@@ -930,7 +930,7 @@ EffectSequence CustomAnimationList::getSelection() const
-sal_Bool CustomAnimationList::DoubleClickHdl()
+bool CustomAnimationList::DoubleClickHdl()
{
mpController->onDoubleClick();
return false;
diff --git a/sd/source/ui/animations/CustomAnimationList.hxx b/sd/source/ui/animations/CustomAnimationList.hxx
index cd0fb5bae939..8aeb811d0c81 100644
--- a/sd/source/ui/animations/CustomAnimationList.hxx
+++ b/sd/source/ui/animations/CustomAnimationList.hxx
@@ -67,7 +67,7 @@ public:
// overrides
virtual void SelectHdl();
- virtual sal_Bool DoubleClickHdl();
+ virtual bool DoubleClickHdl();
virtual void Paint( const Rectangle& rRect );
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx b/sd/source/ui/animations/CustomAnimationPane.cxx
index 96006e00f292..32438f81630b 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1751,7 +1751,7 @@ void CustomAnimationPane::onChange( bool bCreate )
{
if( bCreate )
{
- mpCustomAnimationList->SelectAll( sal_False );
+ mpCustomAnimationList->SelectAll( false );
// gather shapes from the selection
std::vector< Any >::iterator aIter( aTargets.begin() );
diff --git a/sd/source/ui/dlg/custsdlg.cxx b/sd/source/ui/dlg/custsdlg.cxx
index 1561111ab371..7c83709e77da 100644
--- a/sd/source/ui/dlg/custsdlg.cxx
+++ b/sd/source/ui/dlg/custsdlg.cxx
@@ -370,7 +370,7 @@ IMPL_LINK( SdDefineCustomShowDlg, ClickButtonHdl, void *, p )
{
OUString aStr = m_pLbPages->GetSelectEntry( i );
pEntry = m_pLbCustomPages->InsertEntry( aStr,
- 0, sal_False, nPosCP );
+ 0, false, nPosCP );
m_pLbCustomPages->Select( pEntry );
SdPage* pPage = rDoc.GetSdPage( (sal_uInt16) m_pLbPages->
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index eb759625df3d..76cd0f442115 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -498,7 +498,7 @@ IMPL_LINK( SdNavigatorWin, MenuSelectHdl, Menu *, pMenu )
{
// patch, prevents endless loop
if( maTlbObjects.GetSelectionCount() > 1 )
- maTlbObjects.SelectAll( sal_False );
+ maTlbObjects.SelectAll( false );
maTlbObjects.SetSelectionMode( SINGLE_SELECTION );
}
@@ -994,7 +994,7 @@ void SdPageNameControllerItem::StateChanged( sal_uInt16 nSId,
if( pNavigatorWin->maTlbObjects.GetSelectionMode() == MULTIPLE_SELECTION )
{
// because otherwise it is always additional select
- pNavigatorWin->maTlbObjects.SelectAll( sal_False );
+ pNavigatorWin->maTlbObjects.SelectAll( false );
}
pNavigatorWin->maTlbObjects.SelectEntry( aPageName );
}
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 08f7e5c04c39..7c8d9d2d25f7 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -593,7 +593,7 @@ void SdPageObjsTLB::Fill( const SdDrawDocument* pInDoc, SfxMedium* pInMedium,
Image aImgDocClosed=Image( BitmapEx( SdResId( BMP_DOC_CLOSED ) ) );
// insert document name
- InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, sal_True, TREELIST_APPEND,
+ InsertEntry( maDocName, aImgDocOpen, aImgDocClosed, NULL, true, TREELIST_APPEND,
reinterpret_cast< void* >( 1 )
);
}
@@ -624,7 +624,7 @@ void SdPageObjsTLB::AddShapeList (
aIcon,
aIcon,
pParentEntry,
- sal_False,
+ false,
TREELIST_APPEND,
pUserData);
@@ -673,7 +673,7 @@ void SdPageObjsTLB::AddShapeList (
maImgOle,
maImgOle,
pEntry,
- sal_False,
+ false,
TREELIST_APPEND,
pObj
);
@@ -707,7 +707,7 @@ void SdPageObjsTLB::AddShapeList (
maImgGraphic,
maImgGraphic,
pEntry,
- sal_False,
+ false,
TREELIST_APPEND,
pObj
);
@@ -756,7 +756,7 @@ void SdPageObjsTLB::AddShapeList (
rIconProvider.maImgObjects,
rIconProvider.maImgObjects,
pEntry,
- sal_False,
+ false,
TREELIST_APPEND,
pObj
);
@@ -972,7 +972,7 @@ void SdPageObjsTLB::RequestingChildren( SvTreeListEntry* pFileEntry )
aImgPage,
aImgPage,
pFileEntry,
- sal_False,
+ false,
TREELIST_APPEND,
reinterpret_cast< void* >( 1 ) );
@@ -1188,26 +1188,26 @@ void SdPageObjsTLB::StartDrag( sal_Int8 nAction, const Point& rPosPixel)
// Select all entries and disable them as drop targets.
SetSelectionMode(MULTIPLE_SELECTION);
- SetCursor(NULL, sal_False);
- SelectAll(sal_True, sal_False);
- EnableSelectionAsDropTarget(sal_False, sal_True);
+ SetCursor(NULL, false);
+ SelectAll(true, false);
+ EnableSelectionAsDropTarget(false, true);
// Enable only the entries as drop targets that are children of the
// page under the mouse.
SvTreeListEntry* pParent = GetRootLevelParent(pEntry);
if (pParent != NULL)
{
- SelectAll(sal_False, sal_False);
- Select(pParent, sal_True);
+ SelectAll(false, false);
+ Select(pParent, true);
// for (SvTreeListEntry*pChild=FirstChild(pParent); pChild!=NULL; pChild=NextSibling(pChild))
// Select(pChild, sal_True);
- EnableSelectionAsDropTarget(sal_True, sal_True);//sal_False);
+ EnableSelectionAsDropTarget(true, true);//sal_False);
}
// Set selection back to the entry under the mouse.
- SelectAll(sal_False,sal_False);
+ SelectAll(false, false);
SetSelectionMode(SINGLE_SELECTION);
- Select(pEntry, sal_True);
+ Select(pEntry, true);
// We can delete the Navigator from ExecuteDrag (when switching to
// another document type), but that would kill the StarView MouseMove
@@ -1343,7 +1343,7 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
SvTreeListEntry* pEntry = GetDropTarget(rEvent.maPosPixel);
if (rEvent.mbLeaving || !CheckDragAndDropMode( this, rEvent.mnAction ))
{
- ImplShowTargetEmphasis( pTargetEntry, sal_False );
+ ImplShowTargetEmphasis( pTargetEntry, false );
}
else if( !GetDragDropMode() )
{
@@ -1356,16 +1356,16 @@ sal_Int8 SdPageObjsTLB::AcceptDrop (const AcceptDropEvent& rEvent)
// Draw emphasis.
if (pEntry != pTargetEntry || !(nImpFlags & SVLBOX_TARGEMPH_VIS))
{
- ImplShowTargetEmphasis( pTargetEntry, sal_False );
+ ImplShowTargetEmphasis( pTargetEntry, false );
pTargetEntry = pEntry;
- ImplShowTargetEmphasis( pTargetEntry, sal_True );
+ ImplShowTargetEmphasis( pTargetEntry, true );
}
}
}
// Hide emphasis when there is no valid drop action.
if (nResult == DND_ACTION_NONE)
- ImplShowTargetEmphasis(pTargetEntry, sal_False);
+ ImplShowTargetEmphasis(pTargetEntry, false);
return nResult;
}
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index b52a0c0dcb56..63a015b69eb9 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -337,7 +337,7 @@ void SdTPAction::Reset( const SfxItemSet& rAttrs )
case presentation::ClickAction_BOOKMARK:
{
if( !m_pLbTree->SelectEntry( aFileName ) )
- m_pLbTree->SelectAll( sal_False );
+ m_pLbTree->SelectAll( false );
}
break;