mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove no longer needed ImpEditView::mpLibreOfficeKitSearchable

Browse Source 
All clients has been ported to use
ImpEditView::mpLibreOfficeKitViewCallable instead.

Change-Id: I3a2513ac5900f801a2e7aec79807f4e333dfba3d
Reviewed-on: https://gerrit.libreoffice.org/26561
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>
This commit is contained in:
Miklos Vajna 2016-06-22 08:01:04 +02:00
parent c65d731446
commit 03e83de83b
8 changed files with 2 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
editeng/source/editeng/editview.cxx
View File

@ -583,11 +583,6 @@ Color EditView::GetBackgroundColor() const
return pImpEditView->GetBackgroundColor(); return pImpEditView->GetBackgroundColor();
} }
void EditView::registerLibreOfficeKitCallback(OutlinerSearchable *pSearchable)
{
pImpEditView->registerLibreOfficeKitCallback(pSearchable);
}
void EditView::registerLibreOfficeKitViewCallback(OutlinerViewCallable *pCallable) void EditView::registerLibreOfficeKitViewCallback(OutlinerViewCallable *pCallable)
{ {
pImpEditView->registerLibreOfficeKitViewCallback(pCallable); pImpEditView->registerLibreOfficeKitViewCallback(pCallable);

12
editeng/source/editeng/impedit.cxx
View File

@ -79,7 +79,6 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindo
pOutWin = pWindow; pOutWin = pWindow;
pPointer = nullptr; pPointer = nullptr;
pBackgroundColor = nullptr; pBackgroundColor = nullptr;
mpLibreOfficeKitSearchable = nullptr;
mpLibreOfficeKitViewCallable = nullptr; mpLibreOfficeKitViewCallable = nullptr;
nScrollDiffX = 0; nScrollDiffX = 0;
nExtraCursorFlags = 0; nExtraCursorFlags = 0;
@ -118,17 +117,6 @@ void ImpEditView::SetBackgroundColor( const Color& rColor )
pBackgroundColor = new Color( rColor ); pBackgroundColor = new Color( rColor );
} }
void ImpEditView::registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable)
{
mpLibreOfficeKitSearchable = pSearchable;
}
void ImpEditView::libreOfficeKitCallback(int nType, const char* pPayload) const
{
if (mpLibreOfficeKitSearchable)
mpLibreOfficeKitSearchable->libreOfficeKitCallback(nType, pPayload);
}
void ImpEditView::registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable) void ImpEditView::registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable)
{ {
mpLibreOfficeKitViewCallable = pCallable; mpLibreOfficeKitViewCallable = pCallable;

8
editeng/source/editeng/impedit.hxx
View File

@ -221,8 +221,6 @@ private:
EditView* pEditView; EditView* pEditView;
vcl::Cursor* pCursor; vcl::Cursor* pCursor;
Color* pBackgroundColor; Color* pBackgroundColor;
/// Model callback.
OutlinerSearchable* mpLibreOfficeKitSearchable;
/// Per-view callback. /// Per-view callback.
OutlinerViewCallable* mpLibreOfficeKitViewCallable; OutlinerViewCallable* mpLibreOfficeKitViewCallable;
EditEngine* pEditEngine; EditEngine* pEditEngine;
@ -369,11 +367,7 @@ public:
const Color& GetBackgroundColor() const { const Color& GetBackgroundColor() const {
return ( pBackgroundColor ? *pBackgroundColor : pOutWin->GetBackground().GetColor() ); } return ( pBackgroundColor ? *pBackgroundColor : pOutWin->GetBackground().GetColor() ); }
/// @see vcl::ITiledRenderable::registerCallback(). /// @see SfxViewShell::registerLibreOfficeKitViewCallback().
void registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable);
/// Invokes the registered model callback, if there are any.
void libreOfficeKitCallback(int nType, const char* pPayload) const;
/// @see vcl::ITiledRenderable::registerCallback().
void registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable); void registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable);
/// Invokes the registered view callback, if there are any. /// Invokes the registered view callback, if there are any.
void libreOfficeKitViewCallback(int nType, const char* pPayload) const; void libreOfficeKitViewCallback(int nType, const char* pPayload) const;

9
editeng/source/outliner/outlvw.cxx
View File

