summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--editeng/source/editeng/editview.cxx5
-rw-r--r--editeng/source/editeng/impedit.cxx7
-rw-r--r--editeng/source/editeng/impedit.hxx2
-rw-r--r--editeng/source/outliner/outlvw.cxx5
-rw-r--r--include/editeng/editview.hxx1
-rw-r--r--include/editeng/outliner.hxx2
-rw-r--r--sc/source/ui/app/inputhdl.cxx18
-rw-r--r--sc/source/ui/view/viewdata.cxx1
-rw-r--r--svx/source/svdraw/svdedxv.cxx7
-rw-r--r--sw/source/uibase/docvw/PostItMgr.cxx1
-rw-r--r--sw/source/uibase/docvw/SidebarWin.cxx1
11 files changed, 6 insertions, 44 deletions
diff --git a/editeng/source/editeng/editview.cxx b/editeng/source/editeng/editview.cxx
index 6814e28e76c8..3eb54507423f 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 639c45375a6f..c3eade27a367 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,12 +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 f99458c62c33..3b01c185df61 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 412a897bf890..ebde75837dc7 100644
--- a/editeng/source/outliner/outlvw.cxx
+++ b/editeng/source/outliner/outlvw.cxx
@@ -1432,11 +1432,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 2d0a815ce4bc..1dc24cbe71c7 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 4a1b97faa1e9..94c8376c71e8 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 00026e84e431..1eddd3397d02 100644
--- a/sc/source/ui/app/inputhdl.cxx
+++ b/sc/source/ui/app/inputhdl.cxx
@@ -53,6 +53,7 @@
#include <comphelper/string.hxx>
#include <formula/formulahelper.hxx>
#include <LibreOfficeKit/LibreOfficeKitEnums.h>
+#include <comphelper/lok.hxx>
#include "inputwin.hxx"
#include "tabvwsh.hxx"
@@ -86,8 +87,6 @@
using namespace formula;
-// STATIC DATA -----------------------------------------------------------
-
bool ScInputHandler::bOptLoaded = false; // Evaluate App options
bool ScInputHandler::bAutoComplete = false; // Is set in KeyInput
@@ -636,15 +635,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)
- {
- ScDocument& rDoc = pActiveViewSh->GetViewData().GetDocShell()->GetDocument();
- if (EditView* pEditView = pEngine->GetActiveView())
- pEditView->setTiledRendering(rDoc.GetDrawLayer()->isTiledRendering());
- }
}
void ScInputHandler::UpdateAutoCorrFlag()
@@ -1722,12 +1712,10 @@ void ScInputHandler::UpdateActiveView()
if (pActiveViewSh && pTableView)
{
ScDocShell* pDocShell = pActiveViewSh->GetViewData().GetDocShell();
- ScDocument& rDoc = pDocShell->GetDocument();
- if (rDoc.GetDrawLayer()->isTiledRendering())
+ if (comphelper::LibreOfficeKit::isActive())
{
ScDrawLayer *pDrawLayer = pDocShell->GetDocument().GetDrawLayer();
pTableView->registerLibreOfficeKitCallback(pDrawLayer->getLibreOfficeKitCallback(), pDrawLayer->getLibreOfficeKitData(), pDrawLayer);
- pTableView->setTiledRendering(true);
}
}
@@ -3473,7 +3461,7 @@ void ScInputHandler::NotifyChange( const ScInputHdlState* pState,
if ( pInputWin )
pInputWin->SetTextString(aString);
- else if ( rDoc.GetDrawLayer()->isTiledRendering() )
+ else if ( comphelper::LibreOfficeKit::isActive() )
rDoc.GetDrawLayer()->libreOfficeKitCallback(LOK_CALLBACK_CELL_FORMULA, aString.toUtf8().getStr());
}
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 16662c733da1..b63a202781c1 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -950,7 +950,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 66e323a1db90..3bbccf99ce58 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -62,10 +62,10 @@
#include <sdr/overlay/overlaytools.hxx>
#include <svx/sdr/table/tablecontroller.hxx>
#include <drawinglayer/processor2d/processor2dtools.hxx>
+#include <comphelper/lok.hxx>
#include <memory>
-
void SdrObjEditView::ImpClearVars()
{
bQuickTextEditMode=true;
@@ -316,7 +316,7 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& rPaintWindow) const
// compare against that; that's how double-buffering can
// still find the matching OutlinerView.
OutputDevice* pOutputDevice = rPaintWindow.GetWindow() ? rPaintWindow.GetWindow() : &rPaintWindow.GetOutputDevice();
- if(pOLV->GetWindow() == pOutputDevice || GetModel()->isTiledRendering())
+ if(pOLV->GetWindow() == pOutputDevice || comphelper::LibreOfficeKit::isActive())
{
ImpPaintOutlinerView(*pOLV, aCheckRect, rPaintWindow.GetTargetOutputDevice());
return;
@@ -342,7 +342,7 @@ void SdrObjEditView::ImpPaintOutlinerView(OutlinerView& rOutlView, const Rectang
// clipped; happens in case of editing text inside a shape in Calc.
// FIXME would be better to complete the setup so that we don't get an
// empty rRect here
- if (!GetModel()->isTiledRendering() || !rRect.IsEmpty())
+ if (!comphelper::LibreOfficeKit::isActive() || !rRect.IsEmpty())
aBlankRect.Intersection(rRect);
rOutlView.GetOutliner()->SetUpdateMode(true); // Bugfix #22596#
@@ -461,7 +461,6 @@ OutlinerView* SdrObjEditView::ImpMakeOutlinerView(vcl::Window* pWin, bool /*bNoP
}
pOutlView->SetControlWord(nStat);
pOutlView->SetBackgroundColor( aBackground );
- pOutlView->setTiledRendering(GetModel()->isTiledRendering());
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 86be22085bfb..d968eb22bc17 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 497e14c1361d..daa2835be340 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(true);
mpOutlinerView->registerLibreOfficeKitCallback(pCallback, pData, pDrawModel);
}
generated by cgit (git 2.34.1) at 2024-07-04 18:56:23 +0000