summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-03-11 08:15:40 +0200
committerNoel Grandin <noel@peralex.com>2014-03-11 08:18:26 +0200
commit1b8d1001c4a92c8788266215fdd14e301b0a0d04 (patch)
treef57abd30d3aa801386b69db08384707cb008cfcb
parente60fe3c7443eb2bbfdb57eab6cd9b62896b526af (diff)
svx: sal_Bool->bool
Change-Id: Ia7db5746fa5d8f60111d10d09865120981956947
-rw-r--r--include/svx/tbcontrl.hxx4
-rw-r--r--include/svx/tbxalign.hxx2
-rw-r--r--include/svx/tbxctl.hxx2
-rw-r--r--include/svx/tbxcustomshapes.hxx2
-rw-r--r--include/svx/txencbox.hxx6
-rw-r--r--sc/source/ui/dbgui/scuiasciiopt.cxx2
-rw-r--r--svx/source/customshapes/tbxcustomshapes.cxx2
-rw-r--r--svx/source/dialog/txencbox.cxx8
-rw-r--r--svx/source/tbxctrls/tbcontrl.cxx8
-rw-r--r--svx/source/tbxctrls/tbxdrctl.cxx2
10 files changed, 19 insertions, 19 deletions
diff --git a/include/svx/tbcontrl.hxx b/include/svx/tbcontrl.hxx
index f4de176b9614..b63fd1cb9d73 100644
--- a/include/svx/tbcontrl.hxx
+++ b/include/svx/tbcontrl.hxx
@@ -270,7 +270,7 @@ class SVX_DLLPUBLIC SvxColorExtToolBoxControl : public SfxToolBoxControl
::svx::ToolboxButtonColorUpdater* pBtnUpdater;
Color mLastColor;
- sal_Bool bChoiceFromPalette;
+ bool bChoiceFromPalette;
public:
SFX_DECL_TOOLBOX_CONTROL();
@@ -281,7 +281,7 @@ public:
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
virtual SfxPopupWindow* CreatePopupWindow();
- virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void Select( bool bMod1 = false );
};
diff --git a/include/svx/tbxalign.hxx b/include/svx/tbxalign.hxx
index f741da44653c..252636257e50 100644
--- a/include/svx/tbxalign.hxx
+++ b/include/svx/tbxalign.hxx
@@ -26,7 +26,7 @@
class SVX_DLLPUBLIC SvxTbxCtlAlign: public SfxToolBoxControl
{
public:
- virtual ::sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception);
+ virtual sal_Bool SAL_CALL opensSubToolbar() throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual OUString SAL_CALL getSubToolbarName() throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL functionSelected( const OUString& aCommand ) throw (::com::sun::star::uno::RuntimeException, std::exception);
virtual void SAL_CALL updateImage() throw (::com::sun::star::uno::RuntimeException, std::exception);
diff --git a/include/svx/tbxctl.hxx b/include/svx/tbxctl.hxx
index ba36503e46dc..9413a914bbcf 100644
--- a/include/svx/tbxctl.hxx
+++ b/include/svx/tbxctl.hxx
@@ -44,7 +44,7 @@ public:
SFX_DECL_TOOLBOX_CONTROL();
- virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void Select( bool bMod1 = false );
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
diff --git a/include/svx/tbxcustomshapes.hxx b/include/svx/tbxcustomshapes.hxx
index c47457e70e0d..578b67804c5b 100644
--- a/include/svx/tbxcustomshapes.hxx
+++ b/include/svx/tbxcustomshapes.hxx
@@ -32,7 +32,7 @@ class SVX_DLLPUBLIC SvxTbxCtlCustomShapes : public SfxToolBoxControl
{
public:
using SfxToolBoxControl::Select;
- virtual void Select( sal_Bool bMod1 = sal_False );
+ virtual void Select( bool bMod1 = false );
virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
virtual SfxPopupWindowType GetPopupWindowType() const;
diff --git a/include/svx/txencbox.hxx b/include/svx/txencbox.hxx
index 92bc35baa105..a63ef943823b 100644
--- a/include/svx/txencbox.hxx
+++ b/include/svx/txencbox.hxx
@@ -52,7 +52,7 @@ public:
RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
<TRUE/> whenever the box is used in import dialogs. */
void FillFromTextEncodingTable(
- sal_Bool bExcludeImportSubsets = sal_False,
+ bool bExcludeImportSubsets = false,
sal_uInt32 nExcludeInfoFlags = 0,
sal_uInt32 nButIncludeInfoFlags = 0
);
@@ -73,7 +73,7 @@ public:
RTL_TEXTENCODING_GB_18030. Normally, this flag should be set to
<TRUE/> whenever the box is used in import dialogs. */
void FillFromDbTextEncodingMap(
- sal_Bool bExcludeImportSubsets = sal_False,
+ bool bExcludeImportSubsets = false,
sal_uInt32 nExcludeInfoFlags = 0,
sal_uInt32 nButIncludeInfoFlags = 0
);
@@ -94,7 +94,7 @@ public:
sal_Int32 nPos = LISTBOX_APPEND );
void SelectTextEncoding( const rtl_TextEncoding nEnc,
- sal_Bool bSelect = sal_True );
+ bool bSelect = true );
rtl_TextEncoding GetSelectTextEncoding() const;
diff --git a/sc/source/ui/dbgui/scuiasciiopt.cxx b/sc/source/ui/dbgui/scuiasciiopt.cxx
index 04b2483ac9c1..e62215367b48 100644
--- a/sc/source/ui/dbgui/scuiasciiopt.cxx
+++ b/sc/source/ui/dbgui/scuiasciiopt.cxx
@@ -390,7 +390,7 @@ ScImportAsciiDlg::ScImportAsciiDlg( Window* pParent,OUString aDatName,
// *** text encoding ListBox ***
// all encodings allowed, including Unicode, but subsets are excluded
- pLbCharSet->FillFromTextEncodingTable( sal_True );
+ pLbCharSet->FillFromTextEncodingTable( true );
// Insert one "SYSTEM" entry for compatibility in AsciiOptions and system
// independent document linkage.
pLbCharSet->InsertTextEncoding( RTL_TEXTENCODING_DONTKNOW, aCharSetUser );
diff --git a/svx/source/customshapes/tbxcustomshapes.cxx b/svx/source/customshapes/tbxcustomshapes.cxx
index f2dc0af909e4..be13fd29f1c5 100644
--- a/svx/source/customshapes/tbxcustomshapes.cxx
+++ b/svx/source/customshapes/tbxcustomshapes.cxx
@@ -128,7 +128,7 @@ SfxPopupWindow* SvxTbxCtlCustomShapes::CreatePopupWindow()
-void SvxTbxCtlCustomShapes::Select( sal_Bool /*bMod1*/ )
+void SvxTbxCtlCustomShapes::Select( bool /*bMod1*/ )
{
if ( !m_aCommand.isEmpty() )
{
diff --git a/svx/source/dialog/txencbox.cxx b/svx/source/dialog/txencbox.cxx
index a0796d38f614..331d90b1a422 100644
--- a/svx/source/dialog/txencbox.cxx
+++ b/svx/source/dialog/txencbox.cxx
@@ -81,7 +81,7 @@ sal_Int32 SvxTextEncodingBox::EncodingToPos_Impl( rtl_TextEncoding nEnc ) const
void SvxTextEncodingBox::FillFromTextEncodingTable(
- sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
+ bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
rtl_TextEncodingInfo aInfo;
@@ -131,7 +131,7 @@ void SvxTextEncodingBox::FillFromTextEncodingTable(
void SvxTextEncodingBox::FillFromDbTextEncodingMap(
- sal_Bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
+ bool bExcludeImportSubsets, sal_uInt32 nExcludeInfoFlags,
sal_uInt32 nButIncludeInfoFlags )
{
#ifdef DISABLE_DBCONNECTIVITY
@@ -193,7 +193,7 @@ void SvxTextEncodingBox::FillFromDbTextEncodingMap(
void SvxTextEncodingBox::FillWithMimeAndSelectBest()
{
- FillFromTextEncodingTable( sal_False, 0xffffffff, RTL_TEXTENCODING_INFO_MIME );
+ FillFromTextEncodingTable( false, 0xffffffff, RTL_TEXTENCODING_INFO_MIME );
rtl_TextEncoding nEnc = SvtSysLocale::GetBestMimeEncoding();
SelectTextEncoding( nEnc );
}
@@ -232,7 +232,7 @@ rtl_TextEncoding SvxTextEncodingBox::GetSelectTextEncoding() const
-void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, sal_Bool bSelect )
+void SvxTextEncodingBox::SelectTextEncoding( const rtl_TextEncoding nEnc, bool bSelect )
{
sal_Int32 nAt = EncodingToPos_Impl( nEnc );
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index fd31acff4313..5a7cec23a155 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -2471,7 +2471,7 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
mLastColor( COL_AUTO )
{
rTbx.SetItemBits( nId, TIB_DROPDOWN | rTbx.GetItemBits( nId ) );
- bChoiceFromPalette = sal_False;
+ bChoiceFromPalette = false;
// The following commands are available at the various modules
switch( nSlotId )
@@ -2548,7 +2548,7 @@ SfxPopupWindow* SvxColorExtToolBoxControl::CreatePopupWindow()
FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE );
pColorWin->StartSelection();
SetPopupWindow( pColorWin );
- bChoiceFromPalette = sal_True;
+ bChoiceFromPalette = true;
return pColorWin;
}
@@ -2568,7 +2568,7 @@ void SvxColorExtToolBoxControl::StateChanged(
if (bChoiceFromPalette)
{
- bChoiceFromPalette = sal_False;
+ bChoiceFromPalette = false;
const SvxColorItem* pItem = 0;
if ( SFX_ITEM_DONTCARE != eState )
@@ -2585,7 +2585,7 @@ void SvxColorExtToolBoxControl::StateChanged(
-void SvxColorExtToolBoxControl::Select( sal_Bool )
+void SvxColorExtToolBoxControl::Select( bool )
{
OUString aCommand;
OUString aParamName;
diff --git a/svx/source/tbxctrls/tbxdrctl.cxx b/svx/source/tbxctrls/tbxdrctl.cxx
index cac037a5fdb7..84ed8839529d 100644
--- a/svx/source/tbxctrls/tbxdrctl.cxx
+++ b/svx/source/tbxctrls/tbxdrctl.cxx
@@ -101,7 +101,7 @@ void SvxTbxCtlDraw::toggleToolbox()
-void SvxTbxCtlDraw::Select( sal_Bool )
+void SvxTbxCtlDraw::Select( bool )
{
toggleToolbox();
}