[Libreoffice-commits] core.git: sd/uiconfig

[andreas kainz (via logerrit)]

 sd/uiconfig/sdraw/ui/notebookbar_single.ui |1 +
 sd/uiconfig/simpress/ui/notebookbar_compact.ui |   17 -
 sd/uiconfig/simpress/ui/notebookbar_single.ui  |2 ++
 3 files changed, 3 insertions(+), 17 deletions(-)

New commits:
commit 618baf4c5b40f19be6e47e1384fbc7a6b7610416
Author: andreas kainz 
AuthorDate: Thu Jul 18 23:26:30 2019 +0200
Commit: andreas_kainz 
CommitDate: Fri Jul 19 06:57:00 2019 +0200

NB fix context- behaviour in draw and impress

Change-Id: I943466895a51463be59dacb3686926d29562a371
Reviewed-on: https://gerrit.libreoffice.org/75931
Tested-by: Jenkins
Reviewed-by: andreas_kainz 

diff --git a/sd/uiconfig/sdraw/ui/notebookbar_single.ui 
b/sd/uiconfig/sdraw/ui/notebookbar_single.ui
index abd9c3309712..81aef999ba81 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar_single.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar_single.ui
@@ -5642,6 +5642,7 @@
 
   
   
+  
 
   
   
diff --git a/sd/uiconfig/simpress/ui/notebookbar_compact.ui 
b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
index 591a2c68674e..5ebe3e066d36 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_compact.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_compact.ui
@@ -14052,9 +14052,6 @@
 11
   
 
-
-  
-
   
   
 9
@@ -14069,7 +14066,6 @@
 
   
   
-  
   
 
   
@@ -15135,10 +15131,6 @@
 8
   
 
-
-  
-  
-
   
   
 10
@@ -16366,9 +16358,6 @@
 8
   
 
-
-  
-
   
   
 11
@@ -17699,9 +17688,6 @@
 8
   
 
-
-  
-
   
   
 12
@@ -19563,9 +19549,6 @@
 8
   
 
-
-  
-
   
   
 12
diff --git a/sd/uiconfig/simpress/ui/notebookbar_single.ui 
b/sd/uiconfig/simpress/ui/notebookbar_single.ui
index 24d7b4da4998..1fc803e09b5d 100644
--- a/sd/uiconfig/simpress/ui/notebookbar_single.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar_single.ui
@@ -5287,6 +5287,8 @@
 
 
   
+  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: toolkit/source

[Justin Luth (via logerrit)]

 toolkit/source/controls/stdtabcontroller.cxx |   15 +++
 1 file changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 5cf057c3365a0feafc8f2e4f4a9e24d69a581999
Author: Justin Luth 
AuthorDate: Sat Jul 6 13:42:12 2019 +0300
Commit: Justin Luth 
CommitDate: Fri Jul 19 06:14:12 2019 +0200

tdf#125609 toolkit: don't use XTabController::getControls

Calling XTabController::getControls was supposed to give
performance improvements (coded in OOo), but it
pulls cached information which is not up to date if
this listener for elementInserted events is handled before
the formController's listener. It is missing the most recently
created control - and thus it never sees the last control
in the form, and fails to create the radio group.

Additionally, when all of the controls are not yet
created, this function seems to be designed to catch that
and immediately return. With the "optimization" the
missing controls were never noticed, and so unnecessary
processing continued - a performance detriment while
the form is being built.

My impresssion is that the local getControl() function
is not terribly inefficient, so the performance impact
seems minimal, especially since it now only
makes the call once and caches the result itself.

Since not-yet-peered controls cause the function to again
terminate early (as it was designed to do),
this may have unintended side effects,
in case anything was designed in the past 10+ years
expecting the old behaviour, so I have no intention
of back-porting this.

Change-Id: Ica8ddab69043a30b23d008cd8db5df1c13b94ad2
Reviewed-on: https://gerrit.libreoffice.org/75163
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/toolkit/source/controls/stdtabcontroller.cxx 
b/toolkit/source/controls/stdtabcontroller.cxx
index 7f89093a8dde..61900b4d76ce 100644
--- a/toolkit/source/controls/stdtabcontroller.cxx
+++ b/toolkit/source/controls/stdtabcontroller.cxx
@@ -308,18 +308,17 @@ void StdTabController::activateTabOrder(  )
 if ( !xC.is() || !xVclContainerPeer.is() )
 return;
 
-// This may return a TabController, which returns desired list of controls 
faster
-Reference< XTabController >  xTabController(static_cast< 
::cppu::OWeakObject* >(this), UNO_QUERY);
-
 // Get a flattened list of controls sequences
 Sequence< Reference< XControlModel > > aModels = 
mxModel->getControlModels();
 Sequence< Reference< XWindow > > aCompSeq;
 Sequence< Any> aTabSeq;
 
-// DG: For the sake of optimization, retrieve Controls from getControls(),
-// this may sound counterproductive, but leads to performance improvements
-// in practical scenarios (Forms)
-Sequence< Reference< XControl > > aControls = 
xTabController->getControls();
+// Previously used aControls = xTabController->getControls() "for the sake 
of optimization",
+// but that list isn't valid during the creation phase (missing last 
created control) because
+// listenermultiplexer.cxx handles fmvwimp::elementinserted before 
formcontroller::elementInserted
+// Perhaps other places using the same optimization need to be reviewed?  
(tdf#125609)
+Sequence< Reference< XControl > > aCachedControls = getControls();
+Sequence< Reference< XControl > > aControls = aCachedControls;
 
 // #58317# Some Models may be missing from the Container. Plus there is a
 // autoTabOrder call later on.
@@ -337,7 +336,7 @@ void StdTabController::activateTabOrder(  )
 {
 mxModel->getGroup( nG, aThisGroupModels, aName );
 
-aControls = xTabController->getControls();
+aControls = aCachedControls;
 // ImplCreateComponentSequence has a really strange semantics 
regarding it's first parameter:
 // upon method entry, it expects a super set of the controls which 
it returns
 // this means we need to completely fill this sequence with all 
available controls before
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC - QRCode] Week Report 7 (8 July - 14 July)

[shubham goyal]

Within this time period, I was mainly traveling and was unavailable to
complete my
assigned work.

http://document-foundation-mail-archive.969070.n3.nabble.com/GSoC-QR-Code-Unavailability-from-12-July-to-17-July-td4263704.html

However, I researched on unique_pointer to help to solve the unique_pointer
issues as discussed here.

https://gerrit.libreoffice.org/#/c/74167/19/include/svx/svdograf.hxx@116
https://gerrit.libreoffice.org/#/c/75356/

Thanks :)
Shubham Goyal
IRC - shubhamg
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: sw/qa sw/source

[Miklos Vajna (via logerrit)]

 sw/qa/extras/uiwriter/data2/ole-save-while-edit.odt |binary
 sw/qa/extras/uiwriter/uiwriter2.cxx |   36 
 sw/source/uibase/app/docsh.cxx  |8 
 3 files changed, 44 insertions(+)

New commits:
commit d33cc4f7edc2ce21a9c5a01a7f5e85cfd324c6d9
Author: Miklos Vajna 
AuthorDate: Thu Jul 18 18:03:54 2019 +0200
Commit: Miklos Vajna 
CommitDate: Fri Jul 19 02:10:03 2019 +0200

sw: fix missing OLE preview for actively edited OLE object on save

Regression from commit 74844277cc2194c9e43f5bd7a6f78a9603da32f3 (disable
generation of ole previews in ODF format until after load, 2016-09-13),
if the user started an OLE edit in a Writer document, and saved without
ending the OLE edit, then
svt::EmbeddedObjectRef::UpdateReplacementOnDemand() removed the old
replacement image, but no new one was created.

Given that save is always an explicit user action (auto-save does not
kick in for unmodified documents), restore the permission to update OLE
replacement images during save.

Do this check in SwDocShell::CalcLayoutForOLEObjects(), as that's
OLE-related and is called from all the relevant save code paths (save,
save-as, convert to alien formats).

Change-Id: Idaad43909cd744a379e713efd70ffd000e2692bc
Reviewed-on: https://gerrit.libreoffice.org/75867
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/sw/qa/extras/uiwriter/data2/ole-save-while-edit.odt 
b/sw/qa/extras/uiwriter/data2/ole-save-while-edit.odt
new file mode 100644
index ..33a2284dd314
Binary files /dev/null and 
b/sw/qa/extras/uiwriter/data2/ole-save-while-edit.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 2c9e4e91f610..b48dfdf40dd4 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2004,4 +2005,39 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, 
testDateFormFieldCurrentDateInvalidation)
 }
 #endif
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testOleSaveWhileEdit)
+{
+// Enable LOK mode, otherwise OCommonEmbeddedObject::SwitchStateTo_Impl() 
will throw when it
+// finds out that the test runs headless.
+comphelper::LibreOfficeKit::setActive();
+
+// Load a document with a Draw doc in it.
+SwDoc* pDoc = createDoc("ole-save-while-edit.odt");
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+pWrtShell->GotoObj(/*bNext=*/true, GotoObjFlags::Any);
+
+// Select the frame and switch to the frame shell.
+SwView* pView = pDoc->GetDocShell()->GetView();
+pView->StopShellTimer();
+
+// Start editing the OLE object.
+pWrtShell->LaunchOLEObj();
+
+// Save the document without existing the OLE edit.
+uno::Reference xStorable(mxComponent, uno::UNO_QUERY);
+xStorable->storeToURL(maTempFile.GetURL(), {});
+
+uno::Reference xNameAccess
+= 
packages::zip::ZipFileAccess::createWithURL(comphelper::getComponentContext(m_xSFactory),
+  maTempFile.GetURL());
+// Without the accompanying fix in place, this test would have failed: the 
OLE object lost its
+// replacement on save if the edit was active while saving.
+CPPUNIT_ASSERT(xNameAccess->hasByName("ObjectReplacements/Object 1"));
+
+// Dispose the document while LOK is still active to avoid leaks.
+mxComponent->dispose();
+mxComponent.clear();
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index 229decaf2a9c..b6c0df359aa8 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1276,6 +1276,14 @@ void SwDocShell::CalcLayoutForOLEObjects()
 if (!m_pWrtShell)
 return;
 
+if (m_pView && m_pView->GetIPClient())
+{
+// We have an active OLE edit: allow link updates, so an up to date 
replacement graphic can
+// be created.
+comphelper::EmbeddedObjectContainer& rEmbeddedObjectContainer = 
getEmbeddedObjectContainer();
+rEmbeddedObjectContainer.setUserAllowsLinkUpdate(true);
+}
+
 SwIterator aIter( 
*m_xDoc->GetDfltGrfFormatColl() );
 for( SwContentNode* pNd = aIter.First(); pNd; pNd = aIter.Next() )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basic/source

[Caolán McNamara (via logerrit)]

 basic/source/runtime/runtime.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2fbd7d240efe0737706950195b58fa6a101b9020
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 11:07:40 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 19 00:06:33 2019 +0200

cid#1448438 Uncaught exception

Change-Id: I444e8c8833db6bb0af9cfc7c3b18b45178faa663
Reviewed-on: https://gerrit.libreoffice.org/75892
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basic/source/runtime/runtime.cxx b/basic/source/runtime/runtime.cxx
index 3baba08b2f8a..74f849ad576f 100644
--- a/basic/source/runtime/runtime.cxx
+++ b/basic/source/runtime/runtime.cxx
@@ -344,7 +344,7 @@ SbiInstance::~SbiInstance()
 }
 catch( const Exception& )
 {
-css::uno::Any ex( cppu::getCaughtException() );
+css::uno::Any ex(DbgGetCaughtException());
 SAL_WARN("basic", "SbiInstance::~SbiInstance: caught an exception 
while disposing the components! " << exceptionToString(ex) );
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcompiler/source

[Caolán McNamara (via logerrit)]

 helpcompiler/source/HelpIndexer_main.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa5c79b4c62e1e1c53b36f79947d2cba7e3db4fa
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 11:08:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 19 00:06:11 2019 +0200

cid#1448441 Unchecked return value

Change-Id: I97f6ad2bd0a6d838871cfb9ff54f2e654d6abfd0
Reviewed-on: https://gerrit.libreoffice.org/75893
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/helpcompiler/source/HelpIndexer_main.cxx 
b/helpcompiler/source/HelpIndexer_main.cxx
index 0919e89eb004..3ad47bbf7a28 100644
--- a/helpcompiler/source/HelpIndexer_main.cxx
+++ b/helpcompiler/source/HelpIndexer_main.cxx
@@ -69,7 +69,7 @@ int main(int argc, char **argv)
 OUString cwd;
 osl_getProcessWorkingDir(&cwd.pData);
 
-osl::File::getAbsoluteFileURL(cwd, sDir, sDir);
+(void)osl::File::getAbsoluteFileURL(cwd, sDir, sDir);
 
 HelpIndexer indexer(
 OUString(lang.c_str(), lang.size(), osl_getThreadTextEncoding()),
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - sd/source ucb/source vcl/unx

[Caolán McNamara (via logerrit)]

 sd/source/ui/remotecontrol/ImagePreparer.cxx |9 ++---
 ucb/source/ucp/file/filtask.cxx  |2 +-
 vcl/unx/generic/fontmanager/fontmanager.cxx  |   10 ++
 3 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit 1dc747590bb5fbd06411efc53589f3702cc992be
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:56:39 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 19 00:02:08 2019 +0200

cid#1448426 Unchecked return value

Change-Id: Ia6ad812f76d1f69eb91a7d4f65f221b6598ce05a
Reviewed-on: https://gerrit.libreoffice.org/75887
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index dd19b6edc7c3..9601bb0cb088 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -2501,7 +2501,7 @@ TaskManager::getv(
 // Assume failure
 aIsRegular = false;
 osl::DirectoryItem aTargetItem;
-osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), aTargetItem );
+(void)osl::DirectoryItem::get( aFileStatus.getLinkTargetURL(), 
aTargetItem );
 if ( aTargetItem.is() )
 {
 osl::FileStatus aTargetStatus( osl_FileStatus_Mask_Type );
commit b6f91112daae40fcde357f2eb3f12df08702af76
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:59:22 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 19 00:01:45 2019 +0200

cid#1448435 Unchecked return value

Change-Id: I1c75280dfcfa1f475d657570bf390847ab922cc8
Reviewed-on: https://gerrit.libreoffice.org/75889
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/generic/fontmanager/fontmanager.cxx 
b/vcl/unx/generic/fontmanager/fontmanager.cxx
index 3438fb7cd73e..8af7d1a53b67 100644
--- a/vcl/unx/generic/fontmanager/fontmanager.cxx
+++ b/vcl/unx/generic/fontmanager/fontmanager.cxx
@@ -236,10 +236,12 @@ std::vector> 
PrintFontManager::anal
 if (aFile.open(osl_File_OpenFlag_Read | 
osl_File_OpenFlag_NoLock) == osl::File::E_None)
 {
 osl::DirectoryItem aItem;
-osl::DirectoryItem::get( aURL, aItem );
-osl::FileStatus aFileStatus( osl_FileStatus_Mask_FileSize 
);
-aItem.getFileStatus( aFileStatus );
-fileSize = aFileStatus.getFileSize();
+if (osl::DirectoryItem::get(aURL, aItem) == 
osl::File::E_None)
+{
+osl::FileStatus aFileStatus( 
osl_FileStatus_Mask_FileSize );
+aItem.getFileStatus( aFileStatus );
+fileSize = aFileStatus.getFileSize();
+}
 }
 }
 
commit 56fc428da3fd778a12e89ce789105dfbfbb28647
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 11:02:21 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 19 00:01:26 2019 +0200

cid#1448436 Unchecked return value

Change-Id: I971587c6340afc83ac3a28b148650a8f20120164
Reviewed-on: https://gerrit.libreoffice.org/75890
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/remotecontrol/ImagePreparer.cxx 
b/sd/source/ui/remotecontrol/ImagePreparer.cxx
index 3a208fdde6ec..baf117ac4b7a 100644
--- a/sd/source/ui/remotecontrol/ImagePreparer.cxx
+++ b/sd/source/ui/remotecontrol/ImagePreparer.cxx
@@ -155,16 +155,19 @@ uno::Sequence ImagePreparer::preparePreview(
 
 xFilter->filter( aProps );
 
-// FIXME: error handling.
+File aFile(aFileURL);
+if (aFile.open(0) != osl::File::E_None)
+return uno::Sequence();
 
-File aFile( aFileURL );
-aFile.open(0);
 sal_uInt64 aRead;
 rSize = 0;
 aFile.getSize( rSize );
 uno::Sequence aContents( rSize );
 
 aFile.read( aContents.getArray(), rSize, aRead );
+if (aRead != rSize)
+aContents.realloc(aRead);
+
 aFile.close();
 File::remove( aFileURL );
 return aContents;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/source ucb/source

[Caolán McNamara (via logerrit)]

 sc/source/ui/miscdlgs/acredlin.cxx |6 --
 ucb/source/ucp/file/filtask.cxx|4 ++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 6568ee89f4087172839698cdce453978854e4ff7
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 11:06:14 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 19 00:01:07 2019 +0200

cid#1448437 Unchecked return value

Change-Id: I2dec7a66f5609b1e34d9b337f8c562440d3f5132
Reviewed-on: https://gerrit.libreoffice.org/75891
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index 3c54c50b8ed4..dd19b6edc7c3 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -1167,8 +1167,8 @@ TaskManager::move( sal_Int32 CommandId,
 
 osl::FileStatus 
aStatus(osl_FileStatus_Mask_Type|osl_FileStatus_Mask_LinkTargetURL);
 osl::DirectoryItem aItem;
-osl::DirectoryItem::get(dstUnqPath,aItem);
-aItem.getFileStatus(aStatus);
+(void)osl::DirectoryItem::get(dstUnqPath,aItem);
+(void)aItem.getFileStatus(aStatus);
 
 if( aStatus.isValid(osl_FileStatus_Mask_Type)  &&
 aStatus.isValid(osl_FileStatus_Mask_LinkTargetURL) &&
commit 7037fe070ba81fb3dd8dfc03a7ddeb5090b2288f
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:29:55 2019 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 19 00:00:54 2019 +0200

cid#1448287 Unchecked return value

Change-Id: Ifd6bd0f4218805ad52a256fad82a4d2455c6afa9
Reviewed-on: https://gerrit.libreoffice.org/75871
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/miscdlgs/acredlin.cxx 
b/sc/source/ui/miscdlgs/acredlin.cxx
index 44d89d2669be..3b381cd51e36 100644
--- a/sc/source/ui/miscdlgs/acredlin.cxx
+++ b/sc/source/ui/miscdlgs/acredlin.cxx
@@ -1397,14 +1397,14 @@ void ScAcceptChgDlg::AppendChanges(const ScChangeTrack* 
pChanges,sal_uLong nStar
 void ScAcceptChgDlg::RemoveEntries(sal_uLong nStartAction,sal_uLong nEndAction)
 {
 weld::TreeView& rTreeView = pTheView->GetWidget();
-rTreeView.freeze();
 
 ScRedlinData *pEntryData=nullptr;
 std::unique_ptr xEntry(rTreeView.make_iterator());
 if (rTreeView.get_cursor(xEntry.get()))
 pEntryData = 
reinterpret_cast(rTreeView.get_id(*xEntry).toInt64());
 
-rTreeView.get_iter_first(*xEntry);
+if (!rTreeView.get_iter_first(*xEntry))
+return;
 
 sal_uLong nAction=0;
 if (pEntryData)
@@ -1428,6 +1428,8 @@ void ScAcceptChgDlg::RemoveEntries(sal_uLong 
nStartAction,sal_uLong nEndAction)
 }
 while (rTreeView.iter_next(*xEntry));
 
+rTreeView.freeze();
+
 // MUST do it backwards, don't delete parents before children and GPF
 for (auto it = aIdsToRemove.rbegin(); it != aIdsToRemove.rend(); ++it)
 rTreeView.remove_id(*it);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'refs/tags/libreoffice-6.3.0.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.0.2' created by Christian Lohmaier 
 at 2019-07-18 20:45 +

Tag libreoffice-6.3.0.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0w2n8ACgkQ9DSh76/u
rqPDbA//ZS4V8HXCyix9bsZ2ACG4AdDpmqgb9EWPzrzocsFNTufk83xqDh+uQdPQ
pwwyxUBFD3ksqzHW6l11akreERPuXtgi6MAp61J/aTzrJM0GbvX6lpyKrY8WC6Q/
iO9oDhwVCNEcffZGOhkqHNPDeuEFU4cQghtOoVGRUsE+88lE1DfFgp1/oOz0nTc6
PksySb6WT0SiyYzMQrWkFoqDPEBsIdcv3IXvhntVWZvF88zZzFl/X0U9CUmn5Qsg
Xoi7W1BAyw08/q0Csk2TDRDtWsLuG/0x3EHrfifaa4DxLWve/0WnWaDEPnwJJkhZ
TLp1psnF/LrqlqT+eBp0sWxozQnQ01kZ9f4efc5j4/W1mdyJq0EnrCWljHxIEzsC
l65tC231K4g6TBUyexsqov1IhFAjXPEHaPTAxa1jWMt6kv57D7YfDyw8omlvhJTq
3XUVb7WkfoIBkt0mWKhZ5VLtdMWZDKqUxDmwOAtXakURVG+djIpwtsd7af9kt1mw
4cBNZkq7ior7Om5VkaODyzp4zF28q01g8TdXmGwmiayiNBZgKmQTP9ari1Uq8e+e
zp/xTUu5ILu6dir586Wl/Zc5DxD5gojU1rangBb1N9y48D3bUFOoohmYm/BL7O5Q
eCl4X1HtsLoUSS/AipCqMUMfmzeKkC2Q+oVATWSpBSurruTdqBE=
=LEVp
-END PGP SIGNATURE-

Changes since libreoffice-6-3-branch-point-6:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'refs/tags/libreoffice-6.3.0.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.0.2' created by Christian Lohmaier 
 at 2019-07-18 20:45 +

Tag libreoffice-6.3.0.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0w2n8ACgkQ9DSh76/u
rqNm/xAAxpspDbDqlv5H7uQftMzt7Mb60vcQGmCBD0bCtJy/RbUFHG8aUZ5sepud
pSCXWKzO9uKFqu+vKxM2Vlma7Lex9HovwBs6JdC4uTkGsreloEVC2g1qOC4/piKS
GNZ6Woy1dsUKC+tr0Ea5eSLiINt3dqkvDFi+y2i/bvxQDzCSR0pynoInbLrhEjr7
cbABvNG1Ld5VXHq53/doLlCZyWliiC7WnkbC+VE7QIjtCDvtZTNcZNfBxnkbrV6b
lTqpJBaeTgVSg1xzMpoksD4nN4gwRoGCnv738ffjBJ+XrPdoX3kCewIlw+4Plepv
FBaLUBXoFZDyx3TmnpZd0HCu3R07YlaAX0WvpPH7EgMtAGXkp3qRZ5rfORa1m9PE
+hh8ca4YblgKLZ37Z6DMGWw0FaiTdDncpVpno/49aYB4FIuLCsPoGrtCUAWpcF4r
kt4ovbvF0pKKNETidbF2ZFEBvhmiwSdXvse2SrqumW2U4CKsBl+Zqnr/SKRImtp4
0L+9kd5TL8KbUrvOagUBUbkfMZebLunUCgCtGfUmNWh+eQNYJyaxkpZI/vYfVO7E
cvImHj2HDFZtVhD7tHM3OkLkslmtwxsnxLT4ZsiWBpJi/66Eeq7S2jovk5NCNUsW
Qho9lxYFPkUh+W0+6AoiWd0DGq+ulZLezVKtOk/rNl1IaxfGfXY=
=jqa7
-END PGP SIGNATURE-

Changes since libreoffice-6-3-branch-point-11:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3-0' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d7959ab06feee05dfab9fc763b380d1c749aa3e6
Author: Christian Lohmaier 
AuthorDate: Thu Jul 18 22:46:12 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 22:46:12 2019 +0200

bump product version to 6.3.0.2.0+

Change-Id: I536b5fbc8b3de7ecbbf6dadce16b238218d0cf60

diff --git a/configure.ac b/configure.ac
index 44907555d6c5..73eb6192d341 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.0.2.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'refs/tags/libreoffice-6.3.0.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.0.2' created by Christian Lohmaier 
 at 2019-07-18 20:45 +

Tag libreoffice-6.3.0.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0w2nsACgkQ9DSh76/u
rqNdag/7BItzia0dco4xVlO3aRKUFNrQ5mSn0qKKfQOCfKg0vklQUIKdqWEcvdNQ
8D1K5o55dlipI10LcG0evxgC/8Ixr/uv/oRrz7vmCpzc+ueI+TCDsyI1UfQlUXTr
jKguibC8vIQPOBlOFafmg66vylf0ZDufcHAYT2ZRl+OPrfsoAoG6ANhgK+8juSi/
CWLNtjS4ql5ZJc64xEVcwkfFCDRcB8Havxj628Nx1M1WsqBSFqeMIl0HdNWBdaV4
TOBs0RkpqKcPQMutzaOZNQ4UUHYBfjbdKRRQwU5jKPaVNvNlFz+erd+6acqg3DFv
z48f0mg9Fn4QhlKW1vxZ/jdtXuFY5mUdaMzkUXCWWTkSXh7b43YOPUN1crs6Lx1i
1yxmwBArOwVgZ0ZH78IHDfSLnpeQebXO42abNdQ9OAnDNnV0OD/V+nZ8/q/gAWtq
gx5NzTskU4Xfu+f1W1QJv4pB8VYB/OIr3q2VDVdUv22OyLN9PWKo2DDj4VmE4twM
tP09Vg81FsS9KnXv/89+MtDqAYPReTs8o5+QgarsQTgD3B2d6EmaJL0R6b3gdbTG
VncdsrKwFekyx+/wN+1IvQR3Lgctw+K7PRxK8oyM3cqSVYkL0hMgPm3h4i3CCNpT
+vwx3B80gYj77lH2atfKSw6V4fqswkj+CnyrUA+wL024tYm4DyI=
=7LID
-END PGP SIGNATURE-

Changes since libreoffice-6-3-branch-point-4:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'refs/tags/libreoffice-6.3.0.2'

[Christian Lohmaier (via logerrit)]

Tag 'libreoffice-6.3.0.2' created by Christian Lohmaier 
 at 2019-07-18 20:45 +

Tag libreoffice-6.3.0.2
-BEGIN PGP SIGNATURE-

iQIzBAABCAAdFiEEwoOeytlAj76VMcPp9DSh76/urqMFAl0w2n8ACgkQ9DSh76/u
rqNm7RAAoyTrgVjkFBGcIxPdHFm329N9XQDypGI68QvQo9qFp7Zt8/ZsoZA9Kys1
ki2wI3o+wwrMeyQLIO1ZQ9/ZRjEpCS+b+qEwIYhTH/VJeeKe3XZCfqbjGPlQwqlB
7HUB7e0ixin/e8V61CBhpHKUw334wCL8d3KfAC4Mp4Tbtw7pB1m83tjxbE9+tHKG
8ICkqbd/DPryTa4Qw+nsaZ7R8Ijt8cnjNQJkJEWMDbXp+Bp8iHWN0tnJ1elLpCA8
iumLhq53jo4n11KKIVgPZ9oB3dgPGq3DbF3AiROhSqxfXs7n7cdJyqu/1zEeCPDe
+ZksNl3r4tBrdly+opwlM4pPLgdYWeX8VRdrA21HxN2HFSjAJTz446otZLUqM2GP
KQvMtSAEdQ/DkrlJEQuRZZ3ZHn8Q/43Np1ybCNmF4kx3PJ6KiExnwKBPuIMWW/J7
FP56GoM2l35WU3OHql6tWXMkUhudfptyJmOo1T6yPhg7+XM9ppwNXXiJXEU/EtJ+
UucymXHhEPjd2HsrTvDyZmb85c28+cwNafCdgkJg46XplyzhmkG/NJUe72QuSRQe
/0PVEpga9lpT3ClR/mc9eeaMXXlLj6Q1xeLPJ8Llf0vHgjqLqkSHIlpSobhw/Ac+
cCIZUL1Gn0pZVzWRsxF4lSdNmwrCsctk8tuup69HhVFF8ZFKbQ0=
=/ThK
-END PGP SIGNATURE-

Changes since libreoffice-6-3-branch-point-422:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: shell/source

[Caolán McNamara (via logerrit)]

 shell/source/tools/lngconvex/lngconvex.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa7ca0a1c7f899f9df09e96ffe7f7bb3f48c850f
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:54:59 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 22:46:05 2019 +0200

cid#1448418 Unchecked return value

Change-Id: Ia2cceb8e169a363a21753fbcf79fa29669957e84
Reviewed-on: https://gerrit.libreoffice.org/75886
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/shell/source/tools/lngconvex/lngconvex.cxx 
b/shell/source/tools/lngconvex/lngconvex.cxx
index ff8126285ff6..452e88e29147 100644
--- a/shell/source/tools/lngconvex/lngconvex.cxx
+++ b/shell/source/tools/lngconvex/lngconvex.cxx
@@ -108,7 +108,7 @@ OUString get_absolute_path(
 osl::FileBase::getFileURLFromSystemPath(RelDir, rel_url);
 
 OUString abs_url;
-osl::FileBase::getAbsoluteFileURL(base_url, rel_url, abs_url);
+(void)osl::FileBase::getAbsoluteFileURL(base_url, rel_url, abs_url);
 
 OUString abs_sys_path;
 osl::FileBase::getSystemPathFromFileURL(abs_url, abs_sys_path);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - configure.ac

[Christian Lohmaier (via logerrit)]

 configure.ac |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f10995b015716839c7ffc7eca8c4c857e0e27f85
Author: Christian Lohmaier 
AuthorDate: Thu Jul 18 22:42:49 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 22:42:49 2019 +0200

bump product version to 6.3.1.0.0+

Change-Id: Idac3762319c689ff58246204abf60bdca781f5aa

diff --git a/configure.ac b/configure.ac
index 44907555d6c5..3508907a0c3b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.3.0.1.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.3.1.0.0+],[],[],[http://documentfoundation.org/])
 
 dnl libnumbertext needs autoconf 2.68, but that can pick up autoconf268 just 
fine if it is installed
 dnl whereas aclocal (as run by autogen.sh) insists on using autoconf and fails 
hard
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'libreoffice-6-3-0'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-3-0' available with the following commits:
commit 082f1f5bcfb2f6c670d6ebdaf6dc8e3448677653
Author: Christian Lohmaier 
Date:   Thu Jul 18 22:39:39 2019 +0200

Branch libreoffice-6-3-0

This is 'libreoffice-6-3-0' - the stable branch for the 6.3.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ibe5da9d14890e77272435b212705f3553a6cabd0

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'libreoffice-6-3-0'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-3-0' available with the following commits:
commit 95fd57ec2f4335706fa2f1c573cb3f0fffc2d0c3
Author: Christian Lohmaier 
Date:   Thu Jul 18 22:38:37 2019 +0200

Branch libreoffice-6-3-0

This is 'libreoffice-6-3-0' - the stable branch for the 6.3.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: Ia6ea1a2bd2aeba53f0bbd7e84f92758d593ae2e4

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Changes to 'libreoffice-6-3-0'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-3-0' available with the following commits:
commit 6938cd3c7e3774bc88f2a7cde2510cb3c249fb9f
Author: Christian Lohmaier 
Date:   Thu Jul 18 22:38:37 2019 +0200

Branch libreoffice-6-3-0

This is 'libreoffice-6-3-0' - the stable branch for the 6.3.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: If99d365417eaaece24d500b2db21a17f502940b5

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'libreoffice-6-3-0'

[Christian Lohmaier (via logerrit)]

New branch 'libreoffice-6-3-0' available with the following commits:
commit 3c15b2dfa3f159ffc91120fcae5dea034667af20
Author: Christian Lohmaier 
Date:   Thu Jul 18 22:38:37 2019 +0200

Branch libreoffice-6-3-0

This is 'libreoffice-6-3-0' - the stable branch for the 6.3.0 release.
Only very safe changes, reviewed by three people are allowed.

If you want to commit more complicated fix for the next 6.3.x release,
please use the 'libreoffice-6-3' branch.

If you want to build something cool, unstable, and risky, use master.

Change-Id: I595b57ae38aaa52dd0dfb1fe9ea3996838c95782

___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/unoidl/unopback.cxx |2 +-
 sd/source/ui/unoidl/unopback.hxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8f963098ad2106472f5aca10b23a374f03523597
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:52:58 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 22:33:39 2019 +0200

cid#1448395 Uncaught exception

Change-Id: I7478aa8a971e834efee0effd998c68cb85368892
Reviewed-on: https://gerrit.libreoffice.org/75885
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/unoidl/unopback.cxx b/sd/source/ui/unoidl/unopback.cxx
index 09fd1309a2a6..459bdb42de71 100644
--- a/sd/source/ui/unoidl/unopback.cxx
+++ b/sd/source/ui/unoidl/unopback.cxx
@@ -88,7 +88,7 @@ void SdUnoPageBackground::Notify( SfxBroadcaster&, const 
SfxHint& rHint )
 }
 }
 
-void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet 
) throw()
+void SdUnoPageBackground::fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet )
 {
 rSet.ClearItem();
 
diff --git a/sd/source/ui/unoidl/unopback.hxx b/sd/source/ui/unoidl/unopback.hxx
index fc549c29e20b..d0fda4567ed3 100644
--- a/sd/source/ui/unoidl/unopback.hxx
+++ b/sd/source/ui/unoidl/unopback.hxx
@@ -58,7 +58,7 @@ public:
 virtual ~SdUnoPageBackground() throw() override;
 
 // internal
-void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet ) throw();
+void fillItemSet( SdDrawDocument* pDoc, SfxItemSet& rSet );
 virtual void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) override;
 
 // uno helper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: forms/source

[Caolán McNamara (via logerrit)]

 forms/source/component/FormComponent.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit e48e2bb90748bb2d63dfd70d05ab8b463fb9bcd2
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:51:08 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 22:18:38 2019 +0200

cid#1448381 Unchecked return value

Change-Id: I4f0b48df10bf8557e39e0769a61a36bacac8f02a
Reviewed-on: https://gerrit.libreoffice.org/75884
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/forms/source/component/FormComponent.cxx 
b/forms/source/component/FormComponent.cxx
index 6afc11f50aaa..6d46f3a9825e 100644
--- a/forms/source/component/FormComponent.cxx
+++ b/forms/source/component/FormComponent.cxx
@@ -1973,7 +1973,6 @@ void OBoundControlModel::connectToField(const 
Reference& rForm)
 }
 
 }
