summaryrefslogtreecommitdiff
path: root/unotools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-01-28 19:58:32 +0100
committerStephan Bergmann <sbergman@redhat.com>2014-01-28 20:26:17 +0100
commit9d1c20259f08cd798a2f197a7ecef1bf6382be3f (patch)
treedbacfce0d0369ce22ac578b28616fc1332db8ac2 /unotools
parentb4c2496f44c29de0185116f86226df911828f51b (diff)
bool improvements
Change-Id: I7020537797b181b0fcbf78de3d7b962b96744895
Diffstat (limited to 'unotools')
-rw-r--r--unotools/source/config/bootstrap.cxx4
-rw-r--r--unotools/source/config/cmdoptions.cxx2
-rw-r--r--unotools/source/config/compatibility.cxx2
-rw-r--r--unotools/source/config/dynamicmenuoptions.cxx2
-rw-r--r--unotools/source/config/lingucfg.cxx10
-rw-r--r--unotools/source/i18n/localedatawrapper.cxx18
-rw-r--r--unotools/source/i18n/transliterationwrapper.cxx2
-rw-r--r--unotools/source/misc/componentresmodule.cxx2
-rw-r--r--unotools/source/ucbhelper/ucbstreamhelper.cxx4
-rw-r--r--unotools/source/ucbhelper/xtempfile.cxx2
10 files changed, 24 insertions, 24 deletions
diff --git a/unotools/source/config/bootstrap.cxx b/unotools/source/config/bootstrap.cxx
index f05e204937fe..dcd3ab4b271b 100644
--- a/unotools/source/config/bootstrap.cxx
+++ b/unotools/source/config/bootstrap.cxx
@@ -36,8 +36,8 @@
#include "tools/getprocessworkingdir.hxx"
// ---------------------------------------------------------------------------------------
-// #define this to a non-zero value, if remembering defaults is not supported properly
-#define RTL_BOOTSTRAP_DEFAULTS_BROKEN 1
+// #define this to true, if remembering defaults is not supported properly
+#define RTL_BOOTSTRAP_DEFAULTS_BROKEN true
#define BOOTSTRAP_ITEM_PRODUCT_KEY "ProductKey"
#define BOOTSTRAP_ITEM_VERSIONFILE "Location"
diff --git a/unotools/source/config/cmdoptions.cxx b/unotools/source/config/cmdoptions.cxx
index 1bfb2f62ab4c..082bbf02f9c0 100644
--- a/unotools/source/config/cmdoptions.cxx
+++ b/unotools/source/config/cmdoptions.cxx
@@ -315,7 +315,7 @@ sal_Bool SvtCommandOptions_Impl::Lookup( SvtCommandOptions::CmdOption eCmdOption
return m_aDisabledCommands.Lookup( aCommand );
}
default:
- DBG_ASSERT( sal_False, "SvtCommandOptions_Impl::Lookup()\nUnknown option type given!\n" );
+ DBG_ASSERT( false, "SvtCommandOptions_Impl::Lookup()\nUnknown option type given!\n" );
}
return sal_False;
diff --git a/unotools/source/config/compatibility.cxx b/unotools/source/config/compatibility.cxx
index 34fe2e784a77..34ab126c1503 100644
--- a/unotools/source/config/compatibility.cxx
+++ b/unotools/source/config/compatibility.cxx
@@ -457,7 +457,7 @@ void SvtCompatibilityOptions_Impl::SetDefault( OUString sName, bool bValue )
//*****************************************************************************************************************
void SvtCompatibilityOptions_Impl::Notify( const Sequence< OUString >& )
{
- DBG_ASSERT( sal_False, "SvtCompatibilityOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" );
+ DBG_ASSERT( false, "SvtCompatibilityOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" );
}
//*****************************************************************************************************************
diff --git a/unotools/source/config/dynamicmenuoptions.cxx b/unotools/source/config/dynamicmenuoptions.cxx
index 964cf50765cc..b808121b71db 100644
--- a/unotools/source/config/dynamicmenuoptions.cxx
+++ b/unotools/source/config/dynamicmenuoptions.cxx
@@ -467,7 +467,7 @@ SvtDynamicMenuOptions_Impl::~SvtDynamicMenuOptions_Impl()
//*****************************************************************************************************************
void SvtDynamicMenuOptions_Impl::Notify( const Sequence< OUString >& )
{
- DBG_ASSERT( sal_False, "SvtDynamicMenuOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" );
+ DBG_ASSERT( false, "SvtDynamicMenuOptions_Impl::Notify()\nNot implemented yet! I don't know how I can handle a dynamical list of unknown properties ...\n" );
}
//*****************************************************************************************************************
diff --git a/unotools/source/config/lingucfg.cxx b/unotools/source/config/lingucfg.cxx
index 066697291c91..10b9c799f895 100644
--- a/unotools/source/config/lingucfg.cxx
+++ b/unotools/source/config/lingucfg.cxx
@@ -393,7 +393,7 @@ uno::Any SvtLinguConfigItem::GetProperty( sal_Int32 nPropertyHandle ) const
case UPH_IS_GRAMMAR_AUTO: pbVal = &rOpt.bIsGrammarAuto; break;
case UPH_IS_GRAMMAR_INTERACTIVE: pbVal = &rOpt.bIsGrammarInteractive; break;
default :
- DBG_ASSERT( 0, "unexpected property handle" );
+ DBG_ASSERT( false, "unexpected property handle" );
}
if (pbVal)
@@ -494,7 +494,7 @@ sal_Bool SvtLinguConfigItem::SetProperty( sal_Int32 nPropertyHandle, const uno::
case UPH_IS_GRAMMAR_AUTO: pbVal = &rOpt.bIsGrammarAuto; break;
case UPH_IS_GRAMMAR_INTERACTIVE: pbVal = &rOpt.bIsGrammarInteractive; break;
default :
- DBG_ASSERT( 0, "unexpected property handle" );
+ DBG_ASSERT( false, "unexpected property handle" );
}
if (pbVal)
@@ -656,7 +656,7 @@ sal_Bool SvtLinguConfigItem::LoadOptions( const uno::Sequence< OUString > &rProp
break;
default:
- DBG_ASSERT( 0, "unexpected case" );
+ DBG_ASSERT( false, "unexpected case" );
}
}
@@ -787,7 +787,7 @@ sal_Bool SvtLinguConfigItem::IsReadOnly( sal_Int32 nPropertyHandle ) const
case UPH_IS_GRAMMAR_AUTO: bReadOnly = rOpt.bROIsGrammarAuto; break;
case UPH_IS_GRAMMAR_INTERACTIVE: bReadOnly = rOpt.bROIsGrammarInteractive; break;
default :
- DBG_ASSERT( 0, "unexpected property handle" );
+ DBG_ASSERT( false, "unexpected property handle" );
}
return bReadOnly;
}
@@ -1148,7 +1148,7 @@ OUString SvtLinguConfig::GetVendorImageUrl_Impl(
}
catch (uno::Exception &)
{
- DBG_ASSERT( 0, "exception caught. GetVendorImageUrl_Impl failed" );
+ DBG_ASSERT( false, "exception caught. GetVendorImageUrl_Impl failed" );
}
return aRes;
}
diff --git a/unotools/source/i18n/localedatawrapper.cxx b/unotools/source/i18n/localedatawrapper.cxx
index da47e8b876a9..9a7439109815 100644
--- a/unotools/source/i18n/localedatawrapper.cxx
+++ b/unotools/source/i18n/localedatawrapper.cxx
@@ -1337,7 +1337,7 @@ OUString LocaleDataWrapper::getDate( const Date& rDate ) const
sal_uInt16 nYear = rDate.GetYear();
sal_uInt16 nYearLen;
- if ( sal_True /* IsDateCentury() */ )
+ if ( true /* IsDateCentury() */ )
nYearLen = 4;
else
{
@@ -1348,25 +1348,25 @@ OUString LocaleDataWrapper::getDate( const Date& rDate ) const
switch ( getDateFormat() )
{
case DMY :
- pBuf = ImplAdd2UNum( pBuf, nDay, sal_True /* IsDateDayLeadingZero() */ );
+ pBuf = ImplAdd2UNum( pBuf, nDay, true /* IsDateDayLeadingZero() */ );
pBuf = ImplAddString( pBuf, getDateSep() );
- pBuf = ImplAdd2UNum( pBuf, nMonth, sal_True /* IsDateMonthLeadingZero() */ );
+ pBuf = ImplAdd2UNum( pBuf, nMonth, true /* IsDateMonthLeadingZero() */ );
pBuf = ImplAddString( pBuf, getDateSep() );
pBuf = ImplAddUNum( pBuf, nYear, nYearLen );
break;
case MDY :
- pBuf = ImplAdd2UNum( pBuf, nMonth, sal_True /* IsDateMonthLeadingZero() */ );
+ pBuf = ImplAdd2UNum( pBuf, nMonth, true /* IsDateMonthLeadingZero() */ );
pBuf = ImplAddString( pBuf, getDateSep() );
- pBuf = ImplAdd2UNum( pBuf, nDay, sal_True /* IsDateDayLeadingZero() */ );
+ pBuf = ImplAdd2UNum( pBuf, nDay, true /* IsDateDayLeadingZero() */ );
pBuf = ImplAddString( pBuf, getDateSep() );
pBuf = ImplAddUNum( pBuf, nYear, nYearLen );
break;
default:
pBuf = ImplAddUNum( pBuf, nYear, nYearLen );
pBuf = ImplAddString( pBuf, getDateSep() );
- pBuf = ImplAdd2UNum( pBuf, nMonth, sal_True /* IsDateMonthLeadingZero() */ );
+ pBuf = ImplAdd2UNum( pBuf, nMonth, true /* IsDateMonthLeadingZero() */ );
pBuf = ImplAddString( pBuf, getDateSep() );
- pBuf = ImplAdd2UNum( pBuf, nDay, sal_True /* IsDateDayLeadingZero() */ );
+ pBuf = ImplAdd2UNum( pBuf, nDay, true /* IsDateDayLeadingZero() */ );
}
return OUString(aBuf, pBuf-aBuf);
@@ -1383,7 +1383,7 @@ OUString LocaleDataWrapper::getTime( const Time& rTime, sal_Bool bSec, sal_Bool
nHour %= 24;
- pBuf = ImplAdd2UNum( pBuf, nHour, sal_True /* IsTimeLeadingZero() */ );
+ pBuf = ImplAdd2UNum( pBuf, nHour, true /* IsTimeLeadingZero() */ );
pBuf = ImplAddString( pBuf, getTimeSep() );
pBuf = ImplAdd2UNum( pBuf, rTime.GetMin(), true );
if ( bSec )
@@ -1456,7 +1456,7 @@ OUString LocaleDataWrapper::getDuration( const Time& rTime, sal_Bool bSec, sal_B
if ( rTime < Time( 0 ) )
pBuf = ImplAddString( pBuf, ' ' );
- if ( sal_True /* IsTimeLeadingZero() */ )
+ if ( true /* IsTimeLeadingZero() */ )
pBuf = ImplAddUNum( pBuf, rTime.GetHour(), 2 );
else
pBuf = ImplAddUNum( pBuf, rTime.GetHour() );
diff --git a/unotools/source/i18n/transliterationwrapper.cxx b/unotools/source/i18n/transliterationwrapper.cxx
index abaac0b1953d..7a457e0ebf82 100644
--- a/unotools/source/i18n/transliterationwrapper.cxx
+++ b/unotools/source/i18n/transliterationwrapper.cxx
@@ -34,7 +34,7 @@ TransliterationWrapper::TransliterationWrapper(
const Reference< XComponentContext > & rxContext,
sal_uInt32 nTyp )
: xTrans( Transliteration::create(rxContext) ),
- aLanguageTag( LANGUAGE_SYSTEM ), nType( nTyp ), bFirstCall( sal_True )
+ aLanguageTag( LANGUAGE_SYSTEM ), nType( nTyp ), bFirstCall( true )
{
}
diff --git a/unotools/source/misc/componentresmodule.cxx b/unotools/source/misc/componentresmodule.cxx
index 8573fd611a67..14d572b9a1d2 100644
--- a/unotools/source/misc/componentresmodule.cxx
+++ b/unotools/source/misc/componentresmodule.cxx
@@ -90,7 +90,7 @@ namespace utl
.append(aMgrName)
.append(")!").getStr() );
- m_bInitialized = sal_True;
+ m_bInitialized = true;
}
return m_pResources;
}
diff --git a/unotools/source/ucbhelper/ucbstreamhelper.cxx b/unotools/source/ucbhelper/ucbstreamhelper.cxx
index 4c1d57619e8f..42f482d5608a 100644
--- a/unotools/source/ucbhelper/ucbstreamhelper.cxx
+++ b/unotools/source/ucbhelper/ucbstreamhelper.cxx
@@ -143,14 +143,14 @@ static SvStream* lcl_CreateStream( const OUString& rFileName, StreamMode eOpenMo
SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
UcbLockBytesHandler* pHandler )
{
- return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler, sal_True /* bEnsureFileExists */ );
+ return lcl_CreateStream( rFileName, eOpenMode, Reference < XInteractionHandler >(), pHandler, true /* bEnsureFileExists */ );
}
SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
Reference < XInteractionHandler > xInteractionHandler,
UcbLockBytesHandler* pHandler )
{
- return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, pHandler, sal_True /* bEnsureFileExists */ );
+ return lcl_CreateStream( rFileName, eOpenMode, xInteractionHandler, pHandler, true /* bEnsureFileExists */ );
}
SvStream* UcbStreamHelper::CreateStream( const OUString& rFileName, StreamMode eOpenMode,
diff --git a/unotools/source/ucbhelper/xtempfile.cxx b/unotools/source/ucbhelper/xtempfile.cxx
index 106772487bd4..f206a953576b 100644
--- a/unotools/source/ucbhelper/xtempfile.cxx
+++ b/unotools/source/ucbhelper/xtempfile.cxx
@@ -37,7 +37,7 @@ OTempFileService::OTempFileService(css::uno::Reference< css::uno::XComponentCont
{
mpTempFile = new ::utl::TempFile;
- mpTempFile->EnableKillingFile ( sal_True );
+ mpTempFile->EnableKillingFile ( true );
}
OTempFileService::~OTempFileService ()