diff options
-rw-r--r-- | editeng/inc/eerdll2.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/editeng.cxx | 16 | ||||
-rw-r--r-- | editeng/source/editeng/editview.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eerdll.cxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/eertfpar.hxx | 2 | ||||
-rw-r--r-- | editeng/source/editeng/impedit.hxx | 4 | ||||
-rw-r--r-- | editeng/source/editeng/impedit2.cxx | 4 | ||||
-rw-r--r-- | editeng/source/outliner/outlin2.cxx | 13 | ||||
-rw-r--r-- | editeng/source/outliner/outlvw.cxx | 6 | ||||
-rw-r--r-- | include/editeng/CustomPropertyField.hxx | 4 | ||||
-rw-r--r-- | include/editeng/editeng.hxx | 16 | ||||
-rw-r--r-- | include/editeng/editview.hxx | 2 | ||||
-rw-r--r-- | include/editeng/outliner.hxx | 18 |
13 files changed, 46 insertions, 45 deletions
diff --git a/editeng/inc/eerdll2.hxx b/editeng/inc/eerdll2.hxx index f7dcb13ec696..96f90ac8453e 100644 --- a/editeng/inc/eerdll2.hxx +++ b/editeng/inc/eerdll2.hxx @@ -36,7 +36,7 @@ namespace editeng public: SharedVclResources(); ~SharedVclResources(); - VclPtr<VirtualDevice> GetVirtualDevice(); + VclPtr<VirtualDevice> const & GetVirtualDevice(); }; } diff --git a/editeng/source/editeng/editeng.cxx b/editeng/source/editeng/editeng.cxx index db6c7710dc38..2a3ccb3d52bb 100644 --- a/editeng/source/editeng/editeng.cxx +++ b/editeng/source/editeng/editeng.cxx @@ -167,7 +167,7 @@ void EditEngine::SetRefMapMode( const MapMode& rMapMode ) pImpEditEngine->SetRefMapMode( rMapMode ); } -MapMode EditEngine::GetRefMapMode() +MapMode const & EditEngine::GetRefMapMode() { return pImpEditEngine->GetRefMapMode(); } @@ -177,7 +177,7 @@ void EditEngine::SetBackgroundColor( const Color& rColor ) pImpEditEngine->SetBackgroundColor( rColor ); } -Color EditEngine::GetBackgroundColor() const +Color const & EditEngine::GetBackgroundColor() const { return pImpEditEngine->GetBackgroundColor(); } @@ -1519,7 +1519,7 @@ void EditEngine::SetNotifyHdl( const Link<EENotify&,void>& rLink ) pImpEditEngine->SetNotifyHdl( rLink ); } -Link<EENotify&,void> EditEngine::GetNotifyHdl() const +Link<EENotify&,void> const & EditEngine::GetNotifyHdl() const { return pImpEditEngine->GetNotifyHdl(); } @@ -1529,7 +1529,7 @@ void EditEngine::SetStatusEventHdl( const Link<EditStatus&, void>& rLink ) pImpEditEngine->SetStatusEventHdl( rLink ); } -Link<EditStatus&, void> EditEngine::GetStatusEventHdl() const +Link<EditStatus&, void> const & EditEngine::GetStatusEventHdl() const { return pImpEditEngine->GetStatusEventHdl(); } @@ -1636,7 +1636,7 @@ void EditEngine::SetModifyHdl( const Link<LinkParamNone*,void>& rLink ) pImpEditEngine->SetModifyHdl( rLink ); } -Link<LinkParamNone*,void> EditEngine::GetModifyHdl() const +Link<LinkParamNone*,void> const & EditEngine::GetModifyHdl() const { return pImpEditEngine->GetModifyHdl(); } @@ -2154,7 +2154,7 @@ void EditEngine::SetSpeller( Reference< XSpellChecker1 > const &xSpeller ) pImpEditEngine->SetSpeller( xSpeller ); } -Reference< XSpellChecker1 > EditEngine::GetSpeller() +Reference< XSpellChecker1 > const & EditEngine::GetSpeller() { return pImpEditEngine->GetSpeller(); } @@ -2719,7 +2719,7 @@ void EditEngine::SetBeginDropHdl( const Link<EditView*,void>& rLink ) pImpEditEngine->SetBeginDropHdl( rLink ); } -Link<EditView*,void> EditEngine::GetBeginDropHdl() const +Link<EditView*,void> const & EditEngine::GetBeginDropHdl() const { return pImpEditEngine->GetBeginDropHdl(); } @@ -2730,7 +2730,7 @@ void EditEngine::SetEndDropHdl( const Link<EditView*,void>& rLink ) pImpEditEngine->SetEndDropHdl( rLink ); } -Link<EditView*,void> EditEngine::GetEndDropHdl() const +Link<EditView*,void> const & EditEngine::GetEndDropHdl() const { return pImpEditEngine->GetEndDropHdl(); } diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx index 5a852f003605..a7000ce5e5a9 100644 --- a/editeng/source/editeng/editview.cxx +++ b/editeng/source/editeng/editview.cxx @@ -660,7 +660,7 @@ void EditView::SetBackgroundColor( const Color& rColor ) pImpEditView->SetBackgroundColor( rColor ); } -Color EditView::GetBackgroundColor() const +Color const & EditView::GetBackgroundColor() const { return pImpEditView->GetBackgroundColor(); } diff --git a/editeng/source/editeng/eerdll.cxx b/editeng/source/editeng/eerdll.cxx index f6b43af56221..9033db06b84d 100644 --- a/editeng/source/editeng/eerdll.cxx +++ b/editeng/source/editeng/eerdll.cxx @@ -216,7 +216,7 @@ editeng::SharedVclResources::SharedVclResources() editeng::SharedVclResources::~SharedVclResources() { m_pVirDev.disposeAndClear(); } -VclPtr<VirtualDevice> editeng::SharedVclResources::GetVirtualDevice() +VclPtr<VirtualDevice> const & editeng::SharedVclResources::GetVirtualDevice() { return m_pVirDev; } std::shared_ptr<editeng::SharedVclResources> EditDLL::GetSharedVclResources() diff --git a/editeng/source/editeng/eertfpar.hxx b/editeng/source/editeng/eertfpar.hxx index a308ff5ad3da..c289bb8422df 100644 --- a/editeng/source/editeng/eertfpar.hxx +++ b/editeng/source/editeng/eertfpar.hxx @@ -61,7 +61,7 @@ public: virtual SvParserState CallParser() override; - EditPaM GetCurPaM() const { return aCurSel.Max(); } + EditPaM const & GetCurPaM() const { return aCurSel.Max(); } }; typedef tools::SvRef<EditRTFParser> EditRTFParserRef; diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx index 06fec2bc7e6a..698f16b60f3e 100644 --- a/editeng/source/editeng/impedit.hxx +++ b/editeng/source/editeng/impedit.hxx @@ -824,7 +824,7 @@ public: void SetText( const EditTextObject& rTextObject ); EditSelection InsertText( const EditTextObject& rTextObject, EditSelection aSel ); - EditSelection MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView ); + EditSelection const & MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView ); EditSelection MoveParagraphs( Range aParagraphs, sal_Int32 nNewPos, EditView* pCurView ); @@ -1039,7 +1039,7 @@ public: void SetAddExtLeading( bool b ); bool IsAddExtLeading() const { return bAddExtLeading; } - static std::shared_ptr<SvxForbiddenCharactersTable> GetForbiddenCharsTable(); + static std::shared_ptr<SvxForbiddenCharactersTable> const & GetForbiddenCharsTable(); static void SetForbiddenCharsTable( const std::shared_ptr<SvxForbiddenCharactersTable>& xForbiddenChars ); /** sets a link that is called at the beginning of a drag operation at an edit view */ diff --git a/editeng/source/editeng/impedit2.cxx b/editeng/source/editeng/impedit2.cxx index 5d2b0d27e8a3..138e429a70f7 100644 --- a/editeng/source/editeng/impedit2.cxx +++ b/editeng/source/editeng/impedit2.cxx @@ -755,7 +755,7 @@ void ImpEditEngine::ParaAttribsChanged( ContentNode const * pNode ) // Cursor movements -EditSelection ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView ) +EditSelection const & ImpEditEngine::MoveCursor( const KeyEvent& rKeyEvent, EditView* pEditView ) { // Actually, only necessary for up/down, but whatever. CheckIdleFormatter(); @@ -4337,7 +4337,7 @@ void ImpEditEngine::IndentBlock( EditView* pEditView, bool bRight ) } } -std::shared_ptr<SvxForbiddenCharactersTable> ImpEditEngine::GetForbiddenCharsTable() +std::shared_ptr<SvxForbiddenCharactersTable> const & ImpEditEngine::GetForbiddenCharsTable() { return EditDLL::Get().GetGlobalData()->GetForbiddenCharsTable(); } diff --git a/editeng/source/outliner/outlin2.cxx b/editeng/source/outliner/outlin2.cxx index 737f47a74b18..b14c9e70d5ce 100644 --- a/editeng/source/outliner/outlin2.cxx +++ b/editeng/source/outliner/outlin2.cxx @@ -72,7 +72,7 @@ bool Outliner::IsUndoEnabled() const return pEditEngine->IsUndoEnabled(); } -MapMode Outliner::GetRefMapMode() const +MapMode const & Outliner::GetRefMapMode() const { return pEditEngine->GetRefMapMode(); } @@ -87,7 +87,7 @@ void Outliner::SetBackgroundColor( const Color& rColor ) pEditEngine->SetBackgroundColor( rColor ); } -Color Outliner::GetBackgroundColor() const +Color const & Outliner::GetBackgroundColor() const { return pEditEngine->GetBackgroundColor(); } @@ -113,7 +113,7 @@ void Outliner::SetModifyHdl( const Link<LinkParamNone*,void>& rLink ) pEditEngine->SetModifyHdl( rLink ); } -Link<LinkParamNone*,void> Outliner::GetModifyHdl() const +Link<LinkParamNone*,void> const & Outliner::GetModifyHdl() const { return pEditEngine->GetModifyHdl(); } @@ -133,7 +133,7 @@ void Outliner::SetStatusEventHdl( const Link<EditStatus&, void>& rLink ) pEditEngine->SetStatusEventHdl( rLink ); } -Link<EditStatus&, void> Outliner::GetStatusEventHdl() const +Link<EditStatus&, void> const & Outliner::GetStatusEventHdl() const { return pEditEngine->GetStatusEventHdl(); } @@ -163,7 +163,7 @@ void Outliner::SetWordDelimiters( const OUString& rDelimiters ) pEditEngine->SetWordDelimiters( rDelimiters ); } -OUString Outliner::GetWordDelimiters() const +OUString const & Outliner::GetWordDelimiters() const { return pEditEngine->GetWordDelimiters(); } @@ -393,7 +393,8 @@ void Outliner::SetSpeller( Reference< XSpellChecker1 > const &xSpeller ) { pEditEngine->SetSpeller( xSpeller ); } -Reference< XSpellChecker1 > Outliner::GetSpeller() + +Reference< XSpellChecker1 > const & Outliner::GetSpeller() { return pEditEngine->GetSpeller(); } diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx index 1e2740734e3b..5706eada0f87 100644 --- a/editeng/source/outliner/outlvw.cxx +++ b/editeng/source/outliner/outlvw.cxx @@ -571,7 +571,7 @@ void OutlinerView::AdjustHeight( long nDY ) pEditView->MoveParagraphs( nDY ); } -tools::Rectangle OutlinerView::GetVisArea() const +tools::Rectangle const & OutlinerView::GetVisArea() const { return pEditView->GetVisArea(); } @@ -1244,7 +1244,7 @@ void OutlinerView::SetOutputArea( const tools::Rectangle& rRect ) pEditView->SetOutputArea( rRect ); } -tools::Rectangle OutlinerView::GetOutputArea() const +tools::Rectangle const & OutlinerView::GetOutputArea() const { return pEditView->GetOutputArea(); } @@ -1403,7 +1403,7 @@ void OutlinerView::RegisterViewShell(OutlinerViewShell* pViewShell) pEditView->RegisterViewShell(pViewShell); } -Color OutlinerView::GetBackgroundColor() +Color const & OutlinerView::GetBackgroundColor() { return pEditView->GetBackgroundColor(); } diff --git a/include/editeng/CustomPropertyField.hxx b/include/editeng/CustomPropertyField.hxx index 30f082c5cfd4..2a06592b9c36 100644 --- a/include/editeng/CustomPropertyField.hxx +++ b/include/editeng/CustomPropertyField.hxx @@ -43,12 +43,12 @@ public: OUString GetFormatted(css::uno::Reference<css::document::XDocumentProperties> const & xDocumentProperties); - OUString GetName() const + OUString const & GetName() const { return msName; } - OUString GetCurrentPresentation() const + OUString const & GetCurrentPresentation() const { return msCurrentPresentation; } diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx index b426c4cdae0b..c47c281f22bb 100644 --- a/include/editeng/editeng.hxx +++ b/include/editeng/editeng.hxx @@ -212,13 +212,13 @@ public: OutputDevice* GetRefDevice() const; void SetRefMapMode( const MapMode& rMapMode ); - MapMode GetRefMapMode(); + MapMode const & GetRefMapMode(); void SetUpdateMode( bool bUpdate ); bool GetUpdateMode() const; void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor() const; + Color const & GetBackgroundColor() const; Color GetAutoColor() const; void EnableAutoColor( bool b ); void ForceAutoColor( bool b ); @@ -353,7 +353,7 @@ public: bool IsModified() const; void SetModifyHdl( const Link<LinkParamNone*,void>& rLink ); - Link<LinkParamNone*,void> GetModifyHdl() const; + Link<LinkParamNone*,void> const & GetModifyHdl() const; bool IsInSelectionMode() const; @@ -375,10 +375,10 @@ public: void Write( SvStream& rOutput, EETextFormat ); void SetStatusEventHdl( const Link<EditStatus&,void>& rLink ); - Link<EditStatus&,void> GetStatusEventHdl() const; + Link<EditStatus&,void> const & GetStatusEventHdl() const; void SetNotifyHdl( const Link<EENotify&,void>& rLink ); - Link<EENotify&,void> GetNotifyHdl() const; + Link<EENotify&,void> const & GetNotifyHdl() const; void SetRtfImportHdl( const Link<RtfImportInfo&,void>& rLink ); const Link<RtfImportInfo&,void>& GetRtfImportHdl() const; @@ -424,7 +424,7 @@ public: void SetSpeller( css::uno::Reference< css::linguistic2::XSpellChecker1 > const &xSpeller ); css::uno::Reference< - css::linguistic2::XSpellChecker1 > + css::linguistic2::XSpellChecker1 > const & GetSpeller(); void SetHyphenator( css::uno::Reference< css::linguistic2::XHyphenator > const & xHyph ); @@ -525,11 +525,11 @@ public: static bool HasValidData( const css::uno::Reference< css::datatransfer::XTransferable >& rTransferable ); /** sets a link that is called at the beginning of a drag operation at an edit view */ void SetBeginDropHdl( const Link<EditView*,void>& rLink ); - Link<EditView*,void> GetBeginDropHdl() const; + Link<EditView*,void> const & GetBeginDropHdl() const; /** sets a link that is called at the end of a drag operation at an edit view */ void SetEndDropHdl( const Link<EditView*,void>& rLink ); - Link<EditView*,void> GetEndDropHdl() const; + Link<EditView*,void> const & GetEndDropHdl() const; /// specifies if auto-correction should capitalize the first word or not (default is on) void SetFirstWordCapitalization( bool bCapitalize ); diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx index 6e566be7be7d..52f56d517de6 100644 --- a/include/editeng/editview.hxx +++ b/include/editeng/editview.hxx @@ -220,7 +220,7 @@ public: ErrCode Read( SvStream& rInput, EETextFormat eFormat, SvKeyValueIterator* pHTTPHeaderAttrs ); void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor() const; + Color const & GetBackgroundColor() const; /// Informs this edit view about which view shell contains it. void RegisterViewShell(OutlinerViewShell* pViewShell); diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx index 0ae54025809a..a892f4c16f72 100644 --- a/include/editeng/outliner.hxx +++ b/include/editeng/outliner.hxx @@ -242,9 +242,9 @@ public: bool IsReadOnly() const; void SetOutputArea( const tools::Rectangle& rRect ); - tools::Rectangle GetOutputArea() const; + tools::Rectangle const & GetOutputArea() const; - tools::Rectangle GetVisArea() const; + tools::Rectangle const & GetVisArea() const; void CreateSelectionList (std::vector<Paragraph*> &aSelList) ; @@ -269,7 +269,7 @@ public: void CollapseAll(); void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor(); + Color const & GetBackgroundColor(); /// Informs this edit view about which view shell contains it. void RegisterViewShell(OutlinerViewShell* pViewShell); @@ -717,10 +717,10 @@ public: const SfxItemSet& GetEmptyItemSet() const; void SetRefMapMode( const MapMode& ); - MapMode GetRefMapMode() const; + MapMode const & GetRefMapMode() const; void SetBackgroundColor( const Color& rColor ); - Color GetBackgroundColor() const; + Color const & GetBackgroundColor() const; void SetMaxDepth( sal_Int16 nDepth ); sal_Int16 GetMaxDepth() const { return nMaxDepth; } @@ -791,12 +791,12 @@ public: void SetPaintFirstLineHdl(const Link<PaintFirstLineInfo*,void>& rLink) { maPaintFirstLineHdl = rLink; } void SetModifyHdl( const Link<LinkParamNone*,void>& rLink ); - Link<LinkParamNone*,void> GetModifyHdl() const; + Link<LinkParamNone*,void> const & GetModifyHdl() const; void SetNotifyHdl( const Link<EENotify&,void>& rLink ); void SetStatusEventHdl( const Link<EditStatus&, void>& rLink ); - Link<EditStatus&, void> GetStatusEventHdl() const; + Link<EditStatus&, void> const & GetStatusEventHdl() const; void Draw( OutputDevice* pOutDev, const tools::Rectangle& rOutRect ); void Draw( OutputDevice* pOutDev, const Point& rStartPos ); @@ -827,7 +827,7 @@ public: EBulletInfo GetBulletInfo( sal_Int32 nPara ); void SetWordDelimiters( const OUString& rDelimiters ); - OUString GetWordDelimiters() const; + OUString const & GetWordDelimiters() const; OUString GetWord( sal_Int32 nPara, sal_Int32 nIndex ); void StripPortions(); @@ -907,7 +907,7 @@ public: virtual OUString CalcFieldValue( const SvxFieldItem& rField, sal_Int32 nPara, sal_Int32 nPos, Color*& rTxtColor, Color*& rFldColor ); void SetSpeller( css::uno::Reference< css::linguistic2::XSpellChecker1 > const &xSpeller ); - css::uno::Reference< css::linguistic2::XSpellChecker1 > + css::uno::Reference< css::linguistic2::XSpellChecker1 > const & GetSpeller(); void SetHyphenator( css::uno::Reference< css::linguistic2::XHyphenator > const & xHyph ); |