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
db72475a
Kaydet (Commit)
db72475a
authored
Nis 27, 2015
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
SfxDispatcher::GetShellAndSlot_Impl return type wants to be bool
Change-Id: I7897ce11621a7aac991ea64897d8fdeb06c3d2d7
üst
d6690c1c
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
6 deletions
+6
-6
dispatch.hxx
include/sfx2/dispatch.hxx
+1
-1
dispatch.cxx
sfx2/source/control/dispatch.cxx
+5
-5
No files found.
include/sfx2/dispatch.hxx
Dosyayı görüntüle @
db72475a
...
@@ -185,7 +185,7 @@ public:
...
@@ -185,7 +185,7 @@ public:
SAL_DLLPRIVATE
void
SetMenu_Impl
();
SAL_DLLPRIVATE
void
SetMenu_Impl
();
SAL_DLLPRIVATE
void
Update_Impl
(
bool
bForce
=
false
);
// ObjectBars etc.
SAL_DLLPRIVATE
void
Update_Impl
(
bool
bForce
=
false
);
// ObjectBars etc.
SAL_DLLPRIVATE
bool
IsUpdated_Impl
()
const
;
SAL_DLLPRIVATE
bool
IsUpdated_Impl
()
const
;
SAL_DLLPRIVATE
int
GetShellAndSlot_Impl
(
sal_uInt16
nSlot
,
SfxShell
**
ppShell
,
const
SfxSlot
**
ppSlot
,
SAL_DLLPRIVATE
bool
GetShellAndSlot_Impl
(
sal_uInt16
nSlot
,
SfxShell
**
ppShell
,
const
SfxSlot
**
ppSlot
,
bool
bOwnShellsOnly
,
bool
bModal
,
bool
bRealSlot
=
true
);
bool
bOwnShellsOnly
,
bool
bModal
,
bool
bRealSlot
=
true
);
SAL_DLLPRIVATE
void
SetReadOnly_Impl
(
bool
bOn
);
SAL_DLLPRIVATE
void
SetReadOnly_Impl
(
bool
bOn
);
SAL_DLLPRIVATE
bool
GetReadOnly_Impl
()
const
;
SAL_DLLPRIVATE
bool
GetReadOnly_Impl
()
const
;
...
...
sfx2/source/control/dispatch.cxx
Dosyayı görüntüle @
db72475a
...
@@ -784,7 +784,7 @@ void SfxDispatcher::DoParentDeactivate_Impl()
...
@@ -784,7 +784,7 @@ void SfxDispatcher::DoParentDeactivate_Impl()
sal_False
sal_False
The SfxShell was not found, ppShell and ppSlot are invalid.
The SfxShell was not found, ppShell and ppSlot are invalid.
*/
*/
int
SfxDispatcher
::
GetShellAndSlot_Impl
(
sal_uInt16
nSlot
,
SfxShell
**
ppShell
,
bool
SfxDispatcher
::
GetShellAndSlot_Impl
(
sal_uInt16
nSlot
,
SfxShell
**
ppShell
,
const
SfxSlot
**
ppSlot
,
bool
bOwnShellsOnly
,
bool
bModal
,
bool
bRealSlot
)
const
SfxSlot
**
ppSlot
,
bool
bOwnShellsOnly
,
bool
bModal
,
bool
bRealSlot
)
{
{
SFX_STACK
(
SfxDispatcher
::
GetShellAndSlot_Impl
);
SFX_STACK
(
SfxDispatcher
::
GetShellAndSlot_Impl
);
...
@@ -794,7 +794,7 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
...
@@ -794,7 +794,7 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
if
(
_FindServer
(
nSlot
,
aSvr
,
bModal
)
)
if
(
_FindServer
(
nSlot
,
aSvr
,
bModal
)
)
{
{
if
(
bOwnShellsOnly
&&
aSvr
.
GetShellLevel
()
>=
xImp
->
aStack
.
size
()
)
if
(
bOwnShellsOnly
&&
aSvr
.
GetShellLevel
()
>=
xImp
->
aStack
.
size
()
)
return
sal_F
alse
;
return
f
alse
;
*
ppShell
=
GetShell
(
aSvr
.
GetShellLevel
());
*
ppShell
=
GetShell
(
aSvr
.
GetShellLevel
());
*
ppSlot
=
aSvr
.
GetSlot
();
*
ppSlot
=
aSvr
.
GetSlot
();
...
@@ -802,12 +802,12 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
...
@@ -802,12 +802,12 @@ int SfxDispatcher::GetShellAndSlot_Impl(sal_uInt16 nSlot, SfxShell** ppShell,
*
ppSlot
=
(
*
ppShell
)
->
GetInterface
()
->
GetRealSlot
(
*
ppSlot
);
*
ppSlot
=
(
*
ppShell
)
->
GetInterface
()
->
GetRealSlot
(
*
ppSlot
);
// Check only real slots as enum slots don't have an execute function!
// Check only real slots as enum slots don't have an execute function!
if
(
bRealSlot
&&
((
0
==
*
ppSlot
)
||
(
0
==
(
*
ppSlot
)
->
GetExecFnc
())
))
if
(
bRealSlot
&&
((
0
==
*
ppSlot
)
||
(
0
==
(
*
ppSlot
)
->
GetExecFnc
())
))
return
sal_F
alse
;
return
f
alse
;
return
sal_T
rue
;
return
t
rue
;
}
}
return
sal_F
alse
;
return
f
alse
;
}
}
/** This method performs a request for a cached <Slot-Server>.
/** This method performs a request for a cached <Slot-Server>.
...
...
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