[Libreoffice-commits] core.git: chart2/source filter/source framework/source oox/source reportdesign/source sd/source sfx2/source
Stephan Bergmann
sbergman at redhat.com
Thu Apr 23 08:17:56 PDT 2015
chart2/source/tools/InternalDataProvider.cxx | 2 -
filter/source/config/cache/typedetection.cxx | 2 -
filter/source/svg/svgexport.cxx | 8 ++--
framework/source/helper/statusindicatorfactory.cxx | 6 +--
framework/source/jobs/shelljob.cxx | 4 +-
framework/source/layoutmanager/helpers.cxx | 2 -
framework/source/loadenv/loadenv.cxx | 30 +++++++--------
framework/source/services/autorecovery.cxx | 8 ++--
framework/source/services/taskcreatorsrv.cxx | 8 ++--
framework/source/uielement/toolbarmanager.cxx | 4 +-
oox/source/ppt/presentationfragmenthandler.cxx | 2 -
reportdesign/source/ui/report/ReportController.cxx | 10 ++---
sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 2 -
sfx2/source/doc/guisaveas.cxx | 3 -
14 files changed, 45 insertions(+), 46 deletions(-)
New commits:
commit ac1130130b50c6e047629e4387f8bbabe4241494
Author: Stephan Bergmann <sbergman at redhat.com>
Date: Thu Apr 23 17:03:58 2015 +0200
Use comphelper::SequenceAsHashMap::getUnpackedValueOrDefault<bool>
...instead of ...<sal_Bool>; plus ensuing loplugin:implicitboolconversion
Change-Id: I5400e9d3175b9fe9b6088d37fe6bf3275314d7d0
diff --git a/chart2/source/tools/InternalDataProvider.cxx b/chart2/source/tools/InternalDataProvider.cxx
index 0a369a3..39fdf18 100644
--- a/chart2/source/tools/InternalDataProvider.cxx
+++ b/chart2/source/tools/InternalDataProvider.cxx
@@ -1533,7 +1533,7 @@ sal_Bool SAL_CALL InternalDataProvider::isNotANumber( double nNumber )
void SAL_CALL InternalDataProvider::initialize(const uno::Sequence< uno::Any > & _aArguments) throw (uno::RuntimeException, uno::Exception, std::exception)
{
comphelper::SequenceAsHashMap aArgs(_aArguments);
- if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData" ,sal_False) )
+ if ( aArgs.getUnpackedValueOrDefault( "CreateDefaultData", false ) )
createDefaultData();
}
// ____ XCloneable ____
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index a9d1ebd..0a457e2 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -1135,7 +1135,7 @@ void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor)
{
bool bSuccess = false;
OUString sURL = rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_URL(), OUString() );
- bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_READONLY(), sal_False );
+ bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_READONLY(), false );
if ( !sURL.isEmpty() && ::utl::LocalFileHelper::IsLocalFile( INetURLObject( sURL ).GetMainURL( INetURLObject::NO_DECODE ) ) )
{
// OOo uses own file locking mechanics in case of local file
diff --git a/filter/source/svg/svgexport.cxx b/filter/source/svg/svgexport.cxx
index 84572d0b..7ed8a0a 100644
--- a/filter/source/svg/svgexport.cxx
+++ b/filter/source/svg/svgexport.cxx
@@ -332,7 +332,7 @@ SVGExport::SVGExport(
comphelper::SequenceAsHashMap aFilterDataHashMap = rFilterData;
// TinyProfile
- mbIsUseTinyProfile = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_TINYPROFILE, sal_True);
+ mbIsUseTinyProfile = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_TINYPROFILE, true);
// Font Embedding
comphelper::SequenceAsHashMap::const_iterator iter = aFilterDataHashMap.find(SVG_PROP_EMBEDFONTS);
@@ -351,13 +351,13 @@ SVGExport::SVGExport(
}
// Native Decoration
- mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, sal_False);
+ mbIsUseNativeTextDecoration = mbIsUseTinyProfile ? sal_False : aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_NATIVEDECORATION, false);
// Tiny Opacity (supported from SVG Tiny 1.2)
- mbIsUseOpacity = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, sal_True);
+ mbIsUseOpacity = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_OPACITY, true);
// Positioned Characters (Seems to be experimental, as it was always initialized with false)
- mbIsUsePositionedCharacters = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_POSITIONED_CHARACTERS, sal_False);
+ mbIsUsePositionedCharacters = aFilterDataHashMap.getUnpackedValueOrDefault(SVG_PROP_POSITIONED_CHARACTERS, false);
}
diff --git a/framework/source/helper/statusindicatorfactory.cxx b/framework/source/helper/statusindicatorfactory.cxx
index 64a5e7d..3b4001a 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -93,8 +93,8 @@ void SAL_CALL StatusIndicatorFactory::initialize(const css::uno::Sequence< css::
m_xFrame = lArgs.getUnpackedValueOrDefault("Frame" , css::uno::Reference< css::frame::XFrame >());
m_xPluggWindow = lArgs.getUnpackedValueOrDefault("Window" , css::uno::Reference< css::awt::XWindow >() );
- m_bAllowParentShow = lArgs.getUnpackedValueOrDefault("AllowParentShow" , sal_False );
- m_bDisableReschedule = lArgs.getUnpackedValueOrDefault("DisableReschedule", sal_False );
+ m_bAllowParentShow = lArgs.getUnpackedValueOrDefault("AllowParentShow" , false );
+ m_bDisableReschedule = lArgs.getUnpackedValueOrDefault("DisableReschedule", false );
}
}
@@ -358,7 +358,7 @@ void StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
utl::MediaDescriptor lDocArgs(xModel->getArgs());
bHiddenDoc = lDocArgs.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_HIDDEN(),
- sal_False);
+ false);
}
}
diff --git a/framework/source/jobs/shelljob.cxx b/framework/source/jobs/shelljob.cxx
index 0342061..93a4f6a 100644
--- a/framework/source/jobs/shelljob.cxx
+++ b/framework/source/jobs/shelljob.cxx
@@ -88,8 +88,8 @@ css::uno::Any SAL_CALL ShellJob::execute(const css::uno::Sequence< css::beans::N
const OUString sCommand = lOwnCfg.getUnpackedValueOrDefault(PROP_COMMAND , OUString());
const css::uno::Sequence< OUString > lCommandArguments = lOwnCfg.getUnpackedValueOrDefault(PROP_ARGUMENTS , css::uno::Sequence< OUString >());
- const bool bDeactivateJobIfDone = lOwnCfg.getUnpackedValueOrDefault(PROP_DEACTIVATEJOBIFDONE , sal_True );
- const bool bCheckExitCode = lOwnCfg.getUnpackedValueOrDefault(PROP_CHECKEXITCODE , sal_True );
+ const bool bDeactivateJobIfDone = lOwnCfg.getUnpackedValueOrDefault(PROP_DEACTIVATEJOBIFDONE , true );
+ const bool bCheckExitCode = lOwnCfg.getUnpackedValueOrDefault(PROP_CHECKEXITCODE , true );
// replace all might existing place holder.
OUString sRealCommand = impl_substituteCommandVariables(sCommand);
diff --git a/framework/source/layoutmanager/helpers.cxx b/framework/source/layoutmanager/helpers.cxx
index dd6b12e..527eeeb 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -274,7 +274,7 @@ bool implts_isPreviewModel( const uno::Reference< frame::XModel >& xModel )
if ( xModel.is() )
{
utl::MediaDescriptor aDesc( xModel->getArgs() );
- return aDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), sal_False);
+ return aDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), false);
}
else
return false;
diff --git a/framework/source/loadenv/loadenv.cxx b/framework/source/loadenv/loadenv.cxx
index f73754d..270833b 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -282,8 +282,8 @@ void LoadEnv::initializeLoading(const OUString&
// UI mode
const bool bUIMode =
( ( m_eFeature & E_WORK_WITH_UI ) == E_WORK_WITH_UI ) &&
- ( m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_HIDDEN() , sal_False ) == sal_False ) &&
- ( m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_PREVIEW(), sal_False ) == sal_False );
+ ( m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_HIDDEN(), false ) == false ) &&
+ ( m_lMediaDescriptor.getUnpackedValueOrDefault( utl::MediaDescriptor::PROP_PREVIEW(), false ) == false );
initializeUIDefaults(
m_xContext,
@@ -1078,9 +1078,9 @@ bool LoadEnv::impl_loadContent()
// So we prevent our code against wrong using. Why?
// It could be, that using of this progress could make trouble. e.g. He make window visible ...
// but shouldn't do that. But if no indicator is available ... nobody has a chance to do that!
- bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN() , sal_False );
- bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED() , sal_False );
- bool bPreview = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW() , sal_False );
+ bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN() , false );
+ bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED() , false );
+ bool bPreview = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW() , false );
css::uno::Reference< css::task::XStatusIndicator > xProgress = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), css::uno::Reference< css::task::XStatusIndicator >());
if (!bHidden && !bMinimized && !bPreview && !xProgress.is())
@@ -1241,9 +1241,9 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
// or better its not allowed for some requests in general :-)
if (
( ! TargetHelper::matchSpecialTarget(m_sTarget, TargetHelper::E_DEFAULT) ) ||
- (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , sal_False) == sal_True) ||
-// (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN() , sal_False) == sal_True) ||
- (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), sal_False) == sal_True)
+ (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , false) == true) ||
+// (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN() , false) == sal_True) ||
+ (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), false) == true)
)
{
return css::uno::Reference< css::frame::XFrame >();
@@ -1330,7 +1330,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchAlreadyLoaded()
// Hidden frames are special.
// They will be used as "last chance" if there is no visible frame pointing to the same model.
// Safe the result but continue with current loop might be looking for other visible frames.
- bool bIsHidden = lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False);
+ bool bIsHidden = lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false);
if (
( bIsHidden ) &&
( ! xHiddenTask.is())
@@ -1396,7 +1396,7 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
// It doesn't matter if somewhere wants to create a new view
// or open a new untitled document ...
// The only exception form that - hidden frames!
- if (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False) == sal_True)
+ if (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false) == true)
return css::uno::Reference< css::frame::XFrame >();
css::uno::Reference< css::frame::XFramesSupplier > xSupplier( css::frame::Desktop::create( m_xContext ), css::uno::UNO_QUERY);
@@ -1413,8 +1413,8 @@ css::uno::Reference< css::frame::XFrame > LoadEnv::impl_searchRecycleTarget()
// These states indicates a wish for creation of a new view in general.
if (
- (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , sal_False) == sal_True) ||
- (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), sal_False) == sal_True)
+ (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE() , false) == true) ||
+ (m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(), false) == true)
)
{
return css::uno::Reference< css::frame::XFrame >();
@@ -1531,8 +1531,8 @@ void LoadEnv::impl_reactForLoadingState()
// Note: We show new created frames here only.
// We dont hide already visible frames here ...
css::uno::Reference< css::awt::XWindow > xWindow = m_xTargetFrame->getContainerWindow();
- bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), sal_False);
- bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(), sal_False);
+ bool bHidden = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(), false);
+ bool bMinimized = m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(), false);
if (bMinimized)
{
@@ -1649,7 +1649,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const css::uno::Reference< css::awt::X
if ( pWindow )
{
bool const preview( m_lMediaDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_PREVIEW(), sal_False) );
+ utl::MediaDescriptor::PROP_PREVIEW(), false) );
bool bForceFrontAndFocus(false);
if ( !preview )
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 31051e5..5bf18dc 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -1357,7 +1357,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
// independent from the configuration entry.
if ((eNewJob & AutoRecovery::E_SET_AUTOSAVE_STATE) == AutoRecovery::E_SET_AUTOSAVE_STATE)
{
- bool bOn = lArgs.getUnpackedValueOrDefault(PROP_AUTOSAVE_STATE, sal_True);
+ bool bOn = lArgs.getUnpackedValueOrDefault(PROP_AUTOSAVE_STATE, true);
if (bOn)
{
// dont enable AutoSave hardly !
@@ -1379,7 +1379,7 @@ void SAL_CALL AutoRecovery::dispatch(const css::util::URL&
m_eJob |= eNewJob;
- bAsync = lArgs.getUnpackedValueOrDefault(PROP_DISPATCH_ASYNCHRON, sal_False);
+ bAsync = lArgs.getUnpackedValueOrDefault(PROP_DISPATCH_ASYNCHRON, false);
aParams = DispatchParams(lArgs, static_cast< css::frame::XDispatch* >(this));
// Hold this instance alive till the asynchronous operation will be finished.
@@ -2471,7 +2471,7 @@ void AutoRecovery::implts_registerDocument(const css::uno::Reference< css::frame
// check if this document must be ignored for recovery !
// Some use cases dont wish support for AutoSave/Recovery ... as e.g. OLE-Server / ActiveX Control etcpp.
- bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), sal_False);
+ bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), false);
if (bNoAutoSave)
return;
@@ -2889,7 +2889,7 @@ bool lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo& rInfo)
return true;
utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
- bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), sal_False);
+ bool bNoAutoSave = lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(), false);
return bNoAutoSave;
}
diff --git a/framework/source/services/taskcreatorsrv.cxx b/framework/source/services/taskcreatorsrv.cxx
index b5b0399..e26f481 100644
--- a/framework/source/services/taskcreatorsrv.cxx
+++ b/framework/source/services/taskcreatorsrv.cxx
@@ -140,13 +140,13 @@ css::uno::Reference< css::uno::XInterface > SAL_CALL TaskCreatorService::createI
css::uno::Reference< css::frame::XFrame > xParentFrame = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_PARENTFRAME) , css::uno::Reference< css::frame::XFrame >());
OUString sFrameName = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_FRAMENAME) , OUString() );
- bool bVisible = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_MAKEVISIBLE) , sal_False );
- bool bCreateTopWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CREATETOPWINDOW) , sal_True );
+ bool bVisible = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_MAKEVISIBLE) , false );
+ bool bCreateTopWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CREATETOPWINDOW) , true );
// only possize=[0,0,0,0] triggers default handling of vcl !
css::awt::Rectangle aPosSize = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_POSSIZE) , css::awt::Rectangle(0, 0, 0, 0) );
css::uno::Reference< css::awt::XWindow > xContainerWindow = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_CONTAINERWINDOW) , css::uno::Reference< css::awt::XWindow >() );
- bool bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , sal_False );
- bool bEnableTitleBarUpdate = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_ENABLE_TITLEBARUPDATE) , sal_True );
+ bool bSupportPersistentWindowState = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_SUPPORTPERSISTENTWINDOWSTATE) , false );
+ bool bEnableTitleBarUpdate = lArgs.getUnpackedValueOrDefault(OUString(ARGUMENT_ENABLE_TITLEBARUPDATE) , true );
// We use FrameName property to set it as API name of the new created frame later.
// But those frame names must be different from the set of special target names as e.g. _blank, _self etcpp !
diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx
index 85ddc81..4de9df4 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1644,8 +1644,8 @@ bool ToolBarManager::IsPluginMode() const
{
Sequence< PropertyValue > aSeq = xModel->getArgs();
utl::MediaDescriptor aMediaDescriptor( aSeq );
- bPluginMode = aMediaDescriptor.getUnpackedValueOrDefault< sal_Bool >(
- utl::MediaDescriptor::PROP_VIEWONLY(), sal_False );
+ bPluginMode = aMediaDescriptor.getUnpackedValueOrDefault(
+ utl::MediaDescriptor::PROP_VIEWONLY(), false );
}
}
diff --git a/oox/source/ppt/presentationfragmenthandler.cxx b/oox/source/ppt/presentationfragmenthandler.cxx
index 1d06a5b..84dabe5 100644
--- a/oox/source/ppt/presentationfragmenthandler.cxx
+++ b/oox/source/ppt/presentationfragmenthandler.cxx
@@ -377,7 +377,7 @@ void PresentationFragmentHandler::finalizeImport()
// writing back the original PageCount of this document, it can be accessed from the XModel
// via getArgs after the import.
rFilterData["OriginalPageCount"] = makeAny(nPageCount);
- bool bImportNotesPages = rFilterData.getUnpackedValueOrDefault("ImportNotesPages", sal_True);
+ bool bImportNotesPages = rFilterData.getUnpackedValueOrDefault("ImportNotesPages", true);
OUString aPageRange = rFilterData.getUnpackedValueOrDefault("PageRange", OUString());
if( !aPageRange.getLength() )
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 6733961..bd7f17e 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -3287,13 +3287,13 @@ void OReportController::createDateTime(const Sequence< PropertyValue >& _aArgs)
uno::Reference< report::XSection> xSection = aMap.getUnpackedValueOrDefault(PROPERTY_SECTION,uno::Reference< report::XSection>());
OUString sFunction;
- bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE,sal_False);
+ bool bDate = aMap.getUnpackedValueOrDefault(PROPERTY_DATE_STATE, false);
if ( bDate )
{
sFunction = "TODAY()";
createControl(aMap.getAsConstPropertyValueList(),xSection,sFunction);
}
- bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE,sal_False);
+ bool bTime = aMap.getUnpackedValueOrDefault(PROPERTY_TIME_STATE, false);
if ( bTime )
{
sFunction = "TIMEVALUE(NOW())";
@@ -3316,7 +3316,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
}
SequenceAsHashMap aMap(_aArgs);
- bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE,sal_False);
+ bool bStateOfPage = aMap.getUnpackedValueOrDefault(PROPERTY_STATE, false);
OUString sFunction( ModuleRes(STR_RPT_PN_PAGE).toString() );
sFunction = sFunction.replaceFirst("#PAGENUMBER#", "PageNumber()");
@@ -3327,7 +3327,7 @@ void OReportController::createPageNumber(const Sequence< PropertyValue >& _aArgs
sFunction = sFunction.replaceFirst("#PAGECOUNT#", "PageCount()");
}
- bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON,sal_True);
+ bool bInPageHeader = aMap.getUnpackedValueOrDefault(PROPERTY_PAGEHEADERON, true);
createControl(_aArgs,bInPageHeader ? m_xReportDefinition->getPageHeader() : m_xReportDefinition->getPageFooter(),sFunction);
}
@@ -3939,7 +3939,7 @@ void OReportController::createGroupSection(const bool _bUndo,const bool _bHeader
if ( m_xReportDefinition.is() )
{
const SequenceAsHashMap aMap(_aArgs);
- const bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), sal_False);
+ const bool bSwitchOn = aMap.getUnpackedValueOrDefault(_bHeader ? OUString(PROPERTY_HEADERON) : OUString(PROPERTY_FOOTERON), false);
uno::Reference< report::XGroup> xGroup = aMap.getUnpackedValueOrDefault(PROPERTY_GROUP,uno::Reference< report::XGroup>());
if ( xGroup.is() )
{
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index 7ae9508..cba8afb 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -90,7 +90,7 @@ void SAL_CALL BasicToolBarFactory::initialize (const Sequence<Any>& aArguments)
utl::MediaDescriptor aDescriptor (mxController->getModel()->getArgs());
if ( ! aDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_PREVIEW(),
- sal_False))
+ false))
{
// Register the factory for its supported tool bars.
Reference<XControllerManager> xControllerManager(mxController, UNO_QUERY_THROW);
diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx
index ef848e0..5437493 100644
--- a/sfx2/source/doc/guisaveas.cxx
+++ b/sfx2/source/doc/guisaveas.cxx
@@ -1253,8 +1253,7 @@ OUString ModelData_Impl::GetRecommendedDir( const OUString& aSuggestedDir )
OUString aRecommendedDir;
if ( ( !aSuggestedDir.isEmpty() || GetStorable()->hasLocation() )
- && !GetMediaDescr().getUnpackedValueOrDefault("RepairPackage",
- sal_False ) )
+ && !GetMediaDescr().getUnpackedValueOrDefault("RepairPackage", false ) )
{
INetURLObject aLocation;
if ( !aSuggestedDir.isEmpty() )
More information about the Libreoffice-commits
mailing list