diff options
author | matteocam <matteo.campanelli@gmail.com> | 2015-08-19 21:24:41 +0200 |
---|---|---|
committer | matteocam <matteo.campanelli@gmail.com> | 2015-08-19 21:24:41 +0200 |
commit | 1f163d68a3f015fbe485012534b7c36f1784654a (patch) | |
tree | e0a42866ce49c1184e0611e1ab0fb109f48efa97 | |
parent | babddd2eb9ff9169d3432d333db2574563e82e6e (diff) |
Minor code cleaning
Change-Id: I948867ff87a2f331a2765699351e02db53e41539
-rw-r--r-- | include/editeng/overflowingtxt.hxx | 8 | ||||
-rw-r--r-- | include/svx/svdedxv.hxx | 4 | ||||
-rw-r--r-- | svx/source/svdraw/svdedxv.cxx | 14 |
3 files changed, 10 insertions, 16 deletions
diff --git a/include/editeng/overflowingtxt.hxx b/include/editeng/overflowingtxt.hxx index 1e5c6e5f7eb7..810c7be3ad27 100644 --- a/include/editeng/overflowingtxt.hxx +++ b/include/editeng/overflowingtxt.hxx @@ -72,20 +72,12 @@ public: OutlinerParaObject *DeeplyMergeParaObject(Outliner *, OutlinerParaObject *); ESelection GetInsertionPointSel() const; - //OUString GetHeadingLines() const; - //OUString GetEndingLines() const; - //bool HasOtherParas() const { return !(mTailTxt == "" && mpMidParas == NULL); } - private: friend class Outliner; - // Constructor - //OverflowingText(EditTextObject *pTObj); OverflowingText(com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable> xOverflowingContent); - OutlinerParaObject *impMakeOverflowingParaObject(Outliner *pOutliner); - //const EditTextObject *mpContentTextObj; com::sun::star::uno::Reference< com::sun::star::datatransfer::XTransferable> mxOverflowingContent; }; diff --git a/include/svx/svdedxv.hxx b/include/svx/svdedxv.hxx index 194d65716c65..b7c2d26f2085 100644 --- a/include/svx/svdedxv.hxx +++ b/include/svx/svdedxv.hxx @@ -127,7 +127,9 @@ protected: // handler for AutoGrowing text with active Outliner DECL_LINK(ImpOutlinerStatusEventHdl,EditStatus*); - DECL_LINK(ImpChainingEventHdl,void*); + + // Chaining + void ImpChainingEventHdl(); DECL_LINK(ImpAfterCutOrPasteChainingEventHdl,void*); DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,void); diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx index 1430e80faf57..b13b86095518 100644 --- a/svx/source/svdraw/svdedxv.cxx +++ b/svx/source/svdraw/svdedxv.cxx @@ -491,7 +491,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl,EditStatus*,pEditStat) return 0; } -IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl) +void SdrObjEditView::ImpChainingEventHdl() { if(pTextEditOutliner ) { @@ -503,11 +503,11 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl) // XXX: IsChainable and GetNilChainingEvent are a bit mixed up atm if (!pTextObj->IsChainable()) { - return 0; + return; } // This is true during an underflow-caused overflow (with pEdtOutl->SetText()) if (pTextChain->GetNilChainingEvent(pTextObj)) { - return 0; + return; } // We prevent to trigger further handling of overflow/underflow for pTextObj @@ -549,7 +549,7 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpChainingEventHdl) fprintf(stderr, "[OnChaining] No Edit Outliner View\n"); } } - return 0; + } IMPL_LINK_NOARG(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl) @@ -557,7 +557,7 @@ IMPL_LINK_NOARG(SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl) SdrTextObj* pTextObj = dynamic_cast< SdrTextObj * >( GetTextEditObject()); if (!pTextObj) return 0; - ImpChainingEventHdl(NULL); + ImpChainingEventHdl(); TextChainCursorManager *pCursorManager = new TextChainCursorManager(this, pTextObj); ImpMoveCursorAfterChainingEvent(pCursorManager); return 0; @@ -829,7 +829,7 @@ bool SdrObjEditView::SdrBeginTextEdit( pTextEditOutlinerView->SetEndCutPasteLinkHdl(LINK(this,SdrObjEditView,ImpAfterCutOrPasteChainingEventHdl) ); /* We should call: * - ImpChainingEventHdl(NULL); + ImpChainingEventHdl(); TextChainCursorManager *pCursorManager = new TextChainCursorManager(this, pTextObj); ImpMoveCursorAfterChainingEvent(pCursorManager); */ @@ -1346,7 +1346,7 @@ bool SdrObjEditView::KeyInput(const KeyEvent& rKEvt, vcl::Window* pWin) } /* Start chaining processing */ - ImpChainingEventHdl(NULL); + ImpChainingEventHdl(); ImpMoveCursorAfterChainingEvent(pCursorManager); /* End chaining processing */ |