Skip to content

C
core
Kaydet (Commit) a9bc164a authored tarafından Takeshi Abe's avatar Takeshi Abe
Dosyalara gözat
Seçenekler

sal_Bool to bool 

Change-Id: I0a8d0f11c45aba1d34a0098e6a371bd616b08b72
üst f90f71e2
Hide whitespace changes
Inline Side-by-side
Showing with 57 additions and 58 deletions
cui/source/options/optdict.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -276,8 +276,7 @@ SvxEditDictionaryDialog::SvxEditDictionaryDialog(
Reference< XDictionary > xDic( pDic[i], UNO_QUERY );
if (xDic.is())
{
sal_Bool bNegative = xDic->getDictionaryType() == DictionaryType_NEGATIVE ?
sal_True : sal_False;
bool bNegative = xDic->getDictionaryType() == DictionaryType_NEGATIVE;
String aDicName( xDic->getName() );
const String aTxt( ::GetDicInfoStr( aDicName,
LanguageTag( xDic->getLocale() ).getLanguageType(), bNegative ) );
......@@ -455,7 +454,7 @@ IMPL_LINK_NOARG(SvxEditDictionaryDialog, SelectLangHdl_Impl)
if ( aBox.Execute() == RET_YES )
{
xDic->setLocale( LanguageTag( nLang ).getLocale() );
sal_Bool bNegativ = xDic->getDictionaryType() == DictionaryType_NEGATIVE;
bool bNegativ = xDic->getDictionaryType() == DictionaryType_NEGATIVE;
const String sName(
::GetDicInfoStr( xDic->getName(),
......
svx/inc/svx/langbox.hxx
Dosyayı görüntüle @ a9bc164a
......@@ -47,7 +47,7 @@ class SvtLanguageTable;
// load language strings from resource
SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg );
SVX_DLLPUBLIC String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, bool bNeg );
class SVX_DLLPUBLIC SvxLanguageBox : public ListBox
{
......
svx/source/dialog/_contdlg.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -191,7 +191,7 @@ sal_Bool SvxContourDlg::IsGraphicChanged() const
PolyPolygon SvxContourDlg::GetPolyPolygon()
{
return pSuperClass->GetPolyPolygon( sal_True );
return pSuperClass->GetPolyPolygon( true );
}
const void* SvxContourDlg::GetEditingObject() const
......@@ -362,7 +362,7 @@ void SvxSuperContourDlg::SetPolyPolygon( const PolyPolygon& rPolyPoly )
aContourWnd.GetSdrModel()->SetChanged( sal_True );
}
PolyPolygon SvxSuperContourDlg::GetPolyPolygon( sal_Bool bRescaleToGraphic )
PolyPolygon SvxSuperContourDlg::GetPolyPolygon( bool bRescaleToGraphic )
{
PolyPolygon aRetPolyPoly( aContourWnd.GetPolyPolygon() );
......@@ -407,12 +407,12 @@ void SvxSuperContourDlg::UpdateGraphic( const Graphic& rGraphic, sal_Bool _bGrap
aUpdateTimer.Start();
}
sal_Bool SvxSuperContourDlg::IsUndoPossible() const
bool SvxSuperContourDlg::IsUndoPossible() const
{
return aUndoGraphic.GetType() != GRAPHIC_NONE;
}
sal_Bool SvxSuperContourDlg::IsRedoPossible() const
bool SvxSuperContourDlg::IsRedoPossible() const
{
return aRedoGraphic.GetType() != GRAPHIC_NONE;
}
......
svx/source/dialog/contimp.hxx
Dosyayı görüntüle @ a9bc164a
......@@ -79,13 +79,13 @@ public:
sal_Bool IsGraphicChanged() const { return nGrfChanged > 0UL; }
void SetPolyPolygon( const PolyPolygon& rPolyPoly );
PolyPolygon GetPolyPolygon( sal_Bool bRescaleToGraphic = sal_True );
PolyPolygon GetPolyPolygon( bool bRescaleToGraphic = true );
void SetEditingObject( void* pObj ) { pCheckObj = pObj; }
const void* GetEditingObject() const { return pCheckObj; }
sal_Bool IsUndoPossible() const;
sal_Bool IsRedoPossible() const;
bool IsUndoPossible() const;
bool IsRedoPossible() const;
void UpdateGraphic( const Graphic& rGraphic, sal_Bool bGraphicLinked,
const PolyPolygon* pPolyPoly = NULL,
......
svx/source/dialog/fntctrl.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -196,9 +196,9 @@ public:
Size CalcTextSize( OutputDevice* pWin, OutputDevice* pPrt, const SvxFont &rFont );
void DrawPrev( OutputDevice* pWin, Printer* pPrt, Point &rPt, const SvxFont &rFont );
sal_Bool SetFontWidthScale( sal_uInt16 nScaleInPercent );
bool SetFontWidthScale( sal_uInt16 nScaleInPercent );
inline void Invalidate100PercentFontWidth();
inline sal_Bool Is100PercentFontWidthValid() const;
inline bool Is100PercentFontWidthValid() const;
void ScaleFontWidth( const OutputDevice& rOutDev );
// scales rNonCJKFont and aCJKFont depending on nFontWidthScale and
// sets the 100%-Font-Widths
......@@ -209,7 +209,7 @@ inline void FontPrevWin_Impl::Invalidate100PercentFontWidth()
n100PercentFontWidth = n100PercentFontWidthCJK = n100PercentFontWidthCTL = -1;
}
inline sal_Bool FontPrevWin_Impl::Is100PercentFontWidthValid() const
inline bool FontPrevWin_Impl::Is100PercentFontWidthValid() const
{
DBG_ASSERT( ( n100PercentFontWidth == -1 && n100PercentFontWidthCJK == -1 ) ||
( n100PercentFontWidth != -1 && n100PercentFontWidthCJK != -1 ) ||
......@@ -422,15 +422,15 @@ void FontPrevWin_Impl::DrawPrev( OutputDevice* pWin, Printer* _pPrinter,
// -----------------------------------------------------------------------
sal_Bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale )
bool FontPrevWin_Impl::SetFontWidthScale( sal_uInt16 nScale )
{
if( nFontWidthScale != nScale )
{
nFontWidthScale = nScale;
return sal_True;
return true;
}
return sal_False;
return false;
}
......
svx/source/dialog/graphctl.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -278,7 +278,7 @@ void GraphCtrl::MarkListHasChanged()
void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
KeyCode aCode( rKEvt.GetKeyCode() );
sal_Bool bProc = sal_False;
bool bProc = false;
switch ( aCode.GetCode() )
{
......@@ -288,7 +288,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
if ( bSdrMode )
{
pView->DeleteMarked();
bProc = sal_True;
bProc = true;
if( !pView->AreObjectsMarked() )
GetParentDialog()->GrabFocusToFirstControl();
}
......@@ -321,7 +321,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
{
GetParentDialog()->GrabFocusToFirstControl();
}
bProc = sal_True;
bProc = true;
}
}
break;
......@@ -342,7 +342,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
pView->UnmarkAllObj();
pView->MarkNextObj (bForward);
}
bProc = sal_True;
bProc = true;
}
else if(aCode.IsMod1())
{
......@@ -572,7 +572,7 @@ void GraphCtrl::KeyInput( const KeyEvent& rKEvt )
}
}
bProc = sal_True;
bProc = true;
}
}
}
......
svx/source/dialog/hdft.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -481,7 +481,7 @@ IMPL_LINK( SvxHFPage, TurnOnHdl, CheckBox *, pBox )
}
else
{
sal_Bool bDelete = sal_True;
bool bDelete = true;
if ( !bDisableQueryBox && pBox && m_pTurnOnBox->GetSavedValue() == sal_True )
bDelete = ( QueryBox( this, SVX_RES( RID_SVXQBX_DELETE_HEADFOOT ) ).Execute() == RET_YES );
......
svx/source/dialog/imapdlg.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -415,7 +415,7 @@ IMPL_LINK( SvxIMapDlg, TbxClickHdl, ToolBox*, pTbx )
case( TBI_ACTIVE ):
{
URLLoseFocusHdl( NULL );
sal_Bool bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
bool bNewState = !pTbx->IsItemChecked( TBI_ACTIVE );
pTbx->CheckItem( TBI_ACTIVE, bNewState );
pIMapWnd->SetCurrentObjState( !bNewState );
}
......
svx/source/dialog/langbox.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -41,7 +41,7 @@ using namespace ::com::sun::star::uno;
// -----------------------------------------------------------------------
String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, sal_Bool bNeg )
String GetDicInfoStr( const String& rName, const sal_uInt16 nLang, bool bNeg )
{
INetURLObject aURLObj;
aURLObj.SetSmartProtocol( INET_PROT_FILE );
......@@ -88,7 +88,7 @@ static Sequence< sal_Int16 > lcl_LocaleSeqToLangSeq( Sequence< Locale > &rSeq )
}
static sal_Bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nLang )
static bool lcl_SeqHasLang( const Sequence< sal_Int16 > & rLangSeq, sal_Int16 nLang )
{
sal_Int32 i = -1;
sal_Int32 nLen = rLangSeq.getLength();
......@@ -166,12 +166,12 @@ void SvxLanguageBox::Init()
{
LanguageType nLangType = aLangTable.GetTypeAtIndex( i );
sal_Bool bInsert = sal_True;
bool bInsert = true;
if ((LANGUAGE_DONTKNOW == nLangType) ||
(LANGUAGE_SYSTEM == nLangType) ||
(LANGUAGE_USER1 <= nLangType && nLangType <= LANGUAGE_USER9))
{
bInsert = sal_False;
bInsert = false;
}
if ( bInsert )
......@@ -367,7 +367,7 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
sal_uInt16 nAt = 0;
if ( m_bWithCheckmark )
{
sal_Bool bFound = sal_False;
bool bFound = false;
if (!m_pSpellUsedLang)
{
......@@ -376,7 +376,7 @@ sal_uInt16 SvxLanguageBox::ImplInsertLanguage( const LanguageType nLangType, sal
m_pSpellUsedLang = new Sequence< sal_Int16 >( xSpell->getLanguages() );
}
bFound = m_pSpellUsedLang ?
lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : sal_False;
lcl_SeqHasLang( *m_pSpellUsedLang, nRealLang ) : false;
nAt = ImplInsertImgEntry( aStrEntry, nPos, bFound );
}
......
svx/source/dialog/measctrl.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -86,8 +86,8 @@ void SvxXMeasurePreview::SetAttributes( const SfxItemSet& rInAttrs )
void SvxXMeasurePreview::MouseButtonDown( const MouseEvent& rMEvt )
{
sal_Bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
sal_Bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
bool bZoomIn = rMEvt.IsLeft() && !rMEvt.IsShift();
bool bZoomOut = rMEvt.IsRight() || rMEvt.IsShift();
sal_Bool bCtrl = rMEvt.IsMod1();
if( bZoomIn || bZoomOut )
......
svx/source/dialog/pagectrl.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -32,15 +32,15 @@ struct PageWindow_Impl
SvxBoxItem* pBorder;
Bitmap aBitmap;
bool bBitmap;
sal_Bool bResetBackground;
bool bResetBackground;
sal_Bool bFrameDirection;
sal_Int32 nFrameDirection;
PageWindow_Impl() :
pBorder(0),
bBitmap(sal_False),
bResetBackground(sal_False),
bBitmap(false),
bResetBackground(false),
bFrameDirection(sal_False),
nFrameDirection(0) {}
......@@ -224,7 +224,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s
DrawRect( Rectangle( Point(0,0), winSize ) );
if ( pImpl->bResetBackground )
pImpl->bResetBackground = sal_False;
pImpl->bResetBackground = false;
}
SetLineColor( rFieldTextColor );
// Shadow
......@@ -343,7 +343,7 @@ void SvxPageWindow::DrawPage( const Point& rOrg, const sal_Bool bSecond, const s
rtl::OUString sDraw(sText.GetChar(i));
long nHDiff = 0;
long nCharWidth = GetTextWidth(sDraw);
sal_Bool bHorizontal = 0 == aMove.Y();
bool bHorizontal = 0 == aMove.Y();
if(!bHorizontal)
{
nHDiff = (nAWidth - nCharWidth)/2;
......@@ -407,10 +407,10 @@ void SvxPageWindow::SetBitmap( Bitmap* pBmp )
if ( pBmp )
{
pImpl->aBitmap = *pBmp;
pImpl->bBitmap = sal_True;
pImpl->bBitmap = true;
}
else
pImpl->bBitmap = sal_False;
pImpl->bBitmap = false;
}
// -----------------------------------------------------------------------
......@@ -440,7 +440,7 @@ void SvxPageWindow::SetFrameDirection(sal_Int32 nFrameDirection)
void SvxPageWindow::ResetBackground()
{
pImpl->bResetBackground = sal_True;
pImpl->bResetBackground = true;
}
Size SvxPageWindow::GetOptimalSize() const
......
svx/source/dialog/passwd.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -29,7 +29,7 @@
IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl)
{
sal_Bool bOK = sal_True;
bool bOK = true;
short nRet = RET_OK;
String aEmpty;
......@@ -39,7 +39,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl)
aNewPasswdED.SetText( aEmpty );
aRepeatPasswdED.SetText( aEmpty );
aNewPasswdED.GrabFocus();
bOK = sal_False;
bOK = false;
}
if ( bOK && aCheckPasswordHdl.IsSet() && !aCheckPasswordHdl.Call( this ) )
......@@ -47,7 +47,7 @@ IMPL_LINK_NOARG(SvxPasswordDialog, ButtonHdl)
ErrorBox( this, WB_OK, aOldPasswdErrStr ).Execute();
aOldPasswdED.SetText( aEmpty );
aOldPasswdED.GrabFocus();
bOK = sal_False;
bOK = false;
}
if ( bOK )
......
svx/source/dialog/pfiledlg.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -94,7 +94,7 @@ SvxPluginFileDlg::SvxPluginFileDlg (Window *, sal_uInt16 nKind )
( nKind == SID_INSERT_VIDEO && aStrPlugMIMEType.SearchAscii ( sVideo ) == 0 ) )
{
// extension already in the filterlist of the filedlg ?
sal_Bool bAlreadyExist = sal_False;
bool bAlreadyExist = false;
for ( j = aPlugExtensions.begin(), end = aPlugExtensions.end(); j != end && !bAlreadyExist; ++j )
{
bAlreadyExist = (j->Search( aStrPlugExtension ) != STRING_NOTFOUND );
......
svx/source/dialog/rubydialog.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -88,7 +88,7 @@ class SvxRubyData_Impl : public cppu::WeakImplHelper1
Reference<XRubySelection> xSelection;
Sequence<PropertyValues> aRubyValues;
Reference<XController> xController;
sal_Bool bHasSelectionChanged;
bool bHasSelectionChanged;
public:
SvxRubyData_Impl();
~SvxRubyData_Impl();
......@@ -102,7 +102,7 @@ class SvxRubyData_Impl : public cppu::WeakImplHelper1
xModel = xController->getModel();
return xModel;
}
sal_Bool HasSelectionChanged() const{return bHasSelectionChanged;}
bool HasSelectionChanged() const{return bHasSelectionChanged;}
Reference<XRubySelection> GetRubySelection()
{
xSelection = Reference<XRubySelection>(xController, UNO_QUERY);
......@@ -114,7 +114,7 @@ class SvxRubyData_Impl : public cppu::WeakImplHelper1
aRubyValues.realloc(0);
else
aRubyValues = xSelection->getRubyList(false);
bHasSelectionChanged = sal_False;
bHasSelectionChanged = false;
}
Sequence<PropertyValues>& GetRubyValues() {return aRubyValues;}
void AssertOneEntry();
......@@ -125,7 +125,7 @@ class SvxRubyData_Impl : public cppu::WeakImplHelper1
};
//-----------------------------------------------------------------------------
SvxRubyData_Impl::SvxRubyData_Impl() :
bHasSelectionChanged(sal_False)
bHasSelectionChanged(false)
{
}
//-----------------------------------------------------------------------------
......@@ -143,7 +143,7 @@ void SvxRubyData_Impl::SetController(Reference<XController> xCtrl)
if(xSelSupp.is())
xSelSupp->removeSelectionChangeListener(this);
bHasSelectionChanged = sal_True;
bHasSelectionChanged = true;
xController = xCtrl;
xSelSupp = Reference<XSelectionSupplier>(xController, UNO_QUERY);
if(xSelSupp.is())
......@@ -157,7 +157,7 @@ void SvxRubyData_Impl::SetController(Reference<XController> xCtrl)
//-----------------------------------------------------------------------------
void SvxRubyData_Impl::selectionChanged( const EventObject& ) throw (RuntimeException)
{
bHasSelectionChanged = sal_True;
bHasSelectionChanged = true;
}
//-----------------------------------------------------------------------------
void SvxRubyData_Impl::disposing( const EventObject&) throw (RuntimeException)
......@@ -439,7 +439,7 @@ void SvxRubyDialog::Update()
sal_Int16 nAdjust = -1;
sal_Int16 nPosition = -1;
OUString sCharStyleName, sTmp;
sal_Bool bCharStyleEqual = sal_True;
bool bCharStyleEqual = true;
for(sal_Int32 nRuby = 0; nRuby < nLen; nRuby++)
{
const Sequence<PropertyValue> &rProps = aRubyValues.getConstArray()[nRuby];
......@@ -469,7 +469,7 @@ void SvxRubyDialog::Update()
if(!nRuby)
sCharStyleName = sTmp;
else if(sCharStyleName != sTmp)
bCharStyleEqual = sal_False;
bCharStyleEqual = false;
}
}
}
......@@ -797,7 +797,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
nAdjust = 1;
//which part is stretched ?
sal_Bool bRubyStretch = nBaseWidth >= nRubyWidth;
bool bRubyStretch = nBaseWidth >= nRubyWidth;
long nCenter = aWinSize.Width() / 2;
long nLeftStart = nCenter - (bRubyStretch ? (nBaseWidth / 2) : (nRubyWidth / 2));
......@@ -807,7 +807,7 @@ void RubyPreview::Paint( const Rectangle& /* rRect */ )
long nYBase = aWinSize.Height() * 3 / 4 - nTextHeight / 2;
//use above also if no selection is set
sal_Bool bAbove = m_pParentDlg->m_pPositionLB->GetSelectEntryPos() != 1;
bool bAbove = m_pParentDlg->m_pPositionLB->GetSelectEntryPos() != 1;
if(!bAbove)
{
long nTmp = nYRuby;
......
svx/source/dialog/rulritem.cxx
Dosyayı görüntüle @ a9bc164a
......@@ -55,7 +55,7 @@ String SvxLongLRSpaceItem::GetValueText() const
bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
sal_Int32 nVal;
......@@ -85,7 +85,7 @@ bool SvxLongLRSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8
// -----------------------------------------------------------------------
bool SvxLongLRSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
sal_Int32 nVal = 0;
......@@ -181,7 +181,7 @@ String SvxLongULSpaceItem::GetValueText() const
bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) const
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
sal_Int32 nVal;
......@@ -211,7 +211,7 @@ bool SvxLongULSpaceItem::QueryValue( ::com::sun::star::uno::Any& rVal, sal_uInt8
// -----------------------------------------------------------------------
bool SvxLongULSpaceItem::PutValue( const ::com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_Bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
bool bConvert = 0!=(nMemberId&CONVERT_TWIPS);
nMemberId &= ~CONVERT_TWIPS;
sal_Int32 nVal = 0;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment