[Libreoffice-commits] core.git: editeng/source include/editeng sc/source svx/source sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Fri Jan 22 00:15:52 PST 2016
editeng/source/editeng/editview.cxx | 5 -----
editeng/source/editeng/impedit.cxx | 6 ------
editeng/source/editeng/impedit.hxx | 2 --
editeng/source/outliner/outlvw.cxx | 5 -----
include/editeng/editview.hxx | 1 -
include/editeng/outliner.hxx | 2 --
sc/source/ui/app/inputhdl.cxx | 9 ---------
sc/source/ui/view/viewdata.cxx | 1 -
svx/source/svdraw/svdedxv.cxx | 1 -
sw/source/uibase/docvw/PostItMgr.cxx | 1 -
sw/source/uibase/docvw/SidebarWin.cxx | 1 -
11 files changed, 34 deletions(-)
New commits:
commit fb7edcd806aad98ad61e60b4165771ca3ae13ef3
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Fri Jan 22 09:14:25 2016 +0100
editeng: ImpEditView::mbTiledRendering is never read
Change-Id: Ie8e33d075f0cedbb9f7148717c4318f4494ed419
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index f936d4e..14c2b24 100644
--- a/editeng/source/editeng/editview.cxx
+++ b/editeng/source/editeng/editview.cxx
@@ -583,11 +583,6 @@ Color EditView::GetBackgroundColor() const
return pImpEditView->GetBackgroundColor();
}
-void EditView::setTiledRendering(bool bTiledRendering)
-{
- pImpEditView->setTiledRendering(bTiledRendering);
-}
-
void EditView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable *pSearchable)
{
pImpEditView->registerLibreOfficeKitCallback(pCallback, pLibreOfficeKitData, pSearchable);
diff --git a/editeng/source/editeng/impedit.cxx b/editeng/source/editeng/impedit.cxx
index 0fc72ff..36bd526 100644
--- a/editeng/source/editeng/impedit.cxx
+++ b/editeng/source/editeng/impedit.cxx
@@ -79,7 +79,6 @@ ImpEditView::ImpEditView( EditView* pView, EditEngine* pEng, vcl::Window* pWindo
pOutWin = pWindow;
pPointer = nullptr;
pBackgroundColor = nullptr;
- mbTiledRendering = false;
mpLibreOfficeKitCallback = nullptr;
mpLibreOfficeKitData = nullptr;
mpLibreOfficeKitSearchable = nullptr;
@@ -120,11 +119,6 @@ void ImpEditView::SetBackgroundColor( const Color& rColor )
pBackgroundColor = new Color( rColor );
}
-void ImpEditView::setTiledRendering(bool bTiledRendering)
-{
- mbTiledRendering = bTiledRendering;
-}
-
void ImpEditView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pData, OutlinerSearchable* pSearchable)
{
mpLibreOfficeKitCallback = pCallback;
diff --git a/editeng/source/editeng/impedit.hxx b/editeng/source/editeng/impedit.hxx
index 57e03f7..1962b7e 100644
--- a/editeng/source/editeng/impedit.hxx
+++ b/editeng/source/editeng/impedit.hxx
@@ -222,7 +222,6 @@ private:
EditView* pEditView;
vcl::Cursor* pCursor;
Color* pBackgroundColor;
- bool mbTiledRendering;
LibreOfficeKitCallback mpLibreOfficeKitCallback;
void* mpLibreOfficeKitData;
OutlinerSearchable* mpLibreOfficeKitSearchable;
@@ -370,7 +369,6 @@ public:
const Color& GetBackgroundColor() const {
return ( pBackgroundColor ? *pBackgroundColor : pOutWin->GetBackground().GetColor() ); }
- void setTiledRendering(bool bTiledRendering);
/// @see vcl::ITiledRenderable::registerCallback().
void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable* pSearchable);
/// Invokes the registered callback, if there are any.
diff --git a/editeng/source/outliner/outlvw.cxx b/editeng/source/outliner/outlvw.cxx
index d624eb6..6240c0f 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1431,11 +1431,6 @@ void OutlinerView::SetBackgroundColor( const Color& rColor )
pEditView->SetBackgroundColor( rColor );
}
-void OutlinerView::setTiledRendering(bool bTiledRendering)
-{
- pEditView->setTiledRendering(bTiledRendering);
-}
-
void OutlinerView::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable* pSearchable)
{
pEditView->registerLibreOfficeKitCallback(pCallback, pLibreOfficeKitData, pSearchable);
diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 21343f5..9c1c541 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -182,7 +182,6 @@ public:
void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor() const;
- void setTiledRendering(bool bTiledRendering);
/// @see vcl::ITiledRenderable::registerCallback().
void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable *pSearchable);
diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 6ea221e..8e428f2 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -273,8 +273,6 @@ public:
void SetBackgroundColor( const Color& rColor );
Color GetBackgroundColor();
- /// Set if we are doing tiled rendering.
- void setTiledRendering(bool bTiledRendering);
/// @see vcl::ITiledRenderable::registerCallback().
void registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallback, void* pLibreOfficeKitData, OutlinerSearchable* pSearchable);
diff --git a/sc/source/ui/app/inputhdl.cxx b/sc/source/ui/app/inputhdl.cxx
index 609fcb3..98783dc 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -731,14 +731,6 @@ void ScInputHandler::ImplCreateEditEngine()
pEngine->SetControlWord( pEngine->GetControlWord() | EEControlBits::AUTOCORRECT );
pEngine->SetModifyHdl( LINK( this, ScInputHandler, ModifyHdl ) );
}
-
- // set the EditEngine so that it invalidates the view instead of direct
- // paint
- if (pActiveViewSh)
- {
- if (EditView* pEditView = pEngine->GetActiveView())
- pEditView->setTiledRendering(comphelper::LibreOfficeKit::isActive());
- }
}
void ScInputHandler::UpdateAutoCorrFlag()
@@ -1890,7 +1882,6 @@ void ScInputHandler::UpdateActiveView()
{
ScDrawLayer *pDrawLayer = pDocShell->GetDocument().GetDrawLayer();
pTableView->registerLibreOfficeKitCallback(pDrawLayer->getLibreOfficeKitCallback(), pDrawLayer->getLibreOfficeKitData(), pDrawLayer);
- pTableView->setTiledRendering(true);
}
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index f5a8384..35ea8e0 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -948,7 +948,6 @@ void ScViewData::SetEditEngine( ScSplitPos eWhich,
pEditView[eWhich]->registerLibreOfficeKitCallback(pDoc->GetDrawLayer()->getLibreOfficeKitCallback(),
pDoc->GetDrawLayer()->getLibreOfficeKitData(),
pDoc->GetDrawLayer());
- pEditView[eWhich]->setTiledRendering(true);
}
}
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index 2cd9533..f2c0fca 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -461,7 +461,6 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP
}
pOutlView->SetControlWord(nStat);
pOutlView->SetBackgroundColor( aBackground );
- pOutlView->setTiledRendering(comphelper::LibreOfficeKit::isActive());
pOutlView->registerLibreOfficeKitCallback(GetModel()->getLibreOfficeKitCallback(), GetModel()->getLibreOfficeKitData(), GetModel());
if (pText!=nullptr)
{
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx b/sw/source/uibase/docvw/PostItMgr.cxx
index 86be220..d968eb2 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -889,7 +889,6 @@ void SwPostItMgr::registerLibreOfficeKitCallback(LibreOfficeKitCallback pCallbac
if (!pPostIt)
continue;
- pPostIt->GetOutlinerView()->setTiledRendering(comphelper::LibreOfficeKit::isActive());
pPostIt->GetOutlinerView()->registerLibreOfficeKitCallback(pCallback, pData, pSearchable);
}
}
diff --git a/sw/source/uibase/docvw/SidebarWin.cxx b/sw/source/uibase/docvw/SidebarWin.cxx
index 57374ac..97d9767 100644
--- a/sw/source/uibase/docvw/SidebarWin.cxx
+++ b/sw/source/uibase/docvw/SidebarWin.cxx
@@ -618,7 +618,6 @@ void SwSidebarWin::InitControls()
LibreOfficeKitCallback pCallback = nullptr;
void* pData = nullptr;
pDrawModel->getLibreOfficeKitCallback(pCallback, pData);
- mpOutlinerView->setTiledRendering(comphelper::LibreOfficeKit::isActive());
mpOutlinerView->registerLibreOfficeKitCallback(pCallback, pData, pDrawModel);
}
More information about the Libreoffice-commits
mailing list