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
eb7fe34e
Kaydet (Commit)
eb7fe34e
authored
May 28, 2011
tarafından
Kohei Yoshida
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_Bool to bool.
üst
ff057f09
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
75 additions
and
75 deletions
+75
-75
tabview2.cxx
sc/source/ui/view/tabview2.cxx
+10
-10
tabview3.cxx
sc/source/ui/view/tabview3.cxx
+65
-65
No files found.
sc/source/ui/view/tabview2.cxx
Dosyayı görüntüle @
eb7fe34e
...
@@ -388,8 +388,8 @@ void ScTabView::PaintMarks(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
...
@@ -388,8 +388,8 @@ void ScTabView::PaintMarks(SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
if
(
!
ValidCol
(
nEndCol
))
nEndCol
=
MAXCOL
;
if
(
!
ValidCol
(
nEndCol
))
nEndCol
=
MAXCOL
;
if
(
!
ValidRow
(
nEndRow
))
nEndRow
=
MAXROW
;
if
(
!
ValidRow
(
nEndRow
))
nEndRow
=
MAXROW
;
sal_B
ool
bLeft
=
(
nStartCol
==
0
&&
nEndCol
==
MAXCOL
);
b
ool
bLeft
=
(
nStartCol
==
0
&&
nEndCol
==
MAXCOL
);
sal_B
ool
bTop
=
(
nStartRow
==
0
&&
nEndRow
==
MAXROW
);
b
ool
bTop
=
(
nStartRow
==
0
&&
nEndRow
==
MAXROW
);
if
(
bLeft
)
if
(
bLeft
)
PaintLeftArea
(
nStartRow
,
nEndRow
);
PaintLeftArea
(
nStartRow
,
nEndRow
);
...
@@ -493,7 +493,7 @@ void ScTabView::DoneBlockMode( bool bContinue )
...
@@ -493,7 +493,7 @@ void ScTabView::DoneBlockMode( bool bContinue )
if
(
IsBlockMode
()
&&
!
bMoveIsShift
)
if
(
IsBlockMode
()
&&
!
bMoveIsShift
)
{
{
ScMarkData
&
rMark
=
aViewData
.
GetMarkData
();
ScMarkData
&
rMark
=
aViewData
.
GetMarkData
();
sal_B
ool
bFlag
=
rMark
.
GetMarkingFlag
();
b
ool
bFlag
=
rMark
.
GetMarkingFlag
();
rMark
.
SetMarking
(
false
);
rMark
.
SetMarking
(
false
);
if
(
bBlockNeg
&&
!
bContinue
)
if
(
bBlockNeg
&&
!
bContinue
)
...
@@ -510,7 +510,7 @@ void ScTabView::DoneBlockMode( bool bContinue )
...
@@ -510,7 +510,7 @@ void ScTabView::DoneBlockMode( bool bContinue )
SCTAB
nTab
=
aViewData
.
GetTabNo
();
SCTAB
nTab
=
aViewData
.
GetTabNo
();
ScDocument
*
pDoc
=
aViewData
.
GetDocument
();
ScDocument
*
pDoc
=
aViewData
.
GetDocument
();
if
(
pDoc
->
HasTable
(
nTab
)
)
if
(
pDoc
->
HasTable
(
nTab
)
)
PaintBlock
(
sal_True
);
// sal_T
rue -> Block loeschen
PaintBlock
(
true
);
// t
rue -> Block loeschen
else
else
rMark
.
ResetMark
();
rMark
.
ResetMark
();
}
}
...
@@ -996,7 +996,7 @@ void ScTabView::PaintBlock( bool bReset )
...
@@ -996,7 +996,7 @@ void ScTabView::PaintBlock( bool bReset )
HideAllCursors
();
HideAllCursors
();
if
(
bMulti
)
if
(
bMulti
)
{
{
sal_B
ool
bFlag
=
rMark
.
GetMarkingFlag
();
b
ool
bFlag
=
rMark
.
GetMarkingFlag
();
rMark
.
SetMarking
(
false
);
rMark
.
SetMarking
(
false
);
rMark
.
MarkToMulti
();
rMark
.
MarkToMulti
();
rMark
.
GetMultiMarkArea
(
aMarkRange
);
rMark
.
GetMultiMarkArea
(
aMarkRange
);
...
@@ -1069,7 +1069,7 @@ void ScTabView::SelectAllTables()
...
@@ -1069,7 +1069,7 @@ void ScTabView::SelectAllTables()
if
(
nCount
>
1
)
if
(
nCount
>
1
)
{
{
for
(
SCTAB
i
=
0
;
i
<
nCount
;
i
++
)
for
(
SCTAB
i
=
0
;
i
<
nCount
;
i
++
)
rMark
.
SelectTable
(
i
,
sal_T
rue
);
rMark
.
SelectTable
(
i
,
t
rue
);
aViewData
.
GetDocShell
()
->
PostPaintExtras
();
aViewData
.
GetDocShell
()
->
PostPaintExtras
();
SfxBindings
&
rBind
=
aViewData
.
GetBindings
();
SfxBindings
&
rBind
=
aViewData
.
GetBindings
();
...
@@ -1094,7 +1094,7 @@ void ScTabView::DeselectAllTables()
...
@@ -1094,7 +1094,7 @@ void ScTabView::DeselectAllTables()
rBind
.
Invalidate
(
FID_TAB_DESELECTALL
);
rBind
.
Invalidate
(
FID_TAB_DESELECTALL
);
}
}
sal_B
ool
lcl_FitsInWindow
(
double
fScaleX
,
double
fScaleY
,
sal_uInt16
nZoom
,
b
ool
lcl_FitsInWindow
(
double
fScaleX
,
double
fScaleY
,
sal_uInt16
nZoom
,
long
nWindowX
,
long
nWindowY
,
ScDocument
*
pDoc
,
SCTAB
nTab
,
long
nWindowX
,
long
nWindowY
,
ScDocument
*
pDoc
,
SCTAB
nTab
,
SCCOL
nStartCol
,
SCROW
nStartRow
,
SCCOL
nEndCol
,
SCROW
nEndRow
,
SCCOL
nStartCol
,
SCROW
nStartRow
,
SCCOL
nEndCol
,
SCROW
nEndRow
,
SCCOL
nFixPosX
,
SCROW
nFixPosY
)
SCCOL
nFixPosX
,
SCROW
nFixPosY
)
...
@@ -1153,7 +1153,7 @@ sal_Bool lcl_FitsInWindow( double fScaleX, double fScaleY, sal_uInt16 nZoom,
...
@@ -1153,7 +1153,7 @@ sal_Bool lcl_FitsInWindow( double fScaleX, double fScaleY, sal_uInt16 nZoom,
}
}
}
}
return
sal_T
rue
;
return
t
rue
;
}
}
sal_uInt16
ScTabView
::
CalcZoom
(
SvxZoomType
eType
,
sal_uInt16
nOldZoom
)
sal_uInt16
ScTabView
::
CalcZoom
(
SvxZoomType
eType
,
sal_uInt16
nOldZoom
)
...
@@ -1275,7 +1275,7 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
...
@@ -1275,7 +1275,7 @@ sal_uInt16 ScTabView::CalcZoom( SvxZoomType eType, sal_uInt16 nOldZoom )
if
(
pStyleSheet
)
if
(
pStyleSheet
)
{
{
ScPrintFunc
aPrintFunc
(
aViewData
.
GetDocShell
(),
ScPrintFunc
aPrintFunc
(
aViewData
.
GetDocShell
(),
aViewData
.
GetViewShell
()
->
GetPrinter
(
sal_T
rue
),
aViewData
.
GetViewShell
()
->
GetPrinter
(
t
rue
),
nCurTab
);
nCurTab
);
Size
aPageSize
=
aPrintFunc
.
GetDataSize
();
Size
aPageSize
=
aPrintFunc
.
GetDataSize
();
...
@@ -1400,7 +1400,7 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId )
...
@@ -1400,7 +1400,7 @@ void ScTabView::ErrorMessage( sal_uInt16 nGlobStrId )
Window
*
pParent
=
aViewData
.
GetDialogParent
();
Window
*
pParent
=
aViewData
.
GetDialogParent
();
ScWaitCursorOff
aWaitOff
(
pParent
);
ScWaitCursorOff
aWaitOff
(
pParent
);
sal_B
ool
bFocus
=
pParent
&&
pParent
->
HasFocus
();
b
ool
bFocus
=
pParent
&&
pParent
->
HasFocus
();
if
(
nGlobStrId
==
STR_PROTECTIONERR
)
if
(
nGlobStrId
==
STR_PROTECTIONERR
)
{
{
...
...
sc/source/ui/view/tabview3.cxx
Dosyayı görüntüle @
eb7fe34e
...
@@ -145,7 +145,7 @@ void ScTabView::UpdateAutoFillMark()
...
@@ -145,7 +145,7 @@ void ScTabView::UpdateAutoFillMark()
{
{
// single selection or cursor
// single selection or cursor
ScRange
aMarkRange
;
ScRange
aMarkRange
;
sal_B
ool
bMarked
=
(
aViewData
.
GetSimpleArea
(
aMarkRange
)
==
SC_MARK_SIMPLE
);
b
ool
bMarked
=
(
aViewData
.
GetSimpleArea
(
aMarkRange
)
==
SC_MARK_SIMPLE
);
sal_uInt16
i
;
sal_uInt16
i
;
for
(
i
=
0
;
i
<
4
;
i
++
)
for
(
i
=
0
;
i
<
4
;
i
++
)
...
@@ -453,7 +453,7 @@ void ScTabView::SelectionChanged()
...
@@ -453,7 +453,7 @@ void ScTabView::SelectionChanged()
void
ScTabView
::
CursorPosChanged
()
void
ScTabView
::
CursorPosChanged
()
{
{
sal_B
ool
bRefMode
=
SC_MOD
()
->
IsFormulaMode
();
b
ool
bRefMode
=
SC_MOD
()
->
IsFormulaMode
();
if
(
!
bRefMode
)
// Abfrage, damit RefMode bei Tabellenwechsel funktioniert
if
(
!
bRefMode
)
// Abfrage, damit RefMode bei Tabellenwechsel funktioniert
aViewData
.
GetDocShell
()
->
Broadcast
(
SfxSimpleHint
(
FID_KILLEDITVIEW
)
);
aViewData
.
GetDocShell
()
->
Broadcast
(
SfxSimpleHint
(
FID_KILLEDITVIEW
)
);
...
@@ -475,7 +475,7 @@ void ScTabView::TestHintWindow()
...
@@ -475,7 +475,7 @@ void ScTabView::TestHintWindow()
{
{
// show input help window and list drop-down button for validity
// show input help window and list drop-down button for validity
sal_B
ool
bListValButton
=
false
;
b
ool
bListValButton
=
false
;
ScAddress
aListValPos
;
ScAddress
aListValPos
;
ScDocument
*
pDoc
=
aViewData
.
GetDocument
();
ScDocument
*
pDoc
=
aViewData
.
GetDocument
();
...
@@ -557,7 +557,7 @@ void ScTabView::TestHintWindow()
...
@@ -557,7 +557,7 @@ void ScTabView::TestHintWindow()
if
(
pData
&&
pData
->
HasSelectionList
()
)
if
(
pData
&&
pData
->
HasSelectionList
()
)
{
{
aListValPos
.
Set
(
aViewData
.
GetCurX
(),
aViewData
.
GetCurY
(),
aViewData
.
GetTabNo
()
);
aListValPos
.
Set
(
aViewData
.
GetCurX
(),
aViewData
.
GetCurY
(),
aViewData
.
GetTabNo
()
);
bListValButton
=
sal_T
rue
;
bListValButton
=
t
rue
;
}
}
}
}
else
else
...
@@ -620,8 +620,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -620,8 +620,8 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
ScSplitPos
eActive
=
aViewData
.
GetActivePart
();
ScSplitPos
eActive
=
aViewData
.
GetActivePart
();
ScHSplitPos
eActiveX
=
WhichH
(
eActive
);
ScHSplitPos
eActiveX
=
WhichH
(
eActive
);
ScVSplitPos
eActiveY
=
WhichV
(
eActive
);
ScVSplitPos
eActiveY
=
WhichV
(
eActive
);
sal_B
ool
bHFix
=
(
aViewData
.
GetHSplitMode
()
==
SC_SPLIT_FIX
);
b
ool
bHFix
=
(
aViewData
.
GetHSplitMode
()
==
SC_SPLIT_FIX
);
sal_B
ool
bVFix
=
(
aViewData
.
GetVSplitMode
()
==
SC_SPLIT_FIX
);
b
ool
bVFix
=
(
aViewData
.
GetVSplitMode
()
==
SC_SPLIT_FIX
);
if
(
bHFix
)
if
(
bHFix
)
if
(
eActiveX
==
SC_SPLIT_LEFT
&&
nCurX
>=
(
SCsCOL
)
aViewData
.
GetFixPosX
())
if
(
eActiveX
==
SC_SPLIT_LEFT
&&
nCurX
>=
(
SCsCOL
)
aViewData
.
GetFixPosX
())
{
{
...
@@ -665,7 +665,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -665,7 +665,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
long
nSpaceY
=
(
aScrSize
.
Height
()
-
nCellSizeY
)
/
2
;
long
nSpaceY
=
(
aScrSize
.
Height
()
-
nCellSizeY
)
/
2
;
// nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes
// nSpaceY: desired start position of cell for FOLLOW_JUMP, modified if dialog interferes
sal_B
ool
bForceNew
=
false
;
// force new calculation of JUMP position (vertical only)
b
ool
bForceNew
=
false
;
// force new calculation of JUMP position (vertical only)
// VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY )
// VisibleCellsY == CellsAtY( GetPosY( eWhichY ), 1, eWhichY )
...
@@ -680,7 +680,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -680,7 +680,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
Window
*
pCare
=
lcl_GetCareWin
(
aViewData
.
GetViewShell
()
->
GetViewFrame
()
);
Window
*
pCare
=
lcl_GetCareWin
(
aViewData
.
GetViewShell
()
->
GetViewFrame
()
);
if
(
pCare
)
if
(
pCare
)
{
{
sal_B
ool
bLimit
=
false
;
b
ool
bLimit
=
false
;
Rectangle
aDlgPixel
;
Rectangle
aDlgPixel
;
Size
aWinSize
;
Size
aWinSize
;
Window
*
pWin
=
GetActiveWin
();
Window
*
pWin
=
GetActiveWin
();
...
@@ -693,7 +693,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -693,7 +693,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
{
{
if
(
nCurX
<
nDeltaX
||
nCurX
>=
nDeltaX
+
nSizeX
||
if
(
nCurX
<
nDeltaX
||
nCurX
>=
nDeltaX
+
nSizeX
||
nCurY
<
nDeltaY
||
nCurY
>=
nDeltaY
+
nSizeY
)
nCurY
<
nDeltaY
||
nCurY
>=
nDeltaY
+
nSizeY
)
bLimit
=
sal_T
rue
;
// es wird sowieso gescrollt
bLimit
=
t
rue
;
// es wird sowieso gescrollt
else
else
{
{
// Cursor ist auf dem Bildschirm
// Cursor ist auf dem Bildschirm
...
@@ -702,14 +702,14 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -702,14 +702,14 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
aViewData
.
GetMergeSizePixel
(
nCurX
,
nCurY
,
nCSX
,
nCSY
);
aViewData
.
GetMergeSizePixel
(
nCurX
,
nCurY
,
nCSX
,
nCSY
);
Rectangle
aCursor
(
aStart
,
Size
(
nCSX
,
nCSY
)
);
Rectangle
aCursor
(
aStart
,
Size
(
nCSX
,
nCSY
)
);
if
(
aCursor
.
IsOver
(
aDlgPixel
)
)
if
(
aCursor
.
IsOver
(
aDlgPixel
)
)
bLimit
=
sal_T
rue
;
// Zelle vom Dialog ueberdeckt
bLimit
=
t
rue
;
// Zelle vom Dialog ueberdeckt
}
}
}
}
}
}
if
(
bLimit
)
if
(
bLimit
)
{
{
sal_B
ool
bBottom
=
false
;
b
ool
bBottom
=
false
;
long
nTopSpace
=
aDlgPixel
.
Top
();
long
nTopSpace
=
aDlgPixel
.
Top
();
long
nBotSpace
=
aWinSize
.
Height
()
-
aDlgPixel
.
Bottom
();
long
nBotSpace
=
aWinSize
.
Height
()
-
aDlgPixel
.
Bottom
();
if
(
nBotSpace
>
0
&&
nBotSpace
>
nTopSpace
)
if
(
nBotSpace
>
0
&&
nBotSpace
>
nTopSpace
)
...
@@ -724,14 +724,14 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -724,14 +724,14 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
if
(
nCurY
>=
nDiff
)
// Pos. kann nicht negativ werden
if
(
nCurY
>=
nDiff
)
// Pos. kann nicht negativ werden
{
{
nSpaceY
=
nDlgBot
+
(
nBotSpace
-
nCellSizeY
)
/
2
;
nSpaceY
=
nDlgBot
+
(
nBotSpace
-
nCellSizeY
)
/
2
;
bBottom
=
sal_T
rue
;
bBottom
=
t
rue
;
bForceNew
=
sal_T
rue
;
bForceNew
=
t
rue
;
}
}
}
}
if
(
!
bBottom
&&
nTopSpace
>
0
)
if
(
!
bBottom
&&
nTopSpace
>
0
)
{
{
nSpaceY
=
(
nTopSpace
-
nCellSizeY
)
/
2
;
nSpaceY
=
(
nTopSpace
-
nCellSizeY
)
/
2
;
bForceNew
=
sal_T
rue
;
bForceNew
=
t
rue
;
}
}
}
}
}
}
...
@@ -740,7 +740,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -740,7 +740,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
SCsCOL
nNewDeltaX
=
nDeltaX
;
SCsCOL
nNewDeltaX
=
nDeltaX
;
SCsROW
nNewDeltaY
=
nDeltaY
;
SCsROW
nNewDeltaY
=
nDeltaY
;
sal_B
ool
bDoLine
=
false
;
b
ool
bDoLine
=
false
;
switch
(
eMode
)
switch
(
eMode
)
{
{
...
@@ -757,11 +757,11 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -757,11 +757,11 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
if
(
nNewDeltaY
<
0
)
nNewDeltaY
=
0
;
if
(
nNewDeltaY
<
0
)
nNewDeltaY
=
0
;
nSizeY
=
(
SCsROW
)
aViewData
.
CellsAtY
(
nNewDeltaY
,
1
,
eAlignY
);
nSizeY
=
(
SCsROW
)
aViewData
.
CellsAtY
(
nNewDeltaY
,
1
,
eAlignY
);
}
}
bDoLine
=
sal_T
rue
;
bDoLine
=
t
rue
;
break
;
break
;
case
SC_FOLLOW_LINE
:
case
SC_FOLLOW_LINE
:
bDoLine
=
sal_T
rue
;
bDoLine
=
t
rue
;
break
;
break
;
case
SC_FOLLOW_FIX
:
case
SC_FOLLOW_FIX
:
...
@@ -793,7 +793,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
...
@@ -793,7 +793,7 @@ void ScTabView::AlignToCursor( SCsCOL nCurX, SCsROW nCurY, ScFollowMode eMode,
nSizeY
=
(
SCsROW
)
aViewData
.
CellsAtY
(
nNewDeltaY
,
1
,
eAlignY
);
nSizeY
=
(
SCsROW
)
aViewData
.
CellsAtY
(
nNewDeltaY
,
1
,
eAlignY
);
}
}
bDoLine
=
sal_T
rue
;
bDoLine
=
t
rue
;
break
;
break
;
case
SC_FOLLOW_NONE
:
case
SC_FOLLOW_NONE
:
...
@@ -985,7 +985,7 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
...
@@ -985,7 +985,7 @@ void ScTabView::MoveCursorRel( SCsCOL nMovX, SCsROW nMovY, ScFollowMode eMode,
if
(
nMovY
!=
0
&&
VALIDCOLROW
(
nCurX
,
nCurY
))
if
(
nMovY
!=
0
&&
VALIDCOLROW
(
nCurX
,
nCurY
))
SkipCursorVertical
(
nCurX
,
nCurY
,
nOldY
,
nMovY
);
SkipCursorVertical
(
nCurX
,
nCurY
,
nOldY
,
nMovY
);
MoveCursorAbs
(
nCurX
,
nCurY
,
eMode
,
bShift
,
false
,
sal_T
rue
,
bKeepSel
);
MoveCursorAbs
(
nCurX
,
nCurY
,
eMode
,
bShift
,
false
,
t
rue
,
bKeepSel
);
}
}
void
ScTabView
::
MoveCursorPage
(
SCsCOL
nMovX
,
SCsROW
nMovY
,
ScFollowMode
eMode
,
bool
bShift
,
bool
bKeepSel
)
void
ScTabView
::
MoveCursorPage
(
SCsCOL
nMovX
,
SCsROW
nMovY
,
ScFollowMode
eMode
,
bool
bShift
,
bool
bKeepSel
)
...
@@ -1219,7 +1219,7 @@ void ScTabView::FindNextUnprot( bool bShift, bool bInSelection )
...
@@ -1219,7 +1219,7 @@ void ScTabView::FindNextUnprot( bool bShift, bool bInSelection )
short
nMove
=
bShift
?
-
1
:
1
;
short
nMove
=
bShift
?
-
1
:
1
;
ScMarkData
&
rMark
=
aViewData
.
GetMarkData
();
ScMarkData
&
rMark
=
aViewData
.
GetMarkData
();
sal_B
ool
bMarked
=
bInSelection
&&
(
rMark
.
IsMarked
()
||
rMark
.
IsMultiMarked
());
b
ool
bMarked
=
bInSelection
&&
(
rMark
.
IsMarked
()
||
rMark
.
IsMultiMarked
());
SCCOL
nCurX
;
SCCOL
nCurX
;
SCROW
nCurY
;
SCROW
nCurY
;
...
@@ -1333,7 +1333,7 @@ void ScTabView::MarkRange( const ScRange& rRange, bool bSetCursor, bool bContinu
...
@@ -1333,7 +1333,7 @@ void ScTabView::MarkRange( const ScRange& rRange, bool bSetCursor, bool bContinu
SetTabNo
(
nTab
);
SetTabNo
(
nTab
);
HideAllCursors
();
HideAllCursors
();
DoneBlockMode
(
bContinue
);
// bContinue==
sal_T
rue -> clear old mark
DoneBlockMode
(
bContinue
);
// bContinue==
t
rue -> clear old mark
if
(
bSetCursor
)
// Wenn Cursor gesetzt wird, immer auch alignen
if
(
bSetCursor
)
// Wenn Cursor gesetzt wird, immer auch alignen
{
{
SCCOL
nAlignX
=
rRange
.
aStart
.
Col
();
SCCOL
nAlignX
=
rRange
.
aStart
.
Col
();
...
@@ -1443,7 +1443,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
...
@@ -1443,7 +1443,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
FmFormShell
*
pFormSh
=
aViewData
.
GetViewShell
()
->
GetFormShell
();
FmFormShell
*
pFormSh
=
aViewData
.
GetViewShell
()
->
GetFormShell
();
if
(
pFormSh
)
if
(
pFormSh
)
{
{
sal_Bool
bAllowed
=
sal
::
static_int_cast
<
sal_Bool
>
(
pFormSh
->
PrepareClose
(
sal_True
)
);
bool
bAllowed
=
static_cast
<
bool
>
(
pFormSh
->
PrepareClose
(
true
)
);
if
(
!
bAllowed
)
if
(
!
bAllowed
)
{
{
//! Fehlermeldung? oder macht das die FormShell selber?
//! Fehlermeldung? oder macht das die FormShell selber?
...
@@ -1467,7 +1467,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
...
@@ -1467,7 +1467,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
SCTAB
nOldPos
=
nTab
;
SCTAB
nOldPos
=
nTab
;
while
(
!
pDoc
->
IsVisible
(
nTab
))
// naechste sichtbare suchen
while
(
!
pDoc
->
IsVisible
(
nTab
))
// naechste sichtbare suchen
{
{
sal_B
ool
bUp
=
(
nTab
>=
nOldPos
);
b
ool
bUp
=
(
nTab
>=
nOldPos
);
if
(
bUp
)
if
(
bUp
)
{
{
++
nTab
;
++
nTab
;
...
@@ -1495,7 +1495,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
...
@@ -1495,7 +1495,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
DrawDeselectAll
();
DrawDeselectAll
();
ScModule
*
pScMod
=
SC_MOD
();
ScModule
*
pScMod
=
SC_MOD
();
sal_B
ool
bRefMode
=
pScMod
->
IsFormulaMode
();
b
ool
bRefMode
=
pScMod
->
IsFormulaMode
();
if
(
!
bRefMode
)
// Abfrage, damit RefMode bei Tabellenwechsel funktioniert
if
(
!
bRefMode
)
// Abfrage, damit RefMode bei Tabellenwechsel funktioniert
{
{
DoneBlockMode
();
DoneBlockMode
();
...
@@ -1504,14 +1504,14 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
...
@@ -1504,14 +1504,14 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
}
}
ScSplitPos
eOldActive
=
aViewData
.
GetActivePart
();
// before switching
ScSplitPos
eOldActive
=
aViewData
.
GetActivePart
();
// before switching
sal_B
ool
bFocus
=
pGridWin
[
eOldActive
]
->
HasFocus
();
b
ool
bFocus
=
pGridWin
[
eOldActive
]
->
HasFocus
();
aViewData
.
SetTabNo
(
nTab
);
aViewData
.
SetTabNo
(
nTab
);
// UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen
// UpdateShow noch vor SetCursor, damit UpdateAutoFillMark die richtigen
// Fenster findet (wird aus SetCursor gerufen)
// Fenster findet (wird aus SetCursor gerufen)
UpdateShow
();
UpdateShow
();
aViewData
.
ResetOldCursor
();
aViewData
.
ResetOldCursor
();
SetCursor
(
aViewData
.
GetCurX
(),
aViewData
.
GetCurY
(),
sal_T
rue
);
SetCursor
(
aViewData
.
GetCurX
(),
aViewData
.
GetCurY
(),
t
rue
);
SfxBindings
&
rBindings
=
aViewData
.
GetBindings
();
SfxBindings
&
rBindings
=
aViewData
.
GetBindings
();
ScMarkData
&
rMark
=
aViewData
.
GetMarkData
();
ScMarkData
&
rMark
=
aViewData
.
GetMarkData
();
...
@@ -1540,7 +1540,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
...
@@ -1540,7 +1540,7 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
bExtendSelection
=
false
;
bExtendSelection
=
false
;
if
(
bExtendSelection
)
if
(
bExtendSelection
)
rMark
.
SelectTable
(
nTab
,
sal_T
rue
);
rMark
.
SelectTable
(
nTab
,
t
rue
);
else
else
{
{
rMark
.
SelectOneTable
(
nTab
);
rMark
.
SelectOneTable
(
nTab
);
...
@@ -1604,13 +1604,13 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
...
@@ -1604,13 +1604,13 @@ void ScTabView::SetTabNo( SCTAB nTab, bool bNew, bool bExtendSelection, bool bSa
// Fixierungen
// Fixierungen
sal_B
ool
bResize
=
false
;
b
ool
bResize
=
false
;
if
(
aViewData
.
GetHSplitMode
()
==
SC_SPLIT_FIX
)
if
(
aViewData
.
GetHSplitMode
()
==
SC_SPLIT_FIX
)
if
(
aViewData
.
UpdateFixX
())
if
(
aViewData
.
UpdateFixX
())
bResize
=
sal_T
rue
;
bResize
=
t
rue
;
if
(
aViewData
.
GetVSplitMode
()
==
SC_SPLIT_FIX
)
if
(
aViewData
.
GetVSplitMode
()
==
SC_SPLIT_FIX
)
if
(
aViewData
.
UpdateFixY
())
if
(
aViewData
.
UpdateFixY
())
bResize
=
sal_T
rue
;
bResize
=
t
rue
;
if
(
bResize
)
if
(
bResize
)
RepeatResize
();
RepeatResize
();
InvalidateSplit
();
InvalidateSplit
();
...
@@ -1677,7 +1677,7 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW
...
@@ -1677,7 +1677,7 @@ void ScTabView::MakeEditView( ScEditEngineDefaulter* pEngine, SCCOL nCol, SCROW
SCCOL
nScrX
=
aViewData
.
GetPosX
(
eHWhich
);
SCCOL
nScrX
=
aViewData
.
GetPosX
(
eHWhich
);
SCROW
nScrY
=
aViewData
.
GetPosY
(
eVWhich
);
SCROW
nScrY
=
aViewData
.
GetPosY
(
eVWhich
);
sal_B
ool
bPosVisible
=
b
ool
bPosVisible
=
(
nCol
>=
nScrX
&&
nCol
<=
nScrX
+
aViewData
.
VisibleCellsX
(
eHWhich
)
+
1
&&
(
nCol
>=
nScrX
&&
nCol
<=
nScrX
+
aViewData
.
VisibleCellsX
(
eHWhich
)
+
1
&&
nRow
>=
nScrY
&&
nRow
<=
nScrY
+
aViewData
.
VisibleCellsY
(
eVWhich
)
+
1
);
nRow
>=
nScrY
&&
nRow
<=
nScrY
+
aViewData
.
VisibleCellsY
(
eVWhich
)
+
1
);
...
@@ -1737,11 +1737,11 @@ void ScTabView::KillEditView( bool bNoPaint )
...
@@ -1737,11 +1737,11 @@ void ScTabView::KillEditView( bool bNoPaint )
SCROW
nRow1
=
aViewData
.
GetEditStartRow
();
SCROW
nRow1
=
aViewData
.
GetEditStartRow
();
SCCOL
nCol2
=
aViewData
.
GetEditEndCol
();
SCCOL
nCol2
=
aViewData
.
GetEditEndCol
();
SCROW
nRow2
=
aViewData
.
GetEditEndRow
();
SCROW
nRow2
=
aViewData
.
GetEditEndRow
();
sal_B
ool
bPaint
[
4
];
b
ool
bPaint
[
4
];
sal_Bool
bNotifyAcc
(
false
)
;
bool
bNotifyAcc
=
false
;
sal_B
ool
bExtended
=
nRow1
!=
nRow2
;
// Col wird sowieso bis zum Ende gezeichnet
b
ool
bExtended
=
nRow1
!=
nRow2
;
// Col wird sowieso bis zum Ende gezeichnet
sal_B
ool
bAtCursor
=
nCol1
<=
aViewData
.
GetCurX
()
&&
b
ool
bAtCursor
=
nCol1
<=
aViewData
.
GetCurX
()
&&
nCol2
>=
aViewData
.
GetCurX
()
&&
nCol2
>=
aViewData
.
GetCurX
()
&&
nRow1
==
aViewData
.
GetCurY
();
nRow1
==
aViewData
.
GetCurY
();
for
(
i
=
0
;
i
<
4
;
i
++
)
for
(
i
=
0
;
i
<
4
;
i
++
)
...
@@ -1773,12 +1773,12 @@ void ScTabView::KillEditView( bool bNoPaint )
...
@@ -1773,12 +1773,12 @@ void ScTabView::KillEditView( bool bNoPaint )
}
}
if
(
pDrawView
)
if
(
pDrawView
)
DrawEnableAnim
(
sal_T
rue
);
DrawEnableAnim
(
t
rue
);
// GrabFocus immer dann, wenn diese View aktiv ist und
// GrabFocus immer dann, wenn diese View aktiv ist und
// die Eingabezeile den Focus hat
// die Eingabezeile den Focus hat
sal_B
ool
bGrabFocus
=
false
;
b
ool
bGrabFocus
=
false
;
if
(
aViewData
.
IsActive
())
if
(
aViewData
.
IsActive
())
{
{
ScInputHandler
*
pInputHdl
=
SC_MOD
()
->
GetInputHdl
();
ScInputHandler
*
pInputHdl
=
SC_MOD
()
->
GetInputHdl
();
...
@@ -1786,7 +1786,7 @@ void ScTabView::KillEditView( bool bNoPaint )
...
@@ -1786,7 +1786,7 @@ void ScTabView::KillEditView( bool bNoPaint )
{
{
ScInputWindow
*
pInputWin
=
pInputHdl
->
GetInputWindow
();
ScInputWindow
*
pInputWin
=
pInputHdl
->
GetInputWindow
();
if
(
pInputWin
&&
pInputWin
->
IsInputActive
())
if
(
pInputWin
&&
pInputWin
->
IsInputActive
())
bGrabFocus
=
sal_T
rue
;
bGrabFocus
=
t
rue
;
}
}
}
}
...
@@ -1856,7 +1856,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
...
@@ -1856,7 +1856,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
{
{
ScHSplitPos
eHWhich
=
WhichH
(
(
ScSplitPos
)
i
);
ScHSplitPos
eHWhich
=
WhichH
(
(
ScSplitPos
)
i
);
ScVSplitPos
eVWhich
=
WhichV
(
(
ScSplitPos
)
i
);
ScVSplitPos
eVWhich
=
WhichV
(
(
ScSplitPos
)
i
);
sal_B
ool
bOut
=
false
;
b
ool
bOut
=
false
;
nCol1
=
nStartCol
;
nCol1
=
nStartCol
;
nRow1
=
nStartRow
;
nRow1
=
nStartRow
;
...
@@ -1871,16 +1871,16 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
...
@@ -1871,16 +1871,16 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
if
(
eMode
==
SC_UPDATE_ALL
)
// for UPDATE_ALL, paint anyway
if
(
eMode
==
SC_UPDATE_ALL
)
// for UPDATE_ALL, paint anyway
nCol2
=
nScrX
;
// (because of extending strings to the right)
nCol2
=
nScrX
;
// (because of extending strings to the right)
else
else
bOut
=
sal_T
rue
;
// completely outside the window
bOut
=
t
rue
;
// completely outside the window
}
}
if
(
nRow1
<
nScrY
)
nRow1
=
nScrY
;
if
(
nRow1
<
nScrY
)
nRow1
=
nScrY
;
if
(
nRow2
<
nScrY
)
bOut
=
sal_T
rue
;
if
(
nRow2
<
nScrY
)
bOut
=
t
rue
;
SCCOL
nLastX
=
nScrX
+
aViewData
.
VisibleCellsX
(
eHWhich
)
+
1
;
SCCOL
nLastX
=
nScrX
+
aViewData
.
VisibleCellsX
(
eHWhich
)
+
1
;
SCROW
nLastY
=
nScrY
+
aViewData
.
VisibleCellsY
(
eVWhich
)
+
1
;
SCROW
nLastY
=
nScrY
+
aViewData
.
VisibleCellsY
(
eVWhich
)
+
1
;
if
(
nCol1
>
nLastX
)
bOut
=
sal_T
rue
;
if
(
nCol1
>
nLastX
)
bOut
=
t
rue
;
if
(
nCol2
>
nLastX
)
nCol2
=
nLastX
;
if
(
nCol2
>
nLastX
)
nCol2
=
nLastX
;
if
(
nRow1
>
nLastY
)
bOut
=
sal_T
rue
;
if
(
nRow1
>
nLastY
)
bOut
=
t
rue
;
if
(
nRow2
>
nLastY
)
nRow2
=
nLastY
;
if
(
nRow2
>
nLastY
)
nRow2
=
nLastY
;
if
(
!
bOut
)
if
(
!
bOut
)
...
@@ -1889,7 +1889,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
...
@@ -1889,7 +1889,7 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
pGridWin
[
i
]
->
Draw
(
nCol1
,
nRow1
,
nCol2
,
nRow2
,
eMode
);
pGridWin
[
i
]
->
Draw
(
nCol1
,
nRow1
,
nCol2
,
nRow2
,
eMode
);
else
// ALL oder MARKS
else
// ALL oder MARKS
{
{
sal_B
ool
bLayoutRTL
=
aViewData
.
GetDocument
()
->
IsLayoutRTL
(
aViewData
.
GetTabNo
()
);
b
ool
bLayoutRTL
=
aViewData
.
GetDocument
()
->
IsLayoutRTL
(
aViewData
.
GetTabNo
()
);
long
nLayoutSign
=
bLayoutRTL
?
-
1
:
1
;
long
nLayoutSign
=
bLayoutRTL
?
-
1
:
1
;
Point
aStart
=
aViewData
.
GetScrPos
(
nCol1
,
nRow1
,
(
ScSplitPos
)
i
);
Point
aStart
=
aViewData
.
GetScrPos
(
nCol1
,
nRow1
,
(
ScSplitPos
)
i
);
...
@@ -1903,14 +1903,14 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
...
@@ -1903,14 +1903,14 @@ void ScTabView::PaintArea( SCCOL nStartCol, SCROW nStartRow, SCCOL nEndCol, SCRO
if
(
eMode
==
SC_UPDATE_ALL
&&
nRow2
>=
MAXROW
)
if
(
eMode
==
SC_UPDATE_ALL
&&
nRow2
>=
MAXROW
)
aEnd
.
Y
()
=
pGridWin
[
i
]
->
GetOutputSizePixel
().
Height
();
aEnd
.
Y
()
=
pGridWin
[
i
]
->
GetOutputSizePixel
().
Height
();
sal_Bool
bShowChanges
=
sal_T
rue
;
//! ...
bool
bShowChanges
=
t
rue
;
//! ...
if
(
bShowChanges
)
if
(
bShowChanges
)
{
{
aStart
.
X
()
-=
nLayoutSign
;
// include change marks
aStart
.
X
()
-=
nLayoutSign
;
// include change marks
aStart
.
Y
()
-=
1
;
aStart
.
Y
()
-=
1
;
}
}
sal_B
ool
bMarkClipped
=
aViewData
.
GetOptions
().
GetOption
(
VOPT_CLIPMARKS
);
b
ool
bMarkClipped
=
aViewData
.
GetOptions
().
GetOption
(
VOPT_CLIPMARKS
);
if
(
bMarkClipped
)
if
(
bMarkClipped
)
{
{
// dazu muesste ScColumn::IsEmptyBlock optimiert werden
// dazu muesste ScColumn::IsEmptyBlock optimiert werden
...
@@ -1972,18 +1972,18 @@ void ScTabView::PaintRangeFinder( long nNumber )
...
@@ -1972,18 +1972,18 @@ void ScTabView::PaintRangeFinder( long nNumber )
// wegnehmen -> Repaint
// wegnehmen -> Repaint
// SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende
// SC_UPDATE_MARKS: Invalidate, nicht bis zum Zeilenende
sal_B
ool
bHiddenEdge
=
false
;
b
ool
bHiddenEdge
=
false
;
SCROW
nTmp
;
SCROW
nTmp
;
ScDocument
*
pDoc
=
aViewData
.
GetDocument
();
ScDocument
*
pDoc
=
aViewData
.
GetDocument
();
while
(
nCol1
>
0
&&
pDoc
->
ColHidden
(
nCol1
,
nTab
)
)
while
(
nCol1
>
0
&&
pDoc
->
ColHidden
(
nCol1
,
nTab
)
)
{
{
--
nCol1
;
--
nCol1
;
bHiddenEdge
=
sal_T
rue
;
bHiddenEdge
=
t
rue
;
}
}
while
(
nCol2
<
MAXCOL
&&
pDoc
->
ColHidden
(
nCol2
,
nTab
)
)
while
(
nCol2
<
MAXCOL
&&
pDoc
->
ColHidden
(
nCol2
,
nTab
)
)
{
{
++
nCol2
;
++
nCol2
;
bHiddenEdge
=
sal_T
rue
;
bHiddenEdge
=
t
rue
;
}
}
nTmp
=
pDoc
->
LastVisibleRow
(
0
,
nRow1
,
nTab
);
nTmp
=
pDoc
->
LastVisibleRow
(
0
,
nRow1
,
nTab
);
if
(
!
ValidRow
(
nTmp
))
if
(
!
ValidRow
(
nTmp
))
...
@@ -1991,7 +1991,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
...
@@ -1991,7 +1991,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
if
(
nTmp
<
nRow1
)
if
(
nTmp
<
nRow1
)
{
{
nRow1
=
nTmp
;
nRow1
=
nTmp
;
bHiddenEdge
=
sal_T
rue
;
bHiddenEdge
=
t
rue
;
}
}
nTmp
=
pDoc
->
FirstVisibleRow
(
nRow2
,
MAXROW
,
nTab
);
nTmp
=
pDoc
->
FirstVisibleRow
(
nRow2
,
MAXROW
,
nTab
);
if
(
!
ValidRow
(
nTmp
))
if
(
!
ValidRow
(
nTmp
))
...
@@ -1999,7 +1999,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
...
@@ -1999,7 +1999,7 @@ void ScTabView::PaintRangeFinder( long nNumber )
if
(
nTmp
>
nRow2
)
if
(
nTmp
>
nRow2
)
{
{
nRow2
=
nTmp
;
nRow2
=
nTmp
;
bHiddenEdge
=
sal_T
rue
;
bHiddenEdge
=
t
rue
;
}
}
if
(
nCol2
-
nCol1
>
1
&&
nRow2
-
nRow1
>
1
&&
!
bHiddenEdge
)
if
(
nCol2
-
nCol1
>
1
&&
nRow2
-
nRow1
>
1
&&
!
bHiddenEdge
)
...
@@ -2144,7 +2144,7 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol )
...
@@ -2144,7 +2144,7 @@ void ScTabView::PaintTopArea( SCCOL nStartCol, SCCOL nEndCol )
if
(
nStartCol
>
0
)
if
(
nStartCol
>
0
)
--
nStartCol
;
//! allgemeiner ?
--
nStartCol
;
//! allgemeiner ?
sal_B
ool
bLayoutRTL
=
aViewData
.
GetDocument
()
->
IsLayoutRTL
(
aViewData
.
GetTabNo
()
);
b
ool
bLayoutRTL
=
aViewData
.
GetDocument
()
->
IsLayoutRTL
(
aViewData
.
GetTabNo
()
);
long
nLayoutSign
=
bLayoutRTL
?
-
1
:
1
;
long
nLayoutSign
=
bLayoutRTL
?
-
1
:
1
;
for
(
sal_uInt16
i
=
0
;
i
<
2
;
i
++
)
for
(
sal_uInt16
i
=
0
;
i
<
2
;
i
++
)
...
@@ -2232,7 +2232,7 @@ bool ScTabView::PaintExtras()
...
@@ -2232,7 +2232,7 @@ bool ScTabView::PaintExtras()
aViewData
.
SetTabNo
(
nCount
-
1
);
aViewData
.
SetTabNo
(
nCount
-
1
);
bRet
=
true
;
bRet
=
true
;
}
}
pTabControl
->
UpdateStatus
();
//
sal_T
rue = active
pTabControl
->
UpdateStatus
();
//
t
rue = active
return
bRet
;
return
bRet
;
}
}
...
@@ -2246,8 +2246,8 @@ void ScTabView::RecalcPPT()
...
@@ -2246,8 +2246,8 @@ void ScTabView::RecalcPPT()
aViewData
.
RefreshZoom
();
// pre-calculate new PPT values
aViewData
.
RefreshZoom
();
// pre-calculate new PPT values
sal_B
ool
bChangedX
=
(
aViewData
.
GetPPTX
()
!=
nOldX
);
b
ool
bChangedX
=
(
aViewData
.
GetPPTX
()
!=
nOldX
);
sal_B
ool
bChangedY
=
(
aViewData
.
GetPPTY
()
!=
nOldY
);
b
ool
bChangedY
=
(
aViewData
.
GetPPTY
()
!=
nOldY
);
if
(
bChangedX
||
bChangedY
)
if
(
bChangedX
||
bChangedY
)
{
{
// call view SetZoom (including draw scale, split update etc)
// call view SetZoom (including draw scale, split update etc)
...
@@ -2276,13 +2276,13 @@ void ScTabView::ActivateView( bool bActivate, bool bFirst )
...
@@ -2276,13 +2276,13 @@ void ScTabView::ActivateView( bool bActivate, bool bFirst )
// wird nur bei MDI-(De)Activate gerufen
// wird nur bei MDI-(De)Activate gerufen
// aViewData.Activate hinten wegen Cursor-Show bei KillEditView
// aViewData.Activate hinten wegen Cursor-Show bei KillEditView
// Markierung nicht mehr loeschen - wenn an der ViewData Activate(
sal_F
alse) gesetzt ist,
// Markierung nicht mehr loeschen - wenn an der ViewData Activate(
f
alse) gesetzt ist,
// wird die Markierung nicht ausgegeben
// wird die Markierung nicht ausgegeben
if
(
!
bActivate
)
if
(
!
bActivate
)
{
{
ScModule
*
pScMod
=
SC_MOD
();
ScModule
*
pScMod
=
SC_MOD
();
sal_B
ool
bRefMode
=
pScMod
->
IsFormulaMode
();
b
ool
bRefMode
=
pScMod
->
IsFormulaMode
();
// Referenzeingabe nicht abbrechen, um Referenzen auf
// Referenzeingabe nicht abbrechen, um Referenzen auf
// andere Dokumente zuzulassen
// andere Dokumente zuzulassen
...
@@ -2349,7 +2349,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
...
@@ -2349,7 +2349,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
{
{
bInActivatePart
=
true
;
bInActivatePart
=
true
;
sal_B
ool
bRefMode
=
SC_MOD
()
->
IsFormulaMode
();
b
ool
bRefMode
=
SC_MOD
()
->
IsFormulaMode
();
// the HasEditView call during SetCursor would fail otherwise
// the HasEditView call during SetCursor would fail otherwise
if
(
aViewData
.
HasEditView
(
eOld
)
&&
!
bRefMode
)
if
(
aViewData
.
HasEditView
(
eOld
)
&&
!
bRefMode
)
...
@@ -2359,11 +2359,11 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
...
@@ -2359,11 +2359,11 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
ScVSplitPos
eOldV
=
WhichV
(
eOld
);
ScVSplitPos
eOldV
=
WhichV
(
eOld
);
ScHSplitPos
eNewH
=
WhichH
(
eWhich
);
ScHSplitPos
eNewH
=
WhichH
(
eWhich
);
ScVSplitPos
eNewV
=
WhichV
(
eWhich
);
ScVSplitPos
eNewV
=
WhichV
(
eWhich
);
sal_B
ool
bTopCap
=
pColBar
[
eOldH
]
&&
pColBar
[
eOldH
]
->
IsMouseCaptured
();
b
ool
bTopCap
=
pColBar
[
eOldH
]
&&
pColBar
[
eOldH
]
->
IsMouseCaptured
();
sal_B
ool
bLeftCap
=
pRowBar
[
eOldV
]
&&
pRowBar
[
eOldV
]
->
IsMouseCaptured
();
b
ool
bLeftCap
=
pRowBar
[
eOldV
]
&&
pRowBar
[
eOldV
]
->
IsMouseCaptured
();
sal_B
ool
bFocus
=
pGridWin
[
eOld
]
->
HasFocus
();
b
ool
bFocus
=
pGridWin
[
eOld
]
->
HasFocus
();
sal_B
ool
bCapture
=
pGridWin
[
eOld
]
->
IsMouseCaptured
();
b
ool
bCapture
=
pGridWin
[
eOld
]
->
IsMouseCaptured
();
if
(
bCapture
)
if
(
bCapture
)
pGridWin
[
eOld
]
->
ReleaseMouse
();
pGridWin
[
eOld
]
->
ReleaseMouse
();
pGridWin
[
eOld
]
->
ClickExtern
();
pGridWin
[
eOld
]
->
ClickExtern
();
...
@@ -2391,7 +2391,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
...
@@ -2391,7 +2391,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
if
(
bTopCap
&&
pColBar
[
eNewH
]
)
if
(
bTopCap
&&
pColBar
[
eNewH
]
)
{
{
pColBar
[
eOldH
]
->
SetIgnoreMove
(
sal_T
rue
);
pColBar
[
eOldH
]
->
SetIgnoreMove
(
t
rue
);
pColBar
[
eNewH
]
->
SetIgnoreMove
(
false
);
pColBar
[
eNewH
]
->
SetIgnoreMove
(
false
);
pHdrSelEng
->
SetWindow
(
pColBar
[
eNewH
]
);
pHdrSelEng
->
SetWindow
(
pColBar
[
eNewH
]
);
long
nWidth
=
pColBar
[
eNewH
]
->
GetOutputSizePixel
().
Width
();
long
nWidth
=
pColBar
[
eNewH
]
->
GetOutputSizePixel
().
Width
();
...
@@ -2400,7 +2400,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
...
@@ -2400,7 +2400,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
}
}
if
(
bLeftCap
&&
pRowBar
[
eNewV
]
)
if
(
bLeftCap
&&
pRowBar
[
eNewV
]
)
{
{
pRowBar
[
eOldV
]
->
SetIgnoreMove
(
sal_T
rue
);
pRowBar
[
eOldV
]
->
SetIgnoreMove
(
t
rue
);
pRowBar
[
eNewV
]
->
SetIgnoreMove
(
false
);
pRowBar
[
eNewV
]
->
SetIgnoreMove
(
false
);
pHdrSelEng
->
SetWindow
(
pRowBar
[
eNewV
]
);
pHdrSelEng
->
SetWindow
(
pRowBar
[
eNewV
]
);
long
nHeight
=
pRowBar
[
eNewV
]
->
GetOutputSizePixel
().
Height
();
long
nHeight
=
pRowBar
[
eNewV
]
->
GetOutputSizePixel
().
Height
();
...
@@ -2413,7 +2413,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
...
@@ -2413,7 +2413,7 @@ void ScTabView::ActivatePart( ScSplitPos eWhich )
pGridWin
[
eWhich
]
->
ShowCursor
();
pGridWin
[
eWhich
]
->
ShowCursor
();
SfxInPlaceClient
*
pClient
=
aViewData
.
GetViewShell
()
->
GetIPClient
();
SfxInPlaceClient
*
pClient
=
aViewData
.
GetViewShell
()
->
GetIPClient
();
sal_B
ool
bOleActive
=
(
pClient
&&
pClient
->
IsObjectInPlaceActive
()
);
b
ool
bOleActive
=
(
pClient
&&
pClient
->
IsObjectInPlaceActive
()
);
// don't switch ViewShell's active window during RefInput, because the focus
// don't switch ViewShell's active window during RefInput, because the focus
// might change, and subsequent SetReference calls wouldn't find the right EditView
// might change, and subsequent SetReference calls wouldn't find the right EditView
...
...
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