summaryrefslogtreecommitdiff
path: root/editeng/source/outliner
diff options
context:
space:
mode:
authorJan Holesovsky <kendy@suse.cz>2011-03-18 15:49:47 +0100
committerJan Holesovsky <kendy@suse.cz>2011-03-18 15:49:47 +0100
commit091e4aee3386f3bfee081dc8646494e0eb97f88a (patch)
treedd79298b4e8729ca7dc874274d4a33ea88fe107d /editeng/source/outliner
parentf0681adbf092e2b455db52535f2df882bc87343a (diff)
parent224bd63b3fa459baa0a6bb5cd03f5dc2ca475d82 (diff)
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts: avmedia/source/framework/mediacontrol.cxx connectivity/source/commontools/DateConversion.cxx desktop/source/deployment/registry/component/dp_component.cxx editeng/inc/editeng/numitem.hxx editeng/inc/editeng/txtrange.hxx editeng/source/editeng/editobj.cxx editeng/source/editeng/editview.cxx editeng/source/editeng/eehtml.cxx editeng/source/editeng/impedit3.cxx editeng/source/editeng/impedit4.cxx editeng/source/misc/txtrange.cxx editeng/source/outliner/outlin2.cxx editeng/source/outliner/outlvw.cxx framework/source/layoutmanager/layoutmanager.cxx linguistic/source/lngsvcmgr.hxx sfx2/source/appl/app.cxx sfx2/source/appl/app.src sfx2/source/appl/appbas.cxx sfx2/source/appl/appcfg.cxx sfx2/source/appl/appdde.cxx sfx2/source/appl/appmain.cxx sfx2/source/appl/appopen.cxx sfx2/source/appl/appquit.cxx sfx2/source/appl/appserv.cxx sfx2/source/appl/childwin.cxx sfx2/source/appl/fileobj.cxx sfx2/source/appl/fileobj.hxx sfx2/source/appl/workwin.cxx sfx2/source/control/dispatch.cxx sfx2/source/control/macro.cxx sfx2/source/control/objface.cxx sfx2/source/control/request.cxx sfx2/source/control/shell.cxx sfx2/source/control/statcach.cxx sfx2/source/dialog/dinfdlg.cxx sfx2/source/dialog/dockwin.cxx sfx2/source/dialog/mailmodel.cxx sfx2/source/dialog/mailmodelapi.cxx sfx2/source/dialog/mgetempl.cxx sfx2/source/dialog/splitwin.cxx sfx2/source/dialog/styledlg.cxx sfx2/source/dialog/tabdlg.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/dialog/tplcitem.cxx sfx2/source/dialog/tplpitem.cxx sfx2/source/doc/doctempl.cxx sfx2/source/doc/docvor.cxx sfx2/source/doc/new.cxx sfx2/source/doc/objcont.cxx sfx2/source/doc/objserv.cxx sfx2/source/doc/objxtor.cxx sfx2/source/inc/appdata.hxx sfx2/source/inc/helpid.hrc sfx2/source/inc/sfxlocal.hrc sfx2/source/inc/statcach.hxx sfx2/source/inc/templdgi.hxx sfx2/source/inc/virtmenu.hxx sfx2/source/inc/workwin.hxx sfx2/source/menu/mnumgr.cxx sfx2/source/menu/virtmenu.cxx sfx2/source/statbar/stbitem.cxx sfx2/source/view/frame.cxx sfx2/source/view/frame2.cxx sfx2/source/view/orgmgr.cxx sfx2/source/view/printer.cxx sfx2/source/view/prnmon.cxx sfx2/source/view/sfxbasecontroller.cxx sfx2/source/view/viewfrm.cxx sfx2/source/view/viewfrm2.cxx sfx2/source/view/viewprn.cxx sfx2/source/view/viewsh.cxx svx/inc/svx/svditer.hxx svx/source/dialog/sdstring.src svx/source/form/fmpage.cxx svx/source/form/formcontroller.cxx svx/source/svdraw/svdcrtv.cxx svx/source/svdraw/svditer.cxx svx/source/svdraw/svdview.cxx xmloff/source/forms/elementimport.cxx
Diffstat (limited to 'editeng/source/outliner')
-rw-r--r--editeng/source/outliner/makefile.mk60
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outl_pch.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outl_pch.hxx0
-rw-r--r--editeng/source/outliner/outleeng.cxx42
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outleeng.hxx34
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outlin2.cxx156
-rw-r--r--editeng/source/outliner/outliner.cxx456
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outliner.src0
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outlobj.cxx0
-rwxr-xr-x[-rw-r--r--]editeng/source/outliner/outlundo.cxx34
-rw-r--r--editeng/source/outliner/outlundo.hxx18
-rw-r--r--editeng/source/outliner/outlvw.cxx360
-rw-r--r--editeng/source/outliner/paralist.cxx66
-rw-r--r--editeng/source/outliner/paralist.hxx24
14 files changed, 594 insertions, 656 deletions
diff --git a/editeng/source/outliner/makefile.mk b/editeng/source/outliner/makefile.mk
deleted file mode 100644
index df1c795801ae..000000000000
--- a/editeng/source/outliner/makefile.mk
+++ /dev/null
@@ -1,60 +0,0 @@
-#*************************************************************************
-#
-# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-#
-# Copyright 2000, 2010 Oracle and/or its affiliates.
-#
-# OpenOffice.org - a multi-platform office productivity suite
-#
-# This file is part of OpenOffice.org.
-#
-# OpenOffice.org is free software: you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License version 3
-# only, as published by the Free Software Foundation.
-#
-# OpenOffice.org is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU Lesser General Public License version 3 for more details
-# (a copy is included in the LICENSE file that accompanied this code).
-#
-# You should have received a copy of the GNU Lesser General Public License
-# version 3 along with OpenOffice.org. If not, see
-# <http://www.openoffice.org/license.html>
-# for a copy of the LGPLv3 License.
-#
-#*************************************************************************
-
-PRJ=..$/..
-
-PRJNAME=editeng
-TARGET=outliner
-AUTOSEG=true
-ENABLE_EXCEPTIONS=TRUE
-
-PROJECTPCH4DLL=TRUE
-PROJECTPCH=outl_pch
-PROJECTPCHSOURCE=outl_pch
-
-
-# --- Settings -----------------------------------------------------------
-
-.INCLUDE : settings.mk
-.INCLUDE : $(PRJ)$/util$/makefile.pmk
-
-# --- Allgemein ----------------------------------------------------------
-
-SLOFILES= \
- $(SLO)$/outlundo.obj \
- $(SLO)$/outliner.obj \
- $(SLO)$/outlin2.obj \
- $(SLO)$/paralist.obj \
- $(SLO)$/outlvw.obj \
- $(SLO)$/outleeng.obj \
- $(SLO)$/outlobj.obj
-
-SRS1NAME=$(TARGET)
-SRC1FILES= outliner.src
-
-.INCLUDE : target.mk
-
diff --git a/editeng/source/outliner/outl_pch.cxx b/editeng/source/outliner/outl_pch.cxx
index 22522eb0369d..22522eb0369d 100644..100755
--- a/editeng/source/outliner/outl_pch.cxx
+++ b/editeng/source/outliner/outl_pch.cxx
diff --git a/editeng/source/outliner/outl_pch.hxx b/editeng/source/outliner/outl_pch.hxx
index 06f1f29760a7..06f1f29760a7 100644..100755
--- a/editeng/source/outliner/outl_pch.hxx
+++ b/editeng/source/outliner/outl_pch.hxx
diff --git a/editeng/source/outliner/outleeng.cxx b/editeng/source/outliner/outleeng.cxx
index 751c7f2e32a4..1e49a67a027e 100644
--- a/editeng/source/outliner/outleeng.cxx
+++ b/editeng/source/outliner/outleeng.cxx
@@ -56,7 +56,7 @@ OutlinerEditEng::~OutlinerEditEng()
{
}
-void OutlinerEditEng::PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
+void OutlinerEditEng::PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
{
if( GetControlWord() && EE_CNTRL_OUTLINER )
{
@@ -67,7 +67,7 @@ void OutlinerEditEng::PaintingFirstLine( USHORT nPara, const Point& rStartPos, l
pOwner->PaintBullet( nPara, rStartPos, rOrigin, nOrientation, pOutDev );
}
-const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( USHORT nPara ) const
+const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( sal_uInt16 nPara ) const
{
const SvxNumberFormat* pFmt = NULL;
if (pOwner)
@@ -76,32 +76,32 @@ const SvxNumberFormat* OutlinerEditEng::GetNumberFormat( USHORT nPara ) const
}
-Rectangle OutlinerEditEng::GetBulletArea( USHORT nPara )
+Rectangle OutlinerEditEng::GetBulletArea( sal_uInt16 nPara )
{
Rectangle aBulletArea = Rectangle( Point(), Point() );
if ( nPara < pOwner->pParaList->GetParagraphCount() )
{
if ( pOwner->ImplHasBullet( nPara ) )
- aBulletArea = pOwner->ImpCalcBulletArea( nPara, FALSE, FALSE );
+ aBulletArea = pOwner->ImpCalcBulletArea( nPara, sal_False, sal_False );
}
return aBulletArea;
}
-void OutlinerEditEng::ParagraphInserted( USHORT nNewParagraph )
+void OutlinerEditEng::ParagraphInserted( sal_uInt16 nNewParagraph )
{
pOwner->ParagraphInserted( nNewParagraph );
EditEngine::ParagraphInserted( nNewParagraph );
}
-void OutlinerEditEng::ParagraphDeleted( USHORT nDeletedParagraph )
+void OutlinerEditEng::ParagraphDeleted( sal_uInt16 nDeletedParagraph )
{
pOwner->ParagraphDeleted( nDeletedParagraph );
EditEngine::ParagraphDeleted( nDeletedParagraph );
}
-void OutlinerEditEng::ParagraphConnected( USHORT /*nLeftParagraph*/, USHORT nRightParagraph )
+void OutlinerEditEng::ParagraphConnected( sal_uInt16 /*nLeftParagraph*/, sal_uInt16 nRightParagraph )
{
if( pOwner && pOwner->IsUndoEnabled() && !const_cast<EditEngine&>(pOwner->GetEditEngine()).IsInUndo() )
{
@@ -119,22 +119,22 @@ void OutlinerEditEng::StyleSheetChanged( SfxStyleSheet* pStyle )
pOwner->StyleSheetChanged( pStyle );
}
-void OutlinerEditEng::ParaAttribsChanged( USHORT nPara )
+void OutlinerEditEng::ParaAttribsChanged( sal_uInt16 nPara )
{
pOwner->ParaAttribsChanged( nPara );
}
-BOOL OutlinerEditEng::SpellNextDocument()
+sal_Bool OutlinerEditEng::SpellNextDocument()
{
return pOwner->SpellNextDocument();
}
-BOOL OutlinerEditEng::ConvertNextDocument()
+sal_Bool OutlinerEditEng::ConvertNextDocument()
{
return pOwner->ConvertNextDocument();
}
-XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
+XubString OutlinerEditEng::GetUndoComment( sal_uInt16 nUndoId ) const
{
switch( nUndoId )
{
@@ -158,8 +158,8 @@ XubString OutlinerEditEng::GetUndoComment( USHORT nUndoId ) const
}
}
-void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen,
- const sal_Int32* pDXArray, const SvxFont& rFont, USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen,
+ const sal_Int32* pDXArray, const SvxFont& rFont, sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
@@ -174,7 +174,7 @@ void OutlinerEditEng::DrawingText( const Point& rStartPos, const XubString& rTex
}
void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar,
- const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
+ const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
bool bEndOfLine, bool bEndOfParagraph,
const Color& rOverlineColor, const Color& rTextLineColor)
{
@@ -182,23 +182,23 @@ void OutlinerEditEng::DrawingTab( const Point& rStartPos, long nWidth, const Str
bEndOfLine, bEndOfParagraph, rOverlineColor, rTextLineColor );
}
-void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void OutlinerEditEng::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
{
EditEngine::FieldClicked( rField, nPara, nPos ); // If URL
pOwner->FieldClicked( rField, nPara, nPos );
}
-void OutlinerEditEng::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void OutlinerEditEng::FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
{
pOwner->FieldSelected( rField, nPara, nPos );
}
-XubString OutlinerEditEng::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString OutlinerEditEng::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
{
return pOwner->CalcFieldValue( rField, nPara, nPos, rpTxtColor, rpFldColor );
}
-void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void OutlinerEditEng::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
if( pPara )
@@ -206,13 +206,13 @@ void OutlinerEditEng::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
if ( !IsInUndo() && IsUndoEnabled() )
pOwner->UndoActionStart( OLUNDO_ATTR );
- EditEngine::SetParaAttribs( (USHORT)nPara, rSet );
+ EditEngine::SetParaAttribs( (sal_uInt16)nPara, rSet );
- pOwner->ImplCheckNumBulletItem( (USHORT)nPara );
+ pOwner->ImplCheckNumBulletItem( (sal_uInt16)nPara );
// #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
- pOwner->ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pOwner->pParaList->GetParagraphCount()) );
+ pOwner->ImplCheckParagraphs( (sal_uInt16)nPara, (sal_uInt16) (pOwner->pParaList->GetParagraphCount()) );
if ( !IsInUndo() && IsUndoEnabled() )
pOwner->UndoActionEnd( OLUNDO_ATTR );
diff --git a/editeng/source/outliner/outleeng.hxx b/editeng/source/outliner/outleeng.hxx
index 085aadc12b97..59124b83042d 100644..100755
--- a/editeng/source/outliner/outleeng.hxx
+++ b/editeng/source/outliner/outleeng.hxx
@@ -42,21 +42,21 @@ protected:
// derived from EditEngine. Allows Outliner objetcs to provide
// bullet access to the EditEngine.
- virtual const SvxNumberFormat* GetNumberFormat( USHORT nPara ) const;
+ virtual const SvxNumberFormat* GetNumberFormat( sal_uInt16 nPara ) const;
public:
OutlinerEditEng( Outliner* pOwner, SfxItemPool* pPool );
~OutlinerEditEng();
- virtual void PaintingFirstLine( USHORT nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
+ virtual void PaintingFirstLine( sal_uInt16 nPara, const Point& rStartPos, long nBaseLineY, const Point& rOrigin, short nOrientation, OutputDevice* pOutDev );
- virtual void ParagraphInserted( USHORT nNewParagraph );
- virtual void ParagraphDeleted( USHORT nDeletedParagraph );
- virtual void ParagraphConnected( USHORT nLeftParagraph, USHORT nRightParagraph );
+ virtual void ParagraphInserted( sal_uInt16 nNewParagraph );
+ virtual void ParagraphDeleted( sal_uInt16 nDeletedParagraph );
+ virtual void ParagraphConnected( sal_uInt16 nLeftParagraph, sal_uInt16 nRightParagraph );
virtual void DrawingText(
- const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont,
- USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+ const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray, const SvxFont& rFont,
+ sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
@@ -68,27 +68,27 @@ public:
virtual void DrawingTab(
const Point& rStartPos, long nWidth, const String& rChar,
- const SvxFont& rFont, USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft,
+ const SvxFont& rFont, sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft,
bool bEndOfLine,
bool bEndOfParagraph,
const Color& rOverlineColor,
const Color& rTextLineColor);
virtual void StyleSheetChanged( SfxStyleSheet* pStyle );
- virtual void ParaAttribsChanged( USHORT nPara );
- virtual BOOL SpellNextDocument();
- virtual XubString GetUndoComment( USHORT nUndoId ) const;
+ virtual void ParaAttribsChanged( sal_uInt16 nPara );
+ virtual sal_Bool SpellNextDocument();
+ virtual XubString GetUndoComment( sal_uInt16 nUndoId ) const;
// for text conversion
- virtual BOOL ConvertNextDocument();
+ virtual sal_Bool ConvertNextDocument();
- virtual void FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
- virtual void FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos );
- virtual XubString CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rTxtColor, Color*& rFldColor );
+ virtual void FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos );
+ virtual void FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos );
+ virtual XubString CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rTxtColor, Color*& rFldColor );
- virtual Rectangle GetBulletArea( USHORT nPara );
+ virtual Rectangle GetBulletArea( sal_uInt16 nPara );
- virtual void SetParaAttribs( USHORT nPara, const SfxItemSet& rSet );
+ virtual void SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet );
// belongs into class Outliner, move there before incompatible update!
Link aOutlinerNotifyHdl;
diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx
index dcefdca1e580..401effdbd20f 100644..100755
--- a/editeng/source/outliner/outlin2.cxx
+++ b/editeng/source/outliner/outlin2.cxx
@@ -60,14 +60,14 @@ using namespace ::com::sun::star::linguistic2;
// ====================== Simple pass-through =======================
// ======================================================================
-void Outliner::SetUpdateMode( BOOL bUpdate )
+void Outliner::SetUpdateMode( sal_Bool bUpdate )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetUpdateMode( bUpdate );
}
-BOOL Outliner::GetUpdateMode() const
+sal_Bool Outliner::GetUpdateMode() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetUpdateMode();
@@ -79,13 +79,13 @@ const SfxItemSet& Outliner::GetEmptyItemSet() const
return pEditEngine->GetEmptyItemSet();
}
-void Outliner::EnableUndo( BOOL bEnable )
+void Outliner::EnableUndo( sal_Bool bEnable )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->EnableUndo( bEnable );
}
-BOOL Outliner::IsUndoEnabled() const
+sal_Bool Outliner::IsUndoEnabled() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsUndoEnabled();
@@ -122,13 +122,13 @@ void Outliner::ClearModifyFlag()
pEditEngine->ClearModifyFlag();
}
-BOOL Outliner::IsModified() const
+sal_Bool Outliner::IsModified() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsModified();
}
-ULONG Outliner::GetTextHeight() const
+sal_uLong Outliner::GetTextHeight() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetTextHeight();
@@ -176,31 +176,31 @@ Link Outliner::GetStatusEventHdl() const
return pEditEngine->GetStatusEventHdl();
}
-void Outliner::SetDefTab( USHORT nTab )
+void Outliner::SetDefTab( sal_uInt16 nTab )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetDefTab( nTab );
}
-USHORT Outliner::GetDefTab() const
+sal_uInt16 Outliner::GetDefTab() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetDefTab();
}
-BOOL Outliner::IsFlatMode() const
+sal_Bool Outliner::IsFlatMode() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsFlatMode();
}
-BOOL Outliner::UpdateFields()
+sal_Bool Outliner::UpdateFields()
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->UpdateFields();
}
-void Outliner::RemoveFields( BOOL bKeepFieldText, TypeId aType )
+void Outliner::RemoveFields( sal_Bool bKeepFieldText, TypeId aType )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->RemoveFields( bKeepFieldText, aType );
@@ -218,7 +218,7 @@ String Outliner::GetWordDelimiters() const
return pEditEngine->GetWordDelimiters();
}
-String Outliner::GetWord( USHORT nPara, USHORT nIndex )
+String Outliner::GetWord( sal_uInt16 nPara, sal_uInt16 nIndex )
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetWord( nPara, nIndex );
@@ -303,7 +303,7 @@ void Outliner::SetMaxAutoPaperSize( const Size& rSz )
pEditEngine->SetMaxAutoPaperSize( rSz );
}
-BOOL Outliner::IsExpanded( Paragraph* pPara ) const
+sal_Bool Outliner::IsExpanded( Paragraph* pPara ) const
{
DBG_CHKTHIS(Outliner,0);
return pParaList->HasVisibleChilds( pPara );
@@ -315,7 +315,7 @@ Paragraph* Outliner::GetParent( Paragraph* pParagraph ) const
return pParaList->GetParent( pParagraph );
}
-ULONG Outliner::GetChildCount( Paragraph* pParent ) const
+sal_uLong Outliner::GetChildCount( Paragraph* pParent ) const
{
DBG_CHKTHIS(Outliner,0);
return pParaList->GetChildCount( pParent );
@@ -330,7 +330,7 @@ Size Outliner::CalcTextSize()
Point Outliner::GetDocPos( Paragraph* pPara )
{
DBG_CHKTHIS(Outliner,0);
- return pEditEngine->GetDocPosTopLeft( (USHORT)pParaList->GetAbsPos( pPara ) );
+ return pEditEngine->GetDocPosTopLeft( (sal_uInt16)pParaList->GetAbsPos( pPara ) );
}
void Outliner::SetStyleSheetPool( SfxStyleSheetPool* pSPool )
@@ -345,73 +345,73 @@ SfxStyleSheetPool* Outliner::GetStyleSheetPool()
return pEditEngine->GetStyleSheetPool();
}
-SfxStyleSheet* Outliner::GetStyleSheet( ULONG nPara )
+SfxStyleSheet* Outliner::GetStyleSheet( sal_uLong nPara )
{
DBG_CHKTHIS(Outliner,0);
- return pEditEngine->GetStyleSheet( (USHORT)nPara );
+ return pEditEngine->GetStyleSheet( (sal_uInt16)nPara );
}
-BOOL Outliner::IsInSelectionMode() const
+sal_Bool Outliner::IsInSelectionMode() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsInSelectionMode();
}
-void Outliner::SetControlWord( ULONG nWord )
+void Outliner::SetControlWord( sal_uLong nWord )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetControlWord( nWord );
}
-ULONG Outliner::GetControlWord() const
+sal_uLong Outliner::GetControlWord() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetControlWord();
}
-void Outliner::SetAsianCompressionMode( USHORT n )
+void Outliner::SetAsianCompressionMode( sal_uInt16 n )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetAsianCompressionMode( n );
}
-USHORT Outliner::GetAsianCompressionMode() const
+sal_uInt16 Outliner::GetAsianCompressionMode() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetAsianCompressionMode();
}
-void Outliner::SetKernAsianPunctuation( BOOL b )
+void Outliner::SetKernAsianPunctuation( sal_Bool b )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetKernAsianPunctuation( b );
}
-BOOL Outliner::IsKernAsianPunctuation() const
+sal_Bool Outliner::IsKernAsianPunctuation() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsKernAsianPunctuation();
}
-void Outliner::SetAddExtLeading( BOOL bExtLeading )
+void Outliner::SetAddExtLeading( sal_Bool bExtLeading )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetAddExtLeading( bExtLeading );
}
-BOOL Outliner::IsAddExtLeading() const
+sal_Bool Outliner::IsAddExtLeading() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsAddExtLeading();
}
-void Outliner::UndoActionStart( USHORT nId )
+void Outliner::UndoActionStart( sal_uInt16 nId )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->UndoActionStart( nId );
}
-void Outliner::UndoActionEnd( USHORT nId )
+void Outliner::UndoActionEnd( sal_uInt16 nId )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->UndoActionEnd( nId );
@@ -420,34 +420,34 @@ void Outliner::UndoActionEnd( USHORT nId )
void Outliner::InsertUndo( EditUndo* pUndo )
{
DBG_CHKTHIS(Outliner,0);
- pEditEngine->GetUndoManager().AddUndoAction( pUndo, FALSE );
+ pEditEngine->GetUndoManager().AddUndoAction( pUndo, sal_False );
}
-BOOL Outliner::IsInUndo()
+sal_Bool Outliner::IsInUndo()
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsInUndo();
}
-ULONG Outliner::GetLineCount( ULONG nParagraph ) const
+sal_uLong Outliner::GetLineCount( sal_uLong nParagraph ) const
{
DBG_CHKTHIS(Outliner,0);
- return pEditEngine->GetLineCount( (USHORT)nParagraph );
+ return pEditEngine->GetLineCount( (sal_uInt16)nParagraph );
}
-USHORT Outliner::GetLineLen( ULONG nParagraph, USHORT nLine ) const
+sal_uInt16 Outliner::GetLineLen( sal_uLong nParagraph, sal_uInt16 nLine ) const
{
DBG_CHKTHIS(Outliner,0);
- return pEditEngine->GetLineLen( (USHORT)nParagraph, nLine );
+ return pEditEngine->GetLineLen( (sal_uInt16)nParagraph, nLine );
}
-ULONG Outliner::GetLineHeight( ULONG nParagraph, ULONG nLine )
+sal_uLong Outliner::GetLineHeight( sal_uLong nParagraph, sal_uLong nLine )
{
DBG_CHKTHIS(Outliner,0);
- return pEditEngine->GetLineHeight( (USHORT)nParagraph, (USHORT)nLine );
+ return pEditEngine->GetLineHeight( (sal_uInt16)nParagraph, (sal_uInt16)nLine );
}
-void Outliner::QuickRemoveCharAttribs( USHORT nPara, USHORT nWhich )
+void Outliner::QuickRemoveCharAttribs( sal_uInt16 nPara, sal_uInt16 nWhich )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->QuickRemoveCharAttribs( nPara, nWhich );
@@ -465,10 +465,10 @@ sal_Bool Outliner::HasConvertibleTextPortion( LanguageType nLang )
return pEditEngine->HasConvertibleTextPortion( nLang );
}
-BOOL Outliner::ConvertNextDocument()
+sal_Bool Outliner::ConvertNextDocument()
{
DBG_CHKTHIS(Outliner,0);
- return FALSE;
+ return sal_False;
}
void Outliner::SetDefaultLanguage( LanguageType eLang )
@@ -483,7 +483,7 @@ LanguageType Outliner::GetDefaultLanguage() const
return pEditEngine->GetDefaultLanguage();
}
-BOOL Outliner::HasOnlineSpellErrors() const
+sal_Bool Outliner::HasOnlineSpellErrors() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->HasOnlineSpellErrors();
@@ -495,7 +495,7 @@ void Outliner::CompleteOnlineSpelling()
pEditEngine->CompleteOnlineSpelling();
}
-BOOL Outliner::HasText( const SvxSearchItem& rSearchItem )
+sal_Bool Outliner::HasText( const SvxSearchItem& rSearchItem )
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->HasText( rSearchItem );
@@ -513,10 +513,10 @@ SfxItemPool* Outliner::GetEditTextObjectPool() const
return pEditEngine->GetEditTextObjectPool();
}
-BOOL Outliner::SpellNextDocument()
+sal_Bool Outliner::SpellNextDocument()
{
DBG_CHKTHIS(Outliner,0);
- return FALSE;
+ return sal_False;
}
@@ -562,16 +562,16 @@ OutputDevice* Outliner::GetRefDevice() const
return pEditEngine->GetRefDevice();
}
-USHORT Outliner::GetFirstLineOffset( ULONG nParagraph )
+sal_uInt16 Outliner::GetFirstLineOffset( sal_uLong nParagraph )
{
DBG_CHKTHIS(Outliner,0);
- return pEditEngine->GetFirstLineOffset( (USHORT)nParagraph );
+ return pEditEngine->GetFirstLineOffset( (sal_uInt16)nParagraph );
}
-ULONG Outliner::GetTextHeight( ULONG nParagraph ) const
+sal_uLong Outliner::GetTextHeight( sal_uLong nParagraph ) const
{
DBG_CHKTHIS(Outliner,0);
- return pEditEngine->GetTextHeight((USHORT)nParagraph );
+ return pEditEngine->GetTextHeight((sal_uInt16)nParagraph );
}
Point Outliner::GetDocPos( const Point& rPaperPos ) const
@@ -580,35 +580,35 @@ Point Outliner::GetDocPos( const Point& rPaperPos ) const
return pEditEngine->GetDocPos( rPaperPos );
}
-Point Outliner::GetDocPosTopLeft( ULONG nParagraph )
+Point Outliner::GetDocPosTopLeft( sal_uLong nParagraph )
{
DBG_CHKTHIS(Outliner,0);
- return pEditEngine->GetDocPosTopLeft( (USHORT)nParagraph );
+ return pEditEngine->GetDocPosTopLeft( (sal_uInt16)nParagraph );
}
-BOOL Outliner::IsTextPos( const Point& rPaperPos, USHORT nBorder )
+sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder )
{
return IsTextPos( rPaperPos, nBorder, NULL );
}
-BOOL Outliner::IsTextPos( const Point& rPaperPos, USHORT nBorder, BOOL* pbBullet )
+sal_Bool Outliner::IsTextPos( const Point& rPaperPos, sal_uInt16 nBorder, sal_Bool* pbBullet )
{
DBG_CHKTHIS(Outliner,0);
if ( pbBullet)
- *pbBullet = FALSE;
- BOOL bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder );
+ *pbBullet = sal_False;
+ sal_Bool bTextPos = pEditEngine->IsTextPos( rPaperPos, nBorder );
if ( !bTextPos )
{
Point aDocPos = GetDocPos( rPaperPos );
- USHORT nPara = pEditEngine->FindParagraph( aDocPos.Y() );
+ sal_uInt16 nPara = pEditEngine->FindParagraph( aDocPos.Y() );
if ( ( nPara != EE_PARA_NOT_FOUND ) && ImplHasBullet( nPara ) )
{
- Rectangle aBulArea = ImpCalcBulletArea( nPara, TRUE, TRUE );
+ Rectangle aBulArea = ImpCalcBulletArea( nPara, sal_True, sal_True );
if ( aBulArea.IsInside( rPaperPos ) )
{
- bTextPos = TRUE;
+ bTextPos = sal_True;
if ( pbBullet)
- *pbBullet = TRUE;
+ *pbBullet = sal_True;
}
}
}
@@ -624,50 +624,50 @@ void Outliner::QuickSetAttribs( const SfxItemSet& rSet, const ESelection& rSel )
void Outliner::QuickInsertText( const XubString& rText, const ESelection& rSel )
{
- bFirstParaIsEmpty = FALSE;
+ bFirstParaIsEmpty = sal_False;
pEditEngine->QuickInsertText( rText, rSel );
}
void Outliner::QuickDelete( const ESelection& rSel )
{
- bFirstParaIsEmpty = FALSE;
+ bFirstParaIsEmpty = sal_False;
pEditEngine->QuickDelete( rSel );
}
void Outliner::QuickInsertField( const SvxFieldItem& rFld, const ESelection& rSel )
{
DBG_CHKTHIS(Outliner,0);
- bFirstParaIsEmpty = FALSE;
+ bFirstParaIsEmpty = sal_False;
pEditEngine->QuickInsertField( rFld, rSel );
}
void Outliner::QuickInsertLineBreak( const ESelection& rSel )
{
DBG_CHKTHIS(Outliner,0);
- bFirstParaIsEmpty = FALSE;
+ bFirstParaIsEmpty = sal_False;
pEditEngine->QuickInsertLineBreak( rSel );
}
-void Outliner::QuickFormatDoc( BOOL bFull )
+void Outliner::QuickFormatDoc( sal_Bool bFull )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->QuickFormatDoc( bFull );
}
-void Outliner::SetGlobalCharStretching( USHORT nX, USHORT nY )
+void Outliner::SetGlobalCharStretching( sal_uInt16 nX, sal_uInt16 nY )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetGlobalCharStretching( nX, nY );
}
-void Outliner::GetGlobalCharStretching( USHORT& rX, USHORT& rY )
+void Outliner::GetGlobalCharStretching( sal_uInt16& rX, sal_uInt16& rY )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->GetGlobalCharStretching( rX, rY );
}
-void Outliner::DoStretchChars( USHORT nX, USHORT nY )
+void Outliner::DoStretchChars( sal_uInt16 nX, sal_uInt16 nY )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->DoStretchChars( nX, nY );
@@ -679,43 +679,43 @@ void Outliner::EraseVirtualDevice()
pEditEngine->EraseVirtualDevice();
}
-void Outliner::SetBigTextObjectStart( USHORT nStartAtPortionCount )
+void Outliner::SetBigTextObjectStart( sal_uInt16 nStartAtPortionCount )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetBigTextObjectStart( nStartAtPortionCount );
}
-USHORT Outliner::GetBigTextObjectStart() const
+sal_uInt16 Outliner::GetBigTextObjectStart() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetBigTextObjectStart();
}
-BOOL Outliner::ShouldCreateBigTextObject() const
+sal_Bool Outliner::ShouldCreateBigTextObject() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->ShouldCreateBigTextObject();
}
-void Outliner::SetVertical( BOOL b )
+void Outliner::SetVertical( sal_Bool b )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetVertical( b );
}
-BOOL Outliner::IsVertical() const
+sal_Bool Outliner::IsVertical() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsVertical();
}
-void Outliner::SetFixedCellHeight( BOOL bUseFixedCellHeight )
+void Outliner::SetFixedCellHeight( sal_Bool bUseFixedCellHeight )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetFixedCellHeight( bUseFixedCellHeight );
}
-BOOL Outliner::IsFixedCellHeight() const
+sal_Bool Outliner::IsFixedCellHeight() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsFixedCellHeight();
@@ -733,13 +733,13 @@ EEHorizontalTextDirection Outliner::GetDefaultHorizontalTextDirection() const
return pEditEngine->GetDefaultHorizontalTextDirection();
}
-USHORT Outliner::GetScriptType( const ESelection& rSelection ) const
+sal_uInt16 Outliner::GetScriptType( const ESelection& rSelection ) const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetScriptType( rSelection );
}
-LanguageType Outliner::GetLanguage( USHORT nPara, USHORT nPos ) const
+LanguageType Outliner::GetLanguage( sal_uInt16 nPara, sal_uInt16 nPos ) const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetLanguage( nPara, nPos );
@@ -751,25 +751,25 @@ void Outliner::RemoveAttribs( const ESelection& rSelection, sal_Bool bRemovePara
pEditEngine->RemoveAttribs( rSelection, bRemoveParaAttribs, nWhich );
}
-void Outliner::EnableAutoColor( BOOL b )
+void Outliner::EnableAutoColor( sal_Bool b )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->EnableAutoColor( b );
}
-BOOL Outliner::IsAutoColorEnabled() const
+sal_Bool Outliner::IsAutoColorEnabled() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsAutoColorEnabled();
}
-void Outliner::ForceAutoColor( BOOL b )
+void Outliner::ForceAutoColor( sal_Bool b )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->ForceAutoColor( b );
}
-BOOL Outliner::IsForceAutoColor() const
+sal_Bool Outliner::IsForceAutoColor() const
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->IsForceAutoColor();
diff --git a/editeng/source/outliner/outliner.cxx b/editeng/source/outliner/outliner.cxx
index 20b9f4ddd406..86b93a2eef19 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -70,20 +70,20 @@ using ::std::advance;
#define DEFAULT_SCALE 75
-static const USHORT nDefStyles = 3; // Special treatment for the first 3 levels
-static const USHORT nDefBulletIndent = 800;
-static const USHORT nDefBulletWidth = 700;
-static const USHORT pDefBulletIndents[nDefStyles]= { 1400, 800, 800 };
-static const USHORT pDefBulletWidths[nDefStyles] = { 1000, 850, 700 };
+static const sal_uInt16 nDefStyles = 3; // Special treatment for the first 3 levels
+static const sal_uInt16 nDefBulletIndent = 800;
+static const sal_uInt16 nDefBulletWidth = 700;
+static const sal_uInt16 pDefBulletIndents[nDefStyles]= { 1400, 800, 800 };
+static const sal_uInt16 pDefBulletWidths[nDefStyles] = { 1000, 850, 700 };
-USHORT lcl_ImplGetDefBulletWidth( sal_Int16 nDepth )
+sal_uInt16 lcl_ImplGetDefBulletWidth( sal_Int16 nDepth )
{
return ( nDepth < nDefStyles ) ? pDefBulletWidths[nDepth] : nDefBulletWidth;
}
-USHORT lcl_ImplGetDefBulletIndent( sal_Int16 nDepth )
+sal_uInt16 lcl_ImplGetDefBulletIndent( sal_Int16 nDepth )
{
- USHORT nI = 0;
+ sal_uInt16 nI = 0;
if( nDepth >= 0 )
{
@@ -108,7 +108,7 @@ void Outliner::ImplCheckDepth( sal_Int16& rnDepth ) const
rnDepth = nMaxDepth;
}
-Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDepth)
+Paragraph* Outliner::Insert(const XubString& rText, sal_uLong nAbsPos, sal_Int16 nDepth)
{
DBG_CHKTHIS(Outliner,0);
DBG_ASSERT(pParaList->GetParagraphCount(),"Insert:No Paras");
@@ -117,7 +117,7 @@ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDe
ImplCheckDepth( nDepth );
- ULONG nParagraphCount = pParaList->GetParagraphCount();
+ sal_uLong nParagraphCount = pParaList->GetParagraphCount();
if( nAbsPos > nParagraphCount )
nAbsPos = nParagraphCount;
@@ -137,28 +137,28 @@ Paragraph* Outliner::Insert(const XubString& rText, ULONG nAbsPos, sal_Int16 nDe
}
else
{
- BOOL bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( FALSE );
- ImplBlockInsertionCallbacks( TRUE );
+ sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+ pEditEngine->SetUpdateMode( sal_False );
+ ImplBlockInsertionCallbacks( sal_True );
pPara = new Paragraph( nDepth );
pParaList->Insert( pPara, nAbsPos );
- pEditEngine->InsertParagraph( (USHORT)nAbsPos, String() );
+ pEditEngine->InsertParagraph( (sal_uInt16)nAbsPos, String() );
DBG_ASSERT(pPara==pParaList->GetParagraph(nAbsPos),"Insert:Failed");
- ImplInitDepth( (USHORT)nAbsPos, nDepth, FALSE );
+ ImplInitDepth( (sal_uInt16)nAbsPos, nDepth, sal_False );
pHdlParagraph = pPara;
ParagraphInsertedHdl();
pPara->nFlags |= PARAFLAG_HOLDDEPTH;
SetText( rText, pPara );
- ImplBlockInsertionCallbacks( FALSE );
+ ImplBlockInsertionCallbacks( sal_False );
pEditEngine->SetUpdateMode( bUpdate );
}
- bFirstParaIsEmpty = FALSE;
+ bFirstParaIsEmpty = sal_False;
DBG_ASSERT(pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(),"SetText failed");
return pPara;
}
-void Outliner::ParagraphInserted( USHORT nPara )
+void Outliner::ParagraphInserted( sal_uInt16 nPara )
{
DBG_CHKTHIS(Outliner,0);
@@ -172,7 +172,7 @@ void Outliner::ParagraphInserted( USHORT nPara )
if( pEditEngine->IsInUndo() )
{
pPara->nFlags = PARAFLAG_SETBULLETTEXT;
- pPara->bVisible = TRUE;
+ pPara->bVisible = sal_True;
const SfxInt16Item& rLevel = (const SfxInt16Item&) pEditEngine->GetParaAttrib( nPara, EE_PARA_OUTLLEVEL );
pPara->SetDepth( rLevel.GetValue() );
}
@@ -189,14 +189,14 @@ void Outliner::ParagraphInserted( USHORT nPara )
if( !pEditEngine->IsInUndo() )
{
- ImplCalcBulletText( nPara, TRUE, FALSE );
+ ImplCalcBulletText( nPara, sal_True, sal_False );
pHdlParagraph = pPara;
ParagraphInsertedHdl();
}
}
}
-void Outliner::ParagraphDeleted( USHORT nPara )
+void Outliner::ParagraphDeleted( sal_uInt16 nPara )
{
DBG_CHKTHIS(Outliner,0);
@@ -223,24 +223,24 @@ void Outliner::ParagraphDeleted( USHORT nPara )
pPara = pParaList->GetParagraph( nPara );
if ( pPara && ( pPara->GetDepth() > nDepth ) )
{
- ImplCalcBulletText( nPara, TRUE, FALSE );
+ ImplCalcBulletText( nPara, sal_True, sal_False );
// Search for next on the this level ...
while ( pPara && pPara->GetDepth() > nDepth )
pPara = pParaList->GetParagraph( ++nPara );
}
if ( pPara && ( pPara->GetDepth() == nDepth ) )
- ImplCalcBulletText( nPara, TRUE, FALSE );
+ ImplCalcBulletText( nPara, sal_True, sal_False );
}
}
-void Outliner::Init( USHORT nMode )
+void Outliner::Init( sal_uInt16 nMode )
{
nOutlinerMode = nMode;
Clear();
- ULONG nCtrl = pEditEngine->GetControlWord();
+ sal_uLong nCtrl = pEditEngine->GetControlWord();
nCtrl &= ~(EE_CNTRL_OUTLINER|EE_CNTRL_OUTLINER2);
SetMaxDepth( 9 );
@@ -263,12 +263,12 @@ void Outliner::Init( USHORT nMode )
pEditEngine->SetControlWord( nCtrl );
- ImplInitDepth( 0, GetMinDepth(), FALSE );
+ ImplInitDepth( 0, GetMinDepth(), sal_False );
GetUndoManager().Clear();
}
-void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
+void Outliner::SetMaxDepth( sal_Int16 nDepth, sal_Bool bCheckParagraphs )
{
if( nMaxDepth != nDepth )
{
@@ -276,8 +276,8 @@ void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
if( bCheckParagraphs )
{
- USHORT nParagraphs = (USHORT)pParaList->GetParagraphCount();
- for ( USHORT nPara = 0; nPara < nParagraphs; nPara++ )
+ sal_uInt16 nParagraphs = (sal_uInt16)pParaList->GetParagraphCount();
+ for ( sal_uInt16 nPara = 0; nPara < nParagraphs; nPara++ )
{
Paragraph* pPara = pParaList->GetParagraph( nPara );
if( pPara && pPara->GetDepth() > nMaxDepth )
@@ -289,7 +289,7 @@ void Outliner::SetMaxDepth( sal_Int16 nDepth, BOOL bCheckParagraphs )
}
}
-sal_Int16 Outliner::GetDepth( ULONG nPara ) const
+sal_Int16 Outliner::GetDepth( sal_uLong nPara ) const
{
Paragraph* pPara = pParaList->GetParagraph( nPara );
DBG_ASSERT( pPara, "Outliner::GetDepth - Paragraph not found!" );
@@ -308,9 +308,9 @@ void Outliner::SetDepth( Paragraph* pPara, sal_Int16 nNewDepth )
mnDepthChangeHdlPrevFlags = pPara->nFlags;
pHdlParagraph = pPara;
- USHORT nPara = (USHORT)GetAbsPos( pPara );
- ImplInitDepth( nPara, nNewDepth, TRUE );
- ImplCalcBulletText( nPara, FALSE, FALSE );
+ sal_uInt16 nPara = (sal_uInt16)GetAbsPos( pPara );
+ ImplInitDepth( nPara, nNewDepth, sal_True );
+ ImplCalcBulletText( nPara, sal_False, sal_False );
if ( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
ImplSetLevelDependendStyleSheet( nPara );
@@ -341,7 +341,7 @@ void Outliner::SetNumberingStartValue( sal_uInt16 nPara, sal_Int16 nNumberingSta
// #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
- ImplCheckParagraphs( nPara, (USHORT) (pParaList->GetParagraphCount()) );
+ ImplCheckParagraphs( nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
pEditEngine->SetModified();
}
}
@@ -368,18 +368,18 @@ void Outliner::SetParaIsNumberingRestart( sal_uInt16 nPara, sal_Bool bParaIsNumb
// #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
- ImplCheckParagraphs( nPara, (USHORT) (pParaList->GetParagraphCount()) );
+ ImplCheckParagraphs( nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
pEditEngine->SetModified();
}
}
-OutlinerParaObject* Outliner::CreateParaObject( USHORT nStartPara, USHORT nCount ) const
+OutlinerParaObject* Outliner::CreateParaObject( sal_uInt16 nStartPara, sal_uInt16 nCount ) const
{
DBG_CHKTHIS(Outliner,0);
- if ( sal::static_int_cast< ULONG >( nStartPara + nCount ) >
+ if ( sal::static_int_cast< sal_uLong >( nStartPara + nCount ) >
pParaList->GetParagraphCount() )
- nCount = sal::static_int_cast< USHORT >(
+ nCount = sal::static_int_cast< sal_uInt16 >(
pParaList->GetParagraphCount() - nStartPara );
// When a new OutlinerParaObject is created because a paragraph is just beeing deleted,
@@ -412,16 +412,16 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
DBG_CHKTHIS(Outliner,0);
DBG_ASSERT(pPara,"SetText:No Para");
- BOOL bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( FALSE );
- ImplBlockInsertionCallbacks( TRUE );
+ sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+ pEditEngine->SetUpdateMode( sal_False );
+ ImplBlockInsertionCallbacks( sal_True );
- USHORT nPara = (USHORT)pParaList->GetAbsPos( pPara );
+ sal_uInt16 nPara = (sal_uInt16)pParaList->GetAbsPos( pPara );
if( !rText.Len() )
{
pEditEngine->SetText( nPara, rText );
- ImplInitDepth( nPara, pPara->GetDepth(), FALSE );
+ ImplInitDepth( nPara, pPara->GetDepth(), sal_False );
}
else
{
@@ -431,9 +431,9 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
if( aText.GetChar( aText.Len()-1 ) == '\x0A' )
aText.Erase( aText.Len()-1, 1 ); // Delete the last break
- USHORT nCount = aText.GetTokenCount( '\x0A' );
- USHORT nPos = 0;
- USHORT nInsPos = nPara+1;
+ sal_uInt16 nCount = aText.GetTokenCount( '\x0A' );
+ sal_uInt16 nPos = 0;
+ sal_uInt16 nInsPos = nPara+1;
while( nCount > nPos )
{
XubString aStr = aText.GetToken( nPos, '\x0A' );
@@ -453,7 +453,7 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
( ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEVIEW ) )
{
// Extract Tabs
- USHORT nTabs = 0;
+ sal_uInt16 nTabs = 0;
while ( ( nTabs < aStr.Len() ) && ( aStr.GetChar( nTabs ) == '\t' ) )
nTabs++;
if ( nTabs )
@@ -480,15 +480,15 @@ void Outliner::SetText( const XubString& rText, Paragraph* pPara )
nInsPos--;
pEditEngine->SetText( nInsPos, aStr );
}
- ImplInitDepth( nInsPos, nCurDepth, FALSE );
+ ImplInitDepth( nInsPos, nCurDepth, sal_False );
nInsPos++;
nPos++;
}
}
DBG_ASSERT(pParaList->GetParagraphCount()==pEditEngine->GetParagraphCount(),"SetText failed!");
- bFirstParaIsEmpty = FALSE;
- ImplBlockInsertionCallbacks( FALSE );
+ bFirstParaIsEmpty = sal_False;
+ ImplBlockInsertionCallbacks( sal_False );
pEditEngine->SetUpdateMode( bUpdate );
}
@@ -499,7 +499,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
DBG_CHKTHIS(Outliner,0);
bool bConverted = false;
- USHORT nTabs = 0;
+ sal_uInt16 nTabs = 0;
ESelection aDelSel;
// const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (sal_uInt16)nPara );
@@ -509,16 +509,16 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
XubString aHeading_US( RTL_CONSTASCII_USTRINGPARAM( "heading" ) );
XubString aNumber_US( RTL_CONSTASCII_USTRINGPARAM( "Numbering" ) );
- XubString aStr( pEditEngine->GetText( (USHORT)nPara ) );
+ XubString aStr( pEditEngine->GetText( (sal_uInt16)nPara ) );
xub_Unicode* pPtr = (xub_Unicode*)aStr.GetBuffer();
- USHORT nHeadingNumberStart = 0;
- USHORT nNumberingNumberStart = 0;
- SfxStyleSheet* pStyle= pEditEngine->GetStyleSheet( (USHORT)nPara );
+ sal_uInt16 nHeadingNumberStart = 0;
+ sal_uInt16 nNumberingNumberStart = 0;
+ SfxStyleSheet* pStyle= pEditEngine->GetStyleSheet( (sal_uInt16)nPara );
if( pStyle )
{
aName = pStyle->GetName();
- USHORT nSearch;
+ sal_uInt16 nSearch;
if ( ( nSearch = aName.Search( aHeading_US ) ) != STRING_NOTFOUND )
nHeadingNumberStart = nSearch + aHeading_US.Len();
else if ( ( nSearch = aName.Search( aNumber_US ) ) != STRING_NOTFOUND )
@@ -532,16 +532,16 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
( pPtr[0] != '\t' ) && ( pPtr[1] == '\t' ) )
{
// Extract Bullet and Tab
- aDelSel = ESelection( (USHORT)nPara, 0, (USHORT)nPara, 2 );
+ aDelSel = ESelection( (sal_uInt16)nPara, 0, (sal_uInt16)nPara, 2 );
}
- USHORT nPos = nHeadingNumberStart ? nHeadingNumberStart : nNumberingNumberStart;
+ sal_uInt16 nPos = nHeadingNumberStart ? nHeadingNumberStart : nNumberingNumberStart;
String aLevel = aName.Copy( nPos );
aLevel.EraseLeadingChars( ' ' );
- nTabs = sal::static_int_cast< USHORT >(aLevel.ToInt32());
+ nTabs = sal::static_int_cast< sal_uInt16 >(aLevel.ToInt32());
if( nTabs )
nTabs--; // Level 0 = "heading 1"
- bConverted = TRUE;
+ bConverted = sal_True;
}
else
{
@@ -553,7 +553,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
}
// Remove tabs from the text
if( nTabs )
- aDelSel = ESelection( (USHORT)nPara, 0, (USHORT)nPara, nTabs );
+ aDelSel = ESelection( (sal_uInt16)nPara, 0, (sal_uInt16)nPara, nTabs );
}
if ( aDelSel.HasRange() )
@@ -571,7 +571,7 @@ bool Outliner::ImpConvertEdtToOut( sal_uInt32 nPara,EditView* pView)
sal_Int16 nOutlLevel = rLevel.GetValue();
ImplCheckDepth( nOutlLevel );
- ImplInitDepth( sal::static_int_cast< sal_uInt16 >(nPara), nOutlLevel, FALSE );
+ ImplInitDepth( sal::static_int_cast< sal_uInt16 >(nPara), nOutlLevel, sal_False );
return bConverted;
}
@@ -580,25 +580,25 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
{
DBG_CHKTHIS(Outliner,0);
- BOOL bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+ pEditEngine->SetUpdateMode( sal_False );
- BOOL bUndo = pEditEngine->IsUndoEnabled();
- EnableUndo( FALSE );
+ sal_Bool bUndo = pEditEngine->IsUndoEnabled();
+ EnableUndo( sal_False );
Init( rPObj.GetOutlinerMode() );
- ImplBlockInsertionCallbacks( TRUE );
+ ImplBlockInsertionCallbacks( sal_True );
pEditEngine->SetText(rPObj.GetTextObject());
if( rPObj.Count() != pEditEngine->GetParagraphCount() )
{
int nop=0;nop++;
}
- bFirstParaIsEmpty = FALSE;
+ bFirstParaIsEmpty = sal_False;
- pParaList->Clear( TRUE );
- for( USHORT nCurPara = 0; nCurPara < rPObj.Count(); nCurPara++ )
+ pParaList->Clear( sal_True );
+ for( sal_uInt16 nCurPara = 0; nCurPara < rPObj.Count(); nCurPara++ )
{
Paragraph* pPara = new Paragraph( rPObj.GetParagraphData(nCurPara));
ImplCheckDepth( pPara->nDepth );
@@ -610,10 +610,10 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
// #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
- ImplCheckParagraphs( 0, (USHORT) (pParaList->GetParagraphCount()) );
+ ImplCheckParagraphs( 0, (sal_uInt16) (pParaList->GetParagraphCount()) );
EnableUndo( bUndo );
- ImplBlockInsertionCallbacks( FALSE );
+ ImplBlockInsertionCallbacks( sal_False );
pEditEngine->SetUpdateMode( bUpdate );
DBG_ASSERT( pParaList->GetParagraphCount()==rPObj.Count(),"SetText failed");
@@ -625,14 +625,14 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
DBG_CHKTHIS(Outliner,0);
Paragraph* pPara;
- BOOL bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+ pEditEngine->SetUpdateMode( sal_False );
- ImplBlockInsertionCallbacks( TRUE );
- ULONG nPara;
+ ImplBlockInsertionCallbacks( sal_True );
+ sal_uLong nPara;
if( bFirstParaIsEmpty )
{
- pParaList->Clear( TRUE );
+ pParaList->Clear( sal_True );
pEditEngine->SetText(rPObj.GetTextObject());
nPara = 0;
}
@@ -641,53 +641,53 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
nPara = pParaList->GetParagraphCount();
pEditEngine->InsertParagraph( EE_PARA_APPEND, rPObj.GetTextObject() );
}
- bFirstParaIsEmpty = FALSE;
+ bFirstParaIsEmpty = sal_False;
- for( USHORT n = 0; n < rPObj.Count(); n++ )
+ for( sal_uInt16 n = 0; n < rPObj.Count(); n++ )
{
pPara = new Paragraph( rPObj.GetParagraphData(n) );
pParaList->Append(pPara);
- USHORT nP = sal::static_int_cast< USHORT >(nPara+n);
+ sal_uInt16 nP = sal::static_int_cast< sal_uInt16 >(nPara+n);
DBG_ASSERT(pParaList->GetAbsPos(pPara)==nP,"AddText:Out of sync");
- ImplInitDepth( nP, pPara->GetDepth(), FALSE );
+ ImplInitDepth( nP, pPara->GetDepth(), sal_False );
}
DBG_ASSERT( pEditEngine->GetParagraphCount()==pParaList->GetParagraphCount(), "SetText: OutOfSync" );
// #i100014#
// It is not a good idea to substract 1 from a count and cast the result
// to USHORT without check, if the count is 0.
- ImplCheckParagraphs( (USHORT)nPara, (USHORT) (pParaList->GetParagraphCount()) );
+ ImplCheckParagraphs( (sal_uInt16)nPara, (sal_uInt16) (pParaList->GetParagraphCount()) );
- ImplBlockInsertionCallbacks( FALSE );
+ ImplBlockInsertionCallbacks( sal_False );
pEditEngine->SetUpdateMode( bUpdate );
}
-void Outliner::FieldClicked( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void Outliner::FieldClicked( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
{
DBG_CHKTHIS(Outliner,0);
if ( aFieldClickedHdl.IsSet() )
{
EditFieldInfo aFldInfo( this, rField, nPara, nPos );
- aFldInfo.SetSimpleClick( TRUE );
+ aFldInfo.SetSimpleClick( sal_True );
aFieldClickedHdl.Call( &aFldInfo );
}
}
-void Outliner::FieldSelected( const SvxFieldItem& rField, USHORT nPara, USHORT nPos )
+void Outliner::FieldSelected( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos )
{
DBG_CHKTHIS(Outliner,0);
if ( !aFieldClickedHdl.IsSet() )
return;
EditFieldInfo aFldInfo( this, rField, nPara, nPos );
- aFldInfo.SetSimpleClick( FALSE );
+ aFldInfo.SetSimpleClick( sal_False );
aFieldClickedHdl.Call( &aFldInfo );
}
-XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, USHORT nPos, Color*& rpTxtColor, Color*& rpFldColor )
+XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, sal_uInt16 nPara, sal_uInt16 nPos, Color*& rpTxtColor, Color*& rpFldColor )
{
DBG_CHKTHIS(Outliner,0);
if ( !aCalcFieldValueHdl.IsSet() )
@@ -711,19 +711,19 @@ XubString Outliner::CalcFieldValue( const SvxFieldItem& rField, USHORT nPara, US
return aFldInfo.GetRepresentation();
}
-void Outliner::SetStyleSheet( ULONG nPara, SfxStyleSheet* pStyle )
+void Outliner::SetStyleSheet( sal_uLong nPara, SfxStyleSheet* pStyle )
{
DBG_CHKTHIS(Outliner,0);
Paragraph* pPara = pParaList->GetParagraph( nPara );
if (pPara)
{
- pEditEngine->SetStyleSheet( (USHORT)nPara, pStyle );
+ pEditEngine->SetStyleSheet( (sal_uInt16)nPara, pStyle );
pPara->nFlags |= PARAFLAG_SETBULLETTEXT;
- ImplCheckNumBulletItem( (USHORT) nPara );
+ ImplCheckNumBulletItem( (sal_uInt16) nPara );
}
}
-void Outliner::SetVisible( Paragraph* pPara, BOOL bVisible )
+void Outliner::SetVisible( Paragraph* pPara, sal_Bool bVisible )
{
DBG_CHKTHIS(Outliner,0);
DBG_ASSERT( pPara, "SetVisible: pPara = NULL" );
@@ -731,19 +731,19 @@ void Outliner::SetVisible( Paragraph* pPara, BOOL bVisible )
if (pPara)
{
pPara->bVisible = bVisible;
- ULONG nPara = pParaList->GetAbsPos( pPara );
- pEditEngine->ShowParagraph( (USHORT)nPara, bVisible );
+ sal_uLong nPara = pParaList->GetAbsPos( pPara );
+ pEditEngine->ShowParagraph( (sal_uInt16)nPara, bVisible );
}
}
-void Outliner::ImplCheckNumBulletItem( USHORT nPara )
+void Outliner::ImplCheckNumBulletItem( sal_uInt16 nPara )
{
Paragraph* pPara = pParaList->GetParagraph( nPara );
if (pPara)
pPara->aBulSize.Width() = -1;
}
-void Outliner::ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLevelStyle )
+void Outliner::ImplSetLevelDependendStyleSheet( sal_uInt16 nPara, SfxStyleSheet* pLevelStyle )
{
DBG_CHKTHIS(Outliner,0);
@@ -778,7 +778,7 @@ void Outliner::ImplSetLevelDependendStyleSheet( USHORT nPara, SfxStyleSheet* pLe
}
}
-void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo, BOOL bUndoAction )
+void Outliner::ImplInitDepth( sal_uInt16 nPara, sal_Int16 nDepth, sal_Bool bCreateUndo, sal_Bool bUndoAction )
{
DBG_CHKTHIS(Outliner,0);
@@ -794,10 +794,10 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
// the old values are restored by the EditEngine.
if( !IsInUndo() )
{
- BOOL bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+ pEditEngine->SetUpdateMode( sal_False );
- BOOL bUndo = bCreateUndo && IsUndoEnabled();
+ sal_Bool bUndo = bCreateUndo && IsUndoEnabled();
if ( bUndo && bUndoAction )
UndoActionStart( OLUNDO_DEPTH );
@@ -805,7 +805,7 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
aAttrs.Put( SfxInt16Item( EE_PARA_OUTLLEVEL, nDepth ) );
pEditEngine->SetParaAttribs( nPara, aAttrs );
ImplCheckNumBulletItem( nPara );
- ImplCalcBulletText( nPara, FALSE, FALSE );
+ ImplCalcBulletText( nPara, sal_False, sal_False );
if ( bUndo )
{
@@ -818,30 +818,30 @@ void Outliner::ImplInitDepth( USHORT nPara, sal_Int16 nDepth, BOOL bCreateUndo,
}
}
-void Outliner::SetParaAttribs( USHORT nPara, const SfxItemSet& rSet )
+void Outliner::SetParaAttribs( sal_uInt16 nPara, const SfxItemSet& rSet )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetParaAttribs( nPara, rSet );
}
-BOOL Outliner::Expand( Paragraph* pPara )
+sal_Bool Outliner::Expand( Paragraph* pPara )
{
DBG_CHKTHIS(Outliner,0);
if ( pParaList->HasHiddenChilds( pPara ) )
{
OLUndoExpand* pUndo = 0;
- BOOL bUndo = IsUndoEnabled() && !IsInUndo();
+ sal_Bool bUndo = IsUndoEnabled() && !IsInUndo();
if( bUndo )
{
UndoActionStart( OLUNDO_EXPAND );
pUndo = new OLUndoExpand( this, OLUNDO_EXPAND );
pUndo->pParas = 0;
- pUndo->nCount = (USHORT)pParaList->GetAbsPos( pPara );
+ pUndo->nCount = (sal_uInt16)pParaList->GetAbsPos( pPara );
}
pHdlParagraph = pPara;
- bIsExpanding = TRUE;
+ bIsExpanding = sal_True;
pParaList->Expand( pPara );
ExpandHdl();
InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) );
@@ -850,32 +850,32 @@ BOOL Outliner::Expand( Paragraph* pPara )
InsertUndo( pUndo );
UndoActionEnd( OLUNDO_EXPAND );
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-BOOL Outliner::Collapse( Paragraph* pPara )
+sal_Bool Outliner::Collapse( Paragraph* pPara )
{
DBG_CHKTHIS(Outliner,0);
if ( pParaList->HasVisibleChilds( pPara ) ) // expanded
{
OLUndoExpand* pUndo = 0;
- BOOL bUndo = FALSE;
+ sal_Bool bUndo = sal_False;
if( !IsInUndo() && IsUndoEnabled() )
- bUndo = TRUE;
+ bUndo = sal_True;
if( bUndo )
{
UndoActionStart( OLUNDO_COLLAPSE );
pUndo = new OLUndoExpand( this, OLUNDO_COLLAPSE );
pUndo->pParas = 0;
- pUndo->nCount = (USHORT)pParaList->GetAbsPos( pPara );
+ pUndo->nCount = (sal_uInt16)pParaList->GetAbsPos( pPara );
}
pHdlParagraph = pPara;
- bIsExpanding = FALSE;
+ bIsExpanding = sal_False;
pParaList->Collapse( pPara );
ExpandHdl();
InvalidateBullet( pPara, pParaList->GetAbsPos(pPara) );
@@ -884,13 +884,13 @@ BOOL Outliner::Collapse( Paragraph* pPara )
InsertUndo( pUndo );
UndoActionEnd( OLUNDO_COLLAPSE );
}
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
-Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
+Font Outliner::ImpCalcBulletFont( sal_uInt16 nPara ) const
{
const SvxNumberFormat* pFmt = GetNumberFormat( nPara );
DBG_ASSERT( pFmt && ( pFmt->GetNumberingType() != SVX_NUM_BITMAP ) && ( pFmt->GetNumberingType() != SVX_NUM_NUMBER_NONE ), "ImpCalcBulletFont: Missing or BitmapBullet!" );
@@ -922,17 +922,17 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
}
// Use original scale...
- USHORT nStretchX, nStretchY;
+ sal_uInt16 nStretchX, nStretchY;
const_cast<Outliner*>(this)->GetGlobalCharStretching(nStretchX, nStretchY);
- USHORT nScale = pFmt->GetBulletRelSize() * nStretchY / 100;
- ULONG nScaledLineHeight = aStdFont.GetSize().Height();
+ sal_uInt16 nScale = pFmt->GetBulletRelSize() * nStretchY / 100;
+ sal_uLong nScaledLineHeight = aStdFont.GetSize().Height();
nScaledLineHeight *= nScale*10;
nScaledLineHeight /= 1000;
aBulletFont.SetAlign( ALIGN_BOTTOM );
aBulletFont.SetSize( Size( 0, nScaledLineHeight ) );
- BOOL bVertical = IsVertical();
+ sal_Bool bVertical = IsVertical();
aBulletFont.SetVertical( bVertical );
aBulletFont.SetOrientation( bVertical ? 2700 : 0 );
@@ -949,7 +949,7 @@ Font Outliner::ImpCalcBulletFont( USHORT nPara ) const
return aBulletFont;
}
-void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
+void Outliner::PaintBullet( sal_uInt16 nPara, const Point& rStartPos,
const Point& rOrigin, short nOrientation, OutputDevice* pOutDev )
{
DBG_CHKTHIS(Outliner,0);
@@ -963,12 +963,12 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
if ( ImplHasBullet( nPara ) && bDrawBullet)
{
- BOOL bVertical = IsVertical();
+ sal_Bool bVertical = IsVertical();
- BOOL bRightToLeftPara = pEditEngine->IsRightToLeft( nPara );
+ sal_Bool bRightToLeftPara = pEditEngine->IsRightToLeft( nPara );
- Rectangle aBulletArea( ImpCalcBulletArea( nPara, TRUE, FALSE ) );
- USHORT nStretchX, nStretchY;
+ Rectangle aBulletArea( ImpCalcBulletArea( nPara, sal_True, sal_False ) );
+ sal_uInt16 nStretchX, nStretchY;
GetGlobalCharStretching(nStretchX, nStretchY);
aBulletArea = Rectangle( Point(aBulletArea.Left()*nStretchX/100,
aBulletArea.Top()),
@@ -983,7 +983,7 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
{
Font aBulletFont( ImpCalcBulletFont( nPara ) );
// Use baseline
- BOOL bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
+ sal_Bool bSymbol = pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL;
aBulletFont.SetAlign( bSymbol ? ALIGN_BOTTOM : ALIGN_BASELINE );
Font aOldFont = pOutDev->GetFont();
pOutDev->SetFont( aBulletFont );
@@ -1028,7 +1028,7 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
}
// VCL will take care of brackets and so on...
- ULONG nLayoutMode = pOutDev->GetLayoutMode();
+ sal_uLong nLayoutMode = pOutDev->GetLayoutMode();
nLayoutMode &= ~(TEXT_LAYOUT_BIDI_RTL|TEXT_LAYOUT_COMPLEX_DISABLED|TEXT_LAYOUT_BIDI_STRONG);
if ( bRightToLeftPara )
nLayoutMode |= TEXT_LAYOUT_BIDI_RTL;
@@ -1136,15 +1136,15 @@ void Outliner::PaintBullet( USHORT nPara, const Point& rStartPos,
}
}
-void Outliner::InvalidateBullet( Paragraph* /*pPara*/, ULONG nPara )
+void Outliner::InvalidateBullet( Paragraph* /*pPara*/, sal_uLong nPara )
{
DBG_CHKTHIS(Outliner,0);
- long nLineHeight = (long)pEditEngine->GetLineHeight((USHORT)nPara );
+ long nLineHeight = (long)pEditEngine->GetLineHeight((sal_uInt16)nPara );
for ( size_t i = 0, n = aViewList.size(); i < n; ++i )
{
OutlinerView* pView = aViewList[ i ];
- Point aPos( pView->pEditView->GetWindowPosTopLeft((USHORT)nPara ) );
+ Point aPos( pView->pEditView->GetWindowPosTopLeft((sal_uInt16)nPara ) );
Rectangle aRect( pView->GetOutputArea() );
aRect.Right() = aPos.X();
aRect.Top() = aPos.Y();
@@ -1155,26 +1155,26 @@ void Outliner::InvalidateBullet( Paragraph* /*pPara*/, ULONG nPara )
}
}
-ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong Outliner::Read( SvStream& rInput, const String& rBaseURL, sal_uInt16 eFormat, SvKeyValueIterator* pHTTPHeaderAttrs )
{
DBG_CHKTHIS(Outliner,0);
- BOOL bOldUndo = pEditEngine->IsUndoEnabled();
- EnableUndo( FALSE );
+ sal_Bool bOldUndo = pEditEngine->IsUndoEnabled();
+ EnableUndo( sal_False );
- BOOL bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+ pEditEngine->SetUpdateMode( sal_False );
Clear();
- ImplBlockInsertionCallbacks( TRUE );
- ULONG nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs );
+ ImplBlockInsertionCallbacks( sal_True );
+ sal_uLong nRet = pEditEngine->Read( rInput, rBaseURL, (EETextFormat)eFormat, pHTTPHeaderAttrs );
- bFirstParaIsEmpty = FALSE;
+ bFirstParaIsEmpty = sal_False;
- USHORT nParas = pEditEngine->GetParagraphCount();
- pParaList->Clear( TRUE );
- USHORT n;
+ sal_uInt16 nParas = pEditEngine->GetParagraphCount();
+ pParaList->Clear( sal_True );
+ sal_uInt16 n;
for ( n = 0; n < nParas; n++ )
{
Paragraph* pPara = new Paragraph( 0 );
@@ -1185,7 +1185,7 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( n );
const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
sal_Int16 nDepth = rLevel.GetValue();
- ImplInitDepth( n, nDepth, FALSE );
+ ImplInitDepth( n, nDepth, sal_False );
}
}
@@ -1194,7 +1194,7 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
ImpFilterIndents( 0, nParas-1 );
}
- ImplBlockInsertionCallbacks( FALSE );
+ ImplBlockInsertionCallbacks( sal_False );
pEditEngine->SetUpdateMode( bUpdate );
EnableUndo( bOldUndo );
@@ -1202,15 +1202,15 @@ ULONG Outliner::Read( SvStream& rInput, const String& rBaseURL, USHORT eFormat,
}
-void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara )
+void Outliner::ImpFilterIndents( sal_uLong nFirstPara, sal_uLong nLastPara )
{
DBG_CHKTHIS(Outliner,0);
- BOOL bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+ pEditEngine->SetUpdateMode( sal_False );
Paragraph* pLastConverted = NULL;
- for( ULONG nPara = nFirstPara; nPara <= nLastPara; nPara++ )
+ for( sal_uLong nPara = nFirstPara; nPara <= nLastPara; nPara++ )
{
Paragraph* pPara = pParaList->GetParagraph( nPara );
if (pPara)
@@ -1225,27 +1225,27 @@ void Outliner::ImpFilterIndents( ULONG nFirstPara, ULONG nLastPara )
pPara->SetDepth( pLastConverted->GetDepth() );
}
- ImplInitDepth( (USHORT)nPara, pPara->GetDepth(), FALSE );
+ ImplInitDepth( (sal_uInt16)nPara, pPara->GetDepth(), sal_False );
}
}
pEditEngine->SetUpdateMode( bUpdate );
}
-SfxUndoManager& Outliner::GetUndoManager()
+::svl::IUndoManager& Outliner::GetUndoManager()
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetUndoManager();
}
-void Outliner::ImpTextPasted( ULONG nStartPara, USHORT nCount )
+void Outliner::ImpTextPasted( sal_uLong nStartPara, sal_uInt16 nCount )
{
DBG_CHKTHIS(Outliner,0);
- BOOL bUpdate = pEditEngine->GetUpdateMode();
- pEditEngine->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pEditEngine->GetUpdateMode();
+ pEditEngine->SetUpdateMode( sal_False );
- const ULONG nStart = nStartPara;
+ const sal_uLong nStart = nStartPara;
Paragraph* pPara = pParaList->GetParagraph( nStartPara );
@@ -1270,14 +1270,14 @@ void Outliner::ImpTextPasted( ULONG nStartPara, USHORT nCount )
else // EditEngine mode
{
sal_Int16 nDepth = -1;
- const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (USHORT)nStartPara );
+ const SfxItemSet& rAttrs = pEditEngine->GetParaAttribs( (sal_uInt16)nStartPara );
if ( rAttrs.GetItemState( EE_PARA_OUTLLEVEL ) == SFX_ITEM_ON )
{
const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
nDepth = rLevel.GetValue();
}
if ( nDepth != GetDepth( nStartPara ) )
- ImplInitDepth( (USHORT)nStartPara, nDepth, FALSE );
+ ImplInitDepth( (sal_uInt16)nStartPara, nDepth, sal_False );
}
nCount--;
@@ -1298,7 +1298,7 @@ long Outliner::IndentingPagesHdl( OutlinerView* pView )
return aIndentingPagesHdl.Call( pView );
}
-BOOL Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
+sal_Bool Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
{
DBG_CHKTHIS(Outliner,0);
// The selected pages must already be set in advance through
@@ -1309,32 +1309,32 @@ BOOL Outliner::ImpCanIndentSelectedPages( OutlinerView* pCurView )
if ( ( mnFirstSelPage == 0 ) && ( ImplGetOutlinerMode() != OUTLINERMODE_TEXTOBJECT ) )
{
if ( nDepthChangedHdlPrevDepth == 1 ) // is the only page
- return FALSE;
+ return sal_False;
else
- pCurView->ImpCalcSelectedPages( FALSE ); // without the first
+ pCurView->ImpCalcSelectedPages( sal_False ); // without the first
}
- return (BOOL)IndentingPagesHdl( pCurView );
+ return (sal_Bool)IndentingPagesHdl( pCurView );
}
-BOOL Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView )
+sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView )
{
DBG_CHKTHIS(Outliner,0);
// The selected pages must already be set in advance through
// ImpCalcSelectedPages
- return (BOOL)RemovingPagesHdl( pCurView );
+ return (sal_Bool)RemovingPagesHdl( pCurView );
}
-Outliner::Outliner( SfxItemPool* pPool, USHORT nMode )
+Outliner::Outliner( SfxItemPool* pPool, sal_uInt16 nMode )
: nMinDepth( -1 )
{
DBG_CTOR( Outliner, 0 );
- bStrippingPortions = FALSE;
- bPasting = FALSE;
+ bStrippingPortions = sal_False;
+ bPasting = sal_False;
nFirstPage = 1;
- bBlockInsCallback = FALSE;
+ bBlockInsCallback = sal_False;
nMaxDepth = 9;
@@ -1342,7 +1342,7 @@ Outliner::Outliner( SfxItemPool* pPool, USHORT nMode )
pParaList->SetVisibleStateChangedHdl( LINK( this, Outliner, ParaVisibleStateChangedHdl ) );
Paragraph* pPara = new Paragraph( 0 );
pParaList->Append(pPara);
- bFirstParaIsEmpty = TRUE;
+ bFirstParaIsEmpty = sal_True;
pEditEngine = new OutlinerEditEng( this, pPool );
pEditEngine->SetBeginMovingParagraphsHdl( LINK( this, Outliner, BeginMovingParagraphsHdl ) );
@@ -1357,7 +1357,7 @@ Outliner::~Outliner()
{
DBG_DTOR(Outliner,0);
- pParaList->Clear( TRUE );
+ pParaList->Clear( sal_True );
delete pParaList;
delete pEditEngine;
}
@@ -1378,7 +1378,7 @@ size_t Outliner::InsertView( OutlinerView* pView, size_t nIndex )
advance( it, nIndex );
ActualIndex = nIndex;
}
- pEditEngine->InsertView( pView->pEditView, (USHORT)nIndex );
+ pEditEngine->InsertView( pView->pEditView, (sal_uInt16)nIndex );
return ActualIndex;
}
@@ -1403,10 +1403,10 @@ OutlinerView* Outliner::RemoveView( size_t nIndex )
{
DBG_CHKTHIS(Outliner,0);
- EditView* pEditView = pEditEngine->GetView( (USHORT)nIndex );
+ EditView* pEditView = pEditEngine->GetView( (sal_uInt16)nIndex );
pEditView->HideCursor(); // HACK
- pEditEngine->RemoveView( (USHORT)nIndex );
+ pEditEngine->RemoveView( (sal_uInt16)nIndex );
{
ViewList::iterator it = aViewList.begin();
@@ -1454,37 +1454,37 @@ void Outliner::DepthChangedHdl()
}
-ULONG Outliner::GetAbsPos( Paragraph* pPara )
+sal_uLong Outliner::GetAbsPos( Paragraph* pPara )
{
DBG_CHKTHIS(Outliner,0);
DBG_ASSERT(pPara,"GetAbsPos:No Para");
return pParaList->GetAbsPos( pPara );
}
-ULONG Outliner::GetParagraphCount() const
+sal_uLong Outliner::GetParagraphCount() const
{
DBG_CHKTHIS(Outliner,0);
return pParaList->GetParagraphCount();
}
-Paragraph* Outliner::GetParagraph( ULONG nAbsPos ) const
+Paragraph* Outliner::GetParagraph( sal_uLong nAbsPos ) const
{
DBG_CHKTHIS(Outliner,0);
return pParaList->GetParagraph( nAbsPos );
}
-BOOL Outliner::HasChilds( Paragraph* pParagraph ) const
+sal_Bool Outliner::HasChilds( Paragraph* pParagraph ) const
{
DBG_CHKTHIS(Outliner,0);
return pParaList->HasChilds( pParagraph );
}
-BOOL Outliner::ImplHasBullet( USHORT nPara ) const
+sal_Bool Outliner::ImplHasBullet( sal_uInt16 nPara ) const
{
return GetNumberFormat(nPara) != 0;
}
-const SvxNumberFormat* Outliner::GetNumberFormat( USHORT nPara ) const
+const SvxNumberFormat* Outliner::GetNumberFormat( sal_uInt16 nPara ) const
{
const SvxNumberFormat* pFmt = NULL;
@@ -1504,7 +1504,7 @@ const SvxNumberFormat* Outliner::GetNumberFormat( USHORT nPara ) const
return pFmt;
}
-Size Outliner::ImplGetBulletSize( USHORT nPara )
+Size Outliner::ImplGetBulletSize( sal_uInt16 nPara )
{
Paragraph* pPara = pParaList->GetParagraph( nPara );
if (!pPara)
@@ -1539,19 +1539,19 @@ Size Outliner::ImplGetBulletSize( USHORT nPara )
return pPara->aBulSize;
}
-void Outliner::ImplCheckParagraphs( USHORT nStart, USHORT nEnd )
+void Outliner::ImplCheckParagraphs( sal_uInt16 nStart, sal_uInt16 nEnd )
{
DBG_CHKTHIS( Outliner, 0 );
// i100014#
// assure that the following for-loop does not loop forever
- for ( USHORT n = nStart; n < nEnd; n++ )
+ for ( sal_uInt16 n = nStart; n < nEnd; n++ )
{
Paragraph* pPara = pParaList->GetParagraph( n );
if (pPara)
{
pPara->Invalidate();
- ImplCalcBulletText( n, FALSE, FALSE );
+ ImplCalcBulletText( n, sal_False, sal_False );
}
}
}
@@ -1560,14 +1560,14 @@ void Outliner::SetRefDevice( OutputDevice* pRefDev )
{
DBG_CHKTHIS(Outliner,0);
pEditEngine->SetRefDevice( pRefDev );
- for ( USHORT n = (USHORT) pParaList->GetParagraphCount(); n; )
+ for ( sal_uInt16 n = (sal_uInt16) pParaList->GetParagraphCount(); n; )
{
Paragraph* pPara = pParaList->GetParagraph( --n );
pPara->Invalidate();
}
}
-void Outliner::ParaAttribsChanged( USHORT nPara )
+void Outliner::ParaAttribsChanged( sal_uInt16 nPara )
{
DBG_CHKTHIS(Outliner,0);
@@ -1584,7 +1584,7 @@ void Outliner::ParaAttribsChanged( USHORT nPara )
if ( pPara && pPara->GetDepth() != rLevel.GetValue() )
{
pPara->SetDepth( rLevel.GetValue() );
- ImplCalcBulletText( nPara, TRUE, TRUE );
+ ImplCalcBulletText( nPara, sal_True, sal_True );
}
}
}
@@ -1598,13 +1598,13 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle )
// Here all the paragraphs, which had the said template, used to be
// hunted by a ImpRecalcParaAttribs, why?
// => only the Bullet-representation can really change...
- USHORT nParas = (USHORT)pParaList->GetParagraphCount();
- for( USHORT nPara = 0; nPara < nParas; nPara++ )
+ sal_uInt16 nParas = (sal_uInt16)pParaList->GetParagraphCount();
+ for( sal_uInt16 nPara = 0; nPara < nParas; nPara++ )
{
if ( pEditEngine->GetStyleSheet( nPara ) == pStyle )
{
ImplCheckNumBulletItem( nPara );
- ImplCalcBulletText( nPara, FALSE, FALSE );
+ ImplCalcBulletText( nPara, sal_False, sal_False );
// EditEngine formats changed paragraphs before calling this method,
// so they are not reformatted now and use wrong bullet indent
pEditEngine->QuickMarkInvalid( ESelection( nPara, 0, nPara, 0 ) );
@@ -1612,7 +1612,7 @@ void Outliner::StyleSheetChanged( SfxStyleSheet* pStyle )
}
}
-Rectangle Outliner::ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnPaperPos )
+Rectangle Outliner::ImpCalcBulletArea( sal_uInt16 nPara, sal_Bool bAdjust, sal_Bool bReturnPaperPos )
{
// Bullet area within the paragraph ...
Rectangle aBulletArea;
@@ -1623,7 +1623,7 @@ Rectangle Outliner::ImpCalcBulletArea( USHORT nPara, BOOL bAdjust, BOOL bReturnP
Point aTopLeft;
Size aBulletSize( ImplGetBulletSize( nPara ) );
- BOOL bOutlineMode = ( pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER ) != 0;
+ sal_Bool bOutlineMode = ( pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER ) != 0;
// the ODF attribut text:space-before which holds the spacing to add to the left of the label
const short nSpaceBefore = pFmt->GetAbsLSpace() + pFmt->GetFirstLineOffset();
@@ -1720,7 +1720,7 @@ void Outliner::ExpandHdl()
aExpandHdl.Call( this );
}
-EBulletInfo Outliner::GetBulletInfo( USHORT nPara )
+EBulletInfo Outliner::GetBulletInfo( sal_uInt16 nPara )
{
EBulletInfo aInfo;
@@ -1747,53 +1747,53 @@ EBulletInfo Outliner::GetBulletInfo( USHORT nPara )
if ( aInfo.bVisible )
{
- aInfo.aBounds = ImpCalcBulletArea( nPara, TRUE, TRUE );
+ aInfo.aBounds = ImpCalcBulletArea( nPara, sal_True, sal_True );
}
return aInfo;
}
-XubString Outliner::GetText( Paragraph* pParagraph, ULONG nCount ) const
+XubString Outliner::GetText( Paragraph* pParagraph, sal_uLong nCount ) const
{
DBG_CHKTHIS(Outliner,0);
XubString aText;
- USHORT nStartPara = (USHORT) pParaList->GetAbsPos( pParagraph );
- for ( USHORT n = 0; n < nCount; n++ )
+ sal_uInt16 nStartPara = (sal_uInt16) pParaList->GetAbsPos( pParagraph );
+ for ( sal_uInt16 n = 0; n < nCount; n++ )
{
aText += pEditEngine->GetText( nStartPara + n );
- if ( (n+1) < (USHORT)nCount )
+ if ( (n+1) < (sal_uInt16)nCount )
aText += '\n';
}
return aText;
}
-void Outliner::Remove( Paragraph* pPara, ULONG nParaCount )
+void Outliner::Remove( Paragraph* pPara, sal_uLong nParaCount )
{
DBG_CHKTHIS(Outliner,0);
- ULONG nPos = pParaList->GetAbsPos( pPara );
+ sal_uLong nPos = pParaList->GetAbsPos( pPara );
if( !nPos && ( nParaCount >= pParaList->GetParagraphCount() ) )
{
Clear();
}
else
{
- for( USHORT n = 0; n < (USHORT)nParaCount; n++ )
- pEditEngine->RemoveParagraph( (USHORT) nPos );
+ for( sal_uInt16 n = 0; n < (sal_uInt16)nParaCount; n++ )
+ pEditEngine->RemoveParagraph( (sal_uInt16) nPos );
}
}
void Outliner::StripPortions()
{
DBG_CHKTHIS(Outliner,0);
- bStrippingPortions = TRUE;
+ bStrippingPortions = sal_True;
pEditEngine->StripPortions();
- bStrippingPortions = FALSE;
+ bStrippingPortions = sal_False;
}
-void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHORT nTextStart, USHORT nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont,
- USHORT nPara, USHORT nIndex, BYTE nRightToLeft,
+void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, sal_uInt16 nTextStart, sal_uInt16 nTextLen, const sal_Int32* pDXArray,const SvxFont& rFont,
+ sal_uInt16 nPara, sal_uInt16 nIndex, sal_uInt8 nRightToLeft,
const EEngineData::WrongSpellVector* pWrongSpellVector,
const SvxFieldData* pFieldData,
bool bEndOfLine,
@@ -1815,7 +1815,7 @@ void Outliner::DrawingText( const Point& rStartPos, const XubString& rText, USHO
}
void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const String& rChar, const SvxFont& rFont,
- USHORT nPara, xub_StrLen nIndex, BYTE nRightToLeft, bool bEndOfLine, bool bEndOfParagraph,
+ sal_uInt16 nPara, xub_StrLen nIndex, sal_uInt8 nRightToLeft, bool bEndOfLine, bool bEndOfParagraph,
const Color& rOverlineColor, const Color& rTextLineColor)
{
if(aDrawPortionHdl.IsSet())
@@ -1830,20 +1830,20 @@ void Outliner::DrawingTab( const Point& rStartPos, long nWidth, const String& rC
long Outliner::RemovingPagesHdl( OutlinerView* pView )
{
DBG_CHKTHIS(Outliner,0);
- return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : TRUE;
+ return aRemovingPagesHdl.IsSet() ? aRemovingPagesHdl.Call( pView ) : sal_True;
}
-BOOL Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, USHORT _nFirstPage, USHORT nPages )
+sal_Bool Outliner::ImpCanDeleteSelectedPages( OutlinerView* pCurView, sal_uInt16 _nFirstPage, sal_uInt16 nPages )
{
DBG_CHKTHIS(Outliner,0);
nDepthChangedHdlPrevDepth = nPages;
mnFirstSelPage = _nFirstPage;
pHdlParagraph = 0;
- return (BOOL)RemovingPagesHdl( pCurView );
+ return (sal_Bool)RemovingPagesHdl( pCurView );
}
-SfxItemSet Outliner::GetParaAttribs( USHORT nPara )
+SfxItemSet Outliner::GetParaAttribs( sal_uInt16 nPara )
{
DBG_CHKTHIS(Outliner,0);
return pEditEngine->GetParaAttribs( nPara );
@@ -1853,8 +1853,8 @@ IMPL_LINK( Outliner, ParaVisibleStateChangedHdl, Paragraph*, pPara )
{
DBG_CHKTHIS(Outliner,0);
- ULONG nPara = pParaList->GetAbsPos( pPara );
- pEditEngine->ShowParagraph( (USHORT)nPara, pPara->IsVisible() );
+ sal_uLong nPara = pParaList->GetAbsPos( pPara );
+ pEditEngine->ShowParagraph( (sal_uInt16)nPara, pPara->IsVisible() );
return 0;
}
@@ -1878,7 +1878,7 @@ IMPL_LINK( Outliner, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos )
IMPL_LINK( Outliner, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos )
{
- bPasting = FALSE;
+ bPasting = sal_False;
ImpTextPasted( pInfos->nStartPara, pInfos->nEndPara - pInfos->nStartPara + 1 );
maEndPasteOrDropHdl.Call( pInfos );
UndoActionEnd( EDITUNDO_DRAGANDDROP );
@@ -1890,10 +1890,10 @@ IMPL_LINK( Outliner, EndMovingParagraphsHdl, MoveParagraphsInfo*, pInfos )
DBG_CHKTHIS(Outliner,0);
pParaList->MoveParagraphs( pInfos->nStartPara, pInfos->nDestPara, pInfos->nEndPara - pInfos->nStartPara + 1 );
- USHORT nChangesStart = Min( pInfos->nStartPara, pInfos->nDestPara );
- USHORT nParas = (USHORT)pParaList->GetParagraphCount();
- for ( USHORT n = nChangesStart; n < nParas; n++ )
- ImplCalcBulletText( n, FALSE, FALSE );
+ sal_uInt16 nChangesStart = Min( pInfos->nStartPara, pInfos->nDestPara );
+ sal_uInt16 nParas = (sal_uInt16)pParaList->GetParagraphCount();
+ for ( sal_uInt16 n = nChangesStart; n < nParas; n++ )
+ ImplCalcBulletText( n, sal_False, sal_False );
if( !IsInUndo() )
aEndMovingHdl.Call( this );
@@ -1915,7 +1915,7 @@ static bool isSameNumbering( const SvxNumberFormat& rN1, const SvxNumberFormat&
return true;
}
-sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pParaFmt )
+sal_uInt16 Outliner::ImplGetNumbering( sal_uInt16 nPara, const SvxNumberFormat* pParaFmt )
{
sal_uInt16 nNumber = pParaFmt->GetStart() - 1;
@@ -1963,12 +1963,12 @@ sal_uInt16 Outliner::ImplGetNumbering( USHORT nPara, const SvxNumberFormat* pPar
return nNumber;
}
-void Outliner::ImplCalcBulletText( USHORT nPara, BOOL bRecalcLevel, BOOL bRecalcChilds )
+void Outliner::ImplCalcBulletText( sal_uInt16 nPara, sal_Bool bRecalcLevel, sal_Bool bRecalcChilds )
{
DBG_CHKTHIS(Outliner,0);
Paragraph* pPara = pParaList->GetParagraph( nPara );
- USHORT nRelPos = 0xFFFF;
+ sal_uInt16 nRelPos = 0xFFFF;
while ( pPara )
{
@@ -2022,12 +2022,12 @@ void Outliner::Clear()
if( !bFirstParaIsEmpty )
{
- ImplBlockInsertionCallbacks( TRUE );
+ ImplBlockInsertionCallbacks( sal_True );
pEditEngine->Clear();
- pParaList->Clear( TRUE );
+ pParaList->Clear( sal_True );
pParaList->Append( new Paragraph( nMinDepth ));
- bFirstParaIsEmpty = TRUE;
- ImplBlockInsertionCallbacks( FALSE );
+ bFirstParaIsEmpty = sal_True;
+ ImplBlockInsertionCallbacks( sal_False );
}
else
{
@@ -2037,20 +2037,20 @@ void Outliner::Clear()
}
}
-void Outliner::SetFlatMode( BOOL bFlat )
+void Outliner::SetFlatMode( sal_Bool bFlat )
{
DBG_CHKTHIS(Outliner,0);
if( bFlat != pEditEngine->IsFlatMode() )
{
- for ( USHORT nPara = (USHORT)pParaList->GetParagraphCount(); nPara; )
+ for ( sal_uInt16 nPara = (sal_uInt16)pParaList->GetParagraphCount(); nPara; )
pParaList->GetParagraph( --nPara )->aBulSize.Width() = -1;
pEditEngine->SetFlatMode( bFlat );
}
}
-String Outliner::ImplGetBulletText( USHORT nPara )
+String Outliner::ImplGetBulletText( sal_uInt16 nPara )
{
String aRes;
Paragraph* pPara = pParaList->GetParagraph( nPara );
@@ -2058,14 +2058,14 @@ String Outliner::ImplGetBulletText( USHORT nPara )
{
// Enable optimization again ...
// if( pPara->nFlags & PARAFLAG_SETBULLETTEXT )
- ImplCalcBulletText( nPara, FALSE, FALSE );
+ ImplCalcBulletText( nPara, sal_False, sal_False );
aRes = pPara->GetText();
}
return aRes;
}
// this is needed for StarOffice Api
-void Outliner::SetLevelDependendStyleSheet( USHORT nPara )
+void Outliner::SetLevelDependendStyleSheet( sal_uInt16 nPara )
{
SfxItemSet aOldAttrs( pEditEngine->GetParaAttribs( nPara ) );
ImplSetLevelDependendStyleSheet( nPara );
@@ -2074,7 +2074,7 @@ void Outliner::SetLevelDependendStyleSheet( USHORT nPara )
SV_IMPL_PTRARR( NotifyList, EENotifyPtr );
-void Outliner::ImplBlockInsertionCallbacks( BOOL b )
+void Outliner::ImplBlockInsertionCallbacks( sal_Bool b )
{
if ( b )
{
@@ -2187,7 +2187,7 @@ sal_Bool DrawPortionInfo::IsRTL() const
nError = U_ZERO_ERROR;
// I do not have this info here. Is it necessary? I'll have to ask MT.
- const BYTE nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
+ const sal_uInt8 nDefaultDir = UBIDI_LTR; //IsRightToLeft( nPara ) ? UBIDI_RTL : UBIDI_LTR;
ubidi_setPara(pBidi, reinterpret_cast<const UChar *>(mrText.GetBuffer()), mrText.Len(), nDefaultDir, NULL, &nError); // UChar != sal_Unicode in MinGW
nError = U_ZERO_ERROR;
diff --git a/editeng/source/outliner/outliner.src b/editeng/source/outliner/outliner.src
index 42f8195407bd..42f8195407bd 100644..100755
--- a/editeng/source/outliner/outliner.src
+++ b/editeng/source/outliner/outliner.src
diff --git a/editeng/source/outliner/outlobj.cxx b/editeng/source/outliner/outlobj.cxx
index 989c6d0b4f17..989c6d0b4f17 100644..100755
--- a/editeng/source/outliner/outlobj.cxx
+++ b/editeng/source/outliner/outlobj.cxx
diff --git a/editeng/source/outliner/outlundo.cxx b/editeng/source/outliner/outlundo.cxx
index 9b3c720d11ec..3767d9ac68d6 100644..100755
--- a/editeng/source/outliner/outlundo.cxx
+++ b/editeng/source/outliner/outlundo.cxx
@@ -42,7 +42,7 @@
#include <outlundo.hxx>
-OutlinerUndoBase::OutlinerUndoBase( USHORT _nId, Outliner* pOutliner )
+OutlinerUndoBase::OutlinerUndoBase( sal_uInt16 _nId, Outliner* pOutliner )
: EditUndo( _nId, NULL )
{
DBG_ASSERT( pOutliner, "Undo: Outliner?!" );
@@ -112,7 +112,7 @@ void OutlinerUndoChangeParaNumberingRestart::ImplApplyData( const ParaRestartDat
pOutliner->SetParaIsNumberingRestart( mnPara, rData.mbParaIsNumberingRestart );
}
-OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth )
+OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, sal_uInt16 nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth )
: OutlinerUndoBase( OLUNDO_DEPTH, pOutliner )
{
mnPara = nPara;
@@ -122,12 +122,12 @@ OutlinerUndoChangeDepth::OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nP
void OutlinerUndoChangeDepth::Undo()
{
- GetOutliner()->ImplInitDepth( mnPara, mnOldDepth, FALSE );
+ GetOutliner()->ImplInitDepth( mnPara, mnOldDepth, sal_False );
}
void OutlinerUndoChangeDepth::Redo()
{
- GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, FALSE );
+ GetOutliner()->ImplInitDepth( mnPara, mnNewDepth, sal_False );
}
void OutlinerUndoChangeDepth::Repeat()
@@ -136,7 +136,7 @@ void OutlinerUndoChangeDepth::Repeat()
}
-OutlinerUndoCheckPara::OutlinerUndoCheckPara( Outliner* pOutliner, USHORT nPara )
+OutlinerUndoCheckPara::OutlinerUndoCheckPara( Outliner* pOutliner, sal_uInt16 nPara )
: OutlinerUndoBase( OLUNDO_DEPTH, pOutliner )
{
mnPara = nPara;
@@ -146,14 +146,14 @@ void OutlinerUndoCheckPara::Undo()
{
Paragraph* pPara = GetOutliner()->GetParagraph( mnPara );
pPara->Invalidate();
- GetOutliner()->ImplCalcBulletText( mnPara, FALSE, FALSE );
+ GetOutliner()->ImplCalcBulletText( mnPara, sal_False, sal_False );
}
void OutlinerUndoCheckPara::Redo()
{
Paragraph* pPara = GetOutliner()->GetParagraph( mnPara );
pPara->Invalidate();
- GetOutliner()->ImplCalcBulletText( mnPara, FALSE, FALSE );
+ GetOutliner()->ImplCalcBulletText( mnPara, sal_False, sal_False );
}
void OutlinerUndoCheckPara::Repeat()
@@ -163,7 +163,7 @@ void OutlinerUndoCheckPara::Repeat()
DBG_NAME(OLUndoExpand);
-OLUndoExpand::OLUndoExpand(Outliner* pOut, USHORT _nId )
+OLUndoExpand::OLUndoExpand(Outliner* pOut, sal_uInt16 _nId )
: EditUndo( _nId, 0 )
{
DBG_CTOR(OLUndoExpand,0);
@@ -181,20 +181,20 @@ OLUndoExpand::~OLUndoExpand()
}
-void OLUndoExpand::Restore( BOOL bUndo )
+void OLUndoExpand::Restore( sal_Bool bUndo )
{
DBG_CHKTHIS(OLUndoExpand,0);
DBG_ASSERT(pOutliner,"Undo:No Outliner");
DBG_ASSERT(pOutliner->pEditEngine,"Outliner already deleted");
Paragraph* pPara;
- BOOL bExpand = FALSE;
- USHORT _nId = GetId();
+ sal_Bool bExpand = sal_False;
+ sal_uInt16 _nId = GetId();
if((_nId == OLUNDO_EXPAND && !bUndo) || (_nId == OLUNDO_COLLAPSE && bUndo))
- bExpand = TRUE;
+ bExpand = sal_True;
if( !pParas )
{
- pPara = pOutliner->GetParagraph( (ULONG)nCount );
+ pPara = pOutliner->GetParagraph( (sal_uLong)nCount );
if( bExpand )
pOutliner->Expand( pPara );
else
@@ -202,9 +202,9 @@ void OLUndoExpand::Restore( BOOL bUndo )
}
else
{
- for( USHORT nIdx = 0; nIdx < nCount; nIdx++ )
+ for( sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++ )
{
- pPara = pOutliner->GetParagraph( (ULONG)(pParas[nIdx]) );
+ pPara = pOutliner->GetParagraph( (sal_uLong)(pParas[nIdx]) );
if( bExpand )
pOutliner->Expand( pPara );
else
@@ -217,14 +217,14 @@ void OLUndoExpand::Restore( BOOL bUndo )
void OLUndoExpand::Undo()
{
DBG_CHKTHIS(OLUndoExpand,0);
- Restore( TRUE );
+ Restore( sal_True );
}
void OLUndoExpand::Redo()
{
DBG_CHKTHIS(OLUndoExpand,0);
- Restore( FALSE );
+ Restore( sal_False );
}
diff --git a/editeng/source/outliner/outlundo.hxx b/editeng/source/outliner/outlundo.hxx
index a6c04490abc0..5b49b0f64bde 100644
--- a/editeng/source/outliner/outlundo.hxx
+++ b/editeng/source/outliner/outlundo.hxx
@@ -39,7 +39,7 @@ private:
Outliner* mpOutliner;
public:
- OutlinerUndoBase( USHORT nId, Outliner* pOutliner );
+ OutlinerUndoBase( sal_uInt16 nId, Outliner* pOutliner );
Outliner* GetOutliner() const { return mpOutliner; }
};
@@ -88,12 +88,12 @@ class OutlinerUndoChangeDepth : public OutlinerUndoBase
{
using SfxUndoAction::Repeat;
private:
- USHORT mnPara;
+ sal_uInt16 mnPara;
sal_Int16 mnOldDepth;
sal_Int16 mnNewDepth;
public:
- OutlinerUndoChangeDepth( Outliner* pOutliner, USHORT nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
+ OutlinerUndoChangeDepth( Outliner* pOutliner, sal_uInt16 nPara, sal_Int16 nOldDepth, sal_Int16 nNewDepth );
virtual void Undo();
virtual void Redo();
@@ -107,10 +107,10 @@ class OutlinerUndoCheckPara : public OutlinerUndoBase
{
using SfxUndoAction::Repeat;
private:
- USHORT mnPara;
+ sal_uInt16 mnPara;
public:
- OutlinerUndoCheckPara( Outliner* pOutliner, USHORT nPara );
+ OutlinerUndoCheckPara( Outliner* pOutliner, sal_uInt16 nPara );
virtual void Undo();
virtual void Redo();
@@ -125,17 +125,17 @@ public:
class OLUndoExpand : public EditUndo
{
using SfxUndoAction::Repeat;
- void Restore( BOOL bUndo );
+ void Restore( sal_Bool bUndo );
public:
- OLUndoExpand( Outliner* pOut, USHORT nId );
+ OLUndoExpand( Outliner* pOut, sal_uInt16 nId );
~OLUndoExpand();
virtual void Undo();
virtual void Redo();
virtual void Repeat();
- USHORT* pParas; // 0 == nCount contains paragraph number
+ sal_uInt16* pParas; // 0 == nCount contains paragraph number
Outliner* pOutliner;
- USHORT nCount;
+ sal_uInt16 nCount;
};
#endif
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index 7d43f04d9141..9e685870037f 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -76,8 +76,8 @@ OutlinerView::OutlinerView( Outliner* pOut, Window* pWin )
DBG_CTOR( OutlinerView, 0 );
pOwner = pOut;
- bDDCursorVisible = FALSE;
- bInDragMode = FALSE;
+ bDDCursorVisible = sal_False;
+ bInDragMode = sal_False;
nDDScrollLRBorderWidthWin = 0;
nDDScrollTBBorderWidthWin = 0;
pHorTabArrDoc = 0;
@@ -104,7 +104,7 @@ void OutlinerView::Paint( const Rectangle& rRect )
pEditView->Paint( rRect );
}
-BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
+sal_Bool OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
{
DBG_CHKTHIS( OutlinerView, 0 );
@@ -114,18 +114,18 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
pOwner->Insert( String() );
- BOOL bKeyProcessed = FALSE;
+ sal_Bool bKeyProcessed = sal_False;
ESelection aSel( pEditView->GetSelection() );
- BOOL bSelection = aSel.HasRange();
+ sal_Bool bSelection = aSel.HasRange();
KeyCode aKeyCode = rKEvt.GetKeyCode();
KeyFuncType eFunc = aKeyCode.GetFunction();
- USHORT nCode = aKeyCode.GetCode();
- BOOL bReadOnly = IsReadOnly();
+ sal_uInt16 nCode = aKeyCode.GetCode();
+ sal_Bool bReadOnly = IsReadOnly();
if( bSelection && ( nCode != KEY_TAB ) && EditEngine::DoesKeyChangeText( rKEvt ) )
{
- if ( ImpCalcSelectedPages( FALSE ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
- return TRUE;
+ if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
+ return sal_True;
}
if ( eFunc != KEYFUNC_DONTKNOW )
@@ -137,14 +137,14 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
if ( !bReadOnly )
{
Cut();
- bKeyProcessed = TRUE;
+ bKeyProcessed = sal_True;
}
}
break;
case KEYFUNC_COPY:
{
Copy();
- bKeyProcessed = TRUE;
+ bKeyProcessed = sal_True;
}
break;
case KEYFUNC_PASTE:
@@ -152,7 +152,7 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
if ( !bReadOnly )
{
PasteSpecial();
- bKeyProcessed = TRUE;
+ bKeyProcessed = sal_True;
}
}
break;
@@ -166,7 +166,7 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
if( pNext && pNext->HasFlag(PARAFLAG_ISPAGE) )
{
if( !pOwner->ImpCanDeleteSelectedPages( this, aSel.nEndPara, 1 ) )
- return FALSE;
+ return sal_False;
}
}
}
@@ -189,13 +189,13 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
( bSelection || !aSel.nStartPos ) )
{
Indent( aKeyCode.IsShift() ? (-1) : (+1) );
- bKeyProcessed = TRUE;
+ bKeyProcessed = sal_True;
}
else if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) &&
!bSelection && !aSel.nEndPos && pOwner->ImplHasBullet( aSel.nEndPara ) )
{
Indent( aKeyCode.IsShift() ? (-1) : (+1) );
- bKeyProcessed = TRUE;
+ bKeyProcessed = sal_True;
}
}
}
@@ -207,11 +207,11 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
Paragraph* pPara = pOwner->pParaList->GetParagraph( aSel.nEndPara );
Paragraph* pPrev = pOwner->pParaList->GetParagraph( aSel.nEndPara-1 );
if( !pPrev->IsVisible() )
- return TRUE;
+ return sal_True;
if( !pPara->GetDepth() )
{
if(!pOwner->ImpCanDeleteSelectedPages(this, aSel.nEndPara , 1 ) )
- return TRUE;
+ return sal_True;
}
}
}
@@ -230,20 +230,20 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
if( !bSelection &&
aSel.nEndPos == pOwner->pEditEngine->GetTextLen( aSel.nEndPara ) )
{
- ULONG nChilds = pOwner->pParaList->GetChildCount(pPara);
+ sal_uLong nChilds = pOwner->pParaList->GetChildCount(pPara);
if( nChilds && !pOwner->pParaList->HasVisibleChilds(pPara))
{
pOwner->UndoActionStart( OLUNDO_INSERT );
- ULONG nTemp = aSel.nEndPara;
+ sal_uLong nTemp = aSel.nEndPara;
nTemp += nChilds;
nTemp++; // insert above next Non-Child
pOwner->Insert( String(),nTemp,pPara->GetDepth());
// Position the cursor
- ESelection aTmpSel((USHORT)nTemp,0,(USHORT)nTemp,0);
+ ESelection aTmpSel((sal_uInt16)nTemp,0,(sal_uInt16)nTemp,0);
pEditView->SetSelection( aTmpSel );
- pEditView->ShowCursor( TRUE, TRUE );
+ pEditView->ShowCursor( sal_True, sal_True );
pOwner->UndoActionEnd( OLUNDO_INSERT );
- bKeyProcessed = TRUE;
+ bKeyProcessed = sal_True;
}
}
}
@@ -252,16 +252,16 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
( aSel.nEndPos == pOwner->pEditEngine->GetTextLen(aSel.nEndPara) ) )
{
pOwner->UndoActionStart( OLUNDO_INSERT );
- ULONG nTemp = aSel.nEndPara;
+ sal_uLong nTemp = aSel.nEndPara;
nTemp++;
pOwner->Insert( String(), nTemp, pPara->GetDepth()+1 );
// Position the cursor
- ESelection aTmpSel((USHORT)nTemp,0,(USHORT)nTemp,0);
+ ESelection aTmpSel((sal_uInt16)nTemp,0,(sal_uInt16)nTemp,0);
pEditView->SetSelection( aTmpSel );
- pEditView->ShowCursor( TRUE, TRUE );
+ pEditView->ShowCursor( sal_True, sal_True );
pOwner->UndoActionEnd( OLUNDO_INSERT );
- bKeyProcessed = TRUE;
+ bKeyProcessed = sal_True;
}
}
}
@@ -269,14 +269,15 @@ BOOL OutlinerView::PostKeyEvent( const KeyEvent& rKEvt, Window* pFrameWin )
}
}
- return bKeyProcessed ? TRUE : pEditView->PostKeyEvent( rKEvt, pFrameWin );
+ return bKeyProcessed ? sal_True : pEditView->PostKeyEvent( rKEvt, pFrameWin );
+
}
-ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget)
+sal_uLong OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget)
{
DBG_CHKTHIS(OutlinerView,0);
- ULONG nPara = EE_PARA_NOT_FOUND;
+ sal_uLong nPara = EE_PARA_NOT_FOUND;
Point aMousePosWin = pEditView->GetWindow()->PixelToLogic( rPosPix );
if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
@@ -295,7 +296,7 @@ ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget
aPaperPos.Y() -= aOutArea.Top();
aPaperPos.Y() += aVisArea.Top();
- BOOL bBullet;
+ sal_Bool bBullet;
if ( pOwner->IsTextPos( aPaperPos, 0, &bBullet ) )
{
Point aDocPos = pOwner->GetDocPos( aPaperPos );
@@ -317,7 +318,7 @@ ULONG OutlinerView::ImpCheckMousePos(const Point& rPosPix, MouseTarget& reTarget
return nPara;
}
-BOOL OutlinerView::MouseMove( const MouseEvent& rMEvt )
+sal_Bool OutlinerView::MouseMove( const MouseEvent& rMEvt )
{
DBG_CHKTHIS(OutlinerView,0);
@@ -326,7 +327,7 @@ BOOL OutlinerView::MouseMove( const MouseEvent& rMEvt )
Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
- return FALSE;
+ return sal_False;
Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
pEditView->GetWindow()->SetPointer( aPointer );
@@ -334,7 +335,7 @@ BOOL OutlinerView::MouseMove( const MouseEvent& rMEvt )
}
-BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
+sal_Bool OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
{
DBG_CHKTHIS(OutlinerView,0);
if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
@@ -342,24 +343,24 @@ BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
- return FALSE;
+ return sal_False;
Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
pEditView->GetWindow()->SetPointer( aPointer );
MouseTarget eTarget;
- ULONG nPara = ImpCheckMousePos( rMEvt.GetPosPixel(), eTarget );
+ sal_uLong nPara = ImpCheckMousePos( rMEvt.GetPosPixel(), eTarget );
if ( eTarget == MouseBullet )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
- BOOL bHasChilds = (pPara && pOwner->pParaList->HasChilds(pPara));
+ sal_Bool bHasChilds = (pPara && pOwner->pParaList->HasChilds(pPara));
if( rMEvt.GetClicks() == 1 )
{
- ULONG nEndPara = nPara;
+ sal_uLong nEndPara = nPara;
if ( bHasChilds && pOwner->pParaList->HasVisibleChilds(pPara) )
nEndPara += pOwner->pParaList->GetChildCount( pPara );
// The selection is inverted, so that EditEngine does not scroll
- ESelection aSel((USHORT)nEndPara, 0xffff,(USHORT)nPara, 0 );
+ ESelection aSel((sal_uInt16)nEndPara, 0xffff,(sal_uInt16)nPara, 0 );
pEditView->SetSelection( aSel );
}
else if( rMEvt.GetClicks() == 2 && bHasChilds )
@@ -367,7 +368,7 @@ BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
aDDStartPosPix = rMEvt.GetPosPixel();
aDDStartPosRef=pEditView->GetWindow()->PixelToLogic( aDDStartPosPix,pOwner->GetRefMapMode());
- return TRUE;
+ return sal_True;
}
// special case for outliner view in impress, check if double click hits the page icon for toggle
@@ -385,7 +386,7 @@ BOOL OutlinerView::MouseButtonDown( const MouseEvent& rMEvt )
}
-BOOL OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
+sal_Bool OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
{
DBG_CHKTHIS(OutlinerView,0);
if ( ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_TEXTOBJECT ) || pEditView->GetEditEngine()->IsInSelectionMode() )
@@ -393,7 +394,7 @@ BOOL OutlinerView::MouseButtonUp( const MouseEvent& rMEvt )
Point aMousePosWin( pEditView->GetWindow()->PixelToLogic( rMEvt.GetPosPixel() ) );
if( !pEditView->GetOutputArea().IsInside( aMousePosWin ) )
- return FALSE;
+ return sal_False;
Pointer aPointer = GetPointer( rMEvt.GetPosPixel() );
pEditView->GetWindow()->SetPointer( aPointer );
@@ -406,7 +407,7 @@ void OutlinerView::ImpHideDDCursor()
DBG_CHKTHIS(OutlinerView,0);
if ( bDDCursorVisible )
{
- bDDCursorVisible = FALSE;
+ bDDCursorVisible = sal_False;
ImpPaintDDCursor();
}
}
@@ -416,7 +417,7 @@ void OutlinerView::ImpShowDDCursor()
DBG_CHKTHIS(OutlinerView,0);
if ( !bDDCursorVisible )
{
- bDDCursorVisible = TRUE;
+ bDDCursorVisible = sal_True;
ImpPaintDDCursor();
}
}
@@ -445,16 +446,16 @@ void OutlinerView::ImpPaintDDCursor()
}
else
{
- ULONG nPara = nDDCurPara;
+ sal_uLong nPara = nDDCurPara;
if ( nDDCurPara == LIST_APPEND )
{
Paragraph* pTemp = pOwner->pParaList->LastVisible();
nPara = pOwner->pParaList->GetAbsPos( pTemp );
}
- aStartPointWin = pEditView->GetWindowPosTopLeft((USHORT) nPara );
+ aStartPointWin = pEditView->GetWindowPosTopLeft((sal_uInt16) nPara );
if ( nDDCurPara == LIST_APPEND )
{
- long nHeight = pOwner->pEditEngine->GetTextHeight((USHORT)nPara );
+ long nHeight = pOwner->pEditEngine->GetTextHeight((sal_uInt16)nPara );
aStartPointWin.Y() += nHeight;
}
aStartPointWin.X() = aOutputArWin.Left();
@@ -469,10 +470,10 @@ void OutlinerView::ImpPaintDDCursor()
// Calculates above which paragraph must it must be inserted
-ULONG OutlinerView::ImpGetInsertionPara( const Point& rPosPixel )
+sal_uLong OutlinerView::ImpGetInsertionPara( const Point& rPosPixel )
{
DBG_CHKTHIS(OutlinerView,0);
- ULONG nCurPara = pEditView->GetParagraph( rPosPixel );
+ sal_uLong nCurPara = pEditView->GetParagraph( rPosPixel );
ParagraphList* pParaList = pOwner->pParaList;
if ( nCurPara == EE_PARA_NOT_FOUND )
@@ -480,8 +481,8 @@ ULONG OutlinerView::ImpGetInsertionPara( const Point& rPosPixel )
else
{
Point aPosWin = pEditView->GetWindow()->PixelToLogic( rPosPixel );
- Point aParaPosWin = pEditView->GetWindowPosTopLeft((USHORT)nCurPara);
- long nHeightRef = pOwner->pEditEngine->GetTextHeight((USHORT)nCurPara);
+ Point aParaPosWin = pEditView->GetWindowPosTopLeft((sal_uInt16)nCurPara);
+ long nHeightRef = pOwner->pEditEngine->GetTextHeight((sal_uInt16)nCurPara);
long nParaYOffs = aPosWin.Y() - aParaPosWin.Y();
if ( nParaYOffs > nHeightRef / 2 )
@@ -499,7 +500,7 @@ void OutlinerView::ImpToggleExpand( Paragraph* pPara )
{
DBG_CHKTHIS(OutlinerView,0);
- USHORT nPara = (USHORT) pOwner->pParaList->GetAbsPos( pPara );
+ sal_uInt16 nPara = (sal_uInt16) pOwner->pParaList->GetAbsPos( pPara );
pEditView->SetSelection( ESelection( nPara, 0, nPara, 0 ) );
ImplExpandOrCollaps( nPara, nPara, !pOwner->pParaList->HasVisibleChilds( pPara ) );
pEditView->ShowCursor();
@@ -515,21 +516,21 @@ void OutlinerView::SetOutliner( Outliner* pOutliner )
-ULONG OutlinerView::Select( Paragraph* pParagraph, BOOL bSelect,
- BOOL bWithChilds )
+sal_uLong OutlinerView::Select( Paragraph* pParagraph, sal_Bool bSelect,
+ sal_Bool bWithChilds )
{
DBG_CHKTHIS(OutlinerView,0);
- ULONG nPara = pOwner->pParaList->GetAbsPos( pParagraph );
- USHORT nEnd = 0;
+ sal_uLong nPara = pOwner->pParaList->GetAbsPos( pParagraph );
+ sal_uInt16 nEnd = 0;
if ( bSelect )
nEnd = 0xffff;
- ULONG nChildCount = 0;
+ sal_uLong nChildCount = 0;
if ( bWithChilds )
nChildCount = pOwner->pParaList->GetChildCount( pParagraph );
- ESelection aSel( (USHORT)nPara, 0,(USHORT)(nPara+nChildCount), nEnd );
+ ESelection aSel( (sal_uInt16)nPara, 0,(sal_uInt16)(nPara+nChildCount), nEnd );
pEditView->SetSelection( aSel );
return nChildCount+1;
}
@@ -539,23 +540,21 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
{
DBG_CHKTHIS(OutlinerView,0);
- BOOL bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+ pOwner->pEditEngine->SetUpdateMode( sal_False );
if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
pOwner->UndoActionStart( OLUNDO_ATTR );
- ParaRange aSel = ImpGetSelectedParagraphs( FALSE );
+ ParaRange aSel = ImpGetSelectedParagraphs( sal_False );
pEditView->SetAttribs( rAttrs );
// Update Bullet text
- for( USHORT nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ for( sal_uInt16 nPara= aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
pOwner->ImplCheckNumBulletItem( nPara );
- // update following paras as well, numbering depends on
- // previous paras
- pOwner->ImplCalcBulletText( nPara, TRUE, FALSE );
+ pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
if( !pOwner->IsInUndo() && pOwner->IsUndoEnabled() )
pOwner->InsertUndo( new OutlinerUndoCheckPara( pOwner, nPara ) );
@@ -567,7 +566,7 @@ void OutlinerView::SetAttribs( const SfxItemSet& rAttrs )
pEditView->SetEditEngineUpdateMode( bUpdate );
}
-ParaRange OutlinerView::ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds )
+ParaRange OutlinerView::ImpGetSelectedParagraphs( sal_Bool bIncludeHiddenChilds )
{
DBG_CHKTHIS( OutlinerView, 0 );
@@ -581,7 +580,7 @@ ParaRange OutlinerView::ImpGetSelectedParagraphs( BOOL bIncludeHiddenChilds )
Paragraph* pLast = pOwner->pParaList->GetParagraph( aParas.nEndPara );
if ( pOwner->pParaList->HasHiddenChilds( pLast ) )
aParas.nEndPara =
- sal::static_int_cast< USHORT >(
+ sal::static_int_cast< sal_uInt16 >(
aParas.nEndPara +
pOwner->pParaList->GetChildCount( pLast ) );
}
@@ -598,22 +597,22 @@ void OutlinerView::Indent( short nDiff )
{
DBG_CHKTHIS( OutlinerView, 0 );
- if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( TRUE ) && !pOwner->ImpCanIndentSelectedPages( this ) ) )
+ if( !nDiff || ( ( nDiff > 0 ) && ImpCalcSelectedPages( sal_True ) && !pOwner->ImpCanIndentSelectedPages( this ) ) )
return;
const bool bOutlinerView = pOwner->pEditEngine->GetControlWord() & EE_CNTRL_OUTLINER;
- BOOL bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
+ pOwner->pEditEngine->SetUpdateMode( sal_False );
- BOOL bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
+ sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
if( bUndo )
pOwner->UndoActionStart( OLUNDO_DEPTH );
sal_Int16 nMinDepth = -1; // Optimization: Not to recalculate to manny parargaphs when not really needed.
- ParaRange aSel = ImpGetSelectedParagraphs( TRUE );
- for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ ParaRange aSel = ImpGetSelectedParagraphs( sal_True );
+ for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
@@ -694,8 +693,8 @@ void OutlinerView::Indent( short nDiff )
pOwner->mnDepthChangeHdlPrevFlags = pPara->nFlags;
pOwner->pHdlParagraph = pPara;
- pOwner->ImplInitDepth( nPara, nNewDepth, TRUE, FALSE );
- pOwner->ImplCalcBulletText( nPara, FALSE, FALSE );
+ pOwner->ImplInitDepth( nPara, nNewDepth, sal_True, sal_False );
+ pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
pOwner->ImplSetLevelDependendStyleSheet( nPara );
@@ -710,18 +709,18 @@ void OutlinerView::Indent( short nDiff )
}
}
- USHORT nParas = (USHORT)pOwner->pParaList->GetParagraphCount();
- for ( USHORT n = aSel.nEndPara+1; n < nParas; n++ )
+ sal_uInt16 nParas = (sal_uInt16)pOwner->pParaList->GetParagraphCount();
+ for ( sal_uInt16 n = aSel.nEndPara+1; n < nParas; n++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( n );
if ( pPara->GetDepth() < nMinDepth )
break;
- pOwner->ImplCalcBulletText( n, FALSE, FALSE );
+ pOwner->ImplCalcBulletText( n, sal_False, sal_False );
}
if ( bUpdate )
{
- pEditView->SetEditEngineUpdateMode( TRUE );
+ pEditView->SetEditEngineUpdateMode( sal_True );
pEditView->ShowCursor();
}
@@ -729,33 +728,33 @@ void OutlinerView::Indent( short nDiff )
pOwner->UndoActionEnd( OLUNDO_DEPTH );
}
-BOOL OutlinerView::AdjustHeight( long nDY )
+sal_Bool OutlinerView::AdjustHeight( long nDY )
{
DBG_CHKTHIS(OutlinerView,0);
pEditView->MoveParagraphs( nDY );
- return TRUE; // remove return value...
+ return sal_True; // remove return value...
}
-void OutlinerView::AdjustDepth( Paragraph* pPara, short nDX, BOOL bWithChilds)
+void OutlinerView::AdjustDepth( Paragraph* pPara, short nDX, sal_Bool bWithChilds)
{
DBG_CHKTHIS(OutlinerView,0);
- ULONG nStartPara = pOwner->pParaList->GetAbsPos( pPara );
- ULONG nEndPara = nStartPara;
+ sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
+ sal_uLong nEndPara = nStartPara;
if ( bWithChilds )
nEndPara += pOwner->pParaList->GetChildCount( pPara );
- ESelection aSel((USHORT)nStartPara, 0,(USHORT)nEndPara, 0xffff );
+ ESelection aSel((sal_uInt16)nStartPara, 0,(sal_uInt16)nEndPara, 0xffff );
pEditView->SetSelection( aSel );
AdjustDepth( nDX );
}
-void OutlinerView::AdjustHeight( Paragraph* pPara, long nDY, BOOL bWithChilds )
+void OutlinerView::AdjustHeight( Paragraph* pPara, long nDY, sal_Bool bWithChilds )
{
DBG_CHKTHIS(OutlinerView,0);
- ULONG nStartPara = pOwner->pParaList->GetAbsPos( pPara );
- ULONG nEndPara = nStartPara;
+ sal_uLong nStartPara = pOwner->pParaList->GetAbsPos( pPara );
+ sal_uLong nEndPara = nStartPara;
if ( bWithChilds )
nEndPara += pOwner->pParaList->GetChildCount( pPara );
- ESelection aSel( (USHORT)nStartPara, 0, (USHORT)nEndPara, 0xffff );
+ ESelection aSel( (sal_uInt16)nStartPara, 0, (sal_uInt16)nEndPara, 0xffff );
pEditView->SetSelection( aSel );
AdjustHeight( nDY );
}
@@ -896,47 +895,47 @@ void OutlinerView::ImpScrollUp()
void OutlinerView::Expand()
{
DBG_CHKTHIS( OutlinerView, 0 );
- ParaRange aParas = ImpGetSelectedParagraphs( FALSE );
- ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, TRUE );
+ ParaRange aParas = ImpGetSelectedParagraphs( sal_False );
+ ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_True );
}
void OutlinerView::Collapse()
{
DBG_CHKTHIS( OutlinerView, 0 );
- ParaRange aParas = ImpGetSelectedParagraphs( FALSE );
- ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, FALSE );
+ ParaRange aParas = ImpGetSelectedParagraphs( sal_False );
+ ImplExpandOrCollaps( aParas.nStartPara, aParas.nEndPara, sal_False );
}
void OutlinerView::ExpandAll()
{
DBG_CHKTHIS( OutlinerView, 0 );
- ImplExpandOrCollaps( 0, (USHORT)(pOwner->pParaList->GetParagraphCount()-1), TRUE );
+ ImplExpandOrCollaps( 0, (sal_uInt16)(pOwner->pParaList->GetParagraphCount()-1), sal_True );
}
void OutlinerView::CollapseAll()
{
DBG_CHKTHIS(OutlinerView,0);
- ImplExpandOrCollaps( 0, (USHORT)(pOwner->pParaList->GetParagraphCount()-1), FALSE );
+ ImplExpandOrCollaps( 0, (sal_uInt16)(pOwner->pParaList->GetParagraphCount()-1), sal_False );
}
-void OutlinerView::ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL bExpand )
+void OutlinerView::ImplExpandOrCollaps( sal_uInt16 nStartPara, sal_uInt16 nEndPara, sal_Bool bExpand )
{
DBG_CHKTHIS( OutlinerView, 0 );
- BOOL bUpdate = pOwner->GetUpdateMode();
- pOwner->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pOwner->GetUpdateMode();
+ pOwner->SetUpdateMode( sal_False );
- BOOL bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
+ sal_Bool bUndo = !pOwner->IsInUndo() && pOwner->IsUndoEnabled();
if( bUndo )
pOwner->UndoActionStart( bExpand ? OLUNDO_EXPAND : OLUNDO_COLLAPSE );
- for ( USHORT nPara = nStartPara; nPara <= nEndPara; nPara++ )
+ for ( sal_uInt16 nPara = nStartPara; nPara <= nEndPara; nPara++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
- BOOL bDone = bExpand ? pOwner->Expand( pPara ) : pOwner->Collapse( pPara );
+ sal_Bool bDone = bExpand ? pOwner->Expand( pPara ) : pOwner->Collapse( pPara );
if( bDone )
{
// The line under the paragraph should disappear ...
@@ -949,7 +948,7 @@ void OutlinerView::ImplExpandOrCollaps( USHORT nStartPara, USHORT nEndPara, BOOL
if ( bUpdate )
{
- pOwner->SetUpdateMode( TRUE );
+ pOwner->SetUpdateMode( sal_True );
pEditView->ShowCursor();
}
}
@@ -981,22 +980,22 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
DBG_CHKTHIS(OutlinerView,0);
- if ( ImpCalcSelectedPages( FALSE ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
+ if ( ImpCalcSelectedPages( sal_False ) && !pOwner->ImpCanDeleteSelectedPages( this ) )
return;
pOwner->UndoActionStart( OLUNDO_INSERT );
- pOwner->pEditEngine->SetUpdateMode( FALSE );
- ULONG nStart, nParaCount;
+ pOwner->pEditEngine->SetUpdateMode( sal_False );
+ sal_uLong nStart, nParaCount;
nParaCount = pOwner->pEditEngine->GetParagraphCount();
- USHORT nSize = ImpInitPaste( nStart );
+ sal_uInt16 nSize = ImpInitPaste( nStart );
pEditView->InsertText( rParaObj.GetTextObject() );
ImpPasted( nStart, nParaCount, nSize);
- pEditView->SetEditEngineUpdateMode( TRUE );
+ pEditView->SetEditEngineUpdateMode( sal_True );
pOwner->UndoActionEnd( OLUNDO_INSERT );
- pEditView->ShowCursor( TRUE, TRUE );
+ pEditView->ShowCursor( sal_True, sal_True );
}
@@ -1004,7 +1003,7 @@ void OutlinerView::InsertText( const OutlinerParaObject& rParaObj )
void OutlinerView::Cut()
{
DBG_CHKTHIS(OutlinerView,0);
- if ( !ImpCalcSelectedPages( FALSE ) || pOwner->ImpCanDeleteSelectedPages( this ) )
+ if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) )
pEditView->Cut();
}
@@ -1017,25 +1016,25 @@ void OutlinerView::Paste()
void OutlinerView::PasteSpecial()
{
DBG_CHKTHIS(OutlinerView,0);
- if ( !ImpCalcSelectedPages( FALSE ) || pOwner->ImpCanDeleteSelectedPages( this ) )
+ if ( !ImpCalcSelectedPages( sal_False ) || pOwner->ImpCanDeleteSelectedPages( this ) )
{
pOwner->UndoActionStart( OLUNDO_INSERT );
- pOwner->pEditEngine->SetUpdateMode( FALSE );
- pOwner->bPasting = TRUE;
+ pOwner->pEditEngine->SetUpdateMode( sal_False );
+ pOwner->bPasting = sal_True;
pEditView->PasteSpecial();
if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
{
- const USHORT nParaCount = pOwner->pEditEngine->GetParagraphCount();
+ const sal_uInt16 nParaCount = pOwner->pEditEngine->GetParagraphCount();
- for( USHORT nPara = 0; nPara < nParaCount; nPara++ )
+ for( sal_uInt16 nPara = 0; nPara < nParaCount; nPara++ )
pOwner->ImplSetLevelDependendStyleSheet( nPara );
}
- pEditView->SetEditEngineUpdateMode( TRUE );
+ pEditView->SetEditEngineUpdateMode( sal_True );
pOwner->UndoActionEnd( OLUNDO_INSERT );
- pEditView->ShowCursor( TRUE, TRUE );
+ pEditView->ShowCursor( sal_True, sal_True );
}
}
@@ -1043,9 +1042,9 @@ void OutlinerView::CreateSelectionList (std::vector<Paragraph*> &aSelList)
{
DBG_CHKTHIS( OutlinerView, 0 );
- ParaRange aParas = ImpGetSelectedParagraphs( TRUE );
+ ParaRange aParas = ImpGetSelectedParagraphs( sal_True );
- for ( USHORT nPara = aParas.nStartPara; nPara <= aParas.nEndPara; nPara++ )
+ for ( sal_uInt16 nPara = aParas.nStartPara; nPara <= aParas.nEndPara; nPara++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
aSelList.push_back(pPara);
@@ -1063,11 +1062,11 @@ void OutlinerView::SetStyleSheet( SfxStyleSheet* pStyle )
DBG_CHKTHIS(OutlinerView,0);
pEditView->SetStyleSheet( pStyle );
- ParaRange aSel = ImpGetSelectedParagraphs( TRUE );
- for( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ ParaRange aSel = ImpGetSelectedParagraphs( sal_True );
+ for( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
pOwner->ImplCheckNumBulletItem( nPara );
- pOwner->ImplCalcBulletText( nPara, FALSE, FALSE );
+ pOwner->ImplCalcBulletText( nPara, sal_False, sal_False );
}
}
@@ -1096,28 +1095,28 @@ Pointer OutlinerView::GetPointer( const Point& rPosPixel )
}
-USHORT OutlinerView::ImpInitPaste( ULONG& rStart )
+sal_uInt16 OutlinerView::ImpInitPaste( sal_uLong& rStart )
{
DBG_CHKTHIS(OutlinerView,0);
- pOwner->bPasting = TRUE;
+ pOwner->bPasting = sal_True;
ESelection aSelection( pEditView->GetSelection() );
aSelection.Adjust();
rStart = aSelection.nStartPara;
- USHORT nSize = aSelection.nEndPara - aSelection.nStartPara + 1;
+ sal_uInt16 nSize = aSelection.nEndPara - aSelection.nStartPara + 1;
return nSize;
}
-void OutlinerView::ImpPasted( ULONG nStart, ULONG nPrevParaCount, USHORT nSize)
+void OutlinerView::ImpPasted( sal_uLong nStart, sal_uLong nPrevParaCount, sal_uInt16 nSize)
{
DBG_CHKTHIS(OutlinerView,0);
- pOwner->bPasting = FALSE;
- ULONG nCurParaCount = (ULONG)pOwner->pEditEngine->GetParagraphCount();
+ pOwner->bPasting = sal_False;
+ sal_uLong nCurParaCount = (sal_uLong)pOwner->pEditEngine->GetParagraphCount();
if( nCurParaCount < nPrevParaCount )
- nSize = sal::static_int_cast< USHORT >(
+ nSize = sal::static_int_cast< sal_uInt16 >(
nSize - ( nPrevParaCount - nCurParaCount ) );
else
- nSize = sal::static_int_cast< USHORT >(
+ nSize = sal::static_int_cast< sal_uInt16 >(
nSize + ( nCurParaCount - nPrevParaCount ) );
pOwner->ImpTextPasted( nStart, nSize );
}
@@ -1130,31 +1129,31 @@ void OutlinerView::Command( const CommandEvent& rCEvt )
}
-void OutlinerView::SelectRange( ULONG nFirst, USHORT nCount )
+void OutlinerView::SelectRange( sal_uLong nFirst, sal_uInt16 nCount )
{
DBG_CHKTHIS(OutlinerView,0);
- ULONG nLast = nFirst+nCount;
- nCount = (USHORT)pOwner->pParaList->GetParagraphCount();
+ sal_uLong nLast = nFirst+nCount;
+ nCount = (sal_uInt16)pOwner->pParaList->GetParagraphCount();
if( nLast <= nCount )
nLast = nCount - 1;
- ESelection aSel( (USHORT)nFirst, 0, (USHORT)nLast, 0xffff );
+ ESelection aSel( (sal_uInt16)nFirst, 0, (sal_uInt16)nLast, 0xffff );
pEditView->SetSelection( aSel );
}
-USHORT OutlinerView::ImpCalcSelectedPages( BOOL bIncludeFirstSelected )
+sal_uInt16 OutlinerView::ImpCalcSelectedPages( sal_Bool bIncludeFirstSelected )
{
DBG_CHKTHIS(OutlinerView,0);
ESelection aSel( pEditView->GetSelection() );
aSel.Adjust();
- USHORT nPages = 0;
- USHORT nFirstPage = 0xFFFF;
- USHORT nStartPara = aSel.nStartPara;
+ sal_uInt16 nPages = 0;
+ sal_uInt16 nFirstPage = 0xFFFF;
+ sal_uInt16 nStartPara = aSel.nStartPara;
if ( !bIncludeFirstSelected )
nStartPara++; // All paragraphs after StartPara will be deleted
- for ( USHORT nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ for ( sal_uInt16 nPara = nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
DBG_ASSERT(pPara, "ImpCalcSelectedPages: invalid Selection? ");
@@ -1185,11 +1184,11 @@ void OutlinerView::ToggleBullets()
aSel.Adjust();
const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( FALSE );
+ pOwner->pEditEngine->SetUpdateMode( sal_False );
sal_Int16 nDepth = -2;
- for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
@@ -1216,8 +1215,8 @@ void OutlinerView::ToggleBullets()
// #i100014#
// It is not a good idea to substract 1 from a count and cast the result
- // to USHORT without check, if the count is 0.
- USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount());
+ // to sal_uInt16 without check, if the count is 0.
+ sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount());
pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
@@ -1234,9 +1233,9 @@ void OutlinerView::EnableBullets()
aSel.Adjust();
const bool bUpdate = pOwner->pEditEngine->GetUpdateMode();
- pOwner->pEditEngine->SetUpdateMode( FALSE );
+ pOwner->pEditEngine->SetUpdateMode( sal_False );
- for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
DBG_ASSERT(pPara, "OutlinerView::ToggleBullets(), illegal selection?");
@@ -1249,8 +1248,9 @@ void OutlinerView::EnableBullets()
// #i100014#
// It is not a good idea to substract 1 from a count and cast the result
- // to USHORT without check, if the count is 0.
- USHORT nParaCount = (USHORT) (pOwner->pParaList->GetParagraphCount());
+ // to sal_uInt16 without check, if the count is 0.
+ sal_uInt16 nParaCount = (sal_uInt16) (pOwner->pParaList->GetParagraphCount());
+
pOwner->ImplCheckParagraphs( aSel.nStartPara, nParaCount );
pOwner->pEditEngine->QuickMarkInvalid( ESelection( aSel.nStartPara, 0, nParaCount, 0 ) );
@@ -1260,16 +1260,16 @@ void OutlinerView::EnableBullets()
}
-void OutlinerView::RemoveAttribsKeepLanguages( BOOL bRemoveParaAttribs )
+void OutlinerView::RemoveAttribsKeepLanguages( sal_Bool bRemoveParaAttribs )
{
- RemoveAttribs( bRemoveParaAttribs, 0, TRUE /*keep language attribs*/ );
+ RemoveAttribs( bRemoveParaAttribs, 0, sal_True /*keep language attribs*/ );
}
-void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL bKeepLanguages )
+void OutlinerView::RemoveAttribs( sal_Bool bRemoveParaAttribs, sal_uInt16 nWhich, sal_Bool bKeepLanguages )
{
DBG_CHKTHIS(OutlinerView,0);
- BOOL bUpdate = pOwner->GetUpdateMode();
- pOwner->SetUpdateMode( FALSE );
+ sal_Bool bUpdate = pOwner->GetUpdateMode();
+ pOwner->SetUpdateMode( sal_False );
pOwner->UndoActionStart( OLUNDO_ATTR );
if (bKeepLanguages)
pEditView->RemoveAttribsKeepLanguages( bRemoveParaAttribs );
@@ -1280,10 +1280,10 @@ void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL b
// Loop through all paragraphs and set indentation and level
ESelection aSel = pEditView->GetSelection();
aSel.Adjust();
- for ( USHORT nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
+ for ( sal_uInt16 nPara = aSel.nStartPara; nPara <= aSel.nEndPara; nPara++ )
{
Paragraph* pPara = pOwner->pParaList->GetParagraph( nPara );
- pOwner->ImplInitDepth( nPara, pPara->GetDepth(), FALSE, FALSE );
+ pOwner->ImplInitDepth( nPara, pPara->GetDepth(), sal_False, sal_False );
}
}
pOwner->UndoActionEnd( OLUNDO_ATTR );
@@ -1297,7 +1297,7 @@ void OutlinerView::RemoveAttribs( BOOL bRemoveParaAttribs, USHORT nWhich, BOOL b
// ======================================================================
-void OutlinerView::InsertText( const XubString& rNew, BOOL bSelect )
+void OutlinerView::InsertText( const XubString& rNew, sal_Bool bSelect )
{
DBG_CHKTHIS(OutlinerView,0);
if( pOwner->bFirstParaIsEmpty )
@@ -1318,26 +1318,26 @@ void OutlinerView::SetSelection( const ESelection& rSel )
pEditView->SetSelection( rSel );
}
-void OutlinerView::SetReadOnly( BOOL bReadOnly )
+void OutlinerView::SetReadOnly( sal_Bool bReadOnly )
{
DBG_CHKTHIS(OutlinerView,0);
pEditView->SetReadOnly( bReadOnly );
}
-BOOL OutlinerView::IsReadOnly() const
+sal_Bool OutlinerView::IsReadOnly() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->IsReadOnly();
}
-BOOL OutlinerView::HasSelection() const
+sal_Bool OutlinerView::HasSelection() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->HasSelection();
}
-void OutlinerView::ShowCursor( BOOL bGotoCursor )
+void OutlinerView::ShowCursor( sal_Bool bGotoCursor )
{
DBG_CHKTHIS(OutlinerView,0);
pEditView->ShowCursor( bGotoCursor );
@@ -1386,10 +1386,10 @@ XubString OutlinerView::GetSelected() const
}
-void OutlinerView::RemoveCharAttribs( ULONG nPara, USHORT nWhich)
+void OutlinerView::RemoveCharAttribs( sal_uLong nPara, sal_uInt16 nWhich)
{
DBG_CHKTHIS(OutlinerView,0);
- pEditView->RemoveCharAttribs( (USHORT)nPara, nWhich);
+ pEditView->RemoveCharAttribs( (sal_uInt16)nPara, nWhich);
}
@@ -1400,7 +1400,7 @@ void OutlinerView::CompleteAutoCorrect()
}
-EESpellState OutlinerView::StartSpeller( BOOL bMultiDoc )
+EESpellState OutlinerView::StartSpeller( sal_Bool bMultiDoc )
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->StartSpeller( bMultiDoc );
@@ -1416,7 +1416,7 @@ EESpellState OutlinerView::StartThesaurus()
void OutlinerView::StartTextConversion(
LanguageType nSrcLang, LanguageType nDestLang, const Font *pDestFont,
- INT32 nOptions, BOOL bIsInteractive, BOOL bMultipleDoc )
+ sal_Int32 nOptions, sal_Bool bIsInteractive, sal_Bool bMultipleDoc )
{
DBG_CHKTHIS(OutlinerView,0);
if (
@@ -1434,7 +1434,7 @@ void OutlinerView::StartTextConversion(
}
-USHORT OutlinerView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
+sal_uInt16 OutlinerView::StartSearchAndReplace( const SvxSearchItem& rSearchItem )
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->StartSearchAndReplace( rSearchItem );
@@ -1462,14 +1462,14 @@ void OutlinerView::Scroll( long nHorzScroll, long nVertScroll )
}
-void OutlinerView::SetControlWord( ULONG nWord )
+void OutlinerView::SetControlWord( sal_uLong nWord )
{
DBG_CHKTHIS(OutlinerView,0);
pEditView->SetControlWord( nWord );
}
-ULONG OutlinerView::GetControlWord() const
+sal_uLong OutlinerView::GetControlWord() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetControlWord();
@@ -1504,7 +1504,7 @@ void OutlinerView::Redo()
}
-void OutlinerView::EnablePaste( BOOL bEnable )
+void OutlinerView::EnablePaste( sal_Bool bEnable )
{
DBG_CHKTHIS(OutlinerView,0);
pEditView->EnablePaste( bEnable );
@@ -1532,7 +1532,7 @@ const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer() const
}
-const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer( USHORT& nPara, USHORT& nPos ) const
+const SvxFieldItem* OutlinerView::GetFieldUnderMousePointer( sal_uInt16& nPara, sal_uInt16& nPos ) const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetFieldUnderMousePointer( nPara, nPos );
@@ -1545,28 +1545,28 @@ const SvxFieldItem* OutlinerView::GetFieldAtSelection() const
return pEditView->GetFieldAtSelection();
}
-void OutlinerView::SetInvalidateMore( USHORT nPixel )
+void OutlinerView::SetInvalidateMore( sal_uInt16 nPixel )
{
DBG_CHKTHIS(OutlinerView,0);
pEditView->SetInvalidateMore( nPixel );
}
-USHORT OutlinerView::GetInvalidateMore() const
+sal_uInt16 OutlinerView::GetInvalidateMore() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetInvalidateMore();
}
-BOOL OutlinerView::IsCursorAtWrongSpelledWord( BOOL bMarkIfWrong )
+sal_Bool OutlinerView::IsCursorAtWrongSpelledWord( sal_Bool bMarkIfWrong )
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->IsCursorAtWrongSpelledWord( bMarkIfWrong );
}
-BOOL OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, BOOL bMarkIfWrong )
+sal_Bool OutlinerView::IsWrongSpelledWordAtPos( const Point& rPosPixel, sal_Bool bMarkIfWrong )
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->IsWrongSpelledWordAtPos( rPosPixel, bMarkIfWrong );
@@ -1586,28 +1586,28 @@ void OutlinerView::ExecuteSpellPopup( const Point& rPosPixel, Link* pStartDlg )
pEditView->ExecuteSpellPopup( rPosPixel, pStartDlg );
}
-ULONG OutlinerView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, BOOL bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
+sal_uLong OutlinerView::Read( SvStream& rInput, const String& rBaseURL, EETextFormat eFormat, sal_Bool bSelect, SvKeyValueIterator* pHTTPHeaderAttrs )
{
DBG_CHKTHIS(OutlinerView,0);
- USHORT nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
+ sal_uInt16 nOldParaCount = pEditView->GetEditEngine()->GetParagraphCount();
ESelection aOldSel = pEditView->GetSelection();
aOldSel.Adjust();
- ULONG nRet = pEditView->Read( rInput, rBaseURL, eFormat, bSelect, pHTTPHeaderAttrs );
+ sal_uLong nRet = pEditView->Read( rInput, rBaseURL, eFormat, bSelect, pHTTPHeaderAttrs );
long nParaDiff = pEditView->GetEditEngine()->GetParagraphCount() - nOldParaCount;
- USHORT nChangesStart = aOldSel.nStartPara;
- USHORT nChangesEnd = sal::static_int_cast< USHORT >(nChangesStart + nParaDiff + (aOldSel.nEndPara-aOldSel.nStartPara));
+ sal_uInt16 nChangesStart = aOldSel.nStartPara;
+ sal_uInt16 nChangesEnd = sal::static_int_cast< sal_uInt16 >(nChangesStart + nParaDiff + (aOldSel.nEndPara-aOldSel.nStartPara));
- for ( USHORT n = nChangesStart; n <= nChangesEnd; n++ )
+ for ( sal_uInt16 n = nChangesStart; n <= nChangesEnd; n++ )
{
if ( eFormat == EE_FORMAT_BIN )
{
- USHORT nDepth = 0;
+ sal_uInt16 nDepth = 0;
const SfxItemSet& rAttrs = pOwner->GetParaAttribs( n );
const SfxInt16Item& rLevel = (const SfxInt16Item&) rAttrs.Get( EE_PARA_OUTLLEVEL );
nDepth = rLevel.GetValue();
- pOwner->ImplInitDepth( n, nDepth, FALSE );
+ pOwner->ImplInitDepth( n, nDepth, sal_False );
}
if ( pOwner->ImplGetOutlinerMode() == OUTLINERMODE_OUTLINEOBJECT )
@@ -1622,7 +1622,7 @@ ULONG OutlinerView::Read( SvStream& rInput, const String& rBaseURL, EETextForma
return nRet;
}
-ULONG OutlinerView::Write( SvStream& rOutput, EETextFormat eFormat )
+sal_uLong OutlinerView::Write( SvStream& rOutput, EETextFormat eFormat )
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->Write( rOutput, eFormat );
@@ -1647,7 +1647,7 @@ SfxItemSet OutlinerView::GetAttribs()
return pEditView->GetAttribs();
}
-USHORT OutlinerView::GetSelectedScriptType() const
+sal_uInt16 OutlinerView::GetSelectedScriptType() const
{
DBG_CHKTHIS(OutlinerView,0);
return pEditView->GetSelectedScriptType();
diff --git a/editeng/source/outliner/paralist.cxx b/editeng/source/outliner/paralist.cxx
index ee7d518b4137..c09e0f22d90f 100644
--- a/editeng/source/outliner/paralist.cxx
+++ b/editeng/source/outliner/paralist.cxx
@@ -76,7 +76,7 @@ Paragraph::Paragraph( sal_Int16 nDDepth )
nDepth = nDDepth;
nFlags = 0;
- bVisible = TRUE;
+ bVisible = sal_True;
}
Paragraph::Paragraph( const Paragraph& rPara )
@@ -94,7 +94,7 @@ Paragraph::Paragraph( const Paragraph& rPara )
Paragraph::Paragraph( const ParagraphData& rData )
: nFlags( 0 )
, aBulSize( -1, -1)
-, bVisible( TRUE )
+, bVisible( sal_True )
{
DBG_CTOR( Paragraph, 0 );
@@ -122,7 +122,7 @@ void Paragraph::SetParaIsNumberingRestart( sal_Bool bParaIsNumberingRestart )
mnNumberingStartValue = -1;
}
-void ParagraphList::Clear( BOOL bDestroyParagraphs )
+void ParagraphList::Clear( sal_Bool bDestroyParagraphs )
{
if ( bDestroyParagraphs )
{
@@ -139,21 +139,21 @@ void ParagraphList::Append( Paragraph* pPara)
maEntries.push_back(pPara);
}
-void ParagraphList::Insert( Paragraph* pPara, ULONG nAbsPos)
+void ParagraphList::Insert( Paragraph* pPara, sal_uLong nAbsPos)
{
OSL_ASSERT(nAbsPos != ULONG_MAX && nAbsPos <= maEntries.size());
maEntries.insert(maEntries.begin()+nAbsPos,pPara);
}
-void ParagraphList::Remove( ULONG nPara )
+void ParagraphList::Remove( sal_uLong nPara )
{
OSL_ASSERT(nPara < maEntries.size());
maEntries.erase(maEntries.begin() + nPara );
}
-void ParagraphList::MoveParagraphs( ULONG nStart, ULONG nDest, ULONG _nCount )
+void ParagraphList::MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong _nCount )
{
OSL_ASSERT(nStart < maEntries.size() && nDest < maEntries.size());
@@ -185,7 +185,6 @@ Paragraph* ParagraphList::NextVisible( Paragraph* pPara ) const
std::vector<Paragraph*>::const_iterator iter = std::find(maEntries.begin(),
maEntries.end(),
pPara);
-
for (; iter != maEntries.end(); ++iter)
{
if ((*iter)->IsVisible())
@@ -200,7 +199,6 @@ Paragraph* ParagraphList::PrevVisible( Paragraph* pPara ) const
std::vector<Paragraph*>::const_reverse_iterator iter = std::find(maEntries.rbegin(),
maEntries.rend(),
pPara);
-
for (; iter != maEntries.rend(); ++iter)
{
if ((*iter)->IsVisible())
@@ -222,31 +220,31 @@ Paragraph* ParagraphList::LastVisible() const
return iter != maEntries.rend() ? *iter : NULL;
}
-BOOL ParagraphList::HasChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasChilds( Paragraph* pParagraph ) const
{
- ULONG n = GetAbsPos( pParagraph );
+ sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
- return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? TRUE : FALSE;
+ return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) ) ? sal_True : sal_False;
}
-BOOL ParagraphList::HasHiddenChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasHiddenChilds( Paragraph* pParagraph ) const
{
- ULONG n = GetAbsPos( pParagraph );
+ sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
- return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? TRUE : FALSE;
+ return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && !pNext->IsVisible() ) ? sal_True : sal_False;
}
-BOOL ParagraphList::HasVisibleChilds( Paragraph* pParagraph ) const
+sal_Bool ParagraphList::HasVisibleChilds( Paragraph* pParagraph ) const
{
- ULONG n = GetAbsPos( pParagraph );
+ sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pNext = GetParagraph( ++n );
- return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible() ) ? TRUE : FALSE;
+ return ( pNext && ( pNext->GetDepth() > pParagraph->GetDepth() ) && pNext->IsVisible() ) ? sal_True : sal_False;
}
-ULONG ParagraphList::GetChildCount( Paragraph* pParent ) const
+sal_uLong ParagraphList::GetChildCount( Paragraph* pParent ) const
{
- ULONG nChildCount = 0;
- ULONG n = GetAbsPos( pParent );
+ sal_uLong nChildCount = 0;
+ sal_uLong n = GetAbsPos( pParent );
Paragraph* pPara = GetParagraph( ++n );
while ( pPara && ( pPara->GetDepth() > pParent->GetDepth() ) )
{
@@ -256,10 +254,10 @@ ULONG ParagraphList::GetChildCount( Paragraph* pParent ) const
return nChildCount;
}
-Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, USHORT& rRelPos */ ) const
+Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const
{
/* rRelPos = 0 */;
- ULONG n = GetAbsPos( pParagraph );
+ sal_uLong n = GetAbsPos( pParagraph );
Paragraph* pPrev = GetParagraph( --n );
while ( pPrev && ( pPrev->GetDepth() >= pParagraph->GetDepth() ) )
{
@@ -273,15 +271,15 @@ Paragraph* ParagraphList::GetParent( Paragraph* pParagraph /*, USHORT& rRelPos *
void ParagraphList::Expand( Paragraph* pParent )
{
- ULONG nChildCount = GetChildCount( pParent );
- ULONG nPos = GetAbsPos( pParent );
+ sal_uLong nChildCount = GetChildCount( pParent );
+ sal_uLong nPos = GetAbsPos( pParent );
- for ( ULONG n = 1; n <= nChildCount; n++ )
+ for ( sal_uLong n = 1; n <= nChildCount; n++ )
{
Paragraph* pPara = GetParagraph( nPos+n );
if ( !( pPara->IsVisible() ) )
{
- pPara->bVisible = TRUE;
+ pPara->bVisible = sal_True;
aVisibleStateChangedHdl.Call( pPara );
}
}
@@ -289,23 +287,23 @@ void ParagraphList::Expand( Paragraph* pParent )
void ParagraphList::Collapse( Paragraph* pParent )
{
- ULONG nChildCount = GetChildCount( pParent );
- ULONG nPos = GetAbsPos( pParent );
+ sal_uLong nChildCount = GetChildCount( pParent );
+ sal_uLong nPos = GetAbsPos( pParent );
- for ( ULONG n = 1; n <= nChildCount; n++ )
+ for ( sal_uLong n = 1; n <= nChildCount; n++ )
{
Paragraph* pPara = GetParagraph( nPos+n );
if ( pPara->IsVisible() )
{
- pPara->bVisible = FALSE;
+ pPara->bVisible = sal_False;
aVisibleStateChangedHdl.Call( pPara );
}
}
}
-ULONG ParagraphList::GetAbsPos( Paragraph* pParent ) const
+sal_uLong ParagraphList::GetAbsPos( Paragraph* pParent ) const
{
- ULONG pos = 0;
+ sal_uLong pos = 0;
std::vector<Paragraph*>::const_iterator iter;
for (iter = maEntries.begin(); iter != maEntries.end(); ++iter, ++pos)
{
@@ -316,9 +314,9 @@ ULONG ParagraphList::GetAbsPos( Paragraph* pParent ) const
return ~0;
}
-ULONG ParagraphList::GetVisPos( Paragraph* pPara ) const
+sal_uLong ParagraphList::GetVisPos( Paragraph* pPara ) const
{
- ULONG nVisPos = 0;
+ sal_uLong nVisPos = 0;
std::vector<Paragraph*>::const_iterator iter;
for (iter = maEntries.begin(); iter != maEntries.end(); ++iter, ++nVisPos)
{
diff --git a/editeng/source/outliner/paralist.hxx b/editeng/source/outliner/paralist.hxx
index f751c97aea9d..29398c24239e 100644
--- a/editeng/source/outliner/paralist.hxx
+++ b/editeng/source/outliner/paralist.hxx
@@ -38,35 +38,35 @@ class Paragraph;
class ParagraphList
{
public:
- void Clear( BOOL bDestroyParagraphs );
+ void Clear( sal_Bool bDestroyParagraphs );
sal_uInt32 GetParagraphCount() const
{
return maEntries.size();
}
- Paragraph* GetParagraph( ULONG nPos ) const
+ Paragraph* GetParagraph( sal_uLong nPos ) const
{
return nPos < maEntries.size() ? maEntries[nPos] : NULL;
}
- ULONG GetAbsPos( Paragraph* pParent ) const;
- ULONG GetVisPos( Paragraph* pParagraph ) const;
+ sal_uLong GetAbsPos( Paragraph* pParent ) const;
+ sal_uLong GetVisPos( Paragraph* pParagraph ) const;
void Append( Paragraph *pPara);
- void Insert( Paragraph* pPara, ULONG nAbsPos);
- void Remove( ULONG nPara );
- void MoveParagraphs( ULONG nStart, ULONG nDest, ULONG nCount );
+ void Insert( Paragraph* pPara, sal_uLong nAbsPos);
+ void Remove( sal_uLong nPara );
+ void MoveParagraphs( sal_uLong nStart, sal_uLong nDest, sal_uLong nCount );
Paragraph* NextVisible( Paragraph* ) const;
Paragraph* PrevVisible( Paragraph* ) const;
Paragraph* LastVisible() const;
- Paragraph* GetParent( Paragraph* pParagraph /*, USHORT& rRelPos */ ) const;
- BOOL HasChilds( Paragraph* pParagraph ) const;
- BOOL HasHiddenChilds( Paragraph* pParagraph ) const;
- BOOL HasVisibleChilds( Paragraph* pParagraph ) const;
- ULONG GetChildCount( Paragraph* pParagraph ) const;
+ Paragraph* GetParent( Paragraph* pParagraph /*, sal_uInt16& rRelPos */ ) const;
+ sal_Bool HasChilds( Paragraph* pParagraph ) const;
+ sal_Bool HasHiddenChilds( Paragraph* pParagraph ) const;
+ sal_Bool HasVisibleChilds( Paragraph* pParagraph ) const;
+ sal_uLong GetChildCount( Paragraph* pParagraph ) const;
void Expand( Paragraph* pParent );
void Collapse( Paragraph* pParent );
generated by cgit (git 2.34.1) at 2024-07-02 07:34:36 +0000