[Libreoffice-commits] .: Branch 'integration/dev300_m101' - 2 commits - basctl/source cui/source forms/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sun Mar 13 04:23:53 PDT 2011
basctl/source/basicide/basobj3.cxx | 2 +-
cui/source/customize/acccfg.src | 1 -
cui/source/dialogs/SpellDialog.cxx | 3 +--
cui/source/dialogs/about.cxx | 5 +++--
cui/source/dialogs/iconcdlg.cxx | 11 +++++------
cui/source/inc/align.hxx | 4 ++--
cui/source/inc/iconcdlg.hxx | 3 ++-
cui/source/options/optdict.cxx | 4 ++--
cui/source/options/optgdlg.cxx | 6 +++---
cui/source/options/treeopt.src | 7 +------
cui/source/tabpages/align.cxx | 20 ++++++++++----------
cui/source/tabpages/backgrnd.cxx | 4 ++--
cui/source/tabpages/border.cxx | 2 +-
cui/source/tabpages/chardlg.cxx | 36 ++++++++++++++++++------------------
cui/source/tabpages/dstribut.cxx | 2 +-
cui/source/tabpages/paragrph.cxx | 2 +-
cui/source/tabpages/tparea.cxx | 2 +-
forms/source/component/Filter.hxx | 4 ++--
18 files changed, 56 insertions(+), 62 deletions(-)
New commits:
commit c608f21f9cec7a617786a3a657db9efeb9cc8031
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sun Mar 13 05:35:57 2011 -0500
use boost::unordered_map instead of hash_map
diff --git a/forms/source/component/Filter.hxx b/forms/source/component/Filter.hxx
index 5785d25..316a214 100644
--- a/forms/source/component/Filter.hxx
+++ b/forms/source/component/Filter.hxx
@@ -46,7 +46,7 @@
#include <connectivity/sqlparse.hxx>
#include <svx/ParseContext.hxx>
-#include <hash_map>
+#include <boost/unordered_map.hpp>
//.........................................................................
namespace frm
@@ -75,7 +75,7 @@ namespace frm
::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData;
::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindow > m_xMessageParent;
- typedef ::std::hash_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > MapString2String;
+ typedef ::boost::unordered_map< ::rtl::OUString, ::rtl::OUString, ::rtl::OUStringHash > MapString2String;
MapString2String m_aDisplayItemToValueItem;
::rtl::OUString m_aText;
commit 5d3fb6af5e2c5ff28e935f3d6445016727d84583
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Mar 12 23:58:22 2011 -0600
mis-merge: mostly remove remaining tools types
diff --git a/basctl/source/basicide/basobj3.cxx b/basctl/source/basicide/basobj3.cxx
index d9c27d8..3e82e0e 100644
--- a/basctl/source/basicide/basobj3.cxx
+++ b/basctl/source/basicide/basobj3.cxx
@@ -375,7 +375,7 @@ void BasicStopped( sal_Bool* pbAppWindowDisabled,
BasicIDEShell* pIDEShell = IDE_DLL()->GetShell();
if( pIDEShell )
{
- USHORT nWait = 0;
+ sal_uInt16 nWait = 0;
while ( pIDEShell->GetViewFrame()->GetWindow().IsWait() )
{
pIDEShell->GetViewFrame()->GetWindow().LeaveWait();
diff --git a/cui/source/customize/acccfg.src b/cui/source/customize/acccfg.src
index 7e8322f..874ac85 100644
--- a/cui/source/customize/acccfg.src
+++ b/cui/source/customize/acccfg.src
@@ -251,7 +251,6 @@ Resource RID_SVXPAGE_CONFIGGROUPBOX
ImageBitmap = Bitmap { File = "im30826.png"; };
MASKCOLOR
};
- };
Image BMP_COLLAPSED
{
ImageBitmap = Bitmap
diff --git a/cui/source/dialogs/SpellDialog.cxx b/cui/source/dialogs/SpellDialog.cxx
index 0ff89d0..290080f 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -928,7 +928,6 @@ void SpellDialog::InitUserDicts()
}
SvtLinguConfig aCfg;
- const bool bHC = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
// list suitable dictionaries
bool bEnable = false;
@@ -958,7 +957,7 @@ void SpellDialog::InitUserDicts()
if (xSvcInfo.is())
{
OUString aDictionaryImageUrl( aCfg.GetSpellAndGrammarContextDictionaryImage(
- xSvcInfo->getImplementationName(), bHC) );
+ xSvcInfo->getImplementationName()) );
if (aDictionaryImageUrl.getLength() > 0)
{
Image aImage( lcl_GetImageFromPngUrl( aDictionaryImageUrl ) );
diff --git a/cui/source/dialogs/about.cxx b/cui/source/dialogs/about.cxx
index 2cd6e3e..a1de647 100644
--- a/cui/source/dialogs/about.cxx
+++ b/cui/source/dialogs/about.cxx
@@ -164,7 +164,7 @@ AboutDialog::AboutDialog( Window* pParent, const ResId& rId ) :
if ( pResMgr )
{
aCopyrightTextStr = String( ResId( ABOUT_STR_COPYRIGHT, *pResMgr ) );
- pDeveloperAry = new ResStringArray( ResId( ABOUT_STR_DEVELOPER_ARY, *pResMgr ) );
+// pDeveloperAry = new ResStringArray( ResId( ABOUT_STR_DEVELOPER_ARY, *pResMgr ) );
delete pResMgr;
}
@@ -375,7 +375,8 @@ void AboutDialog::Paint( const Rectangle& rRect )
const int nFullWidth = GetOutputSizePixel().Width();
int nY = nOff;
- const int nDevCnt = static_cast<int>( pDeveloperAry->Count() );
+// const int nDevCnt = static_cast<int>( pDeveloperAry->Count() );
+ const int nDevCnt = 0;
for( int i = 0; i < nDevCnt; ++i )
{
if( nY >= rRect.Bottom() )
diff --git a/cui/source/dialogs/iconcdlg.cxx b/cui/source/dialogs/iconcdlg.cxx
index b7c58f7..3c06796 100644
--- a/cui/source/dialogs/iconcdlg.cxx
+++ b/cui/source/dialogs/iconcdlg.cxx
@@ -305,7 +305,7 @@ IconChoiceDialog ::~IconChoiceDialog ()
}
// remove Userdata from Icons
- for ( ULONG i=0; i < maIconCtrl.GetEntryCount(); i++)
+ for ( sal_uLong i=0; i < maIconCtrl.GetEntryCount(); i++)
{
SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData();
@@ -392,8 +392,8 @@ void IconChoiceDialog::RemoveTabPage( sal_uInt16 nId )
}
// remove Icon
- bool bFound = FALSE;
- for ( ULONG i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++)
+ bool bFound = false;
+ for ( sal_uLong i=0; i<maIconCtrl.GetEntryCount() && !bFound; i++)
{
SvxIconChoiceCtrlEntry* pEntry = maIconCtrl.GetEntry ( i );
sal_uInt16* pUserData = (sal_uInt16*) pEntry->GetUserData();
@@ -499,7 +499,7 @@ void IconChoiceDialog::HidePageImpl ( IconChoicePageData* pData )
void IconChoiceDialog::RemoveResetButton()
{
aResetBtn.Hide();
- bHideResetBtn = TRUE;
+ bHideResetBtn = true;
}
// -----------------------------------------------------------------------
@@ -817,7 +817,7 @@ void IconChoiceDialog::ActivatePageImpl ()
DBG_ASSERT( !maPageList.empty(), "keine Pages angemeldet" );
IconChoicePageData* pData = GetPageData ( mnCurrentPageId );
DBG_ASSERT( pData, "Id nicht bekannt" );
- BOOL bReadOnly = FALSE;
+ bool bReadOnly = false;
if ( pData )
{
if ( !pData->pPage )
@@ -1271,4 +1271,4 @@ void IconChoiceDialog::FocusOnIcon( sal_uInt16 nId )
}
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/cui/source/inc/align.hxx b/cui/source/inc/align.hxx
index b7c32b2..818fd38 100644
--- a/cui/source/inc/align.hxx
+++ b/cui/source/inc/align.hxx
@@ -55,7 +55,7 @@ public:
static SfxTabPage* Create( Window* pParent, const SfxItemSet& rAttrSet );
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 );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
@@ -66,7 +66,7 @@ private:
void InitVsRefEgde();
void UpdateEnableControls();
- bool HasAlignmentChanged( const SfxItemSet& rNew, USHORT nWhich ) const;
+ bool HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const;
DECL_LINK( UpdateEnableHdl, void* );
diff --git a/cui/source/inc/iconcdlg.hxx b/cui/source/inc/iconcdlg.hxx
index 812ef24..58e234b 100644
--- a/cui/source/inc/iconcdlg.hxx
+++ b/cui/source/inc/iconcdlg.hxx
@@ -233,7 +233,7 @@ public :
//
SvxIconChoiceCtrlEntry* AddTabPage(
- sal_uInt16 nId, const String& rIconText, const Image& rChoiceIcon, const Image& rChoiceIconHC,
+ sal_uInt16 nId, const String& rIconText, const Image& rChoiceIcon,
CreatePage pCreateFunc /* != NULL */, GetPageRanges pRangesFunc = NULL /* NULL allowed*/,
sal_Bool bItemsOnDemand = sal_False, sal_uLong nPos = LIST_APPEND );
@@ -241,6 +241,7 @@ public :
sal_uInt16 GetCurPageId() const { return mnCurrentPageId; }
void ShowPage( sal_uInt16 nId );
void RemoveTabPage( sal_uInt16 nId );
+ void RemoveResetButton();
// liefert ggf. per Map konvertierte lokale Slots
const sal_uInt16* GetInputRanges( const SfxItemPool& );
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index d1f2ea2..09c331b 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -550,8 +550,8 @@ void SvxEditDictionaryDialog::ShowWords_Impl( sal_uInt16 nId )
if (aWordsLB.GetEntryCount())
{
- aWordED .SetText( aWordsLB.GetEntryText((ULONG)0, 0) );
- aReplaceED.SetText( aWordsLB.GetEntryText((ULONG)0, 1) );
+ aWordED .SetText( aWordsLB.GetEntryText((sal_uLong)0, 0) );
+ aReplaceED.SetText( aWordsLB.GetEntryText((sal_uLong)0, 1) );
}
LeaveWait();
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index 75375fe..9e0d3df 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -415,7 +415,7 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetTryODMADialog( aODMADlgCB.IsChecked() );
- bModified = TRUE;
+ bModified = sal_True;
}
if ( aDocStatusCB.IsChecked() != aDocStatusCB.GetSavedValue() )
@@ -429,14 +429,14 @@ sal_Bool OfaMiscTabPage::FillItemSet( SfxItemSet& rSet )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetSaveAlwaysAllowed( aSaveAlwaysCB.IsChecked() );
- bModified = TRUE;
+ bModified = sal_True;
}
if ( aExperimentalCB.IsChecked() != aExperimentalCB.GetSavedValue() )
{
SvtMiscOptions aMiscOpt;
aMiscOpt.SetExperimentalMode( aExperimentalCB.IsChecked() );
- bModified = TRUE;
+ bModified = sal_True;
}
const SfxUInt16Item* pUInt16Item =
diff --git a/cui/source/options/treeopt.src b/cui/source/options/treeopt.src
index 5a885b3..a1924ad 100644
--- a/cui/source/options/treeopt.src
+++ b/cui/source/options/treeopt.src
@@ -335,10 +335,5 @@ ImageList RID_IMGLIST_TREEOPT
IMGLST_IDLST
};
-ImageList RID_IMGLIST_TREEOPT_HC
-{
- Prefix = "trh";
- MASK_COL
- IMGLST_IDLST
-};
+
diff --git a/cui/source/tabpages/align.cxx b/cui/source/tabpages/align.cxx
index be1deaa..f90f57d 100644
--- a/cui/source/tabpages/align.cxx
+++ b/cui/source/tabpages/align.cxx
@@ -124,10 +124,10 @@ namespace {
template<typename _JustContainerType, typename _JustEnumType>
void lcl_MaybeResetAlignToDistro(
- ListBox& rLB, USHORT nListPos, const SfxItemSet& rCoreAttrs, USHORT nWhichAlign, USHORT nWhichJM, _JustEnumType eBlock)
+ ListBox& rLB, sal_uInt16 nListPos, const SfxItemSet& rCoreAttrs, sal_uInt16 nWhichAlign, sal_uInt16 nWhichJM, _JustEnumType eBlock)
{
const SfxPoolItem* pItem;
- if (rCoreAttrs.GetItemState(nWhichAlign, TRUE, &pItem) != SFX_ITEM_SET)
+ if (rCoreAttrs.GetItemState(nWhichAlign, sal_True, &pItem) != SFX_ITEM_SET)
// alignment not set.
return;
@@ -137,7 +137,7 @@ void lcl_MaybeResetAlignToDistro(
// alignment is not 'justify'. No need to go further.
return;
- if (rCoreAttrs.GetItemState(nWhichJM, TRUE, &pItem) != SFX_ITEM_SET)
+ if (rCoreAttrs.GetItemState(nWhichJM, sal_True, &pItem) != SFX_ITEM_SET)
// justification method is not set.
return;
@@ -148,7 +148,7 @@ void lcl_MaybeResetAlignToDistro(
rLB.SelectEntryPos(nListPos);
}
-void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, USHORT nWhichJM, const ListBox& rLB, USHORT nListPos)
+void lcl_SetJustifyMethodToItemSet(SfxItemSet& rSet, sal_uInt16 nWhichJM, const ListBox& rLB, sal_uInt16 nListPos)
{
SvxCellJustifyMethod eJM = SVX_JUSTIFY_METHOD_AUTO;
if (rLB.GetSelectEntryPos() == nListPos)
@@ -261,19 +261,19 @@ sal_uInt16* AlignmentTabPage::GetRanges()
return s_pRanges;
}
-BOOL AlignmentTabPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool AlignmentTabPage::FillItemSet( SfxItemSet& rSet )
{
bool bChanged = SfxTabPage::FillItemSet(rSet);
// Special treatment for distributed alignment; we need to set the justify
// method to 'distribute' to distinguish from the normal justification.
- USHORT nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD);
+ sal_uInt16 nWhichHorJM = GetWhich(SID_ATTR_ALIGN_HOR_JUSTIFY_METHOD);
lcl_SetJustifyMethodToItemSet(rSet, nWhichHorJM, maLbHorAlign, ALIGNDLG_HORALIGN_DISTRIBUTED);
if (!bChanged)
bChanged = HasAlignmentChanged(rSet, nWhichHorJM);
- USHORT nWhichVerJM = GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD);
+ sal_uInt16 nWhichVerJM = GetWhich(SID_ATTR_ALIGN_VER_JUSTIFY_METHOD);
lcl_SetJustifyMethodToItemSet(rSet, nWhichVerJM, maLbVerAlign, ALIGNDLG_VERALIGN_DISTRIBUTED);
if (!bChanged)
bChanged = HasAlignmentChanged(rSet, nWhichVerJM);
@@ -367,19 +367,19 @@ void AlignmentTabPage::UpdateEnableControls()
maFlProperties.Show( maBtnWrap.IsVisible() || maBtnHyphen.IsVisible() || maBtnShrink.IsVisible() || maLbFrameDir.IsVisible() );
}
-bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, USHORT nWhich ) const
+bool AlignmentTabPage::HasAlignmentChanged( const SfxItemSet& rNew, sal_uInt16 nWhich ) const
{
const SfxItemSet& rOld = GetItemSet();
const SfxPoolItem* pItem;
SvxCellJustifyMethod eMethodOld = SVX_JUSTIFY_METHOD_AUTO;
SvxCellJustifyMethod eMethodNew = SVX_JUSTIFY_METHOD_AUTO;
- if (rOld.GetItemState(nWhich, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rOld.GetItemState(nWhich, sal_True, &pItem) == SFX_ITEM_SET)
{
const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem);
eMethodOld = static_cast<SvxCellJustifyMethod>(p->GetEnumValue());
}
- if (rNew.GetItemState(nWhich, TRUE, &pItem) == SFX_ITEM_SET)
+ if (rNew.GetItemState(nWhich, sal_True, &pItem) == SFX_ITEM_SET)
{
const SfxEnumItem* p = static_cast<const SfxEnumItem*>(pItem);
eMethodNew = static_cast<SvxCellJustifyMethod>(p->GetEnumValue());
diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 0dd1ac6..9a86c1d 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -1135,14 +1135,14 @@ void SvxBackgroundTabPage::FillColorValueSets_Impl()
const SfxPoolItem* pItem = NULL;
XColorTable* pColorTable = NULL;
const Size aSize15x15 = Size( 15, 15 );
- bool bOwn = FALSE;
+ bool bOwn = false;
if ( pDocSh && ( 0 != ( pItem = pDocSh->GetItem( SID_COLOR_TABLE ) ) ) )
pColorTable = ( (SvxColorTableItem*)pItem )->GetColorTable();
if ( !pColorTable )
{
- bOwn = sal_True;
+ bOwn = true;
pColorTable = new XColorTable( SvtPathOptions().GetPalettePath() );
}
diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 0eb4d3a..0a94bc7 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -917,7 +917,7 @@ IMPL_LINK( SvxBorderTabPage, SelColHdl_Impl, ListBox *, pLb )
// -----------------------------------------------------------------------
-SvxBorderStyle lcl_getBorderStyle( USHORT nStyle )
+SvxBorderStyle lcl_getBorderStyle( sal_uInt16 nStyle )
{
SvxBorderStyle nResult = SOLID;
switch ( nStyle )
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index 17c9da7..92f3589 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -1290,7 +1290,7 @@ sal_Bool SvxCharNamePage::FillItemSet_Impl( SfxItemSet& rSet, LanguageGroup eLan
if ( bChanged && rFontName.Len() )
{
rSet.Put( aFontItem );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
rSet.ClearItem( nWhich );
@@ -2220,7 +2220,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
if ( (FontUnderline)(sal_uLong)m_aUnderlineLB.GetEntryData(i) == eUnderline )
{
m_aUnderlineLB.SelectEntryPos(i);
- bEnable = TRUE;
+ bEnable = sal_True;
break;
}
}
@@ -2277,7 +2277,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
if ( (FontUnderline)(sal_uLong)m_aOverlineLB.GetEntryData(i) == eOverline )
{
m_aOverlineLB.SelectEntryPos(i);
- bEnable = TRUE;
+ bEnable = sal_True;
break;
}
}
@@ -2334,7 +2334,7 @@ void SvxCharEffectsPage::Reset( const SfxItemSet& rSet )
if ( (FontStrikeout)(sal_uLong)m_aStrikeoutLB.GetEntryData(i) == eStrikeout )
{
m_aStrikeoutLB.SelectEntryPos(i);
- bEnable = TRUE;
+ bEnable = sal_True;
break;
}
}
@@ -2665,7 +2665,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
SvxUnderlineItem aNewItem( eUnder, nWhich );
aNewItem.SetColor( m_aUnderlineColorLB.GetSelectEntryColor() );
rSet.Put( aNewItem );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -2699,7 +2699,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
SvxOverlineItem aNewItem( eOver, nWhich );
aNewItem.SetColor( m_aOverlineColorLB.GetSelectEntryColor() );
rSet.Put( aNewItem );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -2730,7 +2730,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged )
{
rSet.Put( SvxCrossedOutItem( eStrike, nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -2755,7 +2755,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged )
{
rSet.Put( SvxWordLineModeItem( m_aIndividualWordsBtn.IsChecked(), nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -2791,7 +2791,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged )
{
rSet.Put( SvxEmphasisMarkItem( eMark, nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -2827,7 +2827,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && bChecked )
{
rSet.Put( SvxCaseMapItem( eCaseMap, nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -2864,7 +2864,7 @@ sal_Bool SvxCharEffectsPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && eState != STATE_DONTKNOW )
{
rSet.Put( SvxContourItem( StateToAttr( eState ), nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -3691,7 +3691,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged && nPos != LISTBOX_ENTRY_NOTFOUND )
{
rSet.Put( SvxKerningItem( nKerning, nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -3704,7 +3704,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
if ( m_aPairKerningBtn.IsChecked() != m_aPairKerningBtn.GetSavedValue() )
{
rSet.Put( SvxAutoKernItem( m_aPairKerningBtn.IsChecked(), nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -3714,7 +3714,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
if ( m_aScaleWidthMF.GetText() != m_aScaleWidthMF.GetSavedValue() )
{
rSet.Put( SvxCharScaleWidthItem( (sal_uInt16)m_aScaleWidthMF.GetValue(), nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -3732,7 +3732,7 @@ sal_Bool SvxCharPositionPage::FillItemSet( SfxItemSet& rSet )
else if (m_a270degRB.IsChecked())
aItem.SetTopToBotton();
rSet.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
@@ -3857,7 +3857,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart )
pBox->SelectEntryPos(0);
else
{
- bool bFound = FALSE;
+ bool bFound = false;
for ( sal_uInt16 i = 1; i < pBox->GetEntryCount(); ++i )
{
if ( (sal_uLong)pBox->GetEntryData(i) != CHRDLG_ENCLOSE_SPECIAL_CHAR )
@@ -3867,7 +3867,7 @@ void SvxCharTwoLinesPage::SetBracket( sal_Unicode cBracket, sal_Bool bStart )
{
pBox->SelectEntryPos(i);
nEntryPos = i;
- bFound = sal_True;
+ bFound = true;
break;
}
}
@@ -3997,7 +3997,7 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
if ( bChanged )
{
rSet.Put( SvxTwoLinesItem( bOn, cStart, cEnd, nWhich ) );
- bModified = TRUE;
+ bModified = sal_True;
}
else if ( SFX_ITEM_DEFAULT == rOldSet.GetItemState( nWhich, sal_False ) )
CLEARTITEM;
diff --git a/cui/source/tabpages/dstribut.cxx b/cui/source/tabpages/dstribut.cxx
index 7321af1..08f37dc 100644
--- a/cui/source/tabpages/dstribut.cxx
+++ b/cui/source/tabpages/dstribut.cxx
@@ -172,7 +172,7 @@ void SvxDistributePage::Reset(const SfxItemSet& )
case SvxDistributeHorizontalLeft : maBtnHorLeft.SetState(sal_True); break;
case SvxDistributeHorizontalCenter : maBtnHorCenter.SetState(sal_True); break;
case SvxDistributeHorizontalDistance : maBtnHorDistance.SetState(sal_True); break;
- case SvxDistributeHorizontalRight : maBtnHorRight.SetState(TRUE); break;
+ case SvxDistributeHorizontalRight : maBtnHorRight.SetState(sal_True); break;
}
maBtnVerNone.SetState(sal_False);
diff --git a/cui/source/tabpages/paragrph.cxx b/cui/source/tabpages/paragrph.cxx
index e269f07..a0c05e9 100644
--- a/cui/source/tabpages/paragrph.cxx
+++ b/cui/source/tabpages/paragrph.cxx
@@ -1185,7 +1185,7 @@ sal_Bool SvxParaAlignTabPage::FillItemSet( SfxItemSet& rOutSet )
pOld->GetLastBlock() != eLastBlock ||
( bChecked && bNothingWasChecked ) )
{
- bModified = TRUE;
+ bModified = sal_True;
SvxAdjustItem aAdj(
(const SvxAdjustItem&)GetItemSet().Get( _nWhich ) );
aAdj.SetAdjust( eAdjust );
diff --git a/cui/source/tabpages/tparea.cxx b/cui/source/tabpages/tparea.cxx
index ca71377..633e63c 100644
--- a/cui/source/tabpages/tparea.cxx
+++ b/cui/source/tabpages/tparea.cxx
@@ -807,7 +807,7 @@ void SvxAreaTabPage::ActivatePage( const SfxItemSet& rSet )
if( pColorTab )
{
- USHORT _nPos = 0;
+ sal_uInt16 _nPos = 0;
// Bitmapliste
if( *pnBitmapListState )
{
More information about the Libreoffice-commits
mailing list