-hasField();
 }
 
 void OBoundControlModel::initFromField( const Reference< XRowSet >& _rxRowSet )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/qa sc/source

[Mike Kaganski (via logerrit)]

 sc/qa/unit/copy_paste_test.cxx |   74 +
 sc/source/core/data/table2.cxx |7 ++-
 2 files changed, 79 insertions(+), 2 deletions(-)

New commits:
commit 7e803a348a020bc48a039c4f7f098ae17843c534
Author: Mike Kaganski 
AuthorDate: Wed Jul 17 12:15:28 2019 +1000
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 22:16:14 2019 +0200

tdf#126421: don't limit pasted data to allocated columns in destination

Change-Id: Ic30360795c5dac1dc232f95bd25f5a11946c7dee
Reviewed-on: https://gerrit.libreoffice.org/75738
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 2d4ccc58e9ef3b98a88407e1a7a3abf3379f0d20)
Reviewed-on: https://gerrit.libreoffice.org/75756
Reviewed-by: Christian Lohmaier 

diff --git a/sc/qa/unit/copy_paste_test.cxx b/sc/qa/unit/copy_paste_test.cxx
index 967faaadf13a..a31312c6fe6f 100644
--- a/sc/qa/unit/copy_paste_test.cxx
+++ b/sc/qa/unit/copy_paste_test.cxx
@@ -33,11 +33,13 @@ public:
 void testCopyPasteXLS();
 void testTdf84411();
 void testTdf124565();
+void testTdf126421();
 
 CPPUNIT_TEST_SUITE(ScCopyPasteTest);
 CPPUNIT_TEST(testCopyPasteXLS);
 CPPUNIT_TEST(testTdf84411);
 CPPUNIT_TEST(testTdf124565);
+CPPUNIT_TEST(testTdf126421);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -126,6 +128,14 @@ void ScCopyPasteTest::testCopyPasteXLS()
 
 namespace {
 
+ScMarkData::MarkedTabsType TabsInRange(const ScRange& r)
+{
+ScMarkData::MarkedTabsType aResult;
+for (SCTAB i = r.aStart.Tab(); i <= r.aEnd.Tab(); ++i)
+aResult.insert(i);
+return aResult;
+}
+
 void lcl_copy( const OUString& rSrcRange, const OUString& rDstRange, 
ScDocument& rDoc, ScTabViewShell* pViewShell )
 {
 ScDocument aClipDoc(SCDOCMODE_CLIP);
@@ -135,6 +145,7 @@ void lcl_copy( const OUString& rSrcRange, const OUString& 
rDstRange, ScDocument&
 ScRefFlags nRes = aSrcRange.Parse(rSrcRange, &rDoc, 
rDoc.GetAddressConvention());
 CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & ScRefFlags::VALID));
 pViewShell->GetViewData().GetMarkData().SetMarkArea(aSrcRange);
+
pViewShell->GetViewData().GetMarkData().SetSelectedTabs(TabsInRange(aSrcRange));
 pViewShell->GetViewData().GetView()->CopyToClip(&aClipDoc, false, false, 
false, false);
 
 // 2. Paste
@@ -142,6 +153,7 @@ void lcl_copy( const OUString& rSrcRange, const OUString& 
rDstRange, ScDocument&
 nRes = aDstRange.Parse(rDstRange, &rDoc, rDoc.GetAddressConvention());
 CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & ScRefFlags::VALID));
 pViewShell->GetViewData().GetMarkData().SetMarkArea(aDstRange);
+
pViewShell->GetViewData().GetMarkData().SetSelectedTabs(TabsInRange(aDstRange));
 pViewShell->GetViewData().GetView()->PasteFromClip(InsertDeleteFlags::ALL, 
&aClipDoc);
 }
 
@@ -289,6 +301,68 @@ void ScCopyPasteTest::testTdf124565()
 xDocSh->DoClose();
 }
 
+void ScCopyPasteTest::testTdf126421()
+{
+uno::Reference xDesktop
+= frame::Desktop::create(::comphelper::getProcessComponentContext());
+CPPUNIT_ASSERT(xDesktop.is());
+
+// create a frame
+Reference xTargetFrame = xDesktop->findFrame("_blank", 0);
+CPPUNIT_ASSERT(xTargetFrame.is());
+
+// 1. Create spreadsheet
+uno::Sequence aEmptyArgList;
+uno::Reference xComponent
+= xDesktop->loadComponentFromURL("private:factory/scalc", "_blank", 0, 
aEmptyArgList);
+CPPUNIT_ASSERT(xComponent.is());
+
+// Get the document model
+SfxObjectShell* pFoundShell = 
SfxObjectShell::GetShellFromComponent(xComponent);
+CPPUNIT_ASSERT_MESSAGE("Failed to access document shell", pFoundShell);
+
+ScDocShellRef xDocSh = dynamic_cast(pFoundShell);
+CPPUNIT_ASSERT(xDocSh);
+
+uno::Reference xModel2(xDocSh->GetModel(), UNO_QUERY);
+CPPUNIT_ASSERT(xModel2.is());
+
+Reference 
xController(xModel2->createDefaultViewController(xTargetFrame),
+   UNO_QUERY);
+CPPUNIT_ASSERT(xController.is());
+
+// introduce model/view/controller to each other
+xController->attachModel(xModel2.get());
+xModel2->connectController(xController.get());
+xTargetFrame->setComponent(xController->getComponentWindow(), 
xController.get());
+xController->attachFrame(xTargetFrame);
+xModel2->setCurrentController(xController.get());
+
+ScDocument& rDoc = xDocSh->GetDocument();
+
+// Get the document controller
+ScTabViewShell* pViewShell = xDocSh->GetBestViewShell(false);
+CPPUNIT_ASSERT(pViewShell != nullptr);
+
+// 2. Setup data
+for (int r = 0; r < 2; ++r)
+for (int c = 0; c < 1024; ++c)
+rDoc.SetValue(c, r, 0, (c + 1) * 100 + (r + 1));
+
+const SCTAB n2ndTab = rDoc.GetMaxTableNumber() + 1;
+rDoc.MakeTable(n2ndTab);
+const auto aTabNames = rDoc.GetAllTableNames();
+
+lcl_copy(aTabNames[0] + ".A1:AMJ2", aTabNames[n2ndTab] + ".A1:AMJ2", rDoc, 
pViewShell);
+
+// 3. C

[Libreoffice-commits] core.git: 2 commits - basic/source sd/source

[Caolán McNamara (via logerrit)]

 basic/source/runtime/iosys.cxx|3 ++-
 sd/source/helper/simplereferencecomponent.cxx |2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ecf1e4b4022bc6e7756d2f94e192ef69816c8f63
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:48:28 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 22:12:36 2019 +0200

cid#1448356 Uncaught exception

Change-Id: Iaa48face892514b5af769cdb3120f001940cf0ea
Reviewed-on: https://gerrit.libreoffice.org/75882
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/helper/simplereferencecomponent.cxx 
b/sd/source/helper/simplereferencecomponent.cxx
index 23a1fe108c4a..acce1c481288 100644
--- a/sd/source/helper/simplereferencecomponent.cxx
+++ b/sd/source/helper/simplereferencecomponent.cxx
@@ -54,7 +54,7 @@ void SimpleReferenceComponent::release()
 }
 catch (RuntimeException const &) // don't break throw ()
 {
-css::uno::Any ex( cppu::getCaughtException() );
+css::uno::Any ex(DbgGetCaughtException());
 SAL_WARN( "sd", exceptionToString(ex) );
 }
 }
commit acf351fab73b1d05592d33e0a32cbc7cd160ae97
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:49:41 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 22:12:20 2019 +0200

cid#1448372 Unchecked return value

Change-Id: I63d8c9d145cd938fde289d680bdc0ed3f7357bd7
Reviewed-on: https://gerrit.libreoffice.org/75883
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basic/source/runtime/iosys.cxx b/basic/source/runtime/iosys.cxx
index c0b85982cf81..d73a177ac223 100644
--- a/basic/source/runtime/iosys.cxx
+++ b/basic/source/runtime/iosys.cxx
@@ -247,7 +247,8 @@ sal_uInt64 OslStream::SeekPos( sal_uInt64 nPos )
 }
 OSL_VERIFY(rc == ::osl::FileBase::E_None);
 sal_uInt64 nRealPos(0);
-maFile.getPos( nRealPos );
+rc = maFile.getPos( nRealPos );
+OSL_VERIFY(rc == ::osl::FileBase::E_None);
 return nRealPos;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - officecfg/registry

[Heiko Tietze (via logerrit)]

 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |   11 
++
 1 file changed, 11 insertions(+)

New commits:
commit 235a74d2e9d0e5e991777ef6d1a1625dab009670
Author: Heiko Tietze 
AuthorDate: Mon Jul 15 13:39:50 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 22:10:46 2019 +0200

tdf#125783 - .uno:WhatsNew command lacks name and tooltip

Label and tooltip added to GenericCommands

Change-Id: I292c377aed146196f1a9c3cc92f122b9b14c9b70
Reviewed-on: https://gerrit.libreoffice.org/75632
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit c96707fa8d3a81e0c2f425db2029f65b3481aa27)
Reviewed-on: https://gerrit.libreoffice.org/75640
Reviewed-by: Christian Lohmaier 

diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ee1f797e7a1d..39458c5d1698 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5170,6 +5170,17 @@
   1
 
   
+  
+
+  What's New
+
+
+  Open the release notes for the installed 
version in the default browser
+
+
+  1
+
+  
   
 
   License Information
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/dlg/sdtreelb.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit becbf34a863569fe38487faf2f41963677241710
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:45:56 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:41:33 2019 +0200

cid#1448347 Unchecked return value

Change-Id: I18a43e9a033a7326563f37caa0292a2c34752be0
Reviewed-on: https://gerrit.libreoffice.org/75880
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index 6bce07db2b24..695a7c97dac2 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -1523,7 +1523,7 @@ IMPL_LINK(SdPageObjsTLV, RequestingChildrenHdl, const 
weld::TreeIter&, rFileEntr
 m_xTreeView->iter_children(*xPageEntry);
 }
 else
-m_xTreeView->iter_next_sibling(*xPageEntry);
+(void)m_xTreeView->iter_next_sibling(*xPageEntry);
 
 SdrObjListIter aIter( pPage, SdrIterMode::DeepWithGroups );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: package/inc package/source

[Caolán McNamara (via logerrit)]

 package/inc/ThreadedDeflater.hxx   |2 +-
 package/source/zipapi/ThreadedDeflater.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 8ba4058ede102224cbdbea5c03dda2adfed61ea5
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:47:21 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:37:55 2019 +0200

cid#1448353 Uncaught exception

Change-Id: Ia967db3f73bee9167be4fd88090b27bfdbd4aca0
Reviewed-on: https://gerrit.libreoffice.org/75881
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/package/inc/ThreadedDeflater.hxx b/package/inc/ThreadedDeflater.hxx
index 90801700a37e..7a86fbbd72ca 100644
--- a/package/inc/ThreadedDeflater.hxx
+++ b/package/inc/ThreadedDeflater.hxx
@@ -47,7 +47,7 @@ class ThreadedDeflater final
 public:
 // Unlike with Deflater class, bNoWrap is always true.
 ThreadedDeflater(sal_Int32 nSetLevel);
-~ThreadedDeflater();
+~ThreadedDeflater() COVERITY_NOEXCEPT_FALSE;
 void startDeflate(const css::uno::Sequence& rBuffer);
 void waitForTasks();
 bool finished() const;
diff --git a/package/source/zipapi/ThreadedDeflater.cxx 
b/package/source/zipapi/ThreadedDeflater.cxx
index 930ab13ded71..f5fedee0273b 100644
--- a/package/source/zipapi/ThreadedDeflater.cxx
+++ b/package/source/zipapi/ThreadedDeflater.cxx
@@ -66,7 +66,7 @@ ThreadedDeflater::ThreadedDeflater(sal_Int32 nSetLevel)
 {
 }
 
-ThreadedDeflater::~ThreadedDeflater()
+ThreadedDeflater::~ThreadedDeflater() COVERITY_NOEXCEPT_FALSE
 {
 waitForTasks();
 clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - sal/osl sfx2/source tools/source

[Caolán McNamara (via logerrit)]

 sal/osl/unx/pipe.cxx  |2 +-
 sfx2/source/safemode/safemode.cxx |2 +-
 tools/source/stream/strmunx.cxx   |2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit fbaf0ccbf43ec3ed320c56a2bff4d7e8e59fb132
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:20:06 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:16:52 2019 +0200

cid#1448224 Unchecked return value

Change-Id: Ie13b8b8f865e44f3746fdf79bf0b1b2cec2aba1d
Reviewed-on: https://gerrit.libreoffice.org/75845
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/tools/source/stream/strmunx.cxx b/tools/source/stream/strmunx.cxx
index 4ba6da6dfe1b..152ed9b10274 100644
--- a/tools/source/stream/strmunx.cxx
+++ b/tools/source/stream/strmunx.cxx
@@ -63,7 +63,7 @@ InternalStreamLock::InternalStreamLock(
 m_nEndPos( nEnd ),
 m_pStream( pStream )
 {
-osl::DirectoryItem::get( m_pStream->GetFileName(), m_aItem );
+(void)osl::DirectoryItem::get( m_pStream->GetFileName(), m_aItem );
 #if OSL_DEBUG_LEVEL > 1
 OString aFileName(OUStringToOString(m_pStream->GetFileName(),
   
osl_getThreadTextEncoding()));
commit 034da04b16292a8a967340499832af23ec479bdc
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:32:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:16:19 2019 +0200

cid#1448294 Unchecked return value

Change-Id: Iee0153a00df72cf9353d2e40ff02f81f96522afe
Reviewed-on: https://gerrit.libreoffice.org/75873
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/safemode/safemode.cxx 
b/sfx2/source/safemode/safemode.cxx
index 6d8dcf981a4d..0b7b64446bf9 100644
--- a/sfx2/source/safemode/safemode.cxx
+++ b/sfx2/source/safemode/safemode.cxx
@@ -75,7 +75,7 @@ OUString SafeMode::getFilePath(const OUString& sFilename)
 
 OUString aProfilePath;
 FileBase::getSystemPathFromFileURL(url, aProfilePath);
-FileBase::getAbsoluteFileURL(url, sFilename, aProfilePath);
+(void)FileBase::getAbsoluteFileURL(url, sFilename, aProfilePath);
 return aProfilePath;
 }
 
commit 02b42f2825693454a4154d0e17a1dbcd3b4a66c6
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:31:34 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:16:01 2019 +0200

cid#1448288 Unchecked return value from library

Change-Id: Id1b8044126e65e67b2496cf7a4eb86b54ba6c1df
Reviewed-on: https://gerrit.libreoffice.org/75872
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sal/osl/unx/pipe.cxx b/sal/osl/unx/pipe.cxx
index f9037a14e4a7..e9888e577ec5 100644
--- a/sal/osl/unx/pipe.cxx
+++ b/sal/osl/unx/pipe.cxx
@@ -246,7 +246,7 @@ static oslPipe osl_psz_createPipe(const sal_Char 
*pszPipeName, oslPipeOptions Op
 depends on umask */
 
 if (!Security)
-chmod(name.getStr(),S_IRWXU | S_IRWXG |S_IRWXO);
+(void)chmod(name.getStr(),S_IRWXU | S_IRWXG |S_IRWXO);
 
 strcpy(pPipe->m_Name, name.getStr()); // safe, see check above
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - desktop/source filter/source idl/source

[Caolán McNamara (via logerrit)]

 desktop/source/deployment/misc/lockfile.cxx |2 +-
 filter/source/flash/swfwriter1.cxx  |4 
 idl/source/prj/svidl.cxx|4 ++--
 3 files changed, 3 insertions(+), 7 deletions(-)

New commits:
commit 99242d6ca22eaad663e1326e5eb402ded3521e24
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:41:39 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:15:42 2019 +0200

cid#1448337 Unchecked return value from library

Change-Id: Ie43cc1888179340318ddefb7fa4ba5f0bc1dc896
Reviewed-on: https://gerrit.libreoffice.org/75879
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/flash/swfwriter1.cxx 
b/filter/source/flash/swfwriter1.cxx
index bab56d749bc6..7967468650c3 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -740,14 +740,10 @@ sal_uInt16 Writer::defineBitmap( const BitmapEx 
&bmpSource, sal_Int32 nJPEGQuali
 alpha_compressed_size = uLongf(width * height + 
static_cast(raw_size/100) + 12);
 pAlphaCompressed.reset(new sal_uInt8[ compressed_size ]);
 
-#ifdef DBG_UTIL
 if(compress2(pAlphaCompressed.get(), &alpha_compressed_size, 
aAlphaData.data(), width * height, Z_BEST_COMPRESSION) != Z_OK)
 {
 SAL_WARN( "filter.flash", "compress2 failed!" ); ((void)0);
 }
-#else
-compress2(pAlphaCompressed.get(), &alpha_compressed_size, 
aAlphaData.data(), width * height, Z_BEST_COMPRESSION);
-#endif
 }
 
 // clear these early for less peak memory usage
commit dcfc5ecf93203e697df2290fa045f6a2fc7e00cd
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:35:26 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:15:24 2019 +0200

cid#1448323 Unchecked return value

Change-Id: I2d1d3d2ce7302fa895820981e0c15b59d491ddc4
Reviewed-on: https://gerrit.libreoffice.org/75876
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/idl/source/prj/svidl.cxx b/idl/source/prj/svidl.cxx
index d76b16a66835..fcfebed79816 100644
--- a/idl/source/prj/svidl.cxx
+++ b/idl/source/prj/svidl.cxx
@@ -120,8 +120,8 @@ int main ( int argc, char ** argv)
 {
 osl::DirectoryItem aDI;
 osl::FileStatus fileStatus( osl_FileStatus_Mask_FileName );
-osl::DirectoryItem::get( aCommand.aExportFile, aDI );
-aDI.getFileStatus(fileStatus);
+(void)osl::DirectoryItem::get( aCommand.aExportFile, aDI );
+(void)aDI.getFileStatus(fileStatus);
 pDataBase->SetExportFile( fileStatus.getFileName() );
 }
 
commit 53d78a7410dadb62be23c209b35ca1422a896307
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:34:02 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:15:07 2019 +0200

cid#1448296 Unchecked return value

Change-Id: I09268bc22f4fb34160975063e38ea60a68123400
Reviewed-on: https://gerrit.libreoffice.org/75875
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/desktop/source/deployment/misc/lockfile.cxx 
b/desktop/source/deployment/misc/lockfile.cxx
index ff216ff7f9dc..0cda82e6b3c3 100644
--- a/desktop/source/deployment/misc/lockfile.cxx
+++ b/desktop/source/deployment/misc/lockfile.cxx
@@ -130,7 +130,7 @@ namespace desktop {
 // remove file and create new
 File::remove( m_aLockname );
 File aFile(m_aLockname);
-aFile.open( osl_File_OpenFlag_Create );
+(void)aFile.open( osl_File_OpenFlag_Create );
 aFile.close( );
 syncToFile( );
 m_bRemove = true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - basic/source desktop/source

[Caolán McNamara (via logerrit)]

 basic/source/runtime/methods.cxx |4 ++--
 desktop/source/app/opencl.cxx|2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dc9ef75c82aa0f3b210bc3009078693e9624c711
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:36:37 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:14:51 2019 +0200

cid#1448326 Unchecked return value

Change-Id: I21dd0363ff8cad8737a25b3b79f960d44d03bdd4
Reviewed-on: https://gerrit.libreoffice.org/75877
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/basic/source/runtime/methods.cxx b/basic/source/runtime/methods.cxx
index 2928107308aa..de9b5f91badd 100644
--- a/basic/source/runtime/methods.cxx
+++ b/basic/source/runtime/methods.cxx
@@ -2966,9 +2966,9 @@ void SbRtl_GetAttr(StarBASIC * pBasic, SbxArray & rPar, 
bool bWrite)
 else
 {
 DirectoryItem aItem;
-DirectoryItem::get( getFullPath( rPar.Get(1)->GetOUString() ), 
aItem );
+(void)DirectoryItem::get( getFullPath( rPar.Get(1)->GetOUString() 
), aItem );
 FileStatus aFileStatus( osl_FileStatus_Mask_Attributes | 
osl_FileStatus_Mask_Type );
-aItem.getFileStatus( aFileStatus );
+(void)aItem.getFileStatus( aFileStatus );
 sal_uInt64 nAttributes = aFileStatus.getAttributes();
 bool bReadOnly = (nAttributes & osl_File_Attribute_ReadOnly) != 0;
 
commit 8c5e75a05b51b0f9ea0408e902dfc74ca895b395
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:37:39 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 21:14:36 2019 +0200

cid#1448333 Unchecked return value

Change-Id: If23db9a245b4dd4b59b9b5410a094f2f374eedfd
Reviewed-on: https://gerrit.libreoffice.org/75878
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/desktop/source/app/opencl.cxx b/desktop/source/app/opencl.cxx
index 16da10e50206..c421a3ab66da 100644
--- a/desktop/source/app/opencl.cxx
+++ b/desktop/source/app/opencl.cxx
@@ -219,7 +219,7 @@ void Desktop::CheckOpenCLCompute(const Reference< XDesktop2 
> &xDesktop)
 DirectoryItem aItem;
 DirectoryItem::get( aURL, aItem );
 FileStatus aFileStatus( osl_FileStatus_Mask_ModifyTime );
-aItem.getFileStatus( aFileStatus );
+(void)aItem.getFileStatus( aFileStatus );
 TimeValue aTimeVal = aFileStatus.getModifyTime();
 aSelectedCLDeviceVersionID += "--";
 aSelectedCLDeviceVersionID += OUString::number(aTimeVal.Seconds);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: i18nlangtag/source include/i18nlangtag svtools/inc

[Eike Rathke (via logerrit)]

 i18nlangtag/source/isolang/isolang.cxx |2 +-
 include/i18nlangtag/lang.h |2 +-
 svtools/inc/langtab.hrc|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 647060ece2df49e2655a4015c581543ac9ad1e19
Author: Eike Rathke 
AuthorDate: Thu Jul 18 14:11:11 2019 +0200
Commit: Eike Rathke 
CommitDate: Thu Jul 18 20:42:20 2019 +0200

It's Classical Armenian, not Classic [xcl-AM]

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

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index be183839fb59..ca511f9989df 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -673,7 +673,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_FON,   "fon", "BJ", k0},
 { LANGUAGE_USER_PLAUTDIETSCH,  "pdt", "CA", k0},
 { LANGUAGE_USER_ARMENIAN_WESTERN,  "hyw", "AM", k0},
-{ LANGUAGE_USER_ARMENIAN_CLASSIC,  "xcl", "AM", k0},
+{ LANGUAGE_USER_ARMENIAN_CLASSICAL,"xcl", "AM", k0},
 { LANGUAGE_USER_JUHOAN,"ktz", "NA", k0},
 { LANGUAGE_USER_NARO,  "nhr", "BW", k0},
 { LANGUAGE_USER_ILOKO, "ilo", "PH", k0},
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index 0863e5a1a9ae..37dba1cc5123 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -743,7 +743,7 @@ namespace o3tl
 #define LANGUAGE_USER_ARMENIAN_RUSSIA   LanguageType(0x802B)  /* 
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
 #define LANGUAGE_USER_ARMENIAN_IRAN LanguageType(0x842B)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_ARMENIAN)) */
 #define LANGUAGE_USER_ARMENIAN_WESTERN  LanguageType(0x069F)
-#define LANGUAGE_USER_ARMENIAN_CLASSIC  LanguageType(0x06A0)
+#define LANGUAGE_USER_ARMENIAN_CLASSICALLanguageType(0x06A0)
 #define LANGUAGE_USER_MALAY_ARABIC_MALAYSIA LanguageType(0x803E)  /* 
makeLangID( 0x20, getPrimaryLanguage( LANGUAGE_MALAY_MALAYSIA)) */
 #define LANGUAGE_USER_MALAY_ARABIC_BRUNEI   LanguageType(0x843E)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_MALAY_BRUNEI_DARUSSALAM)) */
 #define LANGUAGE_USER_JUHOANLanguageType(0x06A1)
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 43394d03e2a1..13fb8a89070a 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -411,7 +411,7 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Russia)") , 
LANGUAGE_USER_ARMENIAN_RUSSIA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Eastern (Iran)") , 
LANGUAGE_USER_ARMENIAN_IRAN },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Western (Armenia)") , 
LANGUAGE_USER_ARMENIAN_WESTERN },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classic (Armenia)") , 
LANGUAGE_USER_ARMENIAN_CLASSIC },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Armenian, Classical (Armenia)") , 
LANGUAGE_USER_ARMENIAN_CLASSICAL },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Malaysia)") , 
LANGUAGE_USER_MALAY_ARABIC_MALAYSIA },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Malay Arabic (Brunei Darussalam)") , 
LANGUAGE_USER_MALAY_ARABIC_BRUNEI },
 { NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Juǀ’hoan") , LANGUAGE_USER_JUHOAN },
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/EL-SHREIF/ui_logger' - uitest/ui_logger_dsl vcl/source

[Ahmed ElShreif (via logerrit)]

 uitest/ui_logger_dsl/dsl_core.py |4 ++-
 uitest/ui_logger_dsl/example.ul  |   51 ++-
 vcl/source/uitest/logger.cxx |4 +--
 vcl/source/uitest/uiobject.cxx   |2 -
 4 files changed, 35 insertions(+), 26 deletions(-)

New commits:
commit c7633b8427130dc4649aef0e80e24aa1b52dacef
Author: Ahmed ElShreif 
AuthorDate: Thu Jul 18 12:25:05 2019 -0500
Commit: Ahmed ElShreif 
CommitDate: Thu Jul 18 12:25:05 2019 -0500

Solving some bugs in the ui logger

Change-Id: I39836423fad8cb361a8f007f648108618906be8a

diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index a43399c190a4..0d5593081693 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -171,6 +171,7 @@ class ul_Compiler:
 self.prev_command.uno_command_name+"\")\n"
 self.variables.append(old_line)
 line = "\t\t" + DialogCommand.dialog_name + " = 
self.xUITest.getTopFocusWindow()\n"
+self.variables.append(line)
 
 elif (DialogCommand.__class__.__name__ == "OpenModelessDialog"):
 old_line = self.variables.pop()
@@ -184,14 +185,15 @@ class ul_Compiler:
 self.prev_command.uno_command_name+"\")\n"
 self.variables.append(old_line)
 line = "\t\t" + DialogCommand.dialog_name + "  = 
self.xUITest.getTopFocusWindow()\n"
+self.variables.append(line)
 
 elif (DialogCommand.__class__.__name__ == "CloseDialog"):
 if (self.prev_command.__class__.__name__ == "ButtonUIObject"):
 old_line = self.variables.pop()
 line="\t\tself.ui_test.close_dialog_through_button("+\
 self.prev_command.ui_button+")\n"
+self.variables.append(line)
 
-self.variables.append(line)
 self.prev_command=DialogCommand
 
 def handle_button(self, ButtonUIObject):
diff --git a/uitest/ui_logger_dsl/example.ul b/uitest/ui_logger_dsl/example.ul
index 93bc14c59c5a..dc78ac14dcd6 100644
--- a/uitest/ui_logger_dsl/example.ul
+++ b/uitest/ui_logger_dsl/example.ul
@@ -1,22 +1,29 @@
-Start writer
-Send UNO Command (".uno:UpdateInputFields")
-Send UNO Command (".uno:FontDialog")
-Open CharacterPropertiesDialog
-Choose Tab number 0 from CharacterPropertiesDialog 
-Choose Tab number 2 from CharacterPropertiesDialog
-Select "90deg" Radio Button from CharacterPropertiesDialog
-Toggle "pairkerning" CheckBox from CharacterPropertiesDialog
-Select in "weststylelb-cjk" ComboBox item number 2 from 
CharacterPropertiesDialog 
-Increase "scalewidthsb" from CharacterPropertiesDialog
-Decrease "scalewidthsb" from CharacterPropertiesDialog
-Type on "linewidthmf" {"TEXT": "1"} from CharacterPropertiesDialog
-Select element with position 2 in "effectslb" from CharacterPropertiesDialog
-Click on "ok" from CharacterPropertiesDialog 
-Close Dialog
-Type on writer {"TEXT": "s"}
-Select from Pos 5 to Pos 7
-Set Zoom to 100
-GOTO page number 1
-Open QuerySaveDialog
-Click on "ok" from QuerySaveDialog
-Close Dialog
+Start calc
+Switch to sheet number 0
+Select from calc {"CELL": "A1"}
+Select from calc {"CELL": "B5"}
+Select from calc {"CELL": "C6"}
+Switch to sheet number 1
+Select from calc {"CELL": "A1"}
+Switch to sheet number 0
+Select from calc {"CELL": "C6"}
+Switch to sheet number 1
+Select from calc {"CELL": "A1"}
+Switch to sheet number 2
+Select from calc {"CELL": "A1"}
+Select from calc {"CELL": "C5"}
+Type on current cell {"TEXT": "a"}
+Type on current cell {"TEXT": "a"}
+Select from calc {"CELL": "C7"}
+Type on current cell {"TEXT": "a"}
+Type on current cell {"TEXT": "v"}
+Select from calc {"CELL": "C5"}
+Send UNO Command (".uno:ZoomSlider") 
+Send UNO Command (".uno:ZoomSlider")  {}
+Send UNO Command (".uno:DataFilterAutoFilter") 
+Lanuch AutoFilter from Col 0 and Row 2
+Click on 'ok' from check_list_menu
+Select from calc {"RANGE": "C1:C7"}
+Open Modal QuerySaveDialog
+Click on 'discard' from QuerySaveDialog
+Close Dialog
\ No newline at end of file
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index 4b3f69245ae6..0dac10050023 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -292,7 +292,7 @@ void UITestLogger::logEvent(const EventDescription& 
rDescription)
 OUString aLogLine ;
 //first check on general commands
 if(rDescription.aAction=="SET"){
-aLogLine =  "Set Zoom to be "  + 
GetValueInMapWithIndex(rDescription.aParameters,0);
+aLogLine =  "Set Zoom to "  + 
GetValueInMapWithIndex(rDescription.aParameters,0);
 }
 else if(rDescription.aAction=="SIDEBAR"){
 aLogLine = "From SIDEBAR Choose " + aParameterString;
@@ -308,7 +308,7 @@ void UITestLogger::logEvent(const EventDescription& 
rDescription)
 else if(rDescription.aAction=="SELECT"){
 OUString to = GetValueInMapWithIndex(rDescription.aParameters,0);
 OUString from =   
G

[Libreoffice-commits] core.git: Branch 'private/EL-SHREIF/ui_logger' - uitest/ui_logger_dsl

[Ahmed ElShreif (via logerrit)]

 uitest/ui_logger_dsl/dsl_core.py |  323 ---
 1 file changed, 107 insertions(+), 216 deletions(-)

New commits:
commit 9f0ebbfcdc480b727162b108c509e020cf7e215b
Author: Ahmed ElShreif 
AuthorDate: Sat Jul 13 15:09:25 2019 +0200
Commit: Ahmed ElShreif 
CommitDate: Sat Jul 13 17:36:52 2019 +0200

Adding General Functions to remove Redundunt lines:

1) init_app
2) init_Object
3) write_line_without_parameters
4) write_line_with_one_parameters

Then Rewrite the handlers again

Change-Id: I8ceb01f4eaa48f1544ada8966c7585dcbd3e15aa

diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index c81a099b6de5..a43399c190a4 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -91,6 +91,43 @@ class ul_Compiler:
 
 self.log_lines=self.get_log_file(self.input_address)
 
