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/cellsh1.cxx9
-rw-r--r--sc/source/ui/view/colrowba.cxx10
-rw-r--r--sc/source/ui/view/gridwin.cxx2
-rw-r--r--sc/source/ui/view/hdrcont.cxx5
-rw-r--r--sc/source/ui/view/overlayobject.cxx4
-rw-r--r--sc/source/ui/view/viewfun2.cxx6
-rw-r--r--sc/source/ui/view/viewfunc.cxx5
7 files changed, 13 insertions, 28 deletions
diff --git a/sc/source/ui/view/cellsh1.cxx b/sc/source/ui/view/cellsh1.cxx
index c7f0ef8d2724..a1cdc8c45766 100644
--- a/sc/source/ui/view/cellsh1.cxx
+++ b/sc/source/ui/view/cellsh1.cxx
@@ -2085,9 +2085,7 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
ScAbstractDialogFactory* pFact = ScAbstractDialogFactory::Create();
OSL_ENSURE(pFact, "ScAbstractFactory create fail!");
- ScRangeList aRangeList;
ScViewData* pData = GetViewData();
- pData->GetMarkData().FillRangeListWithMarks(&aRangeList, false);
ScDocument* pDoc = pData->GetDocument();
if(pDoc->IsTabProtected(pData->GetTabNo()))
@@ -2097,14 +2095,9 @@ void ScCellShell::ExecuteEdit( SfxRequest& rReq )
}
ScAddress aPos(pData->GetCurX(), pData->GetCurY(), pData->GetTabNo());
- if(aRangeList.empty())
- {
- ScRange* pRange = new ScRange(aPos);
- aRangeList.push_back(pRange);
- }
ScConditionalFormatList* pList = pDoc->GetCondFormList( aPos.Tab() );
- AbstractScCondFormatManagerDlg* pDlg = pFact->CreateScCondFormatMgrDlg( pTabViewShell->GetDialogParent(), pDoc, pList, aRangeList, aPos, RID_SCDLG_COND_FORMAT_MANAGER);
+ AbstractScCondFormatManagerDlg* pDlg = pFact->CreateScCondFormatMgrDlg( pTabViewShell->GetDialogParent(), pDoc, pList, aPos, RID_SCDLG_COND_FORMAT_MANAGER);
if(pDlg->Execute() == RET_OK)
{
pDoc->SetCondFormList(pDlg->GetConditionalFormatList(), aPos.Tab());
diff --git a/sc/source/ui/view/colrowba.cxx b/sc/source/ui/view/colrowba.cxx
index 9f383fb80b53..890b05e98ca9 100644
--- a/sc/source/ui/view/colrowba.cxx
+++ b/sc/source/ui/view/colrowba.cxx
@@ -66,11 +66,10 @@ String lcl_MetricString( long nTwips, const String& rText )
ScColBar::ScColBar( Window* pParent, ScViewData* pData, ScHSplitPos eWhichPos,
ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) :
- ScHeaderControl( pParent, pEng, MAXCOL+1, HDR_HORIZONTAL ),
+ ScHeaderControl( pParent, pEng, MAXCOL+1, false ),
pViewData( pData ),
eWhich( eWhichPos ),
- pFuncSet( pFunc ),
- pSelEngine( pEng )
+ pFuncSet( pFunc )
{
Show();
}
@@ -236,11 +235,10 @@ sal_Bool ScColBar::IsLayoutRTL() // overloaded only for columns
ScRowBar::ScRowBar( Window* pParent, ScViewData* pData, ScVSplitPos eWhichPos,
ScHeaderFunctionSet* pFunc, ScHeaderSelectionEngine* pEng ) :
- ScHeaderControl( pParent, pEng, MAXROW+1, HDR_VERTICAL ),
+ ScHeaderControl( pParent, pEng, MAXROW+1, true ),
pViewData( pData ),
eWhich( eWhichPos ),
- pFuncSet( pFunc ),
- pSelEngine( pEng )
+ pFuncSet( pFunc )
{
Show();
}
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 33926232166c..f4e317e10317 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -5431,7 +5431,7 @@ void ScGridWindow::UpdateCopySourceOverlay()
Rectangle aLogic = PixelToLogic(aRect, aDrawMode);
::basegfx::B2DRange aRange(aLogic.Left(), aLogic.Top(), aLogic.Right(), aLogic.Bottom());
- ScOverlayDashedBorder* pDashedBorder = new ScOverlayDashedBorder(aRange, aHighlight, this);
+ ScOverlayDashedBorder* pDashedBorder = new ScOverlayDashedBorder(aRange, aHighlight);
xOverlayManager->add(*pDashedBorder);
mpOOSelectionBorder->append(*pDashedBorder);
}
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index 539e782c07af..a0fba138a916 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -61,11 +61,10 @@
//==================================================================
ScHeaderControl::ScHeaderControl( Window* pParent, SelectionEngine* pSelectionEngine,
- SCCOLROW nNewSize, sal_uInt16 nNewFlags ) :
+ SCCOLROW nNewSize, bool bNewVertical ) :
Window ( pParent ),
pSelEngine ( pSelectionEngine ),
- nFlags ( nNewFlags ),
- bVertical ( (nNewFlags & HDR_VERTICAL) != 0 ),
+ bVertical ( bNewVertical ),
nSize ( nNewSize ),
nMarkStart ( 0 ),
nMarkEnd ( 0 ),
diff --git a/sc/source/ui/view/overlayobject.cxx b/sc/source/ui/view/overlayobject.cxx
index ed0ff36fc952..20430c2dbace 100644
--- a/sc/source/ui/view/overlayobject.cxx
+++ b/sc/source/ui/view/overlayobject.cxx
@@ -30,7 +30,6 @@
#include "overlayobject.hxx"
#include "vcl/outdev.hxx"
#include "vcl/lineinfo.hxx"
-#include "vcl/window.hxx"
#include "tools/fract.hxx"
#include "basegfx/range/b2drange.hxx"
#include "basegfx/polygon/b2dpolygon.hxx"
@@ -45,9 +44,8 @@ using ::drawinglayer::primitive2d::Primitive2DSequence;
#define DASH_UPDATE_INTERVAL 180 // in msec
-ScOverlayDashedBorder::ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor, Window* pWin) :
+ScOverlayDashedBorder::ScOverlayDashedBorder(const ::basegfx::B2DRange& rRange, const Color& rColor) :
OverlayObject(rColor),
- mpParent(pWin),
mbToggle(true)
{
mbAllowsAnimation = true;
diff --git a/sc/source/ui/view/viewfun2.cxx b/sc/source/ui/view/viewfun2.cxx
index 4f1cbd98a2bf..a98936b3978d 100644
--- a/sc/source/ui/view/viewfun2.cxx
+++ b/sc/source/ui/view/viewfun2.cxx
@@ -1984,7 +1984,7 @@ sal_Bool ScViewFunc::InsertTables(std::vector<rtl::OUString>& aNames, SCTAB nTab
{
if (bRecord)
pDocSh->GetUndoManager()->AddUndoAction(
- new ScUndoInsertTables( pDocSh, nTab, false, aNames));
+ new ScUndoInsertTables( pDocSh, nTab, aNames));
// Update views
@@ -2416,7 +2416,7 @@ void ScViewFunc::ImportTables( ScDocShell* pSrcShell,
if (bUndo)
{
pDocSh->GetUndoManager()->AddUndoAction(
- new ScUndoImportTab( pDocSh, nTab, nCount, bLink ) );
+ new ScUndoImportTab( pDocSh, nTab, nCount ) );
}
for (i=0; i<nInsCount; i++)
@@ -2584,7 +2584,7 @@ void ScViewFunc::MoveTable(
pDestDoc->GetName(nDestTab, sName);
pDestShell->GetUndoManager()->AddUndoAction(
new ScUndoImportTab( pDestShell, nDestTab,
- static_cast<SCTAB>(TheTabs.size()), false));
+ static_cast<SCTAB>(TheTabs.size())));
}
else
diff --git a/sc/source/ui/view/viewfunc.cxx b/sc/source/ui/view/viewfunc.cxx
index 888ff5c29f0f..f999b52d1a1e 100644
--- a/sc/source/ui/view/viewfunc.cxx
+++ b/sc/source/ui/view/viewfunc.cxx
@@ -597,9 +597,6 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r
{
ScAddress aPos( nCol, nRow, nTab );
ScBaseCell* pOldCell = pDoc->GetCell( aPos );
- sal_Bool bNeedHeight = ( pOldCell && pOldCell->GetCellType() == CELLTYPE_EDIT )
- || pDoc->HasAttrib(
- nCol,nRow,nTab, nCol,nRow,nTab, HASATTR_NEEDHEIGHT );
// undo
ScBaseCell* pUndoCell = (bUndo && pOldCell) ? pOldCell->Clone( *pDoc ) : 0;
@@ -610,7 +607,7 @@ void ScViewFunc::EnterValue( SCCOL nCol, SCROW nRow, SCTAB nTab, const double& r
if (bUndo)
{
pDocSh->GetUndoManager()->AddUndoAction(
- new ScUndoEnterValue( pDocSh, aPos, pUndoCell, rValue, bNeedHeight ) );
+ new ScUndoEnterValue( pDocSh, aPos, pUndoCell, rValue ) );
}
pDocSh->PostPaintCell( aPos );
generated by cgit (git 2.34.1) at 2024-07-14 07:19:10 +0000