[Libreoffice-commits] core.git: 22 commits - chart2/source cui/source editeng/qa editeng/source extensions/source filter/source include/editeng reportdesign/source sc/source sd/inc sd/source starmath/source svx/source sw/inc sw/source
Noel Grandin
noel at peralex.com
Thu Feb 27 02:31:15 PST 2014
chart2/source/controller/main/ChartController_TextEdit.cxx | 4
chart2/source/controller/main/ShapeController.cxx | 2
cui/source/tabpages/autocdlg.cxx | 8
cui/source/tabpages/chardlg.cxx | 2
cui/source/tabpages/paragrph.cxx | 4
editeng/qa/unit/core-test.cxx | 12
editeng/source/accessibility/AccessibleStaticTextBase.cxx | 2
editeng/source/editeng/editeng.cxx | 2
editeng/source/editeng/edtspell.cxx | 20
editeng/source/editeng/edtspell.hxx | 20
editeng/source/editeng/eerdll.cxx | 6
editeng/source/editeng/impedit2.cxx | 4
editeng/source/items/frmitems.cxx | 26 -
editeng/source/items/numitem.cxx | 26 -
editeng/source/items/paraitem.cxx | 16
editeng/source/items/svxfont.cxx | 2
editeng/source/items/textitem.cxx | 20
editeng/source/misc/acorrcfg.cxx | 4
editeng/source/misc/splwrap.cxx | 90 +--
editeng/source/misc/svxacorr.cxx | 336 ++++++-------
editeng/source/misc/txtrange.cxx | 4
editeng/source/outliner/outleeng.cxx | 2
editeng/source/outliner/outlin2.cxx | 78 +--
editeng/source/outliner/outliner.cxx | 222 ++++----
editeng/source/outliner/outlundo.cxx | 8
editeng/source/outliner/outlvw.cxx | 158 +++---
editeng/source/outliner/paralist.cxx | 12
editeng/source/rtf/rtfitem.cxx | 26 -
editeng/source/rtf/svxrtf.cxx | 58 +-
editeng/source/uno/unoedhlp.cxx | 8
editeng/source/uno/unoedprx.cxx | 10
editeng/source/uno/unofored.cxx | 2
editeng/source/uno/unoforou.cxx | 2
editeng/source/uno/unonrule.cxx | 2
editeng/source/uno/unotext.cxx | 4
extensions/source/propctrlr/fontdialog.cxx | 2
filter/source/msfilter/msdffimp.cxx | 4
filter/source/msfilter/svdfppt.cxx | 4
include/editeng/AccessibleEditableTextPara.hxx | 2
include/editeng/fontitem.hxx | 12
include/editeng/forbiddenruleitem.hxx | 2
include/editeng/keepitem.hxx | 4
include/editeng/lrspitem.hxx | 22
include/editeng/nhypitem.hxx | 2
include/editeng/nlbkitem.hxx | 2
include/editeng/numitem.hxx | 44 -
include/editeng/opaqitem.hxx | 4
include/editeng/outliner.hxx | 184 +++----
include/editeng/paragraphdata.hxx | 2
include/editeng/pgrditem.hxx | 2
include/editeng/pmdlitem.hxx | 10
include/editeng/prntitem.hxx | 4
include/editeng/protitem.hxx | 20
include/editeng/scriptspaceitem.hxx | 2
include/editeng/shdditem.hxx | 2
include/editeng/spltitem.hxx | 4
include/editeng/splwrap.hxx | 54 +-
include/editeng/svxacorr.hxx | 98 +--
include/editeng/svxfont.hxx | 10
include/editeng/svxrtf.hxx | 22
include/editeng/tstpitem.hxx | 8
include/editeng/twolinesitem.hxx | 8
include/editeng/txtrange.hxx | 20
include/editeng/ulspitem.hxx | 10
include/editeng/unoedhlp.hxx | 4
include/editeng/unoedprx.hxx | 2
include/editeng/unoedsrc.hxx | 4
include/editeng/unofored.hxx | 8
include/editeng/unoforou.hxx | 8
include/editeng/unotext.hxx | 2
reportdesign/source/ui/misc/UITools.cxx | 4
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/drtxtob1.cxx | 2
sc/source/ui/unoobj/styleuno.cxx | 2
sd/inc/Outliner.hxx | 4
sd/source/core/drawdoc.cxx | 10
sd/source/core/drawdoc4.cxx | 8
sd/source/core/sdpage.cxx | 6
sd/source/core/stlpool.cxx | 14
sd/source/ui/annotations/annotationmanager.cxx | 2
sd/source/ui/annotations/annotationwindow.cxx | 6
sd/source/ui/dlg/dlgolbul.cxx | 4
sd/source/ui/func/fubullet.cxx | 12
sd/source/ui/func/fuexpand.cxx | 4
sd/source/ui/func/fuolbull.cxx | 2
sd/source/ui/func/fusumry.cxx | 4
sd/source/ui/func/futext.cxx | 6
sd/source/ui/view/DocumentRenderer.cxx | 4
sd/source/ui/view/Outliner.cxx | 22
sd/source/ui/view/drawview.cxx | 4
sd/source/ui/view/drviews2.cxx | 6
sd/source/ui/view/drviews3.cxx | 4
sd/source/ui/view/drviewse.cxx | 4
sd/source/ui/view/outlnvs2.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 6
sd/source/ui/view/outlview.cxx | 16
sd/source/ui/view/sdview2.cxx | 2
sd/source/ui/view/sdview3.cxx | 4
sd/source/ui/view/viewshel.cxx | 2
starmath/source/accessibility.cxx | 7
starmath/source/accessibility.hxx | 2
svx/source/accessibility/AccessibleEmptyEditSource.cxx | 10
svx/source/sdr/properties/textproperties.cxx | 2
svx/source/sidebar/nbdtmg.cxx | 4
svx/source/svdraw/svdedxv.cxx | 14
svx/source/svdraw/svdmodel.cxx | 2
svx/source/svdraw/svdoashp.cxx | 6
svx/source/svdraw/svdomeas.cxx | 2
svx/source/svdraw/svdotext.cxx | 14
svx/source/svdraw/svdotextpathdecomposition.cxx | 2
svx/source/svdraw/svdotxat.cxx | 2
svx/source/svdraw/svdotxed.cxx | 4
svx/source/svdraw/svdoutl.cxx | 2
svx/source/table/cell.cxx | 6
svx/source/table/svdotable.cxx | 8
svx/source/table/tablecontroller.cxx | 2
svx/source/table/tablertfimporter.cxx | 4
svx/source/unodraw/unoshtxt.cxx | 2
sw/inc/swacorr.hxx | 4
sw/source/core/bastyp/init.cxx | 18
sw/source/core/doc/doclay.cxx | 8
sw/source/core/doc/poolfmt.cxx | 8
sw/source/core/doc/tblafmt.cxx | 6
sw/source/core/edit/acorrect.cxx | 30 -
sw/source/core/edit/autofmt.cxx | 6
sw/source/core/frmedt/fetab.cxx | 2
sw/source/core/inc/acorrect.hxx | 14
sw/source/core/sw3io/swacorr.cxx | 6
sw/source/core/undo/unins.cxx | 2
sw/source/filter/html/htmldraw.cxx | 2
sw/source/filter/html/swhtml.cxx | 2
sw/source/filter/ww8/docxattributeoutput.cxx | 4
sw/source/filter/ww8/wrtw8nds.cxx | 2
sw/source/filter/ww8/ww8par6.cxx | 2
sw/source/filter/xml/xmltbli.cxx | 2
sw/source/ui/docvw/AnnotationWin.cxx | 4
sw/source/ui/docvw/SidebarTxtControl.cxx | 2
sw/source/ui/docvw/SidebarWin.cxx | 6
sw/source/ui/inc/hyp.hxx | 4
sw/source/ui/lingu/hyp.cxx | 6
sw/source/ui/lingu/sdrhhcwrap.cxx | 18
sw/source/ui/lingu/sdrhhcwrap.hxx | 2
sw/source/ui/shells/annotsh.cxx | 10
sw/source/ui/shells/drwtxtex.cxx | 2
sw/source/ui/shells/drwtxtsh.cxx | 8
sw/source/ui/shells/txtnum.cxx | 10
sw/source/ui/uiview/viewtab.cxx | 6
sw/source/ui/utlui/uitool.cxx | 2
148 files changed, 1127 insertions(+), 1128 deletions(-)
New commits:
commit b46f93a3c53ce15b38369eb8b127b69bad9b2143
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 26 15:30:29 2014 +0200
editeng: sal_Bool->bool
Change-Id: Ic59e48341f69b8c6e6fe77b05eeebac56a2c53e7
diff --git a/editeng/source/accessibility/AccessibleStaticTextBase.cxx b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
index 893a0df..540e551 100644
--- a/editeng/source/accessibility/AccessibleStaticTextBase.cxx
+++ b/editeng/source/accessibility/AccessibleStaticTextBase.cxx
@@ -927,7 +927,7 @@ namespace accessibility
{
SvxAccessibleTextAdapter& rTextForwarder = mpImpl->GetParagraph( aPos.nIndex ).GetTextForwarder();
sal_Int32 nStartIndex, nEndIndex;
- if ( rTextForwarder.GetAttributeRun( nStartIndex, nEndIndex, aPos.nPara, aPos.nIndex, sal_True ) )
+ if ( rTextForwarder.GetAttributeRun( nStartIndex, nEndIndex, aPos.nPara, aPos.nIndex, true ) )
{
aResult.SegmentText = getTextRange( nStartIndex, nEndIndex );
aResult.SegmentStart = nStartIndex;
diff --git a/editeng/source/uno/unoedhlp.cxx b/editeng/source/uno/unoedhlp.cxx
index b2025f6..c8d0be8 100644
--- a/editeng/source/uno/unoedhlp.cxx
+++ b/editeng/source/uno/unoedhlp.cxx
@@ -108,7 +108,7 @@ SAL_WNODEPRECATED_DECLARATIONS_PUSH
}
SAL_WNODEPRECATED_DECLARATIONS_POP
-sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell )
+bool SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell )
{
// IA2 CWS introduced bInCell, but also did many other changes here.
// Need to verify implementation with AT (IA2 and ATK)
@@ -202,7 +202,7 @@ sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32
if ( nLen )
{
sal_Int32 nStartIdx, nEndIdx;
- GetAttributeRun( nStartIdx, nEndIdx, rEE, nParaIdx, nLen, sal_False );
+ GetAttributeRun( nStartIdx, nEndIdx, rEE, nParaIdx, nLen, false );
SfxItemSet aSet = rEE.GetAttribs( nParaIdx, nLen-1, nLen, GETATTRIBS_CHARATTRIBS );
if ( aSet == aCrrntSet )
{
@@ -226,7 +226,7 @@ sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32
if ( nLen )
{
sal_Int32 nStartIdx, nEndIdx;
- GetAttributeRun( nStartIdx, nEndIdx, rEE, nParaIdx, 0, sal_False );
+ GetAttributeRun( nStartIdx, nEndIdx, rEE, nParaIdx, 0, false );
SfxItemSet aSet = rEE.GetAttribs( nParaIdx, 0, 1, GETATTRIBS_CHARATTRIBS );
if ( aSet == aCrrntSet )
{
@@ -260,7 +260,7 @@ sal_Bool SvxEditSourceHelper::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32
nEndIndex += aEndPos.nIndex;
}
- return sal_True;
+ return true;
}
Point SvxEditSourceHelper::EEToUserSpace( const Point& rPoint, const Size& rEESize, bool bIsVertical )
diff --git a/editeng/source/uno/unoedprx.cxx b/editeng/source/uno/unoedprx.cxx
index 1512635..36d091b 100644
--- a/editeng/source/uno/unoedprx.cxx
+++ b/editeng/source/uno/unoedprx.cxx
@@ -947,7 +947,7 @@ sal_Bool SvxAccessibleTextAdapter::GetWordIndices( sal_Int32 nPara, sal_Int32 nI
return sal_True;
}
-sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool /* bInCell */ ) const
+bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool /* bInCell */ ) const
{
DBG_ASSERT(mpTextForwarder, "SvxAccessibleTextAdapter: no forwarder");
@@ -965,7 +965,7 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_
nStartIndex = 0;
nEndIndex = aIndex.GetBulletLen();
- return sal_True;
+ return true;
}
if( aIndex.InField() )
@@ -978,11 +978,11 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_
nStartIndex = aIndex.GetIndex() - aIndex.GetFieldOffset();
nEndIndex = nStartIndex + aIndex.GetFieldLen();
- return sal_True;
+ return true;
}
if( !mpTextForwarder->GetAttributeRun( nStartIndex, nEndIndex, nPara, nIndex ) )
- return sal_False;
+ return false;
aIndex.SetEEIndex( nPara, nStartIndex, *this );
DBG_ASSERT(aIndex.GetIndex() >= 0 &&
@@ -996,7 +996,7 @@ sal_Bool SvxAccessibleTextAdapter::GetAttributeRun( sal_Int32& nStartIndex, sal_
"SvxAccessibleTextIndex::SetIndex: index value overflow");
nEndIndex = aIndex.GetIndex();
- return sal_True;
+ return true;
}
sal_Int32 SvxAccessibleTextAdapter::GetLineCount( sal_Int32 nPara ) const
diff --git a/editeng/source/uno/unofored.cxx b/editeng/source/uno/unofored.cxx
index c0b3fbf..9b1b70e 100644
--- a/editeng/source/uno/unofored.cxx
+++ b/editeng/source/uno/unofored.cxx
@@ -406,7 +406,7 @@ sal_Bool SvxEditEngineForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nInd
return sal_False;
}
-sal_Bool SvxEditEngineForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell ) const
+bool SvxEditEngineForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell ) const
{
return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rEditEngine, nPara, nIndex, bInCell );
}
diff --git a/editeng/source/uno/unoforou.cxx b/editeng/source/uno/unoforou.cxx
index 72b73cf..4163643 100644
--- a/editeng/source/uno/unoforou.cxx
+++ b/editeng/source/uno/unoforou.cxx
@@ -403,7 +403,7 @@ sal_Bool SvxOutlinerForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex
return sal_False;
}
-sal_Bool SvxOutlinerForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell ) const
+bool SvxOutlinerForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell ) const
{
return SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, rOutliner.GetEditEngine(), nPara, nIndex, bInCell );
}
diff --git a/editeng/source/uno/unotext.cxx b/editeng/source/uno/unotext.cxx
index 35fcff4..9b23877 100644
--- a/editeng/source/uno/unotext.cxx
+++ b/editeng/source/uno/unotext.cxx
@@ -2572,9 +2572,9 @@ sal_Bool SvxDummyTextSource::GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, s
return sal_False;
}
-sal_Bool SvxDummyTextSource::GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, sal_Bool ) const
+bool SvxDummyTextSource::GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, bool ) const
{
- return sal_False;
+ return false;
}
sal_Int32 SvxDummyTextSource::GetLineCount( sal_Int32 ) const
diff --git a/include/editeng/AccessibleEditableTextPara.hxx b/include/editeng/AccessibleEditableTextPara.hxx
index 3b3df85..e169edd 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -302,7 +302,7 @@ namespace accessibility
@param nIndex
The character index at where to look for similar character attributes
- @return sal_False, if the method was not able to determine the range
+ @return false, if the method was not able to determine the range
*/
bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nIndex );
diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index 8184561..58d78aa 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -98,9 +98,9 @@ public:
@param nIndex
The character index from which the range of similar attributed characters is requested
- @return sal_True, if the range has been successfully determined
+ @return true, if the range has been successfully determined
*/
- static sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False);
+ static bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, const EditEngine& rEE, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false);
/** Convert point from edit engine to user coordinate space
diff --git a/include/editeng/unoedprx.hxx b/include/editeng/unoedprx.hxx
index a6255e5..95624bd 100644
--- a/include/editeng/unoedprx.hxx
+++ b/include/editeng/unoedprx.hxx
@@ -69,7 +69,7 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
- virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const;
+ virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
virtual void SetUpdateModeForAcc( sal_Bool bUp);
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index 671f86b..e8bccfc 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -322,9 +322,9 @@ public:
@param nIndex
The character index from which the range of similar attributed characters is requested
- @return sal_True, if the range has been successfully determined
+ @return true, if the range has been successfully determined
*/
- virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const = 0;
+ virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const = 0;
/** Query number of lines in the formatted paragraph
diff --git a/include/editeng/unofored.hxx b/include/editeng/unofored.hxx
index b726925..95b1618 100644
--- a/include/editeng/unofored.hxx
+++ b/include/editeng/unofored.hxx
@@ -68,11 +68,11 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
- virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const;
- virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
- virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
+ virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
+ virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
+ virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const;
- virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const;
+ virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const;
virtual sal_Bool Delete( const ESelection& );
virtual sal_Bool InsertText( const OUString&, const ESelection& );
virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False );
diff --git a/include/editeng/unoforou.hxx b/include/editeng/unoforou.hxx
index ae7e912..1ea7f61 100644
--- a/include/editeng/unoforou.hxx
+++ b/include/editeng/unoforou.hxx
@@ -89,11 +89,11 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
- virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const;
- virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
- virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
+ virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
+ virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
+ virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_Int32& rStart, /*out*/sal_Int32& rEnd, sal_Int32 nPara, sal_Int32 nLine ) const;
- virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const;
+ virtual sal_Int32 GetLineNumberAtIndex( sal_Int32 nPara, sal_Int32 nIndex ) const;
virtual sal_Bool Delete( const ESelection& );
virtual sal_Bool InsertText( const OUString&, const ESelection& );
virtual sal_Bool QuickFormatDoc( sal_Bool bFull=sal_False );
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index a6a44da..c6d8a43 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -207,7 +207,7 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
- virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const;
+ virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const;
diff --git a/starmath/source/accessibility.cxx b/starmath/source/accessibility.cxx
index 20b4557..7054b71 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1343,12 +1343,11 @@ sal_Bool SmTextForwarder::GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal
return bRes;
}
-sal_Bool SmTextForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell ) const
+bool SmTextForwarder::GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell ) const
{
EditEngine *pEditEngine = rEditAcc.GetEditEngine();
- return pEditEngine ?
- SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex, bInCell )
- : sal_False;
+ return pEditEngine &&
+ SvxEditSourceHelper::GetAttributeRun( nStartIndex, nEndIndex, *pEditEngine, nPara, nIndex, bInCell );
}
sal_Int32 SmTextForwarder::GetLineCount( sal_Int32 nPara ) const
diff --git a/starmath/source/accessibility.hxx b/starmath/source/accessibility.hxx
index 5bd092b..9cc2578 100644
--- a/starmath/source/accessibility.hxx
+++ b/starmath/source/accessibility.hxx
@@ -234,7 +234,7 @@ public:
virtual OutputDevice* GetRefDevice() const;
virtual sal_Bool GetIndexAtPoint( const Point&, sal_Int32& nPara, sal_Int32& nIndex ) const;
virtual sal_Bool GetWordIndices( sal_Int32 nPara, sal_Int32 nIndex, sal_Int32& nStart, sal_Int32& nEnd ) const;
- virtual sal_Bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, sal_Bool bInCell = sal_False ) const;
+ virtual bool GetAttributeRun( sal_Int32& nStartIndex, sal_Int32& nEndIndex, sal_Int32 nPara, sal_Int32 nIndex, bool bInCell = false ) const;
virtual sal_Int32 GetLineCount( sal_Int32 nPara ) const;
virtual sal_Int32 GetLineLen( sal_Int32 nPara, sal_Int32 nLine ) const;
virtual void GetLineBoundaries( /*out*/sal_Int32 &rStart, /*out*/sal_Int32 &rEnd, sal_Int32 nParagraph, sal_Int32 nLine ) const;
diff --git a/svx/source/accessibility/AccessibleEmptyEditSource.cxx b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
index f860126..a72297b 100644
--- a/svx/source/accessibility/AccessibleEmptyEditSource.cxx
+++ b/svx/source/accessibility/AccessibleEmptyEditSource.cxx
@@ -138,7 +138,7 @@ namespace accessibility
void SetNotifyHdl( const Link& ) {}
LanguageType GetLanguage( sal_Int32, sal_Int32 ) const { return LANGUAGE_DONTKNOW; }
- sal_Int32 GetFieldCount( sal_Int32 ) const { return 0; }
+ sal_Int32 GetFieldCount( sal_Int32 ) const { return 0; }
EFieldInfo GetFieldInfo( sal_Int32, sal_uInt16 ) const { return EFieldInfo(); }
EBulletInfo GetBulletInfo( sal_Int32 ) const { return EBulletInfo(); }
Rectangle GetCharBounds( sal_Int32, sal_Int32 ) const { return Rectangle(); }
@@ -147,11 +147,11 @@ namespace accessibility
OutputDevice* GetRefDevice() const { return NULL; }
sal_Bool GetIndexAtPoint( const Point&, sal_Int32&, sal_Int32& ) const { return sal_False; }
sal_Bool GetWordIndices( sal_Int32, sal_Int32, sal_Int32&, sal_Int32& ) const { return sal_False; }
- sal_Bool GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, sal_Bool ) const { return sal_False; }
- sal_Int32 GetLineCount( sal_Int32 nPara ) const { return nPara == 0 ? 1 : 0; }
- sal_Int32 GetLineLen( sal_Int32, sal_Int32 ) const { return 0; }
+ bool GetAttributeRun( sal_Int32&, sal_Int32&, sal_Int32, sal_Int32, bool ) const { return false; }
+ sal_Int32 GetLineCount( sal_Int32 nPara ) const { return nPara == 0 ? 1 : 0; }
+ sal_Int32 GetLineLen( sal_Int32, sal_Int32 ) const { return 0; }
void GetLineBoundaries( /*out*/sal_Int32 & rStart, /*out*/sal_Int32 & rEnd, sal_Int32 /*nParagraph*/, sal_Int32 /*nLine*/ ) const { rStart = rEnd = 0; }
- sal_Int32 GetLineNumberAtIndex( sal_Int32 /*nPara*/, sal_Int32 /*nIndex*/ ) const { return 0; }
+ sal_Int32 GetLineNumberAtIndex( sal_Int32 /*nPara*/, sal_Int32 /*nIndex*/ ) const { return 0; }
// the following two methods would, strictly speaking, require
// a switch to a real EditSource, too. Fortunately, the
commit 4e808f63290e3abade2a7dcea11209af56855b31
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 26 15:06:39 2014 +0200
editeng: sal_Bool->bool
Change-Id: I5ed4b1bdaba917d420666b15ec0b7060370f1059
diff --git a/include/editeng/ulspitem.hxx b/include/editeng/ulspitem.hxx
index 46e4a31..ed33eda 100644
--- a/include/editeng/ulspitem.hxx
+++ b/include/editeng/ulspitem.hxx
@@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxULSpaceItem : public SfxPoolItem
{
sal_uInt16 nUpper; // Upper space
sal_uInt16 nLower; // Lower space
- sal_Bool bContext; // Contextual spacing?
+ bool bContext; // Contextual spacing?
sal_uInt16 nPropUpper, nPropLower; // relative or absolute (=100%)
public:
TYPEINFO();
@@ -69,13 +69,13 @@ public:
void SetUpperValue( const sal_uInt16 nU ) { nUpper = nU; }
void SetLowerValue( const sal_uInt16 nL ) { nLower = nL; }
- void SetContextValue( const sal_Bool bC ) { bContext = bC; }
- void SetPropUpper( const sal_uInt16 nU ) { nPropUpper = nU; }
- void SetPropLower( const sal_uInt16 nL ) { nPropLower = nL; }
+ void SetContextValue( const bool bC ) { bContext = bC; }
+ void SetPropUpper( const sal_uInt16 nU ) { nPropUpper = nU; }
+ void SetPropLower( const sal_uInt16 nL ) { nPropLower = nL; }
sal_uInt16 GetUpper() const { return nUpper; }
sal_uInt16 GetLower() const { return nLower; }
- sal_Bool GetContext() const { return bContext; }
+ bool GetContext() const { return bContext; }
sal_uInt16 GetPropUpper() const { return nPropUpper; }
sal_uInt16 GetPropLower() const { return nPropLower; }
};
commit 015b80e852f2292fc12f3e209726178f05d95e3c
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 26 14:11:45 2014 +0200
editeng: sal_Bool->bool
Change-Id: I9e27453f0b77a23ae3d811f0a50a85d3fdf80978
diff --git a/cui/source/tabpages/chardlg.cxx b/cui/source/tabpages/chardlg.cxx
index ce3dedb..e9a0bd2 100644
--- a/cui/source/tabpages/chardlg.cxx
+++ b/cui/source/tabpages/chardlg.cxx
@@ -3471,7 +3471,7 @@ sal_Bool SvxCharTwoLinesPage::FillItemSet( SfxItemSet& rSet )
sal_Bool bModified = sal_False, bChanged = sal_True;
sal_uInt16 nWhich = GetWhich( SID_ATTR_CHAR_TWO_LINES );
const SfxPoolItem* pOld = GetOldItem( rSet, SID_ATTR_CHAR_TWO_LINES );
- sal_Bool bOn = m_pTwoLinesBtn->IsChecked();
+ bool bOn = m_pTwoLinesBtn->IsChecked();
sal_Unicode cStart = ( bOn && m_pStartBracketLB->GetSelectEntryPos() > 0 )
? m_pStartBracketLB->GetSelectEntry()[0] : 0;
sal_Unicode cEnd = ( bOn && m_pEndBracketLB->GetSelectEntryPos() > 0 )
diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx
index 71c8593..06c6d84 100644
--- a/editeng/source/editeng/editeng.cxx
+++ b/editeng/source/editeng/editeng.cxx
@@ -524,7 +524,7 @@ void EditEngine::SetPolygon(const basegfx::B2DPolyPolygon& rPolyPolygon, const b
}
}
- TextRanger* pRanger = new TextRanger( rPolyPolygon, pLinePolyPolygon, 30, 2, 2, bSimple, sal_True );
+ TextRanger* pRanger = new TextRanger( rPolyPolygon, pLinePolyPolygon, 30, 2, 2, bSimple, true );
pImpEditEngine->SetTextRanger( pRanger );
pImpEditEngine->SetPaperSize( pRanger->GetBoundRect().GetSize() );
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index f372082..ad3b0df 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -137,7 +137,7 @@ TYPEINIT1_FACTORY(SvxNoHyphenItem, SfxBoolItem, new SvxNoHyphenItem(true, 0));
TYPEINIT1_FACTORY(SvxLineColorItem, SvxColorItem, new SvxLineColorItem(0));
TYPEINIT1_FACTORY(SvxBlinkItem, SfxBoolItem, new SvxBlinkItem(false, 0));
TYPEINIT1_FACTORY(SvxEmphasisMarkItem, SfxUInt16Item, new SvxEmphasisMarkItem(EMPHASISMARK_NONE, 0));
-TYPEINIT1_FACTORY(SvxTwoLinesItem, SfxPoolItem, new SvxTwoLinesItem(sal_True, 0, 0, 0));
+TYPEINIT1_FACTORY(SvxTwoLinesItem, SfxPoolItem, new SvxTwoLinesItem(true, 0, 0, 0));
TYPEINIT1_FACTORY(SvxScriptTypeItem, SfxUInt16Item, new SvxScriptTypeItem);
TYPEINIT1_FACTORY(SvxCharRotateItem, SfxUInt16Item, new SvxCharRotateItem(0, false, 0));
TYPEINIT1_FACTORY(SvxCharScaleWidthItem, SfxUInt16Item, new SvxCharScaleWidthItem(100, 0));
@@ -2975,7 +2975,7 @@ sal_uInt16 SvxEmphasisMarkItem::GetVersion( sal_uInt16 nFFVer ) const
|* class SvxTwoLinesItem
*************************************************************************/
-SvxTwoLinesItem::SvxTwoLinesItem( sal_Bool bFlag, sal_Unicode nStartBracket,
+SvxTwoLinesItem::SvxTwoLinesItem( bool bFlag, sal_Unicode nStartBracket,
sal_Unicode nEndBracket, sal_uInt16 nW )
: SfxPoolItem( nW ),
cStartBracket( nStartBracket ), cEndBracket( nEndBracket ), bOn( bFlag )
diff --git a/editeng/source/misc/txtrange.cxx b/editeng/source/misc/txtrange.cxx
index 1790b82..4b6b11a 100644
--- a/editeng/source/misc/txtrange.cxx
+++ b/editeng/source/misc/txtrange.cxx
@@ -30,7 +30,7 @@
TextRanger::TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DPolyPolygon* pLinePolyPolygon,
sal_uInt16 nCacheSz, sal_uInt16 nLft, sal_uInt16 nRght,
- sal_Bool bSimpl, sal_Bool bInnr, sal_Bool bVert ) :
+ bool bSimpl, bool bInnr, bool bVert ) :
pBound( NULL ),
nCacheSize( nCacheSz ),
nRight( nRght ),
@@ -81,7 +81,7 @@ TextRanger::~TextRanger()
If there's is a change in the writing direction,
the cache has to be cleared.
*/
-void TextRanger::SetVertical( sal_Bool bNew )
+void TextRanger::SetVertical( bool bNew )
{
if( IsVertical() != bNew )
{
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 5fb15d4..632e7c2 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -1041,7 +1041,7 @@ ATTR_SETEMPHASIS:
default: cStt = 0, cEnd = 0; break;
}
- pSet->Put( SvxTwoLinesItem( sal_True, cStt, cEnd,
+ pSet->Put( SvxTwoLinesItem( true, cStt, cEnd,
PLAINID->nTwoLines ));
}
break;
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 719f502..c0a7136 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -53,7 +53,7 @@ public:
const sal_Unicode cFil = cDfltFillChar );
sal_Int32& GetTabPos() { return nTabPos; }
- sal_Int32 GetTabPos() const { return nTabPos; }
+ sal_Int32 GetTabPos() const { return nTabPos; }
SvxTabAdjust& GetAdjustment() { return eAdjustment; }
SvxTabAdjust GetAdjustment() const { return eAdjustment; }
@@ -67,7 +67,7 @@ public:
OUString GetValueString() const;
// the "old" operator==()
- sal_Bool IsEqual( const SvxTabStop& rTS ) const
+ bool IsEqual( const SvxTabStop& rTS ) const
{
return ( nTabPos == rTS.nTabPos &&
eAdjustment == rTS.eAdjustment &&
@@ -76,9 +76,9 @@ public:
}
// For the SortedArray:
- sal_Bool operator==( const SvxTabStop& rTS ) const
+ bool operator==( const SvxTabStop& rTS ) const
{ return nTabPos == rTS.nTabPos; }
- sal_Bool operator <( const SvxTabStop& rTS ) const
+ bool operator <( const SvxTabStop& rTS ) const
{ return nTabPos < rTS.nTabPos; }
SvxTabStop& operator=( const SvxTabStop& rTS )
diff --git a/include/editeng/twolinesitem.hxx b/include/editeng/twolinesitem.hxx
index 6ebc9d2..a2e01ac 100644
--- a/include/editeng/twolinesitem.hxx
+++ b/include/editeng/twolinesitem.hxx
@@ -28,10 +28,10 @@ class SvXMLUnitConverter;
class EDITENG_DLLPUBLIC SvxTwoLinesItem : public SfxPoolItem
{
sal_Unicode cStartBracket, cEndBracket;
- sal_Bool bOn;
+ bool bOn;
public:
TYPEINFO();
- SvxTwoLinesItem( sal_Bool bOn /*= sal_True*/,
+ SvxTwoLinesItem( bool bOn /*= true*/,
sal_Unicode nStartBracket /*= 0*/,
sal_Unicode nEndBracket /*= 0*/,
sal_uInt16 nId );
@@ -62,8 +62,8 @@ public:
return *this;
}
- sal_Bool GetValue() const { return bOn; }
- void SetValue( sal_Bool bFlag ) { bOn = bFlag; }
+ bool GetValue() const { return bOn; }
+ void SetValue( bool bFlag ) { bOn = bFlag; }
sal_Unicode GetStartBracket() const { return cStartBracket; }
void SetStartBracket( sal_Unicode c ) { cStartBracket = c; }
diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index c072e09..b18a793 100644
--- a/include/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
@@ -52,10 +52,10 @@ class EDITENG_DLLPUBLIC TextRanger
sal_uInt16 nUpper; // Distance Contour-Text
sal_uInt16 nLower; // Distance Text-Contour
sal_uInt32 nPointCount; // Number of polygon points
- sal_Bool bSimple : 1; // Just outside edge
- sal_Bool bInner : 1; // TRUE: Objekt inline (EditEngine);
- // FALSE: Objekt flow (StarWriter);
- sal_Bool bVertical :1; // for vertical writing mode
+ bool bSimple : 1; // Just outside edge
+ bool bInner : 1; // TRUE: Objekt inline (EditEngine);
+ // FALSE: Objekt flow (StarWriter);
+ bool bVertical :1;// for vertical writing mode
TextRanger( const TextRanger& ); // not implemented
const Rectangle& _GetBoundRect();
@@ -63,7 +63,7 @@ public:
TextRanger( const basegfx::B2DPolyPolygon& rPolyPolygon,
const basegfx::B2DPolyPolygon* pLinePolyPolygon,
sal_uInt16 nCacheSize, sal_uInt16 nLeft, sal_uInt16 nRight,
- sal_Bool bSimple, sal_Bool bInner, sal_Bool bVert = sal_False );
+ bool bSimple, bool bInner, bool bVert = false );
~TextRanger();
LongDqPtr GetTextRanges( const Range& rRange );
sal_uInt16 GetRight() const { return nRight; }
@@ -71,17 +71,17 @@ public:
sal_uInt16 GetUpper() const { return nUpper; }
sal_uInt16 GetLower() const { return nLower; }
sal_uInt32 GetPointCount() const { return nPointCount; }
- sal_Bool IsSimple() const { return bSimple; }
- sal_Bool IsInner() const { return bInner; }
- sal_Bool IsVertical() const { return bVertical; }
- sal_Bool HasBorder() const { return nRight || nLeft; }
+ bool IsSimple() const { return bSimple; }
+ bool IsInner() const { return bInner; }
+ bool IsVertical() const { return bVertical; }
+ bool HasBorder() const { return nRight || nLeft; }
const PolyPolygon& GetPolyPolygon() const { return *mpPolyPolygon; }
const PolyPolygon* GetLinePolygon() const { return mpLinePolyPolygon; }
const Rectangle& GetBoundRect()
{ return pBound ? static_cast< const Rectangle& >(*pBound) : _GetBoundRect(); }
void SetUpper( sal_uInt16 nNew ){ nUpper = nNew; }
void SetLower( sal_uInt16 nNew ){ nLower = nNew; }
- void SetVertical( sal_Bool bNew );
+ void SetVertical( bool bNew );
};
#endif // _TXTRANGE_HXX
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 9ff2b8d..bbf4463 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -674,7 +674,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
new SvxColorListItem(pColorList.get(),ITEMID_COLOR_TABLE),
new SvxBlinkItem(false,ITEMID_BLINK),
new SvxEmphasisMarkItem(EMPHASISMARK_NONE,ITEMID_EMPHASISMARK),
- new SvxTwoLinesItem(sal_True,0,0,ITEMID_TWOLINES),
+ new SvxTwoLinesItem(true,0,0,ITEMID_TWOLINES),
new SvxCharRotateItem(0,false,ITEMID_CHARROTATE),
new SvxCharScaleWidthItem(100,ITEMID_CHARSCALE_W),
new SvxCharReliefItem(RELIEF_NONE,ITEMID_CHARRELIEF),
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 3fc45a5..78f4434 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -493,7 +493,7 @@ void _InitCore()
aAttrTab[ RES_CHRATR_ROTATE - POOLATTR_BEGIN ] = new SvxCharRotateItem( 0, false, RES_CHRATR_ROTATE );
aAttrTab[ RES_CHRATR_EMPHASIS_MARK - POOLATTR_BEGIN ] = new SvxEmphasisMarkItem( EMPHASISMARK_NONE, RES_CHRATR_EMPHASIS_MARK );
- aAttrTab[ RES_CHRATR_TWO_LINES - POOLATTR_BEGIN ] = new SvxTwoLinesItem( sal_False, 0, 0, RES_CHRATR_TWO_LINES );
+ aAttrTab[ RES_CHRATR_TWO_LINES - POOLATTR_BEGIN ] = new SvxTwoLinesItem( false, 0, 0, RES_CHRATR_TWO_LINES );
aAttrTab[ RES_CHRATR_SCALEW - POOLATTR_BEGIN ] = new SvxCharScaleWidthItem( 100, RES_CHRATR_SCALEW );
aAttrTab[ RES_CHRATR_RELIEF - POOLATTR_BEGIN ] = new SvxCharReliefItem( RELIEF_NONE, RES_CHRATR_RELIEF );
aAttrTab[ RES_CHRATR_HIDDEN - POOLATTR_BEGIN ] = new SvxCharHiddenItem( false, RES_CHRATR_HIDDEN );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 9e3596c..15f5094 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -3276,7 +3276,7 @@ void SwWW8ImplReader::Read_DoubleLine_Rotate( sal_uInt16, const sal_uInt8* pData
case 3: cStt = '<', cEnd = '>'; break;
case 4: cStt = '{', cEnd = '}'; break;
}
- NewAttr( SvxTwoLinesItem( sal_True, cStt, cEnd, RES_CHRATR_TWO_LINES ));
+ NewAttr( SvxTwoLinesItem( true, cStt, cEnd, RES_CHRATR_TWO_LINES ));
}
break;
commit c521f0720800a943fedffdc102aa51e09008c677
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 26 12:53:18 2014 +0200
editeng: sal_Bool->bool
Change-Id: I7da10ad3ba8017d64c723b53795348edf0e7dd6d
diff --git a/chart2/source/controller/main/ShapeController.cxx b/chart2/source/controller/main/ShapeController.cxx
index 46f1afe..f5cbd24 100644
--- a/chart2/source/controller/main/ShapeController.cxx
+++ b/chart2/source/controller/main/ShapeController.cxx
@@ -584,7 +584,7 @@ void ShapeController::executeDispatch_ParagraphDialog()
aNewAttr.Put( aAttr );
aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
- aNewAttr.Put( SvxFmtSplitItem( sal_True, SID_ATTR_PARA_SPLIT) );
+ aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT) );
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx
index ba44190..8a8144c 100644
--- a/editeng/source/editeng/eerdll.cxx
+++ b/editeng/source/editeng/eerdll.cxx
@@ -107,7 +107,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[1] = new SvXMLAttrContainerItem( EE_PARA_XMLATTRIBS );
ppDefItems[2] = new SfxBoolItem( EE_PARA_HANGINGPUNCTUATION, false );
ppDefItems[3] = new SfxBoolItem( EE_PARA_FORBIDDENRULES, true );
- ppDefItems[4] = new SvxScriptSpaceItem( sal_True, EE_PARA_ASIANCJKSPACING );
+ ppDefItems[4] = new SvxScriptSpaceItem( true, EE_PARA_ASIANCJKSPACING );
ppDefItems[5] = new SvxNumBulletItem( aDefaultNumRule, EE_PARA_NUMBULLET );
ppDefItems[6] = new SfxBoolItem( EE_PARA_HYPHENATE, false );
ppDefItems[7] = new SfxBoolItem( EE_PARA_BULLETSTATE, true );
@@ -132,7 +132,7 @@ SfxPoolItem** GlobalEditData::GetDefItems()
ppDefItems[24] = new SvxCrossedOutItem( STRIKEOUT_NONE, EE_CHAR_STRIKEOUT );
ppDefItems[25] = new SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC );
ppDefItems[26] = new SvxContourItem( false, EE_CHAR_OUTLINE );
- ppDefItems[27] = new SvxShadowedItem( sal_False, EE_CHAR_SHADOW );
+ ppDefItems[27] = new SvxShadowedItem( false, EE_CHAR_SHADOW );
ppDefItems[28] = new SvxEscapementItem( 0, 100, EE_CHAR_ESCAPEMENT );
ppDefItems[29] = new SvxAutoKernItem( false, EE_CHAR_PAIRKERNING );
ppDefItems[30] = new SvxKerningItem( 0, EE_CHAR_KERNING );
diff --git a/editeng/source/items/paraitem.cxx b/editeng/source/items/paraitem.cxx
index eff85f1..906ba1a 100644
--- a/editeng/source/items/paraitem.cxx
+++ b/editeng/source/items/paraitem.cxx
@@ -72,9 +72,9 @@ TYPEINIT1_FACTORY(SvxWidowsItem, SfxByteItem, new SvxWidowsItem(0, 0));
TYPEINIT1_FACTORY(SvxOrphansItem, SfxByteItem, new SvxOrphansItem(0, 0));
TYPEINIT1_FACTORY(SvxHyphenZoneItem, SfxPoolItem, new SvxHyphenZoneItem(false, 0));
TYPEINIT1_FACTORY(SvxTabStopItem, SfxPoolItem, new SvxTabStopItem(0));
-TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxFmtSplitItem, SfxBoolItem, new SvxFmtSplitItem(false, 0));
TYPEINIT1_FACTORY(SvxPageModelItem, SfxStringItem, new SvxPageModelItem(0));
-TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxScriptSpaceItem, SfxBoolItem, new SvxScriptSpaceItem(false, 0));
TYPEINIT1_FACTORY(SvxHangingPunctuationItem, SfxBoolItem, new SvxHangingPunctuationItem(false, 0));
TYPEINIT1_FACTORY(SvxForbiddenRuleItem, SfxBoolItem, new SvxForbiddenRuleItem(false, 0));
TYPEINIT1_FACTORY(SvxParaVertAlignItem, SfxUInt16Item, new SvxParaVertAlignItem(0, 0));
@@ -1266,7 +1266,7 @@ SfxPoolItem* SvxFmtSplitItem::Create( SvStream& rStrm, sal_uInt16 ) const
{
sal_Int8 bIsSplit;
rStrm.ReadSChar( bIsSplit );
- return new SvxFmtSplitItem( sal_Bool( bIsSplit != 0 ), Which() );
+ return new SvxFmtSplitItem( bIsSplit != 0, Which() );
}
@@ -1371,7 +1371,7 @@ SfxItemPresentation SvxPageModelItem::GetPresentation
-SvxScriptSpaceItem::SvxScriptSpaceItem( sal_Bool bOn, const sal_uInt16 nId )
+SvxScriptSpaceItem::SvxScriptSpaceItem( bool bOn, const sal_uInt16 nId )
: SfxBoolItem( nId, bOn )
{
}
diff --git a/editeng/source/items/textitem.cxx b/editeng/source/items/textitem.cxx
index 6059059..f372082 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -121,7 +121,7 @@ TYPEINIT1_FACTORY(SvxTextLineItem, SfxEnumItem, new SvxTextLineItem(UNDERLINE_NO
TYPEINIT1_FACTORY(SvxUnderlineItem, SfxEnumItem, new SvxUnderlineItem(UNDERLINE_NONE, 0));
TYPEINIT1_FACTORY(SvxOverlineItem, SfxEnumItem, new SvxOverlineItem(UNDERLINE_NONE, 0));
TYPEINIT1_FACTORY(SvxCrossedOutItem, SfxEnumItem, new SvxCrossedOutItem(STRIKEOUT_NONE, 0));
-TYPEINIT1_FACTORY(SvxShadowedItem, SfxBoolItem, new SvxShadowedItem(sal_False, 0));
+TYPEINIT1_FACTORY(SvxShadowedItem, SfxBoolItem, new SvxShadowedItem(false, 0));
TYPEINIT1_FACTORY(SvxAutoKernItem, SfxBoolItem, new SvxAutoKernItem(false, 0));
TYPEINIT1_FACTORY(SvxWordLineModeItem, SfxBoolItem, new SvxWordLineModeItem(sal_False, 0));
TYPEINIT1_FACTORY(SvxContourItem, SfxBoolItem, new SvxContourItem(false, 0));
@@ -1626,7 +1626,7 @@ bool SvxCrossedOutItem::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
}
// class SvxShadowedItem -------------------------------------------------
-SvxShadowedItem::SvxShadowedItem( const sal_Bool bShadowed, const sal_uInt16 nId ) :
+SvxShadowedItem::SvxShadowedItem( const bool bShadowed, const sal_uInt16 nId ) :
SfxBoolItem( nId, bShadowed )
{
}
diff --git a/editeng/source/rtf/rtfitem.cxx b/editeng/source/rtf/rtfitem.cxx
index 37a5b5b..5fb15d4 100644
--- a/editeng/source/rtf/rtfitem.cxx
+++ b/editeng/source/rtf/rtfitem.cxx
@@ -307,7 +307,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_KEEP:
if( PARDID->nSplit )
{
- pSet->Put( SvxFmtSplitItem( sal_False, PARDID->nSplit ));
+ pSet->Put( SvxFmtSplitItem( false, PARDID->nSplit ));
}
break;
@@ -518,7 +518,7 @@ void SvxRTFParser::ReadAttr( int nToken, SfxItemSet* pSet )
case RTF_ASPALPHA:
if( PARDID->nScriptSpace )
{
- pSet->Put( SvxScriptSpaceItem( sal_True,
+ pSet->Put( SvxScriptSpaceItem( true,
PARDID->nScriptSpace ));
}
break;
diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index f1c6310..0b9ee16 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -1133,7 +1133,7 @@ const SfxItemSet& SvxRTFParser::GetRTFDefaults()
sal_uInt16 nId;
if( 0 != ( nId = ((RTFPardAttrMapIds*)&aPardMap[0])->nScriptSpace ))
{
- SvxScriptSpaceItem aItem( sal_False, nId );
+ SvxScriptSpaceItem aItem( false, nId );
if( bNewDoc )
pAttrPool->SetPoolDefaultItem( aItem );
else
diff --git a/extensions/source/propctrlr/fontdialog.cxx b/extensions/source/propctrlr/fontdialog.cxx
index f6d598b..014510f 100644
--- a/extensions/source/propctrlr/fontdialog.cxx
+++ b/extensions/source/propctrlr/fontdialog.cxx
@@ -513,7 +513,7 @@ namespace pcr
*pCounter++ = new SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, CFID_CASEMAP);
*pCounter++ = new SvxContourItem(false, CFID_CONTOUR);
- *pCounter++ = new SvxShadowedItem(sal_False, CFID_SHADOWED);
+ *pCounter++ = new SvxShadowedItem(false, CFID_SHADOWED);
*pCounter++ = new SvxFontListItem (new FontList(Application::GetDefaultDevice()), CFID_FONTLIST);
diff --git a/include/editeng/scriptspaceitem.hxx b/include/editeng/scriptspaceitem.hxx
index a3ae32f..73b770f 100644
--- a/include/editeng/scriptspaceitem.hxx
+++ b/include/editeng/scriptspaceitem.hxx
@@ -35,7 +35,7 @@ class EDITENG_DLLPUBLIC SvxScriptSpaceItem : public SfxBoolItem
public:
TYPEINFO();
- SvxScriptSpaceItem( sal_Bool bOn /*= sal_False*/,
+ SvxScriptSpaceItem( bool bOn /*= false*/,
const sal_uInt16 nId );
virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const;
diff --git a/include/editeng/shdditem.hxx b/include/editeng/shdditem.hxx
index 2a61198..011a35f 100644
--- a/include/editeng/shdditem.hxx
+++ b/include/editeng/shdditem.hxx
@@ -36,7 +36,7 @@ class EDITENG_DLLPUBLIC SvxShadowedItem : public SfxBoolItem
public:
TYPEINFO();
- SvxShadowedItem( const sal_Bool bShadowed /*= sal_False*/,
+ SvxShadowedItem( const bool bShadowed /*= false*/,
const sal_uInt16 nId );
// "pure virtual Methods" from SfxPoolItem
diff --git a/include/editeng/spltitem.hxx b/include/editeng/spltitem.hxx
index fd51c14..0c3c228 100644
--- a/include/editeng/spltitem.hxx
+++ b/include/editeng/spltitem.hxx
@@ -37,7 +37,7 @@ public:
TYPEINFO();
~SvxFmtSplitItem();
- inline SvxFmtSplitItem( const sal_Bool bSplit /*= sal_True*/,
+ inline SvxFmtSplitItem( const bool bSplit /*= true*/,
const sal_uInt16 nWh );
inline SvxFmtSplitItem& operator=( const SvxFmtSplitItem& rSplit );
@@ -52,7 +52,7 @@ public:
OUString &rText, const IntlWrapper * = 0 ) const;
};
-inline SvxFmtSplitItem::SvxFmtSplitItem( const sal_Bool bSplit, const sal_uInt16 nWh ) :
+inline SvxFmtSplitItem::SvxFmtSplitItem( const bool bSplit, const sal_uInt16 nWh ) :
SfxBoolItem( nWh, bSplit )
{}
diff --git a/reportdesign/source/ui/misc/UITools.cxx b/reportdesign/source/ui/misc/UITools.cxx
index 2ac3787..9ff2b8d 100644
--- a/reportdesign/source/ui/misc/UITools.cxx
+++ b/reportdesign/source/ui/misc/UITools.cxx
@@ -659,7 +659,7 @@ bool openCharDialog( const uno::Reference<report::XReportControlFormat >& _rxRep
new SvxPostureItem(ITALIC_NONE,ITEMID_POSTURE),
new SvxWeightItem(WEIGHT_NORMAL,ITEMID_WEIGHT),
- new SvxShadowedItem(sal_False,ITEMID_SHADOWED),
+ new SvxShadowedItem(false,ITEMID_SHADOWED),
new SvxWordLineModeItem(sal_False,ITEMID_WORDLINEMODE),
new SvxContourItem(false,ITEMID_CONTOUR),
new SvxCrossedOutItem(STRIKEOUT_NONE,ITEMID_CROSSEDOUT),
diff --git a/sc/source/ui/drawfunc/drtxtob1.cxx b/sc/source/ui/drawfunc/drtxtob1.cxx
index 907f42b..d993d81 100644
--- a/sc/source/ui/drawfunc/drtxtob1.cxx
+++ b/sc/source/ui/drawfunc/drtxtob1.cxx
@@ -87,7 +87,7 @@ bool ScDrawTextObjectBar::ExecuteParaDlg( const SfxItemSet& rArgs,
aNewAttr.Put( SvxHyphenZoneItem( false, SID_ATTR_PARA_HYPHENZONE ) );
aNewAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, SID_ATTR_PARA_PAGEBREAK ) );
- aNewAttr.Put( SvxFmtSplitItem( sal_True, SID_ATTR_PARA_SPLIT) );
+ aNewAttr.Put( SvxFmtSplitItem( true, SID_ATTR_PARA_SPLIT) );
aNewAttr.Put( SvxWidowsItem( 0, SID_ATTR_PARA_WIDOWS) );
aNewAttr.Put( SvxOrphansItem( 0, SID_ATTR_PARA_ORPHANS) );
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 2951406..32c592c 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -248,7 +248,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
// for korean and japanese languages we have a different default for apply spacing between asian, latin and ctl text
if (MsLangId::isKorean(eRealCTLLanguage) || (LANGUAGE_JAPANESE == eRealCTLLanguage))
{
- GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( sal_False, EE_PARA_ASIANCJKSPACING ) );
+ GetPool().GetSecondaryPool()->SetPoolDefaultItem( SvxScriptSpaceItem( false, EE_PARA_ASIANCJKSPACING ) );
}
// Set DefTab and SpellOptions for the SD module
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 85a9fa3..479730a 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -209,7 +209,7 @@ void SdDrawDocument::CreateLayoutTemplates()
rISet.Put( SvxPostureItem( ITALIC_NONE, EE_CHAR_ITALIC_CTL ) );
rISet.Put(SvxContourItem(false, EE_CHAR_OUTLINE ));
- rISet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW ));
+ rISet.Put(SvxShadowedItem(false, EE_CHAR_SHADOW ));
rISet.Put(SvxUnderlineItem(UNDERLINE_NONE, EE_CHAR_UNDERLINE));
rISet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE));
rISet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 12962c8..5208bca 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -255,7 +255,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
rSet.Put( SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ) );
rSet.Put( SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
rSet.Put( SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ) );
- rSet.Put( SvxShadowedItem(sal_False, EE_CHAR_SHADOW ) );
+ rSet.Put( SvxShadowedItem(false, EE_CHAR_SHADOW ) );
rSet.Put( SvxContourItem(false, EE_CHAR_OUTLINE ) );
rSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) );
@@ -372,7 +372,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
rTitleSet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ));
rTitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
rTitleSet.Put(SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ));
- rTitleSet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW ));
+ rTitleSet.Put(SvxShadowedItem(false, EE_CHAR_SHADOW ));
rTitleSet.Put(SvxContourItem(false, EE_CHAR_OUTLINE ));
rTitleSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rTitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) );
@@ -417,7 +417,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
rSubtitleSet.Put(SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ));
rSubtitleSet.Put(SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ));
rSubtitleSet.Put(SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ));
- rSubtitleSet.Put(SvxShadowedItem(sal_False, EE_CHAR_SHADOW ));
+ rSubtitleSet.Put(SvxShadowedItem(false, EE_CHAR_SHADOW ));
rSubtitleSet.Put(SvxContourItem(false, EE_CHAR_OUTLINE ));
rSubtitleSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rSubtitleSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF ) );
@@ -465,7 +465,7 @@ void SdStyleSheetPool::CreateLayoutStyleSheets(const OUString& rLayoutName, sal_
rNotesSet.Put( SvxOverlineItem(UNDERLINE_NONE, EE_CHAR_OVERLINE ) );
rNotesSet.Put( SvxCrossedOutItem(STRIKEOUT_NONE, EE_CHAR_STRIKEOUT ) );
rNotesSet.Put( SvxCaseMapItem(SVX_CASEMAP_NOT_MAPPED, EE_CHAR_CASEMAP ) );
- rNotesSet.Put( SvxShadowedItem(sal_False, EE_CHAR_SHADOW ) );
+ rNotesSet.Put( SvxShadowedItem(false, EE_CHAR_SHADOW ) );
rNotesSet.Put( SvxContourItem(false, EE_CHAR_OUTLINE ) );
rNotesSet.Put( SvxEmphasisMarkItem(EMPHASISMARK_NONE, EE_CHAR_EMPHASISMARK ) );
rNotesSet.Put( SvxCharReliefItem(RELIEF_NONE, EE_CHAR_RELIEF) );
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index c02d672..3fc45a5 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -466,7 +466,7 @@ void _InitCore()
aAttrTab[ RES_CHRATR_LANGUAGE- POOLATTR_BEGIN ] = new SvxLanguageItem(LANGUAGE_DONTKNOW, RES_CHRATR_LANGUAGE );
aAttrTab[ RES_CHRATR_POSTURE- POOLATTR_BEGIN ] = new SvxPostureItem( ITALIC_NONE, RES_CHRATR_POSTURE );
aAttrTab[ RES_CHRATR_PROPORTIONALFONTSIZE- POOLATTR_BEGIN ] = new SvxPropSizeItem( 100, RES_CHRATR_PROPORTIONALFONTSIZE );
- aAttrTab[ RES_CHRATR_SHADOWED- POOLATTR_BEGIN ] = new SvxShadowedItem( sal_False, RES_CHRATR_SHADOWED );
+ aAttrTab[ RES_CHRATR_SHADOWED- POOLATTR_BEGIN ] = new SvxShadowedItem( false, RES_CHRATR_SHADOWED );
aAttrTab[ RES_CHRATR_UNDERLINE- POOLATTR_BEGIN ] = new SvxUnderlineItem( UNDERLINE_NONE, RES_CHRATR_UNDERLINE );
aAttrTab[ RES_CHRATR_WEIGHT- POOLATTR_BEGIN ] = new SvxWeightItem( WEIGHT_NORMAL, RES_CHRATR_WEIGHT );
aAttrTab[ RES_CHRATR_RSID - POOLATTR_BEGIN ] = new SvxRsidItem( 0, RES_CHRATR_RSID );
@@ -531,7 +531,7 @@ void _InitCore()
aAttrTab[ RES_PARATR_LINESPACING- POOLATTR_BEGIN ] = new SvxLineSpacingItem( LINE_SPACE_DEFAULT_HEIGHT, RES_PARATR_LINESPACING );
aAttrTab[ RES_PARATR_ADJUST- POOLATTR_BEGIN ] = new SvxAdjustItem( SVX_ADJUST_LEFT, RES_PARATR_ADJUST );
- aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] = new SvxFmtSplitItem( sal_True, RES_PARATR_SPLIT );
+ aAttrTab[ RES_PARATR_SPLIT- POOLATTR_BEGIN ] = new SvxFmtSplitItem( true, RES_PARATR_SPLIT );
aAttrTab[ RES_PARATR_WIDOWS- POOLATTR_BEGIN ] = new SvxWidowsItem( 0, RES_PARATR_WIDOWS );
aAttrTab[ RES_PARATR_ORPHANS- POOLATTR_BEGIN ] = new SvxOrphansItem( 0, RES_PARATR_ORPHANS );
aAttrTab[ RES_PARATR_TABSTOP- POOLATTR_BEGIN ] = new SvxTabStopItem( 1, SVX_TAB_DEFDIST, SVX_TAB_ADJUST_DEFAULT, RES_PARATR_TABSTOP );
@@ -544,7 +544,7 @@ void _InitCore()
aAttrTab[ RES_PARATR_REGISTER - POOLATTR_BEGIN ] = new SwRegisterItem( sal_False );
aAttrTab[ RES_PARATR_NUMRULE - POOLATTR_BEGIN ] = new SwNumRuleItem( OUString() );
- aAttrTab[ RES_PARATR_SCRIPTSPACE - POOLATTR_BEGIN ] = new SvxScriptSpaceItem( sal_True, RES_PARATR_SCRIPTSPACE );
+ aAttrTab[ RES_PARATR_SCRIPTSPACE - POOLATTR_BEGIN ] = new SvxScriptSpaceItem( true, RES_PARATR_SCRIPTSPACE );
aAttrTab[ RES_PARATR_HANGINGPUNCTUATION - POOLATTR_BEGIN ] = new SvxHangingPunctuationItem( true, RES_PARATR_HANGINGPUNCTUATION );
aAttrTab[ RES_PARATR_FORBIDDEN_RULES - POOLATTR_BEGIN ] = new SvxForbiddenRuleItem( true, RES_PARATR_FORBIDDEN_RULES );
aAttrTab[ RES_PARATR_VERTALIGN - POOLATTR_BEGIN ] = new SvxParaVertAlignItem( 0, RES_PARATR_VERTALIGN );
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index f757c72..9a72c44 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -374,7 +374,7 @@ SwTxtFmtColl* SwDoc::GetTxtCollFromPool( sal_uInt16 nId, bool bRegardLanguage )
}
if (nAppLanguage == LANGUAGE_KOREAN)
{
- SvxScriptSpaceItem aScriptSpace(sal_False, RES_PARATR_SCRIPTSPACE);
+ SvxScriptSpaceItem aScriptSpace(false, RES_PARATR_SCRIPTSPACE);
aSet.Put(aScriptSpace);
}
}
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 398b062..3c03d05 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -277,7 +277,7 @@ SwBoxAutoFmt::SwBoxAutoFmt()
aOverline( UNDERLINE_NONE, RES_CHRATR_OVERLINE ),
aCrossedOut( STRIKEOUT_NONE, RES_CHRATR_CROSSEDOUT ),
aContour( false, RES_CHRATR_CONTOUR ),
- aShadowed( sal_False, RES_CHRATR_SHADOWED ),
+ aShadowed( false, RES_CHRATR_SHADOWED ),
aColor( RES_CHRATR_COLOR ),
aBox( RES_BOX ),
aTLBR( 0 ),
diff --git a/sw/source/ui/shells/annotsh.cxx b/sw/source/ui/shells/annotsh.cxx
index 3b7ea90..3247ce98 100644
--- a/sw/source/ui/shells/annotsh.cxx
+++ b/sw/source/ui/shells/annotsh.cxx
@@ -522,7 +522,7 @@ void SwAnnotationShell::Exec( SfxRequest &rReq )
aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
- aDlgAttr.Put( SvxFmtSplitItem( sal_True, RES_PARATR_SPLIT ) );
+ aDlgAttr.Put( SvxFmtSplitItem( true, RES_PARATR_SPLIT ) );
aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
diff --git a/sw/source/ui/shells/drwtxtex.cxx b/sw/source/ui/shells/drwtxtex.cxx
index 4180f95..30d88e9 100644
--- a/sw/source/ui/shells/drwtxtex.cxx
+++ b/sw/source/ui/shells/drwtxtex.cxx
@@ -416,7 +416,7 @@ void SwDrawTextShell::Execute( SfxRequest &rReq )
aDlgAttr.Put( SvxHyphenZoneItem( false, RES_PARATR_HYPHENZONE) );
aDlgAttr.Put( SvxFmtBreakItem( SVX_BREAK_NONE, RES_BREAK ) );
- aDlgAttr.Put( SvxFmtSplitItem( sal_True, RES_PARATR_SPLIT ) );
+ aDlgAttr.Put( SvxFmtSplitItem( true, RES_PARATR_SPLIT ) );
aDlgAttr.Put( SvxWidowsItem( 0, RES_PARATR_WIDOWS ) );
aDlgAttr.Put( SvxOrphansItem( 0, RES_PARATR_ORPHANS ) );
commit 2c4621c87ed3a7b19de195c21494c9a381e72b2e
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 26 11:30:40 2014 +0200
editeng: sal_Bool->bool
Change-Id: I659497b79fe809865639429f2744d815f2a1f3e2
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 39b6721..5c9b840 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -106,7 +106,7 @@ void EditSpellWrapper::SpellStart( SvxSpellArea eArea )
}
}
-sal_Bool EditSpellWrapper::SpellContinue()
+bool EditSpellWrapper::SpellContinue()
{
SetLast( pEditView->GetImpEditEngine()->ImpSpell( pEditView ) );
return GetLast().is();
@@ -118,12 +118,12 @@ void EditSpellWrapper::SpellEnd()
SvxSpellWrapper::SpellEnd();
}
-sal_Bool EditSpellWrapper::HasOtherCnt()
+bool EditSpellWrapper::HasOtherCnt()
{
return false;
}
-sal_Bool EditSpellWrapper::SpellMore()
+bool EditSpellWrapper::SpellMore()
{
EditEngine* pEE = pEditView->GetEditEngine();
ImpEditEngine* pImpEE = pEditView->GetImpEditEngine();
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 8e6ccd7..46eb0fe 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -46,11 +46,11 @@ private:
protected:
virtual void SpellStart( SvxSpellArea eArea );
- virtual sal_Bool SpellContinue(); // Check area
+ virtual bool SpellContinue(); // Check area
virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage );
virtual void SpellEnd();
- virtual sal_Bool SpellMore();
- virtual sal_Bool HasOtherCnt();
+ virtual bool SpellMore();
+ virtual bool HasOtherCnt();
virtual void ScrollArea();
virtual void ChangeWord( const OUString& rNewWord, const sal_uInt16 nLang );
virtual void ChangeThesWord( const OUString& rNewWord );
diff --git a/editeng/source/misc/splwrap.cxx b/editeng/source/misc/splwrap.cxx
index 95b6f41..ba9166d 100644
--- a/editeng/source/misc/splwrap.cxx
+++ b/editeng/source/misc/splwrap.cxx
@@ -147,22 +147,22 @@ SvxSpellWrapper::~SvxSpellWrapper()
SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
Reference< XSpellChecker1 > &xSpellChecker,
- const sal_Bool bStart, const sal_Bool bIsAllRight,
- const sal_Bool bOther, const sal_Bool bRevAllow ) :
+ const bool bStart, const bool bIsAllRight,
+ const bool bOther, const bool bRevAllow ) :
pWin ( pWn ),
xSpell ( xSpellChecker ),
mpTextObj( NULL),
bOtherCntnt ( bOther ),
- bDialog ( sal_False ),
- bHyphen ( sal_False ),
- bAuto ( sal_False ),
+ bDialog ( false ),
+ bHyphen ( false ),
+ bAuto ( false ),
bStartChk ( bOther ),
bRevAllowed ( bRevAllow ),
bAllRight ( bIsAllRight )
{
Reference< linguistic2::XLinguProperties > xProp( SvxGetLinguPropertySet() );
- sal_Bool bWrapReverse = xProp.is() ? xProp->getIsWrapReverse() : sal_False;
+ bool bWrapReverse = xProp.is() && xProp->getIsWrapReverse();
bReverse = bRevAllow && bWrapReverse;
bStartDone = bOther || ( !bReverse && bStart );
bEndDone = bReverse && bStart && !bOther;
@@ -172,20 +172,20 @@ SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
SvxSpellWrapper::SvxSpellWrapper( Window* pWn,
Reference< XHyphenator > &xHyphenator,
- const sal_Bool bStart, const sal_Bool bOther ) :
+ const bool bStart, const bool bOther ) :
pWin ( pWn ),
xHyph ( xHyphenator ),
mpTextObj( NULL),
bOtherCntnt ( bOther ),
- bDialog ( sal_False ),
- bHyphen ( sal_False ),
- bAuto ( sal_False ),
- bReverse ( sal_False ),
+ bDialog ( false ),
+ bHyphen ( false ),
+ bAuto ( false ),
+ bReverse ( false ),
bStartDone ( bOther || ( !bReverse && bStart ) ),
bEndDone ( bReverse && bStart && !bOther ),
bStartChk ( bOther ),
- bRevAllowed ( sal_False ),
- bAllRight ( sal_True )
+ bRevAllowed ( false ),
+ bAllRight ( true )
{
}
@@ -251,17 +251,17 @@ void SvxSpellWrapper::SpellStart( SvxSpellArea /*eSpell*/ )
-sal_Bool SvxSpellWrapper::HasOtherCnt()
+bool SvxSpellWrapper::HasOtherCnt()
{
- return sal_False; // Is there a special area?
+ return false; // Is there a special area?
}
-sal_Bool SvxSpellWrapper::SpellMore()
+bool SvxSpellWrapper::SpellMore()
{
- return sal_False; // Should additional documents be examined?
+ return false; // Should additional documents be examined?
}
@@ -277,9 +277,9 @@ void SvxSpellWrapper::SpellEnd()
-sal_Bool SvxSpellWrapper::SpellContinue()
+bool SvxSpellWrapper::SpellContinue()
{
- return sal_False;
+ return false;
}
@@ -360,7 +360,7 @@ void SvxSpellWrapper::SpellDocument( )
{
if ( bOtherCntnt )
{
- bReverse = sal_False;
+ bReverse = false;
SpellStart( SVX_SPELL_OTHER );
}
else
@@ -375,7 +375,7 @@ void SvxSpellWrapper::SpellDocument( )
Reference< XHyphenatedWord > xHyphWord( GetLast(), UNO_QUERY );
Window *pOld = pWin;
- bDialog = sal_True;
+ bDialog = true;
if (xHyphWord.is())
{
EditAbstractDialogFactory* pFact = EditAbstractDialogFactory::Create();
@@ -387,7 +387,7 @@ void SvxSpellWrapper::SpellDocument( )
pDlg->Execute();
delete pDlg;
}
- bDialog = sal_False;
+ bDialog = false;
pWin = pOld;
};
}
@@ -396,27 +396,27 @@ void SvxSpellWrapper::SpellDocument( )
// Select the next area
-sal_Bool SvxSpellWrapper::SpellNext( )
+bool SvxSpellWrapper::SpellNext( )
{
Reference< linguistic2::XLinguProperties > xProp( SvxGetLinguPropertySet() );
- sal_Bool bWrapReverse = xProp.is() ? xProp->getIsWrapReverse() : sal_False;
- sal_Bool bActRev = bRevAllowed && bWrapReverse;
+ bool bWrapReverse = xProp.is() && xProp->getIsWrapReverse();
+ bool bActRev = bRevAllowed && bWrapReverse;
// bActRev is the direction after Spell checking, bReverse is the one
// at the beginning.
if( bActRev == bReverse )
{ // No change of direction, thus is the
if( bStartChk ) // desired area ( bStartChk )
- bStartDone = sal_True; // completely processed.
+ bStartDone = true; // completely processed.
else
- bEndDone = sal_True;
+ bEndDone = true;
}
else if( bReverse == bStartChk ) //For a change of direction, an area can
{ // be processed during certain circumstances
if( bStartChk ) // If the firdt part is spell checked in backwards
- bEndDone = sal_True; // and this is reversed in the process, then
+ bEndDone = true; // and this is reversed in the process, then
else // then the end part is processed (and vice-versa).
- bStartDone = sal_True;
+ bStartDone = true;
}
bReverse = bActRev;
@@ -424,39 +424,39 @@ sal_Bool SvxSpellWrapper::SpellNext( )
{
if ( SpellMore() ) // spell check another document?
{
- bOtherCntnt = sal_False;
+ bOtherCntnt = false;
bStartDone = !bReverse;
bEndDone = bReverse;
SpellStart( SVX_SPELL_BODY );
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
- sal_Bool bGoOn = sal_False;
+ bool bGoOn = false;
if ( bOtherCntnt )
{
- bStartChk = sal_False;
+ bStartChk = false;
SpellStart( SVX_SPELL_BODY );
- bGoOn = sal_True;
+ bGoOn = true;
}
else if ( bStartDone && bEndDone )
{
- sal_Bool bIsSpellSpecial = xProp.is() ? xProp->getIsSpellSpecial() : sal_False;
+ bool bIsSpellSpecial = xProp.is() && xProp->getIsSpellSpecial();
// Body area done, ask for special area
if( !IsHyphen() && bIsSpellSpecial && HasOtherCnt() )
{
SpellStart( SVX_SPELL_OTHER );
- bOtherCntnt = bGoOn = sal_True;
+ bOtherCntnt = bGoOn = true;
}
else if ( SpellMore() ) // check another document?
{
- bOtherCntnt = sal_False;
+ bOtherCntnt = false;
bStartDone = !bReverse;
bEndDone = bReverse;
SpellStart( SVX_SPELL_BODY );
- return sal_True;
+ return true;
}
}
else
@@ -470,14 +470,14 @@ sal_Bool SvxSpellWrapper::SpellNext( )
{
// sacrifice the other area if necessary ask for special area
WAIT_ON();
- bStartDone = bEndDone = sal_True;
+ bStartDone = bEndDone = true;
return SpellNext();
}
else
{
bStartChk = !bStartDone;
SpellStart( bStartChk ? SVX_SPELL_BODY_START : SVX_SPELL_BODY_END );
- bGoOn = sal_True;
+ bGoOn = true;
}
WAIT_ON();
}
@@ -530,14 +530,14 @@ Reference< XDictionary > SvxSpellWrapper::GetAllRightDic() const
-sal_Bool SvxSpellWrapper::FindSpellError()
+bool SvxSpellWrapper::FindSpellError()
{
ShowLanguageErrors();
Reference< XInterface > xRef;
WAIT_ON();
- sal_Bool bSpell = sal_True;
+ bool bSpell = true;
Reference< XDictionary > xAllRightDic;
if (IsAllRight())
@@ -572,11 +572,11 @@ sal_Bool SvxSpellWrapper::FindSpellError()
LanguageTag( xAlt->getLocale() ).getLanguageType() );
}
else
- bSpell = sal_False;
+ bSpell = false;
}
}
else if (xHyphWord.is())
- bSpell = sal_False;
+ bSpell = false;
else
{
SpellEnd();
diff --git a/include/editeng/splwrap.hxx b/include/editeng/splwrap.hxx
index d2fb651..0039f44 100644
--- a/include/editeng/splwrap.hxx
+++ b/include/editeng/splwrap.hxx
@@ -56,31 +56,31 @@ private:
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > xHyph;
SdrObject* mpTextObj;
- sal_Bool bOtherCntnt : 1; // set => Check special sections initially
- sal_Bool bDialog : 1; // Is pWin the Svx...Dialog?
- sal_Bool bHyphen : 1; // Split instead of spell checking
- sal_Bool bAuto : 1; // AutoCorrect available?
- sal_Bool bReverse : 1; // Reverse spell check
- sal_Bool bStartDone : 1; // Beginning already corrected
- sal_Bool bEndDone : 1; // End part already corrected
- sal_Bool bStartChk : 1; // Examine the beginning
- sal_Bool bRevAllowed : 1; // Reverse spell check prohibited
- sal_Bool bAllRight : 1; // Record wrong words in the dedicated
+ bool bOtherCntnt : 1; // set => Check special sections initially
+ bool bDialog : 1; // Is pWin the Svx...Dialog?
+ bool bHyphen : 1; // Split instead of spell checking
+ bool bAuto : 1; // AutoCorrect available?
+ bool bReverse : 1; // Reverse spell check
+ bool bStartDone : 1; // Beginning already corrected
+ bool bEndDone : 1; // End part already corrected
+ bool bStartChk : 1; // Examine the beginning
+ bool bRevAllowed : 1; // Reverse spell check prohibited
+ bool bAllRight : 1; // Record wrong words in the dedicated
// dictionary and do not start the dialog.
- EDITENG_DLLPRIVATE sal_Bool SpellNext(); // select next area
- sal_Bool FindSpellError(); // Check for errors (over areas)
+ EDITENG_DLLPRIVATE bool SpellNext(); // select next area
+ bool FindSpellError(); // Check for errors (over areas)
public:
SvxSpellWrapper( Window* pWn,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 > &xSpellChecker,
- const sal_Bool bStart = sal_False, const sal_Bool bIsAllRight = sal_False,
- const sal_Bool bOther = sal_False, const sal_Bool bRevAllow = sal_True );
+ const bool bStart = false, const bool bIsAllRight = false,
+ const bool bOther = false, const bool bRevAllow = true );
SvxSpellWrapper( Window* pWn,
::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator > &xHyphenator,
- const sal_Bool bStart = sal_False, const sal_Bool bOther = sal_False );
+ const bool bStart = false, const bool bOther = false );
virtual ~SvxSpellWrapper();
@@ -96,21 +96,21 @@ public:
static void ShowLanguageErrors();
void SpellDocument(); // Perform Spell Checking
- inline sal_Bool IsStartDone(){ return bStartDone; }
- inline sal_Bool IsEndDone(){ return bEndDone; }
- inline sal_Bool IsReverse(){ return bReverse; }
- inline sal_Bool IsDialog(){ return bDialog; } // SvxSpellCheckDialog OnScreen
- inline sal_Bool IsHyphen(){ return bHyphen; } // Split instead of Spell check
- inline void SetHyphen( const sal_Bool bNew = sal_True ){ bHyphen = bNew; }
+ inline bool IsStartDone(){ return bStartDone; }
+ inline bool IsEndDone(){ return bEndDone; }
+ inline bool IsReverse(){ return bReverse; }
+ inline bool IsDialog(){ return bDialog; } // SvxSpellCheckDialog OnScreen
+ inline bool IsHyphen(){ return bHyphen; } // Split instead of Spell check
+ inline void SetHyphen( const bool bNew = true ){ bHyphen = bNew; }
inline ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XSpellChecker1 >
GetXSpellChecker() { return xSpell; }
inline ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XHyphenator >
GetXHyphenator() { return xHyph; }
- inline sal_Bool IsAllRight() { return bAllRight; }
+ inline bool IsAllRight() { return bAllRight; }
inline Window* GetWin() { return pWin; }
- inline void EnableAutoCorrect() { bAuto = sal_True; }
+ inline void EnableAutoCorrect() { bAuto = true; }
protected:
::com::sun::star::uno::Reference<
@@ -119,10 +119,10 @@ protected:
void SetLast(const ::com::sun::star::uno::Reference<
::com::sun::star::uno::XInterface > &xNewLast)
{ xLast = xNewLast; }
- virtual sal_Bool SpellMore(); // examine further documents?
- virtual sal_Bool HasOtherCnt(); // Are there any special areas?
- virtual void SpellStart( SvxSpellArea eSpell ); // Preparing the area
- virtual sal_Bool SpellContinue(); // Check Areas
+ virtual bool SpellMore(); // examine further documents?
+ virtual bool HasOtherCnt(); // Are there any special areas?
+ virtual void SpellStart( SvxSpellArea eSpell ); // Preparing the area
+ virtual bool SpellContinue(); // Check Areas
// Result available through GetLast
virtual void ReplaceAll( const OUString &rNewText, sal_Int16 nLanguage ); //Replace word from the replace list
virtual void StartThesaurus( const OUString &rWord, sal_uInt16 nLang );
diff --git a/sw/source/ui/inc/hyp.hxx b/sw/source/ui/inc/hyp.hxx
index f3bb7d3..02edf35 100644
--- a/sw/source/ui/inc/hyp.hxx
+++ b/sw/source/ui/inc/hyp.hxx
@@ -40,9 +40,9 @@ private:
protected:
virtual void SpellStart( SvxSpellArea eSpell );
- virtual sal_Bool SpellContinue();
+ virtual bool SpellContinue();
virtual void SpellEnd( );
- virtual sal_Bool SpellMore();
+ virtual bool SpellMore();
virtual void InsertHyphen( const sal_uInt16 nPos ); // insert hyphen
public:
diff --git a/sw/source/ui/lingu/hyp.cxx b/sw/source/ui/lingu/hyp.cxx
index 4dc0ce7..1b228e5 100644
--- a/sw/source/ui/lingu/hyp.cxx
+++ b/sw/source/ui/lingu/hyp.cxx
@@ -76,7 +76,7 @@ void SwHyphWrapper::SpellStart( SvxSpellArea eSpell )
-sal_Bool SwHyphWrapper::SpellContinue()
+bool SwHyphWrapper::SpellContinue()
{
// for automatic separation, make actions visible only at the end
boost::scoped_ptr<SwWait> pWait;
@@ -109,12 +109,12 @@ void SwHyphWrapper::SpellEnd()
}
-sal_Bool SwHyphWrapper::SpellMore()
+bool SwHyphWrapper::SpellMore()
{
PSH->Push();
bInfoBox = sal_True;
PSH->Combine();
- return sal_False;
+ return false;
}
commit fdf284276fa3f6248702208239355d7734420833
Author: Noel Grandin <noel at peralex.com>
Date: Wed Feb 26 11:01:45 2014 +0200
editeng: sal_Bool->bool
Change-Id: Ice3b0a4ccf7a6d25311ff65a23efa9082cd501de
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index 9e0d8b0..85f6223 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -1982,22 +1982,22 @@ IMPL_LINK( OfaQuoteTabPage, QuoteHdl, PushButton*, pBtn )
case SGL_START:
cDlg = cSglStartQuote;
if(cDlg == 0)
- cDlg = pAutoCorrect->GetQuote('\'', sal_True, eLang);
+ cDlg = pAutoCorrect->GetQuote('\'', true, eLang);
break;
case SGL_END:
cDlg = cSglEndQuote;
if(cDlg == 0)
- cDlg = pAutoCorrect->GetQuote('\'', sal_False, eLang);
+ cDlg = pAutoCorrect->GetQuote('\'', false, eLang);
break;
case DBL_START:
cDlg = cStartQuote;
if(cDlg == 0)
- cDlg = pAutoCorrect->GetQuote('\"', sal_True, eLang);
+ cDlg = pAutoCorrect->GetQuote('\"', true, eLang);
break;
case DBL_END:
cDlg = cEndQuote;
if(cDlg == 0)
- cDlg = pAutoCorrect->GetQuote('\"', sal_False, eLang);
+ cDlg = pAutoCorrect->GetQuote('\"', false, eLang);
break;
default:
OSL_FAIL("svx::OfaQuoteTabPage::QuoteHdl(), how to initialize cDlg?" );
diff --git a/editeng/qa/unit/core-test.cxx b/editeng/qa/unit/core-test.cxx
index 2f7b7d8..87dfd78 100644
--- a/editeng/qa/unit/core-test.cxx
+++ b/editeng/qa/unit/core-test.cxx
@@ -234,35 +234,35 @@ public:
private:
OUString & m_rText;
LanguageType m_eLang;
- virtual sal_Bool Delete( sal_Int32 nStt, sal_Int32 nEnd )
+ virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd )
{
//fprintf(stderr, "TestAutoCorrDoc::Delete\n");
m_rText = m_rText.replaceAt(nStt, nEnd-nStt, "");
return true;
}
- virtual sal_Bool Insert( sal_Int32 nPos, const OUString& rTxt )
+ virtual bool Insert( sal_Int32 nPos, const OUString& rTxt )
{
//fprintf(stderr, "TestAutoCorrDoc::Insert\n");
m_rText = m_rText.replaceAt(nPos, 0, rTxt);
return true;
}
- virtual sal_Bool Replace( sal_Int32 nPos, const OUString& rTxt )
+ virtual bool Replace( sal_Int32 nPos, const OUString& rTxt )
{
//fprintf(stderr, "TestAutoCorrDoc::Replace\n");
return ReplaceRange( nPos, rTxt.getLength(), rTxt );
}
- virtual sal_Bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt )
+ virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt )
{
//fprintf(stderr, "TestAutoCorrDoc::ReplaceRange %d %d %s\n", nPos, nLen, OUStringToOString(rTxt, RTL_TEXTENCODING_UTF8).getStr());
m_rText = m_rText.replaceAt(nPos, nLen, rTxt);
return true;
}
- virtual sal_Bool SetAttr( sal_Int32, sal_Int32, sal_uInt16, SfxPoolItem& )
+ virtual bool SetAttr( sal_Int32, sal_Int32, sal_uInt16, SfxPoolItem& )
{
//fprintf(stderr, "TestAutoCorrDoc::SetAttr\n");
return true;
}
- virtual sal_Bool SetINetAttr( sal_Int32, sal_Int32, const OUString& )
+ virtual bool SetINetAttr( sal_Int32, sal_Int32, const OUString& )
{
//fprintf(stderr, "TestAutoCorrDoc::SetINetAttr\n");
return true;
diff --git a/editeng/source/editeng/edtspell.cxx b/editeng/source/editeng/edtspell.cxx
index 1ee9734..39b6721 100644
--- a/editeng/source/editeng/edtspell.cxx
+++ b/editeng/source/editeng/edtspell.cxx
@@ -597,7 +597,7 @@ EdtAutoCorrDoc::~EdtAutoCorrDoc()
mpEditEngine->UndoActionEnd( EDITUNDO_INSERT );
}
-sal_Bool EdtAutoCorrDoc::Delete(sal_Int32 nStt, sal_Int32 nEnd)
+bool EdtAutoCorrDoc::Delete(sal_Int32 nStt, sal_Int32 nEnd)
{
EditSelection aSel( EditPaM( pCurNode, nStt ), EditPaM( pCurNode, nEnd ) );
mpEditEngine->DeleteSelection(aSel);
@@ -608,7 +608,7 @@ sal_Bool EdtAutoCorrDoc::Delete(sal_Int32 nStt, sal_Int32 nEnd)
return true;
}
-sal_Bool EdtAutoCorrDoc::Insert(sal_Int32 nPos, const OUString& rTxt)
+bool EdtAutoCorrDoc::Insert(sal_Int32 nPos, const OUString& rTxt)
{
EditSelection aSel = EditPaM( pCurNode, nPos );
mpEditEngine->InsertText(aSel, rTxt);
@@ -623,12 +623,12 @@ sal_Bool EdtAutoCorrDoc::Insert(sal_Int32 nPos, const OUString& rTxt)
return true;
}
-sal_Bool EdtAutoCorrDoc::Replace(sal_Int32 nPos, const OUString& rTxt)
+bool EdtAutoCorrDoc::Replace(sal_Int32 nPos, const OUString& rTxt)
{
return ReplaceRange( nPos, rTxt.getLength(), rTxt );
}
-sal_Bool EdtAutoCorrDoc::ReplaceRange(sal_Int32 nPos, sal_Int32 nSourceLength, const OUString& rTxt)
+bool EdtAutoCorrDoc::ReplaceRange(sal_Int32 nPos, sal_Int32 nSourceLength, const OUString& rTxt)
{
// Actually a Replace introduce => corresponds to UNDO
sal_uInt16 nEnd = nPos+nSourceLength;
@@ -651,7 +651,7 @@ sal_Bool EdtAutoCorrDoc::ReplaceRange(sal_Int32 nPos, sal_Int32 nSourceLength, c
return true;
}
-sal_Bool EdtAutoCorrDoc::SetAttr(sal_Int32 nStt, sal_Int32 nEnd,
+bool EdtAutoCorrDoc::SetAttr(sal_Int32 nStt, sal_Int32 nEnd,
sal_uInt16 nSlotId, SfxPoolItem& rItem)
{
SfxItemPool* pPool = &mpEditEngine->GetEditDoc().GetItemPool();
@@ -677,7 +677,7 @@ sal_Bool EdtAutoCorrDoc::SetAttr(sal_Int32 nStt, sal_Int32 nEnd,
return true;
}
-sal_Bool EdtAutoCorrDoc::SetINetAttr(sal_Int32 nStt, sal_Int32 nEnd,
+bool EdtAutoCorrDoc::SetINetAttr(sal_Int32 nStt, sal_Int32 nEnd,
const OUString& rURL)
{
// Turn the Text into a command field ...
@@ -768,7 +768,7 @@ bool EdtAutoCorrDoc::ChgAutoCorrWord( sal_Int32& rSttPos,
return bRet;
}
-LanguageType EdtAutoCorrDoc::GetLanguage( sal_Int32 nPos, sal_Bool ) const
+LanguageType EdtAutoCorrDoc::GetLanguage( sal_Int32 nPos, bool ) const
{
return mpEditEngine->GetLanguage( EditPaM( pCurNode, nPos+1 ) );
}
diff --git a/editeng/source/editeng/edtspell.hxx b/editeng/source/editeng/edtspell.hxx
index 75e1ef0..8e6ccd7 100644
--- a/editeng/source/editeng/edtspell.hxx
+++ b/editeng/source/editeng/edtspell.hxx
@@ -139,20 +139,20 @@ public:
EdtAutoCorrDoc(EditEngine* pE, ContentNode* pCurNode, sal_uInt16 nCrsr, sal_Unicode cIns);
~EdtAutoCorrDoc();
- virtual sal_Bool Delete( sal_Int32 nStt, sal_Int32 nEnd );
- virtual sal_Bool Insert( sal_Int32 nPos, const OUString& rTxt );
- virtual sal_Bool Replace( sal_Int32 nPos, const OUString& rTxt );
- virtual sal_Bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt );
+ virtual bool Delete( sal_Int32 nStt, sal_Int32 nEnd );
+ virtual bool Insert( sal_Int32 nPos, const OUString& rTxt );
+ virtual bool Replace( sal_Int32 nPos, const OUString& rTxt );
+ virtual bool ReplaceRange( sal_Int32 nPos, sal_Int32 nLen, const OUString& rTxt );
- virtual sal_Bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, SfxPoolItem& );
- virtual sal_Bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL );
+ virtual bool SetAttr( sal_Int32 nStt, sal_Int32 nEnd, sal_uInt16 nSlotId, SfxPoolItem& );
+ virtual bool SetINetAttr( sal_Int32 nStt, sal_Int32 nEnd, const OUString& rURL );
virtual OUString const* GetPrevPara(bool bAtNormalPos) SAL_OVERRIDE;
virtual bool ChgAutoCorrWord( sal_Int32& rSttPos, sal_Int32 nEndPos,
SvxAutoCorrect& rACorrect, OUString* pPara );
- virtual LanguageType GetLanguage( sal_Int32 nPos, sal_Bool bPrevPara = sal_False ) const;
+ virtual LanguageType GetLanguage( sal_Int32 nPos, bool bPrevPara = false ) const;
sal_uInt16 GetCursor() const { return nCursor; }
diff --git a/editeng/source/misc/acorrcfg.cxx b/editeng/source/misc/acorrcfg.cxx
index 4ec25e2..de1805a 100644
--- a/editeng/source/misc/acorrcfg.cxx
+++ b/editeng/source/misc/acorrcfg.cxx
@@ -220,8 +220,8 @@ void SvxBaseAutoCorrCfg::Load(bool bInit)
}
}
if( nFlags )
- rParent.pAutoCorrect->SetAutoCorrFlag( nFlags, sal_True );
- rParent.pAutoCorrect->SetAutoCorrFlag( ( 0xffff & ~nFlags ), sal_False );
+ rParent.pAutoCorrect->SetAutoCorrFlag( nFlags, true );
+ rParent.pAutoCorrect->SetAutoCorrFlag( ( 0xffff & ~nFlags ), false );
}
}
diff --git a/editeng/source/misc/svxacorr.cxx b/editeng/source/misc/svxacorr.cxx
index d908888..320a999 100644
--- a/editeng/source/misc/svxacorr.cxx
+++ b/editeng/source/misc/svxacorr.cxx
@@ -141,25 +141,25 @@ bool lcl_IsUnsupportedUnicodeChar( CharClass& rCC, const OUString& rTxt,
return false;
}
-static sal_Bool lcl_IsSymbolChar( CharClass& rCC, const OUString& rTxt,
+static bool lcl_IsSymbolChar( CharClass& rCC, const OUString& rTxt,
sal_Int32 nStt, sal_Int32 nEnd )
{
for( ; nStt < nEnd; ++nStt )
{
if( ::com::sun::star::i18n::UnicodeType::PRIVATE_USE ==
rCC.getType( rTxt, nStt ))
- return sal_True;
+ return true;
}
- return sal_False;
+ return false;
}
-static sal_Bool lcl_IsInAsciiArr( const sal_Char* pArr, const sal_Unicode c )
+static bool lcl_IsInAsciiArr( const sal_Char* pArr, const sal_Unicode c )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
for( ; *pArr; ++pArr )
if( *pArr == c )
{
- bRet = sal_True;
+ bRet = true;
break;
}
return bRet;
@@ -179,7 +179,7 @@ void SvxAutoCorrDoc::SaveCpltSttWord( sal_uLong, sal_Int32, const OUString&,
{
}
-LanguageType SvxAutoCorrDoc::GetLanguage( sal_Int32, sal_Bool ) const
+LanguageType SvxAutoCorrDoc::GetLanguage( sal_Int32, bool ) const
{
return LANGUAGE_SYSTEM;
}
@@ -227,7 +227,7 @@ static void lcl_ClearTable(boost::ptr_map<LanguageTag, SvxAutoCorrectLanguageLis
rLangTable.clear();
}
-sal_Bool SvxAutoCorrect::IsAutoCorrectChar( sal_Unicode cChar )
+bool SvxAutoCorrect::IsAutoCorrectChar( sal_Unicode cChar )
{
return cChar == '\0' || cChar == '\t' || cChar == 0x0a ||
cChar == ' ' || cChar == '\'' || cChar == '\"' ||
@@ -237,7 +237,7 @@ sal_Bool SvxAutoCorrect::IsAutoCorrectChar( sal_Unicode cChar )
cChar == '/' || cChar == '-';
}
-sal_Bool SvxAutoCorrect::NeedsHardspaceAutocorr( sal_Unicode cChar )
+bool SvxAutoCorrect::NeedsHardspaceAutocorr( sal_Unicode cChar )
{
return cChar == '%' || cChar == ';' || cChar == ':' || cChar == '?' || cChar == '!' ||
cChar == '/' /*case for the urls exception*/;
@@ -328,7 +328,7 @@ void SvxAutoCorrect::_GetCharClass( LanguageType eLang )
eCharClassLang = eLang;
}
-void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, sal_Bool bOn )
+void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, bool bOn )
{
long nOld = nFlags;
nFlags = bOn ? nFlags | nFlag
@@ -347,11 +347,11 @@ void SvxAutoCorrect::SetAutoCorrFlag( long nFlag, sal_Bool bOn )
// Two capital letters at the beginning of word?
-sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
+bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
CharClass& rCC = GetCharClass( eLang );
// Delete all non alphanumeric. Test the characters at the beginning/end of
@@ -427,7 +427,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTx
{
if( SaveWordWrdSttLst & nFlags )
rDoc.SaveCpltSttWord( CptlSttWrd, nSttPos, sWord, cSave );
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -436,7 +436,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttWrd( SvxAutoCorrDoc& rDoc, const OUString& rTx
}
-sal_Bool SvxAutoCorrect::FnChgOrdinalNumber(
+bool SvxAutoCorrect::FnChgOrdinalNumber(
SvxAutoCorrDoc& rDoc, const OUString& rTxt,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang )
@@ -445,7 +445,7 @@ sal_Bool SvxAutoCorrect::FnChgOrdinalNumber(
// 201th or 201st
// 12th or 12nd
CharClass& rCC = GetCharClass( eLang );
- sal_Bool bChg = sal_False;
+ bool bChg = false;
for( ; nSttPos < nEndPos; ++nSttPos )
if( !lcl_IsInAsciiArr( sImplSttSkipChars, rTxt[ nSttPos ] ))
@@ -507,12 +507,12 @@ sal_Bool SvxAutoCorrect::FnChgOrdinalNumber(
}
-sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
+bool SvxAutoCorrect::FnChgToEnEmDash(
SvxAutoCorrDoc& rDoc, const OUString& rTxt,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang )
{
- sal_Bool bRet = sal_False;
+ bool bRet = false;
CharClass& rCC = GetCharClass( eLang );
if (eLang == LANGUAGE_SYSTEM)
eLang = GetAppLang().getLanguageType();
@@ -545,7 +545,7 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
{
rDoc.Delete( nSttPos, nSttPos + 2 );
rDoc.Insert( nSttPos, bAlwaysUseEmDash ? OUString(cEmDash) : OUString(cEnDash) );
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -580,7 +580,7 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
{
rDoc.Delete( nTmpPos, nTmpPos + nLen );
rDoc.Insert( nTmpPos, bAlwaysUseEmDash ? OUString(cEmDash) : OUString(cEnDash) );
- bRet = sal_True;
+ bRet = true;
}
}
}
@@ -604,14 +604,14 @@ sal_Bool SvxAutoCorrect::FnChgToEnEmDash(
nSttPos = nSttPos + nFndPos;
rDoc.Delete( nSttPos, nSttPos + 2 );
rDoc.Insert( nSttPos, (bEnDash ? OUString(cEnDash) : OUString(cEmDash)) );
- bRet = sal_True;
+ bRet = true;
}
}
return bRet;
}
-sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
+bool SvxAutoCorrect::FnAddNonBrkSpace(
SvxAutoCorrDoc& rDoc, const OUString& rTxt,
sal_Int32, sal_Int32 nEndPos,
LanguageType eLang )
@@ -646,7 +646,7 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
if (nIndex + nProtocolLen <= rTxt.getLength())
{
if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex, nProtocolLen)) != INET_PROT_NOT_VALID)
- return sal_False;
+ return false;
}
// Check the presence of "://" in the word
@@ -697,20 +697,20 @@ sal_Bool SvxAutoCorrect::FnAddNonBrkSpace(
}
-sal_Bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
+bool SvxAutoCorrect::FnSetINetAttr( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang )
{
OUString sURL( URIHelper::FindFirstURLInText( rTxt, nSttPos, nEndPos,
GetCharClass( eLang ) ));
- sal_Bool bRet = !sURL.isEmpty();
+ bool bRet = !sURL.isEmpty();
if( bRet ) // also Attribut setzen:
rDoc.SetINetAttr( nSttPos, nEndPos, sURL );
return bRet;
}
-sal_Bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
+bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString& rTxt,
sal_Int32 , sal_Int32 nEndPos,
LanguageType eLang )
{
@@ -721,11 +721,11 @@ sal_Bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString
sal_Unicode c, cInsChar = rTxt[ nEndPos ]; // underline or bold
if( ++nEndPos != rTxt.getLength() &&
!IsWordDelim( rTxt[ nEndPos ] ) )
- return sal_False;
+ return false;
--nEndPos;
- sal_Bool bAlphaNum = sal_False;
+ bool bAlphaNum = false;
sal_Int32 nPos = nEndPos;
sal_Int32 nFndPos = -1;
CharClass& rCC = GetCharClass( eLang );
@@ -783,14 +783,14 @@ sal_Bool SvxAutoCorrect::FnChgWeightUnderl( SvxAutoCorrDoc& rDoc, const OUString
}
-sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
- const OUString& rTxt, sal_Bool bNormalPos,
+bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
+ const OUString& rTxt, bool bNormalPos,
sal_Int32 nSttPos, sal_Int32 nEndPos,
LanguageType eLang )
{
if( rTxt.isEmpty() || nEndPos <= nSttPos )
- return sal_False;
+ return false;
CharClass& rCC = GetCharClass( eLang );
OUString aText( rTxt );
@@ -799,7 +799,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
*pWordStt = 0,
*pDelim = 0;
- sal_Bool bAtStart = sal_False;
+ bool bAtStart = false;
do {
--pStr;
if (rCC.isLetter(aText, pStr - pStart))
@@ -819,17 +819,17 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
else
break;
}
- } while( 0 == ( bAtStart = (pStart == pStr)) );
+ } while( ! ( bAtStart = (pStart == pStr) ) );
if (!pWordStt)
- return sal_False; // no character to be replaced
+ return false; // no character to be replaced
if (rCC.isDigit(aText, pStr - pStart))
- return sal_False; // already ok
+ return false; // already ok
if (IsUpperLetter(rCC.getCharacterType(aText, pWordStt - pStart)))
- return sal_False; // already ok
+ return false; // already ok
//See if the text is the start of a protocol string, e.g. have text of
//"http" see if it is the start of "http:" and if so leave it alone
@@ -838,28 +838,28 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
if (nIndex + nProtocolLen <= rTxt.getLength())
{
if (INetURLObject::CompareProtocolScheme(rTxt.copy(nIndex, nProtocolLen)) != INET_PROT_NOT_VALID)
- return sal_False; // already ok
+ return false; // already ok
}
if (0x1 == *pWordStt || 0x2 == *pWordStt)
- return sal_False; // already ok
+ return false; // already ok
if( *pDelim && 2 >= pDelim - pWordStt &&
lcl_IsInAsciiArr( ".-)>", *pDelim ) )
- return sal_False;
+ return false;
if( !bAtStart ) // Still no beginning of a paragraph?
{
if ( IsWordDelim( *pStr ) )
{
- while( 0 == ( bAtStart = (pStart == pStr--) ) && IsWordDelim( *pStr ))
+ while( ! ( bAtStart = (pStart == pStr--) ) && IsWordDelim( *pStr ) )
;
}
// Asian full stop, full width full stop, full width exclamation mark
// and full width question marks are treated as word delimiters
else if ( 0x3002 != *pStr && 0xFF0E != *pStr && 0xFF01 != *pStr &&
0xFF1F != *pStr )
- return sal_False; // no valid separator -> no replacement
+ return false; // no valid separator -> no replacement
}
if( bAtStart ) // at the beginning of a paragraph?
@@ -877,7 +877,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
}
aText = *pPrevPara;
- bAtStart = sal_False;
+ bAtStart = false;
pStart = aText.getStr();
pStr = pStart + aText.getLength();
@@ -885,10 +885,10 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
--pStr;
if( !IsWordDelim( *pStr ))
break;
- } while( 0 == ( bAtStart = (pStart == pStr)) );
+ } while( ! ( bAtStart = (pStart == pStr) ) );
if( bAtStart )
- return sal_False; // no valid separator -> no replacement
+ return false; // no valid separator -> no replacement
}
// Found [ \t]+[A-Z0-9]+ until here. Test now on the paragraph separator.
@@ -896,7 +896,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
const sal_Unicode* pExceptStt = 0;
if( !bAtStart )
{
- sal_Bool bContinue = sal_True;
+ bool bContinue = true;
int nFlag = C_NONE;
do {
switch( *pStr )
@@ -913,10 +913,10 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
//previous word is a . So probably last word is an
//anagram that ends in . and not truly the end of a
//previous sentence, so don't autocapitalize this word
- return sal_False;
+ return false;
}
if( nFlag & C_FULL_STOP )
- return sal_False; // no valid separator -> no replacement
+ return false; // no valid separator -> no replacement
nFlag |= C_FULL_STOP;
pExceptStt = pStr;
}
@@ -925,7 +925,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
case 0xFF01 :
{
if( nFlag & C_EXCLAMATION_MARK )
- return sal_False; // no valid separator -> no replacement
+ return false; // no valid separator -> no replacement
nFlag |= C_EXCLAMATION_MARK;
}
break;
@@ -933,21 +933,21 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
case 0xFF1F :
{
if( nFlag & C_QUESTION_MARK)
- return sal_False; // no valid separator -> no replacement
+ return false; // no valid separator -> no replacement
nFlag |= C_QUESTION_MARK;
}
break;
default:
if( !nFlag )
- return sal_False; // no valid separator -> no replacement
+ return false; // no valid separator -> no replacement
else
- bContinue = sal_False;
+ bContinue = false;
break;
}
if( bContinue && pStr-- == pStart )
{
- return sal_False; // no valid separator -> no replacement
+ return false; // no valid separator -> no replacement
}
} while( bContinue );
if( C_FULL_STOP != nFlag )
@@ -955,28 +955,28 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
}
if( 2 > ( pStr - pStart ) )
- return sal_False;
+ return false;
if (!rCC.isLetterNumeric(aText, pStr-- - pStart))
{
- sal_Bool bValid = sal_False, bAlphaFnd = sal_False;
+ bool bValid = false, bAlphaFnd = false;
const sal_Unicode* pTmpStr = pStr;
while( !bValid )
{
if( rCC.isDigit( aText, pTmpStr - pStart ) )
{
- bValid = sal_True;
+ bValid = true;
pStr = pTmpStr - 1;
}
else if( rCC.isLetter( aText, pTmpStr - pStart ) )
{
if( bAlphaFnd )
{
- bValid = sal_True;
+ bValid = true;
pStr = pTmpStr;
}
else
- bAlphaFnd = sal_True;
+ bAlphaFnd = true;
}
else if( bAlphaFnd || IsWordDelim( *pTmpStr ) )
break;
@@ -988,16 +988,16 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
}
if( !bValid )
- return sal_False; // no valid separator -> no replacement
+ return false; // no valid separator -> no replacement
}
- sal_Bool bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
+ bool bNumericOnly = '0' <= *(pStr+1) && *(pStr+1) <= '9';
// Search for the beginning of the word
while( !IsWordDelim( *pStr ))
{
if( bNumericOnly && rCC.isLetter( aText, pStr - pStart ) )
- bNumericOnly = sal_False;
+ bNumericOnly = false;
if( pStart == pStr )
break;
@@ -1006,7 +1006,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
}
if( bNumericOnly ) // consists of only numbers, then not
- return sal_False;
+ return false;
if( IsWordDelim( *pStr ))
++pStr;
@@ -1018,7 +1018,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
{
sWord = OUString(pStr, pExceptStt - pStr + 1);
if( FindInCplSttExceptList(eLang, sWord) )
- return sal_False;
+ return false;
// Delete all non alphanumeric. Test the characters at the
// beginning/end of the word ( recognizes: "(min.", "/min.", and so on.)
@@ -1037,10 +1037,10 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
if( !sTmp.isEmpty() && sTmp.getLength() != sWord.getLength() &&
FindInCplSttExceptList(eLang, sTmp))
- return sal_False;
+ return false;
- if(FindInCplSttExceptList(eLang, sWord, sal_True))
- return sal_False;
+ if(FindInCplSttExceptList(eLang, sWord, true))
+ return false;
}
// Ok, then replace
@@ -1048,7 +1048,7 @@ sal_Bool SvxAutoCorrect::FnCptlSttSntnc( SvxAutoCorrDoc& rDoc,
nSttPos = pWordStt - rTxt.getStr();
OUString sChar( cSave );
sChar = rCC.titlecase(sChar); //see fdo#56740
- sal_Bool bRet = sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar );
+ bool bRet = sChar[0] != cSave && rDoc.ReplaceRange( nSttPos, 1, sChar );
// Parahaps someone wants to have the word
if( bRet && SaveWordCplSttLst & nFlags )
@@ -1100,7 +1100,7 @@ bool SvxAutoCorrect::FnCorrectCapsLock( SvxAutoCorrDoc& rDoc, const OUString& rT
}
-sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote,
+sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, bool bSttQuote,
LanguageType eLang ) const
{
sal_Unicode cRet = bSttQuote ? ( '\"' == cInsChar
@@ -1131,10 +1131,10 @@ sal_Unicode SvxAutoCorrect::GetQuote( sal_Unicode cInsChar, sal_Bool bSttQuote,
}
void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
- sal_Unicode cInsChar, sal_Bool bSttQuote,
- sal_Bool bIns )
+ sal_Unicode cInsChar, bool bSttQuote,
+ bool bIns )
{
- LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
+ LanguageType eLang = rDoc.GetLanguage( nInsPos, false );
sal_Unicode cRet = GetQuote( cInsChar, bSttQuote, eLang );
OUString sChg( cInsChar );
@@ -1173,9 +1173,9 @@ void SvxAutoCorrect::InsertQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
}
OUString SvxAutoCorrect::GetQuote( SvxAutoCorrDoc& rDoc, sal_Int32 nInsPos,
- sal_Unicode cInsChar, sal_Bool bSttQuote )
+ sal_Unicode cInsChar, bool bSttQuote )
{
- LanguageType eLang = rDoc.GetLanguage( nInsPos, sal_False );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list