[Libreoffice-commits] core.git: sc/source sw/inc sw/source
Caolán McNamara
caolanm at redhat.com
Wed Mar 4 13:08:25 PST 2015
sc/source/filter/excel/xelink.cxx | 40 ++++++++++++-------------
sc/source/filter/excel/xetable.cxx | 2 -
sc/source/filter/inc/tokstack.hxx | 34 ++++++++++-----------
sc/source/filter/inc/xelink.hxx | 2 -
sc/source/filter/inc/xetable.hxx | 2 -
sw/inc/PostItMgr.hxx | 2 -
sw/inc/SidebarWin.hxx | 2 -
sw/inc/unotxdoc.hxx | 2 -
sw/source/filter/ww8/docxattributeoutput.cxx | 2 -
sw/source/uibase/docvw/AnchorOverlayObject.cxx | 4 +-
sw/source/uibase/docvw/AnchorOverlayObject.hxx | 2 -
sw/source/uibase/docvw/PostItMgr.cxx | 10 +++---
sw/source/uibase/docvw/SidebarWin.cxx | 4 +-
sw/source/uibase/docvw/edtwin.cxx | 4 +-
sw/source/uibase/inc/cnttab.hxx | 8 ++---
sw/source/uibase/inc/edtwin.hxx | 2 -
sw/source/uibase/sidebar/PageMarginControl.cxx | 10 +++---
sw/source/uibase/sidebar/PageMarginControl.hxx | 4 +-
sw/source/uibase/uno/unotxdoc.cxx | 6 +--
19 files changed, 71 insertions(+), 71 deletions(-)
New commits:
commit 986a0709e25e5148bf6003aba25ca16bba1b43db
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Mar 4 20:27:49 2015 +0000
V801: Decreased performance
Change-Id: I342cbf679e50175808f64469c7e5c208cb75d8db
diff --git a/sc/source/filter/excel/xelink.cxx b/sc/source/filter/excel/xelink.cxx
index 521d2b6..f9e22a7 100644
--- a/sc/source/filter/excel/xelink.cxx
+++ b/sc/source/filter/excel/xelink.cxx
@@ -102,7 +102,7 @@ class XclExpExtName : public XclExpExtNameBase
{
public:
explicit XclExpExtName( const XclExpRoot& rRoot, const XclExpSupbook& rSupbook, const OUString& rName,
- const ScExternalRefCache::TokenArrayRef pArray );
+ const ScExternalRefCache::TokenArrayRef& rArray );
private:
/** Writes additional record contents. */
@@ -130,7 +130,7 @@ public:
@return The 1-based (Excel-like) list index of the DDE link. */
sal_uInt16 InsertDde( const OUString& rApplic, const OUString& rTopic, const OUString& rItem );
- sal_uInt16 InsertExtName( const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray );
+ sal_uInt16 InsertExtName( const XclExpSupbook& rSupbook, const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray );
/** Writes the EXTERNNAME record list. */
virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE;
@@ -321,7 +321,7 @@ public:
@return The 1-based EXTERNNAME record index; or 0, if the record list is full. */
sal_uInt16 InsertDde( const OUString& rItem );
- sal_uInt16 InsertExtName( const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray );
+ sal_uInt16 InsertExtName( const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray );
/** Get the type of record. */
XclSupbookType GetType() const;
@@ -422,7 +422,7 @@ public:
bool InsertExtName(
sal_uInt16& rnSupbook, sal_uInt16& rnExtName, const OUString& rUrl,
- const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray );
+ const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray );
XclExpXti GetXti( sal_uInt16 nFileId, const OUString& rTabName, sal_uInt16 nXclTabSpan,
XclExpRefLogEntry* pRefLogEntry = NULL );
@@ -514,7 +514,7 @@ public:
virtual bool InsertExtName(
sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl,
- const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) = 0;
+ const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ) = 0;
/** Derived classes write the entire link table to the passed stream. */
virtual void Save( XclExpStream& rStrm ) = 0;
@@ -562,7 +562,7 @@ public:
virtual bool InsertExtName(
sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl,
- const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) SAL_OVERRIDE;
+ const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ) SAL_OVERRIDE;
virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE;
@@ -631,7 +631,7 @@ public:
virtual bool InsertExtName(
sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl,
- const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) SAL_OVERRIDE;
+ const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ) SAL_OVERRIDE;
virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE;
@@ -950,10 +950,10 @@ void XclExpExtNameDde::WriteAddData( XclExpStream& rStrm )
}
XclExpExtName::XclExpExtName( const XclExpRoot& rRoot, const XclExpSupbook& rSupbook,
- const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray ) :
+ const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray ) :
XclExpExtNameBase( rRoot, rName ),
mrSupbook(rSupbook),
- mpArray(pArray->Clone())
+ mpArray(rArray->Clone())
{
}
@@ -1087,10 +1087,10 @@ sal_uInt16 XclExpExtNameBuffer::InsertDde(
}
sal_uInt16 XclExpExtNameBuffer::InsertExtName( const XclExpSupbook& rSupbook,
- const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray )
+ const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray )
{
sal_uInt16 nIndex = GetIndex( rName );
- return nIndex ? nIndex : AppendNew( new XclExpExtName( GetRoot(), rSupbook, rName, pArray ) );
+ return nIndex ? nIndex : AppendNew( new XclExpExtName( GetRoot(), rSupbook, rName, rArray ) );
}
void XclExpExtNameBuffer::Save( XclExpStream& rStrm )
@@ -1616,9 +1616,9 @@ sal_uInt16 XclExpSupbook::InsertDde( const OUString& rItem )
return GetExtNameBuffer().InsertDde( maUrl, maDdeTopic, rItem );
}
-sal_uInt16 XclExpSupbook::InsertExtName( const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray )
+sal_uInt16 XclExpSupbook::InsertExtName( const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray )
{
- return GetExtNameBuffer().InsertExtName(*this, rName, pArray);
+ return GetExtNameBuffer().InsertExtName(*this, rName, rArray);
}
XclSupbookType XclExpSupbook::GetType() const
@@ -1980,7 +1980,7 @@ bool XclExpSupbookBuffer::InsertDde(
bool XclExpSupbookBuffer::InsertExtName(
sal_uInt16& rnSupbook, sal_uInt16& rnExtName, const OUString& rUrl,
- const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray )
+ const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray )
{
XclExpSupbookRef xSupbook;
if (!GetSupbookUrl(xSupbook, rnSupbook, rUrl))
@@ -1988,7 +1988,7 @@ bool XclExpSupbookBuffer::InsertExtName(
xSupbook.reset( new XclExpSupbook(GetRoot(), rUrl) );
rnSupbook = Append(xSupbook);
}
- rnExtName = xSupbook->InsertExtName(rName, pArray);
+ rnExtName = xSupbook->InsertExtName(rName, rArray);
return rnExtName > 0;
}
@@ -2232,7 +2232,7 @@ bool XclExpLinkManagerImpl5::InsertDde(
bool XclExpLinkManagerImpl5::InsertExtName(
sal_uInt16& /*rnExtSheet*/, sal_uInt16& /*rnExtName*/, const OUString& /*rUrl*/,
- const OUString& /*rName*/, const ScExternalRefCache::TokenArrayRef /*pArray*/ )
+ const OUString& /*rName*/, const ScExternalRefCache::TokenArrayRef& /*rArray*/ )
{
// not implemented
return false;
@@ -2442,10 +2442,10 @@ bool XclExpLinkManagerImpl8::InsertDde(
}
bool XclExpLinkManagerImpl8::InsertExtName( sal_uInt16& rnExtSheet, sal_uInt16& rnExtName,
- const OUString& rName, const OUString& rUrl, const ScExternalRefCache::TokenArrayRef pArray )
+ const OUString& rName, const OUString& rUrl, const ScExternalRefCache::TokenArrayRef& rArray )
{
sal_uInt16 nSupbook;
- if( maSBBuffer.InsertExtName( nSupbook, rnExtName, rUrl, rName, pArray ) )
+ if( maSBBuffer.InsertExtName( nSupbook, rnExtName, rUrl, rName, rArray ) )
{
rnExtSheet = InsertXti( XclExpXti( nSupbook, EXC_TAB_EXTERNAL, EXC_TAB_EXTERNAL ) );
return true;
@@ -2590,9 +2590,9 @@ bool XclExpLinkManager::InsertDde(
bool XclExpLinkManager::InsertExtName(
sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rName, const OUString& rUrl,
- const ScExternalRefCache::TokenArrayRef pArray )
+ const ScExternalRefCache::TokenArrayRef& rArray )
{
- return mxImpl->InsertExtName( rnExtSheet, rnExtName, rUrl, rName, pArray );
+ return mxImpl->InsertExtName(rnExtSheet, rnExtName, rUrl, rName, rArray);
}
void XclExpLinkManager::Save( XclExpStream& rStrm )
diff --git a/sc/source/filter/excel/xetable.cxx b/sc/source/filter/excel/xetable.cxx
index ba1d24a..230ece2 100644
--- a/sc/source/filter/excel/xetable.cxx
+++ b/sc/source/filter/excel/xetable.cxx
@@ -651,7 +651,7 @@ void XclExpNumberCell::WriteContents( XclExpStream& rStrm )
IMPL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell )
XclExpBooleanCell::XclExpBooleanCell(
- const XclExpRoot rRoot, const XclAddress& rXclPos,
+ const XclExpRoot& rRoot, const XclAddress& rXclPos,
const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId, bool bValue ) :
// #i41210# always use latin script for boolean cells
XclExpSingleCellBase( rRoot, EXC_ID3_BOOLERR, 2, rXclPos, pPattern, ApiScriptType::LATIN, nForcedXFId ),
diff --git a/sc/source/filter/inc/tokstack.hxx b/sc/source/filter/inc/tokstack.hxx
index 9bf137d..7513d48 100644
--- a/sc/source/filter/inc/tokstack.hxx
+++ b/sc/source/filter/inc/tokstack.hxx
@@ -192,7 +192,7 @@ private:
public:
TokenPool( svl::SharedStringPool& rSPool );
~TokenPool();
- inline TokenPool& operator <<( const TokenId nId );
+ inline TokenPool& operator <<( const TokenId& rId );
inline TokenPool& operator <<( const DefTokenId eId );
inline TokenPool& operator <<( TokenStack& rStack );
void operator >>( TokenId& rId );
@@ -217,11 +217,11 @@ public:
const TokenId StoreExtRef( sal_uInt16 nFileId, const OUString& rTabName, const ScComplexRefData& rRef );
inline const TokenId LastId( void ) const;
- inline const ScTokenArray* operator []( const TokenId nId );
+ inline const ScTokenArray* operator []( const TokenId& rId );
void Reset( void );
- inline E_TYPE GetType( const TokenId& nId ) const;
- bool IsSingleOp( const TokenId& nId, const DefTokenId eId ) const;
- const OUString* GetExternal( const TokenId& nId ) const;
+ inline E_TYPE GetType( const TokenId& rId ) const;
+ bool IsSingleOp( const TokenId& rId, const DefTokenId eId ) const;
+ const OUString* GetExternal( const TokenId& rId ) const;
ScMatrix* GetMatrix( unsigned int n ) const;
};
@@ -236,7 +236,7 @@ class TokenStack
public:
TokenStack( sal_uInt16 nNewSize = 1024 );
~TokenStack();
- inline TokenStack& operator <<( const TokenId nNewId );
+ inline TokenStack& operator <<( const TokenId& rNewId );
inline void operator >>( TokenId &rId );
inline void Reset( void );
@@ -263,12 +263,12 @@ inline const TokenId TokenStack::Get( void )
return nRet;
}
-inline TokenStack &TokenStack::operator <<( const TokenId nNewId )
+inline TokenStack &TokenStack::operator <<( const TokenId& rNewId )
{// Element on Stack
OSL_ENSURE( nPos < nSize, "*TokenStack::<<(): Stack overflow" );
if( nPos < nSize )
{
- pStack[ nPos ] = nNewId;
+ pStack[ nPos ] = rNewId;
nPos++;
}
@@ -291,19 +291,19 @@ inline void TokenStack::Reset( void )
nPos = 0;
}
-inline TokenPool& TokenPool::operator <<( const TokenId nId )
+inline TokenPool& TokenPool::operator <<( const TokenId& rId )
{
- // POST: nId's are stored consecutively in Pool under a new Id;
+ // POST: rId's are stored consecutively in Pool under a new Id;
// finalize with >> or Store()
- // nId -> ( sal_uInt16 ) nId - 1;
- OSL_ENSURE( ( sal_uInt16 ) nId < nScTokenOff,
+ // rId -> ( sal_uInt16 ) rId - 1;
+ OSL_ENSURE( ( sal_uInt16 ) rId < nScTokenOff,
"-TokenPool::operator <<: TokenId in DefToken-Range!" );
if( nP_IdAkt >= nP_Id )
if (!GrowId())
return *this;
- pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) nId ) - 1;
+ pP_Id[ nP_IdAkt ] = ( ( sal_uInt16 ) rId ) - 1;
nP_IdAkt++;
return *this;
@@ -360,16 +360,16 @@ inline const TokenId TokenPool::LastId( void ) const
return static_cast<TokenId>(nElementAkt); // correct, as Ausgabe with Offset 1!
}
-const inline ScTokenArray* TokenPool::operator []( const TokenId nId )
+const inline ScTokenArray* TokenPool::operator []( const TokenId& rId )
{
pScToken->Clear();
- if( nId )
- {//...only if nId > 0!
+ if( rId )
+ {//...only if rId > 0!
#ifdef DBG_UTIL
m_nRek = 0;
#endif
- GetElement( ( sal_uInt16 ) nId - 1 );
+ GetElement( ( sal_uInt16 ) rId - 1 );
}
return pScToken;
diff --git a/sc/source/filter/inc/xelink.hxx b/sc/source/filter/inc/xelink.hxx
index 89d8b2f..9209b7e 100644
--- a/sc/source/filter/inc/xelink.hxx
+++ b/sc/source/filter/inc/xelink.hxx
@@ -195,7 +195,7 @@ public:
bool InsertExtName(
sal_uInt16& rnExtSheet, sal_uInt16& rnExtName, const OUString& rUrl,
- const OUString& rName, const ScExternalRefCache::TokenArrayRef pArray );
+ const OUString& rName, const ScExternalRefCache::TokenArrayRef& rArray );
/** Writes the entire Link table. */
virtual void Save( XclExpStream& rStrm ) SAL_OVERRIDE;
diff --git a/sc/source/filter/inc/xetable.hxx b/sc/source/filter/inc/xetable.hxx
index 091f566..0c56662 100644
--- a/sc/source/filter/inc/xetable.hxx
+++ b/sc/source/filter/inc/xetable.hxx
@@ -384,7 +384,7 @@ class XclExpBooleanCell : public XclExpSingleCellBase
DECL_FIXEDMEMPOOL_NEWDEL( XclExpBooleanCell )
public:
- explicit XclExpBooleanCell( const XclExpRoot rRoot, const XclAddress& rXclPos,
+ explicit XclExpBooleanCell( const XclExpRoot& rRoot, const XclAddress& rXclPos,
const ScPatternAttr* pPattern, sal_uInt32 nForcedXFId,
bool bValue );
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 948445e..f8bb42d 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -164,7 +164,7 @@ class SwPostItMgr: public SfxListener
void AutoScroll(const sw::sidebarwindows::SwSidebarWin* pPostIt,const unsigned long aPage );
bool ScrollbarHit(const unsigned long aPage,const Point &aPoint);
bool LayoutByPage( std::list<sw::sidebarwindows::SwSidebarWin*> &aVisiblePostItList,
- const Rectangle aBorder,
+ const Rectangle& rBorder,
long lNeededHeight);
void CheckForRemovedPostIts();
bool ArrowEnabled(sal_uInt16 aDirection,unsigned long aPage) const;
diff --git a/sw/inc/SidebarWin.hxx b/sw/inc/SidebarWin.hxx
index 0ac7a51..4df4582 100644
--- a/sw/inc/SidebarWin.hxx
+++ b/sw/inc/SidebarWin.hxx
@@ -171,7 +171,7 @@ class SwSidebarWin : public vcl::Window
DECL_LINK( WindowEventListener, VclSimpleEvent* );
inline bool IsMouseOverSidebarWin() const { return mbMouseOver; }
- void SetLanguage(const SvxLanguageItem aNewItem);
+ void SetLanguage(const SvxLanguageItem& rNewItem);
void ChangeSidebarItem( SwSidebarItem& rSidebarItem );
virtual ::com::sun::star::uno::Reference< ::com::sun::star::accessibility::XAccessible > CreateAccessible() SAL_OVERRIDE;
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 6ffa02f..e528195 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -188,7 +188,7 @@ private:
css::uno::Sequence<css::uno::Any> const * arguments);
// used for XRenderable implementation
- SfxViewShell * GuessViewShell( /* out */ bool &rbIsSwSrcView, const css::uno::Reference< css::frame::XController > xController = css::uno::Reference< css::frame::XController >() );
+ SfxViewShell * GuessViewShell( /* out */ bool &rbIsSwSrcView, const css::uno::Reference< css::frame::XController >& rController = css::uno::Reference< css::frame::XController >() );
SwDoc * GetRenderDoc( SfxViewShell *&rpView, const css::uno::Any& rSelection, bool bIsPDFExport );
SfxViewShell * GetRenderView( bool &rbIsSwSrcView, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions, bool bIsPDFExport );
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 3b830d1..0e1b5cd 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -162,7 +162,7 @@ class FFDataWriterHelper
m_pSerializer->endElementNS( XML_w, XML_ffData );
}
public:
- FFDataWriterHelper( const ::sax_fastparser::FSHelperPtr pSerializer ) : m_pSerializer( pSerializer ){}
+ FFDataWriterHelper( const ::sax_fastparser::FSHelperPtr& rSerializer ) : m_pSerializer( rSerializer ){}
void WriteFormCheckbox( const OUString& rName, const OUString& rDefault, bool bChecked )
{
writeCommonStart( rName );
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.cxx b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
index d3f1ee0..4f3fa86b 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.cxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.cxx
@@ -284,10 +284,10 @@ AnchorOverlayObject::AnchorOverlayObject( const basegfx::B2DPoint& rBasePos,
const basegfx::B2DPoint& rFifthPos,
const basegfx::B2DPoint& rSixthPos,
const basegfx::B2DPoint& rSeventhPos,
- const Color aBaseColor,
+ const Color& rBaseColor,
const bool bShadowedEffect,
const bool bLineSolid)
- : OverlayObjectWithBasePosition( rBasePos, aBaseColor )
+ : OverlayObjectWithBasePosition(rBasePos, rBaseColor)
, maSecondPosition(rSecondPos)
, maThirdPosition(rThirdPos)
, maFourthPosition(rFourthPos)
diff --git a/sw/source/uibase/docvw/AnchorOverlayObject.hxx b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
index 8298abc..fdcdbd3 100644
--- a/sw/source/uibase/docvw/AnchorOverlayObject.hxx
+++ b/sw/source/uibase/docvw/AnchorOverlayObject.hxx
@@ -120,7 +120,7 @@ class AnchorOverlayObject: public sdr::overlay::OverlayObjectWithBasePosition
const basegfx::B2DPoint& rFifthPos,
const basegfx::B2DPoint& rSixthPos,
const basegfx::B2DPoint& rSeventhPos,
- const Color aBaseColor,
+ const Color& rBaseColor,
const bool bShadowedEffect,
const bool bLineSolid );
virtual ~AnchorOverlayObject();
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 397def2..cbd5f2f 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -977,7 +977,7 @@ Color SwPostItMgr::GetArrowColor(sal_uInt16 aDirection,unsigned long aPage) cons
}
}
-bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,const Rectangle aBorder, long lNeededHeight)
+bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList, const Rectangle& rBorder, long lNeededHeight)
{
/*** General layout idea:***/
// - if we have space left, we always move the current one up,
@@ -986,10 +986,10 @@ bool SwPostItMgr::LayoutByPage(std::list<SwSidebarWin*> &aVisiblePostItList,cons
// - then the real layout starts
//rBorder is the page rect
- const Rectangle rBorder = mpEditWin->LogicToPixel( aBorder);
- long lTopBorder = rBorder.Top() + 5;
- long lBottomBorder = rBorder.Bottom() - 5;
- const long lVisibleHeight = lBottomBorder - lTopBorder; //rBorder.GetHeight() ;
+ const Rectangle aBorder = mpEditWin->LogicToPixel(rBorder);
+ long lTopBorder = aBorder.Top() + 5;
+ long lBottomBorder = aBorder.Bottom() - 5;
+ const long lVisibleHeight = lBottomBorder - lTopBorder; //aBorder.GetHeight() ;
const size_t nPostItListSize = aVisiblePostItList.size();
long lTranslatePos = 0;
bool bScrollbars = false;
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index e6f4a91..9b01664 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -914,7 +914,7 @@ void SwSidebarWin::SetReadonly(bool bSet)
GetOutlinerView()->SetReadOnly(bSet);
}
-void SwSidebarWin::SetLanguage(const SvxLanguageItem aNewItem)
+void SwSidebarWin::SetLanguage(const SvxLanguageItem& rNewItem)
{
Link pLink = Engine()->GetModifyHdl();
Engine()->SetModifyHdl( Link() );
@@ -923,7 +923,7 @@ void SwSidebarWin::SetLanguage(const SvxLanguageItem aNewItem)
ESelection aNewSelection( 0, 0, Engine()->GetParagraphCount()-1, EE_TEXTPOS_ALL );
GetOutlinerView()->SetSelection( aNewSelection );
SfxItemSet aEditAttr(GetOutlinerView()->GetAttribs());
- aEditAttr.Put(aNewItem);
+ aEditAttr.Put(rNewItem);
GetOutlinerView()->SetAttribs( aEditAttr );
GetOutlinerView()->SetSelection(aOld);
diff --git a/sw/source/uibase/docvw/edtwin.cxx b/sw/source/uibase/docvw/edtwin.cxx
index bf0b28d..d799f96 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -2783,7 +2783,7 @@ void touch_lo_selection_end_move_impl(const void *documentHandle,
#endif
-void SwEditWin::MoveCursor( SwWrtShell &rSh, const Point aDocPos,
+void SwEditWin::MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
const bool bOnlyText, bool bLockView )
{
const bool bTmpNoInterrupt = bNoInterrupt;
@@ -2800,7 +2800,7 @@ void SwEditWin::MoveCursor( SwWrtShell &rSh, const Point aDocPos,
// only temporary generate move context because otherwise
// the query to the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
- nTmpSetCrsr = rSh.SetCursor(&aDocPos, bOnlyText);
+ nTmpSetCrsr = rSh.SetCursor(&rDocPos, bOnlyText);
bValidCrsrPos = !(CRSR_POSCHG & nTmpSetCrsr);
}
diff --git a/sw/source/uibase/inc/cnttab.hxx b/sw/source/uibase/inc/cnttab.hxx
index 1fd1e18..e5626bb 100644
--- a/sw/source/uibase/inc/cnttab.hxx
+++ b/sw/source/uibase/inc/cnttab.hxx
@@ -53,10 +53,10 @@ struct CurTOXType
TOXTypes eType;
sal_uInt16 nIndex; //for TOX_USER only
- bool operator==(const CurTOXType aCmp)
- {
- return eType == aCmp.eType && nIndex == aCmp.nIndex;
- }
+ bool operator==(const CurTOXType& rCmp)
+ {
+ return eType == rCmp.eType && nIndex == rCmp.nIndex;
+ }
sal_uInt16 GetFlatIndex() const;
CurTOXType () : eType (TOX_INDEX), nIndex (0) {};
diff --git a/sw/source/uibase/inc/edtwin.hxx b/sw/source/uibase/inc/edtwin.hxx
index 5d8e239..aa2eca4b 100644
--- a/sw/source/uibase/inc/edtwin.hxx
+++ b/sw/source/uibase/inc/edtwin.hxx
@@ -180,7 +180,7 @@ friend void PageNumNotify( SwViewShell* pVwSh,
using OutputDevice::GetTextColor;
- void MoveCursor( SwWrtShell &rSh, const Point aDocPos,
+ void MoveCursor( SwWrtShell &rSh, const Point& rDocPos,
const bool bOnlyText, bool bLockView );
protected:
diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx
index 6e80bb0..7cb8429 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.cxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.cxx
@@ -44,7 +44,7 @@ PageMarginControl::PageMarginControl(
const SvxLongLRSpaceItem& aPageLRMargin,
const SvxLongULSpaceItem& aPageULMargin,
const bool bMirrored,
- const Size aPageSize,
+ const Size& rPageSize,
const bool bLandscape,
const FieldUnit eFUnit,
const SfxMapUnit eUnit )
@@ -111,7 +111,7 @@ PageMarginControl::PageMarginControl(
maBottomMarginEdit.SetModifyHdl( aLinkUL );
SetMetricValue( maBottomMarginEdit, mnPageBottomMargin, meUnit );
- SetMetricFieldMaxValues( aPageSize );
+ SetMetricFieldMaxValues(rPageSize);
if ( mbMirrored )
{
@@ -138,15 +138,15 @@ PageMarginControl::~PageMarginControl(void)
StoreUserCustomValues();
}
-void PageMarginControl::SetMetricFieldMaxValues( const Size aPageSize )
+void PageMarginControl::SetMetricFieldMaxValues(const Size& rPageSize)
{
const long nML = maLeftMarginEdit.Denormalize( maLeftMarginEdit.GetValue(FUNIT_TWIP) );
const long nMR = maRightMarginEdit.Denormalize( maRightMarginEdit.GetValue(FUNIT_TWIP) );
const long nMT = maTopMarginEdit.Denormalize(maTopMarginEdit.GetValue(FUNIT_TWIP) );
const long nMB = maBottomMarginEdit.Denormalize( maBottomMarginEdit.GetValue(FUNIT_TWIP) );
- const long nPH = LogicToLogic( aPageSize.Height(), (MapUnit)meUnit, MAP_TWIP );
- const long nPW = LogicToLogic( aPageSize.Width(), (MapUnit)meUnit, MAP_TWIP );
+ const long nPH = LogicToLogic( rPageSize.Height(), (MapUnit)meUnit, MAP_TWIP );
+ const long nPW = LogicToLogic( rPageSize.Width(), (MapUnit)meUnit, MAP_TWIP );
// Left
long nMax = nPW - nMR - MINBODY;
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx
index 253a56b1..908b1c6 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -56,7 +56,7 @@ public:
const SvxLongLRSpaceItem& aPageLRMargin,
const SvxLongULSpaceItem& aPageULMargin,
const bool bMirrored,
- const Size aPageSize,
+ const Size& rPageSize,
const bool bLandscape,
const FieldUnit eFUnit,
const SfxMapUnit eUnit );
@@ -103,7 +103,7 @@ private:
DECL_LINK( ModifyLRMarginHdl, MetricField* );
DECL_LINK( ModifyULMarginHdl, MetricField* );
- void SetMetricFieldMaxValues( const Size aPageSize );
+ void SetMetricFieldMaxValues(const Size& rPageSize);
bool GetUserCustomValues();
void StoreUserCustomValues();
diff --git a/sw/source/uibase/uno/unotxdoc.cxx b/sw/source/uibase/uno/unotxdoc.cxx
index 0f0cbeb..912ba13 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2885,7 +2885,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
SfxViewShell * SwXTextDocument::GuessViewShell(
/* out */ bool &rbIsSwSrcView,
- const uno::Reference< css::frame::XController > xController )
+ const uno::Reference< css::frame::XController >& rController )
{
// #130810# SfxViewShell::Current() / SfxViewShell::GetObjectShell()
// must not be used (see comment from MBA)
@@ -2906,9 +2906,9 @@ SfxViewShell * SwXTextDocument::GuessViewShell(
pSwSrcView = dynamic_cast< SwSrcView * >(pView);
if (!pSwPagePreview)
pSwPagePreview = dynamic_cast< SwPagePreview * >(pView);
- if (xController.is())
+ if (rController.is())
{
- if (pView && pView->GetController() == xController)
+ if (pView && pView->GetController() == rController)
break;
}
else if (pSwView || pSwSrcView)
More information about the Libreoffice-commits
mailing list