[Libreoffice-commits] core.git: 9 commits - basic/source canvas/source chart2/qa configmgr/source cpputools/source desktop/inc desktop/source extensions/source filter/source forms/source idl/inc idl/source postprocess/qa pyuno/inc pyuno/source reportdesign/inc reportdesign/source sal/osl sfx2/source slideshow/source svtools/source sw/qa sw/source test/source testtools/source unoxml/source vbahelper/source
Noel Grandin
noel at peralex.com
Thu May 8 02:54:21 PDT 2014
basic/source/classes/sb.cxx | 4
canvas/source/cairo/cairo_canvashelper.cxx | 2
canvas/source/cairo/cairo_canvashelper.hxx | 2
canvas/source/cairo/cairo_devicehelper.cxx | 4
canvas/source/cairo/cairo_devicehelper.hxx | 4
canvas/source/cairo/cairo_spritecanvas.cxx | 2
canvas/source/cairo/cairo_spritecanvashelper.cxx | 10
canvas/source/cairo/cairo_spritecanvashelper.hxx | 6
canvas/source/directx/dx_bitmapcanvashelper.cxx | 2
canvas/source/directx/dx_bitmapcanvashelper.hxx | 2
canvas/source/directx/dx_devicehelper.cxx | 4
canvas/source/directx/dx_devicehelper.hxx | 4
canvas/source/directx/dx_spritecanvashelper.cxx | 10
canvas/source/directx/dx_spritecanvashelper.hxx | 6
canvas/source/directx/dx_spritedevicehelper.cxx | 4
canvas/source/directx/dx_spritedevicehelper.hxx | 4
canvas/source/opengl/ogl_spritedevicehelper.cxx | 4
canvas/source/opengl/ogl_spritedevicehelper.hxx | 4
canvas/source/vcl/canvasbitmaphelper.cxx | 2
canvas/source/vcl/canvasbitmaphelper.hxx | 2
canvas/source/vcl/canvashelper.cxx | 2
canvas/source/vcl/canvashelper.hxx | 2
canvas/source/vcl/devicehelper.cxx | 4
canvas/source/vcl/devicehelper.hxx | 4
canvas/source/vcl/spritecanvashelper.cxx | 8
canvas/source/vcl/spritecanvashelper.hxx | 4
chart2/qa/extras/chart2export.cxx | 18
configmgr/source/writemodfile.cxx | 6
cpputools/source/sp2bv/sp2bv.cxx | 8
cpputools/source/unoexe/unoexe.cxx | 34
desktop/inc/app.hxx | 12
desktop/source/app/app.cxx | 101 +-
desktop/source/app/appinit.cxx | 6
desktop/source/app/check_ext_deps.cxx | 2
desktop/source/app/dispatchwatcher.cxx | 16
desktop/source/app/dispatchwatcher.hxx | 2
desktop/source/app/officeipcthread.cxx | 24
desktop/source/app/officeipcthread.hxx | 4
desktop/source/migration/migration.cxx | 16
desktop/source/migration/migration_impl.hxx | 10
desktop/source/migration/services/jvmfwk.cxx | 10
desktop/source/splash/splash.cxx | 42 -
extensions/source/propctrlr/formcomponenthandler.cxx | 52 -
extensions/source/propctrlr/propcontroller.cxx | 30
extensions/source/propctrlr/propcontroller.hxx | 8
extensions/source/propctrlr/propertycomposer.cxx | 2
extensions/source/propctrlr/sqlcommanddesign.hxx | 2
extensions/source/propctrlr/standardcontrol.cxx | 16
extensions/source/propctrlr/standardcontrol.hxx | 8
extensions/source/propctrlr/usercontrol.cxx | 4
extensions/source/propctrlr/usercontrol.hxx | 4
filter/source/storagefilterdetect/filterdetect.hxx | 2
forms/source/runtime/formoperations.cxx | 8
idl/inc/basobj.hxx | 18
idl/inc/bastype.hxx | 70 -
idl/inc/command.hxx | 2
idl/inc/database.hxx | 28
idl/inc/hash.hxx | 28
idl/inc/lex.hxx | 59 -
idl/inc/module.hxx | 14
idl/inc/object.hxx | 12
idl/inc/slot.hxx | 114 +-
idl/inc/types.hxx | 82 -
idl/source/cmptools/hash.cxx | 24
idl/source/cmptools/lex.cxx | 18
idl/source/objects/basobj.cxx | 46 -
idl/source/objects/bastype.cxx | 96 +-
idl/source/objects/module.cxx | 30
idl/source/objects/object.cxx | 20
idl/source/objects/slot.cxx | 136 +--
idl/source/objects/types.cxx | 160 +--
idl/source/prj/command.cxx | 18
idl/source/prj/database.cxx | 124 +--
idl/source/prj/svidl.cxx | 8
postprocess/qa/services.cxx | 2
pyuno/inc/pyuno/pyuno.hxx | 2
pyuno/source/module/pyuno_except.cxx | 8
pyuno/source/module/pyuno_impl.hxx | 4
pyuno/source/module/pyuno_runtime.cxx | 2
reportdesign/inc/ReportDefinition.hxx | 13
reportdesign/source/core/api/FormatCondition.cxx | 2
reportdesign/source/core/api/Function.cxx | 4
reportdesign/source/core/api/ImageControl.cxx | 6
reportdesign/source/core/api/ReportDefinition.cxx | 48 -
reportdesign/source/core/api/Section.cxx | 10
reportdesign/source/core/api/Shape.cxx | 4
reportdesign/source/core/inc/FixedText.hxx | 15
reportdesign/source/core/inc/FormatCondition.hxx | 14
reportdesign/source/core/inc/FormattedField.hxx | 15
reportdesign/source/core/inc/Function.hxx | 16
reportdesign/source/core/inc/Group.hxx | 15
reportdesign/source/core/inc/ImageControl.hxx | 14
reportdesign/source/core/inc/ReportComponent.hxx | 2
reportdesign/source/core/inc/ReportControlModel.hxx | 16
reportdesign/source/core/inc/ReportHelperImpl.hxx | 2
reportdesign/source/core/inc/Section.hxx | 27
reportdesign/source/core/inc/Shape.hxx | 16
reportdesign/source/inc/GroupProperties.hxx | 6
reportdesign/source/ui/dlg/Navigator.cxx | 10
reportdesign/source/ui/report/ReportController.cxx | 30
reportdesign/source/ui/report/ReportControllerObserver.cxx | 4
reportdesign/source/ui/report/ReportSection.cxx | 4
reportdesign/source/ui/report/SectionWindow.cxx | 2
sal/osl/unx/profile.cxx | 174 ++--
sal/osl/unx/security.cxx | 48 -
sfx2/source/appl/impldde.cxx | 2
slideshow/source/engine/slideshowimpl.cxx | 2
svtools/source/brwbox/brwbox1.cxx | 2
svtools/source/brwbox/brwbox2.cxx | 4
svtools/source/brwbox/datwin.cxx | 18
svtools/source/brwbox/datwin.hxx | 30
svtools/source/config/accessibilityoptions.cxx | 18
svtools/source/config/apearcfg.cxx | 2
svtools/source/config/extcolorcfg.cxx | 56 -
svtools/source/config/helpopt.cxx | 2
svtools/source/config/itemholder2.cxx | 4
svtools/source/config/menuoptions.cxx | 4
svtools/source/contnr/contentenumeration.cxx | 18
svtools/source/contnr/contentenumeration.hxx | 36
svtools/source/contnr/fileview.cxx | 14
svtools/source/contnr/imivctl.hxx | 166 ++--
svtools/source/contnr/imivctl1.cxx | 536 ++++++-------
svtools/source/contnr/imivctl2.cxx | 32
svtools/source/contnr/templwin.cxx | 44 -
svtools/source/contnr/templwin.hxx | 32
svtools/source/control/toolbarmenu.cxx | 4
svtools/source/control/toolbarmenuimp.hxx | 2
svtools/source/control/valueacc.cxx | 14
svtools/source/control/valueimp.hxx | 4
svtools/source/dialogs/ServerDetailsControls.cxx | 6
svtools/source/dialogs/addresstemplate.cxx | 40
svtools/source/dialogs/mcvmath.hxx | 4
svtools/source/dialogs/roadmapwizard.cxx | 6
svtools/source/edit/editsyntaxhighlighter.cxx | 2
svtools/source/filter/SvFilterOptionsDialog.cxx | 6
svtools/source/filter/exportdialog.cxx | 28
svtools/source/filter/exportdialog.hxx | 14
svtools/source/graphic/descriptor.cxx | 6
svtools/source/graphic/grfcache.cxx | 52 -
svtools/source/graphic/grfcache.hxx | 16
svtools/source/graphic/provider.cxx | 2
svtools/source/hatchwindow/documentcloser.cxx | 6
svtools/source/hatchwindow/ipwin.cxx | 22
svtools/source/hatchwindow/ipwin.hxx | 10
svtools/source/inc/unoiface.hxx | 8
svtools/source/misc/acceleratorexecute.cxx | 12
svtools/source/misc/ehdl.cxx | 4
svtools/source/misc/embedhlp.cxx | 18
svtools/source/misc/embedtransfer.cxx | 4
svtools/source/misc/openfiledroptargetlistener.cxx | 6
svtools/source/misc/transfer.cxx | 2
svtools/source/svrtf/svparser.cxx | 14
svtools/source/uno/addrtempuno.cxx | 6
svtools/source/uno/generictoolboxcontroller.cxx | 6
svtools/source/uno/popupmenucontrollerbase.cxx | 2
svtools/source/uno/svtxgridcontrol.cxx | 18
svtools/source/uno/toolboxcontroller.cxx | 6
svtools/source/uno/treecontrolpeer.cxx | 12
svtools/source/uno/treecontrolpeer.hxx | 4
svtools/source/uno/unoevent.cxx | 22
svtools/source/uno/unoiface.cxx | 38
svtools/source/uno/unoimap.cxx | 10
svtools/source/uno/wizard/wizardshell.cxx | 2
svtools/source/uno/wizard/wizardshell.hxx | 12
sw/qa/extras/ooxmlexport/ooxmlexport.cxx | 22
sw/qa/extras/ooxmlimport/ooxmlimport.cxx | 14
sw/source/core/edit/edredln.cxx | 4
test/source/beans/xpropertyset.cxx | 2
test/source/sheet/datapilotfield.cxx | 10
test/source/sheet/xdatabaserange.cxx | 20
test/source/sheet/xprintareas.cxx | 10
testtools/source/bridgetest/bridgetest.cxx | 30
testtools/source/bridgetest/constructors.cxx | 12
testtools/source/bridgetest/cppobj.cxx | 4
unoxml/source/xpath/xpathobject.cxx | 2
vbahelper/source/msforms/vbauserform.cxx | 2
vbahelper/source/vbahelper/vbacommandbar.cxx | 9
vbahelper/source/vbahelper/vbacommandbar.hxx | 8
vbahelper/source/vbahelper/vbacommandbarcontrol.cxx | 26
vbahelper/source/vbahelper/vbacommandbarcontrol.hxx | 6
vbahelper/source/vbahelper/vbacommandbarcontrols.cxx | 20
vbahelper/source/vbahelper/vbacommandbarcontrols.hxx | 10
vbahelper/source/vbahelper/vbacommandbars.cxx | 12
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 13
184 files changed, 2024 insertions(+), 1879 deletions(-)
New commits:
commit 78b9537b6aca0f998f939988e6e1a56528d28baf
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 8 11:44:15 2014 +0200
various: sal_Bool->bool
Change-Id: I30fa5227f30373f95060148f269450d2945c1bb9
diff --git a/basic/source/classes/sb.cxx b/basic/source/classes/sb.cxx
index 902ad6a..5a37bbc 100644
--- a/basic/source/classes/sb.cxx
+++ b/basic/source/classes/sb.cxx
@@ -1698,7 +1698,7 @@ bool StarBASIC::CError( SbError code, const OUString& rMsg,
bool bRet;
if( GetSbData()->aErrHdl.IsSet() )
{
- bRet = (sal_Bool) GetSbData()->aErrHdl.Call( this );
+ bRet = (bool) GetSbData()->aErrHdl.Call( this );
}
else
{
@@ -1746,7 +1746,7 @@ bool StarBASIC::RTError( SbError code, const OUString& rMsg, sal_Int32 l, sal_In
SetErrorData( code, l, c1, c2 );
if( GetSbData()->aErrHdl.IsSet() )
{
- return (sal_Bool) GetSbData()->aErrHdl.Call( this );
+ return (bool) GetSbData()->aErrHdl.Call( this );
}
else
{
diff --git a/chart2/qa/extras/chart2export.cxx b/chart2/qa/extras/chart2export.cxx
index eded887..30a252a 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -274,8 +274,8 @@ void testErrorBar( Reference< XPropertySet > xErrorBar )
void checkCommonTrendline(
Reference<chart2::XRegressionCurve> xCurve,
double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward,
- sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue,
- sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2)
+ bool aExpectedForceIntercept, double aExpectedInterceptValue,
+ bool aExpectedShowEquation, bool aExpectedR2)
{
Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY );
CPPUNIT_ASSERT(xProperties.is());
@@ -288,7 +288,7 @@ void checkCommonTrendline(
CPPUNIT_ASSERT(xProperties->getPropertyValue("ExtrapolateBackward") >>= aExtrapolateBackward);
CPPUNIT_ASSERT_EQUAL(aExpectedExtrapolateBackward, aExtrapolateBackward);
- sal_Bool aForceIntercept = false;
+ bool aForceIntercept = false;
CPPUNIT_ASSERT(xProperties->getPropertyValue("ForceIntercept") >>= aForceIntercept);
CPPUNIT_ASSERT_EQUAL(aExpectedForceIntercept, aForceIntercept);
@@ -302,11 +302,11 @@ void checkCommonTrendline(
Reference< XPropertySet > xEquationProperties( xCurve->getEquationProperties() );
CPPUNIT_ASSERT(xEquationProperties.is());
- sal_Bool aShowEquation = false;
+ bool aShowEquation = false;
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowEquation") >>= aShowEquation);
CPPUNIT_ASSERT_EQUAL(aExpectedShowEquation, aShowEquation);
- sal_Bool aShowCorrelationCoefficient = false;
+ bool aShowCorrelationCoefficient = false;
CPPUNIT_ASSERT(xEquationProperties->getPropertyValue("ShowCorrelationCoefficient") >>= aShowCorrelationCoefficient);
CPPUNIT_ASSERT_EQUAL(aExpectedR2, aShowCorrelationCoefficient);
}
@@ -327,8 +327,8 @@ void checkNameAndType(Reference<XPropertySet> xProperties, const OUString& aExpe
void checkLinearTrendline(
Reference<chart2::XRegressionCurve> xCurve, const OUString& aExpectedName,
double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward,
- sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue,
- sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2)
+ bool aExpectedForceIntercept, double aExpectedInterceptValue,
+ bool aExpectedShowEquation, bool aExpectedR2)
{
Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY );
CPPUNIT_ASSERT(xProperties.is());
@@ -346,8 +346,8 @@ void checkPolynomialTrendline(
Reference<chart2::XRegressionCurve> xCurve, const OUString& aExpectedName,
sal_Int32 aExpectedDegree,
double aExpectedExtrapolateForward, double aExpectedExtrapolateBackward,
- sal_Bool aExpectedForceIntercept, double aExpectedInterceptValue,
- sal_Bool aExpectedShowEquation, sal_Bool aExpectedR2)
+ bool aExpectedForceIntercept, double aExpectedInterceptValue,
+ bool aExpectedShowEquation, bool aExpectedR2)
{
Reference<XPropertySet> xProperties( xCurve , uno::UNO_QUERY );
CPPUNIT_ASSERT(xProperties.is());
diff --git a/configmgr/source/writemodfile.cxx b/configmgr/source/writemodfile.cxx
index b3d7b87..7ceade5 100644
--- a/configmgr/source/writemodfile.cxx
+++ b/configmgr/source/writemodfile.cxx
@@ -114,7 +114,7 @@ void writeData_(oslFileHandle handle, char const * begin, sal_Int32 length) {
}
}
-void writeValueContent_(oslFileHandle handle, sal_Bool value) {
+void writeValueContent_(oslFileHandle handle, bool value) {
if (value) {
writeData_(handle, RTL_CONSTASCII_STRINGPARAM("true"));
} else {
@@ -196,7 +196,7 @@ template< typename T > void writeItemListValue(
void writeValue(oslFileHandle handle, Type type, css::uno::Any const & value) {
switch (type) {
case TYPE_BOOLEAN:
- writeSingleValue< sal_Bool >(handle, value);
+ writeSingleValue< bool >(handle, value);
break;
case TYPE_SHORT:
writeSingleValue< sal_Int16 >(handle, value);
@@ -217,7 +217,7 @@ void writeValue(oslFileHandle handle, Type type, css::uno::Any const & value) {
writeSingleValue< css::uno::Sequence< sal_Int8 > >(handle, value);
break;
case TYPE_BOOLEAN_LIST:
- writeListValue< sal_Bool >(handle, value);
+ writeListValue< bool >(handle, value);
break;
case TYPE_SHORT_LIST:
writeListValue< sal_Int16 >(handle, value);
diff --git a/cpputools/source/sp2bv/sp2bv.cxx b/cpputools/source/sp2bv/sp2bv.cxx
index a4147df..b3853fc 100644
--- a/cpputools/source/sp2bv/sp2bv.cxx
+++ b/cpputools/source/sp2bv/sp2bv.cxx
@@ -24,7 +24,7 @@
#include "rtl/ustring.hxx"
#include "rtl/ustrbuf.h"
-static sal_Bool hasOption(char const * szOption, int argc, char** argv);
+static bool hasOption(char const * szOption, int argc, char** argv);
#define HELP_TEXT \
@@ -109,14 +109,14 @@ int main(int argc, char **argv)
-static sal_Bool hasOption(char const * szOption, int argc, char** argv)
+static bool hasOption(char const * szOption, int argc, char** argv)
{
- sal_Bool retVal= sal_False;
+ bool retVal = false;
for(sal_Int16 i= 1; i < argc; i++)
{
if( ! strcmp(argv[i], szOption))
{
- retVal= sal_True;
+ retVal = true;
break;
}
}
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 05b1fd4..687c6e7 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -59,7 +59,7 @@ using namespace com::sun::star::container;
namespace unoexe
{
-static sal_Bool s_quiet = false;
+static bool s_quiet = false;
static inline void out( const sal_Char * pText )
{
@@ -84,18 +84,18 @@ static const char arUsingText[] =
" [--quiet]\n"
" [-- Argument1 Argument2 ...]\n";
-static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
- sal_uInt32 * pnIndex, const OUString & aArg)
+static bool readOption( OUString * pValue, const sal_Char * pOpt,
+ sal_uInt32 * pnIndex, const OUString & aArg)
throw (RuntimeException)
{
const OUString dash("-");
if(!aArg.startsWith(dash))
- return sal_False;
+ return false;
OUString aOpt = OUString::createFromAscii( pOpt );
if (aArg.getLength() < aOpt.getLength())
- return sal_False;
+ return false;
if (aOpt.equalsIgnoreAsciiCase( aArg.copy(1) ))
{
@@ -119,7 +119,7 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
out( tmp.getStr() );
#endif
++(*pnIndex);
- return sal_True;
+ return true;
}
}
else if (aArg.indexOf(aOpt) == 1)
@@ -134,13 +134,13 @@ static sal_Bool readOption( OUString * pValue, const sal_Char * pOpt,
#endif
++(*pnIndex);
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
- sal_uInt32 * pnIndex, const OUString & aArg)
+static bool readOption( bool * pbOpt, const sal_Char * pOpt,
+ sal_uInt32 * pnIndex, const OUString & aArg)
{
const OUString dashdash("--");
OUString aOpt = OUString::createFromAscii(pOpt);
@@ -148,14 +148,14 @@ static sal_Bool readOption( sal_Bool * pbOpt, const sal_Char * pOpt,
if(aArg.startsWith(dashdash) && aOpt.equals(aArg.copy(2)))
{
++(*pnIndex);
- *pbOpt = sal_True;
+ *pbOpt = true;
#if OSL_DEBUG_LEVEL > 1
out( "\n> identified option --" );
out( pOpt );
#endif
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
template< class T >
@@ -270,7 +270,7 @@ class OInstanceProvider
Mutex _aSingleInstanceMutex;
Reference< XInterface > _xSingleInstance;
- sal_Bool _bSingleInstance;
+ bool _bSingleInstance;
OUString _aImplName;
OUString _aLocation;
@@ -285,7 +285,7 @@ public:
OInstanceProvider( const Reference< XComponentContext > & xContext,
const OUString & rImplName, const OUString & rLocation,
const OUString & rServiceName, const Sequence< Any > & rInitParams,
- sal_Bool bSingleInstance, const OUString & rInstanceName )
+ bool bSingleInstance, const OUString & rInstanceName )
: _xContext( xContext )
, _bSingleInstance( bSingleInstance )
, _aImplName( rImplName )
@@ -408,8 +408,8 @@ SAL_IMPLEMENT_MAIN()
{
OUString aImplName, aLocation, aServiceName, aUnoUrl;
Sequence< OUString > aParams;
- sal_Bool bSingleAccept = sal_False;
- sal_Bool bSingleInstance = sal_False;
+ bool bSingleAccept = false;
+ bool bSingleInstance = false;
// read command line arguments
diff --git a/filter/source/storagefilterdetect/filterdetect.hxx b/filter/source/storagefilterdetect/filterdetect.hxx
index 385d3c0..06a9aa2 100644
--- a/filter/source/storagefilterdetect/filterdetect.hxx
+++ b/filter/source/storagefilterdetect/filterdetect.hxx
@@ -60,7 +60,7 @@ public:
OUString StorageFilterDetect_getImplementationName();
-sal_Bool StorageFilterDetect_supportsService(const OUString& ServiceName);
+bool StorageFilterDetect_supportsService(const OUString& ServiceName);
com::sun::star::uno::Sequence<OUString> StorageFilterDetect_getSupportedServiceNames();
diff --git a/forms/source/runtime/formoperations.cxx b/forms/source/runtime/formoperations.cxx
index 40933b0..2931726 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -348,7 +348,7 @@ namespace frm
aState.Enabled = !impl_isInsertOnlyForm_throw();
}
else
- aState.State <<= (sal_Bool)sal_False;
+ aState.State <<= false;
}
break;
@@ -781,7 +781,7 @@ namespace frm
// simply toggle the value
bool bApplied = false;
m_xCursorProperties->getPropertyValue( PROPERTY_APPLYFILTER ) >>= bApplied;
- m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( (sal_Bool)!bApplied ) );
+ m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( !bApplied ) );
// and reload
WaitObject aWO( NULL );
@@ -1656,7 +1656,7 @@ namespace frm
try
{
m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, makeAny( m_xParser->getFilter() ) );
- m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( (sal_Bool)sal_True ) );
+ m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( true ) );
m_xLoadableForm->reload();
}
@@ -1671,7 +1671,7 @@ namespace frm
try
{
m_xParser->setOrder( sOriginalFilter );
- m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( (sal_Bool)bApplied ) );
+ m_xCursorProperties->setPropertyValue( PROPERTY_APPLYFILTER, makeAny( bApplied ) );
m_xCursorProperties->setPropertyValue( PROPERTY_FILTER, makeAny( m_xParser->getFilter() ) );
m_xLoadableForm->reload();
}
diff --git a/postprocess/qa/services.cxx b/postprocess/qa/services.cxx
index 680ad63..c9d30f4 100644
--- a/postprocess/qa/services.cxx
+++ b/postprocess/qa/services.cxx
@@ -57,7 +57,7 @@ void ServicesTest::test()
try
{
OString message = OUStringToOString(s[i], RTL_TEXTENCODING_UTF8);
- sal_Bool bDefConstructor = xseq[c]->isDefaultConstructor();
+ bool bDefConstructor = xseq[c]->isDefaultConstructor();
Reference< css::lang::XMultiComponentFactory > serviceManager = m_xContext->getServiceManager();
Reference< XInterface > instance;
diff --git a/sal/osl/unx/profile.cxx b/sal/osl/unx/profile.cxx
index 6e7c38b..15df5b5 100644
--- a/sal/osl/unx/profile.cxx
+++ b/sal/osl/unx/profile.cxx
@@ -98,17 +98,17 @@ typedef struct _osl_TProfileImpl
sal_Char** m_Lines;
osl_TProfileSection* m_Sections;
pthread_mutex_t m_AccessLock;
- sal_Bool m_bIsValid;
+ bool m_bIsValid;
} osl_TProfileImpl;
static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption ProfileFlags);
static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags);
-static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode);
-static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate);
+static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode);
+static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate);
static osl_TStamp OslProfile_getFileStamp(osl_TFile* pFile);
static sal_Char* OslProfile_getLine(osl_TFile* pFile);
-static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine);
+static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine);
static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen);
static sal_Char* addLine(osl_TProfileImpl* pProfile, const sal_Char* Line);
static sal_Char* insertLine(osl_TProfileImpl* pProfile, const sal_Char* Line, sal_uInt32 LineNo);
@@ -116,19 +116,19 @@ static void removeLine(osl_TProfileImpl* pProfile, sal_uInt32 LineNo);
static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection,
sal_uInt32 NoEntry, sal_uInt32 Line,
sal_Char* Entry, sal_uInt32 Len);
-static sal_Bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection,
- int Line, sal_Char* Entry, sal_uInt32 Len);
+static bool addEntry(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection,
+ int Line, sal_Char* Entry, sal_uInt32 Len);
static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry);
-static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len);
+static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len);
static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection);
static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile, const sal_Char* Section,
const sal_Char* Entry, sal_uInt32 *pNoEntry);
-static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile);
-static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup);
-static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable);
-static sal_Bool releaseProfile(osl_TProfileImpl* pProfile);
+static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile);
+static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup);
+static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable);
+static bool releaseProfile(osl_TProfileImpl* pProfile);
-static sal_Bool writeProfileImpl (osl_TFile* pFile);
+static bool writeProfileImpl (osl_TFile* pFile);
static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl*);
static bool osl_ProfileSwapProfileNames(osl_TProfileImpl*);
static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_Char* pszExtension, sal_Char* pszTmpName, int BufferMaxLen);
@@ -207,7 +207,7 @@ static oslProfile SAL_CALL osl_psz_openProfile(const sal_Char *pszProfileName, o
}
pthread_mutex_init(&(pProfile->m_AccessLock),PTHREAD_MUTEXATTR_DEFAULT);
- pProfile->m_bIsValid=sal_True;
+ pProfile->m_bIsValid = true;
pProfile->m_Stamp = OslProfile_getFileStamp(pFile);
bRet=loadProfile(pFile, pProfile);
@@ -242,7 +242,7 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
pthread_mutex_lock(&(pProfile->m_AccessLock));
- if ( pProfile->m_bIsValid == sal_False )
+ if ( pProfile->m_bIsValid == false )
{
OSL_ASSERT(pProfile->m_bIsValid);
pthread_mutex_unlock(&(pProfile->m_AccessLock));
@@ -252,22 +252,22 @@ sal_Bool SAL_CALL osl_closeProfile(oslProfile Profile)
return sal_False;
}
- pProfile->m_bIsValid=sal_False;
+ pProfile->m_bIsValid = false;
if ( ! ( pProfile->m_Flags & osl_Profile_READLOCK ) && ( pProfile->m_Flags & FLG_MODIFIED ) )
{
- pTmpProfile = acquireProfile(Profile,sal_True);
+ pTmpProfile = acquireProfile(Profile, true);
if ( pTmpProfile != 0 )
{
- sal_Bool bRet = storeProfile(pTmpProfile, sal_True);
+ bool bRet = storeProfile(pTmpProfile, true);
OSL_ASSERT(bRet);
(void)bRet;
}
}
else
{
- pTmpProfile = acquireProfile(Profile,sal_False);
+ pTmpProfile = acquireProfile(Profile, false);
}
if ( pTmpProfile == 0 )
@@ -336,7 +336,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
{
osl_TProfileImpl* pProfile = (osl_TProfileImpl*) Profile;
osl_TFile* pFile;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_flushProfile()");
@@ -352,7 +352,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
pthread_mutex_lock(&(pProfile->m_AccessLock));
- if ( pProfile->m_bIsValid == sal_False )
+ if ( pProfile->m_bIsValid == false )
{
OSL_ASSERT(pProfile->m_bIsValid);
pthread_mutex_unlock(&(pProfile->m_AccessLock));
@@ -377,7 +377,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
#ifdef DEBUG_OSL_PROFILE
OSL_TRACE("swapping to storeprofile");
#endif
- bRet = storeProfile(pProfile,sal_False);
+ bRet = storeProfile(pProfile, false);
OSL_ASSERT(bRet);
}
@@ -388,7 +388,7 @@ sal_Bool SAL_CALL osl_flushProfile(oslProfile Profile)
return bRet;
}
-static sal_Bool writeProfileImpl(osl_TFile* pFile)
+static bool writeProfileImpl(osl_TFile* pFile)
{
#if OSL_DEBUG_LEVEL > 1
unsigned int nLen=0;
@@ -403,7 +403,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out osl_writeProfileImpl() [invalid args]");
#endif
- return sal_False;
+ return false;
}
#if OSL_DEBUG_LEVEL > 1
@@ -414,7 +414,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
if ( !safeWrite(pFile->m_Handle, pFile->m_pWriteBuf, pFile->m_nWriteBufLen - pFile->m_nWriteBufFree) )
{
OSL_TRACE("write failed '%s'",strerror(errno));
- return (sal_False);
+ return false;
}
free(pFile->m_pWriteBuf);
@@ -424,7 +424,7 @@ static sal_Bool writeProfileImpl(osl_TFile* pFile)
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out osl_writeProfileImpl() [ok]");
#endif
- return sal_True;
+ return true;
}
sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
@@ -439,7 +439,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
osl_TProfileSection* pSec;
osl_TProfileImpl* pProfile=0;
osl_TProfileImpl* pTmpProfile=0;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_readProfileString");
@@ -457,7 +457,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == sal_False )
+ if ( pTmpProfile->m_bIsValid == false )
{
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
#ifdef TRACE_OSL_PROFILE
@@ -466,7 +466,7 @@ sal_Bool SAL_CALL osl_readProfileString(oslProfile Profile,
return sal_False;
}
- pProfile = acquireProfile(Profile, sal_False);
+ pProfile = acquireProfile(Profile, false);
if ( pProfile == NULL )
{
@@ -598,7 +598,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
const sal_Char* pszString)
{
sal_uInt32 i;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_uInt32 NoEntry;
sal_Char* pStr;
sal_Char* Line = 0;
@@ -622,7 +622,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == sal_False )
+ if ( pTmpProfile->m_bIsValid == false )
{
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
@@ -632,7 +632,7 @@ sal_Bool SAL_CALL osl_writeProfileString(oslProfile Profile,
return sal_False;
}
- pProfile=acquireProfile(Profile, sal_True);
+ pProfile=acquireProfile(Profile, true);
if (pProfile == NULL)
{
@@ -741,7 +741,7 @@ sal_Bool SAL_CALL osl_writeProfileBool(oslProfile Profile,
const sal_Char* pszEntry,
sal_Bool Value)
{
- sal_Bool bRet=sal_False;
+ bool bRet = false;
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_writeProfileBool");
@@ -767,7 +767,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
sal_uInt32 Value)
{
int i, n = 0;
- sal_Bool bRet=sal_False;
+ bool bRet = false;
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_writeProfileIdent");
@@ -777,7 +777,7 @@ sal_Bool SAL_CALL osl_writeProfileIdent(oslProfile Profile,
++n;
if ((i = Value - FirstId) >= n)
- bRet = sal_False;
+ bRet = false;
else
bRet = osl_writeProfileString(Profile, pszSection, pszEntry, Strings[i]);
@@ -795,7 +795,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
osl_TProfileSection* pSec;
osl_TProfileImpl* pProfile = 0;
osl_TProfileImpl* pTmpProfile = 0;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_removeProfileEntry");
@@ -813,7 +813,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == sal_False )
+ if ( pTmpProfile->m_bIsValid == false )
{
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
@@ -823,7 +823,7 @@ sal_Bool SAL_CALL osl_removeProfileEntry(oslProfile Profile,
return sal_False;
}
- pProfile = acquireProfile(Profile, sal_True);
+ pProfile = acquireProfile(Profile, true);
if (pProfile == NULL)
{
@@ -879,7 +879,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile,
osl_TProfileSection* pSec;
osl_TProfileImpl* pProfile = 0;
osl_TProfileImpl* pTmpProfile = 0;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_getProfileSectionEntries");
@@ -898,7 +898,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == sal_False )
+ if ( pTmpProfile->m_bIsValid == false )
{
OSL_ASSERT(pTmpProfile->m_bIsValid);
@@ -911,7 +911,7 @@ sal_uInt32 SAL_CALL osl_getProfileSectionEntries(oslProfile Profile,
return sal_False;
}
- pProfile = acquireProfile(Profile, sal_False);
+ pProfile = acquireProfile(Profile, false);
if (pProfile == NULL)
{
@@ -982,7 +982,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile,
osl_TProfileSection* pSec;
osl_TProfileImpl* pProfile = 0;
osl_TProfileImpl* pTmpProfile = 0;
- sal_Bool bRet = sal_False;
+ bool bRet = false;
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In osl_getProfileSections");
@@ -1000,7 +1000,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile,
pthread_mutex_lock(&(pTmpProfile->m_AccessLock));
- if ( pTmpProfile->m_bIsValid == sal_False )
+ if ( pTmpProfile->m_bIsValid == false )
{
OSL_ASSERT(pTmpProfile->m_bIsValid);
pthread_mutex_unlock(&(pTmpProfile->m_AccessLock));
@@ -1010,7 +1010,7 @@ sal_uInt32 SAL_CALL osl_getProfileSections(oslProfile Profile,
return sal_False;
}
- pProfile = acquireProfile(Profile, sal_False);
+ pProfile = acquireProfile(Profile, false);
if (pProfile == NULL)
{
@@ -1079,12 +1079,12 @@ static osl_TStamp OslProfile_getFileStamp(osl_TFile* pFile)
return (status.st_mtime);
}
-static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
+static bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
{
struct flock lock;
/* boring hack, but initializers for static vars must be constant */
- static sal_Bool bIsInitialized = sal_False;
- static sal_Bool bLockingDisabled;
+ static bool bIsInitialized = false;
+ static bool bLockingDisabled;
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In OslProfile_lockFile");
@@ -1097,15 +1097,15 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
if ( pEnvValue == 0 )
{
- bLockingDisabled = sal_False;
+ bLockingDisabled = false;
}
else
{
- bLockingDisabled = sal_True;
+ bLockingDisabled = true;
}
- bIsInitialized = sal_True;
+ bIsInitialized = true;
}
if (pFile->m_Handle < 0)
@@ -1113,7 +1113,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out OslProfile_lockFile [invalid file handle]");
#endif
- return (sal_False);
+ return false;
}
if ( bLockingDisabled )
@@ -1121,7 +1121,7 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out OslProfile_lockFile [locking disabled]");
#endif
- return (sal_True);
+ return true;
}
lock.l_start = 0;
@@ -1154,27 +1154,27 @@ static sal_Bool OslProfile_lockFile(const osl_TFile* pFile, osl_TLockMode eMode)
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out OslProfile_lockFile [fcntl F_SETLKW]");
#endif
- return sal_False;
+ return false;
}
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out OslProfile_lockFile [ok]");
#endif
- return sal_True;
+ return true;
}
static osl_TFile* openFileImpl(const sal_Char* pszFilename, oslProfileOption ProfileFlags )
{
int Flags;
osl_TFile* pFile = (osl_TFile*) calloc(1, sizeof(osl_TFile));
- sal_Bool bWriteable = sal_False;
+ bool bWriteable = false;
if ( ProfileFlags & ( osl_Profile_WRITELOCK | osl_Profile_FLUSHWRITE ) )
{
#ifdef DEBUG_OSL_PROFILE
OSL_TRACE("setting bWriteable to TRUE");
#endif
- bWriteable=sal_True;
+ bWriteable = true;
}
if (! bWriteable)
@@ -1274,7 +1274,7 @@ static osl_TStamp closeFileImpl(osl_TFile* pFile, oslProfileOption Flags)
return(stamp);
}
-static sal_Bool OslProfile_rewindFile(osl_TFile* pFile, sal_Bool bTruncate)
+static bool OslProfile_rewindFile(osl_TFile* pFile, bool bTruncate)
{
bool bRet = true;
#ifdef TRACE_OSL_PROFILE
@@ -1394,7 +1394,7 @@ static sal_Char* OslProfile_getLine(osl_TFile* pFile)
return pLine;
}
-static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine)
+static bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine)
{
unsigned int Len = strlen(pszLine);
@@ -1404,7 +1404,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine)
if ( pFile == 0 || pFile->m_Handle < 0 )
{
- return (sal_False);
+ return false;
}
if ( pFile->m_pWriteBuf == 0 )
@@ -1422,7 +1422,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine)
pTmp=(sal_Char*) realloc(pFile->m_pWriteBuf,( ( pFile->m_nWriteBufLen + Len ) * 2) );
if ( pTmp == 0 )
{
- return sal_False;
+ return false;
}
pFile->m_pWriteBuf = pTmp;
pFile->m_nWriteBufFree = pFile->m_nWriteBufFree + pFile->m_nWriteBufLen + ( 2 * Len );
@@ -1440,7 +1440,7 @@ static sal_Bool OslProfile_putLine(osl_TFile* pFile, const sal_Char *pszLine)
pFile->m_nWriteBufFree-=Len+1;
- return sal_True;
+ return true;
}
static sal_Char* stripBlanks(sal_Char* String, sal_uInt32* pLen)
@@ -1617,10 +1617,10 @@ static void setEntry(osl_TProfileImpl* pProfile, osl_TProfileSection* pSection,
return;
}
-static sal_Bool addEntry(osl_TProfileImpl* pProfile,
- osl_TProfileSection *pSection,
- int Line, sal_Char* Entry,
- sal_uInt32 Len)
+static bool addEntry(osl_TProfileImpl* pProfile,
+ osl_TProfileSection *pSection,
+ int Line, sal_Char* Entry,
+ sal_uInt32 Len)
{
if (pSection != NULL)
{
@@ -1643,7 +1643,7 @@ static sal_Bool addEntry(osl_TProfileImpl* pProfile,
{
pSection->m_NoEntries = 0;
pSection->m_MaxEntries = 0;
- return (sal_False);
+ return false;
}
}
@@ -1653,10 +1653,10 @@ static sal_Bool addEntry(osl_TProfileImpl* pProfile,
setEntry(pProfile, pSection, pSection->m_NoEntries - 1, Line,
Entry, Len);
- return (sal_True);
+ return true;
}
- return (sal_False);
+ return false;
}
static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry)
@@ -1679,7 +1679,7 @@ static void removeEntry(osl_TProfileSection *pSection, sal_uInt32 NoEntry)
return;
}
-static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len)
+static bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char* Section, sal_uInt32 Len)
{
if (pProfile->m_NoSections >= pProfile->m_MaxSections)
{
@@ -1707,7 +1707,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char*
{
pProfile->m_NoSections = 0;
pProfile->m_MaxSections = 0;
- return (sal_False);
+ return false;
}
}
@@ -1725,7 +1725,7 @@ static sal_Bool addSection(osl_TProfileImpl* pProfile, int Line, const sal_Char*
pProfile->m_Sections[pProfile->m_NoSections - 1].m_Offset = Section - pProfile->m_Lines[Line];
pProfile->m_Sections[pProfile->m_NoSections - 1].m_Len = Len;
- return (sal_True);
+ return true;
}
static void removeSection(osl_TProfileImpl* pProfile, osl_TProfileSection *pSection)
@@ -1810,7 +1810,7 @@ static osl_TProfileSection* findEntry(osl_TProfileImpl* pProfile,
return (pSec);
}
-static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
+static bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
{
sal_uInt32 i;
sal_Char* pStr;
@@ -1821,18 +1821,18 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
if ( !pFile )
{
- return sal_False;
+ return false;
}
if ( !pProfile )
{
- return sal_False;
+ return false;
}
pProfile->m_NoLines = 0;
pProfile->m_NoSections = 0;
- OSL_VERIFY(OslProfile_rewindFile(pFile, sal_False));
+ OSL_VERIFY(OslProfile_rewindFile(pFile, false));
while ( ( pLine=OslProfile_getLine(pFile) ) != 0 )
{
@@ -1840,7 +1840,7 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
rtl_freeMemory( pLine );
OSL_ASSERT(bWasAdded);
if ( ! bWasAdded )
- return (sal_False);
+ return false;
}
for (i = 0; i < pProfile->m_NoLines; i++)
@@ -1882,10 +1882,10 @@ static sal_Bool loadProfile(osl_TFile* pFile, osl_TProfileImpl* pProfile)
}
}
- return (sal_True);
+ return true;
}
-static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
+static bool storeProfile(osl_TProfileImpl* pProfile, bool bCleanup)
{
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In storeProfile");
@@ -1901,10 +1901,10 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
if ( pTmpFile == 0 )
{
- return sal_False;
+ return false;
}
- OSL_VERIFY(OslProfile_rewindFile(pTmpFile, sal_True));
+ OSL_VERIFY(OslProfile_rewindFile(pTmpFile, true));
for ( i = 0 ; i < pProfile->m_NoLines ; i++ )
{
@@ -1927,7 +1927,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
#endif
closeFileImpl(pTmpFile,pProfile->m_Flags);
- return sal_False;
+ return false;
}
pProfile->m_Flags &= ~FLG_MODIFIED;
@@ -1964,7 +1964,7 @@ static sal_Bool storeProfile(osl_TProfileImpl* pProfile, sal_Bool bCleanup)
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out storeProfile [ok]");
#endif
- return (sal_True);
+ return true;
}
static osl_TFile* osl_openTmpProfileImpl(osl_TProfileImpl* pProfile)
@@ -2059,7 +2059,7 @@ static void osl_ProfileGenerateExtension(const sal_Char* pszFileName, const sal_
return;
}
-static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
+static osl_TProfileImpl* acquireProfile(oslProfile Profile, bool bWriteable)
{
osl_TProfileImpl* pProfile = (osl_TProfileImpl*)Profile;
oslProfileOption PFlags=0;
@@ -2106,7 +2106,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
if (memcmp(&Stamp, &(pProfile->m_Stamp), sizeof(osl_TStamp)))
{
- sal_Bool bRet=sal_False;
+ bool bRet = false;
pProfile->m_Stamp = Stamp;
@@ -2132,7 +2132,7 @@ static osl_TProfileImpl* acquireProfile(oslProfile Profile, sal_Bool bWriteable)
return (pProfile);
}
-static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
+static bool releaseProfile(osl_TProfileImpl* pProfile)
{
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("In releaseProfile");
@@ -2143,7 +2143,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out releaseProfile [profile==0]");
#endif
- return sal_False;
+ return false;
}
if (pProfile->m_Flags & FLG_AUTOOPEN)
@@ -2162,7 +2162,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
{
if (pProfile->m_Flags & FLG_MODIFIED)
{
- sal_Bool bRet=storeProfile(pProfile, sal_False);
+ bool bRet = storeProfile(pProfile, false);
OSL_ASSERT(bRet);
(void)bRet;
}
@@ -2175,7 +2175,7 @@ static sal_Bool releaseProfile(osl_TProfileImpl* pProfile)
#ifdef TRACE_OSL_PROFILE
OSL_TRACE("Out releaseProfile [ok]");
#endif
- return (sal_True);
+ return true;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sal/osl/unx/security.cxx b/sal/osl/unx/security.cxx
index 2787bdb..6afdc1c 100644
--- a/sal/osl/unx/security.cxx
+++ b/sal/osl/unx/security.cxx
@@ -46,11 +46,11 @@ static oslSecurityError SAL_CALL
osl_psz_loginUser(const sal_Char* pszUserName, const sal_Char* pszPasswd,
oslSecurity* pSecurity);
extern "C" sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent, sal_uInt32 nMax);
-static sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax);
-static sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
-static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax);
+static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
+static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax);
-static sal_Bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) {
+static bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) {
#if defined _SC_GETPW_R_SIZE_MAX
long m;
errno = 0;
@@ -59,17 +59,17 @@ static sal_Bool sysconf_SC_GETPW_R_SIZE_MAX(std::size_t * value) {
/* _SC_GETPW_R_SIZE_MAX has no limit; some platforms like certain
FreeBSD versions support sysconf(_SC_GETPW_R_SIZE_MAX) in a broken
way and always set EINVAL, so be resilient here: */
- return sal_False;
+ return false;
} else {
OSL_ASSERT(
m >= 0
&& (unsigned long) m < std::numeric_limits<std::size_t>::max());
*value = (std::size_t) m;
- return sal_True;
+ return true;
}
#else
/* some platforms like Mac OS X 1.3 do not define _SC_GETPW_R_SIZE_MAX: */
- return sal_False;
+ return false;
#endif
}
@@ -210,7 +210,7 @@ oslSecurityError SAL_CALL osl_loginUserOnFileServer(
sal_Bool SAL_CALL osl_getUserIdent(oslSecurity Security, rtl_uString **ustrIdent)
{
- sal_Bool bRet=sal_False;
+ bool bRet = false;
sal_Char pszIdent[1024];
pszIdent[0] = '\0';
@@ -244,7 +244,7 @@ sal_Bool SAL_CALL osl_psz_getUserIdent(oslSecurity Security, sal_Char *pszIdent,
sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName)
{
- sal_Bool bRet=sal_False;
+ bool bRet = false;
sal_Char pszName[1024];
pszName[0] = '\0';
@@ -257,28 +257,28 @@ sal_Bool SAL_CALL osl_getUserName(oslSecurity Security, rtl_uString **ustrName)
return bRet;
}
-static sal_Bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax)
+static bool SAL_CALL osl_psz_getUserName(oslSecurity Security, sal_Char* pszName, sal_uInt32 nMax)
{
oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
if (pSecImpl == NULL || pSecImpl->m_pPasswd.pw_name == NULL)
- return sal_False;
+ return false;
strncpy(pszName, pSecImpl->m_pPasswd.pw_name, nMax);
- return sal_True;
+ return true;
}
sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirectory)
{
- sal_Bool bRet=sal_False;
+ bool bRet = false;
sal_Char pszDirectory[PATH_MAX];
pszDirectory[0] = '\0';
bRet = osl_psz_getHomeDir(Security,pszDirectory,sizeof(pszDirectory));
- if ( bRet == sal_True )
+ if ( bRet )
{
rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
OSL_ASSERT(*pustrDirectory != NULL);
@@ -288,12 +288,12 @@ sal_Bool SAL_CALL osl_getHomeDir(oslSecurity Security, rtl_uString **pustrDirect
return bRet;
}
-static sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
+static bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
{
oslSecurityImpl *pSecImpl = (oslSecurityImpl *)Security;
if (pSecImpl == NULL)
- return sal_False;
+ return false;
#ifdef ANDROID
{
@@ -354,26 +354,26 @@ static sal_Bool SAL_CALL osl_psz_getHomeDir(oslSecurity Security, sal_Char* pszD
else if (pSecImpl->m_pPasswd.pw_dir != NULL)
strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax);
else
- return sal_False;
+ return false;
}
else if (pSecImpl->m_pPasswd.pw_dir != NULL)
strncpy(pszDirectory, pSecImpl->m_pPasswd.pw_dir, nMax);
else
- return sal_False;
+ return false;
- return sal_True;
+ return true;
}
sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDirectory)
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
sal_Char pszDirectory[PATH_MAX];
pszDirectory[0] = '\0';
bRet = osl_psz_getConfigDir(Security,pszDirectory,sizeof(pszDirectory));
- if ( bRet == sal_True )
+ if ( bRet )
{
rtl_string2UString( pustrDirectory, pszDirectory, rtl_str_getLength( pszDirectory ), osl_getThreadTextEncoding(), OUSTRING_TO_OSTRING_CVTFLAGS );
OSL_ASSERT(*pustrDirectory != NULL);
@@ -387,7 +387,7 @@ sal_Bool SAL_CALL osl_getConfigDir(oslSecurity Security, rtl_uString **pustrDire
#define DOT_CONFIG "/.config"
-static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
+static bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* pszDirectory, sal_uInt32 nMax)
{
sal_Char *pStr = getenv("XDG_CONFIG_HOME");
@@ -397,7 +397,7 @@ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* ps
// a default equal to $HOME/.config should be used.
if (!osl_psz_getHomeDir(Security, pszDirectory, nMax))
- return sal_False;
+ return false;
n = strlen(pszDirectory);
if (n + sizeof(DOT_CONFIG) < nMax)
{
@@ -448,7 +448,7 @@ static sal_Bool SAL_CALL osl_psz_getConfigDir(oslSecurity Security, sal_Char* ps
else
strncpy(pszDirectory, pStr, nMax);
- return sal_True;
+ return true;
}
#undef DOT_CONFIG
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 5d39bac..501346a 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -400,7 +400,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData )
IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData )
{
- bool bValid = (sal_Bool)(sal_uIntPtr)pData;
+ bool bValid = (bool)(sal_uIntPtr)pData;
if( !bValid && ( pRequest || pLink ))
{
DdeTransaction* pReq = 0;
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index 9463da9..21c3213 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -2377,7 +2377,7 @@ void SlideShowImpl::notifySlideEnded (const bool bReverse)
boost::bind<void>(
::boost::mem_fn(&presentation::XSlideShowListener::slideEnded),
_1,
- sal_Bool(bReverse)));
+ bReverse));
}
bool SlideShowImpl::notifyHyperLinkClicked( OUString const& hyperLink )
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
index bea603d..e1f8d95 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport.cxx
@@ -672,7 +672,7 @@ DECLARE_OOXMLEXPORT_TEST(testFdo65655, "fdo65655.docx")
// However - LO assumed that because the 'even' footer is blank - it should ignore the 'Different Odd & Even Pages' flag
// So it did not import it and did not export it
uno::Reference<beans::XPropertySet> xPropertySet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
- sal_Bool bValue = false;
+ bool bValue = false;
xPropertySet->getPropertyValue("HeaderIsShared") >>= bValue;
CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
xPropertySet->getPropertyValue("FooterIsShared") >>= bValue;
@@ -1411,12 +1411,12 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx")
xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag;
CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
- sal_Bool bTheme = sal_False;
+ bool bTheme = false;
for(int i = 0; i < aGrabBag.getLength(); ++i)
{
if (aGrabBag[i].Name == "OOXTheme")
{
- bTheme = sal_True;
+ bTheme = true;
uno::Reference<xml::dom::XDocument> aThemeDom;
CPPUNIT_ASSERT(aGrabBag[i].Value >>= aThemeDom); // PropertyValue of proper type
CPPUNIT_ASSERT(aThemeDom.get()); // Reference not empty
@@ -1435,40 +1435,40 @@ DECLARE_OOXMLEXPORT_TEST(testSmartart, "smartart.docx")
xGroupPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag;
CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
- sal_Bool bData = sal_False, bLayout = sal_False, bQStyle = sal_False, bColor = sal_False, bDrawing = sal_False;
+ bool bData = false, bLayout = false, bQStyle = false, bColor = false, bDrawing = false;
for(int i = 0; i < aGrabBag.getLength(); ++i)
{
if (aGrabBag[i].Name == "OOXData")
{
- bData = sal_True;
+ bData = true;
uno::Reference<xml::dom::XDocument> aDataDom;
CPPUNIT_ASSERT(aGrabBag[i].Value >>= aDataDom); // PropertyValue of proper type
CPPUNIT_ASSERT(aDataDom.get()); // Reference not empty
}
else if (aGrabBag[i].Name == "OOXLayout")
{
- bLayout = sal_True;
+ bLayout = true;
uno::Reference<xml::dom::XDocument> aLayoutDom;
CPPUNIT_ASSERT(aGrabBag[i].Value >>= aLayoutDom); // PropertyValue of proper type
CPPUNIT_ASSERT(aLayoutDom.get()); // Reference not empty
}
else if (aGrabBag[i].Name == "OOXStyle")
{
- bQStyle = sal_True;
+ bQStyle = true;
uno::Reference<xml::dom::XDocument> aStyleDom;
CPPUNIT_ASSERT(aGrabBag[i].Value >>= aStyleDom); // PropertyValue of proper type
CPPUNIT_ASSERT(aStyleDom.get()); // Reference not empty
}
else if (aGrabBag[i].Name == "OOXColor")
{
- bColor = sal_True;
+ bColor = true;
uno::Reference<xml::dom::XDocument> aColorDom;
CPPUNIT_ASSERT(aGrabBag[i].Value >>= aColorDom); // PropertyValue of proper type
CPPUNIT_ASSERT(aColorDom.get()); // Reference not empty
}
else if (aGrabBag[i].Name == "OOXDrawing")
{
- bDrawing = sal_True;
+ bDrawing = true;
uno::Sequence< uno::Any > diagramDrawing;
uno::Reference<xml::dom::XDocument> aDrawingDom;
CPPUNIT_ASSERT(aGrabBag[i].Value >>= diagramDrawing);
@@ -1570,12 +1570,12 @@ DECLARE_OOXMLEXPORT_TEST(testCustomXmlGrabBag, "customxml.docx")
uno::Sequence<beans::PropertyValue> aGrabBag(0);
xTextDocumentPropertySet->getPropertyValue(OUString("InteropGrabBag")) >>= aGrabBag;
CPPUNIT_ASSERT(aGrabBag.hasElements()); // Grab Bag not empty
- sal_Bool CustomXml = sal_False;
+ bool CustomXml = false;
for(int i = 0; i < aGrabBag.getLength(); ++i)
{
if (aGrabBag[i].Name == "OOXCustomXml" || aGrabBag[i].Name == "OOXCustomXmlProps")
{
- CustomXml = sal_True;
+ CustomXml = true;
uno::Reference<xml::dom::XDocument> aCustomXmlDom;
uno::Sequence<uno::Reference<xml::dom::XDocument> > aCustomXmlDomList;
CPPUNIT_ASSERT(aGrabBag[i].Value >>= aCustomXmlDomList); // PropertyValue of proper type
diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
index a533e16..9ea637a 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport.cxx
@@ -171,11 +171,11 @@ DECLARE_OOXMLIMPORT_TEST(testN750935, "n750935.docx")
* xray ThisComponent.StyleFamilies.PageStyles.Default.FooterIsShared
*/
uno::Reference<beans::XPropertySet> xPropertySet(getStyles("PageStyles")->getByName(DEFAULT_STYLE), uno::UNO_QUERY);
- sal_Bool bValue = false;
+ bool bValue = false;
xPropertySet->getPropertyValue("HeaderIsShared") >>= bValue;
- CPPUNIT_ASSERT_EQUAL(sal_Bool(true), bValue);
+ CPPUNIT_ASSERT_EQUAL(true, bValue);
xPropertySet->getPropertyValue("FooterIsShared") >>= bValue;
- CPPUNIT_ASSERT_EQUAL(sal_Bool(true), bValue);
+ CPPUNIT_ASSERT_EQUAL(true, bValue);
}
DECLARE_OOXMLIMPORT_TEST(testN757890, "n757890.docx")
@@ -379,7 +379,7 @@ DECLARE_OOXMLIMPORT_TEST(testN764005, "n764005.docx")
text::TextContentAnchorType eValue;
xPropertySet->getPropertyValue("AnchorType") >>= eValue;
CPPUNIT_ASSERT(eValue != text::TextContentAnchorType_AS_CHARACTER);
- sal_Bool bValue = sal_True;
+ bool bValue = true;
xPropertySet->getPropertyValue("Opaque") >>= bValue;
CPPUNIT_ASSERT_EQUAL(false, bool(bValue));
}
@@ -1149,7 +1149,7 @@ DECLARE_OOXMLIMPORT_TEST(testToolsLineNumbering, "tools-line-numbering.docx")
* xray ThisComponent.getLineNumberingProperties().SeparatorInterval == 3
*/
- sal_Bool bValue = sal_False;
+ bool bValue = false;
sal_Int32 nValue = -1;
uno::Reference< text::XTextDocument > xtextDocument(mxComponent, uno::UNO_QUERY);
@@ -1157,10 +1157,10 @@ DECLARE_OOXMLIMPORT_TEST(testToolsLineNumbering, "tools-line-numbering.docx")
uno::Reference< beans::XPropertySet > xPropertySet = xLineProperties->getLineNumberingProperties();
xPropertySet->getPropertyValue("IsOn") >>= bValue;
- CPPUNIT_ASSERT_EQUAL(sal_True, bValue);
+ CPPUNIT_ASSERT_EQUAL(true, bValue);
xPropertySet->getPropertyValue("CountEmptyLines") >>= bValue;
- CPPUNIT_ASSERT_EQUAL(sal_True, bValue);
+ CPPUNIT_ASSERT_EQUAL(true, bValue);
xPropertySet->getPropertyValue("NumberPosition") >>= nValue;
CPPUNIT_ASSERT_EQUAL(sal_Int32(0), nValue);
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index 96beac3..aff2040 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -95,7 +95,7 @@ bool SwEditShell::AcceptRedlinesInSelection()
{
SET_CURR_SHELL( this );
StartAllAction();
- sal_Bool bRet = GetDoc()->AcceptRedline( *GetCrsr(), true );
+ bool bRet = GetDoc()->AcceptRedline( *GetCrsr(), true );
EndAllAction();
return bRet;
}
@@ -104,7 +104,7 @@ bool SwEditShell::RejectRedlinesInSelection()
{
SET_CURR_SHELL( this );
StartAllAction();
- sal_Bool bRet = GetDoc()->RejectRedline( *GetCrsr(), true );
+ bool bRet = GetDoc()->RejectRedline( *GetCrsr(), true );
EndAllAction();
return bRet;
}
diff --git a/test/source/beans/xpropertyset.cxx b/test/source/beans/xpropertyset.cxx
index b842cd2..c90e6e1 100644
--- a/test/source/beans/xpropertyset.cxx
+++ b/test/source/beans/xpropertyset.cxx
@@ -100,7 +100,7 @@ bool XPropertySet::isPropertyValueChangeable(const OUString& rName)
if (type == getCppuType<sal_Bool>())
{
// boolean type
- sal_Bool bOld = any.get<sal_Bool>();
+ bool bOld = any.get<sal_Bool>();
xPropSet->setPropertyValue(rName, makeAny(!bOld));
}
else if (type == getCppuType<sal_Int8>())
diff --git a/test/source/sheet/datapilotfield.cxx b/test/source/sheet/datapilotfield.cxx
index bf25ba8..1cd175a 100644
--- a/test/source/sheet/datapilotfield.cxx
+++ b/test/source/sheet/datapilotfield.cxx
@@ -50,7 +50,7 @@ void DataPilotField::testSortInfo()
&& aNewSortInfoValue.Mode == aSortInfoValue.Mode && aNewSortInfoValue.IsAscending == aSortInfoValue.IsAscending);
//setting HasSortInfo only makes sense for false, for true the uno implementation does nothing
- sal_Bool bHasSortInfo;
+ bool bHasSortInfo;
OUString aHasSortInfo("HasSortInfo");
xValue = xPropSet->getPropertyValue(aHasSortInfo);
CPPUNIT_ASSERT( xValue >>= bHasSortInfo );
@@ -83,7 +83,7 @@ void DataPilotField::testLayoutInfo()
aNewLayoutInfoValue.AddEmptyLines == aLayoutInfoValue.AddEmptyLines);
//setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing
- sal_Bool bHasLayoutInfo;
+ bool bHasLayoutInfo;
OUString aHasLayoutInfo("HasLayoutInfo");
xValue = xPropSet->getPropertyValue(aHasLayoutInfo);
CPPUNIT_ASSERT( xValue >>= bHasLayoutInfo );
@@ -116,7 +116,7 @@ void DataPilotField::testAutoShowInfo()
aNewAutoShowInfoValue.IsEnabled == aAutoShowInfoValue.IsEnabled);
//setting HasLayoutInfo only makes sense for false, tor true the uno implementation does nothing
- sal_Bool bHasAutoShowInfo;
+ bool bHasAutoShowInfo;
OUString aHasAutoShowInfo("HasAutoShowInfo");
xValue = xPropSet->getPropertyValue(aHasAutoShowInfo);
CPPUNIT_ASSERT( xValue >>= bHasAutoShowInfo );
@@ -149,7 +149,7 @@ void DataPilotField::testReference()
&& aReferenceValue.ReferenceItemType == aNewReferenceValue.ReferenceItemType);
//setting HasReference only makes sense for false, tor true the uno implementation does nothing
- sal_Bool bHasReference;
+ bool bHasReference;
OUString aHasReference("HasReference");
xValue = xPropSet->getPropertyValue(aHasReference);
CPPUNIT_ASSERT( xValue >>= bHasReference );
@@ -169,7 +169,7 @@ void DataPilotField::testIsGroupField()
uno::Reference< beans::XPropertySet > xPropSet(init(),UNO_QUERY_THROW);
uno::Any xValue;
OUString aIsGroupField("IsGroupField");
- sal_Bool bIsGroupField;
+ bool bIsGroupField;
xValue = xPropSet->getPropertyValue(aIsGroupField);
CPPUNIT_ASSERT( xValue >>= bIsGroupField);
diff --git a/test/source/sheet/xdatabaserange.cxx b/test/source/sheet/xdatabaserange.cxx
index 8b7f119..4bd0d27 100644
--- a/test/source/sheet/xdatabaserange.cxx
+++ b/test/source/sheet/xdatabaserange.cxx
@@ -73,15 +73,15 @@ void XDatabaseRange::testGetSortDescriptor()
if (xProp.Name == "IsSortColumns")
{
- sal_Bool bIsSortColumns = sal_True;
+ bool bIsSortColumns = true;
xProp.Value >>= bIsSortColumns;
- CPPUNIT_ASSERT(bIsSortColumns == sal_True);
+ CPPUNIT_ASSERT(bIsSortColumns);
}
else if (xProp.Name == "ContainsHeader")
{
- sal_Bool bContainsHeader = sal_True;
+ bool bContainsHeader = true;
xProp.Value >>= bContainsHeader;
- CPPUNIT_ASSERT(bContainsHeader == sal_True);
+ CPPUNIT_ASSERT(bContainsHeader);
}
else if (xProp.Name == "MaxFieldCount")
{
@@ -96,15 +96,15 @@ void XDatabaseRange::testGetSortDescriptor()
}
else if (xProp.Name == "BindFormatsToContent")
{
- sal_Bool bBindFormatsToContent = sal_False;
+ bool bBindFormatsToContent = false;
xProp.Value >>= bBindFormatsToContent;
- CPPUNIT_ASSERT(bBindFormatsToContent == sal_True);
+ CPPUNIT_ASSERT(bBindFormatsToContent);
}
else if (xProp.Name == "CopyOutputData")
{
- sal_Bool bCopyOutputData = sal_True;
+ bool bCopyOutputData = true;
xProp.Value >>= bCopyOutputData;
- CPPUNIT_ASSERT(bCopyOutputData == sal_False);
+ CPPUNIT_ASSERT(bCopyOutputData == false);
}
else if (xProp.Name == "OutputPosition")
{
@@ -112,9 +112,9 @@ void XDatabaseRange::testGetSortDescriptor()
}
else if (xProp.Name == "IsUserListEnabled")
{
- sal_Bool bIsUserListEnabled = sal_True;
+ bool bIsUserListEnabled = true;
xProp.Value >>= bIsUserListEnabled;
- CPPUNIT_ASSERT(bIsUserListEnabled == sal_False);
+ CPPUNIT_ASSERT(bIsUserListEnabled == false);
}
else if (xProp.Name == "UserListIndex")
diff --git a/test/source/sheet/xprintareas.cxx b/test/source/sheet/xprintareas.cxx
index 298c0d4..5e1fb60 100644
--- a/test/source/sheet/xprintareas.cxx
+++ b/test/source/sheet/xprintareas.cxx
@@ -21,20 +21,18 @@ namespace apitest {
void XPrintAreas::testSetAndGetPrintTitleColumns()
{
uno::Reference< sheet::XPrintAreas > xPrintAreas(init(), UNO_QUERY_THROW);
- sal_Bool testState = true;
- xPrintAreas->setPrintTitleColumns(testState);
+ xPrintAreas->setPrintTitleColumns(sal_True);
- CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleColumns", xPrintAreas->getPrintTitleColumns() == testState);
+ CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleColumns", xPrintAreas->getPrintTitleColumns() == sal_True);
}
void XPrintAreas::testSetAndGetPrintTitleRows()
{
uno::Reference< sheet::XPrintAreas > xPrintAreas(init(), UNO_QUERY_THROW);
- sal_Bool testState = true;
- xPrintAreas->setPrintTitleRows(testState);
+ xPrintAreas->setPrintTitleRows(sal_True);
- CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleRows", xPrintAreas->getPrintTitleRows() == testState);
+ CPPUNIT_ASSERT_MESSAGE("Wrong attribution at PrintTitleRows", xPrintAreas->getPrintTitleRows() == sal_True);
}
// the rest is right now in progress...
diff --git a/testtools/source/bridgetest/bridgetest.cxx b/testtools/source/bridgetest/bridgetest.cxx
index a29ca66..c0be052 100644
--- a/testtools/source/bridgetest/bridgetest.cxx
+++ b/testtools/source/bridgetest/bridgetest.cxx
@@ -124,7 +124,7 @@ public:
};
-static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 )
+static bool equals( const TestElement & rData1, const TestElement & rData2 )
{
check( rData1.Bool == rData2.Bool, "### bool does not match!" );
check( rData1.Char == rData2.Char, "### char does not match!" );
@@ -159,7 +159,7 @@ static sal_Bool equals( const TestElement & rData1, const TestElement & rData2 )
rData1.Any == rData2.Any);
}
-static sal_Bool equals( const TestData & rData1, const TestData & rData2 )
+static bool equals( const TestData & rData1, const TestData & rData2 )
{
sal_Int32 nLen;
@@ -175,16 +175,16 @@ static sal_Bool equals( const TestData & rData1, const TestData & rData2 )
if (! equals( pElements1[nLen], pElements2[nLen] ))
{
check( false, "### sequence element did not match!" );
- return sal_False;
+ return false;
}
}
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
static void assign( TestElement & rData,
- sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
+ bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
sal_Int32 nLong, sal_uInt32 nULong,
sal_Int64 nHyper, sal_uInt64 nUHyper,
@@ -248,7 +248,7 @@ bool testAny(
}
-static sal_Bool performAnyTest( const Reference< XBridgeTest > &xLBT, const TestData &data)
+static bool performAnyTest( const Reference< XBridgeTest > &xLBT, const TestData &data)
{
bool bReturn = true;
bReturn = testAny( data.Byte ,xLBT ) && bReturn;
@@ -283,7 +283,7 @@ static sal_Bool performAnyTest( const Reference< XBridgeTest > &xLBT, const Test
}
-static sal_Bool performSequenceOfCallTest( const Reference < XBridgeTest > &xLBT )
+static bool performSequenceOfCallTest( const Reference < XBridgeTest > &xLBT )
{
sal_Int32 i,nRounds;
sal_Int32 nGlobalIndex = 0;
@@ -328,11 +328,11 @@ public:
-static sal_Bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT )
+static bool performRecursiveCallTest( const Reference < XBridgeTest > & xLBT )
{
xLBT->startRecursiveCall( new ORecursiveCall , 50 );
// on failure, the test would lock up or crash
- return sal_True;
+ return true;
}
class MyClass : public osl::DebugBase<MyClass>, public OWeakObject
@@ -364,7 +364,7 @@ void MyClass::release() throw ()
}
-static sal_Bool performTest(
+static bool performTest(
const Reference<XComponentContext> & xContext,
const Reference<XBridgeTest > & xLBT,
bool noCurrentContext )
@@ -924,9 +924,9 @@ static sal_Bool performTest(
return bRet;
}
-static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
+static bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
{
- sal_Bool bReturn = sal_True;
+ bool bReturn = true;
OUString sCompare = STRING_TEST_CONSTANT;
Reference<XInterface> const x(xLBT->getInterface());
try
@@ -949,7 +949,7 @@ static sal_Bool raiseOnewayException( const Reference < XBridgeTest > & xLBT )
}
-static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
+static bool raiseException( const Reference< XBridgeTest > & xLBT )
{
sal_Int32 nCount = 0;
try
@@ -1027,7 +1027,7 @@ static sal_Bool raiseException( const Reference< XBridgeTest > & xLBT )
}
return (nCount == 3);
}
- return sal_False;
+ return false;
}
/* Returns an acquired sequence
diff --git a/testtools/source/bridgetest/constructors.cxx b/testtools/source/bridgetest/constructors.cxx
index 6c33803..1bc595c 100644
--- a/testtools/source/bridgetest/constructors.cxx
+++ b/testtools/source/bridgetest/constructors.cxx
@@ -68,7 +68,7 @@ private:
void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
throw (css::uno::Exception, std::exception)
{
- sal_Bool arg0 = sal_Bool();
+ bool arg0;
::sal_Int8 arg1 = sal_Int8();
::sal_Int16 arg2 = sal_Int16();
::sal_uInt16 arg3 = sal_uInt16();
@@ -80,7 +80,7 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
double arg9 = double();
OUString arg11;
css::uno::Type arg12;
- sal_Bool arg13 = sal_Bool();
+ bool arg13;
css::uno::Sequence< sal_Bool > arg14;
css::uno::Sequence< ::sal_Int8 > arg15;
css::uno::Sequence< ::sal_Int16 > arg16;
@@ -94,23 +94,23 @@ void Impl::initialize(css::uno::Sequence< css::uno::Any > const & arguments)
css::uno::Sequence< OUString > arg25;
css::uno::Sequence< css::uno::Type > arg26;
css::uno::Sequence< css::uno::Any > arg27;
- sal_Bool arg27b = sal_Bool();
+ bool arg27b;
css::uno::Sequence< css::uno::Sequence< sal_Bool > > arg28;
css::uno::Sequence< css::uno::Sequence< css::uno::Any > > arg29;
- sal_Bool arg29b = sal_Bool();
+ bool arg29b;
css::uno::Sequence< ::test::testtools::bridgetest::TestEnum > arg30;
css::uno::Sequence< ::test::testtools::bridgetest::TestStruct > arg31;
css::uno::Sequence<
::test::testtools::bridgetest::TestPolyStruct< sal_Bool > > arg32;
css::uno::Sequence<
::test::testtools::bridgetest::TestPolyStruct< css::uno::Any > > arg33;
- sal_Bool arg33b = sal_Bool();
+ bool arg33b;
css::uno::Sequence< css::uno::Reference< css::uno::XInterface > > arg34;
::test::testtools::bridgetest::TestEnum arg35;
::test::testtools::bridgetest::TestStruct arg36;
::test::testtools::bridgetest::TestPolyStruct< sal_Bool > arg37;
::test::testtools::bridgetest::TestPolyStruct< css::uno::Any > arg38;
- sal_Bool arg38b = sal_Bool();
+ bool arg38b;
css::uno::Reference< css::uno::XInterface > arg39;
if (!(arguments.getLength() == 40
&& (arguments[0] >>= arg0) && arg0
diff --git a/testtools/source/bridgetest/cppobj.cxx b/testtools/source/bridgetest/cppobj.cxx
index af14d32..d9e5ef7 100644
--- a/testtools/source/bridgetest/cppobj.cxx
+++ b/testtools/source/bridgetest/cppobj.cxx
@@ -70,7 +70,7 @@ inline static Sequence< OUString > getSupportedServiceNames()
static void assign( TestElement & rData,
- sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
+ bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
sal_Int32 nLong, sal_uInt32 nULong,
sal_Int64 nHyper, sal_uInt64 nUHyper,
@@ -97,7 +97,7 @@ static void assign( TestElement & rData,
}
static void assign( TestData & rData,
- sal_Bool bBool, sal_Unicode cChar, sal_Int8 nByte,
+ bool bBool, sal_Unicode cChar, sal_Int8 nByte,
sal_Int16 nShort, sal_uInt16 nUShort,
sal_Int32 nLong, sal_uInt32 nULong,
sal_Int64 nHyper, sal_uInt64 nUHyper,
diff --git a/unoxml/source/xpath/xpathobject.cxx b/unoxml/source/xpath/xpathobject.cxx
index 0272c82..1107840 100644
--- a/unoxml/source/xpath/xpathobject.cxx
+++ b/unoxml/source/xpath/xpathobject.cxx
@@ -95,7 +95,7 @@ namespace XPath
{
::osl::MutexGuard const g(m_rMutex);
- return (sal_Bool) xmlXPathCastToBoolean(m_pXPathObj.get());
+ return xmlXPathCastToBoolean(m_pXPathObj.get()) != 0;
}
/**
commit e5d0a9ad78ceb531018cb49c1d78b0f63ba92995
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 8 11:43:40 2014 +0200
pyuno: sal_Bool->bool
Change-Id: I071c8984cd86b523d8ebae04b5fb2bdc1ac1a5b1
diff --git a/pyuno/inc/pyuno/pyuno.hxx b/pyuno/inc/pyuno/pyuno.hxx
index dbc003c..eef09da 100644
--- a/pyuno/inc/pyuno/pyuno.hxx
+++ b/pyuno/inc/pyuno/pyuno.hxx
@@ -131,7 +131,7 @@ public:
/** returns 1 when the reference points to a python object python object,
otherwise 0.
*/
- sal_Bool is() const
+ bool is() const
{
return m != 0;
}
diff --git a/pyuno/source/module/pyuno_except.cxx b/pyuno/source/module/pyuno_except.cxx
index cf02bd0..63b1e68 100644
--- a/pyuno/source/module/pyuno_except.cxx
+++ b/pyuno/source/module/pyuno_except.cxx
@@ -92,9 +92,9 @@ static PyRef createClass( const OUString & name, const Runtime &runtime )
throw RuntimeException( buf.makeStringAndClear(), Reference< XInterface > () );
}
- sal_Bool isStruct = desc.get()->eTypeClass == typelib_TypeClass_STRUCT;
- sal_Bool isExc = desc.get()->eTypeClass == typelib_TypeClass_EXCEPTION;
- sal_Bool isInterface = desc.get()->eTypeClass == typelib_TypeClass_INTERFACE;
+ bool isStruct = desc.get()->eTypeClass == typelib_TypeClass_STRUCT;
+ bool isExc = desc.get()->eTypeClass == typelib_TypeClass_EXCEPTION;
+ bool isInterface = desc.get()->eTypeClass == typelib_TypeClass_INTERFACE;
if( !isStruct && !isExc && ! isInterface )
{
OUStringBuffer buf;
@@ -206,7 +206,7 @@ bool isInstanceOfStructOrException( PyObject *obj)
return false;
}
-sal_Bool isInterfaceClass( const Runtime &runtime, PyObject * obj )
+bool isInterfaceClass( const Runtime &runtime, PyObject * obj )
{
const ClassSet & set = runtime.getImpl()->cargo->interfaceSet;
return set.find( obj ) != set.end();
diff --git a/pyuno/source/module/pyuno_impl.hxx b/pyuno/source/module/pyuno_impl.hxx
index 02600cd..bca4dc2 100644
--- a/pyuno/source/module/pyuno_impl.hxx
+++ b/pyuno/source/module/pyuno_impl.hxx
@@ -250,7 +250,7 @@ PyObject *PyUNO_invoke( PyObject *object, const char *name , PyObject *args );
com::sun::star::uno::Any PyEnum2Enum( PyObject *obj )
throw ( com::sun::star::uno::RuntimeException );
-sal_Bool PyBool2Bool( PyObject *o, const Runtime & r )
+bool PyBool2Bool( PyObject *o, const Runtime & r )
throw ( com::sun::star::uno::RuntimeException );
sal_Unicode PyChar2Unicode( PyObject *o )
throw ( com::sun::star::uno::RuntimeException );
@@ -263,7 +263,7 @@ const char *typeClassToString( com::sun::star::uno::TypeClass t );
PyRef getObjectFromUnoModule( const Runtime &runtime, const char * object )
throw ( com::sun::star::uno::RuntimeException );
-sal_Bool isInterfaceClass( const Runtime &, PyObject *obj );
+bool isInterfaceClass( const Runtime &, PyObject *obj );
bool isInstanceOfStructOrException( PyObject *obj);
com::sun::star::uno::Sequence<com::sun::star::uno::Type> implementsInterfaces(
const Runtime & runtime, PyObject *obj );
diff --git a/pyuno/source/module/pyuno_runtime.cxx b/pyuno/source/module/pyuno_runtime.cxx
index 343b8f8..b266f01 100644
--- a/pyuno/source/module/pyuno_runtime.cxx
+++ b/pyuno/source/module/pyuno_runtime.cxx
@@ -393,7 +393,7 @@ PyRef Runtime::any2PyObject (const Any &a ) const
}
case typelib_TypeClass_BOOLEAN:
{
- sal_Bool b = sal_Bool();
+ bool b;
if ((a >>= b) && b)
return Py_True;
else
commit 798531135855ad17d4939bee1c920d26032758c6
Author: Noel Grandin <noel at peralex.com>
Date: Thu May 8 11:43:26 2014 +0200
desktop: sal_Bool->bool
Change-Id: I3462a9d4c23c9bc858c1a9d91caa58d87b204ee0
diff --git a/desktop/inc/app.hxx b/desktop/inc/app.hxx
index 8b8affe..984d31e 100644
--- a/desktop/inc/app.hxx
+++ b/desktop/inc/app.hxx
@@ -114,10 +114,10 @@ class Desktop : public Application
return m_aBootstrapStatus;
}
- static sal_Bool isCrashReporterEnabled();
+ static bool isCrashReporterEnabled();
// first-start (ever) related methods
- static sal_Bool CheckExtensionDependencies();
+ static bool CheckExtensionDependencies();
void SynchronizeExtensionRepositories();
void SetSplashScreenText( const OUString& rText );
@@ -136,10 +136,10 @@ class Desktop : public Application
void CreateTemporaryDirectory();
void RemoveTemporaryDirectory();
- sal_Bool InitializeInstallation( const OUString& rAppFilename );
+ bool InitializeInstallation( const OUString& rAppFilename );
bool InitializeConfiguration();
void FlushConfiguration();
- sal_Bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
+ bool InitializeQuickstartMode( const css::uno::Reference< css::uno::XComponentContext >& rxContext );
void HandleBootstrapPathErrors( ::utl::Bootstrap::Status, const OUString& aMsg );
void StartSetup( const OUString& aParameters );
@@ -169,9 +169,9 @@ class Desktop : public Application
static void ShowBackingComponent(Desktop * progress);
- static sal_Bool SaveTasks();
+ static bool SaveTasks();
- static sal_Bool isUIOnSessionShutdownAllowed();
+ static bool isUIOnSessionShutdownAllowed();
// on-demand acceptors
static void createAcceptor(const OUString& aDescription);
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 247ac1d..018f52d 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -721,13 +721,13 @@ bool Desktop::QueryExit()
Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() );
Reference< XPropertySet > xPropertySet(xDesktop, UNO_QUERY_THROW);
- xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any((sal_Bool)sal_True) );
+ xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(true) );
- sal_Bool bExit = xDesktop->terminate();
+ bool bExit = xDesktop->terminate();
if ( !bExit )
{
- xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any((sal_Bool)sal_False) );
+ xPropertySet->setPropertyValue( OUString(SUSPEND_QUICKSTARTVETO ), Any(false) );
}
else
{
@@ -780,7 +780,7 @@ OUString Desktop::CreateErrorMsgString(
{
OUString aMsg;
OUString aFilePath;
- sal_Bool bFileInfo = sal_True;
+ bool bFileInfo = true;
switch ( nFailureCode )
{
@@ -789,7 +789,7 @@ OUString Desktop::CreateErrorMsgString(
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_PATH_INVALID,
OUString( "The installation path is not available." ) );
- bFileInfo = sal_False;
+ bFileInfo = false;
}
break;
@@ -840,7 +840,7 @@ OUString Desktop::CreateErrorMsgString(
{
aMsg = GetMsgString( STR_BOOTSTRAP_ERR_INTERNAL,
OUString( "An internal failure occurred." ) );
- bFileInfo = sal_False;
+ bFileInfo = false;
}
break;
@@ -848,7 +848,7 @@ OUString Desktop::CreateErrorMsgString(
{
// This needs to be improved, see #i67575#:
aMsg = "Invalid version file entry";
- bFileInfo = sal_False;
+ bFileInfo = false;
}
break;
@@ -1073,7 +1073,7 @@ void Desktop::HandleBootstrapErrors(
}
-sal_Bool Desktop::isUIOnSessionShutdownAllowed()
+bool Desktop::isUIOnSessionShutdownAllowed()
{
return officecfg::Office::Recovery::SessionShutdown::DocumentStoreUIEnabled
::get();
@@ -1096,9 +1096,9 @@ sal_Bool Desktop::isUIOnSessionShutdownAllowed()
Because the user may be logged out last time from it's
unix session...
*/
-void impl_checkRecoveryState(sal_Bool& bCrashed ,
- sal_Bool& bRecoveryDataExists,
- sal_Bool& bSessionDataExists )
+void impl_checkRecoveryState(bool& bCrashed ,
+ bool& bRecoveryDataExists,
+ bool& bSessionDataExists )
{
bCrashed = officecfg::Office::Recovery::RecoveryInfo::Crashed::get();
bool elements = officecfg::Office::Recovery::RecoveryList::get()->
@@ -1115,8 +1115,8 @@ void impl_checkRecoveryState(sal_Bool& bCrashed ,
@param bEmergencySave
differs between EMERGENCY_SAVE and RECOVERY
*/
-sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
- sal_Bool bExistsRecoveryData)
+bool impl_callRecoveryUI(bool bEmergencySave ,
+ bool bExistsRecoveryData)
{
static OUString SERVICENAME_RECOVERYUI("com.sun.star.comp.svx.RecoveryUI");
static OUString COMMAND_EMERGENCYSAVE("vnd.sun.star.autorecovery:/doEmergencySave");
@@ -1142,7 +1142,7 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
xURLParser->parseStrict(aURL);
css::uno::Any aRet = xRecoveryUI->dispatchWithReturnValue(aURL, css::uno::Sequence< css::beans::PropertyValue >());
- sal_Bool bRet = sal_False;
+ bool bRet = false;
aRet >>= bRet;
return !bEmergencySave || bRet;
}
@@ -1155,11 +1155,11 @@ sal_Bool impl_callRecoveryUI(sal_Bool bEmergencySave ,
*
*/
-sal_Bool Desktop::SaveTasks()
+bool Desktop::SaveTasks()
{
return impl_callRecoveryUI(
- sal_True , // sal_True => force emergency save
- sal_False);
+ true , // sal_True => force emergency save
+ false);
}
namespace {
@@ -1248,7 +1248,7 @@ void restartOnMac(bool passArguments) {
sal_uInt16 Desktop::Exception(sal_uInt16 nError)
{
// protect against recursive calls
- static sal_Bool bInException = sal_False;
+ static bool bInException = false;
sal_uInt16 nOldMode = Application::GetSystemWindowMode();
Application::SetSystemWindowMode( nOldMode & ~SYSTEMWINDOW_MODE_NOAUTOMODE );
@@ -1260,12 +1260,12 @@ sal_uInt16 Desktop::Exception(sal_uInt16 nError)
Application::Abort( aDoubleExceptionString );
}
- bInException = sal_True;
+ bInException = true;
const CommandLineArgs& rArgs = GetCommandLineArgs();
// save all modified documents ... if it's allowed doing so.
- sal_Bool bRestart = sal_False;
- sal_Bool bAllowRecoveryAndSessionManagement = (
+ bool bRestart = false;
+ bool bAllowRecoveryAndSessionManagement = (
( !rArgs.IsNoRestore() ) && // some use cases of office must work without recovery
( !rArgs.IsHeadless() ) &&
(( nError & EXC_MAJORTYPE ) != EXC_DISPLAY ) && // recovery can't work without UI ... but UI layer seems to be the reason for this crash
@@ -1323,14 +1323,14 @@ void Desktop::AppEvent( const ApplicationEvent& rAppEvent )
struct ExecuteGlobals
{
Reference < css::document::XEventListener > xGlobalBroadcaster;
- sal_Bool bRestartRequested;
- sal_Bool bUseSystemFileDialog;
+ bool bRestartRequested;
+ bool bUseSystemFileDialog;
std::auto_ptr<SvtLanguageOptions> pLanguageOptions;
std::auto_ptr<SvtPathOptions> pPathOptions;
ExecuteGlobals()
- : bRestartRequested( sal_False )
- , bUseSystemFileDialog( sal_True )
+ : bRestartRequested( false )
+ , bUseSystemFileDialog( true )
{}
};
@@ -1520,9 +1520,9 @@ int Desktop::Main()
SetSplashScreenProgress(50);
// Backing Component
- sal_Bool bCrashed = sal_False;
- sal_Bool bExistsRecoveryData = sal_False;
- sal_Bool bExistsSessionData = sal_False;
+ bool bCrashed = false;
+ bool bExistsRecoveryData = false;
+ bool bExistsSessionData = false;
SAL_INFO( "desktop.app", "{ impl_checkRecoveryState" );
impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData);
@@ -1615,7 +1615,7 @@ int Desktop::Main()
if ( !pExecGlobals->bRestartRequested )
{
Application::SetFilterHdl( LINK( this, Desktop, ImplInitFilterHdl ) );
- sal_Bool bTerminateRequested = sal_False;
+ bool bTerminateRequested = false;
// Preload function depends on an initialized sfx application!
SetSplashScreenProgress(75);
@@ -1775,7 +1775,7 @@ int Desktop::doShutdown()
pExecGlobals->pPathOptions.reset( 0 );
SAL_INFO( "desktop.app", "<- dispose path/language options" );
- sal_Bool bRR = pExecGlobals->bRestartRequested;
+ bool bRR = pExecGlobals->bRestartRequested;
delete pExecGlobals, pExecGlobals = NULL;
SAL_INFO( "desktop.app", "FINISHED WITH Destop::Main" );
@@ -1870,7 +1870,7 @@ void Desktop::FlushConfiguration()
css::uno::UNO_QUERY_THROW)->flush();
}
-sal_Bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >& rxContext )
+bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >& rxContext )
{
try
{
@@ -1879,7 +1879,7 @@ sal_Bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >
// this will only be activated if --quickstart was specified on cmdline
SAL_INFO( "desktop.app", "desktop (cd100003) createInstance com.sun.star.office.Quickstart" );
- sal_Bool bQuickstart = shouldLaunchQuickstart();
+ bool bQuickstart = shouldLaunchQuickstart();
// Try to instantiate quickstart service. This service is not mandatory, so
// do nothing if service is not available
@@ -1898,11 +1898,11 @@ sal_Bool Desktop::InitializeQuickstartMode( const Reference< XComponentContext >
{
css::office::Quickstart::createStart(rxContext, bQuickstart);
}
- return sal_True;
+ return true;
}
catch( const ::com::sun::star::uno::Exception& )
{
- return sal_False;
+ return false;
}
}
@@ -2227,28 +2227,28 @@ void Desktop::OpenClients()
if (!rArgs.IsQuickstart())
{
- sal_Bool bShowHelp = sal_False;
+ bool bShowHelp = false;
OUStringBuffer aHelpURLBuffer;
if (rArgs.IsHelpWriter()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start");
} else if (rArgs.IsHelpCalc()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://scalc/start");
} else if (rArgs.IsHelpDraw()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdraw/start");
} else if (rArgs.IsHelpImpress()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://simpress/start");
} else if (rArgs.IsHelpBase()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdatabase/start");
} else if (rArgs.IsHelpBasic()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sbasic/start");
} else if (rArgs.IsHelpMath()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://smath/start");
}
if (bShowHelp) {
@@ -2308,10 +2308,7 @@ void Desktop::OpenClients()
// but no document inside memory corrspond to this data.
// Furter it's not acceptable to recover such documents without any UI. It can
// need some time, where the user wont see any results and wait for finishing the office startup ...
- sal_Bool bAllowRecoveryAndSessionManagement = (
- ( !rArgs.IsNoRestore() ) &&
- ( !rArgs.IsHeadless() )
- );
+ bool bAllowRecoveryAndSessionManagement = ( !rArgs.IsNoRestore() ) && ( !rArgs.IsHeadless() );
if ( ! bAllowRecoveryAndSessionManagement )
{
@@ -2333,9 +2330,9 @@ void Desktop::OpenClients()
}
else
{
- sal_Bool bCrashed = sal_False;
- sal_Bool bExistsRecoveryData = sal_False;
- sal_Bool bExistsSessionData = sal_False;
+ bool bCrashed = false;
+ bool bExistsRecoveryData = false;
+ bool bExistsSessionData = false;
impl_checkRecoveryState(bCrashed, bExistsRecoveryData, bExistsSessionData);
@@ -2349,7 +2346,7 @@ void Desktop::OpenClients()
try
{
bRecovery = impl_callRecoveryUI(
- sal_False , // false => force recovery instead of emergency save
+ false , // false => force recovery instead of emergency save
bExistsRecoveryData);
}
catch(const css::uno::Exception& e)
@@ -2731,7 +2728,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
void Desktop::OpenSplashScreen()
{
const CommandLineArgs &rCmdLine = GetCommandLineArgs();
- sal_Bool bVisible = sal_False;
+ bool bVisible = false;
// Show intro only if this is normal start (e.g. no server, no quickstart, no printing )
if ( !rCmdLine.IsInvisible() &&
!rCmdLine.IsHeadless() &&
@@ -2767,7 +2764,7 @@ void Desktop::OpenSplashScreen()
if ( rCmdLine.HasSplashPipe() )
aSplashService = "com.sun.star.office.PipeSplashScreen";
- bVisible = sal_True;
+ bVisible = true;
Sequence< Any > aSeq( 2 );
aSeq[0] <<= bVisible;
aSeq[1] <<= aAppName;
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 68f7aa0..221afef 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -129,7 +129,7 @@ void Desktop::RegisterServices(Reference< XComponentContext > const & context)
CommandLineArgs& rCmdLine = GetCommandLineArgs();
// Headless mode for FAT Office
- sal_Bool bHeadlessMode = rCmdLine.IsHeadless();
+ bool bHeadlessMode = rCmdLine.IsHeadless();
if ( bHeadlessMode )
Application::EnableHeadlessMode(false);
@@ -160,7 +160,7 @@ namespace
struct CurrentTempURL : public rtl::Static< OUString, CurrentTempURL > {};
}
-static sal_Bool bAccept = sal_False;
+static bool bAccept = false;
void Desktop::createAcceptor(const OUString& aAcceptString)
{
@@ -219,7 +219,7 @@ void Desktop::enableAcceptors()
if (!bAccept)
{
// from now on, all new acceptors are enabled
- bAccept = sal_True;
+ bAccept = true;
// enable existing acceptors by calling initialize(true)
// on all existing acceptors
AcceptorMap &rMap = acceptorMap::get();
diff --git a/desktop/source/app/check_ext_deps.cxx b/desktop/source/app/check_ext_deps.cxx
index 6bc0f30..4bdde01 100644
--- a/desktop/source/app/check_ext_deps.cxx
+++ b/desktop/source/app/check_ext_deps.cxx
@@ -384,7 +384,7 @@ static bool impl_needsCompatCheck()
// Do we need to check the dependencies of the extensions?
// When there are unresolved issues, we can't continue with startup
-sal_Bool Desktop::CheckExtensionDependencies()
+bool Desktop::CheckExtensionDependencies()
{
if (!impl_needsCompatCheck())
{
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 5b0e270..abdbe38 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -159,14 +159,14 @@ DispatchWatcher::~DispatchWatcher()
}
-sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequestsList, bool bNoTerminate )
+bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatchRequestsList, bool bNoTerminate )
{
Reference< XDesktop2 > xDesktop = css::frame::Desktop::create( ::comphelper::getProcessComponentContext() );
DispatchList::const_iterator p;
std::vector< DispatchHolder > aDispatches;
OUString aAsTemplateArg( "AsTemplate" );
- sal_Bool bSetInputFilter = sal_False;
+ bool bSetInputFilter = false;
OUString aForcedInputFilter;
for ( p = aDispatchRequestsList.begin(); p != aDispatchRequestsList.end(); ++p )
@@ -181,7 +181,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
// Set Input Filter
if ( aDispatchRequest.aRequestType == REQUEST_INFILTER )
{
- bSetInputFilter = sal_True;
+ bSetInputFilter = true;
aForcedInputFilter = aDispatchRequest.aURL;
OfficeIPCThread::RequestsCompleted( 1 );
continue;
@@ -424,7 +424,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
OUString aFilterOut=aParam.copy( nPathIndex+1 );
OUString aFilter;
OUString aFilterExt;
- sal_Bool bGuess = sal_False;
+ bool bGuess = false;
if( nFilterIndex >= 0 )
{
@@ -434,7 +434,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
else
{
// Guess
- bGuess = sal_True;
+ bGuess = true;
aFilterExt = aParam.copy( 0, nPathIndex );
}
INetURLObject aOutFilename( aObj );
@@ -515,7 +515,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
aPrinterArgs[0].Name = "FileName";
aPrinterArgs[0].Value <<= aOutFile;
aPrinterArgs[1].Name = "Wait";
- aPrinterArgs[1].Value <<= ( sal_Bool ) sal_True;
+ aPrinterArgs[1].Value <<= true;
xDoc->print( aPrinterArgs );
} else {
if ( aDispatchRequest.aRequestType == REQUEST_PRINTTO )
@@ -530,7 +530,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
// print ( also without user interaction )
Sequence < PropertyValue > aPrinterArgs( 1 );
aPrinterArgs[0].Name = "Wait";
- aPrinterArgs[0].Value <<= ( sal_Bool ) sal_True;
+ aPrinterArgs[0].Value <<= true;
xDoc->print( aPrinterArgs );
}
}
@@ -607,7 +607,7 @@ sal_Bool DispatchWatcher::executeDispatchRequests( const DispatchList& aDispatch
}
}
- return sal_False;
+ return false;
}
diff --git a/desktop/source/app/dispatchwatcher.hxx b/desktop/source/app/dispatchwatcher.hxx
index 1ac7b4d..1fa1c9d 100644
--- a/desktop/source/app/dispatchwatcher.hxx
+++ b/desktop/source/app/dispatchwatcher.hxx
@@ -92,7 +92,7 @@ class DispatchWatcher : public ::cppu::WeakImplHelper1< ::com::sun::star::frame:
static DispatchWatcher* GetDispatchWatcher();
// execute new dispatch request
- sal_Bool executeDispatchRequests( const DispatchList& aDispatches, bool bNoTerminate = false );
+ bool executeDispatchRequests( const DispatchList& aDispatches, bool bNoTerminate = false );
private:
DispatchWatcher();
diff --git a/desktop/source/app/officeipcthread.cxx b/desktop/source/app/officeipcthread.cxx
index 7c1d5d6..4702f85 100644
--- a/desktop/source/app/officeipcthread.cxx
+++ b/desktop/source/app/officeipcthread.cxx
@@ -425,14 +425,14 @@ void OfficeIPCThread::EnableRequests( bool i_bEnable )
}
}
-sal_Bool OfficeIPCThread::AreRequestsPending()
+bool OfficeIPCThread::AreRequestsPending()
{
// Give info about pending requests
::osl::MutexGuard aGuard( GetMutex() );
if ( pGlobalOfficeIPCThread.is() )
return ( pGlobalOfficeIPCThread->mnPendingRequests > 0 );
else
- return sal_False;
+ return false;
}
void OfficeIPCThread::RequestsCompleted( int nCount )
@@ -840,28 +840,28 @@ void OfficeIPCThread::execute()
}
if ( !aCmdLineArgs->IsQuickstart() ) {
- sal_Bool bShowHelp = sal_False;
+ bool bShowHelp = false;
OUStringBuffer aHelpURLBuffer;
if (aCmdLineArgs->IsHelpWriter()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://swriter/start");
} else if (aCmdLineArgs->IsHelpCalc()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://scalc/start");
} else if (aCmdLineArgs->IsHelpDraw()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdraw/start");
} else if (aCmdLineArgs->IsHelpImpress()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://simpress/start");
} else if (aCmdLineArgs->IsHelpBase()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sdatabase/start");
} else if (aCmdLineArgs->IsHelpBasic()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://sbasic/start");
} else if (aCmdLineArgs->IsHelpMath()) {
- bShowHelp = sal_True;
+ bShowHelp = true;
aHelpURLBuffer.appendAscii("vnd.sun.star.help://smath/start");
}
if (bShowHelp) {
@@ -1018,7 +1018,7 @@ static void AddConversionsToDispatchList(
}
-sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest )
+bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequest )
{
// protect the dispatch list
osl::ClearableMutexGuard aGuard( GetMutex() );
@@ -1036,7 +1036,7 @@ sal_Bool OfficeIPCThread::ExecuteCmdLineRequests( ProcessDocumentsRequest& aRequ
AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceOpenList, DispatchWatcher::REQUEST_FORCEOPEN, aEmpty, aRequest.aModule );
AddToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aForceNewList, DispatchWatcher::REQUEST_FORCENEW, aEmpty, aRequest.aModule );
AddConversionsToDispatchList( aDispatchList, aRequest.aCwdUrl, aRequest.aConversionList, aRequest.aConversionParams, aRequest.aPrinterName, aRequest.aModule, aRequest.aConversionOut );
- sal_Bool bShutdown( sal_False );
+ bool bShutdown( false );
if ( pGlobalOfficeIPCThread.is() )
{
diff --git a/desktop/source/app/officeipcthread.hxx b/desktop/source/app/officeipcthread.hxx
index 139f1bc..1015366 100644
--- a/desktop/source/app/officeipcthread.hxx
+++ b/desktop/source/app/officeipcthread.hxx
@@ -114,9 +114,9 @@ class OfficeIPCThread : public salhelper::Thread
// controlling pipe communication during shutdown
static void SetDowning();
static void EnableRequests( bool i_bEnable = true );
- static sal_Bool AreRequestsPending();
+ static bool AreRequestsPending();
static void RequestsCompleted( int n = 1 );
- static sal_Bool ExecuteCmdLineRequests( ProcessDocumentsRequest& );
+ static bool ExecuteCmdLineRequests( ProcessDocumentsRequest& );
// return sal_False if second office
static Status EnableOfficeIPCThread();
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 4b53ec3..f455821 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -211,7 +211,7 @@ void Migration::migrateSettingsIfNecessary()
if (! aImpl.initializeMigration() )
return;
- sal_Bool bResult = sal_False;
+ bool bResult = false;
try
{
bResult = aImpl.doMigration();
@@ -236,12 +236,12 @@ MigrationImpl::~MigrationImpl()
}
// The main entry point for migrating settings
-sal_Bool MigrationImpl::doMigration()
+bool MigrationImpl::doMigration()
{
// compile file list for migration
m_vrFileList = compileFileList();
- sal_Bool result = sal_False;
+ bool result = false;
try
{
NewVersionUIInfo aNewVersionUIInfo;
@@ -313,7 +313,7 @@ sal_Bool MigrationImpl::doMigration()
runServices();
refresh();
- result = sal_True;
+ result = true;
}
catch (css::uno::Exception & e)
{
@@ -352,7 +352,7 @@ void MigrationImpl::setMigrationCompleted()
bool MigrationImpl::checkMigrationCompleted()
{
- sal_Bool bMigrationCompleted = sal_False;
+ bool bMigrationCompleted = false;
try {
uno::Reference< XPropertySet > aPropertySet(
getConfigAccess("org.openoffice.Setup/Office"), uno::UNO_QUERY_THROW);
@@ -362,7 +362,7 @@ bool MigrationImpl::checkMigrationCompleted()
{
// migration prevented - fake it's success
setMigrationCompleted();
- bMigrationCompleted = sal_True;
+ bMigrationCompleted = true;
}
}
catch (const Exception&)
@@ -859,7 +859,7 @@ void MigrationImpl::copyConfig() {
}
}
-uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPath, sal_Bool bUpdate)
+uno::Reference< XNameAccess > MigrationImpl::getConfigAccess(const sal_Char* pPath, bool bUpdate)
{
uno::Reference< XNameAccess > xNameAccess;
try{
@@ -1030,7 +1030,7 @@ void MigrationImpl::runServices()
if (xNameAccess->getElementNames().getLength() > 0)
{
aModuleInfo.sModuleShortName = sModuleShortName;
- aModuleInfo.bHasMenubar = sal_True;
+ aModuleInfo.bHasMenubar = true;
}
}
diff --git a/desktop/source/migration/migration_impl.hxx b/desktop/source/migration/migration_impl.hxx
index 576e7d7..5f8e345 100644
--- a/desktop/source/migration/migration_impl.hxx
+++ b/desktop/source/migration/migration_impl.hxx
@@ -114,7 +114,7 @@ struct MigrationItem
return *this;
}
- sal_Bool operator==(const MigrationItem& aMigrationItem)
+ bool operator==(const MigrationItem& aMigrationItem)
{
return ( aMigrationItem.m_sParentNodeName == m_sParentNodeName &&
aMigrationItem.m_sPrevSibling == m_sPrevSibling &&
@@ -150,10 +150,10 @@ struct MigrationItemInfo
struct MigrationModuleInfo
{
OUString sModuleShortName;
- sal_Bool bHasMenubar;
+ bool bHasMenubar;
::std::vector< OUString > m_vToolbars;
- MigrationModuleInfo():bHasMenubar(sal_False){};
+ MigrationModuleInfo() : bHasMenubar(false) {};
};
@@ -205,7 +205,7 @@ private:
// helpers
strings_vr getAllFiles(const OUString& baseURL) const;
strings_vr applyPatterns(const strings_v& vSet, const strings_v& vPatterns) const;
- css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, sal_Bool rw=sal_False);
+ css::uno::Reference< css::container::XNameAccess > getConfigAccess(const sal_Char* path, bool rw=false);
::std::vector< MigrationModuleInfo > dectectUIChangesForAllModules() const;
void compareOldAndNewConfig(const OUString& sParentNodeName,
@@ -230,7 +230,7 @@ public:
MigrationImpl();
~MigrationImpl();
bool initializeMigration();
- sal_Bool doMigration();
+ bool doMigration();
OUString getOldVersionName();
};
}
diff --git a/desktop/source/migration/services/jvmfwk.cxx b/desktop/source/migration/services/jvmfwk.cxx
index c4420e5..c59fbea 100644
--- a/desktop/source/migration/services/jvmfwk.cxx
+++ b/desktop/source/migration/services/jvmfwk.cxx
@@ -257,8 +257,8 @@ void SAL_CALL JavaMigration::initialize( const css::uno::Sequence< css::uno::Any
*pIter >>= aValue;
if ( aValue.Name == "OldConfiguration" )
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list