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
eef0e91d
Kaydet (Commit)
eef0e91d
authored
May 08, 2015
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
there's another ExecuteInfo in sw
Change-Id: Id72d3cdfa8b0d5e62fc04ddc464069ac58df0f58
üst
79776356
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
mnuitem.hxx
include/sfx2/mnuitem.hxx
+0
-9
mnuitem.cxx
sfx2/source/menu/mnuitem.cxx
+12
-3
No files found.
include/sfx2/mnuitem.hxx
Dosyayı görüntüle @
eef0e91d
...
...
@@ -120,15 +120,6 @@ inline SfxVirtualMenu* SfxMenuControl::GetPopupMenu() const
{ SfxMenuControl::RegisterMenuControl( pMod, new SfxMenuCtrlFactory( \
Class::CreateImpl, TYPE(nItemClass), nSlotId ) ); }
struct
ExecuteInfo
{
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
frame
::
XDispatch
>
xDispatch
;
::
com
::
sun
::
star
::
util
::
URL
aTargetURL
;
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
beans
::
PropertyValue
>
aArgs
;
DECL_STATIC_LINK
(
ExecuteInfo
,
ExecuteHdl_Impl
,
ExecuteInfo
*
);
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sfx2/source/menu/mnuitem.cxx
Dosyayı görüntüle @
eef0e91d
...
...
@@ -327,6 +327,15 @@ SfxUnoMenuControl::~SfxUnoMenuControl()
pUnoCtrl
->
release
();
}
struct
MenuExecuteInfo
{
::
com
::
sun
::
star
::
uno
::
Reference
<
::
com
::
sun
::
star
::
frame
::
XDispatch
>
xDispatch
;
::
com
::
sun
::
star
::
util
::
URL
aTargetURL
;
::
com
::
sun
::
star
::
uno
::
Sequence
<
::
com
::
sun
::
star
::
beans
::
PropertyValue
>
aArgs
;
DECL_STATIC_LINK
(
MenuExecuteInfo
,
ExecuteHdl_Impl
,
MenuExecuteInfo
*
);
};
sal_IntPtr
Select_Impl
(
void
*
/*pHdl*/
,
void
*
pVoid
)
{
Menu
*
pMenu
=
static_cast
<
Menu
*>
(
pVoid
);
...
...
@@ -360,17 +369,17 @@ sal_IntPtr Select_Impl( void* /*pHdl*/, void* pVoid )
if
(
xDisp
.
is
()
)
{
ExecuteInfo
*
pExecuteInfo
=
new
ExecuteInfo
;
MenuExecuteInfo
*
pExecuteInfo
=
new
Menu
ExecuteInfo
;
pExecuteInfo
->
xDispatch
=
xDisp
;
pExecuteInfo
->
aTargetURL
=
aTargetURL
;
pExecuteInfo
->
aArgs
=
Sequence
<
PropertyValue
>
();
Application
::
PostUserEvent
(
LINK
(
0
,
ExecuteInfo
,
ExecuteHdl_Impl
),
pExecuteInfo
);
Application
::
PostUserEvent
(
LINK
(
0
,
Menu
ExecuteInfo
,
ExecuteHdl_Impl
),
pExecuteInfo
);
}
return
sal_IntPtr
(
true
);
}
IMPL_STATIC_LINK_NOINSTANCE
(
ExecuteInfo
,
ExecuteHdl_Impl
,
ExecuteInfo
*
,
pExecuteInfo
)
IMPL_STATIC_LINK_NOINSTANCE
(
MenuExecuteInfo
,
ExecuteHdl_Impl
,
Menu
ExecuteInfo
*
,
pExecuteInfo
)
{
pExecuteInfo
->
xDispatch
->
dispatch
(
pExecuteInfo
->
aTargetURL
,
pExecuteInfo
->
aArgs
);
delete
pExecuteInfo
;
...
...
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