summaryrefslogtreecommitdiff
path: root/cui/source/tabpages/tpline.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'cui/source/tabpages/tpline.cxx')
-rw-r--r--cui/source/tabpages/tpline.cxx186
1 files changed, 93 insertions, 93 deletions
diff --git a/cui/source/tabpages/tpline.cxx b/cui/source/tabpages/tpline.cxx
index 682721d56b39..7c4eea588c86 100644
--- a/cui/source/tabpages/tpline.cxx
+++ b/cui/source/tabpages/tpline.cxx
@@ -85,7 +85,7 @@
// static ----------------------------------------------------------------
-static USHORT pLineRanges[] =
+static sal_uInt16 pLineRanges[] =
{
XATTR_LINETRANSPARENCE,
XATTR_LINETRANSPARENCE,
@@ -147,9 +147,9 @@ SvxLineTabPage::SvxLineTabPage
aSymbolHeightMF ( this, CUI_RES(MF_SYMBOL_HEIGHT)),
aSymbolRatioCB ( this, CUI_RES(CB_SYMBOL_RATIO)),
- bLastWidthModified(FALSE),
+ bLastWidthModified(sal_False),
aSymbolLastSize(Size(0,0)),
- bSymbols(FALSE),
+ bSymbols(sal_False),
rOutAttrs ( rInAttrs ),
bObjSelected( sal_False ),
@@ -245,14 +245,14 @@ SvxLineTabPage::SvxLineTabPage
aSymbolHeightMF.SetModifyHdl(LINK(this, SvxLineTabPage, SizeHdl_Impl));
aSymbolRatioCB.SetClickHdl(LINK(this, SvxLineTabPage, RatioHdl_Impl));
- aSymbolRatioCB.Check(TRUE);
- ShowSymbolControls(FALSE);
+ aSymbolRatioCB.Check(sal_True);
+ ShowSymbolControls(sal_False);
// #63083#
nActLineWidth = -1;
}
//#58425# Symbole auf einer Linie (z.B. StarChart) , Symbol-Controls aktivieren
-void SvxLineTabPage::ShowSymbolControls(BOOL bOn)
+void SvxLineTabPage::ShowSymbolControls(sal_Bool bOn)
{
bSymbols=bOn;
aSymbolWidthFT.Show(bOn);
@@ -297,7 +297,7 @@ void SvxLineTabPage::Construct()
void SvxLineTabPage::FillListboxes()
{
// Linienstile
- USHORT nOldSelect = aLbLineStyle.GetSelectEntryPos();
+ sal_uInt16 nOldSelect = aLbLineStyle.GetSelectEntryPos();
aLbLineStyle.FillStyles();
aLbLineStyle.Fill( pDashList );
aLbLineStyle.SelectEntryPos( nOldSelect );
@@ -312,7 +312,7 @@ void SvxLineTabPage::FillListboxes()
nOldSelect = aLbEndStyle.GetSelectEntryPos();
aLbEndStyle.Clear();
aLbEndStyle.InsertEntry( sNone );
- aLbEndStyle.Fill( pLineEndList, FALSE );
+ aLbEndStyle.Fill( pLineEndList, sal_False );
aLbEndStyle.SelectEntryPos( nOldSelect );
}
@@ -325,8 +325,8 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
SetPageType(pPageTypeItem->GetValue()); //add CHINA001 end
if( nDlgType == 0 && pDashList ) //CHINA001 if( *pDlgType == 0 && pDashList ) // Linien-Dialog
{
- USHORT nPos;
- USHORT nCount;
+ sal_uInt16 nPos;
+ sal_uInt16 nCount;
// Dashliste
if( ( *pnDashListState & CT_MODIFIED ) ||
@@ -401,7 +401,7 @@ void SvxLineTabPage::ActivatePage( const SfxItemSet& rSet )
aLbEndStyle.Clear();
aLbEndStyle.InsertEntry( sNone );
- aLbEndStyle.Fill( pLineEndList, FALSE );
+ aLbEndStyle.Fill( pLineEndList, sal_False );
nCount = aLbEndStyle.GetEntryCount();
if( nCount == 0 )
@@ -499,7 +499,7 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
{
nPageType = 1; // evtl. fuer Erweiterungen//CHINA001 *pPageType = 1; // evtl. fuer Erweiterungen
*pPosDashLb = aLbLineStyle.GetSelectEntryPos() - 2;// erster Eintrag SOLID !!!
- USHORT nPos = aLbStartStyle.GetSelectEntryPos();
+ sal_uInt16 nPos = aLbStartStyle.GetSelectEntryPos();
if( nPos != LISTBOX_ENTRY_NOTFOUND )
nPos--;
*pPosLineEndLb = nPos;
@@ -513,11 +513,11 @@ int SvxLineTabPage::DeactivatePage( SfxItemSet* _pSet )
// -----------------------------------------------------------------------
-BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
+sal_Bool SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
{
const SfxPoolItem* pOld = NULL;
- USHORT nPos;
- BOOL bModified = FALSE;
+ sal_uInt16 nPos;
+ sal_Bool bModified = sal_False;
// Um evtl. Modifikationen der Liste vorzubeugen
// werden Items anderer Seiten nicht gesetzt
@@ -546,7 +546,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if ( !pOld || !( *(const XLineDashItem*)pOld == aDashItem ) )
{
rAttrs.Put( aDashItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
}
@@ -554,7 +554,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if ( !pOld || !( *(const XLineStyleItem*)pOld == *pStyleItem ) )
{
rAttrs.Put( *pStyleItem );
- bModified = TRUE;
+ bModified = sal_True;
}
delete pStyleItem;
}
@@ -568,7 +568,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if ( !pOld || !( *(const XLineWidthItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
//Breite Linienanfang
@@ -579,7 +579,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if ( !pOld || !( *(const XLineStartWidthItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
//Breite Linienende
@@ -590,7 +590,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if ( !pOld || !( *(const XLineEndWidthItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
@@ -603,7 +603,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if ( !pOld || !( *(const XLineColorItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
@@ -625,7 +625,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) )
{
rAttrs.Put( *pItem );
- bModified = TRUE;
+ bModified = sal_True;
}
delete pItem;
}
@@ -645,7 +645,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
( !pOld || !( *(const XLineEndItem*)pOld == *pItem ) ) )
{
rAttrs.Put( *pItem );
- bModified = TRUE;
+ bModified = sal_True;
}
delete pItem;
}
@@ -655,23 +655,23 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
TriState eState = aTsbCenterStart.GetState();
if( eState != aTsbCenterStart.GetSavedValue() )
{
- XLineStartCenterItem aItem( sal::static_int_cast< BOOL >( eState ) );
+ XLineStartCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) );
pOld = GetOldItem( rAttrs, XATTR_LINESTARTCENTER );
if ( !pOld || !( *(const XLineStartCenterItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
eState = aTsbCenterEnd.GetState();
if( eState != aTsbCenterEnd.GetSavedValue() )
{
- XLineEndCenterItem aItem( sal::static_int_cast< BOOL >( eState ) );
+ XLineEndCenterItem aItem( sal::static_int_cast< sal_Bool >( eState ) );
pOld = GetOldItem( rAttrs, XATTR_LINEENDCENTER );
if ( !pOld || !( *(const XLineEndCenterItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
@@ -683,7 +683,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if ( !pOld || !( *(const XLineStartWidthItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
//Breite Linienende
@@ -694,20 +694,20 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if ( !pOld || !( *(const XLineEndWidthItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
// Transparenz
- UINT16 nVal = (UINT16)aMtrTransparent.GetValue();
- if( nVal != (UINT16)aMtrTransparent.GetSavedValue().ToInt32() )
+ sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
+ if( nVal != (sal_uInt16)aMtrTransparent.GetSavedValue().ToInt32() )
{
XLineTransparenceItem aItem( nVal );
pOld = GetOldItem( rAttrs, XATTR_LINETRANSPARENCE );
if ( !pOld || !( *(const XLineTransparenceItem*)pOld == aItem ) )
{
rAttrs.Put( aItem );
- bModified = TRUE;
+ bModified = sal_True;
}
}
@@ -748,7 +748,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if(!pOld || !(*(const XLineJointItem*)pOld == *pNew))
{
rAttrs.Put( *pNew );
- bModified = TRUE;
+ bModified = sal_True;
}
delete pNew;
@@ -764,7 +764,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if(bNewSize)
{
rAttrs.Put(aSItem);
- bModified=TRUE;
+ bModified=sal_True;
}
SfxInt32Item aTItem(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),nSymbolType);
@@ -775,7 +775,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if(bNewType)
{
rAttrs.Put(aTItem);
- bModified=TRUE;
+ bModified=sal_True;
}
if(nSymbolType!=SVX_SYMBOLTYPE_NONE)
@@ -787,7 +787,7 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
if(bNewBrush)
{
rAttrs.Put(aBItem);
- bModified=TRUE;
+ bModified=sal_True;
}
}
}
@@ -797,9 +797,9 @@ BOOL SvxLineTabPage::FillItemSet( SfxItemSet& rAttrs )
// -----------------------------------------------------------------------
-BOOL SvxLineTabPage::FillXLSet_Impl()
+sal_Bool SvxLineTabPage::FillXLSet_Impl()
{
- USHORT nPos;
+ sal_uInt16 nPos;
if( aLbLineStyle.GetSelectEntryPos() == LISTBOX_ENTRY_NOTFOUND )
{
@@ -879,23 +879,23 @@ BOOL SvxLineTabPage::FillXLSet_Impl()
// Linienenden zentriert
if( aTsbCenterStart.GetState() == STATE_CHECK )
- rXLSet.Put( XLineStartCenterItem( TRUE ) );
+ rXLSet.Put( XLineStartCenterItem( sal_True ) );
else if( aTsbCenterStart.GetState() == STATE_NOCHECK )
- rXLSet.Put( XLineStartCenterItem( FALSE ) );
+ rXLSet.Put( XLineStartCenterItem( sal_False ) );
if( aTsbCenterEnd.GetState() == STATE_CHECK )
- rXLSet.Put( XLineEndCenterItem( TRUE ) );
+ rXLSet.Put( XLineEndCenterItem( sal_True ) );
else if( aTsbCenterEnd.GetState() == STATE_NOCHECK )
- rXLSet.Put( XLineEndCenterItem( FALSE ) );
+ rXLSet.Put( XLineEndCenterItem( sal_False ) );
// Transparenz
- UINT16 nVal = (UINT16)aMtrTransparent.GetValue();
+ sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
rXLSet.Put( XLineTransparenceItem( nVal ) );
// #116827#
aCtlPreview.SetLineAttributes(aXLineAttr.GetItemSet());
- return( TRUE );
+ return( sal_True );
}
// -----------------------------------------------------------------------
@@ -915,11 +915,11 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
*/
const SfxPoolItem *pPoolItem;
long nSymType=SVX_SYMBOLTYPE_UNKNOWN;
- BOOL bPrevSym=FALSE;
- BOOL bEnable=TRUE;
- BOOL bIgnoreGraphic=FALSE;
- BOOL bIgnoreSize=FALSE;
- if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),TRUE,&pPoolItem) == SFX_ITEM_SET)
+ sal_Bool bPrevSym=sal_False;
+ sal_Bool bEnable=sal_True;
+ sal_Bool bIgnoreGraphic=sal_False;
+ sal_Bool bIgnoreSize=sal_False;
+ if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLTYPE),sal_True,&pPoolItem) == SFX_ITEM_SET)
{
nSymType=((const SfxInt32Item *)pPoolItem)->GetValue();
}
@@ -928,13 +928,13 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
{
aSymbolGraphic=aAutoSymbolGraphic;
aSymbolSize=aSymbolLastSize=aAutoSymbolGraphic.GetPrefSize();
- bPrevSym=TRUE;
+ bPrevSym=sal_True;
}
else if(nSymType == SVX_SYMBOLTYPE_NONE)
{
- bEnable=FALSE;
- bIgnoreGraphic=TRUE;
- bIgnoreSize=TRUE;
+ bEnable=sal_False;
+ bIgnoreGraphic=sal_True;
+ bIgnoreSize=sal_True;
}
else if(nSymType >= 0)
{
@@ -943,7 +943,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
pModel->GetItemPool().FreezeIdRanges();
- SdrPage* pPage = new SdrPage( *pModel, FALSE );
+ SdrPage* pPage = new SdrPage( *pModel, sal_False );
pPage->SetSize(Size(1000,1000));
pModel->InsertPage( pPage, 0 );
SdrView* pView = new SdrView( pModel, &aVDev );
@@ -977,9 +977,9 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
aSymbolSize=pObj->GetSnapRect().GetSize();
aSymbolGraphic.SetPrefSize(aSymbolSize);
aSymbolGraphic.SetPrefMapMode(MAP_100TH_MM);
- bPrevSym=TRUE;
- bEnable=TRUE;
- bIgnoreGraphic=TRUE;
+ bPrevSym=sal_True;
+ bEnable=sal_True;
+ bIgnoreGraphic=sal_True;
pView->UnmarkAll();
pObj=pPage->RemoveObject(0);
@@ -990,7 +990,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
delete pView;
delete pModel;
}
- if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH),TRUE,&pPoolItem) == SFX_ITEM_SET)
+ if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_BRUSH),sal_True,&pPoolItem) == SFX_ITEM_SET)
{
const Graphic* pGraphic = ((const SvxBrushItem *)pPoolItem)->GetGraphic();
if( pGraphic )
@@ -1005,10 +1005,10 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
pGraphic->GetPrefMapMode(),
MAP_100TH_MM );
}
- bPrevSym=TRUE;
+ bPrevSym=sal_True;
}
}
- if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),TRUE,&pPoolItem) == SFX_ITEM_SET)
+ if(rAttrs.GetItemState(rAttrs.GetPool()->GetWhich(SID_ATTR_SYMBOLSIZE),sal_True,&pPoolItem) == SFX_ITEM_SET)
{
aSymbolSize = ((const SvxSizeItem *)pPoolItem)->GetSize();
}
@@ -1101,7 +1101,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
else if( rAttrs.GetItemState( XATTR_LINESTART ) != SFX_ITEM_DONTCARE )
{
// #86265# select entry using list and polygon, not string
- sal_Bool bSelected(FALSE);
+ sal_Bool bSelected(sal_False);
const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineStartItem&)rAttrs.Get(XATTR_LINESTART)).GetLineStartValue();
for(sal_Int32 a(0);!bSelected && a < pLineEndList->Count(); a++)
@@ -1113,7 +1113,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
{
// select this entry
aLbStartStyle.SelectEntryPos((sal_uInt16)a + 1);
- bSelected = TRUE;
+ bSelected = sal_True;
}
}
@@ -1134,7 +1134,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
else if( rAttrs.GetItemState( XATTR_LINEEND ) != SFX_ITEM_DONTCARE )
{
// #86265# select entry using list and polygon, not string
- sal_Bool bSelected(FALSE);
+ sal_Bool bSelected(sal_False);
const basegfx::B2DPolyPolygon& rItemPolygon = ((const XLineEndItem&)rAttrs.Get(XATTR_LINEEND)).GetLineEndValue();
for(sal_Int32 a(0);!bSelected && a < pLineEndList->Count(); a++)
@@ -1146,7 +1146,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
{
// select this entry
aLbEndStyle.SelectEntryPos((sal_uInt16)a + 1);
- bSelected = TRUE;
+ bSelected = sal_True;
}
}
@@ -1194,7 +1194,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
}
else if( rAttrs.GetItemState( XATTR_LINESTARTCENTER ) != SFX_ITEM_DONTCARE )
{
- aTsbCenterStart.EnableTriState( FALSE );
+ aTsbCenterStart.EnableTriState( sal_False );
if( ( ( const XLineStartCenterItem& ) rAttrs.Get( XATTR_LINESTARTCENTER ) ).GetValue() )
aTsbCenterStart.SetState( STATE_CHECK );
@@ -1214,7 +1214,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
}
else if( rAttrs.GetItemState( XATTR_LINEENDCENTER ) != SFX_ITEM_DONTCARE )
{
- aTsbCenterEnd.EnableTriState( FALSE );
+ aTsbCenterEnd.EnableTriState( sal_False );
if( ( ( const XLineEndCenterItem& ) rAttrs.Get( XATTR_LINEENDCENTER ) ).GetValue() )
aTsbCenterEnd.SetState( STATE_CHECK );
@@ -1229,7 +1229,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
// Transparenz
if( rAttrs.GetItemState( XATTR_LINETRANSPARENCE ) != SFX_ITEM_DONTCARE )
{
- USHORT nTransp = ( ( const XLineTransparenceItem& ) rAttrs.
+ sal_uInt16 nTransp = ( ( const XLineTransparenceItem& ) rAttrs.
Get( XATTR_LINETRANSPARENCE ) ).GetValue();
aMtrTransparent.SetValue( nTransp );
ChangeTransparentHdl_Impl( NULL );
@@ -1253,7 +1253,7 @@ void SvxLineTabPage::Reset( const SfxItemSet& rAttrs )
// Synchronisieren
// Jetzt wird der Wert aus der INI-Datei geholt (#42258#)
String aStr = GetUserData();
- aCbxSynchronize.Check( (BOOL)aStr.ToInt32() );
+ aCbxSynchronize.Check( (sal_Bool)aStr.ToInt32() );
// #116827#
if(bObjSelected && SFX_ITEM_DEFAULT == rAttrs.GetItemState(XATTR_LINEJOINT))
@@ -1320,7 +1320,7 @@ SfxTabPage* SvxLineTabPage::Create( Window* pWindow,
//------------------------------------------------------------------------
-USHORT* SvxLineTabPage::GetRanges()
+sal_uInt16* SvxLineTabPage::GetRanges()
{
return( pLineRanges );
}
@@ -1332,12 +1332,12 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
if(pCntrl == &aMtrLineWidth)
{
// Linienbreite und Start/EndBreite
- INT32 nNewLineWidth = GetCoreValue( aMtrLineWidth, ePoolUnit );
+ sal_Int32 nNewLineWidth = GetCoreValue( aMtrLineWidth, ePoolUnit );
if(nActLineWidth == -1)
{
// Noch nicht initialisiert, hole den Startwert
const SfxPoolItem* pOld = GetOldItem( rXLSet, XATTR_LINEWIDTH );
- INT32 nStartLineWidth = 0;
+ sal_Int32 nStartLineWidth = 0;
if(pOld)
nStartLineWidth = (( const XLineWidthItem *)pOld)->GetValue();
nActLineWidth = nStartLineWidth;
@@ -1346,8 +1346,8 @@ IMPL_LINK( SvxLineTabPage, ChangePreviewHdl_Impl, void *, pCntrl )
if(nActLineWidth != nNewLineWidth)
{
// Anpassungen Start/EndWidth #63083#
- INT32 nValAct = GetCoreValue( aMtrStartWidth, ePoolUnit );
- INT32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10);
+ sal_Int32 nValAct = GetCoreValue( aMtrStartWidth, ePoolUnit );
+ sal_Int32 nValNew = nValAct + (((nNewLineWidth - nActLineWidth) * 15) / 10);
if(nValNew < 0)
nValNew = 0;
SetMetricValue( aMtrStartWidth, nValNew, ePoolUnit );
@@ -1520,7 +1520,7 @@ long SvxLineTabPage::ClickMeasuringHdl_Impl( void* )
IMPL_LINK( SvxLineTabPage, ChangeTransparentHdl_Impl, void *, EMPTYARG )
{
- UINT16 nVal = (UINT16)aMtrTransparent.GetValue();
+ sal_uInt16 nVal = (sal_uInt16)aMtrTransparent.GetValue();
XLineTransparenceItem aItem( nVal );
rXLSet.Put( XLineTransparenceItem( aItem ) );
@@ -1580,7 +1580,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;
- pInfo->nItemId = (UINT16)(MN_GALLERY_ENTRY + i);
+ pInfo->nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i);
aGrfBrushItems.Insert(pInfo, i);
const Graphic* pGraphic = pBrushItem->GetGraphic();
@@ -1591,7 +1591,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
if(aSize.Width() > MAX_BMP_WIDTH ||
aSize.Height() > MAX_BMP_HEIGHT)
{
- BOOL bWidth = aSize.Width() > aSize.Height();
+ sal_Bool bWidth = aSize.Width() > aSize.Height();
double nScale = bWidth ?
(double)MAX_BMP_WIDTH / (double)aSize.Width():
(double)MAX_BMP_HEIGHT / (double)aSize.Height();
@@ -1609,7 +1609,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
}
aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_GALLERY, pPopup );
if(!aGrfNames.Count())
- aSymbolMB.GetPopupMenu()->EnableItem(MN_GALLERY, FALSE);
+ aSymbolMB.GetPopupMenu()->EnableItem(MN_GALLERY, sal_False);
}
if(!pButton->GetPopupMenu()->GetPopupMenu( MN_SYMBOLS ) && pSymbolList)
@@ -1619,7 +1619,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
SdrModel* pModel = new SdrModel(NULL, NULL, LOADREFCOUNTS);
pModel->GetItemPool().FreezeIdRanges();
// Page
- SdrPage* pPage = new SdrPage( *pModel, FALSE );
+ SdrPage* pPage = new SdrPage( *pModel, sal_False );
pPage->SetSize(Size(1000,1000));
pModel->InsertPage( pPage, 0 );
// 3D View
@@ -1662,13 +1662,13 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
SvxBmpItemInfo* pInfo = new SvxBmpItemInfo();
pInfo->pBrushItem = pBrushItem;
- pInfo->nItemId = (UINT16)(MN_GALLERY_ENTRY + i + nNumMenuGalleryItems);
+ pInfo->nItemId = (sal_uInt16)(MN_GALLERY_ENTRY + i + nNumMenuGalleryItems);
aGrfBrushItems.Insert(pInfo, nNumMenuGalleryItems + i);
Size aSize(aBitmap.GetSizePixel());
if(aSize.Width() > MAX_BMP_WIDTH || aSize.Height() > MAX_BMP_HEIGHT)
{
- BOOL bWidth = aSize.Width() > aSize.Height();
+ sal_Bool bWidth = aSize.Width() > aSize.Height();
double nScale = bWidth ?
(double)MAX_BMP_WIDTH / (double)aSize.Width():
(double)MAX_BMP_HEIGHT / (double)aSize.Height();
@@ -1679,7 +1679,7 @@ IMPL_LINK( SvxLineTabPage, MenuCreateHdl_Impl, MenuButton *, pButton )
}
aSymbolMB.GetPopupMenu()->SetPopupMenu( MN_SYMBOLS, pPopup );
if(!aGrfNames.Count())
- aSymbolMB.GetPopupMenu()->EnableItem(MN_SYMBOLS, FALSE);
+ aSymbolMB.GetPopupMenu()->EnableItem(MN_SYMBOLS, sal_False);
delete pView;
delete pModel;
@@ -1694,7 +1694,7 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem)
PopupMenu* pPopup = pThis->aSymbolMB.GetPopupMenu()->GetPopupMenu( MN_GALLERY );
SvxBmpItemInfo* pBmpInfo = 0;
- for ( USHORT i = 0; i < pThis->aGrfBrushItems.Count(); i++ )
+ for ( sal_uInt16 i = 0; i < pThis->aGrfBrushItems.Count(); i++ )
{
SvxBmpItemInfo* pInfo = (SvxBmpItemInfo*)pThis->aGrfBrushItems.GetObject(i);
if( pInfo->pBrushItem == pItem )
@@ -1711,7 +1711,7 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem)
if(aSize.Width() > MAX_BMP_WIDTH ||
aSize.Height() > MAX_BMP_HEIGHT)
{
- BOOL bWidth = aSize.Width() > aSize.Height();
+ sal_Bool bWidth = aSize.Width() > aSize.Height();
double nScale = bWidth ?
(double)MAX_BMP_WIDTH / (double)aSize.Width():
(double)MAX_BMP_HEIGHT / (double)aSize.Height();
@@ -1729,12 +1729,12 @@ IMPL_STATIC_LINK(SvxLineTabPage, GraphicArrivedHdl_Impl, SvxBrushItem*, pItem)
//Handler f�r Menuebutton
IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
{
- USHORT nItemId = pButton->GetCurItemId();
+ sal_uInt16 nItemId = pButton->GetCurItemId();
const Graphic* pGraphic = 0;
Graphic aGraphic;
String aGrfName;
- BOOL bResetSize = FALSE;
- BOOL bEnable=TRUE;
+ sal_Bool bResetSize = sal_False;
+ sal_Bool bEnable=sal_True;
long nPreviousSymbolType = nSymbolType;
if(nItemId >= MN_GALLERY_ENTRY)
@@ -1746,7 +1746,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
else
{
nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM;
- bResetSize = TRUE;
+ bResetSize = sal_True;
}
SvxBmpItemInfo* pInfo = (SvxBmpItemInfo*)aGrfBrushItems.GetObject(nItemId - MN_GALLERY_ENTRY);
pGraphic = pInfo->pBrushItem->GetGraphic();
@@ -1765,7 +1765,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
{
nSymbolType=SVX_SYMBOLTYPE_NONE;
pGraphic=NULL;
- bEnable=FALSE;
+ bEnable=sal_False;
}
break;
default:
@@ -1781,7 +1781,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
{
nSymbolType=SVX_SYMBOLTYPE_BRUSHITEM;
pGraphic = &aGraphic;
- bResetSize = TRUE;
+ bResetSize = sal_True;
}
}
if( !pGraphic )
@@ -1814,7 +1814,7 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
{
aSymbolGraphic=Graphic();
aCtlPreview.SetSymbol(NULL,aSymbolSize);
- bEnable=FALSE;
+ bEnable=sal_False;
}
aSymbolLastSize=aSymbolSize;
SetMetricValue(aSymbolWidthMF, aSymbolSize.Width(), ePoolUnit);
@@ -1831,9 +1831,9 @@ IMPL_LINK( SvxLineTabPage, GraphicHdl_Impl, MenuButton *, pButton )
IMPL_LINK( SvxLineTabPage, SizeHdl_Impl, MetricField *, pField)
{
bNewSize=true;
- BOOL bWidth = (BOOL)(pField == &aSymbolWidthMF);
+ sal_Bool bWidth = (sal_Bool)(pField == &aSymbolWidthMF);
bLastWidthModified = bWidth;
- BOOL bRatio = aSymbolRatioCB.IsChecked();
+ sal_Bool bRatio = aSymbolRatioCB.IsChecked();
long nWidthVal = static_cast<long>(aSymbolWidthMF.Denormalize(aSymbolWidthMF.GetValue(FUNIT_100TH_MM)));
long nHeightVal= static_cast<long>(aSymbolHeightMF.Denormalize(aSymbolHeightMF.GetValue(FUNIT_100TH_MM)));
nWidthVal = OutputDevice::LogicToLogic(nWidthVal,MAP_100TH_MM,(MapUnit)ePoolUnit );
@@ -1924,7 +1924,7 @@ void SvxLineTabPage::PageCreated (SfxAllItemSet aSet) //add CHINA001
if(pSdrObjListItem) //symbols
{
- ShowSymbolControls(TRUE);
+ ShowSymbolControls(sal_True);
pSymbolList = static_cast<SdrObjList*>(pSdrObjListItem->GetValue());
if (pSymbolAttrItem)
pSymbolAttr = new SfxItemSet(pSymbolAttrItem->GetItemSet());