summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2016-04-20 17:16:24 +0200
committerStephan Bergmann <sbergman@redhat.com>2016-04-20 17:25:39 +0200
commitf8ce00be4ea1b4f69dfe37c641001ec935f86792 (patch)
tree2d4f5614891e74fe62f59b1df0e89dbbb8cbd02e
parent6009d338236733006e69b184bfcfab355fa81493 (diff)
loplugin:salbool: Automatic rewrite of sal_False/True
Change-Id: Ie48c55954d479092ef0447711c442b760905a2b4
-rw-r--r--desktop/source/app/app.cxx4
-rw-r--r--desktop/source/app/appinit.cxx2
-rw-r--r--desktop/source/app/dispatchwatcher.cxx24
-rw-r--r--desktop/source/deployment/registry/component/dp_component.cxx4
-rw-r--r--desktop/source/deployment/registry/executable/dp_executable.cxx4
-rw-r--r--desktop/source/deployment/registry/package/dp_package.cxx2
-rw-r--r--desktop/source/lib/init.cxx2
-rw-r--r--desktop/source/lib/lokinteractionhandler.cxx2
-rw-r--r--desktop/source/migration/migration.cxx10
9 files changed, 27 insertions, 27 deletions
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index cee382f6cf51..7fb2c5bb0174 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -2329,7 +2329,7 @@ void Desktop::HandleAppEvent( const ApplicationEvent& rAppEvent )
// to true inside attachFrame(). But setComponent() reset this state every time ...
xBackingFrame->setComponent(xBackingWin, xStartModule);
xStartModule->attachFrame(xBackingFrame);
- xContainerWindow->setVisible(sal_True);
+ xContainerWindow->setVisible(true);
vcl::Window* pCompWindow = VCLUnoHelper::GetWindow(xBackingFrame->getComponentWindow());
if (pCompWindow)
@@ -2567,7 +2567,7 @@ void Desktop::ShowBackingComponent(Desktop * progress)
{
progress->CloseSplashScreen();
}
- xContainerWindow->setVisible(sal_True);
+ xContainerWindow->setVisible(true);
}
}
diff --git a/desktop/source/app/appinit.cxx b/desktop/source/app/appinit.cxx
index 4f5b284d184e..105ade387159 100644
--- a/desktop/source/app/appinit.cxx
+++ b/desktop/source/app/appinit.cxx
@@ -175,7 +175,7 @@ class enable
Sequence<Any> m_aSeq;
public:
enable() : m_aSeq(1) {
- m_aSeq[0] <<= sal_True;
+ m_aSeq[0] <<= true;
}
void operator() (const AcceptorMap::value_type& val) {
if (val.second.is()) {
diff --git a/desktop/source/app/dispatchwatcher.cxx b/desktop/source/app/dispatchwatcher.cxx
index 7279a8f0368d..257b5a6d94b8 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -261,16 +261,16 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
{
// documents opened for printing are opened readonly because they must be opened as a new document and this
// document could be open already
- aArgs[1].Value <<= sal_True;
+ aArgs[1].Value <<= true;
// always open a new document for printing, because it must be disposed afterwards
- aArgs[2].Value <<= sal_True;
+ aArgs[2].Value <<= true;
// printing is done in a hidden view
- aArgs[3].Value <<= sal_True;
+ aArgs[3].Value <<= true;
// load document for printing without user interaction
- aArgs[4].Value <<= sal_True;
+ aArgs[4].Value <<= true;
// hidden documents should never be put into open tasks
aTarget = "_blank";
@@ -337,7 +337,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
// window!!
Sequence < PropertyValue > aArgs2(1);
aArgs2[0].Name = "SynchronMode";
- aArgs2[0].Value <<= sal_True;
+ aArgs2[0].Value <<= true;
Reference < XNotifyingDispatch > xDisp( xDispatcher, UNO_QUERY );
if ( xDisp.is() )
xDisp->dispatchWithNotification( aURL, aArgs2, this );
@@ -368,9 +368,9 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
aArgs.realloc( nIndex+1 );
aArgs[nIndex].Name = aAsTemplateArg;
if ( aDispatchRequest.aRequestType == REQUEST_FORCENEW )
- aArgs[nIndex].Value <<= sal_True;
+ aArgs[nIndex].Value <<= true;
else
- aArgs[nIndex].Value <<= sal_False;
+ aArgs[nIndex].Value <<= false;
}
// if we are called in viewmode, open document read-only
@@ -378,7 +378,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
sal_Int32 nIndex = aArgs.getLength();
aArgs.realloc(nIndex+1);
aArgs[nIndex].Name = "ReadOnly";
- aArgs[nIndex].Value <<= sal_True;
+ aArgs[nIndex].Value <<= true;
}
// if we are called with -start set Start in mediadescriptor
@@ -386,7 +386,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
sal_Int32 nIndex = aArgs.getLength();
aArgs.realloc(nIndex+1);
aArgs[nIndex].Name = "StartPresentation";
- aArgs[nIndex].Value <<= sal_True;
+ aArgs[nIndex].Value <<= true;
}
// Force input filter, if possible
@@ -508,7 +508,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
sal_Int32 nFilterOptionsIndex = aFilter.indexOf(':');
Sequence<PropertyValue> conversionProperties( 0 < nFilterOptionsIndex ? 3 : 2 );
conversionProperties[0].Name = "Overwrite";
- conversionProperties[0].Value <<= sal_True;
+ conversionProperties[0].Value <<= true;
conversionProperties[1].Name = "FilterName";
if( 0 < nFilterOptionsIndex )
@@ -649,7 +649,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
{
Reference < XCloseable > xClose( xDoc, UNO_QUERY );
if ( xClose.is() )
- xClose->close( sal_True );
+ xClose->close( true );
else
{
Reference < XComponent > xComp( xDoc, UNO_QUERY );
@@ -674,7 +674,7 @@ bool DispatchWatcher::executeDispatchRequests( const std::vector<DispatchRequest
aArgs[0].Name = "Referer";
aArgs[0].Value <<= OUString("private:OpenEvent");
aArgs[1].Name = "SynchronMode";
- aArgs[1].Value <<= sal_True;
+ aArgs[1].Value <<= true;
for ( size_t n = 0; n < aDispatches.size(); n++ )
{
diff --git a/desktop/source/deployment/registry/component/dp_component.cxx b/desktop/source/deployment/registry/component/dp_component.cxx
index 51d0f078d42b..80d6e063d0e7 100644
--- a/desktop/source/deployment/registry/component/dp_component.cxx
+++ b/desktop/source/deployment/registry/component/dp_component.cxx
@@ -1624,8 +1624,8 @@ BackendImpl::OtherPlatformPackageImpl::isRegistered_(
::rtl::Reference<AbortChannel> const& /* abortChannel */,
Reference<XCommandEnvironment> const& /* xCmdEnv */ )
{
- return beans::Optional<beans::Ambiguous<sal_Bool> >(sal_True,
- beans::Ambiguous<sal_Bool>(sal_True, sal_False));
+ return beans::Optional<beans::Ambiguous<sal_Bool> >(true,
+ beans::Ambiguous<sal_Bool>(true, false));
}
void
diff --git a/desktop/source/deployment/registry/executable/dp_executable.cxx b/desktop/source/deployment/registry/executable/dp_executable.cxx
index 0b7841ede322..97d38f7a4c50 100644
--- a/desktop/source/deployment/registry/executable/dp_executable.cxx
+++ b/desktop/source/deployment/registry/executable/dp_executable.cxx
@@ -213,9 +213,9 @@ BackendImpl::ExecutablePackageImpl::isRegistered_(
{
bool registered = getMyBackend()->hasActiveEntry(getURL());
return beans::Optional< beans::Ambiguous<sal_Bool> >(
- sal_True /* IsPresent */,
+ true /* IsPresent */,
beans::Ambiguous<sal_Bool>(
- registered, sal_False /* IsAmbiguous */ ) );
+ registered, false /* IsAmbiguous */ ) );
}
void BackendImpl::ExecutablePackageImpl::processPackage_(
diff --git a/desktop/source/deployment/registry/package/dp_package.cxx b/desktop/source/deployment/registry/package/dp_package.cxx
index 5ee41ed53929..01a15b425e4a 100644
--- a/desktop/source/deployment/registry/package/dp_package.cxx
+++ b/desktop/source/deployment/registry/package/dp_package.cxx
@@ -765,7 +765,7 @@ sal_Bool BackendImpl::PackageImpl::checkDependencies(
throw deployment::ExtensionRemovedException();
DescriptionInfoset info = getDescriptionInfoset();
if (!info.hasDescription())
- return sal_True;
+ return true;
return checkDependencies(xCmdEnv, info);
}
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 0f46a04621dc..d74ae31332ba 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -690,7 +690,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis, const char* sUrl, const cha
}
MediaDescriptor aSaveMediaDescriptor;
- aSaveMediaDescriptor["Overwrite"] <<= sal_True;
+ aSaveMediaDescriptor["Overwrite"] <<= true;
aSaveMediaDescriptor["FilterName"] <<= aFilterName;
aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS()] <<= aFilterOptions;
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx
index df8345c6807a..8ebff623b254 100644
--- a/desktop/source/lib/lokinteractionhandler.cxx
+++ b/desktop/source/lib/lokinteractionhandler.cxx
@@ -318,7 +318,7 @@ sal_Bool SAL_CALL LOKInteractionHandler::handleInteractionRequest(
// TODO: perform more interactions 'for real' like the above
selectApproved(rContinuations);
- return sal_True;
+ return true;
}
void LOKInteractionHandler::SetPassword(char const*const pPassword)
diff --git a/desktop/source/migration/migration.cxx b/desktop/source/migration/migration.cxx
index 5e7f6e1f26d1..c2f81bcb8b22 100644
--- a/desktop/source/migration/migration.cxx
+++ b/desktop/source/migration/migration.cxx
@@ -264,7 +264,7 @@ bool MigrationImpl::doMigration()
uno::Reference< ui::XUIConfigurationManager > xCfgManager = aNewVersionUIInfo.getConfigManager(vModulesInfo[i].sModuleShortName);
if (vModulesInfo[i].bHasMenubar) {
- uno::Reference< container::XIndexContainer > xOldVersionMenuSettings(xOldCfgManager->getSettings(sMenubarResourceURL, sal_True), uno::UNO_QUERY);
+ uno::Reference< container::XIndexContainer > xOldVersionMenuSettings(xOldCfgManager->getSettings(sMenubarResourceURL, true), uno::UNO_QUERY);
uno::Reference< container::XIndexContainer > xNewVersionMenuSettings = aNewVersionUIInfo.getNewMenubarSettings(vModulesInfo[i].sModuleShortName);
OUString sParent;
compareOldAndNewConfig(sParent, xOldVersionMenuSettings, xNewVersionMenuSettings, sMenubarResourceURL);
@@ -277,7 +277,7 @@ bool MigrationImpl::doMigration()
OUString sToolbarName = vModulesInfo[i].m_vToolbars[j];
OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
- uno::Reference< container::XIndexContainer > xOldVersionToolbarSettings(xOldCfgManager->getSettings(sToolbarResourceURL, sal_True), uno::UNO_QUERY);
+ uno::Reference< container::XIndexContainer > xOldVersionToolbarSettings(xOldCfgManager->getSettings(sToolbarResourceURL, true), uno::UNO_QUERY);
uno::Reference< container::XIndexContainer > xNewVersionToolbarSettings = aNewVersionUIInfo.getNewToolbarSettings(vModulesInfo[i].sModuleShortName, sToolbarName);
OUString sParent;
compareOldAndNewConfig(sParent, xOldVersionToolbarSettings, xNewVersionToolbarSettings, sToolbarResourceURL);
@@ -321,7 +321,7 @@ void MigrationImpl::setMigrationCompleted()
{
try {
uno::Reference< XPropertySet > aPropertySet(getConfigAccess("org.openoffice.Setup/Office", true), uno::UNO_QUERY_THROW);
- aPropertySet->setPropertyValue("MigrationCompleted", uno::makeAny(sal_True));
+ aPropertySet->setPropertyValue("MigrationCompleted", uno::makeAny(true));
uno::Reference< XChangesBatch >(aPropertySet, uno::UNO_QUERY_THROW)->commitChanges();
} catch (...) {
// fail silently
@@ -1230,7 +1230,7 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules
if (vModulesInfo[i].bHasMenubar) {
m_lNewVersionMenubarSettingsSeq[i].Name = vModulesInfo[i].sModuleShortName;
- m_lNewVersionMenubarSettingsSeq[i].Value <<= xCfgManager->getSettings(sMenubarResourceURL, sal_True);
+ m_lNewVersionMenubarSettingsSeq[i].Value <<= xCfgManager->getSettings(sMenubarResourceURL, true);
}
sal_Int32 nToolbars = vModulesInfo[i].m_vToolbars.size();
@@ -1241,7 +1241,7 @@ void NewVersionUIInfo::init(const ::std::vector< MigrationModuleInfo >& vModules
OUString sToolbarResourceURL = sToolbarResourcePre + sToolbarName;
lPropSeq[j].Name = sToolbarName;
- lPropSeq[j].Value <<= xCfgManager->getSettings(sToolbarResourceURL, sal_True);
+ lPropSeq[j].Value <<= xCfgManager->getSettings(sToolbarResourceURL, true);
}
m_lNewVersionToolbarSettingsSeq[i].Name = vModulesInfo[i].sModuleShortName;