summaryrefslogtreecommitdiff
path: root/sfx2/source/control/objface.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'sfx2/source/control/objface.cxx')
-rwxr-xr-x[-rw-r--r--]sfx2/source/control/objface.cxx112
1 files changed, 56 insertions, 56 deletions
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 082ec6a4c1f4..8538e064418d 100644..100755
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -38,7 +38,7 @@
#include <sfx2/msg.hxx>
#include <sfx2/app.hxx>
#include <sfx2/msgpool.hxx>
-#include "sfxresid.hxx"
+#include "sfx2/sfxresid.hxx"
#include <sfx2/minarray.hxx>
#include <sfx2/objsh.hxx>
@@ -68,18 +68,18 @@ SfxCompareSlots_Impl( const void* pSmaller, const void* pBigger )
struct SfxObjectUI_Impl
{
- USHORT nPos;
+ sal_uInt16 nPos;
ResId aResId;
- BOOL bVisible;
- BOOL bContext;
+ sal_Bool bVisible;
+ sal_Bool bContext;
String* pName;
sal_uInt32 nFeature;
- SfxObjectUI_Impl(USHORT n, const ResId& rResId, BOOL bVis, sal_uInt32 nFeat) :
+ SfxObjectUI_Impl(sal_uInt16 n, const ResId& rResId, sal_Bool bVis, sal_uInt32 nFeat) :
nPos(n),
aResId(rResId.GetId(), *rResId.GetResMgr()),
bVisible(bVis),
- bContext(FALSE),
+ bContext(sal_False),
pName(0),
nFeature(nFeat)
{
@@ -101,12 +101,12 @@ struct SfxInterface_Impl
ResId aPopupRes; // registered PopupMenu
ResId aStatBarRes; // registered StatusBar
SfxModule* pModule;
- BOOL bRegistered;
+ sal_Bool bRegistered;
SfxInterface_Impl() :
aPopupRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager()),
aStatBarRes(0,*SfxApplication::GetOrCreate()->GetSfxResManager())
- , bRegistered(FALSE)
+ , bRegistered(sal_False)
{
pObjectBars = new SfxObjectUIArr_Impl;
pChildWindows = new SfxObjectUIArr_Impl;
@@ -114,7 +114,7 @@ struct SfxInterface_Impl
~SfxInterface_Impl()
{
- USHORT n;
+ sal_uInt16 n;
for (n=0; n<pObjectBars->Count(); n++)
delete (*pObjectBars)[n];
delete pObjectBars;
@@ -125,7 +125,7 @@ struct SfxInterface_Impl
}
};
-static SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr );
+static SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr );
//====================================================================
@@ -136,7 +136,7 @@ SfxInterface::SfxInterface( const char *pClassName,
const ResId& rNameResId,
SfxInterfaceId nId,
const SfxInterface* pParent,
- SfxSlot &rSlotMap, USHORT nSlotCount ):
+ SfxSlot &rSlotMap, sal_uInt16 nSlotCount ):
pName(pClassName),
pGenoType(pParent),
nClassId(nId),
@@ -149,7 +149,7 @@ SfxInterface::SfxInterface( const char *pClassName,
void SfxInterface::Register( SfxModule* pMod )
{
- pImpData->bRegistered = TRUE;
+ pImpData->bRegistered = sal_True;
pImpData->pModule = pMod;
if ( pMod )
pMod->GetSlotPool()->RegisterInterface(*this);
@@ -157,7 +157,7 @@ void SfxInterface::Register( SfxModule* pMod )
SFX_APP()->GetAppSlotPool_Impl().RegisterInterface(*this);
}
-void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
+void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, sal_uInt16 nSlotCount )
{
pSlots = &rSlotMap;
nCount = nSlotCount;
@@ -171,7 +171,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
qsort( pSlots, nCount, sizeof(SfxSlot), SfxCompareSlots_Impl );
// link masters and slaves
- USHORT nIter = 1;
+ sal_uInt16 nIter = 1;
for ( pIter = pSlots; nIter <= nCount; ++pIter, ++nIter )
{
@@ -192,7 +192,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
if ( 0 == pIter->GetNextSlot() )
{
SfxSlot *pLastSlot = pIter;
- for ( USHORT n = nIter; n < Count(); ++n )
+ for ( sal_uInt16 n = nIter; n < Count(); ++n )
{
SfxSlot *pCurSlot = (pSlots+n);
if ( pCurSlot->nMasterSlotId == pIter->nMasterSlotId )
@@ -209,7 +209,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
// Slots refering in circle to the next with the same
// Status method.
SfxSlot *pLastSlot = pIter;
- for ( USHORT n = nIter; n < Count(); ++n )
+ for ( sal_uInt16 n = nIter; n < Count(); ++n )
{
SfxSlot *pCurSlot = (pSlots+n);
if ( pCurSlot->GetStateFnc() == pIter->GetStateFnc() )
@@ -225,7 +225,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
#ifdef DBG_UTIL
else
{
- USHORT nIter = 1;
+ sal_uInt16 nIter = 1;
for ( SfxSlot *pNext = pIter+1; nIter < nCount; ++pNext, ++nIter )
{
@@ -302,7 +302,7 @@ void SfxInterface::SetSlotMap( SfxSlot& rSlotMap, USHORT nSlotCount )
SfxInterface::~SfxInterface()
{
SfxModule *pMod = pImpData->pModule;
- BOOL bRegistered = pImpData->bRegistered;
+ sal_Bool bRegistered = pImpData->bRegistered;
delete pImpData;
DBG_ASSERT( bRegistered, "Interface not registered!" );
if ( bRegistered )
@@ -318,7 +318,7 @@ SfxInterface::~SfxInterface()
// searches for the specified func
-const SfxSlot* SfxInterface::GetSlot( USHORT nFuncId ) const
+const SfxSlot* SfxInterface::GetSlot( sal_uInt16 nFuncId ) const
{
DBG_MEMTEST();
DBG_CHKTHIS(SfxInterface, 0);
@@ -341,7 +341,7 @@ const SfxSlot* SfxInterface::GetSlot( const String& rCommand ) const
if ( aCommand.SearchAscii( UNO_COMMAND ) == 0 )
aCommand.Erase( 0, sizeof( UNO_COMMAND )-1 );
- for ( USHORT n=0; n<nCount; n++ )
+ for ( sal_uInt16 n=0; n<nCount; n++ )
{
if ( (pSlots+n)->pUnoName &&
aCommand.CompareIgnoreCaseToAscii( (pSlots+n)->GetUnoName() ) == COMPARE_EQUAL )
@@ -372,7 +372,7 @@ const SfxSlot* SfxInterface::GetRealSlot( const SfxSlot *pSlot ) const
//--------------------------------------------------------------------
-const SfxSlot* SfxInterface::GetRealSlot( USHORT nSlotId ) const
+const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
{
DBG_MEMTEST();
DBG_CHKTHIS(SfxInterface, 0);
@@ -400,26 +400,26 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId )
//--------------------------------------------------------------------
-void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId,
+void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId,
const String *pStr )
{
RegisterObjectBar( nPos, rResId, 0UL, pStr );
}
-void SfxInterface::RegisterObjectBar( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
{
SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr );
if ( pUI )
pImpData->pObjectBars->Append(pUI);
}
-SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
+SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const String *pStr )
{
if ((nPos & SFX_VISIBILITY_MASK) == 0)
nPos |= SFX_VISIBILITY_STANDARD;
- SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(nPos, rResId, TRUE, nFeature);
+ SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(nPos, rResId, sal_True, nFeature);
if (pStr == 0)
{
@@ -439,13 +439,13 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl( USHORT nPos, const ResId& rResId, sal_
return pUI;
}
-const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
+const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const
{
- BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+ sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
{
// Are there toolbars in the super class?
- USHORT nBaseCount = pGenoType->GetObjectBarCount();
+ sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
if ( nNo < nBaseCount )
// The Super class comes first
return pGenoType->GetObjectBarResId( nNo );
@@ -454,7 +454,7 @@ const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
}
#ifdef DBG_UTIL
- USHORT nObjBarCount = pImpData->pObjectBars->Count();
+ sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar is unknown!" );
#endif
return (*pImpData->pObjectBars)[nNo]->aResId;
@@ -463,13 +463,13 @@ const ResId& SfxInterface::GetObjectBarResId( USHORT nNo ) const
//--------------------------------------------------------------------
-USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
+sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
{
- BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+ sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
{
// Are there toolbars in the super class?
- USHORT nBaseCount = pGenoType->GetObjectBarCount();
+ sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
if ( nNo < nBaseCount )
// The Super class comes first
return pGenoType->GetObjectBarPos( nNo );
@@ -478,7 +478,7 @@ USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
}
#ifdef DBG_UTIL
- USHORT nObjBarCount = pImpData->pObjectBars->Count();
+ sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar is unknown!" );
#endif
return (*pImpData->pObjectBars)[nNo]->nPos;
@@ -487,7 +487,7 @@ USHORT SfxInterface::GetObjectBarPos( USHORT nNo ) const
//--------------------------------------------------------------------
-USHORT SfxInterface::GetObjectBarCount() const
+sal_uInt16 SfxInterface::GetObjectBarCount() const
{
if (pGenoType && ! pGenoType->HasName())
return pImpData->pObjectBars->Count() + pGenoType->GetObjectBarCount();
@@ -496,14 +496,14 @@ USHORT SfxInterface::GetObjectBarCount() const
}
//--------------------------------------------------------------------
-void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, const String* pChildWinName)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, const String* pChildWinName)
{
RegisterChildWindow( nId, bContext, 0UL, pChildWinName );
}
-void SfxInterface::RegisterChildWindow(USHORT nId, BOOL bContext, sal_uInt32 nFeature, const String*)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, sal_Bool bContext, sal_uInt32 nFeature, const String*)
{
- SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), TRUE, nFeature);
+ SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), sal_True, nFeature);
pUI->bContext = bContext;
pImpData->pChildWindows->Append(pUI);
}
@@ -514,12 +514,12 @@ void SfxInterface::RegisterStatusBar(const ResId& rResId)
}
-sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
+sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const
{
if ( pGenoType )
{
// Are there ChildWindows in der Superklasse?
- USHORT nBaseCount = pGenoType->GetChildWindowCount();
+ sal_uInt16 nBaseCount = pGenoType->GetChildWindowCount();
if ( nNo < nBaseCount )
// The Super class comes first
return pGenoType->GetChildWindowId( nNo );
@@ -528,7 +528,7 @@ sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
}
#ifdef DBG_UTIL
- USHORT nCWCount = pImpData->pChildWindows->Count();
+ sal_uInt16 nCWCount = pImpData->pChildWindows->Count();
DBG_ASSERT( nNo<nCWCount,"ChildWindow is unknown!" );
#endif
sal_uInt32 nRet = (*pImpData->pChildWindows)[nNo]->aResId.GetId();
@@ -537,12 +537,12 @@ sal_uInt32 SfxInterface::GetChildWindowId (USHORT nNo) const
return nRet;
}
-sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
+sal_uInt32 SfxInterface::GetChildWindowFeature (sal_uInt16 nNo) const
{
if ( pGenoType )
{
// Are there ChildWindows in der Superklasse?
- USHORT nBaseCount = pGenoType->GetChildWindowCount();
+ sal_uInt16 nBaseCount = pGenoType->GetChildWindowCount();
if ( nNo < nBaseCount )
// The Super class comes first
return pGenoType->GetChildWindowFeature( nNo );
@@ -551,7 +551,7 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
}
#ifdef DBG_UTIL
- USHORT nCWCount = pImpData->pChildWindows->Count();
+ sal_uInt16 nCWCount = pImpData->pChildWindows->Count();
DBG_ASSERT( nNo<nCWCount,"ChildWindow is unknown!" );
#endif
return (*pImpData->pChildWindows)[nNo]->nFeature;
@@ -560,7 +560,7 @@ sal_uInt32 SfxInterface::GetChildWindowFeature (USHORT nNo) const
//--------------------------------------------------------------------
-USHORT SfxInterface::GetChildWindowCount() const
+sal_uInt16 SfxInterface::GetChildWindowCount() const
{
if (pGenoType)
return pImpData->pChildWindows->Count() + pGenoType->GetChildWindowCount();
@@ -585,13 +585,13 @@ const ResId& SfxInterface::GetStatusBarResId() const
-const String* SfxInterface::GetObjectBarName ( USHORT nNo ) const
+const String* SfxInterface::GetObjectBarName ( sal_uInt16 nNo ) const
{
- BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+ sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
{
// Are there toolbars in the super class?
- USHORT nBaseCount = pGenoType->GetObjectBarCount();
+ sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
if ( nNo < nBaseCount )
// The Super class comes first
return pGenoType->GetObjectBarName( nNo );
@@ -600,19 +600,19 @@ const String* SfxInterface::GetObjectBarName ( USHORT nNo ) const
}
#ifdef DBG_UTIL
- USHORT nObjBarCount = pImpData->pObjectBars->Count();
+ sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar is unknown!" );
#endif
return (*pImpData->pObjectBars)[nNo]->pName;
}
-sal_uInt32 SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
+sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const
{
- BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+ sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
{
// Are there toolbars in the super class?
- USHORT nBaseCount = pGenoType->GetObjectBarCount();
+ sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
if ( nNo < nBaseCount )
// The Super class comes first
return pGenoType->GetObjectBarFeature( nNo );
@@ -621,19 +621,19 @@ sal_uInt32 SfxInterface::GetObjectBarFeature ( USHORT nNo ) const
}
#ifdef DBG_UTIL
- USHORT nObjBarCount = pImpData->pObjectBars->Count();
+ sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar ist unknown!" );
#endif
return (*pImpData->pObjectBars)[nNo]->nFeature;
}
-BOOL SfxInterface::IsObjectBarVisible(USHORT nNo) const
+sal_Bool SfxInterface::IsObjectBarVisible(sal_uInt16 nNo) const
{
- BOOL bGenoType = (pGenoType != 0 && !pGenoType->HasName());
+ sal_Bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
{
// Are there toolbars in the super class?
- USHORT nBaseCount = pGenoType->GetObjectBarCount();
+ sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
if ( nNo < nBaseCount )
// The Super class comes first
return pGenoType->IsObjectBarVisible( nNo );
@@ -642,7 +642,7 @@ BOOL SfxInterface::IsObjectBarVisible(USHORT nNo) const
}
#ifdef DBG_UTIL
- USHORT nObjBarCount = pImpData->pObjectBars->Count();
+ sal_uInt16 nObjBarCount = pImpData->pObjectBars->Count();
DBG_ASSERT( nNo<nObjBarCount,"Objectbar is unknown!" );
#endif
return (*pImpData->pObjectBars)[nNo]->bVisible;
generated by cgit (git 2.34.1) at 2024-12-24 12:12:13 +0000