@ -1421,11 +1421,6 @@ void OutlinerView::SetBackgroundColor( const Color& rColor )
pEditView->SetBackgroundColor( rColor ); pEditView->SetBackgroundColor( rColor );
} }
void OutlinerView::registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable)
{
pEditView->registerLibreOfficeKitCallback(pSearchable);
}
void OutlinerView::registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable) void OutlinerView::registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable)
{ {
pEditView->registerLibreOfficeKitViewCallback(pCallable); pEditView->registerLibreOfficeKitViewCallback(pCallable);
@ -1456,10 +1451,6 @@ Selection OutlinerView::GetSurroundingTextSelection() const
return pEditView->GetSurroundingTextSelection(); return pEditView->GetSurroundingTextSelection();
} }
OutlinerSearchable::~OutlinerSearchable()
{
}
// ===== some code for thesaurus sub menu within context menu // ===== some code for thesaurus sub menu within context menu

2
include/editeng/editview.hxx
View File

@ -183,8 +183,6 @@ public:
void SetBackgroundColor( const Color& rColor ); void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor() const; Color GetBackgroundColor() const;
/// Register a LOK model callback.
void registerLibreOfficeKitCallback(OutlinerSearchable *pSearchable);
/// Register a LOK view callback. /// Register a LOK view callback.
void registerLibreOfficeKitViewCallback(OutlinerViewCallable *pCallable); void registerLibreOfficeKitViewCallback(OutlinerViewCallable *pCallable);

13
include/editeng/outliner.hxx
View File

@ -270,8 +270,6 @@ public:
void SetBackgroundColor( const Color& rColor ); void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor(); Color GetBackgroundColor();
/// Registers a LOK model callback.
void registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable);
/// Registers a LOK view callback. /// Registers a LOK view callback.
void registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable); void registerLibreOfficeKitViewCallback(OutlinerViewCallable* pCallable);
@ -375,16 +373,7 @@ public:
void SetEndCutPasteLinkHdl(const Link<LinkParamNone*,void> &rLink) { aEndCutPasteLink = rLink; } void SetEndCutPasteLinkHdl(const Link<LinkParamNone*,void> &rLink) { aEndCutPasteLink = rLink; }
}; };
/// Interface class to not depend on SdrModel in editeng. /// Interface class to not depend on SfxViewShell in editeng.
class EDITENG_DLLPUBLIC OutlinerSearchable
{
public:
virtual ~OutlinerSearchable();
virtual void libreOfficeKitCallback(int nType, const char* pPayload) const = 0;
};
/// Interface class to not depend on SfxViewShell in editeng, meant to replace OutlinerSearchable at the end.
class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI OutlinerViewCallable class SAL_NO_VTABLE SAL_DLLPUBLIC_RTTI OutlinerViewCallable
{ {
public: public:

2
sw/inc/PostItMgr.hxx
View File

@ -289,8 +289,6 @@ class SwPostItMgr: public SfxListener
void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage); void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage);
void PaintTile(OutputDevice& rRenderContext, const Rectangle& rRect); void PaintTile(OutputDevice& rRenderContext, const Rectangle& rRect);
/// Informs already created annotations about a newly registered LOK callback.
void registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable);
}; };
#endif #endif

12
sw/source/uibase/docvw/PostItMgr.cxx
View File

@ -880,18 +880,6 @@ void SwPostItMgr::PaintTile(OutputDevice& rRenderContext, const Rectangle& /*rRe
} }
} }
void SwPostItMgr::registerLibreOfficeKitCallback(OutlinerSearchable* pSearchable)
{
for (SwSidebarItem* pItem : mvPostItFields)
{
SwSidebarWin* pPostIt = pItem->pPostIt;
if (!pPostIt)
continue;
pPostIt->GetOutlinerView()->registerLibreOfficeKitCallback(pSearchable);
}
}
void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage) void SwPostItMgr::Scroll(const long lScroll,const unsigned long aPage)
{ {
OSL_ENSURE((lScroll % GetScrollSize() )==0,"SwPostItMgr::Scroll: scrolling by wrong value"); OSL_ENSURE((lScroll % GetScrollSize() )==0,"SwPostItMgr::Scroll: scrolling by wrong value");