summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog/mgetempl.cxx
diff options
context:
space:
mode:
authorPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
committerPhilipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM>2011-02-14 16:17:22 +0100
commit1fb042333fe6287756ff1fac11d18cd7c150730d (patch)
tree595de5d187177832ce656d7832af9dce9dce2d99 /sfx2/source/dialog/mgetempl.cxx
parent5b3e910e926c7dd1e8dcfe8e0a5c6cb5bd17480a (diff)
parentcd0d6a5a6775f197fdb7e78b54c8133074a7a236 (diff)
rebase to DEV300_m100
Diffstat (limited to 'sfx2/source/dialog/mgetempl.cxx')
-rw-r--r--sfx2/source/dialog/mgetempl.cxx48
1 files changed, 24 insertions, 24 deletions
diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx
index d97847f5b6e0..454c42896cfe 100644
--- a/sfx2/source/dialog/mgetempl.cxx
+++ b/sfx2/source/dialog/mgetempl.cxx
@@ -84,7 +84,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
pStyle( &( (SfxStyleDialog*)pParent->GetParent() )->GetStyleSheet() ),
pItem ( 0 ),
- bModified ( FALSE ),
+ bModified ( sal_False ),
aName ( pStyle->GetName() ),
aFollow ( pStyle->GetFollow() ),
aParent ( pStyle->GetParent() ),
@@ -132,7 +132,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
{
// NullString als Name -> Name generieren
String aNoName( SfxResId( STR_NONAME ) );
- USHORT nNo = 1;
+ sal_uInt16 nNo = 1;
String aNo( aNoName );
aNoName += String::CreateFromInt32( nNo );
while ( pPool->Find( aNoName ) )
@@ -156,7 +156,7 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
aNameMLE.SetControlBackground( GetSettings().GetStyleSettings().GetDialogColor() );
aNameMLE.SetText( pStyle->GetName() );
- aNameMLE.EnableCursor( FALSE );
+ aNameMLE.EnableCursor( sal_False );
aNameMLE.Show();
}
@@ -208,9 +208,9 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
aBaseFt.Disable();
aBaseLb.Disable();
}
- USHORT nCount = pFamilies->Count();
+ sal_uInt16 nCount = pFamilies->Count();
- USHORT i;
+ sal_uInt16 i;
for ( i = 0; i < nCount; ++i )
{
pItem = pFamilies->GetObject(i);
@@ -219,15 +219,15 @@ SfxManageStyleSheetPage::SfxManageStyleSheetPage( Window* pParent, const SfxItem
break;
}
- USHORT nStyleFilterIdx = 0xffff;
+ sal_uInt16 nStyleFilterIdx = 0xffff;
if ( i < nCount )
{
// Filterflags
const SfxStyleFilter& rList = pItem->GetFilterList();
- nCount = (USHORT)rList.Count();
- USHORT nIdx = 0;
- USHORT nMask = pStyle->GetMask() & ~SFXSTYLEBIT_USERDEF;
+ nCount = (sal_uInt16)rList.Count();
+ sal_uInt16 nIdx = 0;
+ sal_uInt16 nMask = pStyle->GetMask() & ~SFXSTYLEBIT_USERDEF;
if ( !nMask ) // Benutzervorlage?
nMask = pStyle->GetMask();
@@ -322,7 +322,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox,
if ( pBox->IsEnabled() )
{
// ist der aktuelle Eintrag, dessen Namen modifizieren wurde
- const BOOL bSelect = pBox->GetSelectEntry() == aBuf;
+ const sal_Bool bSelect = pBox->GetSelectEntry() == aBuf;
pBox->RemoveEntry( aBuf );
pBox->InsertEntry( rNew );
@@ -414,7 +414,7 @@ IMPL_LINK_INLINE_END( SfxManageStyleSheetPage, LoseFocusHdl, Edit *, pEdit )
//-------------------------------------------------------------------------
-BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
+sal_Bool SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
/* [Beschreibung]
@@ -429,9 +429,9 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
[R"uckgabewert]
- BOOL TRUE: es hat eine "Anderung der Daten
+ sal_Bool sal_True: es hat eine "Anderung der Daten
stattgefunden
- FALSE: es hat keine "Anderung der Daten
+ sal_False: es hat keine "Anderung der Daten
stattgefunden
[Querverweise]
@@ -441,7 +441,7 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
*/
{
- const USHORT nFilterIdx = aFilterLb.GetSelectEntryPos();
+ const sal_uInt16 nFilterIdx = aFilterLb.GetSelectEntryPos();
// Filter setzen
@@ -449,16 +449,16 @@ BOOL SfxManageStyleSheetPage::FillItemSet( SfxItemSet& rSet )
nFilterIdx != aFilterLb.GetSavedValue() &&
aFilterLb.IsEnabled() )
{
- bModified = TRUE;
+ bModified = sal_True;
DBG_ASSERT( pItem, "kein Item" );
// geht nur bei Benutzervorlagen
#if OSL_DEBUG_LEVEL > 1
- USHORT nIdx = (USHORT)(long)aFilterLb.GetEntryData( nFilterIdx );
+ sal_uInt16 nIdx = (sal_uInt16)(long)aFilterLb.GetEntryData( nFilterIdx );
SfxFilterTupel* p;
p = pItem->GetFilterList().GetObject( nIdx );
#endif
- USHORT nMask = pItem->GetFilterList().GetObject(
- (USHORT)(long)aFilterLb.GetEntryData( nFilterIdx ) )->nFlags |
+ sal_uInt16 nMask = pItem->GetFilterList().GetObject(
+ (sal_uInt16)(long)aFilterLb.GetEntryData( nFilterIdx ) )->nFlags |
SFXSTYLEBIT_USERDEF;
pStyle->SetMask( nMask );
}
@@ -492,7 +492,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
*/
{
- bModified = FALSE;
+ bModified = sal_False;
String sCmp( pStyle->GetName() );
if ( sCmp != aName )
@@ -534,7 +534,7 @@ void SfxManageStyleSheetPage::Reset( const SfxItemSet& /*rAttrSet*/ )
if ( aFilterLb.IsEnabled() )
{
- USHORT nCmp = pStyle->GetMask();
+ sal_uInt16 nCmp = pStyle->GetMask();
if ( nCmp != nFlags )
pStyle->SetMask( nFlags );
@@ -590,7 +590,7 @@ void SfxManageStyleSheetPage::ActivatePage( const SfxItemSet& rSet)
const SfxPoolItem* pPoolItem;
if ( SFX_ITEM_SET ==
- rSet.GetItemState( SID_ATTR_AUTO_STYLE_UPDATE, FALSE, &pPoolItem ) )
+ rSet.GetItemState( SID_ATTR_AUTO_STYLE_UPDATE, sal_False, &pPoolItem ) )
aAutoCB.Check( ( (const SfxBoolItem*)pPoolItem )->GetValue() );
aAutoCB.SaveValue();
}
@@ -633,7 +633,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
aNameEd.SetSelection( Selection( SELECTION_MIN, SELECTION_MAX ) );
return SfxTabPage::KEEP_PAGE;
}
- bModified = TRUE;
+ bModified = sal_True;
}
if ( pStyle->HasFollowSupport() && aFollowLb.IsEnabled() )
@@ -649,7 +649,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
aFollowLb.GrabFocus();
return SfxTabPage::KEEP_PAGE;
}
- bModified = TRUE;
+ bModified = sal_True;
}
}
@@ -669,7 +669,7 @@ int SfxManageStyleSheetPage::DeactivatePage( SfxItemSet* pItemSet )
aBaseLb.GrabFocus();
return SfxTabPage::KEEP_PAGE;
}
- bModified = TRUE;
+ bModified = sal_True;
nRet |= (int)SfxTabPage::REFRESH_SET;
}
}
generated by cgit (git 2.34.1) at 2025-03-23 23:21:24 +0000