Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
69b50555
Kaydet (Commit)
69b50555
authored
Nis 08, 2015
tarafından
Jan Holesovsky
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sc tiled editing: Reuse the selection method.
Change-Id: I05175f0d8c37994658e0dcdf355a753bf7c840b8
üst
7e056939
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
16 additions
and
22 deletions
+16
-22
docuno.cxx
sc/source/ui/unoobj/docuno.cxx
+1
-8
gridwin.cxx
sc/source/ui/view/gridwin.cxx
+2
-12
gridwin4.cxx
sc/source/ui/view/gridwin4.cxx
+13
-2
No files found.
sc/source/ui/unoobj/docuno.cxx
Dosyayı görüntüle @
69b50555
...
...
@@ -622,14 +622,7 @@ void ScModelObj::setTextSelection(int nType, int nX, int nY)
Point
aPoint
(
convertTwipToMm100
(
nX
),
convertTwipToMm100
(
nY
));
if
(
!
pTableView
->
GetOutputArea
().
IsInside
(
aPoint
))
{
// if the handle does not stay in the editeng area, we want to turn
// the selection into the cell selection
pViewShell
->
UpdateInputLine
();
pViewShell
->
UpdateInputHandler
();
}
else
if
(
pTableView
->
GetOutputArea
().
IsInside
(
aPoint
))
{
switch
(
nType
)
{
...
...
sc/source/ui/view/gridwin.cxx
Dosyayı görüntüle @
69b50555
...
...
@@ -1718,18 +1718,8 @@ void ScGridWindow::HandleMouseButtonDown( const MouseEvent& rMEvt, MouseEventSta
aCell
.
assign
(
*
pViewData
->
GetDocument
(),
ScAddress
(
nPosX
,
nPosY
,
nTab
));
if
(
aCell
.
isEmpty
())
{
// stop editing
ScTabViewShell
*
pViewShell
=
pViewData
->
GetViewShell
();
pViewShell
->
UpdateInputLine
();
pViewShell
->
UpdateInputHandler
();
// select the given cell
ScTabView
*
pTabView
=
pViewData
->
GetView
();
pTabView
->
SetCursor
(
nPosX
,
nPosY
);
pTabView
->
DoneBlockMode
();
pTabView
->
InitBlockMode
(
nPosX
,
nPosY
,
nTab
,
true
);
pTabView
->
MarkCursor
(
nPosX
,
nPosY
,
nTab
);
pTabView
->
SelectionChanged
();
SetCellSelectionPixel
(
LOK_SETTEXTSELECTION_START
,
aPos
.
X
(),
aPos
.
Y
());
SetCellSelectionPixel
(
LOK_SETTEXTSELECTION_END
,
aPos
.
X
(),
aPos
.
Y
());
return
;
}
}
...
...
sc/source/ui/view/gridwin4.cxx
Dosyayı görüntüle @
69b50555
...
...
@@ -1010,6 +1010,15 @@ void ScGridWindow::LogicInvalidate(const Rectangle* pRectangle)
void
ScGridWindow
::
SetCellSelectionPixel
(
int
nType
,
int
nPixelX
,
int
nPixelY
)
{
ScTabView
*
pTabView
=
pViewData
->
GetView
();
ScTabViewShell
*
pViewShell
=
pViewData
->
GetViewShell
();
ScInputHandler
*
pInputHandler
=
SC_MOD
()
->
GetInputHdl
(
pViewShell
);
if
(
pInputHandler
&&
pInputHandler
->
IsInputMode
())
{
// we need to switch off the editeng
pViewShell
->
UpdateInputLine
();
pViewShell
->
UpdateInputHandler
();
}
if
(
nType
==
LOK_SETTEXTSELECTION_RESET
)
{
...
...
@@ -1024,10 +1033,12 @@ void ScGridWindow::SetCellSelectionPixel(int nType, int nPixelX, int nPixelY)
SCROW
nRow1
,
nRow2
;
SCTAB
nTab1
,
nTab2
;
bool
bWasEmpty
=
false
;
if
(
aRangeList
.
empty
())
{
nCol1
=
nCol2
=
pViewData
->
GetCurX
();
nRow1
=
nRow2
=
pViewData
->
GetCurY
();
bWasEmpty
=
true
;
}
else
aRangeList
.
Combine
().
GetVars
(
nCol1
,
nRow1
,
nTab1
,
nCol2
,
nRow2
,
nTab2
);
...
...
@@ -1042,7 +1053,7 @@ void ScGridWindow::SetCellSelectionPixel(int nType, int nPixelX, int nPixelY)
switch
(
nType
)
{
case
LOK_SETTEXTSELECTION_START
:
if
(
nNewPosX
!=
nCol1
||
nNewPosY
!=
nRow1
)
if
(
nNewPosX
!=
nCol1
||
nNewPosY
!=
nRow1
||
bWasEmpty
)
{
pTabView
->
SetCursor
(
nNewPosX
,
nNewPosY
);
pTabView
->
DoneBlockMode
();
...
...
@@ -1051,7 +1062,7 @@ void ScGridWindow::SetCellSelectionPixel(int nType, int nPixelX, int nPixelY)
}
break
;
case
LOK_SETTEXTSELECTION_END
:
if
(
nNewPosX
!=
nCol2
||
nNewPosY
!=
nRow2
)
if
(
nNewPosX
!=
nCol2
||
nNewPosY
!=
nRow2
||
bWasEmpty
)
{
pTabView
->
SetCursor
(
nCol1
,
nRow1
);
pTabView
->
DoneBlockMode
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment