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
8c809777
Kaydet (Commit)
8c809777
authored
Mar 20, 2014
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
coverity#705886 Dereference before null check
Change-Id: I707dcfb324760a7058cb0abcb2eca7819e0568e4
üst
70f90c80
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
19 deletions
+11
-19
ipclient.cxx
sfx2/source/view/ipclient.cxx
+11
-19
No files found.
sfx2/source/view/ipclient.cxx
Dosyayı görüntüle @
8c809777
...
@@ -702,7 +702,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
...
@@ -702,7 +702,7 @@ void SfxInPlaceClient::SetObject( const uno::Reference < embed::XEmbeddedObject
}
}
}
}
if
(
!
m_pViewSh
||
m_pViewSh
->
GetViewFrame
()
->
GetFrame
().
IsClosing_Impl
()
)
if
(
m_pViewSh
->
GetViewFrame
()
->
GetFrame
().
IsClosing_Impl
()
)
// sometimes applications reconnect clients on shutting down because it happens in their Paint methods
// sometimes applications reconnect clients on shutting down because it happens in their Paint methods
return
;
return
;
...
@@ -929,8 +929,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
...
@@ -929,8 +929,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
if
(
!
nError
)
if
(
!
nError
)
{
{
if
(
m_pViewSh
)
m_pViewSh
->
GetViewFrame
()
->
GetTopFrame
().
LockResize_Impl
(
true
);
m_pViewSh
->
GetViewFrame
()
->
GetTopFrame
().
LockResize_Impl
(
true
);
try
try
{
{
m_pImp
->
m_xObject
->
setClientSite
(
m_pImp
->
m_xClient
);
m_pImp
->
m_xObject
->
setClientSite
(
m_pImp
->
m_xClient
);
...
@@ -982,12 +981,9 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
...
@@ -982,12 +981,9 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
//TODO/LATER: better error handling
//TODO/LATER: better error handling
}
}
if
(
m_pViewSh
)
SfxViewFrame
*
pFrame
=
m_pViewSh
->
GetViewFrame
();
{
pFrame
->
GetTopFrame
().
LockResize_Impl
(
false
);
SfxViewFrame
*
pFrame
=
m_pViewSh
->
GetViewFrame
();
pFrame
->
GetTopFrame
().
Resize
();
pFrame
->
GetTopFrame
().
LockResize_Impl
(
false
);
pFrame
->
GetTopFrame
().
Resize
();
}
}
}
}
}
}
}
...
@@ -1050,13 +1046,12 @@ void SfxInPlaceClient::DeactivateObject()
...
@@ -1050,13 +1046,12 @@ void SfxInPlaceClient::DeactivateObject()
}
}
}
}
if
(
m_pViewSh
)
m_pViewSh
->
GetViewFrame
()
->
GetTopFrame
().
LockResize_Impl
(
true
);
m_pViewSh
->
GetViewFrame
()
->
GetTopFrame
().
LockResize_Impl
(
true
);
if
(
m_pImp
->
m_xObject
->
getStatus
(
m_pImp
->
m_nAspect
)
&
embed
::
EmbedMisc
::
MS_EMBED_ACTIVATEWHENVISIBLE
)
if
(
m_pImp
->
m_xObject
->
getStatus
(
m_pImp
->
m_nAspect
)
&
embed
::
EmbedMisc
::
MS_EMBED_ACTIVATEWHENVISIBLE
)
{
{
m_pImp
->
m_xObject
->
changeState
(
embed
::
EmbedStates
::
INPLACE_ACTIVE
);
m_pImp
->
m_xObject
->
changeState
(
embed
::
EmbedStates
::
INPLACE_ACTIVE
);
if
(
bHasFocus
&&
m_pViewSh
)
if
(
bHasFocus
)
m_pViewSh
->
GetWindow
()
->
GrabFocus
();
m_pViewSh
->
GetWindow
()
->
GrabFocus
();
}
}
else
else
...
@@ -1069,13 +1064,10 @@ void SfxInPlaceClient::DeactivateObject()
...
@@ -1069,13 +1064,10 @@ void SfxInPlaceClient::DeactivateObject()
m_pImp
->
m_xObject
->
changeState
(
embed
::
EmbedStates
::
RUNNING
);
m_pImp
->
m_xObject
->
changeState
(
embed
::
EmbedStates
::
RUNNING
);
}
}
if
(
m_pViewSh
)
SfxViewFrame
*
pFrame
=
m_pViewSh
->
GetViewFrame
();
{
SfxViewFrame
::
SetViewFrame
(
pFrame
);
SfxViewFrame
*
pFrame
=
m_pViewSh
->
GetViewFrame
();
pFrame
->
GetTopFrame
().
LockResize_Impl
(
false
);
SfxViewFrame
::
SetViewFrame
(
pFrame
);
pFrame
->
GetTopFrame
().
Resize
();
pFrame
->
GetTopFrame
().
LockResize_Impl
(
false
);
pFrame
->
GetTopFrame
().
Resize
();
}
}
}
catch
(
com
::
sun
::
star
::
uno
::
Exception
&
)
catch
(
com
::
sun
::
star
::
uno
::
Exception
&
)
{}
{}
...
...
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