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
4ac7459b
Kaydet (Commit)
4ac7459b
authored
Eyl 14, 2015
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
convert Link<> to typed
Change-Id: I6564e4e7042c34741fd7c9ed03627c83ef818486
üst
699eb7e3
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
13 additions
and
15 deletions
+13
-15
roadmapwizard.hxx
include/svtools/roadmapwizard.hxx
+1
-1
roadmap.hxx
svtools/inc/roadmap.hxx
+2
-2
roadmap.cxx
svtools/source/control/roadmap.cxx
+6
-6
roadmapwizard.cxx
svtools/source/dialogs/roadmapwizard.cxx
+4
-6
No files found.
include/svtools/roadmapwizard.hxx
Dosyayı görüntüle @
4ac7459b
...
...
@@ -216,7 +216,7 @@ namespace svt
void
updateRoadmapItemLabel
(
WizardState
_nState
);
private
:
DECL_DLLPRIVATE_LINK
(
OnRoadmapItemSelected
,
void
*
);
DECL_DLLPRIVATE_LINK
_TYPED
(
OnRoadmapItemSelected
,
LinkParamNone
*
,
void
);
/** updates the roadmap control to show the given path, as far as possible
(modulo conflicts with other paths)
...
...
svtools/inc/roadmap.hxx
Dosyayı görüntüle @
4ac7459b
...
...
@@ -76,8 +76,8 @@ public:
ItemId
GetCurrentRoadmapItemID
()
const
;
bool
SelectRoadmapItemByID
(
ItemId
_nItemID
);
void
SetItemSelectHdl
(
const
Link
<>&
_rHdl
);
Link
<
>
GetItemSelectHdl
(
)
const
;
void
SetItemSelectHdl
(
const
Link
<
LinkParamNone
*
,
void
>&
_rHdl
);
Link
<
LinkParamNone
*
,
void
>
GetItemSelectHdl
(
)
const
;
virtual
void
DataChanged
(
const
DataChangedEvent
&
rDCEvt
)
SAL_OVERRIDE
;
virtual
void
GetFocus
()
SAL_OVERRIDE
;
...
...
svtools/source/control/roadmap.cxx
Dosyayı görüntüle @
4ac7459b
...
...
@@ -89,7 +89,7 @@ class RoadmapImpl : public RoadmapTypes
{
protected
:
const
ORoadmap
&
m_rAntiImpl
;
Link
<
>
m_aSelectHdl
;
Link
<
LinkParamNone
*
,
void
>
m_aSelectHdl
;
BitmapEx
m_aPicture
;
HL_Vector
m_aRoadmapSteps
;
ItemId
m_iCurItemID
;
...
...
@@ -162,11 +162,11 @@ public:
return
m_aPicture
;
}
void
setSelectHdl
(
const
Link
<>&
_rHdl
)
void
setSelectHdl
(
const
Link
<
LinkParamNone
*
,
void
>&
_rHdl
)
{
m_aSelectHdl
=
_rHdl
;
}
const
Link
<>&
getSelectHdl
()
const
const
Link
<
LinkParamNone
*
,
void
>&
getSelectHdl
()
const
{
return
m_aSelectHdl
;
}
...
...
@@ -515,19 +515,19 @@ void ORoadmap::DeselectOldRoadmapItems()
}
}
void
ORoadmap
::
SetItemSelectHdl
(
const
Link
<>&
_rHdl
)
void
ORoadmap
::
SetItemSelectHdl
(
const
Link
<
LinkParamNone
*
,
void
>&
_rHdl
)
{
m_pImpl
->
setSelectHdl
(
_rHdl
);
}
Link
<>
ORoadmap
::
GetItemSelectHdl
()
const
Link
<
LinkParamNone
*
,
void
>
ORoadmap
::
GetItemSelectHdl
()
const
{
return
m_pImpl
->
getSelectHdl
();
}
void
ORoadmap
::
Select
()
{
GetItemSelectHdl
().
Call
(
this
);
GetItemSelectHdl
().
Call
(
nullptr
);
CallEventListeners
(
VCLEVENT_ROADMAP_ITEMSELECTED
);
}
...
...
svtools/source/dialogs/roadmapwizard.cxx
Dosyayı görüntüle @
4ac7459b
...
...
@@ -461,16 +461,16 @@ namespace svt
}
IMPL_LINK_NOARG
(
RoadmapWizard
,
OnRoadmapItemSelecte
d
)
IMPL_LINK_NOARG
_TYPED
(
RoadmapWizard
,
OnRoadmapItemSelected
,
LinkParamNone
*
,
voi
d
)
{
RoadmapTypes
::
ItemId
nCurItemId
=
m_pImpl
->
pRoadmap
->
GetCurrentRoadmapItemID
();
if
(
nCurItemId
==
getCurrentState
()
)
// nothing to do
return
1L
;
return
;
if
(
isTravelingSuspended
()
)
return
0
;
return
;
WizardTravelSuspension
aTravelGuard
(
*
this
);
...
...
@@ -481,7 +481,7 @@ namespace svt
"RoadmapWizard::OnRoadmapItemSelected: something's wrong here!"
);
if
(
(
nCurrentIndex
==
-
1
)
||
(
nNewIndex
==
-
1
)
)
{
return
0L
;
return
;
}
bool
bResult
=
true
;
...
...
@@ -500,8 +500,6 @@ namespace svt
if
(
!
bResult
)
m_pImpl
->
pRoadmap
->
SelectRoadmapItemByID
(
getCurrentState
()
);
return
1L
;
}
...
...
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