summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorStefan Heinemann <stefan.heinemann@codedump.ch>2015-09-25 13:06:09 +0200
committerMichael Stahl <mstahl@redhat.com>2015-09-29 18:33:40 +0000
commitc50eb68af3096645246a77259bb3d1cc70eb6b63 (patch)
treea3f9442fa2d2c13464d1623f8bcf772b27426e72 /sw/source
parent491c2e24ac110c9ebdb1a483c34ae3d14ab0d615 (diff)
Renamed wrongly prefixed boolean variables
Fixed tdf#94269 Change-Id: I63109cc4e095bad680d7637a065080ea368860ae Reviewed-on: https://gerrit.libreoffice.org/18851 Reviewed-by: Michael Stahl <mstahl@redhat.com> Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/core/attr/swatrset.cxx8
-rw-r--r--sw/source/core/crsr/swcrsr.cxx4
-rw-r--r--sw/source/core/doc/fmtcol.cxx8
-rw-r--r--sw/source/core/docnode/node.cxx18
-rw-r--r--sw/source/core/edit/autofmt.cxx2
-rw-r--r--sw/source/core/inc/swfont.hxx4
-rw-r--r--sw/source/core/text/itrcrsr.cxx14
-rw-r--r--sw/source/core/text/itrtxt.hxx2
-rw-r--r--sw/source/filter/ww8/ww8par6.cxx8
-rw-r--r--sw/source/ui/dbui/mmaddressblockpage.cxx12
-rw-r--r--sw/source/ui/fldui/fldvar.cxx4
-rw-r--r--sw/source/ui/misc/bookmark.cxx10
-rw-r--r--sw/source/uibase/app/docsh2.cxx6
-rw-r--r--sw/source/uibase/cctrl/actctrl.cxx8
-rw-r--r--sw/source/uibase/dochdl/swdtflvr.cxx188
-rw-r--r--sw/source/uibase/uiview/pview.cxx6
-rw-r--r--sw/source/uibase/utlui/content.cxx8
-rw-r--r--sw/source/uibase/wrtsh/move.cxx8
18 files changed, 159 insertions, 159 deletions
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index b24f64a1c6b9..935f8fcb4199 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -196,9 +196,9 @@ bool SwAttrSet::Put_BC( const SfxPoolItem& rAttr,
{
pNewSet = pNew;
pOldSet = pOld;
- bool nRet = 0 != SfxItemSet::Put( rAttr );
+ bool bRet = 0 != SfxItemSet::Put( rAttr );
pOldSet = pNewSet = 0;
- return nRet;
+ return bRet;
}
bool SwAttrSet::Put_BC( const SfxItemSet& rSet,
@@ -206,9 +206,9 @@ bool SwAttrSet::Put_BC( const SfxItemSet& rSet,
{
pNewSet = pNew;
pOldSet = pOld;
- bool nRet = SfxItemSet::Put( rSet );
+ bool bRet = SfxItemSet::Put( rSet );
pOldSet = pNewSet = 0;
- return nRet;
+ return bRet;
}
sal_uInt16 SwAttrSet::ClearItem_BC( sal_uInt16 nWhich,
diff --git a/sw/source/core/crsr/swcrsr.cxx b/sw/source/core/crsr/swcrsr.cxx
index dbe8576ca629..f9630c1eb28e 100644
--- a/sw/source/core/crsr/swcrsr.cxx
+++ b/sw/source/core/crsr/swcrsr.cxx
@@ -1432,8 +1432,8 @@ static OUString lcl_MaskDeletedRedlines( const SwTextNode* pTextNd )
//mask deleted redlines
OUString sNodeText(pTextNd->GetText());
const SwDoc& rDoc = *pTextNd->GetDoc();
- const bool nShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() );
- if ( nShowChg )
+ const bool bShowChg = IDocumentRedlineAccess::IsShowChanges( rDoc.getIDocumentRedlineAccess().GetRedlineMode() );
+ if ( bShowChg )
{
sal_uInt16 nAct = rDoc.getIDocumentRedlineAccess().GetRedlinePos( *pTextNd, USHRT_MAX );
for ( ; nAct < rDoc.getIDocumentRedlineAccess().GetRedlineTable().size(); nAct++ )
diff --git a/sw/source/core/doc/fmtcol.cxx b/sw/source/core/doc/fmtcol.cxx
index 28afa7c1dc06..a3d3db07d0ee 100644
--- a/sw/source/core/doc/fmtcol.cxx
+++ b/sw/source/core/doc/fmtcol.cxx
@@ -521,7 +521,7 @@ void SwCollCondition::RegisterToFormat( SwFormat& rFormat )
bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
{
- bool nRet = false;
+ bool bRet = false;
if( nCondition == rCmp.nCondition )
{
if( USRFLD_EXPRESSION & nCondition )
@@ -539,15 +539,15 @@ bool SwCollCondition::operator==( const SwCollCondition& rCmp ) const
if( pColl )
{
SwCalc aCalc( *pColl->GetDoc() );
- nRet = aCalc.Calculate( *pTmp ).GetBool();
+ bRet = aCalc.Calculate( *pTmp ).GetBool();
}
}
}
else if( aSubCondition.nSubCondition ==
rCmp.aSubCondition.nSubCondition )
- nRet = true;
+ bRet = true;
}
- return nRet;
+ return bRet;
}
void SwCollCondition::SetCondition( sal_uLong nCond, sal_uLong nSubCond )
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 75537b5920a5..64c7e59d9bae 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -156,7 +156,7 @@ bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwContentNode& rNo
pStyleNames->Put( aNewSet );
}
- const bool nRet = aNewSet.Put( rSet );
+ const bool bRet = aNewSet.Put( rSet );
// #i76273# Robust
if ( pStyleNames )
@@ -165,10 +165,10 @@ bool Put( std::shared_ptr<const SfxItemSet>& rpAttrSet, const SwContentNode& rNo
delete pStyleNames;
}
- if ( nRet )
+ if ( bRet )
GetNewAutoStyle( rpAttrSet, rNode, aNewSet );
- return nRet;
+ return bRet;
}
bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
@@ -182,12 +182,12 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
if( rNode.GetModifyAtAttr() )
aNewSet.SetModifyAtAttr( &rNode );
- const bool nRet = aNewSet.Put_BC( rAttr, pOld, pNew );
+ const bool bRet = aNewSet.Put_BC( rAttr, pOld, pNew );
- if ( nRet )
+ if ( bRet )
GetNewAutoStyle( rpAttrSet, rNode, aNewSet );
- return nRet;
+ return bRet;
}
bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
@@ -209,7 +209,7 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
if( rNode.GetModifyAtAttr() )
aNewSet.SetModifyAtAttr( &rNode );
- const bool nRet = aNewSet.Put_BC( rSet, pOld, pNew );
+ const bool bRet = aNewSet.Put_BC( rSet, pOld, pNew );
// #i76273# Robust
if ( pStyleNames )
@@ -218,10 +218,10 @@ bool Put_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
delete pStyleNames;
}
- if ( nRet )
+ if ( bRet )
GetNewAutoStyle( rpAttrSet, rNode, aNewSet );
- return nRet;
+ return bRet;
}
sal_uInt16 ClearItem_BC( std::shared_ptr<const SfxItemSet>& rpAttrSet,
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2371e0dccbb4..76bc11ef6470 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -193,7 +193,7 @@ class SwAutoFormat
void DeleteSel( SwPaM& rPam );
bool DeleteCurNxtPara( const OUString& rNxtPara );
/// delete in the node start and/or end
- void DeleteCurrentParagraph( bool bStart = true, bool nEnd = true );
+ void DeleteCurrentParagraph( bool bStart = true, bool bEnd = true );
void DelEmptyLine( bool bTstNextPara = true );
/// when using multiline paragraphs delete the "left" and/or
/// "right" margins
diff --git a/sw/source/core/inc/swfont.hxx b/sw/source/core/inc/swfont.hxx
index 70a0acabc743..aa470a9ef8d5 100644
--- a/sw/source/core/inc/swfont.hxx
+++ b/sw/source/core/inc/swfont.hxx
@@ -216,7 +216,7 @@ public:
inline void SetOverColor( const Color &rColor ) { aOverColor = rColor; }
inline void SetStrikeout( const FontStrikeout eStrikeout );
inline void SetOutline( const bool bOutline );
- void SetVertical( sal_uInt16 nDir, const bool nVertLayout = false );
+ void SetVertical( sal_uInt16 nDir, const bool bVertLayout = false );
inline void SetShadow( const bool bShadow );
inline void SetAutoKern( FontKerning nAutoKern );
inline void SetTransparent( const bool bTrans );
@@ -285,7 +285,7 @@ public:
FontWeight GetWeight() const { return aSub[nActual].GetWeight(); }
FontEmphasisMark GetEmphasisMark() const
{ return aSub[nActual].GetEmphasisMark(); }
- sal_uInt16 GetOrientation( const bool nVertLayout = false ) const;
+ sal_uInt16 GetOrientation( const bool bVertLayout = false ) const;
inline const OUString& GetName( const sal_uInt8 nWhich ) const
{ return aSub[nWhich].GetName(); }
diff --git a/sw/source/core/text/itrcrsr.cxx b/sw/source/core/text/itrcrsr.cxx
index 746e5622db99..d11918f6535f 100644
--- a/sw/source/core/text/itrcrsr.cxx
+++ b/sw/source/core/text/itrcrsr.cxx
@@ -1259,7 +1259,7 @@ bool SwTextCursor::GetCharRect( SwRect* pOrig, const sal_Int32 nOfst,
// Return: Offset in String
sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
- bool nChgNode, SwCrsrMoveState* pCMS ) const
+ bool bChgNode, SwCrsrMoveState* pCMS ) const
{
// If necessary, as catch up, do the adjustment
GetAdjusted();
@@ -1468,7 +1468,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
sal_uInt16 nHeight = pPor->Height();
if ( !nHeight || nHeight > nWidth )
nHeight = nWidth;
- if( nChgNode && nWidth - nHeight/2 > nX )
+ if( bChgNode && nWidth - nHeight/2 > nX )
--nCurrStart;
}
}
@@ -1479,7 +1479,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
if ( nWidth )
{
// Else we may not enter the character-supplying frame...
- if( !( nChgNode && pPos && pPor->IsFlyCntPortion() ) )
+ if( !( bChgNode && pPos && pPor->IsFlyCntPortion() ) )
{
if ( pPor->InFieldGrp() ||
( pPor->IsMultiPortion() &&
@@ -1585,7 +1585,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
}
return GetCrsrOfst( pPos, Point( GetLineStart() + nX, rPoint.Y() ),
- nChgNode, pCMS );
+ bChgNode, pCMS );
}
if( pPor->InTextGrp() )
{
@@ -1694,7 +1694,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
}
else
{
- if( nChgNode && pPos && pPor->IsFlyCntPortion()
+ if( bChgNode && pPos && pPor->IsFlyCntPortion()
&& !static_cast<SwFlyCntPortion*>(pPor)->IsDraw() )
{
// JP 24.11.94: if the Position is not in Fly, then
@@ -1702,7 +1702,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
// (BugId: 9692 + Change in feshview)
SwFlyInCntFrm *pTmp = static_cast<SwFlyCntPortion*>(pPor)->GetFlyFrm();
SwFrm* pLower = pTmp->GetLower();
- bool bChgNode = pLower
+ bool bChgNodeInner = pLower
&& (pLower->IsTextFrm() || pLower->IsLayoutFrm());
Point aTmpPoint( rPoint );
@@ -1712,7 +1712,7 @@ sal_Int32 SwTextCursor::GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
if ( pFrm->IsVertical() )
pFrm->SwitchHorizontalToVertical( aTmpPoint );
- if( bChgNode && pTmp->Frm().IsInside( aTmpPoint ) &&
+ if( bChgNodeInner && pTmp->Frm().IsInside( aTmpPoint ) &&
!( pTmp->IsProtected() ) )
{
nLength = static_cast<SwFlyCntPortion*>(pPor)->
diff --git a/sw/source/core/text/itrtxt.hxx b/sw/source/core/text/itrtxt.hxx
index 84454abb88ea..77a09886fb19 100644
--- a/sw/source/core/text/itrtxt.hxx
+++ b/sw/source/core/text/itrtxt.hxx
@@ -284,7 +284,7 @@ public:
bool GetEndCharRect(SwRect *, const sal_Int32, SwCrsrMoveState* = 0,
const long nMax = 0 );
sal_Int32 GetCrsrOfst( SwPosition *pPos, const Point &rPoint,
- bool nChgNode, SwCrsrMoveState* = 0 ) const;
+ bool bChgNode, SwCrsrMoveState* = 0 ) const;
// Respects ambiguities: For the implementation see below
const SwLineLayout *CharCrsrToLine( const sal_Int32 nPos );
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index a68c025cd85d..3cea85acdd23 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -189,8 +189,8 @@ void wwSection::SetDirection()
break;
}
- sal_uInt8 nRTLPgn = maSep.fBiDi;
- if ((meDir == FRMDIR_HORI_LEFT_TOP) && nRTLPgn)
+ sal_uInt8 bRTLPgn = maSep.fBiDi;
+ if ((meDir == FRMDIR_HORI_LEFT_TOP) && bRTLPgn)
meDir = FRMDIR_HORI_RIGHT_TOP;
}
@@ -649,9 +649,9 @@ SwSectionFormat *wwSectionManager::InsertSection(
SfxItemSet aSet( mrReader.m_rDoc.GetAttrPool(), aFrameFormatSetRange );
- bool nRTLPgn = !maSegments.empty() && maSegments.back().IsBiDi();
+ bool bRTLPgn = !maSegments.empty() && maSegments.back().IsBiDi();
aSet.Put(SvxFrameDirectionItem(
- nRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
+ bRTLPgn ? FRMDIR_HORI_RIGHT_TOP : FRMDIR_HORI_LEFT_TOP, RES_FRAMEDIR));
if (2 == mrReader.m_pWDop->fpc)
aSet.Put( SwFormatFootnoteAtTextEnd(FTNEND_ATTXTEND));
diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx
index d8387c1f8284..67daed33acfa 100644
--- a/sw/source/ui/dbui/mmaddressblockpage.cxx
+++ b/sw/source/ui/dbui/mmaddressblockpage.cxx
@@ -1359,20 +1359,20 @@ void AddressMultiLineEdit::Notify(SfxBroadcaster& /*rBC*/, const SfxHint& rHint)
bool AddressMultiLineEdit::PreNotify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if( MouseNotifyEvent::KEYINPUT == rNEvt.GetType() &&
rNEvt.GetKeyEvent()->GetCharCode())
{
- nHandled = true;
+ bHandled = true;
}
else if(MouseNotifyEvent::MOUSEBUTTONDOWN == rNEvt.GetType()) {
const MouseEvent *pMEvt = rNEvt.GetMouseEvent();
if(pMEvt->GetClicks() >= 2)
- nHandled = true;
+ bHandled = true;
}
- if(!nHandled)
- nHandled = VclMultiLineEdit::PreNotify( rNEvt );
- return nHandled;
+ if(!bHandled)
+ bHandled = VclMultiLineEdit::PreNotify( rNEvt );
+ return bHandled;
}
diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index e1a08823e0b5..5b65c8cb9cc1 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -1282,7 +1282,7 @@ VCL_BUILDER_DECL_FACTORY(SelectionListBox)
bool SelectionListBox::PreNotify( NotifyEvent& rNEvt )
{
- bool nHandled = ListBox::PreNotify( rNEvt );
+ bool bHandled = ListBox::PreNotify( rNEvt );
if ( rNEvt.GetType() == MouseNotifyEvent::KEYUP )
{
const KeyEvent* pKEvt = rNEvt.GetKeyEvent();
@@ -1299,7 +1299,7 @@ bool SelectionListBox::PreNotify( NotifyEvent& rNEvt )
bCallAddSelection = true;
}
- return nHandled;
+ return bHandled;
}
void SwFieldVarPage::FillUserData()
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 353f2e9a1357..40a7e6b2db66 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -225,17 +225,17 @@ sal_Int32 BookmarkCombo::GetSelectEntryPos( sal_Int32 nSelIndex ) const
bool BookmarkCombo::PreNotify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if( MouseNotifyEvent::KEYINPUT == rNEvt.GetType() &&
rNEvt.GetKeyEvent()->GetCharCode() )
{
OUString sKey( rNEvt.GetKeyEvent()->GetCharCode() );
if(-1 != aForbiddenChars.indexOf(sKey))
- nHandled = true;
+ bHandled = true;
}
- if(!nHandled)
- nHandled = SwComboBox::PreNotify( rNEvt );
- return nHandled;
+ if(!bHandled)
+ bHandled = SwComboBox::PreNotify( rNEvt );
+ return bHandled;
}
VCL_BUILDER_FACTORY_ARGS(BookmarkCombo, 0)
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index d6919ebb819a..d4fe645099cf 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -316,9 +316,9 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& rHint )
// Notification Close Doc
bool SwDocShell::PrepareClose( bool bUI )
{
- bool nRet = SfxObjectShell::PrepareClose( bUI );
+ bool bRet = SfxObjectShell::PrepareClose( bUI );
- if( nRet )
+ if( bRet )
EndListening( *this );
if (m_pDoc && IsInPrepareClose())
@@ -332,7 +332,7 @@ bool SwDocShell::PrepareClose( bool bUI )
xVbaEvents->processVbaEvent( DOCUMENT_CLOSE, aArgs );
}
}
- return nRet;
+ return bRet;
}
void SwDocShell::Execute(SfxRequest& rReq)
diff --git a/sw/source/uibase/cctrl/actctrl.cxx b/sw/source/uibase/cctrl/actctrl.cxx
index 95674b0d4f02..d17706730dcf 100644
--- a/sw/source/uibase/cctrl/actctrl.cxx
+++ b/sw/source/uibase/cctrl/actctrl.cxx
@@ -28,7 +28,7 @@ void NumEditAction::Action()
bool NumEditAction::Notify( NotifyEvent& rNEvt )
{
- bool nHandled = false;
+ bool bHandled = false;
if ( rNEvt.GetType() == MouseNotifyEvent::KEYINPUT )
{
@@ -39,13 +39,13 @@ bool NumEditAction::Notify( NotifyEvent& rNEvt )
!nModifier)
{
Action();
- nHandled = true;
+ bHandled = true;
}
}
- if(!nHandled)
+ if(!bHandled)
NumericField::Notify( rNEvt );
- return nHandled;
+ return bHandled;
}
void ReturnActionEdit::KeyInput( const KeyEvent& rEvt)
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx
index 97a1759eaa41..235b975e5b2b 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -1188,7 +1188,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
std::unique_ptr<SwTrnsfrActionAndUndo> pAction;
SwModule* pMod = SW_MOD();
- bool nRet = false;
+ bool bRet = false;
bool bCallAutoCaption = false;
if( pPt )
@@ -1274,14 +1274,14 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
if(bPrivateDrop)
{
// then internal Drag & Drop or XSelection
- nRet = pTrans->PrivateDrop( rSh, *pPt, DND_ACTION_MOVE == nDropAction,
+ bRet = pTrans->PrivateDrop( rSh, *pPt, DND_ACTION_MOVE == nDropAction,
bPasteSelection );
}
else if( !pPt && pTunneledTrans &&
EXCHG_OUT_ACTION_INSERT_PRIVATE == nAction )
{
// then internal paste
- nRet = pTunneledTrans->PrivatePaste( rSh );
+ bRet = pTunneledTrans->PrivatePaste( rSh );
}
else if( EXCHG_INOUT_ACTION_NONE != nAction )
{
@@ -1319,7 +1319,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
switch( nFormat )
{
case SotClipboardFormatId::DRAWING:
- nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
+ bRet = SwTransferable::_PasteSdrFormat( rData, rSh,
SwPasteSdr::Insert, pPt,
nActionFlags, bNeedToSelectBeforePaste);
break;
@@ -1329,7 +1329,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case SotClipboardFormatId::HTML_NO_COMMENT:
case SotClipboardFormatId::RTF:
case SotClipboardFormatId::STRING:
- nRet = SwTransferable::_PasteFileContent( rData, rSh,
+ bRet = SwTransferable::_PasteFileContent( rData, rSh,
nFormat, bMsg );
break;
@@ -1340,25 +1340,25 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
{
SwFormatINetFormat aFormat( aBkmk.GetURL(), OUString() );
rSh.InsertURL( aFormat, aBkmk.GetDescription() );
- nRet = true;
+ bRet = true;
}
}
break;
case SotClipboardFormatId::SD_OLE:
- nRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
nActionFlags, bMsg );
break;
case SotClipboardFormatId::SVIM:
- nRet = SwTransferable::_PasteImageMap( rData, rSh );
+ bRet = SwTransferable::_PasteImageMap( rData, rSh );
break;
case SotClipboardFormatId::SVXB:
case SotClipboardFormatId::BITMAP:
case SotClipboardFormatId::PNG:
case SotClipboardFormatId::GDIMETAFILE:
- nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
SwPasteSdr::Insert,pPt,
nActionFlags, nDropAction, bNeedToSelectBeforePaste);
break;
@@ -1367,13 +1367,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case SotClipboardFormatId::SBA_FIELDDATAEXCHANGE:
case SotClipboardFormatId::SBA_DATAEXCHANGE:
case SotClipboardFormatId::SBA_CTRLDATAEXCHANGE:
- nRet = SwTransferable::_PasteDBData( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteDBData( rData, rSh, nFormat,
EXCHG_IN_ACTION_LINK == nClearedAction,
pPt, bMsg );
break;
case SotClipboardFormatId::SIMPLE_FILE:
- nRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
( EXCHG_IN_ACTION_MOVE == nClearedAction
? SwPasteSdr::Replace
: EXCHG_IN_ACTION_LINK == nClearedAction
@@ -1384,7 +1384,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case SotClipboardFormatId::FILE_LIST:
// then insert as graphics only
- nRet = SwTransferable::_PasteFileList( rData, rSh,
+ bRet = SwTransferable::_PasteFileList( rData, rSh,
EXCHG_IN_ACTION_LINK == nClearedAction,
pPt, bMsg );
break;
@@ -1405,14 +1405,14 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
}
}
rSh.NavigatorPaste( aBkmk, nClearedAction );
- nRet = true;
+ bRet = true;
}
}
break;
case SotClipboardFormatId::INET_IMAGE:
case SotClipboardFormatId::NETSCAPE_IMAGE:
- nRet = SwTransferable::_PasteTargetURL( rData, rSh,
+ bRet = SwTransferable::_PasteTargetURL( rData, rSh,
SwPasteSdr::Insert,
pPt, true );
break;
@@ -1425,7 +1425,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case EXCHG_OUT_ACTION_INSERT_FILE:
{
bool graphicInserted;
- nRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteFileName( rData, rSh, nFormat,
SwPasteSdr::Insert, pPt,
nActionFlags, bMsg,
&graphicInserted );
@@ -1435,14 +1435,14 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
break;
case EXCHG_OUT_ACTION_INSERT_OLE:
- nRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteOLE( rData, rSh, nFormat,
nActionFlags,bMsg );
break;
case EXCHG_OUT_ACTION_INSERT_DDE:
{
bool bReRead = 0 != CNT_HasGrf( rSh.GetCntType() );
- nRet = SwTransferable::_PasteDDE( rData, rSh, bReRead, bMsg );
+ bRet = SwTransferable::_PasteDDE( rData, rSh, bReRead, bMsg );
}
break;
@@ -1456,7 +1456,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
SwTransferable::_CheckForURLOrLNKFile( rData, sURL, &sDesc );
if( sDesc.isEmpty() )
sDesc = sURL;
- nRet = true;
+ bRet = true;
}
}
else
@@ -1466,11 +1466,11 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
{
sURL = aBkmk.GetURL();
sDesc = aBkmk.GetDescription();
- nRet = true;
+ bRet = true;
}
}
- if( nRet )
+ if( bRet )
{
SwFormatINetFormat aFormat( sURL, OUString() );
rSh.InsertURL( aFormat, sDesc );
@@ -1482,7 +1482,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
switch( nFormat )
{
case SotClipboardFormatId::DRAWING:
- nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
+ bRet = SwTransferable::_PasteSdrFormat( rData, rSh,
SwPasteSdr::SetAttr, pPt,
nActionFlags, bNeedToSelectBeforePaste);
break;
@@ -1494,7 +1494,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case SotClipboardFormatId::SIMPLE_FILE:
case SotClipboardFormatId::FILEGRPDESCRIPTOR:
case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
- nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
SwPasteSdr::SetAttr, pPt,
nActionFlags, nDropAction, bNeedToSelectBeforePaste);
break;
@@ -1505,7 +1505,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
break;
case EXCHG_OUT_ACTION_INSERT_DRAWOBJ:
- nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
+ bRet = SwTransferable::_PasteSdrFormat( rData, rSh,
SwPasteSdr::Insert, pPt,
nActionFlags, bNeedToSelectBeforePaste);
break;
@@ -1513,13 +1513,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case EXCHG_OUT_ACTION_INSERT_GDIMETAFILE:
case EXCHG_OUT_ACTION_INSERT_BITMAP:
case EXCHG_OUT_ACTION_INSERT_GRAPH:
- nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
SwPasteSdr::Insert, pPt,
nActionFlags, nDropAction, bNeedToSelectBeforePaste);
break;
case EXCHG_OUT_ACTION_REPLACE_DRAWOBJ:
- nRet = SwTransferable::_PasteSdrFormat( rData, rSh,
+ bRet = SwTransferable::_PasteSdrFormat( rData, rSh,
SwPasteSdr::Replace, pPt,
nActionFlags, bNeedToSelectBeforePaste);
break;
@@ -1528,13 +1528,13 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
case EXCHG_OUT_ACTION_REPLACE_GDIMETAFILE:
case EXCHG_OUT_ACTION_REPLACE_BITMAP:
case EXCHG_OUT_ACTION_REPLACE_GRAPH:
- nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
+ bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat,
SwPasteSdr::Replace,pPt,
nActionFlags, nDropAction, bNeedToSelectBeforePaste);
break;
case EXCHG_OUT_ACTION_INSERT_INTERACTIVE:
- nRet = SwTransferable::_PasteAsHyperlink( rData, rSh, nFormat );
+ bRet = SwTransferable::_PasteAsHyperlink( rData, rSh, nFormat );
break;
default:
@@ -1553,7 +1553,7 @@ bool SwTransferable::PasteData( TransferableDataHelper& rData,
if( bCallAutoCaption )
rSh.GetView().AutoCaption( GRAPHIC_CAP );
- return nRet;
+ return bRet;
}
SotExchangeDest SwTransferable::GetSotDestination( const SwWrtShell& rSh,
@@ -1630,7 +1630,7 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bMsg )
{
sal_uInt16 nResId = STR_CLPBRD_FORMAT_ERROR;
- bool nRet = false;
+ bool bRet = false;
MSE40HTMLClipFormatObj aMSE40ClpObj;
@@ -1702,10 +1702,10 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
if( IsError( aReader.Read( *pRead )) )
nResId = STR_ERROR_CLPBRD_READ;
else
- nResId = 0, nRet = true;
+ nResId = 0, bRet = true;
rSh.SetChgLnk( aOldLink );
- if( nRet )
+ if( bRet )
rSh.CallChgLnk();
}
else
@@ -1719,13 +1719,13 @@ bool SwTransferable::_PasteFileContent( TransferableDataHelper& rData,
{
ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SW_RES( nResId ), VCL_MESSAGE_INFO)->Execute();
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
SotClipboardFormatId nFormat, sal_uInt8 nActionFlags, bool bMsg )
{
- bool nRet = false;
+ bool bRet = false;
TransferableObjectDescriptor aObjDesc;
uno::Reference < io::XInputStream > xStrm;
uno::Reference < embed::XStorage > xStore;
@@ -1791,7 +1791,7 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
SwPaM &rPAM = *rSh.GetCrsr();
SwReader aReader( xStore, aEmptyOUStr, rPAM );
if( !IsError( aReader.Read( *pRead )) )
- nRet = true;
+ bRet = true;
else if( bMsg )
ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SW_RES(STR_ERROR_CLPBRD_READ), VCL_MESSAGE_INFO )->Execute();
}
@@ -1932,9 +1932,9 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
//End of Hack!
rSh.InsertOleObject( xObjRef );
- nRet = true;
+ bRet = true;
- if( nRet && ( nActionFlags &
+ if( bRet && ( nActionFlags &
( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) ))
SwTransferable::_PasteTargetURL( rData, rSh, SwPasteSdr::NONE, 0, false );
@@ -1942,14 +1942,14 @@ bool SwTransferable::_PasteOLE( TransferableDataHelper& rData, SwWrtShell& rSh,
SwOLEObj::UnloadObject( xObj, rSh.GetDoc(), embed::Aspects::MSOLE_CONTENT );
}
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
SwWrtShell& rSh, SwPasteSdr nAction,
const Point* pPt, bool bInsertGRF )
{
- bool nRet = false;
+ bool bRet = false;
INetImage aINetImg;
if( ( rData.HasFormat( SotClipboardFormatId::INET_IMAGE ) &&
rData.GetINetImage( SotClipboardFormatId::INET_IMAGE, aINetImg )) ||
@@ -1964,9 +1964,9 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
//!!! check at FileSystem - only then it make sense to test graphics !!!
Graphic aGraphic;
GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter();
- nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyOUStr, aGraphic, &rFlt );
+ bRet = GRFILTER_OK == GraphicFilter::LoadGraphic( sURL, aEmptyOUStr, aGraphic, &rFlt );
- if( nRet )
+ if( bRet )
{
//Check and Perform rotation if needed
lclCheckAndPerformRotation(aGraphic);
@@ -2001,15 +2001,15 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
}
break;
default:
- nRet = false;
+ bRet = false;
}
}
}
else
- nRet = true;
+ bRet = true;
}
- if( nRet )
+ if( bRet )
{
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
rSh.GetFlyFrmAttr( aSet );
@@ -2024,7 +2024,7 @@ bool SwTransferable::_PasteTargetURL( TransferableDataHelper& rData,
rSh.SetFlyFrmAttr( aSet );
}
}
- return nRet;
+ return bRet;
}
void SwTransferable::SetSelInShell( SwWrtShell& rSh, bool bSelectFrm,
@@ -2095,8 +2095,8 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
rData.HasFormat( nFormat = SotClipboardFormatId::BITMAP )) )
{
Graphic aGrf;
- bool nRet = rData.GetGraphic( nFormat, aGrf );
- if( nRet )
+ bool bRet = rData.GetGraphic( nFormat, aGrf );
+ if( bRet )
{
OUString sLnkTyp("DDE");
if ( bReReadGrf )
@@ -2104,7 +2104,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& rData,
else
rWrtShell.Insert( aCmd, sLnkTyp, aGrf );
}
- return nRet;
+ return bRet;
}
SwFieldType* pTyp = 0;
@@ -2233,7 +2233,7 @@ bool SwTransferable::_PasteSdrFormat( TransferableDataHelper& rData,
SwWrtShell& rSh, SwPasteSdr nAction,
const Point* pPt, sal_uInt8 nActionFlags, bool bNeedToSelectBeforePaste)
{
- bool nRet = false;
+ bool bRet = false;
tools::SvRef<SotStorageStream> xStrm;
if( rData.GetSotStorageStream( SotClipboardFormatId::DRAWING, xStrm ))
{
@@ -2247,20 +2247,20 @@ bool SwTransferable::_PasteSdrFormat( TransferableDataHelper& rData,
}
rSh.Paste( *xStrm, nAction, pPt );
- nRet = true;
+ bRet = true;
- if( nRet && ( nActionFlags &
+ if( bRet && ( nActionFlags &
( EXCHG_OUT_ACTION_FLAG_INSERT_TARGETURL >> 8) ))
SwTransferable::_PasteTargetURL( rData, rSh, SwPasteSdr::NONE, 0, false );
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
SotClipboardFormatId nFormat, SwPasteSdr nAction, const Point* pPt,
sal_uInt8 nActionFlags, sal_Int8 nDropAction, bool bNeedToSelectBeforePaste)
{
- bool nRet = false;
+ bool bRet = false;
Graphic aGraphic;
INetBookmark aBkmk;
@@ -2271,7 +2271,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
case SotClipboardFormatId::BITMAP:
case SotClipboardFormatId::PNG:
case SotClipboardFormatId::GDIMETAFILE:
- nRet = rData.GetGraphic( nFormat, aGraphic );
+ bRet = rData.GetGraphic( nFormat, aGraphic );
break;
case SotClipboardFormatId::SVXB:
@@ -2281,7 +2281,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
if(rData.GetSotStorageStream(SotClipboardFormatId::SVXB, xStm))
{
ReadGraphic( *xStm, aGraphic );
- nRet = (GRAPHIC_NONE != aGraphic.GetType() && GRAPHIC_DEFAULT != aGraphic.GetType());
+ bRet = (GRAPHIC_NONE != aGraphic.GetType() && GRAPHIC_DEFAULT != aGraphic.GetType());
}
break;
@@ -2290,7 +2290,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
case SotClipboardFormatId::NETSCAPE_BOOKMARK:
case SotClipboardFormatId::FILEGRPDESCRIPTOR:
case SotClipboardFormatId::UNIFORMRESOURCELOCATOR:
- if( ( nRet = rData.GetINetBookmark( nFormat, aBkmk ) ))
+ if( ( bRet = rData.GetINetBookmark( nFormat, aBkmk ) ))
{
if( SwPasteSdr::SetAttr == nAction )
nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK;
@@ -2302,7 +2302,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
case SotClipboardFormatId::SIMPLE_FILE:
{
OUString sText;
- if( ( nRet = rData.GetString( nFormat, sText ) ) )
+ if( ( bRet = rData.GetString( nFormat, sText ) ) )
{
OUString sDesc;
SwTransferable::_CheckForURLOrLNKFile( rData, sText, &sDesc );
@@ -2317,7 +2317,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
break;
default:
- nRet = rData.GetGraphic( nFormat, aGraphic );
+ bRet = rData.GetGraphic( nFormat, aGraphic );
break;
}
@@ -2325,17 +2325,17 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
{
//!!! check at FileSystem - only then it makes sense to test the graphics !!!
GraphicFilter &rFlt = GraphicFilter::GetGraphicFilter();
- nRet = GRFILTER_OK == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyOUStr,
+ bRet = GRFILTER_OK == GraphicFilter::LoadGraphic( aBkmk.GetURL(), aEmptyOUStr,
aGraphic, &rFlt );
- if( !nRet && SwPasteSdr::SetAttr == nAction &&
+ if( !bRet && SwPasteSdr::SetAttr == nAction &&
SotClipboardFormatId::SIMPLE_FILE == nFormat &&
// only at frame selection
rSh.IsFrmSelected() )
{
// then set as hyperlink after the graphic
nFormat = SotClipboardFormatId::NETSCAPE_BOOKMARK;
- nRet = true;
+ bRet = true;
}
}
@@ -2348,7 +2348,7 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
SwTransferable::SetSelInShell( rSh, true, pPt );
}
- if( nRet )
+ if( bRet )
{
//Check and Perform rotation if needed
lclCheckAndPerformRotation(aGraphic);
@@ -2426,13 +2426,13 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
}
default:
{
- nRet = false;
+ bRet = false;
break;
}
}
}
- if( nRet )
+ if( bRet )
{
if( nActionFlags &
@@ -2463,17 +2463,17 @@ bool SwTransferable::_PasteGrf( TransferableDataHelper& rData, SwWrtShell& rSh,
aURL.SetMap( &aMap );
aSet.Put( aURL );
rSh.SetFlyFrmAttr( aSet );
- nRet = true;
+ bRet = true;
}
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
SwWrtShell& rSh )
{
- bool nRet = false;
+ bool bRet = false;
if( rData.HasFormat( SotClipboardFormatId::SVIM ))
{
SfxItemSet aSet( rSh.GetAttrPool(), RES_URL, RES_URL );
@@ -2490,15 +2490,15 @@ bool SwTransferable::_PasteImageMap( TransferableDataHelper& rData,
aSet.Put( aURL );
rSh.SetFlyFrmAttr( aSet );
}
- nRet = true;
+ bRet = true;
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
SwWrtShell& rSh, SotClipboardFormatId nFormat )
{
- bool nRet = false;
+ bool bRet = false;
OUString sFile;
if( rData.GetString( nFormat, sFile ) && !sFile.isEmpty() )
{
@@ -2534,9 +2534,9 @@ bool SwTransferable::_PasteAsHyperlink( TransferableDataHelper& rData,
sDesc.isEmpty() ? sFile : sDesc);
}
}
- nRet = true;
+ bRet = true;
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
@@ -2545,12 +2545,12 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
sal_uInt8 nActionFlags, bool /* bMsg */,
bool * graphicInserted)
{
- bool nRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, nAction,
+ bool bRet = SwTransferable::_PasteGrf( rData, rSh, nFormat, nAction,
pPt, nActionFlags, 0, false);
if (graphicInserted != 0) {
- *graphicInserted = nRet;
+ *graphicInserted = bRet;
}
- if( !nRet )
+ if( !bRet )
{
OUString sFile, sDesc;
if( rData.GetString( nFormat, sFile ) && !sFile.isEmpty() )
@@ -2592,7 +2592,7 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
Application::PostUserEvent( LINK( &rSh, SwWrtShell,
InsertRegionDialog ), pSect );
- nRet = true;
+ bRet = true;
}
else if( SwPasteSdr::SetAttr == nAction ||
( bIsURLFile && SwPasteSdr::Insert == nAction ))
@@ -2628,19 +2628,19 @@ bool SwTransferable::_PasteFileName( TransferableDataHelper& rData,
sDesc.isEmpty() ? sFile : sDesc );
}
}
- nRet = true;
+ bRet = true;
}
}
}
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
SwWrtShell& rSh, SotClipboardFormatId nFormat, bool bLink,
const Point* pDragPt, bool bMsg )
{
- bool nRet = false;
+ bool bRet = false;
OUString sText;
if( rData.GetString( nFormat, sText ) && !sText.isEmpty() )
{
@@ -2722,20 +2722,20 @@ bool SwTransferable::_PasteDBData( TransferableDataHelper& rData,
rSh.SwFEShell::InsertDrawObj( *pObj, *pDragPt );
}
}
- nRet = true;
+ bRet = true;
}
else if( bMsg )
{
ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SW_RES(STR_CLPBRD_FORMAT_ERROR), VCL_MESSAGE_INFO)->Execute();
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
SwWrtShell& rSh, bool bLink,
const Point* pPt, bool bMsg )
{
- bool nRet = false;
+ bool bRet = false;
FileList aFileList;
if( rData.GetFileList( SotClipboardFormatId::FILE_LIST, aFileList ) &&
aFileList.Count() )
@@ -2757,7 +2757,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
sFlyNm = rSh.GetFlyName();
SwTransferable::SetSelInShell( rSh, false, pPt );
}
- nRet = true;
+ bRet = true;
}
}
if( !sFlyNm.isEmpty() )
@@ -2767,7 +2767,7 @@ bool SwTransferable::_PasteFileList( TransferableDataHelper& rData,
{
ScopedVclPtrInstance<MessageDialog>::Create( nullptr, SW_RES(STR_CLPBRD_FORMAT_ERROR), VCL_MESSAGE_INFO)->Execute();
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_CheckForURLOrLNKFile( TransferableDataHelper& rData,
@@ -2811,7 +2811,7 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
SotClipboardFormatId nFormat )
{
SwWait aWait( *rSh.GetView().GetDocShell(), false );
- bool nRet = false;
+ bool bRet = false;
SotClipboardFormatId nPrivateFormat = SotClipboardFormatId::PRIVATE;
SwTransferable *pClipboard = GetSwTransferable( rData );
@@ -2820,7 +2820,7 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
nPrivateFormat = SotClipboardFormatId::EMBED_SOURCE;
if( pClipboard && nPrivateFormat == nFormat )
- nRet = pClipboard->PrivatePaste( rSh );
+ bRet = pClipboard->PrivatePaste( rSh );
else if( rData.HasFormat( nFormat ) )
{
uno::Reference<XTransferable> xTransferable( rData.GetXTransferable() );
@@ -2842,10 +2842,10 @@ bool SwTransferable::PasteFormat( SwWrtShell& rSh,
lcl_getTransferPointer ( xTransferable ) );
if( EXCHG_INOUT_ACTION_NONE != nAction )
- nRet = SwTransferable::PasteData( rData, rSh, nAction, nFormat,
+ bRet = SwTransferable::PasteData( rData, rSh, nAction, nFormat,
nDestination, true, false );
}
- return nRet;
+ return bRet;
}
bool SwTransferable::_TestAllowedFormat( const TransferableDataHelper& rData,
@@ -2894,7 +2894,7 @@ bool SwTransferable::PasteUnformatted( SwWrtShell& rSh, TransferableDataHelper&
bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rData, SotClipboardFormatId& rFormatUsed )
{
- bool nRet = false;
+ bool bRet = false;
SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
std::unique_ptr<SfxAbstractPasteDialog> pDlg(pFact->CreatePasteDialog( &rSh.GetView().GetEditWin() ));
@@ -2956,12 +2956,12 @@ bool SwTransferable::PasteSpecial( SwWrtShell& rSh, TransferableDataHelper& rDat
SotClipboardFormatId nFormat = pDlg->GetFormat( rData.GetTransferable() );
if( nFormat != SotClipboardFormatId::NONE )
- nRet = SwTransferable::PasteFormat( rSh, rData, nFormat );
+ bRet = SwTransferable::PasteFormat( rSh, rData, nFormat );
- if ( nRet )
+ if ( bRet )
rFormatUsed = nFormat;
- return nRet;
+ return bRet;
}
void SwTransferable::FillClipFormatItem( const SwWrtShell& rSh,
@@ -3281,16 +3281,16 @@ bool SwTransferable::PrivatePaste( SwWrtShell& rShell )
}
}
- bool nRet = rShell.Paste( m_pClpDocFac->GetDoc() );
+ bool bRet = rShell.Paste( m_pClpDocFac->GetDoc() );
if( bKillPaMs )
rShell.KillPams();
// If Smart Paste then insert blank
- if( nRet && bSmart && ((bInWrd && !bEndWrd )|| bSttWrd) )
+ if( bRet && bSmart && ((bInWrd && !bEndWrd )|| bSttWrd) )
rShell.SwEditShell::Insert(' ');
- return nRet;
+ return bRet;
}
bool SwTransferable::PrivateDrop( SwWrtShell& rSh, const Point& rDragPt,
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 21c69c6e892e..199bd60ddf4b 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -890,12 +890,12 @@ void SwPagePreview::Execute( SfxRequest &rReq )
eMvMode = SwPagePreviewWin::MV_DOC_END; bRetVal = true; goto MOVEPAGE;
MOVEPAGE:
{
- bool nRet = ChgPage( eMvMode );
+ bool bRet = ChgPage( eMvMode );
// return value fuer Basic
if(bRetVal)
- rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), !nRet));
+ rReq.SetReturnValue(SfxBoolItem(rReq.GetSlot(), !bRet));
- bRefresh = nRet;
+ bRefresh = bRet;
rReq.Done();
}
break;
diff --git a/sw/source/uibase/utlui/content.cxx b/sw/source/uibase/utlui/content.cxx
index 201b48b9ba5f..7edacd1bb0bf 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -2274,12 +2274,12 @@ void SwContentTree::Notify(SfxBroadcaster & rBC, SfxHint const& rHint)
void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
{
- bool nMove = false;
+ bool bMove = false;
switch( nCmd )
{
case FN_ITEM_DOWN:
case FN_ITEM_UP:
- nMove = true;
+ bMove = true;
//fall-through
case FN_ITEM_LEFT:
case FN_ITEM_RIGHT:
@@ -2301,14 +2301,14 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, bool bModifier)
}
}
if ( nActPos < USHRT_MAX &&
- ( !nMove || pShell->IsOutlineMovable( nActPos )) )
+ ( !bMove || pShell->IsOutlineMovable( nActPos )) )
{
pShell->StartAllAction();
pShell->GotoOutline( nActPos); // If text selection != box selection
pShell->Push();
pShell->MakeOutlineSel( nActPos, nActPos,
bModifier);
- if( nMove )
+ if( bMove )
{
short nDir = nCmd == FN_ITEM_UP ? -1 : 1;
if( !bModifier && ( (nDir == -1 && nActPos > 0) ||
diff --git a/sw/source/uibase/wrtsh/move.cxx b/sw/source/uibase/wrtsh/move.cxx
index 4d93e8bfcf34..271f75e0b29e 100644
--- a/sw/source/uibase/wrtsh/move.cxx
+++ b/sw/source/uibase/wrtsh/move.cxx
@@ -80,17 +80,17 @@ void SwWrtShell::MoveCrsr( bool bWithSelect )
bool SwWrtShell::SimpleMove( FNSimpleMove FnSimpleMove, bool bSelect )
{
- bool nRet;
+ bool bRet;
if( bSelect )
{
SttCrsrMove();
MoveCrsr( true );
- nRet = (this->*FnSimpleMove)();
+ bRet = (this->*FnSimpleMove)();
EndCrsrMove();
}
- else if( ( nRet = (this->*FnSimpleMove)() ) )
+ else if( ( bRet = (this->*FnSimpleMove)() ) )
MoveCrsr();
- return nRet;
+ return bRet;
}
bool SwWrtShell::Left( sal_uInt16 nMode, bool bSelect,