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
cd43b8cf
Kaydet (Commit)
cd43b8cf
authored
Nis 11, 2016
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
Turn disableLayoutManager into a member function
Change-Id: I489859a53f98a1e70f8a79c3a974dd0d8954ccd1
üst
819175e1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
5 deletions
+6
-5
frame.cxx
framework/source/services/frame.cxx
+6
-5
No files found.
framework/source/services/frame.cxx
Dosyayı görüntüle @
cd43b8cf
...
...
@@ -387,6 +387,8 @@ private:
void
impl_setCloser
(
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame2
>&
xFrame
,
bool
bState
);
void
impl_disposeContainerWindow
(
css
::
uno
::
Reference
<
css
::
awt
::
XWindow
>&
xWindow
);
void
disableLayoutManager
(
const
css
::
uno
::
Reference
<
css
::
frame
::
XLayoutManager2
>&
xLayoutManager
);
void
checkDisposed
()
{
osl
::
MutexGuard
g
(
rBHelper
.
rMutex
);
if
(
rBHelper
.
bInDispose
||
rBHelper
.
bDisposed
)
{
...
...
@@ -726,10 +728,9 @@ void lcl_enableLayoutManager(const css::uno::Reference< css::frame::XLayoutManag
/*-****************************************************************************************************
deinitialize layout manager
**/
void
lcl_disableLayoutManager
(
const
css
::
uno
::
Reference
<
css
::
frame
::
XLayoutManager2
>&
xLayoutManager
,
const
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>&
xFrame
)
void
Frame
::
disableLayoutManager
(
const
css
::
uno
::
Reference
<
css
::
frame
::
XLayoutManager2
>&
xLayoutManager
)
{
xFrame
->
removeFrameActionListener
(
xLayoutManager
);
removeFrameActionListener
(
xLayoutManager
);
xLayoutManager
->
setDockingAreaAcceptor
(
css
::
uno
::
Reference
<
css
::
ui
::
XDockingAreaAcceptor
>
());
xLayoutManager
->
attachFrame
(
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
());
}
...
...
@@ -2088,7 +2089,7 @@ void SAL_CALL Frame::disposing()
implts_stopWindowListening
();
if
(
m_xLayoutManager
.
is
())
lcl_disableLayoutManager
(
m_xLayoutManager
,
this
);
disableLayoutManager
(
m_xLayoutManager
);
delete
m_pWindowCommandDispatch
;
...
...
@@ -2694,7 +2695,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/,
{
m_xLayoutManager
=
xNewLayoutManager
;
if
(
xOldLayoutManager
.
is
())
lcl_disableLayoutManager
(
xOldLayoutManager
,
this
);
disableLayoutManager
(
xOldLayoutManager
);
if
(
xNewLayoutManager
.
is
())
lcl_enableLayoutManager
(
xNewLayoutManager
,
this
);
}
...
...
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