summaryrefslogtreecommitdiff
path: root/svtools/source/misc
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2014-05-08 11:42:56 +0200
committerNoel Grandin <noel@peralex.com>2014-05-08 11:48:13 +0200
commitb7d30cb50ede0752f1ee194655f925c77e06879a (patch)
treee9f1369976e5130ee20704344371060b0637a29a /svtools/source/misc
parent2d54aa1d22f404a1a36aaa97d3e3bf5024e89aed (diff)
svtools: sal_Bool->bool
Change-Id: Idd9a3ccf0eb6d14cec158daa17a6b2da625f7ffa
Diffstat (limited to 'svtools/source/misc')
-rw-r--r--svtools/source/misc/acceleratorexecute.cxx12
-rw-r--r--svtools/source/misc/ehdl.cxx4
-rw-r--r--svtools/source/misc/embedhlp.cxx18
-rw-r--r--svtools/source/misc/embedtransfer.cxx4
-rw-r--r--svtools/source/misc/openfiledroptargetlistener.cxx6
-rw-r--r--svtools/source/misc/transfer.cxx2
6 files changed, 23 insertions, 23 deletions
diff --git a/svtools/source/misc/acceleratorexecute.cxx b/svtools/source/misc/acceleratorexecute.cxx
index 3cb104a029dd..83348b1a779b 100644
--- a/svtools/source/misc/acceleratorexecute.cxx
+++ b/svtools/source/misc/acceleratorexecute.cxx
@@ -116,7 +116,7 @@ void AcceleratorExecute::init(const css::uno::Reference< css::uno::XComponentCon
// specify our internal dispatch provider
// frame or desktop?! => document or global config.
- sal_Bool bDesktopIsUsed = sal_False;
+ bool bDesktopIsUsed = false;
m_xDispatcher = css::uno::Reference< css::frame::XDispatchProvider >(xEnv, css::uno::UNO_QUERY);
if (!m_xDispatcher.is())
{
@@ -129,7 +129,7 @@ void AcceleratorExecute::init(const css::uno::Reference< css::uno::XComponentCon
aLock.reset();
m_xDispatcher = xDispatcher;
- bDesktopIsUsed = sal_True;
+ bDesktopIsUsed = true;
}
aLock.clear();
@@ -232,10 +232,10 @@ css::awt::KeyEvent AcceleratorExecute::st_VCLKey2AWTKey(const KeyCode& aVCLKey)
KeyCode AcceleratorExecute::st_AWTKey2VCLKey(const css::awt::KeyEvent& aAWTKey)
{
- sal_Bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
- sal_Bool bMod1 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1 );
- sal_Bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 );
- sal_Bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 );
+ bool bShift = ((aAWTKey.Modifiers & css::awt::KeyModifier::SHIFT) == css::awt::KeyModifier::SHIFT );
+ bool bMod1 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD1 ) == css::awt::KeyModifier::MOD1 );
+ bool bMod2 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD2 ) == css::awt::KeyModifier::MOD2 );
+ bool bMod3 = ((aAWTKey.Modifiers & css::awt::KeyModifier::MOD3 ) == css::awt::KeyModifier::MOD3 );
sal_uInt16 nKey = (sal_uInt16)aAWTKey.KeyCode;
return KeyCode(nKey, bShift, bMod1, bMod2, bMod3);
diff --git a/svtools/source/misc/ehdl.cxx b/svtools/source/misc/ehdl.cxx
index 1f650c94b58c..7f91b93a7d2b 100644
--- a/svtools/source/misc/ehdl.cxx
+++ b/svtools/source/misc/ehdl.cxx
@@ -261,8 +261,8 @@ struct ErrorResource_Impl : private Resource
~ErrorResource_Impl() { FreeResource(); }
- operator ResString(){ return ResString( aResId ); }
- operator sal_Bool(){return IsAvailableRes(aResId.SetRT(RSC_STRING));}
+ operator ResString() { return ResString( aResId ); }
+ operator bool() { return IsAvailableRes(aResId.SetRT(RSC_STRING)); }
};
diff --git a/svtools/source/misc/embedhlp.cxx b/svtools/source/misc/embedhlp.cxx
index d4fe3e1edcd1..a6715e3b5bf1 100644
--- a/svtools/source/misc/embedhlp.cxx
+++ b/svtools/source/misc/embedhlp.cxx
@@ -839,7 +839,7 @@ OUString EmbeddedObjectRef::GetChartType()
uno::Reference< chart2::XCoordinateSystemContainer > xCooSysCnt( xDiagram, uno::UNO_QUERY_THROW );
uno::Sequence< uno::Reference< chart2::XCoordinateSystem > > aCooSysSeq( xCooSysCnt->getCoordinateSystems());
// IA2 CWS. Unused: int nCoordinateCount = aCooSysSeq.getLength();
- sal_Bool bGetChartType = sal_False;
+ bool bGetChartType = false;
for( sal_Int32 nCooSysIdx=0; nCooSysIdx<aCooSysSeq.getLength(); ++nCooSysIdx )
{
uno::Reference< chart2::XChartTypeContainer > xCTCnt( aCooSysSeq[nCooSysIdx], uno::UNO_QUERY_THROW );
@@ -855,12 +855,12 @@ OUString EmbeddedObjectRef::GetChartType()
if (strChartType == "com.sun.star.chart2.AreaChartType")
{
Style += "Areas";
- bGetChartType = sal_True;
+ bGetChartType = true;
}
else if (strChartType == "com.sun.star.chart2.BarChartType")
{
Style += "Bars";
- bGetChartType = sal_True;
+ bGetChartType = true;
}
else if (strChartType == "com.sun.star.chart2.ColumnChartType")
{
@@ -874,34 +874,34 @@ OUString EmbeddedObjectRef::GetChartType()
Style += "Bars";
else
Style += "Columns";
- bGetChartType = sal_True;
+ bGetChartType = true;
}
}
}
else if (strChartType == "com.sun.star.chart2.LineChartType")
{
Style += "Lines";
- bGetChartType = sal_True;
+ bGetChartType = true;
}
else if (strChartType == "com.sun.star.chart2.ScatterChartType")
{
Style += "XY Chart";
- bGetChartType = sal_True;
+ bGetChartType = true;
}
else if (strChartType == "com.sun.star.chart2.PieChartType")
{
Style += "Pies";
- bGetChartType = sal_True;
+ bGetChartType = true;
}
else if (strChartType == "com.sun.star.chart2.NetChartType")
{
Style += "Radar";
- bGetChartType = sal_True;
+ bGetChartType = true;
}
else if (strChartType == "com.sun.star.chart2.CandleStickChartType")
{
Style += "Candle Stick Chart";
- bGetChartType = sal_True;
+ bGetChartType = true;
}
if (bGetChartType)
return Style;
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index a87191c12e45..aa2375ba5317 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -107,14 +107,14 @@ bool SvEmbedTransferHelper::GetData( const ::com::sun::star::datatransfer::DataF
uno::Reference < embed::XStorage > xStg = comphelper::OStorageHelper::GetTemporaryStorage();
OUString aName( "Dummy" );
SvStream* pStream = NULL;
- sal_Bool bDeleteStream = sal_False;
+ bool bDeleteStream = false;
uno::Sequence < beans::PropertyValue > aEmpty;
xPers->storeToEntry( xStg, aName, aEmpty, aEmpty );
if ( xStg->isStreamElement( aName ) )
{
uno::Reference < io::XStream > xStm = xStg->cloneStreamElement( aName );
pStream = utl::UcbStreamHelper::CreateStream( xStm );
- bDeleteStream = sal_True;
+ bDeleteStream = true;
}
else
{
diff --git a/svtools/source/misc/openfiledroptargetlistener.cxx b/svtools/source/misc/openfiledroptargetlistener.cxx
index 655c8ed1e2c5..e50cb0b35293 100644
--- a/svtools/source/misc/openfiledroptargetlistener.cxx
+++ b/svtools/source/misc/openfiledroptargetlistener.cxx
@@ -74,7 +74,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr
if ( css::datatransfer::dnd::DNDConstants::ACTION_NONE != nAction )
{
TransferableDataHelper aHelper( dtde.Transferable );
- sal_Bool bFormatFound = sal_False;
+ bool bFormatFound = false;
FileList aFileList;
// at first check filelist format
@@ -83,7 +83,7 @@ void SAL_CALL OpenFileDropTargetListener::drop( const css::datatransfer::dnd::Dr
sal_uLong i, nCount = aFileList.Count();
for ( i = 0; i < nCount; ++i )
implts_OpenFile( aFileList.GetFile(i) );
- bFormatFound = sal_True;
+ bFormatFound = true;
}
// then, if necessary, the file format
@@ -132,7 +132,7 @@ void SAL_CALL OpenFileDropTargetListener::dragOver( const css::datatransfer::dnd
{
try
{
- sal_Bool bAccept = ( implts_IsDropFormatSupported( SOT_FORMAT_FILE ) ||
+ bool bAccept = ( implts_IsDropFormatSupported( SOT_FORMAT_FILE ) ||
implts_IsDropFormatSupported( SOT_FORMAT_FILE_LIST ) );
if ( !bAccept )
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 5f651b2056dc..d9b358622db2 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -449,7 +449,7 @@ Sequence< DataFlavor > SAL_CALL TransferableHelper::getTransferDataFlavors() thr
sal_Bool SAL_CALL TransferableHelper::isDataFlavorSupported( const DataFlavor& rFlavor ) throw( RuntimeException, std::exception )
{
const SolarMutexGuard aGuard;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
try
{