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
f212779a
Kaydet (Commit)
f212779a
authored
Kas 10, 2014
tarafından
Tobias Madl
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
changed timer to idle, and translated de to en
Change-Id: Ie7789b17a6055e30f67b3a523fd38d221aa8e9ed
üst
83a5cc3a
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
58 additions
and
61 deletions
+58
-61
navipi.hxx
sc/source/ui/inc/navipi.hxx
+1
-1
navipi.cxx
sc/source/ui/navipi/navipi.cxx
+57
-60
No files found.
sc/source/ui/inc/navipi.hxx
Dosyayı görüntüle @
f212779a
...
@@ -228,7 +228,7 @@ private:
...
@@ -228,7 +228,7 @@ private:
ScScenarioWindow
aWndScenarios
;
ScScenarioWindow
aWndScenarios
;
ScDocListBox
aLbDocuments
;
ScDocListBox
aLbDocuments
;
Timer
aContentTimer
;
Idle
aContentIdle
;
OUString
aTitleBase
;
OUString
aTitleBase
;
OUString
aStrDragMode
;
OUString
aStrDragMode
;
...
...
sc/source/ui/navipi/navipi.cxx
Dosyayı görüntüle @
f212779a
...
@@ -49,10 +49,7 @@
...
@@ -49,10 +49,7 @@
#include <algorithm>
#include <algorithm>
// Timeout, um Notizen zu suchen
// toleance, how much spac above the folded size is still small
#define SC_CONTENT_TIMEOUT 1000
// Toleranz, wieviel ueber der eingeklappten Groesse noch klein ist
#define SCNAV_MINTOL 5
#define SCNAV_MINTOL 5
// maximum values for UI
// maximum values for UI
...
@@ -103,9 +100,9 @@ bool ColumnEdit::Notify( NotifyEvent& rNEvt )
...
@@ -103,9 +100,9 @@ bool ColumnEdit::Notify( NotifyEvent& rNEvt )
if
(
!
aCode
.
IsMod1
()
&&
!
aCode
.
IsMod2
()
)
if
(
!
aCode
.
IsMod1
()
&&
!
aCode
.
IsMod2
()
)
{
{
//!
Eingabeueberpruefung (nur Zahlen oder nur Buchstaben, max 2 bzw 3 Stellen
)
//!
Input Validation (only alphanumerics, max 2-3 digits
)
//! wa
r vor VCL per nicht weitergeleitetem KeyI
nput
//! wa
s before VCL not forwarded keyi
nput
//!
dafuer was neues ausdenken
!!!
//!
rethink this
!!!
if
(
aCode
.
GetCode
()
==
KEY_RETURN
)
if
(
aCode
.
GetCode
()
==
KEY_RETURN
)
{
{
...
@@ -161,7 +158,7 @@ void ColumnEdit::EvalText()
...
@@ -161,7 +158,7 @@ void ColumnEdit::EvalText()
if
(
!
aStrCol
.
isEmpty
())
if
(
!
aStrCol
.
isEmpty
())
{
{
// nKeyGroup
wird bei VCL mangels KeyInput nicht mehr gesetz
t
// nKeyGroup
is no longer set at VCL, in cause of lack of keyinpu
t
if
(
CharClass
::
isAsciiNumeric
(
aStrCol
)
)
if
(
CharClass
::
isAsciiNumeric
(
aStrCol
)
)
nCol
=
NumStrToAlpha
(
aStrCol
);
nCol
=
NumStrToAlpha
(
aStrCol
);
...
@@ -341,14 +338,14 @@ void CommandToolBox::Select( sal_uInt16 nSelId )
...
@@ -341,14 +338,14 @@ void CommandToolBox::Select( sal_uInt16 nSelId )
NavListMode
eOldMode
=
rDlg
.
eListMode
;
NavListMode
eOldMode
=
rDlg
.
eListMode
;
NavListMode
eNewMode
=
eOldMode
;
NavListMode
eNewMode
=
eOldMode
;
if
(
nSelId
==
IID_SCENARIOS
)
// auf Szenario
if
(
nSelId
==
IID_SCENARIOS
)
{
{
if
(
eOldMode
==
NAV_LMODE_SCENARIOS
)
if
(
eOldMode
==
NAV_LMODE_SCENARIOS
)
eNewMode
=
NAV_LMODE_AREAS
;
eNewMode
=
NAV_LMODE_AREAS
;
else
else
eNewMode
=
NAV_LMODE_SCENARIOS
;
eNewMode
=
NAV_LMODE_SCENARIOS
;
}
}
else
//
ein/aus
else
//
on/off
{
{
if
(
eOldMode
==
NAV_LMODE_NONE
)
if
(
eOldMode
==
NAV_LMODE_NONE
)
eNewMode
=
NAV_LMODE_AREAS
;
eNewMode
=
NAV_LMODE_AREAS
;
...
@@ -388,8 +385,8 @@ void CommandToolBox::Click()
...
@@ -388,8 +385,8 @@ void CommandToolBox::Click()
IMPL_LINK_NOARG
(
CommandToolBox
,
ToolBoxDropdownClickHdl
)
IMPL_LINK_NOARG
(
CommandToolBox
,
ToolBoxDropdownClickHdl
)
{
{
//
Das Popupmenue fuer den Dropmodus muss im Click (Button Down)
//
the popup menue of the drop modus has to be called in the
//
statt im Select (Button Up) aufgerufen werden.
//
click (button down) and not in the select (button up)
if
(
GetCurItemId
()
==
IID_DROPMODE
)
if
(
GetCurItemId
()
==
IID_DROPMODE
)
{
{
...
@@ -398,12 +395,12 @@ IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl)
...
@@ -398,12 +395,12 @@ IMPL_LINK_NOARG(CommandToolBox, ToolBoxDropdownClickHdl)
aPop
.
Execute
(
this
,
GetItemRect
(
IID_DROPMODE
),
POPUPMENU_EXECUTE_DOWN
);
aPop
.
Execute
(
this
,
GetItemRect
(
IID_DROPMODE
),
POPUPMENU_EXECUTE_DOWN
);
sal_uInt16
nId
=
aPop
.
GetSelected
();
sal_uInt16
nId
=
aPop
.
GetSelected
();
EndSelection
();
//
vor SetDropMode (SetDropMode ruft
SetItemImage)
EndSelection
();
//
bevore SetDropMode (SetDropMode calls
SetItemImage)
if
(
nId
>=
RID_DROPMODE_URL
&&
nId
<=
RID_DROPMODE_COPY
)
if
(
nId
>=
RID_DROPMODE_URL
&&
nId
<=
RID_DROPMODE_COPY
)
rDlg
.
SetDropMode
(
nId
-
RID_DROPMODE_URL
);
rDlg
.
SetDropMode
(
nId
-
RID_DROPMODE_URL
);
//
den gehighlighteten Button aufhebe
n
//
reset the highlighted butto
n
Point
aPoint
;
Point
aPoint
;
MouseEvent
aLeave
(
aPoint
,
0
,
MouseEventModifiers
::
LEAVEWINDOW
|
MouseEventModifiers
::
SYNTHETIC
);
MouseEvent
aLeave
(
aPoint
,
0
,
MouseEventModifiers
::
LEAVEWINDOW
|
MouseEventModifiers
::
SYNTHETIC
);
MouseMove
(
aLeave
);
MouseMove
(
aLeave
);
...
@@ -489,25 +486,25 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
...
@@ -489,25 +486,25 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
pNavigator
=
new
ScNavigatorDlg
(
pBind
,
this
,
pParent
,
true
);
pNavigator
=
new
ScNavigatorDlg
(
pBind
,
this
,
pParent
,
true
);
SetWindow
(
pNavigator
);
SetWindow
(
pNavigator
);
//
Einstellungen muessen anderswo gemerkt werden
,
//
handle configurations elsewhere
,
//
pInfo geht uns (ausser der Groesse) nichts mehr an
//
onyl size of pInfo matters now
Size
aInfoSize
=
pParent
->
GetOutputSizePixel
();
//
von aussen vorgegebene Groess
e
Size
aInfoSize
=
pParent
->
GetOutputSizePixel
();
//
outside defined siz
e
Size
aNavSize
=
pNavigator
->
GetOutputSizePixel
();
// Default-
Groess
e
Size
aNavSize
=
pNavigator
->
GetOutputSizePixel
();
// Default-
Siz
e
aNavSize
.
Width
()
=
std
::
max
(
aInfoSize
.
Width
(),
aNavSize
.
Width
()
);
aNavSize
.
Width
()
=
std
::
max
(
aInfoSize
.
Width
(),
aNavSize
.
Width
()
);
aNavSize
.
Height
()
=
std
::
max
(
aInfoSize
.
Height
(),
aNavSize
.
Height
()
);
aNavSize
.
Height
()
=
std
::
max
(
aInfoSize
.
Height
(),
aNavSize
.
Height
()
);
pNavigator
->
nListModeHeight
=
std
::
max
(
aNavSize
.
Height
(),
pNavigator
->
nListModeHeight
);
pNavigator
->
nListModeHeight
=
std
::
max
(
aNavSize
.
Height
(),
pNavigator
->
nListModeHeight
);
//
Die Groesse kann in einem anderen Modul geaendert worden sein
,
//
The size could be changed in another module
,
//
deshalb muessen in Abhaengigkeit von der momentanen Groesse die
//
therefore we have to or have not to display the content
//
Inhalte eingeblendet werden oder nicht
//
in dependence of the current size
bool
bSmall
=
(
aInfoSize
.
Height
()
<=
pNavigator
->
aInitSize
.
Height
()
+
SCNAV_MINTOL
);
bool
bSmall
=
(
aInfoSize
.
Height
()
<=
pNavigator
->
aInitSize
.
Height
()
+
SCNAV_MINTOL
);
NavListMode
eNavMode
=
NAV_LMODE_NONE
;
NavListMode
eNavMode
=
NAV_LMODE_NONE
;
if
(
!
bSmall
)
if
(
!
bSmall
)
{
{
//
wenn Szenario aktiv war, wieder einschalte
n
//
if scenario was active, switch o
n
ScNavipiCfg
&
rCfg
=
SC_MOD
()
->
GetNavipiCfg
();
ScNavipiCfg
&
rCfg
=
SC_MOD
()
->
GetNavipiCfg
();
NavListMode
eLastMode
=
(
NavListMode
)
rCfg
.
GetListMode
();
NavListMode
eLastMode
=
(
NavListMode
)
rCfg
.
GetListMode
();
...
@@ -517,10 +514,10 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
...
@@ -517,10 +514,10 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
eNavMode
=
NAV_LMODE_AREAS
;
eNavMode
=
NAV_LMODE_AREAS
;
}
}
//
Die Groesse des Floats nicht neu setzen (sal_False bei SetListMode), damit der
//
Do not set the size of the float again (sal_False at SetListMode), so that the
//
Navigator nicht aufgeklappt wird, wenn er minimiert war
(#38872#).
//
navigator is not expanded, if it was minimized
(#38872#).
pNavigator
->
SetListMode
(
eNavMode
,
false
);
// FALSE:
Groesse des Float nicht setzen
pNavigator
->
SetListMode
(
eNavMode
,
false
);
// FALSE:
do not set the Float size
sal_uInt16
nCmdId
;
sal_uInt16
nCmdId
;
switch
(
eNavMode
)
switch
(
eNavMode
)
...
@@ -538,7 +535,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
...
@@ -538,7 +535,7 @@ ScNavigatorDialogWrapper::ScNavigatorDialogWrapper(
pNavigator
->
DoResize
();
pNavigator
->
DoResize
();
}
}
pNavigator
->
bFirstBig
=
(
nCmdId
==
0
);
//
dann spae
ter
pNavigator
->
bFirstBig
=
(
nCmdId
==
0
);
//
la
ter
}
}
void
ScNavigatorDialogWrapper
::
Resizing
(
Size
&
rSize
)
void
ScNavigatorDialogWrapper
::
Resizing
(
Size
&
rSize
)
...
@@ -584,19 +581,19 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
...
@@ -584,19 +581,19 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
{
{
ScNavipiCfg
&
rCfg
=
SC_MOD
()
->
GetNavipiCfg
();
ScNavipiCfg
&
rCfg
=
SC_MOD
()
->
GetNavipiCfg
();
nDropMode
=
rCfg
.
GetDragMode
();
nDropMode
=
rCfg
.
GetDragMode
();
// eListMode
wird von aussen gesetzt, Root weiter unten
// eListMode
is set from outside, Root further below
aLbDocuments
.
SetDropDownLineCount
(
9
);
aLbDocuments
.
SetDropDownLineCount
(
9
);
OUString
aOpen
(
" ("
);
OUString
aOpen
(
" ("
);
aStrActive
=
aOpen
;
aStrActive
=
aOpen
;
aStrActive
+=
OUString
(
ScResId
(
STR_ACTIVE
)
);
aStrActive
+=
OUString
(
ScResId
(
STR_ACTIVE
)
);
aStrActive
+=
")"
;
// " (a
ktiv
)"
aStrActive
+=
")"
;
// " (a
ctive
)"
aStrNotActive
=
aOpen
;
aStrNotActive
=
aOpen
;
aStrNotActive
+=
OUString
(
ScResId
(
STR_NOTACTIVE
)
);
aStrNotActive
+=
OUString
(
ScResId
(
STR_NOTACTIVE
)
);
aStrNotActive
+=
")"
;
// " (
inaktiv
)"
aStrNotActive
+=
")"
;
// " (
not active
)"
aStrHidden
=
aOpen
;
aStrHidden
=
aOpen
;
aStrHidden
+=
OUString
(
ScResId
(
STR_HIDDEN
)
);
aStrHidden
+=
OUString
(
ScResId
(
STR_HIDDEN
)
);
aStrHidden
+=
")"
;
// " (
versteckt
)"
aStrHidden
+=
")"
;
// " (
hidden
)"
aTitleBase
=
GetText
();
aTitleBase
=
GetText
();
...
@@ -632,7 +629,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
...
@@ -632,7 +629,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
StartListening
(
*
(
SfxGetpApp
())
);
StartListening
(
*
(
SfxGetpApp
())
);
StartListening
(
rBindings
);
StartListening
(
rBindings
);
aLbDocuments
.
Hide
();
//
bei NAV_LMODE_NONE gibts die nicht
aLbDocuments
.
Hide
();
//
does not exist at NAV_LMODE_NONE
aLbEntries
.
InitWindowBits
(
true
);
aLbEntries
.
InitWindowBits
(
true
);
...
@@ -642,7 +639,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
...
@@ -642,7 +639,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
SV_DRAGDROP_CTRL_COPY
|
SV_DRAGDROP_CTRL_COPY
|
SV_DRAGDROP_ENABLE_TOP
);
SV_DRAGDROP_ENABLE_TOP
);
// wa
r eine Kategorie als Root ausgewaehl
t?
// wa
s a category chosen as roo
t?
sal_uInt16
nLastRoot
=
rCfg
.
GetRootType
();
sal_uInt16
nLastRoot
=
rCfg
.
GetRootType
();
if
(
nLastRoot
)
if
(
nLastRoot
)
aLbEntries
.
SetRootType
(
nLastRoot
);
aLbEntries
.
SetRootType
(
nLastRoot
);
...
@@ -659,8 +656,8 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
...
@@ -659,8 +656,8 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
aWndScenarios
.
Hide
();
aWndScenarios
.
Hide
();
aWndScenarios
.
SetPosPixel
(
aLbEntries
.
GetPosPixel
()
);
aWndScenarios
.
SetPosPixel
(
aLbEntries
.
GetPosPixel
()
);
aContent
Timer
.
SetTimeout
Hdl
(
LINK
(
this
,
ScNavigatorDlg
,
TimeHdl
)
);
aContent
Idle
.
SetIdle
Hdl
(
LINK
(
this
,
ScNavigatorDlg
,
TimeHdl
)
);
aContent
Timer
.
SetTimeout
(
SC_CONTENT_TIMEOU
T
);
aContent
Idle
.
SetPriority
(
VCL_IDLE_PRIORITY_LOWES
T
);
FreeResource
();
FreeResource
();
...
@@ -682,7 +679,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
...
@@ -682,7 +679,7 @@ ScNavigatorDlg::ScNavigatorDlg( SfxBindings* pB, SfxChildWindowContext* pCW, vcl
ScNavigatorDlg
::~
ScNavigatorDlg
()
ScNavigatorDlg
::~
ScNavigatorDlg
()
{
{
aContent
Timer
.
Stop
();
aContent
Idle
.
Stop
();
sal_uInt16
i
;
sal_uInt16
i
;
for
(
i
=
0
;
i
<
CTRL_ITEMS
;
i
++
)
for
(
i
=
0
;
i
<
CTRL_ITEMS
;
i
++
)
...
@@ -757,13 +754,13 @@ void ScNavigatorDlg::DoResize()
...
@@ -757,13 +754,13 @@ void ScNavigatorDlg::DoResize()
Size
aNewSize
=
GetOutputSizePixel
();
Size
aNewSize
=
GetOutputSizePixel
();
long
nTotalHeight
=
aNewSize
.
Height
();
long
nTotalHeight
=
aNewSize
.
Height
();
//
bei angedocktem Navigator wird das Fenster evtl. erst klein erzeugt
,
//
if the navigator is docked, the window is probably at first small generated
,
//
dann kommt ein Resize auf die wirkliche Groesse -> dann Inhalte einschalten
//
then there is a resize to the actual size -> switch on content
bool
bSmall
=
(
nTotalHeight
<=
aInitSize
.
Height
()
+
SCNAV_MINTOL
);
bool
bSmall
=
(
nTotalHeight
<=
aInitSize
.
Height
()
+
SCNAV_MINTOL
);
if
(
!
bSmall
&&
bFirstBig
)
if
(
!
bSmall
&&
bFirstBig
)
{
{
//
Inhalte laut Config wieder einschalten
//
Switch on content again as described in the config
bFirstBig
=
false
;
bFirstBig
=
false
;
NavListMode
eNavMode
=
NAV_LMODE_AREAS
;
NavListMode
eNavMode
=
NAV_LMODE_AREAS
;
...
@@ -771,11 +768,11 @@ void ScNavigatorDlg::DoResize()
...
@@ -771,11 +768,11 @@ void ScNavigatorDlg::DoResize()
NavListMode
eLastMode
=
(
NavListMode
)
rCfg
.
GetListMode
();
NavListMode
eLastMode
=
(
NavListMode
)
rCfg
.
GetListMode
();
if
(
eLastMode
==
NAV_LMODE_SCENARIOS
)
if
(
eLastMode
==
NAV_LMODE_SCENARIOS
)
eNavMode
=
NAV_LMODE_SCENARIOS
;
eNavMode
=
NAV_LMODE_SCENARIOS
;
SetListMode
(
eNavMode
,
false
);
// FALSE:
Groesse des Float nicht setzen
SetListMode
(
eNavMode
,
false
);
// FALSE:
do not set the Float size
}
}
//
auch wenn die Inhalte nicht sichtbar sind, die Groessen anpassen
,
//
even if the content is not visible, adapt the size
,
//
damit die Breite stimm
t
//
so the widht fi
t
Point
aEntryPos
=
aLbEntries
.
GetPosPixel
();
Point
aEntryPos
=
aLbEntries
.
GetPosPixel
();
Point
aListPos
=
aLbDocuments
.
GetPosPixel
();
Point
aListPos
=
aLbDocuments
.
GetPosPixel
();
...
@@ -822,7 +819,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
...
@@ -822,7 +819,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
}
}
else
if
(
NAV_LMODE_NONE
==
eListMode
)
else
if
(
NAV_LMODE_NONE
==
eListMode
)
{
{
// Tab
ellen hier nicht mehr
// Tab
le not any more
}
}
else
else
{
{
...
@@ -850,7 +847,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
...
@@ -850,7 +847,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
aLbEntries
.
Refresh
(
SC_CONTENT_AREALINK
);
aLbEntries
.
Refresh
(
SC_CONTENT_AREALINK
);
break
;
break
;
// SFX_HINT_DOCCHANGED
kommt nicht nur bei Dokument-Wechsel
// SFX_HINT_DOCCHANGED
not only at document change
case
SC_HINT_NAVIGATOR_UPDATEALL
:
case
SC_HINT_NAVIGATOR_UPDATEALL
:
UpdateAll
();
UpdateAll
();
...
@@ -858,7 +855,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
...
@@ -858,7 +855,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
case
FID_DATACHANGED
:
case
FID_DATACHANGED
:
case
FID_ANYDATACHANGED
:
case
FID_ANYDATACHANGED
:
aContent
Timer
.
Start
();
// Notizen nicht sofort suchen
aContent
Idle
.
Start
();
// Do not search notes immediately
break
;
break
;
case
FID_KILLEDITVIEW
:
case
FID_KILLEDITVIEW
:
aLbEntries
.
ObjectFresh
(
SC_CONTENT_OLEOBJECT
);
aLbEntries
.
ObjectFresh
(
SC_CONTENT_OLEOBJECT
);
...
@@ -883,7 +880,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
...
@@ -883,7 +880,7 @@ void ScNavigatorDlg::Notify( SfxBroadcaster&, const SfxHint& rHint )
IMPL_LINK
(
ScNavigatorDlg
,
TimeHdl
,
Timer
*
,
pTimer
)
IMPL_LINK
(
ScNavigatorDlg
,
TimeHdl
,
Timer
*
,
pTimer
)
{
{
if
(
pTimer
!=
&
aContent
Timer
)
if
(
pTimer
!=
&
aContent
Idle
)
return
0
;
return
0
;
aLbEntries
.
Refresh
(
SC_CONTENT_NOTE
);
aLbEntries
.
Refresh
(
SC_CONTENT_NOTE
);
...
@@ -901,7 +898,7 @@ void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew)
...
@@ -901,7 +898,7 @@ void ScNavigatorDlg::SetDropMode(sal_uInt16 nNew)
void
ScNavigatorDlg
::
CursorPosChanged
()
void
ScNavigatorDlg
::
CursorPosChanged
()
{
{
//!
Eintraege selektieren
???
//!
select entries
???
// if ( GetDBAtCursor( aStrDbName ) )
// if ( GetDBAtCursor( aStrDbName ) )
// if ( GetAreaAtCursor( aStrAreaName ) )
// if ( GetAreaAtCursor( aStrAreaName ) )
...
@@ -911,8 +908,8 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
...
@@ -911,8 +908,8 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
{
{
if
(
(
nColNo
+
1
!=
nCurCol
)
||
(
nRowNo
+
1
!=
nCurRow
)
)
if
(
(
nColNo
+
1
!=
nCurCol
)
||
(
nRowNo
+
1
!=
nCurRow
)
)
{
{
// SID_CURRENTCELL == Item #0
Cache leeren, damit das Setzen der
// SID_CURRENTCELL == Item #0
clear cache, so it's possible
//
aktuellen Zelle auch in zusammengefassten Bereichen funktioniert.
//
setting the current cell even in combined areas
ppBoundItems
[
0
]
->
ClearCache
();
ppBoundItems
[
0
]
->
ClearCache
();
ScAddress
aScAddress
(
nColNo
,
nRowNo
,
0
);
ScAddress
aScAddress
(
nColNo
,
nRowNo
,
0
);
...
@@ -923,7 +920,7 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
...
@@ -923,7 +920,7 @@ void ScNavigatorDlg::SetCurrentCell( SCCOL nColNo, SCROW nRowNo )
bUnmark
=
!
pViewData
->
GetMarkData
().
IsCellMarked
(
nColNo
,
nRowNo
);
bUnmark
=
!
pViewData
->
GetMarkData
().
IsCellMarked
(
nColNo
,
nRowNo
);
SfxStringItem
aPosItem
(
SID_CURRENTCELL
,
aAddr
);
SfxStringItem
aPosItem
(
SID_CURRENTCELL
,
aAddr
);
SfxBoolItem
aUnmarkItem
(
FN_PARAM_1
,
bUnmark
);
//
ggf. Selektion aufhebe
n
SfxBoolItem
aUnmarkItem
(
FN_PARAM_1
,
bUnmark
);
//
cancel selektio
n
rBindings
.
GetDispatcher
()
->
Execute
(
SID_CURRENTCELL
,
rBindings
.
GetDispatcher
()
->
Execute
(
SID_CURRENTCELL
,
SfxCallMode
::
SYNCHRON
|
SfxCallMode
::
RECORD
,
SfxCallMode
::
SYNCHRON
|
SfxCallMode
::
RECORD
,
...
@@ -945,7 +942,7 @@ void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo )
...
@@ -945,7 +942,7 @@ void ScNavigatorDlg::SetCurrentTable( SCTAB nTabNo )
{
{
if
(
nTabNo
!=
nCurTab
)
if
(
nTabNo
!=
nCurTab
)
{
{
//
Tabelle fuer Basic ist 1-basiert
//
Table for basic is base-1
SfxUInt16Item
aTabItem
(
SID_CURRENTTAB
,
static_cast
<
sal_uInt16
>
(
nTabNo
)
+
1
);
SfxUInt16Item
aTabItem
(
SID_CURRENTTAB
,
static_cast
<
sal_uInt16
>
(
nTabNo
)
+
1
);
rBindings
.
GetDispatcher
()
->
Execute
(
SID_CURRENTTAB
,
rBindings
.
GetDispatcher
()
->
Execute
(
SID_CURRENTTAB
,
SfxCallMode
::
SYNCHRON
|
SfxCallMode
::
RECORD
,
SfxCallMode
::
SYNCHRON
|
SfxCallMode
::
RECORD
,
...
@@ -980,7 +977,7 @@ void ScNavigatorDlg::SetCurrentObject( const OUString& rName )
...
@@ -980,7 +977,7 @@ void ScNavigatorDlg::SetCurrentObject( const OUString& rName )
&
aNameItem
,
0L
);
&
aNameItem
,
0L
);
}
}
void
ScNavigatorDlg
::
SetCurrentDoc
(
const
OUString
&
rDocName
)
// a
ktivieren
void
ScNavigatorDlg
::
SetCurrentDoc
(
const
OUString
&
rDocName
)
// a
ctivate
{
{
SfxStringItem
aDocItem
(
SID_CURRENTDOC
,
rDocName
);
SfxStringItem
aDocItem
(
SID_CURRENTDOC
,
rDocName
);
rBindings
.
GetDispatcher
()
->
Execute
(
SID_CURRENTDOC
,
rBindings
.
GetDispatcher
()
->
Execute
(
SID_CURRENTDOC
,
...
@@ -1062,7 +1059,7 @@ void ScNavigatorDlg::UpdateAll()
...
@@ -1062,7 +1059,7 @@ void ScNavigatorDlg::UpdateAll()
break
;
break
;
}
}
aContent
Timer
.
Stop
();
// dann nicht nochmal
aContent
Idle
.
Stop
();
// not again
}
}
void
ScNavigatorDlg
::
SetListMode
(
NavListMode
eMode
,
bool
bSetSize
)
void
ScNavigatorDlg
::
SetListMode
(
NavListMode
eMode
,
bool
bSetSize
)
...
@@ -1070,7 +1067,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize )
...
@@ -1070,7 +1067,7 @@ void ScNavigatorDlg::SetListMode( NavListMode eMode, bool bSetSize )
if
(
eMode
!=
eListMode
)
if
(
eMode
!=
eListMode
)
{
{
if
(
eMode
!=
NAV_LMODE_NONE
)
if
(
eMode
!=
NAV_LMODE_NONE
)
bFirstBig
=
false
;
//
nicht mehr automatisch umschalten
bFirstBig
=
false
;
//
do not switch automatically any more
eListMode
=
eMode
;
eListMode
=
eMode
;
...
@@ -1197,7 +1194,7 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize )
...
@@ -1197,7 +1194,7 @@ void ScNavigatorDlg::ShowScenarios( bool bShow, bool bSetSize )
}
}
}
}
//
Dokumente fue
r Dropdown-Listbox
//
documents fo
r Dropdown-Listbox
void
ScNavigatorDlg
::
GetDocNames
(
const
OUString
*
pManualSel
)
void
ScNavigatorDlg
::
GetDocNames
(
const
OUString
*
pManualSel
)
{
{
...
@@ -1222,7 +1219,7 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel )
...
@@ -1222,7 +1219,7 @@ void ScNavigatorDlg::GetDocNames( const OUString* pManualSel )
if
(
pManualSel
?
(
aName
==
*
pManualSel
)
if
(
pManualSel
?
(
aName
==
*
pManualSel
)
:
(
pSh
==
pCurrentSh
)
)
:
(
pSh
==
pCurrentSh
)
)
aSelEntry
=
aEntry
;
//
kompletter Eintrag zum Selektiere
n
aSelEntry
=
aEntry
;
//
compelte entry for selectio
n
}
}
pSh
=
SfxObjectShell
::
GetNext
(
*
pSh
);
pSh
=
SfxObjectShell
::
GetNext
(
*
pSh
);
...
@@ -1295,7 +1292,7 @@ void ScNavigatorDlg::CheckDataArea()
...
@@ -1295,7 +1292,7 @@ void ScNavigatorDlg::CheckDataArea()
void
ScNavigatorDlg
::
StartOfDataArea
()
void
ScNavigatorDlg
::
StartOfDataArea
()
{
{
// pMarkArea
auswerten
???
// pMarkArea
evaluate
???
if
(
GetViewData
()
)
if
(
GetViewData
()
)
{
{
...
@@ -1313,7 +1310,7 @@ void ScNavigatorDlg::StartOfDataArea()
...
@@ -1313,7 +1310,7 @@ void ScNavigatorDlg::StartOfDataArea()
void
ScNavigatorDlg
::
EndOfDataArea
()
void
ScNavigatorDlg
::
EndOfDataArea
()
{
{
// pMarkArea
auswerten
???
// pMarkArea
evaluate
???
if
(
GetViewData
()
)
if
(
GetViewData
()
)
{
{
...
@@ -1334,7 +1331,7 @@ SfxChildAlignment ScNavigatorDlg::CheckAlignment(
...
@@ -1334,7 +1331,7 @@ SfxChildAlignment ScNavigatorDlg::CheckAlignment(
{
{
SfxChildAlignment
eRetAlign
;
SfxChildAlignment
eRetAlign
;
//!
kein Andocken, wenn Listbox nicht da
???
//!
no docking, if Listbox not exists
???
switch
(
eAlign
)
switch
(
eAlign
)
{
{
...
@@ -1344,7 +1341,7 @@ SfxChildAlignment ScNavigatorDlg::CheckAlignment(
...
@@ -1344,7 +1341,7 @@ SfxChildAlignment ScNavigatorDlg::CheckAlignment(
case
SFX_ALIGN_BOTTOM
:
case
SFX_ALIGN_BOTTOM
:
case
SFX_ALIGN_LOWESTBOTTOM
:
case
SFX_ALIGN_LOWESTBOTTOM
:
case
SFX_ALIGN_HIGHESTBOTTOM
:
case
SFX_ALIGN_HIGHESTBOTTOM
:
eRetAlign
=
eActAlign
;
//
nicht erlaubt
eRetAlign
=
eActAlign
;
//
illegal
break
;
break
;
case
SFX_ALIGN_LEFT
:
case
SFX_ALIGN_LEFT
:
...
@@ -1353,7 +1350,7 @@ SfxChildAlignment ScNavigatorDlg::CheckAlignment(
...
@@ -1353,7 +1350,7 @@ SfxChildAlignment ScNavigatorDlg::CheckAlignment(
case
SFX_ALIGN_LASTLEFT
:
case
SFX_ALIGN_LASTLEFT
:
case
SFX_ALIGN_FIRSTRIGHT
:
case
SFX_ALIGN_FIRSTRIGHT
:
case
SFX_ALIGN_LASTRIGHT
:
case
SFX_ALIGN_LASTRIGHT
:
eRetAlign
=
eAlign
;
//
erlaubt
eRetAlign
=
eAlign
;
//
legal
break
;
break
;
default
:
default
:
...
...
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