[Libreoffice-commits] core.git: 2 commits - connectivity/qa connectivity/source cui/source include/connectivity
Noel Grandin
noel at peralex.com
Wed Apr 16 02:52:33 PDT 2014
connectivity/qa/connectivity/mork/DriverTest.cxx | 4
connectivity/source/commontools/CommonTools.cxx | 4
connectivity/source/commontools/DateConversion.cxx | 4
connectivity/source/commontools/FDatabaseMetaDataResultSet.cxx | 16
connectivity/source/commontools/RowFunctionParser.cxx | 6
connectivity/source/commontools/TColumnsHelper.cxx | 10
connectivity/source/commontools/TDatabaseMetaDataBase.cxx | 18
connectivity/source/commontools/TIndexColumns.cxx | 2
connectivity/source/commontools/TIndexes.cxx | 6
connectivity/source/commontools/TKeys.cxx | 6
connectivity/source/commontools/TPrivilegesResultSet.cxx | 10
connectivity/source/commontools/TSkipDeletedSet.cxx | 16
connectivity/source/commontools/TSortIndex.cxx | 4
connectivity/source/commontools/dbconversion.cxx | 10
connectivity/source/commontools/dbexception.cxx | 2
connectivity/source/commontools/dbtools.cxx | 14
connectivity/source/commontools/dbtools2.cxx | 14
connectivity/source/commontools/filtermanager.cxx | 2
connectivity/source/commontools/parameters.cxx | 2
connectivity/source/commontools/predicateinput.cxx | 6
connectivity/source/commontools/statementcomposer.cxx | 8
connectivity/source/cpool/ZConnectionPool.cxx | 12
connectivity/source/cpool/ZConnectionPool.hxx | 2
connectivity/source/cpool/ZPoolCollection.cxx | 26 -
connectivity/source/cpool/ZPoolCollection.hxx | 8
connectivity/source/drivers/ado/ADatabaseMetaData.cxx | 26 -
connectivity/source/drivers/calc/CConnection.cxx | 4
connectivity/source/drivers/calc/CDatabaseMetaData.cxx | 22 -
connectivity/source/drivers/calc/CResultSet.cxx | 14
connectivity/source/drivers/calc/CTable.cxx | 38 +-
connectivity/source/drivers/calc/Cservices.cxx | 2
connectivity/source/drivers/dbase/DCode.cxx | 2
connectivity/source/drivers/dbase/DDatabaseMetaData.cxx | 10
connectivity/source/drivers/dbase/DIndex.cxx | 54 +-
connectivity/source/drivers/dbase/DIndexIter.cxx | 16
connectivity/source/drivers/dbase/DResultSet.cxx | 14
connectivity/source/drivers/dbase/DTable.cxx | 132 +++----
connectivity/source/drivers/dbase/DTables.cxx | 2
connectivity/source/drivers/dbase/Dservices.cxx | 2
connectivity/source/drivers/dbase/dindexnode.cxx | 64 +--
connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx | 37 -
connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx | 26 -
connectivity/source/drivers/file/FConnection.cxx | 16
connectivity/source/drivers/file/FDatabaseMetaData.cxx | 68 +--
connectivity/source/drivers/file/FPreparedStatement.cxx | 4
connectivity/source/drivers/file/FResultSet.cxx | 156 ++++----
connectivity/source/drivers/file/FStatement.cxx | 8
connectivity/source/drivers/file/FTable.cxx | 16
connectivity/source/drivers/file/fanalyzer.cxx | 10
connectivity/source/drivers/file/fcode.cxx | 36 -
connectivity/source/drivers/file/fcomp.cxx | 14
connectivity/source/drivers/firebird/Connection.cxx | 6
connectivity/source/drivers/firebird/Connection.hxx | 8
connectivity/source/drivers/firebird/DatabaseMetaData.cxx | 2
connectivity/source/drivers/firebird/Driver.cxx | 2
connectivity/source/drivers/firebird/ResultSet.hxx | 2
connectivity/source/drivers/firebird/Services.cxx | 2
connectivity/source/drivers/firebird/StatementCommonBase.cxx | 2
connectivity/source/drivers/firebird/SubComponent.hxx | 2
connectivity/source/drivers/flat/EConnection.cxx | 4
connectivity/source/drivers/flat/EResultSet.cxx | 10
connectivity/source/drivers/flat/ETable.cxx | 46 +-
connectivity/source/drivers/flat/Eservices.cxx | 2
connectivity/source/drivers/hsqldb/HCatalog.cxx | 2
connectivity/source/drivers/hsqldb/HColumns.cxx | 8
connectivity/source/drivers/hsqldb/HDriver.cxx | 10
connectivity/source/drivers/hsqldb/HStorageMap.cxx | 4
connectivity/source/drivers/hsqldb/HTable.cxx | 6
connectivity/source/drivers/hsqldb/HTables.cxx | 4
connectivity/source/drivers/hsqldb/HView.cxx | 2
connectivity/source/drivers/hsqldb/HViews.cxx | 8
connectivity/source/drivers/hsqldb/Hservices.cxx | 2
connectivity/source/drivers/jdbc/DatabaseMetaData.cxx | 38 +-
connectivity/source/drivers/jdbc/DriverPropertyInfo.cxx | 2
connectivity/source/drivers/jdbc/JConnection.cxx | 12
connectivity/source/drivers/jdbc/JStatement.cxx | 4
connectivity/source/drivers/jdbc/Object.cxx | 14
connectivity/source/drivers/jdbc/ResultSet.cxx | 2
connectivity/source/drivers/jdbc/jservices.cxx | 2
connectivity/source/drivers/jdbc/tools.cxx | 6
connectivity/source/drivers/mork/MConnection.hxx | 2
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 36 -
connectivity/source/drivers/mork/MDatabaseMetaData.hxx | 26 -
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.cxx | 10
connectivity/source/drivers/mork/MDatabaseMetaDataHelper.hxx | 4
connectivity/source/drivers/mork/MPreparedStatement.cxx | 6
connectivity/source/drivers/mork/MPreparedStatement.hxx | 2
connectivity/source/drivers/mork/MQueryHelper.cxx | 32 -
connectivity/source/drivers/mork/MQueryHelper.hxx | 32 -
connectivity/source/drivers/mork/MResultSet.cxx | 74 +--
connectivity/source/drivers/mork/MResultSet.hxx | 24 -
connectivity/source/drivers/mork/MResultSetMetaData.cxx | 2
connectivity/source/drivers/mork/MResultSetMetaData.hxx | 4
connectivity/source/drivers/mork/MStatement.cxx | 4
connectivity/source/drivers/mork/MTable.hxx | 2
connectivity/source/drivers/mozab/MDatabaseMetaData.cxx | 36 -
connectivity/source/drivers/mozab/MDatabaseMetaData.hxx | 26 -
connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx | 2
connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx | 12
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx | 10
connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx | 4
connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx | 3
connectivity/source/drivers/mysql/YColumns.cxx | 8
connectivity/source/drivers/mysql/YDriver.cxx | 6
connectivity/source/drivers/mysql/YTable.cxx | 4
connectivity/source/drivers/mysql/YTables.cxx | 4
connectivity/source/drivers/mysql/YViews.cxx | 6
connectivity/source/drivers/odbc/OConnection.cxx | 30 -
connectivity/source/drivers/odbc/ODatabaseMetaData.cxx | 26 -
connectivity/source/drivers/odbc/ODatabaseMetaDataResultSet.cxx | 62 +--
connectivity/source/drivers/odbc/OFunctions.cxx | 122 +++---
connectivity/source/drivers/odbc/OPreparedStatement.cxx | 10
connectivity/source/drivers/odbc/ORealDriver.cxx | 2
connectivity/source/drivers/odbc/OResultSet.cxx | 84 ++--
connectivity/source/drivers/odbc/OResultSetMetaData.cxx | 6
connectivity/source/drivers/odbc/OStatement.cxx | 40 +-
connectivity/source/drivers/odbc/OTools.cxx | 20 -
connectivity/source/drivers/odbc/oservices.cxx | 2
connectivity/source/drivers/postgresql/pq_baseresultset.cxx | 10
connectivity/source/drivers/postgresql/pq_baseresultset.hxx | 2
connectivity/source/drivers/postgresql/pq_connection.hxx | 4
connectivity/source/drivers/postgresql/pq_databasemetadata.cxx | 2
connectivity/source/drivers/postgresql/pq_preparedstatement.cxx | 4
connectivity/source/drivers/postgresql/pq_preparedstatement.hxx | 2
connectivity/source/drivers/postgresql/pq_resultsetmetadata.cxx | 8
connectivity/source/drivers/postgresql/pq_resultsetmetadata.hxx | 2
connectivity/source/drivers/postgresql/pq_sequenceresultsetmetadata.cxx | 2
connectivity/source/drivers/postgresql/pq_statement.cxx | 12
connectivity/source/drivers/postgresql/pq_statement.hxx | 4
connectivity/source/drivers/postgresql/pq_statics.cxx | 48 +-
connectivity/source/drivers/postgresql/pq_statics.hxx | 24 -
connectivity/source/drivers/postgresql/pq_tools.cxx | 16
connectivity/source/drivers/postgresql/pq_tools.hxx | 4
connectivity/source/drivers/postgresql/pq_xindexcolumns.cxx | 2
connectivity/source/drivers/postgresql/pq_xindexes.cxx | 2
connectivity/source/drivers/postgresql/pq_xtables.cxx | 8
connectivity/source/inc/AutoRetrievingBase.hxx | 8
connectivity/source/inc/FDatabaseMetaDataResultSet.hxx | 4
connectivity/source/inc/OColumn.hxx | 64 +--
connectivity/source/inc/OTypeInfo.hxx | 24 -
connectivity/source/inc/TDatabaseMetaDataBase.hxx | 48 +-
connectivity/source/inc/TPrivilegesResultSet.hxx | 2
connectivity/source/inc/TResultSetHelper.hxx | 6
connectivity/source/inc/TSkipDeletedSet.hxx | 4
connectivity/source/inc/TSortIndex.hxx | 14
connectivity/source/inc/ado/ADatabaseMetaData.hxx | 26 -
connectivity/source/inc/ado/Aolevariant.hxx | 3
connectivity/source/inc/calc/CResultSet.hxx | 6
connectivity/source/inc/calc/CTable.hxx | 6
connectivity/source/inc/dbase/DCode.hxx | 2
connectivity/source/inc/dbase/DDatabaseMetaData.hxx | 4
connectivity/source/inc/dbase/DIndex.hxx | 28 -
connectivity/source/inc/dbase/DIndexIter.hxx | 10
connectivity/source/inc/dbase/DResultSet.hxx | 4
connectivity/source/inc/dbase/DTable.hxx | 36 -
connectivity/source/inc/dbase/dindexnode.hxx | 76 ++--
connectivity/source/inc/file/FConnection.hxx | 22 -
connectivity/source/inc/file/FDatabaseMetaData.hxx | 26 -
connectivity/source/inc/file/FResultSet.hxx | 42 +-
connectivity/source/inc/file/FStatement.hxx | 4
connectivity/source/inc/file/FTable.hxx | 14
connectivity/source/inc/file/fanalyzer.hxx | 10
connectivity/source/inc/file/fcode.hxx | 26 -
connectivity/source/inc/file/fcomp.hxx | 12
connectivity/source/inc/flat/EConnection.hxx | 4
connectivity/source/inc/flat/EResultSet.hxx | 2
connectivity/source/inc/flat/ETable.hxx | 6
connectivity/source/inc/hsqldb/HColumns.hxx | 6
connectivity/source/inc/hsqldb/HDriver.hxx | 2
connectivity/source/inc/hsqldb/HView.hxx | 2
connectivity/source/inc/hsqldb/HViews.hxx | 2
connectivity/source/inc/java/lang/Object.hxx | 4
connectivity/source/inc/java/sql/Connection.hxx | 12
connectivity/source/inc/java/sql/DatabaseMetaData.hxx | 30 -
connectivity/source/inc/java/sql/DriverPropertyInfo.hxx | 2
connectivity/source/inc/java/sql/JStatement.hxx | 2
connectivity/source/inc/java/tools.hxx | 2
connectivity/source/inc/mysql/YColumns.hxx | 6
connectivity/source/inc/mysql/YViews.hxx | 4
connectivity/source/inc/odbc/OBoundParam.hxx | 6
connectivity/source/inc/odbc/OConnection.hxx | 32 -
connectivity/source/inc/odbc/ODatabaseMetaData.hxx | 30 -
connectivity/source/inc/odbc/ODatabaseMetaDataResultSet.hxx | 12
connectivity/source/inc/odbc/OFunctions.hxx | 2
connectivity/source/inc/odbc/OPreparedStatement.hxx | 4
connectivity/source/inc/odbc/OResultSet.hxx | 32 -
connectivity/source/inc/odbc/OResultSetMetaData.hxx | 6
connectivity/source/inc/odbc/OStatement.hxx | 12
connectivity/source/inc/odbc/OTools.hxx | 18
connectivity/source/manager/mdrivermanager.cxx | 8
connectivity/source/parse/PColumn.cxx | 2
connectivity/source/parse/sqliterator.cxx | 20 -
connectivity/source/parse/sqlnode.cxx | 12
connectivity/source/simpledbt/parsenode_s.cxx | 2
connectivity/source/simpledbt/parsenode_s.hxx | 4
connectivity/source/simpledbt/parser_s.cxx | 2
cui/source/customize/acccfg.cxx | 8
cui/source/customize/cfg.cxx | 16
cui/source/customize/cfgutil.cxx | 32 -
cui/source/customize/eventdlg.cxx | 2
cui/source/customize/eventdlg.hxx | 2
cui/source/customize/macropg.cxx | 8
cui/source/customize/macropg_impl.hxx | 4
cui/source/customize/selector.cxx | 22 -
cui/source/dialogs/SpellDialog.cxx | 2
cui/source/dialogs/about.cxx | 2
cui/source/dialogs/commonlingui.cxx | 2
cui/source/dialogs/commonlingui.hxx | 2
cui/source/dialogs/cuicharmap.cxx | 10
cui/source/dialogs/cuifmsearch.cxx | 32 -
cui/source/dialogs/cuigaldlg.cxx | 44 +-
cui/source/dialogs/cuigrfflt.cxx | 4
cui/source/dialogs/cuihyperdlg.cxx | 16
cui/source/dialogs/hangulhanjadlg.cxx | 4
cui/source/dialogs/hldocntp.cxx | 22 -
cui/source/dialogs/hldoctp.cxx | 6
cui/source/dialogs/hlinettp.cxx | 6
cui/source/dialogs/hlmarkwn.cxx | 26 -
cui/source/dialogs/hltpbase.cxx | 32 -
cui/source/dialogs/hyphen.cxx | 30 -
cui/source/dialogs/iconcdlg.cxx | 58 +--
cui/source/dialogs/insdlg.cxx | 32 -
cui/source/dialogs/linkdlg.cxx | 18
cui/source/dialogs/multipat.cxx | 4
cui/source/dialogs/postdlg.cxx | 6
cui/source/dialogs/scriptdlg.cxx | 30 -
cui/source/dialogs/showcols.cxx | 2
cui/source/dialogs/srchxtra.cxx | 12
cui/source/dialogs/zoom.cxx | 10
cui/source/factory/dlgfact.cxx | 4
cui/source/inc/SpellDialog.hxx | 2
cui/source/inc/acccfg.hxx | 8
cui/source/inc/autocdlg.hxx | 24 -
cui/source/inc/backgrnd.hxx | 16
cui/source/inc/cfgutil.hxx | 10
cui/source/inc/chardlg.hxx | 6
cui/source/inc/cuicharmap.hxx | 8
cui/source/inc/cuifmsearch.hxx | 6
cui/source/inc/cuigaldlg.hxx | 10
cui/source/inc/cuigrfflt.hxx | 8
cui/source/inc/cuihyperdlg.hxx | 10
cui/source/inc/cuitabarea.hxx | 50 +-
cui/source/inc/cuitabline.hxx | 26 -
cui/source/inc/dbregister.hxx | 2
cui/source/inc/grfpage.hxx | 8
cui/source/inc/headertablistbox.hxx | 2
cui/source/inc/hldocntp.hxx | 4
cui/source/inc/hldoctp.hxx | 4
cui/source/inc/hlinettp.hxx | 4
cui/source/inc/hlmarkwn.hxx | 8
cui/source/inc/hltpbase.hxx | 18
cui/source/inc/hyphen.hxx | 2
cui/source/inc/iconcdlg.hxx | 40 +-
cui/source/inc/insdlg.hxx | 6
cui/source/inc/labdlg.hxx | 4
cui/source/inc/linkdlg.hxx | 6
cui/source/inc/macropg.hxx | 2
cui/source/inc/measure.hxx | 2
cui/source/inc/numfmt.hxx | 14
cui/source/inc/numpages.hxx | 44 +-
cui/source/inc/optdict.hxx | 16
cui/source/inc/optpath.hxx | 2
cui/source/inc/page.hxx | 2
cui/source/inc/paragrph.hxx | 12
cui/source/inc/postdlg.hxx | 2
cui/source/inc/scriptdlg.hxx | 2
cui/source/inc/selector.hxx | 16
cui/source/inc/srchxtra.hxx | 4
cui/source/inc/tabstpge.hxx | 2
cui/source/inc/textattr.hxx | 12
cui/source/inc/treeopt.hxx | 8
cui/source/inc/zoom.hxx | 2
cui/source/options/cfgchart.cxx | 8
cui/source/options/cfgchart.hxx | 4
cui/source/options/connpoolconfig.cxx | 12
cui/source/options/connpooloptions.cxx | 22 -
cui/source/options/connpooloptions.hxx | 2
cui/source/options/connpoolsettings.cxx | 4
cui/source/options/connpoolsettings.hxx | 8
cui/source/options/dbregister.cxx | 10
cui/source/options/dbregistersettings.hxx | 2
cui/source/options/doclinkdialog.cxx | 6
cui/source/options/doclinkdialog.hxx | 4
cui/source/options/fontsubs.cxx | 24 -
cui/source/options/fontsubs.hxx | 8
cui/source/options/optaboutconfig.cxx | 6
cui/source/options/optaboutconfig.hxx | 2
cui/source/options/optaccessibility.cxx | 4
cui/source/options/optaccessibility.hxx | 2
cui/source/options/optasian.cxx | 16
cui/source/options/optcolor.cxx | 2
cui/source/options/optcolor.hxx | 2
cui/source/options/optctl.cxx | 12
cui/source/options/optdict.cxx | 68 +--
cui/source/options/optfltr.cxx | 26 -
cui/source/options/optfltr.hxx | 4
cui/source/options/optgdlg.cxx | 104 ++---
cui/source/options/optgdlg.hxx | 4
cui/source/options/optinet2.cxx | 22 -
cui/source/options/optinet2.hxx | 8
cui/source/options/optjava.cxx | 2
cui/source/options/optjsearch.cxx | 44 +-
cui/source/options/optjsearch.hxx | 6
cui/source/options/optlingu.cxx | 146 +++----
cui/source/options/optpath.cxx | 18
cui/source/options/optsave.cxx | 14
cui/source/options/optupdt.cxx | 8
cui/source/options/treeopt.cxx | 48 +-
cui/source/options/webconninfo.cxx | 2
cui/source/tabpages/autocdlg.cxx | 102 ++---
cui/source/tabpages/backgrnd.cxx | 66 +--
cui/source/tabpages/border.cxx | 16
cui/source/tabpages/chardlg.cxx | 148 +++----
cui/source/tabpages/grfpage.cxx | 22 -
cui/source/tabpages/macroass.cxx | 10
cui/source/tabpages/measure.cxx | 48 +-
cui/source/tabpages/numfmt.cxx | 74 +--
cui/source/tabpages/numpages.cxx | 186 +++++-----
cui/source/tabpages/page.cxx | 62 +--
cui/source/tabpages/paragrph.cxx | 110 ++---
cui/source/tabpages/swpossizetabpage.cxx | 28 -
cui/source/tabpages/tabarea.cxx | 2
cui/source/tabpages/tabline.cxx | 4
cui/source/tabpages/tabstpge.cxx | 18
cui/source/tabpages/textanim.cxx | 28 -
cui/source/tabpages/textattr.cxx | 40 +-
cui/source/tabpages/tparea.cxx | 120 +++---
cui/source/tabpages/tpbitmap.cxx | 38 +-
cui/source/tabpages/tpcolor.cxx | 32 -
cui/source/tabpages/tpgradnt.cxx | 24 -
cui/source/tabpages/tphatch.cxx | 24 -
cui/source/tabpages/tpline.cxx | 100 ++---
cui/source/tabpages/tplnedef.cxx | 24 -
cui/source/tabpages/tplneend.cxx | 26 -
cui/source/tabpages/tpshadow.cxx | 14
cui/source/tabpages/transfrm.cxx | 28 -
include/connectivity/PColumn.hxx | 2
include/connectivity/parameters.hxx | 2
338 files changed, 3004 insertions(+), 3003 deletions(-)
New commits:
commit 5b1b1e55ce492ceb1a907833f7073b46451760c6
Author: Noel Grandin <noel at peralex.com>
Date: Wed Apr 16 11:39:08 2014 +0200
cui: sal_Bool->bool
Change-Id: Ib7dd1f27d4909d30ee794936364a472a9755c609
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 398fe7f..40ad739 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -733,7 +733,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
, aLoadAccelConfigStr(CUI_RES(RID_SVXSTR_LOADACCELCONFIG))
, aSaveAccelConfigStr(CUI_RES(RID_SVXSTR_SAVEACCELCONFIG))
, aFilterCfgStr(CUI_RES(RID_SVXSTR_FILTERNAME_CFG))
- , m_bStylesInfoInitialized(sal_False)
+ , m_bStylesInfoInitialized(false)
, m_xGlobal()
, m_xModule()
, m_xAct()
@@ -914,7 +914,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
m_aStylesInfo.setModel(xModel);
m_pFunctionBox->SetStylesInfo(&m_aStylesInfo);
m_pGroupLBox->SetStylesInfo(&m_aStylesInfo);
- m_bStylesInfoInitialized = sal_True;
+ m_bStylesInfoInitialized = true;
}
// Insert all editable accelerators into list box. It is possible
@@ -956,7 +956,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(0, nPos);
TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData();
- pEntry->m_bIsConfigurable = sal_True;
+ pEntry->m_bIsConfigurable = true;
pEntry->m_sCommand = sCommand;
CreateCustomItems(pLBEntry, m_pEntriesBox->GetEntryText(pLBEntry, 0), sLabel);
}
@@ -976,7 +976,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
SvTreeListEntry* pLBEntry = m_pEntriesBox->GetEntry(0, nPos);
TAccInfo* pEntry = (TAccInfo*)pLBEntry->GetUserData();
- pEntry->m_bIsConfigurable = sal_False;
+ pEntry->m_bIsConfigurable = false;
CreateCustomItems(pLBEntry, m_pEntriesBox->GetEntryText(pLBEntry, 0), OUString());
}
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 91a4c30..8135610 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -527,7 +527,7 @@ bool GetToolbarItemData(
OUString& rCommandURL,
OUString& rLabel,
sal_uInt16& rType,
- sal_Bool& rIsVisible,
+ bool& rIsVisible,
sal_Int32& rStyle,
uno::Reference< container::XIndexAccess >& rSubMenu )
{
@@ -603,7 +603,7 @@ ConvertSvxConfigEntry(
aPropSeq[2].Name = aDescriptorLabel;
if ( !pEntry->HasChangedName() && !pEntry->GetCommand().isEmpty() )
{
- sal_Bool isDefaultName = sal_False;
+ bool isDefaultName = false;
try
{
uno::Any a( xCommandToLabelMap->getByName( pEntry->GetCommand() ) );
@@ -619,7 +619,7 @@ ConvertSvxConfigEntry(
if ( tmpLabel.equals( pEntry->GetName() ) )
{
- isDefaultName = sal_True;
+ isDefaultName = true;
}
break;
@@ -681,7 +681,7 @@ ConvertToolbarEntry(
aPropSeq[2].Name = aDescriptorLabel;
if ( !pEntry->HasChangedName() && !pEntry->GetCommand().isEmpty() )
{
- sal_Bool isDefaultName = sal_False;
+ bool isDefaultName = false;
try
{
uno::Any a( xCommandToLabelMap->getByName( pEntry->GetCommand() ) );
@@ -697,7 +697,7 @@ ConvertToolbarEntry(
if ( tmpLabel.equals( pEntry->GetName() ) )
{
- isDefaultName = sal_True;
+ isDefaultName = true;
}
break;
@@ -2552,7 +2552,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton )
if ( m_pSelectorDlg == NULL )
{
// Create Script Selector which also shows builtin commands
- m_pSelectorDlg = new SvxScriptSelectorDialog( this, sal_True, m_xFrame );
+ m_pSelectorDlg = new SvxScriptSelectorDialog( this, true, m_xFrame );
m_pSelectorDlg->SetAddHdl(
LINK( this, SvxMenuConfigPage, AddFunctionHdl ) );
@@ -4189,7 +4189,7 @@ bool ToolbarSaveInData::LoadToolbar(
OUString aCommandURL;
OUString aLabel;
bool bIsUserDefined = true;
- sal_Bool bIsVisible;
+ bool bIsVisible;
sal_Int32 nStyle;
sal_uInt16 nType( css::ui::ItemType::DEFAULT );
@@ -4475,7 +4475,7 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton )
if ( m_pSelectorDlg == NULL )
{
// Create Script Selector which shows slot commands
- m_pSelectorDlg = new SvxScriptSelectorDialog( this, sal_True, m_xFrame );
+ m_pSelectorDlg = new SvxScriptSelectorDialog( this, true, m_xFrame );
// Position the Script Selector over the Add button so it is
// beside the menu contents list and does not obscure it
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index f1ffaa1..40b88bb 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -94,14 +94,14 @@ OUString SfxStylesInfo_Impl::generateCommand(const OUString& sFamily, const OUSt
return sCommand.makeStringAndClear();
}
-sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
+bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
{
static sal_Int32 LEN_STYLEPROT = CMDURL_STYLEPROT_ONLY.getLength();
static sal_Int32 LEN_SPART = CMDURL_SPART_ONLY.getLength();
static sal_Int32 LEN_FPART = CMDURL_FPART_ONLY.getLength();
if (!aStyle.sCommand.startsWith(CMDURL_STYLEPROT_ONLY))
- return sal_False;
+ return false;
aStyle.sFamily = OUString();
aStyle.sStyle = OUString();
@@ -110,7 +110,7 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
OUString sCmdArgs = aStyle.sCommand.copy(LEN_STYLEPROT, nCmdLen-LEN_STYLEPROT);
sal_Int32 i = sCmdArgs.indexOf('&');
if (i<0)
- return sal_False;
+ return false;
OUString sArg = sCmdArgs.copy(0, i);
if (sArg.startsWith(CMDURL_SPART_ONLY))
@@ -125,9 +125,9 @@ sal_Bool SfxStylesInfo_Impl::parseStyleCommand(SfxStyleInfo_Impl& aStyle)
aStyle.sFamily = sArg.copy(LEN_FPART, sArg.getLength()-LEN_FPART);
if (!(aStyle.sFamily.isEmpty() || aStyle.sStyle.isEmpty()))
- return sal_True;
+ return true;
- return sal_False;
+ return false;
}
void SfxStylesInfo_Impl::getLabel4Style(SfxStyleInfo_Impl& aStyle)
@@ -627,13 +627,13 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent
{
Sequence< Reference< browse::XBrowseNode > > children =
rootNode->getChildNodes();
- sal_Bool bIsRootNode = sal_False;
+ bool bIsRootNode = false;
OUString user("user");
OUString share("share");
if ( rootNode->getName() == "Root" )
{
- bIsRootNode = sal_True;
+ bIsRootNode = true;
}
//To mimic current starbasic behaviour we
@@ -652,14 +652,14 @@ void SfxConfigGroupListBox::Init(const css::uno::Reference< css::uno::XComponent
for ( sal_Int32 n = 0; n < children.getLength(); ++n )
{
Reference< browse::XBrowseNode >& theChild = children[n];
- sal_Bool bDisplay = sal_True;
+ bool bDisplay = true;
OUString uiName = theChild->getName();
if ( bIsRootNode )
{
if ( ! ((theChild->getName().equals( user ) || theChild->getName().equals( share ) ||
theChild->getName().equals( currentDocTitle ) ) ) )
{
- bDisplay=sal_False;
+ bDisplay=false;
}
else
{
@@ -983,9 +983,9 @@ void SfxConfigGroupListBox::GroupSelected()
pFunctionListBox->SetUpdateMode(true);
}
-sal_Bool SfxConfigGroupListBox::Expand( SvTreeListEntry* pParent )
+bool SfxConfigGroupListBox::Expand( SvTreeListEntry* pParent )
{
- sal_Bool bRet = SvTreeListBox::Expand( pParent );
+ bool bRet = SvTreeListBox::Expand( pParent );
if ( bRet )
{
sal_uLong nEntries = GetOutputSizePixel().Height() / GetEntryHeight();
@@ -1020,7 +1020,7 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry )
*/
{
SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData();
- pInfo->bWasOpened = sal_True;
+ pInfo->bWasOpened = true;
switch ( pInfo->nKind )
{
case SFX_CFGGROUP_SCRIPTCONTAINER:
@@ -1035,13 +1035,13 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry )
{
Sequence< Reference< browse::XBrowseNode > > children =
rootNode->getChildNodes();
- sal_Bool bIsRootNode = sal_False;
+ bool bIsRootNode = false;
OUString user("user");
OUString share("share" );
if ( rootNode->getName() == "Root" )
{
- bIsRootNode = sal_True;
+ bIsRootNode = true;
}
/* To mimic current starbasic behaviour we
@@ -1062,11 +1062,11 @@ void SfxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry )
{
Reference< browse::XBrowseNode >& theChild = children[n];
OUString aName( theChild->getName() );
- sal_Bool bDisplay = sal_True;
+ bool bDisplay = true;
if ( bIsRootNode )
{
if ( !( (aName.equals(user) || aName.equals(share) || aName.equals(currentDocTitle) ) ) )
- bDisplay=sal_False;
+ bDisplay=false;
}
if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
{
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index f3bea62..9f2a5cf 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -172,7 +172,7 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
bAppConfig = *bApp;
if ( *bApp )
{
- SetReadOnly( sal_False );
+ SetReadOnly( false );
_SvxMacroTabPage::DisplayAppEvents( true );
}
else
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index 24321a1..dd14a12 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -35,7 +35,7 @@ class SvxEventConfigPage : public _SvxMacroTabPage
::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > m_xDocumentEvents;
::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > m_xDocumentModifiable;
- sal_Bool bAppConfig;
+ bool bAppConfig;
DECL_LINK( SelectHdl_Impl, ListBox* );
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 00a48e6..881f5a5 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -183,7 +183,7 @@ void MacroEventListBox::ConnectElements( void )
maListBox.InitHeaderBar( &maHeaderBar );
}
-void MacroEventListBox::Show( sal_Bool bVisible, sal_uInt16 nFlags )
+void MacroEventListBox::Show( bool bVisible, sal_uInt16 nFlags )
{
maListBox.Show( bVisible, nFlags );
maHeaderBar.Show( bVisible, nFlags );
@@ -412,7 +412,7 @@ void _SvxMacroTabPage::Reset( const SfxItemSet& )
DisplayAppEvents(bAppEvents);
}
-void _SvxMacroTabPage::SetReadOnly( sal_Bool bSet )
+void _SvxMacroTabPage::SetReadOnly( bool bSet )
{
mpImpl->bReadOnly = bSet;
}
@@ -600,7 +600,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
return 0;
}
- const sal_Bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled();
+ const bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled();
OUString* pEventName = (OUString*)pE->GetUserData();
@@ -658,7 +658,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
else if( bAssEnabled )
{
// assign pressed
- SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog( pThis, sal_False, pThis->GetFrame() );
+ SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog( pThis, false, pThis->GetFrame() );
if( pDlg )
{
short ret = pDlg->Execute();
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 1a2d87c..907bdfd 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@ -33,8 +33,8 @@ public:
OUString sStrEvent;
OUString sAssignedMacro;
MacroEventListBox* pEventLB;
- sal_Bool bReadOnly;
- sal_Bool bIDEDialogMode;
+ bool bReadOnly;
+ bool bIDEDialogMode;
};
class AssignComponentDialog : public ModalDialog
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 3538054..4dbbac2 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -303,7 +303,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode
Sequence< Reference< browse::XBrowseNode > > children =
_rxRootNode->getChildNodes();
- sal_Bool bIsRootNode = _rxRootNode->getName() == "Root";
+ bool bIsRootNode = _rxRootNode->getName() == "Root";
/* To mimic current starbasic behaviour we
need to make sure that only the current document
@@ -325,7 +325,7 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode
if ( !theChild.is() )
continue;
OUString sUIName = theChild->getName();
- sal_Bool bDisplay = sal_True;
+ bool bDisplay = true;
if ( bIsRootNode
|| ( m_bShowSlots && _pParentEntry && ( GetModel()->GetDepth( _pParentEntry ) == 0 ) )
@@ -336,16 +336,16 @@ void SvxConfigGroupListBox::fillScriptList( const Reference< browse::XBrowseNode
if ( sUIName == "user" )
{
sUIName = m_sMyMacros;
- bIsRootNode = sal_True;
+ bIsRootNode = true;
}
else if ( sUIName == "share" )
{
sUIName = m_sProdMacros;
- bIsRootNode = sal_True;
+ bIsRootNode = true;
}
else if ( !sUIName.equals( sCurrentDocTitle ) )
{
- bDisplay = sal_False;
+ bDisplay = false;
}
}
@@ -797,9 +797,9 @@ void SvxConfigGroupListBox::GroupSelected()
pFunctionListBox->SetUpdateMode(true);
}
-sal_Bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent )
+bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent )
{
- sal_Bool bRet = SvTreeListBox::Expand( pParent );
+ bool bRet = SvTreeListBox::Expand( pParent );
if ( bRet )
{
sal_uLong nEntries = GetOutputSizePixel().Height() / GetEntryHeight();
@@ -831,7 +831,7 @@ sal_Bool SvxConfigGroupListBox::Expand( SvTreeListEntry* pParent )
void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry )
{
SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData();
- pInfo->bWasOpened = sal_True;
+ pInfo->bWasOpened = true;
switch ( pInfo->nKind )
{
case SVX_CFGGROUP_SCRIPTCONTAINER:
@@ -858,7 +858,7 @@ void SvxConfigGroupListBox::RequestingChildren( SvTreeListEntry *pEntry )
*/
SvxScriptSelectorDialog::SvxScriptSelectorDialog(
- Window* pParent, sal_Bool bShowSlots, const Reference< frame::XFrame >& xFrame)
+ Window* pParent, bool bShowSlots, const Reference< frame::XFrame >& xFrame)
: ModelessDialog(pParent, "MacroSelectorDialog", "cui/ui/macroselectordialog.ui")
, m_bShowSlots(bShowSlots)
{
@@ -959,7 +959,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
{
// If we are displaying Slot API commands then the dialog is being
// run from Tools/Configure and we should not close it, just hide it
- if ( m_bShowSlots == sal_False )
+ if ( m_bShowSlots == false )
{
EndDialog( RET_CANCEL );
}
@@ -974,7 +974,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
// If we are displaying Slot API commands then this the dialog is being
// run from Tools/Configure and we should not close it
- if ( m_bShowSlots == sal_False )
+ if ( m_bShowSlots == false )
{
EndDialog( RET_OK );
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 659cb10..0bf1dff 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1940,7 +1940,7 @@ void SentenceEditWindow_Impl::ResetUndo()
}
-void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg )
+void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, bool bTryMerg )
{
::svl::IUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager();
rUndoMgr.AddUndoAction(pAction, bTryMerg);
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 0985a26..ff61962 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -175,7 +175,7 @@ void AboutDialog::SetLogo()
// fdo#67401 set AntiAliasing for SVG logo
SvtOptionsDrawinglayer aDrawOpt;
- sal_Bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing();
+ bool bOldAntiAliasSetting = aDrawOpt.IsAntiAliasing();
aDrawOpt.SetAntiAliasing(true);
// load svg logo, specify desired width, scale height isotrophically
diff --git a/cui/source/dialogs/commonlingui.cxx b/cui/source/dialogs/commonlingui.cxx
index d2b9cac..48aae68 100644
--- a/cui/source/dialogs/commonlingui.cxx
+++ b/cui/source/dialogs/commonlingui.cxx
@@ -125,7 +125,7 @@ void SvxCommonLinguisticControl::SetButtonHandler( ButtonType _eType, const Link
}
-void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, sal_Bool _bEnable )
+void SvxCommonLinguisticControl::EnableButton( ButtonType _eType, bool _bEnable )
{
Button* pButton = GetButton( _eType );
if ( pButton )
diff --git a/cui/source/dialogs/commonlingui.hxx b/cui/source/dialogs/commonlingui.hxx
index 5ad64b0..b5598b7 100644
--- a/cui/source/dialogs/commonlingui.hxx
+++ b/cui/source/dialogs/commonlingui.hxx
@@ -104,7 +104,7 @@ public:
inline const Link& GetResetWordHdl() const { return aAktWord.GetActivateHdl(); }
void SetButtonHandler( ButtonType _eType, const Link& _rHandler );
- void EnableButton( ButtonType _eType, sal_Bool _bEnable );
+ void EnableButton( ButtonType _eType, bool _bEnable );
inline PushButton* GetButton( ButtonType _eType ) { return implGetButton( _eType ); }
inline const PushButton* GetButton( ButtonType _eType ) const { return implGetButton( _eType ); }
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index 207bef3..eaa041e 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -44,7 +44,7 @@
// class SvxCharacterMap =================================================
-SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne_, const SfxItemSet* pSet )
+SvxCharacterMap::SvxCharacterMap( Window* pParent, bool bOne_, const SfxItemSet* pSet )
: SfxModalDialog(pParent, "SpecialCharactersDialog", "cui/ui/specialcharacters.ui")
, bOne( bOne_ )
, pSubsetMap( NULL )
@@ -171,7 +171,7 @@ short SvxCharacterMap::Execute()
// class SvxShowText =====================================================
-SvxShowText::SvxShowText(Window* pParent, sal_Bool bCenter)
+SvxShowText::SvxShowText(Window* pParent, bool bCenter)
: Control(pParent)
, mnY(0)
, mbCenter(bCenter)
@@ -455,7 +455,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
pSubsetMap = NULL;
m_pSubsetLB->Clear();
- sal_Bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
+ bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
if( bNeedSubset )
{
FontCharMap aFontCharMap;
@@ -476,7 +476,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, FontSelectHdl)
bFirst = false;
}
if( m_pSubsetLB->GetEntryCount() <= 1 )
- bNeedSubset = sal_False;
+ bNeedSubset = false;
}
m_pSubsetText->Enable(bNeedSubset);
@@ -541,7 +541,7 @@ IMPL_LINK_NOARG(SvxCharacterMap, CharHighlightHdl)
{
OUString aText;
sal_UCS4 cChar = m_pShowSet->GetSelectCharacter();
- sal_Bool bSelect = (cChar > 0);
+ bool bSelect = (cChar > 0);
// show char sample
if ( bSelect )
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index 017dff1..ecbf3ff 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -237,7 +237,7 @@ void FmSearchDialog::Init(const OUString& strVisibleFields, const OUString& sIni
// initial
m_aDelayedPaint.SetTimeoutHdl(LINK(this, FmSearchDialog, OnDelayedPaint));
m_aDelayedPaint.SetTimeout(500);
- EnableSearchUI(sal_True);
+ EnableSearchUI(true);
if ( m_prbSearchForText->IsChecked() )
m_pcmbSearchText->GrabFocus();
@@ -259,7 +259,7 @@ IMPL_LINK(FmSearchDialog, OnClickedFieldRadios, Button*, pButton)
{
if ((pButton == m_prbSearchForText) || (pButton == m_prbSearchForNull) || (pButton == m_prbSearchForNotNull))
{
- EnableSearchForDependees(sal_True);
+ EnableSearchForDependees(true);
}
else
// en- or disable field list box accordingly
@@ -297,7 +297,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
if (m_pcbStartOver->IsChecked())
{
m_pcbStartOver->Check(false);
- EnableSearchUI(sal_False);
+ EnableSearchUI(false);
if (m_prbSearchForText->IsChecked())
m_pSearchEngine->StartOver(strThisRoundText);
else
@@ -305,7 +305,7 @@ IMPL_LINK_NOARG(FmSearchDialog, OnClickedSearchAgain)
}
else
{
- EnableSearchUI(sal_False);
+ EnableSearchUI(false);
if (m_prbSearchForText->IsChecked())
m_pSearchEngine->SearchNext(strThisRoundText);
else
@@ -410,7 +410,7 @@ IMPL_LINK(FmSearchDialog, OnFieldSelected, ListBox*, pBox)
IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
{
- sal_Bool bChecked = pBox->IsChecked();
+ bool bChecked = pBox->IsChecked();
// formatter or case -> pass on to the engine
if (pBox == m_pcbUseFormat)
@@ -478,7 +478,7 @@ IMPL_LINK(FmSearchDialog, OnCheckBoxToggled, CheckBox*, pBox)
m_pSoundsLikeCJKSettings->Enable(bChecked);
// two other buttons which depend on this one
- sal_Bool bEnable = ( m_prbSearchForText->IsChecked()
+ bool bEnable = ( m_prbSearchForText->IsChecked()
&& !m_pSoundsLikeCJK->IsChecked()
)
|| !SvtCJKOptions().IsJapaneseFindEnabled();
@@ -544,11 +544,11 @@ IMPL_LINK( FmSearchDialog, OnContextSelection, ListBox*, pBox)
return 0L;
}
-void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
+void FmSearchDialog::EnableSearchUI(bool bEnable)
{
// when the controls shall be disabled their paint is turned off and then turned on again after a delay
if (!bEnable)
- EnableControlPaint(sal_False);
+ EnableControlPaint(false);
else
{
if (m_aDelayedPaint.IsActive())
@@ -597,7 +597,7 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
if (!bEnable)
m_aDelayedPaint.Start();
else
- EnableControlPaint(sal_True);
+ EnableControlPaint(true);
if ( bEnable )
{ // restore focus
@@ -615,14 +615,14 @@ void FmSearchDialog::EnableSearchUI(sal_Bool bEnable)
}
-void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable)
+void FmSearchDialog::EnableSearchForDependees(bool bEnable)
{
- sal_Bool bSearchingForText = m_prbSearchForText->IsChecked();
+ bool bSearchingForText = m_prbSearchForText->IsChecked();
m_pbSearchAgain->Enable(bEnable && (!bSearchingForText || (!m_pcmbSearchText->GetText().isEmpty())));
bEnable = bEnable && bSearchingForText;
- sal_Bool bEnableRedundants = !m_pSoundsLikeCJK->IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled();
+ bool bEnableRedundants = !m_pSoundsLikeCJK->IsChecked() || !SvtCJKOptions().IsJapaneseFindEnabled();
m_pcmbSearchText->Enable (bEnable);
m_pftPosition->Enable (bEnable && !m_pcbWildCard->IsChecked());
@@ -638,7 +638,7 @@ void FmSearchDialog::EnableSearchForDependees(sal_Bool bEnable)
m_pcbCase->Enable (bEnable && bEnableRedundants);
}
-void FmSearchDialog::EnableControlPaint(sal_Bool bEnable)
+void FmSearchDialog::EnableControlPaint(bool bEnable)
{
Control* pAffectedControls[] = { m_prbSearchForText, m_pcmbSearchText, m_prbSearchForNull, m_prbSearchForNotNull,
m_prbSearchForText, m_prbAllFields, m_prbSingleField, m_plbField, m_pftPosition, m_plbPosition,
@@ -661,7 +661,7 @@ void FmSearchDialog::EnableControlPaint(sal_Bool bEnable)
IMPL_LINK_NOARG(FmSearchDialog, OnDelayedPaint)
{
- EnableControlPaint(sal_True);
+ EnableControlPaint(true);
return 0L;
}
@@ -713,7 +713,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
case FmSearchProgress::STATE_SUCCESSFULL:
OnFound(pProgress->aBookmark, (sal_Int16)pProgress->nFieldIndex);
- EnableSearchUI(sal_True);
+ EnableSearchUI(true);
break;
case FmSearchProgress::STATE_ERROR:
@@ -726,7 +726,7 @@ IMPL_LINK(FmSearchDialog, OnSearchProgress, FmSearchProgress*, pProgress)
}
// NO break !
case FmSearchProgress::STATE_CANCELED:
- EnableSearchUI(sal_True);
+ EnableSearchUI(true);
if (m_lnkCanceledNotFoundHdl.IsSet())
{
FmFoundRecordInformation friInfo;
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 4a802e9..f5f3924 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -118,7 +118,7 @@ void SearchThread::execute()
void SearchThread::ImplSearch( const INetURLObject& rStartURL,
const ::std::vector< OUString >& rFormats,
- sal_Bool bRecursive )
+ bool bRecursive )
{
{
SolarMutexGuard aGuard;
@@ -148,17 +148,17 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
INetURLObject aFoundURL( xContentAccess->queryContentIdentifierString() );
DBG_ASSERT( aFoundURL.GetProtocol() != INET_PROT_NOT_VALID, "invalid URL" );
- sal_Bool bFolder = xRow->getBoolean( 1 ); // property "IsFolder"
+ bool bFolder = xRow->getBoolean( 1 ); // property "IsFolder"
if ( xRow->wasNull() )
- bFolder = sal_False;
+ bFolder = false;
if( bRecursive && bFolder )
- ImplSearch( aFoundURL, rFormats, sal_True );
+ ImplSearch( aFoundURL, rFormats, true );
else
{
- sal_Bool bDocument = xRow->getBoolean( 2 ); // property "IsDocument"
+ bool bDocument = xRow->getBoolean( 2 ); // property "IsDocument"
if ( xRow->wasNull() )
- bDocument = sal_False;
+ bDocument = false;
if( bDocument )
{
@@ -543,7 +543,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
{
Gallery* pGal = pThm->GetParent();
const sal_uLong nId = GetId();
- sal_Bool bDifferentThemeExists = sal_False;
+ bool bDifferentThemeExists = false;
for( sal_uLong i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ )
{
@@ -560,7 +560,7 @@ IMPL_LINK_NOARG(GalleryIdDialog, ClickOkHdl)
InfoBox aBox( this, aStr );
aBox.Execute();
m_pLbResName->GrabFocus();
- bDifferentThemeExists = sal_True;
+ bDifferentThemeExists = true;
}
}
@@ -630,7 +630,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
OUString aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
OUString aAccess;
OUString aType( SVX_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
- sal_Bool bReadOnly = pThm->IsReadOnly();
+ bool bReadOnly = pThm->IsReadOnly();
m_pEdtMSName->SetText( pThm->GetName() );
m_pEdtMSName->SetReadOnly( bReadOnly );
@@ -750,7 +750,7 @@ void TPGalleryThemeProperties::StartSearchFiles( const OUString& _rFolderURL, sh
if ( RET_OK == _nDlgResult )
{
aURL = INetURLObject( _rFolderURL );
- bSearchRecursive = sal_True; // UI choice no longer possible, windows file picker allows no user controls
+ bSearchRecursive = true; // UI choice no longer possible, windows file picker allows no user controls
SearchFiles();
}
@@ -805,7 +805,7 @@ void TPGalleryThemeProperties::FillFilterList()
FilterEntry* pFilterEntry;
FilterEntry* pTestEntry;
sal_uInt16 i, nKeyCount;
- sal_Bool bInList;
+ bool bInList;
// graphic filters
for( i = 0, nKeyCount = rFilter.GetImportFormatCount(); i < nKeyCount; i++ )
@@ -814,7 +814,7 @@ void TPGalleryThemeProperties::FillFilterList()
aName = rFilter.GetImportFormatName( i );
size_t entryIndex = 0;
pTestEntry = aFilterEntryList.empty() ? NULL : aFilterEntryList[ entryIndex ];
- bInList = sal_False;
+ bInList = false;
OUString aExtensions;
int j = 0;
@@ -837,7 +837,7 @@ void TPGalleryThemeProperties::FillFilterList()
{
if ( pTestEntry->aFilterName == aExt )
{
- bInList = sal_True;
+ bInList = true;
break;
}
pTestEntry = ( ++entryIndex < aFilterEntryList.size() )
@@ -995,7 +995,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickSearchHdl)
if( xFolderPicker->execute() == RET_OK )
{
aURL = INetURLObject( xFolderPicker->getDirectory() );
- bSearchRecursive = sal_True; // UI choice no longer possible, windows file picker allows no user controls
+ bSearchRecursive = true; // UI choice no longer possible, windows file picker allows no user controls
SearchFiles();
}
@@ -1057,7 +1057,7 @@ void TPGalleryThemeProperties::DoPreview()
if( aString != aPreviewString )
{
INetURLObject _aURL( aFoundList[ m_pLbxFound->GetEntryPos( aString ) ] );
- bInputAllowed = sal_False;
+ bInputAllowed = false;
if ( !m_pWndPreview->SetGraphic( _aURL ) )
{
@@ -1072,7 +1072,7 @@ void TPGalleryThemeProperties::DoPreview()
xMediaPlayer->start();
}
- bInputAllowed = sal_True;
+ bInputAllowed = true;
aPreviewString = aString;
}
}
@@ -1096,7 +1096,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeHdl)
}
else
{
- bTakeAll = sal_False;
+ bTakeAll = false;
TakeFiles();
}
}
@@ -1111,7 +1111,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, ClickTakeAllHdl)
if( bInputAllowed )
{
aPreviewTimer.Stop();
- bTakeAll = sal_True;
+ bTakeAll = true;
TakeFiles();
}
@@ -1124,7 +1124,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
{
if( bInputAllowed )
{
- sal_Bool bPreviewPossible = sal_False;
+ bool bPreviewPossible = false;
aPreviewTimer.Stop();
@@ -1133,7 +1133,7 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, SelectFoundHdl)
if( m_pLbxFound->GetSelectEntryCount() == 1 )
{
m_pCbxPreview->Enable();
- bPreviewPossible = sal_True;
+ bPreviewPossible = true;
}
else
m_pCbxPreview->Disable();
@@ -1184,14 +1184,14 @@ IMPL_LINK_NOARG(TPGalleryThemeProperties, EndSearchProgressHdl)
m_pLbxFound->SelectEntryPos( 0 );
m_pBtnTakeAll->Enable();
m_pCbxPreview->Enable();
- bEntriesFound = sal_True;
+ bEntriesFound = true;
}
else
{
m_pLbxFound->InsertEntry( OUString( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) );
m_pBtnTakeAll->Disable();
m_pCbxPreview->Disable();
- bEntriesFound = sal_False;
+ bEntriesFound = false;
}
return 0L;
}
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index ae2ada6..53da9da 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -183,7 +183,7 @@ IMPL_LINK_NOARG(GraphicFilterDialog, ImplModifyHdl)
GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
- sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges )
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges )
: GraphicFilterDialog(pParent, "MosaicDialog",
"cui/ui/mosaicdialog.ui", rGraphic)
{
@@ -292,7 +292,7 @@ Graphic GraphicFilterSmooth::GetFilteredGraphic( const Graphic& rGraphic, double
GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
- sal_uInt8 cGreyThreshold, sal_Bool bInvert )
+ sal_uInt8 cGreyThreshold, bool bInvert )
: GraphicFilterDialog(pParent, "SolarizeDialog",
"cui/ui/solarizedialog.ui", rGraphic)
{
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 1c7bccb..8d33cc6 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -86,11 +86,11 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
: IconChoiceDialog( pParent, CUI_RES ( RID_SVXDLG_NEWHYPERLINK ) ),
maCtrl ( SID_HYPERLINK_GETLINK, *pBindings, this ),
mpBindings ( pBindings ),
- mbReadOnly ( sal_False ),
- mbIsHTMLDoc ( sal_False )
+ mbReadOnly ( false ),
+ mbIsHTMLDoc ( false )
{
SetUniqueId( HID_HYPERLINK_DIALOG );
- mbGrabFocus = sal_True;
+ mbGrabFocus = true;
// insert pages
Image aImage;
OUString aStrTitle;
@@ -123,7 +123,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
SetInputSet (mpItemSet);
// Init Dialog
- Start (sal_False);
+ Start (false);
pBindings->Update( SID_READONLY_MODE );
@@ -182,13 +182,13 @@ void SvxHpLinkDlg::Move()
// Size of Extrawindow
Size aExtraWndSize( pCurrentPage->GetSizeExtraWnd() );
- sal_Bool bDoInvalid ;
+ bool bDoInvalid ;
if( aDlgPos.X()+(1.02*aDlgSize.Width())+aExtraWndSize.Width() > aWindowSize.Width() )
{
if( aDlgPos.X() - ( 0.02*aDlgSize.Width() ) - aExtraWndSize.Width() < 0 )
{
// Pos Extrawindow anywhere
- bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), sal_True );
+ bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), true );
}
else
{
@@ -308,7 +308,7 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
if ( mbGrabFocus )
{
pCurrentPage->SetInitFocus(); // #92535# grab the focus only once at initialization
- mbGrabFocus = sal_False;
+ mbGrabFocus = false;
}
return nPageId;
}
@@ -319,7 +319,7 @@ sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
|*
|************************************************************************/
-void SvxHpLinkDlg::SetReadOnlyMode( sal_Bool bRdOnly )
+void SvxHpLinkDlg::SetReadOnlyMode( bool bRdOnly )
{
mbReadOnly = bRdOnly;
if ( bRdOnly )
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index c494464..03aedf3 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -420,7 +420,7 @@ namespace svx
if( m_bDisplayListBox != bDisplayListBox )
{
Control& rOldControl = implGetCurrentControl();
- sal_Bool bHasFocus = rOldControl.HasFocus();
+ bool bHasFocus = rOldControl.HasFocus();
m_bDisplayListBox = bDisplayListBox;
@@ -729,7 +729,7 @@ namespace svx
pOtherBox = &m_aHangulOnly;
if (pBox && pOtherBox)
{
- sal_Bool bBoxChecked = pBox->IsChecked();
+ bool bBoxChecked = pBox->IsChecked();
if (bBoxChecked)
pOtherBox->Check( false );
pOtherBox->Enable( !bBoxChecked );
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 28577d7..c04c81c 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -60,9 +60,9 @@ struct DocumentTypeData
{}
};
-sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const
+bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OUString& rBase, INetURLObject& aURLObject ) const
{
- sal_Bool bIsValidURL = !rPath.isEmpty();
+ bool bIsValidURL = !rPath.isEmpty();
if ( bIsValidURL )
{
aURLObject.SetURL( rPath );
@@ -80,7 +80,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const OUString& rPath, const OU
{
OUString aBase( aURLObject.getName( INetURLObject::LAST_SEGMENT, false ) );
if ( aBase.isEmpty() || ( aBase[0] == '.' ) )
- bIsValidURL = sal_False;
+ bIsValidURL = false;
}
if ( bIsValidURL )
{
@@ -261,10 +261,10 @@ void SvxHyperlinkNewDocTp::SetInitFocus()
|*
\************************************************************************/
-sal_Bool SvxHyperlinkNewDocTp::AskApply()
+bool SvxHyperlinkNewDocTp::AskApply()
{
INetURLObject aINetURLObject;
- sal_Bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject );
+ bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject );
if ( !bRet )
{
WarningBox aWarning( this, WB_OK, CUI_RESSTR(RID_SVXSTR_HYPDLG_NOVALIDFILENAME) );
@@ -310,7 +310,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler > xHandler;
SvStream* pIStm = ::utl::UcbStreamHelper::CreateStream( aURL.GetMainURL( INetURLObject::NO_DECODE ), STREAM_READ, xHandler );
- sal_Bool bOk = pIStm && ( pIStm->GetError() == 0);
+ bool bOk = pIStm && ( pIStm->GetError() == 0);
if( pIStm )
delete pIStm;
@@ -407,19 +407,19 @@ IMPL_LINK_NOARG(SvxHyperlinkNewDocTp, ClickNewHdl_Impl)
utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL );
OUString aStrPath = aStrURL;
- sal_Bool bZeroPath = aStrPath.isEmpty();
- sal_Bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled
+ bool bZeroPath = aStrPath.isEmpty();
+ bool bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled
// as file name, otherwise we do not yet know
if( bZeroPath )
aStrPath = SvtPathOptions().GetWorkPath();
else if( !::utl::UCBContentHelper::IsFolder( aStrURL ) )
- bHandleFileName = sal_True;
+ bHandleFileName = true;
xFolderPicker->setDisplayDirectory( aStrPath );
- DisableClose( sal_True );
+ DisableClose( true );
sal_Int16 nResult = xFolderPicker->execute();
- DisableClose( sal_False );
+ DisableClose( false );
if( ExecutableDialogResults::OK == nResult )
{
sal_Char const sSlash[] = "/";
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index f91f89c..f668248 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -47,7 +47,7 @@ SvxHyperlinkDocTp::SvxHyperlinkDocTp ( Window *pParent, const SfxItemSet& rItemS
maFtURL ( this, CUI_RES (FT_URL) ),
maFtFullURL ( this, CUI_RES (FT_FULL_URL) ),
maBtBrowse ( this, CUI_RES (BTN_BROWSE) ),
- mbMarkWndOpen ( sal_False )
+ mbMarkWndOpen ( false )
{
// Disable display of bitmap names.
maBtBrowse.EnableTextDisplay (false);
@@ -201,9 +201,9 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl)
aDlg.SetDisplayDirectory( aOldURL );
}
- DisableClose( sal_True );
+ DisableClose( true );
ErrCode nError = aDlg.Execute();
- DisableClose( sal_False );
+ DisableClose( false );
if ( ERRCODE_NONE == nError )
{
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index d20f4c4..6ef1536 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -50,7 +50,7 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
maFtPassword ( this, CUI_RES (FT_PASSWD) ),
maEdPassword ( this, CUI_RES (ED_PASSWD) ),
maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ),
- mbMarkWndOpen ( sal_False )
+ mbMarkWndOpen ( false )
{
// Disable display of bitmap names.
maBtBrowse.EnableTextDisplay (false);
@@ -271,8 +271,8 @@ IMPL_LINK_NOARG(SvxHyperlinkInternetTp, ModifiedLoginHdl_Impl)
void SvxHyperlinkInternetTp::SetScheme(const OUString& rScheme)
{
//if rScheme is empty or unknown the default beaviour is like it where HTTP
- sal_Bool bFTP = rScheme.startsWith(sFTPScheme);
- sal_Bool bInternet = !(bFTP);
+ bool bFTP = rScheme.startsWith(sFTPScheme);
+ bool bInternet = !(bFTP);
//update protocol button selection:
maRbtLinktypFTP.Check(bFTP);
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index eb7ffba..2e15476 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -124,7 +124,7 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
maBtApply( this, CUI_RES (BT_APPLY) ),
maBtClose( this, CUI_RES (BT_CLOSE) ),
maLbTree ( this, CUI_RES (TLB_MARK) ),
- mbUserMoved ( sal_False ),
+ mbUserMoved ( false ),
mpParent ( pParent ),
mnError ( LERR_NOERROR )
{
@@ -172,11 +172,11 @@ sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError)
|*
|************************************************************************/
-sal_Bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos )
+bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos )
{
if ( !mbUserMoved )
{
- sal_Bool bOldStatus = mbUserMoved;
+ bool bOldStatus = mbUserMoved;
SetPosPixel ( aNewPos );
mbUserMoved = bOldStatus;
}
@@ -189,12 +189,12 @@ void SvxHlinkDlgMarkWnd::Move ()
Window::Move();
if ( IsReallyVisible() )
- mbUserMoved = sal_True;
+ mbUserMoved = true;
}
-sal_Bool SvxHlinkDlgMarkWnd::ConnectToDialog( sal_Bool bDoit )
+bool SvxHlinkDlgMarkWnd::ConnectToDialog( bool bDoit )
{
- sal_Bool bOldStatus = mbUserMoved;
+ bool bOldStatus = mbUserMoved;
mbUserMoved = !bDoit;
@@ -307,7 +307,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree (const OUString& aStrURL)
|*
|************************************************************************/
-sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL)
+bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL)
{
mnError = LERR_NOERROR;
@@ -324,7 +324,7 @@ sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc(const OUString& aURL)
{
uno::Sequence< beans::PropertyValue > aArg(1);
aArg.getArray()[0].Name = "Hidden";
- aArg.getArray()[0].Value <<= (sal_Bool) sal_True;
+ aArg.getArray()[0].Value <<= true;
xComp = xLoader->loadComponentFromURL( aURL, OUString( "_blank" ), 0, aArg );
}
catch( const io::IOException& )
@@ -387,7 +387,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
uno::Any aAny;
OUString aLink( *pNames++ );
- sal_Bool bError = sal_False;
+ bool bError = false;
try
{
aAny = xLinks->getByName( aLink );
@@ -396,7 +396,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
{
// if the name of the target was invalid (like empty headings)
// no object can be provided
- bError = sal_True;
+ bError = true;
}
if(bError)
continue;
@@ -415,7 +415,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
// is it a target ?
uno::Reference< lang::XServiceInfo > xSI( xTarget, uno::UNO_QUERY );
- sal_Bool bIsTarget = xSI->supportsService( aProp_LinkTarget );
+ bool bIsTarget = xSI->supportsService( aProp_LinkTarget );
// create userdata
TargetData *pData = new TargetData ( aLink, bIsTarget );
@@ -499,14 +499,14 @@ void SvxHlinkDlgMarkWnd::ClearTree()
SvTreeListEntry* SvxHlinkDlgMarkWnd::FindEntry (const OUString& aStrName)
{
- sal_Bool bFound=sal_False;
+ bool bFound=false;
SvTreeListEntry* pEntry = maLbTree.First();
while ( pEntry && !bFound )
{
TargetData* pUserData = ( TargetData * ) pEntry->GetUserData ();
if (aStrName == pUserData->aUStrLinkname)
- bFound = sal_True;
+ bFound = true;
else
pEntry = maLbTree.Next( pEntry );
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index 9d17318..f31c056 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -129,9 +129,9 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent,
mpFtText ( NULL ),
mpEdText ( NULL ),
mpBtScript ( NULL ),
- mbIsCloseDisabled ( sal_False ),
+ mbIsCloseDisabled ( false ),
mpDialog ( pParent ),
- mbStdControlsInit ( sal_False ),
+ mbStdControlsInit ( false ),
aEmptyStr()
{
// create bookmark-window
@@ -169,7 +169,7 @@ void SvxHyperlinkTabPageBase::DeactivatePage()
TabPage::DeactivatePage();
}
-sal_Bool SvxHyperlinkTabPageBase::QueryClose()
+bool SvxHyperlinkTabPageBase::QueryClose()
{
return !mbIsCloseDisabled;
}
@@ -196,16 +196,16 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
mpBtScript->SetAccessibleRelationLabeledBy( mpFtForm );
}
- mbStdControlsInit = sal_True;
+ mbStdControlsInit = true;
}
// Move Extra-Window
-sal_Bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, sal_Bool bDisConnectDlg )
+bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, bool bDisConnectDlg )
{
- sal_Bool bReturn = mpMarkWnd->MoveTo ( aNewPos );
+ bool bReturn = mpMarkWnd->MoveTo ( aNewPos );
if( bDisConnectDlg )
- mpMarkWnd->ConnectToDialog( sal_False );
+ mpMarkWnd->ConnectToDialog( false );
return ( !bReturn && IsMarkWndVisible() );
}
@@ -233,7 +233,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
{
// Pos Extrawindow anywhere
MoveToExtraWnd( Point(10,10) ); // very unlikely
- mpMarkWnd->ConnectToDialog( sal_False );
+ mpMarkWnd->ConnectToDialog( false );
}
else
{
@@ -297,10 +297,10 @@ void SvxHyperlinkTabPageBase::DoApply ()
}
// Ask page whether an insert is possible
-sal_Bool SvxHyperlinkTabPageBase::AskApply ()
+bool SvxHyperlinkTabPageBase::AskApply ()
{
// default-implementation
- return sal_True;
+ return true;
}
// This method would be called from bookmark-window to set new mark-string
@@ -316,7 +316,7 @@ void SvxHyperlinkTabPageBase::SetInitFocus()
}
// Ask dialog whether the curretn doc is a HTML-doc
-sal_Bool SvxHyperlinkTabPageBase::IsHTMLDoc() const
+bool SvxHyperlinkTabPageBase::IsHTMLDoc() const
{
return ((SvxHpLinkDlg*)mpDialog)->IsHTMLDoc();
}
@@ -351,7 +351,7 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
because if no JAVA is installed an error box occurs and then it is possible
to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF
*/
- sal_Bool bIsInputEnabled = GetParent()->IsInputEnabled();
+ bool bIsInputEnabled = GetParent()->IsInputEnabled();
if ( bIsInputEnabled )
GetParent()->EnableInput( false );
SfxMacroAssignDlg aDlg( this, mxDocumentFrame, *pItemSet );
@@ -372,9 +372,9 @@ IMPL_LINK_NOARG(SvxHyperlinkTabPageBase, ClickScriptHdl_Impl)
if ( bIsInputEnabled )
GetParent()->EnableInput( true );
// execute dlg
- DisableClose( sal_True );
+ DisableClose( true );
short nRet = aDlg.Execute();
- DisableClose( sal_False );
+ DisableClose( false );
if ( RET_OK == nRet )
{
const SfxItemSet* pOutSet = aDlg.GetOutputItemSet();
@@ -574,9 +574,9 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet)
return( LEAVE_PAGE );
}
-sal_Bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd()
+bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd()
{
- return sal_False;
+ return false;
}
void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(sal_Bool)
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index b2d8224..edf181b 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -349,9 +349,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CutHdl_Impl)
{
if( !bBusy )
{
- bBusy = sal_True;
+ bBusy = true;
ContinueHyph_Impl( /*nHyphPos*/nOldPos );
- bBusy = sal_False;
+ bBusy = false;
}
return 0;
}
@@ -367,9 +367,9 @@ IMPL_LINK( SvxHyphenWordDialog, HyphenateAllHdl_Impl, Button *, EMPTYARG /*pButt
xProp->setIsHyphAuto( sal_True );
- bBusy = sal_True;
+ bBusy = true;
ContinueHyph_Impl( /*nHyphPos*/nOldPos );
- bBusy = sal_False;
+ bBusy = false;
xProp->setIsHyphAuto( sal_False );
}
@@ -387,9 +387,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, DeleteHdl_Impl)
{
if( !bBusy )
{
- bBusy = sal_True;
+ bBusy = true;
ContinueHyph_Impl();
- bBusy = sal_False;
+ bBusy = false;
}
return 0;
}
@@ -399,9 +399,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, ContinueHdl_Impl)
{
if( !bBusy )
{
- bBusy = sal_True;
+ bBusy = true;
ContinueHyph_Impl( CONTINUE_HYPH );
- bBusy = sal_False;
+ bBusy = false;
}
return 0;
}
@@ -411,10 +411,10 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, CancelHdl_Impl)
{
if( !bBusy )
{
- bBusy = sal_True;
+ bBusy = true;
pHyphWrapper->SpellEnd();
EndDialog( RET_CANCEL );
- bBusy = sal_False;
+ bBusy = false;
}
return 0;
}
@@ -424,9 +424,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Left_Impl)
{
if( !bBusy )
{
- bBusy = sal_True;
+ bBusy = true;
SelLeft();
- bBusy = sal_False;
+ bBusy = false;
}
return 0;
}
@@ -436,9 +436,9 @@ IMPL_LINK_NOARG(SvxHyphenWordDialog, Right_Impl)
{
if( !bBusy )
{
- bBusy = sal_True;
+ bBusy = true;
SelRight();
- bBusy = sal_False;
+ bBusy = false;
}
return 0;
}
@@ -467,7 +467,7 @@ SvxHyphenWordDialog::SvxHyphenWordDialog(
, nHyphPos(0)
, nOldPos(0)
, nHyphenationPositionsOffset(0)
- , bBusy(sal_False)
+ , bBusy(false)
{
get(m_pWordEdit, "worded");
get(m_pLeftBtn, "left");
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index 4bdd721..3c5f794 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -70,7 +70,7 @@ IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId,
const SfxItemSet &rAttrSet )
: TabPage ( pParent, rResId ),
pSet ( &rAttrSet ),
- bHasExchangeSupport ( sal_False ),
+ bHasExchangeSupport ( false ),
pDialog ( NULL )
{
SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE );
@@ -111,16 +111,16 @@ void IconChoicePage::FillUserData()
-sal_Bool IconChoicePage::IsReadOnly() const
+bool IconChoicePage::IsReadOnly() const
{
- return sal_False;
+ return false;
}
-sal_Bool IconChoicePage::QueryClose()
+bool IconChoicePage::QueryClose()
{
- return sal_True;
+ return true;
}
/**********************************************************************
@@ -211,11 +211,11 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
pRanges ( NULL ),
nResId ( rResId.GetId() ),
- bHideResetBtn ( sal_False ),
- bModal ( sal_False ),
- bInOK ( sal_False ),
- bModified ( sal_False ),
- bItemsReset ( sal_False )
+ bHideResetBtn ( false ),
+ bModal ( false ),
+ bInOK ( false ),
+ bModified ( false ),
+ bItemsReset ( false )
{
maIconCtrl.SetStyle (WB_3DLOOK | WB_ICON | WB_BORDER | WB_NOCOLUMNHEADER | WB_HIGHLIGHTFRAME | WB_NODRAGSELECTION | WB_TABSTOP | WB_CLIPCHILDREN );
@@ -245,7 +245,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
aHelpBtn.Show();
aResetBtn.Show();
- SetPosSizeCtrls ( sal_True );
+ SetPosSizeCtrls ( true );
}
@@ -307,7 +307,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage(
const Image& rChoiceIcon,
CreatePage pCreateFunc /* != 0 */,
GetPageRanges pRangesFunc /* darf 0 sein */,
- sal_Bool bItemsOnDemand,
+ bool bItemsOnDemand,
sal_uLong /*nPos*/
)
{
@@ -439,7 +439,7 @@ void IconChoiceDialog::Resize()
}
}
-void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit )
+void IconChoiceDialog::SetPosSizeCtrls ( bool bInit )
{
const Point aCtrlOffset ( LogicToPixel( Point( CTRLS_OFFSET, CTRLS_OFFSET ), MAP_APPFONT ) );
Size aOutSize ( GetOutputSizePixel() );
@@ -665,7 +665,7 @@ IMPL_LINK_NOARG(IconChoiceDialog , ChosePageHdl_Impl)
IMPL_LINK_NOARG(IconChoiceDialog, OkHdl)
{
- bInOK = sal_True;
+ bInOK = true;
if ( OK_Impl() )
{
@@ -758,7 +758,7 @@ void IconChoiceDialog::ActivatePageImpl ()
pData->pPage->Reset( *pSet );
}
- pData->bRefresh = sal_False;
+ pData->bRefresh = false;
if ( pExampleSet )
pData->pPage->ActivatePage( *pExampleSet );
@@ -776,7 +776,7 @@ void IconChoiceDialog::ActivatePageImpl ()
-sal_Bool IconChoiceDialog::DeActivatePageImpl ()
+bool IconChoiceDialog::DeActivatePageImpl ()
{
IconChoicePageData *pData = GetPageData ( mnCurrentPageId );
@@ -828,17 +828,17 @@ sal_Bool IconChoiceDialog::DeActivatePageImpl ()
{
IconChoicePageData* pObj = maPageList[ i ];
if ( pObj->pPage != pPage )
- pObj->bRefresh = sal_True;
+ pObj->bRefresh = true;
else
- pObj->bRefresh = sal_False;
+ pObj->bRefresh = false;
}
}
}
if ( nRet & IconChoicePage::LEAVE_PAGE )
- return sal_True;
+ return true;
else
- return sal_False;
+ return false;
}
@@ -961,11 +961,11 @@ short IconChoiceDialog::Execute()
-void IconChoiceDialog::Start( sal_Bool bShow )
+void IconChoiceDialog::Start( bool bShow )
{
aCancelBtn.SetClickHdl( LINK( this, IconChoiceDialog, CancelHdl ) );
- bModal = sal_False;
+ bModal = false;
Start_Impl();
@@ -976,15 +976,15 @@ void IconChoiceDialog::Start( sal_Bool bShow )
-sal_Bool IconChoiceDialog::QueryClose()
+bool IconChoiceDialog::QueryClose()
{
- sal_Bool bRet = sal_True;
+ bool bRet = true;
for ( size_t i = 0, nCount = maPageList.size(); i < nCount; ++i )
{
IconChoicePageData* pData = maPageList[i ];
if ( pData->pPage && !pData->pPage->QueryClose() )
{
- bRet = sal_False;
+ bRet = false;
break;
}
}
@@ -1064,7 +1064,7 @@ IconChoicePageData* IconChoiceDialog::GetPageData ( sal_uInt16 nId )
|
\**********************************************************************/
-sal_Bool IconChoiceDialog::OK_Impl()
+bool IconChoiceDialog::OK_Impl()
{
IconChoicePage* pPage = GetPageData ( mnCurrentPageId )->pPage;
@@ -1075,7 +1075,7 @@ sal_Bool IconChoiceDialog::OK_Impl()
if ( pSet )
{
SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() );
- sal_Bool bRet = sal_False;
+ bool bRet = false;
if ( pPage->HasExchangeSupport() )
nRet = pPage->DeactivatePage( &aTmp );
@@ -1087,7 +1087,7 @@ sal_Bool IconChoiceDialog::OK_Impl()
pOutSet->Put( aTmp );
}
else if ( bRet )
- bModified |= sal_True;
+ bModified |= true;
}
else
nRet = pPage->DeactivatePage( NULL );
@@ -1101,7 +1101,7 @@ sal_Bool IconChoiceDialog::OK_Impl()
short IconChoiceDialog::Ok()
{
- bInOK = sal_True;
+ bInOK = true;
if ( !pOutSet )
{
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index ac0645e..fe7dfea 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -82,9 +82,9 @@ static OUString impl_getSvtResString( sal_uInt32 nId )
return aRet;
}
-sal_Bool InsertObjectDialog_Impl::IsCreateNew() const
+bool InsertObjectDialog_Impl::IsCreateNew() const
{
- return sal_False;
+ return false;
}
uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( OUString* /*pGraphicMediaType*/ )
@@ -216,8 +216,8 @@ short SvInsertOleDlg::Execute()
if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK )
{
OUString aFileName;
- sal_Bool bLink = sal_False;
- sal_Bool bCreateNew = IsCreateNew();
+ bool bLink = false;
+ bool bCreateNew = IsCreateNew();
if ( bCreateNew )
{
// create and insert new embedded object
@@ -523,7 +523,7 @@ void SfxInsertFloatingFrameDialog::Init()
short SfxInsertFloatingFrameDialog::Execute()
{
short nRet = RET_OK;
- sal_Bool bOK = sal_False;
+ bool bOK = false;
uno::Reference < beans::XPropertySet > xSet;
if ( m_xObj.is() )
{
@@ -567,11 +567,11 @@ short SfxInsertFloatingFrameDialog::Execute()
else
m_pNMMarginHeight->SetText( OUString::number( nSize ) );
- sal_Bool bScrollOn = sal_False;
- sal_Bool bScrollOff = sal_False;
- sal_Bool bScrollAuto = sal_False;
+ bool bScrollOn = false;
+ bool bScrollOff = false;
+ bool bScrollAuto = false;
- sal_Bool bSet = sal_False;
+ bool bSet = false;
aAny = xSet->getPropertyValue( "FrameIsAutoScroll" );
aAny >>= bSet;
if ( !bSet )
@@ -582,13 +582,13 @@ short SfxInsertFloatingFrameDialog::Execute()
bScrollOff = !bSet;
}
else
- bScrollAuto = sal_True;
+ bScrollAuto = true;
m_pRBScrollingOn->Check( bScrollOn );
m_pRBScrollingOff->Check( bScrollOff );
m_pRBScrollingAuto->Check( bScrollAuto );
- bSet = sal_False;
+ bSet = false;
aAny = xSet->getPropertyValue( "FrameIsAutoBorder" );
aAny >>= bSet;
if ( !bSet )
@@ -600,7 +600,7 @@ short SfxInsertFloatingFrameDialog::Execute()
}
SetUpdateMode( true );
- bOK = sal_True;
+ bOK = true;
}
catch ( uno::Exception& )
{
@@ -640,7 +640,7 @@ short SfxInsertFloatingFrameDialog::Execute()
{
try
{
- sal_Bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE;
+ bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE;
if ( bIPActive )
m_xObj->changeState( embed::EmbedStates::RUNNING );
@@ -653,7 +653,7 @@ short SfxInsertFloatingFrameDialog::Execute()
if ( m_pRBScrollingAuto->IsChecked() )
eScroll = ScrollingAuto;
- sal_Bool bHasBorder = m_pRBFrameBorderOn->IsChecked();
+ bool bHasBorder = m_pRBFrameBorderOn->IsChecked();
long lMarginWidth;
if ( !m_pCBMarginWidthDefault->IsChecked() )
@@ -671,9 +671,9 @@ short SfxInsertFloatingFrameDialog::Execute()
xSet->setPropertyValue( "FrameName", makeAny( aName ) );
if ( eScroll == ScrollingAuto )
- xSet->setPropertyValue( "FrameIsAutoScroll", makeAny( sal_True ) );
+ xSet->setPropertyValue( "FrameIsAutoScroll", makeAny( true ) );
else
- xSet->setPropertyValue( "FrameIsScrollingMode", makeAny( (sal_Bool) ( eScroll == ScrollingYes) ) );
+ xSet->setPropertyValue( "FrameIsScrollingMode", makeAny( eScroll == ScrollingYes ) );
xSet->setPropertyValue( "FrameIsBorder", makeAny( bHasBorder ) );
xSet->setPropertyValue( "FrameMarginWidth", makeAny( sal_Int32( lMarginWidth ) ) );
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 74ac8ec..043de03 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -77,7 +77,7 @@ static long nTabs[] =
};
-SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bHtml )
+SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, bool bHtml )
: ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ),
aFtFiles( this, CUI_RES( FT_FILES ) ),
aFtLinks( this, CUI_RES( FT_LINKS ) ),
@@ -419,7 +419,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
{
(void)pPushButton;
- sal_Bool bModified = sal_False;
+ bool bModified = false;
if(Links().GetSelectionCount() <= 1)
{
sal_uLong nPos;
@@ -434,7 +434,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
Links().GetModel()->Remove( Links().GetEntry( nPos ) );
// close object, if it's still existing
- sal_Bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType();
+ bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType();
// tell the link that it will be resolved!
xLink->Closed();
@@ -453,7 +453,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
if( pEntry )
Links().SetCurEntry( pEntry );
}
- bModified = sal_True;
+ bModified = true;
}
}
else
@@ -481,7 +481,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
// if somebody has forgotten to deregister himself
pLinkMgr->Remove( &xLink );
- bModified = sal_True;
+ bModified = true;
}
// then remove all selected entries
}
@@ -538,11 +538,11 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
// So search for the link in the manager; if it does not exist
// anymore, fill the list completely new. Otherwise only the
// edited link needs to be refreshed.
- sal_Bool bLinkFnd = sal_False;
+ bool bLinkFnd = false;
for( size_t n = pLinkMgr->GetLinks().size(); n; )
if( _pLink == &(*pLinkMgr->GetLinks()[ --n ]) )
{
- bLinkFnd = sal_True;
+ bLinkFnd = true;
break;
}
@@ -551,7 +551,7 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
Links().SetUpdateMode(false);
Links().GetModel()->Remove( Links().GetEntry( nPos ) );
SvTreeListEntry* pToUnselect = Links().FirstSelected();
- InsertEntry( *_pLink, nPos, sal_True );
+ InsertEntry( *_pLink, nPos, true );
if(pToUnselect)
Links().Select(pToUnselect, false);
Links().SetUpdateMode(true);
@@ -627,7 +627,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
}
-void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, sal_Bool bSelect )
+void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uLong nPos, bool bSelect )
{
OUString aEntry, sFileNm, sLinkNm, sTypeNm, sFilter;
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index eee728b..b353e2d 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -290,7 +290,7 @@ void SvxMultiPathDialog::SetPath( const OUString& rPath )
{
OUString sPath = rPath.getToken( i, cDelim );
OUString sSystemPath;
- sal_Bool bIsSystemPath =
+ bool bIsSystemPath =
::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath );
OUString sEntry( '\t' );
@@ -322,7 +322,7 @@ void SvxPathSelectDialog::SetPath(const OUString& rPath)
{
OUString sPath = rPath.getToken( i, cDelim );
OUString sSystemPath;
- sal_Bool bIsSystemPath =
+ bool bIsSystemPath =
::utl::LocalFileHelper::ConvertURLToSystemPath( sPath, sSystemPath );
if ( bIsSystemPath )
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index d430bdb..0b14ca6 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -62,7 +62,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
aFont.SetWeight( WEIGHT_LIGHT );
m_pEditED->SetFont( aFont );
- sal_Bool bNew = sal_True;
+ bool bNew = true;
sal_uInt16 nWhich = 0;
if ( !bPrevNext )
@@ -76,7 +76,7 @@ SvxPostItDialog::SvxPostItDialog(Window* pParent, const SfxItemSet& rCoreSet,
if ( rSet.GetItemState( nWhich, true ) >= SFX_ITEM_AVAILABLE )
{
- bNew = sal_False;
+ bNew = false;
const SvxPostItAuthorItem& rAuthor =
(const SvxPostItAuthorItem&)rSet.Get( nWhich );
aAuthorStr = rAuthor.GetValue();
@@ -154,7 +154,7 @@ sal_uInt16* SvxPostItDialog::GetRanges()
-void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev)
+void SvxPostItDialog::EnableTravel(bool bNext, bool bPrev)
{
m_pPrevBtn->Enable(bPrev);
m_pNextBtn->Enable(bNext);
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 9de4ce5..7e73497 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -839,7 +839,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
}
//do we need L10N for this? ie something like:
//String aNewStdName( ResId( STR_STDMODULENAME ) );
- sal_Bool bValid = sal_False;
+ bool bValid = false;
sal_Int32 i = 1;
Sequence< Reference< browse::XBrowseNode > > childNodes;
@@ -849,7 +849,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
if( node->hasChildNodes() == sal_False )
{
aNewName = aNewStdName + OUString::number(i);
- bValid = sal_True;
+ bValid = true;
}
else
{
@@ -865,7 +865,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
while ( !bValid )
{
aNewName = aNewStdName + OUString::number(i);
- sal_Bool bFound = sal_False;
+ bool bFound = false;
if(childNodes.getLength() > 0 )
{
OUString nodeName = childNodes[0]->getName();
@@ -877,7 +877,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
{
if (aNewName+extn == childNodes[index]->getName())
{
- bFound = sal_True;
+ bFound = true;
break;
}
}
@@ -887,7 +887,7 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
}
else
{
- bValid = sal_True;
+ bValid = true;
}
}
@@ -899,12 +899,12 @@ void SvxScriptOrgDialog::createEntry( SvTreeListEntry* pEntry )
if ( xNewDlg->Execute() && !xNewDlg->GetObjectName().isEmpty() )
{
OUString aUserSuppliedName = xNewDlg->GetObjectName();
- bValid = sal_True;
+ bValid = true;
for( sal_Int32 index = 0; index < childNodes.getLength(); index++ )
{
if (aUserSuppliedName+extn == childNodes[index]->getName())
{
- bValid = sal_False;
+ bValid = false;
OUString aError( m_createErrStr );
aError += m_createDupStr;
ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError );
@@ -1022,13 +1022,13 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry )
boost::scoped_ptr< CuiInputDialog > xNewDlg( new CuiInputDialog( static_cast<Window*>(this), nMode ) );
xNewDlg->SetObjectName( aNewName );
- sal_Bool bValid;
+ bool bValid;
do
{
if ( xNewDlg->Execute() && !xNewDlg->GetObjectName().isEmpty() )
{
OUString aUserSuppliedName = xNewDlg->GetObjectName();
- bValid = sal_True;
+ bValid = true;
if( bValid )
aNewName = aUserSuppliedName;
}
@@ -1077,7 +1077,7 @@ void SvxScriptOrgDialog::renameEntry( SvTreeListEntry* pEntry )
}
void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
{
- sal_Bool result = sal_False;
+ bool result = false;
Reference< browse::XBrowseNode > node = getBrowseNode( pEntry );
// ISSUE L10N string & can we centre list?
OUString aQuery = m_delQueryStr + getListOfChildren( node, 0 );
@@ -1108,7 +1108,7 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
}
}
- if ( result == sal_True )
+ if ( result )
{
m_pScriptsBox->deleteTree( pEntry );
m_pScriptsBox->GetModel()->Remove( pEntry );
@@ -1123,15 +1123,13 @@ void SvxScriptOrgDialog::deleteEntry( SvTreeListEntry* pEntry )
}
-sal_Bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps,
+bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps,
OUString& propName )
{
- sal_Bool result = false;
+ bool result = false;
try
{
- sal_Bool bTemp = sal_False;
- xProps->getPropertyValue( propName ) >>= bTemp;
- result = ( bTemp == sal_True );
+ xProps->getPropertyValue( propName ) >>= result;
}
catch ( Exception& )
{
diff --git a/cui/source/dialogs/showcols.cxx b/cui/source/dialogs/showcols.cxx
index 73b781b..d0a79b7 100644
--- a/cui/source/dialogs/showcols.cxx
+++ b/cui/source/dialogs/showcols.cxx
@@ -84,7 +84,7 @@ void FmShowColsDialog::SetColumns(const ::com::sun::star::uno::Reference< ::com:
{
sCurName = "";
xCurCol.set(xCols->getByIndex(i), css::uno::UNO_QUERY);
- sal_Bool bIsHidden = sal_False;
+ bool bIsHidden = false;
try
{
::com::sun::star::uno::Any aHidden = xCurCol->getPropertyValue(CUIFM_PROP_HIDDEN);
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index d13ce27..cdaf009 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -106,7 +106,7 @@ void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
}
else if (nId == m_nBackPageId)
{
- ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(sal_True);
+ ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(true);
}
}
@@ -139,14 +139,14 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog(Window* pParent,
sal_uInt16 nSlot = rPool.GetSlotId( nWhich );
if ( nSlot >= SID_SVX_START )
{
- sal_Bool bChecked = sal_False, bFound = sal_False;
+ bool bChecked = false, bFound = false;
for ( sal_uInt16 i = 0; !bFound && i < rList.Count(); ++i )
{
if ( nSlot == rList[i].nSlot )
{
- bFound = sal_True;
+ bFound = true;
if ( IsInvalidItem( rList[i].pItem ) )
- bChecked = sal_True;
+ bChecked = true;
}
}
@@ -181,7 +181,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
for ( sal_uInt16 i = 0; i < m_pAttrLB->GetEntryCount(); ++i )
{
sal_uInt16 nSlot = (sal_uInt16)(sal_uLong)m_pAttrLB->GetEntryData(i);
- sal_Bool bChecked = m_pAttrLB->IsChecked(i);
+ bool bChecked = m_pAttrLB->IsChecked(i);
sal_uInt16 j;
for ( j = rList.Count(); j; )
@@ -223,7 +223,7 @@ IMPL_LINK_NOARG(SvxSearchAttributeDialog, OKHdl)
SvxSearchSimilarityDialog::SvxSearchSimilarityDialog
(
Window* pParent,
- sal_Bool bRelax,
+ bool bRelax,
sal_uInt16 nOther,
sal_uInt16 nShorter,
sal_uInt16 nLonger
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index e369d03..28eb9a0 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -297,7 +297,7 @@ SvxZoomDialog::~SvxZoomDialog()
IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn )
{
- bModified |= sal_True;
+ bModified = true;
if (pBtn == m_pUserBtn)
{
@@ -315,7 +315,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
{
if ( !m_pUserBtn->IsChecked() )
return 0;
- bModified |= sal_True;
+ bModified = true;
return 0;
}
@@ -323,7 +323,7 @@ IMPL_LINK_NOARG(SvxZoomDialog, SpinHdl)
IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn )
{
- bModified |= sal_True;
+ bModified = true;
if (pBtn == m_pAutomaticBtn)
{
@@ -366,7 +366,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, NumericField *, pEdt )
m_pBookModeChk->Disable();
}
- bModified |= sal_True;
+ bModified = true;
return 0;
}
@@ -378,7 +378,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk )
if (pChk == m_pBookModeChk && !m_pColumnsBtn->IsChecked())
return 0;
- bModified |= sal_True;
+ bModified = true;
return 0;
}
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index b358e5c..01490ba 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -1278,7 +1278,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& ,
const SfxItemSet* pAttrSet )
{
- SfxModalDialog* pDlg = new SvxCharacterMap( pParent, sal_True, pAttrSet );
+ SfxModalDialog* pDlg = new SvxCharacterMap( pParent, true, pAttrSet );
return new CuiAbstractSfxDialog_Impl( pDlg );
}
@@ -1543,7 +1543,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
pDlg = new SfxMacroAssignDlg( pParent, _rxDocumentFrame, rAttr );
break;
case RID_SVXDLG_CHARMAP :
- pDlg = new SvxCharacterMap( pParent, sal_True, &rAttr );
+ pDlg = new SvxCharacterMap( pParent, true, &rAttr );
break;
default:
break;
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index f340cfd..cd0179b 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -105,7 +105,7 @@ public:
void ResetUndo();
void Undo();
- void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
+ void AddUndoAction( SfxUndoAction *pAction, bool bTryMerg=false );
sal_uInt16 GetUndoActionCount();
void UndoActionStart( sal_uInt16 nId );
void UndoActionEnd();
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index 2998db5..825f79b 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -86,20 +86,20 @@ struct TAccInfo
const KeyCode& aKey )
: m_nKeyPos (nKeyPos )
, m_nListPos (nListPos )
- , m_bIsConfigurable(sal_True ) /**< its important to set sal_True as default -
+ , m_bIsConfigurable(true ) /**< its important to set sal_True as default -
because only fix entries will be disabled later ... */
, m_sCommand ( )
, m_aKey (aKey )
{}
- sal_Bool isConfigured() const
+ bool isConfigured() const
{
return (m_nKeyPos>-1 && m_nListPos>-1 && !m_sCommand.isEmpty());
}
sal_Int32 m_nKeyPos;
sal_Int32 m_nListPos;
- sal_Bool m_bIsConfigurable;
+ bool m_bIsConfigurable;
OUString m_sCommand;
KeyCode m_aKey;
};
@@ -134,7 +134,7 @@ private:
OUString aFilterAllStr;
OUString aFilterCfgStr;
SfxStylesInfo_Impl m_aStylesInfo;
- sal_Bool m_bStylesInfoInitialized;
+ bool m_bStylesInfoInitialized;
css::uno::Reference< css::uno::XComponentContext > m_xContext;
css::uno::Reference< css::ui::XAcceleratorConfiguration > m_xGlobal;
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index e6748d0..644a8c7 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -80,8 +80,8 @@ class OfaACorrCheckListBox : public SvSimpleTable
inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
inline sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
- sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
- void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked);
+ bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
+ void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, bool bChecked);
SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const;
void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState );
};
@@ -182,18 +182,18 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
class AutoCorrEdit : public Edit
{
Link aActionLink;
- sal_Bool bSpaces;
+ bool bSpaces;
public:
AutoCorrEdit(Window* pParent, const ResId& rResId) :
- Edit(pParent, rResId), bSpaces(sal_False){}
+ Edit(pParent, rResId), bSpaces(false){}
AutoCorrEdit(Window* pParent) :
- Edit(pParent), bSpaces(sal_False){}
+ Edit(pParent), bSpaces(false){}
void SetActionHdl( const Link& rLink )
{ aActionLink = rLink;}
- void SetSpaces(sal_Bool bSet)
+ void SetSpaces(bool bSet)
{bSpaces = bSet;}
virtual void KeyInput( const KeyEvent& rKEvent ) SAL_OVERRIDE;
@@ -245,16 +245,16 @@ private:
CharClass* pCharClass;
LanguageType eLang;
- sal_Bool bHasSelectionText;
- sal_Bool bFirstSelect:1;
- sal_Bool bReplaceEditChanged:1;
- sal_Bool bSWriter:1;
+ bool bHasSelectionText;
+ bool bFirstSelect:1;
+ bool bReplaceEditChanged:1;
+ bool bSWriter:1;
DECL_LINK(SelectHdl, SvTabListBox*);
DECL_LINK(NewDelHdl, PushButton*);
DECL_LINK(ModifyHdl, Edit*);
- void RefillReplaceBox( sal_Bool bFromReset,
+ void RefillReplaceBox( bool bFromReset,
LanguageType eOldLanguage,
LanguageType eNewLanguage);
@@ -314,7 +314,7 @@ private:
DECL_LINK(SelectHdl, ListBox*);
DECL_LINK(ModifyHdl, Edit*);
/// Box filled with new language
- void RefillReplaceBoxes(sal_Bool bFromReset,
+ void RefillReplaceBoxes(bool bFromReset,
LanguageType eOldLanguage,
LanguageType eNewLanguage);
public:
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 23293c5..b8c77fd 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -59,9 +59,9 @@ public:
/// for the Writer (cells/rows/tables)
void ShowTblControl();
/// for the Writer (paragraph/characters)
- void ShowParaControl(sal_Bool bCharOnly = sal_False);
+ void ShowParaControl(bool bCharOnly = false);
- void EnableTransparency(sal_Bool bColor, sal_Bool bGraphic);
+ void EnableTransparency(bool bColor, bool bGraphic);
virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE;
protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
@@ -108,11 +108,11 @@ private:
Color aBgdColor;
sal_uInt16 nHtmlMode;
- sal_Bool bAllowShowSelector : 1;
- sal_Bool bIsGraphicValid : 1;
- sal_Bool bLinkOnly : 1;
- sal_Bool bColTransparency : 1;
- sal_Bool bGraphTransparency : 1;
+ bool bAllowShowSelector : 1;
+ bool bIsGraphicValid : 1;
+ bool bLinkOnly : 1;
+ bool bColTransparency : 1;
+ bool bGraphTransparency : 1;
Graphic aBgdGraphic;
OUString aBgdGraphicPath;
OUString aBgdGraphicFilter;
@@ -128,7 +128,7 @@ private:
void HideColorUI_Impl();
void ShowBitmapUI_Impl();
void HideBitmapUI_Impl();
- sal_Bool LoadLinkedGraphic_Impl();
+ bool LoadLinkedGraphic_Impl();
void RaiseLoadError_Impl();
void SetGraphicPosition_Impl( SvxGraphicPosition ePos );
SvxGraphicPosition GetGraphicPosition_Impl();
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 60010ff..7a8865a 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -65,7 +65,7 @@ struct SfxStylesInfo_Impl
SfxStylesInfo_Impl();
void setModel(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel);
- sal_Bool parseStyleCommand(SfxStyleInfo_Impl& aStyle);
+ bool parseStyleCommand(SfxStyleInfo_Impl& aStyle);
void getLabel4Style(SfxStyleInfo_Impl& aStyle);
::std::vector< SfxStyleInfo_Impl > getStyleFamilies();
@@ -85,12 +85,12 @@ struct SfxGroupInfo_Impl
sal_uInt16 nKind;
sal_uInt16 nUniqueID;
void* pObject;
- sal_Bool bWasOpened;
+ bool bWasOpened;
OUString sCommand;
OUString sLabel;
SfxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, void* pObj = 0 ) :
- nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(sal_False) {}
+ nKind( n ), nUniqueID( nr ), pObject( pObj ), bWasOpened(false) {}
};
struct CuiMacroInfo
@@ -160,7 +160,7 @@ class SfxConfigGroupListBox : public SvTreeListBox
protected:
virtual void RequestingChildren( SvTreeListEntry *pEntry) SAL_OVERRIDE;
- virtual sal_Bool Expand( SvTreeListEntry* pParent );
+ virtual bool Expand( SvTreeListEntry* pParent );
public:
SfxConfigGroupListBox(Window* pParent, WinBits nStyle);
@@ -173,7 +173,7 @@ public:
bool bEventMode);
void SetFunctionListBox( SfxConfigFunctionListBox *pBox )
{ pFunctionListBox = pBox; }
- void Open( SvTreeListEntry*, sal_Bool );
+ void Open( SvTreeListEntry*, bool );
void GroupSelected();
void SelectMacro( const SfxMacroInfoItem* );
void SelectMacro( const OUString&, const OUString& );
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index cc2c6a8..c582d98 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -49,7 +49,7 @@ class SvxCharBasePage : public SfxTabPage
protected:
SvxFontPrevWindow* m_pPreviewWin;
- sal_Bool m_bPreviewBackgroundToCharacter;
+ bool m_bPreviewBackgroundToCharacter;
SvxCharBasePage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemset);
@@ -217,7 +217,7 @@ private:
void UpdatePreview_Impl();
void SetCaseMap_Impl( SvxCaseMap eCaseMap );
void ResetColor_Impl( const SfxItemSet& rSet );
- sal_Bool FillItemSetColor_Impl( SfxItemSet& rSet );
+ bool FillItemSetColor_Impl( SfxItemSet& rSet );
DECL_LINK( SelectHdl_Impl, ListBox* );
DECL_LINK(CbClickHdl_Impl, void *);
@@ -340,7 +340,7 @@ private:
void UpdatePreview_Impl();
void Initialize();
void SelectCharacter( ListBox* pBox );
- void SetBracket( sal_Unicode cBracket, sal_Bool bStart );
+ void SetBracket( sal_Unicode cBracket, bool bStart );
DECL_LINK(TwoLinesHdl_Impl, void *);
DECL_LINK( CharacterMapHdl_Impl, ListBox* );
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 79ee292..09211e8 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -40,7 +40,7 @@ class SvxShowText : public Control
{
public:
SvxShowText( Window* pParent,
- sal_Bool bCenter = sal_False );
+ bool bCenter = false );
virtual ~SvxShowText();
void SetFont( const Font& rFont );
@@ -56,7 +56,7 @@ protected:
private:
long mnY;
- sal_Bool mbCenter;
+ bool mbCenter;
};
@@ -81,7 +81,7 @@ private:
SvxShowText* m_pShowChar;
FixedText* m_pCharCodeText;
Font aFont;
- sal_Bool bOne;
+ bool bOne;
const SubsetMap* pSubsetMap;
DECL_LINK(OKHdl, void *);
@@ -97,7 +97,7 @@ private:
void fillAllSubsets(ListBox &rListBox);
public:
- SvxCharacterMap( Window* pParent, sal_Bool bOne=sal_True, const SfxItemSet* pSet=0 );
+ SvxCharacterMap( Window* pParent, bool bOne=true, const SfxItemSet* pSet=0 );
virtual ~SvxCharacterMap();
void DisableFontSelection();
diff --git a/cui/source/inc/cuifmsearch.hxx b/cui/source/inc/cuifmsearch.hxx
index 909e2f1..84fabd0 100644
--- a/cui/source/inc/cuifmsearch.hxx
+++ b/cui/source/inc/cuifmsearch.hxx
@@ -143,11 +143,11 @@ protected:
painting is turned on immediately. As a consequence for this intricateness there is no flickering when turning
off and on quickly.
*/
- void EnableSearchUI(sal_Bool bEnable);
+ void EnableSearchUI(bool bEnable);
- void EnableSearchForDependees(sal_Bool bEnable);
+ void EnableSearchForDependees(bool bEnable);
- void EnableControlPaint(sal_Bool bEnable);
+ void EnableControlPaint(bool bEnable);
void InitContext(sal_Int16 nContext);
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 6c3b1ea..3458d5d 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -65,7 +65,7 @@ private:
void ImplSearch( const INetURLObject& rStartURL,
const ::std::vector< OUString >& rFormats,
- sal_Bool bRecursive );
+ bool bRecursive );
virtual ~SearchThread();
virtual void execute() SAL_OVERRIDE;
@@ -253,10 +253,10 @@ class TPGalleryThemeProperties : public SfxTabPage
INetURLObject aURL;
sal_uInt16 nCurFilterPos;
sal_uInt16 nFirstExtFilterPos;
- sal_Bool bEntriesFound;
- sal_Bool bInputAllowed;
- sal_Bool bTakeAll;
- sal_Bool bSearchRecursive;
+ bool bEntriesFound;
+ bool bInputAllowed;
+ bool bTakeAll;
+ bool bSearchRecursive;
::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer;
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index 05ed2b5..f501472 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -121,12 +121,12 @@ private:
public:
GraphicFilterMosaic(Window* pParent, const Graphic& rGraphic,
- sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges);
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, bool bEnhanceEdges);
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE;
long GetTileWidth() const { return static_cast<long>(mpMtrWidth->GetValue()); }
long GetTileHeight() const { return static_cast<long>(mpMtrHeight->GetValue()); }
- sal_Bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); }
+ bool IsEnhanceEdges() const { return mpCbxEdges->IsChecked(); }
};
@@ -142,11 +142,11 @@ private:
public:
GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
- sal_uInt8 nGreyThreshold, sal_Bool bInvert );
+ sal_uInt8 nGreyThreshold, bool bInvert );
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY ) SAL_OVERRIDE;
sal_uInt8 GetGreyThreshold() const { return( (sal_uInt8) FRound( mpMtrThreshold->GetValue() * 2.55 ) ); }
- sal_Bool IsInvert() const { return mpCbxInvert->IsChecked(); }
+ bool IsInvert() const { return mpCbxInvert->IsChecked(); }
};
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index 0f0a512..d6ca568 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -64,9 +64,9 @@ private:
SfxBindings* mpBindings;
SfxItemSet* mpItemSet;
- sal_Bool mbGrabFocus : 1;
- sal_Bool mbReadOnly : 1;
- sal_Bool mbIsHTMLDoc : 1;
+ bool mbGrabFocus : 1;
+ bool mbReadOnly : 1;
+ bool mbIsHTMLDoc : 1;
DECL_LINK (ClickApplyHdl_Impl, void * );
DECL_LINK (ClickCloseHdl_Impl, void * );
@@ -82,8 +82,8 @@ public:
virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage ) SAL_OVERRIDE;
sal_uInt16 SetPage( SvxHyperlinkItem* pItem );
- void SetReadOnlyMode( sal_Bool bReadOnly = sal_False );
- inline sal_Bool IsHTMLDoc() const { return mbIsHTMLDoc; }
+ void SetReadOnlyMode( bool bReadOnly = false );
+ inline bool IsHTMLDoc() const { return mbIsHTMLDoc; }
inline SfxBindings* GetBindings() const { return mpBindings; };
inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); }
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index 417b89a..5f58c56 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -65,7 +65,7 @@ private:
sal_uInt16 mnPageType;
sal_Int32 mnPos;
- sal_Bool mbAreaTP;
+ bool mbAreaTP;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
@@ -138,7 +138,7 @@ class SvxTransparenceTabPage : public SvxTabPage
// preview
SvxXRectPreview* m_pCtlBitmapPreview;
SvxXRectPreview* m_pCtlXRectPreview;
- sal_Bool bBitmap;
+ bool bBitmap;
XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
@@ -151,12 +151,12 @@ class SvxTransparenceTabPage : public SvxTabPage
DECL_LINK(ChangeTrgrTypeHdl_Impl, void*);
DECL_LINK(ModifiedTrgrHdl_Impl, void*);
- void ActivateLinear(sal_Bool bActivate);
- void ActivateGradient(sal_Bool bActivate);
+ void ActivateLinear(bool bActivate);
+ void ActivateGradient(bool bActivate);
void SetControlState_Impl(XGradientStyle eXGS);
- sal_Bool InitPreview ( const SfxItemSet& rSet );
- void InvalidatePreview (sal_Bool bEnable = sal_True );
+ bool InitPreview ( const SfxItemSet& rSet );
+ void InvalidatePreview (bool bEnable = true );
public:
SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs);
@@ -240,7 +240,7 @@ private:
// SvxAreaTabDialog has to call the setter methods (e.g. SetColorChgd).
// Without that the pages used in SvxAreaTabDialog are not usable
ChangeType maFixed_ChangeType;
- sal_Bool maFixed_sal_Bool;
+ bool maFixed_sal_Bool;
ChangeType* pnColorListState;
ChangeType* pnBitmapListState;
@@ -251,7 +251,7 @@ private:
sal_uInt16 nDlgType;
sal_Int32 nPos;
- sal_Bool* pbAreaTP;
+ bool* pbAreaTP;
XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
@@ -311,7 +311,7 @@ public:
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; }
- void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
+ void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; }
virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE;
void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
@@ -337,13 +337,13 @@ private:
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- XColorListRef pColorList;
+ XColorListRef pColorList;
ChangeType* pnColorListState;
- sal_uInt16 nPageType;
- sal_uInt16 nDlgType;
- sal_Bool* pbAreaTP;
+ sal_uInt16 nPageType;
+ sal_uInt16 nDlgType;
+ bool* pbAreaTP;
- sal_Bool bDisable;
+ bool bDisable;
XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
@@ -369,10 +369,10 @@ public:
void SetColorList( XColorListRef pColTab ) { pColorList = pColTab; }
void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }
void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }
- void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
+ void SetAreaTP( bool* pIn ) { pbAreaTP = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorListState = pIn; }
virtual void PageCreated (SfxAllItemSet aSet) SAL_OVERRIDE;
- void DisablePage( sal_Bool bIn ) { bDisable = bIn; }
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list