summaryrefslogtreecommitdiff
path: root/sc/source/ui/view
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/ui/view')
-rw-r--r--sc/source/ui/view/gridwin.cxx4
-rw-r--r--sc/source/ui/view/gridwin4.cxx1
-rw-r--r--sc/source/ui/view/output.cxx2
-rw-r--r--sc/source/ui/view/output2.cxx7
-rw-r--r--sc/source/ui/view/tabvwsh4.cxx6
-rw-r--r--sc/source/ui/view/tabvwshb.cxx4
6 files changed, 1 insertions, 23 deletions
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 79ef36164c89..bc79b8c87af4 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -452,7 +452,6 @@ ScGridWindow::ScGridWindow( vcl::Window* pParent, ScViewData* pData, ScSplitPos
bRFSize( false ),
bPagebreakDrawn( false ),
bDragRect( false ),
- bIsInScroll( false ),
bIsInPaint( false ),
bNeedsRepaint( false ),
bAutoMarkVisible( false ),
@@ -4416,8 +4415,6 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY )
ClickExtern();
HideNoteMarker();
- bIsInScroll = true;
-
SetMapMode(MapUnit::MapPixel);
Scroll( nDifX, nDifY, ScrollFlags::Children );
SetMapMode( GetDrawMapMode() ); // generated shifted MapMode
@@ -4425,7 +4422,6 @@ void ScGridWindow::ScrollPixel( long nDifX, long nDifY )
UpdateEditViewPos();
DrawAfterScroll();
- bIsInScroll = false;
}
// Update Formulas ------------------------------------------------------
diff --git a/sc/source/ui/view/gridwin4.cxx b/sc/source/ui/view/gridwin4.cxx
index a7d13afe54c6..5fea40a60d51 100644
--- a/sc/source/ui/view/gridwin4.cxx
+++ b/sc/source/ui/view/gridwin4.cxx
@@ -553,7 +553,6 @@ void ScGridWindow::DrawContent(OutputDevice &rDevice, const ScTableInfo& rTableI
aOutputData.SetUseStyleColor( true ); // always set in table view
- aOutputData.SetEditObject( GetEditObject() );
aOutputData.SetViewShell( pViewData->GetViewShell() );
bool bGrid = rOpts.GetOption( VOPT_GRID ) && pViewData->GetShowGrid();
diff --git a/sc/source/ui/view/output.cxx b/sc/source/ui/view/output.cxx
index f020a1849df8..a1d4db5e12e5 100644
--- a/sc/source/ui/view/output.cxx
+++ b/sc/source/ui/view/output.cxx
@@ -163,7 +163,6 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
eType( eNewType ),
mnPPTX( nPixelPerTwipsX ),
mnPPTY( nPixelPerTwipsY ),
- pEditObj( nullptr ),
pViewShell( nullptr ),
pDrawView( nullptr ),
bEditMode( false ),
@@ -215,7 +214,6 @@ ScOutputData::ScOutputData( OutputDevice* pNewDev, ScOutputType eNewType,
nScrH += pRowInfo[nArrY].nHeight;
bTabProtected = mpDoc->IsTabProtected( nTab );
- nTabTextDirection = mpDoc->GetEditTextDirection( nTab );
bLayoutRTL = mpDoc->IsLayoutRTL( nTab );
}
diff --git a/sc/source/ui/view/output2.cxx b/sc/source/ui/view/output2.cxx
index ab70337c5790..7191d2875910 100644
--- a/sc/source/ui/view/output2.cxx
+++ b/sc/source/ui/view/output2.cxx
@@ -95,7 +95,6 @@ class ScDrawStringsVars
SvxCellHorJustify eAttrHorJust;
SvxCellVerJustify eAttrVerJust;
SvxCellJustifyMethod eAttrHorJustMethod;
- SvxCellJustifyMethod eAttrVerJustMethod;
const SvxMarginItem* pMargin;
sal_uInt16 nIndent;
bool bRotated;
@@ -188,7 +187,6 @@ ScDrawStringsVars::ScDrawStringsVars(ScOutputData* pData, bool bPTL) :
eAttrHorJust( SvxCellHorJustify::Standard ),
eAttrVerJust( SVX_VER_JUSTIFY_BOTTOM ),
eAttrHorJustMethod( SvxCellJustifyMethod::Auto ),
- eAttrVerJustMethod( SvxCellJustifyMethod::Auto ),
pMargin ( nullptr ),
nIndent ( 0 ),
bRotated ( false ),
@@ -334,7 +332,6 @@ void ScDrawStringsVars::SetPattern(
// justification method
eAttrHorJustMethod = lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_HOR_JUSTIFY_METHOD, pCondSet);
- eAttrVerJustMethod = lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_VER_JUSTIFY_METHOD, pCondSet);
// line break
@@ -2331,7 +2328,7 @@ ScOutputData::DrawEditParam::DrawEditParam(const ScPatternAttr* pPattern, const
meVerJustMethod( lcl_GetValue<SvxJustifyMethodItem, SvxCellJustifyMethod>(*pPattern, ATTR_VER_JUSTIFY_METHOD, pCondSet) ),
meOrient( pPattern->GetCellOrientation(pCondSet) ),
mnArrY(0),
- mnX(0), mnY(0), mnCellX(0), mnCellY(0), mnTab(0),
+ mnX(0), mnCellX(0), mnCellY(0),
mnPosX(0), mnPosY(0), mnInitPosX(0),
mbBreak( (meHorJustAttr == SvxCellHorJustify::Block) || lcl_GetBoolValue(*pPattern, ATTR_LINEBREAK, pCondSet) ),
mbCellIsValue(bCellIsValue),
@@ -4586,10 +4583,8 @@ void ScOutputData::DrawEdit(bool bPixelToLogic)
aParam.maCell = aCell;
aParam.mnArrY = nArrY;
aParam.mnX = nX;
- aParam.mnY = nY;
aParam.mnCellX = nCellX;
aParam.mnCellY = nCellY;
- aParam.mnTab = nTab;
aParam.mnPosX = nPosX;
aParam.mnPosY = nPosY;
aParam.mnInitPosX = nInitPosX;
diff --git a/sc/source/ui/view/tabvwsh4.cxx b/sc/source/ui/view/tabvwsh4.cxx
index a38a87f1dd81..c43b968b7ab5 100644
--- a/sc/source/ui/view/tabvwsh4.cxx
+++ b/sc/source/ui/view/tabvwsh4.cxx
@@ -669,8 +669,6 @@ void ScTabViewShell::SetDrawTextShell( bool bActive )
void ScTabViewShell::SetPivotShell( bool bActive )
{
- bActivePivotSh = bActive;
-
// SetPivotShell is called from CursorPosChanged every time
// -> don't change anything except switching between cell and pivot shell
@@ -693,7 +691,6 @@ void ScTabViewShell::SetPivotShell( bool bActive )
void ScTabViewShell::SetAuditShell( bool bActive )
{
- bActiveAuditingSh = bActive;
if ( bActive )
{
bActiveDrawTextSh = bActiveDrawSh = false;
@@ -1660,14 +1657,11 @@ ScTabViewShell::ScTabViewShell( SfxViewFrame* pViewFrame,
pNavSettings(nullptr),
bActiveDrawSh(false),
bActiveDrawTextSh(false),
- bActivePivotSh(false),
- bActiveAuditingSh(false),
bActiveDrawFormSh(false),
bActiveOleObjectSh(false),
bActiveChartSh(false),
bActiveGraphicSh(false),
bActiveMediaSh(false),
- bActiveEditSh(false),
bFormShellAtTop(false),
bDontSwitch(false),
bInFormatDialog(false),
diff --git a/sc/source/ui/view/tabvwshb.cxx b/sc/source/ui/view/tabvwshb.cxx
index 009afeb5b779..a9a46d5bd50a 100644
--- a/sc/source/ui/view/tabvwshb.cxx
+++ b/sc/source/ui/view/tabvwshb.cxx
@@ -97,8 +97,6 @@ void ScTabViewShell::ConnectObject( SdrOle2Obj* pObj )
// the object area must be set after the scaling since it triggers the resizing
aRect.SetSize( aOleSize );
pClient->SetObjArea( aRect );
-
- static_cast<ScClient*>(pClient)->SetGrafEdit( nullptr );
}
}
@@ -207,8 +205,6 @@ void ScTabViewShell::ActivateObject( SdrOle2Obj* pObj, long nVerb )
aRect.SetSize( aOleSize );
pClient->SetObjArea( aRect );
- static_cast<ScClient*>(pClient)->SetGrafEdit( nullptr );
-
nErr = pClient->DoVerb( nVerb );
bErrorShown = true;
// SfxViewShell::DoVerb shows its error messages
generated by cgit (git 2.34.1) at 2025-01-24 06:01:50 +0000