+def init_app(self):
+if self.current_app in self.objects:
+self.objects[self.current_app]+=1
+else:
+self.objects[self.current_app]=1
+line="\t\t"+self.current_app+" = 
MainWindow.getChild(\""+self.current_app+"\")\n"
+self.variables.append(line)
+
+def init_Object(self,Id_of_Object,Obj_parent):
+
+if Id_of_Object in self.objects:
+self.objects[Id_of_Object]+=1
+else:
+self.objects[Id_of_Object]=1
+line="\t\t"+Id_of_Object+" = "+Obj_parent+\
+".getChild(\""+Id_of_Object+"\")\n"
+self.variables.append(line)
+
+def write_line_without_parameters(self,Action_holder,Action,Action_type):
+
line="\t\t"+Action_holder+".executeAction(\""+Action+"\","+Action_type+"())\n"
+self.variables.append(line)
+
+def 
write_line_with_one_parameters(self,Action_holder,Action,Paramerter_name,parameter_value):
+line="\t\t"+Action_holder+".executeAction(\""+Action+"\", 
mkPropertyValues({\""+\
+Paramerter_name+"\": \""+\
+str(parameter_value)+"\"}))\n"
+self.variables.append(line)
+
+def 
write_line_with_two_parameters(self,Action_holder,Action,Paramerter_name_1,parameter_value_1,
+Paramerter_name_2,parameter_value_2):
+
+line="\t\t"+Action_holder+\
+".executeAction(\""+Action+"\", 
mkPropertyValues({\""+Paramerter_name_1+"\": \""+\
+str(parameter_value_1)+"\", \""+Paramerter_name_2+"\": \""+\
+str(parameter_value_2)+"\"}))\n"
+self.variables.append(line)
+
 def handle_uno(self, UNOCommand):
 if(UNOCommand.prameters==None):
 line = "\t\tself.xUITest.executeCommand(\"" + \
@@ -159,275 +196,153 @@ class ul_Compiler:
 
 def handle_button(self, ButtonUIObject):
 
-if ButtonUIObject.ui_button in self.objects:
-self.objects[ButtonUIObject.ui_button]+=1
-else:
-self.objects[ButtonUIObject.ui_button]=1
-line="\t\t"+ButtonUIObject.ui_button+" = 
"+ButtonUIObject.parent_id+\
-".getChild(\""+ButtonUIObject.ui_button+"\")\n"
-self.variables.append(line)
+self.init_Object(ButtonUIObject.ui_button,ButtonUIObject.parent_id)
+
+
self.write_line_without_parameters(ButtonUIObject.ui_button,"CLICK","tuple")
 
-
line="\t\t"+ButtonUIObject.ui_button+".executeAction(\"CLICK\",tuple())\n"
-self.variables.append(line)
 self.prev_command=ButtonUIObject
 
 def handle_check_box(self, CheckBoxUIObject):
 
-if CheckBoxUIObject.Check_box_id in self.objects:
-self.objects[CheckBoxUIObject.Check_box_id]+=1
-else:
-self.objects[CheckBoxUIObject.Check_box_id]=1
-line="\t\t"+CheckBoxUIObject.Check_box_id+" = 
"+CheckBoxUIObject.parent_id+\
-".getChild(\""+CheckBoxUIObject.Check_box_id+"\")\n"
-self.variables.append(line)
+
self.init_Object(CheckBoxUIObject.Check_box_id,CheckBoxUIObject.parent_id)
+
+
self.write_line_without_parameters(CheckBoxUIObject.Check_box_id,"CLICK","tuple")
 
-
line="\t\t"+CheckBoxUIObject.Check_box_id+".executeAction(\"CLICK\",tuple())\n"
-self.variables.append(line)
 self.prev_command=CheckBoxUIObject
 
 def handle_tab(self, TabControlUIObject):
 
-if TabControlUIObject.tab_id in self.objects:
-self.objects[TabControlUIObject.tab_id]+=1
-else:
-self.objects[TabControlUIObject.tab_id]=1
-line="\t\t"+TabControlUIObject.tab_id+" = 
"+TabControlUIObject.parent_id+\
-".getChild(\""+TabControlUIObject.tab_id+"\")\n"
-self.variables.append(line)
+
self.init_Object(TabControlUIObject.tab_id,TabControlUIObject.parent_id)
+
+
self.write_line_with_one_parameters(TabControlUIObject.tab_id,"SELECT","POS",TabControlUIObject.tab_page_number)
 
-line="\t\t"+TabControlU

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - cui/uiconfig

[Heiko Tietze (via logerrit)]

 cui/uiconfig/ui/tipofthedaydialog.ui |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 875ec40359b409f1dfb9cfbdf7085de1257226fb
Author: Heiko Tietze 
AuthorDate: Mon Jul 15 15:30:21 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 19:23:06 2019 +0200

tdf#125871 - new Tooltip window has empty area selected

Ok button focused by default

Change-Id: Ibe7653c09dd9f76d6b9feda295b92c90a4b26058
Reviewed-on: https://gerrit.libreoffice.org/75637
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit fdd826eefd0f184fd832582237a8ccdae3572f48)
Reviewed-on: https://gerrit.libreoffice.org/75864
Reviewed-by: Christian Lohmaier 

diff --git a/cui/uiconfig/ui/tipofthedaydialog.ui 
b/cui/uiconfig/ui/tipofthedaydialog.ui
index 928bc92c6919..49748809c52c 100644
--- a/cui/uiconfig/ui/tipofthedaydialog.ui
+++ b/cui/uiconfig/ui/tipofthedaydialog.ui
@@ -58,6 +58,8 @@
 gtk-ok
 True
 True
+True
+True
 True
 True
 True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - config_host.mk.in

[Caolán McNamara (via logerrit)]

 config_host.mk.in |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a0da10a3af3335fd1a66d03118c7fb7069fe8f98
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 15:50:12 2019 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 19:15:39 2019 +0200

missing LDAP

since...

Make LDAP support optional
commit 6776c53b7ce2e431d8636f4e5a755f50f787ec8f
Date:   Tue Jan 8 04:53:51 2019 -0500

Change-Id: I4268169809b0dc68b347b28523500453394937de
Reviewed-on: https://gerrit.libreoffice.org/75866
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/config_host.mk.in b/config_host.mk.in
index af6d0c43b60d..f639f9d9415b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -148,6 +148,7 @@ export DISABLE_GUI=@DISABLE_GUI@
 export ENABLE_HTMLHELP=@ENABLE_HTMLHELP@
 export ENABLE_IOS_LIBREOFFICELIGHT_APP=@ENABLE_IOS_LIBREOFFICELIGHT_APP@
 export ENABLE_JAVA=@ENABLE_JAVA@
+export ENABLE_LDAP=@ENABLE_LDAP@
 export ENABLE_LPSOLVE=@ENABLE_LPSOLVE@
 export ENABLE_LTO=@ENABLE_LTO@
 export ENABLE_LWP=@ENABLE_LWP@
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/cib/libreoffice-6-2' - 3 commits - loleaflet/js loleaflet/src

[Samuel Mehrbrodt (via logerrit)]

 loleaflet/js/toolbar.js   |2 -
 loleaflet/src/map/handler/Map.WOPI.js |   46 +-
 loleaflet/src/unocommands.js  |4 +-
 3 files changed, 26 insertions(+), 26 deletions(-)

New commits:
commit 378197ef4abef3aa24ff0739f782427d1fcec3d4
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jul 18 17:41:12 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jul 18 17:41:12 2019 +0200

Alow to modify UI before WOPIPostmessageReady

Manually ported from 35905035a627c8e46c665cb625792f242f2a53ff

diff --git a/loleaflet/src/map/handler/Map.WOPI.js 
b/loleaflet/src/map/handler/Map.WOPI.js
index b8b5f1e2c..63b973e49 100644
--- a/loleaflet/src/map/handler/Map.WOPI.js
+++ b/loleaflet/src/map/handler/Map.WOPI.js
@@ -124,27 +124,7 @@ L.Map.WOPI = L.Handler.extend({
},
 
_postMessageListener: function(e) {
-   if (!window.WOPIPostmessageReady) {
-   return;
-   }
-
var msg = JSON.parse(e.data);
-   if (msg.MessageId === 'Host_PostmessageReady') {
-   // We already have a listener for this in 
loleaflet.html, so ignore it here
-   return;
-   }
-
-   // allow closing documents before they are completely loaded
-   if (msg.MessageId === 'Close_Session') {
-   this._map._socket.sendMessage('closedocument');
-   return;
-   }
-
-   // For all other messages, warn if trying to interact before we 
are completely loaded
-   if (!this._appLoaded) {
-   console.error('LibreOffice Online not loaded yet. 
Listen for App_LoadingStatus (Document_Loaded) event before using PostMessage 
API. Ignoring post message \'' + msg.MessageId + '\'.');
-   return;
-   }
 
if (msg.MessageId === 'Insert_Button') {
if (msg.Values) {
@@ -239,7 +219,28 @@ L.Map.WOPI = L.Handler.extend({
else if (msg.MessageId === 'Hide_Ruler') {
this._map.hideRuler();
}
-   else if (msg.MessageId === 'Set_Settings') {
+
+   if (!window.WOPIPostmessageReady) {
+   return;
+   }
+   if (msg.MessageId === 'Host_PostmessageReady') {
+   // We already have a listener for this in 
loleaflet.html, so ignore it here
+   return;
+   }
+
+   // allow closing documents before they are completely loaded
+   if (msg.MessageId === 'Close_Session') {
+   this._map._socket.sendMessage('closedocument');
+   return;
+   }
+
+   // For all other messages, warn if trying to interact before we 
are completely loaded
+   if (!this._appLoaded) {
+   console.error('LibreOffice Online not loaded yet. 
Listen for App_LoadingStatus (Document_Loaded) event before using PostMessage 
API. Ignoring post message \'' + msg.MessageId + '\'.');
+   return;
+   }
+
+   if (msg.MessageId === 'Set_Settings') {
if (msg.Values) {
var alwaysActive = msg.Values.AlwaysActive;
this._map.options.alwaysActive = !!alwaysActive;
commit c482a47920ea978ba21231c98f68c4021dcd2d27
Author: Samuel Mehrbrodt 
AuthorDate: Thu Jul 18 17:04:23 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jul 18 17:04:23 2019 +0200

Fix "BackColor" tooltip

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index 2090b00fa..dab0b5d4d 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -647,7 +647,7 @@ function createToolbar() {
{type: 'button',  id: 'strikeout', img: 'strikeout', hint: 
_UNO('.uno:Strikeout'), uno: 'Strikeout', disabled: true},
{type: 'break', id: 'breakformatting'},
{type: 'text-color',  id: 'fontcolor', hint: 
_UNO('.uno:FontColor')},
-   {type: 'color',  id: 'backcolor', img: 'backcolor', hint: 
_UNO('.uno:BackColor')},
+   {type: 'color',  id: 'backcolor', img: 'backcolor', hint: 
_UNO('.uno:BackColor', 'text')},
{type: 'color',  id: 'backgroundcolor', img: 'backgroundcolor', 
hint: _UNO('.uno:BackgroundColor')},
{type: 'break', id: 'breakcolor'},
{type: 'button',  id: 'leftpara',  img: 'alignleft', hint: 
_UNO('.uno:LeftPara', '', true), uno: 'LeftPara', unosheet: 'AlignLeft', 
disabled: true},
diff --git a/loleaflet/src/unocommands.js b/loleaflet/src/unocommands.js
index f192e3837..4c6197690 100644
--- a/loleaflet/src/unocommands.js
+++ b/loleaflet/src/unocommands.js
@@ -7,7 +7,7 @@ var unoCommandsArray = {
ArrangeFrameMenu:{text:{menu

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - svl/source

[Eike Rathke (via logerrit)]

 svl/source/numbers/zforfind.cxx |   21 -
 1 file changed, 20 insertions(+), 1 deletion(-)

New commits:
commit 7af89de46ff4a40a8161fd629584d54cfdeadee1
Author: Eike Rathke 
AuthorDate: Fri Jul 12 11:16:07 2019 +0200
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 17:21:35 2019 +0200

Resolves: tdf#126342 obtain date particle order from pattern match

... if there was any. In the NF_EVALDATEFORMAT_FORMAT_INTL case
the input may match a current locale's pattern instead of a
format's locale's pattern and patterns' (format locale + current
locale) date orders may be different from the format's date order.

Change-Id: I3aeaa6c361f98fe80f69c4f5d975fca892dac6ea
Reviewed-on: https://gerrit.libreoffice.org/75481
Reviewed-by: Eike Rathke 
Tested-by: Jenkins
(cherry picked from commit 7de96e9f7b69354fd5b15e1276678000bc386568)
Reviewed-on: https://gerrit.libreoffice.org/75491
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svl/source/numbers/zforfind.cxx b/svl/source/numbers/zforfind.cxx
index 0ec1cd812418..dfb66e3de235 100644
--- a/svl/source/numbers/zforfind.cxx
+++ b/svl/source/numbers/zforfind.cxx
@@ -1699,7 +1699,26 @@ bool ImpSvNumberInputScan::GetDateRef( double& fDays, 
sal_uInt16& nCounter )
 else
 {
 bFormatTurn = true;
-DateFmt = mpFormat->GetDateOrder();
+// Even if the format pattern is to be preferred, the input may
+// have matched a pattern of the current locale, which then
+// again is to be preferred. Both date orders can be different
+// so we need to obtain the actual match. For example ISO
+// -MM-DD format vs locale's DD.MM.YY input.
+if (!GetDatePatternOrder())
+{
+// No pattern match => format match.
+DateFmt = mpFormat->GetDateOrder();
+}
+else
+{
+// Pattern match. Note that patterns may have been
+// constructed from the format's locale and prepended to
+// the current locale's patterns, it doesn't necessarily
+// mean a current locale's pattern was matched, but may if
+// the format's locale's patterns didn't match, which were
+// tried first.
+DateFmt = GetDateOrder();
+}
 }
 break;
 default:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/svx svx/source

[Miklos Vajna (via logerrit)]

 include/svx/sdr/properties/defaultproperties.hxx |2 +-
 include/svx/sdr/properties/properties.hxx|4 
 svx/source/sdr/properties/defaultproperties.cxx  |1 +
 svx/source/sdr/properties/properties.cxx |8 
 svx/source/svdraw/svdobj.cxx |5 +
 5 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit 83a615c568a7a23a3aae7ca52012bc947d4cb5de
Author: Miklos Vajna 
AuthorDate: Thu Jul 18 12:12:48 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jul 18 17:18:59 2019 +0200

svx xml dump: show the SdrObject's properties / item set

Shows items usually accessed using GetMergedItemSet(), to help
debugging.

Change-Id: Id3c20e99c33d5e5762c3b58e2f76ab5686031734
Reviewed-on: https://gerrit.libreoffice.org/75852
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins

diff --git a/include/svx/sdr/properties/defaultproperties.hxx 
b/include/svx/sdr/properties/defaultproperties.hxx
index 82de52f4e6b3..96d4fe5f1d84 100644
--- a/include/svx/sdr/properties/defaultproperties.hxx
+++ b/include/svx/sdr/properties/defaultproperties.hxx
@@ -68,7 +68,7 @@ namespace sdr
 // destructor
 virtual ~DefaultProperties() override;
 
-void dumpAsXml(xmlTextWriterPtr pWriter) const;
+void dumpAsXml(xmlTextWriterPtr pWriter) const override;
 
 // Clone() operator, normally just calls the local copy constructor
 virtual std::unique_ptr Clone(SdrObject& rObj) 
const override;
diff --git a/include/svx/sdr/properties/properties.hxx 
b/include/svx/sdr/properties/properties.hxx
index 7b026f865b1a..56182af840e2 100644
--- a/include/svx/sdr/properties/properties.hxx
+++ b/include/svx/sdr/properties/properties.hxx
@@ -28,6 +28,8 @@
 #include 
 #include 
 
+struct _xmlTextWriter;
+typedef struct _xmlTextWriter* xmlTextWriterPtr;
 class SdrObject;
 class SfxItemSet;
 class SfxPoolItem;
@@ -196,6 +198,8 @@ namespace sdr
 // allow detection of e.g. style sheet or single text attribute 
changes. The
 // default implementation returns 0 (zero)
 virtual sal_uInt32 getVersion() const;
+
+virtual void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
 // checks the FillStyle item and removes unneeded Gradient, FillBitmap 
and Hatch items
diff --git a/svx/source/sdr/properties/defaultproperties.cxx 
b/svx/source/sdr/properties/defaultproperties.cxx
index 60c1d5a00b0c..f9461f796b53 100644
--- a/svx/source/sdr/properties/defaultproperties.cxx
+++ b/svx/source/sdr/properties/defaultproperties.cxx
@@ -233,6 +233,7 @@ namespace sdr
 void DefaultProperties::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
 xmlTextWriterStartElement(pWriter, BAD_CAST("DefaultProperties"));
+BaseProperties::dumpAsXml(pWriter);
 mpItemSet->dumpAsXml(pWriter);
 xmlTextWriterEndElement(pWriter);
 }
diff --git a/svx/source/sdr/properties/properties.cxx 
b/svx/source/sdr/properties/properties.cxx
index 457db8e38b3f..c76ecba49c8a 100644
--- a/svx/source/sdr/properties/properties.cxx
+++ b/svx/source/sdr/properties/properties.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -154,6 +156,12 @@ namespace sdr
 return 0;
 }
 
+void BaseProperties::dumpAsXml(xmlTextWriterPtr pWriter) const
+{
+xmlTextWriterStartElement(pWriter, BAD_CAST("BaseProperties"));
+xmlTextWriterEndElement(pWriter);
+}
+
 void CleanupFillProperties( SfxItemSet& rItemSet )
 {
 const bool bFillBitmap = rItemSet.GetItemState(XATTR_FILLBITMAP, 
false) == SfxItemState::SET;
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 753caf3edd8a..65e8492145fe 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1726,6 +1726,11 @@ void SdrObject::dumpAsXml(xmlTextWriterPtr pWriter) const
 xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("nOrdNum"), "%" 
SAL_PRIuUINT32, GetOrdNumDirect());
 xmlTextWriterWriteAttribute(pWriter, BAD_CAST("aOutRect"), 
BAD_CAST(aOutRect.toString().getStr()));
 
+if (mpProperties)
+{
+mpProperties->dumpAsXml(pWriter);
+}
+
 if (const OutlinerParaObject* pOutliner = GetOutlinerParaObject())
 pOutliner->dumpAsXml(pWriter);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Caolán McNamara (via logerrit)]

 sw/source/ui/fldui/fldtdlg.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e9a13d06f300cc653d2d1b19e5764bcf836a9d4b
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:44:27 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 17:13:28 2019 +0200

cid#1448377 silence Dereference null return value

Change-Id: I8e124f005622091f7c3e989042c5298640ba819b
Reviewed-on: https://gerrit.libreoffice.org/75816
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index b3425050f45a..8c1bb998fb85 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -150,6 +150,7 @@ IMPL_LINK_NOARG(SwFieldDlg, OKHdl, weld::Button&, void)
 if (GetOKButton().get_sensitive())
 {
 SfxTabPage* pPage = GetTabPage(GetCurPageId());
+assert(pPage);
 pPage->FillItemSet(nullptr);
 
 GetOKButton().grab_focus();  // because of InputField-Dlg
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/sfx2 sfx2/source

[Jan-Marek Glogowski (via logerrit)]

 include/sfx2/strings.hrc  |2 +-
 sfx2/source/appl/linkmgr2.cxx |7 +--
 2 files changed, 6 insertions(+), 3 deletions(-)

New commits:
commit d1398fd1cd6957f56992a9239929ccc64fd747f0
Author: Jan-Marek Glogowski 
AuthorDate: Wed Jul 17 11:52:23 2019 +0200
Commit: Thorsten Behrens 
CommitDate: Thu Jul 18 17:01:14 2019 +0200

tdf#126461 incl. document name in link update msg

If you open a OLE-linked document from the console, LO will ask to
update the linked information on open. But this happens before the
document shell has even has set the title of the shell, so a user
has no way to know, what "This document" really refers to.

This is even more problematic if you have multiple open documents
restored by a session manager.

So this changes the string to include the document name.

Change-Id: Ife7b21f6eeb4dd5c1aebd383752cc62279da33fb
Reviewed-on: https://gerrit.libreoffice.org/75777
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/include/sfx2/strings.hrc b/include/sfx2/strings.hrc
index 63cca694a535..b5128e136ce1 100644
--- a/include/sfx2/strings.hrc
+++ b/include/sfx2/strings.hrc
@@ -142,7 +142,7 @@
 #define STR_QUICKSTART_FILE NC_("STR_QUICKSTART_FILE", 
"File")
 #define STR_QUICKSTART_STARTCENTER  
NC_("STR_QUICKSTART_STARTCENTER", "Startcenter")
 #define STR_QUICKSTART_RECENTDOC
NC_("STR_QUICKSTART_RECENTDOC", "Recent Documents")
-#define STR_QUERY_UPDATE_LINKS  NC_("STR_QUERY_UPDATE_LINKS", 
"This document contains one or more links to external data.\n\nWould you like 
to change the document, and update all links\nto get the most recent data?")
+#define STR_QUERY_UPDATE_LINKS  NC_("STR_QUERY_UPDATE_LINKS", 
"The document %{filename} contains one or more links to external data.\n\nWould 
you like to change the document, and update all links\nto get the most recent 
data?")
 #define STR_DDE_ERROR   NC_("STR_DDE_ERROR", "DDE link 
to %1 for %2 area %3 are not available.")
 #define STR_SECURITY_WARNING_NO_HYPERLINKS  
NC_("STR_SECURITY_WARNING_NO_HYPERLINKS", "For security reasons, the hyperlink 
cannot be executed.\nThe stated address will not be opened.")
 #define RID_SECURITY_WARNING_TITLE  
NC_("RID_SECURITY_WARNING_TITLE", "Security Warning")
diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 6a6c282dc4ab..f3b24cb66032 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -311,9 +311,12 @@ void LinkManager::UpdateAllLinks(
 
 if( bAskUpdate )
 {
+OUString aMsg = SfxResId(STR_QUERY_UPDATE_LINKS);
+INetURLObject aURL(pPersist->getDocumentBaseURL());
+aMsg = aMsg.replaceFirst("%{filename}", aURL.GetLastName());
+
 std::unique_ptr 
xQueryBox(Application::CreateMessageDialog(pParentWin,
-   
VclMessageType::Question, VclButtonsType::YesNo,
-   
SfxResId(STR_QUERY_UPDATE_LINKS)));
+   
VclMessageType::Question, VclButtonsType::YesNo, aMsg));
 xQueryBox->set_default_response(RET_YES);
 
 int nRet = xQueryBox->run();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/escherex.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6fe3eb31304923680d04ae069621eabe84cddc24
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:24:09 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 16:28:42 2019 +0200

cid#1448237 Unchecked return value

Change-Id: Ic53196270ececf407d75c2f76998253adf396c64
Reviewed-on: https://gerrit.libreoffice.org/75848
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/msfilter/escherex.cxx 
b/filter/source/msfilter/escherex.cxx
index 2763565b0281..1324a23979cd 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -1576,7 +1576,7 @@ bool 
EscherPropertyContainer::CreateGraphicProperties(const uno::Referencehttps://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

minutes of ESC call ...

[Michael Meeks]

* Present:
 + Caolan, Michael W, Michael M, Michael S, Kendy, Miklos, Eike, Heiko,
   Thorsten, Christian, Kaishu, Gabriel

* Completed Action Items:
+ send out list of papers to conference committee (Sophie)
+ https://wiki.documentfoundation.org/Documentation/HowTo/MigrateFromHSQLDB
   [ wiki page now has some content – thanks to all involved ]

* Pending Action Items:
+ add an alias configure switch & rename KDE backend (Jan-Marek)
   [ another patch depends on this one, needs tweaking (Michael W)]
+ upgrade Android reqs to NDK19 (Kendy)
   [ patch needs pushing ]

* Release Engineering update (Christian)
+ 6.2.6 rc1, next week
+ 6.3.0 rc2
  + branching-off for libreoffice-6-3-0 – due this week
  + planning to tag later today.
  + UI freeze, 1 review needed on libreoffice-6-3 from now on
  + can I push some UI patches
https://gerrit.libreoffice.org/#/c/75637/
  + link is highlighted in error (Heiko)
 + focusing something different no issue (Christian)
  + string change / polish (Heiko)
 https://gerrit.libreoffice.org/#/c/75632/
 + abandoned it, not too important.
 + good to talk to /ask the translations/l10n (Michael)
   + if they’re happy, push it (Christian)
  + would like in today for rc2
  + there will be a 3rd rc3 as planned.
+ Remotes
+ Android viewer
+ Online

* Documentation
+ Olivier was missed.

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
241(241) (topicUI) bugs open, 219(219) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month3 months   12 months  
 added  8(-3)19(-10)38(-4)  82(-4) 
 commented 52(1)180(-25)   427(6) 1439(-2) 
   removed  2(2)  2(2)   2(0)   20(2)  
  resolved  0(-2) 5(-3) 24(-3) 130(-3) 
+ top 10 contributors:
  Heiko Tietze made 64 changes in 1 month, and 81 changes in 1 year
  Foote, V Stuart made 49 changes in 1 month, and 243 changes in 1 year
  Xisco Faulí made 35 changes in 1 month, and 273 changes in 1 year
  Timur made 30 changes in 1 month, and 81 changes in 1 year
  Dieter Praas made 27 changes in 1 month, and 130 changes in 1 year
  kompilainenn made 25 changes in 1 month, and 230 changes in 1 year
  Kainz, Andreas made 17 changes in 1 month, and 200 changes in 1 year
  Thomas Lendo made 13 changes in 1 month, and 248 changes in 1 year
  Budea, Áron made 13 changes in 1 month, and 29 changes in 1 year
  New needsUXEval between Jul/11-18

-> * Tabbed UI (Writer): Division/section-per-tab (similar to Lotus 
WordPro) 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=33173  
 + MUFFINi-ze 
https://lists.freedesktop.org/archives/libreoffice/2019-July/083144.html 
   * Context menu "open file location" from StartCenter thumbnail views 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126404  
   * Writer styles: Addressee and Sender group in subgroup Envelope 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126258  
   * Move Add/Edit/Delete buttons to right side in AutoRedact dialog 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126431  
   * Rework Add/Edit AutoRedaction subdialogs 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126432  
   * Add a confirmation for deleting of target in AutoRedaction dialog 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126433  
   * select shapes with the same style 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126451 
   => in discussion  
   
   * Sidebar Styles get style Icon support 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126450  
   * Ctrl-clicking hyperlink does not work in cell/text edit modes 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=121039  
   => new 
   
   * Add opportunity for deleting of not existing file to "file does not
 exist" dialog in the Start Center 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126423  
   * Revise layout of HTML color palette swatches 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=126403 
   => dup, wfm 
   
-> * LibreOffice components should be single apps on macOS 
 + https://bugs.documentfoundation.org/show_bug.cgi?id=97946  
 + only a single icon, you don’t get single module icons
 + request to split the install into single modules.
 + only a matter of adding launchers (Christian)
 + provide a template and pull it into your dock easily
 + D&D installer gets you 1 application
 + p

[Libreoffice-commits] core.git: 3 commits - helpcompiler/source sd/source

[Caolán McNamara (via logerrit)]

 helpcompiler/source/HelpLinker.cxx|2 +-
 sd/source/ui/slidesorter/controller/SlideSorterController.cxx |6 +++---
 sd/source/ui/unoidl/DrawController.cxx|2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit bc401b98501ef10955ba2eb35ee29d2cf5b0e758
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:09:30 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 16:20:00 2019 +0200

cid#703974 Unchecked return value

Change-Id: I833175e7687df88719d4d946cf97181158187c67
Reviewed-on: https://gerrit.libreoffice.org/75840
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/helpcompiler/source/HelpLinker.cxx 
b/helpcompiler/source/HelpLinker.cxx
index fc5894b080ad..b5a488f3dbc0 100644
--- a/helpcompiler/source/HelpLinker.cxx
+++ b/helpcompiler/source/HelpLinker.cxx
@@ -910,7 +910,7 @@ bool compileExtensionHelp
 sal_uInt64 ret, len = aFileStatus.getFileSize();
 std::unique_ptr s(new char[ int(len) ]);  // the buffer to 
hold the installed files
 osl::File aFile( aTreeFileURL );
-aFile.open( osl_File_OpenFlag_Read );
+(void)aFile.open( osl_File_OpenFlag_Read );
 aFile.read( s.get(), len, ret );
 aFile.close();
 
commit 36d27bb2aec2c2375342d1652501b8874e750a2f
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:13:35 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 16:19:43 2019 +0200

cid#1311945 Uncaught exception

Change-Id: I1f3c2d3e644c4cbb4e38740c05a623864219313e
Reviewed-on: https://gerrit.libreoffice.org/75843
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/unoidl/DrawController.cxx 
b/sd/source/ui/unoidl/DrawController.cxx
index 44ae57e10545..0024a1a568b3 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -429,7 +429,7 @@ void DrawController::FireSwitchCurrentPage (SdPage* 
pNewCurrentPage) throw()
 }
 catch (const uno::Exception&)
 {
-css::uno::Any ex( cppu::getCaughtException() );
+css::uno::Any ex(DbgGetCaughtException());
 SAL_WARN("sd", "sd::SdUnoDrawView::FireSwitchCurrentPage(), exception 
caught:  " << exceptionToString(ex));
 }
 }
commit 6944f42bbbf555a6aa23fe9f37439a803762d4ce
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:19:07 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 16:19:28 2019 +0200

cid#1424266 Uncaught exception

Change-Id: I5e7373dbaef52184327596d029ab63baf57764d9
Reviewed-on: https://gerrit.libreoffice.org/75844
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx 
b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
index 8b36fbb7604e..e544b75eba10 100644
--- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
+++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx
@@ -333,7 +333,7 @@ bool SlideSorterController::Command (
 else
 aPopupId = "pagepanenoselmaster";
 
-std::unique_ptr 
pContext;
+std::unique_ptr> xContext;
 if (pPage == nullptr)
 {
 // When there is no selection, then we show the insertion
@@ -344,7 +344,7 @@ bool SlideSorterController::Command (
 mpInsertionIndicatorHandler->UpdatePosition(
 pWindow->PixelToLogic(rEvent.GetMousePosPixel()),
 InsertionIndicatorHandler::MoveMode);
-pContext.reset(new InsertionIndicatorHandler::ForceShowContext(
+xContext.reset(new InsertionIndicatorHandler::ForceShowContext(
 mpInsertionIndicatorHandler));
 }
 
@@ -389,7 +389,7 @@ bool SlideSorterController::Command (
 GetSelectionManager()->SetInsertionPosition(
 GetInsertionIndicatorHandler()->GetInsertionPageIndex());
 }
-pContext.reset();
+xContext.reset();
 bEventHasBeenHandled = true;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sd/source

[Caolán McNamara (via logerrit)]

 sd/source/core/stlsheet.cxx  |5 +++--
 sd/source/ui/unoidl/unomodel.cxx |5 +++--
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 8ccd9fb5baddc9734be64861a00c1efad42e178e
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:21:39 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 16:19:11 2019 +0200

cid#1448227 Uncaught exception

Change-Id: I6149b087217b9b34ecce984536aae52b8ee9d430
Reviewed-on: https://gerrit.libreoffice.org/75846
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx
index 24b77f9e3730..1d1c98752398 100644
--- a/sd/source/ui/unoidl/unomodel.cxx
+++ b/sd/source/ui/unoidl/unomodel.cxx
@@ -329,8 +329,9 @@ void SAL_CALL SdXImpressDocument::release() throw ( )
 dispose();
 }
 catch (const uno::RuntimeException&)
-{ // don't break throw ()
-css::uno::Any ex( cppu::getCaughtException() );
+{
+// don't break throw ()
+css::uno::Any ex(DbgGetCaughtException());
 SAL_WARN( "sd", exceptionToString(ex) );
 }
 }
commit 2b15319349f90861c55cc3eb34fe5653b3d9a29b
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:22:33 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 16:18:55 2019 +0200

cid#1448325 Uncaught exception

Change-Id: I5bb61909d5d252de7465a29a3c8e49b7b1997ba3
Reviewed-on: https://gerrit.libreoffice.org/75847
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 3ad8f1aa788d..d49806b8b058 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -707,8 +707,9 @@ void SAL_CALL SdStyleSheet::release(  ) throw ()
 dispose();
 }
 catch (RuntimeException const&)
-{ // don't break throw ()
-css::uno::Any ex( cppu::getCaughtException() );
+{
+// don't break throw ()
+css::uno::Any ex(DbgGetCaughtException());
 SAL_WARN( "sd", exceptionToString(ex) );
 }
 OSL_ASSERT( mrBHelper.bDisposed );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Scott Clarke license statement

[Scott Clarke]

All of my past & future contributions to LibreOffice may be
licensed under the MPLv2/LGPLv3+ dual license.

Scott Clarke

___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |   21 +
 1 file changed, 1 insertion(+), 20 deletions(-)

New commits:
commit df43979db9179780e0c95bc2dc2478ee95858342
Author: Samuel Mehrbrodt 
AuthorDate: Tue Jul 16 17:41:48 2019 +0200
Commit: Katarina Behrens 
CommitDate: Thu Jul 18 15:46:50 2019 +0200

tdf#126424 Don't dispose decks before saving their state

Only dispose them in SidebarController::disposing after the
state has been saved.

Change-Id: I9e42383e20e2bc0100557b8cb8fbd26b3505f236
Reviewed-on: https://gerrit.libreoffice.org/75719
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit b58aa94f1f365c746135470bceb97cc182c289bc)
Reviewed-on: https://gerrit.libreoffice.org/75832
Reviewed-by: Katarina Behrens 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 066ebe52751f..24660ef3dc2f 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -191,7 +191,6 @@ void 
SidebarController::registerSidebarForFrame(SidebarController* pController,
 
 void SidebarController::unregisterSidebarForFrame(SidebarController* 
pController, const css::uno::Reference& xController)
 {
-pController->disposeDecks();
 css::uno::Reference xMultiplexer (
 css::ui::ContextChangeEventMultiplexer::get(
 ::comphelper::getProcessComponentContext()));
@@ -227,22 +226,7 @@ void SAL_CALL SidebarController::disposing()
 }
 
 // clear decks
-ResourceManager::DeckContextDescriptorContainer aDecks;
-
-mpResourceManager->GetMatchingDecks (
-aDecks,
-GetCurrentContext(),
-IsDocumentReadOnly(),
-mxFrame->getController());
-
-for (const auto& rDeck : aDecks)
-{
-std::shared_ptr deckDesc = 
mpResourceManager->GetDeckDescriptor(rDeck.msId);
-
-VclPtr aDeck = deckDesc->mpDeck;
-if (aDeck)
-aDeck.disposeAndClear();
-}
+disposeDecks();
 
 uno::Reference xController = 
mxFrame->getController();
 if (!xController.is())
@@ -697,9 +681,6 @@ void SidebarController::SwitchToDeck (
 const DeckDescriptor& rDeckDescriptor,
 const Context& rContext)
 {
-
-maFocusManager.Clear();
-
 const bool bForceNewDeck 
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
 const bool bForceNewPanels 
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
 mnRequestedForceFlags = SwitchFlag_NoForce;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - xmlhelp/source

[Caolán McNamara (via logerrit)]

 xmlhelp/source/cxxhelp/provider/urlparameter.cxx |2 +-
 xmlhelp/source/treeview/tvread.cxx   |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 56f5a752f2e9e35887ec57de9e55a83d46a994c2
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:11:17 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 15:17:03 2019 +0200

cid#704107 Unchecked return value

Change-Id: I6fb22b972a19b42787242d98d08fc425f5c0aea9
Reviewed-on: https://gerrit.libreoffice.org/75842
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/xmlhelp/source/treeview/tvread.cxx 
b/xmlhelp/source/treeview/tvread.cxx
index f11ae69d948e..72f28fef63c8 100644
--- a/xmlhelp/source/treeview/tvread.cxx
+++ b/xmlhelp/source/treeview/tvread.cxx
@@ -402,7 +402,7 @@ TVChildTarget::TVChildTarget( const Reference< 
XComponentContext >& xContext )
 len = configData.vFileLen[--j];
 std::unique_ptr s(new char[ int(len) ]);  // the buffer to 
hold the installed files
 osl::File aFile( configData.vFileURL[j] );
-aFile.open( osl_File_OpenFlag_Read );
+(void)aFile.open( osl_File_OpenFlag_Read );
 aFile.read( s.get(),len,ret );
 aFile.close();
 
commit 957afd1430062292ade17037d4705bd60652791d
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:10:40 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 15:16:50 2019 +0200

cid#704106 Unchecked return value

Change-Id: Ic0a9d173c24af8962539b00207b8dd24cbbcdbc0
Reviewed-on: https://gerrit.libreoffice.org/75841
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx 
b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
index e65d414bd97e..d77c70552bb9 100644
--- a/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
+++ b/xmlhelp/source/cxxhelp/provider/urlparameter.cxx
@@ -565,7 +565,7 @@ helpMatch(const char * URI) {
 static void *
 fileOpen(const char *URI) {
 osl::File *pRet = new osl::File(OUString(URI, strlen(URI), 
RTL_TEXTENCODING_UTF8));
-pRet->open(osl_File_OpenFlag_Read);
+(void)pRet->open(osl_File_OpenFlag_Read);
 return pRet;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Caolán McNamara (via logerrit)]

 filter/source/xsltdialog/xmlfilterjar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3f4f42ed9beeb38092de044ccde1828b32a787c2
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:08:24 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 14:46:09 2019 +0200

cid#703960 Unchecked return value

Change-Id: I679e9e91261d468f2f2ee08f840ac3043d87817c
Reviewed-on: https://gerrit.libreoffice.org/75839
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx 
b/filter/source/xsltdialog/xmlfilterjar.cxx
index de8b2078107c..d388410ad083 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -201,7 +201,7 @@ bool XMLFilterJarHelper::savePackage( const OUString& 
rPackageURL, const std::ve
 
 {
 osl::File aOutputFile( aTempFileURL );
-/* osl::File::RC rc = */ aOutputFile.open( 
osl_File_OpenFlag_Write );
+(void)aOutputFile.open(osl_File_OpenFlag_Write);
 Reference< XOutputStream > xOS( new OSLOutputStreamWrapper( 
aOutputFile ) );
 
 TypeDetectionExporter aExporter( mxContext );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/data/tdf125894.docx  |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx|8 +++
 writerfilter/source/dmapper/DomainMapper.cxx  |2 
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |   47 --
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |5 ++
 5 files changed, 59 insertions(+), 3 deletions(-)

New commits:
commit e8bae67b3dbcc90ace8264b6b1aefaf0ce459aba
Author: László Németh 
AuthorDate: Wed Jul 17 13:37:44 2019 +0200
Commit: László Németh 
CommitDate: Thu Jul 18 14:42:07 2019 +0200

tdf#125894: DOCX: import tracked changes in frames

Tracked changes weren't imported in frames, losing also
the actual text content: also tracked deletion reappeared
as normal text here, not only the tracked insertions.

Change-Id: I5fc8135cfb7402ad71c5c24eae606aa7ed707dfc
Reviewed-on: https://gerrit.libreoffice.org/75779
Tested-by: Jenkins
Reviewed-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/data/tdf125894.docx 
b/sw/qa/extras/ooxmlexport/data/tdf125894.docx
new file mode 100644
index ..1214f2c09cb7
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf125894.docx differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 98e137327787..c542a7b4394b 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -883,6 +883,14 @@ DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf126245, 
"tdf126245.docx")
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:pPr/w:pPrChange/w:pPr/w:numPr/w:numId", "val", 
"1");
 }
 
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf125894, "tdf125894.docx")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+// import change tracking in frames
+assertXPath(pXmlDoc, "//w:del", 2);
+assertXPath(pXmlDoc, "//w:ins");
+}
+
 DECLARE_OOXMLEXPORT_TEST(testTdf118691, "tdf118691.docx")
 {
 uno::Reference xTablesSupplier(mxComponent, 
uno::UNO_QUERY);
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx 
b/writerfilter/source/dmapper/DomainMapper.cxx
index 173a0a1f99aa..f219330d52a2 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -1991,6 +1991,8 @@ void DomainMapper::sprmWithProps( Sprm& rSprm, const 
PropertyMapPtr& rContext )
 ParagraphPropertyMap* pParaContext = dynamic_cast< 
ParagraphPropertyMap* >( pContext.get() );
 if (pParaContext)
 pParaContext->SetFrameMode();
+
+m_pImpl->m_bIsActualParagraphFramed = true;
 }
 else
 {
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 51b5c1e2cf96..21beb6965bf9 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -251,6 +251,7 @@ DomainMapper_Impl::DomainMapper_Impl(
 m_bCheckFirstFootnoteTab(false),
 m_bIgnoreNextTab(false),
 m_bIsSplitPara(false),
+m_bIsActualParagraphFramed( false ),
 m_vTextFramesForChaining(),
 m_bParaHadField(false),
 m_bParaAutoBefore(false),
@@ -2085,7 +2086,6 @@ void 
DomainMapper_Impl::CreateRedline(uno::Reference const& xR
 default:
 throw lang::IllegalArgumentException("illegal redline token 
type", nullptr, 0);
 }
-uno::Reference < text::XRedline > xRedline( xRange, 
uno::UNO_QUERY_THROW );
 beans::PropertyValues aRedlineProperties( 3 );
 beans::PropertyValue * pRedlineProperties = 
aRedlineProperties.getArray(  );
 pRedlineProperties[0].Name = getPropertyName( PROP_REDLINE_AUTHOR 
);
@@ -2094,7 +2094,17 @@ void 
DomainMapper_Impl::CreateRedline(uno::Reference const& xR
 pRedlineProperties[1].Value <<= 
ConversionHelper::ConvertDateStringToDateTime( pRedline->m_sDate );
 pRedlineProperties[2].Name = getPropertyName( 
PROP_REDLINE_REVERT_PROPERTIES );
 pRedlineProperties[2].Value <<= pRedline->m_aRevertProperties;
-xRedline->makeRedline( sType, aRedlineProperties );
+if (!m_bIsActualParagraphFramed)
+{
+uno::Reference < text::XRedline > xRedline( xRange, 
uno::UNO_QUERY_THROW );
+xRedline->makeRedline( sType, aRedlineProperties );
+}
+else
+{
+aFramedRedlines.push_back( uno::makeAny(xRange) );
+aFramedRedlines.push_back( uno::makeAny(sType) );
+aFramedRedlines.push_back( uno::makeAny(aRedlineProperties) );
+}
 }
 catch( const uno::Exception & )
 {
@@ -5709,15 +5719,46 @@ void DomainMapper_Impl::ExecuteFrameConversion()
 try
 {
 uno::Reference< text::XTextAppendAndConvert > 
xTextAppendAndConv

LibreOffice ESC call, Thur - 16:00 central European (local) time

[Michael Meeks]

Hi everyone,

Prototype agenda below, bug metrics also at the link below;
extra items appreciated as last-week:

https://demo.collaboracloudsuite.com/tdf/

For now we continue using the public jitsi server:

https://meet.jit.si/tdfesc

ATB,

Michael.

* Completed Action Items:
+ send out list of papers to conference committee (Sophie)

* Pending Action Items:
+ add an alias configure switch & rename KDE backend (Jan-Marek)
+ upgrade Android reqs to NDK19 (Kendy)
+ https://wiki.documentfoundation.org/Documentation/HowTo/MigrateFromHSQLDB
   + ensure we have some content here (Drew)

* Release Engineering update (Christian)
+ 6.2.6 rc1, next weeks
+ 6.3.0 rc2/3 status
  + and branching-off there for libreoffice-6-3-0
  + UI freeze, 1 review needed on libreoffice-6-3 from now on
+ Remotes
+ Android viewer
+ Online

* Documentation (Olivier)

* UX Update (Heiko)
+ Bugzilla (topicUI) statistics
241(241) (topicUI) bugs open, 219(219) (needsUXEval) needs to be 
evaluated by the UXteam
+ Updates:
BZ changes   1 week   1 month3 months   12 months  
 added  8(-3)19(-10)38(-4)  82(-4) 
 commented 52(1)180(-25)   427(6) 1439(-2) 
   removed  2(2)  2(2)   2(0)   20(2)  
  resolved  0(-2) 5(-3) 24(-3) 130(-3) 
+ top 10 contributors:
  Heiko Tietze made 64 changes in 1 month, and 81 changes in 1 year
  Foote, V Stuart made 49 changes in 1 month, and 243 changes in 1 year
  Xisco Faulí made 35 changes in 1 month, and 273 changes in 1 year
  Timur made 30 changes in 1 month, and 81 changes in 1 year
  Dieter Praas made 27 changes in 1 month, and 130 changes in 1 year
  kompilainenn made 25 changes in 1 month, and 230 changes in 1 year
  Kainz, Andreas made 17 changes in 1 month, and 200 changes in 1 year
  Thomas Lendo made 13 changes in 1 month, and 248 changes in 1 year
  Budea, Áron made 13 changes in 1 month, and 29 changes in 1 year
* Crash Testing (Caolan)
+ missing Caolan.
+ 6(+0) import failure, 0(+0) export failures
+ ??? coverity issues
+ Google / ossfuzz: ?? fuzzers active now
* Crash Reporting (Xisco)
  + https://crashreport.libreoffice.org/stats/version/6.1.5.2
+ (-74) 1026 1100 1034 1236 1113 1274 1460 1705 1558
  + https://crashreport.libreoffice.org/stats/version/6.1.6.3
+ (-3) 700 703 776 760 571 424 293 277 215 68

  + https://crashreport.libreoffice.org/stats/version/6.2.3.2
+ (-85) 1002 1087 1234 1600 1645 2183 2428 2872 2401
  + https://crashreport.libreoffice.org/stats/version/6.2.4.2
+ (-489) 2333 2822 2733 2615 2039 1586 929 119 0
  + https://crashreport.libreoffice.org/stats/version/6.2.5.2
+ (+748) 748 0
* Hackfests & Events (Sophie)
   + this year hackfests coming up:
+ Dresden Hackfest (Thorsten)
  + tentatively end of October, talking to FSFE people there
+ not confirmed, working on that
   + hope to have one each quarter.

* Conference (Sophie)

* GSOC 2019 (Thorsten/Xisco/Moggi/Heiko)
   + Project page:
 https://summerofcode.withgoogle.com/organizations/5557591040589824/ 
+ 1st evaluation was passed for everyone
   + Mentors, please make sure students are active & communicating!
  + weekly reports are not optional, number decreasing
   + next deadline:
 + Second Evaluations: July 22 - 26, 2019

* mentoring/easyhack update
  committer...   1 week  1 month 3 months 12 months   
  open  124(66) 166(18)  171(19)  179(19) 
   reviews 1784(617)   5544(-18)   15083(310)   53286(256)
merged  311(96)1261(-33)3723(25)14869(37) 
 abandoned   13(-5)  83(1)   207(6)   742(0)  
   own commits  211(52) 792(-16)2729(-33)   13652(-26)
review commits  116(52) 385(2)  1192(42) 4069(51) 
contributor...   1 week 1 month3 months   12 months  
  open  42(21) 71(10) 72(5)   73(5)  
   reviews 314(217)   513(183)   828(129)   2400(152)
merged  66(25)213(16)690(7) 1946(33) 
 abandoned  11(3)  38(-2) 99(-10)326(1)  
   own commits  66(29)213(17)712(11)2027(43) 
review commits   0(0)   0(0)   0(0)0(0)  
+ easyHack statistics:
   needsDevEval 8(8)   needsUXEval 0(0)   cleanup_comments 199(199)   
   total 246(246)   assigned 12(12)   open 220(220)   
+ top 10 contributors:
  Gelmini, Andrea made 161 patches in 1 month, and 1029 patches in 1 
year
  Sumit Chauhan made 7 patches in 1 month, and 17 patches in 1 year
  LibreOfficiant made 6 patches in 1 month, and 38 pa

[Libreoffice-commits] core.git: filter/source

[Caolán McNamara (via logerrit)]

 filter/source/flash/swffilter.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 69899866063d360f087f8a08c51ec6bbfee28b36
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:07:22 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 14:04:50 2019 +0200

cid#703956 Unchecked return value

Change-Id: Ide2d83962c0a03e410443164f80522b2913ab998
Reviewed-on: https://gerrit.libreoffice.org/75838
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/flash/swffilter.cxx 
b/filter/source/flash/swffilter.cxx
index 4448def2d09e..b6ae37da2efa 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -61,13 +61,13 @@ namespace swf {
 
 class OslOutputStreamWrapper : public 
::cppu::WeakImplHelper
 {
-osl::File   mrFile;
+osl::File maFile;
 
 public:
-explicit OslOutputStreamWrapper(const OUString& rFileName) : 
mrFile(rFileName)
+explicit OslOutputStreamWrapper(const OUString& rFileName) : 
maFile(rFileName)
 {
 osl_removeFile(rFileName.pData);
-mrFile.open( osl_File_OpenFlag_Create|osl_File_OpenFlag_Write );
+(void)maFile.open(osl_File_OpenFlag_Create|osl_File_OpenFlag_Write);
 }
 
 // css::io::XOutputStream
@@ -85,7 +85,7 @@ void SAL_CALL OslOutputStreamWrapper::writeBytes( const 
css::uno::Sequence< sal_
 
 while( uBytesToWrite )
 {
-osl::File::RC eRC = mrFile.write( pBuffer, uBytesToWrite, 
uBytesWritten);
+osl::File::RC eRC = maFile.write( pBuffer, uBytesToWrite, 
uBytesWritten);
 
 switch( eRC )
 {
@@ -116,7 +116,7 @@ void SAL_CALL OslOutputStreamWrapper::flush(  )
 
 void SAL_CALL OslOutputStreamWrapper::closeOutput(  )
 {
-osl::File::RC eRC = mrFile.close();
+osl::File::RC eRC = maFile.close();
 
 switch( eRC )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/source

[Caolán McNamara (via logerrit)]

 extensions/source/logging/filehandler.cxx |   10 ++
 1 file changed, 6 insertions(+), 4 deletions(-)

New commits:
commit 644af27d6dc02ce6c238aa76e1ff8182953946e0
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:04:19 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 13:56:44 2019 +0200

cid#703953 Unchecked return value

Change-Id: Id4164e0adc71e57e4c732016306bb53ae7ac4ad7
Reviewed-on: https://gerrit.libreoffice.org/75837
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/extensions/source/logging/filehandler.cxx 
b/extensions/source/logging/filehandler.cxx
index 7b6331d477da..3aa0927ce54d 100644
--- a/extensions/source/logging/filehandler.cxx
+++ b/extensions/source/logging/filehandler.cxx
@@ -174,10 +174,12 @@ namespace logging
 m_pFile.reset( new ::osl::File( m_sFileURL ) );
 // check whether the log file already exists
 ::osl::DirectoryItem aFileItem;
-::osl::DirectoryItem::get( m_sFileURL, aFileItem );
-::osl::FileStatus aStatus( osl_FileStatus_Mask_Validate );
-if ( ::osl::FileBase::E_None == aFileItem.getFileStatus( aStatus ) 
)
-::osl::File::remove( m_sFileURL );
+if (osl::FileBase::E_None == ::osl::DirectoryItem::get(m_sFileURL, 
aFileItem))
+{
+::osl::FileStatus aStatus(osl_FileStatus_Mask_Validate);
+if (::osl::FileBase::E_None == 
aFileItem.getFileStatus(aStatus))
+::osl::File::remove(m_sFileURL);
+}
 
 ::osl::FileBase::RC res = m_pFile->open( osl_File_OpenFlag_Write | 
osl_File_OpenFlag_Create );
 m_eFileValidity =   res == ::osl::FileBase::E_None
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/misc/DExport.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 33b962536a3e2d32e0066c0ad8423809037d38dd
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:02:31 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 13:32:13 2019 +0200

cid#703937 Unchecked return value

Change-Id: I38be419c6ed4857c52ac555696a614008aaad907
Reviewed-on: https://gerrit.libreoffice.org/75835
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/misc/DExport.cxx 
b/dbaccess/source/ui/misc/DExport.cxx
index eea6882135ef..3bc250adb718 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -319,7 +319,7 @@ void ODatabaseExport::insertValueIntoColumn()
 if ( eNumLang != LANGUAGE_NONE )
 {
 nNumberFormat2 = 
m_pFormatter->GetFormatForLanguageIfBuiltIn( nNumberFormat2, eNumLang );
-m_pFormatter->IsNumberFormat( 
m_sTextToken, nNumberFormat2, fOutNumber );
+(void)m_pFormatter->IsNumberFormat( 
m_sTextToken, nNumberFormat2, fOutNumber );
 }
 nNumberFormat = 
static_cast(nNumberFormat2);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - desktop/source

[Caolán McNamara (via logerrit)]

 desktop/source/deployment/gui/dp_gui_extlistbox.cxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit 6bd9fc46121c3488c836b011f5c37c996c507aac
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 14:33:04 2019 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 13:14:29 2019 +0200

scrollbar is outside the widget now, not inside

Change-Id: Ia92658c7a534928209906b8adfb5f9451b513ff0
Reviewed-on: https://gerrit.libreoffice.org/75798
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index dcc3872ab5cc..560d83a95d06 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -277,8 +277,6 @@ void ExtensionBox_Impl::CalcActiveHeight( const long nPos )
 
 // calc description height
 Size aSize = GetOutputSizePixel();
-if ( m_bHasScrollBar )
-aSize.AdjustWidth(-m_xScrollBar->get_vscroll_width());
 
 aSize.AdjustWidth( -(ICON_OFFSET) );
 aSize.setHeight( 1 );
@@ -307,9 +305,6 @@ tools::Rectangle ExtensionBox_Impl::GetEntryRect( const 
long nPos ) const
 
 Size aSize( GetOutputSizePixel() );
 
-if ( m_bHasScrollBar )
-aSize.AdjustWidth(-m_xScrollBar->get_vscroll_width());
-
 if ( m_vEntries[ nPos ]->m_bActive )
 aSize.setHeight( m_nActiveHeight );
 else
@@ -650,9 +645,6 @@ void ExtensionBox_Impl::Paint(vcl::RenderContext& 
rRenderContext, const tools::R
 Point aStart( 0, -m_nTopIndex );
 Size aSize(GetOutputSizePixel());
 
-if ( m_bHasScrollBar )
-aSize.AdjustWidth(-m_xScrollBar->get_vscroll_width());
-
 const ::osl::MutexGuard aGuard( m_entriesMutex );
 
 for (auto const& entry : m_vEntries)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: opencl/opencltest

[Caolán McNamara (via logerrit)]

 opencl/opencltest/main.cxx |7 +++
 1 file changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 34545c3648f72bf655623139e5fcc981ea1fd5a6
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 10:01:13 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 13:13:52 2019 +0200

cid#1448546 Logically dead code

Change-Id: I7013e5ef67ae58c42886a4ba6ea0c9a47074ac8e
Reviewed-on: https://gerrit.libreoffice.org/75834
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/opencl/opencltest/main.cxx b/opencl/opencltest/main.cxx
index 0b1292e3e7a3..a499032f8c05 100644
--- a/opencl/opencltest/main.cxx
+++ b/opencl/opencltest/main.cxx
@@ -110,9 +110,9 @@ static void runTest(const char* deviceName, const char* 
devicePlatform)
 cl_program program = clCreateProgramWithSource(context, 1, source, 
sourceSize, &state);
 openclcheck(state);
 state = clBuildProgram(program, 1, &deviceId, nullptr, nullptr, nullptr);
+#ifdef DBG_UTIL
 if (state != CL_SUCCESS)
 {
-#ifdef DBG_UTIL
 size_t length;
 status
 = clGetProgramBuildInfo(program, deviceId, CL_PROGRAM_BUILD_LOG, 
0, nullptr, &length);
@@ -122,10 +122,9 @@ static void runTest(const char* deviceName, const char* 
devicePlatform)
 error[length] = '\0';
 cerr << "OpenCL driver check build error:" << error.data() << endl;
 abort();
-#else
-openclcheck(state);
-#endif
 }
+#endif
+openclcheck(state);
 cl_kernel kernel = clCreateKernel(program, "testFunction", &state);
 openclcheck(state);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

GSOC Report Week 7

[Rasmus Jonsson]

Last week was spent on the new JavaScript Impress Remote. 

* Worked on front-end for JS remote
* Making the existing Python+Impress code work nicely with the remote
* Python server acting as a relay between browser apps and LibreOffice
* JS client library for any app wanting to connect to this server

There's also an update on the site from Sunday.

https://rptr.github.io/gsoc/
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/outdev/bitmap.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 9cf255dfeda194e601942ea5fcb4b562a080bd8b
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 09:07:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 12:41:41 2019 +0200

cid#1448479 Logically dead code

Change-Id: I1190bd238fad3e5343e83f9c6261d71a44bc6717
Reviewed-on: https://gerrit.libreoffice.org/75831
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index b33a5dfcefa6..acbd13e0a5ab 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -1235,6 +1235,8 @@ void OutputDevice::DrawTransformedBitmapEx(
 return;
 }
 
+assert(bSheared || bRotated); // at this point we are either sheared 
or rotated or both
+
 // fallback; create transformed bitmap the hard way (back-transform
 // the pixels) and paint
 basegfx::B2DRange aVisibleRange(0.0, 0.0, 1.0, 1.0);
@@ -1245,7 +1247,7 @@ void OutputDevice::DrawTransformedBitmapEx(
 // to avoid crashes/resource problems (ca. 1500x3000 here)
 const Size& rOriginalSizePixel(rBitmapEx.GetSizePixel());
 const double fOrigArea(rOriginalSizePixel.Width() * 
rOriginalSizePixel.Height() * 0.5);
-const double fOrigAreaScaled(bSheared || bRotated ? fOrigArea * 1.44 : 
fOrigArea);
+const double fOrigAreaScaled(fOrigArea * 1.44);
 double fMaximumArea(std::min(450.0, std::max(100.0, 
fOrigAreaScaled)));
 
 if(!bMetafile)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: filter/source

[Caolán McNamara (via logerrit)]

 filter/source/msfilter/svdfppt.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 27ce8ce006acd875320661d1c09732c1623c489d
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 09:03:05 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 12:28:07 2019 +0200

cid#1448499 less obscure comparison against end

Change-Id: I6eda7d9ec8d7781cbea191eb2fd2429722a4823a
Reviewed-on: https://gerrit.libreoffice.org/75830
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 5ca81d61f269..d46cd49eb04a 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -6946,7 +6946,7 @@ PPTTextObj::PPTTextObj( SvStream& rIn, 
SdrPowerPointImport& rSdrPowerPointImport
 nPos--;
 FE = std::find_if(FE, FieldList.end(),
 [&nPos](const 
std::unique_ptr& rxField) {return rxField->nPos <= nPos;});
-if ( !(FE < FieldList.end()) )
+if (FE == FieldList.end())
 break;
 
 if ( (*FE)->nPos == nPos )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source

[Caolán McNamara (via logerrit)]

 dbaccess/source/ui/misc/WCopyTable.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 99bae0a92dfffe9d195b3285a39e1218425b0fa2
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 09:00:29 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 12:13:41 2019 +0200

cid#1448482 silence Using invalid iterator

Change-Id: I78c5fa16e035cebe71869bfea57ef2741b5b7f58
Reviewed-on: https://gerrit.libreoffice.org/75829
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/dbaccess/source/ui/misc/WCopyTable.cxx 
b/dbaccess/source/ui/misc/WCopyTable.cxx
index 821349e13aa2..ececd0aa2f40 100644
--- a/dbaccess/source/ui/misc/WCopyTable.cxx
+++ b/dbaccess/source/ui/misc/WCopyTable.cxx
@@ -789,6 +789,7 @@ bool OCopyTableWizard::CheckColumns(sal_Int32& _rnBreakPos)
 if ( aDestIter != m_vDestColumns.end() )
 {
 ODatabaseExport::TColumnVector::const_iterator aFind = 
std::find(m_aDestVec.begin(),m_aDestVec.end(),aDestIter);
+assert(aFind != m_aDestVec.end());
 sal_Int32 nPos = (aFind - m_aDestVec.begin())+1;
 m_vColumnPositions.emplace_back(nPos,nPos);
 m_vColumnTypes.push_back((*aFind)->second->GetType());
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/unocore/unoframe.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 40f6e84b402409faf62d09f34e834b901dd6f716
Author: Michael Stahl 
AuthorDate: Wed Jul 17 17:40:50 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 12:06:55 2019 +0200

sw: missing SolarMutexGuard in SwXFrame::attach()

Causes assert in a test i'm adding...

Change-Id: I5be24aa9683ec0d31494c0c97270d1d58692f764
Reviewed-on: https://gerrit.libreoffice.org/75796
Tested-by: Jenkins
Reviewed-by: Michael Stahl 
(cherry picked from commit 8dfe166a879a17bd8c2e0859d027ff923258a9d8)
Reviewed-on: https://gerrit.libreoffice.org/75826
Reviewed-by: Christian Lohmaier 

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index ea377f2e058e..9f68ab2d8046 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3078,6 +3078,8 @@ void SwXFrame::attachToRange(const uno::Reference< 
text::XTextRange > & xTextRan
 
 void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
 {
+SolarMutexGuard g;
+
 SwFrameFormat* pFormat;
 if(IsDescriptor())
 attachToRange(xTextRange);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/source

[Noel Grandin (via logerrit)]

 sc/source/ui/Accessibility/AccessibleDocument.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 4d285cd1dd8155ca41e5f3b94dbe4142bff8972d
Author: Noel Grandin 
AuthorDate: Wed Jul 17 12:54:05 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 12:05:21 2019 +0200

fix "tdf#119388 calc, slow removing column, improve ScChildrenShapes"

forgot to add the code to actually update the map, which would be bad
for accessibility

Change-Id: I5d93dd84649ce27a37c9035622f94fff3237b778
Reviewed-on: https://gerrit.libreoffice.org/75773
Tested-by: Jenkins
Reviewed-by: Noel Grandin 
(cherry picked from commit aab10bb21f230a0d0d6acf59ccab50dd3c2c3d0a)
Reviewed-on: https://gerrit.libreoffice.org/75819

diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx 
b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index f293dbe95928..e909c5f3a2be 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -1181,6 +1181,7 @@ void ScChildrenShapes::AddShape(const 
uno::Reference& xShape, b
 ScAccessibleShapeData* pShape = new ScAccessibleShapeData();
 pShape->xShape = xShape;
 SortedShapes::iterator aNewItr = maZOrderedShapes.insert(aFindItr, 
pShape);
+maShapesMap[xShape] = pShape;
 SetAnchor(xShape, pShape);
 
 uno::Reference< beans::XPropertySet > xShapeProp(xShape, 
uno::UNO_QUERY);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - dbaccess/source

[Tamas Bunth (via logerrit)]

 dbaccess/source/filter/hsqldb/parseschema.cxx |   20 ++--
 1 file changed, 18 insertions(+), 2 deletions(-)

New commits:
commit 47d6c43c19aa6ea05f0f65db58e5cdcf1c603660
Author: Tamas Bunth 
AuthorDate: Tue Jul 16 21:44:38 2019 +0200
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 12:05:03 2019 +0200

tdf#123020 dbahsql: Support string delimiter

Support multi-word table names while migrating HSQLDB data.

Change-Id: I5129f995ea90a3fdbcbcb844774cf074f3ffddb2
Reviewed-on: https://gerrit.libreoffice.org/75734
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 
(cherry picked from commit b5890bf269214a47833bc9514b80650455e77ef6)
Reviewed-on: https://gerrit.libreoffice.org/75820
Reviewed-by: Christian Lohmaier 

diff --git a/dbaccess/source/filter/hsqldb/parseschema.cxx 
b/dbaccess/source/filter/hsqldb/parseschema.cxx
index be08037b7be5..60e7103cdfa2 100644
--- a/dbaccess/source/filter/hsqldb/parseschema.cxx
+++ b/dbaccess/source/filter/hsqldb/parseschema.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 
 namespace
 {
@@ -74,8 +75,17 @@ public:
 
 OUString getTableName() const
 {
-// SET TABLE 
-return string::split(m_sql, u' ')[2];
+// SET TABLE  or SET TABLE ""
+OUString sName = string::split(m_sql, u' ')[2];
+if (sName.indexOf('"') >= 0)
+{
+// Table name with string delimiter
+OUStringBuffer sMultiName("\"");
+sMultiName.append(string::split(m_sql, u'"')[1]);
+sMultiName.append("\"");
+sName = sMultiName.makeStringAndClear();
+}
+return sName;
 }
 };
 
@@ -169,6 +179,12 @@ void SchemaParser::parseSchema()
 
 std::vector SchemaParser::getTableColumnTypes(const 
OUString& sTableName) const
 {
+if (m_ColumnTypes.count(sTableName) < 1)
+{
+constexpr char NOT_EXIST[] = "Internal error while getting column 
information of table";
+SAL_WARN("dbaccess", NOT_EXIST << ". Table name is: " << sTableName);
+dbtools::throwGenericSQLException(NOT_EXIST, 
::comphelper::getProcessComponentContext());
+}
 return m_ColumnTypes.at(sTableName);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - desktop/source

[Caolán McNamara (via logerrit)]

 desktop/source/deployment/gui/dp_gui_extlistbox.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 448a9e0d967290443dac439579f98311e3296218
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 15:40:22 2019 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 12:03:49 2019 +0200

Resolves: tdf#126304 resizing the extension manager breaks redraw

Change-Id: I1211c90a72048f868ec7ba7a7b6bed452ae8ac4b
Reviewed-on: https://gerrit.libreoffice.org/75792
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 0a092956b416..dcc3872ab5cc 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -709,6 +709,7 @@ void ExtensionBox_Impl::SetupScrollBar()
 void ExtensionBox_Impl::Resize()
 {
 RecalcAll();
+Invalidate();
 }
 
 void ExtensionBox_Impl::SetDrawingArea(weld::DrawingArea* pDrawingArea)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - sc/source

[Caolán McNamara (via logerrit)]

 sc/source/filter/excel/xecontent.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 778359cceebb5aa60db05a44106868e855b6fcfc
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 09:06:39 2019 +0100
Commit: Christian Lohmaier 
CommitDate: Thu Jul 18 12:03:32 2019 +0200

crashtesting: assert on export of fdo63407-3.ods to xls

since...

commit 3cdc1b35b9d86bcfa1277e3e94925ae7b18b8fde
Date:   Tue Jul 2 10:07:24 2019 +0200

tdf#126177 XLSX export: fix hyperlinks to documents

Change-Id: Id5b760a53b1e996d5d47c7477d77ce1d4efc
Reviewed-on: https://gerrit.libreoffice.org/75774
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/sc/source/filter/excel/xecontent.cxx 
b/sc/source/filter/excel/xecontent.cxx
index 3237ff1fca75..6cdd0ad7ad27 100644
--- a/sc/source/filter/excel/xecontent.cxx
+++ b/sc/source/filter/excel/xecontent.cxx
@@ -447,7 +447,7 @@ XclExpHyperlink::XclExpHyperlink( const XclExpRoot& rRoot, 
const SvxURLField& rU
 mnFlags |= EXC_HLINK_MARK;
 
 OUString location = XclXmlUtils::ToOUString(*mxTextMark);
-if (msTarget.endsWith(location))
+if (!location.isEmpty() && msTarget.endsWith("#" + location))
 msTarget = msTarget.copy(0, msTarget.getLength() - 
location.getLength() - 1);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: ucb/source

[Caolán McNamara (via logerrit)]

 ucb/source/ucp/file/filtask.cxx |   25 ++---
 1 file changed, 14 insertions(+), 11 deletions(-)

New commits:
commit b6f452fcdf4dc206943fbe8d43822acb33cf1834
Author: Caolán McNamara 
AuthorDate: Thu Jul 18 08:56:37 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 12:00:18 2019 +0200

cid#1448431 Using invalid iterator

if we are checking itnew against end in the first block, presumably
the second block use of itnew needs the same guard

Change-Id: Ia8cc45229024e477c00b2356665d5656d36f723b
Reviewed-on: https://gerrit.libreoffice.org/75828
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/ucb/source/ucp/file/filtask.cxx b/ucb/source/ucp/file/filtask.cxx
index db1e4ca19dda..3c54c50b8ed4 100644
--- a/ucb/source/ucp/file/filtask.cxx
+++ b/ucb/source/ucp/file/filtask.cxx
@@ -2717,21 +2717,24 @@ TaskManager::getContentExchangedEventListeners( const 
OUString& aOldPrefix,
 
 m_aContent.erase( itold );
 
-if( itnew != m_aContent.end() && 
!itnew->second.notifier.empty() )
+if (itnew != m_aContent.end())
 {
-std::vector& listOfNotifiers = 
itnew->second.notifier;
-for (auto const& pointer : listOfNotifiers)
+if (!itnew->second.notifier.empty())
 {
-std::unique_ptr notifier = 
pointer->cEXC( aNewName );
-if( notifier )
-aVector.push_back( std::move(notifier) );
+std::vector& listOfNotifiers = 
itnew->second.notifier;
+for (auto const& pointer : listOfNotifiers)
+{
+std::unique_ptr notifier = 
pointer->cEXC( aNewName );
+if( notifier )
+aVector.push_back( std::move(notifier) );
+}
 }
-}
 
-// Merge with preexisting notifiers
-// However, these may be in status BaseContent::Deleted
-for( const auto& rCopyPtr : copyList )
-itnew->second.notifier.push_back( rCopyPtr );
+// Merge with preexisting notifiers
+// However, these may be in status BaseContent::Deleted
+for( const auto& rCopyPtr : copyList )
+itnew->second.notifier.push_back( rCopyPtr );
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4b65103510a5f0d347192ed94729a1b351f4aa7b
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:45:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 11:55:25 2019 +0200

cid#1448440 silence Dereference null return value

Change-Id: I1dce0d6a40086539cbcadeaf9a669f4640dbc730
Reviewed-on: https://gerrit.libreoffice.org/75817
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx 
b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
index 35ce20a932fe..8bb45729b6f4 100644
--- a/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
+++ b/chart2/source/controller/dialogs/tp_3D_SceneIllumination.cxx
@@ -442,6 +442,8 @@ IMPL_LINK(ThreeD_SceneIllumination_TabPage, 
ClickLightSourceButtonHdl, weld::But
 }
 }
 
+assert(pInfo);
+
 bool bIsChecked = pInfo->bButtonActive;
 
 ControllerLockGuardUNO aGuard( m_xChartModel );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/sdview3.cxx |   14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

New commits:
commit 1ebc9435849430c61bf41e48a84255a17152fbc9
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:43:09 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 11:43:26 2019 +0200

cid#1448534 Use after free

Change-Id: Ibef20405d1ecf00b71ca12e43902ccd65c873ed2
Reviewed-on: https://gerrit.libreoffice.org/75815
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index 98167637628d..a5ef90d7f7c6 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -1175,14 +1175,16 @@ bool View::InsertData( const TransferableDataHelper& 
rDataHelper,
 nOptions |= SdrInsertFlags::DONTMARK;
 }
 
-InsertObjectAtView( pObj, *pPV, nOptions );
+bReturn = InsertObjectAtView( pObj, *pPV, nOptions );
 
-if( pImageMap )
-pObj->AppendUserData( 
std::unique_ptr(new SdIMapInfo( *pImageMap )) );
+if (bReturn)
+{
+if( pImageMap )
+pObj->AppendUserData( 
std::unique_ptr(new SdIMapInfo( *pImageMap )) );
 
-// let the object stay in loaded state after insertion
-pObj->Unload();
-bReturn = true;
+// let the object stay in loaded state after insertion
+pObj->Unload();
+}
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/control/valueacc.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e5e509551c229f242b3111d43887b22717846ccf
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 19:50:46 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 11:20:55 2019 +0200

cid#1448313 Uninitialized pointer field

Change-Id: I0e449be3c0ae4cfef88766e189e7255ff45e83f9
Reviewed-on: https://gerrit.libreoffice.org/75800
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svtools/source/control/valueacc.cxx 
b/svtools/source/control/valueacc.cxx
index 1033fa1c52fd..c4f333f9b9c4 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -68,6 +68,7 @@ SvtValueSetItem::SvtValueSetItem( SvtValueSet& rParent )
 , mnId(0)
 , meType(VALUESETITEM_NONE)
 , mbVisible(true)
+, mpData(nullptr)
 , mxAcc()
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/filter

[Gabor Kelemen (via logerrit)]

 include/filter/msfilter/msdffimp.hxx|1 -
 include/filter/msfilter/mstoolbar.hxx   |1 -
 include/filter/msfilter/msvbahelper.hxx |5 -
 include/filter/msfilter/svdfppt.hxx |1 -
 4 files changed, 8 deletions(-)

New commits:
commit fe9a87afbaf6e5db834580399e0ce6f912b993ac
Author: Gabor Kelemen 
AuthorDate: Sun Jul 7 17:14:30 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jul 18 11:16:44 2019 +0200

tdf#42949 Fix IWYU warnings in include/filter

Found with bin/find-unneeded-includes
Only removal proposals are dealt with here.

Change-Id: I9eef923aa2910c376212ef50961a1ed89bf8b105
Reviewed-on: https://gerrit.libreoffice.org/75179
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index 4ed847ec12bb..a0bc813fd605 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -36,7 +36,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/filter/msfilter/mstoolbar.hxx 
b/include/filter/msfilter/mstoolbar.hxx
index d29ea04a0023..810306149b89 100644
--- a/include/filter/msfilter/mstoolbar.hxx
+++ b/include/filter/msfilter/mstoolbar.hxx
@@ -9,7 +9,6 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 #define INCLUDED_FILTER_MSFILTER_MSTOOLBAR_HXX
 
-#include 
 #include 
 #include 
 
diff --git a/include/filter/msfilter/msvbahelper.hxx 
b/include/filter/msfilter/msvbahelper.hxx
index a22f97aadd52..782eb212113e 100644
--- a/include/filter/msfilter/msvbahelper.hxx
+++ b/include/filter/msfilter/msvbahelper.hxx
@@ -19,17 +19,12 @@
 #ifndef INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
 #define INCLUDED_FILTER_MSFILTER_MSVBAHELPER_HXX
 
-#include 
-
 #include 
-#include 
 #include 
 #include 
 #include 
 #include 
-#include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index c378a10ebb6f..3261c25f4a8c 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -23,7 +23,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sd/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/sdview4.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1291a6f9684144d2a1902ffeec3f9ac361c06efb
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:41:27 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 10:56:36 2019 +0200

cid#1448529 Use after free

Change-Id: I5bc3a85b7319c52e3b5d1a7e7dffcbe23cdf653c
Reviewed-on: https://gerrit.libreoffice.org/75814
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/view/sdview4.cxx b/sd/source/ui/view/sdview4.cxx
index 9d4bc87a1967..cb50639b2593 100644
--- a/sd/source/ui/view/sdview4.cxx
+++ b/sd/source/ui/view/sdview4.cxx
@@ -559,8 +559,8 @@ IMPL_LINK_NOARG(View, DropInsertFileHdl, Timer *, void)
 nOptions |= SdrInsertFlags::DONTMARK;
 }
 
-InsertObjectAtView( pOleObj, *GetSdrPageView(), 
nOptions );
-pOleObj->SetLogicRect( aRect );
+if (InsertObjectAtView( pOleObj, 
*GetSdrPageView(), nOptions ))
+pOleObj->SetLogicRect( aRect );
 aSz.Width = aRect.GetWidth();
 aSz.Height = aRect.GetHeight();
 xObj->setVisualAreaSize( nAspect,aSz );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - cui/uiconfig sc/source

[Caolán McNamara (via logerrit)]

 cui/uiconfig/ui/hyperlinkdocpage.ui  |   13 +
 cui/uiconfig/ui/hyperlinkinternetpage.ui |   10 --
 cui/uiconfig/ui/hyperlinkmailpage.ui |   13 +
 cui/uiconfig/ui/hyperlinknewdocpage.ui   |   12 
 sc/source/ui/drawfunc/fuins1.cxx |4 ++--
 5 files changed, 36 insertions(+), 16 deletions(-)

New commits:
commit e031303dc72560ca8aa0ad99e632ec25372628ea
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:39:05 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 10:56:24 2019 +0200

cid#1448339 Use after free

Change-Id: I3259e0fe9ebaba819d529af2fdb003ce9a297961
Reviewed-on: https://gerrit.libreoffice.org/75813
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sc/source/ui/drawfunc/fuins1.cxx b/sc/source/ui/drawfunc/fuins1.cxx
index dbd403fe0573..11e2290d08ff 100644
--- a/sc/source/ui/drawfunc/fuins1.cxx
+++ b/sc/source/ui/drawfunc/fuins1.cxx
@@ -198,12 +198,12 @@ static void lcl_InsertGraphic( const Graphic& rGraphic,
 
 //  don't select if from (dispatch) API, to allow subsequent cell 
operations
 SdrInsertFlags nInsOptions = bApi ? SdrInsertFlags::DONTMARK : 
SdrInsertFlags::NONE;
-pView->InsertObjectAtView( pObj, *pPV, nInsOptions );
+bool bSuccess = pView->InsertObjectAtView( pObj, *pPV, nInsOptions );
 
 // SetGraphicLink has to be used after inserting the object,
 // otherwise an empty graphic is swapped in and the contact stuff crashes.
 // See #i37444#.
-if ( bAsLink )
+if (bSuccess && bAsLink)
 pObj->SetGraphicLink( rFileName, ""/*TODO?*/, rFilterName );
 }
 
commit 2e649291ef4146131eb0dd5592258f11cf9184e6
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 21:37:47 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 10:56:09 2019 +0200

Resolves: tdf#126448 set activates_default and correct focus settings

Change-Id: Ia857c37b7f5947e7339ba5f80aad54112ff2c3f7
Reviewed-on: https://gerrit.libreoffice.org/75818
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/uiconfig/ui/hyperlinkdocpage.ui 
b/cui/uiconfig/ui/hyperlinkdocpage.ui
index 45d8af5cd189..a58d2038476e 100644
--- a/cui/uiconfig/ui/hyperlinkdocpage.ui
+++ b/cui/uiconfig/ui/hyperlinkdocpage.ui
@@ -72,12 +72,13 @@
 
   
 True
-True
+False
 True
 True
 
   
-False
+True
+True
   
 
   
@@ -172,6 +173,7 @@
   
 True
 True
+True
   
   
 1
@@ -284,6 +286,7 @@
   
 True
 True
+True
   
   
 1
@@ -294,6 +297,7 @@
   
 True
 True
+True
   
   
 1
@@ -324,7 +328,7 @@
 
   
 True
-True
+False
 True
   
   
@@ -353,7 +357,8 @@
 True
 
   
-False
+True
+True
   
 
   
diff --git a/cui/uiconfig/ui/hyperlinkinternetpage.ui 
b/cui/uiconfig/ui/hyperlinkinternetpage.ui
index f7efdce50f52..5eb3fd60da6d 100644
--- a/cui/uiconfig/ui/hyperlinkinternetpage.ui
+++ b/cui/uiconfig/ui/hyperlinkinternetpage.ui
@@ -126,6 +126,7 @@
 True
 True
 True
+True
   
   
 1
@@ -137,6 +138,7 @@
 True
 True
 True
+True
   
   
 1
@@ -161,12 +163,13 @@
 
   
 True
-True
+False
 True
 True
 
   
 True
+True
   
 
   
@@ -271,6 +274,7 @@
   
 True
 True
+True
   
   
 1
@@ -281,6 +285,7 @@
 

Re: CppunitTest_sw_ooxmllinks failing on Windows

[Jan-Marek Glogowski]

Am 18.07.19 um 07:50 schrieb Luke Benes:
> After https://cgit.freedesktop.org/libreoffice/core/commit/?id=217a80fd205c
> 
> Some windows boxes like @42 are failing. 
> https://tinderbox.libreoffice.org/cgi-bin/gunzip.cgi?tree=MASTER&brief-log=1563378001.26689
> 
> 24716 
> 
>  [build CUT] sw_ooxmlw14export
> 24717 
> 
>  File tested,Execution Time (ms)
> 24718 
> 
>  absolute-link.docx:
> 24719 
> 
>  577
> 24720 
> 
>  testAbsoluteToRelativeImport::Import finished in: 639ms
> 24721 
> 
>  File tested,Execution Time (ms)
> 24722 
> 
>  absolute-link.docx:
> 24723 
> 
>  265
> 24724 
> 
>  testAbsoluteToAbsoluteImport::Import finished in: 297ms
> 24725 
> 
>  File tested,Execution Time (ms)
> 24726 
> 
>  absolute-link.docx:
> 24727 
> 
>  764
> 24728 
> 
>  testAbsoluteToAbsoluteExport::Import_Export_Import finished in: 780ms
> 24729 
> 
>  File tested,Execution Time (ms)
> 24730 
> 
>  relative-link.docx:
> 24731 
> 
>  
> D:/lode/dev/core/sw/qa/extras/ooxmlexport/ooxmllinks.cxx:185:testRelativeToRelativeExport::Import_Export_Import
> 24732 
> 
>  NEXT 
> 
> assertion failed 24733 
> 
>  - Expression: sTarget.startsWith("../")
<> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice

This quite probably needs the same fix then:

commit 2f2f4767089512c34514896bc37823f9310e9dd4
Author: Jan-Marek Glogowski 
Date:   Wed Jul 10 00:12:04 2019 +0200

tdf#126255 compare the URL of the exported file

commit 3f1527fba7b9fe729e421322a9ea91a24aa495e0
Author: Jan-Marek Glogowski 
Date:   Tue Jul 9 14:11:58 2019 +

tdf#126255 handle _WIN32 with different drive letters
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - filter/source

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/itiff/itiff.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 38bf835b48efa2e32d917538cabc4fa2e1dec56d
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 16:13:17 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Jul 18 10:44:02 2019 +0200

Resolves: tdf#126147 relax sanity check and allow truncated tiffs

now the start of the row of data must still exist, but the full
length of the row doesn't have to exist

Change-Id: I5ed8ffef2cab19f040ba789a5d82560ca6847f26
Reviewed-on: https://gerrit.libreoffice.org/75795
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index d2bb00e3720f..9c2236689fac 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -568,9 +568,11 @@ bool TIFFReader::ReadMap()
 if ( nStrip >= aStripOffsets.size())
 return false;
 pTIFF->Seek( aStripOffsets[ nStrip ] + ( ny % 
GetRowsPerStrip() ) * nStripBytesPerRow );
-pTIFF->ReadBytes(getMapData(np), nBytesPerRow);
-if (!pTIFF->good())
-return false;
+// tdf#126147 allow a short incomplete read
+auto pDest = getMapData(np);
+auto nRead = pTIFF->ReadBytes(pDest, nBytesPerRow);
+if (nRead != nBytesPerRow)
+memset(pDest + nRead, 0, nBytesPerRow - nRead);
 }
 if ( !ConvertScanline( ny ) )
 return false;
@@ -1510,8 +1512,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 if (bStatus)
 {
 auto nStart = aStripOffsets[ nStrip ] + ( ny % 
GetRowsPerStrip() ) * nStripBytesPerRow;
-auto nEnd = nStart + nBytesPerRow;
-if (nEnd > nEndOfFile)
+if (nStart > nEndOfFile)
 bStatus = false;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - filter/source

[Caolán McNamara (via logerrit)]

 filter/source/graphicfilter/itiff/itiff.cxx |   11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

New commits:
commit d743130a98a168ba17dcb082cd3fb6efc335a86a
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 16:13:17 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Jul 18 10:43:40 2019 +0200

Resolves: tdf#126147 relax sanity check and allow truncated tiffs

now the start of the row of data must still exist, but the full
length of the row doesn't have to exist

Change-Id: I5ed8ffef2cab19f040ba789a5d82560ca6847f26
Reviewed-on: https://gerrit.libreoffice.org/75794
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 956efdbb4f6c..7509777b6122 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -570,9 +570,11 @@ bool TIFFReader::ReadMap()
 if ( nStrip >= aStripOffsets.size())
 return false;
 pTIFF->Seek( aStripOffsets[ nStrip ] + ( ny % 
GetRowsPerStrip() ) * nStripBytesPerRow );
-pTIFF->ReadBytes(getMapData(np), nBytesPerRow);
-if (!pTIFF->good())
-return false;
+// tdf#126147 allow a short incomplete read
+auto pDest = getMapData(np);
+auto nRead = pTIFF->ReadBytes(pDest, nBytesPerRow);
+if (nRead != nBytesPerRow)
+memset(pDest + nRead, 0, nBytesPerRow - nRead);
 }
 if ( !ConvertScanline( ny ) )
 return false;
@@ -1512,8 +1514,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 if (bStatus)
 {
 auto nStart = aStripOffsets[ nStrip ] + ( ny % 
GetRowsPerStrip() ) * nStripBytesPerRow;
-auto nEnd = nStart + nBytesPerRow;
-if (nEnd > nEndOfFile)
+if (nStart > nEndOfFile)
 bStatus = false;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - svtools/source

[Caolán McNamara (via logerrit)]

 svtools/source/control/valueacc.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 7fd9d3e45a64495c99beb21f0ac0f7d2c16382cb
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 19:50:46 2019 +0100
Commit: Michael Stahl 
CommitDate: Thu Jul 18 10:28:03 2019 +0200

cid#1448313 Uninitialized pointer field

Change-Id: I0e449be3c0ae4cfef88766e189e7255ff45e83f9
Reviewed-on: https://gerrit.libreoffice.org/75806
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/svtools/source/control/valueacc.cxx 
b/svtools/source/control/valueacc.cxx
index 1033fa1c52fd..c4f333f9b9c4 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -68,6 +68,7 @@ SvtValueSetItem::SvtValueSetItem( SvtValueSet& rParent )
 , mnId(0)
 , meType(VALUESETITEM_NONE)
 , mbVisible(true)
+, mpData(nullptr)
 , mxAcc()
 {
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sfx2/source

[Samuel Mehrbrodt (via logerrit)]

 sfx2/source/sidebar/SidebarController.cxx |   21 +
 1 file changed, 1 insertion(+), 20 deletions(-)

New commits:
commit b58aa94f1f365c746135470bceb97cc182c289bc
Author: Samuel Mehrbrodt 
AuthorDate: Tue Jul 16 17:41:48 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Thu Jul 18 10:27:25 2019 +0200

tdf#126424 Don't dispose decks before saving their state

Only dispose them in SidebarController::disposing after the
state has been saved.

Change-Id: I9e42383e20e2bc0100557b8cb8fbd26b3505f236
Reviewed-on: https://gerrit.libreoffice.org/75719
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index f529f9fecfa9..6af46db78a86 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -192,7 +192,6 @@ void 
SidebarController::registerSidebarForFrame(SidebarController* pController,
 
 void SidebarController::unregisterSidebarForFrame(SidebarController* 
pController, const css::uno::Reference& xController)
 {
-pController->disposeDecks();
 css::uno::Reference xMultiplexer (
 css::ui::ContextChangeEventMultiplexer::get(
 ::comphelper::getProcessComponentContext()));
@@ -228,22 +227,7 @@ void SAL_CALL SidebarController::disposing()
 }
 
 // clear decks
-ResourceManager::DeckContextDescriptorContainer aDecks;
-
-mpResourceManager->GetMatchingDecks (
-aDecks,
-GetCurrentContext(),
-IsDocumentReadOnly(),
-mxFrame->getController());
-
-for (const auto& rDeck : aDecks)
-{
-std::shared_ptr deckDesc = 
mpResourceManager->GetDeckDescriptor(rDeck.msId);
-
-VclPtr aDeck = deckDesc->mpDeck;
-if (aDeck)
-aDeck.disposeAndClear();
-}
+disposeDecks();
 
 uno::Reference xController = 
mxFrame->getController();
 if (!xController.is())
@@ -698,9 +682,6 @@ void SidebarController::SwitchToDeck (
 const DeckDescriptor& rDeckDescriptor,
 const Context& rContext)
 {
-
-maFocusManager.Clear();
-
 const bool bForceNewDeck 
((mnRequestedForceFlags&SwitchFlag_ForceNewDeck)!=0);
 const bool bForceNewPanels 
((mnRequestedForceFlags&SwitchFlag_ForceNewPanels)!=0);
 mnRequestedForceFlags = SwitchFlag_NoForce;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sc/source

[Thorsten Wagner (via logerrit)]

 sc/source/ui/app/inputwin.cxx |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2b4efc32e822bf41c4b729137718f3c70f692a89
Author: Thorsten Wagner 
AuthorDate: Mon Jun 17 22:30:15 2019 +0200
Commit: Katarina Behrens 
CommitDate: Thu Jul 18 10:09:13 2019 +0200

tdf#101443 Horizontal inset margin of Calc input bar increased

Change-Id: Ic609da4b8b5fae0f556761c4493e490c82a6386d
Reviewed-on: https://gerrit.libreoffice.org/74214
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 14cd3595c5be..5732411a5bbf 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -999,9 +999,9 @@ ScTextWndGroup::ScTextWndGroup(vcl::Window* pParent, 
ScTabViewShell* pViewSh)
   maTextWnd(VclPtr::Create(this, pViewSh)),
   maScrollBar(VclPtr::Create(this, WB_TABSTOP | WB_VERT | 
WB_DRAG))
 {
-maTextWnd->SetPosPixel(Point(gnBorderWidth, gnBorderHeight));
+maTextWnd->SetPosPixel(Point(2 * gnBorderWidth, gnBorderHeight));
 Size aSize = GetSizePixel();
-maTextWnd->SetSizePixel(Size(aSize.Width() - 2 * gnBorderWidth, 
aSize.Height() - 2 * gnBorderHeight));
+maTextWnd->SetSizePixel(Size(aSize.Width() - 4 * gnBorderWidth, 
aSize.Height() - 2 * gnBorderHeight));
 maTextWnd->Show();
 maTextWnd->SetQuickHelpText(ScResId(SCSTR_QHELP_INPUTWND));
 maTextWnd->SetHelpId(HID_INSWIN_INPUT);
@@ -,13 +,13 @@ void ScTextWndGroup::Resize()
 maScrollBar->SetLineSize(maTextWnd->GetTextHeight());
 maScrollBar->Resize();
 maScrollBar->Show();
-maTextWnd->SetSizePixel(Size(aSize.Width() - aScrollBarSize.Width() - 
gnBorderWidth - 1,
+maTextWnd->SetSizePixel(Size(aSize.Width() - aScrollBarSize.Width() - 
3 * gnBorderWidth - 1,
  aSize.Height() - 2 * gnBorderHeight));
 }
 else
 {
 maScrollBar->Hide();
-maTextWnd->SetSizePixel(Size(aSize.Width() - 2 * gnBorderWidth, 
aSize.Height() - 2 * gnBorderHeight));
+maTextWnd->SetSizePixel(Size(aSize.Width() - 4 * gnBorderWidth, 
aSize.Height() - 2 * gnBorderHeight));
 }
 maTextWnd->Resize();
 Invalidate();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/qa writerfilter/source

[László Németh (via logerrit)]

 sw/qa/extras/ooxmlexport/ooxmllinks.cxx   |9 +++--
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.hxx |2 ++
 3 files changed, 6 insertions(+), 7 deletions(-)

New commits:
commit d91209f354163133eaaac0cf6e708f647d1aff17
Author: László Németh 
AuthorDate: Thu Jul 18 09:49:00 2019 +0200
Commit: László Németh 
CommitDate: Thu Jul 18 09:53:31 2019 +0200

Revert "tdf#123627 DOCX import: fix relative hyperlinks to documents"

This reverts commit 217a80fd205c7f61794c863898cb7cfd1a17e78f.

Change-Id: Ic6c9c68dff800f0969187bdd46b51f8e71c0c618
Reviewed-on: https://gerrit.libreoffice.org/75825
Reviewed-by: László Németh 
Tested-by: László Németh 

diff --git a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx 
b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
index e6a1c8abc9d0..5b03e7ddf532 100644
--- a/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmllinks.cxx
@@ -141,9 +141,7 @@ DECLARE_LINKS_IMPORT_TEST(testRelativeToRelativeImport, 
"relative-link.docx", US
 {
 uno::Reference xParagraph = getParagraph(1);
 uno::Reference xText = getRun(xParagraph, 1);
-OUString sTarget = getProperty(xText, "HyperLinkURL");
-CPPUNIT_ASSERT(sTarget.startsWith("file:///"));
-CPPUNIT_ASSERT(sTarget.endsWith("relative.docx"));
+CPPUNIT_ASSERT_EQUAL(OUString("relative.docx"), 
getProperty(xText, "HyperLinkURL"));
 }
 
 DECLARE_LINKS_IMPORT_TEST(testRelativeToAbsoluteImport, "relative-link.docx", 
USE_ABSOLUTE)
@@ -181,9 +179,8 @@ DECLARE_LINKS_EXPORT_TEST(testRelativeToRelativeExport, 
"relative-link.docx", US
 xmlDocPtr pXmlDoc = parseExport("word/_rels/document.xml.rels");
 if (!pXmlDoc)
 return;
-OUString sTarget = getXPath(pXmlDoc, 
"/rels:Relationships/rels:Relationship[2]", "Target");
-CPPUNIT_ASSERT(sTarget.startsWith("../"));
-CPPUNIT_ASSERT(sTarget.endsWith("relative.docx"));
+
+assertXPath(pXmlDoc, "/rels:Relationships/rels:Relationship[2]", "Target", 
"relative.docx");
 }
 
 DECLARE_LINKS_EXPORT_TEST(testRelativeToAbsoluteExport, "relative-link.docx", 
USE_ABSOLUTE,
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index bcd341ae84ff..51b5c1e2cf96 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -4500,7 +4500,7 @@ void DomainMapper_Impl::CloseFieldCommand()
 // Try to make absolute any relative URLs, except
 // for relative same-document URLs that only 
contain
 // a fragment part:
-if (!sURL.startsWith("#")) {
+if (!sURL.startsWith("#") && 
!m_aSaveOpt.IsSaveRelFSys()) {
 try {
 sURL = rtl::Uri::convertRelToAbs(
 m_aBaseUrl, sURL);
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx 
b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index 5def87793773..040b8df0cc28 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -406,6 +407,7 @@ public:
 private:
 SourceDocumentType const   
 m_eDocumentType;
 DomainMapper&  
 m_rDMapper;
+SvtSaveOptions const   
 m_aSaveOpt;
 OUString m_aBaseUrl;
 css::uno::Reference m_xTextDocument;
 css::uno::Reference m_xDocumentSettings;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/rtl

[Andrea Gelmini (via logerrit)]

 include/rtl/string.hxx |   20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

New commits:
commit bbb2a03f597d8602e4052c5a0f75edbf30d0b50f
Author: Andrea Gelmini 
AuthorDate: Thu Jul 11 22:25:02 2019 +
Commit: Julien Nabet 
CommitDate: Thu Jul 18 09:51:22 2019 +0200

Fix typo

Change-Id: I9843620c378d7c6dbb5696255eb123e0bca9b4bf
Reviewed-on: https://gerrit.libreoffice.org/75821
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/rtl/string.hxx b/include/rtl/string.hxx
index c60cb8d837bb..3b33ee4f1ae5 100644
--- a/include/rtl/string.hxx
+++ b/include/rtl/string.hxx
@@ -113,7 +113,7 @@ public:
 /**
   New string from OString.
 
-  @paramstr a OString.
+  @paramstr an OString.
 */
 OString( const OString & str )
 {
@@ -126,7 +126,7 @@ public:
 /**
   Move constructor.
 
-  @paramstr a OString.
+  @paramstr an OString.
   @since LibreOffice 5.2
 */
 OString( OString && str )
@@ -141,7 +141,7 @@ public:
 /**
   New string from OString data.
 
-  @paramstr a OString data.
+  @paramstr an OString data.
 */
 OString( rtl_String * str )
 {
@@ -154,7 +154,7 @@ public:
 The SAL_NO_ACQUIRE dummy parameter is only there to distinguish this
 from other constructors.
 
-  @paramstr a OString data.
+  @paramstr an OString data.
 */
 OString( rtl_String * str, __sal_NoAcquire )
 {
@@ -297,7 +297,7 @@ public:
 /**
   Assign a new string.
 
-  @paramstr a OString.
+  @paramstr an OString.
 */
 OString & operator=( const OString & str )
 {
@@ -310,7 +310,7 @@ public:
 /**
   Move assign a new string.
 
-  @paramstr a OString.
+  @paramstr an OString.
   @since LibreOffice 5.2
 */
 OString & operator=( OString && str )
@@ -350,7 +350,7 @@ public:
 /**
   Append a string to this string.
 
-  @paramstr a OString.
+  @paramstr an OString.
 */
 OString & operator+=( const OString & str )
 #if defined LIBO_INTERNAL_ONLY
@@ -546,7 +546,7 @@ public:
 }
 
 /**
-  Perform a ASCII lowercase comparison of two strings.
+  Perform an ASCII lowercase comparison of two strings.
 
   The result is true if and only if second string
   represents the same sequence of characters as the first string,
@@ -570,7 +570,7 @@ public:
 }
 
 /**
-  Perform a ASCII lowercase comparison of two strings.
+  Perform an ASCII lowercase comparison of two strings.
 
   The result is true if and only if second string
   represents the same sequence of characters as the first string,
@@ -625,7 +625,7 @@ public:
 }
 
 /**
-  Perform a ASCII lowercase comparison of two strings.
+  Perform an ASCII lowercase comparison of two strings.
 
   The result is true if and only if second string
   represents the same sequence of characters as the first string,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sw/source

[Michael Stahl (via logerrit)]

 sw/source/core/unocore/unoframe.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 8dfe166a879a17bd8c2e0859d027ff923258a9d8
Author: Michael Stahl 
AuthorDate: Wed Jul 17 17:40:50 2019 +0200
Commit: Michael Stahl 
CommitDate: Thu Jul 18 09:49:16 2019 +0200

sw: missing SolarMutexGuard in SwXFrame::attach()

Causes assert in a test i'm adding...

Change-Id: I5be24aa9683ec0d31494c0c97270d1d58692f764
Reviewed-on: https://gerrit.libreoffice.org/75796
Tested-by: Jenkins
Reviewed-by: Michael Stahl 

diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 8c41d7fbe0fd..68a305f40dc8 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -3077,6 +3077,8 @@ void SwXFrame::attachToRange(const uno::Reference< 
text::XTextRange > & xTextRan
 
 void SwXFrame::attach(const uno::Reference< text::XTextRange > & xTextRange)
 {
+SolarMutexGuard g;
+
 SwFrameFormat* pFormat;
 if(IsDescriptor())
 attachToRange(xTextRange);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/rtl

[Andrea Gelmini (via logerrit)]

 include/rtl/ustrbuf.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0f45c5e6fbabb93b4f4c8d6e6a6b1cc4604d53ec
Author: Andrea Gelmini 
AuthorDate: Thu Jul 11 22:25:01 2019 +
Commit: Julien Nabet 
CommitDate: Thu Jul 18 09:44:36 2019 +0200

Fix typo

Change-Id: Iac1e4f3e7ac7f3ea86e31179f2f45e3941abd3a1
Reviewed-on: https://gerrit.libreoffice.org/75822
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 62ba9f6b2cd7..94bf9c789a61 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -513,7 +513,7 @@ public:
 }
 
 /**
-Return a OUString instance reflecting the current content
+Return an OUString instance reflecting the current content
 of this OUStringBuffer.
  */
 const OUString toString() const
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: offapi/com

[Andrea Gelmini (via logerrit)]

 offapi/com/sun/star/ui/XUIElementFactory.idl |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 45341810ab2ca6535532ba16b769e39334138b1f
Author: Andrea Gelmini 
AuthorDate: Thu Jul 18 01:08:58 2019 +0200
Commit: Julien Nabet 
CommitDate: Thu Jul 18 09:42:32 2019 +0200

Fix typo

Change-Id: I28c6478650154b91208f72683485fbf8fd67264b
Reviewed-on: https://gerrit.libreoffice.org/75823
Reviewed-by: Julien Nabet 
Tested-by: Julien Nabet 

diff --git a/offapi/com/sun/star/ui/XUIElementFactory.idl 
b/offapi/com/sun/star/ui/XUIElementFactory.idl
index 9ca679b0c541..c87638c0e1f5 100644
--- a/offapi/com/sun/star/ui/XUIElementFactory.idl
+++ b/offapi/com/sun/star/ui/XUIElementFactory.idl
@@ -98,7 +98,7 @@ interface XUIElementFactory : 
::com::sun::star::uno::XInterface
 (Sidebar only) specifies the current 
com::sun::star::rendering::XSpriteCanvas instance.
 
 ApplicationName
-(Sidebar only) Specifies the current application 
application name (as a string)
+(Sidebar only) Specifies the current application name (as 
a string)
 
 ContextName
 (Sidebar only) Specifies the current context (as a string)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 3 commits - cui/source filter/source svx/source sw/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/page.cxx   |3 ++-
 filter/source/graphicfilter/itiff/itiff.cxx|   11 ++-
 svx/source/dialog/hdft.cxx |1 +
 svx/source/engine3d/view3d.cxx |   10 ++
 sw/source/uibase/sidebar/PageMarginControl.hxx |3 ++-
 5 files changed, 17 insertions(+), 11 deletions(-)

New commits:
commit c21847117a587f1eac99653d05e6ed9278d43f79
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 16:13:17 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:39:09 2019 +0200

Resolves: tdf#126147 relax sanity check and allow truncated tiffs

now the start of the row of data must still exist, but the full
length of the row doesn't have to exist

Change-Id: I5ed8ffef2cab19f040ba789a5d82560ca6847f26
Reviewed-on: https://gerrit.libreoffice.org/75793
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/filter/source/graphicfilter/itiff/itiff.cxx 
b/filter/source/graphicfilter/itiff/itiff.cxx
index 79a4d85aa66b..970e5958635f 100644
--- a/filter/source/graphicfilter/itiff/itiff.cxx
+++ b/filter/source/graphicfilter/itiff/itiff.cxx
@@ -570,9 +570,11 @@ bool TIFFReader::ReadMap()
 if ( nStrip >= aStripOffsets.size())
 return false;
 pTIFF->Seek( aStripOffsets[ nStrip ] + ( ny % 
GetRowsPerStrip() ) * nStripBytesPerRow );
-pTIFF->ReadBytes(getMapData(np), nBytesPerRow);
-if (!pTIFF->good())
-return false;
+// tdf#126147 allow a short incomplete read
+auto pDest = getMapData(np);
+auto nRead = pTIFF->ReadBytes(pDest, nBytesPerRow);
+if (nRead != nBytesPerRow)
+memset(pDest + nRead, 0, nBytesPerRow - nRead);
 }
 if ( !ConvertScanline( ny ) )
 return false;
@@ -1512,8 +1514,7 @@ bool TIFFReader::ReadTIFF(SvStream & rTIFF, Graphic & 
rGraphic )
 if (bStatus)
 {
 auto nStart = aStripOffsets[ nStrip ] + ( ny % 
GetRowsPerStrip() ) * nStripBytesPerRow;
-auto nEnd = nStart + nBytesPerRow;
-if (nEnd > nEndOfFile)
+if (nStart > nEndOfFile)
 bStatus = false;
 }
 }
commit cefce1a247a4674c5726a31b61571eab16328a0b
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:29:17 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:38:52 2019 +0200

tdf#126051 sync MINBODY copies to same value

Change-Id: Id41da7b07dcb25e820e5fd20aed595b1170fa204
Reviewed-on: https://gerrit.libreoffice.org/75807
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/tabpages/page.cxx b/cui/source/tabpages/page.cxx
index a5e7269c224c..dd250a1fe532 100644
--- a/cui/source/tabpages/page.cxx
+++ b/cui/source/tabpages/page.cxx
@@ -61,7 +61,8 @@
 
 // static 
 
-static const long MINBODY   = 284;  // 0,5 cm rounded up in twips
+// #i19922# - tdf#126051 see svx/source/dialog/hdft.cxx and 
sw/source/uibase/sidebar/PageMarginControl.hxx
+static const long MINBODY = 56;  // 1mm in twips rounded
 
 const sal_uInt16 SvxPageDescPage::pRanges[] =
 {
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index 5f5081c9be39..e4c622ae781a 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -53,6 +53,7 @@
 using namespace com::sun::star;
 
 // Word 97 incompatibility (#i19922#)
+// #i19922# - tdf#126051 see cui/source/tabpages/page.cxx and 
sw/source/uibase/sidebar/PageMarginControl.hxx
 static const long MINBODY = 56;  // 1mm in twips rounded
 
 // default distance to Header or footer
diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx 
b/sw/source/uibase/sidebar/PageMarginControl.hxx
index a2b9e0a7deb2..761f5c7dfdec 100644
--- a/sw/source/uibase/sidebar/PageMarginControl.hxx
+++ b/sw/source/uibase/sidebar/PageMarginControl.hxx
@@ -37,7 +37,8 @@
 #define SWPAGE_WIDE_VALUE2 2880
 #define SWPAGE_WIDE_VALUE3 1800
 
-static const long MINBODY = 284; //0.5 cm in twips
+// #i19922# - tdf#126051 see cui/source/tabpages/page.cxx and 
svx/source/dialog/hdft.cxx
+static const long MINBODY = 56;  // 1mm in twips rounded
 
 namespace sw { namespace sidebar {
 
commit f1824e27511709614ea3c03209caee1c22e2ab10
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:37:27 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:38:18 2019 +0200

cid#1448253 Use after free

Change-Id: I83f3ef82faafd31f5a1afca9c5ab3f4040c3552b
Reviewed-on: https://gerrit.libreoffice.org/75812
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a

[Libreoffice-commits] core.git: 3 commits - chart2/source reportdesign/source sfx2/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/main/DrawCommandDispatch.cxx |4 ++--
 reportdesign/source/ui/dlg/Formula.cxx|6 +++---
 reportdesign/source/ui/inc/Formula.hxx|4 ++--
 sfx2/source/doc/SfxRedactionHelper.cxx|4 +---
 4 files changed, 8 insertions(+), 10 deletions(-)

New commits:
commit 784f93b3895fc7e85eec26c3fece12433b3a5ce4
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:34:35 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:38:00 2019 +0200

cid#1448252 Negative array index read

Change-Id: Ia81e2a58e372455531479c98d11a88cd950441df
Reviewed-on: https://gerrit.libreoffice.org/75808
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sfx2/source/doc/SfxRedactionHelper.cxx 
b/sfx2/source/doc/SfxRedactionHelper.cxx
index 310c0374ca35..ff81bdf39292 100644
--- a/sfx2/source/doc/SfxRedactionHelper.cxx
+++ b/sfx2/source/doc/SfxRedactionHelper.cxx
@@ -546,9 +546,7 @@ void 
SfxRedactionHelper::fillSearchOptions(i18nutil::SearchOptions2& rSearchOpt,
 rSearchOpt.Locale = GetAppLanguageTag().getLocale();
 if (pTarget->sType == RedactionTargetType::REDACTION_TARGET_PREDEFINED)
 {
-sal_Int32 nPredefIndex = pTarget->sContent.getToken(0, ';').toInt32();
-//sal_Int32 nPredefIndex = sContent.toInt32();
-
+auto nPredefIndex = pTarget->sContent.getToken(0, ';').toUInt32();
 rSearchOpt.searchString = m_aPredefinedTargets[nPredefIndex];
 }
 else
commit 7fcb5c20310d23a4ede8b0a6e03ba23482792621
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:36:23 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:37:45 2019 +0200

cid#1448236 Use after free

Change-Id: Id7a0ad49a8e73a6b12a0f40c4b8f62b1e1d64356
Reviewed-on: https://gerrit.libreoffice.org/75810
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/main/DrawCommandDispatch.cxx 
b/chart2/source/controller/main/DrawCommandDispatch.cxx
index 7a6a07b1ae41..7540d7962eae 100644
--- a/chart2/source/controller/main/DrawCommandDispatch.cxx
+++ b/chart2/source/controller/main/DrawCommandDispatch.cxx
@@ -371,8 +371,8 @@ void DrawCommandDispatch::execute( const OUString& 
rCommand, const Sequence< bea
 if ( pObj )
 {
 SdrPageView* pPageView = 
pDrawViewWrapper->GetSdrPageView();
-pDrawViewWrapper->InsertObjectAtView( pObj, 
*pPageView );
-
m_pChartController->SetAndApplySelection(Reference(pObj->getUnoShape(),
 uno::UNO_QUERY));
+if (pDrawViewWrapper->InsertObjectAtView(pObj, 
*pPageView))
+
m_pChartController->SetAndApplySelection(Reference(pObj->getUnoShape(),
 uno::UNO_QUERY));
 if ( nFeatureId == COMMAND_ID_DRAW_TEXT )
 {
 m_pChartController->StartTextEdit();
commit e2cd1f41b8cb8a27155ce1fe5760f05b7129
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 19:54:53 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:37:28 2019 +0200

cid#1448383 Resource leak in object

Change-Id: I07af4d48db887c184be824a2d1939b800f837d4e
Reviewed-on: https://gerrit.libreoffice.org/75801
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/reportdesign/source/ui/dlg/Formula.cxx 
b/reportdesign/source/ui/dlg/Formula.cxx
index 919deaeec869..f4c46be3ce6c 100644
--- a/reportdesign/source/ui/dlg/Formula.cxx
+++ b/reportdesign/source/ui/dlg/Formula.cxx
@@ -52,7 +52,7 @@ FormulaDialog::FormulaDialog(weld::Window* pParent
  , svl::SharedStringPool& rStrPool )
 : FormulaModalDialog( pParent, _pFunctionMgr.get(),this)
 ,m_aFunctionManager(_pFunctionMgr)
-,m_pFormulaData(new FormEditData())
+,m_xFormulaData(new FormEditData())
 ,m_pAddField(nullptr)
 ,m_xRowSet(_xRowSet)
 ,m_pEdit(nullptr)
@@ -94,7 +94,7 @@ FormulaDialog::~FormulaDialog()
 
aDlgOpt.SetWindowState(OStringToOUString(m_pAddField->GetWindowState(WindowStateMask::X
 | WindowStateMask::Y | WindowStateMask::State | WindowStateMask::Minimized), 
RTL_TEXTENCODING_ASCII_US));
 }
 
-StoreFormEditData( m_pFormulaData );
+StoreFormEditData(m_xFormulaData.get());
 m_pEdit = nullptr;
 m_pAddField.clear();
 }
@@ -145,7 +145,7 @@ void FormulaDialog::switchBack()
 }
 FormEditData* FormulaDialog::getFormEditData() const
 {
-return m_pFormulaData;
+return m_xFormulaData.get();
 }
 void FormulaDialog::setCurrentFormula(const OUString& _sReplacement)
 {
diff --git a/reportdesign/source/ui/inc/Formula.hxx 
b/reportdesign/source/ui/inc/Formula.hxx
index 394d0b147b4e..1335c6012dd8 100644
--- a/reportdesign/source/ui/inc/Form

[Libreoffice-commits] core.git: 4 commits - sd/source solenv/gbuildtojson toolkit/source vcl/source

[Caolán McNamara (via logerrit)]

 sd/source/ui/view/sdwindow.cxx   |2 +-
 solenv/gbuildtojson/gbuildtojson.cxx |2 +-
 toolkit/source/awt/vclxtoolkit.cxx   |1 +
 vcl/source/window/printdlg.cxx   |2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

New commits:
commit 9b25e24571cd6ee644416158b493188354d961f7
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:10:58 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:37:12 2019 +0200

cid#1448417 silence Unchecked return value from library

Change-Id: I61b3a4408942b98e1ef0562b236b96335a8c5867
Reviewed-on: https://gerrit.libreoffice.org/75805
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/solenv/gbuildtojson/gbuildtojson.cxx 
b/solenv/gbuildtojson/gbuildtojson.cxx
index 7c2429e60d20..00bc6ee8abb8 100644
--- a/solenv/gbuildtojson/gbuildtojson.cxx
+++ b/solenv/gbuildtojson/gbuildtojson.cxx
@@ -55,7 +55,7 @@ int main(int argc, char** argv)
 stringstream contents;
 contents << filestream.rdbuf();
 filestream.close();
-remove(varandfile.second.c_str());
+(void)remove(varandfile.second.c_str());
 string escapedcontents;
 for(auto& c : contents.str())
 {
commit 0b96e4cceb5e078029a72271c30088b688f4bb7a
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:04:00 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:36:57 2019 +0200

cid#1448511 silence Out-of-bounds access

Change-Id: I11920faa3327bfc74e9bfe8a94864a9caaa9b147
Reviewed-on: https://gerrit.libreoffice.org/75803
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/toolkit/source/awt/vclxtoolkit.cxx 
b/toolkit/source/awt/vclxtoolkit.cxx
index 42c135c7b889..96699c246d19 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1398,6 +1398,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** 
ppNewComp,
 
 rtl_getGlobalProcessId( 
reinterpret_cast(processID) );
 
+// coverity[overrun-buffer-arg : FALSE] - 
coverity has difficulty with css::uno::Sequence
 css::uno::Sequence 
processIdSeq(processID, 16);
 
 css::uno::Any anyHandle = 
xSystemDepParent->getWindowHandle(processIdSeq, SYSTEM_DEPENDENT_TYPE);
commit cd7fe8938160015ed8bf53b8164d26fca99e7074
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 20:08:16 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:36:45 2019 +0200

cid#1448365 silence Arguments in wrong order

Change-Id: I20a64d73add3636e02e02ea970577c0505e2b5fd
Reviewed-on: https://gerrit.libreoffice.org/75804
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 758a1c444b7c..df1a8c7bac8c 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1022,7 +1022,7 @@ void PrintDialog::checkPaperSize( Size& rPaperSize )
 if ( (eOrientation == Orientation::Portrait && rPaperSize.Width() > 
rPaperSize.Height()) ||
  (eOrientation == Orientation::Landscape && rPaperSize.Width() < 
rPaperSize.Height()) )
 {
-// coverity[swapped_arguments : FALSE] - this is in the correct order
+// coverity[swapped-arguments : FALSE] - this is in the correct order
 rPaperSize = Size( rPaperSize.Height(), rPaperSize.Width() );
 }
 }
commit 5e9e09e7bff0cb99b48dcf3af942a45b573ac7b5
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 19:57:55 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:36:31 2019 +0200

cid#1451632 Dereference after null check

Change-Id: I5ee95a9341896b8462235ece933fa70773247c92
Reviewed-on: https://gerrit.libreoffice.org/75802
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sd/source/ui/view/sdwindow.cxx b/sd/source/ui/view/sdwindow.cxx
index 7a30096c52fd..fa355dfea869 100644
--- a/sd/source/ui/view/sdwindow.cxx
+++ b/sd/source/ui/view/sdwindow.cxx
@@ -268,7 +268,7 @@ void Window::Command(const CommandEvent& rCEvt)
 //show the text edit outliner view cursor
 else if (!HasFocus() && rCEvt.GetCommand() == CommandEventId::CursorPos)
 {
-OutlinerView* pOLV = mpViewShell->GetView()->GetTextEditOutlinerView();
+OutlinerView* pOLV = mpViewShell ? 
mpViewShell->GetView()->GetTextEditOutlinerView() : nullptr;
 if (pOLV && this == pOLV->GetWindow())
 {
 GrabFocus();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/SpellDialog.cxx |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit de7ffaea58e5813c6e076f3612735c7c7cb70509
Author: Caolán McNamara 
AuthorDate: Wed Jul 17 19:48:42 2019 +0100
Commit: Caolán McNamara 
CommitDate: Thu Jul 18 09:36:03 2019 +0200

cid#1451643 Uninitialized pointer field

Change-Id: I5bb3087e8ccd0de2e04df9596ddf860de29689fb
Reviewed-on: https://gerrit.libreoffice.org/75799
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/cui/source/dialogs/SpellDialog.cxx 
b/cui/source/dialogs/SpellDialog.cxx
index 74af6f7d2a57..52671b110586 100644
--- a/cui/source/dialogs/SpellDialog.cxx
+++ b/cui/source/dialogs/SpellDialog.cxx
@@ -1110,7 +1110,9 @@ bool SpellDialog::ApplyChangeAllList_Impl(SpellPortions& 
rSentence, bool &bHasRe
 }
 
 SentenceEditWindow_Impl::SentenceEditWindow_Impl()
-: m_nErrorStart(0)
+: m_pSpellDialog(nullptr)
+, m_pToolbar(nullptr)
+, m_nErrorStart(0)
 , m_nErrorEnd(0)
 , m_bIsUndoEditMode(false)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin xmloff/inc xmloff/source xmloff/util

[Miklos Vajna (via logerrit)]

 solenv/bin/native-code.py   |1 +
 xmloff/inc/facreg.hxx   |5 -
 xmloff/source/core/facreg.cxx   |1 -
 xmloff/source/draw/sdxmlimp.cxx |   10 +-
 xmloff/util/xo.component|3 ++-
 5 files changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 955871e42d79903205cb0eeb7d82c6bb4d397ec1
Author: Miklos Vajna 
AuthorDate: Wed Jul 17 21:34:58 2019 +0200
Commit: Miklos Vajna 
CommitDate: Thu Jul 18 09:08:05 2019 +0200

xmloff: create XMLImportContentImportOasis instances with an uno constructor

See tdf#74608 for motivation.

Change-Id: I3b52830ece6fae82af1bc57eb93e3a9ad1eb2aff
Reviewed-on: https://gerrit.libreoffice.org/75809
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 809782f97efa..f7858cdd49d4 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -272,6 +272,7 @@ core_constructor_list = [
 "com_sun_star_comp_Impress_XMLOasisContentExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLOasisMetaExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation",
+"com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation",
 "com_sun_star_comp_Impress_XMLOasisSettingsExporter_get_implementation",
 "com_sun_star_comp_Impress_XMLOasisSettingsImporter_get_implementation",
 "com_sun_star_comp_Draw_XMLOasisImporter_get_implementation",
diff --git a/xmloff/inc/facreg.hxx b/xmloff/inc/facreg.hxx
index d9694e6fc276..8541b7842b17 100644
--- a/xmloff/inc/facreg.hxx
+++ b/xmloff/inc/facreg.hxx
@@ -39,11 +39,6 @@ css::uno::Sequence 
XMLImpressStylesImportOasis_getSupportedServiceName
 /// @throws css::uno::Exception
 css::uno::Reference 
XMLImpressStylesImportOasis_createInstance(
 css::uno::Reference const & rSMgr);
-OUString XMLImpressContentImportOasis_getImplementationName() throw();
-css::uno::Sequence 
XMLImpressContentImportOasis_getSupportedServiceNames() throw();
-/// @throws css::uno::Exception
-css::uno::Reference 
XMLImpressContentImportOasis_createInstance(
-css::uno::Reference const & rSMgr);
 
 // impress OOo export
 OUString XMLImpressExportOOO_getImplementationName() throw();
diff --git a/xmloff/source/core/facreg.cxx b/xmloff/source/core/facreg.cxx
index 8a96b89b29e1..cba072106f97 100644
--- a/xmloff/source/core/facreg.cxx
+++ b/xmloff/source/core/facreg.cxx
@@ -58,7 +58,6 @@ XMLOFF_DLLPUBLIC void * xo_component_getFactory( const 
sal_Char * pImplName, voi
 
 // impress oasis import
 SINGLEFACTORY( XMLImpressStylesImportOasis )
-else SINGLEFACTORY( XMLImpressContentImportOasis )
 
 else SINGLEFACTORY( AnimationsImport )
 
diff --git a/xmloff/source/draw/sdxmlimp.cxx b/xmloff/source/draw/sdxmlimp.cxx
index cf5616505789..98f23ab34b74 100644
--- a/xmloff/source/draw/sdxmlimp.cxx
+++ b/xmloff/source/draw/sdxmlimp.cxx
@@ -326,7 +326,15 @@ 
com_sun_star_comp_Draw_XMLOasisSettingsImporter_get_implementation(
 
 SERVICE( XMLImpressStylesImportOasis, 
"com.sun.star.comp.Impress.XMLOasisStylesImporter", 
"XMLImpressStylesImportOasis", false, 
SvXMLImportFlags::STYLES|SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::MASTERSTYLES
 )
 
-SERVICE( XMLImpressContentImportOasis, 
"com.sun.star.comp.Impress.XMLOasisContentImporter", 
"XMLImpressContentImportOasis", false, 
SvXMLImportFlags::AUTOSTYLES|SvXMLImportFlags::CONTENT|SvXMLImportFlags::SCRIPTS|SvXMLImportFlags::FONTDECLS
 )
+extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
+com_sun_star_comp_Impress_XMLOasisContentImporter_get_implementation(
+uno::XComponentContext* pCtx, uno::Sequence const& /*rSeq*/)
+{
+return cppu::acquire(new SdXMLImport(pCtx, "XMLImpressContentImportOasis", 
false,
+ SvXMLImportFlags::AUTOSTYLES | 
SvXMLImportFlags::CONTENT
+ | SvXMLImportFlags::SCRIPTS
+ | SvXMLImportFlags::FONTDECLS));
+}
 
 extern "C" SAL_DLLPUBLIC_EXPORT uno::XInterface*
 com_sun_star_comp_Impress_XMLOasisMetaImporter_get_implementation(
diff --git a/xmloff/util/xo.component b/xmloff/util/xo.component
index 72718cf09bf3..abf03a6e9dfc 100644
--- a/xmloff/util/xo.component
+++ b/xmloff/util/xo.component
@@ -103,7 +103,8 @@
 
constructor="com_sun_star_comp_Draw_XMLOasisContentImporter_get_implementation">
 
   
-  
+  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits