[PATCH] fdo#62475 - remove visual noise in sw/source/core/edit
Philipp Riemer (via Code Review)
gerrit at gerrit.libreoffice.org
Sat Jun 8 15:51:30 PDT 2013
Hi,
I have submitted a patch for review:
https://gerrit.libreoffice.org/4205
To pull it, you can do:
git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/05/4205/1
fdo#62475 - remove visual noise in sw/source/core/edit
- ASCII art
- method comments without further info
- multiple blank lines
Change-Id: I2b17f5fe4be89cc58c3563dfc64f1b3e2a20bdee
---
M sw/source/core/edit/acorrect.cxx
M sw/source/core/edit/autofmt.cxx
M sw/source/core/edit/edatmisc.cxx
M sw/source/core/edit/edattr.cxx
M sw/source/core/edit/eddel.cxx
M sw/source/core/edit/edfcol.cxx
M sw/source/core/edit/edfld.cxx
M sw/source/core/edit/edfldexp.cxx
M sw/source/core/edit/edfmt.cxx
M sw/source/core/edit/edglbldc.cxx
M sw/source/core/edit/edglss.cxx
M sw/source/core/edit/editsh.cxx
M sw/source/core/edit/edlingu.cxx
M sw/source/core/edit/ednumber.cxx
M sw/source/core/edit/edredln.cxx
M sw/source/core/edit/edsect.cxx
M sw/source/core/edit/edtab.cxx
M sw/source/core/edit/edtox.cxx
M sw/source/core/edit/edundo.cxx
M sw/source/core/edit/edws.cxx
20 files changed, 12 insertions(+), 364 deletions(-)
diff --git a/sw/source/core/edit/acorrect.cxx b/sw/source/core/edit/acorrect.cxx
index 12f4efc..5530dc8 100644
--- a/sw/source/core/edit/acorrect.cxx
+++ b/sw/source/core/edit/acorrect.cxx
@@ -37,7 +37,6 @@
using namespace ::com::sun::star;
-
class _PaMIntoCrsrShellRing
{
SwCrsrShell& rSh;
@@ -62,12 +61,14 @@
rDelPam.MoveRingTo( pShCrsr );
rCrsr.MoveRingTo( pShCrsr );
}
+
_PaMIntoCrsrShellRing::~_PaMIntoCrsrShellRing()
{
// and take out the Pam again:
RemoveFromRing( rDelPam, pPrevDelPam );
RemoveFromRing( rCrsr, pPrevCrsr );
}
+
void _PaMIntoCrsrShellRing::RemoveFromRing( SwPaM& rPam, Ring* pPrev )
{
Ring *p, *pNext = (Ring*)&rPam;
@@ -78,7 +79,6 @@
} while( p != pPrev );
}
-
SwAutoCorrDoc::SwAutoCorrDoc( SwEditShell& rEditShell, SwPaM& rPam,
sal_Unicode cIns )
: rEditSh( rEditShell ), rCrsr( rPam ), pIdx( 0 )
@@ -86,7 +86,6 @@
, bUndoIdInitialized( cIns ? false : true )
{
}
-
SwAutoCorrDoc::~SwAutoCorrDoc()
{
@@ -124,7 +123,6 @@
return sal_True;
}
-
sal_Bool SwAutoCorrDoc::Insert( xub_StrLen nPos, const String& rTxt )
{
SwPaM aPam( rCrsr.GetPoint()->nNode.GetNode(), nPos );
@@ -141,11 +139,11 @@
return sal_True;
}
-
sal_Bool SwAutoCorrDoc::Replace( xub_StrLen nPos, const String& rTxt )
{
return ReplaceRange( nPos, rTxt.Len(), rTxt );
}
+
sal_Bool SwAutoCorrDoc::ReplaceRange( xub_StrLen nPos, xub_StrLen nSourceLength, const String& rTxt )
{
SwPaM* pPam = &rCrsr;
@@ -230,8 +228,6 @@
return sal_True;
}
-
-
sal_Bool SwAutoCorrDoc::SetAttr( xub_StrLen nStt, xub_StrLen nEnd, sal_uInt16 nSlotId,
SfxPoolItem& rItem )
{
@@ -254,8 +250,6 @@
}
return 0 != nWhich;
}
-
-
sal_Bool SwAutoCorrDoc::SetINetAttr( xub_StrLen nStt, xub_StrLen nEnd, const String& rURL )
{
@@ -301,7 +295,6 @@
bUndoIdInitialized = true;
return pStr;
}
-
sal_Bool SwAutoCorrDoc::ChgAutoCorrWord( xub_StrLen & rSttPos, xub_StrLen nEndPos,
SvxAutoCorrect& rACorrect,
@@ -361,7 +354,6 @@
pIdx = new SwNodeIndex( rCrsr.GetPoint()->nNode, -1 );
}
- //
SwDoc* pAutoDoc = aTBlks.GetDoc();
SwNodeIndex aSttIdx( pAutoDoc->GetNodes().GetEndOfExtras(), 1 );
SwCntntNode* pCntntNd = pAutoDoc->GetNodes().GoNext( &aSttIdx );
@@ -453,7 +445,6 @@
}
}
-
sal_Bool SwAutoCorrExceptWord::CheckDelChar( const SwPosition& rPos )
{
sal_Bool bRet = sal_False;
@@ -527,6 +518,5 @@
}
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2ffc015..9815c12 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <ctype.h>
#include <hintids.hxx>
@@ -67,8 +66,6 @@
using namespace ::com::sun::star;
-//-------------------------------------------------------------------
-
//JP 16.12.99: definition:
// from pos cPosEnDash to cPosEmDash all chars changed to endashes,
// from pos cPosEmDash to cPosEnd all chars changed to emdashes
@@ -79,7 +76,6 @@
const sal_Unicode cStarSymbolEnDash = 0x2013;
const sal_Unicode cStarSymbolEmDash = 0x2014;
-
SvxSwAutoFmtFlags* SwEditShell::pAutoFmtFlags = 0;
@@ -138,7 +134,6 @@
bool bEmptyLine : 1;
bool bMoreLines : 1;
-
// ------------- private methods -----------------------------
void _GetCharClass( LanguageType eLang );
CharClass& GetCharClass( LanguageType eLang ) const
@@ -150,7 +145,6 @@
}
return *pCharClass;
}
-
bool IsSpace( const sal_Unicode c ) const
{ return (' ' == c || '\t' == c || 0x0a == c|| 0x3000 == c /* Jap. space */); }
@@ -379,13 +373,11 @@
return pDoc->GetNodes()[ aNdIdx.GetIndex() + 1 ]->GetTxtNode();
}
-
sal_Bool SwAutoFormat::IsOneLine( const SwTxtNode& rNd ) const
{
SwTxtFrmInfo aFInfo( GetFrm( rNd ) );
return aFInfo.IsOneLine();
}
-
sal_Bool SwAutoFormat::IsFastFullLine( const SwTxtNode& rNd ) const
{
@@ -397,7 +389,6 @@
}
return bRet;
}
-
sal_Bool SwAutoFormat::IsEnumericChar( const SwTxtNode& rNd ) const
{
@@ -422,7 +413,6 @@
// 1.) / 1. / 1.1.1 / (1). / (1) / ....
return USHRT_MAX != GetDigitLevel( rNd, nBlnks );
}
-
sal_Bool SwAutoFormat::IsBlanksInString( const SwTxtNode& rNd ) const
{
@@ -451,7 +441,6 @@
return sal_False;
}
-
sal_uInt16 SwAutoFormat::CalcLevel( const SwTxtNode& rNd, sal_uInt16 *pDigitLvl ) const
{
sal_uInt16 nLvl = 0, nBlnk = 0;
@@ -470,7 +459,6 @@
}
++nLvl;
}
-
for (xub_StrLen n = 0, nEnd = rTxt.getLength(); n < nEnd; ++n)
{
@@ -491,8 +479,6 @@
return nLvl;
}
-
-
xub_StrLen SwAutoFormat::GetBigIndent( xub_StrLen& rAktSpacePos ) const
{
SwTxtFrmInfo aFInfo( GetFrm( *pAktTxtNd ) );
@@ -509,7 +495,6 @@
return aFInfo.GetBigIndent( rAktSpacePos, pNxtFrm );
}
-
sal_Bool SwAutoFormat::IsNoAlphaLine( const SwTxtNode& rNd ) const
{
@@ -531,8 +516,6 @@
nLen = ( nLen * 3 ) / 4; // long overflow, if the strlen > sal_uInt16
return xub_StrLen(nLen) < (rStr.Len() - nANChar - nBlnk);
}
-
-
bool SwAutoFormat::DoUnderline()
{
@@ -614,7 +597,6 @@
return 2 < nCnt;
}
-
bool SwAutoFormat::DoTable()
{
if( !aFlags.bCreateTable || !aFlags.bAFmtByInput ||
@@ -694,7 +676,6 @@
return 1 < aPosArr.size();
}
-
String& SwAutoFormat::DelLeadingBlanks( String& rStr ) const
{
xub_StrLen nL;
@@ -706,7 +687,6 @@
rStr.Erase( 0, n );
return rStr;
}
-
String& SwAutoFormat::DelTrailingBlanks( String& rStr ) const
{
@@ -721,7 +701,6 @@
return rStr;
}
-
xub_StrLen SwAutoFormat::GetLeadingBlanks( const String& rStr ) const
{
xub_StrLen nL;
@@ -731,7 +710,6 @@
;
return n;
}
-
xub_StrLen SwAutoFormat::GetTrailingBlanks( const String& rStr ) const
{
@@ -743,7 +721,6 @@
;
return ++n;
}
-
bool SwAutoFormat::IsFirstCharCapital( const SwTxtNode& rNd ) const
{
@@ -760,7 +737,6 @@
}
return false;
}
-
sal_uInt16 SwAutoFormat::GetDigitLevel( const SwTxtNode& rNd, xub_StrLen& rPos,
String* pPreFix, String* pPostFix, String* pNumTypes ) const
@@ -1001,7 +977,6 @@
return nDigitLvl; // 0 .. 9 (MAXLEVEL - 1)
}
-
void SwAutoFormat::SetColl( sal_uInt16 nId, bool bHdLineOrText )
{
aDelPam.DeleteMark();
@@ -1035,7 +1010,6 @@
pDoc->SetTxtFmtCollByAutoFmt( *aDelPam.GetPoint(), nId, &aSet );
}
-
bool SwAutoFormat::HasSelBlanks( SwPaM& rPam ) const
{
// Is there a Blank at the beginning or end?
@@ -1060,7 +1034,6 @@
return true;
}
-
bool SwAutoFormat::HasBreakAttr( const SwTxtNode& rTxtNd ) const
{
const SfxItemSet* pSet = rTxtNd.GetpSwAttrSet();
@@ -1079,7 +1052,6 @@
return false;
}
-
/// Is there a dot at the end?
bool SwAutoFormat::IsSentenceAtEnd( const SwTxtNode& rTxtNd ) const
{
@@ -1092,7 +1064,6 @@
;
return '.' == rStr.GetChar( n );
}
-
/// Delete beginning and/or end in a node
void SwAutoFormat::DeleteAktPara( bool bStart, bool bEnd )
@@ -1186,7 +1157,6 @@
return !bHasBlnks;
}
-
void SwAutoFormat::DelEmptyLine( bool bTstNextPara )
{
SetRedlineTxt( STR_AUTOFMTREDL_DEL_EMPTY_PARA );
@@ -1226,7 +1196,6 @@
ClearRedlineTxt();
}
-
void SwAutoFormat::DelMoreLinesBlanks( bool bWithLineBreaks )
{
if( aFlags.bAFmtByInput
@@ -1263,7 +1232,6 @@
}
}
-
// delete the previous paragraph
void SwAutoFormat::DelPrevPara()
{
@@ -1282,7 +1250,6 @@
}
aDelPam.DeleteMark();
}
-
void SwAutoFormat::BuildIndent()
{
@@ -1322,7 +1289,6 @@
AutoCorrect();
}
-
void SwAutoFormat::BuildTextIndent()
{
SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_TEXT_INDENT);
@@ -1361,7 +1327,6 @@
AutoCorrect();
}
-
void SwAutoFormat::BuildText()
{
SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_TEXT );
@@ -1398,7 +1363,6 @@
DeleteAktPara( true, true );
AutoCorrect();
}
-
void SwAutoFormat::BuildEnum( sal_uInt16 nLvl, sal_uInt16 nDigitLevel )
{
@@ -1712,7 +1676,6 @@
AutoCorrect( nAutoCorrPos );
}
-
void SwAutoFormat::BuildNegIndent( SwTwips nSpaces )
{
SetRedlineTxt( STR_AUTOFMTREDL_SET_TMPL_NEG_INDENT );
@@ -1798,7 +1761,6 @@
AutoCorrect();
}
-
void SwAutoFormat::BuildHeadLine( sal_uInt16 nLvl )
{
if( aFlags.bWithRedlining )
@@ -1831,7 +1793,6 @@
AutoCorrect();
}
}
-
/// Start autocorrection for the current TextNode
void SwAutoFormat::AutoCorrect( xub_StrLen nPos )
@@ -2128,7 +2089,6 @@
} while (nPos < pTxt->getLength());
ClearRedlineTxt();
}
-
SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, SvxSwAutoFmtFlags& rFlags,
SwNodeIndex* pSttNd, SwNodeIndex* pEndNd )
@@ -2615,7 +2575,6 @@
delete pWait;
}
-
void SwEditShell::AutoFmtBySplitNode()
{
diff --git a/sw/source/core/edit/edatmisc.cxx b/sw/source/core/edit/edatmisc.cxx
index 616a01e..5c3fc19 100644
--- a/sw/source/core/edit/edatmisc.cxx
+++ b/sw/source/core/edit/edatmisc.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <editsh.hxx>
#include <doc.hxx> // for aNodes
#include <IDocumentUndoRedo.hxx>
@@ -26,12 +25,9 @@
#include <swundo.hxx> // for the UndoIds
#include <ndtxt.hxx> // fot Get-/ChgFmt Set-/GetAttrXXX
-
-
/*
* hard formatting (Attribute)
*/
-
void SwEditShell::ResetAttr( const std::set<sal_uInt16> &attrs, SwPaM* pPaM )
{
@@ -57,8 +53,6 @@
CallChgLnk();
EndAllAction();
}
-
-
void SwEditShell::GCAttr()
{
@@ -100,9 +94,7 @@
const SfxPoolItem& SwEditShell::GetDefault( sal_uInt16 nFmtHint ) const
{
return GetDoc()->GetDefault( nFmtHint );
-
}
-
void SwEditShell::SetAttr( const SfxPoolItem& rHint, sal_uInt16 nFlags )
{
@@ -132,7 +124,6 @@
}
EndAllAction();
}
-
void SwEditShell::SetAttr( const SfxItemSet& rSet, sal_uInt16 nFlags, SwPaM* pPaM )
{
@@ -165,8 +156,5 @@
}
EndAllAction();
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index e0dd05e..74b58a5 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -273,8 +273,6 @@
return NULL;
}
-
-
sal_Bool SwEditShell::GetCurFtn( SwFmtFtn* pFillFtn )
{
// The cursor must be positioned on the current footnotes anchor:
@@ -295,7 +293,6 @@
return 0 != pFtn;
}
-
bool SwEditShell::SetCurFtn( const SwFmtFtn& rFillFtn )
{
bool bChgd = false;
@@ -313,7 +310,6 @@
return bChgd;
}
-
bool SwEditShell::HasFtns( bool bEndNotes ) const
{
const SwFtnIdxs &rIdxs = mpDoc->GetFtnIdxs();
@@ -325,7 +321,6 @@
}
return false;
}
-
/// Give a List of all footnotes and their beginning texts
sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList& rList, bool bEndNotes )
@@ -366,7 +361,6 @@
return rList.Count();
}
-
/// Adjust left margin via object bar (similar to adjustment of numerations).
bool SwEditShell::IsMoveLeftMargin( bool bRight, bool bModulus ) const
@@ -438,7 +432,6 @@
EndUndo( UNDO_END );
EndAllAction();
}
-
static inline sal_uInt16 lcl_SetScriptFlags( sal_uInt16 nType )
{
@@ -523,7 +516,6 @@
return bRet;
}
-
/// returns the script type of the selection
sal_uInt16 SwEditShell::GetScriptType() const
@@ -638,7 +630,6 @@
nRet = SvtLanguageOptions::GetScriptTypeOfLanguage( LANGUAGE_SYSTEM );
return nRet;
}
-
sal_uInt16 SwEditShell::GetCurLang() const
{
diff --git a/sw/source/core/edit/eddel.cxx b/sw/source/core/edit/eddel.cxx
index 62862fc..2d7adb6 100644
--- a/sw/source/core/edit/eddel.cxx
+++ b/sw/source/core/edit/eddel.cxx
@@ -96,7 +96,6 @@
rPam.DeleteMark();
}
-
long SwEditShell::Delete()
{
SET_CURR_SHELL( this );
@@ -330,7 +329,5 @@
}
return bRet;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edfcol.cxx b/sw/source/core/edit/edfcol.cxx
index a4b8903..612fdd5 100644
--- a/sw/source/core/edit/edfcol.cxx
+++ b/sw/source/core/edit/edfcol.cxx
@@ -32,23 +32,15 @@
#include <swundo.hxx>
#include <docary.hxx>
-/*************************************
- * FormatColl
- *************************************/
-// TXT
-
-
SwTxtFmtColl& SwEditShell::GetDfltTxtFmtColl() const
{
return *((SwTxtFmtColl*) (GetDoc()->GetDfltTxtFmtColl()));
}
-
sal_uInt16 SwEditShell::GetTxtFmtCollCount() const
{
return GetDoc()->GetTxtFmtColls()->size();
}
-
SwTxtFmtColl& SwEditShell::GetTxtFmtColl( sal_uInt16 nFmtColl) const
{
@@ -78,7 +70,6 @@
EndAllAction();
}
-
SwTxtFmtColl* SwEditShell::MakeTxtFmtColl(const String& rFmtCollName,
SwTxtFmtColl* pParent)
{
@@ -93,12 +84,10 @@
}
-
void SwEditShell::FillByEx(SwTxtFmtColl* pColl, sal_Bool bReset)
{
if( bReset )
{
- // #i73790# - method renamed
pColl->ResetAllFmtAttr();
}
@@ -139,8 +128,5 @@
GetDoc()->ChgFmt(*pColl, *pSet );
}
}
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edfld.cxx b/sw/source/core/edit/edfld.cxx
index 279d3d1..503fa6f 100644
--- a/sw/source/core/edit/edfld.cxx
+++ b/sw/source/core/edit/edfld.cxx
@@ -164,7 +164,6 @@
}
}
-
void SwEditShell::FieldToText( SwFieldType* pType )
{
if( !pType->GetDepends() )
@@ -251,7 +250,6 @@
return pCurFld;
}
-
/// Are the PaMs positioned on fields?
static SwTxtFld* lcl_FindInputFld( SwDoc* pDoc, SwField& rFld )
{
@@ -280,7 +278,6 @@
SET_CURR_SHELL( this );
StartAllAction();
{
-
// // If there are no selections so take the value of the current cursor position.
SwMsgPoolItem* pMsgHnt = 0;
SwRefMarkFldUpdate aRefMkHt( GetOut() );
@@ -419,7 +416,6 @@
{
GetDoc()->UnlockExpFlds();
}
-
void SwEditShell::SetFldUpdateFlags( SwFldUpdateFlags eFlags )
{
diff --git a/sw/source/core/edit/edfldexp.cxx b/sw/source/core/edit/edfldexp.cxx
index 290666c..b7a0d6a 100644
--- a/sw/source/core/edit/edfldexp.cxx
+++ b/sw/source/core/edit/edfldexp.cxx
@@ -79,5 +79,4 @@
return sal_True;
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edfmt.cxx b/sw/source/core/edit/edfmt.cxx
index f85243c..502cc30 100644
--- a/sw/source/core/edit/edfmt.cxx
+++ b/sw/source/core/edit/edfmt.cxx
@@ -28,24 +28,15 @@
#include "ndtxt.hxx" // for GetXXXFmt
#include "hints.hxx"
-/*************************************
- * Formate
- *************************************/
-// Char
-// OPT: inline
-
-
sal_uInt16 SwEditShell::GetCharFmtCount() const
{
return GetDoc()->GetCharFmts()->size();
}
-
SwCharFmt& SwEditShell::GetCharFmt(sal_uInt16 nFmt) const
{
return *((*(GetDoc()->GetCharFmts()))[nFmt]);
}
-
SwCharFmt* SwEditShell::GetCurCharFmt() const
{
@@ -60,12 +51,10 @@
return pFmt;
}
-
void SwEditShell::FillByEx(SwCharFmt* pCharFmt, sal_Bool bReset)
{
if ( bReset )
{
- // #i73790# - method renamed
pCharFmt->ResetAllFmtAttr();
}
@@ -114,7 +103,6 @@
pCharFmt->SetFmtAttr( *pCNd->GetpSwAttrSet() );
}
-// Frm
sal_uInt16 SwEditShell::GetTblFrmFmtCount(bool bUsed) const
{
return GetDoc()->GetTblFrmFmtCount(bUsed);
@@ -130,7 +118,6 @@
return GetDoc()->GetUniqueTblName();
}
-
SwCharFmt* SwEditShell::MakeCharFmt( const String& rName,
SwCharFmt* pDerivedFrom )
{
@@ -140,15 +127,10 @@
return GetDoc()->MakeCharFmt( rName, pDerivedFrom );
}
-//----------------------------------
-// inlines in product
-
-
SwTxtFmtColl* SwEditShell::GetTxtCollFromPool( sal_uInt16 nId )
{
return GetDoc()->GetTxtCollFromPool( nId );
}
-
/// return the requested automatic format - base-class !
SwFmt* SwEditShell::GetFmtFromPool( sal_uInt16 nId )
@@ -156,12 +138,10 @@
return GetDoc()->GetFmtFromPool( nId );
}
-
SwPageDesc* SwEditShell::GetPageDescFromPool( sal_uInt16 nId )
{
return GetDoc()->GetPageDescFromPool( nId );
}
-
bool SwEditShell::IsUsed( const SwModify& rModify ) const
{
diff --git a/sw/source/core/edit/edglbldc.cxx b/sw/source/core/edit/edglbldc.cxx
index b1be289..b19b839 100644
--- a/sw/source/core/edit/edglbldc.cxx
+++ b/sw/source/core/edit/edglbldc.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
#include <editsh.hxx>
@@ -29,7 +28,6 @@
#include <section.hxx>
#include <doctxm.hxx>
#include <edglbldc.hxx>
-
sal_Bool SwEditShell::IsGlobalDoc() const
{
diff --git a/sw/source/core/edit/edglss.cxx b/sw/source/core/edit/edglss.cxx
index d769b9b..af1f793 100644
--- a/sw/source/core/edit/edglss.cxx
+++ b/sw/source/core/edit/edglss.cxx
@@ -335,8 +335,4 @@
return sal_True;
}
-
-
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/editsh.cxx b/sw/source/core/edit/editsh.cxx
index cad1fd9..f4521a3 100644
--- a/sw/source/core/edit/editsh.cxx
+++ b/sw/source/core/edit/editsh.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <hintids.hxx>
#include <vcl/cmdevt.hxx>
#include <unotools/charclass.hxx>
@@ -61,12 +60,6 @@
using namespace com::sun::star;
-
-/******************************************************************************
- * void SwEditShell::Insert(char c)
- ******************************************************************************/
-
-
void SwEditShell::Insert( sal_Unicode c, sal_Bool bOnlyCurrCrsr )
{
StartAllAction();
@@ -84,12 +77,6 @@
EndAllAction();
}
-
-
-/******************************************************************************
- * void SwEditShell::Insert(const String &rStr)
- ******************************************************************************/
-
void SwEditShell::Insert2(const String &rStr, const bool bForceExpandHints )
{
@@ -170,12 +157,6 @@
EndAllAction();
}
-
-/******************************************************************************
- * void SwEditShell::Overwrite(const String &rStr)
- ******************************************************************************/
-
-
void SwEditShell::Overwrite(const String &rStr)
{
StartAllAction();
@@ -188,11 +169,6 @@
FOREACHPAM_END()
EndAllAction();
}
-
-
-/******************************************************************************
- * long SwEditShell::SplitNode()
- ******************************************************************************/
long SwEditShell::SplitNode( sal_Bool bAutoFormat, sal_Bool bCheckTableStart )
{
@@ -345,13 +321,11 @@
}
}
-
const PolyPolygon *SwEditShell::GetGraphicPolygon() const
{
SwNoTxtNode *pNd = GetCrsr()->GetNode()->GetNoTxtNode();
return pNd->HasContour();
}
-
void SwEditShell::SetGraphicPolygon( const PolyPolygon *pPoly )
{
@@ -401,7 +375,6 @@
return rOObj.GetObject();
}
-
sal_Bool SwEditShell::HasOLEObj( const String &rName ) const
{
SwStartNode *pStNd;
@@ -419,7 +392,6 @@
}
return sal_False;
}
-
void SwEditShell::SetChartName( const String &rName )
{
@@ -450,11 +422,6 @@
return aString;
}
-/****************************************************************************
- * void SwEditShell::UpdateDocStat()
- ****************************************************************************/
-
-
void SwEditShell::UpdateDocStat( )
{
StartAllAction();
@@ -483,11 +450,6 @@
{
return GetDoc()->GetRefMarks( pStrings );
}
-
-/******************************************************************************
- * DropCap-SS
- ******************************************************************************/
-
String SwEditShell::GetDropTxt( const sal_uInt16 nChars ) const
{
@@ -553,7 +515,6 @@
EndAllAction();
}
}
-
String SwEditShell::Calculate()
{
@@ -621,12 +582,10 @@
return aCalc.GetStrResult( aCalc.Calculate(aFormel) );
}
-
sfx2::LinkManager& SwEditShell::GetLinkManager()
{
return mpDoc->GetLinkManager();
}
-
void *SwEditShell::GetIMapInventor() const
{
@@ -635,7 +594,6 @@
}
// #i73788#
-// remove default parameter, because method is always called this default value
Graphic SwEditShell::GetIMapGraphic() const
{
// returns always a graphic if the cursor is in a Fly
@@ -671,7 +629,6 @@
}
return aRet;
}
-
sal_Bool SwEditShell::InsertURL( const SwFmtINetFmt& rFmt, const String& rStr, sal_Bool bKeepSelection )
{
@@ -726,7 +683,6 @@
EndAllAction();
return sal_True;
}
-
sal_uInt16 SwEditShell::GetINetAttrs( SwGetINetAttrs& rArr )
{
@@ -795,6 +751,7 @@
EndAllAction();
return bRet;
}
+
bool SwEditShell::ConvertFieldsToText()
{
StartAllAction();
@@ -802,6 +759,7 @@
EndAllAction();
return bRet;
}
+
void SwEditShell::SetNumberingRestart()
{
StartAllAction();
@@ -871,7 +829,6 @@
}
}
}
-
Pop(sal_False);
EndAllAction();
@@ -949,7 +906,6 @@
EndAllAction();
return nRet;
}
-
const SwFtnInfo& SwEditShell::GetFtnInfo() const
{
@@ -1122,6 +1078,5 @@
ViewShell::ApplyViewOptions( rOpt );
SwEditShell::EndAction();
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index d36fa39..8cfc4e6 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/linguistic2/ProofreadingResult.hpp>
#include <com/sun/star/linguistic2/XProofreader.hpp>
#include <com/sun/star/linguistic2/XProofreadingIterator.hpp>
@@ -63,10 +62,6 @@
using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::linguistic2;
-/*************************************************************************
- * class SwLinguIter
- *************************************************************************/
-
class SwLinguIter
{
SwEditShell *pSh;
@@ -101,10 +96,6 @@
void _End(bool bRestoreSelection = true);
};
-/*************************************************************************
- * class SwSpellIter
- *************************************************************************/
-
// #i18881# to be able to identify the postions of the changed words
// the content positions of each portion need to be saved
struct SpellContentPosition
@@ -112,7 +103,9 @@
sal_uInt16 nLeft;
sal_uInt16 nRight;
};
+
typedef std::vector<SpellContentPosition> SpellContentPositions;
+
class SwSpellIter : public SwLinguIter
{
uno::Reference< XSpellChecker1 > xSpeller;
@@ -159,10 +152,6 @@
uno::Any Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt );
};
-/*************************************************************************
- * class SwHyphIter
- *************************************************************************/
-
class SwHyphIter : public SwLinguIter
{
sal_Bool bOldIdle;
@@ -192,21 +181,11 @@
const SwTxtNode *pLinguNode;
SwTxtFrm *pLinguFrm;
-/*************************************************************************
- * SwLinguIter::SwLinguIter
- *************************************************************************/
-
SwLinguIter::SwLinguIter()
: pSh( 0 ), pStart( 0 ), pEnd( 0 ), pCurr( 0 ), pCurrX( 0 )
{
// TODO missing: ensurance of re-entrance, OSL_ENSURE( etc.
}
-
-/*************************************************************************
- * SwLinguIter::Start
- *************************************************************************/
-
-
void SwLinguIter::_Start( SwEditShell *pShell, SwDocPositions eStart,
SwDocPositions eEnd )
@@ -269,12 +248,6 @@
pLinguNode = 0;
}
-/*************************************************************************
- * SwLinguIter::End
- *************************************************************************/
-
-
-
void SwLinguIter::_End(bool bRestoreSelection)
{
if( !pSh )
@@ -296,12 +269,6 @@
pSh = 0;
}
-
-/*************************************************************************
- * virtual SwSpellIter::Start()
- *************************************************************************/
-
-
void SwSpellIter::Start( SwEditShell *pShell, SwDocPositions eStart,
SwDocPositions eEnd )
@@ -373,12 +340,6 @@
return aSpellRet;
}
-/*************************************************************************
- * virtual SwConvIter::Start()
- *************************************************************************/
-
-
-
void SwConvIter::Start( SwEditShell *pShell, SwDocPositions eStart,
SwDocPositions eEnd )
{
@@ -386,10 +347,6 @@
return;
_Start( pShell, eStart, eEnd );
}
-
-/*************************************************************************
- * SwConvIter::Continue
- *************************************************************************/
uno::Any SwConvIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
{
@@ -450,12 +407,6 @@
return makeAny( aConvText );
}
-
-/*************************************************************************
- * SwHyphIter
- *************************************************************************/
-
-
sal_Bool SwHyphIter::IsAuto()
{
uno::Reference< beans::XPropertySet > xProp( ::GetLinguPropertySet() );
@@ -463,7 +414,6 @@
OUString(UPN_IS_HYPH_AUTO) ).getValue()
: sal_False;
}
-
void SwHyphIter::ShowSelection()
{
@@ -476,12 +426,6 @@
pMySh->EndAction();
}
}
-
-/*************************************************************************
- * virtual SwHyphIter::Start()
- *************************************************************************/
-
-
void SwHyphIter::Start( SwEditShell *pShell, SwDocPositions eStart, SwDocPositions eEnd )
{
@@ -506,10 +450,6 @@
((SwViewOption*)GetSh()->GetViewOptions())->SetIdle( bOldIdle );
_End();
}
-
-/*************************************************************************
- * SwHyphIter::Continue
- *************************************************************************/
uno::Any SwHyphIter::Continue( sal_uInt16* pPageCnt, sal_uInt16* pPageSt )
{
@@ -581,10 +521,6 @@
pCrsr->SetMark();
}
-/*************************************************************************
- * SwHyphIter::DelSoftHyph
- *************************************************************************/
-
void SwHyphIter::DelSoftHyph( SwPaM &rPam )
{
const SwPosition* pStt = rPam.Start();
@@ -593,11 +529,6 @@
SwTxtNode *pNode = pStt->nNode.GetNode().GetTxtNode();
pNode->DelSoftHyph( nStart, nEnd );
}
-
-/*************************************************************************
- * SwHyphIter::InsertSoftHyph
- *************************************************************************/
-
void SwHyphIter::InsertSoftHyph( const xub_StrLen nHyphPos )
{
@@ -654,27 +585,15 @@
return bTextWasGrammarChecked;
}
-/*************************************************************************
- * SwEditShell::HasConvIter
- *************************************************************************/
-
sal_Bool SwEditShell::HasConvIter() const
{
return 0 != pConvIter;
}
-/*************************************************************************
- * SwEditShell::HasHyphIter
- *************************************************************************/
-
sal_Bool SwEditShell::HasHyphIter() const
{
return 0 != pHyphIter;
}
-
-/*************************************************************************
- * SwEditShell::SetFindRange
- *************************************************************************/
void SwEditShell::SetLinguRange( SwDocPositions eStart, SwDocPositions eEnd )
{
@@ -683,10 +602,6 @@
if( *pCrsr->GetPoint() > *pCrsr->GetMark() )
pCrsr->Exchange();
}
-
-/*************************************************************************
- * SwEditShell::SpellStart
- *************************************************************************/
void SwEditShell::SpellStart(
SwDocPositions eStart, SwDocPositions eEnd, SwDocPositions eCurr,
@@ -726,10 +641,6 @@
if (pConvArgs && pConvIter)
pConvIter->Start( this, eStart, eEnd );
}
-
-/*************************************************************************
- * SwEditShell::SpellEnd
- *************************************************************************/
void SwEditShell::SpellEnd( SwConversionArgs *pConvArgs, bool bRestoreSelection )
{
@@ -794,9 +705,6 @@
}
return aRes;
}
-/*************************************************************************
- * SwEditShell::HyphStart
- *************************************************************************/
/* Interactive Hyphenation (BP 10.03.93)
*
@@ -821,9 +729,6 @@
* 4) HyphEnd
* - Restore old cursor, EndAction
*/
-
-
-
void SwEditShell::HyphStart( SwDocPositions eStart, SwDocPositions eEnd )
{
// do not hyphenate if interactive hyphenationg is active elsewhere
@@ -1018,8 +923,6 @@
return xSpellAlt;
}
-
-
bool SwEditShell::GetGrammarCorrection(
linguistic2::ProofreadingResult /*out*/ &rResult, // the complete result
sal_Int32 /*out*/ &rErrorPosInText, // offset of error position in string that was grammar checked...
@@ -1193,7 +1096,6 @@
pSpellIter->ContinueAfterThisSentence();
}
}
-
void SwEditShell::ApplyChangedSentence(const ::svx::SpellPortions& rNewPortions, bool bRecheck)
{
@@ -1836,6 +1738,5 @@
nStart = 0;
}
}
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/ednumber.cxx b/sw/source/core/edit/ednumber.cxx
index 8c5eeda..fe5d91a 100644
--- a/sw/source/core/edit/ednumber.cxx
+++ b/sw/source/core/edit/ednumber.cxx
@@ -27,7 +27,6 @@
#include <swundo.hxx>
#include <numrule.hxx>
-
SwPamRanges::SwPamRanges( const SwPaM& rRing )
{
const SwPaM* pTmp = &rRing;
@@ -35,7 +34,6 @@
Insert( pTmp->GetMark()->nNode, pTmp->GetPoint()->nNode );
} while( &rRing != ( pTmp = (const SwPaM*)pTmp->GetNext() ));
}
-
void SwPamRanges::Insert( const SwNodeIndex& rIdx1, const SwNodeIndex& rIdx2 )
{
@@ -98,8 +96,6 @@
_SwPamRanges::insert( aRg );
}
-
-
SwPaM& SwPamRanges::SetPam( sal_uInt16 nArrPos, SwPaM& rPam )
{
OSL_ASSERT( nArrPos < Count() );
@@ -120,7 +116,6 @@
GetDoc()->SetOutlineNumRule(rRule);
EndAllAction();
}
-
const SwNumRule* SwEditShell::GetOutlineNumRule() const
{
@@ -231,11 +226,11 @@
}
}
}
-
}
return bResult;
}
+
// -> #i29560#
sal_Bool SwEditShell::HasNumber() const
{
@@ -335,6 +330,7 @@
EndAllAction();
return bRet;
}
+
// -> #i23726#
bool SwEditShell::IsFirstOfNumRule() const
{
@@ -356,10 +352,7 @@
}
// <- #i23726#
-// -> #i23725#
-// #i90078#
-// Remove unused default parameter <nLevel> and <bRelative>.
-// Adjust method name and parameter name
+// -> #i23725#, #i90078#
void SwEditShell::ChangeIndentOfAllListLevels( short nDiff )
{
StartAllAction();
@@ -380,7 +373,6 @@
}
// #i90078#
-// Adjust method name
void SwEditShell::SetIndent(short nIndent, const SwPosition & rPos)
{
StartAllAction();
@@ -391,8 +383,6 @@
{
SwPaM aPaM(rPos);
SwTxtNode * pTxtNode = aPaM.GetNode()->GetTxtNode();
-
- // #i90078#
SwNumRule aRule(*pCurNumRule);
@@ -435,7 +425,6 @@
return bRet;
}
-//#outline level add by zhaojianwei
int SwEditShell::GetCurrentParaOutlineLevel( ) const
{
int nLevel = 0;
@@ -446,7 +435,6 @@
nLevel = pTxtNd->GetAttrOutlineLevel();
return nLevel;
}
-//<-end,zhaojianwei
void SwEditShell::GetCurrentOutlineLevels( sal_uInt8& rUpper, sal_uInt8& rLower )
{
@@ -575,7 +563,6 @@
return bRet;
}
-
bool SwEditShell::MoveOutlinePara( short nOffset )
{
StartAllAction();
@@ -658,7 +645,6 @@
return lcl_IsOutlineMoveAndCopyable( GetDoc(), nIdx, true );
}
-
bool SwEditShell::NumOrNoNum( sal_Bool bNumOn, bool bChkStart )
{
bool bRet = false;
@@ -696,7 +682,7 @@
sal_uInt8 SwEditShell::GetNumLevel() const
{
// return current level where the point of the cursor is
- sal_uInt8 nLevel = MAXLEVEL; //end,zhaojianwei
+ sal_uInt8 nLevel = MAXLEVEL;
SwPaM* pCrsr = GetCrsr();
const SwTxtNode* pTxtNd = pCrsr->GetNode()->GetTxtNode();
diff --git a/sw/source/core/edit/edredln.cxx b/sw/source/core/edit/edredln.cxx
index 4165e4c..966255b 100644
--- a/sw/source/core/edit/edredln.cxx
+++ b/sw/source/core/edit/edredln.cxx
@@ -26,7 +26,6 @@
#include "edimp.hxx"
#include "frmtool.hxx"
-
sal_uInt16 SwEditShell::GetRedlineMode() const
{
return GetDoc()->GetRedlineMode();
@@ -135,7 +134,5 @@
return i;
return USHRT_MAX;
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edsect.cxx b/sw/source/core/edit/edsect.cxx
index f767c4d..f9b8af0 100644
--- a/sw/source/core/edit/edsect.cxx
+++ b/sw/source/core/edit/edsect.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <editsh.hxx>
#include <doc.hxx>
#include <IDocumentUndoRedo.hxx>
@@ -55,7 +54,6 @@
return pRet;
}
-
sal_Bool SwEditShell::IsInsRegionAvailable() const
{
if( IsTableMode() )
@@ -69,7 +67,6 @@
return sal_True;
}
-
const SwSection* SwEditShell::GetCurrSection() const
{
if( IsTableMode() )
@@ -82,7 +79,6 @@
*
* In footnotes it may not be the area within the footnote.
*/
-
const SwSection* SwEditShell::GetAnySection( sal_Bool bOutOfTab, const Point* pPt ) const
{
SwFrm *pFrm;
@@ -117,7 +113,6 @@
{
return GetDoc()->GetSections().size();
}
-
sal_Bool SwEditShell::IsAnySectionInDoc( sal_Bool bChkReadOnly, sal_Bool bChkHidden, sal_Bool bChkTOX ) const
{
@@ -155,7 +150,6 @@
return *GetDoc()->GetSections()[ nFmt ];
}
-
void SwEditShell::DelSectionFmt( sal_uInt16 nFmt )
{
StartAllAction();
@@ -164,7 +158,6 @@
CallChgLnk();
EndAllAction();
}
-
void SwEditShell::UpdateSection(sal_uInt16 const nSect,
SwSectionData & rNewData, SfxItemSet const*const pAttr)
@@ -320,7 +313,6 @@
OSL_ENSURE( pCurrentPos != NULL, "Strange, we have no position!" );
const SwNode& rCurrentNode = pCurrentPos->nNode.GetNode();
-
// find innermost section or table. At the end of this scope,
// pInntermostNode contain the section/table before/after which we should
// insert our empty paragraph, or it will be NULL if none is found.
@@ -391,13 +383,11 @@
pReturn = pInnermostNode;
}
-
OSL_ENSURE( ( pReturn == NULL ) || pReturn->IsStartNode() ||
pReturn->IsEndNode(),
"SpecialInsertNode failed" );
return pReturn;
}
-
/** a node can be special-inserted (alt-Enter) whenever lcl_SpecialInsertNode
finds a suitable position
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 1c6dbef..1526496 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -21,7 +21,6 @@
#include <hintids.hxx>
#include <hints.hxx>
-
#include <vcl/svapp.hxx>
#include <vcl/window.hxx>
#include <editeng/boxitem.hxx>
@@ -88,6 +87,7 @@
return pTableNode->GetDoc()->TableToText( pTableNode, cCh );
}
//End for bug #i119954#
+
const SwTable& SwEditShell::InsertTable( const SwInsertTableOptions& rInsTblOpts,
sal_uInt16 nRows, sal_uInt16 nCols,
sal_Int16 eAdj,
diff --git a/sw/source/core/edit/edtox.cxx b/sw/source/core/edit/edtox.cxx
index f919129..426ec63 100644
--- a/sw/source/core/edit/edtox.cxx
+++ b/sw/source/core/edit/edtox.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <com/sun/star/util/SearchOptions.hpp>
#include <com/sun/star/util/SearchFlags.hpp>
#include <com/sun/star/i18n/TransliterationModules.hpp>
@@ -78,8 +77,6 @@
FOREACHPAM_END()
EndAllAction();
}
-
-
void SwEditShell::DeleteTOXMark( SwTOXMark* pMark )
{
@@ -224,7 +221,6 @@
return GetDoc()->GetTOIKeys( eTyp, rArr );
}
-
sal_uInt16 SwEditShell::GetTOXCount() const
{
const SwSectionFmts& rFmts = GetDoc()->GetSections();
@@ -238,7 +234,6 @@
}
return nRet;
}
-
const SwTOXBase* SwEditShell::GetTOX( sal_uInt16 nPos ) const
{
@@ -262,7 +257,6 @@
{
GetDoc()->SetUpdateTOX( bFlag );
}
-
sal_Bool SwEditShell::IsUpdateTOX() const
{
@@ -313,9 +307,7 @@
Push();
rtl_TextEncoding eChrSet = ::osl_getThreadTextEncoding();
- //
// SearchOptions to be used in loop below
- //
bool bCaseSensitive = true;
bool bWordOnly = false;
bool bSrchInSel = false;
@@ -425,7 +417,5 @@
DoUndo(bDoesUndo);
EndAllAction();
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/edit/edundo.cxx b/sw/source/core/edit/edundo.cxx
index 09537fe..79fc76a 100644
--- a/sw/source/core/edit/edundo.cxx
+++ b/sw/source/core/edit/edundo.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <svx/svdview.hxx>
#include <editsh.hxx>
@@ -34,7 +33,6 @@
#include <docsh.hxx>
#include <pagefrm.hxx>
-
/** helper function to select all objects in an SdrMarkList;
* implementation: see below */
static void lcl_SelectSdrMarkList( SwEditShell* pShell,
@@ -42,7 +40,6 @@
bool SwEditShell::CursorsLocked() const
{
-
return GetDoc()->GetDocShell()->GetModel()->hasControllersLocked();
}
@@ -201,7 +198,6 @@
return bRet;
}
-
bool SwEditShell::Repeat(sal_uInt16 const nCount)
{
SET_CURR_SHELL( this );
@@ -222,7 +218,6 @@
EndAllAction();
return bRet;
}
-
static void lcl_SelectSdrMarkList( SwEditShell* pShell,
const SdrMarkList* pSdrMarkList )
diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index 0c646f9..acf268e 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -17,7 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-
#include <vcl/window.hxx>
#include <editsh.hxx>
@@ -37,42 +36,25 @@
{
}
-// ctor/dtor
-
-
SwEditShell::SwEditShell( SwDoc& rDoc, Window *pWindow, const SwViewOption *pOptions )
: SwCrsrShell( rDoc, pWindow, pOptions )
{
GetDoc()->GetIDocumentUndoRedo().DoUndo(true);
}
-
SwEditShell::~SwEditShell() // USED
{
}
-
-/******************************************************************************
- * sal_Bool SwEditShell::IsModified() const
- ******************************************************************************/
-
sal_Bool SwEditShell::IsModified() const
{
return GetDoc()->IsModified();
}
-/******************************************************************************
- * void SwEditShell::SetModified()
- ******************************************************************************/
-
void SwEditShell::SetModified()
{
GetDoc()->SetModified();
}
-/******************************************************************************
- * void SwEditShell::ResetModified()
- ******************************************************************************/
-
void SwEditShell::ResetModified()
{
@@ -85,11 +67,6 @@
GetDoc()->GetIDocumentUndoRedo().SetUndoNoResetModified();
}
-/******************************************************************************
- * void SwEditShell::StartAllAction()
- ******************************************************************************/
-
-
void SwEditShell::StartAllAction()
{
ViewShell *pSh = this;
@@ -101,10 +78,6 @@
pSh = (ViewShell *)pSh->GetNext();
} while(pSh != this);
}
-/******************************************************************************
- * void SwEditShell::EndAllAction()
- ******************************************************************************/
-
void SwEditShell::EndAllAction()
{
@@ -117,11 +90,6 @@
pSh = (ViewShell *)pSh->GetNext();
} while(pSh != this);
}
-
-/******************************************************************************
- * void SwEditShell::CalcLayout()
- ******************************************************************************/
-
void SwEditShell::CalcLayout()
{
@@ -161,9 +129,6 @@
return nRet;
}
-//------------------------------------------------------------------------------
-
-
sal_Bool SwEditShell::HasOtherCnt() const
{
@@ -192,19 +157,16 @@
pSh->StartAction();
}
-
SwActContext::~SwActContext()
{
pSh->EndAction();
}
-
SwMvContext::SwMvContext(SwEditShell *pShell)
: pSh(pShell)
{
pSh->SttCrsrMove();
}
-
SwMvContext::~SwMvContext()
{
@@ -223,13 +185,10 @@
return mpDoc->GetTOXTypeCount(eTyp);
}
-
void SwEditShell::InsertTOXType(const SwTOXType& rTyp)
{
mpDoc->InsertTOXType(rTyp);
}
-
-
void SwEditShell::DoUndo( sal_Bool bOn )
{ GetDoc()->GetIDocumentUndoRedo().DoUndo( bOn ); }
@@ -273,7 +232,6 @@
const SwRewriter *pRewriter)
{ return GetDoc()->GetIDocumentUndoRedo().EndUndo(eUndoId, pRewriter); }
-
bool SwEditShell::GetLastUndoInfo(OUString *const o_pStr,
SwUndoId *const o_pId) const
{ return GetDoc()->GetIDocumentUndoRedo().GetLastUndoInfo(o_pStr, o_pId); }
@@ -306,12 +264,10 @@
EndAllAction();
}
-
void SwEditShell::SetNewDoc(sal_Bool bNew)
{
GetDoc()->SetNewDoc(bNew);
}
-
sal_Bool SwEditShell::GetPrevAutoCorrWord( SvxAutoCorrect& rACorr, String& rWord )
{
@@ -336,7 +292,5 @@
{
return SwDoc::GetAutoCompleteWords();
}
-
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
--
To view, visit https://gerrit.libreoffice.org/4205
To unsubscribe, visit https://gerrit.libreoffice.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2b17f5fe4be89cc58c3563dfc64f1b3e2a20bdee
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Philipp Riemer <ruderphilipp at gmail.com>
More information about the LibreOffice
mailing list