diff options
37 files changed, 137 insertions, 137 deletions
diff --git a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx index 296205390fcc..c0c7c7f0f494 100644 --- a/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx +++ b/chart2/source/controller/chartapiwrapper/DiagramWrapper.cxx @@ -486,10 +486,10 @@ struct StaticDiagramWrapperPropertyArray : public rtl::StaticAggregate< Sequence { }; -bool lcl_isXYChart( const Reference< chart2::XDiagram > xDiagram ) +bool lcl_isXYChart( const Reference< chart2::XDiagram >& rDiagram ) { bool bRet = false; - Reference< chart2::XChartType > xChartType( ::chart::DiagramHelper::getChartTypeByIndex( xDiagram, 0 ) ); + Reference< chart2::XChartType > xChartType( ::chart::DiagramHelper::getChartTypeByIndex( rDiagram, 0 ) ); if( xChartType.is() ) { OUString aChartType( xChartType->getChartType() ); diff --git a/chart2/source/controller/main/ChartController_Position.cxx b/chart2/source/controller/main/ChartController_Position.cxx index 4a5884a49e80..298f2d65d0c1 100644 --- a/chart2/source/controller/main/ChartController_Position.cxx +++ b/chart2/source/controller/main/ChartController_Position.cxx @@ -47,7 +47,7 @@ namespace chart using namespace ::com::sun::star; using namespace ::com::sun::star::chart2; -void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectangle& rPosAndSize, const awt::Size aOriginalSize ) +void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectangle& rPosAndSize, const awt::Size& rOriginalSize ) { long nPosX(0); long nPosY(0); @@ -75,32 +75,32 @@ void lcl_getPositionAndSizeFromItemSet( const SfxItemSet& rItemSet, awt::Rectang case RP_LT: break; case RP_MT: - nPosX += ( aOriginalSize.Width - nSizX ) / 2; + nPosX += ( rOriginalSize.Width - nSizX ) / 2; break; case RP_RT: - nPosX += aOriginalSize.Width - nSizX; + nPosX += rOriginalSize.Width - nSizX; break; case RP_LM: - nPosY += ( aOriginalSize.Height - nSizY ) / 2; + nPosY += ( rOriginalSize.Height - nSizY ) / 2; break; case RP_MM: - nPosX += ( aOriginalSize.Width - nSizX ) / 2; - nPosY += ( aOriginalSize.Height - nSizY ) / 2; + nPosX += ( rOriginalSize.Width - nSizX ) / 2; + nPosY += ( rOriginalSize.Height - nSizY ) / 2; break; case RP_RM: - nPosX += aOriginalSize.Width - nSizX; - nPosY += ( aOriginalSize.Height - nSizY ) / 2; + nPosX += rOriginalSize.Width - nSizX; + nPosY += ( rOriginalSize.Height - nSizY ) / 2; break; case RP_LB: - nPosY += aOriginalSize.Height - nSizY; + nPosY += rOriginalSize.Height - nSizY; break; case RP_MB: - nPosX += ( aOriginalSize.Width - nSizX ) / 2; - nPosY += aOriginalSize.Height - nSizY; + nPosX += ( rOriginalSize.Width - nSizX ) / 2; + nPosY += rOriginalSize.Height - nSizY; break; case RP_RB: - nPosX += aOriginalSize.Width - nSizX; - nPosY += aOriginalSize.Height - nSizY; + nPosX += rOriginalSize.Width - nSizX; + nPosY += rOriginalSize.Height - nSizY; break; default: break; diff --git a/chart2/source/controller/main/CommandDispatchContainer.cxx b/chart2/source/controller/main/CommandDispatchContainer.cxx index 7c6e72d6bcf2..172f8b17be3b 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.cxx +++ b/chart2/source/controller/main/CommandDispatchContainer.cxx @@ -64,11 +64,11 @@ void CommandDispatchContainer::setModel( } void CommandDispatchContainer::setChartDispatch( - const Reference< frame::XDispatch > xChartDispatch, + const Reference< frame::XDispatch >& rChartDispatch, const ::std::set< OUString > & rChartCommands ) { - OSL_ENSURE(xChartDispatch.is(),"Invalid fall back dispatcher!"); - m_xChartDispatcher.set( xChartDispatch ); + OSL_ENSURE(rChartDispatch.is(),"Invalid fall back dispatcher!"); + m_xChartDispatcher.set( rChartDispatch ); m_aChartCommands = rChartCommands; m_aToBeDisposedDispatches.push_back( m_xChartDispatcher ); } diff --git a/chart2/source/controller/main/CommandDispatchContainer.hxx b/chart2/source/controller/main/CommandDispatchContainer.hxx index 0e25f7223cde..9b611bdc802b 100644 --- a/chart2/source/controller/main/CommandDispatchContainer.hxx +++ b/chart2/source/controller/main/CommandDispatchContainer.hxx @@ -83,7 +83,7 @@ public: */ void setChartDispatch( const ::com::sun::star::uno::Reference< - ::com::sun::star::frame::XDispatch > xChartDispatch, + ::com::sun::star::frame::XDispatch >& rChartDispatch, const ::std::set< OUString > & rChartCommands ); /** Returns the dispatch that is able to do the command given in rURL, if diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx index 6f2378ea7ec3..48b92efa9179 100644 --- a/chart2/source/view/main/DummyXShape.cxx +++ b/chart2/source/view/main/DummyXShape.cxx @@ -1013,8 +1013,8 @@ void SAL_CALL DummyGroup2D::setSize( const awt::Size& ) } DummyGraphic2D::DummyGraphic2D(const drawing::Position3D& rPos, const drawing::Direction3D& rSize, - const uno::Reference< graphic::XGraphic > xGraphic ): - mxGraphic(xGraphic) + const uno::Reference< graphic::XGraphic >& rGraphic ): + mxGraphic(rGraphic) { setPosition(Position3DToAWTPoint(rPos)); setSize(Direction3DToAWTSize(rSize)); diff --git a/chart2/source/view/main/DummyXShape.hxx b/chart2/source/view/main/DummyXShape.hxx index 64149d3c3d2c..fd97dff16031 100644 --- a/chart2/source/view/main/DummyXShape.hxx +++ b/chart2/source/view/main/DummyXShape.hxx @@ -285,7 +285,7 @@ class DummyGraphic2D : public DummyXShape { public: DummyGraphic2D(const css::drawing::Position3D& rPosition, const css::drawing::Direction3D& rSize, - const css::uno::Reference< css::graphic::XGraphic > xGraphic ); + const css::uno::Reference< css::graphic::XGraphic >& rGraphic ); private: css::uno::Reference< css::graphic::XGraphic > mxGraphic; diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx b/dbaccess/source/core/dataaccess/documentdefinition.cxx index 63d51d7a25bd..03f0a3e8ffe3 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.cxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx @@ -1409,7 +1409,7 @@ bool ODocumentDefinition::saveAs() namespace { - void lcl_putLoadArgs( ::comphelper::NamedValueCollection& _io_rArgs, const optional_bool _bSuppressMacros, const optional_bool _bReadOnly ) + void lcl_putLoadArgs( ::comphelper::NamedValueCollection& _io_rArgs, const optional_bool& _bSuppressMacros, const optional_bool& _bReadOnly ) { if ( !!_bSuppressMacros ) { @@ -2111,7 +2111,7 @@ void SAL_CALL ODocumentDefinition::disposing( const lang::EventObject& /*Source* } void ODocumentDefinition::firePropertyChange( sal_Int32 i_nHandle, const Any& i_rNewValue, const Any& i_rOldValue, - bool i_bVetoable, const NotifierAccess ) + bool i_bVetoable, const NotifierAccess& ) { fire( &i_nHandle, &i_rNewValue, &i_rOldValue, 1, i_bVetoable ); } diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx b/dbaccess/source/core/dataaccess/documentdefinition.hxx index 9a328e10119a..df68794cc346 100644 --- a/dbaccess/source/core/dataaccess/documentdefinition.hxx +++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx @@ -190,7 +190,7 @@ public: const ::com::sun::star::uno::Any& i_rNewValue, const ::com::sun::star::uno::Any& i_rOldValue, bool i_bVetoable, - const NotifierAccess + const NotifierAccess& ); private: diff --git a/desktop/source/deployment/gui/dp_gui_dialog2.cxx b/desktop/source/deployment/gui/dp_gui_dialog2.cxx index cd4e2a56b770..5fc63464f902 100644 --- a/desktop/source/deployment/gui/dp_gui_dialog2.cxx +++ b/desktop/source/deployment/gui/dp_gui_dialog2.cxx @@ -123,7 +123,7 @@ class ExtBoxWithBtns_Impl : public ExtensionBox_Impl ExtMgrDialog *m_pParent; void SetButtonPos( const Rectangle& rRect ); - void SetButtonStatus( const TEntry_Impl pEntry ); + void SetButtonStatus( const TEntry_Impl& rEntry ); bool HandleTabKey( bool bReverse ); MENU_COMMAND ShowPopupMenu( const Point &rPos, const long nPos ); @@ -255,12 +255,12 @@ void ExtBoxWithBtns_Impl::SetButtonPos( const Rectangle& rRect ) } -void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry ) +void ExtBoxWithBtns_Impl::SetButtonStatus(const TEntry_Impl& rEntry) { bool bShowOptionBtn = true; - pEntry->m_bHasButtons = false; - if ( ( pEntry->m_eState == REGISTERED ) || ( pEntry->m_eState == NOT_AVAILABLE ) ) + rEntry->m_bHasButtons = false; + if ( ( rEntry->m_eState == REGISTERED ) || ( rEntry->m_eState == NOT_AVAILABLE ) ) { m_pEnableBtn->SetText( DialogHelper::getResourceString( RID_CTX_ITEM_DISABLE ) ); m_pEnableBtn->SetHelpId( HID_EXTENSION_MANAGER_LISTBOX_DISABLE ); @@ -272,30 +272,30 @@ void ExtBoxWithBtns_Impl::SetButtonStatus( const TEntry_Impl pEntry ) bShowOptionBtn = false; } - if ( ( !pEntry->m_bUser || ( pEntry->m_eState == NOT_AVAILABLE ) || pEntry->m_bMissingDeps ) - && !pEntry->m_bMissingLic ) + if ( ( !rEntry->m_bUser || ( rEntry->m_eState == NOT_AVAILABLE ) || rEntry->m_bMissingDeps ) + && !rEntry->m_bMissingLic ) m_pEnableBtn->Hide(); else { - m_pEnableBtn->Enable( !pEntry->m_bLocked ); + m_pEnableBtn->Enable( !rEntry->m_bLocked ); m_pEnableBtn->Show(); - pEntry->m_bHasButtons = true; + rEntry->m_bHasButtons = true; } - if ( pEntry->m_bHasOptions && bShowOptionBtn ) + if ( rEntry->m_bHasOptions && bShowOptionBtn ) { - m_pOptionsBtn->Enable( pEntry->m_bHasOptions ); + m_pOptionsBtn->Enable( rEntry->m_bHasOptions ); m_pOptionsBtn->Show(); - pEntry->m_bHasButtons = true; + rEntry->m_bHasButtons = true; } else m_pOptionsBtn->Hide(); - if ( pEntry->m_bUser || pEntry->m_bShared ) + if ( rEntry->m_bUser || rEntry->m_bShared ) { - m_pRemoveBtn->Enable( !pEntry->m_bLocked ); + m_pRemoveBtn->Enable( !rEntry->m_bLocked ); m_pRemoveBtn->Show(); - pEntry->m_bHasButtons = true; + rEntry->m_bHasButtons = true; } else m_pRemoveBtn->Hide(); diff --git a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx index 86a3056ef666..7f7d38a90122 100644 --- a/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx +++ b/desktop/source/deployment/gui/dp_gui_extensioncmdqueue.cxx @@ -142,7 +142,7 @@ public: will be handled and in the second case a VersionException will be handled. */ - ProgressCmdEnv( const uno::Reference< uno::XComponentContext > rContext, + ProgressCmdEnv( const uno::Reference< uno::XComponentContext >& rContext, DialogHelper* pDialogHelper, const OUString& rTitle ) : m_xContext( rContext ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx index a75d2c4c5d4e..ec2dea626a5f 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx @@ -113,15 +113,15 @@ Entry_Impl::~Entry_Impl() {} -sal_Int32 Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const +sal_Int32 Entry_Impl::CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl& rEntry ) const { - sal_Int32 eCompare = pCollator->compareString( m_sTitle, pEntry->m_sTitle ); + sal_Int32 eCompare = pCollator->compareString( m_sTitle, rEntry->m_sTitle ); if ( eCompare == 0 ) { - eCompare = m_sVersion.compareTo( pEntry->m_sVersion ); + eCompare = m_sVersion.compareTo( rEntry->m_sVersion ); if ( eCompare == 0 ) { - sal_Int32 nCompare = m_xPackage->getRepositoryName().compareTo( pEntry->m_xPackage->getRepositoryName() ); + sal_Int32 nCompare = m_xPackage->getRepositoryName().compareTo( rEntry->m_xPackage->getRepositoryName() ); if ( nCompare < 0 ) eCompare = -1; else if ( nCompare > 0 ) @@ -492,20 +492,20 @@ void ExtensionBox_Impl::selectEntry( const long nPos ) } -void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry ) +void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl& rEntry ) { const StyleSettings& rStyleSettings = GetSettings().GetStyleSettings(); - if ( pEntry->m_bActive ) + if ( rEntry->m_bActive ) SetTextColor( rStyleSettings.GetHighlightTextColor() ); - else if ( ( pEntry->m_eState != REGISTERED ) && ( pEntry->m_eState != NOT_AVAILABLE ) ) + else if ( ( rEntry->m_eState != REGISTERED ) && ( rEntry->m_eState != NOT_AVAILABLE ) ) SetTextColor( rStyleSettings.GetDisableColor() ); else if ( IsControlForeground() ) SetTextColor( GetControlForeground() ); else SetTextColor( rStyleSettings.GetFieldTextColor() ); - if ( pEntry->m_bActive ) + if ( rEntry->m_bActive ) { SetLineColor(); SetFillColor( rStyleSettings.GetHighlightColor() ); @@ -526,10 +526,10 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr Point aPos( rRect.TopLeft() ); aPos += Point( TOP_OFFSET, TOP_OFFSET ); Image aImage; - if ( ! pEntry->m_aIcon ) + if ( ! rEntry->m_aIcon ) aImage = m_aDefaultImage; else - aImage = pEntry->m_aIcon; + aImage = rEntry->m_aIcon; Size aImageSize = aImage.GetSizePixel(); if ( ( aImageSize.Width() <= ICON_WIDTH ) && ( aImageSize.Height() <= ICON_HEIGHT ) ) DrawImage( Point( aPos.X()+((ICON_WIDTH-aImageSize.Width())/2), aPos.Y()+((ICON_HEIGHT-aImageSize.Height())/2) ), aImage ); @@ -544,45 +544,45 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr long aTextHeight = GetTextHeight(); // Init publisher link here - if ( !pEntry->m_pPublisher && !pEntry->m_sPublisher.isEmpty() ) + if ( !rEntry->m_pPublisher && !rEntry->m_sPublisher.isEmpty() ) { - pEntry->m_pPublisher = new FixedHyperlink( this ); - pEntry->m_pPublisher->SetBackground(); - pEntry->m_pPublisher->SetPaintTransparent( true ); - pEntry->m_pPublisher->SetURL( pEntry->m_sPublisherURL ); - pEntry->m_pPublisher->SetText( pEntry->m_sPublisher ); - Size aSize = FixedText::CalcMinimumTextSize( pEntry->m_pPublisher ); - pEntry->m_pPublisher->SetSizePixel( aSize ); + rEntry->m_pPublisher = new FixedHyperlink( this ); + rEntry->m_pPublisher->SetBackground(); + rEntry->m_pPublisher->SetPaintTransparent( true ); + rEntry->m_pPublisher->SetURL( rEntry->m_sPublisherURL ); + rEntry->m_pPublisher->SetText( rEntry->m_sPublisher ); + Size aSize = FixedText::CalcMinimumTextSize( rEntry->m_pPublisher ); + rEntry->m_pPublisher->SetSizePixel( aSize ); if ( m_aClickHdl.IsSet() ) - pEntry->m_pPublisher->SetClickHdl( m_aClickHdl ); + rEntry->m_pPublisher->SetClickHdl( m_aClickHdl ); } // Get max title width long nMaxTitleWidth = rRect.GetWidth() - ICON_OFFSET; nMaxTitleWidth -= ( 2 * SMALL_ICON_SIZE ) + ( 4 * SPACE_BETWEEN ); - if ( pEntry->m_pPublisher ) + if ( rEntry->m_pPublisher ) { - nMaxTitleWidth -= pEntry->m_pPublisher->GetSizePixel().Width() + (2*SPACE_BETWEEN); + nMaxTitleWidth -= rEntry->m_pPublisher->GetSizePixel().Width() + (2*SPACE_BETWEEN); } - long aVersionWidth = GetTextWidth( pEntry->m_sVersion ); - long aTitleWidth = GetTextWidth( pEntry->m_sTitle ) + (aTextHeight / 3); + long aVersionWidth = GetTextWidth( rEntry->m_sVersion ); + long aTitleWidth = GetTextWidth( rEntry->m_sTitle ) + (aTextHeight / 3); aPos = rRect.TopLeft() + Point( ICON_OFFSET, TOP_OFFSET ); if ( aTitleWidth > nMaxTitleWidth - aVersionWidth ) { aTitleWidth = nMaxTitleWidth - aVersionWidth - (aTextHeight / 3); - OUString aShortTitle = GetEllipsisString( pEntry->m_sTitle, aTitleWidth ); + OUString aShortTitle = GetEllipsisString( rEntry->m_sTitle, aTitleWidth ); DrawText( aPos, aShortTitle ); aTitleWidth += (aTextHeight / 3); } else - DrawText( aPos, pEntry->m_sTitle ); + DrawText( aPos, rEntry->m_sTitle ); SetFont( aStdFont ); - DrawText( Point( aPos.X() + aTitleWidth, aPos.Y() ), pEntry->m_sVersion ); + DrawText( Point( aPos.X() + aTitleWidth, aPos.Y() ), rEntry->m_sVersion ); long nIconHeight = TOP_OFFSET + SMALL_ICON_SIZE; long nTitleHeight = TOP_OFFSET + GetTextHeight(); @@ -593,22 +593,22 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr // draw description OUString sDescription; - if ( !pEntry->m_sErrorText.isEmpty() ) + if ( !rEntry->m_sErrorText.isEmpty() ) { - if ( pEntry->m_bActive ) - sDescription = pEntry->m_sErrorText + "\n" + pEntry->m_sDescription; + if ( rEntry->m_bActive ) + sDescription = rEntry->m_sErrorText + "\n" + rEntry->m_sDescription; else - sDescription = pEntry->m_sErrorText; + sDescription = rEntry->m_sErrorText; } else - sDescription = pEntry->m_sDescription; + sDescription = rEntry->m_sDescription; aPos.Y() += aTextHeight; - if ( pEntry->m_bActive ) + if ( rEntry->m_bActive ) { long nExtraHeight = 0; - if ( pEntry->m_bHasButtons ) + if ( rEntry->m_bHasButtons ) nExtraHeight = m_nExtraHeight; DrawText( Rectangle( aPos.X(), aPos.Y(), rRect.Right(), rRect.Bottom() - nExtraHeight ), @@ -625,23 +625,23 @@ void ExtensionBox_Impl::DrawRow( const Rectangle& rRect, const TEntry_Impl pEntr } // Draw publisher link - if ( pEntry->m_pPublisher ) + if ( rEntry->m_pPublisher ) { - pEntry->m_pPublisher->Show(); + rEntry->m_pPublisher->Show(); aPos = rRect.TopLeft() + Point( ICON_OFFSET + nMaxTitleWidth + (2*SPACE_BETWEEN), TOP_OFFSET ); - pEntry->m_pPublisher->SetPosPixel( aPos ); + rEntry->m_pPublisher->SetPosPixel( aPos ); } // Draw status icons - if ( !pEntry->m_bUser ) + if ( !rEntry->m_bUser ) { aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SMALL_ICON_SIZE), TOP_OFFSET ); - if ( pEntry->m_bLocked ) + if ( rEntry->m_bLocked ) DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aLockedImage ); else DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aSharedImage ); } - if ( ( pEntry->m_eState == AMBIGUOUS ) || pEntry->m_bMissingDeps || pEntry->m_bMissingLic ) + if ( ( rEntry->m_eState == AMBIGUOUS ) || rEntry->m_bMissingDeps || rEntry->m_bMissingLic ) { aPos = rRect.TopRight() + Point( -(RIGHT_ICON_OFFSET + SPACE_BETWEEN + 2*SMALL_ICON_SIZE), TOP_OFFSET ); DrawImage( aPos, Size( SMALL_ICON_SIZE, SMALL_ICON_SIZE ), m_aWarningImage ); @@ -916,7 +916,7 @@ bool ExtensionBox_Impl::Notify( NotifyEvent& rNEvt ) } -bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStart, +bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl& rEntry, const long nStart, const long nEnd, long &nPos ) { nPos = nStart; @@ -927,13 +927,13 @@ bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStar if ( nStart == nEnd ) { - eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nStart ] ); + eCompare = rEntry->CompareTo( m_pCollator, m_vEntries[ nStart ] ); if ( eCompare < 0 ) return false; else if ( eCompare == 0 ) { //Workaround. See i86963. - if (pEntry->m_xPackage != m_vEntries[nStart]->m_xPackage) + if (rEntry->m_xPackage != m_vEntries[nStart]->m_xPackage) return false; if ( m_bInCheckMode ) @@ -948,16 +948,16 @@ bool ExtensionBox_Impl::FindEntryPos( const TEntry_Impl pEntry, const long nStar } const long nMid = nStart + ( ( nEnd - nStart ) / 2 ); - eCompare = pEntry->CompareTo( m_pCollator, m_vEntries[ nMid ] ); + eCompare = rEntry->CompareTo( m_pCollator, m_vEntries[ nMid ] ); if ( eCompare < 0 ) - return FindEntryPos( pEntry, nStart, nMid-1, nPos ); + return FindEntryPos( rEntry, nStart, nMid-1, nPos ); else if ( eCompare > 0 ) - return FindEntryPos( pEntry, nMid+1, nEnd, nPos ); + return FindEntryPos( rEntry, nMid+1, nEnd, nPos ); else { //Workaround.See i86963. - if (pEntry->m_xPackage != m_vEntries[nMid]->m_xPackage) + if (rEntry->m_xPackage != m_vEntries[nMid]->m_xPackage) return false; if ( m_bInCheckMode ) diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx index 8241e28f9f3a..1590f82500a5 100644 --- a/desktop/source/deployment/gui/dp_gui_extlistbox.hxx +++ b/desktop/source/deployment/gui/dp_gui_extlistbox.hxx @@ -86,7 +86,7 @@ struct Entry_Impl const PackageState eState, const bool bReadOnly ); ~Entry_Impl(); - sal_Int32 CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl pEntry ) const; + sal_Int32 CompareTo( const CollatorWrapper *pCollator, const TEntry_Impl& rEntry ) const; void checkDependencies(); }; @@ -164,10 +164,10 @@ class ExtensionBox_Impl : public ::svt::IExtensionListBox void CalcActiveHeight( const long nPos ); long GetTotalHeight() const; void SetupScrollBar(); - void DrawRow( const Rectangle& rRect, const TEntry_Impl pEntry ); + void DrawRow( const Rectangle& rRect, const TEntry_Impl& rEntry ); bool HandleTabKey( bool bReverse ); bool HandleCursorKey( sal_uInt16 nKeyCode ); - bool FindEntryPos( const TEntry_Impl pEntry, long nStart, long nEnd, long &nFound ); + bool FindEntryPos( const TEntry_Impl& rEntry, long nStart, long nEnd, long &nFound ); void DeleteRemoved(); diff --git a/forms/source/xforms/binding.cxx b/forms/source/xforms/binding.cxx index 919ff0d89639..0adca84e056e 100644 --- a/forms/source/xforms/binding.cxx +++ b/forms/source/xforms/binding.cxx @@ -661,7 +661,7 @@ void Binding::bind( bool bForceRebind ) // helper for Binding::valueModified static void lcl_modified( const Binding::XModifyListener_t xListener, - const Reference<XInterface> xSource ) + const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); xListener->modified( EventObject( xSource ) ); @@ -669,7 +669,7 @@ static void lcl_modified( const Binding::XModifyListener_t xListener, // helper for Binding::valueModified static void lcl_listentry( const Binding::XListEntryListener_t xListener, - const Reference<XInterface> xSource ) + const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); // TODO: send fine granular events @@ -678,7 +678,7 @@ static void lcl_listentry( const Binding::XListEntryListener_t xListener, // helper for Binding::valueModified static void lcl_validate( const Binding::XValidityConstraintListener_t xListener, - const Reference<XInterface> xSource ) + const Reference<XInterface>& xSource ) { OSL_ENSURE( xListener.is(), "no listener?" ); xListener->validityConstraintChanged( EventObject( xSource ) ); diff --git a/include/vbahelper/vbashape.hxx b/include/vbahelper/vbashape.hxx index 18aa3cc283cb..897ff5b0b0ea 100644 --- a/include/vbahelper/vbashape.hxx +++ b/include/vbahelper/vbashape.hxx @@ -56,7 +56,7 @@ public: css::uno::Any getRange() { return m_aRange; }; void setRange( css::uno::Any aRange ) { m_aRange = aRange; }; - static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException); + static sal_Int32 getType( const css::uno::Reference< css::drawing::XShape >& rShape ) throw (css::uno::RuntimeException); // Attributes virtual OUString SAL_CALL getName() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/include/vbahelper/vbashapes.hxx b/include/vbahelper/vbashapes.hxx index 05b09350518d..c4a58008e381 100644 --- a/include/vbahelper/vbashapes.hxx +++ b/include/vbahelper/vbashapes.hxx @@ -51,7 +51,7 @@ protected: //css::awt::Point calculateTopLeftMargin( css::uno::Reference< ov::XHelperInterface > xDocument ); public: - ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); + ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const css::uno::Reference< css::frame::XModel >& xModel ); static void setDefaultShapeProperties( css::uno::Reference< css::drawing::XShape > xShape ) throw (css::uno::RuntimeException); static void setShape_NameProperty( css::uno::Reference< css::drawing::XShape > xShape, const OUString& sName ); //XEnumerationAccess diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx index 4dad460eea91..a9f538096c9b 100644 --- a/sc/inc/document.hxx +++ b/sc/inc/document.hxx @@ -1823,7 +1823,7 @@ public: SC_DLLPUBLIC void SetChangeViewSettings(const ScChangeViewSettings& rNew); rtl::Reference<SvxForbiddenCharactersTable> GetForbiddenCharacters(); - void SetForbiddenCharacters( const rtl::Reference<SvxForbiddenCharactersTable> xNew ); + void SetForbiddenCharacters(const rtl::Reference<SvxForbiddenCharactersTable>& rNew); sal_uInt8 GetAsianCompression() const; // CharacterCompressionType values bool IsValidAsianCompression() const; diff --git a/sc/source/core/data/documen9.cxx b/sc/source/core/data/documen9.cxx index 5dfe76d1d278..639eebb15a17 100644 --- a/sc/source/core/data/documen9.cxx +++ b/sc/source/core/data/documen9.cxx @@ -643,9 +643,9 @@ rtl::Reference<SvxForbiddenCharactersTable> ScDocument::GetForbiddenCharacters() return xForbiddenCharacters; } -void ScDocument::SetForbiddenCharacters( const rtl::Reference<SvxForbiddenCharactersTable> xNew ) +void ScDocument::SetForbiddenCharacters(const rtl::Reference<SvxForbiddenCharactersTable>& rNew) { - xForbiddenCharacters = xNew; + xForbiddenCharacters = rNew; if ( pEditEngine ) pEditEngine->SetForbiddenCharsTable( xForbiddenCharacters ); if ( pDrawLayer ) diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx index 2f7af3d49a08..55e692b78c17 100644 --- a/sc/source/core/data/formulacell.cxx +++ b/sc/source/core/data/formulacell.cxx @@ -137,19 +137,19 @@ lcl_checkRangeDimensions( static bool lcl_checkRangeDimensions( const ScAddress& rPos, - const deque<formula::FormulaToken*>::const_iterator aBegin, - const deque<formula::FormulaToken*>::const_iterator aEnd, + const deque<formula::FormulaToken*>::const_iterator& rBegin, + const deque<formula::FormulaToken*>::const_iterator& rEnd, bool& bCol, bool& bRow, bool& bTab) { - deque<formula::FormulaToken*>::const_iterator aCur(aBegin); + deque<formula::FormulaToken*>::const_iterator aCur(rBegin); ++aCur; - const SingleDoubleRefProvider aRef(**aBegin); + const SingleDoubleRefProvider aRef(**rBegin); bool bOk(false); { const SingleDoubleRefProvider aRefCur(**aCur); bOk = lcl_checkRangeDimensions(rPos, aRef, aRefCur, bCol, bRow, bTab); } - while (bOk && aCur != aEnd) + while (bOk && aCur != rEnd) { const SingleDoubleRefProvider aRefCur(**aCur); bool bColTmp(false); @@ -160,7 +160,7 @@ lcl_checkRangeDimensions( ++aCur; } - if (bOk && aCur == aEnd) + if (bOk && aCur == rEnd) { return true; } diff --git a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx index bea8c9d6ce91..31dff197bd04 100644 --- a/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx +++ b/sc/source/filter/xml/XMLChangeTrackingImportHelper.hxx @@ -106,8 +106,8 @@ struct ScMyMoveRanges ScBigRange aSourceRange; ScBigRange aTargetRange; - ScMyMoveRanges(const ScBigRange& aSource, const ScBigRange aTarget) : - aSourceRange(aSource), aTargetRange(aTarget) {} + ScMyMoveRanges(const ScBigRange& rSource, const ScBigRange& rTarget) : + aSourceRange(rSource), aTargetRange(rTarget) {} }; typedef std::list<sal_uInt32> ScMyDependencies; diff --git a/sc/source/filter/xml/XMLExportIterator.cxx b/sc/source/filter/xml/XMLExportIterator.cxx index f08e4ddabf18..319b3d086c9f 100644 --- a/sc/source/filter/xml/XMLExportIterator.cxx +++ b/sc/source/filter/xml/XMLExportIterator.cxx @@ -191,14 +191,14 @@ ScMyMergedRangesContainer::~ScMyMergedRangesContainer() { } -void ScMyMergedRangesContainer::AddRange(const table::CellRangeAddress aMergedRange) +void ScMyMergedRangesContainer::AddRange(const table::CellRangeAddress& rMergedRange) { - sal_Int32 nStartRow(aMergedRange.StartRow); - sal_Int32 nEndRow(aMergedRange.EndRow); + sal_Int32 nStartRow(rMergedRange.StartRow); + sal_Int32 nEndRow(rMergedRange.EndRow); ScMyMergedRange aRange; aRange.bIsFirst = true; - aRange.aCellRange = aMergedRange; + aRange.aCellRange = rMergedRange; aRange.aCellRange.EndRow = nStartRow; aRange.nRows = nEndRow - nStartRow + 1; aRangeList.push_back( aRange ); diff --git a/sc/source/filter/xml/XMLExportIterator.hxx b/sc/source/filter/xml/XMLExportIterator.hxx index d075ebc97b97..41e59dc975c8 100644 --- a/sc/source/filter/xml/XMLExportIterator.hxx +++ b/sc/source/filter/xml/XMLExportIterator.hxx @@ -139,7 +139,7 @@ protected: public: ScMyMergedRangesContainer(); virtual ~ScMyMergedRangesContainer(); - void AddRange(const com::sun::star::table::CellRangeAddress aMergedRange); + void AddRange(const com::sun::star::table::CellRangeAddress& rMergedRange); using ScMyIteratorBase::UpdateAddress; virtual void SetCellData( ScMyCell& rMyCell ) SAL_OVERRIDE; diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx index de76274c6aa9..acb079e5e875 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.cxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx @@ -956,18 +956,18 @@ void ScFormatRangeStyles::GetFormatRanges(const sal_Int32 nStartColumn, const sa pRowFormatRanges->Sort(); } -void ScFormatRangeStyles::AddRangeStyleName(const table::CellRangeAddress aCellRangeAddress, +void ScFormatRangeStyles::AddRangeStyleName(const table::CellRangeAddress& rCellRangeAddress, const sal_Int32 nStringIndex, const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat) { ScMyFormatRange aFormatRange; - aFormatRange.aRangeAddress = aCellRangeAddress; + aFormatRange.aRangeAddress = rCellRangeAddress; aFormatRange.nStyleNameIndex = nStringIndex; aFormatRange.nValidationIndex = nValidationIndex; aFormatRange.nNumberFormat = nNumberFormat; aFormatRange.bIsAutoStyle = bIsAutoStyle; - OSL_ENSURE(static_cast<size_t>(aCellRangeAddress.Sheet) < aTables.size(), "wrong table"); - ScMyFormatRangeAddresses* pFormatRanges(aTables[aCellRangeAddress.Sheet]); + OSL_ENSURE(static_cast<size_t>(rCellRangeAddress.Sheet) < aTables.size(), "wrong table"); + ScMyFormatRangeAddresses* pFormatRanges(aTables[rCellRangeAddress.Sheet]); pFormatRanges->push_back(aFormatRange); } diff --git a/sc/source/filter/xml/XMLStylesExportHelper.hxx b/sc/source/filter/xml/XMLStylesExportHelper.hxx index 38dc7938cee1..20b9c9a7d3dc 100644 --- a/sc/source/filter/xml/XMLStylesExportHelper.hxx +++ b/sc/source/filter/xml/XMLStylesExportHelper.hxx @@ -204,7 +204,7 @@ public: bool& bIsAutoStyle, sal_Int32& nValidationIndex, sal_Int32& nNumberFormat, const sal_Int32 nRemoveBeforeRow); void GetFormatRanges(const sal_Int32 nStartColumn, const sal_Int32 nEndColumn, const sal_Int32 nRow, const sal_Int32 nTable, ScRowFormatRanges* pFormatRanges); - void AddRangeStyleName(const com::sun::star::table::CellRangeAddress aCellRangeAddress, const sal_Int32 nStringIndex, + void AddRangeStyleName(const com::sun::star::table::CellRangeAddress& rCellRangeAddress, const sal_Int32 nStringIndex, const bool bIsAutoStyle, const sal_Int32 nValidationIndex, const sal_Int32 nNumberFormat); OUString* GetStyleNameByIndex(const sal_Int32 nIndex, const bool bIsAutoStyle); void Sort(); diff --git a/sc/source/filter/xml/xmldrani.hxx b/sc/source/filter/xml/xmldrani.hxx index 5555dfdd3d2e..d66c9be840eb 100644 --- a/sc/source/filter/xml/xmldrani.hxx +++ b/sc/source/filter/xml/xmldrani.hxx @@ -317,9 +317,9 @@ public: virtual void EndElement() SAL_OVERRIDE; - void AddSubTotalColumn(const com::sun::star::sheet::SubTotalColumn aSubTotalColumn) + void AddSubTotalColumn(const com::sun::star::sheet::SubTotalColumn& rSubTotalColumn) { aSubTotalRule.aSubTotalColumns.realloc(aSubTotalRule.aSubTotalColumns.getLength() + 1); - aSubTotalRule.aSubTotalColumns[aSubTotalRule.aSubTotalColumns.getLength() - 1] = aSubTotalColumn; } + aSubTotalRule.aSubTotalColumns[aSubTotalRule.aSubTotalColumns.getLength() - 1] = rSubTotalColumn; } }; class ScXMLSubTotalFieldContext : public SvXMLImportContext diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx index 32955415d7f0..b488821faee0 100644 --- a/sc/source/filter/xml/xmlexprt.cxx +++ b/sc/source/filter/xml/xmlexprt.cxx @@ -465,10 +465,10 @@ sal_Int16 ScXMLExport::GetMeasureUnit() // #110680# ScXMLExport::ScXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlag) : SvXMLExport( GetMeasureUnit(), - xContext, implementationName, XML_SPREADSHEET, nExportFlag ), + rContext, implementationName, XML_SPREADSHEET, nExportFlag ), pDoc(NULL), nSourceStreamPos(0), pNumberFormatAttributesExportHelper(NULL), diff --git a/sc/source/filter/xml/xmlexprt.hxx b/sc/source/filter/xml/xmlexprt.hxx index 1bb0d8b533a9..2a5a6ea2dc52 100644 --- a/sc/source/filter/xml/xmlexprt.hxx +++ b/sc/source/filter/xml/xmlexprt.hxx @@ -236,7 +236,7 @@ protected: virtual XMLFontAutoStylePool* CreateFontAutoStylePool() SAL_OVERRIDE; public: ScXMLExport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLExportFlags nExportFlag); virtual ~ScXMLExport(); diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx index 6648144ad157..2e589023258e 100644 --- a/sc/source/filter/xml/xmlimprt.cxx +++ b/sc/source/filter/xml/xmlimprt.cxx @@ -1978,9 +1978,9 @@ SvXMLImportContext *ScXMLImport::CreateContext( sal_uInt16 nPrefix, } ScXMLImport::ScXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlag) -: SvXMLImport( xContext, implementationName, nImportFlag ), +: SvXMLImport( rContext, implementationName, nImportFlag ), pDoc( NULL ), pChangeTrackingImportHelper(NULL), pStylesImportHelper(NULL), diff --git a/sc/source/filter/xml/xmlimprt.hxx b/sc/source/filter/xml/xmlimprt.hxx index 9576176f95ea..5ceeb72b5d2b 100644 --- a/sc/source/filter/xml/xmlimprt.hxx +++ b/sc/source/filter/xml/xmlimprt.hxx @@ -981,7 +981,7 @@ protected: public: // #110680# ScXMLImport( - const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext > xContext, + const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rContext, OUString const & implementationName, SvXMLImportFlags nImportFlag); virtual ~ScXMLImport() throw(); diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx b/vbahelper/source/vbahelper/vbaapplicationbase.cxx index 430fec29519c..589c02917050 100644 --- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx +++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx @@ -95,7 +95,7 @@ public: return (sal_Int32) nResult; } - void Start( const ::rtl::Reference< VbaApplicationBase > xBase, const OUString& aFunction, double nFrom, double nTo ) + void Start( const ::rtl::Reference< VbaApplicationBase >& xBase, const OUString& aFunction, double nFrom, double nTo ) { if ( !xBase.is() || aFunction.isEmpty() ) throw uno::RuntimeException( "Unexpected arguments!" ); diff --git a/vbahelper/source/vbahelper/vbacolorformat.cxx b/vbahelper/source/vbahelper/vbacolorformat.cxx index 22e553990dce..7cade936ca19 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.cxx +++ b/vbahelper/source/vbahelper/vbacolorformat.cxx @@ -40,7 +40,7 @@ MsoColorIndices::getColorIndex( sal_Int32 nIndex ) }; return COLORINDICES[nIndex]; } -ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XHelperInterface > xInternalParent, const uno::Reference< drawing::XShape > xShape, const sal_Int16 nColorFormatType ) : ScVbaColorFormat_BASE( xParent, xContext ), m_xInternalParent( xInternalParent ), m_xShape( xShape ), m_nColorFormatType( nColorFormatType ) +ScVbaColorFormat::ScVbaColorFormat( const uno::Reference< XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< XHelperInterface >& xInternalParent, const uno::Reference< drawing::XShape >& xShape, const sal_Int16 nColorFormatType ) : ScVbaColorFormat_BASE( xParent, xContext ), m_xInternalParent( xInternalParent ), m_xShape( xShape ), m_nColorFormatType( nColorFormatType ) { m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW ); m_nFillFormatBackColor = 0; diff --git a/vbahelper/source/vbahelper/vbacolorformat.hxx b/vbahelper/source/vbahelper/vbacolorformat.hxx index 3831a2851573..3bb88e990832 100644 --- a/vbahelper/source/vbahelper/vbacolorformat.hxx +++ b/vbahelper/source/vbahelper/vbacolorformat.hxx @@ -103,7 +103,7 @@ protected: virtual OUString getServiceImplName() SAL_OVERRIDE; virtual css::uno::Sequence<OUString> getServiceNames() SAL_OVERRIDE; public: - ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface > xInternalParent, const css::uno::Reference< css::drawing::XShape > xShape, const sal_Int16 nColorFormatType ); + ScVbaColorFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< ov::XHelperInterface >& xInternalParent, const css::uno::Reference< css::drawing::XShape >& xShape, const sal_Int16 nColorFormatType ); // Attributes virtual sal_Int32 SAL_CALL getRGB() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/vbahelper/source/vbahelper/vbacommandbar.cxx b/vbahelper/source/vbahelper/vbacommandbar.cxx index cfab911e058b..8f4a32b418fb 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.cxx +++ b/vbahelper/source/vbahelper/vbacommandbar.cxx @@ -29,8 +29,8 @@ using namespace com::sun::star; using namespace ooo::vba; -ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface > xParent, - const uno::Reference< uno::XComponentContext > xContext, +ScVbaCommandBar::ScVbaCommandBar( const uno::Reference< ov::XHelperInterface >& xParent, + const uno::Reference< uno::XComponentContext >& xContext, VbaCommandBarHelperRef pHelper, const uno::Reference< container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, bool bIsMenu ) throw( uno::RuntimeException ) @@ -195,8 +195,8 @@ ScVbaCommandBar::getServiceNames() VbaDummyCommandBar::VbaDummyCommandBar( - const uno::Reference< ov::XHelperInterface > xParent, - const uno::Reference< uno::XComponentContext > xContext, + const uno::Reference< ov::XHelperInterface >& xParent, + const uno::Reference< uno::XComponentContext >& xContext, const OUString& rName, sal_Int32 nType ) throw( uno::RuntimeException ) : CommandBar_BASE( xParent, xContext ), maName( rName ), diff --git a/vbahelper/source/vbahelper/vbacommandbar.hxx b/vbahelper/source/vbahelper/vbacommandbar.hxx index da0efc78f682..62c6c0d751ba 100644 --- a/vbahelper/source/vbahelper/vbacommandbar.hxx +++ b/vbahelper/source/vbahelper/vbacommandbar.hxx @@ -39,7 +39,7 @@ private: bool m_bIsMenu; public: - ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface > xParent, const css::uno::Reference< css::uno::XComponentContext > xContext, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, bool bIsMenu ) throw( css::uno::RuntimeException ); + ScVbaCommandBar( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, VbaCommandBarHelperRef pHelper, const css::uno::Reference< css::container::XIndexAccess >& xBarSettings, const OUString& sResourceUrl, bool bIsMenu ) throw( css::uno::RuntimeException ); bool IsMenu() const { return m_bIsMenu; } @@ -67,8 +67,8 @@ class VbaDummyCommandBar : public CommandBar_BASE { public: VbaDummyCommandBar( - const css::uno::Reference< ov::XHelperInterface > xParent, - const css::uno::Reference< css::uno::XComponentContext > xContext, + const css::uno::Reference< ov::XHelperInterface >& xParent, + const css::uno::Reference< css::uno::XComponentContext >& xContext, const OUString& rName, sal_Int32 nType ) throw( css::uno::RuntimeException ); diff --git a/vbahelper/source/vbahelper/vbalineformat.cxx b/vbahelper/source/vbahelper/vbalineformat.cxx index 9412467fe6f9..f0229e472faa 100644 --- a/vbahelper/source/vbahelper/vbalineformat.cxx +++ b/vbahelper/source/vbahelper/vbalineformat.cxx @@ -28,7 +28,7 @@ using namespace ooo::vba; using namespace com::sun::star; -ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape > xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) +ScVbaLineFormat::ScVbaLineFormat( const uno::Reference< ov::XHelperInterface >& xParent, const uno::Reference< uno::XComponentContext >& xContext, const uno::Reference< drawing::XShape >& xShape ) : ScVbaLineFormat_BASE( xParent, xContext ), m_xShape( xShape ) { m_xPropertySet.set( xShape, uno::UNO_QUERY_THROW ); m_nLineDashStyle = office::MsoLineDashStyle::msoLineSolid; diff --git a/vbahelper/source/vbahelper/vbalineformat.hxx b/vbahelper/source/vbahelper/vbalineformat.hxx index 0baea68a3cfe..42f3ca666194 100644 --- a/vbahelper/source/vbahelper/vbalineformat.hxx +++ b/vbahelper/source/vbahelper/vbalineformat.hxx @@ -39,7 +39,7 @@ protected: sal_Int32 convertLineStartEndNameToArrowheadStyle( const OUString& sLineName ); OUString convertArrowheadStyleToLineStartEndName( sal_Int32 nArrowheadStyle ) throw (css::uno::RuntimeException); public: - ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape > xShape ); + ScVbaLineFormat( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::drawing::XShape >& xShape ); // Attributes virtual sal_Int32 SAL_CALL getBeginArrowheadStyle() throw (css::uno::RuntimeException, std::exception) SAL_OVERRIDE; diff --git a/vbahelper/source/vbahelper/vbashape.cxx b/vbahelper/source/vbahelper/vbashape.cxx index c31388b2f943..e505b6b37a43 100644 --- a/vbahelper/source/vbahelper/vbashape.cxx +++ b/vbahelper/source/vbahelper/vbashape.cxx @@ -113,7 +113,7 @@ ScVbaShape::removeShapesListener() throw( uno::RuntimeException ) } sal_Int32 -ScVbaShape::getType( const css::uno::Reference< drawing::XShape > xShape ) throw (uno::RuntimeException) +ScVbaShape::getType( const css::uno::Reference< drawing::XShape >& xShape ) throw (uno::RuntimeException) { OUString sShapeType; uno::Reference< drawing::XShapeDescriptor > xShapeDescriptor( xShape, uno::UNO_QUERY_THROW ); diff --git a/vbahelper/source/vbahelper/vbashapes.cxx b/vbahelper/source/vbahelper/vbashapes.cxx index 1eaf7a7dee71..bce5b53df962 100644 --- a/vbahelper/source/vbahelper/vbashapes.cxx +++ b/vbahelper/source/vbahelper/vbashapes.cxx @@ -78,7 +78,7 @@ void ScVbaShapes::initBaseCollection() m_xNameAccess.set( xShapes, uno::UNO_QUERY ); } -ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess > xShapes, const uno::Reference< frame::XModel>& xModel ): ScVbaShapes_BASE( xParent, xContext, xShapes, true ), m_nNewShapeCount(0), m_xModel( xModel ) +ScVbaShapes::ScVbaShapes( const css::uno::Reference< ov::XHelperInterface >& xParent, const css::uno::Reference< css::uno::XComponentContext >& xContext, const css::uno::Reference< css::container::XIndexAccess >& xShapes, const uno::Reference< frame::XModel>& xModel ): ScVbaShapes_BASE( xParent, xContext, xShapes, true ), m_nNewShapeCount(0), m_xModel( xModel ) { m_xShapes.set( xShapes, uno::UNO_QUERY_THROW ); m_xDrawPage.set( xShapes, uno::UNO_QUERY_THROW ); |