[Libreoffice-commits] .: sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Jan 4 23:53:01 PST 2013
sw/source/filter/xml/xmliteme.cxx | 2 -
sw/source/filter/xml/xmlithlp.cxx | 2 -
sw/source/filter/xml/xmltble.cxx | 30 ++++++++++-----------
sw/source/filter/xml/xmltbli.cxx | 54 +++++++++++++++++++-------------------
sw/source/filter/xml/xmltbli.hxx | 22 +++++++--------
sw/source/filter/xml/xmltexte.cxx | 8 ++---
sw/source/filter/xml/xmltexti.cxx | 40 ++++++++++++++--------------
7 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit a472d6176c7d2a88fbea0f25de17924753b052b2
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Fri Jan 4 21:38:38 2013 +0900
sal_Bool to bool
Change-Id: If855e5fafb8f1291d69d5e50fdaa9ef165071293
diff --git a/sw/source/filter/xml/xmliteme.cxx b/sw/source/filter/xml/xmliteme.cxx
index 1dbefcb..d17c101 100644
--- a/sw/source/filter/xml/xmliteme.cxx
+++ b/sw/source/filter/xml/xmliteme.cxx
@@ -135,7 +135,7 @@ void SwXMLTableItemMapper_Impl::handleSpecialItem(
{
sal_Int16 eHoriOrient =
((const SwFmtHoriOrient *)pItem)->GetHoriOrient();
- sal_Bool bExport = sal_False;
+ bool bExport = false;
sal_uInt16 nMemberId =
static_cast<sal_uInt16>( rEntry.nMemberId & MID_SW_FLAG_MASK );
switch( nMemberId )
diff --git a/sw/source/filter/xml/xmlithlp.cxx b/sw/source/filter/xml/xmlithlp.cxx
index 2e3ce1a..2f4e4c3 100644
--- a/sw/source/filter/xml/xmlithlp.cxx
+++ b/sw/source/filter/xml/xmlithlp.cxx
@@ -186,7 +186,7 @@ bool sw_frmitems_setXMLBorder( SvxBorderLine*& rpLine,
((API_LINE_SOLID == nStyle && rpLine->GetDistance()) ||
(API_LINE_DOUBLE == nStyle && !rpLine->GetDistance())) ) )
{
- sal_Bool bDouble = (bHasWidth && API_LINE_DOUBLE == nStyle ) ||
+ bool bDouble = (bHasWidth && API_LINE_DOUBLE == nStyle ) ||
rpLine->GetDistance();
// fdo#38542: for double borders, do not override the width
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 0dc0be5..344ef1d 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -195,12 +195,12 @@ public:
SwXMLTableFrmFmtsSort_Impl ( sal_uInt16 /* nInit */, sal_uInt16 /*nGrow*/ )
{}
- sal_Bool AddRow( SwFrmFmt& rFrmFmt, const OUString& rNamePrefix, sal_uInt32 nLine );
- sal_Bool AddCell( SwFrmFmt& rFrmFmt, const OUString& rNamePrefix,
+ bool AddRow( SwFrmFmt& rFrmFmt, const OUString& rNamePrefix, sal_uInt32 nLine );
+ bool AddCell( SwFrmFmt& rFrmFmt, const OUString& rNamePrefix,
sal_uInt32 nCol, sal_uInt32 nRow, sal_Bool bTop );
};
-sal_Bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
+bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
const OUString& rNamePrefix,
sal_uInt32 nLine )
{
@@ -221,10 +221,10 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
// empty styles have not to be exported
if( !pFrmSize && !pBrush && !pRowSplit )
- return sal_False;
+ return false;
// order is: -/brush, size/-, size/brush
- sal_Bool bInsert = sal_True;
+ bool bInsert = true;
SwXMLFrmFmts_Impl::iterator i;
for( i = aFormatList.begin(); i < aFormatList.end(); ++i )
{
@@ -290,7 +290,7 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddRow( SwFrmFmt& rFrmFmt,
// found!
const String& rFmtName = pTestFmt->GetName();
rFrmFmt.SetName( rFmtName );
- bInsert = sal_False;
+ bInsert = false;
break;
}
@@ -330,7 +330,7 @@ static void lcl_xmltble_appendBoxPrefix( OUStringBuffer& rBuffer,
rBuffer.append( (sal_Int32)(nRow + 1));
}
-sal_Bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
+bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
const OUString& rNamePrefix,
sal_uInt32 nCol, sal_uInt32 nRow, sal_Bool bTop )
{
@@ -361,7 +361,7 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
// empty styles have not to be exported
if( !pVertOrient && !pBrush && !pBox && !pNumFmt && !pFrameDir )
- return sal_False;
+ return false;
// order is: -/-/-/num,
// -/-/box/-, --/-/box/num,
@@ -369,7 +369,7 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
// vert/-/-/-, vert/-/-/num, vert/-/box/-, ver/-/box/num,
// vert/brush/-/-, vert/brush/-/num, vert/brush/box/-,
// vert/brush/box/num
- sal_Bool bInsert = sal_True;
+ bool bInsert = true;
SwXMLFrmFmts_Impl::iterator i;
for( i = aFormatList.begin(); i < aFormatList.end(); ++i )
{
@@ -470,7 +470,7 @@ sal_Bool SwXMLTableFrmFmtsSort_Impl::AddCell( SwFrmFmt& rFrmFmt,
// found!
const String& rFmtName = pTestFmt->GetName();
rFrmFmt.SetName( rFmtName );
- bInsert = sal_False;
+ bInsert = false;
break;
}
@@ -491,7 +491,7 @@ class SwXMLTableInfo_Impl
{
const SwTable *pTable;
Reference < XTextSection > xBaseSection;
- sal_Bool bBaseSectionValid;
+ bool bBaseSectionValid;
public:
@@ -500,14 +500,14 @@ public:
const SwTable *GetTable() const { return pTable; }
const SwFrmFmt *GetTblFmt() const { return pTable->GetFrmFmt(); }
- sal_Bool IsBaseSectionValid() const { return bBaseSectionValid; }
+ bool IsBaseSectionValid() const { return bBaseSectionValid; }
const Reference < XTextSection >& GetBaseSection() const { return xBaseSection; }
inline void SetBaseSection( const Reference < XTextSection >& rBase );
};
inline SwXMLTableInfo_Impl::SwXMLTableInfo_Impl( const SwTable *pTbl ) :
pTable( pTbl ),
- bBaseSectionValid( sal_False )
+ bBaseSectionValid( false )
{
}
@@ -515,7 +515,7 @@ inline void SwXMLTableInfo_Impl::SetBaseSection(
const Reference < XTextSection >& rBaseSection )
{
xBaseSection = rBaseSection;
- bBaseSectionValid = sal_True;
+ bBaseSectionValid = true;
}
// ---------------------------------------------------------------------
@@ -747,7 +747,7 @@ void SwXMLExport::ExportTableAutoStyles( const SwTableNode& rTblNd )
sal_uInt32 nBaseWidth = 0UL;
sal_Int8 nPrcWidth = rFrmSize.GetWidthPercent();
- sal_Bool bFixAbsWidth = nPrcWidth != 0 || /*text::*/HoriOrientation::NONE == eTabHoriOri
+ bool bFixAbsWidth = nPrcWidth != 0 || /*text::*/HoriOrientation::NONE == eTabHoriOri
|| /*text::*/HoriOrientation::FULL == eTabHoriOri;
if( bFixAbsWidth )
{
diff --git a/sw/source/filter/xml/xmltbli.cxx b/sw/source/filter/xml/xmltbli.cxx
index 0b68893..378a307 100644
--- a/sw/source/filter/xml/xmltbli.cxx
+++ b/sw/source/filter/xml/xmltbli.cxx
@@ -636,7 +636,7 @@ SvXMLImportContext *SwXMLTableCellContext_Impl::CreateChildContext(
if( GetTable()->IsValid() )
InsertContent( pTblContext );
- GetTable()->SetHasSubTables( sal_True );
+ GetTable()->SetHasSubTables( true );
}
}
else
@@ -772,7 +772,7 @@ SwXMLTableColContext_Impl::SwXMLTableColContext_Impl(
}
sal_Int32 nWidth = MINLAY;
- sal_Bool bRelWidth = sal_True;
+ bool bRelWidth = true;
if( !aStyleName.isEmpty() )
{
const SfxPoolItem *pItem;
@@ -1294,9 +1294,9 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
pLineFmt( 0 ),
pSharedBoxFormats(NULL),
pDDESource(NULL),
- bFirstSection( sal_True ),
- bRelWidth( sal_True ),
- bHasSubTables( sal_False ),
+ bFirstSection( true ),
+ bRelWidth( true ),
+ bHasSubTables( false ),
nHeaderRows( 0 ),
nCurRow( 0UL ),
nCurCol( 0UL ),
@@ -1439,9 +1439,9 @@ SwXMLTableContext::SwXMLTableContext( SwXMLImport& rImport,
pSharedBoxFormats(NULL),
xParentTable( pTable ),
pDDESource(NULL),
- bFirstSection( sal_False ),
- bRelWidth( sal_True ),
- bHasSubTables( sal_False ),
+ bFirstSection( false ),
+ bRelWidth( true ),
+ bHasSubTables( false ),
nHeaderRows( 0 ),
nCurRow( 0UL ),
nCurCol( 0UL ),
@@ -1517,7 +1517,7 @@ SvXMLImportContext *SwXMLTableContext::CreateChildContext( sal_uInt16 nPrefix,
return pContext;
}
-void SwXMLTableContext::InsertColumn( sal_Int32 nWidth2, sal_Bool bRelWidth2,
+void SwXMLTableContext::InsertColumn( sal_Int32 nWidth2, bool bRelWidth2,
const OUString *pDfltCellStyleName )
{
OSL_ENSURE( nCurCol < USHRT_MAX,
@@ -1951,7 +1951,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
pFrmFmt->SetFmtAttr( SwFmtFrmSize( ATT_VAR_SIZE, nColWidth ) );
SwTableLines& rLines = pBox->GetTabLines();
- sal_Bool bSplitted = sal_False;
+ bool bSplitted = false;
while( !bSplitted )
{
@@ -1978,7 +1978,7 @@ SwTableBox *SwXMLTableContext::MakeTableBox( SwTableLine *pUpper,
rLines.push_back( pLine );
nStartRow = i+1UL;
- bSplitted = sal_True;
+ bSplitted = true;
}
}
if( !bSplitted )
@@ -2232,7 +2232,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
sal_uInt32 nCol = nStartCol;
sal_uInt32 nSplitCol = nRightCol;
- sal_Bool bSplitted = sal_False;
+ bool bSplitted = false;
while( !bSplitted )
{
OSL_ENSURE( nCol < nRightCol, "Zu weit gelaufen" );
@@ -2339,7 +2339,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
if ( 1 != nBoxRowSpan )
pBox->setRowSpan( nBoxRowSpan );
- bSplitted = sal_True;
+ bSplitted = true;
}
else if( bHasSubTables && bHoriSplitPossible && bHoriSplitMayContinue )
{
@@ -2372,7 +2372,7 @@ SwTableLine *SwXMLTableContext::MakeTableLine( SwTableBox *pUpper,
pBox = MakeTableBox( pLine, nTopRow, nStartCol,
nBottomRow, nSplitCol );
- bSplitted = sal_True;
+ bSplitted = true;
}
OSL_ENSURE( bHasSubTables || pBox, "Colspan trouble" );
@@ -2513,8 +2513,8 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox )
sal_Int32 nExtraAbs =
nAbsForRelWidth > nMinAbs ? nAbsForRelWidth - nMinAbs : (sal_Int32)0L;
- sal_Bool bMin = sal_False; // Do all columns get the mininum width?
- sal_Bool bMinExtra = sal_False; // Do all columns get the minimum width plus
+ bool bMin = false; // Do all columns get the mininum width?
+ bool bMinExtra = false; // Do all columns get the minimum width plus
// some extra space?
if( nAbsForRelWidth <= nMinAbs )
@@ -2522,7 +2522,7 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox )
// If there is not enough space left for all columns to
// get the minimum width, they get the minimum width, anyway.
nAbsForRelWidth = nMinAbs;
- bMin = sal_True;
+ bMin = true;
}
else if( nAbsForRelWidth <= (nRelWidth * MINLAY) /
nMinRelColWidth )
@@ -2532,7 +2532,7 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox )
// relative width into account, each column gets the minimum
// width plus some extra space that is based on the additional
// space that is available.
- bMinExtra = sal_True;
+ bMinExtra = true;
}
// Otherwise, if there is enouth space for every column, every
// column gets this space.
@@ -2623,7 +2623,7 @@ void SwXMLTableContext::_MakeTable( SwTableBox *pBox )
for(sal_uInt32 i=0UL; i<nRows; ++i )
{
// Could we split the table behind the current line?
- sal_Bool bSplit = sal_True;
+ bool bSplit = true;
if ( bHasSubTables )
{
SwXMLTableRow_Impl *pRow = &(*pRows)[(sal_uInt16)i];
@@ -2669,7 +2669,7 @@ void SwXMLTableContext::MakeTable()
SwFrmFmt *pFrmFmt = pTableNode->GetTable().GetFrmFmt();
sal_Int16 eHoriOrient = text::HoriOrientation::FULL;
- sal_Bool bSetHoriOrient = sal_False;
+ bool bSetHoriOrient = false;
sal_uInt16 nPrcWidth = 0U;
@@ -2698,14 +2698,14 @@ void SwXMLTableContext::MakeTable()
if( pLRSpace )
{
eHoriOrient = text::HoriOrientation::NONE;
- bSetHoriOrient = sal_True;
+ bSetHoriOrient = true;
}
break;
case text::HoriOrientation::LEFT:
if( pLRSpace )
{
eHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH;
- bSetHoriOrient = sal_True;
+ bSetHoriOrient = true;
}
break;
default:
@@ -2714,7 +2714,7 @@ void SwXMLTableContext::MakeTable()
}
else
{
- bSetHoriOrient = sal_True;
+ bSetHoriOrient = true;
}
const SwFmtFrmSize *pSize = 0;
@@ -2753,14 +2753,14 @@ void SwXMLTableContext::MakeTable()
{
nWidth = USHRT_MAX;
}
- bRelWidth = sal_False;
+ bRelWidth = false;
}
}
else
{
eHoriOrient = text::HoriOrientation::LEFT_AND_WIDTH == eHoriOrient
? text::HoriOrientation::NONE : text::HoriOrientation::FULL;
- bSetHoriOrient = sal_True;
+ bSetHoriOrient = true;
nWidth = USHRT_MAX;
}
break;
@@ -2770,7 +2770,7 @@ void SwXMLTableContext::MakeTable()
}
else
{
- bSetHoriOrient = sal_True;
+ bSetHoriOrient = true;
nWidth = USHRT_MAX;
}
@@ -2859,7 +2859,7 @@ const SwStartNode *SwXMLTableContext::InsertTableSection(
{
// The Cursor already is in the first section
pStNd = pTxtCrsr->GetPaM()->GetNode()->FindTableBoxStartNode();
- bFirstSection = sal_False;
+ bFirstSection = false;
OUString sStyleName( RTL_CONSTASCII_USTRINGPARAM("Standard") );
GetImport().GetTextImport()->SetStyleAndAttrs( GetImport(),
GetImport().GetTextImport()->GetCursor(), sStyleName, sal_True );
diff --git a/sw/source/filter/xml/xmltbli.hxx b/sw/source/filter/xml/xmltbli.hxx
index d521f16..06329c5 100644
--- a/sw/source/filter/xml/xmltbli.hxx
+++ b/sw/source/filter/xml/xmltbli.hxx
@@ -88,9 +88,9 @@ class SwXMLTableContext : public XMLTextTableContext
SwXMLDDETableContext_Impl *pDDESource;
- sal_Bool bFirstSection : 1;
- sal_Bool bRelWidth : 1;
- sal_Bool bHasSubTables : 1;
+ bool bFirstSection : 1;
+ bool bRelWidth : 1;
+ bool bHasSubTables : 1;
sal_uInt16 nHeaderRows;
sal_uInt32 nCurRow;
@@ -156,17 +156,17 @@ public:
SwXMLImport& GetSwImport() { return (SwXMLImport&)GetImport(); }
- void InsertColumn( sal_Int32 nWidth, sal_Bool bRelWidth,
+ void InsertColumn( sal_Int32 nWidth, bool bRelWidth,
const ::rtl::OUString *pDfltCellStyleName = 0 );
sal_Int32 GetColumnWidth( sal_uInt32 nCol, sal_uInt32 nColSpan=1UL ) const;
::rtl::OUString GetColumnDefaultCellStyleName( sal_uInt32 nCol ) const;
inline sal_uInt32 GetColumnCount() const;
- inline sal_Bool HasColumnDefaultCellStyleNames() const;
+ inline bool HasColumnDefaultCellStyleNames() const;
- sal_Bool IsInsertCellPossible() const { return nCurCol < GetColumnCount(); }
- sal_Bool IsInsertColPossible() const { return nCurCol < USHRT_MAX; }
- sal_Bool IsInsertRowPossible() const { return nCurRow < USHRT_MAX; }
- sal_Bool IsValid() const { return pTableNode != 0; }
+ bool IsInsertCellPossible() const { return nCurCol < GetColumnCount(); }
+ bool IsInsertColPossible() const { return nCurCol < USHRT_MAX; }
+ bool IsInsertRowPossible() const { return nCurRow < USHRT_MAX; }
+ bool IsValid() const { return pTableNode != 0; }
void InsertCell( const ::rtl::OUString& rStyleName,
sal_uInt32 nRowSpan=1U, sal_uInt32 nColSpan=1U,
@@ -193,7 +193,7 @@ public:
virtual ::com::sun::star::uno::Reference <
::com::sun::star::text::XTextContent > GetXTextContent() const;
- void SetHasSubTables( sal_Bool bNew ) { bHasSubTables = bNew; }
+ void SetHasSubTables( bool bNew ) { bHasSubTables = bNew; }
};
inline SwXMLTableContext *SwXMLTableContext::GetParentTable() const
@@ -211,7 +211,7 @@ inline const SwStartNode *SwXMLTableContext::GetLastStartNode() const
return GetPrevStartNode( 0UL, GetColumnCount() );
}
-inline sal_Bool SwXMLTableContext::HasColumnDefaultCellStyleNames() const
+inline bool SwXMLTableContext::HasColumnDefaultCellStyleNames() const
{
return pColumnDefaultCellStyleNames != 0;
}
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 059a4e1..70df706 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -222,7 +222,7 @@ void SwXMLTextParagraphExport::setTextEmbeddedGraphicURL(
}
static void lcl_addURL ( SvXMLExport &rExport, const String &rURL,
- sal_Bool bToRel = sal_True )
+ bool bToRel = true )
{
String sRelURL;
@@ -480,7 +480,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
{
OUString sURL;
- sal_Bool bIsOwnLink = sal_False;
+ bool bIsOwnLink = false;
if( SV_EMBEDDED_OWN == nType )
{
try
@@ -504,7 +504,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
}
sURL = GetExport().AddEmbeddedObject( sURL );
- lcl_addURL( rXMLExport, sURL, sal_False );
+ lcl_addURL( rXMLExport, sURL, false );
}
if( SV_EMBEDDED_OWN == nType && pOLENd->GetChartTblName().Len() )
{
@@ -724,7 +724,7 @@ void SwXMLTextParagraphExport::_exportTextEmbedded(
if( (rXMLExport.getExportFlags() & EXPORT_EMBEDDED) == 0 )
{
sURL = GetExport().AddEmbeddedObject( sURL );
- lcl_addURL( rXMLExport, sURL, sal_False );
+ lcl_addURL( rXMLExport, sURL, false );
}
SvXMLElementExport aElementExport( GetExport(), XML_NAMESPACE_DRAW,
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index 5b66876..11e8e6e 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -250,7 +250,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
SwOLENode *pOLENd = 0;
if( rHRef.copy( 0, nPos ) == "vnd.sun.star.ServiceName" )
{
- sal_Bool bInsert = sal_False;
+ bool bInsert = false;
SvGlobalName aClassName;
const XMLServiceMapEntry_Impl *pEntry = aServiceMap;
while( pEntry->sFilterService )
@@ -264,7 +264,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
pEntry->n7, pEntry->n8,
pEntry->n9, pEntry->n10,
pEntry->n11 );
- bInsert = sal_True;
+ bInsert = true;
break;
}
pEntry++;
@@ -375,12 +375,12 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
OSL_ENSURE( pOLENode, "Where is the OLE node" );
OUStringBuffer aBuffer( rTblName.getLength() );
- sal_Bool bQuoted = sal_False;
- sal_Bool bEscape = sal_False;
- sal_Bool bError = sal_False;
+ bool bQuoted = false;
+ bool bEscape = false;
+ bool bError = false;
for( sal_Int32 i=0; i < rTblName.getLength(); i++ )
{
- sal_Bool bEndOfNameFound = sal_False;
+ bool bEndOfNameFound = false;
sal_Unicode c = rTblName[i];
switch( c )
{
@@ -388,48 +388,48 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
if( bEscape )
{
aBuffer.append( c );
- bEscape = sal_False;
+ bEscape = false;
}
else if( bQuoted )
{
- bEndOfNameFound = sal_True;
+ bEndOfNameFound = true;
}
else if( 0 == i )
{
- bQuoted = sal_True;
+ bQuoted = true;
}
else
{
- bError = sal_True;
+ bError = true;
}
break;
case '\\':
if( bEscape )
{
aBuffer.append( c );
- bEscape = sal_False;
+ bEscape = false;
}
else
{
- bEscape = sal_True;
+ bEscape = true;
}
break;
case ' ':
case '.':
if( !bQuoted )
{
- bEndOfNameFound = sal_True;
+ bEndOfNameFound = true;
}
else
{
aBuffer.append( c );
- bEscape = sal_False;
+ bEscape = false;
}
break;
default:
{
aBuffer.append( c );
- bEscape = sal_False;
+ bEscape = false;
}
break;
}
@@ -445,7 +445,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
sal_Int64 nDrawAspect = 0;
const XMLPropStyleContext *pStyle = 0;
- sal_Bool bHasSizeProps = sal_False;
+ bool bHasSizeProps = false;
if( !rStyleName.isEmpty() )
{
pStyle = FindAutoFrameStyle( rStyleName );
@@ -489,7 +489,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
sal_Int32 nVal = 0;
rProp.maValue >>= nVal;
aVisArea.setWidth( nVal );
- bHasSizeProps = sal_True;
+ bHasSizeProps = true;
}
break;
case CTF_OLE_VIS_AREA_HEIGHT:
@@ -497,7 +497,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertOLEObject(
sal_Int32 nVal = 0;
rProp.maValue >>= nVal;
aVisArea.setHeight( nVal );
- bHasSizeProps = sal_True;
+ bHasSizeProps = true;
}
break;
case CTF_OLE_DRAW_ASPECT:
@@ -768,7 +768,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
ScrollingMode eScrollMode = ScrollingAuto;
sal_Bool bHasBorder = sal_False;
- sal_Bool bIsBorderSet = sal_False;
+ bool bIsBorderSet = false;
Size aMargin( SIZE_NOT_SET, SIZE_NOT_SET );
const XMLPropStyleContext *pStyle = 0;
if( !rStyleName.isEmpty() )
@@ -804,7 +804,7 @@ uno::Reference< XPropertySet > SwXMLTextImportHelper::createAndInsertFloatingFra
case CTF_FRAME_DISPLAY_BORDER:
{
bHasBorder = *(sal_Bool *)rProp.maValue.getValue();
- bIsBorderSet = sal_True;
+ bIsBorderSet = true;
}
break;
case CTF_FRAME_MARGIN_HORI:
More information about the Libreoffice-commits
mailing list