diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-03-12 20:06:58 +0100 |
| commit | c61cd1a5a26de1d1f62389988b00229c04e36693 (patch) | |
| tree | 9d6de00f4d149cba080fe88f1eff71a67786b5f0 /sd/source/ui/func/fulinend.cxx | |
| parent | 064f1e4ed53cb16d174534e20a7d02b8c93a4948 (diff) | |
| parent | f2aeec8f22f37146c2f9120e8d0ead383049c1fa (diff) | |
Merge commit 'ooo/DEV300_m101' into integration/dev300_m101
Diffstat (limited to 'sd/source/ui/func/fulinend.cxx')
| -rwxr-xr-x[-rw-r--r--] | sd/source/ui/func/fulinend.cxx | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sd/source/ui/func/fulinend.cxx b/sd/source/ui/func/fulinend.cxx index a89bd4253ad7..b3086c316e21 100644..100755 --- a/sd/source/ui/func/fulinend.cxx +++ b/sd/source/ui/func/fulinend.cxx @@ -94,10 +94,10 @@ void FuLineEnd::DoExecute( SfxRequest& ) if( aInfoRec.bCanConvToPath && pObj->GetObjInventor() == SdrInventor && pObj->GetObjIdentifier() != OBJ_GRUP ) - // bCanConvToPath ist bei Gruppenobjekten TRUE, + // bCanConvToPath ist bei Gruppenobjekten sal_True, // stuerzt aber bei ConvertToPathObj() ab ! { - pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( TRUE, FALSE ); + pNewObj = pConvPolyObj = pObj->ConvertToPolyObj( sal_True, sal_False ); if( !pNewObj || !pNewObj->ISA( SdrPathObj ) ) return; // Abbruch, zusaetzliche Sicherheit, die bei @@ -120,18 +120,18 @@ void FuLineEnd::DoExecute( SfxRequest& ) long nCount = pLineEndList->Count(); long j = 1; - BOOL bDifferent = FALSE; + sal_Bool bDifferent = sal_False; while( !bDifferent ) { aName = aNewName; aName.Append( sal_Unicode(' ') ); aName.Append( UniString::CreateFromInt32( j++ ) ); - bDifferent = TRUE; + bDifferent = sal_True; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = FALSE; + bDifferent = sal_False; } } @@ -145,12 +145,12 @@ void FuLineEnd::DoExecute( SfxRequest& ) if( pDlg->Execute() == RET_OK ) { pDlg->GetName( aName ); - bDifferent = TRUE; + bDifferent = sal_True; for( long i = 0; i < nCount && bDifferent; i++ ) { if( aName == pLineEndList->GetLineEnd( i )->GetName() ) - bDifferent = FALSE; + bDifferent = sal_False; } if( bDifferent ) |