summaryrefslogtreecommitdiff
path: root/sfx2/source/dialog/templdlg.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/dialog/templdlg.cxx')
-rw-r--r--sfx2/source/dialog/templdlg.cxx478
1 files changed, 239 insertions, 239 deletions
diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index b10e634be231..54df29e63e4a 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -97,7 +97,7 @@ using namespace ::com::sun::star::uno;
#define SFX_TEMPLDLG_MIDVSPACE 3
#define SFX_TEMPLDLG_FILTERHEIGHT 100
-static USHORT nLastItemId = USHRT_MAX;
+static sal_uInt16 nLastItemId = USHRT_MAX;
// filter box has maximum 12 entries visible
#define MAX_FILTER_ENTRIES 12
@@ -231,7 +231,7 @@ void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt )
{
nModifier = rMEvt.GetModifier();
- BOOL bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), TRUE ) );
+ sal_Bool bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), sal_True ) );
if( bHitEmptySpace && ( rMEvt.GetClicks() == 2 ) && rMEvt.IsMod1() )
Control::MouseButtonDown( rMEvt );
else
@@ -264,7 +264,7 @@ sal_Int8 DropListBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt )
{
// rEvt.maDropEvent.Context->acceptDrop( DND_ACTION_NONE );
-// rEvt.maDropEvent.Context->dropComplete( TRUE );
+// rEvt.maDropEvent.Context->dropComplete( sal_True );
sal_Int8 nRet = DND_ACTION_NONE;
SfxObjectShell* pDocShell = pDialog->GetObjectShell();
@@ -380,8 +380,8 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
//added by BerryJia for fixing Bug102739 2002-9-9 17:00(Beijing Time)
if( !( GetSelectionCount() > 0 ) )
{
- pDialog->EnableEdit( FALSE );
- pDialog->EnableDel( FALSE );
+ pDialog->EnableEdit( sal_False );
+ pDialog->EnableDel( sal_False );
}
return pDialog->CreateContextMenu();
}
@@ -389,7 +389,7 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void )
//-------------------------------------------------------------------------
SfxTemplateDialogWrapper::SfxTemplateDialogWrapper(Window *pParentWnd,
- USHORT nId, SfxBindings *p, SfxChildWinInfo *pInfo) :
+ sal_uInt16 nId, SfxBindings *p, SfxChildWinInfo *pInfo) :
SfxChildWindow(pParentWnd, nId)
{
SfxTemplateDialog *pWin = new SfxTemplateDialog(p, this, pParentWnd);
@@ -430,13 +430,13 @@ private:
protected:
virtual void Command( const CommandEvent& rMEvt );
virtual long Notify( NotifyEvent& rNEvt );
- virtual BOOL DoubleClickHdl();
+ virtual sal_Bool DoubleClickHdl();
virtual long ExpandingHdl();
virtual void ExpandedHdl();
- virtual BOOL NotifyMoving(SvLBoxEntry* pTarget,
+ virtual sal_Bool NotifyMoving(SvLBoxEntry* pTarget,
SvLBoxEntry* pEntry,
SvLBoxEntry*& rpNewParent,
- ULONG& rNewChildPos);
+ sal_uIntPtr& rNewChildPos);
public:
StyleTreeListBox_Impl( SfxCommonTemplateDialog_Impl* pParent, WinBits nWinStyle = 0);
@@ -456,7 +456,7 @@ public:
void StyleTreeListBox_Impl::MakeExpanded_Impl(ExpandedEntries& rEntries) const
{
SvLBoxEntry *pEntry;
- USHORT nCount=0;
+ sal_uInt16 nCount=0;
for(pEntry=(SvLBoxEntry*)FirstVisible();pEntry;pEntry=(SvLBoxEntry*)NextVisible(pEntry))
{
if(IsExpanded(pEntry))
@@ -472,7 +472,7 @@ PopupMenu* StyleTreeListBox_Impl::CreateContextMenu()
return pDialog->CreateContextMenu();
}
-BOOL StyleTreeListBox_Impl::DoubleClickHdl()
+sal_Bool StyleTreeListBox_Impl::DoubleClickHdl()
/* [Beschreibung]
@@ -483,7 +483,7 @@ BOOL StyleTreeListBox_Impl::DoubleClickHdl()
*/
{
aDoubleClickLink.Call(this);
- return FALSE;
+ return sal_False;
}
//-------------------------------------------------------------------------
@@ -526,10 +526,10 @@ long StyleTreeListBox_Impl::Notify( NotifyEvent& rNEvt )
//-------------------------------------------------------------------------
-BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry* pTarget,
+sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry* pTarget,
SvLBoxEntry* pEntry,
SvLBoxEntry*& rpNewParent,
- ULONG& lPos)
+ sal_uIntPtr& lPos)
/* [Beschreibung]
NotifyMoving Handler; dieser leitet per Link das Event an den Dialog
@@ -539,10 +539,10 @@ BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry* pTarget,
*/
{
if(!pTarget || !pEntry)
- return FALSE;
+ return sal_False;
aParent = GetEntryText(pTarget);
aStyle = GetEntryText(pEntry);
- const BOOL bRet = (BOOL)aDropLink.Call(this);
+ const sal_Bool bRet = (sal_Bool)aDropLink.Call(this);
rpNewParent = pTarget;
lPos=0;
IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
@@ -552,7 +552,7 @@ BOOL StyleTreeListBox_Impl::NotifyMoving(SvLBoxEntry* pTarget,
GetEntryText(pTmpEntry),GetEntryText(pEntry));
pTmpEntry=NextSibling(pTmpEntry),lPos++) ;
- return bRet? (BOOL)2: FALSE;
+ return bRet? (sal_Bool)2: sal_False;
}
//-------------------------------------------------------------------------
@@ -570,7 +570,7 @@ long StyleTreeListBox_Impl::ExpandingHdl()
*/
{
pCurEntry = GetCurEntry();
- return TRUE;
+ return sal_True;
}
//-------------------------------------------------------------------------
@@ -590,7 +590,7 @@ void StyleTreeListBox_Impl::ExpandedHdl()
{
SvLBoxEntry *pEntry = GetHdlEntry();
if(!IsExpanded(pEntry) && pCurEntry != GetCurEntry())
- SelectAll( FALSE );
+ SelectAll( sal_False );
pCurEntry = 0;
}
@@ -628,14 +628,14 @@ struct StyleTree_Impl
String aName;
String aParent;
StyleTreeArr_Impl *pChilds;
- BOOL bIsExpanded;
- BOOL HasParent() const { return aParent.Len() != 0; }
+ sal_Bool bIsExpanded;
+ sal_Bool HasParent() const { return aParent.Len() != 0; }
StyleTree_Impl(const String &rName, const String &rParent):
aName(rName), aParent(rParent), pChilds(0), bIsExpanded(0) {}
~StyleTree_Impl();
- void Put(StyleTree_Impl* pIns, ULONG lPos=ULONG_MAX);
- ULONG Count();
+ void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX);
+ sal_uIntPtr Count();
};
typedef StyleTree_Impl* StyleTree_ImplPtr;
@@ -643,7 +643,7 @@ SV_DECL_PTRARR_DEL(StyleTreeArr_Impl, StyleTree_ImplPtr, 16, 8)
SV_IMPL_PTRARR(StyleTreeArr_Impl, StyleTree_ImplPtr)
-ULONG StyleTree_Impl::Count()
+sal_uIntPtr StyleTree_Impl::Count()
{
return pChilds ? pChilds->Count() : 0L;
}
@@ -657,35 +657,35 @@ StyleTree_Impl::~StyleTree_Impl()
//-------------------------------------------------------------------------
-void StyleTree_Impl::Put(StyleTree_Impl* pIns, ULONG lPos)
+void StyleTree_Impl::Put(StyleTree_Impl* pIns, sal_uIntPtr lPos)
{
if ( !pChilds )
pChilds = new StyleTreeArr_Impl;
if ( ULONG_MAX == lPos )
lPos = pChilds->Count();
- pChilds->Insert( pIns, (USHORT)lPos );
+ pChilds->Insert( pIns, (sal_uInt16)lPos );
}
//-------------------------------------------------------------------------
StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
{
- const USHORT nCount = rArr.Count();
+ const sal_uInt16 nCount = rArr.Count();
// Alle unter ihren Parents einordnen
- USHORT i;
+ sal_uInt16 i;
for(i = 0; i < nCount; ++i)
{
StyleTree_ImplPtr pEntry = rArr[i];
if(pEntry->HasParent())
{
- for(USHORT j = 0; j < nCount; ++j)
+ for(sal_uInt16 j = 0; j < nCount; ++j)
{
StyleTree_ImplPtr pCmp = rArr[j];
if(pCmp->aName == pEntry->aParent)
{
// initial sortiert einfuegen
- USHORT ii;
+ sal_uInt16 ii;
IntlWrapper aIntlWrapper( ::comphelper::getProcessServiceFactory(), Application::GetSettings().GetLocale() );
const CollatorWrapper* pCollator = aIntlWrapper.getCaseCollator();
for ( ii = 0;
@@ -713,14 +713,14 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr)
//-------------------------------------------------------------------------
-inline BOOL IsExpanded_Impl( const ExpandedEntries& rEntries,
+inline sal_Bool IsExpanded_Impl( const ExpandedEntries& rEntries,
const String &rStr)
{
- USHORT nCount=rEntries.Count();
- for(USHORT n=0;n<nCount;n++)
+ sal_uInt16 nCount=rEntries.Count();
+ for(sal_uInt16 n=0;n<nCount;n++)
if(*rEntries[n]==rStr)
- return TRUE;
- return FALSE;
+ return sal_True;
+ return sal_False;
}
@@ -731,8 +731,8 @@ SvLBoxEntry* FillBox_Impl(SvTreeListBox *pBox,
SvLBoxEntry* pParent = 0)
{
SvLBoxEntry* pNewEntry = pBox->InsertEntry(pEntry->aName, pParent);
- const USHORT nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0;
- for(USHORT i = 0; i < nCount; ++i)
+ const sal_uInt16 nCount = pEntry->pChilds? pEntry->pChilds->Count(): 0;
+ for(sal_uInt16 i = 0; i < nCount; ++i)
FillBox_Impl(pBox, (*pEntry->pChilds)[i], rEntries, pNewEntry);
return pNewEntry;
}
@@ -763,20 +763,20 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Sfx
nActFilter ( 0 ),
nAppFilter ( 0 ),
- bDontUpdate ( FALSE ),
- bIsWater ( FALSE ),
- bEnabled ( TRUE ),
- bUpdate ( FALSE ),
- bUpdateFamily ( FALSE ),
- bCanEdit ( FALSE ),
- bCanDel ( FALSE ),
- bCanNew ( TRUE ),
- bWaterDisabled ( FALSE ),
- bNewByExampleDisabled ( FALSE ),
- bUpdateByExampleDisabled( FALSE ),
- bTreeDrag ( TRUE ),
- bHierarchical ( FALSE ),
- bBindingUpdate ( TRUE )
+ bDontUpdate ( sal_False ),
+ bIsWater ( sal_False ),
+ bEnabled ( sal_True ),
+ bUpdate ( sal_False ),
+ bUpdateFamily ( sal_False ),
+ bCanEdit ( sal_False ),
+ bCanDel ( sal_False ),
+ bCanNew ( sal_True ),
+ bWaterDisabled ( sal_False ),
+ bNewByExampleDisabled ( sal_False ),
+ bUpdateByExampleDisabled( sal_False ),
+ bTreeDrag ( sal_True ),
+ bHierarchical ( sal_False ),
+ bBindingUpdate ( sal_True )
{
aFmtLb.SetHelpId( HID_TEMPLATE_FMT );
aFilterLb.SetHelpId( HID_TEMPLATE_FILTER );
@@ -807,20 +807,20 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Mod
nActFilter ( 0 ),
nAppFilter ( 0 ),
- bDontUpdate ( FALSE ),
- bIsWater ( FALSE ),
- bEnabled ( TRUE ),
- bUpdate ( FALSE ),
- bUpdateFamily ( FALSE ),
- bCanEdit ( FALSE ),
- bCanDel ( FALSE ),
- bCanNew ( TRUE ),
- bWaterDisabled ( FALSE ),
- bNewByExampleDisabled ( FALSE ),
- bUpdateByExampleDisabled( FALSE ),
- bTreeDrag ( TRUE ),
- bHierarchical ( FALSE ),
- bBindingUpdate ( TRUE )
+ bDontUpdate ( sal_False ),
+ bIsWater ( sal_False ),
+ bEnabled ( sal_True ),
+ bUpdate ( sal_False ),
+ bUpdateFamily ( sal_False ),
+ bCanEdit ( sal_False ),
+ bCanDel ( sal_False ),
+ bCanNew ( sal_True ),
+ bWaterDisabled ( sal_False ),
+ bNewByExampleDisabled ( sal_False ),
+ bUpdateByExampleDisabled( sal_False ),
+ bTreeDrag ( sal_True ),
+ bHierarchical ( sal_False ),
+ bBindingUpdate ( sal_True )
{
aFmtLb.SetStyle( aFmtLb.GetStyle() | WB_SORT );
@@ -828,7 +828,7 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Mod
//-------------------------------------------------------------------------
-USHORT SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(USHORT nId)
+sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId)
{
const SfxStyleFamilyItem *pItem=pStyleFamilies->GetObject(nId);
return SfxFamilyIdToNId(pItem->GetFamily())-1;
@@ -836,7 +836,7 @@ USHORT SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(USHORT nId)
//-------------------------------------------------------------------------
-void SfxTemplateDialog_Impl::EnableEdit(BOOL bEnable)
+void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable)
{
SfxCommonTemplateDialog_Impl::EnableEdit( bEnable );
if( !bEnable || !bUpdateByExampleDisabled )
@@ -846,9 +846,9 @@ void SfxTemplateDialog_Impl::EnableEdit(BOOL bEnable)
//-------------------------------------------------------------------------
-USHORT SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(USHORT nId)
+sal_uInt16 SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(sal_uInt16 nId)
{
- for ( USHORT i=0;i<pStyleFamilies->Count();i++ )
+ for ( sal_uInt16 i=0;i<pStyleFamilies->Count();i++ )
if ( SfxFamilyIdToNId(pStyleFamilies->GetObject(i)->GetFamily()) == nId+1 )
return i;
DBG_ERROR("Style Nummer nicht gefunden");
@@ -861,7 +861,7 @@ USHORT SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(USHORT nId)
void SfxCommonTemplateDialog_Impl::ReadResource()
{
// globale Benutzer-Resource auslesen
- USHORT i;
+ sal_uInt16 i;
for(i = 0; i < MAX_FAMILIES; ++i)
pFamilyState[i] = 0;
@@ -877,20 +877,20 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
else
pStyleFamilies = new SfxStyleFamilies( aFamId );
- nActFilter = pCurObjShell ? static_cast< USHORT >( LoadFactoryStyleFilter( pCurObjShell ) ) : 0xFFFF;
+ nActFilter = pCurObjShell ? static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ) : 0xFFFF;
if ( pCurObjShell && 0xFFFF == nActFilter )
nActFilter = pCurObjShell->GetAutoStyleFilterIndex();
// Einfuegen in die Toolbox
// umgekehrte Reihenfolge, da immer vorne eingefuegt wird.
- USHORT nCount = pStyleFamilies->Count();
+ sal_uInt16 nCount = pStyleFamilies->Count();
pBindings->ENTERREGISTRATIONS();
for(i = 0; i < nCount; ++i)
{
- USHORT nSlot = 0;
- switch((USHORT)pStyleFamilies->GetObject(i)->GetFamily())
+ sal_uInt16 nSlot = 0;
+ switch((sal_uInt16)pStyleFamilies->GetObject(i)->GetFamily())
{
case SFX_STYLE_FAMILY_CHAR: nSlot = SID_STYLE_FAMILY1; break;
case SFX_STYLE_FAMILY_PARA: nSlot = SID_STYLE_FAMILY2; break;
@@ -942,14 +942,14 @@ void SfxCommonTemplateDialog_Impl::ReadResource()
for( ; nCount--; )
{
const SfxStyleFamilyItem *pItem = pStyleFamilies->GetObject( nCount );
- USHORT nId = SfxFamilyIdToNId( pItem->GetFamily() );
+ sal_uInt16 nId = SfxFamilyIdToNId( pItem->GetFamily() );
InsertFamilyItem( nId, pItem );
}
LoadedFamilies();
- USHORT nStart = SID_STYLE_FAMILY1;
- USHORT nEnd = SID_STYLE_FAMILY4;
+ sal_uInt16 nStart = SID_STYLE_FAMILY1;
+ sal_uInt16 nEnd = SID_STYLE_FAMILY4;
for ( i = nStart; i <= nEnd; i++ )
pBindings->Update(i);
@@ -963,7 +963,7 @@ void SfxCommonTemplateDialog_Impl::ClearResource()
{
ClearFamilyList();
DELETEX(pStyleFamilies);
- USHORT i;
+ sal_uInt16 i;
for ( i = 0; i < MAX_FAMILIES; ++i )
DELETEX(pFamilyState[i]);
for ( i = 0; i < COUNT_BOUND_FUNC; ++i )
@@ -1001,7 +1001,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
GetWindow()->Hide();
DELETEX(pStyleFamilies);
DELETEZ( m_pStyleFamiliesId );
- USHORT i;
+ sal_uInt16 i;
for ( i = 0; i < MAX_FAMILIES; ++i )
DELETEX(pFamilyState[i]);
for ( i = 0; i < COUNT_BOUND_FUNC; ++i )
@@ -1020,7 +1020,7 @@ SfxCommonTemplateDialog_Impl::~SfxCommonTemplateDialog_Impl()
//-------------------------------------------------------------------------
-USHORT SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
+sal_uInt16 SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
{
switch ( nFamily )
{
@@ -1035,10 +1035,10 @@ USHORT SfxCommonTemplateDialog_Impl::SfxFamilyIdToNId( SfxStyleFamily nFamily )
void SfxCommonTemplateDialog_Impl::SetAutomaticFilter()
{
- USHORT nCount = aFilterLb.GetEntryCount();
- for ( USHORT i = 0; i < nCount; ++i )
+ sal_uInt16 nCount = aFilterLb.GetEntryCount();
+ for ( sal_uInt16 i = 0; i < nCount; ++i )
{
- ULONG nFlags = (ULONG)aFilterLb.GetEntryData(i);
+ sal_uIntPtr nFlags = (sal_uIntPtr)aFilterLb.GetEntryData(i);
if ( SFXSTYLEBIT_AUTO == nFlags )
{
// automatic entry found -> select it
@@ -1055,12 +1055,12 @@ void SfxCommonTemplateDialog_Impl::SetAutomaticFilter()
// Hilfsfunktion: Zugriff auf aktuelles Family-Item
const SfxStyleFamilyItem *SfxCommonTemplateDialog_Impl::GetFamilyItem_Impl() const
{
- const USHORT nCount = pStyleFamilies->Count();
- for(USHORT i = 0; i < nCount; ++i)
+ const sal_uInt16 nCount = pStyleFamilies->Count();
+ for(sal_uInt16 i = 0; i < nCount; ++i)
{
const SfxStyleFamilyItem *pItem = pStyleFamilies->GetObject(i);
// if(!pItem)continue;
- USHORT nId = SfxFamilyIdToNId(pItem->GetFamily());
+ sal_uInt16 nId = SfxFamilyIdToNId(pItem->GetFamily());
if(nId == nActFamily)
return pItem;
}
@@ -1079,7 +1079,7 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
if( pStyle )
EnableEdit( !(pStyle->GetMask() & SFXSTYLEBIT_READONLY) );
else
- EnableEdit(FALSE);
+ EnableEdit(sal_False);
if ( pTreeBox )
{
@@ -1098,18 +1098,18 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
}
}
else
- pTreeBox->SelectAll( FALSE );
+ pTreeBox->SelectAll( sal_False );
}
else
{
- BOOL bSelect = ( rStr.Len() > 0 );
+ sal_Bool bSelect = ( rStr.Len() > 0 );
if ( bSelect )
{
SvLBoxEntry* pEntry = (SvLBoxEntry*)aFmtLb.FirstVisible();
while ( pEntry && aFmtLb.GetEntryText( pEntry ) != rStr )
pEntry = (SvLBoxEntry*)aFmtLb.NextVisible( pEntry );
if ( !pEntry )
- bSelect = FALSE;
+ bSelect = sal_False;
else
{
aFmtLb.MakeVisible( pEntry );
@@ -1121,8 +1121,8 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const String &rStr)
if ( !bSelect )
{
- aFmtLb.SelectAll( FALSE );
- EnableEdit(FALSE);
+ aFmtLb.SelectAll( sal_False );
+ EnableEdit(sal_False);
}
}
}
@@ -1149,7 +1149,7 @@ String SfxCommonTemplateDialog_Impl::GetSelectedEntry() const
//-------------------------------------------------------------------------
-void SfxCommonTemplateDialog_Impl::EnableTreeDrag( BOOL bEnable )
+void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable )
{
if ( pStyleSheetPool )
{
@@ -1192,14 +1192,14 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
if(pTreeBox)
((const StyleTreeListBox_Impl *)pTreeBox)->
MakeExpanded_Impl( aEntries);
- pTreeBox->SetUpdateMode( FALSE );
+ pTreeBox->SetUpdateMode( sal_False );
pTreeBox->Clear();
- const USHORT nCount = aArr.Count();
- for(USHORT i = 0; i < nCount; ++i)
+ const sal_uInt16 nCount = aArr.Count();
+ for(sal_uInt16 i = 0; i < nCount; ++i)
FillBox_Impl(pTreeBox, aArr[i], aEntries);
-// EnableEdit(FALSE);
- EnableItem(SID_STYLE_WATERCAN,FALSE);
+// EnableEdit(sal_False);
+ EnableItem(SID_STYLE_WATERCAN,sal_False);
SfxTemplateItem* pState = pFamilyState[nActFamily-1];
@@ -1212,7 +1212,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
pTreeBox->Expand( pEntry );
}
- pTreeBox->SetUpdateMode( TRUE );
+ pTreeBox->SetUpdateMode( sal_True );
String aStyle;
if(pState) //Aktuellen Eintrag selektieren
@@ -1223,7 +1223,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox()
}
//-------------------------------------------------------------------------
-BOOL SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
+sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
{
return pTreeBox? pTreeBox->FirstSelected() != 0:
aFmtLb.GetSelectionCount() != 0;
@@ -1233,7 +1233,7 @@ BOOL SfxCommonTemplateDialog_Impl::HasSelectedStyle() const
//-------------------------------------------------------------------------
// intern: Aktualisierung der Anzeige
-void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags, was aktualisiert werden soll (s.o.)
+void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) // Flags, was aktualisiert werden soll (s.o.)
{
DBG_ASSERT(nFlags, "nichts zu tun");
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
@@ -1241,8 +1241,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
{
// Ist beim Vorlagenkatalog der Fall
SfxTemplateItem **ppItem = pFamilyState;
- const USHORT nFamilyCount = pStyleFamilies->Count();
- USHORT n;
+ const sal_uInt16 nFamilyCount = pStyleFamilies->Count();
+ sal_uInt16 n;
for(n=0;n<nFamilyCount;n++)
if(ppItem[StyleNrToInfoOffset(n)])break;
if ( n == nFamilyCount )
@@ -1257,7 +1257,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
const SfxStyleFamily eFam = pItem->GetFamily();
SfxFilterTupel *pT = pItem->GetFilterList().GetObject(nActFilter);
- USHORT nFilter = pT ? pItem->GetFilterList().GetObject(nActFilter)->nFlags : 0;
+ sal_uInt16 nFilter = pT ? pItem->GetFilterList().GetObject(nActFilter)->nFlags : 0;
if(!nFilter) // automatisch
nFilter = nAppFilter;
@@ -1268,16 +1268,16 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
pItem = GetFamilyItem_Impl();
if((nFlags & UPDATE_FAMILY) == UPDATE_FAMILY)
{
- CheckItem(nActFamily, TRUE); // Button in Toolbox checken
- aFilterLb.SetUpdateMode(FALSE);
+ CheckItem(nActFamily, sal_True); // Button in Toolbox checken
+ aFilterLb.SetUpdateMode(sal_False);
aFilterLb.Clear();
//insert hierarchical at the beginning
- USHORT nPos = aFilterLb.InsertEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)), 0);
- aFilterLb.SetEntryData( nPos, (void*)(ULONG)SFXSTYLEBIT_ALL );
+ sal_uInt16 nPos = aFilterLb.InsertEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL)), 0);
+ aFilterLb.SetEntryData( nPos, (void*)(sal_uIntPtr)SFXSTYLEBIT_ALL );
const SfxStyleFilter& rFilter = pItem->GetFilterList();
- for(USHORT i = 0; i < rFilter.Count(); ++i)
+ for(sal_uInt16 i = 0; i < rFilter.Count(); ++i)
{
- ULONG nFilterFlags = rFilter.GetObject(i)->nFlags;
+ sal_uIntPtr nFilterFlags = rFilter.GetObject(i)->nFlags;
nPos = aFilterLb.InsertEntry( rFilter.GetObject(i)->aName );
aFilterLb.SetEntryData( nPos, (void*)nFilterFlags );
}
@@ -1288,7 +1288,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
nActFilter = 0;
aFilterLb.SelectEntryPos(1);
SfxFilterTupel *pActT = rFilter.GetObject(nActFilter);
- USHORT nFilterFlags = pActT ? rFilter.GetObject(nActFilter)->nFlags : 0;
+ sal_uInt16 nFilterFlags = pActT ? rFilter.GetObject(nActFilter)->nFlags : 0;
pStyleSheetPool->SetSearchMask(eFam, nFilterFlags);
}
@@ -1298,7 +1298,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
// show maximum 12 entries
aFilterLb.SetDropDownLineCount( MAX_FILTER_ENTRIES );
- aFilterLb.SetUpdateMode(TRUE);
+ aFilterLb.SetUpdateMode(sal_True);
}
else
{
@@ -1313,8 +1313,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
if(nFlags & UPDATE_FAMILY_LIST)
{
-// EnableEdit(FALSE);
- EnableItem(SID_STYLE_WATERCAN,FALSE);
+// EnableEdit(sal_False);
+ EnableItem(SID_STYLE_WATERCAN,sal_False);
SfxStyleSheetBase *pStyle = pStyleSheetPool->First();
SvLBoxEntry* pEntry = aFmtLb.First();
@@ -1323,7 +1323,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
while( pStyle )
{
//Bubblesort
- for( USHORT nPos = aStrings.Count() + 1 ; nPos-- ;)
+ for( sal_uInt16 nPos = aStrings.Count() + 1 ; nPos-- ;)
{
if( !nPos || *aStrings[nPos-1] < pStyle->GetName() )
{
@@ -1338,8 +1338,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
}
- USHORT nCount = aStrings.Count();
- USHORT nPos = 0;
+ sal_uInt16 nCount = aStrings.Count();
+ sal_uInt16 nPos = 0;
while( nPos < nCount && pEntry &&
*aStrings[ nPos ] == aFmtLb.GetEntryText( pEntry ) )
{
@@ -1350,13 +1350,13 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(USHORT nFlags) // Flags
if( nPos < nCount || pEntry )
{
// Box mit den Vorlagen fuellen
- aFmtLb.SetUpdateMode(FALSE);
+ aFmtLb.SetUpdateMode(sal_False);
aFmtLb.Clear();
nPos = 0;
while( nPos < nCount )
aFmtLb.InsertEntry( *aStrings.GetObject( nPos++ ));
- aFmtLb.SetUpdateMode(TRUE);
+ aFmtLb.SetUpdateMode(sal_True);
}
// aktuelle Vorlage anzeigen
SfxTemplateItem *pState = pFamilyState[nActFamily-1];
@@ -1383,22 +1383,22 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
if(pItem && !bWaterDisabled)
{
CheckItem(SID_STYLE_WATERCAN, pItem->GetValue());
- EnableItem( SID_STYLE_WATERCAN, TRUE );
+ EnableItem( SID_STYLE_WATERCAN, sal_True );
}
else
if(!bWaterDisabled)
- EnableItem(SID_STYLE_WATERCAN, TRUE);
+ EnableItem(SID_STYLE_WATERCAN, sal_True);
else
- EnableItem(SID_STYLE_WATERCAN, FALSE);
+ EnableItem(SID_STYLE_WATERCAN, sal_False);
//Waehrend Giesskannenmodus Statusupdates ignorieren.
- USHORT nCount=pStyleFamilies->Count();
+ sal_uInt16 nCount=pStyleFamilies->Count();
pBindings->EnterRegistrations();
- for(USHORT n=0; n<nCount; n++)
+ for(sal_uInt16 n=0; n<nCount; n++)
{
SfxControllerItem *pCItem=pBoundItems[n];
- BOOL bChecked = pItem && pItem->GetValue();
+ sal_Bool bChecked = pItem && pItem->GetValue();
if( pCItem->IsBound() == bChecked )
{
if( !bChecked )
@@ -1416,16 +1416,16 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem)
// (Aktualisierung erfolgt, wenn alle Stati aktualisiert worden sind.
// Siehe auch: <SfxBindings::AddDoneHdl(const Link &)>
-void SfxCommonTemplateDialog_Impl::SetFamilyState( USHORT nSlotId, const SfxTemplateItem* pItem )
+void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* pItem )
{
- USHORT nIdx = nSlotId - SID_STYLE_FAMILY_START;
+ sal_uInt16 nIdx = nSlotId - SID_STYLE_FAMILY_START;
DELETEZ(pFamilyState[nIdx]);
if ( pItem )
pFamilyState[nIdx] = new SfxTemplateItem(*pItem);
- bUpdate = TRUE;
+ bUpdate = sal_True;
// Wenn verwendete Vorlagen ( wie zum Teufel findet man das heraus ?? )
- bUpdateFamily = TRUE;
+ bUpdateFamily = sal_True;
}
//-------------------------------------------------------------------------
@@ -1435,7 +1435,7 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( USHORT nSlotId, const SfxTemp
void SfxCommonTemplateDialog_Impl::Update_Impl()
{
- BOOL bDocChanged=FALSE;
+ sal_Bool bDocChanged=sal_False;
SfxStyleSheetBasePool* pNewPool = NULL;
SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame();
SfxObjectShell* pDocShell = pViewFrame->GetObjectShell();
@@ -1460,7 +1460,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
{
StartListening(*pNewPool);
pStyleSheetPool = pNewPool;
- bDocChanged=TRUE;
+ bDocChanged=sal_True;
}
// InvalidateBindings();
}
@@ -1468,7 +1468,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
if (bUpdateFamily)
UpdateFamily_Impl();
- USHORT i;
+ sal_uInt16 i;
for(i = 0; i < MAX_FAMILIES; ++i)
if(pFamilyState[i])
break;
@@ -1481,10 +1481,10 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
// oder Default
if(nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1] ) )
{
- CheckItem(nActFamily, FALSE);
+ CheckItem(nActFamily, sal_False);
SfxTemplateItem **ppItem = pFamilyState;
- const USHORT nFamilyCount = pStyleFamilies->Count();
- USHORT n;
+ const sal_uInt16 nFamilyCount = pStyleFamilies->Count();
+ sal_uInt16 n;
for(n=0;n<nFamilyCount;n++)
if(ppItem[StyleNrToInfoOffset(n)])break;
ppItem+=StyleNrToInfoOffset(n);
@@ -1497,8 +1497,8 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
else if( bDocChanged )
{
// andere DocShell -> alles neu
- CheckItem( nActFamily, TRUE );
- nActFilter = static_cast< USHORT >( LoadFactoryStyleFilter( pDocShell ) );
+ CheckItem( nActFamily, sal_True );
+ nActFilter = static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pDocShell ) );
if ( 0xFFFF == nActFilter )
nActFilter = pDocShell->GetAutoStyleFilterIndex();
@@ -1513,7 +1513,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl()
else
{
// anderer Filter fuer automatisch
- CheckItem( nActFamily, TRUE );
+ CheckItem( nActFamily, sal_True );
const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl();
#if OSL_DEBUG_LEVEL > 1
SfxFilterTupel *pT;
@@ -1544,7 +1544,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
(void)pTim; // unused
if(!bDontUpdate)
{
- bDontUpdate=TRUE;
+ bDontUpdate=sal_True;
if(!pTreeBox)
UpdateStyles_Impl(UPDATE_FAMILY_LIST);
else
@@ -1558,7 +1558,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim )
EnableDelete();
}
}
- bDontUpdate=FALSE;
+ bDontUpdate=sal_False;
DELETEZ(pTimer);
}
else
@@ -1587,7 +1587,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
)
)
{
- bUpdate = FALSE;
+ bUpdate = sal_False;
Update_Impl();
}
else if ( bUpdateFamily )
@@ -1610,7 +1610,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
EnableEdit(
!(pStyle->GetMask() & SFXSTYLEBIT_READONLY) );
else
- EnableEdit(FALSE);
+ EnableEdit(sal_False);
}
}
break;
@@ -1620,7 +1620,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
// Nicht sofort Update_Impl rufen, fuer den Fall da\s eines
// der Dokumente ein internes InPlaceObjekt ist!
case SFX_HINT_DOCCHANGED:
- bUpdate = TRUE;
+ bUpdate = sal_True;
break;
case SFX_HINT_DYING:
{
@@ -1635,7 +1635,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
// es kann sein, da\s sich ein neuer erst anmeldet, nachdem der Timer
// abgelaufen ist - macht sich schlecht in UpdateStyles_Impl() !
- ULONG nId = rHint.ISA(SfxSimpleHint) ? ( (SfxSimpleHint&)rHint ).GetId() : 0;
+ sal_uIntPtr nId = rHint.ISA(SfxSimpleHint) ? ( (SfxSimpleHint&)rHint ).GetId() : 0;
if(!bDontUpdate && nId != SFX_HINT_DYING &&
(rHint.Type() == TYPE(SfxStyleSheetPoolHint)||
@@ -1660,8 +1660,8 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint
// oder als Folge von Neu oder Bearbeiten, wenn die aktuelle
// Vorlage einem anderen Filter zugewiesen wurde.
void SfxCommonTemplateDialog_Impl::FilterSelect(
- USHORT nEntry, // Idx des neuen Filters
- BOOL bForce ) // Aktualisierung erzwingen, auch wenn der neue Filter gleich dem aktuellen ist
+ sal_uInt16 nEntry, // Idx des neuen Filters
+ sal_Bool bForce ) // Aktualisierung erzwingen, auch wenn der neue Filter gleich dem aktuellen ist
{
if( nEntry != nActFilter || bForce )
{
@@ -1691,9 +1691,9 @@ void SfxCommonTemplateDialog_Impl::FilterSelect(
//-------------------------------------------------------------------------
// Intern: Ausf"uhren von Funktionen "uber den Dispatcher
-BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
- USHORT nId, const String &rStr, const String& rRefStr, USHORT nFamily,
- USHORT nMask, USHORT *pIdx, const USHORT* pModifier)
+sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl(
+ sal_uInt16 nId, const String &rStr, const String& rRefStr, sal_uInt16 nFamily,
+ sal_uInt16 nMask, sal_uInt16 *pIdx, const sal_uInt16* pModifier)
{
SfxDispatcher &rDispatcher = *SFX_APP()->GetDispatcher_Impl();
SfxStringItem aItem(nId, rStr);
@@ -1702,7 +1702,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
SfxStringItem aUpdName(SID_STYLE_UPD_BY_EX_NAME, rStr);
SfxStringItem aRefName( SID_STYLE_REFERENCE, rRefStr );
const SfxPoolItem* pItems[ 6 ];
- USHORT nCount = 0;
+ sal_uInt16 nCount = 0;
if( rStr.Len() )
pItems[ nCount++ ] = &aItem;
pItems[ nCount++ ] = &aFamily;
@@ -1722,26 +1722,26 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
Deleted aDeleted;
pbDeleted = &aDeleted;
- USHORT nModi = pModifier ? *pModifier : 0;
+ sal_uInt16 nModi = pModifier ? *pModifier : 0;
const SfxPoolItem* pItem = rDispatcher.Execute(
nId, SFX_CALLMODE_SYNCHRON | SFX_CALLMODE_RECORD | SFX_CALLMODE_MODAL,
pItems, nModi );
// FIXME: Dialog can be destroyed while in Execute() check stack variable for dtor flag!
if ( !pItem || aDeleted() )
- return FALSE;
+ return sal_False;
if ( nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId )
{
SfxUInt16Item *pFilterItem = PTR_CAST(SfxUInt16Item, pItem);
DBG_ASSERT(pFilterItem, "SfxUINT16Item erwartet");
- USHORT nFilterFlags = pFilterItem->GetValue() & ~SFXSTYLEBIT_USERDEF;
+ sal_uInt16 nFilterFlags = pFilterItem->GetValue() & ~SFXSTYLEBIT_USERDEF;
if(!nFilterFlags) // Benutzervorlage?
nFilterFlags = pFilterItem->GetValue();
const SfxStyleFamilyItem *pFamilyItem = GetFamilyItem_Impl();
- const USHORT nFilterCount = (USHORT) pFamilyItem->GetFilterList().Count();
+ const sal_uInt16 nFilterCount = (sal_uInt16) pFamilyItem->GetFilterList().Count();
- for ( USHORT i = 0; i < nFilterCount; ++i )
+ for ( sal_uInt16 i = 0; i < nFilterCount; ++i )
{
const SfxFilterTupel *pTupel =
pFamilyItem->GetFilterList().GetObject(i);
@@ -1755,7 +1755,7 @@ BOOL SfxCommonTemplateDialog_Impl::Execute_Impl(
// where the local stack object is already destroyed. This would
// overwrite objects on the stack!! See #i100110
pbDeleted = NULL;
- return TRUE;
+ return sal_True;
}
//-------------------------------------------------------------------------
@@ -1768,7 +1768,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
if ( !bHierarchical )
{
// TreeView einschalten
- bHierarchical=TRUE;
+ bHierarchical=sal_True;
const String aSelectEntry( GetSelectedEntry());
aFmtLb.Hide();
// aFilterLb.Disable();
@@ -1804,7 +1804,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
// Falls bHierarchical, kann sich die Familie geaendert haben
// minus one since hierarchical is inserted at the start
FilterSelect(pBox->GetSelectEntryPos() - 1, bHierarchical );
- bHierarchical=FALSE;
+ bHierarchical=sal_False;
// UpdateStyles_Impl(UPDATE_FAMILY_LIST); // Anzeige aktualisieren
}
@@ -1814,11 +1814,11 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FilterSelectHdl, ListBox *, pBox )
//-------------------------------------------------------------------------
// Select-Handler der Toolbox
-void SfxCommonTemplateDialog_Impl::FamilySelect(USHORT nEntry)
+void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry)
{
if( nEntry != nActFamily )
{
- CheckItem( nActFamily, FALSE );
+ CheckItem( nActFamily, sal_False );
nActFamily = nEntry;
SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl();
SfxUInt16Item aItem( SID_STYLE_FAMILY, nEntry );
@@ -1831,15 +1831,15 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(USHORT nEntry)
//-------------------------------------------------------------------------
-void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
+void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry)
{
String aEmpty;
switch(nEntry)
{
case SID_STYLE_WATERCAN:
{
- const BOOL bState = IsCheckedItem(nEntry);
- BOOL bCheck;
+ const sal_Bool bState = IsCheckedItem(nEntry);
+ sal_Bool bCheck;
SfxBoolItem aBool;
// wenn eine Vorlage ausgewaehlt ist.
if(!bState && aFmtLb.GetSelectionCount())
@@ -1848,13 +1848,13 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
GetSelectedEntry());
Execute_Impl(
SID_STYLE_WATERCAN, aTemplName, aEmpty,
- (USHORT)GetFamilyItem_Impl()->GetFamily() );
- bCheck = TRUE;
+ (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
+ bCheck = sal_True;
}
else
{
Execute_Impl(SID_STYLE_WATERCAN, aEmpty, aEmpty, 0);
- bCheck = FALSE;
+ bCheck = sal_False;
}
CheckItem(nEntry, bCheck);
aBool.SetValue(bCheck);
@@ -1868,7 +1868,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
const SfxStyleFamily eFam=GetFamilyItem_Impl()->GetFamily();
//pStyleSheetPool->GetSearchFamily();
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
- USHORT nFilter;
+ sal_uInt16 nFilter;
if(pItem&&nActFilter!=0xffff)
{
nFilter = pItem->GetFilterList().GetObject(
@@ -1889,7 +1889,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
const String aTemplName(pDlg->GetName());
Execute_Impl(SID_STYLE_NEW_BY_EXAMPLE,
aTemplName, aEmpty,
- (USHORT)GetFamilyItem_Impl()->GetFamily(),
+ (sal_uInt16)GetFamilyItem_Impl()->GetFamily(),
nFilter);
}
pStyleSheetPool->SetSearchMask( eFam, nFilter );
@@ -1901,7 +1901,7 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(USHORT nEntry)
{
Execute_Impl(SID_STYLE_UPDATE_BY_EXAMPLE,
aEmpty, aEmpty,
- (USHORT)GetFamilyItem_Impl()->GetFamily());
+ (sal_uInt16)GetFamilyItem_Impl()->GetFamily());
break;
}
case SID_TEMPLATE_LOAD:
@@ -1975,11 +1975,11 @@ void SfxCommonTemplateDialog_Impl::SaveFactoryStyleFilter( SfxObjectShell* i_pOb
IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox )
{
- bDontUpdate=TRUE;
+ bDontUpdate=sal_True;
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
const SfxStyleFamily eFam = pItem->GetFamily();
long ret= pStyleSheetPool->SetParent(eFam,pBox->GetStyle(), pBox->GetParent())? 1L: 0L;
- bDontUpdate=FALSE;
+ bDontUpdate=sal_False;
return ret;
}
@@ -2000,7 +2000,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
const SfxStyleFamily eFam=pItem->GetFamily();
- USHORT nMask;
+ sal_uInt16 nMask;
if(pItem&&nActFilter!=0xffff)
{
nMask = pItem->GetFilterList().GetObject(
@@ -2015,7 +2015,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
Execute_Impl(SID_STYLE_NEW,
aEmpty, GetSelectedEntry(),
- ( USHORT )GetFamilyItem_Impl()->GetFamily(),
+ ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
nMask);
Application::SetDefDialogParent( pTmp );
@@ -2027,7 +2027,7 @@ void SfxCommonTemplateDialog_Impl::NewHdl(void *)
if(!pTreeBox)
{
// aFilterLb.SelectEntryPos(nFilter);
- FilterSelect(nActFilter, TRUE);
+ FilterSelect(nActFilter, sal_True);
}
else
{
@@ -2051,7 +2051,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
{
if(IsInitialized() && HasSelectedStyle())
{
- USHORT nFilter = nActFilter;
+ sal_uInt16 nFilter = nActFilter;
String aTemplName(GetSelectedEntry());
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
const SfxStyleFamily eFam = pItem->GetFamily();
@@ -2065,7 +2065,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
else
Application::SetDefDialogParent( pWindow );
if ( Execute_Impl( SID_STYLE_EDIT, aTemplName, String(),
- (USHORT)GetFamilyItem_Impl()->GetFamily(), 0, &nFilter ) )
+ (sal_uInt16)GetFamilyItem_Impl()->GetFamily(), 0, &nFilter ) )
{
// DBG_ASSERT(nFilter < aFilterLb.GetEntryCount(), "Filter ueberindiziert");
// aTemplName = pStyle->GetName();
@@ -2073,7 +2073,7 @@ void SfxCommonTemplateDialog_Impl::EditHdl(void *)
/* if(!pTreeBox)
{
// aFilterLb.SelectEntryPos(nFilter);
- // FilterSelect(nFilter, TRUE);
+ // FilterSelect(nFilter, sal_True);
}
else
FillTreeBox();*/
@@ -2111,15 +2111,15 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *)
if ( pTreeBox ) // Damit die Treelistbox beim L"oschen nicht zuklappt
{
- bDontUpdate = TRUE;
+ bDontUpdate = sal_True;
}
Execute_Impl( SID_STYLE_DELETE, aTemplName,
- String(), (USHORT)GetFamilyItem_Impl()->GetFamily() );
+ String(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
if ( pTreeBox )
{
pTreeBox->RemoveParentKeepChilds( pTreeBox->FirstSelected() );
- bDontUpdate = FALSE;
+ bDontUpdate = sal_False;
}
}
}
@@ -2136,7 +2136,7 @@ void SfxCommonTemplateDialog_Impl::EnableDelete()
const String aTemplName(GetSelectedEntry());
const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl();
const SfxStyleFamily eFam = pItem->GetFamily();
- USHORT nFilter = 0;
+ sal_uInt16 nFilter = 0;
if(pItem->GetFilterList().Count() > nActFilter)
nFilter = pItem->GetFilterList().GetObject(nActFilter)->nFlags;
if(!nFilter) // automatisch
@@ -2147,16 +2147,16 @@ void SfxCommonTemplateDialog_Impl::EnableDelete()
DBG_ASSERT(pStyle, "Style nicht gefunden");
if(pStyle && pStyle->IsUserDefined())
{
- EnableDel(TRUE);
+ EnableDel(sal_True);
}
else
{
- EnableDel(FALSE);
+ EnableDel(sal_False);
}
}
else
{
- EnableDel(FALSE);
+ EnableDel(sal_False);
}
// rBindings.Invalidate( SID_STYLE_DELETE );
// rBindings.Update( SID_STYLE_DELETE );
@@ -2188,10 +2188,10 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, ApplyHdl, Control *, pControl )
if ( IsInitialized() && 0 != pFamilyState[nActFamily-1] &&
GetSelectedEntry().Len() )
{
- USHORT nModifier = aFmtLb.GetModifier();
+ sal_uInt16 nModifier = aFmtLb.GetModifier();
Execute_Impl(SID_STYLE_APPLY,
GetSelectedEntry(), String(),
- ( USHORT )GetFamilyItem_Impl()->GetFamily(),
+ ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily(),
0, 0, &nModifier );
if(ISA(SfxTemplateCatalog_Impl))
((SfxTemplateCatalog_Impl*) this)->pReal->EndDialog(RET_OK);
@@ -2219,9 +2219,9 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, FmtSelectHdl, SvTreeListBox *, pListBox
aEmpty, aEmpty, 0);
Execute_Impl(SID_STYLE_WATERCAN,
GetSelectedEntry(), aEmpty,
- ( USHORT )GetFamilyItem_Impl()->GetFamily());
+ ( sal_uInt16 )GetFamilyItem_Impl()->GetFamily());
}
-// EnableEdit(TRUE);
+// EnableEdit(sal_True);
EnableItem(SID_STYLE_WATERCAN, !bWaterDisabled);
EnableDelete();
}
@@ -2240,16 +2240,16 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
nLastItemId = pMenu->GetCurItemId();
Application::PostUserEvent(
LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ), 0 );
- return TRUE;
+ return sal_True;
}
switch(nLastItemId) {
case ID_NEW: NewHdl(0); break;
case ID_EDIT: EditHdl(0); break;
case ID_DELETE: DeleteHdl(0); break;
- default: return FALSE;
+ default: return sal_False;
}
- return TRUE;
+ return sal_True;
}
// -----------------------------------------------------------------------
@@ -2257,7 +2257,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, MenuSelectHdl, Menu *, pMenu )
void SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl( const Point& rPos, Window* pWin )
{
// Bug# 94152: This part should never be called, because before this happens, the TreeListBox should captured this!
- DBG_ASSERT( FALSE, "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" );
+ DBG_ASSERT( sal_False, "+SfxCommonTemplateDialog_Impl::ExecuteContextMenu_Impl(): How could this happen? Please infirm developer ASAP!" );
PopupMenu* pMenu = CreateContextMenu();
pMenu->Execute( pWin, rPos );
@@ -2277,7 +2277,7 @@ SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const
// -----------------------------------------------------------------------
-void SfxCommonTemplateDialog_Impl::EnableExample_Impl(USHORT nId, BOOL bEnable)
+void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, sal_Bool bEnable)
{
if( nId == SID_STYLE_NEW_BY_EXAMPLE )
bNewByExampleDisabled = !bEnable;
@@ -2296,9 +2296,9 @@ PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void )
{
if ( bBindingUpdate )
{
- pBindings->Invalidate( SID_STYLE_NEW, TRUE, FALSE );
+ pBindings->Invalidate( SID_STYLE_NEW, sal_True, sal_False );
pBindings->Update( SID_STYLE_NEW );
- bBindingUpdate = FALSE;
+ bBindingUpdate = sal_False;
}
PopupMenu* pMenu = new PopupMenu( SfxResId( MN_CONTEXT_TEMPLDLG ) );
pMenu->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ) );
@@ -2317,7 +2317,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
SfxCommonTemplateDialog_Impl( pB, pDlgWindow ),
m_pFloat ( pDlgWindow ),
- m_bZoomIn ( FALSE ),
+ m_bZoomIn ( sal_False ),
m_aActionTbL ( pDlgWindow, this ),
m_aActionTbR ( pDlgWindow, SfxResId( TB_ACTION ) )
@@ -2338,17 +2338,17 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl(
// ------------------------------------------------------------------------
-void SfxTemplateDialog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
+void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
{
m_aActionTbL.EnableItem( nId, bEnable );
}
//-------------------------------------------------------------------------
-void SfxTemplateDialog_Impl::InsertFamilyItem(USHORT nId,const SfxStyleFamilyItem *pItem)
+void SfxTemplateDialog_Impl::InsertFamilyItem(sal_uInt16 nId,const SfxStyleFamilyItem *pItem)
{
rtl::OString sHelpId;
- switch( (USHORT) pItem->GetFamily() )
+ switch( (sal_uInt16) pItem->GetFamily() )
{
case SFX_STYLE_FAMILY_CHAR: sHelpId = ".uno:CharStyle"; break;
case SFX_STYLE_FAMILY_PARA: sHelpId = ".uno:ParaStyle"; break;
@@ -2382,11 +2382,11 @@ void SfxTemplateDialog_Impl::updateFamilyImages()
pStyleFamilies->updateImages( *m_pStyleFamiliesId, bIsHighContrast ? BMP_COLOR_HIGHCONTRAST : BMP_COLOR_NORMAL );
// and set the new images on our toolbox
- USHORT nLoop = pStyleFamilies->Count();
+ sal_uInt16 nLoop = pStyleFamilies->Count();
for( ; nLoop--; )
{
const SfxStyleFamilyItem *pItem = pStyleFamilies->GetObject( nLoop );
- USHORT nId = SfxFamilyIdToNId( pItem->GetFamily() );
+ sal_uInt16 nId = SfxFamilyIdToNId( pItem->GetFamily() );
m_aActionTbL.SetItemImage( nId, pItem->GetImage() );
}
}
@@ -2410,15 +2410,15 @@ void SfxTemplateDialog_Impl::ClearFamilyList()
void SfxCommonTemplateDialog_Impl::InvalidateBindings()
{
- pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, TRUE, FALSE);
+ pBindings->Invalidate(SID_STYLE_NEW_BY_EXAMPLE, sal_True, sal_False);
pBindings->Update( SID_STYLE_NEW_BY_EXAMPLE );
- pBindings->Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE, TRUE, FALSE);
+ pBindings->Invalidate(SID_STYLE_UPDATE_BY_EXAMPLE, sal_True, sal_False);
pBindings->Update( SID_STYLE_UPDATE_BY_EXAMPLE );
- pBindings->Invalidate( SID_STYLE_WATERCAN, TRUE, FALSE);
+ pBindings->Invalidate( SID_STYLE_WATERCAN, sal_True, sal_False);
pBindings->Update( SID_STYLE_WATERCAN );
- pBindings->Invalidate( SID_STYLE_NEW, TRUE, FALSE );
+ pBindings->Invalidate( SID_STYLE_NEW, sal_True, sal_False );
pBindings->Update( SID_STYLE_NEW );
- pBindings->Invalidate( SID_STYLE_DRAGHIERARCHIE, TRUE, FALSE );
+ pBindings->Invalidate( SID_STYLE_DRAGHIERARCHIE, sal_True, sal_False );
pBindings->Update( SID_STYLE_DRAGHIERARCHIE );
}
@@ -2453,9 +2453,9 @@ void SfxTemplateDialog_Impl::Resize()
FloatingWindow *pF = m_pFloat->GetFloatingWindow();
if ( pF )
{
-// if(pF->IsZoomedIn() && m_bZoomIn==FALSE)
+// if(pF->IsZoomedIn() && m_bZoomIn==sal_False)
// pF->SetText(String(SfxResId( DLG_STYLE_DESIGNER )));
-// if(!pF->IsZoomedIn() && m_bZoomIn==TRUE && GetFamilyItem_Impl())
+// if(!pF->IsZoomedIn() && m_bZoomIn==sal_True && GetFamilyItem_Impl())
// UpdateStyles_Impl(UPDATE_FAMILY); //Bereich wieder in Titel schreiben
m_bZoomIn = pF->IsRollUp();
if ( m_bZoomIn )
@@ -2545,7 +2545,7 @@ void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt )
//-------------------------------------------------------------------------
-void SfxTemplateDialog_Impl::EnableItem(USHORT nMesId, BOOL bCheck)
+void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck)
{
String aEmpty;
switch(nMesId)
@@ -2562,7 +2562,7 @@ void SfxTemplateDialog_Impl::EnableItem(USHORT nMesId, BOOL bCheck)
//-------------------------------------------------------------------------
-void SfxTemplateDialog_Impl::CheckItem(USHORT nMesId, BOOL bCheck)
+void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck)
{
switch(nMesId)
{
@@ -2577,7 +2577,7 @@ void SfxTemplateDialog_Impl::CheckItem(USHORT nMesId, BOOL bCheck)
//-------------------------------------------------------------------------
-BOOL SfxTemplateDialog_Impl::IsCheckedItem(USHORT nMesId)
+sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId)
{
switch(nMesId)
{
@@ -2592,7 +2592,7 @@ BOOL SfxTemplateDialog_Impl::IsCheckedItem(USHORT nMesId)
IMPL_LINK_INLINE_START( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
{
- const USHORT nEntry = pBox->GetCurItemId();
+ const sal_uInt16 nEntry = pBox->GetCurItemId();
FamilySelect(nEntry);
return 0;
}
@@ -2620,7 +2620,7 @@ IMPL_LINK_INLINE_END( SfxTemplateDialog_Impl, ToolBoxLSelect, ToolBox *, pBox )
IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
{
- const USHORT nEntry = pBox->GetCurItemId();
+ const sal_uInt16 nEntry = pBox->GetCurItemId();
if(nEntry != SID_STYLE_NEW_BY_EXAMPLE ||
TIB_DROPDOWN != (pBox->GetItemBits(nEntry)&TIB_DROPDOWN))
ActionSelect(nEntry);
@@ -2629,7 +2629,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRSelect, ToolBox *, pBox )
//-------------------------------------------------------------------------
IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
{
- const USHORT nEntry = pBox->GetCurItemId();
+ const sal_uInt16 nEntry = pBox->GetCurItemId();
if(nEntry == SID_STYLE_NEW_BY_EXAMPLE &&
TIB_DROPDOWN == (pBox->GetItemBits(nEntry)&TIB_DROPDOWN))
{
@@ -2687,7 +2687,7 @@ IMPL_LINK( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox )
//-------------------------------------------------------------------------
IMPL_LINK( SfxTemplateDialog_Impl, MenuSelectHdl, Menu*, pMenu)
{
- USHORT nMenuId = pMenu->GetCurItemId();
+ sal_uInt16 nMenuId = pMenu->GetCurItemId();
ActionSelect(nMenuId);
return 0;
}
@@ -2808,7 +2808,7 @@ IMPL_LINK( SfxTemplateCatalog_Impl, OrgHdl, Button *, pButton )
//-------------------------------------------------------------------------
-void SfxTemplateCatalog_Impl::EnableEdit( BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableEdit( sal_Bool bEnable )
{
SfxCommonTemplateDialog_Impl::EnableEdit( bEnable );
aChangeBtn.Enable( bEnable );
@@ -2816,13 +2816,13 @@ void SfxTemplateCatalog_Impl::EnableEdit( BOOL bEnable )
//-------------------------------------------------------------------------
-void SfxTemplateCatalog_Impl::EnableDel( BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableDel( sal_Bool bEnable )
{
SfxCommonTemplateDialog_Impl::EnableDel( bEnable );
aDelBtn.Enable( bEnable );
}
-void SfxTemplateCatalog_Impl::EnableNew(BOOL bEnable)
+void SfxTemplateCatalog_Impl::EnableNew(sal_Bool bEnable)
{
SfxCommonTemplateDialog_Impl::EnableNew( bEnable );
aNewBtn.Enable( bEnable );
@@ -2832,7 +2832,7 @@ void SfxTemplateCatalog_Impl::EnableNew(BOOL bEnable)
IMPL_LINK_INLINE_START( SfxTemplateCatalog_Impl, FamListSelect, ListBox *, pList )
{
- const USHORT nEntry = aFamIds[pList->GetSelectEntryPos()];
+ const sal_uInt16 nEntry = aFamIds[pList->GetSelectEntryPos()];
FamilySelect(nEntry);
return 0;
}
@@ -2840,14 +2840,14 @@ IMPL_LINK_INLINE_END( SfxTemplateCatalog_Impl, FamListSelect, ListBox *, pList )
//-------------------------------------------------------------------------
-void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
+void SfxTemplateCatalog_Impl::EnableItem( sal_uInt16 nMesId, sal_Bool bCheck )
{
if ( nMesId == SID_STYLE_WATERCAN )
aOkBtn.Enable( bCheck );
if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
return;
-/* for(USHORT i=0;i<aFamIds.Count&&aFamIds[i]!=nMesId;i++);
+/* for(sal_uInt16 i=0;i<aFamIds.Count&&aFamIds[i]!=nMesId;i++);
if(i!=aFamIds.Count())
aFamList.SelectEntry(aFamIds[i]);
else
@@ -2857,22 +2857,22 @@ void SfxTemplateCatalog_Impl::EnableItem( USHORT nMesId, BOOL bCheck )
//-------------------------------------------------------------------------
-void SfxTemplateCatalog_Impl::CheckItem(USHORT nMesId, BOOL /*bCheck*/)
+void SfxTemplateCatalog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool /*bCheck*/)
{
if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
return;
- USHORT i;
+ sal_uInt16 i;
for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ ) ;
aFamList.SelectEntryPos(i);
}
//-------------------------------------------------------------------------
-BOOL SfxTemplateCatalog_Impl::IsCheckedItem(USHORT nMesId)
+sal_Bool SfxTemplateCatalog_Impl::IsCheckedItem(sal_uInt16 nMesId)
{
if ( nMesId > SFX_STYLE_FAMILY_PSEUDO || nMesId < SFX_STYLE_FAMILY_CHAR )
- return FALSE;
- USHORT i;
+ return sal_False;
+ sal_uInt16 i;
for ( i = 0; i < aFamIds.Count() && aFamIds[i] != nMesId; i++ )
;
return aFamList.IsEntrySelected( String::CreateFromInt32(i) );
@@ -2882,10 +2882,10 @@ BOOL SfxTemplateCatalog_Impl::IsCheckedItem(USHORT nMesId)
// Der Katalog muss nur das Disablen beherrschen, da waehrend seiner
// Lebenszeit keine Selektionsaenderungen vorgenommen werden koennen
-void SfxTemplateCatalog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
+void SfxTemplateCatalog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable )
{
if ( !bEnable )
- for ( USHORT nPos = aFamIds.Count(); nPos--; )
+ for ( sal_uInt16 nPos = aFamIds.Count(); nPos--; )
if ( aFamIds[ nPos ] == nId )
{
aFamIds.Remove( nPos );
@@ -2893,7 +2893,7 @@ void SfxTemplateCatalog_Impl::EnableFamilyItem( USHORT nId, BOOL bEnable )
}
}
-void SfxTemplateCatalog_Impl::InsertFamilyItem( USHORT nId, const SfxStyleFamilyItem* pItem )
+void SfxTemplateCatalog_Impl::InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pItem )
{
if ( nId > SFX_STYLE_FAMILY_PSEUDO || nId < SFX_STYLE_FAMILY_CHAR )
return;
@@ -2914,21 +2914,21 @@ void SfxTemplateCatalog_Impl::PrepareDeleteAction()
}
-void SfxCommonTemplateDialog_Impl::SetFamily( USHORT nId )
+void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId )
{
if ( nId != nActFamily )
{
if ( nActFamily != 0xFFFF )
- CheckItem( nActFamily, FALSE );
+ CheckItem( nActFamily, sal_False );
nActFamily = nId;
if ( nId != 0xFFFF )
- bUpdateFamily = TRUE;
+ bUpdateFamily = sal_True;
}
}
void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
{
- bUpdateFamily = FALSE;
+ bUpdateFamily = sal_False;
SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl();
SfxViewFrame *pViewFrame = pDispat->GetFrame();
@@ -2944,10 +2944,10 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
StartListening(*pOldStyleSheetPool);
}
- bWaterDisabled = FALSE;
- bCanNew = TRUE;
- bTreeDrag = TRUE;
- bUpdateByExampleDisabled = FALSE;
+ bWaterDisabled = sal_False;
+ bCanNew = sal_True;
+ bTreeDrag = sal_True;
+ bUpdateByExampleDisabled = sal_False;
if ( pStyleSheetPool )
{
@@ -2966,7 +2966,7 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl()
// nur, wenn dieser Bereich erlaubt ist
0 != pFamilyState[ nActFamily - 1 ] )
Execute_Impl( SID_STYLE_APPLY, GetSelectedEntry(),
- String(), (USHORT)GetFamilyItem_Impl()->GetFamily() );
+ String(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() );
}
void SfxCommonTemplateDialog_Impl::ReplaceUpdateButtonByMenu()
{
@@ -3013,7 +3013,7 @@ DropToolBox_Impl::~DropToolBox_Impl()
sal_Int8 DropToolBox_Impl::AcceptDrop( const AcceptDropEvent& rEvt )
{
sal_Int8 nReturn = DND_ACTION_NONE;
- USHORT nItemId = GetItemId( rEvt.maPosPixel );
+ sal_uInt16 nItemId = GetItemId( rEvt.maPosPixel );
if(USHRT_MAX != nItemId && !IsItemChecked( nItemId ))
{
SetCurItemId(nItemId);
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-21 09:16:47 +0000