summaryrefslogtreecommitdiff
path: root/cui/source
diff options
context:
space:
mode:
authorMikhail Voytenko <mav@openoffice.org>2011-01-14 12:41:27 +0100
committerMikhail Voytenko <mav@openoffice.org>2011-01-14 12:41:27 +0100
commit13c1c67ec50995550076b7085d1a955b9df09cd0 (patch)
tree02d6eb0b5492436ffdad936fa6eff8e9b076d3a9 /cui/source
parent1a64ddfe1d1deeb1779dfa73a4fc8aad089dc968 (diff)
removetooltypes01: #i112600# remove tooltypes from cui
Diffstat (limited to 'cui/source')
-rw-r--r--cui/source/customize/acccfg.cxx102
-rw-r--r--cui/source/customize/cfg.cxx506
-rw-r--r--cui/source/customize/cfgutil.cxx110
-rw-r--r--cui/source/customize/eventdlg.cxx22
-rw-r--r--cui/source/customize/eventdlg.hxx4
-rw-r--r--cui/source/customize/macropg.cxx50
-rw-r--r--cui/source/customize/macropg_impl.hxx4
-rw-r--r--cui/source/customize/selector.cxx58
-rwxr-xr-xcui/source/dialogs/SpellDialog.cxx118
-rw-r--r--cui/source/dialogs/cuicharmap.cxx46
-rw-r--r--cui/source/dialogs/cuifmsearch.cxx6
-rw-r--r--cui/source/dialogs/cuigaldlg.cxx72
-rw-r--r--cui/source/dialogs/cuigrfflt.cxx44
-rw-r--r--cui/source/dialogs/cuihyperdlg.cxx22
-rw-r--r--cui/source/dialogs/cuitbxform.cxx2
-rw-r--r--cui/source/dialogs/dlgname.cxx2
-rw-r--r--cui/source/dialogs/hangulhanjadlg.cxx48
-rw-r--r--cui/source/dialogs/hldocntp.cxx20
-rw-r--r--cui/source/dialogs/hldoctp.cxx6
-rw-r--r--cui/source/dialogs/hlinettp.cxx40
-rw-r--r--cui/source/dialogs/hlmailtp.cxx4
-rw-r--r--cui/source/dialogs/hlmarkwn.cxx46
-rw-r--r--cui/source/dialogs/hltpbase.cxx82
-rw-r--r--cui/source/dialogs/iconcdlg.cxx150
-rw-r--r--cui/source/dialogs/insdlg.cxx52
-rw-r--r--cui/source/dialogs/linkdlg.cxx96
-rw-r--r--cui/source/dialogs/multifil.cxx16
-rw-r--r--cui/source/dialogs/multipat.cxx40
-rw-r--r--cui/source/dialogs/passwdomdlg.cxx4
-rw-r--r--cui/source/dialogs/pastedlg.cxx22
-rw-r--r--cui/source/dialogs/plfilter.cxx6
-rw-r--r--cui/source/dialogs/postdlg.cxx24
-rw-r--r--cui/source/dialogs/scriptdlg.cxx46
-rw-r--r--cui/source/dialogs/sdrcelldlg.cxx2
-rw-r--r--cui/source/dialogs/splitcelldlg.cxx2
-rw-r--r--cui/source/dialogs/srchxtra.cxx38
-rwxr-xr-xcui/source/dialogs/thesdlg.cxx16
-rwxr-xr-xcui/source/dialogs/thesdlg_impl.hxx4
-rw-r--r--cui/source/dialogs/zoom.cxx48
-rw-r--r--cui/source/factory/dlgfact.cxx102
-rw-r--r--cui/source/factory/dlgfact.hxx100
-rw-r--r--cui/source/inc/SpellDialog.hxx22
-rw-r--r--cui/source/inc/acccfg.hxx12
-rw-r--r--cui/source/inc/align.hxx2
-rw-r--r--cui/source/inc/autocdlg.hxx56
-rw-r--r--cui/source/inc/backgrnd.hxx26
-rw-r--r--cui/source/inc/bbdlg.hxx6
-rw-r--r--cui/source/inc/border.hxx10
-rw-r--r--cui/source/inc/cfg.hxx72
-rw-r--r--cui/source/inc/cfgutil.hxx22
-rw-r--r--cui/source/inc/chardlg.hxx68
-rw-r--r--cui/source/inc/connect.hxx4
-rw-r--r--cui/source/inc/cuicharmap.hxx10
-rw-r--r--cui/source/inc/cuigaldlg.hxx22
-rw-r--r--cui/source/inc/cuigrfflt.hxx22
-rw-r--r--cui/source/inc/cuihyperdlg.hxx12
-rw-r--r--cui/source/inc/cuioptgenrl.hxx2
-rw-r--r--cui/source/inc/cuisrchdlg.hxx6
-rw-r--r--cui/source/inc/cuitabarea.hxx188
-rw-r--r--cui/source/inc/cuitabline.hxx90
-rw-r--r--cui/source/inc/dbregister.hxx8
-rw-r--r--cui/source/inc/defdlgname.hxx4
-rw-r--r--cui/source/inc/dlgname.hxx2
-rw-r--r--cui/source/inc/dstribut.hxx4
-rw-r--r--cui/source/inc/grfpage.hxx10
-rw-r--r--cui/source/inc/hangulhanjadlg.hxx6
-rwxr-xr-x[-rw-r--r--]cui/source/inc/headertablistbox.hxx2
-rw-r--r--cui/source/inc/hldocntp.hxx4
-rw-r--r--cui/source/inc/hldoctp.hxx6
-rw-r--r--cui/source/inc/hlinettp.hxx8
-rw-r--r--cui/source/inc/hlmarkwn.hxx14
-rw-r--r--cui/source/inc/hltpbase.hxx28
-rw-r--r--cui/source/inc/iconcdlg.hxx74
-rw-r--r--cui/source/inc/insdlg.hxx6
-rw-r--r--cui/source/inc/internationaloptions.hxx2
-rw-r--r--cui/source/inc/labdlg.hxx36
-rw-r--r--cui/source/inc/linkdlg.hxx10
-rw-r--r--cui/source/inc/macroass.hxx6
-rw-r--r--cui/source/inc/macropg.hxx14
-rw-r--r--cui/source/inc/measure.hxx6
-rw-r--r--cui/source/inc/multifil.hxx2
-rw-r--r--cui/source/inc/multipat.hxx2
-rw-r--r--cui/source/inc/numfmt.hxx24
-rw-r--r--cui/source/inc/numpages.hxx78
-rw-r--r--cui/source/inc/optasian.hxx4
-rw-r--r--cui/source/inc/optdict.hxx4
-rw-r--r--cui/source/inc/optimprove.hxx2
-rw-r--r--cui/source/inc/optlingu.hxx8
-rw-r--r--cui/source/inc/optpath.hxx8
-rw-r--r--cui/source/inc/page.hxx8
-rw-r--r--cui/source/inc/paragrph.hxx32
-rw-r--r--cui/source/inc/pastedlg.hxx10
-rw-r--r--cui/source/inc/postdlg.hxx12
-rw-r--r--cui/source/inc/scriptdlg.hxx18
-rw-r--r--cui/source/inc/sdrcelldlg.hxx2
-rw-r--r--cui/source/inc/selector.hxx26
-rw-r--r--cui/source/inc/srchxtra.hxx22
-rw-r--r--cui/source/inc/tabstpge.hxx10
-rw-r--r--cui/source/inc/textanim.hxx8
-rw-r--r--cui/source/inc/textattr.hxx20
-rw-r--r--cui/source/inc/transfrm.hxx24
-rw-r--r--cui/source/inc/treeopt.hxx42
-rw-r--r--cui/source/inc/zoom.hxx16
-rw-r--r--cui/source/options/cfgchart.cxx10
-rw-r--r--cui/source/options/cfgchart.hxx6
-rw-r--r--cui/source/options/connpooloptions.cxx32
-rw-r--r--cui/source/options/connpooloptions.hxx2
-rw-r--r--cui/source/options/cuisrchdlg.cxx6
-rw-r--r--cui/source/options/dbregister.cxx24
-rw-r--r--cui/source/options/fontsubs.cxx68
-rw-r--r--cui/source/options/fontsubs.hxx20
-rw-r--r--cui/source/options/internationaloptions.cxx26
-rw-r--r--cui/source/options/optHeaderTabListbox.cxx10
-rw-r--r--cui/source/options/optaccessibility.cxx4
-rw-r--r--cui/source/options/optaccessibility.hxx2
-rw-r--r--cui/source/options/optasian.cxx40
-rw-r--r--cui/source/options/optchart.cxx16
-rw-r--r--cui/source/options/optchart.hxx2
-rw-r--r--cui/source/options/optcolor.cxx32
-rw-r--r--cui/source/options/optcolor.hxx4
-rw-r--r--cui/source/options/optctl.cxx24
-rw-r--r--cui/source/options/optctl.hxx2
-rwxr-xr-xcui/source/options/optdict.cxx30
-rw-r--r--cui/source/options/optfltr.cxx50
-rw-r--r--cui/source/options/optfltr.hxx10
-rw-r--r--cui/source/options/optgdlg.cxx196
-rw-r--r--cui/source/options/optgdlg.hxx14
-rw-r--r--cui/source/options/optgenrl.cxx38
-rw-r--r--cui/source/options/opthtml.cxx34
-rw-r--r--cui/source/options/opthtml.hxx2
-rw-r--r--cui/source/options/optimprove2.cxx2
-rw-r--r--cui/source/options/optinet2.cxx220
-rw-r--r--cui/source/options/optinet2.hxx24
-rw-r--r--cui/source/options/optjava.cxx54
-rw-r--r--cui/source/options/optjava.hxx2
-rw-r--r--cui/source/options/optjsearch.cxx58
-rw-r--r--cui/source/options/optjsearch.hxx16
-rw-r--r--cui/source/options/optlingu.cxx492
-rw-r--r--cui/source/options/optmemory.cxx14
-rw-r--r--cui/source/options/optmemory.hxx2
-rw-r--r--cui/source/options/optpath.cxx68
-rw-r--r--cui/source/options/optsave.cxx42
-rw-r--r--cui/source/options/optsave.hxx4
-rw-r--r--cui/source/options/optupdt.cxx36
-rw-r--r--cui/source/options/optupdt.hxx2
-rw-r--r--cui/source/options/radiobtnbox.cxx4
-rw-r--r--cui/source/options/securityoptions.hxx14
-rw-r--r--cui/source/options/treeopt.cxx52
-rw-r--r--cui/source/options/webconninfo.cxx16
-rw-r--r--cui/source/options/webconninfo.hxx2
-rw-r--r--cui/source/tabpages/align.cxx14
-rw-r--r--cui/source/tabpages/autocdlg.cxx420
-rw-r--r--cui/source/tabpages/backgrnd.cxx260
-rw-r--r--cui/source/tabpages/bbdlg.cxx4
-rw-r--r--cui/source/tabpages/border.cxx112
-rw-r--r--cui/source/tabpages/borderconn.cxx4
-rw-r--r--cui/source/tabpages/borderconn.hxx2
-rw-r--r--cui/source/tabpages/chardlg.cxx618
-rw-r--r--cui/source/tabpages/connect.cxx66
-rw-r--r--cui/source/tabpages/dstribut.cxx50
-rw-r--r--cui/source/tabpages/grfpage.cxx62
-rw-r--r--cui/source/tabpages/labdlg.cxx18
-rw-r--r--cui/source/tabpages/macroass.cxx76
-rw-r--r--cui/source/tabpages/measure.cxx98
-rw-r--r--cui/source/tabpages/numfmt.cxx264
-rw-r--r--cui/source/tabpages/numpages.cxx748
-rw-r--r--cui/source/tabpages/page.cxx216
-rw-r--r--cui/source/tabpages/paragrph.cxx436
-rw-r--r--cui/source/tabpages/swpossizetabpage.cxx252
-rw-r--r--cui/source/tabpages/swpossizetabpage.hxx20
-rw-r--r--cui/source/tabpages/tabarea.cxx6
-rw-r--r--cui/source/tabpages/tabline.cxx8
-rw-r--r--cui/source/tabpages/tabstpge.cxx82
-rw-r--r--cui/source/tabpages/textanim.cxx72
-rw-r--r--cui/source/tabpages/textattr.cxx58
-rw-r--r--cui/source/tabpages/tparea.cxx308
-rw-r--r--cui/source/tabpages/tpbitmap.cxx88
-rw-r--r--cui/source/tabpages/tpcolor.cxx114
-rw-r--r--cui/source/tabpages/tpgradnt.cxx106
-rw-r--r--cui/source/tabpages/tphatch.cxx58
-rw-r--r--cui/source/tabpages/tpline.cxx186
-rw-r--r--cui/source/tabpages/tplnedef.cxx46
-rw-r--r--cui/source/tabpages/tplneend.cxx44
-rw-r--r--cui/source/tabpages/tpshadow.cxx60
-rw-r--r--cui/source/tabpages/transfrm.cxx98
185 files changed, 5184 insertions, 5184 deletions
diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 25ccabf2789b..5a1ed913b46a 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -113,7 +113,7 @@ static ::rtl::OUString MEDIATYPE_PROPNAME = ::rtl::OUString::creat
static ::rtl::OUString MEDIATYPE_UICONFIG = ::rtl::OUString::createFromAscii("application/vnd.sun.xml.ui.configuration" );
//-----------------------------------------------
-static USHORT __FAR_DATA KEYCODE_ARRAY[] =
+static sal_uInt16 __FAR_DATA KEYCODE_ARRAY[] =
{
KEY_F1 ,
KEY_F2 ,
@@ -573,7 +573,7 @@ static USHORT __FAR_DATA KEYCODE_ARRAY[] =
KEY_DELETE | KEY_SHIFT | KEY_MOD1 | KEY_MOD2
};
-static USHORT KEYCODE_ARRAY_SIZE = (sizeof(KEYCODE_ARRAY) / sizeof(KEYCODE_ARRAY[0]));
+static sal_uInt16 KEYCODE_ARRAY_SIZE = (sizeof(KEYCODE_ARRAY) / sizeof(KEYCODE_ARRAY[0]));
//-----------------------------------------------
// seems to be needed to layout the list box, which shows all
@@ -590,20 +590,20 @@ class SfxAccCfgLBoxString_Impl : public SvLBoxString
{
public:
SfxAccCfgLBoxString_Impl( SvLBoxEntry* pEntry,
- USHORT nFlags,
+ sal_uInt16 nFlags,
const String& sText );
virtual ~SfxAccCfgLBoxString_Impl();
virtual void Paint(const Point& aPos ,
SvLBox& rDevice,
- USHORT nFlags ,
+ sal_uInt16 nFlags ,
SvLBoxEntry* pEntry );
};
//-----------------------------------------------
SfxAccCfgLBoxString_Impl::SfxAccCfgLBoxString_Impl( SvLBoxEntry* pEntry,
- USHORT nFlags,
+ sal_uInt16 nFlags,
const String& sText )
: SvLBoxString(pEntry, nFlags, sText)
{
@@ -617,7 +617,7 @@ SfxAccCfgLBoxString_Impl::~SfxAccCfgLBoxString_Impl()
//-----------------------------------------------
void SfxAccCfgLBoxString_Impl::Paint(const Point& aPos ,
SvLBox& rDevice,
- USHORT /*nFlags*/,
+ sal_uInt16 /*nFlags*/,
SvLBoxEntry* pEntry )
{
/*/ ??? realy needed !!!
@@ -658,8 +658,8 @@ void SfxAccCfgTabListBox_Impl::InitEntry( SvLBoxEntry* pEntry ,
void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
{
KeyCode aCode1 = aKey.GetKeyCode();
- USHORT nCode1 = aCode1.GetCode();
- USHORT nMod1 = aCode1.GetModifier();
+ sal_uInt16 nCode1 = aCode1.GetCode();
+ sal_uInt16 nMod1 = aCode1.GetModifier();
// is it related to our list box ?
if (
@@ -677,8 +677,8 @@ void SfxAccCfgTabListBox_Impl::KeyInput(const KeyEvent& aKey)
TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData();
if (pUserData)
{
- USHORT nCode2 = pUserData->m_aKey.GetCode();
- USHORT nMod2 = pUserData->m_aKey.GetModifier();
+ sal_uInt16 nCode2 = pUserData->m_aKey.GetCode();
+ sal_uInt16 nMod2 = pUserData->m_aKey.GetModifier();
if (
(nCode1 == nCode2) &&
(nMod1 == nMod2 )
@@ -755,7 +755,7 @@ SfxAcceleratorConfigPage::SfxAcceleratorConfigPage( Window* pParent, const SfxIt
// detect max keyname width
long nMaxWidth = 0;
- for ( USHORT i = 0; i < KEYCODE_ARRAY_SIZE; ++i )
+ for ( sal_uInt16 i = 0; i < KEYCODE_ARRAY_SIZE; ++i )
{
long nTmp = GetTextWidth( KeyCode( KEYCODE_ARRAY[i] ).GetName() );
if ( nTmp > nMaxWidth )
@@ -888,9 +888,9 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
// Insert all editable accelerators into list box. It is possible
// that some accelerators are not mapped on the current system/keyboard
// but we don't want to lose these mappings.
- USHORT c1 = KEYCODE_ARRAY_SIZE;
- USHORT i1 = 0;
- USHORT nListPos = 0;
+ sal_uInt16 c1 = KEYCODE_ARRAY_SIZE;
+ sal_uInt16 i1 = 0;
+ sal_uInt16 nListPos = 0;
for (i1=0; i1<c1; ++i1)
{
KeyCode aKey = KEYCODE_ARRAY[i1];
@@ -906,7 +906,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
css::uno::Sequence< css::awt::KeyEvent > lKeys = xAccMgr->getAllKeyEvents();
sal_Int32 c2 = lKeys.getLength();
sal_Int32 i2 = 0;
- USHORT nCol = aEntriesBox.TabCount()-1;
+ sal_uInt16 nCol = aEntriesBox.TabCount()-1;
for (i2=0; i2<c2; ++i2)
{
@@ -914,7 +914,7 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
::rtl::OUString sCommand = xAccMgr->getCommandByKeyEvent(aAWTKey);
String sLabel = GetLabel4Command(sCommand);
KeyCode aKeyCode = ::svt::AcceleratorExecute::st_AWTKey2VCLKey(aAWTKey);
- USHORT nPos = MapKeyCodeToPos(aKeyCode);
+ sal_uInt16 nPos = MapKeyCodeToPos(aKeyCode);
if (nPos == LISTBOX_ENTRY_NOTFOUND)
continue;
@@ -930,12 +930,12 @@ void SfxAcceleratorConfigPage::Init(const css::uno::Reference< css::ui::XAcceler
}
// Map the VCL hardcoded key codes and mark them as not changeable
- ULONG c3 = Application::GetReservedKeyCodeCount();
- ULONG i3 = 0;
+ sal_uLong c3 = Application::GetReservedKeyCodeCount();
+ sal_uLong i3 = 0;
for (i3=0; i3<c3; ++i3)
{
const KeyCode* pKeyCode = Application::GetReservedKeyCode(i3);
- USHORT nPos = MapKeyCodeToPos(*pKeyCode);
+ sal_uInt16 nPos = MapKeyCodeToPos(*pKeyCode);
if (nPos == LISTBOX_ENTRY_NOTFOUND)
continue;
@@ -1015,10 +1015,10 @@ IMPL_LINK(SfxAcceleratorConfigPage, Default, PushButton*, EMPTYARG)
if (xReset.is())
xReset->reset();
- aEntriesBox.SetUpdateMode(FALSE);
+ aEntriesBox.SetUpdateMode(sal_False);
ResetConfig();
Init(m_xAct);
- aEntriesBox.SetUpdateMode(TRUE);
+ aEntriesBox.SetUpdateMode(sal_True);
aEntriesBox.Invalidate();
aEntriesBox.Select(aEntriesBox.GetEntry(0, 0));
@@ -1028,7 +1028,7 @@ IMPL_LINK(SfxAcceleratorConfigPage, Default, PushButton*, EMPTYARG)
//-----------------------------------------------
IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG )
{
- USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
+ sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
String sNewCommand = pFunctionBox->GetCurCommand();
String sLabel = pFunctionBox->GetCurLabel();
@@ -1036,7 +1036,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG )
sLabel = GetLabel4Command(sNewCommand);
pEntry->m_sCommand = sNewCommand;
- USHORT nCol = aEntriesBox.TabCount() - 1;
+ sal_uInt16 nCol = aEntriesBox.TabCount() - 1;
aEntriesBox.SetEntryText(sLabel, nPos, nCol);
((Link &) pFunctionBox->GetSelectHdl()).Call( pFunctionBox );
@@ -1047,11 +1047,11 @@ IMPL_LINK( SfxAcceleratorConfigPage, ChangeHdl, Button*, EMPTYARG )
IMPL_LINK( SfxAcceleratorConfigPage, RemoveHdl, Button *, EMPTYARG )
{
// get selected entry
- USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
+ sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
// remove function name from selected entry
- USHORT nCol = aEntriesBox.TabCount() - 1;
+ sal_uInt16 nCol = aEntriesBox.TabCount() - 1;
aEntriesBox.SetEntryText( String(), nPos, nCol );
pEntry->m_sCommand = ::rtl::OUString();
@@ -1066,17 +1066,17 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
Help::ShowBalloon( this, Point(), String() );
if ( pListBox == &aEntriesBox )
{
- USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
+ sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( aEntriesBox.FirstSelected() );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
::rtl::OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
- aRemoveButton.Enable( FALSE );
- aChangeButton.Enable( FALSE );
+ aRemoveButton.Enable( sal_False );
+ aChangeButton.Enable( sal_False );
if (pEntry->m_bIsConfigurable)
{
if (pEntry->isConfigured())
- aRemoveButton.Enable( TRUE );
+ aRemoveButton.Enable( sal_True );
aChangeButton.Enable( pEntry->m_sCommand != sPossibleNewCommand );
}
}
@@ -1084,25 +1084,25 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
{
pGroupLBox->GroupSelected();
if ( !pFunctionBox->FirstSelected() )
- aChangeButton.Enable( FALSE );
+ aChangeButton.Enable( sal_False );
}
else if ( pListBox == pFunctionBox )
{
- aRemoveButton.Enable( FALSE );
- aChangeButton.Enable( FALSE );
+ aRemoveButton.Enable( sal_False );
+ aChangeButton.Enable( sal_False );
// #i36994 First selected can return zero!
SvLBoxEntry* pLBEntry = aEntriesBox.FirstSelected();
if ( pLBEntry != 0 )
{
- USHORT nPos = (USHORT) aEntriesBox.GetModel()->GetRelPos( pLBEntry );
+ sal_uInt16 nPos = (sal_uInt16) aEntriesBox.GetModel()->GetRelPos( pLBEntry );
TAccInfo* pEntry = (TAccInfo*)aEntriesBox.GetEntry(0, nPos)->GetUserData();
::rtl::OUString sPossibleNewCommand = pFunctionBox->GetCurCommand();
if (pEntry->m_bIsConfigurable)
{
if (pEntry->isConfigured())
- aRemoveButton.Enable( TRUE );
+ aRemoveButton.Enable( sal_True );
aChangeButton.Enable( pEntry->m_sCommand != sPossibleNewCommand );
}
@@ -1115,9 +1115,9 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
if ( pUserData && pUserData->m_sCommand == sPossibleNewCommand )
{
TAccInfo* pU1 = new TAccInfo(-1, -1, pUserData->m_aKey);
- SvLBoxEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, TRUE, LIST_APPEND );
+ SvLBoxEntry* pE1 = aKeyBox.InsertEntry( pUserData->m_aKey.GetName(), 0L, sal_True, LIST_APPEND );
pE1->SetUserData(pU1);
- pE1->EnableChildsOnDemand( FALSE );
+ pE1->EnableChildsOnDemand( sal_False );
}
pIt = aEntriesBox.Next(pIt);
}
@@ -1128,7 +1128,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
// goto selected "key" entry of the key box
SvLBoxEntry* pE2 = 0;
TAccInfo* pU2 = 0;
- USHORT nP2 = LISTBOX_ENTRY_NOTFOUND;
+ sal_uInt16 nP2 = LISTBOX_ENTRY_NOTFOUND;
SvLBoxEntry* pE3 = 0;
pE2 = aKeyBox.FirstSelected();
@@ -1162,10 +1162,10 @@ IMPL_LINK( SfxAcceleratorConfigPage, RadioHdl, RadioButton *, EMPTYARG )
if ( m_xAct.is() && ( xOld == m_xAct ) )
return 0;
- aEntriesBox.SetUpdateMode( FALSE );
+ aEntriesBox.SetUpdateMode( sal_False );
ResetConfig();
Init(m_xAct);
- aEntriesBox.SetUpdateMode( TRUE );
+ aEntriesBox.SetUpdateMode( sal_True );
aEntriesBox.Invalidate();
pGroupLBox->Init(m_xSMGR, m_xFrame, m_sModuleLongName);
@@ -1234,10 +1234,10 @@ IMPL_LINK( SfxAcceleratorConfigPage, LoadHdl, sfx2::FileDialogHelper*, EMPTYARG
// open the configuration and update our UI
css::uno::Reference< css::ui::XAcceleratorConfiguration > xTempAccMgr(xCfgMgr->getShortCutManager(), css::uno::UNO_QUERY_THROW);
- aEntriesBox.SetUpdateMode(FALSE);
+ aEntriesBox.SetUpdateMode(sal_False);
ResetConfig();
Init(xTempAccMgr);
- aEntriesBox.SetUpdateMode(TRUE);
+ aEntriesBox.SetUpdateMode(sal_True);
aEntriesBox.Invalidate();
aEntriesBox.Select(aEntriesBox.GetEntry(0, 0));
@@ -1388,7 +1388,7 @@ void SfxAcceleratorConfigPage::StartFileDialog( WinBits nBits, const String& rTi
}
//-----------------------------------------------
-BOOL SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
+sal_Bool SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
{
Apply(m_xAct);
try
@@ -1398,9 +1398,9 @@ BOOL SfxAcceleratorConfigPage::FillItemSet( SfxItemSet& )
catch(const css::uno::RuntimeException& exRun)
{ throw exRun; }
catch(const css::uno::Exception&)
- { return FALSE; }
+ { return sal_False; }
- return TRUE;
+ return sal_True;
}
//-----------------------------------------------
@@ -1428,7 +1428,7 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
RadioHdl(0);
const SfxPoolItem* pMacroItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, TRUE, &pMacroItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_MACROINFO, sal_True, &pMacroItem ) )
{
m_pMacroInfoItem = PTR_CAST( SfxMacroInfoItem, pMacroItem );
pGroupLBox->SelectMacro( m_pMacroInfoItem );
@@ -1436,11 +1436,11 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
else
{
const SfxPoolItem* pStringItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, TRUE, &pStringItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_CHARMAP, sal_True, &pStringItem ) )
m_pStringItem = PTR_CAST( SfxStringItem, pStringItem );
const SfxPoolItem* pFontItem=0;
- if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, TRUE, &pFontItem ) )
+ if( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_SPECIALCHAR, sal_True, &pFontItem ) )
m_pFontItem = PTR_CAST( SfxStringItem, pFontItem );
if ( m_pStringItem )
@@ -1449,18 +1449,18 @@ void SfxAcceleratorConfigPage::Reset( const SfxItemSet& rSet )
}
//-----------------------------------------------
-USHORT SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const
+sal_uInt16 SfxAcceleratorConfigPage::MapKeyCodeToPos(const KeyCode& aKey) const
{
- USHORT nCode1 = aKey.GetCode()+aKey.GetModifier();
+ sal_uInt16 nCode1 = aKey.GetCode()+aKey.GetModifier();
SvLBoxEntry* pEntry = aEntriesBox.First();
- USHORT i = 0;
+ sal_uInt16 i = 0;
while (pEntry)
{
TAccInfo* pUserData = (TAccInfo*)pEntry->GetUserData();
if (pUserData)
{
- USHORT nCode2 = pUserData->m_aKey.GetCode()+pUserData->m_aKey.GetModifier();
+ sal_uInt16 nCode2 = pUserData->m_aKey.GetCode()+pUserData->m_aKey.GetModifier();
if (nCode1 == nCode2)
return i;
}
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 858564af4e40..7be7b5d88b15 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -438,9 +438,9 @@ SvxConfigPage::CanConfig( const OUString& aModuleId )
|| aModuleId.equalsAscii( "com.sun.star.frame.Bibliography" )
)
{
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
OUString GetModuleName( const OUString& aModuleId )
@@ -550,14 +550,14 @@ bool GetMenuItemData(
}
}
- return TRUE;
+ return sal_True;
}
}
catch ( ::com::sun::star::lang::IndexOutOfBoundsException& )
{
}
- return FALSE;
+ return sal_False;
}
bool GetToolbarItemData(
@@ -643,9 +643,9 @@ ConvertSvxConfigEntry(
// as an empty string.
// It will be initialised again later using the command to label map.
aPropSeq[2].Name = aDescriptorLabel;
- if ( pEntry->HasChangedName() == FALSE && pEntry->GetCommand().getLength() )
+ if ( pEntry->HasChangedName() == sal_False && pEntry->GetCommand().getLength() )
{
- BOOL isDefaultName = FALSE;
+ sal_Bool isDefaultName = sal_False;
try
{
uno::Any a( xCommandToLabelMap->getByName( pEntry->GetCommand() ) );
@@ -661,7 +661,7 @@ ConvertSvxConfigEntry(
if ( tmpLabel.equals( pEntry->GetName() ) )
{
- isDefaultName = TRUE;
+ isDefaultName = sal_True;
}
break;
@@ -724,9 +724,9 @@ ConvertToolbarEntry(
// as an empty string.
// It will be initialised again later using the command to label map.
aPropSeq[2].Name = aDescriptorLabel;
- if ( pEntry->HasChangedName() == FALSE && pEntry->GetCommand().getLength() )
+ if ( pEntry->HasChangedName() == sal_False && pEntry->GetCommand().getLength() )
{
- BOOL isDefaultName = FALSE;
+ sal_Bool isDefaultName = sal_False;
try
{
uno::Any a( xCommandToLabelMap->getByName( pEntry->GetCommand() ) );
@@ -742,7 +742,7 @@ ConvertToolbarEntry(
if ( tmpLabel.equals( pEntry->GetName() ) )
{
- isDefaultName = TRUE;
+ isDefaultName = sal_True;
}
break;
@@ -876,7 +876,7 @@ short SvxConfigDialog::Ok()
return SfxTabDialog::Ok();
}
-void SvxConfigDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
+void SvxConfigDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
{
(void)rPage;
@@ -915,9 +915,9 @@ SaveInData::SaveInData(
const OUString& aModuleId,
bool isDocConfig )
:
- bModified( FALSE ),
+ bModified( sal_False ),
bDocConfig( isDocConfig ),
- bReadOnly( FALSE ),
+ bReadOnly( sal_False ),
m_xCfgMgr( xCfgMgr ),
m_xParentCfgMgr( xParentCfgMgr )
{
@@ -1039,7 +1039,7 @@ Image SaveInData::GetImage( const OUString& rCommandURL )
bool SaveInData::PersistChanges(
const uno::Reference< uno::XInterface >& xManager )
{
- bool result = TRUE;
+ bool result = sal_True;
try
{
@@ -1056,7 +1056,7 @@ bool SaveInData::PersistChanges(
}
catch ( com::sun::star::io::IOException& )
{
- result = FALSE;
+ result = sal_False;
}
return result;
@@ -1119,7 +1119,7 @@ MenuSaveInData::GetEntries()
if ( pRootEntry == NULL )
{
pRootEntry = new SvxConfigEntry(
- String::CreateFromAscii("MainMenus"), String(), TRUE );
+ String::CreateFromAscii("MainMenus"), String(), sal_True );
if ( m_xMenuSettings.is() )
{
@@ -1164,7 +1164,7 @@ bool MenuSaveInData::LoadSubMenus(
uno::Reference< container::XIndexAccess > xSubMenu;
OUString aCommandURL;
OUString aLabel;
- bool bIsUserDefined = TRUE;
+ bool bIsUserDefined = sal_True;
sal_uInt16 nType( css::ui::ItemType::DEFAULT );
@@ -1179,11 +1179,11 @@ bool MenuSaveInData::LoadSubMenus(
try
{
a = m_xCommandToLabelMap->getByName( aCommandURL );
- bIsUserDefined = FALSE;
+ bIsUserDefined = sal_False;
}
catch ( container::NoSuchElementException& )
{
- bIsUserDefined = TRUE;
+ bIsUserDefined = sal_True;
}
// If custom label not set retrieve it from the command
@@ -1208,7 +1208,7 @@ bool MenuSaveInData::LoadSubMenus(
{
// popup menu
SvxConfigEntry* pEntry = new SvxConfigEntry(
- aLabel, aCommandURL, TRUE );
+ aLabel, aCommandURL, sal_True );
pEntry->SetUserDefined( bIsUserDefined );
@@ -1223,7 +1223,7 @@ bool MenuSaveInData::LoadSubMenus(
}
else
{
- pEntry->SetMain( TRUE );
+ pEntry->SetMain( sal_True );
}
subMenuTitle += stripHotKey( aLabel );
@@ -1233,7 +1233,7 @@ bool MenuSaveInData::LoadSubMenus(
else
{
SvxConfigEntry* pEntry = new SvxConfigEntry(
- aLabel, aCommandURL, FALSE );
+ aLabel, aCommandURL, sal_False );
pEntry->SetUserDefined( bIsUserDefined );
pEntries->push_back( pEntry );
}
@@ -1251,7 +1251,7 @@ bool MenuSaveInData::LoadSubMenus(
bool MenuSaveInData::Apply()
{
- bool result = FALSE;
+ bool result = sal_False;
if ( IsModified() )
{
@@ -1293,7 +1293,7 @@ bool MenuSaveInData::Apply()
OSL_TRACE("caught some other exception saving settings");
}
- SetModified( FALSE );
+ SetModified( sal_False );
result = PersistChanges( GetConfigManager() );
}
@@ -1409,7 +1409,7 @@ public:
~PopupPainter() { }
void Paint( const Point& rPos, SvLBox& rOutDev,
- USHORT nViewDataEntryFlags, SvLBoxEntry* pEntry )
+ sal_uInt16 nViewDataEntryFlags, SvLBoxEntry* pEntry )
{
SvLBoxString::Paint( rPos, rOutDev, nViewDataEntryFlags, pEntry );
@@ -1463,7 +1463,7 @@ SvxMenuEntriesListBox::SvxMenuEntriesListBox(
Window* pParent, const ResId& rResId)
: SvTreeListBox( pParent, rResId )
, pPage( (SvxMenuConfigPage*) pParent )
- , m_bIsInternalDrag( FALSE )
+ , m_bIsInternalDrag( sal_False )
{
SetStyle(
GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HIDESELECTION );
@@ -1492,14 +1492,14 @@ DragDropMode SvxMenuEntriesListBox::NotifyStartDrag(
(void)aTransferDataContainer;
(void)pEntry;
- m_bIsInternalDrag = TRUE;
+ m_bIsInternalDrag = sal_True;
return GetDragDropMode();
}
void SvxMenuEntriesListBox::DragFinished( sal_Int8 nDropAction )
{
(void)nDropAction;
- m_bIsInternalDrag = FALSE;
+ m_bIsInternalDrag = sal_False;
}
sal_Int8 SvxMenuEntriesListBox::AcceptDrop( const AcceptDropEvent& rEvt )
@@ -1519,27 +1519,27 @@ sal_Int8 SvxMenuEntriesListBox::AcceptDrop( const AcceptDropEvent& rEvt )
return SvTreeListBox::AcceptDrop( aNewAcceptDropEvent );
}
-BOOL SvxMenuEntriesListBox::NotifyAcceptDrop( SvLBoxEntry* )
+sal_Bool SvxMenuEntriesListBox::NotifyAcceptDrop( SvLBoxEntry* )
{
- return TRUE;
+ return sal_True;
}
-BOOL SvxMenuEntriesListBox::NotifyMoving(
+sal_Bool SvxMenuEntriesListBox::NotifyMoving(
SvLBoxEntry* pTarget, SvLBoxEntry* pSource,
- SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos)
+ SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos)
{
// only try to do a move if we are dragging within the list box
if ( m_bIsInternalDrag )
{
- if ( pPage->MoveEntryData( pSource, pTarget ) == TRUE )
+ if ( pPage->MoveEntryData( pSource, pTarget ) == sal_True )
{
SvTreeListBox::NotifyMoving(
pTarget, pSource, rpNewParent, rNewChildPos );
- return TRUE;
+ return sal_True;
}
else
{
- return FALSE;
+ return sal_False;
}
}
else
@@ -1548,9 +1548,9 @@ BOOL SvxMenuEntriesListBox::NotifyMoving(
}
}
-BOOL SvxMenuEntriesListBox::NotifyCopying(
+sal_Bool SvxMenuEntriesListBox::NotifyCopying(
SvLBoxEntry* pTarget, SvLBoxEntry* pSource,
- SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos)
+ SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos)
{
(void)pSource;
(void)rpNewParent;
@@ -1563,11 +1563,11 @@ BOOL SvxMenuEntriesListBox::NotifyCopying(
// AddFunction already adds the listbox entry so return FALSE
// to stop another listbox entry being added
- return FALSE;
+ return sal_False;
}
// Copying is only allowed from external controls, not within the listbox
- return FALSE;
+ return sal_False;
}
void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
@@ -1582,11 +1582,11 @@ void SvxMenuEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
// support CTRL+UP and CTRL+DOWN for moving selected entries
else if ( keycode.GetCode() == KEY_UP && keycode.IsMod1() )
{
- pPage->MoveEntry( TRUE );
+ pPage->MoveEntry( sal_True );
}
else if ( keycode.GetCode() == KEY_DOWN && keycode.IsMod1() )
{
- pPage->MoveEntry( FALSE );
+ pPage->MoveEntry( sal_False );
}
else
{
@@ -1644,7 +1644,7 @@ SvxConfigPage::SvxConfigPage(
Window *pParent, const SfxItemSet& rSet )
:
SfxTabPage( pParent, CUI_RES( RID_SVXPAGE_MENUS ), rSet ),
- bInitialised( FALSE ),
+ bInitialised( sal_False ),
pCurrentSaveInData( 0 ),
aTopLevelSeparator( this, CUI_RES( GRP_MENUS ) ),
aTopLevelLabel( this, CUI_RES( FT_MENUS ) ),
@@ -1665,8 +1665,8 @@ SvxConfigPage::SvxConfigPage(
pSelectorDlg( 0 )
{
aDescriptionField.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
- aDescriptionField.SetAutoScroll( TRUE );
- aDescriptionField.EnableCursor( FALSE );
+ aDescriptionField.SetAutoScroll( sal_True );
+ aDescriptionField.EnableCursor( sal_False );
}
SvxConfigPage::~SvxConfigPage()
@@ -1683,7 +1683,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
// all other open documents of the same module type
if ( !bInitialised )
{
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
uno::Reference < css::ui::XUIConfigurationManager > xCfgMgr;
uno::Reference < css::ui::XUIConfigurationManager > xDocCfgMgr;
@@ -1729,7 +1729,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
pModuleData = CreateSaveInData( xCfgMgr,
uno::Reference< css::ui::XUIConfigurationManager >(),
aModuleId,
- FALSE );
+ sal_False );
}
catch ( container::NoSuchElementException& )
{
@@ -1770,7 +1770,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
SaveInData* pDocData = NULL;
if ( xDocCfgMgr.is() )
{
- pDocData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, TRUE );
+ pDocData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, sal_True );
if ( !pDocData->IsReadOnly() )
{
@@ -1781,35 +1781,35 @@ void SvxConfigPage::Reset( const SfxItemSet& )
// if an item to select has been passed in (eg. the ResourceURL for a
// toolbar) then try to select the SaveInData entry that has that item
- bool bURLToSelectFound = FALSE;
+ bool bURLToSelectFound = sal_False;
if ( m_aURLToSelect.getLength() != 0 )
{
if ( pDocData != NULL && pDocData->HasURL( m_aURLToSelect ) )
{
- aSaveInListBox.SelectEntryPos( nPos, TRUE );
+ aSaveInListBox.SelectEntryPos( nPos, sal_True );
pCurrentSaveInData = pDocData;
- bURLToSelectFound = TRUE;
+ bURLToSelectFound = sal_True;
}
else if ( pModuleData->HasURL( m_aURLToSelect ) )
{
- aSaveInListBox.SelectEntryPos( 0, TRUE );
+ aSaveInListBox.SelectEntryPos( 0, sal_True );
pCurrentSaveInData = pModuleData;
- bURLToSelectFound = TRUE;
+ bURLToSelectFound = sal_True;
}
}
- if ( bURLToSelectFound == FALSE )
+ if ( bURLToSelectFound == sal_False )
{
// if the document has menu configuration settings select it
// it the SaveIn listbox, otherwise select the module data
if ( pDocData != NULL && pDocData->HasSettings() )
{
- aSaveInListBox.SelectEntryPos( nPos, TRUE );
+ aSaveInListBox.SelectEntryPos( nPos, sal_True );
pCurrentSaveInData = pDocData;
}
else
{
- aSaveInListBox.SelectEntryPos( 0, TRUE );
+ aSaveInListBox.SelectEntryPos( 0, sal_True );
pCurrentSaveInData = pModuleData;
}
}
@@ -1885,7 +1885,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
if ( xDocCfgMgr.is() )
{
- pData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, TRUE );
+ pData = CreateSaveInData( xDocCfgMgr, xCfgMgr, aModuleId, sal_True );
if ( pData && !pData->IsReadOnly() )
{
@@ -1901,7 +1901,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
aSaveInListBox.SetSelectHdl(
LINK( this, SvxConfigPage, SelectSaveInLocation ) );
- bInitialised = TRUE;
+ bInitialised = sal_True;
Init();
}
@@ -1972,11 +1972,11 @@ void SvxConfigPage::Reset( const SfxItemSet& )
return sModuleID;
}
-BOOL SvxConfigPage::FillItemSet( SfxItemSet& )
+sal_Bool SvxConfigPage::FillItemSet( SfxItemSet& )
{
- bool result = FALSE;
+ bool result = sal_False;
- for ( USHORT i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ )
+ for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ )
{
SaveInData* pData =
(SaveInData*) aSaveInListBox.GetEntryData( i );
@@ -2028,7 +2028,7 @@ IMPL_LINK( SvxConfigPage, SelectSaveInLocation, ListBox *, pBox )
void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
{
- USHORT nSelectionPos = aTopLevelListBox.GetSelectEntryPos();
+ sal_uInt16 nSelectionPos = aTopLevelListBox.GetSelectEntryPos();
aTopLevelListBox.Clear();
if ( GetSaveInData() && GetSaveInData()->GetEntries() )
@@ -2039,7 +2039,7 @@ void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
for ( ; iter != end; iter++ )
{
SvxConfigEntry* pEntryData = *iter;
- USHORT nPos = aTopLevelListBox.InsertEntry( stripHotKey( pEntryData->GetName() ) );
+ sal_uInt16 nPos = aTopLevelListBox.InsertEntry( stripHotKey( pEntryData->GetName() ) );
aTopLevelListBox.SetEntryData( nPos, pEntryData );
if ( pEntryData == pToSelect )
@@ -2060,7 +2060,7 @@ void SvxConfigPage::ReloadTopLevelListBox( SvxConfigEntry* pToSelect )
nSelectionPos = nSelectionPos < aTopLevelListBox.GetEntryCount() ?
nSelectionPos : aTopLevelListBox.GetEntryCount() - 1;
- aTopLevelListBox.SelectEntryPos( nSelectionPos, TRUE );
+ aTopLevelListBox.SelectEntryPos( nSelectionPos, sal_True );
aTopLevelListBox.GetSelectHdl().Call( this );
}
@@ -2080,7 +2080,7 @@ void SvxConfigPage::AddSubMenusToUI(
subMenuTitle += OUString::createFromAscii( pMenuSeparatorStr );
subMenuTitle += stripHotKey( pEntryData->GetName() );
- USHORT nPos = aTopLevelListBox.InsertEntry( subMenuTitle );
+ sal_uInt16 nPos = aTopLevelListBox.InsertEntry( subMenuTitle );
aTopLevelListBox.SetEntryData( nPos, pEntryData );
AddSubMenusToUI( subMenuTitle, pEntryData );
@@ -2129,8 +2129,8 @@ SvLBoxEntry* SvxConfigPage::AddFunction(
}
SvxConfigEntry* pNewEntryData =
- new SvxConfigEntry( aDisplayName, aURL, FALSE );
- pNewEntryData->SetUserDefined( TRUE );
+ new SvxConfigEntry( aDisplayName, aURL, sal_False );
+ pNewEntryData->SetUserDefined( sal_True );
// check that this function is not already in the menu
SvxConfigEntry* pParent = GetTopLevelSelection();
@@ -2190,7 +2190,7 @@ SvLBoxEntry* SvxConfigPage::InsertEntry(
SvxEntries::const_iterator end = pEntries->end();
// Advance the iterator to the data for currently selected entry
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
while (*iter != pEntryData && ++iter != end)
{
nPos++;
@@ -2213,14 +2213,14 @@ SvLBoxEntry* SvxConfigPage::InsertEntry(
aContentsListBox->Select( pNewEntry );
aContentsListBox->MakeVisible( pNewEntry );
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
}
return pNewEntry;
}
SvLBoxEntry* SvxConfigPage::InsertEntryIntoUI(
- SvxConfigEntry* pNewEntryData, ULONG nPos )
+ SvxConfigEntry* pNewEntryData, sal_uLong nPos )
{
SvLBoxEntry* pNewEntry = NULL;
@@ -2228,7 +2228,7 @@ SvLBoxEntry* SvxConfigPage::InsertEntryIntoUI(
{
pNewEntry = aContentsListBox->InsertEntry(
String::CreateFromAscii( pSeparatorStr ),
- 0, FALSE, nPos, pNewEntryData );
+ 0, sal_False, nPos, pNewEntryData );
}
else
{
@@ -2240,12 +2240,12 @@ SvLBoxEntry* SvxConfigPage::InsertEntryIntoUI(
if ( !!aImage )
{
pNewEntry = aContentsListBox->InsertEntry(
- aName, aImage, aImage, 0, FALSE, nPos, pNewEntryData );
+ aName, aImage, aImage, 0, sal_False, nPos, pNewEntryData );
}
else
{
pNewEntry = aContentsListBox->InsertEntry(
- aName, 0, FALSE, nPos, pNewEntryData );
+ aName, 0, sal_False, nPos, pNewEntryData );
}
if ( pNewEntryData->IsPopup() ||
@@ -2318,7 +2318,7 @@ bool SvxConfigPage::MoveEntryData(
//modified by shizhoubo for issue53677
if ( NULL == pSourceEntry || NULL == pTargetEntry )
{
- return FALSE;
+ return sal_False;
}
// Grab the entries list for the currently selected menu
@@ -2333,9 +2333,9 @@ bool SvxConfigPage::MoveEntryData(
pEntries->insert(
pEntries->begin(), pSourceData );
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
- return TRUE;
+ return sal_True;
}
else
{
@@ -2356,13 +2356,13 @@ bool SvxConfigPage::MoveEntryData(
// insert the source entry at the position after the target
pEntries->insert( ++iter, pSourceData );
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
- return TRUE;
+ return sal_True;
}
}
- return FALSE;
+ return sal_False;
}
SvxMenuConfigPage::SvxMenuConfigPage(
@@ -2417,13 +2417,13 @@ void SvxMenuConfigPage::Init()
ReloadTopLevelListBox();
- aTopLevelListBox.SelectEntryPos(0, TRUE);
+ aTopLevelListBox.SelectEntryPos(0, sal_True);
aTopLevelListBox.GetSelectHdl().Call(this);
}
SvxMenuConfigPage::~SvxMenuConfigPage()
{
- for ( USHORT i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ )
+ for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ )
{
MenuSaveInData* pData =
(MenuSaveInData*) aSaveInListBox.GetEntryData( i );
@@ -2457,12 +2457,12 @@ void SvxMenuConfigPage::UpdateButtonStates()
if ( aContentsListBox->GetEntryCount() == 0 || selection == NULL )
{
- aMoveUpButton.Enable( FALSE );
- aMoveDownButton.Enable( FALSE );
+ aMoveUpButton.Enable( sal_False );
+ aMoveDownButton.Enable( sal_False );
- pPopup->EnableItem( ID_BEGIN_GROUP, TRUE );
- pPopup->EnableItem( ID_RENAME, FALSE );
- pPopup->EnableItem( ID_DELETE, FALSE );
+ pPopup->EnableItem( ID_BEGIN_GROUP, sal_True );
+ pPopup->EnableItem( ID_RENAME, sal_False );
+ pPopup->EnableItem( ID_DELETE, sal_False );
aDescriptionField.Clear();
@@ -2480,17 +2480,17 @@ void SvxMenuConfigPage::UpdateButtonStates()
if ( pEntryData->IsSeparator() )
{
- pPopup->EnableItem( ID_DELETE, TRUE );
- pPopup->EnableItem( ID_BEGIN_GROUP, FALSE );
- pPopup->EnableItem( ID_RENAME, FALSE );
+ pPopup->EnableItem( ID_DELETE, sal_True );
+ pPopup->EnableItem( ID_BEGIN_GROUP, sal_False );
+ pPopup->EnableItem( ID_RENAME, sal_False );
aDescriptionField.Clear();
}
else
{
- pPopup->EnableItem( ID_BEGIN_GROUP, TRUE );
- pPopup->EnableItem( ID_DELETE, TRUE );
- pPopup->EnableItem( ID_RENAME, TRUE );
+ pPopup->EnableItem( ID_BEGIN_GROUP, sal_True );
+ pPopup->EnableItem( ID_DELETE, sal_True );
+ pPopup->EnableItem( ID_RENAME, sal_True );
aDescriptionField.SetNewText( pEntryData->GetHelpText() );
}
@@ -2508,7 +2508,7 @@ void SvxMenuConfigPage::DeleteSelectedTopLevel()
ReloadTopLevelListBox();
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
}
bool SvxMenuConfigPage::DeleteSelectedContent()
@@ -2539,11 +2539,11 @@ bool SvxMenuConfigPage::DeleteSelectedContent()
// delete data for menu entry
delete pMenuEntry;
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
short SvxMenuConfigPage::QueryReset()
@@ -2619,7 +2619,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
ReloadTopLevelListBox();
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
}
// #i68101# Moemory leak (!)
@@ -2643,7 +2643,7 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
ReloadTopLevelListBox( pDialog->GetSelectedEntry() );
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
}
delete pDialog;
@@ -2651,9 +2651,9 @@ IMPL_LINK( SvxMenuConfigPage, MenuSelectHdl, MenuButton *, pButton )
break;
}
default:
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
@@ -2675,14 +2675,14 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
pNameDialog->GetName(aNewName);
SvxConfigEntry* pNewEntryData =
- new SvxConfigEntry( aNewName, aNewName, TRUE );
- pNewEntryData->SetUserDefined( TRUE );
+ new SvxConfigEntry( aNewName, aNewName, sal_True );
+ pNewEntryData->SetUserDefined( sal_True );
InsertEntry( pNewEntryData );
ReloadTopLevelListBox();
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
}
delete pNameDialog;
@@ -2692,7 +2692,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
case ID_BEGIN_GROUP:
{
SvxConfigEntry* pNewEntryData = new SvxConfigEntry;
- pNewEntryData->SetUserDefined( TRUE );
+ pNewEntryData->SetUserDefined( sal_True );
InsertEntry( pNewEntryData );
break;
@@ -2723,7 +2723,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
pEntry->SetName( aNewName );
aContentsListBox->SetEntryText( pActEntry, aNewName );
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
}
delete pNameDialog;
@@ -2732,7 +2732,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
}
default:
{
- return FALSE;
+ return sal_False;
}
}
@@ -2741,7 +2741,7 @@ IMPL_LINK( SvxMenuConfigPage, EntrySelectHdl, MenuButton *, pButton )
UpdateButtonStates();
}
- return TRUE;
+ return sal_True;
}
IMPL_LINK( SvxMenuConfigPage, AddFunctionHdl,
@@ -2760,7 +2760,7 @@ IMPL_LINK( SvxMenuConfigPage, NewMenuHdl, Button *, pButton )
SvxMainMenuOrganizerDialog* pDialog =
new SvxMainMenuOrganizerDialog( 0,
- GetSaveInData()->GetEntries(), NULL, TRUE );
+ GetSaveInData()->GetEntries(), NULL, sal_True );
bool ret = pDialog->Execute();
@@ -2768,7 +2768,7 @@ IMPL_LINK( SvxMenuConfigPage, NewMenuHdl, Button *, pButton )
{
GetSaveInData()->SetEntries( pDialog->GetEntries() );
ReloadTopLevelListBox( pDialog->GetSelectedEntry() );
- GetSaveInData()->SetModified( TRUE );
+ GetSaveInData()->SetModified( sal_True );
}
delete pDialog;
@@ -2783,7 +2783,7 @@ IMPL_LINK( SvxMenuConfigPage, AddCommandsHdl, Button *, pButton )
if ( pSelectorDlg == NULL )
{
// Create Script Selector which also shows builtin commands
- pSelectorDlg = new SvxScriptSelectorDialog( this, TRUE, m_xFrame );
+ pSelectorDlg = new SvxScriptSelectorDialog( this, sal_True, m_xFrame );
pSelectorDlg->SetAddHdl(
LINK( this, SvxMenuConfigPage, AddFunctionHdl ) );
@@ -2827,7 +2827,7 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
aOKButton( this, CUI_RES( BTN_MENU_ADD ) ),
aCloseButton( this, CUI_RES( BTN_MENU_CLOSE ) ),
aHelpButton( this, CUI_RES( BTN_MENU_HELP ) ),
- bModified( FALSE )
+ bModified( sal_False )
{
FreeResource();
@@ -2866,9 +2866,9 @@ SvxMainMenuOrganizerDialog::SvxMainMenuOrganizerDialog(
OUString newurl = generateCustomMenuURL( pEntries );
SvxConfigEntry* pNewEntryData =
- new SvxConfigEntry( newname, newurl, TRUE );
- pNewEntryData->SetUserDefined( TRUE );
- pNewEntryData->SetMain( TRUE );
+ new SvxConfigEntry( newname, newurl, sal_True );
+ pNewEntryData->SetUserDefined( sal_True );
+ pNewEntryData->SetMain( sal_True );
pNewMenuEntry =
aMenuListBox.InsertEntry( stripHotKey( pNewEntryData->GetName() ) );
@@ -3012,7 +3012,7 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton )
aMenuListBox.GetModel()->Move( pSourceEntry, pTargetEntry );
aMenuListBox.MakeVisible( pSourceEntry );
- bModified = TRUE;
+ bModified = sal_True;
}
}
@@ -3054,11 +3054,11 @@ SvxConfigEntry::SvxConfigEntry( const OUString& rDisplayName,
, aLabel(rDisplayName)
, aCommand(rCommandURL)
, bPopUp(bPopup)
- , bStrEdited( FALSE )
- , bIsUserDefined( FALSE )
- , bIsMain( FALSE )
+ , bStrEdited( sal_False )
+ , bIsUserDefined( sal_False )
+ , bIsMain( sal_False )
, bIsParentData( bParentData )
- , bIsVisible( TRUE )
+ , bIsVisible( sal_True )
, nStyle( 0 )
, pEntries( 0 )
{
@@ -3086,27 +3086,27 @@ bool SvxConfigEntry::IsMovable()
{
if ( IsPopup() && !IsMain() )
{
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
bool SvxConfigEntry::IsDeletable()
{
if ( IsMain() && !IsUserDefined() )
{
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
bool SvxConfigEntry::IsRenamable()
{
if ( IsMain() && !IsUserDefined() )
{
- return FALSE;
+ return sal_False;
}
- return TRUE;
+ return sal_True;
}
SvxToolbarConfigPage::SvxToolbarConfigPage(
@@ -3151,8 +3151,8 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
aMoveDownButton.SetClickHdl ( LINK( this, SvxToolbarConfigPage, MoveHdl) );
// Always enable Up and Down buttons
// added for issue i53677 by shizhoubo
- aMoveDownButton.Enable( TRUE );
- aMoveUpButton.Enable( TRUE );
+ aMoveDownButton.Enable( sal_True );
+ aMoveUpButton.Enable( sal_True );
PopupMenu* pMenu = new PopupMenu( CUI_RES( MODIFY_TOOLBAR ) );
pMenu->SetMenuFlags(
@@ -3206,7 +3206,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
SvxToolbarConfigPage::~SvxToolbarConfigPage()
{
- for ( USHORT i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ )
+ for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ )
{
ToolbarSaveInData* pData =
(ToolbarSaveInData*) aSaveInListBox.GetEntryData( i );
@@ -3225,7 +3225,7 @@ SvxToolbarConfigPage::~SvxToolbarConfigPage()
void SvxToolbarConfigPage::DeleteSelectedTopLevel()
{
- USHORT nSelectionPos = aTopLevelListBox.GetSelectEntryPos();
+ sal_uInt16 nSelectionPos = aTopLevelListBox.GetSelectEntryPos();
ToolbarSaveInData* pSaveInData = (ToolbarSaveInData*) GetSaveInData();
pSaveInData->RemoveToolbar( GetTopLevelSelection() );
@@ -3236,11 +3236,11 @@ void SvxToolbarConfigPage::DeleteSelectedTopLevel()
// subtract one from the entry count
if ( nSelectionPos != aTopLevelListBox.GetEntryCount() - 1 )
{
- aTopLevelListBox.SelectEntryPos( nSelectionPos + 1, TRUE );
+ aTopLevelListBox.SelectEntryPos( nSelectionPos + 1, sal_True );
}
else
{
- aTopLevelListBox.SelectEntryPos( nSelectionPos - 1, TRUE );
+ aTopLevelListBox.SelectEntryPos( nSelectionPos - 1, sal_True );
}
aTopLevelListBox.GetSelectHdl().Call( this );
@@ -3292,10 +3292,10 @@ bool SvxToolbarConfigPage::DeleteSelectedContent()
}
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
IMPL_LINK( SvxToolbarConfigPage, MoveHdl, Button *, pButton )
@@ -3321,7 +3321,7 @@ void SvxToolbarConfigPage::MoveEntry( bool bMoveUp )
IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
{
- USHORT nSelectionPos = aTopLevelListBox.GetSelectEntryPos();
+ sal_uInt16 nSelectionPos = aTopLevelListBox.GetSelectEntryPos();
SvxConfigEntry* pToolbar =
(SvxConfigEntry*)aTopLevelListBox.GetEntryData( nSelectionPos );
@@ -3416,7 +3416,7 @@ IMPL_LINK( SvxToolbarConfigPage, ToolbarSelectHdl, MenuButton *, pButton )
IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
{
- bool bNeedsApply = FALSE;
+ bool bNeedsApply = sal_False;
// get currently selected toolbar
SvxConfigEntry* pToolbar = GetTopLevelSelection();
@@ -3444,7 +3444,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
pEntry->SetName( aNewName );
aContentsListBox->SetEntryText( pActEntry, aNewName );
- bNeedsApply = TRUE;
+ bNeedsApply = sal_True;
}
delete pNameDialog;
@@ -3456,10 +3456,10 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
SvxConfigEntry* pEntry =
(SvxConfigEntry*) pActEntry->GetUserData();
- USHORT nSelectionPos = 0;
+ sal_uInt16 nSelectionPos = 0;
// find position of entry within the list
- for ( USHORT i = 0; i < aContentsListBox->GetEntryCount(); i++ )
+ for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); i++ )
{
if ( aContentsListBox->GetEntry( 0, i ) == pActEntry )
{
@@ -3479,7 +3479,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
pEntry->SetName( aSystemName );
aContentsListBox->SetEntryText(
pActEntry, stripHotKey( aSystemName ) );
- bNeedsApply = TRUE;
+ bNeedsApply = sal_True;
}
uno::Sequence< OUString > aURLSeq( 1 );
@@ -3509,7 +3509,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
aContentsListBox->Select( pNewLBEntry );
aContentsListBox->MakeVisible( pNewLBEntry );
- bNeedsApply = TRUE;
+ bNeedsApply = sal_True;
}
catch ( uno::Exception& )
{
@@ -3520,14 +3520,14 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
case ID_BEGIN_GROUP:
{
SvxConfigEntry* pNewEntryData = new SvxConfigEntry;
- pNewEntryData->SetUserDefined( TRUE );
+ pNewEntryData->SetUserDefined( sal_True );
SvLBoxEntry* pNewLBEntry = InsertEntry( pNewEntryData );
aContentsListBox->SetCheckButtonState(
pNewLBEntry, SV_BUTTON_TRISTATE );
- bNeedsApply = TRUE;
+ bNeedsApply = sal_True;
break;
}
case ID_DELETE:
@@ -3553,10 +3553,10 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
SvxConfigEntry* pEntry =
(SvxConfigEntry*) pActEntry->GetUserData();
- USHORT nSelectionPos = 0;
+ sal_uInt16 nSelectionPos = 0;
// find position of entry within the list
- for ( USHORT i = 0; i < aContentsListBox->GetEntryCount(); i++ )
+ for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); i++ )
{
if ( aContentsListBox->GetEntry( 0, i ) == pActEntry )
{
@@ -3636,10 +3636,10 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
SvxConfigEntry* pEntry =
(SvxConfigEntry*) pActEntry->GetUserData();
- USHORT nSelectionPos = 0;
+ sal_uInt16 nSelectionPos = 0;
// find position of entry within the list
- for ( USHORT i = 0; i < aContentsListBox->GetEntryCount(); i++ )
+ for ( sal_uInt16 i = 0; i < aContentsListBox->GetEntryCount(); i++ )
{
if ( aContentsListBox->GetEntry( 0, i ) == pActEntry )
{
@@ -3691,7 +3691,7 @@ IMPL_LINK( SvxToolbarConfigPage, EntrySelectHdl, MenuButton *, pButton )
}
}
- if ( bNeedsApply == TRUE )
+ if ( bNeedsApply == sal_True )
{
(( ToolbarSaveInData* ) GetSaveInData())->ApplyToolbar( pToolbar );
UpdateButtonStates();
@@ -3708,10 +3708,10 @@ void SvxToolbarConfigPage::Init()
ReloadTopLevelListBox();
- USHORT nPos = 0;
+ sal_uInt16 nPos = 0;
if ( m_aURLToSelect.getLength() != 0 )
{
- for ( USHORT i = 0 ; i < aTopLevelListBox.GetEntryCount(); i++ )
+ for ( sal_uInt16 i = 0 ; i < aTopLevelListBox.GetEntryCount(); i++ )
{
SvxConfigEntry* pData =
(SvxConfigEntry*) aTopLevelListBox.GetEntryData( i );
@@ -3728,7 +3728,7 @@ void SvxToolbarConfigPage::Init()
m_aURLToSelect += OUString::createFromAscii( "standardbar" );
}
- aTopLevelListBox.SelectEntryPos(nPos, TRUE);
+ aTopLevelListBox.SelectEntryPos(nPos, sal_True);
aTopLevelListBox.GetSelectHdl().Call(this);
}
@@ -3977,7 +3977,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
{
pRootEntry = new SvxConfigEntry(
- String::CreateFromAscii("MainToolbars"), String(), TRUE );
+ String::CreateFromAscii("MainToolbars"), String(), sal_True );
uno::Sequence< uno::Sequence < beans::PropertyValue > > info =
GetConfigManager()->getUIElementsInfo(
@@ -4021,9 +4021,9 @@ SvxEntries* ToolbarSaveInData::GetEntries()
}
SvxConfigEntry* pEntry = new SvxConfigEntry(
- uiname, url, TRUE );
+ uiname, url, sal_True );
- pEntry->SetMain( TRUE );
+ pEntry->SetMain( sal_True );
pEntry->SetStyle( GetSystemStyle( url ) );
@@ -4033,11 +4033,11 @@ SvxEntries* ToolbarSaveInData::GetEntries()
OUString custom = OUString::createFromAscii(CUSTOM_TOOLBAR_STR);
if ( systemname.indexOf( custom ) == 0 )
{
- pEntry->SetUserDefined( TRUE );
+ pEntry->SetUserDefined( sal_True );
}
else
{
- pEntry->SetUserDefined( FALSE );
+ pEntry->SetUserDefined( sal_False );
}
pRootEntry->GetEntries()->push_back( pEntry );
@@ -4109,18 +4109,18 @@ SvxEntries* ToolbarSaveInData::GetEntries()
}
SvxConfigEntry* pEntry = new SvxConfigEntry(
- uiname, url, TRUE, TRUE );
+ uiname, url, sal_True, sal_True );
- pEntry->SetMain( TRUE );
+ pEntry->SetMain( sal_True );
pEntry->SetStyle( GetSystemStyle( url ) );
if ( systemname.indexOf( custom ) == 0 )
{
- pEntry->SetUserDefined( TRUE );
+ pEntry->SetUserDefined( sal_True );
}
else
{
- pEntry->SetUserDefined( FALSE );
+ pEntry->SetUserDefined( sal_False );
}
pRootEntry->GetEntries()->push_back( pEntry );
@@ -4167,14 +4167,14 @@ ToolbarSaveInData::HasURL( const OUString& rURL )
if ( pEntry->GetCommand().equals( rURL ) )
{
if ( pEntry->IsParentData() )
- return FALSE;
+ return sal_False;
else
- return TRUE;
+ return sal_True;
}
iter++;
}
- return FALSE;
+ return sal_False;
}
bool ToolbarSaveInData::HasSettings()
@@ -4182,9 +4182,9 @@ bool ToolbarSaveInData::HasSettings()
// return true if there is at least one toolbar entry
if ( GetEntries()->size() > 0 )
{
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
void ToolbarSaveInData::Reset()
@@ -4232,7 +4232,7 @@ void ToolbarSaveInData::Reset()
bool ToolbarSaveInData::Apply()
{
// toolbar changes are instantly applied
- return FALSE;
+ return sal_False;
}
void ToolbarSaveInData::ApplyToolbar(
@@ -4477,7 +4477,7 @@ bool ToolbarSaveInData::LoadToolbar(
uno::Reference< container::XIndexAccess > xSubMenu;
OUString aCommandURL;
OUString aLabel;
- bool bIsUserDefined = TRUE;
+ bool bIsUserDefined = sal_True;
sal_Bool bIsVisible;
sal_Int32 nStyle;
@@ -4494,11 +4494,11 @@ bool ToolbarSaveInData::LoadToolbar(
try
{
a = m_xCommandToLabelMap->getByName( aCommandURL );
- bIsUserDefined = FALSE;
+ bIsUserDefined = sal_False;
}
catch ( container::NoSuchElementException& )
{
- bIsUserDefined = TRUE;
+ bIsUserDefined = sal_True;
}
// If custom label not set retrieve it from the command
@@ -4522,7 +4522,7 @@ bool ToolbarSaveInData::LoadToolbar(
if ( xSubMenu.is() )
{
SvxConfigEntry* pEntry = new SvxConfigEntry(
- aLabel, aCommandURL, TRUE );
+ aLabel, aCommandURL, sal_True );
pEntry->SetUserDefined( bIsUserDefined );
pEntry->SetVisible( bIsVisible );
@@ -4534,7 +4534,7 @@ bool ToolbarSaveInData::LoadToolbar(
else
{
SvxConfigEntry* pEntry = new SvxConfigEntry(
- aLabel, aCommandURL, FALSE );
+ aLabel, aCommandURL, sal_False );
pEntry->SetUserDefined( bIsUserDefined );
pEntry->SetVisible( bIsVisible );
pEntry->SetStyle( nStyle );
@@ -4563,15 +4563,15 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbarEntry, Control *, pBox )
void SvxToolbarConfigPage::UpdateButtonStates()
{
PopupMenu* pPopup = aModifyCommandButton.GetPopupMenu();
- pPopup->EnableItem( ID_RENAME, FALSE );
- pPopup->EnableItem( ID_DELETE, FALSE );
- pPopup->EnableItem( ID_BEGIN_GROUP, FALSE );
- pPopup->EnableItem( ID_DEFAULT_COMMAND, FALSE );
- pPopup->EnableItem( ID_ICON_ONLY, FALSE );
- pPopup->EnableItem( ID_ICON_AND_TEXT, FALSE );
- pPopup->EnableItem( ID_TEXT_ONLY, FALSE );
- pPopup->EnableItem( ID_CHANGE_SYMBOL, FALSE );
- pPopup->EnableItem( ID_RESET_SYMBOL, FALSE );
+ pPopup->EnableItem( ID_RENAME, sal_False );
+ pPopup->EnableItem( ID_DELETE, sal_False );
+ pPopup->EnableItem( ID_BEGIN_GROUP, sal_False );
+ pPopup->EnableItem( ID_DEFAULT_COMMAND, sal_False );
+ pPopup->EnableItem( ID_ICON_ONLY, sal_False );
+ pPopup->EnableItem( ID_ICON_AND_TEXT, sal_False );
+ pPopup->EnableItem( ID_TEXT_ONLY, sal_False );
+ pPopup->EnableItem( ID_CHANGE_SYMBOL, sal_False );
+ pPopup->EnableItem( ID_RESET_SYMBOL, sal_False );
aDescriptionField.Clear();
@@ -4583,22 +4583,22 @@ void SvxToolbarConfigPage::UpdateButtonStates()
SvxConfigEntry* pEntryData = (SvxConfigEntry*) selection->GetUserData();
if ( pEntryData->IsSeparator() )
- pPopup->EnableItem( ID_DELETE, TRUE );
+ pPopup->EnableItem( ID_DELETE, sal_True );
else
{
- pPopup->EnableItem( ID_BEGIN_GROUP, TRUE );
- pPopup->EnableItem( ID_DELETE, TRUE );
- pPopup->EnableItem( ID_RENAME, TRUE );
- pPopup->EnableItem( ID_ICON_ONLY, TRUE );
- pPopup->EnableItem( ID_ICON_AND_TEXT, TRUE );
- pPopup->EnableItem( ID_TEXT_ONLY, TRUE );
- pPopup->EnableItem( ID_CHANGE_SYMBOL, TRUE );
+ pPopup->EnableItem( ID_BEGIN_GROUP, sal_True );
+ pPopup->EnableItem( ID_DELETE, sal_True );
+ pPopup->EnableItem( ID_RENAME, sal_True );
+ pPopup->EnableItem( ID_ICON_ONLY, sal_True );
+ pPopup->EnableItem( ID_ICON_AND_TEXT, sal_True );
+ pPopup->EnableItem( ID_TEXT_ONLY, sal_True );
+ pPopup->EnableItem( ID_CHANGE_SYMBOL, sal_True );
if ( !pEntryData->IsUserDefined() )
- pPopup->EnableItem( ID_DEFAULT_COMMAND, TRUE );
+ pPopup->EnableItem( ID_DEFAULT_COMMAND, sal_True );
if ( pEntryData->IsIconModified() )
- pPopup->EnableItem( ID_RESET_SYMBOL, TRUE );
+ pPopup->EnableItem( ID_RESET_SYMBOL, sal_True );
aDescriptionField.SetNewText( pEntryData->GetHelpText() );
}
@@ -4628,16 +4628,16 @@ IMPL_LINK( SvxToolbarConfigPage, SelectToolbar, ListBox *, pBox )
SvxConfigEntry* pToolbar = GetTopLevelSelection();
if ( pToolbar == NULL )
{
- aModifyTopLevelButton.Enable( FALSE );
- aModifyCommandButton.Enable( FALSE );
- aAddCommandsButton.Enable( FALSE );
+ aModifyTopLevelButton.Enable( sal_False );
+ aModifyCommandButton.Enable( sal_False );
+ aAddCommandsButton.Enable( sal_False );
return 0;
}
- aModifyTopLevelButton.Enable( TRUE );
- aModifyCommandButton.Enable( TRUE );
- aAddCommandsButton.Enable( TRUE );
+ aModifyTopLevelButton.Enable( sal_True );
+ aModifyCommandButton.Enable( sal_True );
+ aAddCommandsButton.Enable( sal_True );
PopupMenu* pPopup = aModifyTopLevelButton.GetPopupMenu();
@@ -4705,8 +4705,8 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
SvxNewToolbarDialog* pNameDialog = new SvxNewToolbarDialog( 0, aNewName );
- USHORT nInsertPos;
- for ( USHORT i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ )
+ sal_uInt16 nInsertPos;
+ for ( sal_uInt16 i = 0 ; i < aSaveInListBox.GetEntryCount(); i++ )
{
SaveInData* pData =
(SaveInData*) aSaveInListBox.GetEntryData( i );
@@ -4718,7 +4718,7 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
}
pNameDialog->aSaveInListBox.SelectEntryPos(
- aSaveInListBox.GetSelectEntryPos(), TRUE );
+ aSaveInListBox.GetSelectEntryPos(), sal_True );
bool ret = pNameDialog->Execute();
if ( ret == RET_OK )
@@ -4732,24 +4732,24 @@ IMPL_LINK( SvxToolbarConfigPage, NewToolbarHdl, Button *, pButton )
if ( GetSaveInData() != pData )
{
- aSaveInListBox.SelectEntryPos( nInsertPos, TRUE );
+ aSaveInListBox.SelectEntryPos( nInsertPos, sal_True );
aSaveInListBox.GetSelectHdl().Call(this);
}
SvxConfigEntry* pToolbar =
- new SvxConfigEntry( aNewName, aNewURL, TRUE );
+ new SvxConfigEntry( aNewName, aNewURL, sal_True );
- pToolbar->SetUserDefined( TRUE );
- pToolbar->SetMain( TRUE );
+ pToolbar->SetUserDefined( sal_True );
+ pToolbar->SetMain( sal_True );
pData->CreateToolbar( pToolbar );
nInsertPos = aTopLevelListBox.InsertEntry( pToolbar->GetName() );
aTopLevelListBox.SetEntryData( nInsertPos, pToolbar );
- aTopLevelListBox.SelectEntryPos( nInsertPos, TRUE );
+ aTopLevelListBox.SelectEntryPos( nInsertPos, sal_True );
aTopLevelListBox.GetSelectHdl().Call(this);
- pData->SetModified( TRUE );
+ pData->SetModified( sal_True );
}
delete pNameDialog;
@@ -4764,7 +4764,7 @@ IMPL_LINK( SvxToolbarConfigPage, AddCommandsHdl, Button *, pButton )
if ( pSelectorDlg == NULL )
{
// Create Script Selector which shows slot commands
- pSelectorDlg = new SvxScriptSelectorDialog( this, TRUE, m_xFrame );
+ pSelectorDlg = new SvxScriptSelectorDialog( this, sal_True, m_xFrame );
// Position the Script Selector over the Add button so it is
// beside the menu contents list and does not obscure it
@@ -4801,7 +4801,7 @@ SvLBoxEntry* SvxToolbarConfigPage::AddFunction(
if ( pEntry->IsBinding() )
{
- pEntry->SetVisible( TRUE );
+ pEntry->SetVisible( sal_True );
aContentsListBox->SetCheckButtonState(
pNewLBEntry, SV_BUTTON_CHECKED );
}
@@ -4885,8 +4885,8 @@ Image SvxToolbarEntriesListBox::GetSizedImage(
// Position image at the center of (width-2),(height) rectangle.
// We need 2 pixels to have a bigger border to the next button image
- USHORT nPosX = std::max( (USHORT) (((( aNewSize.Width() - 2 ) - aImage.GetSizePixel().Width() ) / 2 ) - 1), (USHORT) 0 );
- USHORT nPosY = std::max( (USHORT) (((( aNewSize.Height() - 2 ) - aImage.GetSizePixel().Height() ) / 2 ) + 1), (USHORT) 0 );
+ sal_uInt16 nPosX = std::max( (sal_uInt16) (((( aNewSize.Width() - 2 ) - aImage.GetSizePixel().Width() ) / 2 ) - 1), (sal_uInt16) 0 );
+ sal_uInt16 nPosY = std::max( (sal_uInt16) (((( aNewSize.Height() - 2 ) - aImage.GetSizePixel().Height() ) / 2 ) + 1), (sal_uInt16) 0 );
Point aPos( nPosX > 0 ? nPosX : 0, nPosY > 0 ? nPosY : 0 );
aDev.SetFillColor( aFillColor );
aDev.SetLineColor( aFillColor );
@@ -4962,14 +4962,14 @@ void SvxToolbarEntriesListBox::KeyInput( const KeyEvent& rKeyEvent )
}
}
-BOOL SvxToolbarEntriesListBox::NotifyMoving(
+sal_Bool SvxToolbarEntriesListBox::NotifyMoving(
SvLBoxEntry* pTarget, SvLBoxEntry* pSource,
- SvLBoxEntry*& rpNewParent, ULONG& rNewChildPos)
+ SvLBoxEntry*& rpNewParent, sal_uLong& rNewChildPos)
{
bool result = SvxMenuEntriesListBox::NotifyMoving(
pTarget, pSource, rpNewParent, rNewChildPos );
- if ( result == TRUE )
+ if ( result == sal_True )
{
// Instant Apply changes to UI
SvxConfigEntry* pToolbar = pPage->GetTopLevelSelection();
@@ -4984,11 +4984,11 @@ BOOL SvxToolbarEntriesListBox::NotifyMoving(
return result;
}
-BOOL SvxToolbarEntriesListBox::NotifyCopying(
+sal_Bool SvxToolbarEntriesListBox::NotifyCopying(
SvLBoxEntry* pTarget,
SvLBoxEntry* pSource,
SvLBoxEntry*& rpNewParent,
- ULONG& rNewChildPos)
+ sal_uLong& rNewChildPos)
{
(void)pSource;
(void)rpNewParent;
@@ -5010,11 +5010,11 @@ BOOL SvxToolbarEntriesListBox::NotifyCopying(
// AddFunction already adds the listbox entry so return FALSE
// to stop another listbox entry being added
- return FALSE;
+ return sal_False;
}
// Copying is only allowed from external controls, not within the listbox
- return FALSE;
+ return sal_False;
}
SvxNewToolbarDialog::SvxNewToolbarDialog(
@@ -5077,7 +5077,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
::rtl::OUStringHash,
::std::equal_to< ::rtl::OUString > > ImageInfo;
- aTbSymbol.SetPageScroll( TRUE );
+ aTbSymbol.SetPageScroll( sal_True );
bool bLargeIcons = GetImageType() & css::ui::ImageType::SIZE_LARGE;
m_nExpectedSize = bLargeIcons ? 26 : 16;
@@ -5101,7 +5101,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
if ( !m_xGraphProvider.is() )
{
- aBtnImport.Enable( FALSE );
+ aBtnImport.Enable( sal_False );
}
uno::Reference< beans::XPropertySet > xPropSet(
@@ -5126,7 +5126,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
}
else
{
- aBtnImport.Enable( FALSE );
+ aBtnImport.Enable( sal_False );
}
aDirectory += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "soffice.cfg/import" ) );
@@ -5167,7 +5167,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
for ( sal_Int32 n = 0; n < names.getLength(); n++ )
mImageInfo.insert( ImageInfo::value_type( names[n], false ));
}
- USHORT nId = 1;
+ sal_uInt16 nId = 1;
ImageInfo::const_iterator pConstIter = mImageInfo.begin();
uno::Sequence< OUString > name( 1 );
while ( pConstIter != mImageInfo.end() )
@@ -5247,7 +5247,7 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
++pConstIter;
}
- aBtnDelete.Enable( FALSE );
+ aBtnDelete.Enable( sal_False );
aTbSymbol.SetSelectHdl( LINK(this, SvxIconSelectorDialog, SelectHdl) );
aBtnImport.SetClickHdl( LINK(this, SvxIconSelectorDialog, ImportHdl) );
aBtnDelete.SetClickHdl( LINK(this, SvxIconSelectorDialog, DeleteHdl) );
@@ -5257,11 +5257,11 @@ SvxIconSelectorDialog::SvxIconSelectorDialog( Window *pWindow,
SvxIconSelectorDialog::~SvxIconSelectorDialog()
{
- USHORT nCount = aTbSymbol.GetItemCount();
+ sal_uInt16 nCount = aTbSymbol.GetItemCount();
- for (USHORT n = 0; n < nCount; n++ )
+ for (sal_uInt16 n = 0; n < nCount; n++ )
{
- USHORT nId = aTbSymbol.GetItemId(n);
+ sal_uInt16 nId = aTbSymbol.GetItemId(n);
uno::XInterface* xi = static_cast< uno::XInterface* >(
aTbSymbol.GetItemData( nId ) );
@@ -5277,8 +5277,8 @@ uno::Reference< graphic::XGraphic> SvxIconSelectorDialog::GetSelectedIcon()
{
uno::Reference< graphic::XGraphic > result;
- USHORT nId;
- for ( USHORT n = 0; n < aTbSymbol.GetItemCount(); n++ )
+ sal_uInt16 nId;
+ for ( sal_uInt16 n = 0; n < aTbSymbol.GetItemCount(); n++ )
{
nId = aTbSymbol.GetItemId( n );
if ( aTbSymbol.IsItemChecked( nId ) )
@@ -5296,29 +5296,29 @@ IMPL_LINK( SvxIconSelectorDialog, SelectHdl, ToolBox *, pToolBox )
{
(void)pToolBox;
- USHORT nCount = aTbSymbol.GetItemCount();
+ sal_uInt16 nCount = aTbSymbol.GetItemCount();
- for (USHORT n = 0; n < nCount; n++ )
+ for (sal_uInt16 n = 0; n < nCount; n++ )
{
- USHORT nId = aTbSymbol.GetItemId( n );
+ sal_uInt16 nId = aTbSymbol.GetItemId( n );
if ( aTbSymbol.IsItemChecked( nId ) )
{
- aTbSymbol.CheckItem( nId, FALSE );
+ aTbSymbol.CheckItem( nId, sal_False );
}
}
- USHORT nId = aTbSymbol.GetCurItemId();
+ sal_uInt16 nId = aTbSymbol.GetCurItemId();
aTbSymbol.CheckItem( nId );
::rtl::OUString aSelImageText = aTbSymbol.GetItemText( nId );
if ( m_xImportedImageManager->hasImage( GetImageType(), aSelImageText ) )
{
- aBtnDelete.Enable( TRUE );
+ aBtnDelete.Enable( sal_True );
}
else
{
- aBtnDelete.Enable( FALSE );
+ aBtnDelete.Enable( sal_False );
}
return 0;
@@ -5363,11 +5363,11 @@ IMPL_LINK( SvxIconSelectorDialog, DeleteHdl, PushButton *, pButton )
if ( ret == RET_OK )
{
- USHORT nCount = aTbSymbol.GetItemCount();
+ sal_uInt16 nCount = aTbSymbol.GetItemCount();
- for (USHORT n = 0; n < nCount; n++ )
+ for (sal_uInt16 n = 0; n < nCount; n++ )
{
- USHORT nId = aTbSymbol.GetItemId( n );
+ sal_uInt16 nId = aTbSymbol.GetItemId( n );
if ( aTbSymbol.IsItemChecked( nId ) )
{
@@ -5403,7 +5403,7 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
aMediaProps[0].Value <<= aURL;
com::sun::star::awt::Size aSize;
- bool bOK = FALSE;
+ bool bOK = sal_False;
try
{
xGraphic = m_xGraphProvider->queryGraphic( aMediaProps );
@@ -5414,9 +5414,9 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
OUString::createFromAscii("SizePixel") );
a >>= aSize;
if (0 == aSize.Width || 0 == aSize.Height)
- return FALSE;
+ return sal_False;
else
- bOK = TRUE;
+ bOK = sal_True;
}
catch ( uno::Exception& )
{
@@ -5424,10 +5424,10 @@ bool SvxIconSelectorDialog::ReplaceGraphicItem(
}
bool bResult( false );
- USHORT nCount = aTbSymbol.GetItemCount();
- for (USHORT n = 0; n < nCount; n++ )
+ sal_uInt16 nCount = aTbSymbol.GetItemCount();
+ for (sal_uInt16 n = 0; n < nCount; n++ )
{
- USHORT nId = aTbSymbol.GetItemId( n );
+ sal_uInt16 nId = aTbSymbol.GetItemId( n );
if ( OUString( aTbSymbol.GetItemText( nId ) ) == aURL )
{
@@ -5472,7 +5472,7 @@ void SvxIconSelectorDialog::ImportGraphics(
uno::Sequence< OUString > rejected( rPaths.getLength() );
sal_Int32 rejectedCount = 0;
- USHORT ret = 0;
+ sal_uInt16 ret = 0;
sal_Int32 aIndex;
OUString aIconName;
uno::Sequence< OUString > URLs(1);
@@ -5496,7 +5496,7 @@ void SvxIconSelectorDialog::ImportGraphics(
}
else
{
- if ( ImportGraphic( rPaths[0] ) == FALSE )
+ if ( ImportGraphic( rPaths[0] ) == sal_False )
{
rejected[0] = rPaths[0];
rejectedCount = 1;
@@ -5516,7 +5516,7 @@ void SvxIconSelectorDialog::ImportGraphics(
{
aIndex = rPaths[i].lastIndexOf( '/' );
aIconName = rPaths[i].copy( aIndex+1 );
- ret = SvxIconReplacementDialog( this, aIconName, TRUE ).ShowDialog();
+ ret = SvxIconReplacementDialog( this, aIconName, sal_True ).ShowDialog();
if ( ret == 2 )
{
ReplaceGraphicItem( aPath );
@@ -5531,7 +5531,7 @@ void SvxIconSelectorDialog::ImportGraphics(
if ( !bHasReplaced )
{
bool result = ImportGraphic( aPath );
- if ( result == FALSE )
+ if ( result == sal_False )
{
rejected[ rejectedCount ] = rPaths[i];
rejectedCount++;
@@ -5544,7 +5544,7 @@ void SvxIconSelectorDialog::ImportGraphics(
else
{
bool result = ImportGraphic( aSourcePath + rPaths[i] );
- if ( result == FALSE )
+ if ( result == sal_False )
{
rejected[ rejectedCount ] = rPaths[i];
rejectedCount++;
@@ -5573,9 +5573,9 @@ void SvxIconSelectorDialog::ImportGraphics(
bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
{
- bool result = FALSE;
+ bool result = sal_False;
- USHORT nId = m_nNextId;
+ sal_uInt16 nId = m_nNextId;
++m_nNextId;
uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
@@ -5583,7 +5583,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
uno::Reference< graphic::XGraphic > xGraphic;
com::sun::star::awt::Size aSize;
- bool bOK = TRUE;
+ bool bOK = sal_True;
aMediaProps[0].Value <<= aURL;
try
{
@@ -5598,7 +5598,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
{
a >>= aSize;
if ( 0 == aSize.Width || 0 == aSize.Height )
- bOK = FALSE;
+ bOK = sal_False;
Image aImage( xGraphic );
@@ -5630,7 +5630,7 @@ bool SvxIconSelectorDialog::ImportGraphic( const OUString& aURL )
xConfigPersistence->store();
}
- result = TRUE;
+ result = sal_True;
}
else
{
@@ -5692,7 +5692,7 @@ rtl::OUString SvxIconReplacementDialog :: ReplaceIconName( const OUString& rMess
return name;
}
-USHORT SvxIconReplacementDialog :: ShowDialog()
+sal_uInt16 SvxIconReplacementDialog :: ShowDialog()
{
this->Execute();
return ( this->GetCurButtonId() );
@@ -5714,8 +5714,8 @@ SvxIconChangeDialog::SvxIconChangeDialog(
FreeResource();
aFImageInfo.SetImage(InfoBox::GetStandardImage());
aLineEditDescription.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
- aLineEditDescription.SetAutoScroll( TRUE );
- aLineEditDescription.EnableCursor( FALSE );
+ aLineEditDescription.SetAutoScroll( sal_True );
+ aLineEditDescription.EnableCursor( sal_False );
aLineEditDescription.SetText(aMessage);
}
diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index b85ec24adee2..fc3e44bb4585 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -345,8 +345,8 @@ void SfxConfigFunctionListBox_Impl::ClearAll()
vorhandenen MacroInfos.
*/
{
- USHORT nCount = aArr.Count();
- for ( USHORT i=0; i<nCount; i++ )
+ sal_uInt16 nCount = aArr.Count();
+ for ( sal_uInt16 i=0; i<nCount; i++ )
{
SfxGroupInfo_Impl *pData = aArr[i];
@@ -484,9 +484,9 @@ SvxConfigGroupBoxResource_Impl::SvxConfigGroupBoxResource_Impl() :
}
SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
- Window* pParent, const ResId& rResId, ULONG nConfigMode )
+ Window* pParent, const ResId& rResId, sal_uLong nConfigMode )
: SvTreeListBox( pParent, rResId )
- , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( FALSE ), bShowBasic( TRUE ), pStylesInfo(0)
+ , pImp(new SvxConfigGroupBoxResource_Impl()), pFunctionListBox(0), nMode( nConfigMode ), bShowSF( sal_False ), bShowBasic( sal_True ), pStylesInfo(0)
{
SetStyle( GetStyle() | WB_CLIPCHILDREN | WB_HSCROLL | WB_HASBUTTONS | WB_HASLINES | WB_HASLINESATROOT | WB_HASBUTTONSATROOT );
SetNodeBitmaps( pImp->m_collapsedImage, pImp->m_expandedImage, BMP_COLOR_NORMAL );
@@ -504,10 +504,10 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
value >>= tmp;
if (tmp == sal_True) {
- bShowBasic = TRUE;
+ bShowBasic = sal_True;
}
else {
- bShowBasic = FALSE;
+ bShowBasic = sal_False;
}
value = ::utl::ConfigManager::GetConfigManager()->GetLocalProperty(
@@ -517,10 +517,10 @@ SfxConfigGroupListBox_Impl::SfxConfigGroupListBox_Impl(
value >>= tmp;
if (tmp == sal_True) {
- bShowSF = TRUE;
+ bShowSF = sal_True;
}
else {
- bShowSF = FALSE;
+ bShowSF = sal_False;
}
}
@@ -532,8 +532,8 @@ SfxConfigGroupListBox_Impl::~SfxConfigGroupListBox_Impl()
void SfxConfigGroupListBox_Impl::ClearAll()
{
- USHORT nCount = aArr.Count();
- for ( USHORT i=0; i<nCount; i++ )
+ sal_uInt16 nCount = aArr.Count();
+ for ( sal_uInt16 i=0; i<nCount; i++ )
{
SfxGroupInfo_Impl *pData = aArr[i];
if ( pData->nKind == SFX_CFGGROUP_SCRIPTCONTAINER
@@ -556,7 +556,7 @@ void SfxConfigGroupListBox_Impl::ClearAll()
void SfxConfigGroupListBox_Impl::SetScriptType( const String& rScriptType )
{
pImp->m_aScriptType = rScriptType;
- ULONG nPos=0;
+ sal_uLong nPos=0;
SvLBoxEntry *pEntry = (SvLBoxEntry*) GetModel()->GetEntryAtAbsPos( nPos++ );
while ( pEntry )
{
@@ -740,7 +740,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
const css::uno::Reference< css::frame::XFrame >& xFrame ,
const ::rtl::OUString& sModuleLongName)
{
- SetUpdateMode(FALSE);
+ SetUpdateMode(sal_False);
ClearAll(); // Remove all old entries from treelist box
m_xFrame = xFrame;
@@ -764,7 +764,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
if ( nMode )
{
pSlotPool = pPool ? pPool : &SFX_SLOTPOOL();
- for ( USHORT i=1; i<pSlotPool->GetGroupCount(); i++ )
+ for ( sal_uInt16 i=1; i<pSlotPool->GetGroupCount(); i++ )
{
// Gruppe anw"ahlen ( Gruppe 0 ist intern )
String aName = pSlotPool->SeekGroup( i );
@@ -776,7 +776,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
sal_Bool bActiveEntries = sal_False;
while ( pSfxSlot )
{
- USHORT nId = pSfxSlot->GetSlotId();
+ sal_uInt16 nId = pSfxSlot->GetSlotId();
if ( pSfxSlot->GetMode() & nMode )
{
bActiveEntries = sal_True;
@@ -808,16 +808,16 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
// Zuerst AppBasic
BasicManager *pAppBasicMgr = pSfxApp->GetBasicManager();
- BOOL bInsert = TRUE;
+ sal_Bool bInsert = sal_True;
/*
if ( pArr )
{
- bInsert = FALSE;
- for ( USHORT n=0; n<pArr->Count(); n++ )
+ bInsert = sal_False;
+ for ( sal_uInt16 n=0; n<pArr->Count(); n++ )
{
if ( *(*pArr)[n] == pSfxApp->GetName() )
{
- bInsert = TRUE;
+ bInsert = sal_True;
break;
}
}
@@ -836,7 +836,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_BASICMGR, 0, pAppBasicMgr );
// aArr.Insert( pInfo, aArr.Count() );
pEntry->SetUserData( pInfo );
- pEntry->EnableChildsOnDemand( TRUE );
+ pEntry->EnableChildsOnDemand( sal_True );
// Expand( pEntry );
}
}
@@ -856,7 +856,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
SfxGroupInfo_Impl *pInfo =
new SfxGroupInfo_Impl( SFX_CFGGROUP_DOCBASICMGR, 0, xDoc.get() );
pEntry->SetUserData( pInfo );
- pEntry->EnableChildsOnDemand( TRUE );
+ pEntry->EnableChildsOnDemand( sal_True );
}
}
@@ -903,7 +903,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
String aTitle(pImp->m_sDlgMacros);
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
- pNewEntry->EnableChildsOnDemand( TRUE );
+ pNewEntry->EnableChildsOnDemand( sal_True );
aArr.Insert( pInfo, aArr.Count() );
}
else
@@ -915,19 +915,19 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
{
Sequence< Reference< browse::XBrowseNode > > children =
rootNode->getChildNodes();
- BOOL bIsRootNode = FALSE;
+ sal_Bool bIsRootNode = sal_False;
::rtl::OUString user = ::rtl::OUString::createFromAscii("user");
::rtl::OUString share = ::rtl::OUString::createFromAscii("share");
if ( rootNode->getName().equals(::rtl::OUString::createFromAscii("Root") ))
{
- bIsRootNode = TRUE;
+ bIsRootNode = sal_True;
}
//To mimic current starbasic behaviour we
//need to make sure that only the current document
//is displayed in the config tree. Tests below
- //set the bDisplay flag to FALSE if the current
+ //set the bDisplay flag to sal_False if the current
//node is a first level child of the Root and is NOT
//either the current document, user or share
::rtl::OUString currentDocTitle;
@@ -940,14 +940,14 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
for ( sal_Int32 n = 0; n < children.getLength(); n++ )
{
Reference< browse::XBrowseNode >& theChild = children[n];
- BOOL bDisplay = TRUE;
+ sal_Bool bDisplay = sal_True;
::rtl::OUString uiName = theChild->getName();
if ( bIsRootNode )
{
if ( ! ((theChild->getName().equals( user ) || theChild->getName().equals( share ) ||
theChild->getName().equals( currentDocTitle ) ) ) )
{
- bDisplay=FALSE;
+ bDisplay=sal_False;
}
else
{
@@ -993,7 +993,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
{
if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER )
{
- pNewEntry->EnableChildsOnDemand( TRUE );
+ pNewEntry->EnableChildsOnDemand( sal_True );
m = grandchildren.getLength();
}
}
@@ -1017,7 +1017,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
SfxGroupInfo_Impl *pInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, 0 ); // TODO last parameter should contain user data
aArr.Insert( pInfo, aArr.Count() );
pEntry->SetUserData( pInfo );
- pEntry->EnableChildsOnDemand( TRUE );
+ pEntry->EnableChildsOnDemand( sal_True );
}
/* {
@@ -1029,7 +1029,7 @@ void SfxConfigGroupListBox_Impl::Init(const css::uno::Reference< css::lang::XMul
} */
MakeVisible( GetEntry( 0,0 ) );
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
Image SfxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast )
{
@@ -1205,14 +1205,14 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
{
SvLBoxEntry *pEntry = FirstSelected();
SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData();
- pFunctionListBox->SetUpdateMode(FALSE);
+ pFunctionListBox->SetUpdateMode(sal_False);
pFunctionListBox->ClearAll();
if ( pInfo->nKind != SFX_CFGGROUP_FUNCTION &&
pInfo->nKind != SFX_CFGGROUP_BASICMOD &&
pInfo->nKind != SFX_CFGGROUP_SCRIPTCONTAINER &&
pInfo->nKind != SFX_CFGGROUP_STYLES )
{
- pFunctionListBox->SetUpdateMode(TRUE);
+ pFunctionListBox->SetUpdateMode(sal_True);
return;
}
@@ -1220,7 +1220,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
{
case SFX_CFGGROUP_FUNCTION :
{
- USHORT nGroup = pInfo->nOrd;
+ sal_uInt16 nGroup = pInfo->nOrd;
css::uno::Reference< css::frame::XDispatchInformationProvider > xProvider (m_xFrame, css::uno::UNO_QUERY_THROW);
css::uno::Sequence< css::frame::DispatchInformation > lCommands = xProvider->getConfigurableDispatchInformation(nGroup);
sal_Int32 c = lCommands.getLength();
@@ -1255,7 +1255,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
xDoc = static_cast< XModel* >( pBasInfo->pObject );
SbModule *pMod = (SbModule*) pInfo->pObject;
- for ( USHORT nMeth=0; nMeth < pMod->GetMethods()->Count(); nMeth++ )
+ for ( sal_uInt16 nMeth=0; nMeth < pMod->GetMethods()->Count(); nMeth++ )
{
SbxMethod *pMeth = (SbxMethod*)pMod->GetMethods()->Get(nMeth);
SfxMacroInfoPtr pInf = new SfxMacroInfo( !xDoc.is(),
@@ -1264,7 +1264,7 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
pMeth->GetName());
if ( pMeth->GetInfo() )
pInf->SetHelpText( pMeth->GetInfo()->GetComment() );
- USHORT nId = SFX_APP()->GetMacroConfig()->GetSlotId( pInf );
+ sal_uInt16 nId = SFX_APP()->GetMacroConfig()->GetSlotId( pInf );
if ( !nId )
break; // Kein Slot mehr frei
@@ -1373,31 +1373,31 @@ void SfxConfigGroupListBox_Impl::GroupSelected()
if ( pFunctionListBox->GetEntryCount() )
pFunctionListBox->Select( pFunctionListBox->GetEntry( 0, 0 ) );
- pFunctionListBox->SetUpdateMode(TRUE);
+ pFunctionListBox->SetUpdateMode(sal_True);
}
-BOOL SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
+sal_Bool SfxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
{
- BOOL bRet = SvTreeListBox::Expand( pParent );
+ sal_Bool bRet = SvTreeListBox::Expand( pParent );
if ( bRet )
{
// Wieviele Entries k"onnen angezeigt werden ?
- ULONG nEntries = GetOutputSizePixel().Height() / GetEntryHeight();
+ sal_uLong nEntries = GetOutputSizePixel().Height() / GetEntryHeight();
// Wieviele Kinder sollen angezeigt werden ?
- ULONG nChildCount = GetVisibleChildCount( pParent );
+ sal_uLong nChildCount = GetVisibleChildCount( pParent );
// Passen alle Kinder und der parent gleichzeitig in die View ?
if ( nChildCount+1 > nEntries )
{
// Wenn nicht, wenigstens parent ganz nach oben schieben
- MakeVisible( pParent, TRUE );
+ MakeVisible( pParent, sal_True );
}
else
{
// An welcher relativen ViewPosition steht der aufzuklappende parent
SvLBoxEntry *pEntry = GetFirstEntryInView();
- ULONG nParentPos = 0;
+ sal_uLong nParentPos = 0;
while ( pEntry && pEntry != pParent )
{
nParentPos++;
@@ -1419,7 +1419,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
*/
{
SfxGroupInfo_Impl *pInfo = (SfxGroupInfo_Impl*) pEntry->GetUserData();
- pInfo->bWasOpened = TRUE;
+ pInfo->bWasOpened = sal_True;
switch ( pInfo->nKind )
{
case SFX_CFGGROUP_BASICMGR :
@@ -1431,14 +1431,14 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
BasicManager* pMgr( GetBasicManager( *pEntry ) );
SvLBoxEntry *pLibEntry = 0;
- for ( USHORT nLib=0; nLib<pMgr->GetLibCount(); nLib++)
+ for ( sal_uInt16 nLib=0; nLib<pMgr->GetLibCount(); nLib++)
{
StarBASIC* pLib = pMgr->GetLib( nLib );
pLibEntry = InsertEntry( pMgr->GetLibName( nLib ), pEntry );
SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_BASICLIB, nLib, pLib );
aArr.Insert( pGrpInfo, aArr.Count() );
pLibEntry->SetUserData( pGrpInfo );
- pLibEntry->EnableChildsOnDemand( TRUE );
+ pLibEntry->EnableChildsOnDemand( sal_True );
}
}
@@ -1464,12 +1464,12 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
}
SvLBoxEntry *pModEntry = 0;
- for ( USHORT nMod=0; nMod<pLib->GetModules()->Count(); nMod++ )
+ for ( sal_uInt16 nMod=0; nMod<pLib->GetModules()->Count(); nMod++ )
{
SbModule* pMod = (SbModule*)pLib->GetModules()->Get( nMod );
- BOOL bIsStarScript = FALSE; //pMod->ISA( SbJScriptModule );
- BOOL bWantsStarScript = pImp->m_aScriptType.EqualsAscii("StarScript");
+ sal_Bool bIsStarScript = sal_False; //pMod->ISA( SbJScriptModule );
+ sal_Bool bWantsStarScript = pImp->m_aScriptType.EqualsAscii("StarScript");
if ( bIsStarScript != bWantsStarScript )
continue;
pModEntry = InsertEntry( pMod->GetName(), pEntry );
@@ -1494,19 +1494,19 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
{
Sequence< Reference< browse::XBrowseNode > > children =
rootNode->getChildNodes();
- BOOL bIsRootNode = FALSE;
+ sal_Bool bIsRootNode = sal_False;
::rtl::OUString user = ::rtl::OUString::createFromAscii("user");
::rtl::OUString share = ::rtl::OUString::createFromAscii("share");
if ( rootNode->getName().equals(::rtl::OUString::createFromAscii("Root") ))
{
- bIsRootNode = TRUE;
+ bIsRootNode = sal_True;
}
/* To mimic current starbasic behaviour we
need to make sure that only the current document
is displayed in the config tree. Tests below
- set the bDisplay flag to FALSE if the current
+ set the bDisplay flag to sal_False if the current
node is a first level child of the Root and is NOT
either the current document, user or share */
::rtl::OUString currentDocTitle;
@@ -1521,11 +1521,11 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
{
Reference< browse::XBrowseNode >& theChild = children[n];
::rtl::OUString aName( theChild->getName() );
- BOOL bDisplay = TRUE;
+ sal_Bool bDisplay = sal_True;
if ( bIsRootNode )
{
if ( !( (aName.equals(user) || aName.equals(share) || aName.equals(currentDocTitle) ) ) )
- bDisplay=FALSE;
+ bDisplay=sal_False;
}
if ( children[n].is() && children[n]->getType() != browse::BrowseNodeTypes::SCRIPT && bDisplay )
{
@@ -1561,7 +1561,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
{
if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER )
{
- pNewEntry->EnableChildsOnDemand( TRUE );
+ pNewEntry->EnableChildsOnDemand( sal_True );
m = grandchildren.getLength();
}
}
@@ -1592,7 +1592,7 @@ void SfxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
SfxGroupInfo_Impl *pGrpInfo = new SfxGroupInfo_Impl( SFX_CFGGROUP_STYLES, 0, pFamily );
aArr.Insert( pGrpInfo, aArr.Count() );
pStyleEntry->SetUserData( pGrpInfo );
- pStyleEntry->EnableChildsOnDemand( FALSE );
+ pStyleEntry->EnableChildsOnDemand( sal_False );
}
}
break;
@@ -1636,7 +1636,7 @@ void SfxConfigGroupListBox_Impl::SelectMacro( const String& rBasic,
aBasicName += ' ';
aBasicName += pImp->m_sMacros;
String aLib, aModule, aMethod;
- USHORT nCount = rMacro.GetTokenCount('.');
+ sal_uInt16 nCount = rMacro.GetTokenCount('.');
aMethod = rMacro.GetToken( nCount-1, '.' );
if ( nCount > 2 )
{
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index 8592dbaded5f..7b5633ddfadd 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -71,7 +71,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
_SvxMacroTabPage( pParent, CUI_RES(RID_SVXPAGE_EVENTS), rSet ),
aSaveInText( this, CUI_RES( TXT_SAVEIN ) ),
aSaveInListBox( this, CUI_RES( LB_SAVEIN ) ),
- bAppConfig ( TRUE )
+ bAppConfig ( sal_True )
{
mpImpl->pStrEvent = new String( CUI_RES( STR_EVENT ));
mpImpl->pAssignedMacro = new String( CUI_RES( STR_ASSMACRO ));
@@ -103,7 +103,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
"com.sun.star.frame.GlobalEventBroadcaster" ) ),
uno::UNO_QUERY );
- USHORT nPos(0);
+ sal_uInt16 nPos(0);
if ( xSupplier.is() )
{
m_xAppEvents = xSupplier->getEvents();
@@ -112,7 +112,7 @@ SvxEventConfigPage::SvxEventConfigPage( Window *pParent, const SfxItemSet& rSet,
utl::ConfigManager::PRODUCTNAME ) >>= label;
nPos = aSaveInListBox.InsertEntry( label );
aSaveInListBox.SetEntryData( nPos, new bool(true) );
- aSaveInListBox.SelectEntryPos( nPos, TRUE );
+ aSaveInListBox.SelectEntryPos( nPos, sal_True );
}
}
@@ -168,10 +168,10 @@ void SvxEventConfigPage::ImplInitDocument()
m_xDocumentModifiable = m_xDocumentModifiable.query( xModel );
OUString aTitle = ::comphelper::DocumentInfo::getDocumentTitle( xModel );
- USHORT nPos = aSaveInListBox.InsertEntry( aTitle );
+ sal_uInt16 nPos = aSaveInListBox.InsertEntry( aTitle );
aSaveInListBox.SetEntryData( nPos, new bool(false) );
- aSaveInListBox.SelectEntryPos( nPos, TRUE );
+ aSaveInListBox.SelectEntryPos( nPos, sal_True );
bAppConfig = false;
}
@@ -191,16 +191,16 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
bool* bApp = (bool*) aSaveInListBox.GetEntryData(
aSaveInListBox.GetSelectEntryPos());
- mpImpl->pEventLB->SetUpdateMode( FALSE );
+ mpImpl->pEventLB->SetUpdateMode( sal_False );
bAppConfig = *bApp;
if ( *bApp )
{
- SetReadOnly( FALSE );
+ SetReadOnly( sal_False );
_SvxMacroTabPage::DisplayAppEvents( true );
}
else
{
- bool isReadonly = FALSE;
+ bool isReadonly = sal_False;
uno::Reference< frame::XFramesSupplier > xFramesSupplier(
::comphelper::getProcessServiceFactory()->createInstance(
@@ -227,13 +227,13 @@ IMPL_LINK( SvxEventConfigPage, SelectHdl_Impl, ListBox *, pBox )
_SvxMacroTabPage::DisplayAppEvents( false );
}
- mpImpl->pEventLB->SetUpdateMode( TRUE );
- return TRUE;
+ mpImpl->pEventLB->SetUpdateMode( sal_True );
+ return sal_True;
}
// -----------------------------------------------------------------------
-BOOL SvxEventConfigPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SvxEventConfigPage::FillItemSet( SfxItemSet& rSet )
{
return _SvxMacroTabPage::FillItemSet( rSet );
}
diff --git a/cui/source/customize/eventdlg.hxx b/cui/source/customize/eventdlg.hxx
index dc2e657d65fb..26e4f5848134 100644
--- a/cui/source/customize/eventdlg.hxx
+++ b/cui/source/customize/eventdlg.hxx
@@ -48,7 +48,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;
- BOOL bAppConfig;
+ sal_Bool bAppConfig;
DECL_LINK( SelectHdl_Impl, ListBox* );
@@ -65,7 +65,7 @@ public:
void LateInit( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame );
protected:
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet& );
using _SvxMacroTabPage::Reset;
diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 9b5453553ef3..8c69015c3a9c 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -76,11 +76,11 @@ _SvxMacroTabPage_Impl::_SvxMacroTabPage_Impl( const SfxItemSet& rAttrSet ) :
pStrEvent( NULL ),
pAssignedMacro( NULL ),
pEventLB( NULL ),
- bReadOnly( FALSE ),
- bIDEDialogMode( FALSE )
+ bReadOnly( sal_False ),
+ bIDEDialogMode( sal_False )
{
const SfxPoolItem* pItem;
- if ( SFX_ITEM_SET == rAttrSet.GetItemState( SID_ATTR_MACROITEM, FALSE, &pItem ) )
+ if ( SFX_ITEM_SET == rAttrSet.GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem ) )
bIDEDialogMode = ((const SfxBoolItem*)pItem)->GetValue();
}
@@ -128,7 +128,7 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
if( !maHeaderBar.IsItemMode() )
{
Size aSz;
- USHORT _nTabs = maHeaderBar.GetItemCount();
+ sal_uInt16 _nTabs = maHeaderBar.GetItemCount();
long nTmpSz = 0;
long nWidth = maHeaderBar.GetItemSize( ITEMID_EVENT );
long nBarWidth = maHeaderBar.GetSizePixel().Width();
@@ -140,7 +140,7 @@ IMPL_LINK( _HeaderTabListBox, HeaderEndDrag_Impl, HeaderBar*, pBar )
{
long _nWidth;
- for( USHORT i = 1 ; i < _nTabs ; ++i )
+ for( sal_uInt16 i = 1 ; i < _nTabs ; ++i )
{
_nWidth = maHeaderBar.GetItemSize( i );
aSz.Width() = _nWidth + nTmpSz;
@@ -197,7 +197,7 @@ void _HeaderTabListBox::ConnectElements( void )
maListBox.InitHeaderBar( &maHeaderBar );
}
-void _HeaderTabListBox::Show( BOOL bVisible, USHORT nFlags )
+void _HeaderTabListBox::Show( sal_Bool bVisible, sal_uInt16 nFlags )
{
maListBox.Show( bVisible, nFlags );
maHeaderBar.Show( bVisible, nFlags );
@@ -341,7 +341,7 @@ void _SvxMacroTabPage::InitResources()
// the following method is called when the user clicks OK
// We use the contents of the hashes to replace the settings
-BOOL _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
+sal_Bool _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
{
try
{
@@ -392,7 +392,7 @@ BOOL _SvxMacroTabPage::FillItemSet( SfxItemSet& /*rSet*/ )
{
}
// what is the return value about??
- return FALSE;
+ return sal_False;
}
// the following method clears the bindings in the hashes for both doc & app
@@ -439,12 +439,12 @@ void _SvxMacroTabPage::Reset()
DisplayAppEvents(bAppEvents);
}
-void _SvxMacroTabPage::SetReadOnly( BOOL bSet )
+void _SvxMacroTabPage::SetReadOnly( sal_Bool bSet )
{
mpImpl->bReadOnly = bSet;
}
-BOOL _SvxMacroTabPage::IsReadOnly() const
+sal_Bool _SvxMacroTabPage::IsReadOnly() const
{
return mpImpl->bReadOnly;
}
@@ -459,14 +459,14 @@ class IconLBoxString : public SvLBoxString
int m_nxImageOffset;
public:
- IconLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& sText,
+ IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText,
Image* pMacroImg, Image* pComponentImg,
Image* pMacroImg_h, Image* pComponentImg_h );
- virtual void Paint(const Point& aPos, SvLBox& aDevice, USHORT nFlags, SvLBoxEntry* pEntry );
+ virtual void Paint(const Point& aPos, SvLBox& aDevice, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
};
-IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String& sText,
+IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& sText,
Image* pMacroImg, Image* pComponentImg, Image* pMacroImg_h, Image* pComponentImg_h )
: SvLBoxString( pEntry, nFlags, sText )
, m_pMacroImg( pMacroImg )
@@ -479,7 +479,7 @@ IconLBoxString::IconLBoxString( SvLBoxEntry* pEntry, USHORT nFlags, const String
//===============================================
void IconLBoxString::Paint( const Point& aPos, SvLBox& aDevice,
- USHORT /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
+ sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ )
{
String aTxt( GetText() );
if( aTxt.Len() )
@@ -488,7 +488,7 @@ void IconLBoxString::Paint( const Point& aPos, SvLBox& aDevice,
sal_Int32 nIndex = aURL.indexOf( aVndSunStarUNO );
bool bUNO = nIndex == 0;
- BOOL bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
+ sal_Bool bHC = aDevice.GetSettings().GetStyleSettings().GetHighContrastMode();
const Image* pImg;
if( bHC )
pImg = bUNO ? m_pComponentImg_h : m_pMacroImg_h;
@@ -522,7 +522,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
bAppEvents = appEvents;
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
- mpImpl->pEventLB->SetUpdateMode( FALSE );
+ mpImpl->pEventLB->SetUpdateMode( sal_False );
rListBox.Clear();
SvLBoxEntry* pE = rListBox.GetEntry( 0 );
EventsHash* eventsHash;
@@ -591,7 +591,7 @@ void _SvxMacroTabPage::DisplayAppEvents( bool appEvents)
rListBox.MakeVisible( pE );
}
- rListBox.SetUpdateMode( TRUE );
+ rListBox.SetUpdateMode( sal_True );
EnableButtons( String() );
}
@@ -601,7 +601,7 @@ IMPL_STATIC_LINK( _SvxMacroTabPage, SelectEvent_Impl, SvTabListBox*, EMPTYARG )
_SvxMacroTabPage_Impl* pImpl = pThis->mpImpl;
SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox();
SvLBoxEntry* pE = rListBox.FirstSelected();
- ULONG nPos;
+ sal_uLong nPos;
if( !pE || LISTBOX_ENTRY_NOTFOUND ==
( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) )
@@ -630,7 +630,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
_SvxMacroTabPage_Impl* pImpl = pThis->mpImpl;
SvHeaderTabListBox& rListBox = pImpl->pEventLB->GetListBox();
SvLBoxEntry* pE = rListBox.FirstSelected();
- ULONG nPos;
+ sal_uLong nPos;
if( !pE || LISTBOX_ENTRY_NOTFOUND ==
( nPos = rListBox.GetModel()->GetAbsPos( pE ) ) )
{
@@ -638,7 +638,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
return 0;
}
- const BOOL bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled();
+ const sal_Bool bAssEnabled = pBtn != pImpl->pDeletePB && pImpl->pAssignPB->IsEnabled();
::rtl::OUString* pEventName = (::rtl::OUString*)pE->GetUserData();
@@ -696,7 +696,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
else if( bAssEnabled )
{
// assign pressed
- SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog( pThis, FALSE, pThis->GetFrame() );
+ SvxScriptSelectorDialog* pDlg = new SvxScriptSelectorDialog( pThis, sal_False, pThis->GetFrame() );
if( pDlg )
{
short ret = pDlg->Execute();
@@ -725,7 +725,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
}
// update the listbox entry
- pImpl->pEventLB->SetUpdateMode( FALSE );
+ pImpl->pEventLB->SetUpdateMode( sal_False );
// pE->ReplaceItem( new SvLBoxString( pE, 0, sEventURL ), LB_MACROS_ITEMPOS );
pE->ReplaceItem( new IconLBoxString( pE, 0, sEventURL,
pImpl->pMacroImg, pImpl->pComponentImg,
@@ -734,7 +734,7 @@ long _SvxMacroTabPage::GenericHandler_Impl( _SvxMacroTabPage* pThis, PushButton*
rListBox.GetModel()->InvalidateEntry( pE );
rListBox.Select( pE );
rListBox.MakeVisible( pE );
- rListBox.SetUpdateMode( TRUE );
+ rListBox.SetUpdateMode( sal_True );
pThis->EnableButtons( String() );
return 0;
@@ -774,7 +774,7 @@ void _SvxMacroTabPage::InitAndSetHandler( Reference< container::XNameReplace> xA
mpImpl->pEventLB->GetListBox().SetEntryHeight(
sal::static_int_cast< short >(nMinLineHeight) );
- mpImpl->pEventLB->Enable( TRUE );
+ mpImpl->pEventLB->Enable( sal_True );
if(!m_xAppEvents.is())
{
@@ -884,7 +884,7 @@ SvxMacroTabPage::SvxMacroTabPage( Window* pParent, const Reference< frame::XFram
InitAndSetHandler( xNameReplace, Reference< container::XNameReplace>(0), Reference< util::XModifiable >(0));
DisplayAppEvents(true);
SvHeaderTabListBox& rListBox = mpImpl->pEventLB->GetListBox();
- SvLBoxEntry* pE = rListBox.GetEntry( (ULONG)nSelectedIndex );
+ SvLBoxEntry* pE = rListBox.GetEntry( (sal_uLong)nSelectedIndex );
if( pE )
rListBox.Select(pE);
}
diff --git a/cui/source/customize/macropg_impl.hxx b/cui/source/customize/macropg_impl.hxx
index 63c977cf2422..3ecf625419a4 100644
--- a/cui/source/customize/macropg_impl.hxx
+++ b/cui/source/customize/macropg_impl.hxx
@@ -45,8 +45,8 @@ public:
String* pStrEvent;
String* pAssignedMacro;
_HeaderTabListBox* pEventLB;
- BOOL bReadOnly;
- BOOL bIDEDialogMode;
+ sal_Bool bReadOnly;
+ sal_Bool bIDEDialogMode;
};
class AssignComponentDialog : public ModalDialog
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 3defe910f5a5..32883bd66429 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -143,8 +143,8 @@ IMPL_LINK( SvxConfigFunctionListBox_Impl, TimerHdl, Timer*, EMPTYARG)
void SvxConfigFunctionListBox_Impl::ClearAll()
{
- USHORT nCount = aArr.Count();
- for ( USHORT i=0; i<nCount; i++ )
+ sal_uInt16 nCount = aArr.Count();
+ for ( sal_uInt16 i=0; i<nCount; i++ )
{
SvxGroupInfo_Impl *pData = aArr[i];
delete pData;
@@ -249,8 +249,8 @@ SvxConfigGroupListBox_Impl::~SvxConfigGroupListBox_Impl()
void SvxConfigGroupListBox_Impl::ClearAll()
{
- USHORT nCount = aArr.Count();
- for ( USHORT i=0; i<nCount; i++ )
+ sal_uInt16 nCount = aArr.Count();
+ for ( sal_uInt16 i=0; i<nCount; i++ )
{
SvxGroupInfo_Impl *pData = aArr[i];
delete pData;
@@ -327,12 +327,12 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
Sequence< Reference< browse::XBrowseNode > > children =
_rxRootNode->getChildNodes();
- BOOL bIsRootNode = _rxRootNode->getName().equalsAscii("Root");
+ sal_Bool bIsRootNode = _rxRootNode->getName().equalsAscii("Root");
/* To mimic current starbasic behaviour we
need to make sure that only the current document
is displayed in the config tree. Tests below
- set the bDisplay flag to FALSE if the current
+ set the bDisplay flag to sal_False if the current
node is a first level child of the Root and is NOT
either the current document, user or share */
OUString sCurrentDocTitle;
@@ -349,7 +349,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
if ( !theChild.is() )
continue;
::rtl::OUString sUIName = theChild->getName();
- BOOL bDisplay = TRUE;
+ sal_Bool bDisplay = sal_True;
if ( bIsRootNode
|| ( m_bShowSlots && _pParentEntry && ( GetModel()->GetDepth( _pParentEntry ) == 0 ) )
@@ -369,7 +369,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
}
else if ( !sUIName.equals( sCurrentDocTitle ) )
{
- bDisplay = FALSE;
+ bDisplay = sal_False;
}
}
@@ -401,7 +401,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
* way to determine if a basic lib had children
* without having to ask for them (which forces
* the library to be loaded */
- pNewEntry->EnableChildsOnDemand( TRUE );
+ pNewEntry->EnableChildsOnDemand( sal_True );
}
else
{
@@ -414,7 +414,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
{
if ( grandchildren[m]->getType() == browse::BrowseNodeTypes::CONTAINER )
{
- pNewEntry->EnableChildsOnDemand( TRUE );
+ pNewEntry->EnableChildsOnDemand( sal_True );
break;
}
}
@@ -430,7 +430,7 @@ void SvxConfigGroupListBox_Impl::fillScriptList( const Reference< browse::XBrows
void SvxConfigGroupListBox_Impl::Init()
{
- SetUpdateMode(FALSE);
+ SetUpdateMode(sal_False);
ClearAll();
Reference< XComponentContext > xContext;
@@ -580,7 +580,7 @@ void SvxConfigGroupListBox_Impl::Init()
SvLBoxEntry *pNewEntry = InsertEntry( aTitle, NULL );
pNewEntry->SetUserData( pInfo );
- pNewEntry->EnableChildsOnDemand( TRUE );
+ pNewEntry->EnableChildsOnDemand( sal_True );
aArr.Insert( pInfo, aArr.Count() );
}
else
@@ -590,7 +590,7 @@ void SvxConfigGroupListBox_Impl::Init()
}
}
MakeVisible( GetEntry( 0,0 ) );
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
Image SvxConfigGroupListBox_Impl::GetImage( Reference< browse::XBrowseNode > node, Reference< XComponentContext > xCtx, bool bIsRootNode, bool bHighContrast )
@@ -720,12 +720,12 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
{
SvLBoxEntry *pEntry = FirstSelected();
SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData();
- pFunctionListBox->SetUpdateMode(FALSE);
+ pFunctionListBox->SetUpdateMode(sal_False);
pFunctionListBox->ClearAll();
if ( pInfo->nKind != SVX_CFGGROUP_FUNCTION &&
pInfo->nKind != SVX_CFGGROUP_SCRIPTCONTAINER )
{
- pFunctionListBox->SetUpdateMode(TRUE);
+ pFunctionListBox->SetUpdateMode(sal_True);
return;
}
@@ -896,31 +896,31 @@ void SvxConfigGroupListBox_Impl::GroupSelected()
if ( pFunctionListBox->GetEntryCount() )
pFunctionListBox->Select( pFunctionListBox->GetEntry( 0, 0 ) );
- pFunctionListBox->SetUpdateMode(TRUE);
+ pFunctionListBox->SetUpdateMode(sal_True);
}
-BOOL SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
+sal_Bool SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
{
- BOOL bRet = SvTreeListBox::Expand( pParent );
+ sal_Bool bRet = SvTreeListBox::Expand( pParent );
if ( bRet )
{
// Wieviele Entries k"onnen angezeigt werden ?
- ULONG nEntries = GetOutputSizePixel().Height() / GetEntryHeight();
+ sal_uLong nEntries = GetOutputSizePixel().Height() / GetEntryHeight();
// Wieviele Kinder sollen angezeigt werden ?
- ULONG nChildCount = GetVisibleChildCount( pParent );
+ sal_uLong nChildCount = GetVisibleChildCount( pParent );
// Passen alle Kinder und der parent gleichzeitig in die View ?
if ( nChildCount+1 > nEntries )
{
// Wenn nicht, wenigstens parent ganz nach oben schieben
- MakeVisible( pParent, TRUE );
+ MakeVisible( pParent, sal_True );
}
else
{
// An welcher relativen ViewPosition steht der aufzuklappende parent
SvLBoxEntry *pEntry = GetFirstEntryInView();
- ULONG nParentPos = 0;
+ sal_uLong nParentPos = 0;
while ( pEntry && pEntry != pParent )
{
nParentPos++;
@@ -939,7 +939,7 @@ BOOL SvxConfigGroupListBox_Impl::Expand( SvLBoxEntry* pParent )
void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
{
SvxGroupInfo_Impl *pInfo = (SvxGroupInfo_Impl*) pEntry->GetUserData();
- pInfo->bWasOpened = TRUE;
+ pInfo->bWasOpened = sal_True;
switch ( pInfo->nKind )
{
case SVX_CFGGROUP_SCRIPTCONTAINER:
@@ -966,7 +966,7 @@ void SvxConfigGroupListBox_Impl::RequestingChilds( SvLBoxEntry *pEntry )
*/
SvxScriptSelectorDialog::SvxScriptSelectorDialog(
- Window* pParent, BOOL bShowSlots, const Reference< frame::XFrame >& xFrame )
+ Window* pParent, sal_Bool bShowSlots, const Reference< frame::XFrame >& xFrame )
:
ModelessDialog( pParent, CUI_RES( RID_DLG_SCRIPTSELECTOR ) ),
aDialogDescription( this, CUI_RES( TXT_SELECTOR_DIALOG_DESCRIPTION ) ),
@@ -1023,7 +1023,7 @@ void SvxScriptSelectorDialog::ResizeControls()
Size s, news;
long gap;
- USHORT style = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP |
+ sal_uInt16 style = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP |
TEXT_DRAW_LEFT | TEXT_DRAW_WORDBREAK;
// get dimensions of dialog instructions control
@@ -1116,12 +1116,12 @@ SvxScriptSelectorDialog::UpdateUI()
aCommands.GetHelpText( aCommands.FirstSelected() );
aDescriptionText.SetText( rMessage );
- aOKButton.Enable( TRUE );
+ aOKButton.Enable( sal_True );
}
else
{
aDescriptionText.SetText( String() );
- aOKButton.Enable( FALSE );
+ aOKButton.Enable( sal_False );
}
}
@@ -1131,7 +1131,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 == FALSE )
+ if ( m_bShowSlots == sal_False )
{
EndDialog( RET_CANCEL );
}
@@ -1146,7 +1146,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 == FALSE )
+ if ( m_bShowSlots == sal_False )
{
EndDialog( RET_OK );
}
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 4fde01da986e..9829318c5554 100755
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -100,7 +100,7 @@ struct SpellDialog_Impl
namespace svx{
class SpellUndoAction_Impl : public SfxUndoAction
{
- USHORT m_nId;
+ sal_uInt16 m_nId;
const Link& m_rActionLink;
//undo of button enabling
bool m_bEnableChangePB;
@@ -119,7 +119,7 @@ class SpellUndoAction_Impl : public SfxUndoAction
long m_nOffset;
public:
- SpellUndoAction_Impl(USHORT nId, const Link& rActionLink) :
+ SpellUndoAction_Impl(sal_uInt16 nId, const Link& rActionLink) :
m_nId(nId),
m_rActionLink( rActionLink),
m_bEnableChangePB(false),
@@ -135,7 +135,7 @@ public:
~SpellUndoAction_Impl();
virtual void Undo();
- virtual USHORT GetId() const;
+ virtual sal_uInt16 GetId() const;
void SetEnableChangePB(){m_bEnableChangePB = true;}
bool IsEnableChangePB(){return m_bEnableChangePB;}
@@ -189,7 +189,7 @@ void SpellUndoAction_Impl::Undo()
/*-- 06.11.2003 12:16:02---------------------------------------------------
-----------------------------------------------------------------------*/
-USHORT SpellUndoAction_Impl::GetId()const
+sal_uInt16 SpellUndoAction_Impl::GetId()const
{
return m_nId;
}
@@ -307,7 +307,7 @@ void SpellDialog::Init_Impl()
aLanguageLB.SetSelectHdl(LINK( this, SpellDialog, LanguageSelectHdl ) );
// initialize language ListBox
- aLanguageLB.SetLanguageList( LANG_LIST_SPELL_USED, FALSE, FALSE, TRUE );
+ aLanguageLB.SetLanguageList( LANG_LIST_SPELL_USED, sal_False, sal_False, sal_True );
// get current language
UpdateBoxes_Impl();
@@ -424,7 +424,7 @@ void SpellDialog::SpellContinue_Impl(bool bUseSavedSentence, bool bIgnoreCurrent
{
//remove undo if a new sentence is active
aSentenceED.ResetUndo();
- aUndoPB.Enable(FALSE);
+ aUndoPB.Enable(sal_False);
}
}
}
@@ -439,7 +439,7 @@ IMPL_STATIC_LINK( SpellDialog, InitHdl, SpellDialog *, EMPTYARG )
pThis->aAutoCorrPB.Show(pThis->rParent.HasAutoCorrection());
pThis->SpellContinue_Impl();
pThis->aSentenceED.ResetUndo();
- pThis->aUndoPB.Enable(FALSE);
+ pThis->aUndoPB.Enable(sal_False);
pThis->LockFocusChanges(true);
if( pThis->aChangePB.IsEnabled() )
@@ -725,7 +725,7 @@ IMPL_LINK( SpellDialog, UndoHdl, Button*, EMPTYARG )
{
aSentenceED.Undo();
if(!aSentenceED.GetUndoActionCount())
- aUndoPB.Enable(FALSE);
+ aUndoPB.Enable(sal_False);
return 0;
}
/*-- 06.11.2003 12:19:15---------------------------------------------------
@@ -738,14 +738,14 @@ IMPL_LINK( SpellDialog, DialogUndoHdl, SpellUndoAction_Impl*, pAction )
case SPELLUNDO_CHANGE_TEXTENGINE:
{
if(pAction->IsEnableChangePB())
- aChangePB.Enable(FALSE);
+ aChangePB.Enable(sal_False);
if(pAction->IsEnableChangeAllPB())
- aChangeAllPB.Enable(FALSE);
+ aChangeAllPB.Enable(sal_False);
}
break;
case SPELLUNDO_CHANGE_NEXTERROR:
{
- aSentenceED.MoveErrorMarkTo((USHORT)pAction->GetOldErrorStart(), (USHORT)pAction->GetOldErrorEnd(), false);
+ aSentenceED.MoveErrorMarkTo((sal_uInt16)pAction->GetOldErrorStart(), (sal_uInt16)pAction->GetOldErrorEnd(), false);
if(pAction->IsErrorLanguageSelected())
{
UpdateBoxes_Impl();
@@ -828,7 +828,7 @@ void SpellDialog::SetSelectedLang_Impl( LanguageType nLang )
LanguageType SpellDialog::GetSelectedLang_Impl() const
{
- INT16 nLang = aLanguageLB.GetSelectLanguage();
+ sal_Int16 nLang = aLanguageLB.GetSelectLanguage();
return nLang;
}
/* -----------------28.10.2003 14:27-----------------
@@ -960,7 +960,7 @@ void SpellDialog::InitUserDicts()
delete aAddToDictMB.GetPopupMenu();
PopupMenu* pMenu = new PopupMenu;
pMenu->SetMenuFlags(MENU_FLAG_NOAUTOMNEMONICS);
- USHORT nItemId = 1; // menu items should be enumerated from 1 and not 0
+ sal_uInt16 nItemId = 1; // menu items should be enumerated from 1 and not 0
for (sal_Int32 i = 0; i < nSize; ++i)
{
uno::Reference< linguistic2::XDictionary > xDicTmp( pDic[i], uno::UNO_QUERY );
@@ -1006,7 +1006,7 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
//manually changed
const String aNewWord= aSentenceED.GetErrorText();
- USHORT nItemId = pButton->GetCurItemId();
+ sal_uInt16 nItemId = pButton->GetCurItemId();
PopupMenu *pMenu = pButton->GetPopupMenu();
String aDicName ( pMenu->GetItemText( nItemId ) );
@@ -1018,7 +1018,7 @@ IMPL_LINK(SpellDialog, AddToDictionaryHdl, MenuButton*, pButton )
sal_Int16 nAddRes = DIC_ERR_UNKNOWN;
if (xDic.is())
{
- nAddRes = linguistic::AddEntryToDic( xDic, aNewWord, FALSE, OUString(), LANGUAGE_NONE );
+ nAddRes = linguistic::AddEntryToDic( xDic, aNewWord, sal_False, OUString(), LANGUAGE_NONE );
// save modified user-dictionary if it is persistent
uno::Reference< frame::XStorable > xSavDic( xDic, uno::UNO_QUERY );
if (xSavDic.is())
@@ -1151,7 +1151,7 @@ void SpellDialog::InvalidateDialog()
sal_Int16 i = 0;
while(aDisableArr[i])
{
- aDisableArr[i]->Enable(FALSE);
+ aDisableArr[i]->Enable(sal_False);
i++;
}
SfxModelessDialog::Deactivate();
@@ -1218,7 +1218,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
sServiceName = xNamed->getName();
SpellErrorDescription aDesc( false, aStart->xAlternatives->getWord(),
aStart->xAlternatives->getLocale(), aStart->xAlternatives->getAlternatives(), 0, sServiceName);
- aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (USHORT) nStartPosition, (USHORT) nEndPosition );
+ aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
}
else if(aStart->bIsGrammarError )
{
@@ -1232,11 +1232,11 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
&aStart->sDialogTitle,
&aStart->aGrammarError.aFullComment,
&aStart->aGrammarError.aRuleIdentifier );
- aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (USHORT) nStartPosition, (USHORT) nEndPosition );
+ aSentenceED.SetAttrib( SpellErrorAttrib(aDesc), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
}
if(aStart->bIsField)
- aSentenceED.SetAttrib( SpellBackgroundAttrib(COL_LIGHTGRAY), 0, (USHORT) nStartPosition, (USHORT) nEndPosition );
- aSentenceED.SetAttrib( SpellLanguageAttrib(aStart->eLanguage), 0, (USHORT) nStartPosition, (USHORT) nEndPosition );
+ aSentenceED.SetAttrib( SpellBackgroundAttrib(COL_LIGHTGRAY), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
+ aSentenceED.SetAttrib( SpellLanguageAttrib(aStart->eLanguage), 0, (sal_uInt16) nStartPosition, (sal_uInt16) nEndPosition );
nStartPosition = nEndPosition;
}
aStart++;
@@ -1245,7 +1245,7 @@ bool SpellDialog::GetNextSentence_Impl(bool bUseSavedSentence, bool bRecheck)
if(!bHasReplaced)
aSentenceED.ClearModifyFlag();
aSentenceED.ResetUndo();
- aUndoPB.Enable(FALSE);
+ aUndoPB.Enable(sal_False);
bRet = nStartPosition > 0;
}
return bRet;
@@ -1543,7 +1543,7 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
break;
}
//save the current paragraph
- USHORT nCurrentLen = GetText().Len();
+ sal_uInt16 nCurrentLen = GetText().Len();
if(nAction != ACTION_SELECTFIELD)
pTextView->GetWindow()->KeyInput(rKeyEvt);
else
@@ -1564,8 +1564,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
if(pErrorAttrLeft)
{
TextAttrib* pNewError = pErrorAttrLeft->GetAttr().Clone();
- USHORT nStart = pErrorAttrLeft->GetStart();
- USHORT nEnd = pErrorAttrLeft->GetEnd();
+ sal_uInt16 nStart = pErrorAttrLeft->GetStart();
+ sal_uInt16 nEnd = pErrorAttrLeft->GetEnd();
pTextEngine->RemoveAttrib( 0, *pErrorAttrLeft );
SetAttrib( *pNewError, 0, nStart, ++nEnd );
//only active errors move the mark
@@ -1581,13 +1581,13 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
else if(pErrorAttr)
{
//determine the change
- USHORT nAddedChars = GetText().Len() - nCurrentLen;
+ sal_uInt16 nAddedChars = GetText().Len() - nCurrentLen;
TextAttrib* pNewError = pErrorAttr->GetAttr().Clone();
- USHORT nStart = pErrorAttr->GetStart();
- USHORT nEnd = pErrorAttr->GetEnd();
+ sal_uInt16 nStart = pErrorAttr->GetStart();
+ sal_uInt16 nEnd = pErrorAttr->GetEnd();
pTextEngine->RemoveAttrib( 0, *pErrorAttr );
- nStart = nStart - (USHORT)nAddedChars;
+ nStart = nStart - (sal_uInt16)nAddedChars;
SetAttrib( *pNewError, 0, nStart - nAddedChars, nEnd );
//only if the error is active the mark is moved here
if(bIsErrorActive)
@@ -1600,8 +1600,8 @@ long SentenceEditWindow_Impl::PreNotify( NotifyEvent& rNEvt )
if(pBackAttrLeft)
{
TextAttrib* pNewBack = pBackAttrLeft->GetAttr().Clone();
- USHORT _nStart = pBackAttrLeft->GetStart();
- USHORT _nEnd = pBackAttrLeft->GetEnd();
+ sal_uInt16 _nStart = pBackAttrLeft->GetStart();
+ sal_uInt16 _nEnd = pBackAttrLeft->GetEnd();
pTextEngine->RemoveAttrib( 0, *pBackAttrLeft );
SetAttrib( *pNewBack, 0, _nStart, _nEnd - nAddedChars);
delete pNewBack;
@@ -1651,14 +1651,14 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError )
if (bIgnoreCurrentError)
m_aIgnoreErrorsAt.insert( m_nErrorStart );
ExtTextEngine* pTextEngine = GetTextEngine();
- USHORT nTextLen = pTextEngine->GetTextLen(0);
+ sal_uInt16 nTextLen = pTextEngine->GetTextLen(0);
if(m_nErrorEnd >= nTextLen - 1)
return false;
//if it's not already modified the modified flag has to be reset at the and of the marking
bool bModified = IsModified();
bool bRet = false;
- const USHORT nOldErrorStart = m_nErrorStart;
- const USHORT nOldErrorEnd = m_nErrorEnd;
+ const sal_uInt16 nOldErrorStart = m_nErrorStart;
+ const sal_uInt16 nOldErrorEnd = m_nErrorEnd;
//create a cursor behind the end of the last error
//- or at 0 at the start of the sentence
@@ -1695,7 +1695,7 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError )
m_nErrorEnd = pNextError->GetEnd();
ChangeMarkedWord(xEntry->getReplacementText(),
SvxLocaleToLanguage( pSpellErrorDescription->aLocale ));
- aCursor.GetIndex() = aCursor.GetIndex() + (USHORT)(xEntry->getReplacementText().getLength());
+ aCursor.GetIndex() = aCursor.GetIndex() + (sal_uInt16)(xEntry->getReplacementText().getLength());
}
else
break;
@@ -1734,11 +1734,11 @@ bool SentenceEditWindow_Impl::MarkNextError( bool bIgnoreCurrentError )
/*-- 06.11.2003 13:30:26---------------------------------------------------
-----------------------------------------------------------------------*/
-void SentenceEditWindow_Impl::MoveErrorMarkTo(USHORT nStart, USHORT nEnd, bool bGrammarError)
+void SentenceEditWindow_Impl::MoveErrorMarkTo(sal_uInt16 nStart, sal_uInt16 nEnd, bool bGrammarError)
{
TextEngine* pTextEngine = GetTextEngine();
- pTextEngine->RemoveAttribs( 0, (USHORT)TEXTATTR_FONTCOLOR, TRUE );
- pTextEngine->RemoveAttribs( 0, (USHORT)TEXTATTR_FONTWEIGHT, TRUE );
+ pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTCOLOR, sal_True );
+ pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTWEIGHT, sal_True );
pTextEngine->SetAttrib( TextAttribFontWeight(WEIGHT_BOLD), 0, nStart, nEnd );
pTextEngine->SetAttrib( TextAttribFontColor(bGrammarError ? COL_LIGHTBLUE : COL_LIGHTRED), 0, nStart, nEnd );
m_nErrorStart = nStart;
@@ -1776,30 +1776,30 @@ void SentenceEditWindow_Impl::ChangeMarkedWord(const String& rNewWord, LanguageT
const TextCharAttrib* pLangAttrib =
pTextEngine->FindCharAttrib(
TextPaM(0, m_nErrorEnd), TEXTATTR_SPELL_LANGUAGE );
- USHORT nTextLen = pTextEngine->GetTextLen( 0 );
+ sal_uInt16 nTextLen = pTextEngine->GetTextLen( 0 );
if(pLangAttrib && !pLangAttrib->GetStart() && pLangAttrib->GetEnd() ==
nTextLen)
{
SpellLanguageAttrib aNewLangAttrib( static_cast<const SpellLanguageAttrib&>(pLangAttrib->GetAttr()).GetLanguage());
pTextEngine->RemoveAttrib(0, *pLangAttrib);
- pTextEngine->SetAttrib( aNewLangAttrib, 0, (USHORT)(m_nErrorEnd + nDiffLen) , nTextLen );
+ pTextEngine->SetAttrib( aNewLangAttrib, 0, (sal_uInt16)(m_nErrorEnd + nDiffLen) , nTextLen );
}
}
// undo expanded attributes!
if( pBackAttrib && pBackAttrib->GetStart() < m_nErrorStart && pBackAttrib->GetEnd() == m_nErrorEnd + nDiffLen)
{
TextAttrib* pNewBackground = pBackAttrib->GetAttr().Clone();
- USHORT nStart = pBackAttrib->GetStart();
+ sal_uInt16 nStart = pBackAttrib->GetStart();
pTextEngine->RemoveAttrib(0, *pBackAttrib);
pTextEngine->SetAttrib(*pNewBackground, 0, nStart, m_nErrorStart);
delete pNewBackground;
}
- pTextEngine->SetModified(TRUE);
+ pTextEngine->SetModified(sal_True);
//adjust end position
long nEndTemp = m_nErrorEnd;
nEndTemp += nDiffLen;
- m_nErrorEnd = (USHORT)nEndTemp;
+ m_nErrorEnd = (sal_uInt16)nEndTemp;
SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl(
SPELLUNDO_MOVE_ERROREND, GetSpellDialog()->aDialogUndoLink);
@@ -1871,7 +1871,7 @@ void SentenceEditWindow_Impl::SetAlternatives( Reference< XSpellAlternatives> xA
/*-- 10.09.2003 14:43:02---------------------------------------------------
-----------------------------------------------------------------------*/
-void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd )
+void SentenceEditWindow_Impl::SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd )
{
GetTextEngine()->SetAttrib(rAttr, nPara, nStart, nEnd);
}
@@ -1889,10 +1889,10 @@ void SentenceEditWindow_Impl::SetText( const String& rStr )
-----------------------------------------------------------------------*/
struct LanguagePosition_Impl
{
- USHORT nPosition;
+ sal_uInt16 nPosition;
LanguageType eLanguage;
- LanguagePosition_Impl(USHORT nPos, LanguageType eLang) :
+ LanguagePosition_Impl(sal_uInt16 nPos, LanguageType eLang) :
nPosition(nPos),
eLanguage(eLang)
{}
@@ -1900,7 +1900,7 @@ struct LanguagePosition_Impl
typedef std::vector<LanguagePosition_Impl> LanguagePositions_Impl;
void lcl_InsertBreakPosition_Impl(
- LanguagePositions_Impl& rBreakPositions, USHORT nInsert, LanguageType eLanguage)
+ LanguagePositions_Impl& rBreakPositions, sal_uInt16 nInsert, LanguageType eLanguage)
{
LanguagePositions_Impl::iterator aStart = rBreakPositions.begin();
while(aStart != rBreakPositions.end())
@@ -1931,7 +1931,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
{
svx::SpellPortions aRet;
ExtTextEngine* pTextEngine = GetTextEngine();
- const USHORT nTextLen = pTextEngine->GetTextLen(0);
+ const sal_uInt16 nTextLen = pTextEngine->GetTextLen(0);
if(nTextLen)
{
TextPaM aCursor(0, 0);
@@ -1977,7 +1977,7 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
LanguagePositions_Impl::iterator aStart = aBreakPositions.begin();
//start should always be Null
eLang = aStart->eLanguage;
- USHORT nStart = aStart->nPosition;
+ sal_uInt16 nStart = aStart->nPosition;
DBG_ASSERT(!nStart, "invalid start position - language attribute missing?");
++aStart;
@@ -2002,11 +2002,11 @@ svx::SpellPortions SentenceEditWindow_Impl::CreateSpellPortions( bool bSetIgnore
// quick partly fix of #i71318. Correct fix needs to patch the TextEngine itself...
// this one will only prevent text from disappearing. It may to not have the
// correct language and will probably not spell checked...
- ULONG nPara = pTextEngine->GetParagraphCount();
+ sal_uLong nPara = pTextEngine->GetParagraphCount();
if (nPara > 1)
{
String aLeftOverText;
- for (ULONG i = 1; i < nPara; ++i)
+ for (sal_uLong i = 1; i < nPara; ++i)
{
aLeftOverText.AppendAscii( "\x0a" ); // the manual line break...
aLeftOverText += pTextEngine->GetText(i);
@@ -2037,7 +2037,7 @@ void SentenceEditWindow_Impl::Undo()
if(!GetUndoActionCount())
return;
bool bSaveUndoEdit = IsUndoEditMode();
- USHORT nId;
+ sal_uInt16 nId;
//if the undo edit mode is active then undo all changes until the UNDO_EDIT_MODE action has been found
do
{
@@ -2058,7 +2058,7 @@ void SentenceEditWindow_Impl::ResetUndo()
/*-- 06.11.2003 12:30:41---------------------------------------------------
-----------------------------------------------------------------------*/
-void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg )
+void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg )
{
SfxUndoManager& rUndoMgr = GetTextEngine()->GetUndoManager();
rUndoMgr.AddUndoAction(pAction, bTryMerg);
@@ -2067,7 +2067,7 @@ void SentenceEditWindow_Impl::AddUndoAction( SfxUndoAction *pAction, BOOL bTryMe
/*-- 06.11.2003 12:38:44---------------------------------------------------
-----------------------------------------------------------------------*/
-USHORT SentenceEditWindow_Impl::GetUndoActionCount()
+sal_uInt16 SentenceEditWindow_Impl::GetUndoActionCount()
{
return GetTextEngine()->GetUndoManager().GetUndoActionCount();
}
@@ -2075,14 +2075,14 @@ USHORT SentenceEditWindow_Impl::GetUndoActionCount()
/*-- 12.11.2003 12:12:38---------------------------------------------------
-----------------------------------------------------------------------*/
-void SentenceEditWindow_Impl::UndoActionStart( USHORT nId )
+void SentenceEditWindow_Impl::UndoActionStart( sal_uInt16 nId )
{
GetTextEngine()->UndoActionStart(nId);
}
/*-- 12.11.2003 12:12:38---------------------------------------------------
-----------------------------------------------------------------------*/
-void SentenceEditWindow_Impl::UndoActionEnd( USHORT nId )
+void SentenceEditWindow_Impl::UndoActionEnd( sal_uInt16 nId )
{
GetTextEngine()->UndoActionEnd(nId);
}
@@ -2092,9 +2092,9 @@ void SentenceEditWindow_Impl::UndoActionEnd( USHORT nId )
void SentenceEditWindow_Impl::MoveErrorEnd(long nOffset)
{
if(nOffset > 0)
- m_nErrorEnd = m_nErrorEnd - (USHORT)nOffset;
+ m_nErrorEnd = m_nErrorEnd - (sal_uInt16)nOffset;
else
- m_nErrorEnd = m_nErrorEnd -(USHORT)- nOffset;
+ m_nErrorEnd = m_nErrorEnd -(sal_uInt16)- nOffset;
}
/*-- 13.11.2003 15:15:19---------------------------------------------------
@@ -2129,8 +2129,8 @@ void SentenceEditWindow_Impl::SetUndoEditMode(bool bSet)
//remove error marks
TextEngine* pTextEngine = GetTextEngine();
- pTextEngine->RemoveAttribs( 0, (USHORT)TEXTATTR_FONTCOLOR, TRUE );
- pTextEngine->RemoveAttribs( 0, (USHORT)TEXTATTR_FONTWEIGHT, TRUE );
+ pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTCOLOR, sal_True );
+ pTextEngine->RemoveAttribs( 0, (sal_uInt16)TEXTATTR_FONTWEIGHT, sal_True );
//put the appropriate action on the Undo-stack
SpellUndoAction_Impl* pAction = new SpellUndoAction_Impl(
diff --git a/cui/source/dialogs/cuicharmap.cxx b/cui/source/dialogs/cuicharmap.cxx
index b8b6d2567a47..6c6d7ed4b47a 100644
--- a/cui/source/dialogs/cuicharmap.cxx
+++ b/cui/source/dialogs/cuicharmap.cxx
@@ -59,26 +59,26 @@
// class SvxCharacterMap =================================================
-SvxCharacterMap::SvxCharacterMap( Window* pParent, BOOL bOne, const SfxItemSet* pSet ) :
+SvxCharacterMap::SvxCharacterMap( Window* pParent, sal_Bool bOne, const SfxItemSet* pSet ) :
SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_CHARMAP ) ),
mpCharMapData( 0 )
{
- SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, FALSE );
+ SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, FN_PARAM_1, sal_False );
if ( pItem )
bOne = pItem->GetValue();
mpCharMapData = new SvxCharMapData( this, bOne, &CUI_MGR() );
- SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, FALSE );
+ SFX_ITEMSET_ARG( pSet, pCharItem, SfxInt32Item, SID_ATTR_CHAR, sal_False );
if ( pCharItem )
SetChar( pCharItem->GetValue() );
- SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, FALSE );
+ SFX_ITEMSET_ARG( pSet, pDisableItem, SfxBoolItem, FN_PARAM_2, sal_False );
if ( pDisableItem && pDisableItem->GetValue() )
DisableFontSelection();
- SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, FALSE );
- SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, FALSE );
+ SFX_ITEMSET_ARG( pSet, pFontItem, SvxFontItem, SID_ATTR_CHAR_FONT, sal_False );
+ SFX_ITEMSET_ARG( pSet, pFontNameItem, SfxStringItem, SID_FONT_NAME, sal_False );
if ( pFontItem )
{
Font aFont( pFontItem->GetFamilyName(), pFontItem->GetStyleName(), GetCharFont().GetSize() );
@@ -170,7 +170,7 @@ short SvxCharacterMap::Execute()
// class SvxShowText =====================================================
-SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, BOOL bCenter )
+SvxShowText::SvxShowText( Window* pParent, const ResId& rResId, sal_Bool bCenter )
: Control( pParent, rResId ),
mbCenter( bCenter)
{}
@@ -237,7 +237,7 @@ void SvxShowText::SetFont( const Font& rFont )
aFont.SetWeight( WEIGHT_NORMAL );
aFont.SetAlign( ALIGN_TOP );
aFont.SetSize( PixelToLogic( Size( 0, nWinHeight/2 ) ) );
- aFont.SetTransparent( TRUE );
+ aFont.SetTransparent( sal_True );
Control::SetFont( aFont );
mnY = ( nWinHeight - GetTextHeight() ) / 2;
@@ -259,7 +259,7 @@ SvxShowText::~SvxShowText()
// class SvxCharacterMap =================================================
-SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext )
+SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* pResContext )
: mpDialog( pDialog ),
aShowSet ( pDialog, ResId( CT_SHOWSET, *pResContext ) ),
aShowText ( pDialog, ResId( CT_SHOWTEXT, *pResContext ) ),
@@ -274,14 +274,14 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe
aSubsetText ( pDialog, ResId( FT_SUBSET, *pResContext ) ),
aSubsetLB ( pDialog, ResId( LB_SUBSET, *pResContext ) ),
aSymbolText ( pDialog, ResId( FT_SYMBOLE, *pResContext ) ),
- aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), TRUE ),
+ aShowChar ( pDialog, ResId( CT_SHOWCHAR, *pResContext ), sal_True ),
aCharCodeText ( pDialog, ResId( FT_CHARCODE, *pResContext ) ),
// aAssignText ( pDialog, ResId( FT_ASSIGN, *pResContext ) ),
bOne( bOne_ ),
pSubsetMap( NULL )
{
aFont = pDialog->GetFont();
- aFont.SetTransparent( TRUE );
+ aFont.SetTransparent( sal_True );
aFont.SetFamily( FAMILY_DONTKNOW );
aFont.SetPitch( PITCH_DONTKNOW );
aFont.SetCharSet( RTL_TEXTENCODING_DONTKNOW );
@@ -305,8 +305,8 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe
if ( aFontName != aLastName )
{
aLastName = aFontName;
- USHORT nPos = aFontLB.InsertEntry( aFontName );
- aFontLB.SetEntryData( nPos, (void*)(ULONG)i );
+ sal_uInt16 nPos = aFontLB.InsertEntry( aFontName );
+ aFontLB.SetEntryData( nPos, (void*)(sal_uLong)i );
}
}
// the font may not be in the list =>
@@ -321,7 +321,7 @@ SvxCharMapData::SvxCharMapData( SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pRe
if ( aFontLB.GetEntryPos( aToken ) != LISTBOX_ENTRY_NOTFOUND )
{
aDefStr = aToken;
- bFound = TRUE;
+ bFound = sal_True;
break;
}
}
@@ -387,7 +387,7 @@ IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG )
rtl::OUString aOUStr( &cChar, 1 );
aShowText.SetText( aOUStr );
}
- mpDialog->EndDialog( TRUE );
+ mpDialog->EndDialog( sal_True );
return 0;
}
@@ -395,8 +395,8 @@ IMPL_LINK( SvxCharMapData, OKHdl, OKButton *, EMPTYARG )
IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
{
- USHORT nPos = aFontLB.GetSelectEntryPos(),
- nFont = (USHORT)(ULONG)aFontLB.GetEntryData( nPos );
+ sal_uInt16 nPos = aFontLB.GetSelectEntryPos(),
+ nFont = (sal_uInt16)(sal_uLong)aFontLB.GetEntryData( nPos );
aFont = mpDialog->GetDevFont( nFont );
aFont.SetWeight( WEIGHT_DONTKNOW );
aFont.SetItalic( ITALIC_NONE );
@@ -422,7 +422,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
delete pSubsetMap;
pSubsetMap = NULL;
- BOOL bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
+ sal_Bool bNeedSubset = (aFont.GetCharSet() != RTL_TEXTENCODING_SYMBOL);
if( bNeedSubset )
{
FontCharMap aFontCharMap;
@@ -436,7 +436,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
const Subset* s;
while( NULL != (s = pSubsetMap->GetNextSubset( bFirst )) )
{
- USHORT nPos_ = aSubsetLB.InsertEntry( s->GetName() );
+ sal_uInt16 nPos_ = aSubsetLB.InsertEntry( s->GetName() );
aSubsetLB.SetEntryData( nPos_, (void*)s );
// NOTE: subset must live at least as long as the selected font
if( bFirst )
@@ -444,7 +444,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
bFirst = false;
}
if( aSubsetLB.GetEntryCount() <= 1 )
- bNeedSubset = FALSE;
+ bNeedSubset = sal_False;
}
aSubsetText.Show( bNeedSubset);
@@ -457,7 +457,7 @@ IMPL_LINK( SvxCharMapData, FontSelectHdl, ListBox *, EMPTYARG )
IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG )
{
- USHORT nPos = aSubsetLB.GetSelectEntryPos();
+ sal_uInt16 nPos = aSubsetLB.GetSelectEntryPos();
const Subset* pSubset = reinterpret_cast<const Subset*> (aSubsetLB.GetEntryData(nPos));
if( pSubset )
{
@@ -472,7 +472,7 @@ IMPL_LINK( SvxCharMapData, SubsetSelectHdl, ListBox *, EMPTYARG )
IMPL_LINK( SvxCharMapData, CharDoubleClickHdl, Control *, EMPTYARG )
{
- mpDialog->EndDialog( TRUE );
+ mpDialog->EndDialog( sal_True );
return 0;
}
@@ -577,7 +577,7 @@ IMPL_LINK( SvxCharMapData, AssignHdl, PushButton *, EMPTYARG )
{
const SfxItemSet* pOutSet = pDlg->GetOutputItemSet();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pOutSet->GetItemState( SID_CHARMAP, FALSE, &pItem ) )
+ if( SFX_ITEM_SET == pOutSet->GetItemState( SID_CHARMAP, sal_False, &pItem ) )
{
// show assigned shortcut
}
diff --git a/cui/source/dialogs/cuifmsearch.cxx b/cui/source/dialogs/cuifmsearch.cxx
index cd67d1ab5bb3..a761efcdca28 100644
--- a/cui/source/dialogs/cuifmsearch.cxx
+++ b/cui/source/dialogs/cuifmsearch.cxx
@@ -269,7 +269,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI
// die Listboxen fuellen
// die Methoden des Feldvergleiches
- USHORT nResIds[] = {
+ sal_uInt16 nResIds[] = {
RID_STR_SEARCH_ANYWHERE,
RID_STR_SEARCH_BEGINNING,
RID_STR_SEARCH_END,
@@ -280,7 +280,7 @@ void FmSearchDialog::Init(const UniString& strVisibleFields, const UniString& sI
m_lbPosition.SelectEntryPos(MATCHING_ANYWHERE);
// die Feld-Listbox
- for (USHORT i=0; i<strVisibleFields.GetTokenCount(';'); ++i)
+ for (sal_uInt16 i=0; i<strVisibleFields.GetTokenCount(';'); ++i)
m_lbField.InsertEntry(strVisibleFields.GetToken(i, ';'));
@@ -420,7 +420,7 @@ IMPL_LINK(FmSearchDialog, OnClickedSpecialSettings, Button*, pButton )
aDlg->Execute(); //CHINA001 aDlg.Execute();
- INT32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 INT32 nFlags = aDlg.GetTransliterationFlags();
+ sal_Int32 nFlags = aDlg->GetTransliterationFlags(); //CHINA001 sal_Int32 nFlags = aDlg.GetTransliterationFlags();
m_pSearchEngine->SetTransliterationFlags(nFlags);
m_cbCase.Check(m_pSearchEngine->GetCaseSensitive());
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 4acfe2b8eec7..fcc4f002703d 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -132,7 +132,7 @@ void SAL_CALL SearchThread::onTerminated()
void SearchThread::ImplSearch( const INetURLObject& rStartURL,
const ::std::vector< String >& rFormats,
- BOOL bRecursive )
+ sal_Bool bRecursive )
{
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -167,7 +167,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
bFolder = sal_False;
if( bRecursive && bFolder )
- ImplSearch( aFoundURL, rFormats, TRUE );
+ ImplSearch( aFoundURL, rFormats, sal_True );
else
{
sal_Bool bDocument = xRow->getBoolean( 2 ); // property "IsDocument"
@@ -197,7 +197,7 @@ void SearchThread::ImplSearch( const INetURLObject& rStartURL,
LIST_APPEND );
mpBrowser->aLbxFound.InsertEntry(
GetReducedString( aFoundURL, 50 ),
- (USHORT) mpBrowser->aFoundList.Count() - 1 );
+ (sal_uInt16) mpBrowser->aFoundList.Count() - 1 );
}
}
}
@@ -297,9 +297,9 @@ void SAL_CALL TakeThread::run()
{
String aName;
INetURLObject aURL;
- USHORT nEntries;
+ sal_uInt16 nEntries;
GalleryTheme* pThm = mpBrowser->GetXChgData()->pTheme;
- USHORT nPos;
+ sal_uInt16 nPos;
GalleryProgress* pStatusProgress;
{
@@ -309,7 +309,7 @@ void SAL_CALL TakeThread::run()
pThm->LockBroadcaster();
}
- for( USHORT i = 0; i < nEntries && schedule(); i++ )
+ for( sal_uInt16 i = 0; i < nEntries && schedule(); i++ )
{
// kompletten Filenamen aus FoundList holen
if( mpBrowser->bTakeAll )
@@ -318,7 +318,7 @@ void SAL_CALL TakeThread::run()
aURL = INetURLObject(*mpBrowser->aFoundList.GetObject( nPos = mpBrowser->aLbxFound.GetSelectEntryPos( i ) ));
// Position in Taken-Liste uebernehmen
- mrTakenList.Insert( (void*) (ULONG)nPos, LIST_APPEND );
+ mrTakenList.Insert( (void*) (sal_uLong)nPos, LIST_APPEND );
{
::vos::OGuard aGuard( Application::GetSolarMutex() );
@@ -387,12 +387,12 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG )
sal_uInt32 i, nCount;
GetParent()->EnterWait();
- mpBrowser->aLbxFound.SetUpdateMode( FALSE );
+ mpBrowser->aLbxFound.SetUpdateMode( sal_False );
mpBrowser->aLbxFound.SetNoSelection();
// mark all taken positions in aRemoveEntries
for( i = 0UL, nCount = maTakenList.Count(); i < nCount; ++i )
- aRemoveEntries[ (ULONG) maTakenList.GetObject( i ) ] = true;
+ aRemoveEntries[ (sal_uLong) maTakenList.GetObject( i ) ] = true;
maTakenList.Clear();
@@ -423,7 +423,7 @@ IMPL_LINK( TakeProgress, CleanUpHdl, void*, EMPTYARG )
aRemainingVector.clear();
- mpBrowser->aLbxFound.SetUpdateMode( TRUE );
+ mpBrowser->aLbxFound.SetUpdateMode( sal_True );
mpBrowser->SelectFoundHdl( NULL );
GetParent()->LeaveWait();
@@ -566,7 +566,7 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
GalleryTheme::InsertAllThemes( aLbResName );
- aLbResName.SelectEntryPos( (USHORT) pThm->GetId() );
+ aLbResName.SelectEntryPos( (sal_uInt16) pThm->GetId() );
aLbResName.GrabFocus();
aBtnOk.SetClickHdl( LINK( this, GalleryIdDialog, ClickOkHdl ) );
@@ -577,10 +577,10 @@ GalleryIdDialog::GalleryIdDialog( Window* pParent, GalleryTheme* _pThm ) :
IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
{
Gallery* pGal = pThm->GetParent();
- const ULONG nId = GetId();
- BOOL bDifferentThemeExists = FALSE;
+ const sal_uLong nId = GetId();
+ sal_Bool bDifferentThemeExists = sal_False;
- for( ULONG i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ )
+ for( sal_uLong i = 0, nCount = pGal->GetThemeCount(); i < nCount && !bDifferentThemeExists; i++ )
{
const GalleryThemeEntry* pInfo = pGal->GetThemeInfo( i );
@@ -595,7 +595,7 @@ IMPL_LINK( GalleryIdDialog, ClickOkHdl, void*, EMPTYARG )
InfoBox aBox( this, aStr );
aBox.Execute();
aLbResName.GrabFocus();
- bDifferentThemeExists = TRUE;
+ bDifferentThemeExists = sal_True;
}
}
@@ -634,7 +634,7 @@ GalleryThemeProperties::GalleryThemeProperties( Window* pParent, ExchangeData* _
// ------------------------------------------------------------------------
-void GalleryThemeProperties::PageCreated( USHORT nId, SfxTabPage &rPage )
+void GalleryThemeProperties::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
if( RID_SVXTABPAGE_GALLERY_GENERAL == nId )
( (TPGalleryThemeGeneral&) rPage ).SetXChgData( pData );
@@ -675,7 +675,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
String aObjStr( CUI_RES( RID_SVXSTR_GALLERYPROPS_OBJECT ) );
String aAccess;
String aType( CUI_RES( RID_SVXSTR_GALLERYPROPS_GALTHEME ) );
- BOOL bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
+ sal_Bool bReadOnly = pThm->IsReadOnly() && !pThm->IsImported();
aEdtMSName.SetHelpId( HID_GALLERY_EDIT_MSNAME );
aEdtMSName.SetText( pThm->GetName() );
@@ -713,7 +713,7 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
aFtMSShowChangeDate.SetText( aAccess );
// Image setzen
- USHORT nId;
+ sal_uInt16 nId;
if( pThm->IsImported() )
nId = RID_SVXBMP_THEME_IMPORTED_BIG;
@@ -729,10 +729,10 @@ void TPGalleryThemeGeneral::SetXChgData( ExchangeData* _pData )
// ------------------------------------------------------------------------
-BOOL TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ )
+sal_Bool TPGalleryThemeGeneral::FillItemSet( SfxItemSet& /*rSet*/ )
{
pData->aEditedTitle = aEdtMSName.GetText();
- return TRUE;
+ return sal_True;
}
// ------------------------------------------------------------------------
@@ -758,9 +758,9 @@ TPGalleryThemeProperties::TPGalleryThemeProperties( Window* pWindow, const SfxIt
aWndPreview ( this, CUI_RES( WND_BRSPRV ) ),
nCurFilterPos (0),
nFirstExtFilterPos (0),
- bEntriesFound (FALSE),
- bInputAllowed (TRUE),
- bSearchRecursive (FALSE),
+ bEntriesFound (sal_False),
+ bInputAllowed (sal_True),
+ bSearchRecursive (sal_False),
xDialogListener ( new ::svt::DialogClosedListener() )
{
FreeResource();
@@ -858,7 +858,7 @@ void TPGalleryThemeProperties::FillFilterList()
FilterEntry* pFilterEntry;
FilterEntry* pTestEntry;
sal_uInt16 i, nKeyCount;
- BOOL bInList;
+ sal_Bool bInList;
// graphic filters
for( i = 0, nKeyCount = pFilter->GetImportFormatCount(); i < nKeyCount; i++ )
@@ -866,12 +866,12 @@ void TPGalleryThemeProperties::FillFilterList()
aExt = pFilter->GetImportFormatShortName( i );
aName = pFilter->GetImportFormatName( i );
pTestEntry = (FilterEntry*) aFilterEntryList.First();
- bInList = FALSE;
+ bInList = sal_False;
String aExtensions;
int j = 0;
String sWildcard;
- while( TRUE )
+ while( sal_True )
{
sWildcard = pFilter->GetImportWildcard( i, j++ );
if ( !sWildcard.Len() )
@@ -889,7 +889,7 @@ void TPGalleryThemeProperties::FillFilterList()
{
if ( pTestEntry->aFilterName == aExt )
{
- bInList = TRUE;
+ bInList = sal_True;
break;
}
pTestEntry = (FilterEntry*) aFilterEntryList.Next();
@@ -932,7 +932,7 @@ void TPGalleryThemeProperties::FillFilterList()
{
int j = 0;
String sWildcard;
- while( TRUE )
+ while( sal_True )
{
sWildcard = pFilter->GetImportWildcard( i, j++ );
if ( !sWildcard.Len() )
@@ -1113,7 +1113,7 @@ void TPGalleryThemeProperties::DoPreview()
if( aString != aPreviewString )
{
INetURLObject _aURL( *aFoundList.GetObject( aLbxFound.GetEntryPos( aString ) ) );
- bInputAllowed = FALSE;
+ bInputAllowed = sal_False;
if ( !aWndPreview.SetGraphic( _aURL ) )
{
@@ -1128,7 +1128,7 @@ void TPGalleryThemeProperties::DoPreview()
xMediaPlayer->start();
}
- bInputAllowed = TRUE;
+ bInputAllowed = sal_True;
aPreviewString = aString;
}
}
@@ -1152,7 +1152,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeHdl, void*, EMPTYARG )
}
else
{
- bTakeAll = FALSE;
+ bTakeAll = sal_False;
TakeFiles();
}
}
@@ -1167,7 +1167,7 @@ IMPL_LINK( TPGalleryThemeProperties, ClickTakeAllHdl, void *, EMPTYARG )
if( bInputAllowed )
{
aPreviewTimer.Stop();
- bTakeAll = TRUE;
+ bTakeAll = sal_True;
TakeFiles();
}
@@ -1180,7 +1180,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG )
{
if( bInputAllowed )
{
- BOOL bPreviewPossible = FALSE;
+ sal_Bool bPreviewPossible = sal_False;
aPreviewTimer.Stop();
@@ -1189,7 +1189,7 @@ IMPL_LINK( TPGalleryThemeProperties, SelectFoundHdl, void *, EMPTYARG )
if( aLbxFound.GetSelectEntryCount() == 1 )
{
aCbxPreview.Enable();
- bPreviewPossible = TRUE;
+ bPreviewPossible = sal_True;
}
else
aCbxPreview.Disable();
@@ -1240,14 +1240,14 @@ IMPL_LINK( TPGalleryThemeProperties, EndSearchProgressHdl, SearchProgress *, EMP
aLbxFound.SelectEntryPos( 0 );
aBtnTakeAll.Enable();
aCbxPreview.Enable();
- bEntriesFound = TRUE;
+ bEntriesFound = sal_True;
}
else
{
aLbxFound.InsertEntry( String( CUI_RES( RID_SVXSTR_GALLERY_NOFILES ) ) );
aBtnTakeAll.Disable();
aCbxPreview.Disable();
- bEntriesFound = FALSE;
+ bEntriesFound = sal_False;
}
return 0L;
}
diff --git a/cui/source/dialogs/cuigrfflt.cxx b/cui/source/dialogs/cuigrfflt.cxx
index 8bbbfb5f8df2..572cb56c4512 100644
--- a/cui/source/dialogs/cuigrfflt.cxx
+++ b/cui/source/dialogs/cuigrfflt.cxx
@@ -44,10 +44,10 @@
// - SvxGraphicFilter -
// --------------------
/*
-ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
+sal_uLong SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject )
{
const Graphic& rGraphic = rFilterObject.GetGraphic();
- ULONG nRet;
+ sal_uLong nRet;
if( rGraphic.GetType() == GRAPHIC_BITMAP )
{
@@ -61,7 +61,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_INVERT ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -79,14 +79,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SMOOTH ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -104,14 +104,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SHARPEN ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -129,14 +129,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_REMOVENOISE ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -154,14 +154,14 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_SOBEL ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -179,13 +179,13 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
case( SID_GRFFILTER_MOSAIC ):
{
- GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, FALSE );
+ GraphicFilterMosaic aDlg( pWindow, rGraphic, 4, 4, sal_False );
if( aDlg.Execute() == RET_OK )
aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -213,7 +213,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_POPART ):
{
if( pShell )
- pShell->SetWaitCursor( TRUE );
+ pShell->SetWaitCursor( sal_True );
if( rGraphic.IsAnimated() )
{
@@ -231,7 +231,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
}
if( pShell )
- pShell->SetWaitCursor( FALSE );
+ pShell->SetWaitCursor( sal_False );
}
break;
@@ -246,7 +246,7 @@ ULONG SvxGraphicFilter::ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& r
case( SID_GRFFILTER_SOLARIZE ):
{
- GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, FALSE );
+ GraphicFilterSolarize aDlg( pWindow, rGraphic, 128, sal_False );
if( aDlg.Execute() == RET_OK )
aGraphic = aDlg.GetFilteredGraphic( rGraphic, 1.0, 1.0 );
@@ -446,7 +446,7 @@ IMPL_LINK( GraphicFilterDialog, ImplModifyHdl, void*, EMPTYARG )
// ----------------
GraphicFilterMosaic::GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges ) :
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges ) :
GraphicFilterDialog( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_MOSAIC ), rGraphic ),
maFtWidth ( this, CUI_RES( DLG_FILTERMOSAIC_FT_WIDTH ) ),
maMtrWidth ( this, CUI_RES( DLG_FILTERMOSAIC_MTR_WIDTH ) ),
@@ -519,7 +519,7 @@ Graphic GraphicFilterMosaic::GetFilteredGraphic( const Graphic& rGraphic,
// ------------------
GraphicFilterSolarize::GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
- BYTE cGreyThreshold, BOOL bInvert ) :
+ sal_uInt8 cGreyThreshold, sal_Bool bInvert ) :
GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SOLARIZE ), rGraphic ),
maFtThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_FT_THRESHOLD ) ),
maMtrThreshold ( this, CUI_RES( DLG_FILTERSOLARIZE_MTR_THRESHOLD ) ),
@@ -583,7 +583,7 @@ Graphic GraphicFilterSolarize::GetFilteredGraphic( const Graphic& rGraphic,
// ----------------------
GraphicFilterSepia::GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
- USHORT nSepiaPercent ) :
+ sal_uInt16 nSepiaPercent ) :
GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_SEPIA ), rGraphic ),
maFtSepia ( this, CUI_RES( DLG_FILTERSEPIA_FT_SEPIA ) ),
maMtrSepia ( this, CUI_RES( DLG_FILTERSEPIA_MTR_SEPIA ) )
@@ -633,7 +633,7 @@ Graphic GraphicFilterSepia::GetFilteredGraphic( const Graphic& rGraphic,
// -----------------------
GraphicFilterPoster::GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
- USHORT nPosterCount ) :
+ sal_uInt16 nPosterCount ) :
GraphicFilterDialog ( pParent, CUI_RES( RID_SVX_GRFFILTER_DLG_POSTER ), rGraphic ),
maFtPoster ( this, CUI_RES( DLG_FILTERPOSTER_FT_POSTER ) ),
maNumPoster ( this, CUI_RES( DLG_FILTERPOSTER_NUM_POSTER ) )
@@ -659,7 +659,7 @@ Graphic GraphicFilterPoster::GetFilteredGraphic( const Graphic& rGraphic,
double /*fScaleX*/, double /*fScaleY*/ )
{
Graphic aRet;
- const USHORT nPosterCount = GetPosterColorCount();
+ const sal_uInt16 nPosterCount = GetPosterColorCount();
if( rGraphic.IsAnimated() )
{
@@ -719,7 +719,7 @@ Graphic GraphicFilterEmboss::GetFilteredGraphic( const Graphic& rGraphic,
double /*fScaleX*/, double /*fScaleY*/ )
{
Graphic aRet;
- USHORT nAzim, nElev;
+ sal_uInt16 nAzim, nElev;
switch( maCtlLight.GetActualRP() )
{
diff --git a/cui/source/dialogs/cuihyperdlg.cxx b/cui/source/dialogs/cuihyperdlg.cxx
index 94477b6ef3dc..f394ba629af2 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -48,7 +48,7 @@ using ::com::sun::star::frame::XFrame;
//# #
//########################################################################
-SvxHlinkCtrl::SvxHlinkCtrl( USHORT _nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg )
+SvxHlinkCtrl::SvxHlinkCtrl( sal_uInt16 _nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg )
: SfxControllerItem ( _nId, rBindings )
,aOnlineForwarder ( SID_INTERNET_ONLINE , *this )
,aRdOnlyForwarder ( SID_READONLY_MODE, *this )
@@ -56,7 +56,7 @@ SvxHlinkCtrl::SvxHlinkCtrl( USHORT _nId, SfxBindings & rBindings, SvxHpLinkDlg*
pParent = pDlg;
}
-void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState,
+void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState )
{
if ( eState == SFX_ITEM_AVAILABLE )
@@ -75,7 +75,7 @@ void SvxHlinkCtrl::StateChanged( USHORT nSID, SfxItemState eState,
break;
case SID_READONLY_MODE :
{
- pParent->SetReadOnlyMode( ( (SfxBoolItem*)pState)->GetValue() == TRUE );
+ pParent->SetReadOnlyMode( ( (SfxBoolItem*)pState)->GetValue() == sal_True );
}
break;
}
@@ -146,7 +146,7 @@ SvxHpLinkDlg::SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings)
SetInputSet (mpItemSet);
// Init Dialog
- Start (FALSE);
+ Start (sal_False);
pBindings->Update( SID_READONLY_MODE );
@@ -173,12 +173,12 @@ SvxHpLinkDlg::~SvxHpLinkDlg ()
|*
|************************************************************************/
-BOOL SvxHpLinkDlg::Close()
+sal_Bool SvxHpLinkDlg::Close()
{
GetDispatcher()->Execute( SID_HYPERLINK_DIALOG,
SFX_CALLMODE_ASYNCHRON |
SFX_CALLMODE_RECORD);
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -205,13 +205,13 @@ void SvxHpLinkDlg::Move()
// Size of Extrawindow
Size aExtraWndSize( pCurrentPage->GetSizeExtraWnd() );
- BOOL bDoInvalid ;
+ sal_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()) ), TRUE );
+ bDoInvalid = pCurrentPage->MoveToExtraWnd( Point( 1, long(1.1*aDlgPos.Y()) ), sal_True );
}
else
{
@@ -305,9 +305,9 @@ IMPL_LINK ( SvxHpLinkDlg, ClickCloseHdl_Impl, void *, EMPTYARG )
|*
|************************************************************************/
-USHORT SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
+sal_uInt16 SvxHpLinkDlg::SetPage ( SvxHyperlinkItem* pItem )
{
- USHORT nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
+ sal_uInt16 nPageId = RID_SVXPAGE_HYPERLINK_INTERNET;
String aStrURL ( pItem->GetURL() );
INetURLObject aURL ( aStrURL );
@@ -401,7 +401,7 @@ void SvxHpLinkDlg::SetReadOnlyMode( sal_Bool bRdOnly )
|*
|************************************************************************/
-void SvxHpLinkDlg::PageCreated( USHORT /*nId*/, IconChoicePage& rPage )
+void SvxHpLinkDlg::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& rPage )
{
SvxHyperlinkTabPageBase& rHyperlinkPage = dynamic_cast< SvxHyperlinkTabPageBase& >( rPage );
Reference< XFrame > xDocumentFrame;
diff --git a/cui/source/dialogs/cuitbxform.cxx b/cui/source/dialogs/cuitbxform.cxx
index e3115875fab2..f7a30c9637e3 100644
--- a/cui/source/dialogs/cuitbxform.cxx
+++ b/cui/source/dialogs/cuitbxform.cxx
@@ -58,7 +58,7 @@ FmInputRecordNoDialog::FmInputRecordNoDialog(Window * pParent)
{
m_aRecordNo.SetMin(1);
m_aRecordNo.SetMax(0x7FFFFFFF);
- m_aRecordNo.SetStrictFormat(TRUE);
+ m_aRecordNo.SetStrictFormat(sal_True);
m_aRecordNo.SetDecimalDigits(0);
FreeResource();
diff --git a/cui/source/dialogs/dlgname.cxx b/cui/source/dialogs/dlgname.cxx
index c5bf6d8ffa39..0fd1b4275eb4 100644
--- a/cui/source/dialogs/dlgname.cxx
+++ b/cui/source/dialogs/dlgname.cxx
@@ -216,7 +216,7 @@ IMPL_LINK_INLINE_END( SvxMessDialog, Button2Hdl, Button *, EMPTYARG )
/*************************************************************************/
-void SvxMessDialog::SetButtonText( USHORT nBtnId, const String& rNewTxt )
+void SvxMessDialog::SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt )
{
switch ( nBtnId )
{
diff --git a/cui/source/dialogs/hangulhanjadlg.cxx b/cui/source/dialogs/hangulhanjadlg.cxx
index 169c88aebe71..5a7490b174ca 100644
--- a/cui/source/dialogs/hangulhanjadlg.cxx
+++ b/cui/source/dialogs/hangulhanjadlg.cxx
@@ -51,7 +51,7 @@
#include <comphelper/processfactory.hxx>
#define HHC editeng::HangulHanjaConversion
-#define LINE_CNT static_cast< USHORT >(2)
+#define LINE_CNT static_cast< sal_uInt16 >(2)
//.............................................................................
namespace svx
@@ -118,7 +118,7 @@ namespace svx
PseudoRubyText( const String& _rPrimary, const String& _rSecondary, const RubyPosition _ePosition );
public:
- void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, USHORT _nTextStyle,
+ void Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle,
Rectangle* _pPrimaryLocation = NULL, Rectangle* _pSecondaryLocation = NULL,
::vcl::ControlLayoutData* _pLayoutData = NULL );
};
@@ -132,7 +132,7 @@ namespace svx
}
//-------------------------------------------------------------------------
- void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, USHORT _nTextStyle,
+ void PseudoRubyText::Paint( OutputDevice& _rDevice, const Rectangle& _rRect, sal_uInt16 _nTextStyle,
Rectangle* _pPrimaryLocation, Rectangle* _pSecondaryLocation, ::vcl::ControlLayoutData* _pLayoutData )
{
bool bLayoutOnly = NULL != _pLayoutData;
@@ -204,7 +204,7 @@ namespace svx
// now draw the texts
// as we already calculated the precise rectangles for the texts, we don't want to
// use the alignment flags given - within it's rect, every text is centered
- USHORT nDrawTextStyle( _nTextStyle );
+ sal_uInt16 nDrawTextStyle( _nTextStyle );
nDrawTextStyle &= ~( TEXT_DRAW_RIGHT | TEXT_DRAW_LEFT | TEXT_DRAW_BOTTOM | TEXT_DRAW_TOP );
nDrawTextStyle |= TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER;
@@ -267,7 +267,7 @@ namespace svx
++aTextRect.Top(); --aTextRect.Bottom();
// calculate the text flags for the painting
- USHORT nTextStyle = TEXT_DRAW_MNEMONIC;
+ sal_uInt16 nTextStyle = TEXT_DRAW_MNEMONIC;
WinBits nStyle = GetStyle( );
// the horizontal alignment
@@ -337,7 +337,7 @@ namespace svx
{
OutputDevice* pDev = rUDEvt.GetDevice();
Rectangle aRect = rUDEvt.GetRect();
- USHORT nItemId = rUDEvt.GetItemId();
+ sal_uInt16 nItemId = rUDEvt.GetItemId();
String sText = *static_cast< String* >( GetItemData( nItemId ) );
pDev->DrawText( aRect, sText, TEXT_DRAW_CENTER | TEXT_DRAW_VCENTER );
@@ -345,7 +345,7 @@ namespace svx
void SuggestionSet::ClearSet()
{
- USHORT i, nCount = GetItemCount();
+ sal_uInt16 i, nCount = GetItemCount();
for ( i = 0; i < nCount; ++i )
delete static_cast< String* >( GetItemData(i) );
Clear();
@@ -441,7 +441,7 @@ namespace svx
if( m_bDisplayListBox != bDisplayListBox )
{
Control& rOldControl = implGetCurrentControl();
- BOOL bHasFocus = rOldControl.HasFocus();
+ sal_Bool bHasFocus = rOldControl.HasFocus();
m_bDisplayListBox = bDisplayListBox;
@@ -463,12 +463,12 @@ namespace svx
m_bInSelectionUpdate = true;
if(pControl==&m_aListBox)
{
- USHORT nPos = m_aListBox.GetSelectEntryPos();
+ sal_uInt16 nPos = m_aListBox.GetSelectEntryPos();
m_aValueSet.SelectItem( nPos+1 ); //itemid == pos+1 (id 0 has special meaning)
}
else
{
- USHORT nPos = m_aValueSet.GetSelectItemId()-1; //itemid == pos+1 (id 0 has special meaning)
+ sal_uInt16 nPos = m_aValueSet.GetSelectItemId()-1; //itemid == pos+1 (id 0 has special meaning)
m_aListBox.SelectEntryPos( nPos );
}
m_bInSelectionUpdate = false;
@@ -487,21 +487,21 @@ namespace svx
}
void SuggestionDisplay::InsertEntry( const XubString& rStr )
{
- USHORT nItemId = m_aListBox.InsertEntry( rStr ) + 1; //itemid == pos+1 (id 0 has special meaning)
+ sal_uInt16 nItemId = m_aListBox.InsertEntry( rStr ) + 1; //itemid == pos+1 (id 0 has special meaning)
m_aValueSet.InsertItem( nItemId );
String* pItemData = new String(rStr);
m_aValueSet.SetItemData( nItemId, pItemData );
}
- void SuggestionDisplay::SelectEntryPos( USHORT nPos )
+ void SuggestionDisplay::SelectEntryPos( sal_uInt16 nPos )
{
m_aListBox.SelectEntryPos( nPos );
m_aValueSet.SelectItem( nPos+1 ); //itemid == pos+1 (id 0 has special meaning)
}
- USHORT SuggestionDisplay::GetEntryCount() const
+ sal_uInt16 SuggestionDisplay::GetEntryCount() const
{
return m_aListBox.GetEntryCount();
}
- XubString SuggestionDisplay::GetEntry( USHORT nPos ) const
+ XubString SuggestionDisplay::GetEntry( sal_uInt16 nPos ) const
{
return m_aListBox.GetEntry( nPos );
}
@@ -754,9 +754,9 @@ namespace svx
pOtherBox = &m_aHangulOnly;
if (pBox && pOtherBox)
{
- BOOL bBoxChecked = pBox->IsChecked();
+ sal_Bool bBoxChecked = pBox->IsChecked();
if (bBoxChecked)
- pOtherBox->Check( FALSE );
+ pOtherBox->Check( sal_False );
pOtherBox->Enable( !bBoxChecked );
}
@@ -865,10 +865,10 @@ namespace svx
HHC::ConversionDirection _ePrimaryConversionDirection )
{
// default state: try both direction
- m_aHangulOnly.Check( FALSE );
- m_aHangulOnly.Enable( TRUE );
- m_aHanjaOnly.Check( FALSE );
- m_aHanjaOnly.Enable( TRUE );
+ m_aHangulOnly.Check( sal_False );
+ m_aHangulOnly.Enable( sal_True );
+ m_aHanjaOnly.Check( sal_False );
+ m_aHanjaOnly.Enable( sal_True );
if (!_bTryBothDirections)
{
@@ -1109,7 +1109,7 @@ namespace svx
IMPL_LINK( HangulHanjaOptionsDialog, DeleteDictHdl, void*, EMPTYARG )
{
- USHORT nSelPos = m_aDictsLB.GetSelectEntryPos();
+ sal_uInt16 nSelPos = m_aDictsLB.GetSelectEntryPos();
if( nSelPos != LISTBOX_ENTRY_NOTFOUND )
{
Reference< XConversionDictionary > xDic( m_aDictList[ nSelPos ] );
@@ -1486,8 +1486,8 @@ namespace svx
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
const KeyCode& rKeyCode = pKEvt->GetKeyCode();
- USHORT nMod = rKeyCode.GetModifier();
- USHORT nCode = rKeyCode.GetCode();
+ sal_uInt16 nMod = rKeyCode.GetModifier();
+ sal_uInt16 nCode = rKeyCode.GetCode();
if( nCode == KEY_TAB && ( !nMod || KEY_SHIFT == nMod ) )
{
bool bUp = KEY_SHIFT == nMod;
@@ -1870,7 +1870,7 @@ namespace svx
aName = xDic->getName();
m_aBookLB.InsertEntry( aName );
}
- m_aBookLB.SelectEntryPos( USHORT( _nSelDict ) );
+ m_aBookLB.SelectEntryPos( sal_uInt16( _nSelDict ) );
FreeResource();
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 1015063b05e3..483f36a9e199 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -96,7 +96,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const String& rPath, const Stri
}
if ( bIsValidURL )
{
- USHORT nPos = maLbDocTypes.GetSelectEntryPos();
+ sal_uInt16 nPos = maLbDocTypes.GetSelectEntryPos();
if ( nPos != LISTBOX_ENTRY_NOTFOUND )
aURLObject.SetExtension( ((DocumentTypeData*)maLbDocTypes.GetEntryData( nPos ))->aStrExt );
}
@@ -124,7 +124,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet&
{
// Set HC bitmaps and disable display of bitmap names.
maBtCreate.SetModeImage( Image( CUI_RES( IMG_CREATE_HC ) ), BMP_COLOR_HIGHCONTRAST );
- maBtCreate.EnableTextDisplay (FALSE);
+ maBtCreate.EnableTextDisplay (sal_False);
InitStdControls();
FreeResource();
@@ -147,7 +147,7 @@ SvxHyperlinkNewDocTp::SvxHyperlinkNewDocTp ( Window *pParent, const SfxItemSet&
SvxHyperlinkNewDocTp::~SvxHyperlinkNewDocTp ()
{
- for ( USHORT n=0; n<maLbDocTypes.GetEntryCount(); n++ )
+ for ( sal_uInt16 n=0; n<maLbDocTypes.GetEntryCount(); n++ )
{
DocumentTypeData* pTypeData = (DocumentTypeData*)
maLbDocTypes.GetEntryData ( n );
@@ -279,7 +279,7 @@ void SvxHyperlinkNewDocTp::SetInitFocus()
|*
\************************************************************************/
-BOOL SvxHyperlinkNewDocTp::AskApply()
+sal_Bool SvxHyperlinkNewDocTp::AskApply()
{
INetURLObject aINetURLObject;
sal_Bool bRet = ImplGetURLObject( maCbbPath.GetText(), maCbbPath.GetBaseURL(), aINetURLObject );
@@ -348,7 +348,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
if ( aStrNewName != aEmptyStr )
{
// get private-url
- USHORT nPos = maLbDocTypes.GetSelectEntryPos();
+ sal_uInt16 nPos = maLbDocTypes.GetSelectEntryPos();
if( nPos == LISTBOX_ENTRY_NOTFOUND )
nPos=0;
String aStrDocName ( ( ( DocumentTypeData* )
@@ -359,7 +359,7 @@ void SvxHyperlinkNewDocTp::DoApply ()
SfxStringItem aReferer( SID_REFERER, UniString::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) );
SfxStringItem aFrame( SID_TARGETNAME, UniString::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "_blank" ) ) );
- //SfxBoolItem aFrame( SID_OPEN_NEW_VIEW, TRUE );
+ //SfxBoolItem aFrame( SID_OPEN_NEW_VIEW, sal_True );
String aStrFlags ( sal_Unicode('S') );
if ( maRbtEditLater.IsChecked() )
@@ -429,14 +429,14 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
utl::LocalFileHelper::ConvertSystemPathToURL( aTempStrURL, maCbbPath.GetBaseURL(), aStrURL );
String aStrPath = aStrURL;
- BOOL bZeroPath = ( aStrPath.Len() == 0 );
- BOOL bHandleFileName = bZeroPath; // when path has length of 0, then the rest should always be handled
+ sal_Bool bZeroPath = ( aStrPath.Len() == 0 );
+ sal_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 = TRUE;
+ bHandleFileName = sal_True;
xFolderPicker->setDisplayDirectory( aStrPath );
DisableClose( sal_True );
@@ -467,7 +467,7 @@ IMPL_LINK ( SvxHyperlinkNewDocTp, ClickNewHdl_Impl, void *, EMPTYARG )
maLbDocTypes.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND )
{
// get private-url
- USHORT nPos = maLbDocTypes.GetSelectEntryPos();
+ sal_uInt16 nPos = maLbDocTypes.GetSelectEntryPos();
aNewURL.setExtension( ( ( DocumentTypeData* ) maLbDocTypes.GetEntryData( nPos ) )->aStrExt );
}
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index a87d7710f484..526a44277e06 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -61,13 +61,13 @@ 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 ( FALSE )
+ mbMarkWndOpen ( sal_False )
{
// Set HC bitmaps and disable display of bitmap names.
maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
- maBtBrowse.EnableTextDisplay (FALSE);
+ maBtBrowse.EnableTextDisplay (sal_False);
maBtFileopen.SetModeImage( Image( CUI_RES( IMG_FILEOPEN_HC ) ), BMP_COLOR_HIGHCONTRAST );
- maBtFileopen.EnableTextDisplay (FALSE);
+ maBtFileopen.EnableTextDisplay (sal_False);
InitStdControls();
FreeResource();
diff --git a/cui/source/dialogs/hlinettp.cxx b/cui/source/dialogs/hlinettp.cxx
index 79fde6c7a64c..9aefda6b44bb 100644
--- a/cui/source/dialogs/hlinettp.cxx
+++ b/cui/source/dialogs/hlinettp.cxx
@@ -68,13 +68,13 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
maCbAnonymous ( this, CUI_RES (CBX_ANONYMOUS) ),
maBtBrowse ( this, CUI_RES (BTN_BROWSE) ),
maBtTarget ( this, CUI_RES (BTN_TARGET) ),
- mbMarkWndOpen ( FALSE )
+ mbMarkWndOpen ( sal_False )
{
// Set HC bitmaps and display display of bitmap names.
maBtBrowse.SetModeImage( Image( CUI_RES( IMG_BROWSE_HC ) ), BMP_COLOR_HIGHCONTRAST );
- maBtBrowse.EnableTextDisplay (FALSE);
+ maBtBrowse.EnableTextDisplay (sal_False);
maBtTarget.SetModeImage( Image( CUI_RES( IMG_TARGET_HC ) ), BMP_COLOR_HIGHCONTRAST );
- maBtTarget.EnableTextDisplay (FALSE);
+ maBtTarget.EnableTextDisplay (sal_False);
InitStdControls();
FreeResource();
@@ -103,12 +103,12 @@ SvxHyperlinkInternetTp::SvxHyperlinkInternetTp ( Window *pParent,
///////////////////////////////////////
// set defaults
maRbtLinktypInternet.Check ();
- maFtLogin.Show( FALSE );
- maFtPassword.Show( FALSE );
- maEdLogin.Show( FALSE );
- maEdPassword.Show( FALSE );
- maCbAnonymous.Show( FALSE );
- maBtTarget.Enable( FALSE );
+ maFtLogin.Show( sal_False );
+ maFtPassword.Show( sal_False );
+ maEdLogin.Show( sal_False );
+ maEdPassword.Show( sal_False );
+ maCbAnonymous.Show( sal_False );
+ maBtTarget.Enable( sal_False );
maBtBrowse.Enable( maStrStdDocURL != aEmptyStr );
///////////////////////////////////////
@@ -186,7 +186,7 @@ void SvxHyperlinkInternetTp::setFTPUser(const String& rUser, const String& rPass
maFtPassword.Enable ();
maEdLogin.Enable ();
maEdPassword.Enable ();
- maCbAnonymous.Check(FALSE);
+ maCbAnonymous.Check(sal_False);
}
/*************************************************************************
@@ -304,11 +304,11 @@ void SvxHyperlinkInternetTp::SetScheme( const String& aScheme )
{
//if aScheme is empty or unknown the default beaviour is like it where HTTP
- BOOL bFTP = aScheme.SearchAscii( sFTPScheme ) == 0;
- BOOL bTelnet = FALSE;
+ sal_Bool bFTP = aScheme.SearchAscii( sFTPScheme ) == 0;
+ sal_Bool bTelnet = sal_False;
if( !bFTP )
bTelnet = aScheme.SearchAscii( sTelnetScheme ) == 0;
- BOOL bInternet = !(bFTP || bTelnet);
+ sal_Bool bInternet = !(bFTP || bTelnet);
//update protocol button selection:
maRbtLinktypFTP.Check(bFTP);
@@ -457,11 +457,11 @@ IMPL_LINK ( SvxHyperlinkInternetTp, ClickBrowseHdl_Impl, void *, EMPTYARG )
SfxStringItem aName( SID_FILE_NAME, maStrStdDocURL );
SfxStringItem aRefererItem( SID_REFERER, UniString::CreateFromAscii(
RTL_CONSTASCII_STRINGPARAM( "private:user" ) ) );
- SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, TRUE );
- SfxBoolItem aSilent( SID_SILENT, TRUE );
- SfxBoolItem aReadOnly( SID_DOC_READONLY, TRUE );
+ SfxBoolItem aNewView( SID_OPEN_NEW_VIEW, sal_True );
+ SfxBoolItem aSilent( SID_SILENT, sal_True );
+ SfxBoolItem aReadOnly( SID_DOC_READONLY, sal_True );
- SfxBoolItem aBrowse( SID_BROWSE, TRUE );
+ SfxBoolItem aBrowse( SID_BROWSE, sal_True );
const SfxPoolItem *ppItems[] = { &aName, &aNewView, &aSilent, &aReadOnly, &aRefererItem, &aBrowse, NULL };
(((SvxHpLinkDlg*)mpDialog)->GetBindings())->Execute( SID_OPENDOC, ppItems, 0, SFX_CALLMODE_ASYNCHRON | SFX_CALLMODE_RECORD );
@@ -527,7 +527,7 @@ void SvxHyperlinkInternetTp::SetMarkStr ( String& aStrMark )
|*
|************************************************************************/
-void SvxHyperlinkInternetTp::SetOnlineMode( BOOL /*bEnable*/ )
+void SvxHyperlinkInternetTp::SetOnlineMode( sal_Bool /*bEnable*/ )
{
// State of target-button in subject to the current url-string
// ( Can't display any targets in an document, if there is no
@@ -538,7 +538,7 @@ void SvxHyperlinkInternetTp::SetOnlineMode( BOOL /*bEnable*/ )
if( aStrCurrentTarget == aEmptyStr ||
aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPScheme ) ||
aStrCurrentTarget.EqualsIgnoreCaseAscii( sHTTPSScheme ) )
- maBtTarget.Enable( FALSE );
+ maBtTarget.Enable( sal_False );
else
- maBtTarget.Enable( TRUE );
+ maBtTarget.Enable( sal_True );
}
diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 5ea43e165883..a7d34283face 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -64,7 +64,7 @@ SvxHyperlinkMailTp::SvxHyperlinkMailTp ( Window *pParent, const SfxItemSet& rIte
{
// Set HC bitmaps and disable display of bitmap names.
maBtAdrBook.SetModeImage( Image( CUI_RES( IMG_ADRESSBOOK_HC ) ), BMP_COLOR_HIGHCONTRAST );
- maBtAdrBook.EnableTextDisplay (FALSE);
+ maBtAdrBook.EnableTextDisplay (sal_False);
InitStdControls();
FreeResource();
@@ -212,7 +212,7 @@ void SvxHyperlinkMailTp::SetScheme( const String& aScheme )
//if aScheme is empty or unknown the default beaviour is like it where MAIL
const sal_Char sNewsScheme[] = INET_NEWS_SCHEME;
- BOOL bMail = aScheme.SearchAscii( sNewsScheme ) != 0;
+ sal_Bool bMail = aScheme.SearchAscii( sNewsScheme ) != 0;
//update protocol button selection:
maRbtMail.Check(bMail);
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index 5d29e652a7d2..9898eff9f36b 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -63,9 +63,9 @@ using namespace ::rtl;
struct TargetData
{
OUString aUStrLinkname;
- BOOL bIsTarget;
+ sal_Bool bIsTarget;
- TargetData ( OUString aUStrLName, BOOL bTarget )
+ TargetData ( OUString aUStrLName, sal_Bool bTarget )
: bIsTarget ( bTarget )
{
if ( bIsTarget )
@@ -133,8 +133,8 @@ SvxHlinkDlgMarkWnd::SvxHlinkDlgMarkWnd( SvxHyperlinkTabPageBase *pParent )
maBtApply( this, CUI_RES (BT_APPLY) ),
maBtClose( this, CUI_RES (BT_CLOSE) ),
maLbTree ( this, CUI_RES (TLB_MARK) ),
- mbUserMoved ( FALSE ),
- mbFirst ( TRUE ),
+ mbUserMoved ( sal_False ),
+ mbFirst ( sal_True ),
mpParent ( pParent ),
mnError ( LERR_NOERROR )
{
@@ -161,9 +161,9 @@ SvxHlinkDlgMarkWnd::~SvxHlinkDlgMarkWnd()
|*
|************************************************************************/
-USHORT SvxHlinkDlgMarkWnd::SetError( USHORT nError)
+sal_uInt16 SvxHlinkDlgMarkWnd::SetError( sal_uInt16 nError)
{
- USHORT nOldError = mnError;
+ sal_uInt16 nOldError = mnError;
mnError = nError;
if( mnError != LERR_NOERROR )
@@ -180,11 +180,11 @@ USHORT SvxHlinkDlgMarkWnd::SetError( USHORT nError)
|*
|************************************************************************/
-BOOL SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos )
+sal_Bool SvxHlinkDlgMarkWnd::MoveTo ( Point aNewPos )
{
if ( !mbUserMoved )
{
- BOOL bOldStatus = mbUserMoved;
+ sal_Bool bOldStatus = mbUserMoved;
SetPosPixel ( aNewPos );
mbUserMoved = bOldStatus;
}
@@ -197,12 +197,12 @@ void SvxHlinkDlgMarkWnd::Move ()
Window::Move();
if ( IsReallyVisible() )
- mbUserMoved = TRUE;
+ mbUserMoved = sal_True;
}
-BOOL SvxHlinkDlgMarkWnd::ConnectToDialog( BOOL bDoit )
+sal_Bool SvxHlinkDlgMarkWnd::ConnectToDialog( sal_Bool bDoit )
{
- BOOL bOldStatus = mbUserMoved;
+ sal_Bool bOldStatus = mbUserMoved;
mbUserMoved = !bDoit;
@@ -249,7 +249,7 @@ void SvxHlinkDlgMarkWnd::RefreshTree ( String aStrURL )
|*
|************************************************************************/
-BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
+sal_Bool SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
{
mnError = LERR_NOERROR;
@@ -272,7 +272,7 @@ BOOL SvxHlinkDlgMarkWnd::RefreshFromDoc( OUString aURL )
{
uno::Sequence< beans::PropertyValue > aArg(1);
aArg.getArray()[0].Name = OUString::createFromAscii( "Hidden" );
- aArg.getArray()[0].Value <<= (sal_Bool) TRUE;
+ aArg.getArray()[0].Value <<= (sal_Bool) sal_True;
xComp = xLoader->loadComponentFromURL( aURL, OUString::createFromAscii( "_blank" ), 0, aArg );
}
catch( const io::IOException& )
@@ -346,19 +346,19 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
{
int nEntries=0;
const uno::Sequence< OUString > aNames( xLinks->getElementNames() );
- const ULONG nLinks = aNames.getLength();
+ const sal_uLong nLinks = aNames.getLength();
const OUString* pNames = aNames.getConstArray();
Color aMaskColor( COL_LIGHTMAGENTA );
const OUString aProp_LinkDisplayName( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayName" ) );
const OUString aProp_LinkTarget( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.LinkTarget" ) );
const OUString aProp_LinkDisplayBitmap( RTL_CONSTASCII_USTRINGPARAM( "LinkDisplayBitmap" ) );
- for( ULONG i = 0; i < nLinks; i++ )
+ for( sal_uLong i = 0; i < nLinks; i++ )
{
uno::Any aAny;
OUString aLink( *pNames++ );
- BOOL bError = FALSE;
+ sal_Bool bError = sal_False;
try
{
aAny = xLinks->getByName( aLink );
@@ -367,7 +367,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 = TRUE;
+ bError = sal_True;
}
if(bError)
continue;
@@ -386,7 +386,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
// is it a target ?
uno::Reference< lang::XServiceInfo > xSI( xTarget, uno::UNO_QUERY );
- BOOL bIsTarget = xSI->supportsService( aProp_LinkTarget );
+ sal_Bool bIsTarget = xSI->supportsService( aProp_LinkTarget );
// create userdata
TargetData *pData = new TargetData ( aLink, bIsTarget );
@@ -404,7 +404,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
pEntry = maLbTree.InsertEntry ( aStrDisplayname,
aBmp, aBmp,
pParentEntry,
- FALSE, LIST_APPEND,
+ sal_False, LIST_APPEND,
(void*)pData );
maLbTree.SetExpandedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
maLbTree.SetCollapsedEntryBmp( pEntry, aBmp, BMP_COLOR_HIGHCONTRAST );
@@ -415,7 +415,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
// insert Displayname into treelist without bitmaps
pEntry = maLbTree.InsertEntry ( aStrDisplayname,
pParentEntry,
- FALSE, LIST_APPEND,
+ sal_False, LIST_APPEND,
(void*)pData );
nEntries++;
}
@@ -425,7 +425,7 @@ int SvxHlinkDlgMarkWnd::FillTree( uno::Reference< container::XNameAccess > xLink
// insert Displayname into treelist without bitmaps
pEntry = maLbTree.InsertEntry ( aStrDisplayname,
pParentEntry,
- FALSE, LIST_APPEND,
+ sal_False, LIST_APPEND,
(void*)pData );
nEntries++;
}
@@ -472,14 +472,14 @@ void SvxHlinkDlgMarkWnd::ClearTree()
SvLBoxEntry* SvxHlinkDlgMarkWnd::FindEntry ( String aStrName )
{
- BOOL bFound=FALSE;
+ sal_Bool bFound=sal_False;
SvLBoxEntry* pEntry = maLbTree.First();
while ( pEntry && !bFound )
{
TargetData* pUserData = ( TargetData * ) pEntry->GetUserData ();
if ( aStrName == String( pUserData->aUStrLinkname ) )
- bFound = TRUE;
+ bFound = sal_True;
else
pEntry = maLbTree.Next( pEntry );
}
diff --git a/cui/source/dialogs/hltpbase.cxx b/cui/source/dialogs/hltpbase.cxx
index f9e2c3814552..28bf46ce241e 100644
--- a/cui/source/dialogs/hltpbase.cxx
+++ b/cui/source/dialogs/hltpbase.cxx
@@ -66,10 +66,10 @@ SvxFramesComboBox::SvxFramesComboBox ( Window* pParent, const ResId& rResId,
if ( pFrame )
{
pFrame->GetTargetList(*pList);
- USHORT nCount = (USHORT)pList->Count();
+ sal_uInt16 nCount = (sal_uInt16)pList->Count();
if( nCount )
{
- USHORT i;
+ sal_uInt16 i;
for ( i = 0; i < nCount; i++ )
{
InsertEntry(*pList->GetObject(i));
@@ -98,7 +98,7 @@ SvxFramesComboBox::~SvxFramesComboBox ()
|*
|************************************************************************/
-SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, BOOL bAddresses )
+SvxHyperURLBox::SvxHyperURLBox( Window* pParent, INetProtocol eSmart, sal_Bool bAddresses )
: SvtURLBox ( pParent, eSmart ),
DropTargetHelper ( this ),
mbAccessAddress (bAddresses)
@@ -140,17 +140,17 @@ Diese Methode parsed eine EMailadresse aus einem D&D-DataObjekt aus der Adre�d
#define DB_DD_DELIM ((char)11)
-String SvxHyperURLBox::GetAllEmailNamesFromDragItem( USHORT nItem )
+String SvxHyperURLBox::GetAllEmailNamesFromDragItem( sal_uInt16 nItem )
{
#if !defined( ICC ) && !defined( SOLARIS )
String aAddress;
if ( DragServer::HasFormat( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) )
{
- ULONG nLen = DragServer::GetDataLen( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) - 1;
- USHORT i = 0;
+ sal_uLong nLen = DragServer::GetDataLen( nItem, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE ) - 1;
+ sal_uInt16 i = 0;
String aTxt;
- char *pTxt = aTxt.AllocStrBuf( (USHORT)nLen );
+ char *pTxt = aTxt.AllocStrBuf( (sal_uInt16)nLen );
DragServer::PasteData( nItem, pTxt, nLen, SOT_FORMATSTR_ID_SBA_DATAEXCHANGE );
String aDBName = aTxt.GetToken( i++, DB_DD_DELIM );
String aTableName = aTxt.GetToken( i++, DB_DD_DELIM );
@@ -171,14 +171,14 @@ String SvxHyperURLBox::GetAllEmailNamesFromDragItem( USHORT nItem )
SbaSelectionListRef pSelectionList;
pSelectionList.Clear();
pSelectionList = new SbaSelectionList;
- USHORT nTokCnt = aTxt.GetTokenCount( DB_DD_DELIM );
+ sal_uInt16 nTokCnt = aTxt.GetTokenCount( DB_DD_DELIM );
for ( ; i < nTokCnt; ++i )
pSelectionList->Insert(
- (void*)(USHORT)aTxt.GetToken( i, DB_DD_DELIM ), LIST_APPEND );
+ (void*)(sal_uInt16)aTxt.GetToken( i, DB_DD_DELIM ), LIST_APPEND );
OfaDBMgr* pDBMgr = SFX_APP()->GetOfaDBMgr();
- BOOL bBasic = DBMGR_STD;
+ sal_Bool bBasic = DBMGR_STD;
if ( !pDBMgr->OpenDB( bBasic, aDBName ) )
return aAddress;
@@ -205,17 +205,17 @@ String SvxHyperURLBox::GetAllEmailNamesFromDragItem( USHORT nItem )
if ( aDBDef.Is() )
{
SbaColumn* pCol = aDBDef->GetColumn("EMAIL");
- ULONG nPos = 0;
+ sal_uLong nPos = 0;
if ( pCol )
nPos = aDBDef->GetOriginalColumns().GetPos( pCol ) + 1;
for ( i = 0 ; nPos && i < pSelectionList->Count(); ++i )
{
- ULONG nIndex = (ULONG)pSelectionList->GetObject(i);
+ sal_uLong nIndex = (sal_uLong)pSelectionList->GetObject(i);
// N"achsten zu lesenden Datensatz ansteuern
- BOOL bEnd = rParam.GetCursor()->IsOffRange();
+ sal_Bool bEnd = rParam.GetCursor()->IsOffRange();
if ( !bEnd )
{
@@ -225,7 +225,7 @@ String SvxHyperURLBox::GetAllEmailNamesFromDragItem( USHORT nItem )
if ( aRow.Is() )
{
aAddress += pDBMgr->
- ImportDBField( (USHORT)nPos, &aDBDef, aRow.getBodyPtr() );
+ ImportDBField( (sal_uInt16)nPos, &aDBDef, aRow.getBodyPtr() );
aAddress += ',';
}
else
@@ -294,7 +294,7 @@ SvxHyperlinkTabPageBase::SvxHyperlinkTabPageBase ( Window *pParent,
mpBtScript ( NULL ),
mbIsCloseDisabled ( sal_False ),
mpDialog ( pParent ),
- mbStdControlsInit ( FALSE ),
+ mbStdControlsInit ( sal_False ),
aEmptyStr()
{
// create bookmark-window
@@ -355,10 +355,10 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
mpBtScript->SetClickHdl ( LINK ( this, SvxHyperlinkTabPageBase, ClickScriptHdl_Impl ) );
mpBtScript->SetModeImage( Image( ResId( IMG_SCRIPT_HC, *m_pResMgr ) ), BMP_COLOR_HIGHCONTRAST );
- mpBtScript->EnableTextDisplay (FALSE);
+ mpBtScript->EnableTextDisplay (sal_False);
}
- mbStdControlsInit = TRUE;
+ mbStdControlsInit = sal_True;
}
/*************************************************************************
@@ -367,12 +367,12 @@ void SvxHyperlinkTabPageBase::InitStdControls ()
|*
\************************************************************************/
-BOOL SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, BOOL bDisConnectDlg )
+sal_Bool SvxHyperlinkTabPageBase::MoveToExtraWnd( Point aNewPos, sal_Bool bDisConnectDlg )
{
- BOOL bReturn = mpMarkWnd->MoveTo ( aNewPos );
+ sal_Bool bReturn = mpMarkWnd->MoveTo ( aNewPos );
if( bDisConnectDlg )
- mpMarkWnd->ConnectToDialog( FALSE );
+ mpMarkWnd->ConnectToDialog( sal_False );
return ( !bReturn && IsMarkWndVisible() );
}
@@ -405,7 +405,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
{
// Pos Extrawindow anywhere
MoveToExtraWnd( Point(10,10) ); // very unlikely
- mpMarkWnd->ConnectToDialog( FALSE );
+ mpMarkWnd->ConnectToDialog( sal_False );
}
else
{
@@ -432,7 +432,7 @@ void SvxHyperlinkTabPageBase::ShowMarkWnd ()
void SvxHyperlinkTabPageBase::FillStandardDlgFields ( SvxHyperlinkItem* pHyperlinkItem )
{
// Frame
- USHORT nPos = mpCbbFrame->GetEntryPos ( pHyperlinkItem->GetTargetFrame() );
+ sal_uInt16 nPos = mpCbbFrame->GetEntryPos ( pHyperlinkItem->GetTargetFrame() );
if ( nPos != LISTBOX_ENTRY_NOTFOUND)
mpCbbFrame->SetText ( pHyperlinkItem->GetTargetFrame() );
@@ -484,10 +484,10 @@ void SvxHyperlinkTabPageBase::DoApply ()
|*
\************************************************************************/
-BOOL SvxHyperlinkTabPageBase::AskApply ()
+sal_Bool SvxHyperlinkTabPageBase::AskApply ()
{
// default-implementation
- return TRUE;
+ return sal_True;
}
/*************************************************************************
@@ -508,7 +508,7 @@ void SvxHyperlinkTabPageBase::SetMarkStr ( String& /*aStrMark*/ )
|*
\************************************************************************/
-void SvxHyperlinkTabPageBase::SetOnlineMode( BOOL /*bEnable*/ )
+void SvxHyperlinkTabPageBase::SetOnlineMode( sal_Bool /*bEnable*/ )
{
// default-implemtation : do nothing
}
@@ -530,7 +530,7 @@ void SvxHyperlinkTabPageBase::SetInitFocus()
|*
|************************************************************************/
-BOOL SvxHyperlinkTabPageBase::IsHTMLDoc() const
+sal_Bool SvxHyperlinkTabPageBase::IsHTMLDoc() const
{
return ((SvxHpLinkDlg*)mpDialog)->IsHTMLDoc();
}
@@ -576,9 +576,9 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
because if no JAVA is installed an error box occurs and then it is possible
to close the HyperLinkDlg before its child (MacroAssignDlg) -> GPF
*/
- BOOL bIsInputEnabled = GetParent()->IsInputEnabled();
+ sal_Bool bIsInputEnabled = GetParent()->IsInputEnabled();
if ( bIsInputEnabled )
- GetParent()->EnableInput( FALSE );
+ GetParent()->EnableInput( sal_False );
// <--
SfxMacroAssignDlg aDlg( this, mxDocumentFrame, *pItemSet );
@@ -597,7 +597,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
// --> PB 2006-01-13 #123474#
if ( bIsInputEnabled )
- GetParent()->EnableInput( TRUE );
+ GetParent()->EnableInput( sal_True );
// <--
// execute dlg
DisableClose( sal_True );
@@ -607,7 +607,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
{
const SfxItemSet* pOutSet = aDlg.GetOutputItemSet();
const SfxPoolItem* pItem;
- if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, FALSE, &pItem ))
+ if( SFX_ITEM_SET == pOutSet->GetItemState( SID_ATTR_MACROITEM, sal_False, &pItem ))
{
pHyperlinkItem->SetMacroTable( ((SvxMacroItem*)pItem)->GetMacroTable() );
}
@@ -624,7 +624,7 @@ IMPL_LINK ( SvxHyperlinkTabPageBase, ClickScriptHdl_Impl, void *, EMPTYARG )
|*
|************************************************************************/
-USHORT SvxHyperlinkTabPageBase::GetMacroEvents()
+sal_uInt16 SvxHyperlinkTabPageBase::GetMacroEvents()
{
SvxHyperlinkItem *pHyperlinkItem = (SvxHyperlinkItem *)
GetItemSet().GetItem (SID_HYPERLINK_GETLINK);
@@ -646,9 +646,9 @@ SvxMacroTableDtor* SvxHyperlinkTabPageBase::GetMacroTable()
|*
|************************************************************************/
-BOOL SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
+sal_Bool SvxHyperlinkTabPageBase::FileExists( const INetURLObject& rURL )
{
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if( rURL.GetFull().getLength() > 0 )
{
@@ -727,7 +727,7 @@ void SvxHyperlinkTabPageBase::GetDataFromCommonFields( String& aStrName,
aStrFrame = mpCbbFrame->GetText();
eMode = (SvxLinkInsertMode) (mpLbForm->GetSelectEntryPos()+1);
if( IsHTMLDoc() )
- eMode = (SvxLinkInsertMode) ( UINT16(eMode) | HLINK_HTMLMODE );
+ eMode = (SvxLinkInsertMode) ( sal_uInt16(eMode) | HLINK_HTMLMODE );
}
/*************************************************************************
@@ -764,7 +764,7 @@ void SvxHyperlinkTabPageBase::Reset( const SfxItemSet& rItemSet)
|*
|************************************************************************/
-BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
+sal_Bool SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
{
String aStrURL, aStrName, aStrIntName, aStrFrame;
SvxLinkInsertMode eMode;
@@ -773,14 +773,14 @@ BOOL SvxHyperlinkTabPageBase::FillItemSet( SfxItemSet& rOut)
if ( !aStrName.Len() ) //automatically create a visible name if the link is created without name
aStrName = CreateUiNameFromURL(aStrURL);
- USHORT nEvents = GetMacroEvents();
+ sal_uInt16 nEvents = GetMacroEvents();
SvxMacroTableDtor* pTable = GetMacroTable();
SvxHyperlinkItem aItem( SID_HYPERLINK_SETLINK, aStrName, aStrURL, aStrFrame,
aStrIntName, eMode, nEvents, pTable );
rOut.Put (aItem);
- return TRUE;
+ return sal_True;
}
String SvxHyperlinkTabPageBase::CreateUiNameFromURL( const String& aStrURL )
@@ -847,7 +847,7 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet)
GetCurentItemData ( aStrURL, aStrName, aStrIntName, aStrFrame, eMode);
- USHORT nEvents = GetMacroEvents();
+ sal_uInt16 nEvents = GetMacroEvents();
SvxMacroTableDtor* pTable = GetMacroTable();
if( _pSet )
@@ -860,11 +860,11 @@ int SvxHyperlinkTabPageBase::DeactivatePage( SfxItemSet* _pSet)
return( LEAVE_PAGE );
}
-BOOL SvxHyperlinkTabPageBase::ShouldOpenMarkWnd()
+sal_Bool SvxHyperlinkTabPageBase::ShouldOpenMarkWnd()
{
- return FALSE;
+ return sal_False;
}
-void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(BOOL)
+void SvxHyperlinkTabPageBase::SetMarkWndShouldOpen(sal_Bool)
{
}
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index a9356704e503..67fb03eaa5f3 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -55,7 +55,7 @@ int IconcDlgCmpUS_Impl( const void* p1, const void* p2 )
#endif
#endif
{
- return *(USHORT*)p1 - *(USHORT*)p2;
+ return *(sal_uInt16*)p1 - *(sal_uInt16*)p2;
}
// some stuff for easier changes for SvtViewOptions
@@ -93,9 +93,9 @@ IconChoicePage::IconChoicePage( Window *pParent, const ResId &rResId,
const SfxItemSet &rAttrSet )
: TabPage ( pParent, rResId ),
pSet ( &rAttrSet ),
- bHasExchangeSupport ( FALSE ),
+ bHasExchangeSupport ( sal_False ),
pDialog ( NULL ),
- bStandard ( FALSE )
+ bStandard ( sal_False )
{
SetStyle ( GetStyle() | WB_DIALOGCONTROL | WB_HIDE );
}
@@ -135,9 +135,9 @@ void IconChoicePage::FillUserData()
// -----------------------------------------------------------------------
-BOOL IconChoicePage::IsReadOnly() const
+sal_Bool IconChoicePage::IsReadOnly() const
{
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------
@@ -158,16 +158,16 @@ void IconChoicePage::ImplInitSettings()
Window* pParent = GetParent();
if ( pParent->IsChildTransparentModeEnabled() && !IsControlBackground() )
{
- EnableChildTransparentMode( TRUE );
+ EnableChildTransparentMode( sal_True );
SetParentClipMode( PARENTCLIPMODE_NOCLIP );
- SetPaintTransparent( TRUE );
+ SetPaintTransparent( sal_True );
SetBackground();
}
else
{
- EnableChildTransparentMode( FALSE );
+ EnableChildTransparentMode( sal_False );
SetParentClipMode( 0 );
- SetPaintTransparent( FALSE );
+ SetPaintTransparent( sal_False );
if ( IsControlBackground() )
SetBackground( GetControlBackground() );
@@ -217,7 +217,7 @@ void IconChoicePage::DataChanged( const DataChangedEvent& rDCEvt )
IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
const EIconChoicePos ePos,
- const SfxItemSet *pItemSet )//, BOOL bEditFmt, const String *pUserButtonText = 0 )
+ const SfxItemSet *pItemSet )//, sal_Bool bEditFmt, const String *pUserButtonText = 0 )
: ModalDialog ( pParent, rResId ),
meChoicePos ( ePos ),
maIconCtrl ( this, WB_3DLOOK | WB_ICON | WB_BORDER |
@@ -235,11 +235,11 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
pRanges ( NULL ),
nResId ( rResId.GetId() ),
- bHideResetBtn ( FALSE ),
- bModal ( FALSE ),
- bInOK ( FALSE ),
- bModified ( FALSE ),
- bItemsReset ( FALSE )
+ bHideResetBtn ( sal_False ),
+ bModal ( sal_False ),
+ bInOK ( sal_False ),
+ bModified ( sal_False ),
+ bItemsReset ( sal_False )
{
// IconChoiceCtrl-Settings
//maIconCtrl.SetBackground ( Wallpaper( Color (146, 146, 186) ) );
@@ -248,7 +248,7 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
SetCtrlPos ( meChoicePos );
maIconCtrl.SetClickHdl ( LINK ( this, IconChoiceDialog , ChosePageHdl_Impl ) );
maIconCtrl.Show();
- maIconCtrl.SetChoiceWithCursor ( TRUE );
+ maIconCtrl.SetChoiceWithCursor ( sal_True );
maIconCtrl.SetSelectionMode( SINGLE_SELECTION );
maIconCtrl.SetHelpId( HID_ICCDIALOG_CHOICECTRL );
@@ -271,14 +271,14 @@ IconChoiceDialog::IconChoiceDialog ( Window* pParent, const ResId &rResId,
aHelpBtn.Show();
aResetBtn.Show();
- SetPosSizeCtrls ( TRUE );
+ SetPosSizeCtrls ( sal_True );
}
// -----------------------------------------------------------------------
/*
IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent, const ResId &rResId,
- const SfxItemSet * = 0, BOOL bEditFmt = FALSE,
+ const SfxItemSet * = 0, sal_Bool bEditFmt = sal_False,
const String *pUserButtonText = 0 )
: meChoicePos ( PosLeft ), // Default erst ma Links
maIconCtrl ( this, Die_Winbits ),
@@ -298,7 +298,7 @@ IconChoiceDialog ::IconChoiceDialog ( SfxViewFrame *pViewFrame, Window* pParent,
IconChoiceDialog ::~IconChoiceDialog ()
{
- ULONG i;
+ sal_uLong i;
// save configuration at INI-Manager
// and remove pages
@@ -306,7 +306,7 @@ IconChoiceDialog ::~IconChoiceDialog ()
aTabDlgOpt.SetWindowState( ::rtl::OUString::createFromAscii( GetWindowState((WINDOWSTATE_MASK_X | WINDOWSTATE_MASK_Y | WINDOWSTATE_MASK_STATE | WINDOWSTATE_MASK_MINIMIZED)).GetBuffer() ) );
aTabDlgOpt.SetPageID( mnCurrentPageId );
- const ULONG nCount = maPageList.Count();
+ const sal_uLong nCount = maPageList.Count();
for ( i = 0; i < nCount; ++i )
{
@@ -334,7 +334,7 @@ IconChoiceDialog ::~IconChoiceDialog ()
for ( i=0; i<maIconCtrl.GetEntryCount(); i++)
{
SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
- USHORT* pUserData = (USHORT*) pEntry->GetUserData();
+ sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData();
delete pUserData;
}
@@ -351,12 +351,12 @@ IconChoiceDialog ::~IconChoiceDialog ()
|
\**********************************************************************/
-SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String& rIconText,
+SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( sal_uInt16 nId, const String& rIconText,
const Image& rChoiceIcon,
const Image& rChoiceIconHC,
CreatePage pCreateFunc /* != 0 */,
GetPageRanges pRangesFunc /* darf 0 sein */,
- BOOL bItemsOnDemand, ULONG /*nPos*/ )
+ sal_Bool bItemsOnDemand, sal_uLong /*nPos*/ )
{
IconChoicePageData* pData = new IconChoicePageData ( nId, pCreateFunc,
pRangesFunc,
@@ -366,7 +366,7 @@ SvxIconChoiceCtrlEntry* IconChoiceDialog::AddTabPage( USHORT nId, const String&
pData->fnGetRanges = pRangesFunc;
pData->bOnDemand = bItemsOnDemand;
- USHORT *pId = new USHORT ( nId );
+ sal_uInt16 *pId = new sal_uInt16 ( nId );
SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.InsertEntry( rIconText, rChoiceIcon, rChoiceIconHC );
pEntry->SetUserData ( (void*) pId );
return pEntry;
@@ -382,7 +382,7 @@ void IconChoiceDialog::Paint( const Rectangle& rRect )
{
Dialog::Paint ( rRect );
- for ( ULONG i=0; i<maPageList.Count(); i++ )
+ for ( sal_uLong i=0; i<maPageList.Count(); i++ )
{
IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i );
@@ -453,7 +453,7 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData )
// -----------------------------------------------------------------------
-void IconChoiceDialog::ShowPage( USHORT nId )
+void IconChoiceDialog::ShowPage( sal_uInt16 nId )
{
bool bInvalidate = GetCurPageId() != nId;
SetCurPageId( nId );
@@ -483,7 +483,7 @@ void IconChoiceDialog::Resize()
}
}
-void IconChoiceDialog::SetPosSizeCtrls ( BOOL bInit )
+void IconChoiceDialog::SetPosSizeCtrls ( sal_Bool bInit )
{
const Point aCtrlOffset ( LogicToPixel( Point( CTRLS_OFFSET, CTRLS_OFFSET ), MAP_APPFONT ) );
Size aOutSize ( GetOutputSizePixel() );
@@ -539,7 +539,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( BOOL bInit )
////////////////////////////////////////
// Pages resizen & positionieren
//
- for ( ULONG i=0; i<maPageList.Count(); i++ )
+ for ( sal_uLong i=0; i<maPageList.Count(); i++ )
{
IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i );
@@ -584,7 +584,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( BOOL bInit )
////////////////////////////////////////
// Buttons positionieren
//
- ULONG nXOffset=0;
+ sal_uLong nXOffset=0;
if ( meChoicePos == PosRight )
nXOffset = aNewIconCtrlSize.Width()+(2*aCtrlOffset.X());
@@ -622,7 +622,7 @@ void IconChoiceDialog::SetPosSizeCtrls ( BOOL bInit )
Invalidate();
}
-void IconChoiceDialog::SetPosSizePages ( USHORT nId )
+void IconChoiceDialog::SetPosSizePages ( sal_uInt16 nId )
{
const Point aCtrlOffset ( LogicToPixel( Point( CTRLS_OFFSET, CTRLS_OFFSET ), MAP_APPFONT ) );
IconChoicePageData* pData = GetPageData ( nId );
@@ -678,13 +678,13 @@ void IconChoiceDialog::SetPosSizePages ( USHORT nId )
IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG )
{
- ULONG nPos;
+ sal_uLong nPos;
SvxIconChoiceCtrlEntry *pEntry = maIconCtrl.GetSelectedEntry ( nPos );
if ( !pEntry )
pEntry = maIconCtrl.GetCursor( );
- USHORT *pId = (USHORT*)pEntry->GetUserData ();
+ sal_uInt16 *pId = (sal_uInt16*)pEntry->GetUserData ();
if( *pId != mnCurrentPageId )
{
@@ -709,7 +709,7 @@ IMPL_LINK ( IconChoiceDialog , ChosePageHdl_Impl, void *, EMPTYARG )
IMPL_LINK( IconChoiceDialog, OkHdl, Button *, EMPTYARG )
{
- bInOK = TRUE;
+ bInOK = sal_True;
if ( OK_Impl() )
{
@@ -801,7 +801,7 @@ void IconChoiceDialog::ActivatePageImpl ()
pData->pPage->Reset( *pSet );
}
- pData->bRefresh = FALSE;
+ pData->bRefresh = sal_False;
if ( pExampleSet )
pData->pPage->ActivatePage( *pExampleSet );
@@ -809,7 +809,7 @@ void IconChoiceDialog::ActivatePageImpl ()
SetHelpId( pData->pPage->GetHelpId() );
- BOOL bReadOnly = pData->pPage->IsReadOnly();
+ sal_Bool bReadOnly = pData->pPage->IsReadOnly();
if ( bReadOnly || bHideResetBtn )
aResetBtn.Hide();
else
@@ -819,7 +819,7 @@ void IconChoiceDialog::ActivatePageImpl ()
// -----------------------------------------------------------------------
-BOOL IconChoiceDialog::DeActivatePageImpl ()
+sal_Bool IconChoiceDialog::DeActivatePageImpl ()
{
IconChoicePageData *pData = GetPageData ( mnCurrentPageId );
@@ -867,24 +867,24 @@ BOOL IconChoiceDialog::DeActivatePageImpl ()
pSet = GetRefreshedSet();
DBG_ASSERT( pSet, "GetRefreshedSet() liefert NULL" );
// alle Pages als neu zu initialsieren flaggen
- const ULONG nCount = maPageList.Count();
+ const sal_uLong nCount = maPageList.Count();
- for ( USHORT i = 0; i < nCount; ++i )
+ for ( sal_uInt16 i = 0; i < nCount; ++i )
{
IconChoicePageData* pObj = (IconChoicePageData*)maPageList.GetObject(i);
if ( pObj->pPage != pPage ) // eigene Page nicht mehr refreshen
- pObj->bRefresh = TRUE;
+ pObj->bRefresh = sal_True;
else
- pObj->bRefresh = FALSE;
+ pObj->bRefresh = sal_False;
}
}
}
if ( nRet & IconChoicePage::LEAVE_PAGE )
- return TRUE;
+ return sal_True;
else
- return FALSE;
+ return sal_False;
}
// -----------------------------------------------------------------------
@@ -911,7 +911,7 @@ void IconChoiceDialog::ResetPageImpl ()
|
\**********************************************************************/
-const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
+const sal_uInt16* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
{
if ( pSet )
{
@@ -922,19 +922,19 @@ const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
if ( pRanges )
return pRanges;
SvUShorts aUS( 16, 16 );
- ULONG nCount = maPageList.Count();
+ sal_uLong nCount = maPageList.Count();
- USHORT i;
+ sal_uInt16 i;
for ( i = 0; i < nCount; ++i )
{
IconChoicePageData* pData = maPageList.GetObject (i);
if ( pData->fnGetRanges )
{
- const USHORT* pTmpRanges = (pData->fnGetRanges)();
- const USHORT* pIter = pTmpRanges;
+ const sal_uInt16* pTmpRanges = (pData->fnGetRanges)();
+ const sal_uInt16* pIter = pTmpRanges;
- USHORT nLen;
+ sal_uInt16 nLen;
for( nLen = 0; *pIter; ++nLen, ++pIter )
;
aUS.Insert( pTmpRanges, nLen, aUS.Count() );
@@ -958,14 +958,14 @@ const USHORT* IconChoiceDialog::GetInputRanges( const SfxItemPool& rPool )
#if defined __SUNPRO_CC
#pragma disable_warn
#endif
- qsort( (void*)aUS.GetData(), aUS.Count(), sizeof(USHORT), IconcDlgCmpUS_Impl );
+ qsort( (void*)aUS.GetData(), aUS.Count(), sizeof(sal_uInt16), IconcDlgCmpUS_Impl );
#if defined __SUNPRO_CC
#pragma enable_warn
#endif
}
- pRanges = new USHORT[aUS.Count() + 1];
- memcpy(pRanges, aUS.GetData(), sizeof(USHORT) * aUS.Count());
+ pRanges = new sal_uInt16[aUS.Count() + 1];
+ memcpy(pRanges, aUS.GetData(), sizeof(sal_uInt16) * aUS.Count());
pRanges[aUS.Count()] = 0;
return pRanges;
@@ -988,14 +988,14 @@ void IconChoiceDialog::SetInputSet( const SfxItemSet* pInSet )
// -----------------------------------------------------------------------
-void IconChoiceDialog::PageCreated( USHORT /*nId*/, IconChoicePage& /*rPage*/ )
+void IconChoiceDialog::PageCreated( sal_uInt16 /*nId*/, IconChoicePage& /*rPage*/ )
{
// not interested in
}
// -----------------------------------------------------------------------
-SfxItemSet* IconChoiceDialog::CreateInputItemSet( USHORT )
+SfxItemSet* IconChoiceDialog::CreateInputItemSet( sal_uInt16 )
{
DBG_WARNINGFILE( "CreateInputItemSet nicht implementiert" );
@@ -1020,11 +1020,11 @@ short IconChoiceDialog::Execute()
// -----------------------------------------------------------------------
-void IconChoiceDialog::Start( BOOL bShow )
+void IconChoiceDialog::Start( sal_Bool bShow )
{
aCancelBtn.SetClickHdl( LINK( this, IconChoiceDialog, CancelHdl ) );
- bModal = FALSE;
+ bModal = sal_False;
Start_Impl();
@@ -1038,8 +1038,8 @@ void IconChoiceDialog::Start( BOOL bShow )
sal_Bool IconChoiceDialog::QueryClose()
{
sal_Bool bRet = sal_True;
- const ULONG nCount = maPageList.Count();
- for ( ULONG i = 0; i < nCount; ++i )
+ const sal_uLong nCount = maPageList.Count();
+ for ( sal_uLong i = 0; i < nCount; ++i )
{
IconChoicePageData* pData = maPageList.GetObject(i);
if ( pData->pPage && !pData->pPage->QueryClose() )
@@ -1056,7 +1056,7 @@ sal_Bool IconChoiceDialog::QueryClose()
void IconChoiceDialog::Start_Impl()
{
Point aPos;
- USHORT nActPage;
+ sal_uInt16 nActPage;
if ( mnCurrentPageId == 0 || mnCurrentPageId == USHRT_MAX )
nActPage = maPageList.GetObject(0)->nId;//First()->nId;
@@ -1072,7 +1072,7 @@ void IconChoiceDialog::Start_Impl()
SetWindowState( ByteString( aTabDlgOpt.GetWindowState().getStr(), RTL_TEXTENCODING_ASCII_US ) );
// initiale TabPage aus Programm/Hilfe/Konfig
- nActPage = (USHORT)aTabDlgOpt.GetPageID();
+ nActPage = (sal_uInt16)aTabDlgOpt.GetPageID();
if ( USHRT_MAX != mnCurrentPageId )
nActPage = mnCurrentPageId;
@@ -1104,12 +1104,12 @@ const SfxItemSet* IconChoiceDialog::GetRefreshedSet()
|
\**********************************************************************/
-IconChoicePageData* IconChoiceDialog::GetPageData ( USHORT nId )
+IconChoicePageData* IconChoiceDialog::GetPageData ( sal_uInt16 nId )
{
IconChoicePageData *pRet = NULL;
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
- for ( ULONG i=0; i<maPageList.Count() && !bFound; i++ )
+ for ( sal_uLong i=0; i<maPageList.Count() && !bFound; i++ )
{
IconChoicePageData* pData = (IconChoicePageData*)maPageList.GetObject ( i );
@@ -1128,7 +1128,7 @@ IconChoicePageData* IconChoiceDialog::GetPageData ( USHORT nId )
|
\**********************************************************************/
-BOOL IconChoiceDialog::OK_Impl()
+sal_Bool IconChoiceDialog::OK_Impl()
{
IconChoicePage* pPage = GetPageData ( mnCurrentPageId )->pPage;
@@ -1139,7 +1139,7 @@ BOOL IconChoiceDialog::OK_Impl()
if ( pSet )
{
SfxItemSet aTmp( *pSet->GetPool(), pSet->GetRanges() );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
if ( pPage->HasExchangeSupport() )
nRet = pPage->DeactivatePage( &aTmp );
@@ -1151,7 +1151,7 @@ BOOL IconChoiceDialog::OK_Impl()
pOutSet->Put( aTmp );
}
else if ( bRet )
- bModified |= TRUE;
+ bModified |= sal_True;
}
else
nRet = pPage->DeactivatePage( NULL );
@@ -1165,20 +1165,20 @@ BOOL IconChoiceDialog::OK_Impl()
short IconChoiceDialog::Ok()
{
- bInOK = TRUE;
+ bInOK = sal_True;
if ( !pOutSet )
{
if ( !pExampleSet && pSet )
- pOutSet = pSet->Clone( FALSE ); // ohne Items
+ pOutSet = pSet->Clone( sal_False ); // ohne Items
else if ( pExampleSet )
pOutSet = new SfxItemSet( *pExampleSet );
}
- BOOL _bModified = FALSE;
+ sal_Bool _bModified = sal_False;
- const ULONG nCount = maPageList.Count();
+ const sal_uLong nCount = maPageList.Count();
- for ( USHORT i = 0; i < nCount; ++i )
+ for ( sal_uInt16 i = 0; i < nCount; ++i )
{
IconChoicePageData* pData = GetPageData ( i );
@@ -1198,7 +1198,7 @@ short IconChoiceDialog::Ok()
if ( pPage->FillItemSet( aTmp ) )
{
- _bModified |= TRUE;
+ _bModified |= sal_True;
pExampleSet->Put( aTmp );
pOutSet->Put( aTmp );
}
@@ -1207,20 +1207,20 @@ short IconChoiceDialog::Ok()
}
if ( _bModified || ( pOutSet && pOutSet->Count() > 0 ) )
- _bModified |= TRUE;
+ _bModified |= sal_True;
return _bModified ? RET_OK : RET_CANCEL;
}
// -----------------------------------------------------------------------
-void IconChoiceDialog::FocusOnIcon( USHORT nId )
+void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId )
{
// set focus to icon for the current visible page
- for ( USHORT i=0; i<maIconCtrl.GetEntryCount(); i++)
+ for ( sal_uInt16 i=0; i<maIconCtrl.GetEntryCount(); i++)
{
SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
- USHORT* pUserData = (USHORT*) pEntry->GetUserData();
+ sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData();
if ( pUserData && *pUserData == nId )
{
diff --git a/cui/source/dialogs/insdlg.cxx b/cui/source/dialogs/insdlg.cxx
index 8cf21129f52c..0173eb22d75d 100644
--- a/cui/source/dialogs/insdlg.cxx
+++ b/cui/source/dialogs/insdlg.cxx
@@ -96,9 +96,9 @@ static String impl_getSvtResString( sal_uInt32 nId )
return aRet;
}
-BOOL InsertObjectDialog_Impl::IsCreateNew() const
+sal_Bool InsertObjectDialog_Impl::IsCreateNew() const
{
- return FALSE;
+ return sal_False;
}
uno::Reference< io::XInputStream > InsertObjectDialog_Impl::GetIconIfIconified( ::rtl::OUString* /*pGraphicMediaType*/ )
@@ -224,7 +224,7 @@ SvInsertOleDlg::SvInsertOleDlg
Link aLink( LINK( this, SvInsertOleDlg, RadioHdl ) );
aRbNewObject.SetClickHdl( aLink );
aRbObjectFromfile.SetClickHdl( aLink );
- aRbNewObject.Check( TRUE );
+ aRbNewObject.Check( sal_True );
RadioHdl( NULL );
}
@@ -241,10 +241,10 @@ short SvInsertOleDlg::Execute()
// fill listbox and select default
ListBox& rBox = GetObjectTypes();
- rBox.SetUpdateMode( FALSE );
- for ( ULONG i = 0; i < m_pServers->Count(); i++ )
+ rBox.SetUpdateMode( sal_False );
+ for ( sal_uLong i = 0; i < m_pServers->Count(); i++ )
rBox.InsertEntry( (*m_pServers)[i].GetHumanName() );
- rBox.SetUpdateMode( TRUE );
+ rBox.SetUpdateMode( sal_True );
SelectDefault();
::rtl::OUString aName;
@@ -252,8 +252,8 @@ short SvInsertOleDlg::Execute()
if ( m_xStorage.is() && ( nRet = Dialog::Execute() ) == RET_OK )
{
String aFileName;
- BOOL bLink = FALSE;
- BOOL bCreateNew = IsCreateNew();
+ sal_Bool bLink = sal_False;
+ sal_Bool bCreateNew = IsCreateNew();
if ( bCreateNew )
{
// create and insert new embedded object
@@ -472,7 +472,7 @@ SvInsertPlugInDialog::~SvInsertPlugInDialog()
static void Plugin_ImplFillCommandSequence( const String& aCommands, uno::Sequence< beans::PropertyValue >& aCommandSequence )
{
- USHORT nEaten;
+ sal_uInt16 nEaten;
SvCommandList aLst;
aLst.AppendCommands( aCommands, &nEaten );
@@ -642,7 +642,7 @@ short SvInsertAppletDialog::Execute()
m_aClass.Erase();
m_aCommands.Erase();
- BOOL bOK = FALSE;
+ sal_Bool bOK = sal_False;
uno::Reference < beans::XPropertySet > xSet;
if ( m_xObj.is() )
{
@@ -669,7 +669,7 @@ short SvInsertAppletDialog::Execute()
String aText( CUI_RES( STR_EDIT_APPLET ) );
SetText( aText );
- bOK = TRUE;
+ bOK = sal_True;
}
catch ( uno::Exception& )
{
@@ -698,7 +698,7 @@ short SvInsertAppletDialog::Execute()
{
try
{
- BOOL bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE;
+ sal_Bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE;
if ( bIPActive )
m_xObj->changeState( embed::EmbedStates::RUNNING );
@@ -825,7 +825,7 @@ SfxInsertFloatingFrameDialog::SfxInsertFloatingFrameDialog( Window *pParent, con
short SfxInsertFloatingFrameDialog::Execute()
{
short nRet = RET_OK;
- BOOL bOK = FALSE;
+ sal_Bool bOK = sal_False;
uno::Reference < beans::XPropertySet > xSet;
if ( m_xObj.is() )
{
@@ -848,10 +848,10 @@ short SfxInsertFloatingFrameDialog::Execute()
if ( nSize == SIZE_NOT_SET )
{
- aCBMarginWidthDefault.Check( TRUE );
+ aCBMarginWidthDefault.Check( sal_True );
aNMMarginWidth.SetText( String::CreateFromInt32( DEFAULT_MARGIN_WIDTH ) );
- aFTMarginWidth.Enable( FALSE );
- aNMMarginWidth.Enable( FALSE );
+ aFTMarginWidth.Enable( sal_False );
+ aNMMarginWidth.Enable( sal_False );
}
else
aNMMarginWidth.SetText( String::CreateFromInt32( nSize ) );
@@ -861,17 +861,17 @@ short SfxInsertFloatingFrameDialog::Execute()
if ( nSize == SIZE_NOT_SET )
{
- aCBMarginHeightDefault.Check( TRUE );
+ aCBMarginHeightDefault.Check( sal_True );
aNMMarginHeight.SetText( String::CreateFromInt32( DEFAULT_MARGIN_HEIGHT ) );
- aFTMarginHeight.Enable( FALSE );
- aNMMarginHeight.Enable( FALSE );
+ aFTMarginHeight.Enable( sal_False );
+ aNMMarginHeight.Enable( sal_False );
}
else
aNMMarginHeight.SetText( String::CreateFromInt32( nSize ) );
- BOOL bScrollOn = FALSE;
- BOOL bScrollOff = FALSE;
- BOOL bScrollAuto = FALSE;
+ sal_Bool bScrollOn = sal_False;
+ sal_Bool bScrollOff = sal_False;
+ sal_Bool bScrollAuto = sal_False;
sal_Bool bSet = sal_False;
aAny = xSet->getPropertyValue( ::rtl::OUString::createFromAscii("FrameIsAutoScroll") );
@@ -884,7 +884,7 @@ short SfxInsertFloatingFrameDialog::Execute()
bScrollOff = !bSet;
}
else
- bScrollAuto = TRUE;
+ bScrollAuto = sal_True;
aRBScrollingOn.Check( bScrollOn );
aRBScrollingOff.Check( bScrollOff );
@@ -901,8 +901,8 @@ short SfxInsertFloatingFrameDialog::Execute()
aRBFrameBorderOff.Check( !bSet );
}
- SetUpdateMode( TRUE );
- bOK = TRUE;
+ SetUpdateMode( sal_True );
+ bOK = sal_True;
}
catch ( uno::Exception& )
{
@@ -942,7 +942,7 @@ short SfxInsertFloatingFrameDialog::Execute()
{
try
{
- BOOL bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE;
+ sal_Bool bIPActive = m_xObj->getCurrentState() == embed::EmbedStates::INPLACE_ACTIVE;
if ( bIPActive )
m_xObj->changeState( embed::EmbedStates::RUNNING );
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 0193cefa2964..202e50134c9a 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -74,7 +74,7 @@ static long nTabs[] =
};
-SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, BOOL bHtml )
+SvBaseLinksDlg::SvBaseLinksDlg( Window * pParent, LinkManager* pMgr, sal_Bool bHtml )
: ModalDialog( pParent, CUI_RES( MD_UPDATE_BASELINKS ) ),
aFtFiles( this, CUI_RES( FT_FILES ) ),
aFtLinks( this, CUI_RES( FT_LINKS ) ),
@@ -148,8 +148,8 @@ SvBaseLinksDlg::~SvBaseLinksDlg()
*************************************************************************/
IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
{
- USHORT nSelectionCount = pSvTabListBox ?
- (USHORT)pSvTabListBox->GetSelectionCount() : 0;
+ sal_uInt16 nSelectionCount = pSvTabListBox ?
+ (sal_uInt16)pSvTabListBox->GetSelectionCount() : 0;
if(nSelectionCount > 1)
{
//bei Mehrfachselektion ggf. alte Eintraege deselektieren
@@ -157,16 +157,16 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
SvBaseLink* pLink = 0;
pEntry = pSvTabListBox->GetHdlEntry();
pLink = (SvBaseLink*)pEntry->GetUserData();
- USHORT nObjectType = pLink->GetObjType();
+ sal_uInt16 nObjectType = pLink->GetObjType();
if((OBJECT_CLIENT_FILE & nObjectType) != OBJECT_CLIENT_FILE)
{
- pSvTabListBox->SelectAll(FALSE);
+ pSvTabListBox->SelectAll(sal_False);
pSvTabListBox->Select(pEntry);
nSelectionCount = 1;
}
else
{
- for( USHORT i = 0; i < nSelectionCount; i++)
+ for( sal_uInt16 i = 0; i < nSelectionCount; i++)
{
pEntry = i == 0 ? pSvTabListBox->FirstSelected() :
pSvTabListBox->NextSelected(pEntry);
@@ -174,7 +174,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
pLink = (SvBaseLink*)pEntry->GetUserData();
DBG_ASSERT(pLink, "Wo ist der Link?");
if( (OBJECT_CLIENT_FILE & pLink->GetObjType()) != OBJECT_CLIENT_FILE )
- pSvTabListBox->Select( pEntry, FALSE );
+ pSvTabListBox->Select( pEntry, sal_False );
}
}
@@ -187,7 +187,7 @@ IMPL_LINK( SvBaseLinksDlg, LinksSelectHdl, SvTabListBox *, pSvTabListBox )
}
else
{
- USHORT nPos;
+ sal_uInt16 nPos;
SvBaseLink* pLink = GetSelEntry( &nPos );
if( !pLink )
return 0;
@@ -239,7 +239,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, AutomaticClickHdl, RadioButton *, pRadio
{
(void)pRadioButton;
- USHORT nPos;
+ sal_uInt16 nPos;
SvBaseLink* pLink = GetSelEntry( &nPos );
if( pLink && !( FILEOBJECT & pLink->GetObjType() ) &&
LINKUPDATE_ALWAYS != pLink->GetUpdateMode() )
@@ -252,7 +252,7 @@ IMPL_LINK_INLINE_START( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioBut
{
(void)pRadioButton;
- USHORT nPos;
+ sal_uInt16 nPos;
SvBaseLink* pLink = GetSelEntry( &nPos );
if( pLink && !( FILEOBJECT & pLink->GetObjType() ) &&
LINKUPDATE_ONCALL != pLink->GetUpdateMode())
@@ -264,17 +264,17 @@ IMPL_LINK_INLINE_END( SvBaseLinksDlg, ManualClickHdl, RadioButton *, pRadioButto
IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
{
SvTabListBox& rListBox = Links();
- USHORT nSelCnt = (USHORT)rListBox.GetSelectionCount();
+ sal_uInt16 nSelCnt = (sal_uInt16)rListBox.GetSelectionCount();
if( 255 < nSelCnt )
nSelCnt = 255;
std::vector< SvBaseLink* > aLnkArr;
- std::vector< USHORT > aPosArr;
+ std::vector< sal_uInt16 > aPosArr;
SvLBoxEntry* pE = rListBox.FirstSelected();
while( pE )
{
- USHORT nFndPos = (USHORT)rListBox.GetModel()->GetAbsPos( pE );
+ sal_uInt16 nFndPos = (sal_uInt16)rListBox.GetModel()->GetAbsPos( pE );
if( LISTBOX_ENTRY_NOTFOUND != nFndPos )
{
aLnkArr.push_back( static_cast< SvBaseLink* >( pE->GetUserData() ) );
@@ -285,17 +285,17 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
if( !aLnkArr.empty() )
{
- for( USHORT n = 0; n < aLnkArr.size(); ++n )
+ for( sal_uInt16 n = 0; n < aLnkArr.size(); ++n )
{
SvBaseLinkRef xLink = aLnkArr[ n ];
// suche erstmal im Array nach dem Eintrag
- for( USHORT i = 0; i < pLinkMgr->GetLinks().Count(); ++i )
+ for( sal_uInt16 i = 0; i < pLinkMgr->GetLinks().Count(); ++i )
if( &xLink == *pLinkMgr->GetLinks()[ i ] )
{
- xLink->SetUseCache( FALSE );
+ xLink->SetUseCache( sal_False );
SetType( *xLink, aPosArr[ n ], xLink->GetUpdateMode() );
- xLink->SetUseCache( TRUE );
+ xLink->SetUseCache( sal_True );
break;
}
}
@@ -326,7 +326,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateNowClickHdl, PushButton *, EMPTYARG )
{
SvLBoxEntry* pSelEntry = rListBox.FirstSelected();
if( pE != pSelEntry )
- rListBox.Select( pSelEntry, FALSE );
+ rListBox.Select( pSelEntry, sal_False );
rListBox.Select( pE );
rListBox.MakeVisible( pE );
}
@@ -347,7 +347,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
{
(void)pPushButton;
- USHORT nSelectionCount = (USHORT)Links().GetSelectionCount();
+ sal_uInt16 nSelectionCount = (sal_uInt16)Links().GetSelectionCount();
if(nSelectionCount > 1)
{
PathDialog aPathDlg( this );
@@ -368,7 +368,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
{
String aPath = aPathDlg.GetPath();
- for( USHORT i = 0; i < nSelectionCount; i++)
+ for( sal_uInt16 i = 0; i < nSelectionCount; i++)
{
pEntry = i==0 ?
Links().FirstSelected() :
@@ -395,7 +395,7 @@ IMPL_LINK( SvBaseLinksDlg, ChangeSourceClickHdl, PushButton *, pPushButton )
}
else
{
- USHORT nPos;
+ sal_uInt16 nPos;
SvBaseLink* pLink = GetSelEntry( &nPos );
if ( pLink && (pLink->GetLinkSourceName().Len() != 0) )
pLink->Edit( this, LINK( this, SvBaseLinksDlg, EndEditHdl ) );
@@ -407,10 +407,10 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
{
(void)pPushButton;
- BOOL bModified = FALSE;
+ sal_Bool bModified = sal_False;
if(Links().GetSelectionCount() <= 1)
{
- USHORT nPos;
+ sal_uInt16 nPos;
SvBaseLinkRef xLink = GetSelEntry( &nPos );
if( !xLink.Is() )
return 0;
@@ -422,7 +422,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
Links().GetModel()->Remove( Links().GetEntry( nPos ) );
// falls Object noch vorhanden, dann das schliessen
- BOOL bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType();
+ sal_Bool bNewLnkMgr = OBJECT_CLIENT_FILE == xLink->GetObjType();
// dem Link sagen, das er aufgeloest wird!
xLink->Closed();
@@ -441,7 +441,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
if( pEntry )
Links().SetCurEntry( pEntry );
}
- bModified = TRUE;
+ bModified = sal_True;
}
}
else
@@ -461,7 +461,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
pEntry = Links().NextSelected(pEntry);
}
Links().RemoveSelection();
- for( ULONG i = 0; i < aLinkList.Count(); i++ )
+ for( sal_uLong i = 0; i < aLinkList.Count(); i++ )
{
SvBaseLinkRef xLink = aLinkList.GetObject( i );
// dem Link sagen, das er aufgeloest wird!
@@ -469,7 +469,7 @@ IMPL_LINK( SvBaseLinksDlg, BreakLinkClickHdl, PushButton *, pPushButton )
// falls einer vergessen hat sich auszutragen
pLinkMgr->Remove( &xLink );
- bModified = TRUE;
+ bModified = sal_True;
}
//Danach alle selektierten Eintraege entfernen
}
@@ -502,8 +502,8 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
// for( SvLBoxEntry* pBox = Links().First(); pBox;
// pBox = Links().Next( pBox ))
- Links().SetUpdateMode(FALSE);
- for( ULONG nPos = Links().GetEntryCount(); nPos; )
+ Links().SetUpdateMode(sal_False);
+ for( sal_uLong nPos = Links().GetEntryCount(); nPos; )
{
SvLBoxEntry* pBox = Links().GetEntry( --nPos );
SvBaseLinkRef xLink( (SvBaseLink*)pBox->GetUserData() );
@@ -515,13 +515,13 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
Links().SetEntryText( sCur, pBox, 3 );
}
}
- Links().SetUpdateMode(TRUE);
+ Links().SetUpdateMode(sal_True);
return 0;
}
IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
{
- USHORT nPos;
+ sal_uInt16 nPos;
GetSelEntry( &nPos );
if( _pLink && _pLink->WasLastEditOK() )
@@ -531,23 +531,23 @@ IMPL_LINK( SvBaseLinksDlg, EndEditHdl, sfx2::SvBaseLink*, _pLink )
// also suche den Link im Manager, wenn der nicht mehr existiert,
// dann setze fuelle die Liste komplett neu. Ansonsten braucht
// nur der editierte Linkt aktualisiert werden.
- BOOL bLinkFnd = FALSE;
- for( USHORT n = pLinkMgr->GetLinks().Count(); n; )
+ sal_Bool bLinkFnd = sal_False;
+ for( sal_uInt16 n = pLinkMgr->GetLinks().Count(); n; )
if( _pLink == &(*pLinkMgr->GetLinks()[ --n ]) )
{
- bLinkFnd = TRUE;
+ bLinkFnd = sal_True;
break;
}
if( bLinkFnd )
{
- Links().SetUpdateMode(FALSE);
+ Links().SetUpdateMode(sal_False);
Links().GetModel()->Remove( Links().GetEntry( nPos ) );
SvLBoxEntry* pToUnselect = Links().FirstSelected();
InsertEntry( *_pLink, nPos, sal_True );
if(pToUnselect)
- Links().Select(pToUnselect, FALSE);
- Links().SetUpdateMode(TRUE);
+ Links().Select(pToUnselect, sal_False);
+ Links().SetUpdateMode(sal_True);
}
else
{
@@ -586,7 +586,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
if( pNewMgr )
// Update muss vor Clear gestoppt werden
- Links().SetUpdateMode( FALSE );
+ Links().SetUpdateMode( sal_False );
Links().Clear();
pLinkMgr = pNewMgr;
@@ -594,7 +594,7 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
if( pLinkMgr )
{
SvBaseLinks& rLnks = (SvBaseLinks&)pLinkMgr->GetLinks();
- for( USHORT n = 0; n < rLnks.Count(); ++n )
+ for( sal_uInt16 n = 0; n < rLnks.Count(); ++n )
{
SvBaseLinkRef* pLinkRef = rLnks[ n ];
if( !pLinkRef->Is() )
@@ -614,13 +614,13 @@ void SvBaseLinksDlg::SetManager( LinkManager* pNewMgr )
Links().Select( pEntry );
LinksSelectHdl( 0 );
}
- Links().SetUpdateMode( TRUE );
+ Links().SetUpdateMode( sal_True );
Links().Invalidate();
}
}
-void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool bSelect )
+void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, sal_uInt16 nPos, sal_Bool bSelect )
{
String aEntry, sFileNm, sLinkNm, sTypeNm, sFilter;
@@ -658,12 +658,12 @@ void SvBaseLinksDlg::InsertEntry( const SvBaseLink& rLink, USHORT nPos, sal_Bool
Links().Select(pE);
}
-SvBaseLink* SvBaseLinksDlg::GetSelEntry( USHORT* pPos )
+SvBaseLink* SvBaseLinksDlg::GetSelEntry( sal_uInt16* pPos )
{
SvLBoxEntry* pE = Links().FirstSelected();
- USHORT nPos;
+ sal_uInt16 nPos;
if( pE && LISTBOX_ENTRY_NOTFOUND !=
- ( nPos = (USHORT)Links().GetModel()->GetAbsPos( pE ) ) )
+ ( nPos = (sal_uInt16)Links().GetModel()->GetAbsPos( pE ) ) )
{
DBG_ASSERT( pE, "wo kommt der leere Eintrag her?" );
@@ -675,8 +675,8 @@ SvBaseLink* SvBaseLinksDlg::GetSelEntry( USHORT* pPos )
}
void SvBaseLinksDlg::SetType( SvBaseLink& rLink,
- USHORT nSelPos,
- USHORT nType )
+ sal_uInt16 nSelPos,
+ sal_uInt16 nType )
{
rLink.SetUpdateMode( nType );
rLink.Update();
@@ -691,8 +691,8 @@ void SvBaseLinksDlg::SetActLink( SvBaseLink * pLink )
if( pLinkMgr )
{
const SvBaseLinks& rLnks = pLinkMgr->GetLinks();
- USHORT nSelect = 0;
- for( USHORT n = 0; n < rLnks.Count(); ++n )
+ sal_uInt16 nSelect = 0;
+ for( sal_uInt16 n = 0; n < rLnks.Count(); ++n )
{
SvBaseLinkRef* pLinkRef = rLnks[ n ];
// #109573# only visible links have been inserted into the TreeListBox,
diff --git a/cui/source/dialogs/multifil.cxx b/cui/source/dialogs/multifil.cxx
index 40d62c0311bb..01a4857017da 100644
--- a/cui/source/dialogs/multifil.cxx
+++ b/cui/source/dialogs/multifil.cxx
@@ -76,13 +76,13 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
OSL_ENSURE( xID.is(), "AddHdl_Impl: invalid ID interface!" );
// ensure the content of files are valid
- USHORT nCount = aPathLB.GetEntryCount();
- BOOL bDuplicated = FALSE;
+ sal_uInt16 nCount = aPathLB.GetEntryCount();
+ sal_Bool bDuplicated = sal_False;
try
{
if( nCount > 0 ) // start comparison
{
- USHORT i;
+ sal_uInt16 i;
::ucbhelper::Content & VContent = aContent; // temporary Content reference
Reference< XContent > xVContent;
Reference< XContentIdentifier > xVID;
@@ -113,7 +113,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
{
if ( 0 == xProvider->compareContentIds( xID, xVID ) )
{
- bDuplicated = TRUE;
+ bDuplicated = sal_True;
break;
}
}
@@ -134,7 +134,7 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
}
else
{
- USHORT nPos = aPathLB.InsertEntry( sInsFile, LISTBOX_APPEND );
+ sal_uInt16 nPos = aPathLB.InsertEntry( sInsFile, LISTBOX_APPEND );
aPathLB.SetEntryData( nPos, (void*) new String( sInsFile ) );
}
@@ -146,9 +146,9 @@ IMPL_LINK( SvxMultiFileDialog, AddHdl_Impl, PushButton *, pBtn )
IMPL_LINK( SvxMultiFileDialog, DelHdl_Impl, PushButton *, EMPTYARG )
{
- USHORT nPos = aPathLB.GetSelectEntryPos();
+ sal_uInt16 nPos = aPathLB.GetSelectEntryPos();
aPathLB.RemoveEntry( nPos );
- USHORT nCnt = aPathLB.GetEntryCount();
+ sal_uInt16 nCnt = aPathLB.GetEntryCount();
if ( nCnt )
{
@@ -163,7 +163,7 @@ IMPL_LINK( SvxMultiFileDialog, DelHdl_Impl, PushButton *, EMPTYARG )
// -----------------------------------------------------------------------
-SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed ) :
+SvxMultiFileDialog::SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed ) :
SvxMultiPathDialog( pParent, bEmptyAllowed )
diff --git a/cui/source/dialogs/multipat.cxx b/cui/source/dialogs/multipat.cxx
index 1d3af44facf6..c378cc40e1ad 100644
--- a/cui/source/dialogs/multipat.cxx
+++ b/cui/source/dialogs/multipat.cxx
@@ -55,23 +55,23 @@ using namespace ::com::sun::star::uno;
struct MultiPath_Impl
{
- BOOL bEmptyAllowed;
- BOOL bIsClassPathMode;
+ sal_Bool bEmptyAllowed;
+ sal_Bool bIsClassPathMode;
bool bIsRadioButtonMode;
- MultiPath_Impl( BOOL bAllowed ) :
- bEmptyAllowed( bAllowed ), bIsClassPathMode( FALSE ), bIsRadioButtonMode( false ) {}
+ MultiPath_Impl( sal_Bool bAllowed ) :
+ bEmptyAllowed( bAllowed ), bIsClassPathMode( sal_False ), bIsRadioButtonMode( false ) {}
};
// class SvxMultiPathDialog ----------------------------------------------
IMPL_LINK( SvxMultiPathDialog, SelectHdl_Impl, void *, EMPTYARG )
{
- ULONG nCount = pImpl->bIsRadioButtonMode ? aRadioLB.GetEntryCount() : aPathLB.GetEntryCount();
+ sal_uLong nCount = pImpl->bIsRadioButtonMode ? aRadioLB.GetEntryCount() : aPathLB.GetEntryCount();
bool bIsSelected = pImpl->bIsRadioButtonMode
? aRadioLB.FirstSelected() != NULL
: aPathLB.GetSelectEntryPos() != LISTBOX_ENTRY_NOTFOUND;
- BOOL bEnable = ( pImpl->bEmptyAllowed || nCount > 1 );
+ sal_Bool bEnable = ( pImpl->bEmptyAllowed || nCount > 1 );
aDelBtn.Enable( bEnable && bIsSelected );
return 0;
}
@@ -105,7 +105,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
if ( pImpl->bIsRadioButtonMode )
{
- ULONG nPos = aRadioLB.GetEntryPos( sInsPath, 1 );
+ sal_uLong nPos = aRadioLB.GetEntryPos( sInsPath, 1 );
if ( 0xffffffff == nPos ) //See svtools/source/contnr/svtabbx.cxx SvTabListBox::GetEntryPos
{
String sNewEntry( '\t' );
@@ -131,7 +131,7 @@ IMPL_LINK( SvxMultiPathDialog, AddHdl_Impl, PushButton *, EMPTYARG )
}
else
{
- USHORT nPos = aPathLB.InsertEntry( sInsPath, LISTBOX_APPEND );
+ sal_uInt16 nPos = aPathLB.InsertEntry( sInsPath, LISTBOX_APPEND );
aPathLB.SetEntryData( nPos, (void*)new String( aURL ) );
}
}
@@ -149,9 +149,9 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG )
SvLBoxEntry* pEntry = aRadioLB.FirstSelected();
delete (String*)pEntry->GetUserData();
bool bChecked = aRadioLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED;
- ULONG nPos = aRadioLB.GetEntryPos( pEntry );
+ sal_uLong nPos = aRadioLB.GetEntryPos( pEntry );
aRadioLB.RemoveEntry( pEntry );
- ULONG nCnt = aRadioLB.GetEntryCount();
+ sal_uLong nCnt = aRadioLB.GetEntryCount();
if ( nCnt )
{
nCnt--;
@@ -169,9 +169,9 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG )
}
else
{
- USHORT nPos = aPathLB.GetSelectEntryPos();
+ sal_uInt16 nPos = aPathLB.GetSelectEntryPos();
aPathLB.RemoveEntry( nPos );
- USHORT nCnt = aPathLB.GetEntryCount();
+ sal_uInt16 nCnt = aPathLB.GetEntryCount();
if ( nCnt )
{
@@ -188,7 +188,7 @@ IMPL_LINK( SvxMultiPathDialog, DelHdl_Impl, PushButton *, EMPTYARG )
// -----------------------------------------------------------------------
-SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) :
+SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed ) :
ModalDialog( pParent, CUI_RES( RID_SVXDLG_MULTIPATH ) ),
@@ -226,10 +226,10 @@ SvxMultiPathDialog::SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed ) :
SvxMultiPathDialog::~SvxMultiPathDialog()
{
- USHORT nPos = aPathLB.GetEntryCount();
+ sal_uInt16 nPos = aPathLB.GetEntryCount();
while ( nPos-- )
delete (String*)aPathLB.GetEntryData(nPos);
- nPos = (USHORT)aRadioLB.GetEntryCount();
+ nPos = (sal_uInt16)aRadioLB.GetEntryCount();
while ( nPos-- )
{
SvLBoxEntry* pEntry = aRadioLB.GetEntry( nPos );
@@ -248,7 +248,7 @@ String SvxMultiPathDialog::GetPath() const
if ( pImpl->bIsRadioButtonMode )
{
String sWritable;
- for ( USHORT i = 0; i < aRadioLB.GetEntryCount(); ++i )
+ for ( sal_uInt16 i = 0; i < aRadioLB.GetEntryCount(); ++i )
{
SvLBoxEntry* pEntry = aRadioLB.GetEntry(i);
if ( aRadioLB.GetCheckButtonState( pEntry ) == SV_BUTTON_CHECKED )
@@ -266,7 +266,7 @@ String SvxMultiPathDialog::GetPath() const
}
else
{
- for ( USHORT i = 0; i < aPathLB.GetEntryCount(); ++i )
+ for ( sal_uInt16 i = 0; i < aPathLB.GetEntryCount(); ++i )
{
if ( sNewPath.Len() > 0 )
sNewPath += cDelim;
@@ -281,9 +281,9 @@ String SvxMultiPathDialog::GetPath() const
void SvxMultiPathDialog::SetPath( const String& rPath )
{
sal_Unicode cDelim = pImpl->bIsClassPathMode ? CLASSPATH_DELIMITER : SVT_SEARCHPATH_DELIMITER;
- USHORT nPos, nCount = rPath.GetTokenCount( cDelim );
+ sal_uInt16 nPos, nCount = rPath.GetTokenCount( cDelim );
- for ( USHORT i = 0; i < nCount; ++i )
+ for ( sal_uInt16 i = 0; i < nCount; ++i )
{
String sPath = rPath.GetToken( i, cDelim );
String sSystemPath;
@@ -325,7 +325,7 @@ void SvxMultiPathDialog::SetPath( const String& rPath )
void SvxMultiPathDialog::SetClassPathMode()
{
- pImpl->bIsClassPathMode = TRUE;
+ pImpl->bIsClassPathMode = sal_True;
SetText( CUI_RES( RID_SVXSTR_ARCHIVE_TITLE ));
aPathFL.SetText( CUI_RES( RID_SVXSTR_ARCHIVE_HEADLINE ) );
}
diff --git a/cui/source/dialogs/passwdomdlg.cxx b/cui/source/dialogs/passwdomdlg.cxx
index 5b768c756654..c81897011d36 100644
--- a/cui/source/dialogs/passwdomdlg.cxx
+++ b/cui/source/dialogs/passwdomdlg.cxx
@@ -194,7 +194,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
m_aOk.SetClickHdl( LINK( this, PasswordToOpenModifyDialog_Impl, OkBtnClickHdl ) );
-// m_aOk.Enable( FALSE );
+// m_aOk.Enable( sal_False );
if (nMaxPasswdLen)
{
@@ -212,7 +212,7 @@ PasswordToOpenModifyDialog_Impl::PasswordToOpenModifyDialog_Impl(
m_aMoreFewerOptionsBTN.Enable( bIsPasswordToModify );
if (!bIsPasswordToModify)
- m_aMoreFewerOptionsBTN.Hide( TRUE );
+ m_aMoreFewerOptionsBTN.Hide( sal_True );
}
diff --git a/cui/source/dialogs/pastedlg.cxx b/cui/source/dialogs/pastedlg.cxx
index 2fe952b9197a..be2a7b4cfdbb 100644
--- a/cui/source/dialogs/pastedlg.cxx
+++ b/cui/source/dialogs/pastedlg.cxx
@@ -106,8 +106,8 @@ IMPL_LINK_INLINE_END( SvPasteObjectDialog, DoubleClickHdl, ListBox *, pListBox )
void SvPasteObjectDialog::SetDefault()
{
- bLink = FALSE;
- nAspect = (USHORT)::com::sun::star::embed::Aspects::MSOLE_CONTENT;
+ bLink = sal_False;
+ nAspect = (sal_uInt16)::com::sun::star::embed::Aspects::MSOLE_CONTENT;
}
SvPasteObjectDialog::~SvPasteObjectDialog()
@@ -134,7 +134,7 @@ void SvPasteObjectDialog::Insert( SotFormatStringId nFormat, const String& rForm
delete pStr;
}
-ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
+sal_uLong SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
const DataFlavorExVector* pFormats,
const TransferableObjectDescriptor* )
{
@@ -148,10 +148,10 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
//Dialogbox erzeugen und fuellen
String aSourceName, aTypeName;
- ULONG nSelFormat = 0;
+ sal_uLong nSelFormat = 0;
SvGlobalName aEmptyNm;
- ObjectLB().SetUpdateMode( FALSE );
+ ObjectLB().SetUpdateMode( sal_False );
DataFlavorExVector::iterator aIter( ((DataFlavorExVector&)*pFormats).begin() ),
aEnd( ((DataFlavorExVector&)*pFormats).end() );
@@ -168,7 +168,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
if( !pName &&
( nFormat == SOT_FORMATSTR_ID_EMBED_SOURCE_OLE || nFormat == SOT_FORMATSTR_ID_EMBEDDED_OBJ_OLE ) )
{
- BOOL IsClipboardObject_Impl( SotDataObject * );
+ sal_Bool IsClipboardObject_Impl( SotDataObject * );
if( IsClipboardObject_Impl( pDataObj ) )
{
IDataObject * pDO = NULL;
@@ -188,7 +188,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
LPOBJECTDESCRIPTOR pOD=(LPOBJECTDESCRIPTOR)GlobalLock(stm.hGlobal);
if( pOD->dwFullUserTypeName )
{
- OLECHAR * pN = (OLECHAR *)(((BYTE *)pOD) + pOD->dwFullUserTypeName);
+ OLECHAR * pN = (OLECHAR *)(((sal_uInt8 *)pOD) + pOD->dwFullUserTypeName);
aName.Append( pN );
pName = &aName;
// set format to ole object
@@ -196,7 +196,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
}
if( pOD->dwSrcOfCopy )
{
- OLECHAR * pN = (OLECHAR *)(((BYTE *)pOD) + pOD->dwSrcOfCopy);
+ OLECHAR * pN = (OLECHAR *)(((sal_uInt8 *)pOD) + pOD->dwSrcOfCopy);
aSourceName.Append( *pN++ );
}
else
@@ -270,7 +270,7 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
}
}
- ObjectLB().SetUpdateMode( TRUE );
+ ObjectLB().SetUpdateMode( sal_True );
SelectObject();
if( aSourceName.Len() )
@@ -291,9 +291,9 @@ ULONG SvPasteObjectDialog::GetFormat( const TransferableDataHelper& rHelper,
bLink = PasteLink().IsChecked();
if( AsIconBox().IsChecked() )
- nAspect = (USHORT)com::sun::star::embed::Aspects::MSOLE_ICON;
+ nAspect = (sal_uInt16)com::sun::star::embed::Aspects::MSOLE_ICON;
- nSelFormat = (ULONG)ObjectLB().GetEntryData( ObjectLB().GetSelectEntryPos() );
+ nSelFormat = (sal_uLong)ObjectLB().GetEntryData( ObjectLB().GetSelectEntryPos() );
}
return nSelFormat;
diff --git a/cui/source/dialogs/plfilter.cxx b/cui/source/dialogs/plfilter.cxx
index 4a90c54a277f..a0b1f2ef3126 100644
--- a/cui/source/dialogs/plfilter.cxx
+++ b/cui/source/dialogs/plfilter.cxx
@@ -71,14 +71,14 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc
Sequence<PluginDescription > aDescriptions( xPMgr->getPluginDescriptions() );
const PluginDescription * pDescriptions = aDescriptions.getConstArray();
- for ( UINT32 nPos = aDescriptions.getLength(); nPos--; )
+ for ( sal_uInt32 nPos = aDescriptions.getLength(); nPos--; )
{
const PluginDescription & rDescr = pDescriptions[nPos];
StrSet& rTypes = aMap[ rDescr.Description ];
String aExtension( rDescr.Extension );
- for ( USHORT nCnt = aExtension.GetTokenCount( ';' ); nCnt--; )
+ for ( sal_uInt16 nCnt = aExtension.GetTokenCount( ';' ); nCnt--; )
{
// no default plugins anymore
String aExt( aExtension.GetToken( nCnt, ';' ) );
@@ -121,6 +121,6 @@ void fillNetscapePluginFilters( Sequence< rtl::OUString >& rPluginNames, Sequenc
}
else
ShowServiceNotAvailableError( NULL,
- String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.plugin.PluginManager" ) ), TRUE );
+ String::CreateFromAscii( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.plugin.PluginManager" ) ), sal_True );
}
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index 8ff20084f591..b446be7118fc 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -54,7 +54,7 @@
// static ----------------------------------------------------------------
-static USHORT pRanges[] =
+static sal_uInt16 pRanges[] =
{
SID_ATTR_POSTIT_AUTHOR,
SID_ATTR_POSTIT_TEXT,
@@ -65,8 +65,8 @@ static USHORT pRanges[] =
SvxPostItDialog::SvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
- BOOL bPrevNext,
- BOOL bRedline ) :
+ sal_Bool bPrevNext,
+ sal_Bool bRedline ) :
SfxModalDialog( pParent, CUI_RES( RID_SVXDLG_POSTIT ) ),
@@ -104,8 +104,8 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
aFont.SetWeight( WEIGHT_LIGHT );
aEditED.SetFont( aFont );
- BOOL bNew = TRUE;
- USHORT nWhich = 0;
+ sal_Bool bNew = sal_True;
+ sal_uInt16 nWhich = 0;
if ( !bPrevNext )
{
@@ -116,9 +116,9 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_AUTHOR );
String aAuthorStr, aDateStr, aTextStr;
- if ( rSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
{
- bNew = FALSE;
+ bNew = sal_False;
const SvxPostItAuthorItem& rAuthor =
(const SvxPostItAuthorItem&)rSet.Get( nWhich );
aAuthorStr = rAuthor.GetValue();
@@ -128,7 +128,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_DATE );
- if ( rSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
{
const SvxPostItDateItem& rDate =
(const SvxPostItDateItem&)rSet.Get( nWhich );
@@ -142,7 +142,7 @@ SvxPostItDialog::SvxPostItDialog( Window* pParent,
nWhich = rSet.GetPool()->GetWhich( SID_ATTR_POSTIT_TEXT );
- if ( rSet.GetItemState( nWhich, TRUE ) >= SFX_ITEM_AVAILABLE )
+ if ( rSet.GetItemState( nWhich, sal_True ) >= SFX_ITEM_AVAILABLE )
{
const SvxPostItTextItem& rText =
(const SvxPostItTextItem&)rSet.Get( nWhich );
@@ -181,14 +181,14 @@ void SvxPostItDialog::ShowLastAuthor(const String& rAuthor, const String& rDate)
// -----------------------------------------------------------------------
-USHORT* SvxPostItDialog::GetRanges()
+sal_uInt16* SvxPostItDialog::GetRanges()
{
return pRanges;
}
// -----------------------------------------------------------------------
-void SvxPostItDialog::EnableTravel(BOOL bNext, BOOL bPrev)
+void SvxPostItDialog::EnableTravel(sal_Bool bNext, sal_Bool bPrev)
{
aPrevBtn.Enable(bPrev);
aNextBtn.Enable(bNext);
@@ -230,7 +230,7 @@ IMPL_LINK( SvxPostItDialog, Stamp, Button *, EMPTYARG )
}
aStr += aLocaleWrapper.getDate(aDate);
aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ", " ) );
- aStr += aLocaleWrapper.getTime(aTime, FALSE, FALSE);
+ aStr += aLocaleWrapper.getTime(aTime, sal_False, sal_False);
aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( " ----\n" ) );
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 139ef0071d37..a2eb2cc9c001 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -166,7 +166,7 @@ void SFTreeListBox::deleteAllTree()
void SFTreeListBox::Init( const ::rtl::OUString& language )
{
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
deleteAllTree();
@@ -271,7 +271,7 @@ void SFTreeListBox::Init( const ::rtl::OUString& language )
0, true, std::auto_ptr< SFEntry >(new SFEntry( OBJTYPE_SFROOT, langEntries, xDocumentModel )), factoryURL );
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
Reference< XInterface >
@@ -369,7 +369,7 @@ void SFTreeListBox:: RequestSubEntries( SvLBoxEntry* pRootEntry, Reference< ::co
long SFTreeListBox::ExpandingHdl()
{
- return TRUE;
+ return sal_True;
}
void SFTreeListBox::ExpandAllTrees()
@@ -377,7 +377,7 @@ void SFTreeListBox::ExpandAllTrees()
}
SvLBoxEntry * SFTreeListBox::insertEntry(
- String const & rText, USHORT nBitmap, SvLBoxEntry * pParent,
+ String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent,
bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData, ::rtl::OUString factoryURL )
{
SvLBoxEntry * p;
@@ -403,7 +403,7 @@ SvLBoxEntry * SFTreeListBox::insertEntry(
}
SvLBoxEntry * SFTreeListBox::insertEntry(
- String const & rText, USHORT nBitmap, SvLBoxEntry * pParent,
+ String const & rText, sal_uInt16 nBitmap, SvLBoxEntry * pParent,
bool bChildrenOnDemand, std::auto_ptr< SFEntry > aUserData )
{
Image aHCImage, aImage;
@@ -474,7 +474,7 @@ void __EXPORT SFTreeListBox::ExpandedHdl()
// ----------------------------------------------------------------------------
// InputDialog ------------------------------------------------------------
// ----------------------------------------------------------------------------
-InputDialog::InputDialog(Window * pParent, USHORT nMode )
+InputDialog::InputDialog(Window * pParent, sal_uInt16 nMode )
: ModalDialog( pParent, CUI_RES( RID_DLG_NEWLIB ) ),
aText( this, CUI_RES( FT_NEWLIB ) ),
aEdit( this, CUI_RES( ED_LIBNAME ) ),
@@ -503,7 +503,7 @@ InputDialog::InputDialog(Window * pParent, USHORT nMode )
Size siz, newSiz;
long gap;
- USHORT style = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP |
+ sal_uInt16 style = TEXT_DRAW_MULTILINE | TEXT_DRAW_TOP |
TEXT_DRAW_LEFT | TEXT_DRAW_WORDBREAK;
// get dimensions of dialog instructions control
@@ -919,7 +919,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
{
::rtl::OUString aNewName;
::rtl::OUString aNewStdName;
- USHORT nMode = INPUTMODE_NEWLIB;
+ sal_uInt16 nMode = INPUTMODE_NEWLIB;
if( aScriptsBox.GetModel()->GetDepth( pEntry ) == 0 )
{
aNewStdName = ::rtl::OUString::createFromAscii( "Library" ) ;
@@ -931,8 +931,8 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
}
//do we need L10N for this? ie somethng like:
//String aNewStdName( ResId( STR_STDMODULENAME ) );
- BOOL bValid = FALSE;
- USHORT i = 1;
+ sal_Bool bValid = sal_False;
+ sal_uInt16 i = 1;
Sequence< Reference< browse::XBrowseNode > > childNodes;
// no children => ok to create Parcel1 or Script1 without checking
@@ -942,7 +942,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
{
aNewName = aNewStdName;
aNewName += String::CreateFromInt32( i );
- bValid = TRUE;
+ bValid = sal_True;
}
else
{
@@ -959,7 +959,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
{
aNewName = aNewStdName;
aNewName += String::CreateFromInt32( i );
- BOOL bFound = FALSE;
+ sal_Bool bFound = sal_False;
if(childNodes.getLength() > 0 )
{
::rtl::OUString nodeName = childNodes[0]->getName();
@@ -971,7 +971,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
{
if ( (aNewName+extn).equals( childNodes[index]->getName() ) )
{
- bFound = TRUE;
+ bFound = sal_True;
break;
}
}
@@ -981,7 +981,7 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
}
else
{
- bValid = TRUE;
+ bValid = sal_True;
}
}
@@ -993,12 +993,12 @@ void SvxScriptOrgDialog::createEntry( SvLBoxEntry* pEntry )
if ( xNewDlg->Execute() && xNewDlg->GetObjectName().Len() )
{
::rtl::OUString aUserSuppliedName = xNewDlg->GetObjectName();
- bValid = TRUE;
+ bValid = sal_True;
for( sal_Int32 index = 0; index < childNodes.getLength(); index++ )
{
if ( (aUserSuppliedName+extn).equals( childNodes[index]->getName() ) )
{
- bValid = FALSE;
+ bValid = sal_False;
String aError( m_createErrStr );
aError.Append( m_createDupStr );
ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError );
@@ -1108,24 +1108,24 @@ void SvxScriptOrgDialog::renameEntry( SvLBoxEntry* pEntry )
extn = aNewName.copy(extnPos);
aNewName = aNewName.copy(0,extnPos);
}
- USHORT nMode = INPUTMODE_RENAME;
+ sal_uInt16 nMode = INPUTMODE_RENAME;
std::auto_ptr< InputDialog > xNewDlg( new InputDialog( static_cast<Window*>(this), nMode ) );
xNewDlg->SetObjectName( aNewName );
- BOOL bValid;
+ sal_Bool bValid;
do
{
if ( xNewDlg->Execute() && xNewDlg->GetObjectName().Len() )
{
::rtl::OUString aUserSuppliedName = xNewDlg->GetObjectName();
- bValid = TRUE;
+ bValid = sal_True;
/*
for( sal_Int32 index = 0; index < childNodes.getLength(); index++ )
{
if ( (aUserSuppliedName+extn).equals( childNodes[index]->getName() ) )
{
- bValid = FALSE;
+ bValid = sal_False;
String aError( m_createErrStr );
aError.Append( m_createDupStr );
ErrorBox aErrorBox( static_cast<Window*>(this), WB_OK | RET_OK, aError );
@@ -1230,10 +1230,10 @@ void SvxScriptOrgDialog::deleteEntry( SvLBoxEntry* pEntry )
}
-BOOL SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps,
+sal_Bool SvxScriptOrgDialog::getBoolProperty( Reference< beans::XPropertySet >& xProps,
::rtl::OUString& propName )
{
- BOOL result = false;
+ sal_Bool result = false;
try
{
sal_Bool bTemp = sal_False;
@@ -1303,7 +1303,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
if( aStoredEntry.Len() <= 0 )
return;
SvLBoxEntry* pEntry = 0;
- USHORT nIndex = 0;
+ sal_uInt16 nIndex = 0;
while ( nIndex != STRING_NOTFOUND )
{
String aTmp( aStoredEntry.GetToken( 0, ';', nIndex ) );
diff --git a/cui/source/dialogs/sdrcelldlg.cxx b/cui/source/dialogs/sdrcelldlg.cxx
index 0018fe5ce410..de0393a3ca7b 100644
--- a/cui/source/dialogs/sdrcelldlg.cxx
+++ b/cui/source/dialogs/sdrcelldlg.cxx
@@ -67,7 +67,7 @@ SvxFormatCellsDialog::~SvxFormatCellsDialog()
{
}
-void SvxFormatCellsDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
+void SvxFormatCellsDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
{
switch( nId )
{
diff --git a/cui/source/dialogs/splitcelldlg.cxx b/cui/source/dialogs/splitcelldlg.cxx
index 1025d53c5b1f..e10abfa475d7 100644
--- a/cui/source/dialogs/splitcelldlg.cxx
+++ b/cui/source/dialogs/splitcelldlg.cxx
@@ -59,7 +59,7 @@ SvxSplitTableDlg::SvxSplitTableDlg( Window *pParent, bool bIsTableVertical, long
maVertBox.SetClickHdl( LINK( this, SvxSplitTableDlg, ClickHdl ));
if( mnMaxVertical < 2 )
- maVertBox.Enable(FALSE);
+ maVertBox.Enable(sal_False);
//exchange the meaning of horizontal and vertical for vertical text
if(bIsTableVertical)
diff --git a/cui/source/dialogs/srchxtra.cxx b/cui/source/dialogs/srchxtra.cxx
index 6c670fc08e69..7bae8669cfb2 100644
--- a/cui/source/dialogs/srchxtra.cxx
+++ b/cui/source/dialogs/srchxtra.cxx
@@ -86,7 +86,7 @@ SvxSearchFormatDialog::~SvxSearchFormatDialog()
// -----------------------------------------------------------------------
-void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
+void SvxSearchFormatDialog::PageCreated( sal_uInt16 nId, SfxTabPage& rPage )
{
switch ( nId )
{
@@ -127,7 +127,7 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
( (SvxParaAlignTabPage&)rPage ).EnableJustifyExt();
break;
case RID_SVXPAGE_BACKGROUND :
- ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(TRUE);
+ ( (SvxBackgroundTabPage&)rPage ).ShowParaControl(sal_True);
break;
}
}
@@ -136,7 +136,7 @@ void SvxSearchFormatDialog::PageCreated( USHORT nId, SfxTabPage& rPage )
SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
- const USHORT* pWhRanges ) :
+ const sal_uInt16* pWhRanges ) :
ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHATTR ) ),
@@ -163,21 +163,21 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
SfxItemPool& rPool = pSh->GetPool();
SfxItemSet aSet( rPool, pWhRanges );
SfxWhichIter aIter( aSet );
- USHORT nWhich = aIter.FirstWhich();
+ sal_uInt16 nWhich = aIter.FirstWhich();
while ( nWhich )
{
- USHORT nSlot = rPool.GetSlotId( nWhich );
+ sal_uInt16 nSlot = rPool.GetSlotId( nWhich );
if ( nSlot >= SID_SVX_START )
{
- BOOL bChecked = FALSE, bFound = FALSE;
- for ( USHORT i = 0; !bFound && i < rList.Count(); ++i )
+ sal_Bool bChecked = sal_False, bFound = sal_False;
+ for ( sal_uInt16 i = 0; !bFound && i < rList.Count(); ++i )
{
if ( nSlot == rList[i].nSlot )
{
- bFound = TRUE;
+ bFound = sal_True;
if ( IsInvalidItem( rList[i].pItem ) )
- bChecked = TRUE;
+ bChecked = sal_True;
}
}
@@ -196,7 +196,7 @@ SvxSearchAttributeDialog::SvxSearchAttributeDialog( Window* pParent,
if ( pEntry )
{
aAttrLB.SetCheckButtonState( pEntry, bChecked ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED );
- pEntry->SetUserData( (void*)(ULONG)nSlot );
+ pEntry->SetUserData( (void*)(sal_uLong)nSlot );
}
}
nWhich = aIter.NextWhich();
@@ -213,12 +213,12 @@ IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG )
SearchAttrItem aInvalidItem;
aInvalidItem.pItem = (SfxPoolItem*)-1;
- for ( USHORT i = 0; i < aAttrLB.GetEntryCount(); ++i )
+ for ( sal_uInt16 i = 0; i < aAttrLB.GetEntryCount(); ++i )
{
- USHORT nSlot = (USHORT)(ULONG)aAttrLB.GetEntryData(i);
- BOOL bChecked = aAttrLB.IsChecked(i);
+ sal_uInt16 nSlot = (sal_uInt16)(sal_uLong)aAttrLB.GetEntryData(i);
+ sal_Bool bChecked = aAttrLB.IsChecked(i);
- USHORT j;
+ sal_uInt16 j;
for ( j = rList.Count(); j; )
{
SearchAttrItem& rItem = rList[ --j ];
@@ -245,7 +245,7 @@ IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG )
}
// remove invalid items (pItem == NULL)
- for ( USHORT n = rList.Count(); n; )
+ for ( sal_uInt16 n = rList.Count(); n; )
if ( !rList[ --n ].pItem )
rList.Remove( n );
@@ -258,10 +258,10 @@ IMPL_LINK( SvxSearchAttributeDialog, OKHdl, Button *, EMPTYARG )
SvxSearchSimilarityDialog::SvxSearchSimilarityDialog
(
Window* pParent,
- BOOL bRelax,
- USHORT nOther,
- USHORT nShorter,
- USHORT nLonger
+ sal_Bool bRelax,
+ sal_uInt16 nOther,
+ sal_uInt16 nShorter,
+ sal_uInt16 nLonger
) :
ModalDialog( pParent, CUI_RES( RID_SVXDLG_SEARCHSIMILARITY ) ),
diff --git a/cui/source/dialogs/thesdlg.cxx b/cui/source/dialogs/thesdlg.cxx
index 5ad431567a72..fd8a6e56bf21 100755
--- a/cui/source/dialogs/thesdlg.cxx
+++ b/cui/source/dialogs/thesdlg.cxx
@@ -84,7 +84,7 @@ LookUpComboBox_Impl::LookUpComboBox_Impl(
m_aModifyTimer.SetTimeoutHdl( LINK( this, LookUpComboBox_Impl, ModifyTimer_Hdl ) );
m_aModifyTimer.SetTimeout( 500 );
- EnableAutocomplete( FALSE );
+ EnableAutocomplete( sal_False );
}
@@ -145,7 +145,7 @@ void ReplaceEdit_Impl::SetText( const XubString& rStr, const Selection& rNewSele
AlternativesString_Impl::AlternativesString_Impl(
ThesaurusAlternativesCtrl_Impl &rControl,
- SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr ) :
+ SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) :
//
SvLBoxString( pEntry, nFlags, rStr ),
m_rControlImpl( rControl )
@@ -154,7 +154,7 @@ AlternativesString_Impl::AlternativesString_Impl(
void AlternativesString_Impl::Paint(
const Point& rPos,
- SvLBox& rDev, USHORT,
+ SvLBox& rDev, sal_uInt16,
SvLBoxEntry* pEntry )
{
AlternativesExtraData* pData = m_rControlImpl.GetExtraData( pEntry );
@@ -367,7 +367,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
const sal_Int32 nMeanings = aMeanings.getLength();
const uno::Reference< linguistic2::XMeaning > *pMeanings = aMeanings.getConstArray();
- m_pAlternativesCT->SetUpdateMode( FALSE );
+ m_pAlternativesCT->SetUpdateMode( sal_False );
// clear old user data of control before creating new ones via AddEntry below
m_pAlternativesCT->ClearExtraData();
@@ -387,7 +387,7 @@ bool SvxThesaurusDialog_Impl::UpdateAlternativesBox_Impl()
m_pAlternativesCT->AddEntry( -1, pSynonyms[k], false );
}
- m_pAlternativesCT->SetUpdateMode( TRUE );
+ m_pAlternativesCT->SetUpdateMode( sal_True );
return nMeanings > 0;
}
@@ -419,7 +419,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, LanguageHdl_Impl, MenuButton *, pBtn )
PopupMenu *pMenu = aLangMBtn.GetPopupMenu();
if (pMenu && pBtn)
{
- USHORT nItem = pBtn->GetCurItemId();
+ sal_uInt16 nItem = pBtn->GetCurItemId();
String aLangText( pMenu->GetItemText( nItem ) );
LanguageType nLang = SvtLanguageTable().GetType( aLangText );
DBG_ASSERT( nLang != LANGUAGE_NONE && nLang != LANGUAGE_DONTKNOW, "failed to get language" );
@@ -457,7 +457,7 @@ IMPL_LINK( SvxThesaurusDialog_Impl, WordSelectHdl_Impl, ComboBox *, pBox )
{
if (pBox && !aWordCB.IsTravelSelect()) // act only upon return key and not when traveling with cursor keys
{
- USHORT nPos = pBox->GetSelectEntryPos();
+ sal_uInt16 nPos = pBox->GetSelectEntryPos();
String aStr( pBox->GetEntry( nPos ) );
aStr = linguistic::GetThesaurusReplaceText( aStr );
aWordCB.SetText( aStr );
@@ -704,7 +704,7 @@ SvxThesaurusDialog::SvxThesaurusDialog(
}
std::sort( aLangVec.begin(), aLangVec.end() );
for (size_t i = 0; i < aLangVec.size(); ++i)
- pMenu->InsertItem( (USHORT)i+1, aLangVec[i] ); // menu items should be enumerated from 1 and not 0
+ pMenu->InsertItem( (sal_uInt16)i+1, aLangVec[i] ); // menu items should be enumerated from 1 and not 0
m_pImpl->aLangMBtn.SetPopupMenu( pMenu );
SetWindowTitle( nLanguage );
diff --git a/cui/source/dialogs/thesdlg_impl.hxx b/cui/source/dialogs/thesdlg_impl.hxx
index b682c8d0c129..59de4406bf0d 100755
--- a/cui/source/dialogs/thesdlg_impl.hxx
+++ b/cui/source/dialogs/thesdlg_impl.hxx
@@ -134,9 +134,9 @@ class AlternativesString_Impl : public SvLBoxString
public:
AlternativesString_Impl( ThesaurusAlternativesCtrl_Impl &rControl,
- SvLBoxEntry* pEntry, USHORT nFlags, const String& rStr );
+ SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rStr );
- virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry);
+ virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry);
};
diff --git a/cui/source/dialogs/zoom.cxx b/cui/source/dialogs/zoom.cxx
index e838e94c0db6..f537e6b152b3 100644
--- a/cui/source/dialogs/zoom.cxx
+++ b/cui/source/dialogs/zoom.cxx
@@ -58,23 +58,23 @@
// static ----------------------------------------------------------------
-#define SPECIAL_FACTOR ((USHORT)0xFFFF)
+#define SPECIAL_FACTOR ((sal_uInt16)0xFFFF)
// class SvxZoomDialog ---------------------------------------------------
-USHORT SvxZoomDialog::GetFactor() const
+sal_uInt16 SvxZoomDialog::GetFactor() const
{
if ( a100Btn.IsChecked() )
return 100;
if ( aUserBtn.IsChecked() )
- return (USHORT)aUserEdit.GetValue();
+ return (sal_uInt16)aUserEdit.GetValue();
else
return SPECIAL_FACTOR;
}
// -----------------------------------------------------------------------
-void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId )
+void SvxZoomDialog::SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId )
{
aUserEdit.Disable();
@@ -117,7 +117,7 @@ void SvxZoomDialog::SetFactor( USHORT nNewFactor, USHORT nBtnId )
// -----------------------------------------------------------------------
-void SvxZoomDialog::HideButton( USHORT nBtnId )
+void SvxZoomDialog::HideButton( sal_uInt16 nBtnId )
{
switch ( nBtnId )
{
@@ -140,7 +140,7 @@ void SvxZoomDialog::HideButton( USHORT nBtnId )
// -----------------------------------------------------------------------
-void SvxZoomDialog::SetLimits( USHORT nMin, USHORT nMax )
+void SvxZoomDialog::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax )
{
DBG_ASSERT( nMin < nMax, "invalid limits" );
aUserEdit.SetMin( nMin );
@@ -177,7 +177,7 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
rSet ( rCoreSet ),
pOutSet ( NULL ),
- bModified ( FALSE )
+ bModified ( sal_False )
{
#if ENABLE_LAYOUT
@@ -205,9 +205,9 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
aUserEdit.SetModifyHdl( LINK( this, SvxZoomDialog, SpinHdl ) );
// Default-Werte
- USHORT nValue = 100;
- USHORT nMin = 10;
- USHORT nMax = 1000;
+ sal_uInt16 nValue = 100;
+ sal_uInt16 nMin = 10;
+ sal_uInt16 nMax = 1000;
// ggf. erst den alten Wert besorgen
const SfxUInt16Item* pOldUserItem = 0;
@@ -235,10 +235,10 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
if ( rItem.ISA(SvxZoomItem) )
{
const SvxZoomItem& rZoomItem = (const SvxZoomItem&)rItem;
- const USHORT nZoom = rZoomItem.GetValue();
+ const sal_uInt16 nZoom = rZoomItem.GetValue();
const SvxZoomType eType = rZoomItem.GetType();
- const USHORT nValSet = rZoomItem.GetValueSet();
- USHORT nBtnId = 0;
+ const sal_uInt16 nValSet = rZoomItem.GetValueSet();
+ sal_uInt16 nBtnId = 0;
switch ( eType )
{
@@ -269,14 +269,14 @@ SvxZoomDialog::SvxZoomDialog( Window* pParent, const SfxItemSet& rCoreSet ) :
}
else
{
- const USHORT nZoom = ( (const SfxUInt16Item&)rItem ).GetValue();
+ const sal_uInt16 nZoom = ( (const SfxUInt16Item&)rItem ).GetValue();
SetFactor( nZoom );
}
const SfxPoolItem* pViewLayoutItem = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, FALSE, &pViewLayoutItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_VIEWLAYOUT, sal_False, &pViewLayoutItem ) )
{
- const USHORT nColumns = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->GetValue();
+ const sal_uInt16 nColumns = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->GetValue();
const bool bBookMode = static_cast<const SvxViewLayoutItem*>(pViewLayoutItem)->IsBookMode();
if ( 0 == nColumns )
@@ -335,7 +335,7 @@ SvxZoomDialog::~SvxZoomDialog()
IMPL_LINK( SvxZoomDialog, UserHdl, RadioButton *, pBtn )
{
- bModified |= TRUE;
+ bModified |= sal_True;
if ( pBtn == &aUserBtn )
{
@@ -353,7 +353,7 @@ IMPL_LINK( SvxZoomDialog, SpinHdl, MetricField *, EMPTYARG )
{
if ( !aUserBtn.IsChecked() )
return 0;
- bModified |= TRUE;
+ bModified |= sal_True;
return 0;
}
@@ -361,7 +361,7 @@ IMPL_LINK( SvxZoomDialog, SpinHdl, MetricField *, EMPTYARG )
IMPL_LINK( SvxZoomDialog, ViewLayoutUserHdl, RadioButton *, pBtn )
{
- bModified |= TRUE;
+ bModified |= sal_True;
if ( pBtn == &aAutomaticBtn )
{
@@ -404,7 +404,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutSpinHdl, MetricField *, pEdt )
aBookModeChk.Disable();
}
- bModified |= TRUE;
+ bModified |= sal_True;
return 0;
}
@@ -416,7 +416,7 @@ IMPL_LINK( SvxZoomDialog, ViewLayoutCheckHdl, CheckBox *, pChk )
if ( pChk == &aBookModeChk && !aColumnsBtn.IsChecked() )
return 0;
- bModified |= TRUE;
+ bModified |= sal_True;
return 0;
}
@@ -432,7 +432,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn )
if ( &aOKBtn == pBtn )
{
- USHORT nFactor = GetFactor();
+ sal_uInt16 nFactor = GetFactor();
if ( SPECIAL_FACTOR == nFactor )
{
@@ -458,7 +458,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn )
}
else if ( aColumnsBtn.IsChecked() )
{
- aViewLayoutItem.SetValue( static_cast<USHORT>(aColumnsEdit.GetValue()) );
+ aViewLayoutItem.SetValue( static_cast<sal_uInt16>(aColumnsEdit.GetValue()) );
aViewLayoutItem.SetBookMode( aBookModeChk.IsChecked() );
}
}
@@ -479,7 +479,7 @@ IMPL_LINK( SvxZoomDialog, OKHdl, Button *, pBtn )
if ( pSh )
pSh->PutItem( SfxUInt16Item( SID_ATTR_ZOOM_USER,
- (UINT16)aUserEdit.GetValue() ) );
+ (sal_uInt16)aUserEdit.GetValue() ) );
EndDialog( RET_OK );
}
else
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 1f441d728d63..ee2266fc4c7c 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -204,7 +204,7 @@ IMPL_LINK( VclAbstractDialog2_Impl, EndDialogHdl, Dialog*, pDlg )
//////////////////////////////////////////////////////////////////////////
-void AbstractTabDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
@@ -214,7 +214,7 @@ const SfxItemSet* AbstractTabDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-const USHORT* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
@@ -394,7 +394,7 @@ Reference < com::sun::star::embed::XEmbeddedObject > AbstractInsertObjectDialog_
return pDlg->GetObject();
}
-BOOL AbstractInsertObjectDialog_Impl::IsCreateNew()
+sal_Bool AbstractInsertObjectDialog_Impl::IsCreateNew()
{
return pDlg->IsCreateNew();
}
@@ -414,7 +414,7 @@ void AbstractPasteDialog_Impl::SetObjName( const SvGlobalName & rClass, const St
pDlg->SetObjName( rClass, rObjName );
}
-ULONG AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper,
+sal_uLong AbstractPasteDialog_Impl::GetFormat( const TransferableDataHelper& aHelper,
const DataFlavorExVector* pFormats,
const TransferableObjectDescriptor* pDesc )
{
@@ -426,12 +426,12 @@ void AbstractFmShowColsDialog_Impl::SetColumns(const ::Reference< ::com::sun::s
pDlg->SetColumns(xCols);
}
-void AbstractSvxZoomDialog_Impl::SetLimits( USHORT nMin, USHORT nMax )
+void AbstractSvxZoomDialog_Impl::SetLimits( sal_uInt16 nMin, sal_uInt16 nMax )
{
pDlg->SetLimits( nMin, nMax );
}
-void AbstractSvxZoomDialog_Impl::HideButton( USHORT nBtnId )
+void AbstractSvxZoomDialog_Impl::HideButton( sal_uInt16 nBtnId )
{
pDlg->HideButton( nBtnId );
}
@@ -515,7 +515,7 @@ String AbstractTitleDialog_Impl::GetTitle() const
return pDlg->GetTitle();
}
-ULONG AbstractGalleryIdDialog_Impl::GetId() const
+sal_uLong AbstractGalleryIdDialog_Impl::GetId() const
{
return pDlg->GetId();
}
@@ -555,7 +555,7 @@ String AbstractURLDlg_Impl::GetName() const
return pDlg->GetName();
}
-void AbstractSvxHlinkDlgMarkWnd_Impl::Hide( USHORT nFlags )
+void AbstractSvxHlinkDlgMarkWnd_Impl::Hide( sal_uInt16 nFlags )
{
((Window*)pDlg)->Hide( nFlags );
}
@@ -570,22 +570,22 @@ Size AbstractSvxHlinkDlgMarkWnd_Impl::GetSizePixel() const
return pDlg->GetSizePixel();
}
-BOOL AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const
+sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::IsVisible( ) const
{
return (( Window* )pDlg)->IsVisible();
}
-void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( USHORT nFlags )
+void AbstractSvxHlinkDlgMarkWnd_Impl::Invalidate( sal_uInt16 nFlags )
{
(( Window* )pDlg)->Invalidate(nFlags);
}
-BOOL AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const
+sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::MoveTo( Point aNewPos )const
{
return pDlg->MoveTo(aNewPos);
}
-BOOL AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog( BOOL bDoit )const
+sal_Bool AbstractSvxHlinkDlgMarkWnd_Impl::ConnectToDialog( sal_Bool bDoit )const
{
return pDlg->ConnectToDialog(bDoit);
}
@@ -600,33 +600,33 @@ void AbstractSvxHlinkDlgMarkWnd_Impl::SelectEntry ( String aStrMark )
pDlg->SelectEntry(aStrMark);
}
-USHORT AbstractSvxHlinkDlgMarkWnd_Impl::SetError( USHORT nError)
+sal_uInt16 AbstractSvxHlinkDlgMarkWnd_Impl::SetError( sal_uInt16 nError)
{
return pDlg->SetError(nError);
}
-USHORT AbstractSvxSearchSimilarityDialog_Impl::GetOther()
+sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetOther()
{
return pDlg->GetOther();
}
-USHORT AbstractSvxSearchSimilarityDialog_Impl::GetShorter()
+sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetShorter()
{
return pDlg->GetShorter();
}
-USHORT AbstractSvxSearchSimilarityDialog_Impl::GetLonger()
+sal_uInt16 AbstractSvxSearchSimilarityDialog_Impl::GetLonger()
{
return pDlg-> GetLonger();
}
-BOOL AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
+sal_Bool AbstractSvxSearchSimilarityDialog_Impl::IsRelaxed()
{
return pDlg-> IsRelaxed();
}
// AbstractSvxTransformTabDialog implementations just forwards everything to the dialog
-void AbstractSvxTransformTabDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractSvxTransformTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
@@ -635,7 +635,7 @@ const SfxItemSet* AbstractSvxTransformTabDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
//
-const USHORT* AbstractSvxTransformTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractSvxTransformTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
@@ -659,7 +659,7 @@ void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link& rL
}
// AbstractSvxCaptionDialog implementations just forwards everything to the dialog
-void AbstractSvxCaptionDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractSvxCaptionDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
@@ -668,7 +668,7 @@ const SfxItemSet* AbstractSvxCaptionDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
//
-const USHORT* AbstractSvxCaptionDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractSvxCaptionDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
@@ -691,7 +691,7 @@ void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link& rLink )
pDlg->SetValidateFramePosLink( rLink );
}
-INT32 AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFlags() const
+sal_Int32 AbstractSvxJSearchOptionsDialog_Impl::GetTransliterationFlags() const
{
return pDlg->GetTransliterationFlags();
}
@@ -783,7 +783,7 @@ void AbstractSvxObjectTitleDescDialog_Impl::GetDescription(String& rDescription)
pDlg->GetDescription(rDescription);
}
-void AbstractSvxMessDialog_Impl::SetButtonText( USHORT nBtnId, const String& rNewTxt )
+void AbstractSvxMessDialog_Impl::SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt )
{
pDlg->SetButtonText( nBtnId, rNewTxt );
}
@@ -878,7 +878,7 @@ Graphic AbstractGraphicFilterDialog_Impl::GetFilteredGraphic( const Graphic& rGr
}
// AbstractSvxAreaTabDialog implementations just forwards everything to the dialog
-void AbstractSvxAreaTabDialog_Impl::SetCurPageId( USHORT nId )
+void AbstractSvxAreaTabDialog_Impl::SetCurPageId( sal_uInt16 nId )
{
pDlg->SetCurPageId( nId );
}
@@ -888,7 +888,7 @@ const SfxItemSet* AbstractSvxAreaTabDialog_Impl::GetOutputItemSet() const
return pDlg->GetOutputItemSet();
}
-const USHORT* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
+const sal_uInt16* AbstractSvxAreaTabDialog_Impl::GetInputRanges(const SfxItemPool& pItem )
{
return pDlg->GetInputRanges( pItem );
}
@@ -920,7 +920,7 @@ const SfxItemSet* AbstractSvxPostItDialog_Impl::GetOutputItemSet() const
{
return pDlg->GetOutputItemSet();
}
-void AbstractSvxPostItDialog_Impl::EnableTravel(BOOL bNext, BOOL bPrev)
+void AbstractSvxPostItDialog_Impl::EnableTravel(sal_Bool bNext, sal_Bool bPrev)
{
pDlg->EnableTravel( bNext, bPrev );
}
@@ -944,11 +944,11 @@ void AbstractSvxPostItDialog_Impl::HideAuthor()
{
pDlg->HideAuthor();
}
-void AbstractSvxPostItDialog_Impl::SetReadonlyPostIt(BOOL bDisable)
+void AbstractSvxPostItDialog_Impl::SetReadonlyPostIt(sal_Bool bDisable)
{
pDlg->SetReadonlyPostIt( bDisable );
}
-BOOL AbstractSvxPostItDialog_Impl::IsOkEnabled() const
+sal_Bool AbstractSvxPostItDialog_Impl::IsOkEnabled() const
{
return pDlg->IsOkEnabled();
}
@@ -1131,7 +1131,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTextTabDialog( Window* p
//TabDialog that use functionality of the drawing layer and add AnchorTypes -- for SvxCaptionTabDialog CHINA001
AbstractSvxCaptionDialog* AbstractDialogFactory_Impl::CreateCaptionDialog( Window* pParent,
const SdrView* pView,
- USHORT nAnchorTypes )
+ sal_uInt16 nAnchorTypes )
{
SvxCaptionTabDialog* pDlg = new SvxCaptionTabDialog( pParent, pView, nAnchorTypes );
return new AbstractSvxCaptionDialog_Impl( pDlg );
@@ -1219,7 +1219,7 @@ AbstractDialogFactory_Impl::CreateScriptErrorDialog(
AbstractScriptSelectorDialog*
AbstractDialogFactory_Impl::CreateScriptSelectorDialog(
- Window* pParent, BOOL bShowSlots, const Reference< frame::XFrame >& _rxFrame )
+ Window* pParent, sal_Bool bShowSlots, const Reference< frame::XFrame >& _rxFrame )
{
SvxScriptSelectorDialog* pDlg = NULL;
@@ -1315,7 +1315,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( sal_uInt32 nResI
switch ( nResId )
{
case RID_SVXDLG_CHARMAP :
- pDlg = new SvxCharacterMap( pParent, TRUE, pAttrSet );
+ pDlg = new SvxCharacterMap( pParent, sal_True, pAttrSet );
break;
default:
break;
@@ -1347,17 +1347,17 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateTabItemDialog( Window* p
VclAbstractDialog* AbstractDialogFactory_Impl::CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
- const USHORT* pWhRanges )
+ const sal_uInt16* pWhRanges )
{
Dialog* pDlg = new SvxSearchAttributeDialog( pParent, rLst, pWhRanges);
return new VclAbstractDialog_Impl( pDlg );
}
AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchSimilarityDialog( Window* pParent,
- BOOL bRelax,
- USHORT nOther,
- USHORT nShorter,
- USHORT nLonger)
+ sal_Bool bRelax,
+ sal_uInt16 nOther,
+ sal_uInt16 nShorter,
+ sal_uInt16 nLonger)
{
SvxSearchSimilarityDialog* pDlg = new SvxSearchSimilarityDialog( pParent, bRelax, nOther, nShorter, nLonger );
if ( pDlg )
@@ -1367,7 +1367,7 @@ AbstractSvxSearchSimilarityDialog * AbstractDialogFactory_Impl::CreateSvxSearchS
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg( Window* pParent,
const SfxItemSet& rCoreSet,
- BOOL bEnableSelector)
+ sal_Bool bEnableSelector)
{
SfxTabDialog* pDlg = new SvxBorderBackgroundDlg( pParent, rCoreSet, bEnableSelector);
return new AbstractTabDialog_Impl( pDlg );
@@ -1376,7 +1376,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxBorderBackgroundDlg(
AbstractSvxTransformTabDialog* AbstractDialogFactory_Impl::CreateSvxTransformTabDialog( Window* pParent,
const SfxItemSet* pAttr,
const SdrView* pView,
- USHORT nAnchorTypes )
+ sal_uInt16 nAnchorTypes )
{
SvxTransformTabDialog* pDlg = new SvxTransformTabDialog( pParent, pAttr,pView, nAnchorTypes);
return new AbstractSvxTransformTabDialog_Impl( pDlg );
@@ -1416,7 +1416,7 @@ SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSchTransformTabDialog( W
AbstractSvxJSearchOptionsDialog * AbstractDialogFactory_Impl::CreateSvxJSearchOptionsDialog( Window* pParent,
const SfxItemSet& rOptionsSet,
- INT32 nInitialFlags)
+ sal_Int32 nInitialFlags)
{
SvxJSearchOptionsDialog* pDlg = new SvxJSearchOptionsDialog( pParent, rOptionsSet, nInitialFlags );
return new AbstractSvxJSearchOptionsDialog_Impl( pDlg );
@@ -1502,13 +1502,13 @@ AbstractSvxMessDialog * AbstractDialogFactory_Impl::CreateSvxMessDialog( Window*
return 0;
}
-AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed )
+AbstractSvxMultiPathDialog * AbstractDialogFactory_Impl::CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed )
{
SvxMultiPathDialog* pDlg = new SvxMultiPathDialog( pParent, bEmptyAllowed );
return new AbstractSvxMultiPathDialog_Impl( pDlg );
}
-AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed )
+AbstractSvxMultiFileDialog * AbstractDialogFactory_Impl::CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed )
{
SvxMultiFileDialog* pDlg = new SvxMultiFileDialog( pParent, bEmptyAllowed );
return new AbstractSvxMultiFileDialog_Impl( pDlg );
@@ -1556,7 +1556,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterEmb
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPosterSepia (Window* pParent,
const Graphic& rGraphic,
- USHORT nCount,
+ sal_uInt16 nCount,
sal_uInt32 nResId)
{
GraphicFilterDialog* pDlg=NULL;
@@ -1580,7 +1580,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterPos
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
const Graphic& rGraphic,
- BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 )
+ sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 )
{
GraphicFilterDialog* pDlg = new GraphicFilterSolarize( pParent, rGraphic, nGreyThreshold, bInvert );
return new AbstractGraphicFilterDialog_Impl( pDlg );
@@ -1588,7 +1588,7 @@ AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterSol
AbstractGraphicFilterDialog * AbstractDialogFactory_Impl::CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges,
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges,
sal_uInt32 nResId)
{
GraphicFilterDialog* pDlg=NULL;
@@ -1618,7 +1618,7 @@ AbstractSvxAreaTabDialog* AbstractDialogFactory_Impl::CreateSvxAreaTabDialog( Wi
SfxAbstractTabDialog* AbstractDialogFactory_Impl::CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add forSvxLineTabDialog
SdrModel* pModel,
const SdrObject* pObj ,
- BOOL bHasObj)
+ sal_Bool bHasObj)
{
SfxTabDialog* pDlg = new SvxLineTabDialog( pParent, pAttr, pModel,pObj,bHasObj );
return new AbstractTabDialog_Impl( pDlg );
@@ -1640,7 +1640,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
pDlg = new SvxShortcutAssignDlg( pParent, _rxDocumentFrame, rAttr );
break;
case RID_SVXDLG_CHARMAP :
- pDlg = new SvxCharacterMap( pParent, TRUE, &rAttr );
+ pDlg = new SvxCharacterMap( pParent, sal_True, &rAttr );
break;
default:
break;
@@ -1688,7 +1688,7 @@ SfxAbstractDialog* AbstractDialogFactory_Impl::CreateSfxDialog( Window* pParent,
AbstractSvxPostItDialog* AbstractDialogFactory_Impl::CreateSvxPostItDialog( Window* pParent,
const SfxItemSet& rCoreSet,
- BOOL bPrevNext, BOOL bRedline )
+ sal_Bool bPrevNext, sal_Bool bRedline )
{
SvxPostItDialog* pDlg = new SvxPostItDialog( pParent, rCoreSet, bPrevNext, bRedline );
return new AbstractSvxPostItDialog_Impl( pDlg );
@@ -1730,7 +1730,7 @@ VclAbstractDialog * AbstractDialogFactory_Impl::CreateSvxMacroAssignDlg(
}
// Factories for TabPages
-CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( USHORT nId )
+CreateTabPage AbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nId )
{
switch ( nId )
{
@@ -1816,7 +1816,7 @@ CreateSvxDistributePage AbstractDialogFactory_Impl::GetSvxDistributePageCreatorF
return SvxDistributePage::Create;
}
-DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId )
+DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( sal_uInt16 nId )
{
switch ( nId )
{
@@ -1828,7 +1828,7 @@ DialogGetRanges AbstractDialogFactory_Impl::GetDialogGetRangesFunc( USHORT nId )
return 0;
}
-GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( USHORT nId )
+GetTabPageRanges AbstractDialogFactory_Impl::GetTabPageRangesFunc( sal_uInt16 nId )
{
switch ( nId )
{
@@ -1928,7 +1928,7 @@ SfxAbstractPasteDialog* AbstractDialogFactory_Impl::CreatePasteDialog( Window* p
return new AbstractPasteDialog_Impl( new SvPasteObjectDialog( pParent ) );
}
-SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p)
+SfxAbstractLinksDialog* AbstractDialogFactory_Impl::CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p)
{
SvBaseLinksDlg* pLinkDlg = new SvBaseLinksDlg( pParent, pMgr, bHTML );
if ( p )
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index b68e10c25cdd..e38b9af1113e 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -79,7 +79,7 @@ public: \
{} \
virtual ~Class(); \
virtual short Execute() ;
-// virtual void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 )
+// virtual void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 )
#define IMPL_ABSTDLG_BASE(Class) \
Class::~Class() \
@@ -133,9 +133,9 @@ class AbstractSfxDialog_Impl : public SfxAbstractDialog
class AbstractTabDialog_Impl : public SfxAbstractTabDialog
{
DECL_ABSTDLG_BASE(AbstractTabDialog_Impl,SfxTabDialog)
- virtual void SetCurPageId( USHORT nId );
+ virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem ); //add by CHINA001
virtual void SetInputSet( const SfxItemSet* pInSet ); //add by CHINA001
//From class Window.
virtual void SetText( const XubString& rStr ); //add by CHINA001
@@ -215,8 +215,8 @@ class SvxZoomDialog;
class AbstractSvxZoomDialog_Impl : public AbstractSvxZoomDialog
{
DECL_ABSTDLG_BASE(AbstractSvxZoomDialog_Impl,SvxZoomDialog)
- virtual void SetLimits( USHORT nMin, USHORT nMax );
- virtual void HideButton( USHORT nBtnId );
+ virtual void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax );
+ virtual void HideButton( sal_uInt16 nBtnId );
virtual const SfxItemSet* GetOutputItemSet() const ;
};
@@ -289,7 +289,7 @@ class GalleryIdDialog;
class AbstractGalleryIdDialog_Impl : public AbstractGalleryIdDialog
{
DECL_ABSTDLG_BASE(AbstractGalleryIdDialog_Impl,GalleryIdDialog)
- virtual ULONG GetId() const ;
+ virtual sal_uLong GetId() const ;
};
//for GalleryIdDialog end
@@ -312,16 +312,16 @@ class SvxHlinkDlgMarkWnd;
class AbstractSvxHlinkDlgMarkWnd_Impl : public AbstractSvxHlinkDlgMarkWnd
{
DECL_ABSTDLG_BASE(AbstractSvxHlinkDlgMarkWnd_Impl,SvxHlinkDlgMarkWnd)
- virtual void Hide( USHORT nFlags = 0 );
- virtual BOOL IsVisible() const ;
- virtual void Invalidate( USHORT nFlags = 0 );
+ virtual void Hide( sal_uInt16 nFlags = 0 );
+ virtual sal_Bool IsVisible() const ;
+ virtual void Invalidate( sal_uInt16 nFlags = 0 );
virtual void SetSizePixel( const Size& rNewSize );
virtual Size GetSizePixel() const;
- virtual BOOL MoveTo ( Point aNewPos )const;
- virtual BOOL ConnectToDialog( BOOL bDoit = TRUE )const;
+ virtual sal_Bool MoveTo ( Point aNewPos )const;
+ virtual sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True )const;
virtual void RefreshTree ( String aStrURL ) ;
virtual void SelectEntry ( String aStrMark );
- virtual USHORT SetError( USHORT nError) ;
+ virtual sal_uInt16 SetError( sal_uInt16 nError) ;
};
//for SvxHlinkDlgMarkWnd end
@@ -331,10 +331,10 @@ class SvxSearchSimilarityDialog;
class AbstractSvxSearchSimilarityDialog_Impl :public AbstractSvxSearchSimilarityDialog
{
DECL_ABSTDLG_BASE(AbstractSvxSearchSimilarityDialog_Impl,SvxSearchSimilarityDialog)
- virtual USHORT GetOther();
- virtual USHORT GetShorter();
- virtual USHORT GetLonger();
- virtual BOOL IsRelaxed();
+ virtual sal_uInt16 GetOther();
+ virtual sal_uInt16 GetShorter();
+ virtual sal_uInt16 GetLonger();
+ virtual sal_Bool IsRelaxed();
};
//for SvxSearchSimilarityDialog end
@@ -343,7 +343,7 @@ class SvxJSearchOptionsDialog;
class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDialog
{
DECL_ABSTDLG_BASE(AbstractSvxJSearchOptionsDialog_Impl,SvxJSearchOptionsDialog)
- virtual INT32 GetTransliterationFlags() const;
+ virtual sal_Int32 GetTransliterationFlags() const;
};
//for SvxJSearchOptionsDialog end
@@ -351,9 +351,9 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
virtual void SetValidateFramePosLink( const Link& rLink );
- virtual void SetCurPageId( USHORT nId );
+ virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
virtual void SetText( const XubString& rStr );
virtual String GetText() const;
@@ -362,9 +362,9 @@ class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
virtual void SetValidateFramePosLink( const Link& rLink );
- virtual void SetCurPageId( USHORT nId );
+ virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
virtual void SetText( const XubString& rStr );
virtual String GetText() const;
@@ -438,7 +438,7 @@ class SvxMessDialog;
class AbstractSvxMessDialog_Impl :public AbstractSvxMessDialog
{
DECL_ABSTDLG_BASE(AbstractSvxMessDialog_Impl,SvxMessDialog)
- virtual void SetButtonText( USHORT nBtnId, const String& rNewTxt );
+ virtual void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt );
};
//for SvxMessDialog end
@@ -508,9 +508,9 @@ class SvxAreaTabDialog;
class AbstractSvxAreaTabDialog_Impl :public AbstractSvxAreaTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxAreaTabDialog_Impl,SvxAreaTabDialog)
- virtual void SetCurPageId( USHORT nId );
+ virtual void SetCurPageId( sal_uInt16 nId );
virtual const SfxItemSet* GetOutputItemSet() const;
- virtual const USHORT* GetInputRanges( const SfxItemPool& pItem );
+ virtual const sal_uInt16* GetInputRanges( const SfxItemPool& pItem );
virtual void SetInputSet( const SfxItemSet* pInSet );
//From class Window.
virtual void SetText( const XubString& rStr );
@@ -524,7 +524,7 @@ class AbstractInsertObjectDialog_Impl : public SfxAbstractInsertObjectDialog
DECL_ABSTDLG_BASE(AbstractInsertObjectDialog_Impl, InsertObjectDialog_Impl)
virtual com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject();
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType );
- virtual BOOL IsCreateNew();
+ virtual sal_Bool IsCreateNew();
};
class AbstractPasteDialog_Impl : public SfxAbstractPasteDialog
@@ -533,7 +533,7 @@ public:
DECL_ABSTDLG_BASE(AbstractPasteDialog_Impl, SvPasteObjectDialog )
virtual void Insert( SotFormatStringId nFormat, const String & rFormatName );
virtual void SetObjName( const SvGlobalName & rClass, const String & rObjName );
- virtual ULONG GetFormat( const TransferableDataHelper& aHelper,
+ virtual sal_uLong GetFormat( const TransferableDataHelper& aHelper,
const DataFlavorExVector* pFormats=0,
const TransferableObjectDescriptor* pDesc=0 );
};
@@ -554,14 +554,14 @@ class AbstractSvxPostItDialog_Impl :public AbstractSvxPostItDialog
virtual const SfxItemSet* GetOutputItemSet() const;
virtual void SetPrevHdl( const Link& rLink ) ;
virtual void SetNextHdl( const Link& rLink ) ;
- virtual void EnableTravel(BOOL bNext, BOOL bPrev) ;
+ virtual void EnableTravel(sal_Bool bNext, sal_Bool bPrev) ;
virtual String GetNote() ;
virtual void SetNote(const String& rTxt) ;
virtual void ShowLastAuthor(const String& rAuthor, const String& rDate) ;
virtual void DontChangeAuthor() ;
virtual void HideAuthor() ;
- virtual void SetReadonlyPostIt(BOOL bDisable) ;
- virtual BOOL IsOkEnabled() const ;
+ virtual void SetReadonlyPostIt(sal_Bool bDisable) ;
+ virtual sal_Bool IsOkEnabled() const ;
virtual Window * GetWindow();
private:
Link aNextHdl;
@@ -626,7 +626,7 @@ public:
sal_uInt32 nResId); //add by CHINA001
virtual AbstractSvxCaptionDialog* CreateCaptionDialog( Window* pParent,
const SdrView* pView,
- USHORT nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001
+ sal_uInt16 nAnchorTypes = 0 ); //add for SvxCaptionTabDialog CHINA001
virtual AbstractSvxDistributeDialog* CreateSvxDistributeDialog(Window* pParent,
const SfxItemSet& rAttr,
SvxDistributeHorizontal eHor = SvxDistributeHorizontalNone,
@@ -637,7 +637,7 @@ public:
virtual VclAbstractDialog* CreateEditObjectDialog( Window* pParent, const rtl::OUString& rCommmand,
const com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject >& xObj );
virtual SfxAbstractPasteDialog* CreatePasteDialog( Window* pParent );
- virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, BOOL bHTML, sfx2::SvBaseLink* p=0 );
+ virtual SfxAbstractLinksDialog* CreateLinksDialog( Window* pParent, sfx2::LinkManager* pMgr, sal_Bool bHTML, sfx2::SvBaseLink* p=0 );
virtual AbstractHangulHanjaConversionDialog * CreateHangulHanjaConversionDialog( Window* _pParent, //add for HangulHanjaConversionDialog CHINA001
editeng::HangulHanjaConversion::ConversionDirection _ePrimaryDirection );
@@ -654,11 +654,11 @@ public:
const SfxItemSet& rCoreSet);
virtual SfxAbstractTabDialog* CreateSvxBorderBackgroundDlg( Window* pParent, //add for SvxBorderBackgroundDlg
const SfxItemSet& rCoreSet,
- BOOL bEnableSelector = FALSE) ;
+ sal_Bool bEnableSelector = sal_False) ;
virtual AbstractSvxTransformTabDialog* CreateSvxTransformTabDialog( Window* pParent, //add for SvxTransformTabDialog
const SfxItemSet* pAttr,
const SdrView* pView,
- USHORT nAnchorTypes = 0) ;
+ sal_uInt16 nAnchorTypes = 0) ;
virtual SfxAbstractTabDialog* CreateSchTransformTabDialog( Window* pParent, //add for SchTransformTabDialog
const SfxItemSet* pAttr,
const SdrView* pSdrView,
@@ -694,15 +694,15 @@ public:
virtual VclAbstractDialog* CreateSvxSearchAttributeDialog( Window* pParent,
SearchAttrItemList& rLst,
- const USHORT* pWhRanges);
+ const sal_uInt16* pWhRanges);
virtual AbstractSvxSearchSimilarityDialog * CreateSvxSearchSimilarityDialog( Window* pParent,
- BOOL bRelax,
- USHORT nOther,
- USHORT nShorter,
- USHORT nLonger); //add for SvxSearchSimilarityDialog
+ sal_Bool bRelax,
+ sal_uInt16 nOther,
+ sal_uInt16 nShorter,
+ sal_uInt16 nLonger); //add for SvxSearchSimilarityDialog
virtual AbstractSvxJSearchOptionsDialog * CreateSvxJSearchOptionsDialog( Window* pParent,
const SfxItemSet& rOptionsSet,
- INT32 nInitialFlags);
+ sal_Int32 nInitialFlags);
virtual AbstractFmInputRecordNoDialog * CreateFmInputRecordNoDialog( Window* pParent );
virtual AbstractSvxNewDictionaryDialog* CreateSvxNewDictionaryDialog( Window* pParent,
::com::sun::star::uno::Reference< ::com::sun::star::linguistic2::XSpellChecker1 > &xSpl,
@@ -720,8 +720,8 @@ public:
virtual AbstractSvxMessDialog * CreateSvxMessDialog( Window* pParent, sal_uInt32 nResId,
const String& rText, const String& rDesc,
Image* pImg = NULL ); //add for SvxMessDialog
- virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiPathDialog
- virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE ); //add for SvxMultiFileDialog
+ virtual AbstractSvxMultiPathDialog * CreateSvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); //add for SvxMultiPathDialog
+ virtual AbstractSvxMultiFileDialog * CreateSvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False ); //add for SvxMultiFileDialog
virtual AbstractSvxHpLinkDlg * CreateSvxHpLinkDlg (Window* pParent, //add for SvxHpLink
SfxBindings* pBindings,
sal_uInt32 nResId);
@@ -735,14 +735,14 @@ public:
RECT_POINT eLightSource, sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterPosterSepia (Window* pParent, //add for GraphicFilterPoster & GraphicFilterSepia
const Graphic& rGraphic,
- USHORT nCount,
+ sal_uInt16 nCount,
sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterSolarize (Window* pParent, //add for GraphicFilterSolarize
const Graphic& rGraphic,
- BYTE nGreyThreshold, BOOL bInvert, sal_uInt32 nResId);
+ sal_uInt8 nGreyThreshold, sal_Bool bInvert, sal_uInt32 nResId);
virtual AbstractGraphicFilterDialog * CreateGraphicFilterMosaic (Window* pParent, //add for GraphicFilterMosaic
const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges, sal_uInt32 nResId);
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges, sal_uInt32 nResId);
virtual AbstractSvxAreaTabDialog* CreateSvxAreaTabDialog( Window* pParent,//add for SvxAreaTabDialog
const SfxItemSet* pAttr,
SdrModel* pModel,
@@ -750,23 +750,23 @@ public:
virtual SfxAbstractTabDialog* CreateSvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr, //add for SvxLineTabDialog
SdrModel* pModel,
const SdrObject* pObj = NULL,
- BOOL bHasObj = TRUE );
+ sal_Bool bHasObj = sal_True );
virtual AbstractSvxPostItDialog* CreateSvxPostItDialog( Window* pParent, //add for SvxPostItDialog
const SfxItemSet& rCoreSet,
- BOOL bPrevNext = FALSE, BOOL bRedline = FALSE );
+ sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False );
// For TabPage
- virtual CreateTabPage GetTabPageCreatorFunc( USHORT nId );
+ virtual CreateTabPage GetTabPageCreatorFunc( sal_uInt16 nId );
virtual CreateSvxDistributePage GetSvxDistributePageCreatorFunc();
- virtual GetTabPageRanges GetTabPageRangesFunc( USHORT nId );
- virtual DialogGetRanges GetDialogGetRangesFunc( USHORT nId ); //add for SvxPostItDialog
+ virtual GetTabPageRanges GetTabPageRangesFunc( sal_uInt16 nId );
+ virtual DialogGetRanges GetDialogGetRangesFunc( sal_uInt16 nId ); //add for SvxPostItDialog
virtual VclAbstractDialog* CreateSvxScriptOrgDialog( Window* pParent, const String& rLanguage );
virtual AbstractScriptSelectorDialog*
CreateScriptSelectorDialog(
Window* pParent,
- BOOL bShowSlots,
+ sal_Bool bShowSlots,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& _rxFrame
);
diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 8d233b71e890..a5cf23069c37 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -74,9 +74,9 @@ class SentenceEditWindow_Impl : public MultiLineEdit/*, public SfxListener*/
using MultiLineEdit::SetText;
private:
- std::set< USHORT > m_aIgnoreErrorsAt;
- USHORT m_nErrorStart;
- USHORT m_nErrorEnd;
+ std::set< sal_uInt16 > m_aIgnoreErrorsAt;
+ sal_uInt16 m_nErrorStart;
+ sal_uInt16 m_nErrorEnd;
bool m_bIsUndoEditMode;
Link m_aModifyLink;
@@ -93,12 +93,12 @@ public:
void SetModifyHdl(const Link& rLink) { m_aModifyLink = rLink;}
- void SetAttrib( const TextAttrib& rAttr, ULONG nPara, USHORT nStart, USHORT nEnd );
+ void SetAttrib( const TextAttrib& rAttr, sal_uLong nPara, sal_uInt16 nStart, sal_uInt16 nEnd );
void SetText( const String& rStr );
bool MarkNextError( bool bIgnoreCurrentError );
void ChangeMarkedWord(const String& rNewWord, LanguageType eLanguage);
- void MoveErrorMarkTo(USHORT nErrorStart, USHORT nErrorEnd, bool bGrammar);
+ void MoveErrorMarkTo(sal_uInt16 nErrorStart, sal_uInt16 nErrorEnd, bool bGrammar);
String GetErrorText() const;
void RestoreCurrentError();
@@ -108,8 +108,8 @@ public:
const SpellErrorDescription* GetAlternatives();
- void ResetModified() { GetTextEngine()->SetModified(FALSE); m_bIsUndoEditMode = false;}
- BOOL IsModified() const { return GetTextEngine()->IsModified(); }
+ void ResetModified() { GetTextEngine()->SetModified(sal_False); m_bIsUndoEditMode = false;}
+ sal_Bool IsModified() const { return GetTextEngine()->IsModified(); }
bool IsUndoEditMode() const { return m_bIsUndoEditMode;}
void SetUndoEditMode(bool bSet);
@@ -118,10 +118,10 @@ public:
void ResetUndo();
void Undo();
- void AddUndoAction( SfxUndoAction *pAction, BOOL bTryMerg=FALSE );
- USHORT GetUndoActionCount();
- void UndoActionStart( USHORT nId );
- void UndoActionEnd( USHORT nId );
+ void AddUndoAction( SfxUndoAction *pAction, sal_Bool bTryMerg=sal_False );
+ sal_uInt16 GetUndoActionCount();
+ void UndoActionStart( sal_uInt16 nId );
+ void UndoActionEnd( sal_uInt16 nId );
void MoveErrorEnd(long nOffset);
diff --git a/cui/source/inc/acccfg.hxx b/cui/source/inc/acccfg.hxx
index aa8224654c65..f44a60cc8040 100644
--- a/cui/source/inc/acccfg.hxx
+++ b/cui/source/inc/acccfg.hxx
@@ -90,7 +90,7 @@ public:
m_pAccelConfigPage( pAccelConfigPage )
{}
- void ReplaceEntry( USHORT nPos, const String &rStr );
+ void ReplaceEntry( sal_uInt16 nPos, const String &rStr );
};
// class SfxAcceleratorConfigPage ----------------------------------------
@@ -107,7 +107,7 @@ struct TAccInfo
, m_bIsConfigurable(sal_True )
, m_sCommand ( )
, m_aKey (aKey )
- // its important to set TRUE as default -
+ // its important to set sal_True as default -
// because only fix entries will be disabled later ...
{}
@@ -184,7 +184,7 @@ private:
String GetLabel4Command(const String& sCommand);
void InitAccCfg();
- USHORT MapKeyCodeToPos( const KeyCode &rCode ) const;
+ sal_uInt16 MapKeyCodeToPos( const KeyCode &rCode ) const;
css::uno::Reference< css::frame::XModel > SearchForAlreadyLoadedDoc(const String& sName);
void StartFileDialog( WinBits nBits, const String& rTitle );
@@ -197,7 +197,7 @@ public:
SfxAcceleratorConfigPage( Window *pParent, const SfxItemSet& rItemSet );
virtual ~SfxAcceleratorConfigPage();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet& );
void Apply(const css::uno::Reference< css::ui::XAcceleratorConfiguration >& pAccMgr);
@@ -214,8 +214,8 @@ public:
SfxAcceleratorConfigListBox( Window *pParent, ResId &rResId ) :
ListBox( pParent, rResId ) {}
- void ReplaceEntry( USHORT nPos, const String &rStr );
- void ExpandEntry ( USHORT nPos, const String &rStr );
+ void ReplaceEntry( sal_uInt16 nPos, const String &rStr );
+ void ExpandEntry ( sal_uInt16 nPos, const String &rStr );
};
class SvxShortcutAssignDlg : public SfxSingleTabDialog
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index aea3e5a16ffb..34fada956c86 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -52,7 +52,7 @@ public:
virtual ~AlignmentTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
diff --git a/cui/source/inc/autocdlg.hxx b/cui/source/inc/autocdlg.hxx
index c2ba66766292..7fe4483e5256 100644
--- a/cui/source/inc/autocdlg.hxx
+++ b/cui/source/inc/autocdlg.hxx
@@ -53,7 +53,7 @@ public:
OfaAutoCorrDlg(Window* pParent, const SfxItemSet *pSet );
- void EnableLanguage(BOOL bEnable)
+ void EnableLanguage(sal_Bool bEnable)
{ aLanguageFT.Enable(bEnable);
aLanguageLB.Enable(bEnable);}
@@ -87,14 +87,14 @@ class OfaACorrCheckListBox : public SvxSimpleTable
OfaACorrCheckListBox(Window* pParent, const ResId& rResId ) :
SvxSimpleTable( pParent, rResId ){}
- inline void *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); }
- inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
- inline ULONG GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
+ inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
+ inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
+ inline sal_uLong GetSelectEntryPos() { return GetModel()->GetAbsPos(FirstSelected()); }
- BOOL IsChecked(ULONG nPos, USHORT nCol = 0);
- void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
- SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
- void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
+ sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
+ void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked);
+ SvButtonState GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const;
+ void SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState );
};
// class OfaAutocorrOptionsPage ------------------------------------------
@@ -124,7 +124,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void ActivatePage( const SfxItemSet& );
@@ -171,13 +171,13 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
Font aBulletFont;
Font aByInputBulletFont;
- USHORT nPercent;
+ sal_uInt16 nPercent;
SvLBoxButtonData* pCheckButtonData;
DECL_LINK(SelectHdl, OfaACorrCheckListBox*);
DECL_LINK(EditHdl, PushButton*);
- SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+ SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
OfaSwAutoFmtOptionsPage( Window* pParent,
@@ -187,7 +187,7 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void ActivatePage( const SfxItemSet& );
};
@@ -197,16 +197,16 @@ class OfaSwAutoFmtOptionsPage : public SfxTabPage
class AutoCorrEdit : public Edit
{
Link aActionLink;
- BOOL bSpaces;
+ sal_Bool bSpaces;
public:
AutoCorrEdit(Window* pParent, const ResId& rResId) :
- Edit(pParent, rResId), bSpaces(FALSE){}
+ Edit(pParent, rResId), bSpaces(sal_False){}
void SetActionHdl( const Link& rLink )
{ aActionLink = rLink;}
- void SetSpaces(BOOL bSet)
+ void SetSpaces(sal_Bool bSet)
{bSpaces = bSet;}
virtual void KeyInput( const KeyEvent& rKEvent );
@@ -243,16 +243,16 @@ private:
CharClass* pCharClass;
LanguageType eLang;
- BOOL bHasSelectionText;
- BOOL bFirstSelect:1;
- BOOL bReplaceEditChanged:1;
- BOOL bSWriter:1;
+ sal_Bool bHasSelectionText;
+ sal_Bool bFirstSelect:1;
+ sal_Bool bReplaceEditChanged:1;
+ sal_Bool bSWriter:1;
DECL_LINK(SelectHdl, SvTabListBox*);
DECL_LINK(NewDelHdl, PushButton*);
DECL_LINK(ModifyHdl, Edit*);
- void RefillReplaceBox(BOOL bFromReset, //Box mit neuer Sprache fuellen
+ void RefillReplaceBox(sal_Bool bFromReset, //Box mit neuer Sprache fuellen
LanguageType eOldLanguage,
LanguageType eNewLanguage);
@@ -263,7 +263,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void ActivatePage( const SfxItemSet& );
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
@@ -305,7 +305,7 @@ private:
DECL_LINK(SelectHdl, ListBox*);
DECL_LINK(ModifyHdl, Edit*);
- void RefillReplaceBoxes(BOOL bFromReset, //Box mit neuer Sprache fuellen
+ void RefillReplaceBoxes(sal_Bool bFromReset, //Box mit neuer Sprache fuellen
LanguageType eOldLanguage,
LanguageType eNewLanguage);
public:
@@ -315,7 +315,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void ActivatePage( const SfxItemSet& );
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
@@ -380,7 +380,7 @@ private:
String ChangeStringExt_Impl( sal_UCS4 );
- SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+ SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
OfaQuoteTabPage( Window* pParent, const SfxItemSet& rSet );
public:
@@ -389,7 +389,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void ActivatePage( const SfxItemSet& );
};
@@ -428,7 +428,7 @@ class OfaAutoCompleteTabPage : public SfxTabPage
AutoCompleteMultiListBox aLBEntries;
PushButton aPBEntries;
SvStringsISortDtor* pAutoCmpltList;
- USHORT nAutoCmpltListCnt;
+ sal_uInt16 nAutoCmpltListCnt;
DECL_LINK( CheckHdl, CheckBox* );
@@ -440,7 +440,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void ActivatePage( const SfxItemSet& );
@@ -507,7 +507,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void ActivatePage( const SfxItemSet& );
};
diff --git a/cui/source/inc/backgrnd.hxx b/cui/source/inc/backgrnd.hxx
index 78e545e5e51a..01172af4a435 100644
--- a/cui/source/inc/backgrnd.hxx
+++ b/cui/source/inc/backgrnd.hxx
@@ -65,17 +65,17 @@ class SvxBackgroundTabPage : public SvxTabPage
using TabPage::DeactivatePage;
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void FillUserData();
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
void ShowSelector(); // Umschalt-ListBox aktivieren
void ShowTblControl(); // fuer den Writer (Zellen/Zeilen/Tabelle)
- void ShowParaControl(BOOL bCharOnly = FALSE); // fuer den Writer (Absatz/Zeichen)
- void EnableTransparency(BOOL bColor, BOOL bGraphic);
+ void ShowParaControl(sal_Bool bCharOnly = sal_False); // fuer den Writer (Absatz/Zeichen)
+ void EnableTransparency(sal_Bool bColor, sal_Bool bGraphic);
virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
@@ -122,13 +122,13 @@ private:
//------------------------------------------------------
Color aBgdColor;
- USHORT nHtmlMode;
- BOOL bAllowShowSelector : 1;
- BOOL bIsGraphicValid : 1;
- BOOL bLinkOnly : 1;
- BOOL bResized : 1;
- BOOL bColTransparency : 1;
- BOOL bGraphTransparency : 1;
+ sal_uInt16 nHtmlMode;
+ sal_Bool bAllowShowSelector : 1;
+ sal_Bool bIsGraphicValid : 1;
+ sal_Bool bLinkOnly : 1;
+ sal_Bool bResized : 1;
+ sal_Bool bColTransparency : 1;
+ sal_Bool bGraphTransparency : 1;
Graphic aBgdGraphic;
String aBgdGraphicPath;
String aBgdGraphicFilter;
@@ -145,13 +145,13 @@ private:
void FillColorValueSets_Impl();
void ShowColorUI_Impl();
void ShowBitmapUI_Impl();
- BOOL LoadLinkedGraphic_Impl();
+ sal_Bool LoadLinkedGraphic_Impl();
void RaiseLoadError_Impl();
void SetGraphicPosition_Impl( SvxGraphicPosition ePos );
SvxGraphicPosition GetGraphicPosition_Impl();
void FillControls_Impl(const SvxBrushItem& rBgdAttr,
const String& rUserData);
- BOOL FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, USHORT nSlot);
+ sal_Bool FillItemSetWithWallpaperItem( SfxItemSet& rCoreSet, sal_uInt16 nSlot);
void ResetFromWallpaperItem( const SfxItemSet& rSet );
DECL_LINK( LoadTimerHdl_Impl, Timer* );
diff --git a/cui/source/inc/bbdlg.hxx b/cui/source/inc/bbdlg.hxx
index 249c9c427485..575e744d8ddf 100644
--- a/cui/source/inc/bbdlg.hxx
+++ b/cui/source/inc/bbdlg.hxx
@@ -40,15 +40,15 @@ class SvxBorderBackgroundDlg: public SfxTabDialog
public:
SvxBorderBackgroundDlg( Window *pParent,
const SfxItemSet& rCoreSet,
- BOOL bEnableSelector = FALSE );
+ sal_Bool bEnableSelector = sal_False );
~SvxBorderBackgroundDlg();
protected:
- virtual void PageCreated( USHORT nPageId, SfxTabPage& rTabPage );
+ virtual void PageCreated( sal_uInt16 nPageId, SfxTabPage& rTabPage );
private:
- BOOL bEnableBackgroundSelector; // fuer Border/Background-Dlg
+ sal_Bool bEnableBackgroundSelector; // fuer Border/Background-Dlg
};
diff --git a/cui/source/inc/border.hxx b/cui/source/inc/border.hxx
index 33ea94ff4478..d62083b37d77 100644
--- a/cui/source/inc/border.hxx
+++ b/cui/source/inc/border.hxx
@@ -52,9 +52,9 @@ class SvxBorderTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rCoreAttrs );
+ virtual sal_Bool FillItemSet( SfxItemSet& rCoreAttrs );
virtual void Reset( const SfxItemSet& );
void HideShadowControls();
@@ -122,7 +122,7 @@ private:
bool mbBLTREnabled; /// true = Bottom-left to top-right border enabled.
bool mbUseMarginItem;
- static BOOL bSync;
+ static sal_Bool bSync;
#ifdef _SVX_BORDER_CXX
// Handler
@@ -134,8 +134,8 @@ private:
DECL_LINK( ModifyDistanceHdl_Impl, MetricField*);
DECL_LINK( SyncHdl_Impl, CheckBox*);
- USHORT GetPresetImageId( USHORT nValueSetIdx ) const;
- USHORT GetPresetStringId( USHORT nValueSetIdx ) const;
+ sal_uInt16 GetPresetImageId( sal_uInt16 nValueSetIdx ) const;
+ sal_uInt16 GetPresetStringId( sal_uInt16 nValueSetIdx ) const;
void FillPresetVS();
void FillShadowVS();
diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index 8d63c5f8dd49..13c1289bda48 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -75,7 +75,7 @@ public:
SvxConfigDialog( Window*, const SfxItemSet* );
~SvxConfigDialog();
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
virtual short Ok();
void SetFrame(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame >& xFrame);
@@ -121,7 +121,7 @@ public:
const com::sun::star::uno::Reference
< com::sun::star::uno::XInterface >& xManager );
- void SetModified( bool bValue = TRUE ) { bModified = bValue; }
+ void SetModified( bool bValue = sal_True ) { bModified = bValue; }
bool IsModified( ) { return bModified; }
bool IsReadOnly( ) { return bReadOnly; }
@@ -220,7 +220,7 @@ public:
// methods inherited from SaveInData
SvxEntries* GetEntries();
void SetEntries( SvxEntries* );
- bool HasURL( const rtl::OUString& URL ) { (void)URL; return FALSE; }
+ bool HasURL( const rtl::OUString& URL ) { (void)URL; return sal_False; }
bool HasSettings() { return m_xMenuSettings.is(); }
void Reset();
bool Apply();
@@ -231,7 +231,7 @@ class SvxConfigEntry
private:
// common properties
- USHORT nId;
+ sal_uInt16 nId;
::rtl::OUString aHelpText;
::rtl::OUString aLabel;
::rtl::OUString aCommand;
@@ -258,18 +258,18 @@ public:
SvxConfigEntry( const ::rtl::OUString& rDisplayName,
const ::rtl::OUString& rCommandURL,
- bool bPopup = FALSE,
- bool bParentData = FALSE );
+ bool bPopup = sal_False,
+ bool bParentData = sal_False );
SvxConfigEntry()
:
nId( 0 ),
- bPopUp( FALSE ),
- bStrEdited( FALSE ),
- bIsUserDefined( FALSE ),
- bIsMain( FALSE ),
- bIsParentData( FALSE ),
- bIsVisible( TRUE ),
+ bPopUp( sal_False ),
+ bStrEdited( sal_False ),
+ bIsUserDefined( sal_False ),
+ bIsMain( sal_False ),
+ bIsParentData( sal_False ),
+ bIsVisible( sal_True ),
nStyle( 0 ),
pEntries( 0 )
{}
@@ -280,7 +280,7 @@ public:
void SetCommand( const String& rCmd ) { aCommand = rCmd; }
const ::rtl::OUString& GetName() const { return aLabel; }
- void SetName( const String& rStr ) { aLabel = rStr; bStrEdited = TRUE; }
+ void SetName( const String& rStr ) { aLabel = rStr; bStrEdited = sal_True; }
bool HasChangedName() const { return bStrEdited; }
const ::rtl::OUString& GetHelpText() ;
@@ -289,10 +289,10 @@ public:
const ::rtl::OUString& GetHelpURL() const { return aHelpURL; }
void SetHelpURL( const String& rStr ) { aHelpURL = rStr; }
- void SetPopup( bool bOn = TRUE ) { bPopUp = bOn; }
+ void SetPopup( bool bOn = sal_True ) { bPopUp = bOn; }
bool IsPopup() const { return bPopUp; }
- void SetUserDefined( bool bOn = TRUE ) { bIsUserDefined = bOn; }
+ void SetUserDefined( bool bOn = sal_True ) { bIsUserDefined = bOn; }
bool IsUserDefined() const { return bIsUserDefined; }
bool IsBinding() const { return !bPopUp; }
@@ -302,10 +302,10 @@ public:
void SetEntries( SvxEntries* entries ) { pEntries = entries; }
bool HasEntries() const { return pEntries != NULL; }
- void SetMain( bool bValue = TRUE ) { bIsMain = bValue; }
+ void SetMain( bool bValue = sal_True ) { bIsMain = bValue; }
bool IsMain() { return bIsMain; }
- void SetParentData( bool bValue = TRUE ) { bIsParentData = bValue; }
+ void SetParentData( bool bValue = sal_True ) { bIsParentData = bValue; }
bool IsParentData() { return bIsParentData; }
bool IsMovable();
@@ -345,13 +345,13 @@ public:
virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt );
- virtual BOOL NotifyAcceptDrop( SvLBoxEntry* pEntry );
+ virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* pEntry );
- virtual BOOL NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
- SvLBoxEntry*&, ULONG& );
+ virtual sal_Bool NotifyMoving( SvLBoxEntry*, SvLBoxEntry*,
+ SvLBoxEntry*&, sal_uLong& );
- virtual BOOL NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
- SvLBoxEntry*&, ULONG&);
+ virtual sal_Bool NotifyCopying( SvLBoxEntry*, SvLBoxEntry*,
+ SvLBoxEntry*&, sal_uLong&);
virtual DragDropMode NotifyStartDrag(
TransferDataContainer&, SvLBoxEntry* );
@@ -444,13 +444,13 @@ protected:
SvLBoxEntry* InsertEntry( SvxConfigEntry* pNewEntryData,
SvLBoxEntry* pTarget = NULL,
- bool bFront = FALSE );
+ bool bFront = sal_False );
void AddSubMenusToUI( const String& rBaseTitle,
SvxConfigEntry* pParentData );
SvLBoxEntry* InsertEntryIntoUI ( SvxConfigEntry* pNewEntryData,
- ULONG nPos = LIST_APPEND );
+ sal_uLong nPos = LIST_APPEND );
SvxEntries* FindParentForChild( SvxEntries* pParentEntries,
SvxConfigEntry* pChildData );
@@ -464,15 +464,15 @@ public:
SaveInData* GetSaveInData() { return pCurrentSaveInData; }
SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL,
- bool bFront = FALSE,
- bool bAllowDuplicates = FALSE );
+ bool bFront = sal_False,
+ bool bAllowDuplicates = sal_False );
virtual void MoveEntry( bool bMoveUp );
bool MoveEntryData( SvLBoxEntry* pSourceEntry,
SvLBoxEntry* pTargetEntry );
- BOOL FillItemSet( SfxItemSet& );
+ sal_Bool FillItemSet( SfxItemSet& );
void Reset( const SfxItemSet& );
virtual bool DeleteSelectedContent() = 0;
@@ -554,7 +554,7 @@ class SvxMainMenuOrganizerDialog : public ModalDialog
public:
SvxMainMenuOrganizerDialog (
Window*, SvxEntries*,
- SvxConfigEntry*, bool bCreateMenu = FALSE );
+ SvxConfigEntry*, bool bCreateMenu = sal_False );
~SvxMainMenuOrganizerDialog ();
@@ -568,7 +568,7 @@ class SvxToolbarEntriesListBox : public SvxMenuEntriesListBox
Size m_aCheckBoxImageSizePixel;
Link m_aChangedListener;
SvLBoxButtonData* m_pButtonData;
- BOOL m_bHiContrastMode;
+ sal_Bool m_bHiContrastMode;
SvxConfigPage* pPage;
void ChangeVisibility( SvLBoxEntry* pEntry );
@@ -596,11 +596,11 @@ public:
Size GetCheckBoxPixelSize() const
{ return m_aCheckBoxImageSizePixel; }
- virtual BOOL NotifyMoving(
- SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG& );
+ virtual sal_Bool NotifyMoving(
+ SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong& );
- virtual BOOL NotifyCopying(
- SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, ULONG&);
+ virtual sal_Bool NotifyCopying(
+ SvLBoxEntry*, SvLBoxEntry*, SvLBoxEntry*&, sal_uLong&);
void KeyInput( const KeyEvent& rKeyEvent );
};
@@ -629,8 +629,8 @@ public:
~SvxToolbarConfigPage();
SvLBoxEntry* AddFunction( SvLBoxEntry* pTarget = NULL,
- bool bFront = FALSE,
- bool bAllowDuplicates = TRUE );
+ bool bFront = sal_False,
+ bool bAllowDuplicates = sal_True );
void MoveEntry( bool bMoveUp );
@@ -803,7 +803,7 @@ public:
const rtl::OUString& aMessage );
rtl::OUString ReplaceIconName( const rtl::OUString& );
- USHORT ShowDialog();
+ sal_uInt16 ShowDialog();
};
//added for issue83555
class SvxIconChangeDialog : public ModalDialog
diff --git a/cui/source/inc/cfgutil.hxx b/cui/source/inc/cfgutil.hxx
index 944fca908b8a..62a73e008aac 100644
--- a/cui/source/inc/cfgutil.hxx
+++ b/cui/source/inc/cfgutil.hxx
@@ -109,15 +109,15 @@ struct SfxStylesInfo_Impl
struct SfxGroupInfo_Impl
{
- USHORT nKind;
- USHORT nOrd;
+ sal_uInt16 nKind;
+ sal_uInt16 nOrd;
void* pObject;
- BOOL bWasOpened;
+ sal_Bool bWasOpened;
String sCommand;
String sLabel;
- SfxGroupInfo_Impl( USHORT n, USHORT nr, void* pObj = 0 ) :
- nKind( n ), nOrd( nr ), pObject( pObj ), bWasOpened(FALSE) {}
+ SfxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, void* pObj = 0 ) :
+ nKind( n ), nOrd( nr ), pObject( pObj ), bWasOpened(sal_False) {}
};
typedef SfxGroupInfo_Impl* SfxGroupInfoPtr;
@@ -155,9 +155,9 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
//SfxSlotPool* pSlotPool;
SfxConfigFunctionListBox_Impl* pFunctionListBox;
SfxGroupInfoArr_Impl aArr;
- ULONG nMode;
- BOOL bShowSF; // show Scripting Framework scripts
- BOOL bShowBasic; // show Basic scripts
+ sal_uLong nMode;
+ sal_Bool bShowSF; // show Scripting Framework scripts
+ sal_Bool bShowBasic; // show Basic scripts
::rtl::OUString m_sModuleLongName;
css::uno::Reference< css::lang::XMultiServiceFactory > m_xSMGR;
@@ -181,12 +181,12 @@ class SfxConfigGroupListBox_Impl : public SvTreeListBox
protected:
virtual void RequestingChilds( SvLBoxEntry *pEntry);
using SvListView::Expand;
- virtual BOOL Expand( SvLBoxEntry* pParent );
+ virtual sal_Bool Expand( SvLBoxEntry* pParent );
public:
SfxConfigGroupListBox_Impl ( Window* pParent,
const ResId&,
- ULONG nConfigMode = 0 );
+ sal_uLong nConfigMode = 0 );
~SfxConfigGroupListBox_Impl();
void ClearAll();
@@ -195,7 +195,7 @@ public:
const ::rtl::OUString& sModuleLongName);
void SetFunctionListBox( SfxConfigFunctionListBox_Impl *pBox )
{ pFunctionListBox = pBox; }
- void Open( SvLBoxEntry*, BOOL );
+ void Open( SvLBoxEntry*, sal_Bool );
void GroupSelected();
void SelectMacro( const SfxMacroInfoItem* );
void AddAndSelect( const SfxStringItem*, const SfxStringItem* );
diff --git a/cui/source/inc/chardlg.hxx b/cui/source/inc/chardlg.hxx
index 315a78e70a03..29fcdb13b63a 100644
--- a/cui/source/inc/chardlg.hxx
+++ b/cui/source/inc/chardlg.hxx
@@ -43,13 +43,13 @@ class FontList;
// -----------------------------------------------------------------------
-#define DISABLE_CASEMAP ((USHORT)0x0001)
-#define DISABLE_WORDLINE ((USHORT)0x0002)
-#define DISABLE_BLINK ((USHORT)0x0004)
-#define DISABLE_UNDERLINE_COLOR ((USHORT)0x0008)
+#define DISABLE_CASEMAP ((sal_uInt16)0x0001)
+#define DISABLE_WORDLINE ((sal_uInt16)0x0002)
+#define DISABLE_BLINK ((sal_uInt16)0x0004)
+#define DISABLE_UNDERLINE_COLOR ((sal_uInt16)0x0008)
-#define DISABLE_LANGUAGE ((USHORT)0x0010)
-#define DISABLE_HIDE_LANGUAGE ((USHORT)0x0020)
+#define DISABLE_LANGUAGE ((sal_uInt16)0x0010)
+#define DISABLE_HIDE_LANGUAGE ((sal_uInt16)0x0020)
// class SvxCharBasePage -------------------------------------------------
@@ -59,18 +59,18 @@ protected:
SvxFontPrevWindow m_aPreviewWin;
FixedInfo m_aFontTypeFT;
- BOOL m_bPreviewBackgroundToCharacter;
+ sal_Bool m_bPreviewBackgroundToCharacter;
SvxCharBasePage( Window* pParent, const ResId& rResIdTabPage, const SfxItemSet&,
- USHORT nResIdPrewievWin, USHORT nResIdFontTypeFT );
+ sal_uInt16 nResIdPrewievWin, sal_uInt16 nResIdFontTypeFT );
virtual ~SvxCharBasePage();
- void SetPrevFontSize( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
- void SetPrevFont( const SfxItemSet& rSet, USHORT nSlot, SvxFont& rFont );
- void SetPrevFontStyle( const SfxItemSet& rSet, USHORT nSlotPosture, USHORT nSlotWeight, SvxFont& rFont ); // posture/weight
+ void SetPrevFontSize( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont );
+ void SetPrevFont( const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont );
+ void SetPrevFontStyle( const SfxItemSet& rSet, sal_uInt16 nSlotPosture, sal_uInt16 nSlotWeight, SvxFont& rFont ); // posture/weight
void SetPrevFontWidthScale( const SfxItemSet& rSet );
- void SetPrevFontEscapement( BYTE nProp, BYTE nEscProp, short nEsc );
+ void SetPrevFontEscapement( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
inline SvxFont& GetPreviewFont();
inline SvxFont& GetPreviewCJKFont();
@@ -153,7 +153,7 @@ private:
};
void Reset_Impl( const SfxItemSet& rSet, LanguageGroup eLangGrp );
- BOOL FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
+ sal_Bool FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLangGrp );
void ResetColor_Impl( const SfxItemSet& rSet );
DECL_LINK( UpdateHdl_Impl, Timer* );
@@ -171,10 +171,10 @@ public:
~SvxCharNamePage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
void SetFontList( const SvxFontListItem& rItem );
void EnableRelativeMode();
@@ -182,7 +182,7 @@ public:
// the writer uses SID_ATTR_BRUSH as font background
void SetPreviewBackgroundToCharacter();
- void DisableControls( USHORT nDisable );
+ void DisableControls( sal_uInt16 nDisable );
virtual void PageCreated (SfxAllItemSet aSet);
};
@@ -233,7 +233,7 @@ private:
FixedText m_aPositionFT;
ListBox m_aPositionLB;
- USHORT m_nHtmlMode;
+ sal_uInt16 m_nHtmlMode;
String m_aTransparentColorName;
@@ -243,7 +243,7 @@ private:
void UpdatePreview_Impl();
void SetCaseMap_Impl( SvxCaseMap eCaseMap );
void ResetColor_Impl( const SfxItemSet& rSet );
- BOOL FillItemSetColor_Impl( SfxItemSet& rSet );
+ sal_Bool FillItemSetColor_Impl( SfxItemSet& rSet );
DECL_LINK( SelectHdl_Impl, ListBox* );
DECL_LINK( CbClickHdl_Impl, CheckBox* );
@@ -260,12 +260,12 @@ public:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
- void DisableControls( USHORT nDisable );
+ void DisableControls( sal_uInt16 nDisable );
void EnableFlash();
// the writer uses SID_ATTR_BRUSH as font background
void SetPreviewBackgroundToCharacter();
@@ -305,17 +305,17 @@ private:
short m_nSuperEsc;
short m_nSubEsc;
- UINT16 m_nScaleWidthItemSetVal;
- UINT16 m_nScaleWidthInitialVal;
+ sal_uInt16 m_nScaleWidthItemSetVal;
+ sal_uInt16 m_nScaleWidthInitialVal;
- BYTE m_nSuperProp;
- BYTE m_nSubProp;
+ sal_uInt8 m_nSuperProp;
+ sal_uInt8 m_nSubProp;
SvxCharPositionPage( Window* pParent, const SfxItemSet& rSet );
void Initialize();
- void UpdatePreview_Impl( BYTE nProp, BYTE nEscProp, short nEsc );
- void SetEscapement_Impl( USHORT nEsc );
+ void UpdatePreview_Impl( sal_uInt8 nProp, sal_uInt8 nEscProp, short nEsc );
+ void SetEscapement_Impl( sal_uInt16 nEsc );
DECL_LINK( PositionHdl_Impl, RadioButton* );
DECL_LINK( RotationHdl_Impl, RadioButton* );
@@ -337,10 +337,10 @@ public:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void FillUserData();
// the writer uses SID_ATTR_BRUSH as font background
void SetPreviewBackgroundToCharacter();
@@ -361,15 +361,15 @@ private:
FixedText m_aEndBracketFT;
ListBox m_aEndBracketLB;
- USHORT m_nStartBracketPosition;
- USHORT m_nEndBracketPosition;
+ sal_uInt16 m_nStartBracketPosition;
+ sal_uInt16 m_nEndBracketPosition;
SvxCharTwoLinesPage( Window* pParent, const SfxItemSet& rSet );
void UpdatePreview_Impl();
void Initialize();
void SelectCharacter( ListBox* pBox );
- void SetBracket( sal_Unicode cBracket, BOOL bStart );
+ void SetBracket( sal_Unicode cBracket, sal_Bool bStart );
DECL_LINK( TwoLinesHdl_Impl, CheckBox* );
DECL_LINK( CharacterMapHdl_Impl, ListBox* );
@@ -383,10 +383,10 @@ public:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
virtual void Reset( const SfxItemSet& rSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
// the writer uses SID_ATTR_BRUSH as font background
void SetPreviewBackgroundToCharacter();
virtual void PageCreated (SfxAllItemSet aSet);
diff --git a/cui/source/inc/connect.hxx b/cui/source/inc/connect.hxx
index 88e30ac7dd7a..75f6a11d2e52 100644
--- a/cui/source/inc/connect.hxx
+++ b/cui/source/inc/connect.hxx
@@ -88,9 +88,9 @@ public:
~SvxConnectionPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
void Construct();
diff --git a/cui/source/inc/cuicharmap.hxx b/cui/source/inc/cuicharmap.hxx
index 805f90313e29..eb9a9c91c0eb 100644
--- a/cui/source/inc/cuicharmap.hxx
+++ b/cui/source/inc/cuicharmap.hxx
@@ -60,7 +60,7 @@ class SvxShowText : public Control
public:
SvxShowText( Window* pParent,
const ResId& rResId,
- BOOL bCenter = FALSE );
+ sal_Bool bCenter = sal_False );
~SvxShowText();
void SetFont( const Font& rFont );
@@ -71,14 +71,14 @@ protected:
private:
long mnY;
- BOOL mbCenter;
+ sal_Bool mbCenter;
};
class SvxCharMapData
{
public:
- SvxCharMapData( class SfxModalDialog* pDialog, BOOL bOne_, ResMgr* pResContext );
+ SvxCharMapData( class SfxModalDialog* pDialog, sal_Bool bOne_, ResMgr* pResContext );
void SetCharFont( const Font& rFont );
@@ -103,7 +103,7 @@ friend class SvxCharacterMap;
FixedText aCharCodeText;
// FixedText aAssignText;
Font aFont;
- BOOL bOne;
+ sal_Bool bOne;
const SubsetMap* pSubsetMap;
DECL_LINK( OKHdl, OKButton* );
@@ -123,7 +123,7 @@ private:
SvxCharMapData* mpCharMapData;
public:
- SvxCharacterMap( Window* pParent, BOOL bOne=TRUE, const SfxItemSet* pSet=0 );
+ SvxCharacterMap( Window* pParent, sal_Bool bOne=sal_True, const SfxItemSet* pSet=0 );
~SvxCharacterMap();
void DisableFontSelection();
diff --git a/cui/source/inc/cuigaldlg.hxx b/cui/source/inc/cuigaldlg.hxx
index 954866383c4b..459e927eff3e 100644
--- a/cui/source/inc/cuigaldlg.hxx
+++ b/cui/source/inc/cuigaldlg.hxx
@@ -82,7 +82,7 @@ private:
void ImplSearch( const INetURLObject& rStartURL,
const ::std::vector< String >& rFormats,
- BOOL bRecursive );
+ sal_Bool bRecursive );
virtual void SAL_CALL run();
virtual void SAL_CALL onTerminated();
@@ -243,7 +243,7 @@ public:
GalleryIdDialog( Window* pParent, GalleryTheme* pThm );
~GalleryIdDialog() {}
- ULONG GetId() const { return aLbResName.GetSelectEntryPos(); }
+ sal_uLong GetId() const { return aLbResName.GetSelectEntryPos(); }
};
// --------------------------
@@ -254,7 +254,7 @@ class GalleryThemeProperties : public SfxTabDialog
{
ExchangeData* pData;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
public:
@@ -285,7 +285,7 @@ private:
ExchangeData* pData;
virtual void Reset( const SfxItemSet& ) {}
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
public:
@@ -325,19 +325,19 @@ class TPGalleryThemeProperties : public SfxTabPage
String aLastFilterName;
String aPreviewString;
INetURLObject aURL;
- USHORT nCurFilterPos;
- USHORT nFirstExtFilterPos;
- BOOL bEntriesFound;
- BOOL bInputAllowed;
- BOOL bTakeAll;
- BOOL bSearchRecursive;
+ sal_uInt16 nCurFilterPos;
+ sal_uInt16 nFirstExtFilterPos;
+ sal_Bool bEntriesFound;
+ sal_Bool bInputAllowed;
+ sal_Bool bTakeAll;
+ sal_Bool bSearchRecursive;
::com::sun::star::uno::Reference< ::svt::DialogClosedListener > xDialogListener;
::com::sun::star::uno::Reference< ::com::sun::star::media::XPlayer > xMediaPlayer;
::com::sun::star::uno::Reference< ::com::sun::star::ui::dialogs::XFolderPicker > xFolderPicker;
virtual void Reset( const SfxItemSet& /*rSet*/ ) {}
- virtual BOOL FillItemSet( SfxItemSet& /*rSet*/ ) { return TRUE; }
+ virtual sal_Bool FillItemSet( SfxItemSet& /*rSet*/ ) { return sal_True; }
::rtl::OUString addExtension( const ::rtl::OUString&, const ::rtl::OUString& );
void FillFilterList();
diff --git a/cui/source/inc/cuigrfflt.hxx b/cui/source/inc/cuigrfflt.hxx
index e7f9047af5ca..455ebd021f4c 100644
--- a/cui/source/inc/cuigrfflt.hxx
+++ b/cui/source/inc/cuigrfflt.hxx
@@ -61,7 +61,7 @@ class SvxGraphicFilter
{
public:
- static ULONG ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
+ static sal_uLong ExecuteGrfFilterSlot( SfxRequest& rReq, GraphicObject& rFilterObject );
static void DisableGraphicFilterSlots( SfxItemSet& rSet );
};
*/
@@ -136,13 +136,13 @@ private:
public:
GraphicFilterMosaic( Window* pParent, const Graphic& rGraphic,
- USHORT nTileWidth, USHORT nTileHeight, BOOL bEnhanceEdges );
+ sal_uInt16 nTileWidth, sal_uInt16 nTileHeight, sal_Bool bEnhanceEdges );
~GraphicFilterMosaic();
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
long GetTileWidth() const { return static_cast<long>(maMtrWidth.GetValue()); }
long GetTileHeight() const { return static_cast<long>(maMtrHeight.GetValue()); }
- BOOL IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
+ sal_Bool IsEnhanceEdges() const { return maCbxEdges.IsChecked(); }
};
// -------------------------
@@ -160,12 +160,12 @@ private:
public:
GraphicFilterSolarize( Window* pParent, const Graphic& rGraphic,
- BYTE nGreyThreshold, BOOL bInvert );
+ sal_uInt8 nGreyThreshold, sal_Bool bInvert );
~GraphicFilterSolarize();
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
- BYTE GetGreyThreshold() const { return( (BYTE) FRound( maMtrThreshold.GetValue() * 2.55 ) ); }
- BOOL IsInvert() const { return maCbxInvert.IsChecked(); }
+ sal_uInt8 GetGreyThreshold() const { return( (sal_uInt8) FRound( maMtrThreshold.GetValue() * 2.55 ) ); }
+ sal_Bool IsInvert() const { return maCbxInvert.IsChecked(); }
};
// ----------------------
@@ -182,12 +182,12 @@ private:
public:
GraphicFilterSepia( Window* pParent, const Graphic& rGraphic,
- USHORT nSepiaPercent );
+ sal_uInt16 nSepiaPercent );
~GraphicFilterSepia();
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
- USHORT GetSepiaPercent() const
- { return sal::static_int_cast< USHORT >(maMtrSepia.GetValue()); }
+ sal_uInt16 GetSepiaPercent() const
+ { return sal::static_int_cast< sal_uInt16 >(maMtrSepia.GetValue()); }
};
// -----------------------
@@ -204,11 +204,11 @@ private:
public:
GraphicFilterPoster( Window* pParent, const Graphic& rGraphic,
- USHORT nPosterColorCount );
+ sal_uInt16 nPosterColorCount );
~GraphicFilterPoster();
virtual Graphic GetFilteredGraphic( const Graphic& rGraphic, double fScaleX, double fScaleY );
- USHORT GetPosterColorCount() const { return( (USHORT) maNumPoster.GetValue() ); }
+ sal_uInt16 GetPosterColorCount() const { return( (sal_uInt16) maNumPoster.GetValue() ); }
};
// -----------------------
diff --git a/cui/source/inc/cuihyperdlg.hxx b/cui/source/inc/cuihyperdlg.hxx
index d7747385cce3..73aa971ef617 100644
--- a/cui/source/inc/cuihyperdlg.hxx
+++ b/cui/source/inc/cuihyperdlg.hxx
@@ -54,9 +54,9 @@ private :
SfxStatusForwarder aRdOnlyForwarder;
public :
- SvxHlinkCtrl( USHORT nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg);
+ SvxHlinkCtrl( sal_uInt16 nId, SfxBindings & rBindings, SvxHpLinkDlg* pDlg);
- virtual void StateChanged( USHORT nSID, SfxItemState eState,
+ virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState,
const SfxPoolItem* pState );
};
@@ -91,7 +91,7 @@ private:
DECL_LINK (ClickCloseHdl_Impl, void * );
protected:
- virtual BOOL Close();
+ virtual sal_Bool Close();
virtual void Move();
// virtual long PreNotify( NotifyEvent& rNEvt );
@@ -99,12 +99,12 @@ public:
SvxHpLinkDlg (Window* pParent, SfxBindings* pBindings );
~SvxHpLinkDlg ();
- virtual void PageCreated( USHORT nId, IconChoicePage& rPage );
+ virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
- USHORT SetPage( SvxHyperlinkItem* pItem );
+ sal_uInt16 SetPage( SvxHyperlinkItem* pItem );
void EnableInetBrowse( sal_Bool bEnable = sal_True );
void SetReadOnlyMode( sal_Bool bReadOnly = sal_False );
- inline BOOL IsHTMLDoc() const { return mbIsHTMLDoc; }
+ inline sal_Bool IsHTMLDoc() const { return mbIsHTMLDoc; }
inline SfxBindings* GetBindings() const { return mpBindings; };
inline SfxDispatcher* GetDispatcher() const { return mpBindings->GetDispatcher(); }
diff --git a/cui/source/inc/cuioptgenrl.hxx b/cui/source/inc/cuioptgenrl.hxx
index e978edbdc1af..4e275d1583db 100644
--- a/cui/source/inc/cuioptgenrl.hxx
+++ b/cui/source/inc/cuioptgenrl.hxx
@@ -118,7 +118,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/inc/cuisrchdlg.hxx b/cui/source/inc/cuisrchdlg.hxx
index d1b835cd1966..76243b6a6046 100644
--- a/cui/source/inc/cuisrchdlg.hxx
+++ b/cui/source/inc/cuisrchdlg.hxx
@@ -50,7 +50,7 @@ class SvxJSearchOptionsPage;
class SvxJSearchOptionsDialog : public SfxSingleTabDialog
{
- INT32 nInitialTlFlags;
+ sal_Int32 nInitialTlFlags;
SvxJSearchOptionsPage *pPage;
// disallow copy-constructor and assignment-operator for now
@@ -60,13 +60,13 @@ class SvxJSearchOptionsDialog : public SfxSingleTabDialog
public:
SvxJSearchOptionsDialog( Window *pParent,
const SfxItemSet& rOptionsSet,
- INT32 nInitialFlags );
+ sal_Int32 nInitialFlags );
virtual ~SvxJSearchOptionsDialog();
// Window
virtual void Activate();
- INT32 GetTransliterationFlags() const;
+ sal_Int32 GetTransliterationFlags() const;
};
#endif
diff --git a/cui/source/inc/cuitabarea.hxx b/cui/source/inc/cuitabarea.hxx
index c2ad3f7cc4a3..1c109923b147 100644
--- a/cui/source/inc/cuitabarea.hxx
+++ b/cui/source/inc/cuitabarea.hxx
@@ -59,13 +59,13 @@ private:
ChangeType mnGradientListState;
ChangeType mnHatchingListState;
- USHORT mnPageType;
- USHORT mnDlgType;
- USHORT mnPos;
- BOOL mbAreaTP;
- BOOL mbDeleteColorTable;
+ sal_uInt16 mnPageType;
+ sal_uInt16 mnDlgType;
+ sal_uInt16 mnPos;
+ sal_Bool mbAreaTP;
+ sal_Bool mbDeleteColorTable;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
protected:
virtual short Ok();
@@ -102,7 +102,7 @@ public:
XBitmapList* GetNewBitmapList() const { return mpNewBitmapList; }
const XBitmapList* GetBitmapList() const { return mpBitmapList; }
- void DontDeleteColorTable() { mbDeleteColorTable = FALSE; }
+ void DontDeleteColorTable() { mbDeleteColorTable = sal_False; }
};
/*************************************************************************
@@ -119,10 +119,10 @@ class SvxTransparenceTabPage : public SvxTabPage
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- //CHINA001 UINT16* pPageType;
- //CHINA001 UINT16* pDlgType;
- UINT16 nPageType; //add CHINA001
- UINT16 nDlgType; //add CHINA001
+ //CHINA001 sal_uInt16* pPageType;
+ //CHINA001 sal_uInt16* pDlgType;
+ sal_uInt16 nPageType; //add CHINA001
+ sal_uInt16 nDlgType; //add CHINA001
// main selection
FixedLine aFlProp;
@@ -152,7 +152,7 @@ class SvxTransparenceTabPage : public SvxTabPage
// preview
SvxXRectPreview aCtlBitmapPreview;
SvxXRectPreview aCtlXRectPreview;
- BOOL bBitmap;
+ sal_Bool bBitmap;
XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
@@ -167,30 +167,30 @@ class SvxTransparenceTabPage : public SvxTabPage
DECL_LINK(ModifiedTrgrHdl_Impl, void*);
#endif
- void ActivateLinear(BOOL bActivate);
- void ActivateGradient(BOOL bActivate);
+ void ActivateLinear(sal_Bool bActivate);
+ void ActivateGradient(sal_Bool bActivate);
void SetControlState_Impl(XGradientStyle eXGS);
- BOOL InitPreview ( const SfxItemSet& rSet );
- void InvalidatePreview (BOOL bEnable = TRUE );
+ sal_Bool InitPreview ( const SfxItemSet& rSet );
+ void InvalidatePreview (sal_Bool bEnable = sal_True );
public:
SvxTransparenceTabPage(Window* pParent, const SfxItemSet& rInAttrs);
void Construct();
static SfxTabPage* Create(Window*, const SfxItemSet&);
- static UINT16* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet(SfxItemSet&);
+ virtual sal_Bool FillItemSet(SfxItemSet&);
virtual void Reset(const SfxItemSet&);
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet* pSet);
virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
- //CHINA001 void SetPageType(UINT16 *pInType) { pPageType = pInType; }
- //CHINA001 void SetDlgType(UINT16* pInType) { pDlgType = pInType; }
- void SetPageType(UINT16 nInType) { nPageType = nInType; } //add CHINA001
- void SetDlgType(UINT16 nInType) { nDlgType = nInType; }//add CHINA001
+ //CHINA001 void SetPageType(sal_uInt16 *pInType) { pPageType = pInType; }
+ //CHINA001 void SetDlgType(sal_uInt16* pInType) { pDlgType = pInType; }
+ void SetPageType(sal_uInt16 nInType) { nPageType = nInType; } //add CHINA001
+ void SetDlgType(sal_uInt16 nInType) { nDlgType = nInType; }//add CHINA001
virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
};
@@ -257,14 +257,14 @@ private:
ChangeType* pnGradientListState;
ChangeType* pnHatchingListState;
- //CHINA001 USHORT* pPageType;
- //CHINA001 USHORT* pDlgType;
- //CHINA001 USHORT* pPos;
- UINT16 nPageType; //add CHINA001
- UINT16 nDlgType;//add CHINA001
- UINT16 nPos; //add CHINA001
+ //CHINA001 sal_uInt16* pPageType;
+ //CHINA001 sal_uInt16* pDlgType;
+ //CHINA001 sal_uInt16* pPos;
+ sal_uInt16 nPageType; //add CHINA001
+ sal_uInt16 nDlgType;//add CHINA001
+ sal_uInt16 nPos; //add CHINA001
- BOOL* pbAreaTP;
+ sal_Bool* pbAreaTP;
XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
@@ -298,9 +298,9 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
@@ -313,13 +313,13 @@ public:
{ pHatchingList = pHtchLst; }
void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
- //CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
- //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetDlgType( UINT16 nInType ) { nDlgType = nInType; }//add CHINA001
- //CHINA001 void SetPos( USHORT* pInPos ) { pPos = pInPos; }
- void SetPos( UINT16 nInPos ) { nPos = nInPos; }//add CHINA001
- void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+ //CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+ void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001
+ //CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; }//add CHINA001
+ //CHINA001 void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+ void SetPos( sal_uInt16 nInPos ) { nPos = nInPos; }//add CHINA001
+ void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
@@ -356,12 +356,12 @@ private:
XColorTable* pColorTab;
ChangeType* pnColorTableState;
- UINT16 nPageType; //add CHINA001
- UINT16 nDlgType; //add CHINA001
- USHORT* pPos;
- BOOL* pbAreaTP;
+ sal_uInt16 nPageType; //add CHINA001
+ sal_uInt16 nDlgType; //add CHINA001
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
- BOOL bDisable;
+ sal_Bool bDisable;
XOutdevItemPool* pXPool;
XFillAttrSetItem aXFillAttr;
@@ -378,23 +378,23 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
-//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; }
-//CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPageType( UINT16 nInType ) { nPageType = nInType; } //add CHINA001
- void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //add CHINA001
- void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+//CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+//CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; } //add CHINA001
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } //add CHINA001
+ void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
- void DisablePage( BOOL bIn ) { bDisable = bIn; }
+ void DisablePage( sal_Bool bIn ) { bDisable = bIn; }
};
/*************************************************************************
@@ -441,10 +441,10 @@ private:
ChangeType* pnGradientListState;
ChangeType* pnColorTableState;
- USHORT* pPageType;
- USHORT* pDlgType;
- USHORT* pPos;
- BOOL* pbAreaTP;
+ sal_uInt16* pPageType;
+ sal_uInt16* pDlgType;
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
@@ -471,7 +471,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -481,10 +481,10 @@ public:
void SetGradientList( XGradientList* pGrdLst)
{ pGradientList = pGrdLst; }
- void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPos( USHORT* pInPos ) { pPos = pInPos; }
- void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+ void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+ void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+ void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
void SetGrdChgd( ChangeType* pIn ) { pnGradientListState = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -528,10 +528,10 @@ private:
ChangeType* pnHatchingListState;
ChangeType* pnColorTableState;
- USHORT* pPageType;
- USHORT* pDlgType;
- USHORT* pPos;
- BOOL* pbAreaTP;
+ sal_uInt16* pPageType;
+ sal_uInt16* pDlgType;
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
@@ -559,7 +559,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -571,10 +571,10 @@ public:
void SetHatchingList( XHatchList* pHtchLst)
{ pHatchingList = pHtchLst; }
- void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPos( USHORT* pInPos ) { pPos = pInPos; }
- void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+ void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+ void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+ void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
void SetHtchChgd( ChangeType* pIn ) { pnHatchingListState = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -620,12 +620,12 @@ private:
ChangeType* pnBitmapListState;
ChangeType* pnColorTableState;
- USHORT* pPageType;
- USHORT* pDlgType;
- USHORT* pPos;
- BOOL* pbAreaTP;
+ sal_uInt16* pPageType;
+ sal_uInt16* pDlgType;
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
- BOOL bBmpChanged;
+ sal_Bool bBmpChanged;
XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
@@ -653,7 +653,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -664,10 +664,10 @@ public:
void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
void SetBitmapList( XBitmapList* pBmpLst) { pBitmapList = pBmpLst; }
- void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPos( USHORT* pInPos ) { pPos = pInPos; }
- void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+ void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+ void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+ void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
void SetBmpChgd( ChangeType* pIn ) { pnBitmapListState = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
@@ -730,11 +730,11 @@ private:
XColorTable* pColorTab;
ChangeType* pnColorTableState;
- USHORT* pPageType;
- USHORT* pDlgType;
- USHORT* pPos;
- BOOL* pbAreaTP;
- BOOL bDeleteColorTable;
+ sal_uInt16* pPageType;
+ sal_uInt16* pDlgType;
+ sal_uInt16* pPos;
+ sal_Bool* pbAreaTP;
+ sal_Bool bDeleteColorTable;
XOutdevItemPool* pXPool;
XFillStyleItem aXFStyleItem;
@@ -748,10 +748,10 @@ private:
#ifdef _SVX_TPCOLOR_CXX
void ConvertColorValues (Color& rColor, ColorModel eModell);
- void RgbToCmyk_Impl( Color& rColor, USHORT& rK );
- void CmykToRgb_Impl( Color& rColor, const USHORT nKey );
- USHORT ColorToPercent_Impl( USHORT nColor );
- USHORT PercentToColor_Impl( USHORT nPercent );
+ void RgbToCmyk_Impl( Color& rColor, sal_uInt16& rK );
+ void CmykToRgb_Impl( Color& rColor, const sal_uInt16 nKey );
+ sal_uInt16 ColorToPercent_Impl( sal_uInt16 nColor );
+ sal_uInt16 PercentToColor_Impl( sal_uInt16 nPercent );
void FillValueSet_Impl( ValueSet& rVs );
//-----------------------------------------------------------------------------------------------------
@@ -777,7 +777,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -785,14 +785,14 @@ public:
void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
- void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPos( USHORT* pInPos ) { pPos = pInPos; }
- void SetAreaTP( BOOL* pIn ) { pbAreaTP = pIn; }
+ void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+ void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetPos( sal_uInt16* pInPos ) { pPos = pInPos; }
+ void SetAreaTP( sal_Bool* pIn ) { pbAreaTP = pIn; }
void SetColorChgd( ChangeType* pIn ) { pnColorTableState = pIn; }
- void SetDeleteColorTable( BOOL bIn ) { bDeleteColorTable = bIn; }
+ void SetDeleteColorTable( sal_Bool bIn ) { bDeleteColorTable = bIn; }
virtual void FillUserData();
};
diff --git a/cui/source/inc/cuitabline.hxx b/cui/source/inc/cuitabline.hxx
index 933a71616039..360c2bc99750 100644
--- a/cui/source/inc/cuitabline.hxx
+++ b/cui/source/inc/cuitabline.hxx
@@ -49,21 +49,21 @@ private:
XDashList* pNewDashList;
XLineEndList* pLineEndList;
XLineEndList* pNewLineEndList;
- BOOL bObjSelected;
+ sal_Bool bObjSelected;
ChangeType nLineEndListState;
ChangeType nDashListState;
ChangeType mnColorTableState;
- USHORT nPageType;
- USHORT nDlgType;
- USHORT nPosDashLb;
- USHORT nPosLineEndLb;
- USHORT mnPos;
- BOOL mbAreaTP;
- BOOL mbDeleteColorTable;
+ sal_uInt16 nPageType;
+ sal_uInt16 nDlgType;
+ sal_uInt16 nPosDashLb;
+ sal_uInt16 nPosLineEndLb;
+ sal_uInt16 mnPos;
+ sal_Bool mbAreaTP;
+ sal_Bool mbDeleteColorTable;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
protected:
virtual short Ok();
@@ -75,7 +75,7 @@ protected:
public:
SvxLineTabDialog( Window* pParent, const SfxItemSet* pAttr,
SdrModel* pModel, const SdrObject* pObj = NULL,
- BOOL bHasObj = TRUE );
+ sal_Bool bHasObj = sal_True );
~SvxLineTabDialog();
void SetNewDashList( XDashList* pInLst)
@@ -148,15 +148,15 @@ private:
List aGrfNames;
List aGrfBrushItems;
String sNumCharFmtName;
- BOOL bLastWidthModified;
+ sal_Bool bLastWidthModified;
Size aSymbolLastSize;
Graphic aSymbolGraphic;
Size aSymbolSize;
- BOOL bSymbols;
+ sal_Bool bSymbols;
const SfxItemSet& rOutAttrs;
RECT_POINT eRP;
- BOOL bObjSelected;
+ sal_Bool bObjSelected;
XOutdevItemPool* pXPool;
XLineStyleItem aXLStyle;
@@ -173,15 +173,15 @@ private:
ChangeType* pnLineEndListState;
ChangeType* pnDashListState;
ChangeType* pnColorTableState;
- UINT16 nPageType; //add CHINA001
- UINT16 nDlgType; //add CHINA001
- USHORT* pPosDashLb;
- USHORT* pPosLineEndLb;
+ sal_uInt16 nPageType; //add CHINA001
+ sal_uInt16 nDlgType; //add CHINA001
+ sal_uInt16* pPosDashLb;
+ sal_uInt16* pPosLineEndLb;
SfxMapUnit ePoolUnit;
// #63083#
- INT32 nActLineWidth;
+ sal_Int32 nActLineWidth;
//Handler fr Gallery-Popup-Menue-Button + Size
DECL_LINK( GraphicHdl_Impl, MenuButton * );
@@ -201,13 +201,13 @@ private:
// #116827#
DECL_LINK( ChangeEdgeStyleHdl_Impl, void * );
- BOOL FillXLSet_Impl();
+ sal_Bool FillXLSet_Impl();
#endif
void FillListboxes();
public:
- void ShowSymbolControls(BOOL bOn);
+ void ShowSymbolControls(sal_Bool bOn);
SvxLineTabPage( Window* pParent, const SfxItemSet& rInAttrs );
virtual ~SvxLineTabPage();
@@ -216,9 +216,9 @@ public:
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet& );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -231,12 +231,12 @@ public:
void SetColorTable( XColorTable* pColTab ) { pColorTab = pColTab; }
void SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
void SetLineEndList( XLineEndList* pLneEndLst) { pLineEndList = pLneEndLst; }
- void SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+ void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
- void SetPageType( UINT16 nInType ) { nPageType = nInType; }//CHINA001 void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetDlgType( UINT16 nInType ) { nDlgType = nInType; } //CHINA001 void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
- void SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
+ void SetPageType( sal_uInt16 nInType ) { nPageType = nInType; }//CHINA001 void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+ void SetDlgType( sal_uInt16 nInType ) { nDlgType = nInType; } //CHINA001 void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
+ void SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
@@ -281,7 +281,7 @@ private:
const SfxItemSet& rOutAttrs;
XDash aDash;
- BOOL bObjSelected;
+ sal_Bool bObjSelected;
XOutdevItemPool* pXPool;
XLineStyleItem aXLStyle;
@@ -294,9 +294,9 @@ private:
XDashList* pDashList;
ChangeType* pnDashListState;
- USHORT* pPageType;
- USHORT* pDlgType;
- USHORT* pPosDashLb;
+ sal_uInt16* pPageType;
+ sal_uInt16* pDlgType;
+ sal_uInt16* pPosDashLb;
SfxMapUnit ePoolUnit;
FieldUnit eFUnit;
@@ -326,18 +326,18 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
void SetDashList( XDashList* pDshLst ) { pDashList = pDshLst; }
- void SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+ void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
- void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPosDashLb( USHORT* pInPos ) { pPosDashLb = pInPos; }
+ void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+ void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetPosDashLb( sal_uInt16* pInPos ) { pPosDashLb = pInPos; }
void SetDashChgd( ChangeType* pIn ) { pnDashListState = pIn; }
@@ -371,7 +371,7 @@ private:
const SfxItemSet& rOutAttrs;
const SdrObject* pPolyObj;
- BOOL bObjSelected;
+ sal_Bool bObjSelected;
XOutdevItemPool* pXPool;
XLineStyleItem aXLStyle;
@@ -383,9 +383,9 @@ private:
XLineEndList* pLineEndList;
ChangeType* pnLineEndListState;
- USHORT* pPageType;
- USHORT* pDlgType;
- USHORT* pPosLineEndLb;
+ sal_uInt16* pPageType;
+ sal_uInt16* pDlgType;
+ sal_uInt16* pPosLineEndLb;
#ifdef _SVX_TPLNEEND_CXX
DECL_LINK( ClickAddHdl_Impl, void * );
@@ -406,7 +406,7 @@ public:
void Construct();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -414,11 +414,11 @@ public:
void SetLineEndList( XLineEndList* pInList ) { pLineEndList = pInList; }
void SetPolyObj( const SdrObject* pObj ) { pPolyObj = pObj; }
- void SetObjSelected( BOOL bHasObj ) { bObjSelected = bHasObj; }
+ void SetObjSelected( sal_Bool bHasObj ) { bObjSelected = bHasObj; }
- void SetPageType( USHORT* pInType ) { pPageType = pInType; }
- void SetDlgType( USHORT* pInType ) { pDlgType = pInType; }
- void SetPosLineEndLb( USHORT* pInPos ) { pPosLineEndLb = pInPos; }
+ void SetPageType( sal_uInt16* pInType ) { pPageType = pInType; }
+ void SetDlgType( sal_uInt16* pInType ) { pDlgType = pInType; }
+ void SetPosLineEndLb( sal_uInt16* pInPos ) { pPosLineEndLb = pInPos; }
void SetLineEndChgd( ChangeType* pIn ) { pnLineEndListState = pIn; }
diff --git a/cui/source/inc/dbregister.hxx b/cui/source/inc/dbregister.hxx
index b89ec4e779a0..d069933f13ef 100644
--- a/cui/source/inc/dbregister.hxx
+++ b/cui/source/inc/dbregister.hxx
@@ -62,8 +62,8 @@ namespace svx
HeaderBar* pHeaderBar;
::svx::OptHeaderTabListBox* pPathBox;
SvLBoxEntry* m_pCurEntry;
- ULONG m_nOldCount;
- BOOL m_bModified;
+ sal_uLong m_nOldCount;
+ sal_Bool m_bModified;
#ifdef SVX_DBREGISTER_HXX
DECL_LINK( NewHdl, void * );
@@ -102,9 +102,9 @@ namespace svx
virtual ~DbRegistrationOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void FillUserData();
};
diff --git a/cui/source/inc/defdlgname.hxx b/cui/source/inc/defdlgname.hxx
index 3342d66968a2..273aabcdb3ff 100644
--- a/cui/source/inc/defdlgname.hxx
+++ b/cui/source/inc/defdlgname.hxx
@@ -29,8 +29,8 @@
// define ----------------------------------------------------------------
-#define MESS_BTN_1 ((USHORT)0)
-#define MESS_BTN_2 ((USHORT)1)
+#define MESS_BTN_1 ((sal_uInt16)0)
+#define MESS_BTN_2 ((sal_uInt16)1)
// const -----------------------------------------------------------------
diff --git a/cui/source/inc/dlgname.hxx b/cui/source/inc/dlgname.hxx
index 173ef8e45139..e0e0a05cc9d3 100644
--- a/cui/source/inc/dlgname.hxx
+++ b/cui/source/inc/dlgname.hxx
@@ -195,7 +195,7 @@ public:
SvxMessDialog( Window* pWindow, const String& rText, const String& rDesc, Image* pImg = NULL );
~SvxMessDialog();
- void SetButtonText( USHORT nBtnId, const String& rNewTxt );
+ void SetButtonText( sal_uInt16 nBtnId, const String& rNewTxt );
};
diff --git a/cui/source/inc/dstribut.hxx b/cui/source/inc/dstribut.hxx
index ef28d21c915e..1100f76ccbe6 100644
--- a/cui/source/inc/dstribut.hxx
+++ b/cui/source/inc/dstribut.hxx
@@ -93,8 +93,8 @@ public:
static SfxTabPage* Create(Window*, const SfxItemSet&,
SvxDistributeHorizontal eHor, SvxDistributeVertical eVer);
- static UINT16* GetRanges();
- virtual BOOL FillItemSet(SfxItemSet&);
+ static sal_uInt16* GetRanges();
+ virtual sal_Bool FillItemSet(SfxItemSet&);
virtual void Reset(const SfxItemSet&);
virtual void PointChanged(Window* pWindow, RECT_POINT eRP);
diff --git a/cui/source/inc/grfpage.hxx b/cui/source/inc/grfpage.hxx
index 91d6e89e61dd..ab3ff52318a6 100644
--- a/cui/source/inc/grfpage.hxx
+++ b/cui/source/inc/grfpage.hxx
@@ -106,9 +106,9 @@ class SvxGrfCropPage : public SfxTabPage
const MetricField* pLastCropField;
long nOldWidth;
long nOldHeight;
- BOOL bReset;
- BOOL bInitialized;
- BOOL bSetOrigSize;
+ sal_Bool bReset;
+ sal_Bool bInitialized;
+ sal_Bool bSetOrigSize;
SvxGrfCropPage( Window *pParent, const SfxItemSet &rSet );
@@ -124,14 +124,14 @@ class SvxGrfCropPage : public SfxTabPage
void CalcZoom();
void CalcMinMaxBorder();
- void GraphicHasChanged(BOOL bFound);
+ void GraphicHasChanged(sal_Bool bFound);
virtual void ActivatePage(const SfxItemSet& rSet);
Size GetGrfOrigSize( const Graphic& ) const;
public:
static SfxTabPage *Create( Window *pParent, const SfxItemSet &rSet );
- virtual BOOL FillItemSet( SfxItemSet &rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet &rSet );
virtual void Reset( const SfxItemSet &rSet );
virtual int DeactivatePage( SfxItemSet *pSet );
};
diff --git a/cui/source/inc/hangulhanjadlg.hxx b/cui/source/inc/hangulhanjadlg.hxx
index 6c344cec81c5..ca8a2142764d 100644
--- a/cui/source/inc/hangulhanjadlg.hxx
+++ b/cui/source/inc/hangulhanjadlg.hxx
@@ -75,11 +75,11 @@ namespace svx
void Clear();
void InsertEntry( const XubString& rStr );
- void SelectEntryPos( USHORT nPos );
+ void SelectEntryPos( sal_uInt16 nPos );
- USHORT GetEntryCount() const;
+ sal_uInt16 GetEntryCount() const;
- XubString GetEntry( USHORT nPos ) const;
+ XubString GetEntry( sal_uInt16 nPos ) const;
XubString GetSelectEntry() const;
virtual void StateChanged( StateChangedType nStateChange );
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index ecf59a426528..14eeb5c77933 100644..100755
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -50,7 +50,7 @@ public:
void ConnectElements( void );
// should be called after all manipulations on elements are done
// calcs real sizes depending on sizes of this
- void Show( BOOL bVisible = TRUE, USHORT nFlags = 0 ); // same meaning as Windows::Show()
+ void Show( sal_Bool bVisible = sal_True, sal_uInt16 nFlags = 0 ); // same meaning as Windows::Show()
void Enable( bool bEnable = true, bool bChild = true ); // same meaning as Windows::Enable()
};
diff --git a/cui/source/inc/hldocntp.hxx b/cui/source/inc/hldocntp.hxx
index 9859fc9c0f80..81fbc89eee67 100644
--- a/cui/source/inc/hldocntp.hxx
+++ b/cui/source/inc/hldocntp.hxx
@@ -52,7 +52,7 @@ private:
DECL_LINK (ClickNewHdl_Impl , void * ); // Button : New
- Image GetImage( USHORT nId );
+ Image GetImage( sal_uInt16 nId );
protected:
void FillDlgFields ( String& aStrURL );
@@ -66,7 +66,7 @@ public:
static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
- virtual BOOL AskApply ();
+ virtual sal_Bool AskApply ();
virtual void DoApply ();
virtual void SetInitFocus();
diff --git a/cui/source/inc/hldoctp.hxx b/cui/source/inc/hldoctp.hxx
index 08bfd4d9d308..7eae2afd6b7f 100644
--- a/cui/source/inc/hldoctp.hxx
+++ b/cui/source/inc/hldoctp.hxx
@@ -52,7 +52,7 @@ private:
String maStrURL;
- BOOL mbMarkWndOpen;
+ sal_Bool mbMarkWndOpen;
DECL_LINK (ClickFileopenHdl_Impl , void * ); // Button : Fileopen
DECL_LINK (ClickTargetHdl_Impl , void * ); // Button : Target
@@ -74,8 +74,8 @@ protected:
void GetCurentItemData ( String& aStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode );
- virtual BOOL ShouldOpenMarkWnd () {return mbMarkWndOpen;}
- virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;}
+ virtual sal_Bool ShouldOpenMarkWnd () {return mbMarkWndOpen;}
+ virtual void SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;}
String GetCurrentURL ();
public:
diff --git a/cui/source/inc/hlinettp.hxx b/cui/source/inc/hlinettp.hxx
index e39bb20900af..36f5919c02e7 100644
--- a/cui/source/inc/hlinettp.hxx
+++ b/cui/source/inc/hlinettp.hxx
@@ -57,7 +57,7 @@ private:
String maStrOldUser;
String maStrOldPassword;
- BOOL mbMarkWndOpen;
+ sal_Bool mbMarkWndOpen;
String maStrStdDocURL;
@@ -88,8 +88,8 @@ protected:
virtual void GetCurentItemData ( String& aStrURL, String& aStrName,
String& aStrIntName, String& aStrFrame,
SvxLinkInsertMode& eMode );
- virtual BOOL ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
- virtual void SetMarkWndShouldOpen (BOOL bOpen) {mbMarkWndOpen=bOpen;}
+ virtual sal_Bool ShouldOpenMarkWnd () {return ( mbMarkWndOpen && maRbtLinktypInternet.IsChecked() );}
+ virtual void SetMarkWndShouldOpen (sal_Bool bOpen) {mbMarkWndOpen=bOpen;}
public:
SvxHyperlinkInternetTp ( Window *pParent, const SfxItemSet& rItemSet);
@@ -98,7 +98,7 @@ public:
static IconChoicePage* Create( Window* pWindow, const SfxItemSet& rItemSet );
virtual void SetMarkStr ( String& aStrMark );
- virtual void SetOnlineMode( BOOL bEnable );
+ virtual void SetOnlineMode( sal_Bool bEnable );
virtual void SetInitFocus();
};
diff --git a/cui/source/inc/hlmarkwn.hxx b/cui/source/inc/hlmarkwn.hxx
index 615e2e56bdc3..d466d145b2ee 100644
--- a/cui/source/inc/hlmarkwn.hxx
+++ b/cui/source/inc/hlmarkwn.hxx
@@ -73,17 +73,17 @@ private:
//SvTreeListBox maLbTree;
SvxHlmarkTreeLBox maLbTree;
- BOOL mbUserMoved;
- BOOL mbFirst;
+ sal_Bool mbUserMoved;
+ sal_Bool mbFirst;
SvxHyperlinkTabPageBase* mpParent;
String maStrLastURL;
- USHORT mnError;
+ sal_uInt16 mnError;
protected:
- BOOL RefreshFromDoc( ::rtl::OUString aURL );
+ sal_Bool RefreshFromDoc( ::rtl::OUString aURL );
SvLBoxEntry* FindEntry ( String aStrName );
void ClearTree();
@@ -98,13 +98,13 @@ public:
SvxHlinkDlgMarkWnd (SvxHyperlinkTabPageBase *pParent);
~SvxHlinkDlgMarkWnd();
- BOOL MoveTo ( Point aNewPos );
+ sal_Bool MoveTo ( Point aNewPos );
void RefreshTree ( String aStrURL );
void SelectEntry ( String aStrMark );
- BOOL ConnectToDialog( BOOL bDoit = TRUE );
+ sal_Bool ConnectToDialog( sal_Bool bDoit = sal_True );
- USHORT SetError( USHORT nError);
+ sal_uInt16 SetError( sal_uInt16 nError);
};
diff --git a/cui/source/inc/hltpbase.hxx b/cui/source/inc/hltpbase.hxx
index 2adb0dbdd920..94ad06053cb4 100644
--- a/cui/source/inc/hltpbase.hxx
+++ b/cui/source/inc/hltpbase.hxx
@@ -80,9 +80,9 @@ public:
class SvxHyperURLBox : public SvtURLBox, public DropTargetHelper
{
private:
- BOOL mbAccessAddress;
+ sal_Bool mbAccessAddress;
-// String GetAllEmailNamesFromDragItem( USHORT nItem );
+// String GetAllEmailNamesFromDragItem( sal_uInt16 nItem );
protected:
@@ -95,7 +95,7 @@ protected:
virtual long PreNotify( NotifyEvent& rNEvt );
public:
- SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE, BOOL bAddresses = FALSE );
+ SvxHyperURLBox( Window* pParent, INetProtocol eSmart = INET_PROT_FILE, sal_Bool bAddresses = sal_False );
};
@@ -127,7 +127,7 @@ private:
protected:
Window* mpDialog;
- BOOL mbStdControlsInit;
+ sal_Bool mbStdControlsInit;
String maStrInitURL;
@@ -151,7 +151,7 @@ protected:
String aEmptyStr;
- BOOL FileExists( const INetURLObject& rURL );
+ sal_Bool FileExists( const INetURLObject& rURL );
static String GetSchemeFromURL( String aStrURL );
inline void DisableClose( sal_Bool _bDisable ) { mbIsCloseDisabled = _bDisable; }
@@ -170,27 +170,27 @@ public:
mxDocumentFrame = rxDocumentFrame;
}
- virtual BOOL AskApply ();
+ virtual sal_Bool AskApply ();
virtual void DoApply ();
- virtual void SetOnlineMode( BOOL bEnable );
+ virtual void SetOnlineMode( sal_Bool bEnable );
virtual void SetInitFocus();
virtual void SetMarkStr ( String& aStrMark );
virtual void Reset( const SfxItemSet& );
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void ActivatePage( const SfxItemSet& rItemSet );
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
- BOOL IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); }
+ sal_Bool IsMarkWndVisible () { return ((Window*)mpMarkWnd)->IsVisible(); }
Size GetSizeExtraWnd () { return ( mpMarkWnd->GetSizePixel() ); }
- BOOL MoveToExtraWnd ( Point aNewPos, BOOL bDisConnectDlg = FALSE );
+ sal_Bool MoveToExtraWnd ( Point aNewPos, sal_Bool bDisConnectDlg = sal_False );
virtual void ActivatePage();
virtual void DeactivatePage();
virtual sal_Bool QueryClose();
protected:
- virtual BOOL ShouldOpenMarkWnd();
- virtual void SetMarkWndShouldOpen(BOOL bOpen);
+ virtual sal_Bool ShouldOpenMarkWnd();
+ virtual void SetMarkWndShouldOpen(sal_Bool bOpen);
void ShowMarkWnd ();
void HideMarkWnd () { ( ( Window* ) mpMarkWnd )->Hide(); }
@@ -198,10 +198,10 @@ protected:
SfxDispatcher* GetDispatcher() const;
- USHORT GetMacroEvents();
+ sal_uInt16 GetMacroEvents();
SvxMacroTableDtor* GetMacroTable();
- BOOL IsHTMLDoc() const;
+ sal_Bool IsHTMLDoc() const;
};
#endif // _SVX_TABBASE_HYPERLINK_HXX
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 35f010583fb9..6c2cb24c63fa 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -52,7 +52,7 @@ class IconChoicePage;
// Create-Function
typedef IconChoicePage* (*CreatePage)(Window *pParent, const SfxItemSet &rAttrSet);
-typedef USHORT* (*GetPageRanges)(); // liefert internationale Which-Wert
+typedef sal_uInt16* (*GetPageRanges)(); // liefert internationale Which-Wert
// page-list
DECLARE_LIST( IconChoicePageList, IconChoicePageData * )
@@ -68,21 +68,21 @@ enum EIconChoicePos { PosLeft, PosRight, PosTop, PosBottom };
struct IconChoicePageData
{
- USHORT nId; // Die ID
+ sal_uInt16 nId; // Die ID
CreatePage fnCreatePage; // Pointer auf die Factory
GetPageRanges fnGetRanges;// Pointer auf die Ranges-Funktion
IconChoicePage* pPage; // die TabPage selber
- BOOL bOnDemand; // Flag: ItemSet onDemand
- BOOL bRefresh; // Flag: Seite mu\s neu initialisiert werden
+ sal_Bool bOnDemand; // Flag: ItemSet onDemand
+ sal_Bool bRefresh; // Flag: Seite mu\s neu initialisiert werden
// Konstruktor
- IconChoicePageData( USHORT Id, CreatePage fnPage, GetPageRanges fnRanges, BOOL bDemand )
+ IconChoicePageData( sal_uInt16 Id, CreatePage fnPage, GetPageRanges fnRanges, sal_Bool bDemand )
: nId ( Id ),
fnCreatePage ( fnPage ),
fnGetRanges ( fnRanges ),
pPage ( NULL ),
bOnDemand ( bDemand ),
- bRefresh ( FALSE )
+ bRefresh ( sal_False )
{}
};
@@ -100,9 +100,9 @@ class IconChoicePage : public TabPage
private :
const SfxItemSet* pSet;
String aUserString;
- BOOL bHasExchangeSupport;
+ sal_Bool bHasExchangeSupport;
IconChoiceDialog* pDialog;
- BOOL bStandard;
+ sal_Bool bStandard;
void SetDialog( IconChoiceDialog* pNew ) { pDialog = pNew; }
IconChoiceDialog* GetDialog() const { return pDialog; }
@@ -114,19 +114,19 @@ private :
protected :
IconChoicePage( Window *pParent, const ResId &, const SfxItemSet &rAttrSet );
- USHORT GetSlot( USHORT nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); }
- USHORT GetWhich( USHORT nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); }
+ sal_uInt16 GetSlot( sal_uInt16 nWhich ) const { return pSet->GetPool()->GetSlotId( nWhich ); }
+ sal_uInt16 GetWhich( sal_uInt16 nSlot ) const { return pSet->GetPool()->GetWhich( nSlot ); }
public :
virtual ~IconChoicePage();
const SfxItemSet& GetItemSet() const { return *pSet; }
- virtual BOOL FillItemSet( SfxItemSet& ) = 0;
+ virtual sal_Bool FillItemSet( SfxItemSet& ) = 0;
virtual void Reset( const SfxItemSet& ) = 0;
- BOOL HasExchangeSupport() const { return bHasExchangeSupport; }
- void SetExchangeSupport( BOOL bNew = TRUE ) { bHasExchangeSupport = bNew; }
+ sal_Bool HasExchangeSupport() const { return bHasExchangeSupport; }
+ void SetExchangeSupport( sal_Bool bNew = sal_True ) { bHasExchangeSupport = bNew; }
enum {
KEEP_PAGE = 0x0000, // Fehlerbehandlung; Seite nicht wechseln
@@ -143,7 +143,7 @@ public :
void SetUserData(const String& rString) { aUserString = rString; }
String GetUserData() { return aUserString; }
virtual void FillUserData();
- virtual BOOL IsReadOnly() const;
+ virtual sal_Bool IsReadOnly() const;
virtual sal_Bool QueryClose();
void StateChanged( StateChangedType nType );
@@ -166,7 +166,7 @@ private :
SvtIconChoiceCtrl maIconCtrl; // DAS IconChoice-Control
- USHORT mnCurrentPageId; // Id der aktuell sichtbaren Page
+ sal_uInt16 mnCurrentPageId; // Id der aktuell sichtbaren Page
// Buttons
OKButton aOKBtn;
@@ -177,43 +177,43 @@ private :
const SfxItemSet* pSet;
SfxItemSet* pOutSet;
SfxItemSet* pExampleSet;
- USHORT* pRanges;
+ sal_uInt16* pRanges;
sal_uInt32 nResId;
- BOOL bHideResetBtn;
- BOOL bModal;
- BOOL bInOK;
- BOOL bModified;
- BOOL bItemsReset;
+ sal_Bool bHideResetBtn;
+ sal_Bool bModal;
+ sal_Bool bInOK;
+ sal_Bool bModified;
+ sal_Bool bItemsReset;
DECL_LINK ( ChosePageHdl_Impl, void * );
DECL_LINK ( OkHdl, Button * );
DECL_LINK ( ResetHdl, Button * );
DECL_LINK ( CancelHdl, Button * );
- IconChoicePageData* GetPageData ( USHORT nId );
+ IconChoicePageData* GetPageData ( sal_uInt16 nId );
void Start_Impl();
- BOOL OK_Impl();
+ sal_Bool OK_Impl();
- void SetPosSizeCtrls ( BOOL bInit = FALSE );
- void SetPosSizePages ( USHORT nId );
+ void SetPosSizeCtrls ( sal_Bool bInit = sal_False );
+ void SetPosSizePages ( sal_uInt16 nId );
- void FocusOnIcon ( USHORT nId );
+ void FocusOnIcon ( sal_uInt16 nId );
protected :
void ShowPageImpl ( IconChoicePageData* pData );
void HidePageImpl ( IconChoicePageData* pData );
- virtual void PageCreated( USHORT nId, IconChoicePage& rPage );
- virtual SfxItemSet* CreateInputItemSet( USHORT nId );
+ virtual void PageCreated( sal_uInt16 nId, IconChoicePage& rPage );
+ virtual SfxItemSet* CreateInputItemSet( sal_uInt16 nId );
inline SfxItemSet* GetInputSetImpl() { return (SfxItemSet*)pSet; }
- inline IconChoicePage* GetTabPage( USHORT nPageId )
+ inline IconChoicePage* GetTabPage( sal_uInt16 nPageId )
{ return ( GetPageData (nPageId)->pPage?GetPageData (nPageId)->pPage:NULL); }
const SfxItemSet* GetRefreshedSet();
void ActivatePageImpl ();
- BOOL DeActivatePageImpl ();
+ sal_Bool DeActivatePageImpl ();
void ResetPageImpl ();
short Ok();
@@ -237,16 +237,16 @@ public :
//
SvxIconChoiceCtrlEntry* AddTabPage(
- USHORT nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
+ sal_uInt16 nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
- BOOL bItemsOnDemand = FALSE, ULONG nPos = LIST_APPEND );
+ sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = LIST_APPEND );
- void SetCurPageId( USHORT nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
- USHORT GetCurPageId() const { return mnCurrentPageId; }
- void ShowPage( USHORT nId );
+ void SetCurPageId( sal_uInt16 nId ) { mnCurrentPageId = nId; FocusOnIcon( nId ); }
+ sal_uInt16 GetCurPageId() const { return mnCurrentPageId; }
+ void ShowPage( sal_uInt16 nId );
// liefert ggf. per Map konvertierte lokale Slots
- const USHORT* GetInputRanges( const SfxItemPool& );
+ const sal_uInt16* GetInputRanges( const SfxItemPool& );
void SetInputSet( const SfxItemSet* pInSet );
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
@@ -258,7 +258,7 @@ public :
HelpButton& GetHelpButton() { return aHelpBtn; }
short Execute();
- void Start( BOOL bShow = TRUE );
+ void Start( sal_Bool bShow = sal_True );
sal_Bool QueryClose();
const SfxItemSet* GetExampleSet() const { return pExampleSet; }
diff --git a/cui/source/inc/insdlg.hxx b/cui/source/inc/insdlg.hxx
index a93b93498d37..aeab4d94dbf8 100644
--- a/cui/source/inc/insdlg.hxx
+++ b/cui/source/inc/insdlg.hxx
@@ -56,7 +56,7 @@ public:
com::sun::star::uno::Reference < com::sun::star::embed::XEmbeddedObject > GetObject()
{ return m_xObj; }
virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > GetIconIfIconified( ::rtl::OUString* pGraphicMediaType );
- virtual BOOL IsCreateNew() const;
+ virtual sal_Bool IsCreateNew() const;
};
class SvInsertOleDlg : public InsertObjectDialog_Impl
@@ -85,8 +85,8 @@ class SvInsertOleDlg : public InsertObjectDialog_Impl
ListBox& GetObjectTypes()
{ return aLbObjecttype; }
String GetFilePath() const { return aEdFilepath.GetText(); }
- BOOL IsLinked() const { return aCbFilelink.IsChecked(); }
- BOOL IsCreateNew() const { return aRbNewObject.IsChecked(); }
+ sal_Bool IsLinked() const { return aCbFilelink.IsChecked(); }
+ sal_Bool IsCreateNew() const { return aRbNewObject.IsChecked(); }
public:
SvInsertOleDlg( Window* pParent,
diff --git a/cui/source/inc/internationaloptions.hxx b/cui/source/inc/internationaloptions.hxx
index f95be661f53c..f5c6e919fdac 100644
--- a/cui/source/inc/internationaloptions.hxx
+++ b/cui/source/inc/internationaloptions.hxx
@@ -42,7 +42,7 @@ namespace offapp
protected:
InternationalOptionsPage( Window* _pParent, const SfxItemSet& _rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& _rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& _rSet );
virtual void Reset( const SfxItemSet& _rSet );
public:
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 95e30d241467..ac1269062721 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -72,23 +72,23 @@ private:
String aStrVertList;
short nCaptionType;
- BOOL bFixedAngle;
- INT32 nFixedAngle;
- INT32 nGap;
+ sal_Bool bFixedAngle;
+ sal_Int32 nFixedAngle;
+ sal_Int32 nGap;
short nEscDir;
- BOOL bEscRel;
- INT32 nEscAbs;
- INT32 nEscRel;
- INT32 nLineLen;
- BOOL bFitLineLen;
+ sal_Bool bEscRel;
+ sal_Int32 nEscAbs;
+ sal_Int32 nEscRel;
+ sal_Int32 nLineLen;
+ sal_Bool bFitLineLen;
- USHORT nAnsatzRelPos;
- USHORT nAnsatzTypePos;
- USHORT nWinkelTypePos;
+ sal_uInt16 nAnsatzRelPos;
+ sal_uInt16 nAnsatzTypePos;
+ sal_uInt16 nWinkelTypePos;
#ifdef _SVX_LABDLG_CXX
- void SetupAnsatz_Impl( USHORT nType );
- void SetupType_Impl( USHORT nType );
+ void SetupAnsatz_Impl( sal_uInt16 nType );
+ void SetupType_Impl( sal_uInt16 nType );
DECL_LINK( AnsatzSelectHdl_Impl, ListBox * );
DECL_LINK( AnsatzRelSelectHdl_Impl, ListBox * );
DECL_LINK( LineOptHdl_Impl, Button * );
@@ -103,9 +103,9 @@ public:
virtual ~SvxCaptionTabPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
void Construct();
void SetView( const SdrView* pSdrView )
@@ -122,16 +122,16 @@ class SvxCaptionTabDialog : public SfxTabDialog
private:
// const SfxItemSet& rOutAttrs;
const SdrView* pView;
- USHORT nAnchorCtrls;
+ sal_uInt16 nAnchorCtrls;
Link aValidateLink;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
public:
SvxCaptionTabDialog(Window* pParent, const SdrView* pView,
- USHORT nAnchorTypes = 0 );
+ sal_uInt16 nAnchorTypes = 0 );
~SvxCaptionTabDialog();
diff --git a/cui/source/inc/linkdlg.hxx b/cui/source/inc/linkdlg.hxx
index f6f75ddee89d..114e62679844 100644
--- a/cui/source/inc/linkdlg.hxx
+++ b/cui/source/inc/linkdlg.hxx
@@ -81,7 +81,7 @@ class SvBaseLinksDlg : public ModalDialog
String aStrCloselinkmsgMulti;
String aStrWaitinglink;
sfx2::LinkManager* pLinkMgr;
- BOOL bHtmlMode;
+ sal_Bool bHtmlMode;
SvTabListBox aTbLinks;
Timer aUpdateTimer;
@@ -96,10 +96,10 @@ class SvBaseLinksDlg : public ModalDialog
DECL_LINK( BreakLinkClickHdl, PushButton * );
DECL_LINK( UpdateWaitingHdl, Timer * );
DECL_LINK( EndEditHdl, sfx2::SvBaseLink* );
- sfx2::SvBaseLink* GetSelEntry( USHORT* pPos );
+ sfx2::SvBaseLink* GetSelEntry( sal_uInt16* pPos );
String ImplGetStateStr( const sfx2::SvBaseLink& );
- void SetType( sfx2::SvBaseLink& rLink, USHORT nPos, USHORT nType );
- void InsertEntry( const sfx2::SvBaseLink& rLink, USHORT nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
+ void SetType( sfx2::SvBaseLink& rLink, sal_uInt16 nPos, sal_uInt16 nType );
+ void InsertEntry( const sfx2::SvBaseLink& rLink, sal_uInt16 nPos = LISTBOX_APPEND, sal_Bool bSelect = sal_False);
#endif
void StartUpdateTimer() { aUpdateTimer.Start(); }
@@ -126,7 +126,7 @@ class SvBaseLinksDlg : public ModalDialog
void SetManager( sfx2::LinkManager* );
public:
- SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, BOOL bHtml = FALSE );
+ SvBaseLinksDlg( Window * pParent, sfx2::LinkManager*, sal_Bool bHtml = sal_False );
~SvBaseLinksDlg();
void SetActLink( sfx2::SvBaseLink * pLink );
};
diff --git a/cui/source/inc/macroass.hxx b/cui/source/inc/macroass.hxx
index 45cf2fdbf79e..320ea812725f 100644
--- a/cui/source/inc/macroass.hxx
+++ b/cui/source/inc/macroass.hxx
@@ -76,7 +76,7 @@ public:
virtual ~_SfxMacroTabPage();
- void AddEvent( const String & rEventName, USHORT nEventId );
+ void AddEvent( const String & rEventName, sal_uInt16 nEventId );
const SvxMacroTableDtor& GetMacroTbl() const;
void SetMacroTbl( const SvxMacroTableDtor& rTbl );
@@ -86,10 +86,10 @@ public:
virtual void PageCreated (SfxAllItemSet aSet);
// --------- Erben aus der Basis -------------
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- BOOL IsReadOnly() const;
+ sal_Bool IsReadOnly() const;
};
inline const SvxMacroTableDtor& _SfxMacroTabPage::GetMacroTbl() const
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 0359a330c1f0..c1e864d6b58b 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -48,9 +48,9 @@ typedef ::std::hash_map< ::rtl::OUString, ::std::pair< ::rtl::OUString, ::rtl::O
struct EventDisplayName
{
const sal_Char* pAsciiEventName;
- USHORT nEventResourceID;
+ sal_uInt16 nEventResourceID;
EventDisplayName() : pAsciiEventName( NULL ), nEventResourceID(0) { }
- EventDisplayName( const sal_Char* _pAsciiName, const USHORT _nResId )
+ EventDisplayName( const sal_Char* _pAsciiName, const sal_uInt16 _nResId )
: pAsciiEventName( _pAsciiName )
, nEventResourceID( _nResId )
{
@@ -100,14 +100,14 @@ public:
void InitResources();
void InitAndSetHandler( ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xAppEvents, ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameReplace > xDocEvents, ::com::sun::star::uno::Reference< ::com::sun::star::util::XModifiable > xModifiable );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
using SfxTabPage::Reset;
virtual void Reset();
void DisplayAppEvents( bool appEvents);
- void SetReadOnly( BOOL bSet );
- BOOL IsReadOnly() const;
+ void SetReadOnly( sal_Bool bSet );
+ sal_Bool IsReadOnly() const;
};
class SvxMacroTabPage : public _SvxMacroTabPage
@@ -125,12 +125,12 @@ public:
// class SvxMacroAssignDlg --------------------------------------------------
-typedef USHORT* (*GetTabPageRanges)(); // liefert internationale Which-Werte
+typedef sal_uInt16* (*GetTabPageRanges)(); // liefert internationale Which-Werte
class SvxMacroAssignSingleTabDialog : public SfxModalDialog
{
public:
- SvxMacroAssignSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, USHORT nUniqueId );
+ SvxMacroAssignSingleTabDialog( Window* pParent, const SfxItemSet& rOptionsSet, sal_uInt16 nUniqueId );
virtual ~SvxMacroAssignSingleTabDialog();
diff --git a/cui/source/inc/measure.hxx b/cui/source/inc/measure.hxx
index ddc6f62e6e8a..87129f34c222 100644
--- a/cui/source/inc/measure.hxx
+++ b/cui/source/inc/measure.hxx
@@ -80,7 +80,7 @@ private:
const SdrView* pView;
SfxMapUnit eUnit;
- BOOL bPositionModified;
+ sal_Bool bPositionModified;
#ifdef _SVX_MEASURE_CXX
void FillUnitLB();
@@ -95,9 +95,9 @@ public:
~SvxMeasurePage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
diff --git a/cui/source/inc/multifil.hxx b/cui/source/inc/multifil.hxx
index 8d86e99b731c..1bb4e8c85ef1 100644
--- a/cui/source/inc/multifil.hxx
+++ b/cui/source/inc/multifil.hxx
@@ -47,7 +47,7 @@ private:
DECL_LINK( DelHdl_Impl, PushButton * );
public:
- SvxMultiFileDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
+ SvxMultiFileDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
~SvxMultiFileDialog();
String GetFiles() const { return SvxMultiPathDialog::GetPath(); }
diff --git a/cui/source/inc/multipat.hxx b/cui/source/inc/multipat.hxx
index 44e8f15435fc..6e9df2f3ba04 100644
--- a/cui/source/inc/multipat.hxx
+++ b/cui/source/inc/multipat.hxx
@@ -75,7 +75,7 @@ protected:
DECL_LINK( CheckHdl_Impl, svx::SvxRadioButtonListBox * );
public:
- SvxMultiPathDialog( Window* pParent, BOOL bEmptyAllowed = FALSE );
+ SvxMultiPathDialog( Window* pParent, sal_Bool bEmptyAllowed = sal_False );
~SvxMultiPathDialog();
String GetPath() const;
diff --git a/cui/source/inc/numfmt.hxx b/cui/source/inc/numfmt.hxx
index 92cc494faac4..b6f092788116 100644
--- a/cui/source/inc/numfmt.hxx
+++ b/cui/source/inc/numfmt.hxx
@@ -61,7 +61,7 @@ private:
String aPrevStr;
Color aPrevCol;
- void InitSettings( BOOL bForeground, BOOL bBackground );
+ void InitSettings( sal_Bool bForeground, sal_Bool bBackground );
protected:
virtual void Paint( const Rectangle& rRect );
@@ -91,9 +91,9 @@ public:
#define SfxTabPage ::SfxTabPage
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual int DeactivatePage ( SfxItemSet* pSet = NULL );
@@ -102,7 +102,7 @@ public:
{ SetInfoItem( rItem ); }
void SetOkHdl( const Link& rOkHandler );
- void HideLanguage(BOOL nFlag=TRUE);
+ void HideLanguage(sal_Bool nFlag=sal_True);
virtual long PreNotify( NotifyEvent& rNEvt );
virtual void PageCreated (SfxAllItemSet aSet); //add CHINA001
private:
@@ -139,11 +139,11 @@ private:
SvxNumberInfoItem* pNumItem;
SvxNumberFormatShell* pNumFmtShell;
- ULONG nInitFormat;
+ sal_uLong nInitFormat;
Link fnOkHdl;
- BOOL bNumItemFlag; //Fuer Handling mit DocShell
- BOOL bOneAreaFlag;
+ sal_Bool bNumItemFlag; //Fuer Handling mit DocShell
+ sal_Bool bOneAreaFlag;
short nFixedCategory;
long nCatHeight;
@@ -160,16 +160,16 @@ private:
void Init_Impl();
void FillCurrencyBox();
void FillFormatListBox_Impl( SvxDelStrgs& rEntries );
- void UpdateOptions_Impl( BOOL bCheckCatChange );
- void UpdateFormatListBox_Impl( USHORT bCat, BOOL bUpdateEdit );
+ void UpdateOptions_Impl( sal_Bool bCheckCatChange );
+ void UpdateFormatListBox_Impl( sal_uInt16 bCat, sal_Bool bUpdateEdit );
void DeleteEntryList_Impl( SvxDelStrgs& rEntries );
void Obstructing();
void EnableBySourceFormat_Impl();
- void SetCategory( USHORT nPos );
+ void SetCategory( sal_uInt16 nPos );
String GetExpColorString( Color*& rpPreviewColor, const String& aFormatStr, short nTmpCatPos );
void MakePreviewText( const String& rFormat );
- void ChangePreviewText( USHORT nPos );
- void AddAutomaticLanguage_Impl(LanguageType eAutoLang, BOOL bSelect);
+ void ChangePreviewText( sal_uInt16 nPos );
+ void AddAutomaticLanguage_Impl(LanguageType eAutoLang, sal_Bool bSelect);
// Handler
DECL_LINK( LostFocusHdl_Impl, Edit* pEd );
DECL_LINK( DoubleClickHdl_Impl, SvxFontListBox* pLb );
diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 47decd0ad9c7..f2a551a247b6 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -84,12 +84,12 @@ class SvxSingleNumPickTabPage : public SfxTabPage
SvxNumSettingsArr_Impl aNumSettingsArr;
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- BOOL bModified : 1;
- BOOL bPreset : 1;
+ sal_uInt16 nActNumLvl;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
String sNumCharFmtName;
- USHORT nNumItemId;
+ sal_uInt16 nNumItemId;
protected:
DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -105,7 +105,7 @@ class SvxSingleNumPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
@@ -124,10 +124,10 @@ class SvxBulletPickTabPage : public SfxTabPage
SvxNumValueSet* pExamplesVS;
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- BOOL bModified : 1;
- BOOL bPreset : 1;
- USHORT nNumItemId;
+ sal_uInt16 nActNumLvl;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
+ sal_uInt16 nNumItemId;
String sBulletCharFmtName;
protected:
@@ -143,7 +143,7 @@ class SvxBulletPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetCharFmtName(const String& rName){sBulletCharFmtName = rName;}
@@ -169,10 +169,10 @@ class SvxNumPickTabPage : public SfxTabPage
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- USHORT nNumItemId;
- BOOL bModified : 1;
- BOOL bPreset : 1;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
protected:
@@ -189,7 +189,7 @@ class SvxNumPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetCharFmtNames(const String& rCharName, const String& rBulName)
@@ -216,11 +216,11 @@ class SvxBitmapPickTabPage : public SfxTabPage
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- USHORT nNumItemId;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
SfxMapUnit eCoreUnit;
- BOOL bModified : 1;
- BOOL bPreset : 1;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
protected:
DECL_LINK( NumSelectHdl_Impl, ValueSet*);
@@ -237,7 +237,7 @@ class SvxBitmapPickTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void SetNumCharFmtName(const String& rName){sNumCharFmtName = rName;}
@@ -299,25 +299,25 @@ class SvxNumOptionsTabPage : public SfxTabPage
Size aInitSize[SVX_MAX_NUM];
- BOOL bLastWidthModified : 1;
- BOOL bModified : 1;
- BOOL bPreset : 1;
- BOOL bAutomaticCharStyles: 1;
- BOOL bHTMLMode : 1;
- BOOL bMenuButtonInitialized : 1;
+ sal_Bool bLastWidthModified : 1;
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
+ sal_Bool bAutomaticCharStyles: 1;
+ sal_Bool bHTMLMode : 1;
+ sal_Bool bMenuButtonInitialized : 1;
List aGrfNames;
Font aActBulletFont;
String sBullet;
String sStartWith;
- BYTE nBullet;
- USHORT nActNumLvl;
- USHORT nNumItemId;
+ sal_uInt8 nBullet;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
SfxMapUnit eCoreUnit;
void InitControls();
- void SwitchNumberType( BYTE nType, BOOL bBmp = FALSE );
+ void SwitchNumberType( sal_uInt8 nType, sal_Bool bBmp = sal_False );
void CheckForStartValue_Impl(sal_uInt16 nNumberingType);
DECL_LINK( NumberTypeSelectHdl_Impl, ListBox * );
@@ -348,7 +348,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
//??? void SetWrtShell(SwWrtShell* pSh);
@@ -360,7 +360,7 @@ class SvxNumOptionsTabPage : public SfxTabPage
void SetMetric(FieldUnit eSet);
ListBox& GetCharFmtListBox() {return aCharFmtLB;}
- void SetModified(BOOL bRepaint = TRUE);
+ void SetModified(sal_Bool bRepaint = sal_True);
virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
};
@@ -415,13 +415,13 @@ class SvxNumPositionTabPage : public SfxTabPage
SvxNumRule* pActNum;
SvxNumRule* pSaveNum;
- USHORT nActNumLvl;
- USHORT nNumItemId;
+ sal_uInt16 nActNumLvl;
+ sal_uInt16 nNumItemId;
SfxMapUnit eCoreUnit;
- BOOL bModified : 1;
- BOOL bPreset : 1;
- BOOL bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
+ sal_Bool bModified : 1;
+ sal_Bool bPreset : 1;
+ sal_Bool bInInintControl : 1; //Modify-Fehler umgehen, soll ab 391 behoben sein
// --> OD 2008-01-11 #newlistlevelattrs#
bool bLabelAlignmentPosAndSpaceModeActive;
// <--
@@ -451,14 +451,14 @@ public:
virtual void ActivatePage(const SfxItemSet& rSet);
virtual int DeactivatePage(SfxItemSet *pSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet);
void SetMetric(FieldUnit eSet);
- void SetModified(BOOL bRepaint = TRUE);
+ void SetModified(sal_Bool bRepaint = sal_True);
virtual void PageCreated(SfxAllItemSet aSet); // add CHINA001
};
diff --git a/cui/source/inc/optasian.hxx b/cui/source/inc/optasian.hxx
index 3e13018398b5..6c18568b6292 100644
--- a/cui/source/inc/optasian.hxx
+++ b/cui/source/inc/optasian.hxx
@@ -72,8 +72,8 @@ public:
virtual ~SvxAsianLayoutPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- static UINT16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ static sal_uInt16* GetRanges();
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/inc/optdict.hxx b/cui/source/inc/optdict.hxx
index 345623c19cff..27627b96c9f3 100644
--- a/cui/source/inc/optdict.hxx
+++ b/cui/source/inc/optdict.hxx
@@ -148,7 +148,7 @@ private:
long nWidth;
sal_Bool bFirstSelect;
sal_Bool bDoNothing;
- BOOL bDicIsReadonly;
+ sal_Bool bDicIsReadonly;
#ifdef _SVX_OPTDICT_CXX
DECL_LINK( SelectBookHdl_Impl, ListBox * );
@@ -165,7 +165,7 @@ private:
::com::sun::star::linguistic2::XDictionary > &xDic );
void RemoveDictEntry(SvLBoxEntry* pEntry);
- USHORT GetLBInsertPos(const String &rDicWord);
+ sal_uInt16 GetLBInsertPos(const String &rDicWord);
#endif
diff --git a/cui/source/inc/optimprove.hxx b/cui/source/inc/optimprove.hxx
index 266c51944b09..c827417b669c 100644
--- a/cui/source/inc/optimprove.hxx
+++ b/cui/source/inc/optimprove.hxx
@@ -59,7 +59,7 @@ public:
SvxImprovementPage( Window* pParent );
~SvxImprovementPage();
- inline bool IsYesChecked() const { return m_aYesRB.IsChecked() != FALSE; }
+ inline bool IsYesChecked() const { return m_aYesRB.IsChecked() != sal_False; }
inline String GetPageText() const { return GetText(); }
inline String GetInvitationText() const { return m_aInvitationFT.GetText(); }
diff --git a/cui/source/inc/optlingu.hxx b/cui/source/inc/optlingu.hxx
index 9220ed9bcfbc..26111e4bd0b0 100644
--- a/cui/source/inc/optlingu.hxx
+++ b/cui/source/inc/optlingu.hxx
@@ -86,7 +86,7 @@ class SvxEditModulesDlg : public ModalDialog
SvLBoxButtonData* pCheckButtonData;
- SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+ SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
#ifdef _SVX_OPTLINGU_CXX
DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
@@ -149,10 +149,10 @@ private:
SvxLinguData_Impl* pLinguData;
SvxLinguTabPage( Window* pParent, const SfxItemSet& rCoreSet );
- SvLBoxEntry* CreateEntry(String& rTxt, USHORT nCol);
+ SvLBoxEntry* CreateEntry(String& rTxt, sal_uInt16 nCol);
- void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
- ULONG GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, USHORT nIdx );
+ void AddDicBoxEntry( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
+ sal_uLong GetDicUserData( const com::sun::star::uno::Reference< com::sun::star::linguistic2::XDictionary > &rxDic, sal_uInt16 nIdx );
#ifdef _SVX_OPTLINGU_CXX
DECL_LINK( SelectHdl_Impl, SvxCheckListBox * );
diff --git a/cui/source/inc/optpath.hxx b/cui/source/inc/optpath.hxx
index 2ac80aa64094..e73f390ad2f3 100644
--- a/cui/source/inc/optpath.hxx
+++ b/cui/source/inc/optpath.hxx
@@ -94,9 +94,9 @@ private:
DECL_LINK( DialogClosedHdl, ::com::sun::star::ui::dialogs::DialogClosedEvent* );
- void GetPathList( USHORT _nPathHandle, String& _rInternalPath,
+ void GetPathList( sal_uInt16 _nPathHandle, String& _rInternalPath,
String& _rUserPath, String& _rWritablePath, sal_Bool& _rReadOnly );
- void SetPathList( USHORT _nPathHandle,
+ void SetPathList( sal_uInt16 _nPathHandle,
const String& _rUserPath, const String& _rWritablePath );
#endif
@@ -105,9 +105,9 @@ public:
~SvxPathTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void FillUserData();
};
diff --git a/cui/source/inc/page.hxx b/cui/source/inc/page.hxx
index 9931d2d2cff1..053cbdcad8dc 100644
--- a/cui/source/inc/page.hxx
+++ b/cui/source/inc/page.hxx
@@ -85,7 +85,7 @@
*/
struct SvxPage_Impl;
-typedef USHORT MarginPosition;
+typedef sal_uInt16 MarginPosition;
class SvxPageDescPage : public SfxTabPage
{
@@ -165,7 +165,7 @@ class SvxPageDescPage : public SfxTabPage
long nLastBottomMargin;
Size aMaxSize;
- BOOL bLandscape;
+ sal_Bool bLandscape;
FASTBOOL bBorderModified;
SvxModeType eMode;
Paper ePaperStart;
@@ -218,9 +218,9 @@ protected:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rOutSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rOutSet );
virtual void Reset( const SfxItemSet& rSet );
virtual void FillUserData();
diff --git a/cui/source/inc/paragrph.hxx b/cui/source/inc/paragrph.hxx
index 64a926f5ef89..49778aec5e81 100644
--- a/cui/source/inc/paragrph.hxx
+++ b/cui/source/inc/paragrph.hxx
@@ -108,13 +108,13 @@ private:
long nAbst;
long nWidth;
long nMinFixDist;
- BOOL bRelativeMode;
- BOOL bNegativeIndents;
+ sal_Bool bRelativeMode;
+ sal_Bool bNegativeIndents;
#ifdef _SVX_PARAGRPH_CXX
void SetLineSpacing_Impl( const SvxLineSpacingItem& rAttr );
void Init_Impl();
- void UpdateExample_Impl( BOOL bAll = FALSE );
+ void UpdateExample_Impl( sal_Bool bAll = sal_False );
DECL_LINK( LineDistHdl_Impl, ListBox* );
DECL_LINK( ModifyHdl_Impl, SvxRelativeField* );
@@ -128,13 +128,13 @@ public:
DECL_LINK( ELRLoseFocusHdl, Edit* );
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- void SetPageWidth( USHORT nPageWidth );
+ void SetPageWidth( sal_uInt16 nPageWidth );
void EnableRelativeMode();
void EnableRegisterMode();
void EnableAutoFirstLine();
@@ -178,7 +178,7 @@ class SvxParaAlignTabPage : public SfxTabPage
DECL_LINK( LastLineHdl_Impl, ListBox* );
DECL_LINK( TextDirectionHdl_Impl, ListBox* );
- void UpdateExample_Impl( BOOL bAll = FALSE );
+ void UpdateExample_Impl( sal_Bool bAll = sal_False );
#endif
SvxParaAlignTabPage( Window* pParent, const SfxItemSet& rSet );
@@ -189,9 +189,9 @@ protected:
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void EnableJustifyExt();
@@ -223,9 +223,9 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
void DisablePageBreak();
@@ -275,9 +275,9 @@ private:
NumericField aWidowRowNo;
FixedText aWidowRowLabel;
- BOOL bPageBreak;
- BOOL bHtmlMode;
- USHORT nStdPos;
+ sal_Bool bPageBreak;
+ sal_Bool bHtmlMode;
+ sal_uInt16 nStdPos;
#ifdef _SVX_PARAGRPH_CXX
DECL_LINK( PageBreakHdl_Impl, TriStateBox* );
@@ -314,9 +314,9 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/inc/pastedlg.hxx b/cui/source/inc/pastedlg.hxx
index a1b71e2f751e..f59c3612dc91 100644
--- a/cui/source/inc/pastedlg.hxx
+++ b/cui/source/inc/pastedlg.hxx
@@ -65,8 +65,8 @@ class SvPasteObjectDialog : public ModalDialog
Table aSupplementTable;
SvGlobalName aObjClassName;
String aObjName;
- USHORT nAspect;
- BOOL bLink;
+ sal_uInt16 nAspect;
+ sal_Bool bLink;
ListBox& ObjectLB() { return aLbInsertList; }
FixedText& ObjectSource() { return aFtObjectSource; }
@@ -78,8 +78,8 @@ class SvPasteObjectDialog : public ModalDialog
DECL_LINK( SelectHdl, ListBox * );
DECL_LINK( DoubleClickHdl, ListBox * );
void SetDefault();
- USHORT GetAspect() const { return nAspect; }
- BOOL ShouldLink() const { return bLink; }
+ sal_uInt16 GetAspect() const { return nAspect; }
+ sal_Bool ShouldLink() const { return bLink; }
public:
SvPasteObjectDialog( Window* pParent );
@@ -87,7 +87,7 @@ public:
void Insert( SotFormatStringId nFormat, const String & rFormatName );
void SetObjName( const SvGlobalName & rClass, const String & rObjName );
- ULONG GetFormat( const TransferableDataHelper& aHelper,
+ sal_uLong GetFormat( const TransferableDataHelper& aHelper,
const DataFlavorExVector* pFormats=0,
const TransferableObjectDescriptor* pDesc=0 );
};
diff --git a/cui/source/inc/postdlg.hxx b/cui/source/inc/postdlg.hxx
index 701546225bf4..8dedd612d27e 100644
--- a/cui/source/inc/postdlg.hxx
+++ b/cui/source/inc/postdlg.hxx
@@ -61,10 +61,10 @@ class SvxPostItDialog : public SfxModalDialog
{
public:
SvxPostItDialog( Window* pParent, const SfxItemSet& rCoreSet,
- BOOL bPrevNext = FALSE, BOOL bRedline = FALSE );
+ sal_Bool bPrevNext = sal_False, sal_Bool bRedline = sal_False );
~SvxPostItDialog();
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
Link GetPrevHdl() const { return aPrevHdlLink; }
@@ -74,20 +74,20 @@ public:
void SetNextHdl( const Link& rLink )
{ aNextHdlLink = rLink; }
- void EnableTravel(BOOL bNext, BOOL bPrev);
+ void EnableTravel(sal_Bool bNext, sal_Bool bPrev);
inline String GetNote() { return aEditED.GetText(); }
inline void SetNote(const String& rTxt) { aEditED.SetText(rTxt); }
void ShowLastAuthor(const String& rAuthor, const String& rDate);
- inline void DontChangeAuthor() { aAuthorBtn.Enable(FALSE); }
+ inline void DontChangeAuthor() { aAuthorBtn.Enable(sal_False); }
inline void HideAuthor() { aAuthorBtn.Hide(); }
- inline void SetReadonlyPostIt(BOOL bDisable)
+ inline void SetReadonlyPostIt(sal_Bool bDisable)
{
aOKBtn.Enable( !bDisable );
aEditED.SetReadOnly( bDisable );
aAuthorBtn.Enable( !bDisable );
}
- inline BOOL IsOkEnabled() const { return aOKBtn.IsEnabled(); }
+ inline sal_Bool IsOkEnabled() const { return aOKBtn.IsEnabled(); }
private:
FixedLine aPostItFL;
diff --git a/cui/source/inc/scriptdlg.hxx b/cui/source/inc/scriptdlg.hxx
index 8ecdd93a5d2e..579a3756c447 100644
--- a/cui/source/inc/scriptdlg.hxx
+++ b/cui/source/inc/scriptdlg.hxx
@@ -75,7 +75,7 @@ class SFTreeListBox : public SvTreeListBox
{
friend class SvxScriptOrgDialog;
private:
- USHORT nMode;
+ sal_uInt16 nMode;
Image m_hdImage;
Image m_hdImage_hc;
Image m_libImage;
@@ -109,12 +109,12 @@ public:
- SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
+ SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
SvLBoxEntry * pParent,
bool bChildrenOnDemand,
std::auto_ptr< SFEntry > aUserData,
::rtl::OUString factoryURL );
- SvLBoxEntry * insertEntry(String const & rText, USHORT nBitmap,
+ SvLBoxEntry * insertEntry(String const & rText, sal_uInt16 nBitmap,
SvLBoxEntry * pParent,
bool bChildrenOnDemand,
std::auto_ptr< SFEntry > aUserData );
@@ -131,7 +131,7 @@ private:
CancelButton aCancelButton;
public:
- InputDialog( Window * pParent, USHORT nMode );
+ InputDialog( Window * pParent, sal_uInt16 nMode );
~InputDialog();
String GetObjectName() const { return aEdit.GetText(); }
@@ -141,21 +141,21 @@ public:
class SFEntry
{
private:
- BYTE nType;
+ sal_uInt8 nType;
bool loaded;
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > nodes;
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > model;
SFEntry(){}
public:
- SFEntry( BYTE nT ) { nType = nT; loaded=false; }
- SFEntry( BYTE nT,
+ SFEntry( sal_uInt8 nT ) { nType = nT; loaded=false; }
+ SFEntry( sal_uInt8 nT,
const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& entryNodes ,
const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& entryModel) { nType = nT; nodes = entryNodes; loaded=false; model = entryModel; }
SFEntry( const SFEntry& r ) { nType = r.nType; nodes = r.nodes; loaded = r.loaded; }
virtual ~SFEntry() {}
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode > GetNode() { return nodes ;}
::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > GetModel() { return model ;};
- BYTE GetType() const { return nType; }
+ sal_uInt8 GetType() const { return nType; }
bool isLoaded() const { return loaded; }
void setLoaded() { loaded=true; }
};
@@ -191,7 +191,7 @@ protected:
DECL_LINK( MacroDoubleClickHdl, SvTreeListBox * );
DECL_LINK( ScriptSelectHdl, SvTreeListBox * );
DECL_LINK( ButtonHdl, Button * );
- BOOL getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
+ sal_Bool getBoolProperty( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >& xProps, ::rtl::OUString& propName );
void CheckButtons( ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& node );
void createEntry( SvLBoxEntry* pEntry );
diff --git a/cui/source/inc/sdrcelldlg.hxx b/cui/source/inc/sdrcelldlg.hxx
index fec72bfc07b6..6fea545823b0 100644
--- a/cui/source/inc/sdrcelldlg.hxx
+++ b/cui/source/inc/sdrcelldlg.hxx
@@ -54,7 +54,7 @@ public:
SvxFormatCellsDialog( Window* pParent, const SfxItemSet* pAttr, SdrModel* pModel );
~SvxFormatCellsDialog();
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
};
diff --git a/cui/source/inc/selector.hxx b/cui/source/inc/selector.hxx
index 3c01b955a474..c59aa535c0d2 100644
--- a/cui/source/inc/selector.hxx
+++ b/cui/source/inc/selector.hxx
@@ -50,41 +50,41 @@
struct SvxGroupInfo_Impl
{
- USHORT nKind;
- USHORT nOrd;
+ sal_uInt16 nKind;
+ sal_uInt16 nOrd;
::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >
xBrowseNode;
::rtl::OUString sURL;
::rtl::OUString sHelpText;
- BOOL bWasOpened;
+ sal_Bool bWasOpened;
- SvxGroupInfo_Impl( USHORT n, USHORT nr )
+ SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr )
:nKind( n )
,nOrd( nr )
,xBrowseNode()
,sURL()
,sHelpText()
- ,bWasOpened(FALSE)
+ ,bWasOpened(sal_False)
{
}
- SvxGroupInfo_Impl( USHORT n, USHORT nr, const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxNode )
+ SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::com::sun::star::uno::Reference< ::com::sun::star::script::browse::XBrowseNode >& _rxNode )
:nKind( n )
,nOrd( nr )
,xBrowseNode( _rxNode )
,sURL()
,sHelpText()
- ,bWasOpened(FALSE)
+ ,bWasOpened(sal_False)
{
}
- SvxGroupInfo_Impl( USHORT n, USHORT nr, const ::rtl::OUString& _rURL, const ::rtl::OUString& _rHelpText )
+ SvxGroupInfo_Impl( sal_uInt16 n, sal_uInt16 nr, const ::rtl::OUString& _rURL, const ::rtl::OUString& _rHelpText )
:nKind( n )
,nOrd( nr )
,xBrowseNode()
,sURL( _rURL )
,sHelpText( _rHelpText )
- ,bWasOpened(FALSE)
+ ,bWasOpened(sal_False)
{
}
};
@@ -165,7 +165,7 @@ private:
protected:
virtual void RequestingChilds( SvLBoxEntry *pEntry);
- virtual BOOL Expand( SvLBoxEntry* pParent );
+ virtual sal_Bool Expand( SvLBoxEntry* pParent );
using SvListView::Expand;
public:
@@ -179,7 +179,7 @@ public:
~SvxConfigGroupListBox_Impl();
void Init();
- void Open( SvLBoxEntry*, BOOL );
+ void Open( SvLBoxEntry*, sal_Bool );
void ClearAll();
void GroupSelected();
@@ -203,7 +203,7 @@ class SvxScriptSelectorDialog : public ModelessDialog
FixedLine aDescription;
FixedText aDescriptionText;
- BOOL m_bShowSlots;
+ sal_Bool m_bShowSlots;
Link m_aAddHdl;
DECL_LINK( ClickHdl, Button * );
@@ -217,7 +217,7 @@ public:
SvxScriptSelectorDialog (
Window* pParent = NULL,
- BOOL bShowSlots = FALSE,
+ sal_Bool bShowSlots = sal_False,
const ::com::sun::star::uno::Reference
< ::com::sun::star::frame::XFrame >& xFrame = 0
);
diff --git a/cui/source/inc/srchxtra.hxx b/cui/source/inc/srchxtra.hxx
index 1cf2e91e6511..200a7272d387 100644
--- a/cui/source/inc/srchxtra.hxx
+++ b/cui/source/inc/srchxtra.hxx
@@ -45,7 +45,7 @@ public:
~SvxSearchFormatDialog();
protected:
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
private:
FontList* pFontList;
@@ -57,7 +57,7 @@ class SvxSearchAttributeDialog : public ModalDialog
{
public:
SvxSearchAttributeDialog( Window* pParent, SearchAttrItemList& rLst,
- const USHORT* pWhRanges );
+ const sal_uInt16* pWhRanges );
private:
FixedText aAttrFL;
@@ -92,15 +92,15 @@ private:
public:
SvxSearchSimilarityDialog( Window* pParent,
- BOOL bRelax,
- USHORT nOther,
- USHORT nShorter,
- USHORT nLonger );
-
- USHORT GetOther() { return (USHORT)aOtherFld.GetValue(); }
- USHORT GetShorter() { return (USHORT)aShorterFld.GetValue(); }
- USHORT GetLonger() { return (USHORT)aLongerFld.GetValue(); }
- BOOL IsRelaxed() { return aRelaxBox.IsChecked(); }
+ sal_Bool bRelax,
+ sal_uInt16 nOther,
+ sal_uInt16 nShorter,
+ sal_uInt16 nLonger );
+
+ sal_uInt16 GetOther() { return (sal_uInt16)aOtherFld.GetValue(); }
+ sal_uInt16 GetShorter() { return (sal_uInt16)aShorterFld.GetValue(); }
+ sal_uInt16 GetLonger() { return (sal_uInt16)aLongerFld.GetValue(); }
+ sal_Bool IsRelaxed() { return aRelaxBox.IsChecked(); }
};
diff --git a/cui/source/inc/tabstpge.hxx b/cui/source/inc/tabstpge.hxx
index 80e22eff43b5..5aa7703862b2 100644
--- a/cui/source/inc/tabstpge.hxx
+++ b/cui/source/inc/tabstpge.hxx
@@ -80,12 +80,12 @@ public:
~SvxTabulatorTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rSet );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
- void DisableControls( const USHORT nFlag );
+ void DisableControls( const sal_uInt16 nFlag );
protected:
virtual int DeactivatePage( SfxItemSet* pSet = 0 );
@@ -132,10 +132,10 @@ private:
SvxTabStopItem aNewTabs;
long nDefDist;
FieldUnit eDefUnit;
- BOOL bCheck;
+ sal_Bool bCheck;
#ifdef _SVX_TABSTPGE_CXX
- void InitTabPos_Impl( USHORT nPos = 0 );
+ void InitTabPos_Impl( sal_uInt16 nPos = 0 );
void SetFillAndTabType_Impl();
// Handler
diff --git a/cui/source/inc/textanim.hxx b/cui/source/inc/textanim.hxx
index 5f58258ea255..3c028d0949d1 100644
--- a/cui/source/inc/textanim.hxx
+++ b/cui/source/inc/textanim.hxx
@@ -86,7 +86,7 @@ private:
DECL_LINK( ClickDirectionHdl_Impl, ImageButton * );
void SelectDirection( SdrTextAniDirection nValue );
- USHORT GetSelectedDirection();
+ sal_uInt16 GetSelectedDirection();
#endif
public:
@@ -95,9 +95,9 @@ public:
~SvxTextAnimationPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
void Construct();
@@ -114,7 +114,7 @@ private:
const SfxItemSet& rOutAttrs;
const SdrView* pView;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
public:
diff --git a/cui/source/inc/textattr.hxx b/cui/source/inc/textattr.hxx
index e8ce016d7d6f..2716abcfb043 100644
--- a/cui/source/inc/textattr.hxx
+++ b/cui/source/inc/textattr.hxx
@@ -79,12 +79,12 @@ private:
const SfxItemSet& rOutAttrs;
const SdrView* pView;
- BOOL bAutoGrowSizeEnabled;
- BOOL bContourEnabled;
- BOOL bAutoGrowWidthEnabled;
- BOOL bAutoGrowHeightEnabled;
- BOOL bWordWrapTextEnabled;
- BOOL bFitToSizeEnabled;
+ sal_Bool bAutoGrowSizeEnabled;
+ sal_Bool bContourEnabled;
+ sal_Bool bAutoGrowWidthEnabled;
+ sal_Bool bAutoGrowHeightEnabled;
+ sal_Bool bWordWrapTextEnabled;
+ sal_Bool bFitToSizeEnabled;
#ifdef _SVX_TEXTATTR_CXX
@@ -92,8 +92,8 @@ private:
DECL_LINK( ClickHdl_Impl, void * );
#endif
- /** Return whether the text direction is from left to right (</TRUE>) or
- top to bottom (</FALSE>).
+ /** Return whether the text direction is from left to right (</sal_True>) or
+ top to bottom (</sal_False>).
*/
bool IsTextDirectionLeftToRight (void) const;
@@ -103,9 +103,9 @@ public:
~SvxTextAttrPage();
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void PointChanged( Window* pWindow, RECT_POINT eRP );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index d333237f55c7..b2298ddc5028 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -49,27 +49,27 @@ class SdrView;
/** put this into the nAnchorTypes parameter of the SvxTransformTabDialog c'tor
to disable the size controls */
-const USHORT SVX_OBJ_NORESIZE = 0x0100;
+const sal_uInt16 SVX_OBJ_NORESIZE = 0x0100;
/** put this into the nAnchorTypes parameter of the SvxTransformTabDialog c'tor
to disable the protect controls */
-const USHORT SVX_OBJ_NOPROTECT = 0x0200;
+const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
class SvxTransformTabDialog : public SfxTabDialog
{
private:
const SdrView* pView;
- USHORT nAnchorCtrls;
+ sal_uInt16 nAnchorCtrls;
Link aValidateLink;
- virtual void PageCreated( USHORT nId, SfxTabPage &rPage );
+ virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage );
public:
SvxTransformTabDialog( Window* pParent, const SfxItemSet* pAttr,
const SdrView* pView,
- USHORT nAnchorTypes = 0);
+ sal_uInt16 nAnchorTypes = 0);
~SvxTransformTabDialog();
//link for the Writer to validate positions
@@ -171,9 +171,9 @@ public:
SvxPositionSizeTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -184,7 +184,7 @@ public:
void Construct();
void SetView( const SdrView* pSdrView ) { mpView = pSdrView; }
-// void ShowAnchorCtrls(USHORT nAnchorCtrls); // Writer-spezifische Controls anzeigen
+// void ShowAnchorCtrls(sal_uInt16 nAnchorCtrls); // Writer-spezifische Controls anzeigen
virtual void FillUserData();
void DisableResize();
@@ -236,9 +236,9 @@ public:
SvxAngleTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
@@ -285,9 +285,9 @@ public:
SvxSlantTabPage( Window* pParent, const SfxItemSet& rInAttrs );
static SfxTabPage* Create( Window*, const SfxItemSet& );
- static USHORT* GetRanges();
+ static sal_uInt16* GetRanges();
- virtual BOOL FillItemSet( SfxItemSet& );
+ virtual sal_Bool FillItemSet( SfxItemSet& );
virtual void Reset( const SfxItemSet & );
virtual void ActivatePage( const SfxItemSet& rSet );
diff --git a/cui/source/inc/treeopt.hxx b/cui/source/inc/treeopt.hxx
index 72859aa70945..220968ac4534 100644
--- a/cui/source/inc/treeopt.hxx
+++ b/cui/source/inc/treeopt.hxx
@@ -38,7 +38,7 @@
// static ----------------------------------------------------------------
-BOOL EnableSSO();
+sal_Bool EnableSSO();
CreateTabPage GetSSOCreator( void );
// class OfaOptionsTreeListBox -------------------------------------------
@@ -53,14 +53,14 @@ class OfaOptionsTreeListBox : public SvTreeListBox
using SvListView::Collapse;
private:
- BOOL bInCollapse;
+ sal_Bool bInCollapse;
public:
OfaOptionsTreeListBox(Window* pParent, const ResId& rResId) :
- SvTreeListBox( pParent, rResId ), bInCollapse(FALSE) {}
+ SvTreeListBox( pParent, rResId ), bInCollapse(sal_False) {}
- virtual BOOL Collapse( SvLBoxEntry* pParent );
- BOOL IsInCollapse()const {return bInCollapse;}
+ virtual sal_Bool Collapse( SvLBoxEntry* pParent );
+ sal_Bool IsInCollapse()const {return bInCollapse;}
};
// struct OrderedEntry ---------------------------------------------------
@@ -154,7 +154,7 @@ typedef ::std::vector< OptionsNode* > VectorOfNodes;
struct LastPageSaver
{
- USHORT m_nLastPageId;
+ sal_uInt16 m_nLastPageId;
rtl::OUString m_sLastPageURL_Tools;
rtl::OUString m_sLastPageURL_ExtMgr;
@@ -202,14 +202,14 @@ private:
// for the ColorTabPage
SfxItemSet* pColorPageItemSet;
XColorTable* pColorTab;
- USHORT nChangeType;
- USHORT nUnknownType;
- USHORT nUnknownPos;
- BOOL bIsAreaTP;
-
- BOOL bForgetSelection;
- BOOL bExternBrowserActive;
- BOOL bImageResized;
+ sal_uInt16 nChangeType;
+ sal_uInt16 nUnknownType;
+ sal_uInt16 nUnknownPos;
+ sal_Bool bIsAreaTP;
+
+ sal_Bool bForgetSelection;
+ sal_Bool bExternBrowserActive;
+ sal_Bool bImageResized;
bool bInSelectHdl_Impl;
bool bIsFromExtensionManager;
@@ -223,8 +223,8 @@ private:
static LastPageSaver* pLastPageSaver;
- SfxItemSet* CreateItemSet( USHORT nId );
- void ApplyItemSet( USHORT nId, const SfxItemSet& rSet );
+ SfxItemSet* CreateItemSet( sal_uInt16 nId );
+ void ApplyItemSet( sal_uInt16 nId, const SfxItemSet& rSet );
void InitTreeAndHandler();
void Initialize( const com::sun::star::uno::Reference< com::sun::star::frame::XFrame >& _xFrame );
void ResizeTreeLB( void ); // resizes dialog so that treelistbox has no horizontal scroll bar
@@ -263,16 +263,16 @@ public:
OfaTreeOptionsDialog( Window* pParent, const rtl::OUString& rExtensionId );
~OfaTreeOptionsDialog();
- OptionsPageInfo* AddTabPage( USHORT nId, const String& rPageName, USHORT nGroup );
- USHORT AddGroup( const String& rGroupName, SfxShell* pCreateShell,
- SfxModule* pCreateModule, USHORT nDialogId );
+ OptionsPageInfo* AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup );
+ sal_uInt16 AddGroup( const String& rGroupName, SfxShell* pCreateShell,
+ SfxModule* pCreateModule, sal_uInt16 nDialogId );
void ActivateLastSelection();
- void ActivatePage( USHORT nResId );
+ void ActivatePage( sal_uInt16 nResId );
void ActivatePage( const String& rPageURL );
void ApplyItemSets();
- USHORT GetColorChanged() const { return nChangeType; }
+ sal_uInt16 GetColorChanged() const { return nChangeType; }
XColorTable* GetColorTable() { return pColorTab; }
// helper functions to call the language settings TabPage from the SpellDialog
diff --git a/cui/source/inc/zoom.hxx b/cui/source/inc/zoom.hxx
index 9a8c9b03da1c..0d814d0e30ac 100644
--- a/cui/source/inc/zoom.hxx
+++ b/cui/source/inc/zoom.hxx
@@ -39,9 +39,9 @@
// define ----------------------------------------------------------------
/* CHINA001
-#define ZOOMBTN_OPTIMAL ((USHORT)0x0001)
-#define ZOOMBTN_PAGEWIDTH ((USHORT)0x0002)
-#define ZOOMBTN_WHOLEPAGE ((USHORT)0x0004)
+#define ZOOMBTN_OPTIMAL ((sal_uInt16)0x0001)
+#define ZOOMBTN_PAGEWIDTH ((sal_uInt16)0x0002)
+#define ZOOMBTN_WHOLEPAGE ((sal_uInt16)0x0004)
*/
#ifndef _SVX_ZOOM_HXX
#include "zoom_def.hxx"
@@ -84,7 +84,7 @@ private:
const SfxItemSet& rSet;
SfxItemSet* pOutSet;
- BOOL bModified;
+ sal_Bool bModified;
#ifdef _SVX_ZOOM_CXX
DECL_LINK( UserHdl, RadioButton* );
@@ -101,11 +101,11 @@ public:
const SfxItemSet* GetOutputItemSet() const { return pOutSet; }
- USHORT GetFactor() const;
- void SetFactor( USHORT nNewFactor, USHORT nBtnId = 0 );
+ sal_uInt16 GetFactor() const;
+ void SetFactor( sal_uInt16 nNewFactor, sal_uInt16 nBtnId = 0 );
- void HideButton( USHORT nBtnId );
- void SetLimits( USHORT nMin, USHORT nMax );
+ void HideButton( sal_uInt16 nBtnId );
+ void SetLimits( sal_uInt16 nMin, sal_uInt16 nMax );
};
#include <layout/layout-post.hxx>
diff --git a/cui/source/options/cfgchart.cxx b/cui/source/options/cfgchart.cxx
index ad4c8bc42b3f..64c631266e3f 100644
--- a/cui/source/options/cfgchart.cxx
+++ b/cui/source/options/cfgchart.cxx
@@ -171,7 +171,7 @@ bool SvxChartColorTable::operator==( const SvxChartColorTable & _rOther ) const
SvxChartOptions::SvxChartOptions() :
::utl::ConfigItem( rtl::OUString::createFromAscii( "Office.Chart" )),
- mbIsInitialized( FALSE )
+ mbIsInitialized( sal_False )
{
maPropertyNames.realloc( 1 );
maPropertyNames[ 0 ] = ::rtl::OUString::createFromAscii( "DefaultColor/Series" );
@@ -194,7 +194,7 @@ void SvxChartOptions::SetDefaultColors( const SvxChartColorTable& aCol )
SetModified();
}
-BOOL SvxChartOptions::RetrieveOptions()
+sal_Bool SvxChartOptions::RetrieveOptions()
{
// get sequence containing all properties
@@ -235,9 +235,9 @@ BOOL SvxChartOptions::RetrieveOptions()
maDefColors.append( XColorEntry( aCol, aName ));
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
void SvxChartOptions::Commit()
@@ -271,7 +271,7 @@ void SvxChartOptions::Notify( const com::sun::star::uno::Sequence< rtl::OUString
// class SvxChartColorTableItem
// --------------------
-SvxChartColorTableItem::SvxChartColorTableItem( USHORT nWhich_, const SvxChartColorTable& aTable ) :
+SvxChartColorTableItem::SvxChartColorTableItem( sal_uInt16 nWhich_, const SvxChartColorTable& aTable ) :
SfxPoolItem( nWhich_ ),
m_aColorTable( aTable )
{
diff --git a/cui/source/options/cfgchart.hxx b/cui/source/options/cfgchart.hxx
index 2f7ff8b3df77..2ca899035192 100644
--- a/cui/source/options/cfgchart.hxx
+++ b/cui/source/options/cfgchart.hxx
@@ -70,14 +70,14 @@ class SvxChartOptions : public ::utl::ConfigItem
{
private:
SvxChartColorTable maDefColors;
- BOOL mbIsInitialized;
+ sal_Bool mbIsInitialized;
::com::sun::star::uno::Sequence< ::rtl::OUString >
maPropertyNames;
inline ::com::sun::star::uno::Sequence< ::rtl::OUString > GetPropertyNames() const
{ return maPropertyNames; }
- BOOL RetrieveOptions();
+ sal_Bool RetrieveOptions();
public:
SvxChartOptions();
@@ -97,7 +97,7 @@ class SvxChartColorTableItem : public SfxPoolItem
{
public:
TYPEINFO();
- SvxChartColorTableItem( USHORT nWhich, const SvxChartColorTable& );
+ SvxChartColorTableItem( sal_uInt16 nWhich, const SvxChartColorTable& );
SvxChartColorTableItem( const SvxChartColorTableItem& );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/cui/source/options/connpooloptions.cxx b/cui/source/options/connpooloptions.cxx
index 76bbafa54faa..451b28af785d 100644
--- a/cui/source/options/connpooloptions.cxx
+++ b/cui/source/options/connpooloptions.cxx
@@ -65,7 +65,7 @@ namespace offapp
virtual void Init();
void Update(const DriverPoolingSettings& _rSettings);
- virtual String GetCellText( long nRow, USHORT nColId ) const;
+ virtual String GetCellText( long nRow, sal_uInt16 nColId ) const;
// the handler will be called with a DriverPoolingSettings::const_iterator as parameter,
// or NULL if no valid current row exists
@@ -82,13 +82,13 @@ namespace offapp
sal_Bool isModified() const;
protected:
- virtual void InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol );
- virtual ::svt::CellController* GetController( long nRow, USHORT nCol );
+ virtual void InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol );
+ virtual ::svt::CellController* GetController( long nRow, sal_uInt16 nCol );
- virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const;
+ virtual void PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const;
- virtual BOOL SeekRow( long nRow );
- virtual BOOL SaveModified();
+ virtual sal_Bool SeekRow( long nRow );
+ virtual sal_Bool SaveModified();
virtual sal_Bool IsTabAllowed(sal_Bool _bForward) const;
@@ -97,7 +97,7 @@ namespace offapp
virtual void CursorMoved();
protected:
- virtual sal_uInt32 GetTotalCellWidth(long nRow, USHORT nColId);
+ virtual sal_uInt32 GetTotalCellWidth(long nRow, sal_uInt16 nColId);
private:
@@ -216,7 +216,7 @@ namespace offapp
}
//--------------------------------------------------------------------
- sal_uInt32 DriverListControl::GetTotalCellWidth(long nRow, USHORT nColId)
+ sal_uInt32 DriverListControl::GetTotalCellWidth(long nRow, sal_uInt16 nColId)
{
return GetDataWindow().GetTextWidth(GetCellText(nRow, nColId));
}
@@ -254,7 +254,7 @@ namespace offapp
}
//--------------------------------------------------------------------
- String DriverListControl::GetCellText( long nRow, USHORT nColId ) const
+ String DriverListControl::GetCellText( long nRow, sal_uInt16 nColId ) const
{
String sReturn;
if (nRow > m_aSettings.size())
@@ -269,25 +269,25 @@ namespace offapp
}
//--------------------------------------------------------------------
- void DriverListControl::InitController( ::svt::CellControllerRef& rController, long nRow, USHORT nCol )
+ void DriverListControl::InitController( ::svt::CellControllerRef& rController, long nRow, sal_uInt16 nCol )
{
rController->GetWindow().SetText(GetCellText(nRow, nCol));
}
//--------------------------------------------------------------------
- ::svt::CellController* DriverListControl::GetController( long /*nRow*/, USHORT /*nCol*/ )
+ ::svt::CellController* DriverListControl::GetController( long /*nRow*/, sal_uInt16 /*nCol*/ )
{
return NULL;
}
//--------------------------------------------------------------------
- BOOL DriverListControl::SaveModified()
+ sal_Bool DriverListControl::SaveModified()
{
- return TRUE;
+ return sal_True;
}
//--------------------------------------------------------------------
- BOOL DriverListControl::SeekRow( long _nRow )
+ sal_Bool DriverListControl::SeekRow( long _nRow )
{
DriverListControl_Base::SeekRow(_nRow);
@@ -300,7 +300,7 @@ namespace offapp
}
//--------------------------------------------------------------------
- void DriverListControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, USHORT nColId ) const
+ void DriverListControl::PaintCell( OutputDevice& rDev, const Rectangle& rRect, sal_uInt16 nColId ) const
{
OSL_ENSURE(m_aSeekRow != m_aSettings.end(), "DriverListControl::PaintCell: invalid row!");
@@ -399,7 +399,7 @@ namespace offapp
}
//--------------------------------------------------------------------
- BOOL ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
+ sal_Bool ConnectionPoolOptionsPage::FillItemSet(SfxItemSet& _rSet)
{
commitTimeoutField();
diff --git a/cui/source/options/connpooloptions.hxx b/cui/source/options/connpooloptions.hxx
index 2ceb7d66a06b..c2458cc08450 100644
--- a/cui/source/options/connpooloptions.hxx
+++ b/cui/source/options/connpooloptions.hxx
@@ -70,7 +70,7 @@ namespace offapp
protected:
virtual long Notify( NotifyEvent& _rNEvt );
- virtual BOOL FillItemSet(SfxItemSet& _rSet);
+ virtual sal_Bool FillItemSet(SfxItemSet& _rSet);
virtual void Reset(const SfxItemSet& _rSet);
virtual void ActivatePage( const SfxItemSet& _rSet);
diff --git a/cui/source/options/cuisrchdlg.cxx b/cui/source/options/cuisrchdlg.cxx
index ad34722ae246..93b9247366c1 100644
--- a/cui/source/options/cuisrchdlg.cxx
+++ b/cui/source/options/cuisrchdlg.cxx
@@ -64,14 +64,14 @@
SvxJSearchOptionsDialog::SvxJSearchOptionsDialog(
Window *pParent,
- const SfxItemSet& rOptionsSet, INT32 nInitialFlags ) :
+ const SfxItemSet& rOptionsSet, sal_Int32 nInitialFlags ) :
SfxSingleTabDialog ( pParent, rOptionsSet, RID_SVXPAGE_JSEARCH_OPTIONS ),
nInitialTlFlags( nInitialFlags )
{
pPage = (SvxJSearchOptionsPage *)
SvxJSearchOptionsPage::Create( this, rOptionsSet );
SetTabPage( pPage ); //! implicitly calls pPage->Reset(...)!
- pPage->EnableSaveOptions( FALSE );
+ pPage->EnableSaveOptions( sal_False );
}
@@ -88,7 +88,7 @@ void SvxJSearchOptionsDialog::Activate()
}
-INT32 SvxJSearchOptionsDialog::GetTransliterationFlags() const
+sal_Int32 SvxJSearchOptionsDialog::GetTransliterationFlags() const
{
return pPage->GetTransliterationFlags();
}
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index cc199054d131..b8892ffcbd3f 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -129,7 +129,7 @@ DbRegistrationOptionsPage::DbRegistrationOptionsPage( Window* pParent, const Sfx
pPathBox ( NULL ),
m_pCurEntry ( NULL ),
m_nOldCount ( 0 ),
- m_bModified ( FALSE )
+ m_bModified ( sal_False )
{
m_aNew.SetClickHdl( LINK( this, DbRegistrationOptionsPage, NewHdl ) );
m_aEdit.SetClickHdl( LINK( this, DbRegistrationOptionsPage, EditHdl ) );
@@ -186,7 +186,7 @@ DbRegistrationOptionsPage::~DbRegistrationOptionsPage()
aPathCtrl.SetFocusControl( NULL );
pHeaderBar->Hide();
- for ( USHORT i = 0; i < pPathBox->GetEntryCount(); ++i )
+ for ( sal_uInt16 i = 0; i < pPathBox->GetEntryCount(); ++i )
delete static_cast< DatabaseRegistration* >( pPathBox->GetEntry(i)->GetUserData() );
delete pPathBox;
delete pHeaderBar;
@@ -202,13 +202,13 @@ SfxTabPage* DbRegistrationOptionsPage::Create( Window* pParent,
// -----------------------------------------------------------------------
-BOOL DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
+sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet )
{
// the settings for the single drivers
sal_Bool bModified = sal_False;
DatabaseRegistrations aRegistrations;
- ULONG nCount = pPathBox->GetEntryCount();
- for ( ULONG i = 0; i < nCount; ++i )
+ sal_uLong nCount = pPathBox->GetEntryCount();
+ for ( sal_uLong i = 0; i < nCount; ++i )
{
SvLBoxEntry* pEntry = pPathBox->GetEntry(i);
DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() );
@@ -256,7 +256,7 @@ void DbRegistrationOptionsPage::Reset( const SfxItemSet& rSet )
pHeaderBar->SetItemSize( ITEMID_TYPE, aUserData.GetToken(0).ToInt32() );
HeaderEndDrag_Impl( NULL );
// Sortierrichtung restaurieren
- BOOL bUp = (BOOL)(USHORT)aUserData.GetToken(1).ToInt32();
+ sal_Bool bUp = (sal_Bool)(sal_uInt16)aUserData.GetToken(1).ToInt32();
HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE);
if ( bUp )
@@ -281,7 +281,7 @@ void DbRegistrationOptionsPage::FillUserData()
String aUserData = String::CreateFromInt32( pHeaderBar->GetItemSize( ITEMID_TYPE ) );
aUserData += ';';
HeaderBarItemBits nBits = pHeaderBar->GetItemBits( ITEMID_TYPE );
- BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+ sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
aUserData += bUp ? '1' : '0';
SetUserData( aUserData );
}
@@ -334,7 +334,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
return 0;
HeaderBarItemBits nBits = pHeaderBar->GetItemBits(ITEMID_TYPE);
- BOOL bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
+ sal_Bool bUp = ( ( nBits & HIB_UPARROW ) == HIB_UPARROW );
SvSortMode eMode = SortAscending;
if ( bUp )
@@ -365,7 +365,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
if ( !pHeaderBar->IsItemMode() )
{
Size aSz;
- USHORT nTabs = pHeaderBar->GetItemCount();
+ sal_uInt16 nTabs = pHeaderBar->GetItemCount();
long nTmpSz = 0;
long nWidth = pHeaderBar->GetItemSize(ITEMID_TYPE);
long nBarWidth = pHeaderBar->GetSizePixel().Width();
@@ -375,7 +375,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar )
else if ( ( nBarWidth - nWidth ) < TAB_WIDTH_MIN )
pHeaderBar->SetItemSize( ITEMID_TYPE, nBarWidth - TAB_WIDTH_MIN );
- for ( USHORT i = 1; i <= nTabs; ++i )
+ for ( sal_uInt16 i = 1; i <= nTabs; ++i )
{
long _nWidth = pHeaderBar->GetItemSize(i);
aSz.Width() = _nWidth + nTmpSz;
@@ -453,8 +453,8 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, String*, _pName )
{
if ( _pName )
{
- ULONG nCount = pPathBox->GetEntryCount();
- for ( ULONG i = 0; i < nCount; ++i )
+ sal_uLong nCount = pPathBox->GetEntryCount();
+ for ( sal_uLong i = 0; i < nCount; ++i )
{
SvLBoxEntry* pEntry = pPathBox->GetEntry(i);
if ( (!m_pCurEntry || m_pCurEntry != pEntry) && pPathBox->GetEntryText(pEntry,0) == *_pName )
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 749b92ed54cc..e252e5763cf8 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -85,7 +85,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
aTextColor = aCheckLB.GetTextColor();
- for(USHORT k = 0; k < aNewDelTBX.GetItemCount(); k++)
+ for(sal_uInt16 k = 0; k < aNewDelTBX.GetItemCount(); k++)
aNewDelTBX.SetItemImage(aNewDelTBX.GetItemId(k),
aImageList.GetImage(aNewDelTBX.GetItemId(k)));
@@ -146,7 +146,7 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent,
pBar->SetItemBits(1, nBits);
pBar->SetItemBits(2, nBits);
- USHORT nHeight;
+ sal_uInt16 nHeight;
for(nHeight = 6; nHeight <= 16; nHeight++)
aFontHeightLB.InsertEntry(String::CreateFromInt32(nHeight));
for(nHeight = 18; nHeight <= 28; nHeight+= 2)
@@ -211,7 +211,7 @@ SfxTabPage* SvxFontSubstTabPage::Create( Window* pParent,
/* */
/*********************************************************************/
-BOOL SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
+sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
{
pConfig->ClearSubstitutions();// remove all entries
@@ -242,7 +242,7 @@ BOOL SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
sFontName = aFontNameLB.GetSelectEntry();
pSourceViewConfig->SetFontName(sFontName);
- return FALSE;
+ return sal_False;
}
/*********************************************************************/
@@ -252,7 +252,7 @@ BOOL SvxFontSubstTabPage::FillItemSet( SfxItemSet& )
void SvxFontSubstTabPage::Reset( const SfxItemSet& )
{
- aCheckLB.SetUpdateMode(FALSE);
+ aCheckLB.SetUpdateMode(sal_False);
aCheckLB.Clear();
FontList aFntLst( Application::GetDefaultDevice() );
@@ -275,7 +275,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet& )
}
CheckEnable();
- aCheckLB.SetUpdateMode(TRUE);
+ aCheckLB.SetUpdateMode(sal_True);
//fill font name box first
aNonPropFontsOnlyCB.Check(pSourceViewConfig->IsShowProportionalFontsOnly());
@@ -302,7 +302,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
SvLBoxEntry* pEntry;
// nCol ist behaemmerterweise die nCol'te Textspalte, werden nicht gezaehlt!
// Daher als Spalte "0".
- ULONG nPos = aCheckLB.GetEntryPos(aFont1CB.GetText(), 0);
+ sal_uLong nPos = aCheckLB.GetEntryPos(aFont1CB.GetText(), 0);
switch (aNewDelTBX.GetCurItemId())
{
@@ -323,7 +323,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
pEntry = CreateEntry(sFont1, sFont2);
aCheckLB.Insert(pEntry);
}
- aCheckLB.SelectAll(FALSE);
+ aCheckLB.SelectAll(sal_False);
aCheckLB.Select(pEntry);
}
break;
@@ -358,7 +358,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
if (pWin == &aFont1CB)
{
- ULONG nPos = aCheckLB.GetEntryPos(aFont1CB.GetText(), 0);
+ sal_uLong nPos = aCheckLB.GetEntryPos(aFont1CB.GetText(), 0);
if (nPos != 0xffffffff)
{
@@ -366,7 +366,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
if (pEntry != aCheckLB.FirstSelected())
{
- aCheckLB.SelectAll(FALSE);
+ aCheckLB.SelectAll(sal_False);
aCheckLB.Select(pEntry);
}
}
@@ -382,12 +382,12 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin)
IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
{
String sFontName = aFontNameLB.GetSelectEntry();
- BOOL bNonPropOnly = pBox->IsChecked();
+ sal_Bool bNonPropOnly = pBox->IsChecked();
aFontNameLB.Clear();
FontList aFntLst( Application::GetDefaultDevice() );
aFontNameLB.InsertEntry(sAutomatic);
- USHORT nFontCount = aFntLst.GetFontNameCount();
- for(USHORT nFont = 0; nFont < nFontCount; nFont++)
+ sal_uInt16 nFontCount = aFntLst.GetFontNameCount();
+ for(sal_uInt16 nFont = 0; nFont < nFontCount; nFont++)
{
const FontInfo& rInfo = aFntLst.GetFontName( nFont );
if(!bNonPropOnly || rInfo.GetPitch() == PITCH_FIXED)
@@ -402,11 +402,11 @@ IMPL_LINK(SvxFontSubstTabPage, NonPropFontsHdl, CheckBox*, pBox)
void SvxFontSubstTabPage::CheckEnable()
{
- BOOL bEnableAll = aUseTableCB.IsChecked();
+ sal_Bool bEnableAll = aUseTableCB.IsChecked();
if (bEnableAll)
{
- BOOL bApply, bDelete;
+ sal_Bool bApply, bDelete;
SvLBoxEntry* pEntry = aCheckLB.FirstSelected();
@@ -418,21 +418,21 @@ void SvxFontSubstTabPage::CheckEnable()
aFont1CB.GetText() == aFont2CB.GetText() ||
aCheckLB.GetEntryPos(sEntry) != 0xffffffff ||
(pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0))
- bApply = FALSE;
+ bApply = sal_False;
else
- bApply = TRUE;*/
+ bApply = sal_True;*/
// Wegen OS/2-Optimierungsfehler (Bug #56267) etwas umstaendlicher:
if (!aFont1CB.GetText().Len() || !aFont2CB.GetText().Len())
- bApply = FALSE;
+ bApply = sal_False;
else if(aFont1CB.GetText() == aFont2CB.GetText())
- bApply = FALSE;
+ bApply = sal_False;
else if(aCheckLB.GetEntryPos(sEntry) != 0xffffffff)
- bApply = FALSE;
+ bApply = sal_False;
else if(pEntry != 0 && aCheckLB.NextSelected(pEntry) != 0)
- bApply = FALSE;
+ bApply = sal_False;
else
- bApply = TRUE;
+ bApply = sal_True;
bDelete = pEntry != 0;
@@ -457,7 +457,7 @@ void SvxFontSubstTabPage::CheckEnable()
aCheckLB.DisableTable();
aCheckLB.SetTextColor(Color(COL_GRAY));
aCheckLB.Invalidate();
- aCheckLB.SelectAll(FALSE);
+ aCheckLB.SelectAll(sal_False);
}
}
aNewDelTBX.Enable(bEnableAll);
@@ -474,7 +474,7 @@ void SvxFontSubstTabPage::CheckEnable()
void SvxFontSubstCheckListBox::SetTabs()
{
SvxSimpleTable::SetTabs();
- USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE;
+ sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE;
SvLBoxTab* pTab = (SvLBoxTab*)aTabs.GetObject(1);
pTab->nFlags &= ~nAdjust;
@@ -492,8 +492,8 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt )
if(!rKEvt.GetKeyCode().GetModifier() &&
KEY_SPACE == rKEvt.GetKeyCode().GetCode())
{
- ULONG nSelPos = GetModel()->GetAbsPos(GetCurEntry());
- USHORT nCol = GetCurrentTabPos() - 1;
+ sal_uLong nSelPos = GetModel()->GetAbsPos(GetCurEntry());
+ sal_uInt16 nCol = GetCurrentTabPos() - 1;
if ( nCol < 2 )
{
CheckEntryPos( nSelPos, nCol, !IsChecked( nSelPos, nCol ) );
@@ -501,7 +501,7 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt )
}
else
{
- USHORT nCheck = IsChecked(nSelPos, 1) ? 1 : 0;
+ sal_uInt16 nCheck = IsChecked(nSelPos, 1) ? 1 : 0;
if(IsChecked(nSelPos, 0))
nCheck += 2;
nCheck--;
@@ -518,7 +518,7 @@ void SvxFontSubstCheckListBox::KeyInput( const KeyEvent& rKEvt )
/* */
/*********************************************************************/
-void SvxFontSubstCheckListBox::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked)
+void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked)
{
if ( nPos < GetEntryCount() )
SetCheckButtonState(
@@ -532,7 +532,7 @@ void SvxFontSubstCheckListBox::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChec
/* */
/*********************************************************************/
-void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked)
+void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked)
{
if ( pEntry )
SetCheckButtonState(
@@ -546,7 +546,7 @@ void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL
/* */
/*********************************************************************/
-BOOL SvxFontSubstCheckListBox::IsChecked(ULONG nPos, USHORT nCol)
+sal_Bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol)
{
return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED;
}
@@ -555,7 +555,7 @@ BOOL SvxFontSubstCheckListBox::IsChecked(ULONG nPos, USHORT nCol)
/* */
/*********************************************************************/
-BOOL SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, USHORT nCol)
+sal_Bool SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, sal_uInt16 nCol)
{
return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED;
}
@@ -564,7 +564,7 @@ BOOL SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, USHORT nCol)
/* */
/*********************************************************************/
-void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, USHORT nCol, SvButtonState eState)
+void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState)
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1));
@@ -593,7 +593,7 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, USHORT
/* */
/*********************************************************************/
-SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, USHORT nCol ) const
+SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const
{
SvButtonState eState = SV_BUTTON_UNCHECKED;
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1));
@@ -601,7 +601,7 @@ SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry
if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON)
{
- USHORT nButtonFlags = pItem->GetButtonFlags();
+ sal_uInt16 nButtonFlags = pItem->GetButtonFlags();
eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
}
diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx
index 6180c345cc35..91c6f1a73801 100644
--- a/cui/source/options/fontsubs.hxx
+++ b/cui/source/options/fontsubs.hxx
@@ -55,15 +55,15 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable
SvxFontSubstCheckListBox(Window* pParent, const ResId& rResId ) :
SvxSimpleTable( pParent, rResId ){}
- inline void *GetUserData(ULONG nPos) { return GetEntry(nPos)->GetUserData(); }
- inline void SetUserData(ULONG nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
-
- BOOL IsChecked(ULONG nPos, USHORT nCol = 0);
- BOOL IsChecked(SvLBoxEntry* pEntry, USHORT nCol = 0);
- void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
- void CheckEntry(SvLBoxEntry* pEntry, USHORT nCol, BOOL bChecked);
- SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
- void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
+ inline void *GetUserData(sal_uLong nPos) { return GetEntry(nPos)->GetUserData(); }
+ inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); }
+
+ sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0);
+ sal_Bool IsChecked(SvLBoxEntry* pEntry, sal_uInt16 nCol = 0);
+ void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked);
+ void CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked);
+ SvButtonState GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const;
+ void SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState );
};
// class SvxFontSubstTabPage ----------------------------------------------------
@@ -114,7 +114,7 @@ class SvxFontSubstTabPage : public SfxTabPage
public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet);
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/options/internationaloptions.cxx b/cui/source/options/internationaloptions.cxx
index 96c60fc1599e..57458759c9eb 100644
--- a/cui/source/options/internationaloptions.cxx
+++ b/cui/source/options/internationaloptions.cxx
@@ -48,14 +48,14 @@ namespace offapp
CheckBox m_aCB_ShtVwRight2Left;
CheckBox m_aCB_ShtVwCurrentDocOnly;
- BOOL m_bEnable_SheetView_Opt : 1;
+ sal_Bool m_bEnable_SheetView_Opt : 1;
inline IMPL( Window* _pParent );
- inline void EnableOption_SheetView( BOOL _bEnable = TRUE );
- void ShowOption_SheetView( BOOL _bShow = TRUE );
+ inline void EnableOption_SheetView( sal_Bool _bEnable = sal_True );
+ void ShowOption_SheetView( sal_Bool _bShow = sal_True );
- BOOL FillItemSet( SfxItemSet& _rSet );
+ sal_Bool FillItemSet( SfxItemSet& _rSet );
void Reset( const SfxItemSet& _rSet );
};
@@ -67,12 +67,12 @@ namespace offapp
,m_aCB_ShtVwRight2Left ( _pParent, CUI_RES( CB_SHTVW_RIGHT2LEFT ) )
,m_aCB_ShtVwCurrentDocOnly ( _pParent, CUI_RES( CB_SHTVW_CURRENTDOCONLY ) )
- ,m_bEnable_SheetView_Opt ( FALSE )
+ ,m_bEnable_SheetView_Opt ( sal_False )
{
ShowOption_SheetView( m_bEnable_SheetView_Opt );
}
- inline void InternationalOptionsPage::IMPL::EnableOption_SheetView( BOOL _bEnable )
+ inline void InternationalOptionsPage::IMPL::EnableOption_SheetView( sal_Bool _bEnable )
{
if( m_bEnable_SheetView_Opt != _bEnable )
{
@@ -82,14 +82,14 @@ namespace offapp
}
}
- void InternationalOptionsPage::IMPL::ShowOption_SheetView( BOOL _bShow )
+ void InternationalOptionsPage::IMPL::ShowOption_SheetView( sal_Bool _bShow )
{
m_aFL_SheetView.Show( _bShow );
m_aCB_ShtVwRight2Left.Show( _bShow );
m_aCB_ShtVwCurrentDocOnly.Show( _bShow );
}
- BOOL InternationalOptionsPage::IMPL::FillItemSet( SfxItemSet& _rSet )
+ sal_Bool InternationalOptionsPage::IMPL::FillItemSet( SfxItemSet& _rSet )
{
DBG_ASSERT( _rSet.GetPool(), "-InternationalOptionsPage::FillItemSet(): no pool gives rums!" );
@@ -103,7 +103,7 @@ namespace offapp
// {
// }
- return TRUE;
+ return sal_True;
}
void InternationalOptionsPage::IMPL::Reset( const SfxItemSet& _rSet )
@@ -113,15 +113,15 @@ namespace offapp
DBG_ASSERT( pLeft2RightItem, "+InternationalOptionsPage::Reset(): SID_ATTR_PARA_LEFT_TO_RIGHT not set!" );
- BOOL bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : TRUE;
+ sal_Bool bLeft2Right = pLeft2RightItem? pLeft2RightItem->GetValue() : sal_True;
m_aRB_TxtDirLeft2Right.Check( bLeft2Right );
// handling of SheetView stuff
// if( m_bEnable_SheetView_Opt )
// {
-// m_aCB_ShtVwRight2Left.Check( FALSE );
+// m_aCB_ShtVwRight2Left.Check( sal_False );
//
-// m_aCB_ShtVwCurrentDocOnly.Check( FALSE );
+// m_aCB_ShtVwCurrentDocOnly.Check( sal_False );
// }
}
@@ -150,7 +150,7 @@ namespace offapp
DELETEZ( m_pImpl );
}
- BOOL InternationalOptionsPage::FillItemSet( SfxItemSet& _rSet )
+ sal_Bool InternationalOptionsPage::FillItemSet( SfxItemSet& _rSet )
{
return m_pImpl->FillItemSet( _rSet );
}
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 3cafbf2c2f3d..5fd13b6bb623 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -40,15 +40,15 @@ namespace svx
class OptLBoxString_Impl : public SvLBoxString
{
public:
- OptLBoxString_Impl( SvLBoxEntry* pEntry, USHORT nFlags, const String& rTxt ) :
+ OptLBoxString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) :
SvLBoxString( pEntry, nFlags, rTxt ) {}
- virtual void Paint( const Point& rPos, SvLBox& rDev, USHORT nFlags, SvLBoxEntry* pEntry );
+ virtual void Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry );
};
// -----------------------------------------------------------------------
-void OptLBoxString_Impl::Paint( const Point& rPos, SvLBox& rDev, USHORT, SvLBoxEntry* pEntry )
+void OptLBoxString_Impl::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16, SvLBoxEntry* pEntry )
{
Font aOldFont( rDev.GetFont() );
Font aFont( aOldFont );
@@ -73,9 +73,9 @@ void OptHeaderTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt,
SvLBoxButtonKind eButtonKind )
{
SvTabListBox::InitEntry( pEntry, rTxt, rImg1, rImg2, eButtonKind );
- USHORT _nTabCount = TabCount();
+ sal_uInt16 _nTabCount = TabCount();
- for ( USHORT nCol = 1; nCol < _nTabCount; ++nCol )
+ for ( sal_uInt16 nCol = 1; nCol < _nTabCount; ++nCol )
{
// alle Spalten mit eigener Klasse initialisieren (Spalte 0 == Bitmap)
SvLBoxString* pCol = (SvLBoxString*)pEntry->GetItem( nCol );
diff --git a/cui/source/options/optaccessibility.cxx b/cui/source/options/optaccessibility.cxx
index a4fc84538834..3be5e2a8d927 100644
--- a/cui/source/options/optaccessibility.cxx
+++ b/cui/source/options/optaccessibility.cxx
@@ -123,7 +123,7 @@ SfxTabPage* SvxAccessibilityOptionsTabPage::Create( Window* pParent, const SfxIt
return new SvxAccessibilityOptionsTabPage(pParent, rAttrSet);
}
-BOOL SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
+sal_Bool SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
{
//aConfig.Set... from controls
@@ -148,7 +148,7 @@ BOOL SvxAccessibilityOptionsTabPage::FillItemSet( SfxItemSet& )
Application::MergeSystemSettings( aAllSettings );
Application::SetSettings(aAllSettings);
- return FALSE;
+ return sal_False;
}
void SvxAccessibilityOptionsTabPage::Reset( const SfxItemSet& )
diff --git a/cui/source/options/optaccessibility.hxx b/cui/source/options/optaccessibility.hxx
index 88a472c23541..f816962f46b1 100644
--- a/cui/source/options/optaccessibility.hxx
+++ b/cui/source/options/optaccessibility.hxx
@@ -57,7 +57,7 @@ public:
virtual ~SvxAccessibilityOptionsTabPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/options/optasian.cxx b/cui/source/options/optasian.cxx
index f6fa4e45ca95..fb4c6e2e1352 100644
--- a/cui/source/options/optasian.cxx
+++ b/cui/source/options/optasian.cxx
@@ -175,7 +175,7 @@ SvxAsianLayoutPage::SvxAsianLayoutPage( Window* pParent, const SfxItemSet& rSet
aStartED.SetModifyHdl(aLk);
aEndED.SetModifyHdl(aLk);
- aLanguageLB.SetLanguageList( LANG_LIST_FBD_CHARS, FALSE, FALSE );
+ aLanguageLB.SetLanguageList( LANG_LIST_FBD_CHARS, sal_False, sal_False );
}
/*-- 09.01.01 13:29:02---------------------------------------------------
@@ -194,7 +194,7 @@ SfxTabPage* SvxAsianLayoutPage::Create( Window* pParent, const SfxItemSet& rAttr
/*-- 09.01.01 13:29:03---------------------------------------------------
-----------------------------------------------------------------------*/
-BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
+sal_Bool SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
{
if(aCharKerningRB.IsChecked() != aCharKerningRB.GetSavedValue())
{
@@ -203,7 +203,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
if(pImpl->xPrSetInfo.is() && pImpl->xPrSetInfo->hasPropertyByName(sPunct))
{
Any aVal;
- BOOL bVal = !aCharKerningRB.IsChecked();
+ sal_Bool bVal = !aCharKerningRB.IsChecked();
aVal.setValue(&bVal, ::getBooleanCppuType());
pImpl->xPrSet->setPropertyValue(sPunct, aVal);
}
@@ -232,9 +232,9 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
for( SvxForbiddenChars_Impl* pElem = pImpl->aChangedLanguagesTbl.First();
pElem; pElem = pImpl->aChangedLanguagesTbl.Next() )
{
- ULONG nLang = pImpl->aChangedLanguagesTbl.GetKey( pElem );
+ sal_uLong nLang = pImpl->aChangedLanguagesTbl.GetKey( pElem );
Locale aLocale;
- SvxLanguageToLocale(aLocale, (USHORT)nLang );
+ SvxLanguageToLocale(aLocale, (sal_uInt16)nLang );
if(pElem->bRemoved)
pImpl->xForbidden->removeForbiddenCharacters( aLocale );
else if(pElem->pCharacters)
@@ -248,7 +248,7 @@ BOOL SvxAsianLayoutPage::FillItemSet( SfxItemSet& )
}
eLastUsedLanguageTypeForForbiddenCharacters = aLanguageLB.GetSelectLanguage();
- return FALSE;
+ return sal_False;
}
/*-- 09.01.01 13:29:03---------------------------------------------------
@@ -293,20 +293,20 @@ void SvxAsianLayoutPage::Reset( const SfxItemSet& )
}
else
{
- aStartEndGB.Enable(FALSE);
- aLanguageFT.Enable(FALSE);
- aLanguageLB.Enable(FALSE);
- aStandardCB.Enable(FALSE);
- aStartFT.Enable(FALSE);
- aStartED.Enable(FALSE);
- aEndFT.Enable(FALSE);
- aEndED.Enable(FALSE);
- aHintFT.Enable(FALSE);
+ aStartEndGB.Enable(sal_False);
+ aLanguageFT.Enable(sal_False);
+ aLanguageLB.Enable(sal_False);
+ aStandardCB.Enable(sal_False);
+ aStartFT.Enable(sal_False);
+ aStartED.Enable(sal_False);
+ aEndFT.Enable(sal_False);
+ aEndED.Enable(sal_False);
+ aHintFT.Enable(sal_False);
}
if(bKernWesternText)
- aCharKerningRB.Check(TRUE);
+ aCharKerningRB.Check(sal_True);
else
- aCharPunctKerningRB.Check(TRUE);
+ aCharPunctKerningRB.Check(sal_True);
switch(nCompress)
{
case 0 : aNoCompressionRB.Check(); break;
@@ -359,7 +359,7 @@ IMPL_LINK(SvxAsianLayoutPage, LanguageHdl, SvxLanguageBox*, EMPTYARG )
SvxForbiddenChars_Impl* pElement = pImpl->getForbiddenCharacters(eSelectLanguage);
if(pElement->bRemoved || !pElement->pCharacters)
{
- bAvail = FALSE;
+ bAvail = sal_False;
}
else
{
@@ -459,9 +459,9 @@ IMPL_LINK(SvxAsianLayoutPage, ModifyHdl, Edit*, pEdit)
/*-- 07.09.2007 12:05:09---------------------------------------------------
-----------------------------------------------------------------------*/
-USHORT* SvxAsianLayoutPage::GetRanges()
+sal_uInt16* SvxAsianLayoutPage::GetRanges()
{
//no items are used
- static USHORT pAsianLayoutRanges[] = { 0 };
+ static sal_uInt16 pAsianLayoutRanges[] = { 0 };
return pAsianLayoutRanges;
}
diff --git a/cui/source/options/optchart.cxx b/cui/source/options/optchart.cxx
index 0fd27c60c039..cfec52f07a59 100644
--- a/cui/source/options/optchart.cxx
+++ b/cui/source/options/optchart.cxx
@@ -40,13 +40,13 @@
void ChartColorLB::FillBox( const SvxChartColorTable & rTab )
{
long nCount = rTab.size();
- SetUpdateMode( FALSE );
+ SetUpdateMode( sal_False );
for( long i = 0; i < nCount; i++ )
{
Append( const_cast< XColorEntry * >( & rTab[ i ] ));
}
- SetUpdateMode( TRUE );
+ SetUpdateMode( sal_True );
}
@@ -80,7 +80,7 @@ SvxDefaultColorOptPage::SvxDefaultColorOptPage( Window* pParent, const SfxItemSe
pColorTab = new XColorTable( SvtPathOptions().GetPalettePath() );
const SfxPoolItem* pItem = NULL;
- if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, FALSE, &pItem ) == SFX_ITEM_SET )
+ if ( rInAttrs.GetItemState( SID_SCH_EDITOPTIONS, sal_False, &pItem ) == SFX_ITEM_SET )
{
pColorConfig = SAL_STATIC_CAST( SvxChartColorTableItem*, pItem->Clone() );
}
@@ -123,12 +123,12 @@ SfxTabPage* __EXPORT SvxDefaultColorOptPage::Create( Window* pParent, const SfxI
return new SvxDefaultColorOptPage( pParent, rAttrs );
}
-BOOL __EXPORT SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
+sal_Bool __EXPORT SvxDefaultColorOptPage::FillItemSet( SfxItemSet& rOutAttrs )
{
if( pColorConfig )
rOutAttrs.Put( *SAL_STATIC_CAST( SfxPoolItem*, pColorConfig ));
- return TRUE;
+ return sal_True;
}
void __EXPORT SvxDefaultColorOptPage::Reset( const SfxItemSet& )
@@ -147,7 +147,7 @@ void SvxDefaultColorOptPage::FillColorBox()
for( long i = 0; i < nCount; i++ )
{
pColorEntry = pColorTab->GetColor( i );
- aValSetColorBox.InsertItem( (USHORT) i + 1, pColorEntry->GetColor(), pColorEntry->GetName() );
+ aValSetColorBox.InsertItem( (sal_uInt16) i + 1, pColorEntry->GetColor(), pColorEntry->GetName() );
}
}
@@ -208,7 +208,7 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ChartColorLB*, pColorList )
}
else
{
- aValSetColorBox.SelectItem( (USHORT)nIndex + 1 ); // ValueSet is 1-based
+ aValSetColorBox.SelectItem( (sal_uInt16)nIndex + 1 ); // ValueSet is 1-based
}
return 0L;
@@ -219,7 +219,7 @@ IMPL_LINK( SvxDefaultColorOptPage, ListClickedHdl, ChartColorLB*, pColorList )
IMPL_LINK( SvxDefaultColorOptPage, BoxClickedHdl, ValueSet*, EMPTYARG )
{
- USHORT nIdx = aLbChartColors.GetSelectEntryPos();
+ sal_uInt16 nIdx = aLbChartColors.GetSelectEntryPos();
if( nIdx != LISTBOX_ENTRY_NOTFOUND )
{
XColorEntry aEntry( aValSetColorBox.GetItemColor( aValSetColorBox.GetSelectItemId() ),
diff --git a/cui/source/options/optchart.hxx b/cui/source/options/optchart.hxx
index abf0cf45a2dd..969736079347 100644
--- a/cui/source/options/optchart.hxx
+++ b/cui/source/options/optchart.hxx
@@ -81,7 +81,7 @@ public:
void Construct();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rInAttrs );
- virtual BOOL FillItemSet( SfxItemSet& rOutAttrs );
+ virtual sal_Bool FillItemSet( SfxItemSet& rOutAttrs );
virtual void Reset( const SfxItemSet& rInAttrs );
};
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index ff10e2744533..745a92c3aa73 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -866,13 +866,13 @@ ColorConfigWindow_Impl::ColorConfigWindow_Impl(Window* pParent, const ResId& rRe
}
}
Color aTextColor;
- BOOL bSetTextColor = FALSE;
+ sal_Bool bSetTextColor = sal_False;
//#104195# when the window color is the same as the text color it has to be changed
Color aWinCol = rStyleSettings.GetWindowColor();
Color aRCheckCol = rStyleSettings.GetRadioCheckTextColor();
if(aWinCol == aRCheckCol )
{
- bSetTextColor = TRUE;
+ bSetTextColor = sal_True;
aRCheckCol.Invert();
//if inversion didn't work (gray) then it's set to black
if(aRCheckCol == aWinCol)
@@ -1119,11 +1119,11 @@ ColorConfigCtrl_Impl::ColorConfigCtrl_Impl(
sal_Int32 nThirdWidth = aScrollWindow.aWindows[0]->GetPosPixel().X() - nFirstWidth - nSecondWidth;
const WinBits nHeadBits = HIB_VCENTER | HIB_FIXED| HIB_FIXEDPOS;
- aHeaderHB.InsertItem( 1, sOn, nFirstWidth, (USHORT)nHeadBits|HIB_CENTER);
- aHeaderHB.InsertItem( 2, sUIElem, nSecondWidth, (USHORT)nHeadBits|HIB_LEFT);
- aHeaderHB.InsertItem( 3, sColSetting, nThirdWidth, (USHORT)nHeadBits|HIB_LEFT);
+ aHeaderHB.InsertItem( 1, sOn, nFirstWidth, (sal_uInt16)nHeadBits|HIB_CENTER);
+ aHeaderHB.InsertItem( 2, sUIElem, nSecondWidth, (sal_uInt16)nHeadBits|HIB_LEFT);
+ aHeaderHB.InsertItem( 3, sColSetting, nThirdWidth, (sal_uInt16)nHeadBits|HIB_LEFT);
aHeaderHB.InsertItem( 4, sPreview,
- aHeaderHB.GetSizePixel().Width() - nFirstWidth - nSecondWidth - nThirdWidth, (USHORT)nHeadBits|HIB_LEFT);
+ aHeaderHB.GetSizePixel().Width() - nFirstWidth - nSecondWidth - nThirdWidth, (sal_uInt16)nHeadBits|HIB_LEFT);
aHeaderHB.Show();
aVScroll.SetRangeMin(0);
@@ -1195,7 +1195,7 @@ void ColorConfigCtrl_Impl::Update()
if(ANCHOR == i)
continue;
const ColorConfigValue& rColorEntry = pColorConfig->GetColorValue(ColorConfigEntry(i));
- if(COL_AUTO == (UINT32)rColorEntry.nColor)
+ if(COL_AUTO == (sal_uInt32)rColorEntry.nColor)
{
if(aScrollWindow.aColorBoxes[i])
aScrollWindow.aColorBoxes[i]->SelectEntryPos(0);
@@ -1255,7 +1255,7 @@ void ColorConfigCtrl_Impl::Update()
---------------------------------------------------------------------------*/
sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, bool _bShow)
{
- BOOL bHide = TRUE;
+ sal_Bool bHide = sal_True;
if(pWindow)
{
Point aPos = pWindow->GetPosPixel();
@@ -1269,7 +1269,7 @@ sal_Bool lcl_MoveAndShow(Window* pWindow, long nOffset, long nMaxVisible, bool _
}
IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar)
{
- aScrollWindow.SetUpdateMode(TRUE);
+ aScrollWindow.SetUpdateMode(sal_True);
sal_Int16 i;
long nOffset = aScrollWindow.aColorBoxes[1]->GetPosPixel().Y() - aScrollWindow.aColorBoxes[0]->GetPosPixel().Y();
nOffset *= (nScrollPos - pScrollBar->GetThumbPos());
@@ -1289,7 +1289,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar)
lcl_MoveAndShow(aScrollWindow.aCheckBoxes[i], nOffset, nWindowHeight, bShowCtrl);
lcl_MoveAndShow(aScrollWindow.aFixedTexts[i], nOffset, nWindowHeight, bShowCtrl);
lcl_MoveAndShow(aScrollWindow.aWindows[i] , nOffset, nWindowHeight, bShowCtrl);
- BOOL bShow = lcl_MoveAndShow(aScrollWindow.aColorBoxes[i], nOffset, nWindowHeight, bShowCtrl);
+ sal_Bool bShow = lcl_MoveAndShow(aScrollWindow.aColorBoxes[i], nOffset, nWindowHeight, bShowCtrl);
if(bShow)
{
if(nFirstVisible == -1)
@@ -1343,7 +1343,7 @@ IMPL_LINK(ColorConfigCtrl_Impl, ScrollHdl, ScrollBar*, pScrollBar)
Point aPos = aScrollWindow.aChapters[i]->GetPosPixel(); aPos.Y() += nOffset; aScrollWindow.aChapters[i]->SetPosPixel(aPos);
aPos = aScrollWindow.aChapterWins[i]->GetPosPixel(); aPos.Y() += nOffset; aScrollWindow.aChapterWins[i]->SetPosPixel(aPos);
}
- aScrollWindow.SetUpdateMode(TRUE);
+ aScrollWindow.SetUpdateMode(sal_True);
return 0;
}
/* -----------------------------29.04.2002 17:02------------------------------
@@ -1354,7 +1354,7 @@ long ColorConfigCtrl_Impl::PreNotify( NotifyEvent& rNEvt )
if(rNEvt.GetType() == EVENT_COMMAND)
{
const CommandEvent* pCEvt = rNEvt.GetCommandEvent();
- USHORT nCmd = pCEvt->GetCommand();
+ sal_uInt16 nCmd = pCEvt->GetCommand();
if( COMMAND_WHEEL == nCmd )
{
Command(*pCEvt);
@@ -1528,7 +1528,7 @@ SvxColorOptionsTabPage::SvxColorOptionsTabPage(
aSaveSchemePB( this, CUI_RES( PB_SAVESCHEME) ),
aDeleteSchemePB( this, CUI_RES( PB_DELETESCHEME ) ),
aCustomColorsFL( this, CUI_RES( FL_CUSTOMCOLORS ) ),
- bFillItemSetCalled(FALSE),
+ bFillItemSetCalled(sal_False),
pColorConfig(0),
pExtColorConfig(0),
pColorConfigCT( new ColorConfigCtrl_Impl(this, CUI_RES( CT_COLORCONFIG ) ))
@@ -1573,9 +1573,9 @@ SfxTabPage* SvxColorOptionsTabPage::Create( Window* pParent, const SfxItemSet& r
/* -----------------------------25.03.2002 10:47------------------------------
---------------------------------------------------------------------------*/
-BOOL SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
+sal_Bool SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
{
- bFillItemSetCalled = TRUE;
+ bFillItemSetCalled = sal_True;
if(aColorSchemeLB.GetSavedValue() != aColorSchemeLB.GetSelectEntryPos())
{
pColorConfig->SetModified();
@@ -1585,7 +1585,7 @@ BOOL SvxColorOptionsTabPage::FillItemSet( SfxItemSet& )
pColorConfig->Commit();
if(pExtColorConfig->IsModified())
pExtColorConfig->Commit();
- return TRUE;
+ return sal_True;
}
/* -----------------------------25.03.2002 10:47------------------------------
diff --git a/cui/source/options/optcolor.hxx b/cui/source/options/optcolor.hxx
index 795548e0ad3a..32d7799109e8 100644
--- a/cui/source/options/optcolor.hxx
+++ b/cui/source/options/optcolor.hxx
@@ -52,7 +52,7 @@ class SvxColorOptionsTabPage : public SfxTabPage
FixedLine aCustomColorsFL;
- BOOL bFillItemSetCalled;
+ sal_Bool bFillItemSetCalled;
svtools::EditableColorConfig* pColorConfig;
svtools::EditableExtendedColorConfig* pExtColorConfig;
@@ -69,7 +69,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
virtual int DeactivatePage( SfxItemSet* pSet );
diff --git a/cui/source/options/optctl.cxx b/cui/source/options/optctl.cxx
index a22ce6bc6c36..ef2e959af80c 100644
--- a/cui/source/options/optctl.cxx
+++ b/cui/source/options/optctl.cxx
@@ -82,48 +82,48 @@ SfxTabPage* SvxCTLOptionsPage::Create( Window* pParent, const SfxItemSet& rAttrS
return new SvxCTLOptionsPage( pParent, rAttrSet );
}
// -----------------------------------------------------------------------------
-BOOL SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
+sal_Bool SvxCTLOptionsPage::FillItemSet( SfxItemSet& )
{
- BOOL bModified = FALSE;
+ sal_Bool bModified = sal_False;
SvtCTLOptions aCTLOptions;
// Sequence checking
- BOOL bChecked = m_aSequenceCheckingCB.IsChecked();
+ sal_Bool bChecked = m_aSequenceCheckingCB.IsChecked();
if ( bChecked != m_aSequenceCheckingCB.GetSavedValue() )
{
aCTLOptions.SetCTLSequenceChecking( bChecked );
- bModified = TRUE;
+ bModified = sal_True;
}
bChecked = m_aRestrictedCB.IsChecked();
if( bChecked != m_aRestrictedCB.GetSavedValue() )
{
aCTLOptions.SetCTLSequenceCheckingRestricted( bChecked );
- bModified = TRUE;
+ bModified = sal_True;
}
bChecked = m_aTypeReplaceCB.IsChecked();
if( bChecked != m_aTypeReplaceCB.GetSavedValue())
{
aCTLOptions.SetCTLSequenceCheckingTypeAndReplace(bChecked);
- bModified = TRUE;
+ bModified = sal_True;
}
- BOOL bLogicalChecked = m_aMovementLogicalRB.IsChecked();
- BOOL bVisualChecked = m_aMovementVisualRB.IsChecked();
+ sal_Bool bLogicalChecked = m_aMovementLogicalRB.IsChecked();
+ sal_Bool bVisualChecked = m_aMovementVisualRB.IsChecked();
if ( bLogicalChecked != m_aMovementLogicalRB.GetSavedValue() ||
bVisualChecked != m_aMovementVisualRB.GetSavedValue() )
{
SvtCTLOptions::CursorMovement eMovement =
bLogicalChecked ? SvtCTLOptions::MOVEMENT_LOGICAL : SvtCTLOptions::MOVEMENT_VISUAL;
aCTLOptions.SetCTLCursorMovement( eMovement );
- bModified = TRUE;
+ bModified = sal_True;
}
- USHORT nPos = m_aNumeralsLB.GetSelectEntryPos();
+ sal_uInt16 nPos = m_aNumeralsLB.GetSelectEntryPos();
if ( nPos != m_aNumeralsLB.GetSavedValue() )
{
aCTLOptions.SetCTLTextNumerals( (SvtCTLOptions::TextNumerals)nPos );
- bModified = TRUE;
+ bModified = sal_True;
}
return bModified;
@@ -152,7 +152,7 @@ void SvxCTLOptionsPage::Reset( const SfxItemSet& )
DBG_ERRORFILE( "SvxCTLOptionsPage::Reset(): invalid movement enum" );
}
- USHORT nPos = (USHORT)aCTLOptions.GetCTLTextNumerals();
+ sal_uInt16 nPos = (sal_uInt16)aCTLOptions.GetCTLTextNumerals();
DBG_ASSERT( nPos < m_aNumeralsLB.GetEntryCount(), "SvxCTLOptionsPage::Reset(): invalid numerals enum" );
m_aNumeralsLB.SelectEntryPos( nPos );
diff --git a/cui/source/options/optctl.hxx b/cui/source/options/optctl.hxx
index b18689d60bc9..6ac246b83c18 100644
--- a/cui/source/options/optctl.hxx
+++ b/cui/source/options/optctl.hxx
@@ -62,7 +62,7 @@ public:
virtual ~SvxCTLOptionsPage();
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index 7867c5de68b0..be5750400b69 100755
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -118,7 +118,7 @@ SvxNewDictionaryDialog::SvxNewDictionaryDialog( Window* pParent,
aOKBtn.SetClickHdl( LINK( this, SvxNewDictionaryDialog, OKHdl_Impl ) );
// Sprachen anzeigen
- aLanguageLB.SetLanguageList( LANG_LIST_ALL, TRUE, TRUE );
+ aLanguageLB.SetLanguageList( LANG_LIST_ALL, sal_True, sal_True );
aLanguageLB.SelectEntryPos(0);
FreeResource();
@@ -298,7 +298,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
}
}
- aLangLB.SetLanguageList( LANG_LIST_ALL, TRUE, TRUE );
+ aLangLB.SetLanguageList( LANG_LIST_ALL, sal_True, sal_True );
aReplaceED.SetSpaces(sal_True);
aWordED.SetSpaces(sal_True);
@@ -382,13 +382,13 @@ void SvxEditDictionaryDialog::SetLanguage_Impl( util::Language nLanguage )
aLangLB.SelectLanguage( nLanguage );
}
-USHORT SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord)
+sal_uInt16 SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord)
{
- USHORT nPos = USHRT_MAX;
+ sal_uInt16 nPos = USHRT_MAX;
IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
const CollatorWrapper* pCollator = aIntlWrapper.getCollator();
- USHORT j;
+ sal_uInt16 j;
for( j = 0; j < aWordsLB.GetEntryCount(); j++ )
{
SvLBoxEntry* pEntry = aWordsLB.GetEntry(j);
@@ -453,7 +453,7 @@ IMPL_LINK( SvxEditDictionaryDialog, SelectLangHdl_Impl, ListBox *, EMPTYARG )
sal_uInt16 nDicPos = aAllDictsLB.GetSelectEntryPos();
sal_uInt16 nLang = aLangLB.GetSelectLanguage();
Reference< XDictionary > xDic( aDics.getConstArray()[ nDicPos ], UNO_QUERY );
- INT16 nOldLang = SvxLocaleToLanguage( xDic->getLocale() );
+ sal_Int16 nOldLang = SvxLocaleToLanguage( xDic->getLocale() );
if ( nLang != nOldLang )
{
@@ -535,7 +535,7 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
for (sal_Int32 i = 0; i < nCount; i++)
{
aStr = String(pEntry[i]->getDictionaryWord());
- USHORT nPos = GetLBInsertPos( aStr );
+ sal_uInt16 nPos = GetLBInsertPos( aStr );
if(pEntry[i]->isNegative())
{
aStr += '\t';
@@ -689,8 +689,8 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
xub_StrLen nWordLen=rEntry.Len();
const String& rRepString = aReplaceED.GetText();
- BOOL bEnableNewReplace = FALSE;
- BOOL bEnableDelete = FALSE;
+ sal_Bool bEnableNewReplace = sal_False;
+ sal_Bool bEnableDelete = sal_False;
String aNewReplaceText = sNew;
if(pEdt == &aWordED)
@@ -719,7 +719,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
if (CDE_SIMILAR == eCmpRes)
{
aNewReplaceText = sModify;
- bEnableNewReplace = TRUE;
+ bEnableNewReplace = sal_True;
}
bFound= sal_True;
break;
@@ -734,7 +734,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
bTmpSelEntry=sal_True;
aNewReplaceText = sNew;
- bEnableNewReplace = TRUE;
+ bEnableNewReplace = sal_True;
}
}
@@ -744,7 +744,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
pFirstSel = 0;
aNewReplaceText = sNew;
- bEnableNewReplace = TRUE;
+ bEnableNewReplace = sal_True;
}
bEnableDelete = CDE_DIFFERENT != eCmpRes;
}
@@ -766,13 +766,13 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
aReplaceText = aWordsLB.GetEntryText( pFirstSel, 1 );
aNewReplaceText = sModify;
- bEnableDelete = TRUE;
+ bEnableDelete = sal_True;
}
- BOOL bIsChange =
+ sal_Bool bIsChange =
CDE_EQUAL != cmpDicEntry_Impl(aWordED.GetText(), aWordText)
|| CDE_EQUAL != cmpDicEntry_Impl(aReplaceED.GetText(), aReplaceText);
if (aWordED.GetText().Len() && bIsChange)
- bEnableNewReplace = TRUE;
+ bEnableNewReplace = sal_True;
}
aNewReplacePB.SetText( aNewReplaceText );
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 811a421223e9..a41a4b82bf57 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -84,11 +84,11 @@ SfxTabPage* OfaMSFilterTabPage::Create( Window* pParent,
return new OfaMSFilterTabPage( pParent, rAttrSet );
}
-BOOL OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
+sal_Bool OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
{
SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- BOOL bFlag;
+ sal_Bool bFlag;
if( aWBasicCodeCB.GetSavedValue() != (bFlag = aWBasicCodeCB.IsChecked()))
pOpt->SetLoadWordBasicCode( bFlag );
if( aWBasicStgCB.GetSavedValue() != (bFlag = aWBasicStgCB.IsChecked()))
@@ -106,7 +106,7 @@ BOOL OfaMSFilterTabPage::FillItemSet( SfxItemSet& )
if( aPBasicStgCB.GetSavedValue() != (bFlag = aPBasicStgCB.IsChecked()))
pOpt->SetLoadPPointBasicStorage( bFlag );
- return FALSE;
+ return sal_False;
}
/*-----------------02.09.96 13.47-------------------
@@ -179,15 +179,15 @@ SfxTabPage* OfaMSFilterTabPage2::Create( Window* pParent,
return new OfaMSFilterTabPage2( pParent, rAttrSet );
}
-BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
+sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
{
- BOOL bModified = FALSE;
+ sal_Bool bModified = sal_False;
SvtFilterOptions* pOpt = SvtFilterOptions::Get();
static struct ChkCBoxEntries{
MSFltrPg2_CheckBoxEntries eType;
- BOOL (SvtFilterOptions:: *FnIs)() const;
- void (SvtFilterOptions:: *FnSet)( BOOL bFlag );
+ sal_Bool (SvtFilterOptions:: *FnIs)() const;
+ void (SvtFilterOptions:: *FnSet)( sal_Bool bFlag );
} aChkArr[] = {
{ Math, &SvtFilterOptions::IsMathType2Math,
&SvtFilterOptions::SetMathType2Math },
@@ -208,38 +208,38 @@ BOOL OfaMSFilterTabPage2::FillItemSet( SfxItemSet& )
{ InvalidCBEntry, 0, 0 }
};
- BOOL bCheck, bFirst = TRUE;
+ sal_Bool bCheck, bFirst = sal_True;
for( const ChkCBoxEntries* pArr = aChkArr;
InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst )
{
- USHORT nCol = bFirst ? 1 : 2;
+ sal_uInt16 nCol = bFirst ? 1 : 2;
SvLBoxEntry* pEntry = GetEntry4Type( pArr->eType );
if( pEntry )
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol ));
if( pItem && ((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON )
{
- USHORT nButtonFlags = pItem->GetButtonFlags();
+ sal_uInt16 nButtonFlags = pItem->GetButtonFlags();
bCheck = SV_BUTTON_CHECKED ==
pCheckButtonData->ConvertToButtonState( nButtonFlags );
if( bCheck != (pOpt->*pArr->FnIs)() )
{
- bModified = TRUE;
+ bModified = sal_True;
(pOpt->*pArr->FnSet)( bCheck );
}
}
}
}
- return TRUE;
+ return sal_True;
}
void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
{
SvtFilterOptions* pOpt = SvtFilterOptions::Get();
- aCheckLB.SetUpdateMode(FALSE);
+ aCheckLB.SetUpdateMode(sal_False);
aCheckLB.Clear();
SvtModuleOptions aModuleOpt;
@@ -256,7 +256,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
static struct ChkCBoxEntries{
MSFltrPg2_CheckBoxEntries eType;
- BOOL (SvtFilterOptions:: *FnIs)() const;
+ sal_Bool (SvtFilterOptions:: *FnIs)() const;
} aChkArr[] = {
{ Math, &SvtFilterOptions::IsMathType2Math },
{ Math, &SvtFilterOptions::IsMath2MathType },
@@ -269,11 +269,11 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
{ InvalidCBEntry, NULL }
};
- BOOL bFirst = TRUE;
+ sal_Bool bFirst = sal_True;
for( const ChkCBoxEntries* pArr = aChkArr;
InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst )
{
- USHORT nCol = bFirst ? 1 : 2;
+ sal_uInt16 nCol = bFirst ? 1 : 2;
SvLBoxEntry* pEntry = GetEntry4Type( static_cast< sal_IntPtr >( pArr->eType ) );
if( pEntry )
{
@@ -288,7 +288,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& )
}
}
}
- aCheckLB.SetUpdateMode( TRUE );
+ aCheckLB.SetUpdateMode( sal_True );
}
void OfaMSFilterTabPage2::InsertEntry( const String& _rTxt, sal_IntPtr _nType )
@@ -324,7 +324,7 @@ SvLBoxEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const
void OfaMSFilterTabPage2::MSFltrSimpleTable::SetTabs()
{
SvxSimpleTable::SetTabs();
- USHORT nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE;
+ sal_uInt16 nAdjust = SV_LBOXTAB_ADJUST_RIGHT|SV_LBOXTAB_ADJUST_LEFT|SV_LBOXTAB_ADJUST_CENTER|SV_LBOXTAB_ADJUST_NUMERIC|SV_LBOXTAB_FORCE;
if( aTabs.Count() > 1 )
{
@@ -348,7 +348,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick()
---------------------------------------------------------------------------*/
void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
- SvLBoxEntry* pEntry, USHORT nCol, SvButtonState eState)
+ SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState)
{
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1));
@@ -376,7 +376,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState(
---------------------------------------------------------------------------*/
SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
- SvLBoxEntry* pEntry, USHORT nCol ) const
+ SvLBoxEntry* pEntry, sal_uInt16 nCol ) const
{
SvButtonState eState = SV_BUTTON_UNCHECKED;
SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1));
@@ -384,7 +384,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
if (((SvLBoxItem*)pItem)->IsA() == SV_ITEM_ID_LBOXBUTTON)
{
- USHORT nButtonFlags = pItem->GetButtonFlags();
+ sal_uInt16 nButtonFlags = pItem->GetButtonFlags();
eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
}
@@ -393,7 +393,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
/* -----------------------------2002/06/20 11:57------------------------------
---------------------------------------------------------------------------*/
-void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked)
+void OfaMSFilterTabPage2::MSFltrSimpleTable::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked)
{
if ( nPos < GetEntryCount() )
SetCheckButtonState(
@@ -410,8 +410,8 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt )
if(!rKEvt.GetKeyCode().GetModifier() &&
KEY_SPACE == rKEvt.GetKeyCode().GetCode())
{
- ULONG nSelPos = GetModel()->GetAbsPos(GetCurEntry());
- USHORT nCol = GetCurrentTabPos() - 1;
+ sal_uLong nSelPos = GetModel()->GetAbsPos(GetCurEntry());
+ sal_uInt16 nCol = GetCurrentTabPos() - 1;
if ( nCol < 2 )
{
SvLBoxEntry* pEntry = GetEntry( nSelPos );
@@ -421,7 +421,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt )
}
else
{
- USHORT nCheck = GetCheckButtonState( GetEntry(nSelPos), 1 ) == SV_BUTTON_CHECKED ? 1 : 0;
+ sal_uInt16 nCheck = GetCheckButtonState( GetEntry(nSelPos), 1 ) == SV_BUTTON_CHECKED ? 1 : 0;
if(GetCheckButtonState( GetEntry(nSelPos), 0 ))
nCheck += 2;
nCheck--;
diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx
index e2572e901124..608139fab42d 100644
--- a/cui/source/options/optfltr.hxx
+++ b/cui/source/options/optfltr.hxx
@@ -61,7 +61,7 @@ public:
static SfxTabPage* Create( Window* pParent,
const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
@@ -73,9 +73,9 @@ class OfaMSFilterTabPage2 : public SfxTabPage
using SvTreeListBox::SetCheckButtonState;
using SvxSimpleTable::SetTabs;
- void CheckEntryPos(ULONG nPos, USHORT nCol, BOOL bChecked);
- SvButtonState GetCheckButtonState( SvLBoxEntry*, USHORT nCol ) const;
- void SetCheckButtonState( SvLBoxEntry*, USHORT nCol, SvButtonState );
+ void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked);
+ SvButtonState GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const;
+ void SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState );
protected:
virtual void SetTabs();
virtual void HBarClick();
@@ -105,7 +105,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 06d1c46af3df..8b6c0beda7ae 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -309,7 +309,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
"HighContrastWhite"
};
- for ( USHORT i = 0; i < aHelpFormatLB.GetEntryCount(); i++ )
+ for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++ )
{
String* pData = new String( String::CreateFromAscii( aHelpFormatNames[i] ) );
aHelpFormatLB.SetEntryData( i, pData );
@@ -320,7 +320,7 @@ OfaMiscTabPage::OfaMiscTabPage(Window* pParent, const SfxItemSet& rSet ) :
OfaMiscTabPage::~OfaMiscTabPage()
{
- for(USHORT i = 0; i < aHelpFormatLB.GetEntryCount(); i++)
+ for(sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); i++)
{
delete static_cast< String* >( aHelpFormatLB.GetEntryData(i) );
}
@@ -335,12 +335,12 @@ SfxTabPage* OfaMiscTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
// -----------------------------------------------------------------------
-BOOL OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
{
- BOOL bModified = FALSE;
+ sal_Bool bModified = sal_False;
SvtHelpOptions aHelpOptions;
- BOOL bChecked = aToolTipsCB.IsChecked();
+ sal_Bool bChecked = aToolTipsCB.IsChecked();
if ( bChecked != aToolTipsCB.GetSavedValue() )
aHelpOptions.SetHelpTips( bChecked );
bChecked = ( aExtHelpCB.IsChecked() && aToolTipsCB.IsChecked() );
@@ -349,7 +349,7 @@ BOOL OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
bChecked = aHelpAgentCB.IsChecked();
if ( bChecked != aHelpAgentCB.GetSavedValue() )
aHelpOptions.SetHelpAgentAutoStartMode( bChecked );
- USHORT nHelpFormatPos = aHelpFormatLB.GetSelectEntryPos();
+ sal_uInt16 nHelpFormatPos = aHelpFormatLB.GetSelectEntryPos();
if ( nHelpFormatPos != LISTBOX_ENTRY_NOTFOUND &&
nHelpFormatPos != aHelpFormatLB.GetSavedValue() )
{
@@ -360,29 +360,29 @@ BOOL OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetUseSystemFileDialog( !aFileDlgCB.IsChecked() );
- bModified = TRUE;
+ bModified = sal_True;
}
if ( aPrintDlgCB.IsChecked() != aPrintDlgCB.GetSavedValue() )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetUseSystemPrintDialog( !aPrintDlgCB.IsChecked() );
- bModified = TRUE;
+ bModified = sal_True;
}
if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() )
{
SvtPrintWarningOptions aPrintOptions;
aPrintOptions.SetModifyDocumentOnPrintingAllowed( aDocStatusCB.IsChecked() );
- bModified = TRUE;
+ bModified = sal_True;
}
const SfxUInt16Item* pUInt16Item =
PTR_CAST( SfxUInt16Item, GetOldItem( rSet, SID_ATTR_YEAR2000 ) );
- USHORT nNum = (USHORT)aYearValueField.GetText().ToInt32();
+ sal_uInt16 nNum = (sal_uInt16)aYearValueField.GetText().ToInt32();
if ( pUInt16Item && pUInt16Item->GetValue() != nNum )
{
- bModified = TRUE;
+ bModified = sal_True;
rSet.Put( SfxUInt16Item( SID_ATTR_YEAR2000, nNum ) );
}
@@ -398,7 +398,7 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
aExtHelpCB.Check( aHelpOptions.IsHelpTips() && aHelpOptions.IsExtendedHelp() );
aHelpAgentCB.Check( aHelpOptions.IsHelpAgentAutoStartMode() );
String sStyleSheet = aHelpOptions.GetHelpStyleSheet();
- for ( USHORT i = 0; i < aHelpFormatLB.GetEntryCount(); ++i )
+ for ( sal_uInt16 i = 0; i < aHelpFormatLB.GetEntryCount(); ++i )
{
if ( *static_cast< String* >( aHelpFormatLB.GetEntryData(i) ) == sStyleSheet )
{
@@ -424,17 +424,17 @@ void OfaMiscTabPage::Reset( const SfxItemSet& rSet )
aDocStatusCB.SaveValue();
const SfxPoolItem* pItem = NULL;
- if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, FALSE, &pItem ) )
+ if ( SFX_ITEM_SET == rSet.GetItemState( SID_ATTR_YEAR2000, sal_False, &pItem ) )
{
aYearValueField.SetValue( ((SfxUInt16Item*)pItem)->GetValue() );
TwoFigureConfigHdl( &aYearValueField );
}
else
{
- aYearValueField.Enable(FALSE);
- aTwoFigureFL.Enable(FALSE);
- aInterpretFT.Enable(FALSE);
- aToYearFT.Enable(FALSE);
+ aYearValueField.Enable(sal_False);
+ aTwoFigureFL.Enable(sal_False);
+ aInterpretFT.Enable(sal_False);
+ aToYearFT.Enable(sal_False);
}
}
@@ -499,24 +499,24 @@ class CanvasSettings
public:
CanvasSettings();
- BOOL IsHardwareAccelerationEnabled() const;
- BOOL IsHardwareAccelerationAvailable() const;
- void EnabledHardwareAcceleration( BOOL _bEnabled ) const;
+ sal_Bool IsHardwareAccelerationEnabled() const;
+ sal_Bool IsHardwareAccelerationAvailable() const;
+ void EnabledHardwareAcceleration( sal_Bool _bEnabled ) const;
private:
typedef std::vector< std::pair<OUString,Sequence<OUString> > > ServiceVector;
Reference<XNameAccess> mxForceFlagNameAccess;
ServiceVector maAvailableImplementations;
- mutable BOOL mbHWAccelAvailable;
- mutable BOOL mbHWAccelChecked;
+ mutable sal_Bool mbHWAccelAvailable;
+ mutable sal_Bool mbHWAccelChecked;
};
// -------------------------------------------------------------------
CanvasSettings::CanvasSettings() :
mxForceFlagNameAccess(),
- mbHWAccelAvailable(FALSE),
- mbHWAccelChecked(FALSE)
+ mbHWAccelAvailable(sal_False),
+ mbHWAccelChecked(sal_False)
{
try
{
@@ -576,7 +576,7 @@ CanvasSettings::CanvasSettings() :
}
// -------------------------------------------------------------------
-BOOL CanvasSettings::IsHardwareAccelerationAvailable() const
+sal_Bool CanvasSettings::IsHardwareAccelerationAvailable() const
{
if( !mbHWAccelChecked )
{
@@ -622,7 +622,7 @@ BOOL CanvasSettings::IsHardwareAccelerationAvailable() const
}
// -------------------------------------------------------------------
-BOOL CanvasSettings::IsHardwareAccelerationEnabled() const
+sal_Bool CanvasSettings::IsHardwareAccelerationEnabled() const
{
bool bForceLastEntry(false);
if( !mxForceFlagNameAccess.is() )
@@ -635,7 +635,7 @@ BOOL CanvasSettings::IsHardwareAccelerationEnabled() const
}
// -------------------------------------------------------------------
-void CanvasSettings::EnabledHardwareAcceleration( BOOL _bEnabled ) const
+void CanvasSettings::EnabledHardwareAcceleration( sal_Bool _bEnabled ) const
{
Reference< XNameReplace > xNameReplace(
mxForceFlagNameAccess, UNO_QUERY );
@@ -763,8 +763,8 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
if( ! Application::ValidateSystemFont() )
{
- m_aSystemFont.Check( FALSE );
- m_aSystemFont.Enable( FALSE );
+ m_aSystemFont.Check( sal_False );
+ m_aSystemFont.Enable( sal_False );
}
const StyleSettings& aStyleSettings = Application::GetSettings().GetStyleSettings();
@@ -774,8 +774,8 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
{
// do not check 0th item == auto; it is not a real theme
aIconStyleItemId[0] = 0;
- ULONG nItem = 1;
- for ( ULONG n=0; ++n < STYLE_SYMBOLS_THEMES_MAX; )
+ sal_uLong nItem = 1;
+ for ( sal_uLong n=0; ++n < STYLE_SYMBOLS_THEMES_MAX; )
{
if ( aStyleSettings.CheckSymbolStyle( n ) )
{
@@ -798,7 +798,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet ) :
aAutoStr += ::rtl::OUString::createFromAscii( " (" );
- ULONG nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
+ sal_uLong nAutoStyle = aStyleSettings.GetAutoSymbolsStyle();
if ( aIconStyleItemId[nAutoStyle] )
aAutoStr += aIconStyleLB.GetEntry( aIconStyleItemId[nAutoStyle] );
@@ -854,18 +854,18 @@ SfxTabPage* OfaViewTabPage::Create( Window* pParent, const SfxItemSet& rAttrSet
--------------------------------------------------*/
-BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
+sal_Bool OfaViewTabPage::FillItemSet( SfxItemSet& )
{
SvtFontOptions aFontOpt;
SvtMenuOptions aMenuOpt;
SvtStartOptions aStartOpt;
- BOOL bModified = FALSE;
- BOOL bMenuOptModified = FALSE;
+ sal_Bool bModified = sal_False;
+ sal_Bool bMenuOptModified = sal_False;
bool bRepaintWindows(false);
SvtMiscOptions aMiscOptions;
- UINT16 nSizeLB_NewSelection = aIconSizeLB.GetSelectEntryPos();
+ sal_uInt16 nSizeLB_NewSelection = aIconSizeLB.GetSelectEntryPos();
if( nSizeLB_InitialSelection != nSizeLB_NewSelection )
{
// from now on it's modified, even if via auto setting the same size was set as now selected in the LB
@@ -881,12 +881,12 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
aMiscOptions.SetSymbolsSize( eSet );
}
- UINT16 nStyleLB_NewSelection = aIconStyleLB.GetSelectEntryPos();
+ sal_uInt16 nStyleLB_NewSelection = aIconStyleLB.GetSelectEntryPos();
if( nStyleLB_InitialSelection != nStyleLB_NewSelection )
{
// find the style name in the aIconStyleItemId table
// items from the non-installed icon themes were removed
- for ( ULONG n=0; n < STYLE_SYMBOLS_THEMES_MAX; n++ )
+ for ( sal_uLong n=0; n < STYLE_SYMBOLS_THEMES_MAX; n++ )
{
if ( aIconStyleItemId[n] == nStyleLB_NewSelection )
{
@@ -896,17 +896,17 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
}
}
- BOOL bAppearanceChanged = FALSE;
+ sal_Bool bAppearanceChanged = sal_False;
// Screen Scaling
- UINT16 nOldScale = pAppearanceCfg->GetScaleFactor();
- UINT16 nNewScale = (UINT16)aWindowSizeMF.GetValue();
+ sal_uInt16 nOldScale = pAppearanceCfg->GetScaleFactor();
+ sal_uInt16 nNewScale = (sal_uInt16)aWindowSizeMF.GetValue();
if ( nNewScale != nOldScale )
{
pAppearanceCfg->SetScaleFactor(nNewScale);
- bAppearanceChanged = TRUE;
+ bAppearanceChanged = sal_True;
}
// Mouse Snap Mode
@@ -918,7 +918,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
if ( eNewSnap != eOldSnap )
{
pAppearanceCfg->SetSnapMode(eNewSnap );
- bAppearanceChanged = TRUE;
+ bAppearanceChanged = sal_True;
}
// Middle Mouse Button
@@ -930,41 +930,41 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
if ( eNewMiddleMouse != eOldMiddleMouse )
{
pAppearanceCfg->SetMiddleMouseButton( eNewMiddleMouse );
- bAppearanceChanged = TRUE;
+ bAppearanceChanged = sal_True;
}
#if defined( UNX )
if ( aFontAntiAliasing.IsChecked() != aFontAntiAliasing.GetSavedValue() )
{
pAppearanceCfg->SetFontAntiAliasing( aFontAntiAliasing.IsChecked() );
- bAppearanceChanged = TRUE;
+ bAppearanceChanged = sal_True;
}
if ( aAAPointLimit.GetValue() != aAAPointLimit.GetSavedValue().ToInt32() )
{
pAppearanceCfg->SetFontAntialiasingMinPixelHeight( aAAPointLimit.GetValue() );
- bAppearanceChanged = TRUE;
+ bAppearanceChanged = sal_True;
}
#endif
if ( aFontShowCB.IsChecked() != aFontShowCB.GetSavedValue() )
{
aFontOpt.EnableFontWYSIWYG( aFontShowCB.IsChecked() );
- bModified = TRUE;
+ bModified = sal_True;
}
if(aMenuIconsLB.GetSelectEntryPos() != aMenuIconsLB.GetSavedValue())
{
aMenuOpt.SetMenuIconsState( aMenuIconsLB.GetSelectEntryPos() == 0 ? 2 : aMenuIconsLB.GetSelectEntryPos() - 1);
- bModified = TRUE;
- bMenuOptModified = TRUE;
- bAppearanceChanged = TRUE;
+ bModified = sal_True;
+ bMenuOptModified = sal_True;
+ bAppearanceChanged = sal_True;
}
if ( aFontHistoryCB.IsChecked() != aFontHistoryCB.GetSavedValue() )
{
aFontOpt.EnableFontHistory( aFontHistoryCB.IsChecked() );
- bModified = TRUE;
+ bModified = sal_True;
}
// #i95644# if disabled, do not use value, see in ::Reset()
@@ -973,7 +973,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
if(aUseHardwareAccell.IsChecked() != aUseHardwareAccell.GetSavedValue())
{
pCanvasSettings->EnabledHardwareAcceleration(aUseHardwareAccell.IsChecked());
- bModified = TRUE;
+ bModified = sal_True;
}
}
@@ -983,7 +983,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
if(aUseAntiAliase.IsChecked() != mpDrawinglayerOpt->IsAntiAliasing())
{
mpDrawinglayerOpt->SetAntiAliasing(aUseAntiAliase.IsChecked());
- bModified = TRUE;
+ bModified = sal_True;
bRepaintWindows = true;
}
}
@@ -997,7 +997,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
if(bNewSelection != (bool)mpDrawinglayerOpt->IsTransparentSelection())
{
mpDrawinglayerOpt->SetTransparentSelection(maSelectionCB.IsChecked());
- bModified = TRUE;
+ bModified = sal_True;
bRepaintWindows = true;
}
@@ -1006,7 +1006,7 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
if(nNewTransparence != mpDrawinglayerOpt->GetTransparentSelectionPercent())
{
mpDrawinglayerOpt->SetTransparentSelectionPercent(nNewTransparence);
- bModified = TRUE;
+ bModified = sal_True;
bRepaintWindows = true;
}
}
@@ -1016,8 +1016,8 @@ BOOL OfaViewTabPage::FillItemSet( SfxItemSet& )
m_aSystemFont.IsEnabled() )
{
aAccessibilityOptions.SetIsSystemFont( m_aSystemFont.IsChecked() );
- bModified = TRUE;
- bMenuOptModified = TRUE;
+ bModified = sal_True;
+ bMenuOptModified = sal_True;
}
if( bMenuOptModified )
@@ -1255,9 +1255,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
aLang = MsLangId::convertIsoStringToLanguage(seqInstalledLanguages[i]);
if (aLang != LANGUAGE_DONTKNOW)
{
- //USHORT p = aUserInterfaceLB.InsertLanguage(aLang);
+ //sal_uInt16 p = aUserInterfaceLB.InsertLanguage(aLang);
String aLangStr( pLanguageTable->GetString( aLang ) );
- USHORT p = aUserInterfaceLB.InsertEntry(aLangStr);
+ sal_uInt16 p = aUserInterfaceLB.InsertEntry(aLangStr);
aUserInterfaceLB.SetEntryData(p, (void*)(i+1));
}
}
@@ -1273,7 +1273,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
if (m_sUserLocaleValue.getLength() > 0)
{
sal_Int32 d = 0;
- for (USHORT i=0; i < aUserInterfaceLB.GetEntryCount(); i++)
+ for (sal_uInt16 i=0; i < aUserInterfaceLB.GetEntryCount(); i++)
{
d = (sal_Int32)(sal_IntPtr)aUserInterfaceLB.GetEntryData(i);
if ( d > 0 && seqInstalledLanguages.getLength() > d-1 && seqInstalledLanguages[d-1].equals(m_sUserLocaleValue))
@@ -1290,14 +1290,14 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
OSL_ENSURE(sal_False, aMsg.getStr());
}
- aWesternLanguageLB.SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, TRUE, FALSE, TRUE );
+ aWesternLanguageLB.SetLanguageList( LANG_LIST_WESTERN | LANG_LIST_ONLY_KNOWN, sal_True, sal_False, sal_True );
aWesternLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::LATIN );
- aAsianLanguageLB.SetLanguageList( LANG_LIST_CJK | LANG_LIST_ONLY_KNOWN, TRUE, FALSE, TRUE );
+ aAsianLanguageLB.SetLanguageList( LANG_LIST_CJK | LANG_LIST_ONLY_KNOWN, sal_True, sal_False, sal_True );
aAsianLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::ASIAN );
- aComplexLanguageLB.SetLanguageList( LANG_LIST_CTL | LANG_LIST_ONLY_KNOWN, TRUE, FALSE, TRUE );
+ aComplexLanguageLB.SetLanguageList( LANG_LIST_CTL | LANG_LIST_ONLY_KNOWN, sal_True, sal_False, sal_True );
aComplexLanguageLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::COMPLEX );
- aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, FALSE, FALSE, FALSE);
+ aLocaleSettingLB.SetLanguageList( LANG_LIST_ALL | LANG_LIST_ONLY_KNOWN, sal_False, sal_False, sal_False);
aLocaleSettingLB.InsertDefaultLanguage( ::com::sun::star::i18n::ScriptType::WEAK );
const NfCurrencyTable& rCurrTab = SvNumberFormatter::GetTheCurrencyTable();
@@ -1309,9 +1309,9 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
aCurrencyLB.InsertEntry( aDefaultCurr );
// all currencies
String aTwoSpace( RTL_CONSTASCII_USTRINGPARAM( " " ) );
- USHORT nCurrCount = rCurrTab.Count();
+ sal_uInt16 nCurrCount = rCurrTab.Count();
// first entry is SYSTEM, skip it
- for ( USHORT j=1; j < nCurrCount; ++j )
+ for ( sal_uInt16 j=1; j < nCurrCount; ++j )
{
const NfCurrencyEntry* pCurr = rCurrTab[j];
String aStr_( pCurr->GetBankSymbol() );
@@ -1320,7 +1320,7 @@ OfaLanguagesTabPage::OfaLanguagesTabPage( Window* pParent, const SfxItemSet& rSe
aStr_ = ApplyLreOrRleEmbedding( aStr_ );
aStr_ += aTwoSpace;
aStr_ += ApplyLreOrRleEmbedding( pLanguageTable->GetString( pCurr->GetLanguage() ) );
- USHORT nPos = aCurrencyLB.InsertEntry( aStr_ );
+ sal_uInt16 nPos = aCurrencyLB.InsertEntry( aStr_ );
aCurrencyLB.SetEntryData( nPos, (void*) pCurr );
}
delete pLanguageTable;
@@ -1403,12 +1403,12 @@ void lcl_UpdateAndDelete(SfxVoidItem* pInvalidItems[], SfxBoolItem* pBoolItems[]
}
}
-BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
// lock configuration broadcasters so that we can coordinate the notifications
- pLangConfig->aSysLocaleOptions.BlockBroadcasts( TRUE );
- pLangConfig->aLanguageOptions.BlockBroadcasts( TRUE );
- pLangConfig->aLinguConfig.BlockBroadcasts( TRUE );
+ pLangConfig->aSysLocaleOptions.BlockBroadcasts( sal_True );
+ pLangConfig->aLanguageOptions.BlockBroadcasts( sal_True );
+ pLangConfig->aLinguConfig.BlockBroadcasts( sal_True );
if(aCTLSupportCB.IsChecked() &&
(aCTLSupportCB.GetSavedValue() != aCTLSupportCB.IsChecked()) ||
@@ -1497,7 +1497,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// this will happen after releasing the lock on the ConfigurationBroadcaster at
// the end of this method
pLangConfig->aSysLocaleOptions.SetLocaleConfigString( sNewLang );
- rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, TRUE ) );
+ rSet.Put( SfxBoolItem( SID_OPT_LOCALE_CHANGED, sal_True ) );
}
if(aDecimalSeparatorCB.GetSavedValue() != aDecimalSeparatorCB.IsChecked())
@@ -1505,7 +1505,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// Configured currency, for example, USD-en-US or EUR-de-DE, or empty for locale default.
OUString sOldCurr = pLangConfig->aSysLocaleOptions.GetCurrencyConfigString();
- USHORT nCurrPos = aCurrencyLB.GetSelectEntryPos();
+ sal_uInt16 nCurrPos = aCurrencyLB.GetSelectEntryPos();
const NfCurrencyEntry* pCurr = (const NfCurrencyEntry*)
aCurrencyLB.GetEntryData( nCurrPos );
OUString sNewCurr;
@@ -1515,15 +1515,15 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
if ( sOldCurr != sNewCurr )
pLangConfig->aSysLocaleOptions.SetCurrencyConfigString( sNewCurr );
- BOOL bRet = FALSE;
+ sal_Bool bRet = sal_False;
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
Reference< XPropertySet > xLinguProp( LinguMgr::GetLinguPropertySet(), UNO_QUERY );
- BOOL bCurrentDocCBChecked = aCurrentDocCB.IsChecked();
+ sal_Bool bCurrentDocCBChecked = aCurrentDocCB.IsChecked();
if(aCurrentDocCB.IsEnabled())
bLanguageCurrentDoc_Impl = bCurrentDocCBChecked;
- BOOL bCurrentDocCBChanged = bCurrentDocCBChecked != aCurrentDocCB.GetSavedValue();
+ sal_Bool bCurrentDocCBChanged = bCurrentDocCBChecked != aCurrentDocCB.GetSavedValue();
- BOOL bValChanged = aWesternLanguageLB.GetSavedValue() != aWesternLanguageLB.GetSelectEntryPos();
+ sal_Bool bValChanged = aWesternLanguageLB.GetSavedValue() != aWesternLanguageLB.GetSelectEntryPos();
if( (bCurrentDocCBChanged && !bCurrentDocCBChecked) || bValChanged)
{
LanguageType eSelectLang = aWesternLanguageLB.GetSelectLanguage();
@@ -1541,7 +1541,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::LATIN),
SID_ATTR_LANGUAGE));
- bRet = TRUE;
+ bRet = sal_True;
}
}
bValChanged = aAsianLanguageLB.GetSavedValue() != aAsianLanguageLB.GetSelectEntryPos();
@@ -1562,7 +1562,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::ASIAN),
SID_ATTR_CHAR_CJK_LANGUAGE));
- bRet = TRUE;
+ bRet = sal_True;
}
}
bValChanged = aComplexLanguageLB.GetSavedValue() != aComplexLanguageLB.GetSelectEntryPos();
@@ -1583,7 +1583,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
{
rSet.Put(SvxLanguageItem(MsLangId::resolveSystemLanguageByScriptType(eSelectLang, ::com::sun::star::i18n::ScriptType::COMPLEX),
SID_ATTR_CHAR_CTL_LANGUAGE));
- bRet = TRUE;
+ bRet = sal_True;
}
}
@@ -1596,8 +1596,8 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
const sal_uInt16 STATE_COUNT = 2;
SfxBoolItem* pBoolItems[STATE_COUNT];
- pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, FALSE);
- pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, FALSE);
+ pBoolItems[0] = new SfxBoolItem(SID_VERTICALTEXT_STATE, sal_False);
+ pBoolItems[1] = new SfxBoolItem(SID_TEXT_FITTOSIZE_VERTICAL, sal_False);
SfxVoidItem* pInvalidItems[STATE_COUNT];
pInvalidItems[0] = new SfxVoidItem(SID_VERTICALTEXT_STATE);
@@ -1612,7 +1612,7 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
const sal_uInt16 STATE_COUNT = 1;
SfxBoolItem* pBoolItems[STATE_COUNT];
- pBoolItems[0] = new SfxBoolItem(SID_CTLFONT_STATE, FALSE);
+ pBoolItems[0] = new SfxBoolItem(SID_CTLFONT_STATE, sal_False);
SfxVoidItem* pInvalidItems[STATE_COUNT];
pInvalidItems[0] = new SfxVoidItem(SID_CTLFONT_STATE);
lcl_UpdateAndDelete(pInvalidItems, pBoolItems, STATE_COUNT);
@@ -1624,11 +1624,11 @@ BOOL OfaLanguagesTabPage::FillItemSet( SfxItemSet& rSet )
// first release the lock on the ConfigurationBroadcaster for Locale changes
// it seems that our code relies on the fact that before other changes like e.g. currency
// are broadcasted locale changes have been done
- pLangConfig->aSysLocaleOptions.BlockBroadcasts( FALSE );
- pLangConfig->aLanguageOptions.BlockBroadcasts( FALSE );
- pLangConfig->aLinguConfig.BlockBroadcasts( FALSE );
+ pLangConfig->aSysLocaleOptions.BlockBroadcasts( sal_False );
+ pLangConfig->aLanguageOptions.BlockBroadcasts( sal_False );
+ pLangConfig->aLinguConfig.BlockBroadcasts( sal_False );
- return FALSE;
+ return sal_False;
}
//-----------------------------------------------------------------------------
void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
@@ -1663,7 +1663,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
pCurr = SvNumberFormatter::GetCurrencyEntry( aAbbrev, eLang );
}
// if pCurr==NULL the SYSTEM entry is selected
- USHORT nPos = aCurrencyLB.GetEntryPos( (void*) pCurr );
+ sal_uInt16 nPos = aCurrencyLB.GetEntryPos( (void*) pCurr );
aCurrencyLB.SelectEntryPos( nPos );
bReadonly = pLangConfig->aSysLocaleOptions.IsReadOnly(SvtSysLocaleOptions::E_CURRENCY);
aCurrencyLB.Enable(!bReadonly);
@@ -1676,7 +1676,7 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
LanguageType eCurLangCTL = LANGUAGE_NONE;
SfxObjectShell* pCurrentDocShell = SfxObjectShell::Current();
//collect the configuration values first
- aCurrentDocCB.Enable(FALSE);
+ aCurrentDocCB.Enable(sal_False);
//
Any aWestLang;
Any aCJKLang;
@@ -1705,24 +1705,24 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
//overwrite them by the values provided by the DocShell
if(pCurrentDocShell)
{
- aCurrentDocCB.Enable(TRUE);
+ aCurrentDocCB.Enable(sal_True);
aCurrentDocCB.Check(bLanguageCurrentDoc_Impl);
const SfxPoolItem* pLang;
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, FALSE, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_LANGUAGE, sal_False, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLang, ::com::sun::star::i18n::ScriptType::LATIN) != eTempCurLang)
eCurLang = eTempCurLang;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, FALSE, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CJK_LANGUAGE, sal_False, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCJK, ::com::sun::star::i18n::ScriptType::ASIAN) != eTempCurLang)
eCurLangCJK = eTempCurLang;
}
- if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, FALSE, &pLang))
+ if( SFX_ITEM_SET == rSet.GetItemState(SID_ATTR_CHAR_CTL_LANGUAGE, sal_False, &pLang))
{
LanguageType eTempCurLang = ((const SvxLanguageItem*)pLang)->GetValue();
if (MsLangId::resolveSystemLanguageByScriptType(eCurLangCTL, ::com::sun::star::i18n::ScriptType::COMPLEX) != eTempCurLang)
@@ -1771,11 +1771,11 @@ void OfaLanguagesTabPage::Reset( const SfxItemSet& rSet )
set the focus to the Western Language box
--------------------------------------------------------*/
const SfxPoolItem* pLang = 0;
- if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, FALSE, &pLang ) &&( (const SfxBoolItem*)pLang)->GetValue() == TRUE )
+ if ( SFX_ITEM_SET == rSet.GetItemState(SID_SET_DOCUMENT_LANGUAGE, sal_False, &pLang ) &&( (const SfxBoolItem*)pLang)->GetValue() == sal_True )
{
aWesternLanguageLB.GrabFocus();
- aCurrentDocCB.Enable(TRUE);
- aCurrentDocCB.Check(TRUE);
+ aCurrentDocCB.Enable(sal_True);
+ aCurrentDocCB.Check(sal_True);
}
}
/* -----------------------------20.04.01 15:09--------------------------------
@@ -1819,7 +1819,7 @@ namespace
void lcl_checkLanguageCheckBox(CheckBox& _rCB,sal_Bool _bNewValue,sal_Bool _bOldValue)
{
if ( _bNewValue )
- _rCB.Check(TRUE);
+ _rCB.Check(sal_True);
else
_rCB.Check( _bOldValue );
// #i15082# do not call SaveValue() in running dialog...
@@ -1851,7 +1851,7 @@ IMPL_LINK( OfaLanguagesTabPage, LocaleSettingHdl, SvxLanguageBox*, pBox )
SupportHdl( &aAsianSupportCB );
}
- USHORT nPos;
+ sal_uInt16 nPos;
if ( eLang == LANGUAGE_SYSTEM )
nPos = aCurrencyLB.GetEntryPos( (void*) NULL );
else
diff --git a/cui/source/options/optgdlg.hxx b/cui/source/options/optgdlg.hxx
index 2b8f3d074216..3268cd43c51c 100644
--- a/cui/source/options/optgdlg.hxx
+++ b/cui/source/options/optgdlg.hxx
@@ -83,7 +83,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
@@ -131,13 +131,13 @@ private:
CheckBox maSelectionCB;
MetricField maSelectionMF;
- UINT16 nSizeLB_InitialSelection;
- UINT16 nStyleLB_InitialSelection;
- BOOL bSfxSymbolsAuto;
+ sal_uInt16 nSizeLB_InitialSelection;
+ sal_uInt16 nStyleLB_InitialSelection;
+ sal_Bool bSfxSymbolsAuto;
// item ID for the given icon theme
// might be zero when the theme is not installed and the item is removed
- ULONG aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX];
+ sal_uLong aIconStyleItemId[STYLE_SYMBOLS_THEMES_MAX];
SvtTabAppearanceCfg* pAppearanceCfg;
CanvasSettings* pCanvasSettings;
SvtOptionsDrawinglayer* mpDrawinglayerOpt;
@@ -154,7 +154,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
/* -----------------------------23.11.00 13:04--------------------------------
@@ -209,7 +209,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
- virtual BOOL FillItemSet( SfxItemSet& rSet );
+ virtual sal_Bool FillItemSet( SfxItemSet& rSet );
virtual void Reset( const SfxItemSet& rSet );
};
#endif // #ifndef _OFA_OPTGDLG_HXX
diff --git a/cui/source/options/optgenrl.cxx b/cui/source/options/optgenrl.cxx
index d6fa0ec1fdf3..bba3b10fc846 100644
--- a/cui/source/options/optgenrl.cxx
+++ b/cui/source/options/optgenrl.cxx
@@ -52,20 +52,20 @@
struct GeneralTabPage_Impl
{
- BOOL mbStreetEnabled;
- BOOL mbPLZEnabled;
- BOOL mbCityEnabled;
- BOOL mbUsCityEnabled;
- BOOL mbUsZipEnabled;
+ sal_Bool mbStreetEnabled;
+ sal_Bool mbPLZEnabled;
+ sal_Bool mbCityEnabled;
+ sal_Bool mbUsCityEnabled;
+ sal_Bool mbUsZipEnabled;