Skip to content

C
core
Kaydet (Commit) 2970ec84 authored tarafından Noel Grandin's avatar Noel Grandin
Dosyalara gözat
Seçenekler

editeng: make Link<> usage typed 

Change-Id: Iec36c7e4f4fbc2ee2ee25d4d0c8488340ba7d8c4
Reviewed-on: https://gerrit.libreoffice.org/16968Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarNoel Grandin <noelgrandin@gmail.com>
üst 26ac3ee8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 189 additions and 222 deletions
editeng/source/outliner/outliner.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -807,7 +807,6 @@ bool Outliner::Expand( Paragraph* pPara )
pHdlParagraph = pPara;
bIsExpanding = true;
pParaList->Expand( pPara );
ExpandHdl();
InvalidateBullet(pParaList->GetAbsPos(pPara));
if( bUndo )
{
......@@ -839,7 +838,6 @@ bool Outliner::Collapse( Paragraph* pPara )
pHdlParagraph = pPara;
bIsExpanding = false;
pParaList->Collapse( pPara );
ExpandHdl();
InvalidateBullet(pParaList->GetAbsPos(pPara));
if( bUndo )
{
......@@ -1663,11 +1661,6 @@ Rectangle Outliner::ImpCalcBulletArea( sal_Int32 nPara, bool bAdjust, bool bRetu
return aBulletArea;
}
void Outliner::ExpandHdl()
{
aExpandHdl.Call( this );
}
EBulletInfo Outliner::GetBulletInfo( sal_Int32 nPara )
{
EBulletInfo aInfo;
......@@ -1803,7 +1796,7 @@ IMPL_LINK_NOARG(Outliner, BeginMovingParagraphsHdl)
{
if( !IsInUndo() )
GetBeginMovingHdl().Call( this );
aBeginMovingHdl.Call( this );
return 0;
}
......@@ -2056,13 +2049,13 @@ void Outliner::SetEndDropHdl( const Link<>& rLink )
}
/** sets a link that is called before a drop or paste operation. */
void Outliner::SetBeginPasteOrDropHdl( const Link<>& rLink )
void Outliner::SetBeginPasteOrDropHdl( const Link<PasteOrDropInfos*,void>& rLink )
{
maBeginPasteOrDropHdl = rLink;
}
/** sets a link that is called after a drop or paste operation. */
void Outliner::SetEndPasteOrDropHdl( const Link<>& rLink )
void Outliner::SetEndPasteOrDropHdl( const Link<PasteOrDropInfos*,void>& rLink )
{
maEndPasteOrDropHdl = rLink;
}
......
filter/source/svg/svgexport.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -2128,7 +2128,7 @@ OUString SVGFilter::implGetInterfaceName( const Reference< XInterface >& rxIf )
IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
IMPL_LINK_TYPED( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo, void )
{
bool bFieldProcessed = false;
if( pInfo && mbPresentation )
......@@ -2146,7 +2146,7 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
if( !mCreateOjectsCurrentMasterPage.is() )
{
OSL_FAIL( "error: !mCreateOjectsCurrentMasterPage.is()" );
return 0;
return;
}
bool bHasCharSetMap = !( mTextFieldCharSets.find( mCreateOjectsCurrentMasterPage ) == mTextFieldCharSets.end() );
......@@ -2365,7 +2365,8 @@ IMPL_LINK( SVGFilter, CalcFieldHdl, EditFieldInfo*, pInfo )
}
}
return ( bFieldProcessed ? 0 : maOldFieldHdl.Call( pInfo ) );
if (!bFieldProcessed)
maOldFieldHdl.Call( pInfo );
}
......
filter/source/svg/svgfilter.hxx
Dosyayı görüntüle @ 2970ec84
......@@ -244,8 +244,8 @@ private:
XDrawPageSequence mSelectedPages;
XDrawPageSequence mMasterPageTargets;
Link<> maOldFieldHdl;
Link<> maNewFieldHdl;
Link<EditFieldInfo*,void> maOldFieldHdl;
Link<EditFieldInfo*,void> maNewFieldHdl;
bool implImport( const Sequence< PropertyValue >& rDescriptor ) throw (RuntimeException, std::exception);
......@@ -290,7 +290,7 @@ private:
static Any implSafeGetPagePropSet( const OUString & sPropertyName,
const Reference< XPropertySet > & rxPropSet,
const Reference< XPropertySetInfo > & rxPropSetInfo );
DECL_LINK( CalcFieldHdl, EditFieldInfo* );
DECL_LINK_TYPED( CalcFieldHdl, EditFieldInfo*, void );
static bool isStreamGZip(css::uno::Reference<css::io::XInputStream> xInput);
static bool isStreamSvg(css::uno::Reference<css::io::XInputStream> xInput);
......
include/editeng/outliner.hxx
Dosyayı görüntüle @ 2970ec84
......@@ -590,21 +590,19 @@ class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
Paragraph* pHdlParagraph;
sal_Int32 mnFirstSelPage;
Link<DrawPortionInfo*,void> aDrawPortionHdl;
Link<> aDrawBulletHdl;
Link<> aExpandHdl;
Link<> aParaInsertedHdl;
Link<> aParaRemovingHdl;
Link<> aDepthChangedHdl;
Link<> aWidthArrReqHdl;
Link<> aBeginMovingHdl;
Link<> aEndMovingHdl;
Link<> aIndentingPagesHdl;
Link<> aRemovingPagesHdl;
Link<> aFieldClickedHdl;
Link<> aCalcFieldValueHdl;
Link<> maPaintFirstLineHdl;
Link<> maBeginPasteOrDropHdl;
Link<> maEndPasteOrDropHdl;
Link<DrawBulletInfo*,void> aDrawBulletHdl;
Link<Outliner*,void> aParaInsertedHdl;
Link<Outliner*,void> aParaRemovingHdl;
Link<Outliner*,void> aDepthChangedHdl;
Link<Outliner*,void> aBeginMovingHdl;
Link<Outliner*,void> aEndMovingHdl;
Link<OutlinerView*,long> aIndentingPagesHdl;
Link<OutlinerView*,bool> aRemovingPagesHdl;
Link<EditFieldInfo*,void> aFieldClickedHdl;
Link<EditFieldInfo*,void> aCalcFieldValueHdl;
Link<PaintFirstLineInfo*,void> maPaintFirstLineHdl;
Link<PasteOrDropInfos*,void> maBeginPasteOrDropHdl;
Link<PasteOrDropInfos*,void> maEndPasteOrDropHdl;
sal_Int32 nDepthChangedHdlPrevDepth;
ParaFlag mnDepthChangeHdlPrevFlags;
......@@ -760,50 +758,46 @@ public:
Paragraph* GetHdlParagraph() const { return pHdlParagraph; }
bool IsExpanding() const { return bIsExpanding; }
void ExpandHdl();
void SetExpandHdl( const Link<>& rLink ) { aExpandHdl = rLink; }
Link<> GetExpandHdl() const { return aExpandHdl; }
void ParagraphInsertedHdl();
void SetParaInsertedHdl(const Link<>& rLink){aParaInsertedHdl=rLink;}
Link<> GetParaInsertedHdl() const { return aParaInsertedHdl; }
void SetParaInsertedHdl(const Link<Outliner*,void>& rLink){aParaInsertedHdl=rLink;}
Link<Outliner*,void> GetParaInsertedHdl() const { return aParaInsertedHdl; }
void ParagraphRemovingHdl();
void SetParaRemovingHdl(const Link<>& rLink){aParaRemovingHdl=rLink;}
Link<> GetParaRemovingHdl() const { return aParaRemovingHdl; }
void SetParaRemovingHdl(const Link<Outliner*,void>& rLink){aParaRemovingHdl=rLink;}
Link<Outliner*,void> GetParaRemovingHdl() const { return aParaRemovingHdl; }
void DepthChangedHdl();
void SetDepthChangedHdl(const Link<>& rLink){aDepthChangedHdl=rLink;}
Link<> GetDepthChangedHdl() const { return aDepthChangedHdl; }
void SetDepthChangedHdl(const Link<Outliner*,void>& rLink){aDepthChangedHdl=rLink;}
Link<Outliner*,void> GetDepthChangedHdl() const { return aDepthChangedHdl; }
sal_Int16 GetPrevDepth() const { return static_cast<sal_Int16>(nDepthChangedHdlPrevDepth); }
ParaFlag GetPrevFlags() const { return mnDepthChangeHdlPrevFlags; }
bool RemovingPagesHdl( OutlinerView* );
void SetRemovingPagesHdl(const Link<>& rLink){aRemovingPagesHdl=rLink;}
Link<> GetRemovingPagesHdl() const { return aRemovingPagesHdl; }
void SetRemovingPagesHdl(const Link<OutlinerView*,bool>& rLink){aRemovingPagesHdl=rLink;}
Link<OutlinerView*,bool> GetRemovingPagesHdl() const { return aRemovingPagesHdl; }
long IndentingPagesHdl( OutlinerView* );
void SetIndentingPagesHdl(const Link<>& rLink){aIndentingPagesHdl=rLink;}
Link<> GetIndentingPagesHdl() const { return aIndentingPagesHdl; }
void SetIndentingPagesHdl(const Link<OutlinerView*,long>& rLink){aIndentingPagesHdl=rLink;}
Link<OutlinerView*,long> GetIndentingPagesHdl() const { return aIndentingPagesHdl; }
// valid only in the two upper handlers
sal_Int32 GetSelPageCount() const { return nDepthChangedHdlPrevDepth; }
// valid only in the two upper handlers
sal_Int32 GetFirstSelPage() const { return mnFirstSelPage; }
void SetCalcFieldValueHdl(const Link<>& rLink ) { aCalcFieldValueHdl= rLink; }
Link<> GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; }
void SetCalcFieldValueHdl(const Link<EditFieldInfo*,void>& rLink ) { aCalcFieldValueHdl= rLink; }
Link<EditFieldInfo*,void> GetCalcFieldValueHdl() const { return aCalcFieldValueHdl; }
void SetFieldClickedHdl(const Link<>& rLink ) { aFieldClickedHdl= rLink; }
Link<> GetFieldClickedHdl() const { return aFieldClickedHdl; }
void SetFieldClickedHdl(const Link<EditFieldInfo*,void>& rLink ) { aFieldClickedHdl= rLink; }
Link<EditFieldInfo*,void> GetFieldClickedHdl() const { return aFieldClickedHdl; }
void SetDrawPortionHdl(const Link<DrawPortionInfo*,void>& rLink){aDrawPortionHdl=rLink;}
Link<DrawPortionInfo*,void> GetDrawPortionHdl() const { return aDrawPortionHdl; }
void SetDrawBulletHdl(const Link<>& rLink){aDrawBulletHdl=rLink;}
Link<> GetDrawBulletHdl() const { return aDrawBulletHdl; }
void SetDrawBulletHdl(const Link<DrawBulletInfo*,void>& rLink){aDrawBulletHdl=rLink;}
Link<DrawBulletInfo*,void> GetDrawBulletHdl() const { return aDrawBulletHdl; }
void SetPaintFirstLineHdl(const Link<>& rLink) { maPaintFirstLineHdl = rLink; }
Link<> GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; }
void SetPaintFirstLineHdl(const Link<PaintFirstLineInfo*,void>& rLink) { maPaintFirstLineHdl = rLink; }
Link<PaintFirstLineInfo*,void> GetPaintFirstLineHdl() const { return maPaintFirstLineHdl; }
void SetModifyHdl( const Link<>& rLink );
Link<> GetModifyHdl() const;
......@@ -891,18 +885,14 @@ public:
void SetParaFlag( Paragraph* pPara, ParaFlag nFlag );
static bool HasParaFlag( const Paragraph* pPara, ParaFlag nFlag );
// Returns an array containing the widths of the Bullet Indentations
// Last value must be -1. Is deleted by the outliner.
Link<> GetWidthArrReqHdl() const{ return aWidthArrReqHdl; }
void SetWidthArrReqHdl(const Link<>& rLink){aWidthArrReqHdl=rLink; }
void SetControlWord( EEControlBits nWord );
EEControlBits GetControlWord() const;
Link<> GetBeginMovingHdl() const { return aBeginMovingHdl; }
void SetBeginMovingHdl(const Link<>& rLink) {aBeginMovingHdl=rLink;}
Link<> GetEndMovingHdl() const {return aEndMovingHdl;}
void SetEndMovingHdl( const Link<>& rLink){aEndMovingHdl=rLink;}
Link<Outliner*,void> GetBeginMovingHdl() const { return aBeginMovingHdl; }
void SetBeginMovingHdl(const Link<Outliner*,void>& rLink) {aBeginMovingHdl=rLink;}
Link<Outliner*,void> GetEndMovingHdl() const {return aEndMovingHdl;}
void SetEndMovingHdl( const Link<Outliner*,void>& rLink){aEndMovingHdl=rLink;}
sal_uLong GetLineCount( sal_Int32 nParagraph ) const;
sal_Int32 GetLineLen( sal_Int32 nParagraph, sal_Int32 nLine ) const;
......@@ -995,12 +985,12 @@ public:
void SetEndDropHdl( const Link<>& rLink );
/** sets a link that is called before a drop or paste operation. */
void SetBeginPasteOrDropHdl( const Link<>& rLink );
Link<> GetBeginPasteOrDropHdl() const { return maBeginPasteOrDropHdl; }
void SetBeginPasteOrDropHdl( const Link<PasteOrDropInfos*,void>& rLink );
Link<PasteOrDropInfos*,void> GetBeginPasteOrDropHdl() const { return maBeginPasteOrDropHdl; }
/** sets a link that is called after a drop or paste operation. */
void SetEndPasteOrDropHdl( const Link<>& rLink );
Link<> GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; }
void SetEndPasteOrDropHdl( const Link<PasteOrDropInfos*,void>& rLink );
Link<PasteOrDropInfos*,void> GetEndPasteOrDropHdl() const { return maEndPasteOrDropHdl; }
sal_Int16 GetNumberingStartValue( sal_Int32 nPara );
void SetNumberingStartValue( sal_Int32 nPara, sal_Int16 nNumberingStartValue );
......
include/svx/svdedxv.hxx
Dosyayı görüntüle @ 2970ec84
......@@ -74,7 +74,7 @@ protected:
Rectangle aTextEditArea;
Rectangle aMinTextEditArea;
Link<> aOldCalcFieldValueLink; // for call the old handler
Link<EditFieldInfo*,void> aOldCalcFieldValueLink; // for call the old handler
Point aMacroDownPos;
sal_uInt16 nMacroTol;
......@@ -116,7 +116,7 @@ protected:
// handler for AutoGrowing text with active Outliner
DECL_LINK(ImpOutlinerStatusEventHdl,EditStatus*);
DECL_LINK(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*);
DECL_LINK_TYPED(ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,void);
// link for EndTextEditHdl
DECL_LINK(EndTextEditHdl, SdrUndoManager*);
......@@ -124,8 +124,8 @@ protected:
void ImpMacroUp(const Point& rUpPos);
void ImpMacroDown(const Point& rDownPos);
DECL_LINK( BeginPasteOrDropHdl, PasteOrDropInfos* );
DECL_LINK( EndPasteOrDropHdl, PasteOrDropInfos* );
DECL_LINK_TYPED( BeginPasteOrDropHdl, PasteOrDropInfos*, void );
DECL_LINK_TYPED( EndPasteOrDropHdl, PasteOrDropInfos*, void );
protected:
// #i71538# make constructors of SdrView sub-components protected to avoid incomplete incarnations which may get casted to SdrView
......
sc/inc/scmod.hxx
Dosyayı görüntüle @ 2970ec84
......@@ -131,7 +131,7 @@ public:
DECL_LINK_TYPED( IdleHandler, Timer*, void ); // Timer instead of idle
DECL_LINK_TYPED( SpellTimerHdl, Idle*, void );
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void );
void Execute( SfxRequest& rReq );
void GetState( SfxItemSet& rSet );
......
sc/source/ui/app/scmod.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -2140,48 +2140,46 @@ VclPtr<SfxTabPage> ScModule::CreateTabPage( sal_uInt16 nId, vcl::Window* pParent
return pRet;
}
IMPL_LINK( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo )
IMPL_LINK_TYPED( ScModule, CalcFieldValueHdl, EditFieldInfo*, pInfo, void )
{
//TODO: Merge with ScFieldEditEngine!
if (pInfo)
if (!pInfo)
return;
const SvxFieldItem& rField = pInfo->GetField();
const SvxFieldData* pField = rField.GetField();
if (pField && pField->ISA(SvxURLField))
{
const SvxFieldItem& rField = pInfo->GetField();
const SvxFieldData* pField = rField.GetField();
// URLField
const SvxURLField* pURLField = static_cast<const SvxURLField*>(pField);
OUString aURL = pURLField->GetURL();
if (pField && pField->ISA(SvxURLField))
switch ( pURLField->GetFormat() )
{
// URLField
const SvxURLField* pURLField = static_cast<const SvxURLField*>(pField);
OUString aURL = pURLField->GetURL();
switch ( pURLField->GetFormat() )
case SVXURLFORMAT_APPDEFAULT: //TODO: Settable in the App?
case SVXURLFORMAT_REPR:
{
case SVXURLFORMAT_APPDEFAULT: //TODO: Settable in the App?
case SVXURLFORMAT_REPR:
{
pInfo->SetRepresentation( pURLField->GetRepresentation() );
}
break;
case SVXURLFORMAT_URL:
{
pInfo->SetRepresentation( aURL );
}
break;
pInfo->SetRepresentation( pURLField->GetRepresentation() );
}
break;
svtools::ColorConfigEntry eEntry =
INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
pInfo->SetTextColor( GetColorConfig().GetColorValue(eEntry).nColor );
}
else
{
OSL_FAIL("Unknown Field");
pInfo->SetRepresentation(OUString('?'));
case SVXURLFORMAT_URL:
{
pInfo->SetRepresentation( aURL );
}
break;
}
}
return 0;
svtools::ColorConfigEntry eEntry =
INetURLHistory::GetOrCreate()->QueryUrl( aURL ) ? svtools::LINKSVISITED : svtools::LINKS;
pInfo->SetTextColor( GetColorConfig().GetColorValue(eEntry).nColor );
}
else
{
OSL_FAIL("Unknown Field");
pInfo->SetRepresentation(OUString('?'));
}
}
bool ScModule::RegisterRefWindow( sal_uInt16 nSlotId, vcl::Window *pWnd )
......
sd/inc/sdmod.hxx
Dosyayı görüntüle @ 2970ec84
......@@ -80,7 +80,7 @@ class SdModule : public SfxModule, public SfxListener
public:
TYPEINFO_OVERRIDE();
SFX_DECL_INTERFACE(SD_IF_SDAPP)
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void );
private:
/// SfxInterface initializer.
......
sd/source/ui/app/sdmod2.cxx
Dosyayı görüntüle @ 2970ec84
This diff is collapsed.
sd/source/ui/func/fuinsfil.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -694,19 +694,19 @@ bool FuInsertFile::InsSDDinOlMode(SfxMedium* pMedium)
::Outliner* pOutliner = pOlView->GetViewByWindow(mpWindow)->GetOutliner();
// cut notification links temporarily
Link<> aOldParagraphInsertedHdl = pOutliner->GetParaInsertedHdl();
pOutliner->SetParaInsertedHdl( Link<>(NULL, NULL));
Link<> aOldParagraphRemovingHdl = pOutliner->GetParaRemovingHdl();
pOutliner->SetParaRemovingHdl( Link<>(NULL, NULL));
Link<> aOldDepthChangedHdl = pOutliner->GetDepthChangedHdl();
pOutliner->SetDepthChangedHdl( Link<>(NULL, NULL));
Link<> aOldBeginMovingHdl = pOutliner->GetBeginMovingHdl();
pOutliner->SetBeginMovingHdl( Link<>(NULL, NULL));
Link<> aOldEndMovingHdl = pOutliner->GetEndMovingHdl();
pOutliner->SetEndMovingHdl( Link<>(NULL, NULL));
Link<::Outliner*,void> aOldParagraphInsertedHdl = pOutliner->GetParaInsertedHdl();
pOutliner->SetParaInsertedHdl( Link<::Outliner*,void>());
Link<::Outliner*,void> aOldParagraphRemovingHdl = pOutliner->GetParaRemovingHdl();
pOutliner->SetParaRemovingHdl( Link<::Outliner*,void>());
Link<::Outliner*,void> aOldDepthChangedHdl = pOutliner->GetDepthChangedHdl();
pOutliner->SetDepthChangedHdl( Link<::Outliner*,void>());
Link<::Outliner*,void> aOldBeginMovingHdl = pOutliner->GetBeginMovingHdl();
pOutliner->SetBeginMovingHdl( Link<::Outliner*,void>());
Link<::Outliner*,void> aOldEndMovingHdl = pOutliner->GetEndMovingHdl();
pOutliner->SetEndMovingHdl( Link<::Outliner*,void>());
Link<> aOldStatusEventHdl = pOutliner->GetStatusEventHdl();
pOutliner->SetStatusEventHdl(Link<>(NULL, NULL));
pOutliner->SetStatusEventHdl(Link<>());
pOutliner->Clear();
pOlView->FillOutliner();
......
sd/source/ui/inc/OutlineView.hxx
Dosyayı görüntüle @ 2970ec84
......@@ -95,17 +95,17 @@ public:
void Paint (const Rectangle& rRect, ::sd::Window* pWin);
// Callbacks fuer LINKs
DECL_LINK( ParagraphInsertedHdl, Outliner * );
DECL_LINK( ParagraphRemovingHdl, Outliner * );
DECL_LINK( DepthChangedHdl, Outliner * );
DECL_LINK_TYPED( ParagraphInsertedHdl, Outliner *, void );
DECL_LINK_TYPED( ParagraphRemovingHdl, Outliner *, void );
DECL_LINK_TYPED( DepthChangedHdl, Outliner *, void );
DECL_LINK( StatusEventHdl, void * );
DECL_LINK( BeginMovingHdl, Outliner * );
DECL_LINK( EndMovingHdl, Outliner * );
DECL_LINK(RemovingPagesHdl, void *);
DECL_LINK( IndentingPagesHdl, OutlinerView * );
DECL_LINK_TYPED( BeginMovingHdl, Outliner *, void );
DECL_LINK_TYPED( EndMovingHdl, Outliner *, void );
DECL_LINK_TYPED( RemovingPagesHdl, OutlinerView *, bool );
DECL_LINK_TYPED( IndentingPagesHdl, OutlinerView *, long );
DECL_LINK( BeginDropHdl, void * );
DECL_LINK( EndDropHdl, void * );
DECL_LINK( PaintingFirstLineHdl, PaintFirstLineInfo* );
DECL_LINK_TYPED( PaintingFirstLineHdl, PaintFirstLineInfo*, void );
sal_uLong GetPaperWidth() { return mnPaperWidth;}
......
sd/source/ui/inc/View.hxx
Dosyayı görüntüle @ 2970ec84
......@@ -258,8 +258,8 @@ public:
SdrObject* GetSelectedSingleObject(SdPage* pPage);
protected:
DECL_LINK( OnParagraphInsertedHdl, ::Outliner * );
DECL_LINK( OnParagraphRemovingHdl, ::Outliner * );
DECL_LINK_TYPED( OnParagraphInsertedHdl, ::Outliner *, void );
DECL_LINK_TYPED( OnParagraphRemovingHdl, ::Outliner *, void );
virtual void OnBeginPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE;
virtual void OnEndPasteOrDrop( PasteOrDropInfos* pInfos ) SAL_OVERRIDE;
......
sd/source/ui/view/outlview.cxx
Dosyayı görüntüle @ 2970ec84
This diff is collapsed.
sd/source/ui/view/sdview.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -1075,7 +1075,7 @@ void View::onAccessibilityOptionsChanged()
}
}
IMPL_LINK( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner )
IMPL_LINK_TYPED( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner, void )
{
Paragraph* pPara = pOutliner->GetHdlParagraph();
SdrObject* pObj = GetTextEditObject();
......@@ -1086,13 +1086,12 @@ IMPL_LINK( View, OnParagraphInsertedHdl, ::Outliner *, pOutliner )
if( pPage )
pPage->onParagraphInserted( pOutliner, pPara, pObj );
}
return 0;
}
/**
* Handler for the deletion of the pages (paragraphs).
*/
IMPL_LINK( View, OnParagraphRemovingHdl, ::Outliner *, pOutliner )
IMPL_LINK_TYPED( View, OnParagraphRemovingHdl, ::Outliner *, pOutliner, void )
{
Paragraph* pPara = pOutliner->GetHdlParagraph();
SdrObject* pObj = GetTextEditObject();
......@@ -1103,7 +1102,6 @@ IMPL_LINK( View, OnParagraphRemovingHdl, ::Outliner *, pOutliner )
if( pPage )
pPage->onParagraphRemoving( pOutliner, pPara, pObj );
}
return 0;
}
bool View::isRecordingUndo() const
......
svx/source/svdraw/svdedxv.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -489,7 +489,7 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerStatusEventHdl,EditStatus*,pEditStat)
return 0;
}
IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
IMPL_LINK_TYPED(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI,void)
{
bool bOk=false;
OUString& rStr=pFI->GetRepresentation();
......@@ -513,15 +513,14 @@ IMPL_LINK(SdrObjEditView,ImpOutlinerCalcFieldValueHdl,EditFieldInfo*,pFI)
}
}
Outliner& rDrawOutl=pMod->GetDrawOutliner(pTextObj);
Link<> aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
Link<EditFieldInfo*,void> aDrawOutlLink=rDrawOutl.GetCalcFieldValueHdl();
if (!bOk && aDrawOutlLink.IsSet()) {
aDrawOutlLink.Call(pFI);
bOk = !rStr.isEmpty();
}
if (!bOk && aOldCalcFieldValueLink.IsSet()) {
return aOldCalcFieldValueLink.Call(pFI);
aOldCalcFieldValueLink.Call(pFI);
}
return 0;
}
IMPL_LINK(SdrObjEditView, EndTextEditHdl, SdrUndoManager*, /*pUndoManager*/)
......@@ -633,7 +632,7 @@ bool SdrObjEditView::SdrBeginTextEdit(
// FieldHdl has to be set by SdrBeginTextEdit, because this call an UpdateFields
pTextEditOutliner->SetCalcFieldValueHdl(LINK(this,SdrObjEditView,ImpOutlinerCalcFieldValueHdl));
pTextEditOutliner->SetBeginPasteOrDropHdl(LINK(this,SdrObjEditView,BeginPasteOrDropHdl));
pTextEditOutliner->SetEndPasteOrDropHdl(LINK(this,SdrObjEditView, EndPasteOrDropHdl));
pTextEditOutliner->SetEndPasteOrDropHdl(LINK(this,SdrObjEditView,EndPasteOrDropHdl));
// It is just necessary to make the visualized page known. Set it.
pTextEditOutliner->setVisualizedPage(pPV->GetPage());
......@@ -782,8 +781,8 @@ bool SdrObjEditView::SdrBeginTextEdit(
else
{
pTextEditOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
pTextEditOutliner->SetBeginPasteOrDropHdl(Link<>());
pTextEditOutliner->SetEndPasteOrDropHdl(Link<>());
pTextEditOutliner->SetBeginPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
pTextEditOutliner->SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
}
}
if (pTextEditOutliner != NULL)
......@@ -915,8 +914,8 @@ SdrEndTextEditKind SdrObjEditView::SdrEndTextEdit(bool bDontDeleteReally)
// Set old CalcFieldValue-Handler again, this
// has to happen before Obj::EndTextEdit(), as this does UpdateFields().
pTEOutliner->SetCalcFieldValueHdl(aOldCalcFieldValueLink);
pTEOutliner->SetBeginPasteOrDropHdl(Link<>());
pTEOutliner->SetEndPasteOrDropHdl(Link<>());
pTEOutliner->SetBeginPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
pTEOutliner->SetEndPasteOrDropHdl(Link<PasteOrDropInfos*,void>());
const bool bUndo = IsUndoEnabled();
if( bUndo )
......@@ -1873,16 +1872,14 @@ void SdrObjEditView::MarkListHasChanged()
}
}
IMPL_LINK( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos )
IMPL_LINK_TYPED( SdrObjEditView, EndPasteOrDropHdl, PasteOrDropInfos*, pInfos, void )
{
OnEndPasteOrDrop( pInfos );
return 0;
}
IMPL_LINK( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos )
IMPL_LINK_TYPED( SdrObjEditView, BeginPasteOrDropHdl, PasteOrDropInfos*, pInfos, void )
{
OnBeginPasteOrDrop( pInfos );
return 0;
}
void SdrObjEditView::OnBeginPasteOrDrop( PasteOrDropInfos* )
......
svx/source/svdraw/svdotextdecomposition.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -93,9 +93,9 @@ namespace
DECL_LINK_TYPED(decomposeBlockTextPrimitive, DrawPortionInfo*, void);
DECL_LINK_TYPED(decomposeStretchTextPrimitive, DrawPortionInfo*, void);
DECL_LINK(decomposeContourBulletPrimitive, DrawBulletInfo* );
DECL_LINK(decomposeBlockBulletPrimitive, DrawBulletInfo* );
DECL_LINK(decomposeStretchBulletPrimitive, DrawBulletInfo* );
DECL_LINK_TYPED(decomposeContourBulletPrimitive, DrawBulletInfo*, void);
DECL_LINK_TYPED(decomposeBlockBulletPrimitive, DrawBulletInfo*, void);
DECL_LINK_TYPED(decomposeStretchBulletPrimitive, DrawBulletInfo*, void);
static bool impIsUnderlineAbove(const vcl::Font& rFont);
void impCreateTextPortionPrimitive(const DrawPortionInfo& rInfo);
......@@ -127,7 +127,7 @@ namespace
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeContourBulletPrimitive));
mrOutliner.StripPortions();
mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
mrOutliner.SetDrawBulletHdl(Link<>());
mrOutliner.SetDrawBulletHdl(Link<DrawBulletInfo*,void>());
}
void decomposeBlockTextPrimitive(
......@@ -142,7 +142,7 @@ namespace
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeBlockBulletPrimitive));
mrOutliner.StripPortions();
mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
mrOutliner.SetDrawBulletHdl(Link<>());
mrOutliner.SetDrawBulletHdl(Link<DrawBulletInfo*,void>());
}
void decomposeStretchTextPrimitive(const basegfx::B2DHomMatrix& rNewTransformA, const basegfx::B2DHomMatrix& rNewTransformB)
......@@ -153,7 +153,7 @@ namespace
mrOutliner.SetDrawBulletHdl(LINK(this, impTextBreakupHandler, decomposeStretchBulletPrimitive));
mrOutliner.StripPortions();
mrOutliner.SetDrawPortionHdl(Link<DrawPortionInfo*,void>());
mrOutliner.SetDrawBulletHdl(Link<>());
mrOutliner.SetDrawBulletHdl(Link<DrawBulletInfo*,void>());
}
drawinglayer::primitive2d::Primitive2DSequence getPrimitive2DSequence();
......@@ -620,34 +620,28 @@ namespace
}
}
IMPL_LINK(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo)
IMPL_LINK_TYPED(impTextBreakupHandler, decomposeContourBulletPrimitive, DrawBulletInfo*, pInfo, void)
{
if(pInfo)
{
impHandleDrawBulletInfo(*pInfo);
}
return 0;
}
IMPL_LINK(impTextBreakupHandler, decomposeBlockBulletPrimitive, DrawBulletInfo*, pInfo)
IMPL_LINK_TYPED(impTextBreakupHandler, decomposeBlockBulletPrimitive, DrawBulletInfo*, pInfo, void)
{
if(pInfo)
{
impHandleDrawBulletInfo(*pInfo);
}
return 0;
}
IMPL_LINK(impTextBreakupHandler, decomposeStretchBulletPrimitive, DrawBulletInfo*, pInfo)
IMPL_LINK_TYPED(impTextBreakupHandler, decomposeStretchBulletPrimitive, DrawBulletInfo*, pInfo, void)
{
if(pInfo)
{
impHandleDrawBulletInfo(*pInfo);
}
return 0;
}
drawinglayer::primitive2d::Primitive2DSequence impTextBreakupHandler::getPrimitive2DSequence()
......
svx/source/unodraw/UnoGraphicExporter.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -162,7 +162,7 @@ namespace {
VclPtr<VirtualDevice> CreatePageVDev( SdrPage* pPage, sal_uIntPtr nWidthPixel, sal_uIntPtr nHeightPixel ) const;
DECL_LINK( CalcFieldValueHdl, EditFieldInfo* );
DECL_LINK_TYPED( CalcFieldValueHdl, EditFieldInfo*, void );
void ParseSettings( const Sequence< PropertyValue >& aDescriptor, ExportSettings& rSettings );
bool GetGraphic( ExportSettings& rSettings, Graphic& aGraphic, bool bVectorType );
......@@ -174,7 +174,7 @@ namespace {
SvxDrawPage* mpUnoPage;
Link<> maOldCalcFieldValueHdl;
Link<EditFieldInfo*,void> maOldCalcFieldValueHdl;
sal_Int32 mnPageNumber;
SdrPage* mpCurrentPage;
SdrModel* mpDoc;
......@@ -339,7 +339,7 @@ GraphicExporter::~GraphicExporter()
{
}
IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
IMPL_LINK_TYPED(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
{
if( pInfo )
{
......@@ -378,17 +378,15 @@ IMPL_LINK(GraphicExporter, CalcFieldValueHdl, EditFieldInfo*, pInfo)
pInfo->SetRepresentation( aPageNumValue );
return 0;
return;
}
}
}
long nRet = maOldCalcFieldValueHdl.Call( pInfo );
maOldCalcFieldValueHdl.Call( pInfo );
if( pInfo && mpCurrentPage )
pInfo->SetSdrPage( 0 );
return nRet;
}
/** creates an virtual device for the given page
......
sw/inc/doc.hxx
Dosyayı görüntüle @ 2970ec84
......@@ -600,7 +600,7 @@ public:
// INextInterface here
DECL_LINK(BackgroundDone, SvxBrushItem *);
DECL_LINK(CalcFieldValueHdl, EditFieldInfo*);
DECL_LINK_TYPED(CalcFieldValueHdl, EditFieldInfo*, void);
// OLE ???
bool IsOLEPrtNotifyPending() const { return mbOLEPrtNotifyPending; }
......
sw/source/core/doc/docdraw.cxx
Dosyayı görüntüle @ 2970ec84
......@@ -522,76 +522,74 @@ void SwDoc::SetCalcFieldValueHdl(Outliner* pOutliner)
}
/// Recognise fields/URLs in the Outliner and set how they are displayed.
IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo)
IMPL_LINK_TYPED(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, void)
{
if (pInfo)
{
const SvxFieldItem& rField = pInfo->GetField();
const SvxFieldData* pField = rField.GetField();
if (!pInfo)
return;
if (pField && pField->ISA(SvxDateField))
{
// Date field
pInfo->SetRepresentation(
static_cast<const SvxDateField*>( pField)->GetFormatted(
*GetNumberFormatter( true ), LANGUAGE_SYSTEM) );
}
else if (pField && pField->ISA(SvxURLField))
const SvxFieldItem& rField = pInfo->GetField();
const SvxFieldData* pField = rField.GetField();
if (pField && pField->ISA(SvxDateField))
{
// Date field
pInfo->SetRepresentation(
static_cast<const SvxDateField*>( pField)->GetFormatted(
*GetNumberFormatter( true ), LANGUAGE_SYSTEM) );
}
else if (pField && pField->ISA(SvxURLField))
{
// URL field
switch ( static_cast<const SvxURLField*>( pField)->GetFormat() )
{
// URL field
switch ( static_cast<const SvxURLField*>( pField)->GetFormat() )
case SVXURLFORMAT_APPDEFAULT: //!!! Can be set in App???
case SVXURLFORMAT_REPR:
{
case SVXURLFORMAT_APPDEFAULT: //!!! Can be set in App???
case SVXURLFORMAT_REPR:
{
pInfo->SetRepresentation(
static_cast<const SvxURLField*>(pField)->GetRepresentation());
}
break;
pInfo->SetRepresentation(
static_cast<const SvxURLField*>(pField)->GetRepresentation());
}
break;
case SVXURLFORMAT_URL:
{
pInfo->SetRepresentation(
static_cast<const SvxURLField*>(pField)->GetURL());
}
break;
case SVXURLFORMAT_URL:
{
pInfo->SetRepresentation(
static_cast<const SvxURLField*>(pField)->GetURL());
}
break;
}
sal_uInt16 nChrFormat;
sal_uInt16 nChrFormat;
if (IsVisitedURL(static_cast<const SvxURLField*>(pField)->GetURL()))
nChrFormat = RES_POOLCHR_INET_VISIT;
else
nChrFormat = RES_POOLCHR_INET_NORMAL;
if (IsVisitedURL(static_cast<const SvxURLField*>(pField)->GetURL()))
nChrFormat = RES_POOLCHR_INET_VISIT;
else
nChrFormat = RES_POOLCHR_INET_NORMAL;
SwFormat *pFormat = getIDocumentStylePoolAccess().GetCharFormatFromPool(nChrFormat);
SwFormat *pFormat = getIDocumentStylePoolAccess().GetCharFormatFromPool(nChrFormat);
Color aColor(COL_LIGHTBLUE);
if (pFormat)
aColor = pFormat->GetColor().GetValue();
Color aColor(COL_LIGHTBLUE);
if (pFormat)
aColor = pFormat->GetColor().GetValue();
pInfo->SetTextColor(aColor);
}
else if (pField && pField->ISA(SdrMeasureField))
{
// Measure field
pInfo->ClearFieldColor();
}
else if ( pField && pField->ISA(SvxExtTimeField))
{
// Time field
pInfo->SetRepresentation(
static_cast<const SvxExtTimeField*>( pField)->GetFormatted(
*GetNumberFormatter( true ), LANGUAGE_SYSTEM) );
}
else
{
OSL_FAIL("unknown field command");
pInfo->SetRepresentation( OUString( '?' ) );
}
pInfo->SetTextColor(aColor);
}
else if (pField && pField->ISA(SdrMeasureField))
{
// Measure field
pInfo->ClearFieldColor();
}
else if ( pField && pField->ISA(SvxExtTimeField))
{
// Time field
pInfo->SetRepresentation(
static_cast<const SvxExtTimeField*>( pField)->GetFormatted(
*GetNumberFormatter( true ), LANGUAGE_SYSTEM) );
}
else
{
OSL_FAIL("unknown field command");
pInfo->SetRepresentation( OUString( '?' ) );
}
return 0;
}
// #i62875#
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment