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
4dd62d9c
Kaydet (Commit)
4dd62d9c
authored
Haz 19, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Disambiguate needlessly overloaded SvDetachedEventDescriptor::hasByName
Change-Id: I951e95c4c81e7e0b4bfb2246c163809863fedac5
üst
f2a0e403
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
5 deletions
+4
-5
unoevent.hxx
include/svtools/unoevent.hxx
+1
-2
unoevent.cxx
svtools/source/uno/unoevent.cxx
+2
-2
unoevent.cxx
sw/source/core/unocore/unoevent.cxx
+1
-1
No files found.
include/svtools/unoevent.hxx
Dosyayı görüntüle @
4dd62d9c
...
@@ -293,8 +293,7 @@ protected:
...
@@ -293,8 +293,7 @@ protected:
/// return true: we have a macro for the event
/// return true: we have a macro for the event
/// return false: no macro; getByName() will return an empty macro
/// return false: no macro; getByName() will return an empty macro
/// IllegalArgumentException: the event is not supported
/// IllegalArgumentException: the event is not supported
using
SvBaseEventDescriptor
::
hasByName
;
bool
hasById
(
bool
hasByName
(
const
sal_uInt16
nEvent
)
const
/// item ID of event
const
sal_uInt16
nEvent
)
const
/// item ID of event
throw
(
throw
(
::
com
::
sun
::
star
::
lang
::
IllegalArgumentException
);
::
com
::
sun
::
star
::
lang
::
IllegalArgumentException
);
...
...
svtools/source/uno/unoevent.cxx
Dosyayı görüntüle @
4dd62d9c
...
@@ -497,7 +497,7 @@ void SvDetachedEventDescriptor::getByName(
...
@@ -497,7 +497,7 @@ void SvDetachedEventDescriptor::getByName(
rMacro
=
(
*
aMacros
[
nIndex
]);
rMacro
=
(
*
aMacros
[
nIndex
]);
}
}
bool
SvDetachedEventDescriptor
::
hasBy
Name
(
bool
SvDetachedEventDescriptor
::
hasBy
Id
(
const
sal_uInt16
nEvent
)
const
/// item ID of event
const
sal_uInt16
nEvent
)
const
/// item ID of event
throw
(
IllegalArgumentException
)
throw
(
IllegalArgumentException
)
{
{
...
@@ -545,7 +545,7 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable(
...
@@ -545,7 +545,7 @@ void SvMacroTableEventDescriptor::copyMacrosIntoTable(
for
(
sal_Int16
i
=
0
;
mpSupportedMacroItems
[
i
].
mnEvent
!=
0
;
i
++
)
for
(
sal_Int16
i
=
0
;
mpSupportedMacroItems
[
i
].
mnEvent
!=
0
;
i
++
)
{
{
const
sal_uInt16
nEvent
=
mpSupportedMacroItems
[
i
].
mnEvent
;
const
sal_uInt16
nEvent
=
mpSupportedMacroItems
[
i
].
mnEvent
;
if
(
hasBy
Name
(
nEvent
))
if
(
hasBy
Id
(
nEvent
))
{
{
SvxMacro
&
rMacro
=
rMacroTable
.
Insert
(
nEvent
,
SvxMacro
(
sEmpty
,
sEmpty
));
SvxMacro
&
rMacro
=
rMacroTable
.
Insert
(
nEvent
,
SvxMacro
(
sEmpty
,
sEmpty
));
getByName
(
rMacro
,
nEvent
);
getByName
(
rMacro
,
nEvent
);
...
...
sw/source/core/unocore/unoevent.cxx
Dosyayı görüntüle @
4dd62d9c
...
@@ -134,7 +134,7 @@ void SwHyperlinkEventDescriptor::copyMacrosIntoINetFormat(
...
@@ -134,7 +134,7 @@ void SwHyperlinkEventDescriptor::copyMacrosIntoINetFormat(
for
(
sal_uInt16
i
=
0
;
mpSupportedMacroItems
[
i
].
mnEvent
!=
0
;
++
i
)
for
(
sal_uInt16
i
=
0
;
mpSupportedMacroItems
[
i
].
mnEvent
!=
0
;
++
i
)
{
{
const
sal_uInt16
nEvent
=
mpSupportedMacroItems
[
i
].
mnEvent
;
const
sal_uInt16
nEvent
=
mpSupportedMacroItems
[
i
].
mnEvent
;
if
(
hasBy
Name
(
nEvent
))
if
(
hasBy
Id
(
nEvent
))
{
{
SvxMacro
aMacro
(
sEmpty
,
sEmpty
);
SvxMacro
aMacro
(
sEmpty
,
sEmpty
);
getByName
(
aMacro
,
nEvent
);
getByName
(
aMacro
,
nEvent
);
...
...
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