[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - embeddedobj/source

[Libreoffice Gerrit user]

 embeddedobj/source/msole/oleembed.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d595829c64e149896d2b5e8a4974636f8d9bd892
Author: Caolán McNamara 
AuthorDate: Wed Jul 25 09:09:15 2018 +0100
Commit: Eike Rathke 
CommitDate: Thu Jul 26 00:19:37 2018 +0200

Resolves: tdf#118919 crash on double click ole object

Change-Id: Id7b3df447db56f6f80d6255dabdcc7f6ab149e95
Reviewed-on: https://gerrit.libreoffice.org/57956
Tested-by: Jenkins
Reviewed-by: Eike Rathke 

diff --git a/embeddedobj/source/msole/oleembed.cxx 
b/embeddedobj/source/msole/oleembed.cxx
index e84871d5f304..acb266214c2f 100644
--- a/embeddedobj/source/msole/oleembed.cxx
+++ b/embeddedobj/source/msole/oleembed.cxx
@@ -659,7 +659,7 @@ namespace
 {
 bool lcl_CopyStream(const uno::Reference& xIn, const 
uno::Reference& xOut, sal_Int32 nMaxCopy = SAL_MAX_INT32)
 {
-if (nMaxCopy == 0)
+if (nMaxCopy <= 0)
 return false;
 
 const sal_Int32 nChunkSize = 4096;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - embeddedobj/source

[Szymon Kłos]

 embeddedobj/source/general/docholder.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 19bfffcf3a89fd2fd070e1a878ac628e93d06cc7
Author: Szymon Kłos 
Date:   Sun Jan 28 18:18:32 2018 +0100

tdf#114677 Correct title in Base forms

Change-Id: I07bdb46cce88e876583e1d4217dff3f77f2f3814
Reviewed-on: https://gerrit.libreoffice.org/48801
Tested-by: Jenkins 
Reviewed-by: Szymon Kłos 
(cherry picked from commit 5426a14e39660bde0dece27cf5ec26b9938bd962)
Reviewed-on: https://gerrit.libreoffice.org/48810
Reviewed-by: Julien Nabet 
Reviewed-by: Christian Lohmaier 

diff --git a/embeddedobj/source/general/docholder.cxx 
b/embeddedobj/source/general/docholder.cxx
index 18fbd91641c8..798b4c3c59f5 100644
--- a/embeddedobj/source/general/docholder.cxx
+++ b/embeddedobj/source/general/docholder.cxx
@@ -969,11 +969,11 @@ bool DocumentHolder::LoadDocToFrame( bool bInPlace )
 
 // set document title to show in the title bar
 css::uno::Reference< css::frame::XTitle > xModelTitle( xDoc, 
css::uno::UNO_QUERY );
-if( xModelTitle.is() )
+if( xModelTitle.is() && m_pEmbedObj && 
!m_pEmbedObj->getContainerName().isEmpty() )
 {
 std::locale aResLoc = Translate::Create("sfx");
 OUString sEmbedded = Translate::get(STR_EMBEDDED_TITLE, 
aResLoc);
-xModelTitle->setTitle( m_pEmbedObj->getContainerName() + 
sEmbedded);
+xModelTitle->setTitle( m_pEmbedObj->getContainerName() + 
sEmbedded );
 m_aContainerName = m_pEmbedObj->getContainerName();
 // TODO: get real m_aDocumentNamePart
 m_aDocumentNamePart = sEmbedded;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits