[Libreoffice-commits] core.git: officecfg/registry svx/uiconfig

[heiko tietze]

 officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu |3 ---
 svx/uiconfig/ui/defaultshapespanel.ui|1 -
 2 files changed, 4 deletions(-)

New commits:
commit 8ab79071d8beed7459711df8a5df7a731fbf2271
Author: heiko tietze 
Date:   Mon May 14 18:51:12 2018 +0200

tdf#117186 - Sidebar: Shapes deck should fill the whole sidebar

Change-Id: Ib4ddab03b3b001523f3e819e5bdac7fbefc17f24
Reviewed-on: https://gerrit.libreoffice.org/54339
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index f65558a9b72d..af807dadf828 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -79,9 +79,6 @@
 
   200
 
-
-  true
-
   
 
 
diff --git a/svx/uiconfig/ui/defaultshapespanel.ui 
b/svx/uiconfig/ui/defaultshapespanel.ui
index 5606527bfd21..e211bdf62a84 100644
--- a/svx/uiconfig/ui/defaultshapespanel.ui
+++ b/svx/uiconfig/ui/defaultshapespanel.ui
@@ -17,7 +17,6 @@
 12
 
   
-300
 True
 True
 in
___
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 sw/qa

[Miklos Vajna]

 include/sfx2/docfile.hxx |2 +
 sfx2/source/doc/docfile.cxx  |   11 +++
 sfx2/source/doc/objstor.cxx  |2 +
 sw/qa/extras/uiwriter/data/tdf117225.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |   43 ++-
 5 files changed, 57 insertions(+), 1 deletion(-)

New commits:
commit c1676204447df942e766c0780c1580e1f0427b73
Author: Miklos Vajna 
Date:   Mon May 14 21:47:10 2018 +0200

tdf#117225 sfx2: fix leftover temp file when saving doc with embedded 
objects

Regression from 27938e1bbd5f3405c47b9933be7489eeb03920f3 (sfx2 store:
create temp files next to local files (storage case), 2018-01-17), the
optimization to store temp files during save next to the destination
document (so that it can be renamed and not copied after writing the
data successfully) causes problems when we have embedded objects.

Avoid the problem by disabling this new optimization when the document
has embedded objects.

How to fix the actual root cause is not clear to me, I see that:

- the SfxMedium::GetOutputStorage() call in
  SfxObjectShell::SaveTo_Impl() create a temp file
- the SfxMedium::Commit() call in SfxObjectShell::SaveTo_Impl() tries to
  remove the file, which fails on Windows as there is an open file
  handle to that file
- SfxObjectShell::SwitchChildrenPersistance() would close the storage,
  owning that open file handle, but it's too late

So just go back to the previous behavior for now.

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

diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 06a7f9623764..ce73db5342f1 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -270,6 +270,8 @@ public:
 SAL_DLLPRIVATE SignatureState GetCachedSignatureState_Impl();
 SAL_DLLPRIVATE void   SetCachedSignatureState_Impl( SignatureState 
nState );
 
+void SetHasEmbeddedObjects(bool bHasEmbeddedObjects);
+
 static css::uno::Sequence < css::util::RevisionTag > GetVersionList(
 const css::uno::Reference< css::embed::XStorage >& 
xStorage );
 static OUString CreateTempCopyWithExt( const OUString& aURL );
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index cd257837ef30..a589d1134d90 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -288,6 +288,8 @@ public:
 // in this case the member will hold this information
 SignatureState m_nSignatureState;
 
+bool m_bHasEmbeddedObjects = false;
+
 util::DateTime m_aDateTime;
 
 explicit SfxMedium_Impl();
@@ -3525,6 +3527,10 @@ OUString GetLogicBase(std::unique_ptr 
const & pImpl)
 aLogicBase.clear();
 }
 
+if (pImpl->m_bHasEmbeddedObjects)
+// Embedded objects would mean a special base, ignore that.
+aLogicBase.clear();
+
 return aLogicBase;
 }
 }
@@ -3828,6 +3834,11 @@ void SfxMedium::SetCachedSignatureState_Impl( 
SignatureState nState )
 pImpl->m_nSignatureState = nState;
 }
 
+void SfxMedium::SetHasEmbeddedObjects(bool bHasEmbeddedObjects)
+{
+pImpl->m_bHasEmbeddedObjects = bHasEmbeddedObjects;
+}
+
 bool SfxMedium::HasStorage_Impl() const
 {
 return pImpl->xStorage.is();
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx
index 02b5d7bcb0c5..244de5869a34 100644
--- a/sfx2/source/doc/objstor.cxx
+++ b/sfx2/source/doc/objstor.cxx
@@ -1239,7 +1239,9 @@ bool SfxObjectShell::SaveTo_Impl
 // if the url is not provided ( means the 
document is based on a stream ) this code is not
 // reachable.
 rMedium.CloseAndRelease();
+
rMedium.SetHasEmbeddedObjects(GetEmbeddedObjectContainer().HasEmbeddedObjects());
 rMedium.GetOutputStorage();
+rMedium.SetHasEmbeddedObjects(false);
 }
 }
 else if ( !bStorageBasedSource && !bStorageBasedTarget )
diff --git a/sw/qa/extras/uiwriter/data/tdf117225.odt 
b/sw/qa/extras/uiwriter/data/tdf117225.odt
new file mode 100644
index ..9e31eb6b2090
Binary files /dev/null and b/sw/qa/extras/uiwriter/data/tdf117225.odt differ
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index 735bbe8f7cd0..2d4aa322db4c 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -120,7 +120,29 @@
 #include 
 #include 
 
-static char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data/";
+namespace
+{
+char const DATA_DIRECTORY[] = "/sw/qa/extras/uiwriter/data/";
+
+int CountFilesInDirectory(const OUString )
+{
+int nRet = 0;
+
+   

[Libreoffice-commits] core.git: sc/inc sc/IwyuFilter_sc.yaml

[Gabor Kelemen]

 sc/IwyuFilter_sc.yaml   |   10 ++
 sc/inc/editdataarray.hxx|2 +-
 sc/inc/edittextiterator.hxx |2 +-
 sc/inc/editutil.hxx |2 +-
 sc/inc/eventuno.hxx |2 +-
 5 files changed, 14 insertions(+), 4 deletions(-)

New commits:
commit 8713c1ffd852817404447a507a21fc4a613914d9
Author: Gabor Kelemen 
Date:   Fri May 11 21:55:49 2018 +0200

tdf#42949 Fix IWYU warnings in sc/inc/e*

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

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

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 6ee741af0c80..d76f1530a56e 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -123,3 +123,13 @@ blacklist:
 - com/sun/star/sheet/XMembersSupplier.hpp
 - com/sun/star/util/XCloneable.hpp
 - com/sun/star/util/XRefreshable.hpp
+sc/inc/editdataarray.hxx:
+# base class has to be a complete type
+- editeng/editobj.hxx
+sc/inc/editutil.hxx:
+# struct definition has to be a complete type
+- svx/pageitem.hxx
+sc/inc/eventuno.hxx:
+# base class has to be a complete type
+- com/sun/star/container/XNameReplace.hpp
+- com/sun/star/lang/XServiceInfo.hpp
diff --git a/sc/inc/editdataarray.hxx b/sc/inc/editdataarray.hxx
index 810e75e95b54..6075b6ef3bca 100644
--- a/sc/inc/editdataarray.hxx
+++ b/sc/inc/editdataarray.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SC_INC_EDITDATAARRAY_HXX
 #define INCLUDED_SC_INC_EDITDATAARRAY_HXX
 
-#include "address.hxx"
 #include 
+#include "types.hxx"
 
 #include 
 #include 
diff --git a/sc/inc/edittextiterator.hxx b/sc/inc/edittextiterator.hxx
index 4f5ba73399db..354719adcea7 100644
--- a/sc/inc/edittextiterator.hxx
+++ b/sc/inc/edittextiterator.hxx
@@ -10,7 +10,7 @@
 #ifndef INCLUDED_SC_INC_EDITTEXTITERATOR_HXX
 #define INCLUDED_SC_INC_EDITTEXTITERATOR_HXX
 
-#include "address.hxx"
+#include "types.hxx"
 #include "mtvelements.hxx"
 
 class ScTable;
diff --git a/sc/inc/editutil.hxx b/sc/inc/editutil.hxx
index 1e06b7b9c3d4..6aac49e77f51 100644
--- a/sc/inc/editutil.hxx
+++ b/sc/inc/editutil.hxx
@@ -22,7 +22,7 @@
 
 #include 
 #include "scdllapi.h"
-#include "address.hxx"
+#include "types.hxx"
 #include 
 #include 
 #include 
diff --git a/sc/inc/eventuno.hxx b/sc/inc/eventuno.hxx
index 504c7cd5cdcc..eb85fd9e6fa4 100644
--- a/sc/inc/eventuno.hxx
+++ b/sc/inc/eventuno.hxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 
-#include "global.hxx"
+#include "types.hxx"
 
 class ScDocShell;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/flatpak-manifest.in

[Stephan Bergmann]

 solenv/flatpak-manifest.in |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c074abd484f7666c954942b750b8e1c445013636
Author: Stephan Bergmann 
Date:   Mon May 14 16:58:14 2018 +0200

Merge in Flatpak improvements

...from :

Author: Stephan Bergmann 
Date:   Mon May 14 16:51:37 2018 +0200

Find flatpak'ed Java installation via JAVA_HOME

...instead of via PATH, so that a JAVA_HOME inherited from the 
environment
doesn't accidentally select a different Java installation.  Fixes
 
"undefined
symbol: FT_Done_MM_Var".

Change-Id: I2b4c3a55c92f0ef5c5925f0a9909b7b061eedeeb
Reviewed-on: https://gerrit.libreoffice.org/54330
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6222a34e3074..43187d11c65a 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -592,8 +592,8 @@
 "--device=dri",
 "--filesystem=host",
 "--env=DCONF_USER_CONFIG_DIR=.config/dconf",
+"--env=JAVA_HOME=/app/jre",
 "--env=LIBO_FLATPAK=1",
-"--env=PATH=/usr/bin:/app/jre/bin",
 "--own-name=org.libreoffice.LibreOfficeIpc0",
 "--talk-name=ca.desrt.dconf",
 "--talk-name=org.gtk.vfs.*"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sw/uiconfig/sglobal/menubar/menubar.xml |1 -
 1 file changed, 1 deletion(-)

New commits:
commit b64ef8d113c1cc05c07b3d9fa25e34c7a98acf4a
Author: Mike Kaganski 
Date:   Sun May 13 19:55:54 2018 +0100

Remove "Toggle Design Mode" from Writer's Edit menu

... since it exists in Form menu

Change-Id: I3eaa2c6295242e776990fa3935b1346c130b1247
Reviewed-on: https://gerrit.libreoffice.org/54200
Tested-by: Jenkins 
Reviewed-by: Heiko Tietze 

diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index 9d52c0358415..803081bd383c 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -159,7 +159,6 @@
   
   
   
-  
   
 
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Gabor Kelemen]

 sc/inc/columniterator.hxx |   10 +-
 1 file changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 1c2d8e870cc09e883bc7d53ff6fdefa6c9092a33
Author: Gabor Kelemen 
Date:   Mon May 7 23:15:46 2018 +0200

tdf#42949 Fix IWYU warnings in sc/inc/columniterator.hxx

Found with bin/find-unneeded-includes
Here IWYU suggested to remove the column.hxx, but that does not compile.
Instead IWYUs complete suggestion list is applied

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

diff --git a/sc/inc/columniterator.hxx b/sc/inc/columniterator.hxx
index c6a87b4e6b39..b36a4c7028b2 100644
--- a/sc/inc/columniterator.hxx
+++ b/sc/inc/columniterator.hxx
@@ -10,7 +10,15 @@
 #ifndef INCLUDED_SC_INC_COLUMNITERATOR_HXX
 #define INCLUDED_SC_INC_COLUMNITERATOR_HXX
 
-#include "column.hxx"
+#include 
+#include "address.hxx"
+#include 
+#include "mtvelements.hxx"
+#include 
+#include "types.hxx"
+class ScColumn;
+class ScDocument;
+struct ScRefCellValue;
 
 class ScColumnTextWidthIterator
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 8e8c4da18858bdc446f6a471858e2e77588d1e53
Author: Stephan Bergmann 
Date:   Tue May 15 08:24:18 2018 +0200

loplugin:stringconcat, loplugin:sallogareas (clang-cl)

("bridges.win64" isn't more useful than plain "bridges" here, as each 
platform
uses only one bridges/source/cpp_uno/ sub-dir, anyway)

Change-Id: Ic8c2af892cdfad98e10d43532b3bf3c892555446
Reviewed-on: https://gerrit.libreoffice.org/54351
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx 
b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
index aa1020244d0b..216f261d6d55 100644
--- a/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/msvc_win32_x86-64/cpp2uno.cxx
@@ -240,11 +240,11 @@ extern "C" typelib_TypeClass cpp_vtable_call(
 
 typelib_InterfaceTypeDescription * pTD = pCppI->getTypeDescr();
 
-SAL_INFO( "bridges.win64", "cpp_vtable_call: pCallStack=[" <<
-std::hex << pStack[0] << "," << pStack[1] << "," << pStack[2] << 
",...]" <<
-", pThis=" << pThis << ", pCppI=" << pCppI <<
+SAL_INFO( "bridges", "cpp_vtable_call: pCallStack=[" <<
+std::hex << pStack[0] << "," << pStack[1] << "," << pStack[2] << 
",...], pThis=" <<
+pThis << ", pCppI=" << pCppI <<
 std::dec << ", nFunctionIndex=" << nFunctionIndex << ", 
nVtableOffset=" << nVtableOffset );
-SAL_INFO( "bridges.win64", "name=" << 
OUString::unacquired(>aBase.pTypeName) );
+SAL_INFO( "bridges", "name=" << 
OUString::unacquired(>aBase.pTypeName) );
 
 if ( nFunctionIndex >= pTD->nMapFunctionIndexToMemberIndex )
 {
@@ -266,7 +266,7 @@ extern "C" typelib_TypeClass cpp_vtable_call(
 
 TypeDescription aMemberDescr( pTD->ppAllMembers[nMemberPos] );
 
-SAL_INFO( "bridges.win64", "Calling " << 
OUString::unacquired(()->pTypeName) );
+SAL_INFO( "bridges", "Calling " << 
OUString::unacquired(()->pTypeName) );
 
 typelib_TypeClass eRet;
 switch ( aMemberDescr.get()->eTypeClass )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/inc/scabstdlg.hxx   |2 
 sc/source/ui/attrdlg/scdlgfact.cxx |   26 ++-
 sc/source/ui/attrdlg/scdlgfact.hxx |   10 +
 sc/source/ui/inc/filldlg.hxx   |   86 ++--
 sc/source/ui/miscdlgs/filldlg.cxx  |  252 -
 sc/source/ui/view/cellsh1.cxx  |2 
 sc/uiconfig/scalc/ui/filldlg.ui|   37 +++--
 7 files changed, 199 insertions(+), 216 deletions(-)

New commits:
commit d9f4c8ded46ddc4892bb47128011ba85d6f7cd22
Author: Caolán McNamara 
Date:   Mon May 14 17:32:27 2018 +0100

weld ScFillSeriesDlg

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

diff --git a/sc/inc/scabstdlg.hxx b/sc/inc/scabstdlg.hxx
index 77c3410f0aee..88af9b1ccb4c 100644
--- a/sc/inc/scabstdlg.hxx
+++ b/sc/inc/scabstdlg.hxx
@@ -429,7 +429,7 @@ public:
 ScTabViewShell* pTabViewShell) = 0;
 
 virtual VclPtr 
CreateScDeleteContentsDlg(weld::Window* pParent) = 0;
-virtual VclPtr CreateScFillSeriesDlg( 
vcl::Window*pParent,
+virtual VclPtr 
CreateScFillSeriesDlg(weld::Window*pParent,
 ScDocument& 
rDocument,
 FillDir 
eFillDir,
 FillCmd 
eFillCmd,
diff --git a/sc/source/ui/attrdlg/scdlgfact.cxx 
b/sc/source/ui/attrdlg/scdlgfact.cxx
index 35279d838fc8..d00b2d76f0a0 100644
--- a/sc/source/ui/attrdlg/scdlgfact.cxx
+++ b/sc/source/ui/attrdlg/scdlgfact.cxx
@@ -96,7 +96,10 @@ short AbstractScDeleteContentsDlg_Impl::Execute()
 return m_xDlg->run();
 }
 
-IMPL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl);
+short AbstractScFillSeriesDlg_Impl::Execute()
+{
+return m_xDlg->run();
+}
 
 short AbstractScGroupDlg_Impl::Execute()
 {
@@ -289,42 +292,42 @@ InsertDeleteFlags 
AbstractScDeleteContentsDlg_Impl::GetDelContentsCmdBits() cons
 
 FillDir AbstractScFillSeriesDlg_Impl::GetFillDir() const
 {
-return pDlg->GetFillDir();
+return m_xDlg->GetFillDir();
 }
 
 FillCmd AbstractScFillSeriesDlg_Impl::GetFillCmd() const
 {
-return pDlg->GetFillCmd();
+return m_xDlg->GetFillCmd();
 }
 
 FillDateCmd AbstractScFillSeriesDlg_Impl::GetFillDateCmd() const
 {
-return pDlg->GetFillDateCmd();
+return m_xDlg->GetFillDateCmd();
 }
 
 double  AbstractScFillSeriesDlg_Impl::GetStart() const
 {
-return pDlg->GetStart();
+return m_xDlg->GetStart();
 }
 
 double  AbstractScFillSeriesDlg_Impl::GetStep() const
 {
-return pDlg->GetStep();
+return m_xDlg->GetStep();
 }
 
 double  AbstractScFillSeriesDlg_Impl::GetMax() const
 {
-return pDlg->GetMax();
+return m_xDlg->GetMax();
 }
 
 OUString  AbstractScFillSeriesDlg_Impl::GetStartStr() const
 {
-return pDlg->GetStartStr();
+return m_xDlg->GetStartStr();
 }
 
 voidAbstractScFillSeriesDlg_Impl::SetEdStartValEnabled(bool bFlag)
 {
-pDlg->SetEdStartValEnabled(bFlag);
+m_xDlg->SetEdStartValEnabled(bFlag);
 }
 
 bool AbstractScGroupDlg_Impl::GetColsChecked() const
@@ -724,7 +727,7 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScDelete
 return VclPtr::Create(new 
ScDeleteContentsDlg(pParent));
 }
 
-VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg( vcl::Window*   pParent,
+VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeriesDlg(weld::Window*   pParent,
 ScDocument& 
rDocument,
 FillDir 
eFillDir,
 FillCmd 
eFillCmd,
@@ -734,8 +737,7 @@ VclPtr 
ScAbstractDialogFactory_Impl::CreateScFillSeries
 double  
fMax,
 sal_uInt16  
nPossDir)
 {
-VclPtr pDlg = VclPtr::Create( pParent, 
rDocument,eFillDir, eFillCmd,eFillDateCmd, aStartStr,fStep,fMax,nPossDir);
-return VclPtr::Create( pDlg );
+return VclPtr::Create(new 
ScFillSeriesDlg(pParent, rDocument,eFillDir, eFillCmd,eFillDateCmd, 
aStartStr,fStep,fMax,nPossDir));
 }
 
 VclPtr 
ScAbstractDialogFactory_Impl::CreateAbstractScGroupDlg(weld::Window* pParent, 
bool bUnGroup)
diff --git a/sc/source/ui/attrdlg/scdlgfact.hxx 
b/sc/source/ui/attrdlg/scdlgfact.hxx
index 3da1d5a9767d..f0fdfbf67fa2 100644
--- a/sc/source/ui/attrdlg/scdlgfact.hxx
+++ b/sc/source/ui/attrdlg/scdlgfact.hxx
@@ -193,7 +193,13 @@ public:
 
 class AbstractScFillSeriesDlg_Impl:public AbstractScFillSeriesDlg
 {
-DECL_ABSTDLG_BASE(AbstractScFillSeriesDlg_Impl, ScFillSeriesDlg)
+std::unique_ptr m_xDlg;
+public:
+explicit 

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

[Caolán McNamara]

 sw/qa/core/data/html/pass/ofz8255-1.html |1 +
 sw/source/core/layout/atrfrm.cxx |   16 
 2 files changed, 13 insertions(+), 4 deletions(-)

New commits:
commit 881636aed7b1b5d2e4929a31751b45a656b6fe8a
Author: Caolán McNamara 
Date:   Mon May 14 14:37:03 2018 +0100

ofz#8255 check multiply

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

diff --git a/sw/qa/core/data/html/pass/ofz8255-1.html 
b/sw/qa/core/data/html/pass/ofz8255-1.html
new file mode 100644
index ..7bad71504edd
--- /dev/null
+++ b/sw/qa/core/data/html/pass/ofz8255-1.html
@@ -0,0 +1 @@
+
\ No newline at end of file
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 7f4d27ad6e1c..57012946c9b5 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -994,16 +995,23 @@ sal_uInt16 SwFormatCol::CalcPrtColWidth( sal_uInt16 nCol, 
sal_uInt16 nAct ) cons
 
 void SwFormatCol::Calc( sal_uInt16 nGutterWidth, sal_uInt16 nAct )
 {
-if(!GetNumCols())
+if (!GetNumCols())
 return;
+
 //First set the column widths with the current width, then calculate the
 //column's requested width using the requested total width.
-
 const sal_uInt16 nGutterHalf = nGutterWidth ? nGutterWidth / 2 : 0;
 
 //Width of PrtAreas is totalwidth - spacings / count
-const sal_uInt16 nPrtWidth =
-(nAct - ((GetNumCols()-1) * nGutterWidth)) / GetNumCols();
+sal_uInt16 nSpacings;
+bool bFail = o3tl::checked_multiply(GetNumCols() - 1, 
nGutterWidth, nSpacings);
+if (bFail)
+{
+SAL_WARN("sw.core", "SwFormatVertOrient::Calc: overflow");
+return;
+}
+
+const sal_uInt16 nPrtWidth = (nAct - nSpacings) / GetNumCols();
 sal_uInt16 nAvail = nAct;
 
 //The first column is PrtWidth + (gap width / 2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/inc/retypepassdlg.hxx   |   30 +++---
 sc/source/ui/miscdlgs/retypepassdlg.cxx  |  116 +++
 sc/uiconfig/scalc/ui/retypepassworddialog.ui |   17 +++
 3 files changed, 76 insertions(+), 87 deletions(-)

New commits:
commit 0e4f93e88bfae3489d2de84fc2febed100880628
Author: Caolán McNamara 
Date:   Mon May 14 21:30:04 2018 +0100

weld ScRetypePassInputDlg

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

diff --git a/sc/source/ui/inc/retypepassdlg.hxx 
b/sc/source/ui/inc/retypepassdlg.hxx
index 2aced7126034..8bcab45ffcba 100644
--- a/sc/source/ui/inc/retypepassdlg.hxx
+++ b/sc/source/ui/inc/retypepassdlg.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -96,13 +97,12 @@ private:
 ScPasswordHash  meDesiredHash;
 };
 
-class ScRetypePassInputDlg : public ModalDialog
+class ScRetypePassInputDlg : public weld::GenericDialogController
 {
 public:
 ScRetypePassInputDlg() = delete;
-explicit ScRetypePassInputDlg(vcl::Window* pParent, ScPassHashProtectable* 
pProtected);
+explicit ScRetypePassInputDlg(weld::Window* pParent, 
ScPassHashProtectable* pProtected);
 virtual ~ScRetypePassInputDlg() override;
-virtual void dispose() override;
 
 bool IsRemovePassword() const;
 OUString GetNewPassword() const;
@@ -112,24 +112,24 @@ private:
 void CheckPasswordInput();
 
 private:
-VclPtr   m_pBtnOk;
+ScPassHashProtectable* m_pProtected;
 
-VclPtrm_pBtnRetypePassword;
+std::unique_ptr m_xBtnOk;
 
-VclPtr   m_pPasswordGrid;
-VclPtr   m_pPassword1Edit;
-VclPtr   m_pPassword2Edit;
+std::unique_ptr m_xBtnRetypePassword;
 
-VclPtr   m_pBtnMatchOldPass;
+std::unique_ptr m_xPasswordGrid;
+std::unique_ptr m_xPassword1Edit;
+std::unique_ptr m_xPassword2Edit;
 
-VclPtrm_pBtnRemovePassword;
+std::unique_ptr m_xBtnMatchOldPass;
 
-DECL_LINK( OKHdl, Button*, void );
-DECL_LINK( RadioBtnHdl, Button*, void );
-DECL_LINK( CheckBoxHdl, Button*, void );
-DECL_LINK( PasswordModifyHdl, Edit&, void );
+std::unique_ptr m_xBtnRemovePassword;
 
-ScPassHashProtectable* mpProtected;
+DECL_LINK( OKHdl, weld::Button&, void );
+DECL_LINK( RadioBtnHdl, weld::ToggleButton&, void );
+DECL_LINK( CheckBoxHdl, weld::ToggleButton&, void );
+DECL_LINK( PasswordModifyHdl, weld::Entry&, void );
 };
 
 #endif
diff --git a/sc/source/ui/miscdlgs/retypepassdlg.cxx 
b/sc/source/ui/miscdlgs/retypepassdlg.cxx
index cea2f2716e86..14b51656b01b 100644
--- a/sc/source/ui/miscdlgs/retypepassdlg.cxx
+++ b/sc/source/ui/miscdlgs/retypepassdlg.cxx
@@ -287,11 +287,11 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, Button*, pBtn, 
void )
 // What the ... !?
 return;
 
-ScopedVclPtrInstance< ScRetypePassInputDlg > aDlg(this, pProtected);
-if (aDlg->Execute() == RET_OK)
+ScRetypePassInputDlg aDlg(GetFrameWeld(), pProtected);
+if (aDlg.run() == RET_OK)
 {
 // OK is pressed.  Update the protected item.
-if (aDlg->IsRemovePassword())
+if (aDlg.IsRemovePassword())
 {
 // Remove password from this item.
 pProtected->setPassword(OUString());
@@ -299,7 +299,7 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, Button*, pBtn, 
void )
 else
 {
 // Set a new password.
-OUString aNewPass = aDlg->GetNewPassword();
+OUString aNewPass = aDlg.GetNewPassword();
 pProtected->setPassword(aNewPass);
 }
 
@@ -308,131 +308,111 @@ IMPL_LINK( ScRetypePassDlg, RetypeBtnHdl, Button*, 
pBtn, void )
 }
 }
 
-ScRetypePassInputDlg::ScRetypePassInputDlg(vcl::Window* pParent, 
ScPassHashProtectable* pProtected)
-: ModalDialog(pParent, "RetypePasswordDialog",
-"modules/scalc/ui/retypepassworddialog.ui")
-, mpProtected(pProtected)
+ScRetypePassInputDlg::ScRetypePassInputDlg(weld::Window* pParent, 
ScPassHashProtectable* pProtected)
+: GenericDialogController(pParent, 
"modules/scalc/ui/retypepassworddialog.ui", "RetypePasswordDialog")
+, m_pProtected(pProtected)
+, m_xBtnOk(m_xBuilder->weld_button("ok"))
+, m_xBtnRetypePassword(m_xBuilder->weld_radio_button("retypepassword"))
+, m_xPasswordGrid(m_xBuilder->weld_widget("passwordgrid"))
+, m_xPassword1Edit(m_xBuilder->weld_entry("newpassEntry"))
+, m_xPassword2Edit(m_xBuilder->weld_entry("confirmpassEntry"))
+, m_xBtnMatchOldPass(m_xBuilder->weld_check_button("mustmatch"))
+, m_xBtnRemovePassword(m_xBuilder->weld_radio_button("removepassword"))
 {
-get(m_pBtnOk, "ok");
-get(m_pBtnRetypePassword, "retypepassword");
-get(m_pBtnRemovePassword, 

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

[Michael Stahl]

 sw/source/core/text/redlnitr.cxx |   18 +-
 sw/source/core/text/redlnitr.hxx |6 +++---
 2 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit 5193d7fc00bd9d2ac2f77989e861c819d994c19c
Author: Michael Stahl 
Date:   Mon May 14 12:25:36 2018 +0200

sw: these SwRedlineItr members index into the SwRedlineTable, not the node

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

diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 89f981bf9734..762361af52f0 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -160,7 +160,7 @@ void SwAttrIter::CtorInitAttrIter( SwTextNode& rTextNode, 
SwScriptInfo& rScrInf,
 //
 // If m_bOn is set, the font has been manipulated according to it.
 //
-// If m_nAct is set to COMPLETE_STRING (via Reset()), then currently no
+// If m_nAct is set to SwRedlineTable::npos (via Reset()), then currently no
 // Redline is active, m_nStart and m_nEnd are invalid.
 SwRedlineItr::SwRedlineItr( const SwTextNode& rTextNd, SwFont& rFnt,
 SwAttrHandler& rAH, sal_Int32 nRed, bool bShow,
@@ -170,7 +170,7 @@ SwRedlineItr::SwRedlineItr( const SwTextNode& rTextNd, 
SwFont& rFnt,
 , m_rAttrHandler( rAH )
 , m_nNdIdx( rTextNd.GetIndex() )
 , m_nFirst( nRed )
-, m_nAct( COMPLETE_STRING )
+, m_nAct( SwRedlineTable::npos )
 , m_bOn( false )
 , m_bShow( bShow )
 {
@@ -217,13 +217,13 @@ short SwRedlineItr::Seek_(SwFont& rFnt, sal_Int32 nNew, 
sal_Int32 nOld)
 else
 return nRet + EnterExtend( rFnt, nNew ); // We stayed in the 
same section
 }
-if (COMPLETE_STRING == m_nAct || nOld > nNew)
+if (SwRedlineTable::npos == m_nAct || nOld > nNew)
 m_nAct = m_nFirst;
 
 m_nStart = COMPLETE_STRING;
 m_nEnd = COMPLETE_STRING;
 
-for ( ; m_nAct < 
static_cast(m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size())
 ; ++m_nAct)
+for ( ; m_nAct < 
m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size() ; ++m_nAct)
 {
 m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ m_nAct 
]->CalcStartEnd(m_nNdIdx, m_nStart, m_nEnd);
 
@@ -334,9 +334,9 @@ void SwRedlineItr::Clear_( SwFont* pFnt )
 sal_Int32 SwRedlineItr::GetNextRedln_( sal_Int32 nNext )
 {
 nNext = NextExtend( nNext );
-if (!m_bShow || COMPLETE_STRING == m_nFirst)
+if (!m_bShow || SwRedlineTable::npos == m_nFirst)
 return nNext;
-if (COMPLETE_STRING == m_nAct)
+if (SwRedlineTable::npos == m_nAct)
 {
 m_nAct = m_nFirst;
 m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ m_nAct 
]->CalcStartEnd(m_nNdIdx, m_nStart, m_nEnd);
@@ -368,16 +368,16 @@ bool SwRedlineItr::ChkSpecialUnderline_() const
 
 bool SwRedlineItr::CheckLine( sal_Int32 nChkStart, sal_Int32 nChkEnd )
 {
-if (m_nFirst == COMPLETE_STRING)
+if (m_nFirst == SwRedlineTable::npos)
 return false;
 if( nChkEnd == nChkStart ) // empty lines look one char further
 ++nChkEnd;
 sal_Int32 nOldStart = m_nStart;
 sal_Int32 nOldEnd = m_nEnd;
-sal_Int32 nOldAct = m_nAct;
+SwRedlineTable::size_type const nOldAct = m_nAct;
 bool bRet = false;
 
-for (m_nAct = m_nFirst; m_nAct < 
static_cast(m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size())
 ; ++m_nAct)
+for (m_nAct = m_nFirst; m_nAct < 
m_rDoc.getIDocumentRedlineAccess().GetRedlineTable().size(); ++m_nAct)
 {
 m_rDoc.getIDocumentRedlineAccess().GetRedlineTable()[ m_nAct 
]->CalcStartEnd( m_nNdIdx, m_nStart, m_nEnd );
 if (nChkEnd < m_nStart)
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index bdb719fb4cc5..8961e4eb9af3 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -69,8 +69,8 @@ class SwRedlineItr
 std::unique_ptr m_pSet;
 SwExtend *m_pExt;
 sal_uLong m_nNdIdx;
-sal_Int32 m_nFirst;
-sal_Int32 m_nAct;
+SwRedlineTable::size_type const m_nFirst;
+SwRedlineTable::size_type m_nAct;
 sal_Int32 m_nStart;
 sal_Int32 m_nEnd;
 bool m_bOn;
@@ -102,7 +102,7 @@ public:
 return 0;
 }
 void Reset() {
-if (m_nAct != m_nFirst) m_nAct = COMPLETE_STRING;
+if (m_nAct != m_nFirst) m_nAct = SwRedlineTable::npos;
 if (m_pExt) m_pExt->Reset();
 }
 sal_Int32 GetNextRedln( sal_Int32 nNext ) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Stephan Bergmann]

 extensions/source/config/WinUserInfo/WinUserInfoBe.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit bff6751413e918c6e7826a872b6ee24f8302554f
Author: Stephan Bergmann 
Date:   Tue May 15 08:23:42 2018 +0200

loplugin:unnecessaryoverride, loplugin:cstylecast (clang-cl)

Change-Id: I316965219f70a87b59b731e4d5e6b67d2010c2b9
Reviewed-on: https://gerrit.libreoffice.org/54350
Tested-by: Jenkins 
Reviewed-by: Stephan Bergmann 

diff --git a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx 
b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
index 3e60716b5cdd..0f39a39b9a27 100644
--- a/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
+++ b/extensions/source/config/WinUserInfo/WinUserInfoBe.cxx
@@ -100,7 +100,7 @@ public:
 
 IADsADSystemInfo* pADsys;
 HRESULT hr = CoCreateInstance(CLSID_ADSystemInfo, nullptr, 
CLSCTX_INPROC_SERVER,
-  IID_IADsADSystemInfo, 
(void**));
+  IID_IADsADSystemInfo, 
reinterpret_cast());
 if (FAILED(hr))
 throw css::uno::RuntimeException();
 CoIfPtr aADsysGuard(pADsys);
@@ -116,7 +116,8 @@ public:
 m_sUserDN = o3tl::toU(sUserDN);
 OUString sLdapUserDN = "LDAP://" + m_sUserDN;
 IADsUser* pUser;
-hr = ADsGetObject(o3tl::toW(sLdapUserDN.getStr()), IID_IADsUser, 
(void**));
+hr = ADsGetObject(o3tl::toW(sLdapUserDN.getStr()), IID_IADsUser,
+  reinterpret_cast());
 if (FAILED(hr))
 throw css::uno::RuntimeException();
 CoIfPtr pUserGuard(pUser);
@@ -145,7 +146,6 @@ public:
 GetCachedData(xContext);
 }
 }
-~ADsUserAccess() {}
 
 virtual OUString GetGivenName() override { return m_aMap[givenname]; }
 virtual OUString GetSn() override { return m_aMap[sn]; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

String Length and Array Indexes in macros

[Andrew Pitonyak]

Last time I documented Strings and arrays, an array index was limited 
to +/-32K and a string was similarly limited.


I am now documenting them again and I am hoping that someone knows off 
hand what the new limitations are so that I do not need to scour the 
code to find out. My best guess is that this now uses a 32-bit long, so, 
+/- 2G.




Andrew Pitonyak


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

New Defects reported by Coverity Scan for LibreOffice

[scan-admin]

Hi,

Please find the latest report on new defect(s) introduced to LibreOffice found 
with Coverity Scan.

1 new defect(s) introduced to LibreOffice found with Coverity Scan.
6 defect(s), reported by Coverity Scan earlier, were marked fixed in the recent 
build analyzed by Coverity Scan.

New defect(s) Reported-by: Coverity Scan
Showing 1 of 1 defect(s)


** CID 1435605:  Error handling issues  (CHECKED_RETURN)
/vcl/source/control/field2.cxx: 2517 in TimeFormatter::Reformat()()



*** CID 1435605:  Error handling issues  (CHECKED_RETURN)
/vcl/source/control/field2.cxx: 2517 in TimeFormatter::Reformat()()
2511 if ( !bOK )
2512 return;
2513 
2514 if ( !aStr.isEmpty() )
2515 {
2516 ImplSetText( aStr );
>>> CID 1435605:  Error handling issues  (CHECKED_RETURN)
>>> Calling "TextToTime" without checking return value (as is done 
>>> elsewhere 4 out of 5 times).
2517 TextToTime( aStr, maLastTime, GetFormat(), IsDuration(), 
ImplGetLocaleDataWrapper() );
2518 }
2519 else
2520 SetTime( maLastTime );
2521 }
2522 



To view the defects in Coverity Scan visit, 
https://u2389337.ct.sendgrid.net/wf/click?upn=08onrYu34A-2BWcWUl-2F-2BfV0V05UPxvVjWch-2Bd2MGckcRZBnDJeNb0HijxaS4JNJPxk3kpyAm2AYqo71yXmnOxB72ibeUH-2F-2F1Lhi9AZq3dRu-2F4-3D_g-2BrHdvqzaBa155F-2F8AmPhpJzY63UzWDisJV95WUBpGhqFw1ICExHG8aMaV2EoFpynDFdIcUfUswokbyAGcbF-2FWDngPYX6n0Nm8gsqGdPqHR8Px2hpxiGMBNE3k3rKCe8r3ElG7a5qYuOjB9JWwiFcobp5NL6FygSaUmMM-2FCwxlhllp5X8lBTvicA-2BznfCGEYVIeb4KjJUp37DQuv7G7vO2MZOBIjSHlwElWNq-2FZajZo-3D

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

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

[Caolán McNamara]

 sc/source/ui/inc/crdlg.hxx |   20 ++--
 sc/source/ui/miscdlgs/crdlg.cxx|   39 +
 sc/source/ui/optdlg/tpusrlst.cxx   |3 +-
 sc/uiconfig/scalc/ui/colorrowdialog.ui |9 +--
 4 files changed, 28 insertions(+), 43 deletions(-)

New commits:
commit f7048e9b792c0123318f1133bafa030d688e10d7
Author: Caolán McNamara 
Date:   Tue May 15 09:28:26 2018 +0100

weld ScColOrRowDlg

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

diff --git a/sc/source/ui/inc/crdlg.hxx b/sc/source/ui/inc/crdlg.hxx
index faf4e4b11037..daea06afd699 100644
--- a/sc/source/ui/inc/crdlg.hxx
+++ b/sc/source/ui/inc/crdlg.hxx
@@ -20,25 +20,21 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_CRDLG_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_CRDLG_HXX
 
-#include 
-#include 
-#include 
+#include 
 #include "scui_def.hxx"
 
-class ScColOrRowDlg : public ModalDialog
+class ScColOrRowDlg : public weld::GenericDialogController
 {
 public:
-ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle,
-const OUString& rStrLabel);
+ScColOrRowDlg(weld::Window* pParent, const OUString& rStrTitle, const 
OUString& rStrLabel);
 virtual ~ScColOrRowDlg() override;
-virtual void dispose() override;
 private:
-VclPtr   m_pFrame;
-VclPtrm_pBtnRows;
-VclPtrm_pBtnCols;
-VclPtr   m_pBtnOk;
+std::unique_ptr m_xFrame;
+std::unique_ptr m_xBtnRows;
+std::unique_ptr m_xBtnCols;
+std::unique_ptr m_xBtnOk;
 
-DECL_LINK(OkHdl, Button*, void);
+DECL_LINK(OkHdl, weld::Button&, void);
 };
 
 #endif
diff --git a/sc/source/ui/miscdlgs/crdlg.cxx b/sc/source/ui/miscdlgs/crdlg.cxx
index 3ca8726c2895..4764075697a4 100644
--- a/sc/source/ui/miscdlgs/crdlg.cxx
+++ b/sc/source/ui/miscdlgs/crdlg.cxx
@@ -21,42 +21,25 @@
 
 #include 
 
-ScColOrRowDlg::ScColOrRowDlg(vcl::Window* pParent, const OUString& rStrTitle,
-const OUString& rStrLabel)
-: ModalDialog(pParent, "ColOrRowDialog",
-"modules/scalc/ui/colorrowdialog.ui")
+ScColOrRowDlg::ScColOrRowDlg(weld::Window* pParent, const OUString& rStrTitle, 
const OUString& rStrLabel)
+: GenericDialogController(pParent, "modules/scalc/ui/colorrowdialog.ui", 
"ColOrRowDialog")
+, m_xFrame(m_xBuilder->weld_frame("frame"))
+, m_xBtnRows(m_xBuilder->weld_radio_button("rows"))
+, m_xBtnCols(m_xBuilder->weld_radio_button("columns"))
+, m_xBtnOk(m_xBuilder->weld_button("ok"))
 {
-get(m_pBtnOk, "ok");
-get(m_pBtnCols, "columns");
-get(m_pBtnRows, "rows");
-get(m_pFrame, "frame");
-
-SetText(rStrTitle);
-m_pFrame->set_label(rStrLabel);
-
-m_pBtnCols->Check();
-
-m_pBtnOk->SetClickHdl( LINK( this, ScColOrRowDlg, OkHdl ) );
+m_xDialog->set_title(rStrTitle);
+m_xFrame->set_label(rStrLabel);
+m_xBtnOk->connect_clicked(LINK(this, ScColOrRowDlg, OkHdl));
 }
 
 ScColOrRowDlg::~ScColOrRowDlg()
 {
-disposeOnce();
 }
 
-void ScColOrRowDlg::dispose()
-{
-m_pFrame.clear();
-m_pBtnRows.clear();
-m_pBtnCols.clear();
-m_pBtnOk.clear();
-ModalDialog::dispose();
-}
-
-
-IMPL_LINK_NOARG(ScColOrRowDlg, OkHdl, Button*, void)
+IMPL_LINK_NOARG(ScColOrRowDlg, OkHdl, weld::Button&, void)
 {
-EndDialog( m_pBtnCols->IsChecked() ? SCRET_COLS : SCRET_ROWS );
+m_xDialog->response(m_xBtnCols->get_active() ? SCRET_COLS : SCRET_ROWS);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/source/ui/optdlg/tpusrlst.cxx b/sc/source/ui/optdlg/tpusrlst.cxx
index 3bd623bc7d43..5f7734c483f6 100644
--- a/sc/source/ui/optdlg/tpusrlst.cxx
+++ b/sc/source/ui/optdlg/tpusrlst.cxx
@@ -357,7 +357,8 @@ void ScTpUserLists::CopyListFromArea( const ScRefAddress& 
rStartPos,
 
 if ( (nStartCol != nEndCol) && (nStartRow != nEndRow) )
 {
-nCellDir = ScopedVclPtrInstance(this, aStrCopyList, 
aStrCopyFrom)->Execute();
+ScColOrRowDlg aDialog(GetFrameWeld(), aStrCopyList, aStrCopyFrom);
+nCellDir = aDialog.run();
 }
 else if ( nStartCol != nEndCol )
 nCellDir = SCRET_ROWS;
diff --git a/sc/uiconfig/scalc/ui/colorrowdialog.ui 
b/sc/uiconfig/scalc/ui/colorrowdialog.ui
index ad1e0ceb9c64..bfe948ff3304 100644
--- a/sc/uiconfig/scalc/ui/colorrowdialog.ui
+++ b/sc/uiconfig/scalc/ui/colorrowdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -7,7 +7,13 @@
 6
 Copy List
 False
+True
+0
+0
 dialog
+
+  
+
 
   
 False
@@ -98,7 +104,6 @@
 0
 True
 True
-rows
   
   
 False
___
Libreoffice-commits mailing list

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

[Caolán McNamara]

 sc/source/ui/inc/solveroptions.hxx  |9 +++-
 sc/source/ui/miscdlgs/solveroptions.cxx |   33 +++-
 sc/uiconfig/scalc/ui/doubledialog.ui|   10 -
 sc/uiconfig/scalc/ui/integerdialog.ui   |1 
 4 files changed, 26 insertions(+), 27 deletions(-)

New commits:
commit d735ffde2df79e5ccc4010077ff358ca63e879e9
Author: Caolán McNamara 
Date:   Tue May 15 09:08:18 2018 +0100

weld ScSolverValueDialog

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

diff --git a/sc/source/ui/inc/solveroptions.hxx 
b/sc/source/ui/inc/solveroptions.hxx
index f160ff5e9b6b..4d999ad76b95 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -83,15 +83,14 @@ public:
 sal_Int32   GetValue() const;
 };
 
-class ScSolverValueDialog : public ModalDialog
+class ScSolverValueDialog : public weld::GenericDialogController
 {
-VclPtr   m_pFrame;
-VclPtr   m_pEdValue;
+std::unique_ptr m_xFrame;
+std::unique_ptr m_xEdValue;
 
 public:
-ScSolverValueDialog( vcl::Window * pParent );
+ScSolverValueDialog(weld::Window* pParent);
 virtual ~ScSolverValueDialog() override;
-virtual void dispose() override;
 
 voidSetOptionName( const OUString& rName );
 voidSetValue( double fValue );
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx 
b/sc/source/ui/miscdlgs/solveroptions.cxx
index cc26a8ce849f..9d0e8b043a73 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -322,12 +322,12 @@ void ScSolverOptionsDialog::EditOption()
 {
 if ( pStringItem->IsDouble() )
 {
-ScopedVclPtrInstance< ScSolverValueDialog > aValDialog( 
this );
-aValDialog->SetOptionName( pStringItem->GetText() );
-aValDialog->SetValue( pStringItem->GetDoubleValue() );
-if ( aValDialog->Execute() == RET_OK )
+ScSolverValueDialog aValDialog(GetFrameWeld());
+aValDialog.SetOptionName( pStringItem->GetText() );
+aValDialog.SetValue( pStringItem->GetDoubleValue() );
+if (aValDialog.run() == RET_OK)
 {
-pStringItem->SetDoubleValue( aValDialog->GetValue() );
+pStringItem->SetDoubleValue( aValDialog.GetValue() );
 m_pLbSettings->InvalidateEntry( pEntry );
 }
 }
@@ -429,41 +429,32 @@ sal_Int32 ScSolverIntegerDialog::GetValue() const
 return static_cast(nValue);
 }
 
-ScSolverValueDialog::ScSolverValueDialog( vcl::Window * pParent )
-: ModalDialog( pParent, "DoubleDialog",
-"modules/scalc/ui/doubledialog.ui" )
+ScSolverValueDialog::ScSolverValueDialog(weld::Window* pParent)
+: GenericDialogController(pParent, "modules/scalc/ui/doubledialog.ui", 
"DoubleDialog")
+, m_xFrame(m_xBuilder->weld_frame("frame"))
+, m_xEdValue(m_xBuilder->weld_entry("value"))
 {
-get(m_pFrame, "frame");
-get(m_pEdValue, "value");
 }
 
 ScSolverValueDialog::~ScSolverValueDialog()
 {
-disposeOnce();
-}
-
-void ScSolverValueDialog::dispose()
-{
-m_pFrame.clear();
-m_pEdValue.clear();
-ModalDialog::dispose();
 }
 
 void ScSolverValueDialog::SetOptionName( const OUString& rName )
 {
-m_pFrame->set_label(rName);
+m_xFrame->set_label(rName);
 }
 
 void ScSolverValueDialog::SetValue( double fValue )
 {
-m_pEdValue->SetText( rtl::math::doubleToUString( fValue,
+m_xEdValue->set_text( rtl::math::doubleToUString( fValue,
 rtl_math_StringFormat_Automatic, rtl_math_DecimalPlaces_Max,
 ScGlobal::GetpLocaleData()->getNumDecimalSep()[0], true ) );
 }
 
 double ScSolverValueDialog::GetValue() const
 {
-OUString aInput = m_pEdValue->GetText();
+OUString aInput = m_xEdValue->get_text();
 
 rtl_math_ConversionStatus eStatus = rtl_math_ConversionStatus_Ok;
 sal_Int32 nParseEnd = 0;
diff --git a/sc/uiconfig/scalc/ui/doubledialog.ui 
b/sc/uiconfig/scalc/ui/doubledialog.ui
index 76389b50e01f..db09046c7ff7 100644
--- a/sc/uiconfig/scalc/ui/doubledialog.ui
+++ b/sc/uiconfig/scalc/ui/doubledialog.ui
@@ -1,11 +1,18 @@
 
+
 
-  
+  
   
 False
 6
 Edit Setting
+True
+0
+0
 dialog
+
+  
+
 
   
 False
@@ -75,6 +82,7 @@
 True
 start
 start
+True
   
 
   
diff --git a/sc/uiconfig/scalc/ui/integerdialog.ui 
b/sc/uiconfig/scalc/ui/integerdialog.ui
index 1cae3ac77854..09f383b26afc 100644
--- 

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

[Rene Engelhard]

 sc/inc/miscuno.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 941193639939c759616595c08241a817f7aed501
Author: Rene Engelhard 
Date:   Tue May 15 14:40:19 2018 +0200

fix build

Change-Id: I71238209b4819f256045487f1db83d79f6fe49ba

diff --git a/sc/inc/miscuno.hxx b/sc/inc/miscuno.hxx
index bf5de0d2dee1..ec83181a4e9e 100644
--- a/sc/inc/miscuno.hxx
+++ b/sc/inc/miscuno.hxx
@@ -20,6 +20,8 @@
 #ifndef INCLUDED_SC_INC_MISCUNO_HXX
 #define INCLUDED_SC_INC_MISCUNO_HXX
 
+#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: Branch 'feature/qt5+kde5' - vcl/inc vcl/qt5

[Katarina Behrens]

 vcl/inc/qt5/Qt5Frame.hxx |3 +++
 vcl/inc/qt5/Qt5Menu.hxx  |5 +
 vcl/qt5/Qt5Frame.cxx |6 +-
 vcl/qt5/Qt5Menu.cxx  |   28 +++-
 4 files changed, 40 insertions(+), 2 deletions(-)

New commits:
commit 8521eb0cbeed45a7c366b252968b8f9935afbda3
Author: Katarina Behrens 
Date:   Tue May 15 16:29:15 2018 +0200

Expose menu bar of the main window

and some addional work on activating menus

Change-Id: I0c4d87dc158f3253aa97d151385fce14551c11b9

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 8772ee7bbfcc..1f881d706881 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -28,6 +28,7 @@
 
 class Qt5Graphics;
 class Qt5Instance;
+class Qt5Menu;
 class QWidget;
 class QPaintDevice;
 class QImage;
@@ -55,6 +56,8 @@ class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
 Qt5Frame* m_pParent;
 PointerStyle m_ePointerStyle;
 
+Qt5Menu* m_pSalMenu;
+
 bool m_bDefaultSize;
 bool m_bDefaultPos;
 
diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index cf7a715f5911..1c0f03b3342c 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -12,6 +12,7 @@
 #include 
 
 class MenuItemList;
+class QMenuBar;
 class Qt5MenuItem;
 class Qt5Frame;
 
@@ -24,6 +25,10 @@ private:
 Qt5Frame*mpFrame;
 bool mbMenuBar;
 
+QMenuBar*mpQMenuBar;
+
+void ActivateAllSubMenus( Menu* pMenuBar );
+
 public:
 Qt5Menu( bool bMenuBar );
 virtual ~Qt5Menu() override;
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index ec210c15ade0..4a36bee27776 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -24,6 +24,7 @@
 #include "Qt5Graphics.hxx"
 #include "Qt5Widget.hxx"
 #include "Qt5Data.hxx"
+#include 
 
 #include 
 #include 
@@ -233,7 +234,10 @@ void Qt5Frame::SetIcon(sal_uInt16 nIcon)
 m_pQWidget->window()->setWindowIcon(aIcon);
 }
 
-void Qt5Frame::SetMenu(SalMenu* /*pMenu*/) {}
+void Qt5Frame::SetMenu(SalMenu* pMenu)
+{
+m_pSalMenu = static_cast( pMenu );
+}
 
 void Qt5Frame::DrawMenuBar() {}
 
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index 5a3753b6433a..4869a78b8a05 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -10,6 +10,8 @@
 #include "Qt5Frame.hxx"
 #include "Qt5Menu.hxx"
 
+#include 
+
 #include 
 
 Qt5Menu::Qt5Menu( bool bMenuBar ) :
@@ -55,8 +57,32 @@ void Qt5Menu::SetSubMenu( SalMenuItem* pSalMenuItem, 
SalMenu* pSubMenu, unsigned
 
 void Qt5Menu::SetFrame( const SalFrame* pFrame )
 {
-
+SolarMutexGuard aGuard;
+assert(mbMenuBar);
 mpFrame = const_cast( static_cast( pFrame ) );
+
+mpFrame->SetMenu( this );
+
+QWidget* pWidget = mpFrame->GetQWidget();
+QMainWindow* pMainWindow = dynamic_cast(pWidget);
+if( pMainWindow )
+mpQMenuBar = pMainWindow->menuBar();
+
+ActivateAllSubMenus( mpVCLMenu );
+}
+
+void Qt5Menu::ActivateAllSubMenus( Menu* pMenuBar )
+{
+for (Qt5MenuItem* pSalItem : maItems)
+{
+if ( pSalItem->mpSubMenu != nullptr )
+{
+pMenuBar->HandleMenuActivateEvent(pSalItem->mpSubMenu->GetMenu());
+pSalItem->mpSubMenu->ActivateAllSubMenus(pMenuBar);
+pSalItem->mpSubMenu->Update();
+
pMenuBar->HandleMenuDeActivateEvent(pSalItem->mpSubMenu->GetMenu());
+}
+}
 }
 
 void Qt5Menu::ShowItem( unsigned nPos, bool bCheck )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: New Defects reported by Coverity Scan for LibreOffice

[Caolán McNamara]

On Fri, 2018-05-11 at 21:33 +0200, Khaled Hosny wrote:
> No idea why this is now triggering an issue, but FreetypeFont
> constructor have been unconditionally accessing rFSD.mpFontInstance
> since forever.

Yeah, I just reworked it a little to avoid the warning, so its gone
again in the current scan.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: svl/CppunitTest_svl_qa_cppunit.mk

[Rene Engelhard]

 svl/CppunitTest_svl_qa_cppunit.mk |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit fe4bc1c09d8f647c2ebb46e9ce6e2a07ee65cdf8
Author: Rene Engelhard 
Date:   Tue May 15 15:57:29 2018 +0200

CppunitTest_svl_qa_cppunit: fix system-libnumbertext build

libnumbertext_numbertext package doesn't exist...

Change-Id: I5fc7c9c2386c10a10f2980655292ab12beb1a977

diff --git a/svl/CppunitTest_svl_qa_cppunit.mk 
b/svl/CppunitTest_svl_qa_cppunit.mk
index a067efe8794f..4f3cdcae7b63 100644
--- a/svl/CppunitTest_svl_qa_cppunit.mk
+++ b/svl/CppunitTest_svl_qa_cppunit.mk
@@ -28,10 +28,12 @@ $(eval $(call gb_CppunitTest_use_externals,svl_qa_cppunit, \
 ))
 
 ifeq ($(ENABLE_LIBNUMBERTEXT),TRUE)
+ifneq ($(SYSTEM_LIBNUMBERTEXT),YES)
 $(eval $(call gb_CppunitTest_use_package,svl_qa_cppunit, \
 libnumbertext_numbertext \
 ))
 endif
+endif
 
 $(eval $(call gb_CppunitTest_add_defs,svl_qa_cppunit, \
 -DENABLE_LIBNUMBERTEXT=$(if $(filter TRUE,$(ENABLE_LIBNUMBERTEXT)),1,0) \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source include/sfx2 offapi/com sfx2/source xmlsecurity/source

[Samuel Mehrbrodt]

 cui/source/dialogs/SignSignatureLineDialog.cxx|   77 
++
 include/sfx2/docfile.hxx  |6 
 include/sfx2/objsh.hxx|6 
 offapi/com/sun/star/security/XDocumentDigitalSignatures.idl   |   11 +
 sfx2/source/doc/docfile.cxx   |   32 +++-
 sfx2/source/doc/objserv.cxx   |   29 ++-
 xmlsecurity/source/component/documentdigitalsignatures.cxx|   52 ++
 xmlsecurity/source/gpg/CertificateImpl.cxx|   16 ++
 xmlsecurity/source/gpg/CertificateImpl.hxx|9 +
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.cxx |   19 ++
 xmlsecurity/source/xmlsec/mscrypt/x509certificate_mscryptimpl.hxx |9 +
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.cxx |   16 ++
 xmlsecurity/source/xmlsec/nss/x509certificate_nssimpl.hxx |9 +
 13 files changed, 241 insertions(+), 50 deletions(-)

New commits:
commit 86e8cfdd54ac1b9413f0c86cbc23a80162806685
Author: Samuel Mehrbrodt 
Date:   Fri Apr 20 12:19:12 2018 +0200

Sign Signature Line

This adds a new context menu entry "Sign Signature Line" to signature lines.
You can directly sign the document from there.

Still missing is the updating of the graphic to reflect the valid/invalid
signature state.

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

diff --git a/cui/source/dialogs/SignSignatureLineDialog.cxx 
b/cui/source/dialogs/SignSignatureLineDialog.cxx
index cd0295415410..454b6d42ec52 100644
--- a/cui/source/dialogs/SignSignatureLineDialog.cxx
+++ b/cui/source/dialogs/SignSignatureLineDialog.cxx
@@ -15,10 +15,12 @@
 #include 
 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -137,40 +139,57 @@ void SignSignatureLineDialog::ValidateFields()
 
 void SignSignatureLineDialog::Apply()
 {
-// Read svg and replace placeholder texts
-OUString aSvgImage(getSignatureImage());
-aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]", 
getCDataString(m_aSuggestedSignerName));
-aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", 
getCDataString(m_aSuggestedSignerTitle));
-
-aSvgImage = aSvgImage.replaceAll("[SIGNATURE]", 
getCDataString(m_xEditName->get_text()));
-OUString aIssuerLine = CuiResId(RID_SVXSTR_SIGNATURELINE_SIGNED_BY)
-   .replaceFirst("%1", 
m_xSelectedCertifate->getIssuerName());
-aSvgImage = aSvgImage.replaceAll("[SIGNED_BY]", 
getCDataString(aIssuerLine));
-aSvgImage = aSvgImage.replaceAll("[INVALID_SIGNATURE]", "");
-
-OUString aDate;
-if (m_bShowSignDate)
+if (!m_xSelectedCertifate.is())
 {
-const SvtSysLocale aSysLocale;
-const LocaleDataWrapper& rLocaleData = aSysLocale.GetLocaleData();
-Date aDateTime(Date::SYSTEM);
-aDate = rLocaleData.getDate(aDateTime);
+SAL_WARN("cui.dialogs", "No certificate selected!");
 }
-aSvgImage = aSvgImage.replaceAll("[DATE]", aDate);
 
-// Insert/Update graphic
-SvMemoryStream aSvgStream(4096, 4096);
-aSvgStream.WriteOString(OUStringToOString(aSvgImage, 
RTL_TEXTENCODING_UTF8));
-Reference xInputStream(new 
utl::OSeekableInputStreamWrapper(aSvgStream));
-Reference 
xContext(comphelper::getProcessComponentContext());
-Reference xProvider = 
css::graphic::GraphicProvider::create(xContext);
+SfxObjectShell* pShell = SfxObjectShell::Current();
+pShell->SignDocumentContent(m_xSelectedCertifate);
 
-Sequence aMediaProperties(1);
-aMediaProperties[0].Name = "InputStream";
-aMediaProperties[0].Value <<= xInputStream;
-Reference xGraphic(xProvider->queryGraphic(aMediaProperties));
+bool bSuccess = false; // TODO
 
-m_xShapeProperties->setPropertyValue("Graphic", Any(xGraphic));
+if (bSuccess)
+{
+// Read svg and replace placeholder texts
+OUString aSvgImage(getSignatureImage());
+aSvgImage = aSvgImage.replaceAll("[SIGNER_NAME]", 
getCDataString(m_aSuggestedSignerName));
+aSvgImage = aSvgImage.replaceAll("[SIGNER_TITLE]", 
getCDataString(m_aSuggestedSignerTitle));
+
+aSvgImage = aSvgImage.replaceAll("[SIGNATURE]", 
getCDataString(m_xEditName->get_text()));
+OUString aIssuerLine = CuiResId(RID_SVXSTR_SIGNATURELINE_SIGNED_BY)
+   .replaceFirst("%1", 
m_xSelectedCertifate->getIssuerName());
+aSvgImage = aSvgImage.replaceAll("[SIGNED_BY]", 
getCDataString(aIssuerLine));
+aSvgImage = aSvgImage.replaceAll("[INVALID_SIGNATURE]", "");
+
+OUString aDate;
+if (m_bShowSignDate)
+{
+const 

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

[Noel Grandin]

 editeng/source/outliner/outliner.cxx |   25 -
 editeng/source/outliner/paralist.cxx |   33 +
 editeng/source/outliner/paralist.hxx |9 +
 include/editeng/outliner.hxx |2 +-
 4 files changed, 35 insertions(+), 34 deletions(-)

New commits:
commit 863d2485e60251ac45b019b2c58ced7cfc9d978e
Author: Noel Grandin 
Date:   Wed May 9 13:56:07 2018 +0200

loplugin:useuniqueptr in ParagraphList

Change-Id: I042fb945b0585a0409d76a509c7f9287aa220b68
Reviewed-on: https://gerrit.libreoffice.org/54180
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 

diff --git a/editeng/source/outliner/outliner.cxx 
b/editeng/source/outliner/outliner.cxx
index cc19399e1812..344ece6b82ff 100644
--- a/editeng/source/outliner/outliner.cxx
+++ b/editeng/source/outliner/outliner.cxx
@@ -101,7 +101,7 @@ Paragraph* Outliner::Insert(const OUString& rText, 
sal_Int32 nAbsPos, sal_Int16
 pEditEngine->SetUpdateMode( false );
 ImplBlockInsertionCallbacks( true );
 pPara = new Paragraph( nDepth );
-pParaList->Insert( pPara, nAbsPos );
+pParaList->Insert( std::unique_ptr(pPara), nAbsPos );
 pEditEngine->InsertParagraph( nAbsPos, OUString() );
 DBG_ASSERT(pPara==pParaList->GetParagraph(nAbsPos),"Insert:Failed");
 ImplInitDepth( nAbsPos, nDepth, false );
@@ -126,7 +126,7 @@ void Outliner::ParagraphInserted( sal_Int32 nPara )
 if( bPasting || pEditEngine->IsInUndo() )
 {
 Paragraph* pPara = new Paragraph( -1 );
-pParaList->Insert( pPara, nPara );
+pParaList->Insert( std::unique_ptr(pPara), nPara );
 if( pEditEngine->IsInUndo() )
 {
 pPara->nFlags = ParaFlag::SETBULLETTEXT;
@@ -143,7 +143,7 @@ void Outliner::ParagraphInserted( sal_Int32 nPara )
 nDepth = pParaBefore->GetDepth();
 
 Paragraph* pPara = new Paragraph( nDepth );
-pParaList->Insert( pPara, nPara );
+pParaList->Insert( std::unique_ptr(pPara), nPara );
 
 if( !pEditEngine->IsInUndo() )
 {
@@ -171,7 +171,6 @@ void Outliner::ParagraphDeleted( sal_Int32 nPara )
 }
 
 pParaList->Remove( nPara );
-delete pPara;
 
 if( !pEditEngine->IsInUndo() && !bPasting )
 {
@@ -468,7 +467,7 @@ void Outliner::SetText( const OUString& rText, Paragraph* 
pPara )
 }
 if( nPos ) // not with the first paragraph
 {
-pParaList->Insert( pPara, nInsPos );
+pParaList->Insert( std::unique_ptr(pPara), nInsPos 
);
 pEditEngine->InsertParagraph( nInsPos, aStr );
 ParagraphInsertedHdl(pPara);
 }
@@ -581,10 +580,10 @@ void Outliner::SetText( const OutlinerParaObject& rPObj )
 pParaList->Clear();
 for( sal_Int32 nCurPara = 0; nCurPara < rPObj.Count(); nCurPara++ )
 {
-Paragraph* pPara = new Paragraph( rPObj.GetParagraphData(nCurPara));
+std::unique_ptr pPara(new Paragraph( 
rPObj.GetParagraphData(nCurPara)));
 ImplCheckDepth( pPara->nDepth );
 
-pParaList->Append(pPara);
+pParaList->Append(std::move(pPara));
 ImplCheckNumBulletItem( nCurPara );
 }
 
@@ -622,7 +621,7 @@ void Outliner::AddText( const OutlinerParaObject& rPObj )
 for( sal_Int32 n = 0; n < rPObj.Count(); n++ )
 {
 Paragraph* pPara = new Paragraph( rPObj.GetParagraphData(n) );
-pParaList->Append(pPara);
+pParaList->Append(std::unique_ptr(pPara));
 sal_Int32 nP = nPara+n;
 DBG_ASSERT(pParaList->GetAbsPos(pPara)==nP,"AddText:Out of sync");
 ImplInitDepth( nP, pPara->GetDepth(), false );
@@ -1110,8 +1109,8 @@ ErrCode Outliner::Read( SvStream& rInput, const OUString& 
rBaseURL, EETextFormat
  pParaList->Clear();
 for ( sal_Int32 n = 0; n < nParas; n++ )
 {
-Paragraph* pPara = new Paragraph( 0 );
-pParaList->Append(pPara);
+std::unique_ptr pPara(new Paragraph( 0 ));
+pParaList->Append(std::move(pPara));
 }
 
 ImpFilterIndents( 0, nParas-1 );
@@ -1257,8 +1256,8 @@ Outliner::Outliner(SfxItemPool* pPool, OutlinerMode nMode)
 
 pParaList.reset( new ParagraphList );
 pParaList->SetVisibleStateChangedHdl( LINK( this, Outliner, 
ParaVisibleStateChangedHdl ) );
-Paragraph* pPara = new Paragraph( 0 );
-pParaList->Append(pPara);
+std::unique_ptr pPara(new Paragraph( 0 ));
+pParaList->Append(std::move(pPara));
 
 pEditEngine.reset( new OutlinerEditEng( this, pPool ) );
 pEditEngine->SetBeginMovingParagraphsHdl( LINK( this, Outliner, 
BeginMovingParagraphsHdl ) );
@@ -1887,7 +1886,7 @@ void Outliner::Clear()
 ImplBlockInsertionCallbacks( true );
 pEditEngine->Clear();
 pParaList->Clear();
-pParaList->Append( new Paragraph( nMinDepth ));
+pParaList->Append( 

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

[Zdeněk Crhonek]

 sc/qa/uitest/calc_tests/printRange.py |  118 ++
 1 file changed, 118 insertions(+)

New commits:
commit e29eacbb6a7efaf154430e41a68d986a951d7f4d
Author: Zdeněk Crhonek 
Date:   Mon May 14 21:51:57 2018 +0200

Calc -print range + tdf#33341

Change-Id: I486dd0cffb4173530ee78d3971865df3bac2818b
Reviewed-on: https://gerrit.libreoffice.org/54341
Tested-by: Jenkins 
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/uitest/calc_tests/printRange.py 
b/sc/qa/uitest/calc_tests/printRange.py
new file mode 100644
index ..4e99a30d29b9
--- /dev/null
+++ b/sc/qa/uitest/calc_tests/printRange.py
@@ -0,0 +1,118 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+from uitest.debug import sleep
+
+class printRange(UITestCase):
+def test_printRange(self):
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:F20"}))
+#Set print range
+self.xUITest.executeCommand(".uno:DefinePrintArea")
+# Print Range dialog
+
self.ui_test.execute_modeless_dialog_through_command(".uno:EditPrintArea")
+xDialog = self.xUITest.getTopFocusWindow()
+xlbprintarea = xDialog.getChild("lbprintarea")
+xedprintarea = xDialog.getChild("edprintarea")
+#verify range
+self.assertEqual(get_state_as_dict(xlbprintarea)["SelectEntryText"], 
"- selection -")
+self.assertEqual(get_state_as_dict(xedprintarea)["Text"], "$A$1:$F$20")
+#set Row
+xedrepeatrow = xDialog.getChild("edrepeatrow")
+xedrepeatrow.executeAction("TYPE", mkPropertyValues({"TEXT":"$1"}))
+#set Column
+xedrepeatcol = xDialog.getChild("edrepeatcol")
+xedrepeatcol.executeAction("TYPE", mkPropertyValues({"TEXT":"$A"}))
+# Click Ok
+xOK = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOK)
+
+#Verify Print Range dialog
+
self.ui_test.execute_modeless_dialog_through_command(".uno:EditPrintArea")
+xDialog = self.xUITest.getTopFocusWindow()
+xedprintarea = xDialog.getChild("edprintarea")
+xedrepeatrow = xDialog.getChild("edrepeatrow")
+xedrepeatcol = xDialog.getChild("edrepeatcol")
+self.assertEqual(get_state_as_dict(xedprintarea)["Text"], "$A$1:$F$20")
+self.assertEqual(get_state_as_dict(xedrepeatrow)["Text"], "$1")
+self.assertEqual(get_state_as_dict(xedrepeatcol)["Text"], "$A")
+xOK = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOK)
+
+#delete print ranges
+self.xUITest.executeCommand(".uno:DeletePrintArea")
+#Verify Print Range dialog
+
self.ui_test.execute_modeless_dialog_through_command(".uno:EditPrintArea")
+xDialog = self.xUITest.getTopFocusWindow()
+xedprintarea = xDialog.getChild("edprintarea")
+xlbprintarea = xDialog.getChild("lbprintarea")
+xedrepeatrow = xDialog.getChild("edrepeatrow")
+xedrepeatcol = xDialog.getChild("edrepeatcol")
+self.assertEqual(get_state_as_dict(xedprintarea)["Text"], "")
+self.assertEqual(get_state_as_dict(xlbprintarea)["SelectEntryText"], 
"- entire sheet -")
+self.assertEqual(get_state_as_dict(xedrepeatrow)["Text"], "$1")
+self.assertEqual(get_state_as_dict(xedrepeatcol)["Text"], "$A")
+xOK = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOK)
+self.ui_test.close_doc()
+
+def test_tdf33341_copy_sheet_with_print_range(self):
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+
+gridwin.executeAction("SELECT", mkPropertyValues({"RANGE": "A1:F20"}))
+#Set print range
+self.xUITest.executeCommand(".uno:DefinePrintArea")
+# Print Range dialog
+
self.ui_test.execute_modeless_dialog_through_command(".uno:EditPrintArea")
+xDialog = self.xUITest.getTopFocusWindow()
+xlbprintarea = xDialog.getChild("lbprintarea")
+

[Libreoffice-commits] core.git: i18npool/source offapi/com svl/CppunitTest_svl_qa_cppunit.mk svl/qa

[Mike Kaganski]

 i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx |   66 
++
 i18npool/source/nativenumber/nativenumbersupplier.cxx |  107 
--
 offapi/com/sun/star/i18n/NativeNumberMode.idl |   11 +
 svl/CppunitTest_svl_qa_cppunit.mk |   14 +
 svl/qa/unit/svl.cxx   |   12 +
 5 files changed, 152 insertions(+), 58 deletions(-)

New commits:
commit 56a7f308cf57f87d9e2cdeb77f48b570f81de85e
Author: Mike Kaganski 
Date:   Sun May 13 03:09:43 2018 +0300

tdf#115007: add NatNum codes for cardinal/ordinal number names/indicators

... based on libnumbertext integrated since commit
f1579d3d6c5f5f3a651825e035b93bee7a4f43c6.

[NatNum12] gives cardinal number names (one, two, three, ...)
[NatNum13] gives ordinal number names (first, second, third, ...)
[NatNum14] gives ordinal indicators (1st, 2nd, 3rd, ...)

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

diff --git 
a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx 
b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
index e222611a2afe..af4e27d0f69f 100644
--- a/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
+++ b/i18npool/source/defaultnumberingprovider/defaultnumberingprovider.cxx
@@ -19,7 +19,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -32,9 +31,6 @@
 #include 
 #include 
 #include 
-#include 
-#include 
-#include 
 
 // Cyrillic upper case
 #define C_CYR_A "\xD0\x90"
@@ -588,6 +584,7 @@ DefaultNumberingProvider::makeNumberingString( const 
Sequence 
xNumberText;
-   if (!xNumberText.is())
-   xNumberText = linguistic2::NumberText::create( 
m_xContext );
-   OUString aLoc = LanguageTag::convertToBcp47(aLocale);
-   OUString numbertext_prefix = "";
-   if (numType == TEXT_NUMBER)
-   numbertext_prefix += "ordinal-number ";
-   else if (numType == TEXT_ORDINAL)
-   numbertext_prefix += "ordinal ";
-   // Several hundreds of headings could result typing lags 
because
-   // of the continuous update of the multiple number names 
during typing.
-   // We fix this by buffering the result of the conversion.
-   static std::unordered_map > aBuff;
-   auto aBuffItem = aBuff.find(number);
-   std::map aItem;
-   if (aBuffItem == aBuff.end() || 
!aBuffItem->second.count(numbertext_prefix + aLoc))
-   {
-   OUString snumber = OUString::number(number);
-   OUString aNum =
-   xNumberText->getNumberText( numbertext_prefix + 
snumber, aLocale);
-   if ( !xCharClass.is() )
-   xCharClass = CharacterClassification::create( 
m_xContext );
-   // use number at missing number to text conversion
-   if (aNum.getLength() == 0)
-   aNum = snumber;
-   // capitalize first letter
-   aItem[numbertext_prefix + aLoc] = 
xCharClass->toTitle(aNum, 0, 1, aLocale) + aNum.copy(1);
-   aBuff.insert(std::make_pair(number, aItem));
-   }
-   else
-   {
-   aItem = aBuffItem->second;
-   }
-   result += aItem[numbertext_prefix + aLoc];
-   break;
-   }
+   natNum = NativeNumberMode::NATNUM13; // ordinal number names 
(first, second, third, ...)
+   locale = aLocale;
+   bCapitalize = true;
+   break;
   case ROMAN_UPPER:
result += toRoman( number );
break;
@@ -937,7 +909,17 @@ DefaultNumberingProvider::makeNumberingString( const 
Sequence xNatNum(new 
NativeNumberSupplierService);
-result += xNatNum->getNativeNumberString(OUString::number( number 
), locale, natNum);
+OUString aNum
+= xNatNum->getNativeNumberString(OUString::number(number), 
locale, natNum);
+if (bCapitalize)
+{
+if (!xCharClass.is())
+xCharClass = CharacterClassification::create(m_xContext);
+// capitalize first letter
+result += xCharClass->toTitle(aNum, 0, 1, aLocale) + 
aNum.copy(1);
+}
+else
+result += aNum;
 } else if (tableSize) {
 

[Libreoffice-commits] core.git: distro-configs/LibreOfficeFlatpak.conf solenv/flatpak-manifest.in

[Stephan Bergmann]

 distro-configs/LibreOfficeFlatpak.conf |1 +
 solenv/flatpak-manifest.in |   18 --
 2 files changed, 13 insertions(+), 6 deletions(-)

New commits:
commit 135cbec440050ede4b3f17ae078c944f7edcaa71
Author: Stephan Bergmann 
Date:   Tue May 15 11:39:30 2018 +0200

Adapt solenv/flatpak-manifest.in to recent download.lst changes

Change-Id: Ic8f4afe8f46b5f0c36eeffdbb04b3cc652884ab4

diff --git a/distro-configs/LibreOfficeFlatpak.conf 
b/distro-configs/LibreOfficeFlatpak.conf
index 897b7cc30ff7..a3bec727d4ce 100644
--- a/distro-configs/LibreOfficeFlatpak.conf
+++ b/distro-configs/LibreOfficeFlatpak.conf
@@ -33,6 +33,7 @@
 --without-system-liblangtag
 --without-system-libmspub
 --without-system-libmwaw
+--without-system-libnumbertext
 --without-system-libodfgen
 --without-system-libpagemaker
 --without-system-libqxp
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 43187d11c65a..283714952dce 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -80,10 +80,10 @@
 "type": "shell"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/pdfium-3358.tar.bz2;,
-"sha256": 
"0cd451fb1b301dc1df55f91e644092e505032dcddbdeaf3e2744039377d1bfd0",
+"url": 
"https://dev-www.libreoffice.org/src/pdfium-3426.tar.bz2;,
+"sha256": 
"80331b48166501a192d65476932f17044eeb5f10faa6ea50f4f175169475c957",
 "type": "file",
-"dest-filename": "external/tarballs/pdfium-3358.tar.bz2"
+"dest-filename": "external/tarballs/pdfium-3426.tar.bz2"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz;,
@@ -422,10 +422,10 @@
 "dest-filename": 
"external/tarballs/e5be03eda13ef68aabab6e42aa67715e-redland-1.0.17.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz;,
-"sha256": 
"4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b",
+"url": 
"https://dev-www.libreoffice.org/src/ReemKufi-0.7.zip;,
+"sha256": 
"f60c6508d209ce4236d2d7324256c2ffddd480be7e3d6023770b93dc391a605f",
 "type": "file",
-"dest-filename": "external/tarballs/ReemKufi-0.6.tar.gz"
+"dest-filename": "external/tarballs/ReemKufi-0.7.zip"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2;,
@@ -570,6 +570,12 @@
 "sha256": 
"64585ac36a81291a58269ec5347e7e3e2e8596dbacb9221015c208191333c6e1",
 "type": "file",
 "dest-filename": 
"external/tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip"
+},
+{
+"url": 
"https://dev-www.libreoffice.org/src/libnumbertext-1.0.1-3.tar.xz;,
+"sha256": 
"46f3a5e4cb4b6c5b29f1cd340d1a6ea60e6fabc59859951f022d35e32a32a458",
+"type": "file",
+"dest-filename": 
"external/tarballs/libnumbertext-1.0.1-3.tar.xz"
 }
 ],
 "buildsystem": "simple",
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - vcl/inc vcl/qt5

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit 625696ad3cb8b3d406676de1364830b72a530cfd
Author: Katarina Behrens 
Date:   Mon May 14 15:39:30 2018 +0200

Templatize Qt5Widget class

to distinguish between QMainWindow (top-level SalFrame) and QWidget
(everything else). The former are going to receive a native menu

Change-Id: I9023d1e464345f96f13967f5e2c8b0716890fbc9

diff --git a/vcl/inc/qt5/Qt5Frame.hxx b/vcl/inc/qt5/Qt5Frame.hxx
index 4b0a99113536..8772ee7bbfcc 100644
--- a/vcl/inc/qt5/Qt5Frame.hxx
+++ b/vcl/inc/qt5/Qt5Frame.hxx
@@ -28,7 +28,6 @@
 
 class Qt5Graphics;
 class Qt5Instance;
-class Qt5Widget;
 class QWidget;
 class QPaintDevice;
 class QImage;
@@ -36,7 +35,7 @@ class SvpSalGraphics;
 
 class VCLPLUG_QT5_PUBLIC Qt5Frame : public SalFrame
 {
-friend class Qt5Widget;
+friend class VclQtMixinBase;
 
 std::unique_ptr m_pQWidget;
 
diff --git a/vcl/inc/qt5/Qt5Widget.hxx b/vcl/inc/qt5/Qt5Widget.hxx
index 7e7ed8240802..c95bc94c1f0c 100644
--- a/vcl/inc/qt5/Qt5Widget.hxx
+++ b/vcl/inc/qt5/Qt5Widget.hxx
@@ -21,43 +21,8 @@
 
 #include 
 
-class Qt5Frame;
-class Qt5Object;
-class QFocusEvent;
-class QKeyEvent;
-class QMouseEvent;
-class QMoveEvent;
-class QPaintEvent;
-class QResizeEvent;
-class QShowEvent;
-class QWheelEvent;
+#include  "Qt5Frame.hxx"
 
-class Qt5Widget : public QWidget
-{
-Q_OBJECT
-
-Qt5Frame* m_pFrame;
-
-bool handleKeyEvent(QKeyEvent*, bool);
-void handleMouseButtonEvent(QMouseEvent*, bool);
-
-virtual void focusInEvent(QFocusEvent*) override;
-virtual void focusOutEvent(QFocusEvent*) override;
-virtual void keyPressEvent(QKeyEvent*) override;
-virtual void keyReleaseEvent(QKeyEvent*) override;
-virtual void mouseMoveEvent(QMouseEvent*) override;
-virtual void mousePressEvent(QMouseEvent*) override;
-virtual void mouseReleaseEvent(QMouseEvent*) override;
-virtual void moveEvent(QMoveEvent*) override;
-virtual void paintEvent(QPaintEvent*) override;
-virtual void resizeEvent(QResizeEvent*) override;
-virtual void showEvent(QShowEvent*) override;
-virtual void wheelEvent(QWheelEvent*) override;
-virtual void closeEvent(QCloseEvent*) override;
-
-public:
-Qt5Widget(Qt5Frame& rFrame, QWidget* parent = Q_NULLPTR, Qt::WindowFlags f 
= Qt::WindowFlags());
-virtual ~Qt5Widget() override;
-};
+QWidget* createQt5Widget(Qt5Frame , QWidget* parent, Qt::WindowFlags f);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/qt5/Qt5FilePicker.cxx b/vcl/qt5/Qt5FilePicker.cxx
index cb599b6822a7..7dee36de35d3 100644
--- a/vcl/qt5/Qt5FilePicker.cxx
+++ b/vcl/qt5/Qt5FilePicker.cxx
@@ -193,7 +193,7 @@ sal_Int16 SAL_CALL Qt5FilePicker::execute()
 
 vcl::Window *pWindow = ::Application::GetActiveTopWindow();
 assert( pWindow );
-Qt5Widget *pTransientParent = nullptr;
+QWidget *pTransientParent = nullptr;
 QWindow *pTransientWindow = nullptr;
 if( pWindow )
 {
@@ -201,7 +201,7 @@ sal_Int16 SAL_CALL Qt5FilePicker::execute()
 assert( pFrame );
 if( pFrame )
 {
-pTransientParent = static_cast( pFrame->GetQWidget() 
);
+pTransientParent = pFrame->GetQWidget();
 pTransientWindow = pTransientParent->window()->windowHandle();
 }
 }
diff --git a/vcl/qt5/Qt5Frame.cxx b/vcl/qt5/Qt5Frame.cxx
index 2af95ee039dd..ec210c15ade0 100644
--- a/vcl/qt5/Qt5Frame.cxx
+++ b/vcl/qt5/Qt5Frame.cxx
@@ -90,7 +90,7 @@ Qt5Frame::Qt5Frame(Qt5Frame* pParent, SalFrameStyleFlags 
nStyle, bool bUseCairo)
 aWinFlags |= Qt::Window;
 }
 
-m_pQWidget.reset(new Qt5Widget(*this, pParent ? pParent->GetQWidget() : 
nullptr, aWinFlags));
+m_pQWidget.reset(createQt5Widget(*this, pParent ? pParent->GetQWidget() : 
nullptr, aWinFlags));
 
 if (pParent && !(pParent->m_nStyle & SalFrameStyleFlags::PLUG))
 {
diff --git a/vcl/qt5/Qt5Widget.cxx b/vcl/qt5/Qt5Widget.cxx
index bb3ca8aaa44b..8d910434b600 100644
--- a/vcl/qt5/Qt5Widget.cxx
+++ b/vcl/qt5/Qt5Widget.cxx
@@ -32,43 +32,61 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 #include 
 #include 
 
-Qt5Widget::Qt5Widget(Qt5Frame& rFrame, QWidget* parent, Qt::WindowFlags f)
-: QWidget(parent, f)
-, m_pFrame()
+class VclQtMixinBase
 {
-create();
-setMouseTracking(true);
-setFocusPolicy(Qt::StrongFocus);
-}
-
-Qt5Widget::~Qt5Widget() {}
-
-void Qt5Widget::paintEvent(QPaintEvent* pEvent)
+public:
+VclQtMixinBase( Qt5Frame *pFrame) { m_pFrame = pFrame; }
+
+void mixinFocusInEvent(QFocusEvent*);
+void mixinFocusOutEvent(QFocusEvent*);
+void mixinKeyPressEvent(QKeyEvent*);
+void mixinKeyReleaseEvent(QKeyEvent*);
+void mixinMouseMoveEvent(QMouseEvent*);
+void mixinMousePressEvent(QMouseEvent*);
+void mixinMouseReleaseEvent(QMouseEvent*);
+void mixinMoveEvent(QMoveEvent*);
+void mixinPaintEvent(QPaintEvent*, QWidget* widget);
+void 

Re: External Data providersin Calc - GSoC project

[Markus Mohrhard]

Hello Vikas,

On Tue, May 15, 2018 at 11:13 AM, Vikas Mahato 
wrote:

> Hi all,
>
> I looked into how to make UNO components for calc and referred to
> Solver.idl and XSolver.idl in  offapi module for more understanding.
>
> I am thinking of moving the existing implementation of dataproviders and
> datatransformations (located at sc/source/ui/dataproviders) to two UNO
> components.
>

Please don't. The internal ones are the canonical data providers and I
would like to keep them as it is much easier to design APIs and debug
general problems through internal API code. The UNO API will allow
extensions to add additional data providers and data transformations. In
the end you will notice that you will map some of the UNO API code to
internal code anyway and your internal code will help you shape the API.


> This would mean creating 4 new files in offapi/com/sun/star/sheet namely
>
> ExternalDataProvider.idl
> XExternalDataProvider.idl
> DataTransformations.idl
> XDataTransformations.idl
>

That sounds about right.


> ExternalDataProvider will host the following methods:
> 1. void Import()
> 2. OUString& GetURL()
> 3. map getDataSourcesForURL(const OUString& rURL)
> 4. unique_ptr FetchStreamFromURL(const OUString&,
> OStringBuffer& rBuffer)
>


Note that in UNO API we can not use most of the C++ classes. unique_ptr
needs no equivalent anyway as all UNO API objects are reference counted
(uno::Reference, rtl::Reference). Finding a good replacement for
map will be more challenging and might require using
something along the lines of uno::Sequence.

I'm not sure if we need the Import function in the API. Keep in mind that
the importing is completely handled by the internal code and should not be
started by an extension. I suppose it will be enough for the actual uno
object implementation to have an object which provides all the necessary
methods.


>
>
> DataTransformation will host all the methods defined in
> datatransformation.hxx
>
> I want to convert the existing implementations to UNO so that external
> application developers can make use of the functionality as well.
>

As mentioned, we should have the UNO API as layer on top of the internal
API. At least in Calc (and Charts) we have made bad experiences in the past
with pure UNO API features.

Regards,
Markus

>
> Looking for suggestions and feedback.
>
> Kind Regards,
> Vikas Mahato
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice
>
>
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: wsd/Admin.cpp

[Michael Meeks]

 wsd/Admin.cpp |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit bb49e17e8f70e50caa653be625fa497f51c3135f
Author: Michael Meeks 
Date:   Tue May 15 10:52:56 2018 +0100

Start the admin thread even if it is disabled.

The admin thread does memory cleanup as well which is required.
This also reduces logging churn.

Change-Id: I1c6cfaf6085b685f230dc24ae1716b0256d892f8

diff --git a/wsd/Admin.cpp b/wsd/Admin.cpp
index dc1ff562f..f05a80281 100644
--- a/wsd/Admin.cpp
+++ b/wsd/Admin.cpp
@@ -615,8 +615,7 @@ void Admin::dumpState(std::ostream& os)
 
 void Admin::start()
 {
-if (LOOLWSD::AdminEnabled)
-startThread();
+startThread();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
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]

 sw/source/core/docnode/ndcopy.cxx |2 +-
 sw/source/core/table/swtable.cxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit d15c240434d61422e718a08db7d184d86f2b5f15
Author: Caolán McNamara 
Date:   Tue May 15 09:43:56 2018 +0100

OSL_ENSURE->assert

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

diff --git a/sw/source/core/docnode/ndcopy.cxx 
b/sw/source/core/docnode/ndcopy.cxx
index e68183af8ef0..0463edeaef2a 100644
--- a/sw/source/core/docnode/ndcopy.cxx
+++ b/sw/source/core/docnode/ndcopy.cxx
@@ -180,7 +180,7 @@ static void lcl_CopyTableBox( SwTableBox* pBox, CopyTable* 
pCT )
 else
 {
 SwNodeIndex aNewIdx(*pCT->m_pTableNd, pBox->GetSttIdx() - 
pCT->m_nOldTableSttIdx);
-OSL_ENSURE( aNewIdx.GetNode().IsStartNode(), "Index is not on the 
start node" );
+assert(aNewIdx.GetNode().IsStartNode() && "Index is not on the start 
node");
 
 pNewBox = new SwTableBox(pBoxFormat, aNewIdx, pCT->m_pInsLine);
 pNewBox->setRowSpan( pBox->getRowSpan() );
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 2b69e6fe6302..fdc1633e7c73 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1628,7 +1628,7 @@ SwTableBox::SwTableBox( SwTableBoxFormat* pFormat, const 
SwNodeIndex ,
 
 // insert into the table
 const SwTableNode* pTableNd = m_pStartNode->FindTableNode();
-OSL_ENSURE( pTableNd, "In which table is that box?" );
+assert(pTableNd && "In which table is that box?");
 SwTableSortBoxes& rSrtArr = 
const_cast(pTableNd->GetTable().
 GetTabSortBoxes());
 SwTableBox* p = this;   // error: 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/inc/optsolver.hxx  |   13 +--
 sc/source/ui/miscdlgs/optsolver.cxx |   39 ---
 sc/uiconfig/scalc/ui/solversuccessdialog.ui |   98 ++--
 3 files changed, 73 insertions(+), 77 deletions(-)

New commits:
commit 932c96e158517bc1369d78e8180da4c04c214cff
Author: Caolán McNamara 
Date:   Tue May 15 09:22:13 2018 +0100

weld ScSolverSuccessDialog

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

diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 4b7aabc6a56d..66b7132440dc 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -224,18 +224,17 @@ public:
 virtual void dispose() override;
 };
 
-class ScSolverSuccessDialog : public ModalDialog
+class ScSolverSuccessDialog : public weld::GenericDialogController
 {
-VclPtr m_pFtResult;
-VclPtr m_pBtnOk;
-VclPtr m_pBtnCancel;
+std::unique_ptr m_xFtResult;
+std::unique_ptr m_xBtnOk;
+std::unique_ptr m_xBtnCancel;
 
-DECL_LINK(ClickHdl, Button*, void);
+DECL_LINK(ClickHdl, weld::Button&, void);
 
 public:
-ScSolverSuccessDialog( vcl::Window* pParent, const OUString& rSolution );
+ScSolverSuccessDialog(weld::Window* pParent, const OUString& rSolution);
 virtual ~ScSolverSuccessDialog() override;
-virtual void dispose() override;
 };
 
 #endif
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx 
b/sc/source/ui/miscdlgs/optsolver.cxx
index 479262509a71..96eaf1fd8ccb 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -95,37 +95,28 @@ void ScSolverNoSolutionDialog::dispose()
 ModalDialog::dispose();
 }
 
-ScSolverSuccessDialog::ScSolverSuccessDialog( vcl::Window* pParent, const 
OUString& rSolution )
-: ModalDialog(pParent, "SolverSuccessDialog", 
"modules/scalc/ui/solversuccessdialog.ui")
+ScSolverSuccessDialog::ScSolverSuccessDialog(weld::Window* pParent, const 
OUString& rSolution)
+: GenericDialogController(pParent, 
"modules/scalc/ui/solversuccessdialog.ui", "SolverSuccessDialog")
+, m_xFtResult(m_xBuilder->weld_label("result"))
+, m_xBtnOk(m_xBuilder->weld_button("ok"))
+, m_xBtnCancel(m_xBuilder->weld_button("cancel"))
 {
-get(m_pFtResult, "result");
-get(m_pBtnOk, "ok");
-m_pBtnOk->SetClickHdl(LINK(this, ScSolverSuccessDialog, ClickHdl));
-get(m_pBtnCancel, "cancel");
-m_pBtnCancel->SetClickHdl(LINK(this, ScSolverSuccessDialog, ClickHdl));
-OUString aMessage = m_pFtResult->GetText() + " " + rSolution;
-m_pFtResult->SetText(aMessage);
+m_xBtnOk->connect_clicked(LINK(this, ScSolverSuccessDialog, ClickHdl));
+m_xBtnCancel->connect_clicked(LINK(this, ScSolverSuccessDialog, ClickHdl));
+OUString aMessage = m_xFtResult->get_label() + " " + rSolution;
+m_xFtResult->set_label(aMessage);
 }
 
 ScSolverSuccessDialog::~ScSolverSuccessDialog()
 {
-disposeOnce();
-}
-
-void ScSolverSuccessDialog::dispose()
-{
-m_pFtResult.clear();
-m_pBtnOk.clear();
-m_pBtnCancel.clear();
-ModalDialog::dispose();
 }
 
-IMPL_LINK( ScSolverSuccessDialog, ClickHdl, Button*, pBtn, void )
+IMPL_LINK(ScSolverSuccessDialog, ClickHdl, weld::Button&, rBtn, void)
 {
-if (pBtn == m_pBtnOk)
-EndDialog(RET_OK);
+if ( == m_xBtnOk.get())
+m_xDialog->response(RET_OK);
 else
-EndDialog();
+m_xDialog->response(RET_CANCEL);
 }
 
 ScCursorRefEdit::ScCursorRefEdit( vcl::Window* pParent, vcl::Window *pLabel )
@@ -1054,8 +1045,8 @@ bool ScOptSolverDlg::CallSolver()   // return true -> 
close dialog after cal
 static_cast(aObjective.Column), 
static_cast(aObjective.Row),
 static_cast(aObjective.Sheet));
 
-ScopedVclPtrInstance< ScSolverSuccessDialog > aDialog( this, 
aResultStr );
-if ( aDialog->Execute() == RET_OK )
+ScSolverSuccessDialog aDialog(GetFrameWeld(), aResultStr);
+if (aDialog.run() == RET_OK)
 {
 // keep results and close dialog
 bRestore = false;
diff --git a/sc/uiconfig/scalc/ui/solversuccessdialog.ui 
b/sc/uiconfig/scalc/ui/solversuccessdialog.ui
index 8939a2924ba5..3ab6093422fe 100644
--- a/sc/uiconfig/scalc/ui/solversuccessdialog.ui
+++ b/sc/uiconfig/scalc/ui/solversuccessdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -7,12 +7,60 @@
 6
 Solving Result
 False
+True
+0
+0
 dialog
+
+  
+
 
   
 False
 vertical
 12
+
+  
+False
+end
+
+  
+Keep Result
+True
+True
+True
+True
+True
+True
+ 

External Data providersin Calc - GSoC project

[Vikas Mahato]

Hi all,

I looked into how to make UNO components for calc and referred to
Solver.idl and XSolver.idl in  offapi module for more understanding.

I am thinking of moving the existing implementation of dataproviders and
datatransformations (located at sc/source/ui/dataproviders) to two UNO
components.

This would mean creating 4 new files in offapi/com/sun/star/sheet namely

ExternalDataProvider.idl
XExternalDataProvider.idl
DataTransformations.idl
XDataTransformations.idl

ExternalDataProvider will host the following methods:
1. void Import()
2. OUString& GetURL()
3. map getDataSourcesForURL(const OUString& rURL)
4. unique_ptr FetchStreamFromURL(const OUString&, OStringBuffer&
rBuffer)


DataTransformation will host all the methods defined in
datatransformation.hxx

I want to convert the existing implementations to UNO so that external
application developers can make use of the functionality as well.

Looking for suggestions and feedback.

Kind Regards,
Vikas Mahato
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 sc/source/ui/inc/optsolver.hxx   |7 +++
 sc/source/ui/miscdlgs/optsolver.cxx  |   19 ++-
 sc/uiconfig/scalc/ui/nosolutiondialog.ui |8 +++-
 3 files changed, 16 insertions(+), 18 deletions(-)

New commits:
commit 9aff7f3c491da9e3016e5a3cb9737f8bb7c3d0d9
Author: Caolán McNamara 
Date:   Tue May 15 09:14:19 2018 +0100

weld ScSolverNoSolutionDialog

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

diff --git a/sc/source/ui/inc/optsolver.hxx b/sc/source/ui/inc/optsolver.hxx
index 66b7132440dc..49a4e18e7021 100644
--- a/sc/source/ui/inc/optsolver.hxx
+++ b/sc/source/ui/inc/optsolver.hxx
@@ -214,14 +214,13 @@ public:
 voidSetTimeLimit( sal_Int32 nSeconds );
 };
 
-class ScSolverNoSolutionDialog : public ModalDialog
+class ScSolverNoSolutionDialog : public weld::GenericDialogController
 {
-VclPtr m_pFtErrorText;
+std::unique_ptr m_xFtErrorText;
 
 public:
-ScSolverNoSolutionDialog(vcl::Window* pParent, const OUString& rErrorText);
+ScSolverNoSolutionDialog(weld::Window* pParent, const OUString& 
rErrorText);
 virtual ~ScSolverNoSolutionDialog() override;
-virtual void dispose() override;
 };
 
 class ScSolverSuccessDialog : public weld::GenericDialogController
diff --git a/sc/source/ui/miscdlgs/optsolver.cxx 
b/sc/source/ui/miscdlgs/optsolver.cxx
index 96eaf1fd8ccb..d3cfa487eb42 100644
--- a/sc/source/ui/miscdlgs/optsolver.cxx
+++ b/sc/source/ui/miscdlgs/optsolver.cxx
@@ -77,22 +77,15 @@ void ScSolverProgressDialog::SetTimeLimit( sal_Int32 
nSeconds )
 m_pFtTime->SetText( aNew );
 }
 
-ScSolverNoSolutionDialog::ScSolverNoSolutionDialog( vcl::Window* pParent, 
const OUString& rErrorText )
-: ModalDialog(pParent, "NoSolutionDialog", 
"modules/scalc/ui/nosolutiondialog.ui")
+ScSolverNoSolutionDialog::ScSolverNoSolutionDialog(weld::Window* pParent, 
const OUString& rErrorText)
+: GenericDialogController(pParent, "modules/scalc/ui/nosolutiondialog.ui", 
"NoSolutionDialog")
+, m_xFtErrorText(m_xBuilder->weld_label("error"))
 {
-get(m_pFtErrorText, "error");
-m_pFtErrorText->SetText(rErrorText);
+m_xFtErrorText->set_label(rErrorText);
 }
 
 ScSolverNoSolutionDialog::~ScSolverNoSolutionDialog()
 {
-disposeOnce();
-}
-
-void ScSolverNoSolutionDialog::dispose()
-{
-m_pFtErrorText.clear();
-ModalDialog::dispose();
 }
 
 ScSolverSuccessDialog::ScSolverSuccessDialog(weld::Window* pParent, const 
OUString& rSolution)
@@ -1059,8 +1052,8 @@ bool ScOptSolverDlg::CallSolver()   // return true -> 
close dialog after cal
 uno::Reference xDesc( xSolver, 
uno::UNO_QUERY );
 if ( xDesc.is() )
 aError = xDesc->getStatusDescription(); // error 
description from component
-ScopedVclPtrInstance< ScSolverNoSolutionDialog > aDialog( this, aError 
);
-aDialog->Execute();
+ScSolverNoSolutionDialog aDialog(GetFrameWeld(), aError);
+aDialog.run();
 }
 
 if ( bRestore ) // restore old values
diff --git a/sc/uiconfig/scalc/ui/nosolutiondialog.ui 
b/sc/uiconfig/scalc/ui/nosolutiondialog.ui
index ad2b97a37d47..8c98b07959b2 100644
--- a/sc/uiconfig/scalc/ui/nosolutiondialog.ui
+++ b/sc/uiconfig/scalc/ui/nosolutiondialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -7,7 +7,13 @@
 6
 No Solution
 False
+True
+0
+0
 dialog
+
+  
+
 
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Eike Rathke]

 i18npool/source/nativenumber/nativenumbersupplier.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit fb345397694258d87746879e4c530cc11c777843
Author: Eike Rathke 
Date:   Tue May 15 14:31:56 2018 +0200

Guard static variables, tdf#115007 tdf#117171 follow-up

Change-Id: Ib8f73ceefb8278b6233d46d86a34a3869622239f

diff --git a/i18npool/source/nativenumber/nativenumbersupplier.cxx 
b/i18npool/source/nativenumber/nativenumbersupplier.cxx
index f3c40a2b7d61..f075e5324c16 100644
--- a/i18npool/source/nativenumber/nativenumbersupplier.cxx
+++ b/i18npool/source/nativenumber/nativenumbersupplier.cxx
@@ -63,6 +63,8 @@ typedef struct {
 
 namespace i18npool {
 
+struct theNatNumMutex : public rtl::Static {};
+
 OUString getHebrewNativeNumberString(const OUString& aNumberString, bool 
useGeresh);
 
 OUString getCyrillicNativeNumberString(const OUString& aNumberString);
@@ -560,6 +562,9 @@ OUString getNumberText(const Locale& aLocale, sal_Int16 
numType, const OUString&
 
 OUString aNumberStr = sBuf.makeStringAndClear();
 
+// Guard the static variables below.
+osl::MutexGuard aGuard( theNatNumMutex::get());
+
 static auto xNumberText
 = 
css::linguistic2::NumberText::create(comphelper::getProcessComponentContext());
 OUString aLoc = LanguageTag::convertToBcp47(aLocale);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sc/source/ui/inc/solveroptions.hxx  |   10 
 sc/source/ui/miscdlgs/solveroptions.cxx |   38 ++--
 sc/uiconfig/scalc/ui/integerdialog.ui   |8 +-
 3 files changed, 24 insertions(+), 32 deletions(-)

New commits:
commit a09888adcd1de54dcf90968ed447d196ebf0429a
Author: Caolán McNamara 
Date:   Tue May 15 08:59:28 2018 +0100

weld ScSolverIntegerDialog

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

diff --git a/sc/source/ui/inc/solveroptions.hxx 
b/sc/source/ui/inc/solveroptions.hxx
index 4d999ad76b95..9ad1fb0f6c17 100644
--- a/sc/source/ui/inc/solveroptions.hxx
+++ b/sc/source/ui/inc/solveroptions.hxx
@@ -26,6 +26,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -68,15 +69,14 @@ public:
 const css::uno::Sequence& GetProperties();
 };
 
-class ScSolverIntegerDialog : public ModalDialog
+class ScSolverIntegerDialog : public weld::GenericDialogController
 {
-VclPtr m_pFrame;
-VclPtr m_pNfValue;
+std::unique_ptr m_xFrame;
+std::unique_ptr m_xNfValue;
 
 public:
-ScSolverIntegerDialog( vcl::Window * pParent );
+ScSolverIntegerDialog(weld::Window* pParent);
 virtual ~ScSolverIntegerDialog() override;
-virtual void dispose() override;
 
 voidSetOptionName( const OUString& rName );
 voidSetValue( sal_Int32 nValue );
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx 
b/sc/source/ui/miscdlgs/solveroptions.cxx
index 9d0e8b043a73..18fea8c6a470 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -333,12 +333,12 @@ void ScSolverOptionsDialog::EditOption()
 }
 else
 {
-ScopedVclPtrInstance< ScSolverIntegerDialog > aIntDialog( 
this );
-aIntDialog->SetOptionName( pStringItem->GetText() );
-aIntDialog->SetValue( pStringItem->GetIntValue() );
-if ( aIntDialog->Execute() == RET_OK )
+ScSolverIntegerDialog aIntDialog(GetFrameWeld());
+aIntDialog.SetOptionName( pStringItem->GetText() );
+aIntDialog.SetValue( pStringItem->GetIntValue() );
+if (aIntDialog.run() == RET_OK)
 {
-pStringItem->SetIntValue( aIntDialog->GetValue() );
+pStringItem->SetIntValue(aIntDialog.GetValue());
 m_pLbSettings->InvalidateEntry( pEntry );
 }
 }
@@ -389,44 +389,30 @@ IMPL_LINK_NOARG(ScSolverOptionsDialog, SettingsSelHdl, 
SvTreeListBox*, void)
 m_pBtnEdit->Enable( !bCheckbox );
 }
 
-ScSolverIntegerDialog::ScSolverIntegerDialog(vcl::Window * pParent)
-: ModalDialog( pParent, "IntegerDialog",
-"modules/scalc/ui/integerdialog.ui" )
+ScSolverIntegerDialog::ScSolverIntegerDialog(weld::Window * pParent)
+: GenericDialogController(pParent, "modules/scalc/ui/integerdialog.ui", 
"IntegerDialog")
+, m_xFrame(m_xBuilder->weld_frame("frame"))
+, m_xNfValue(m_xBuilder->weld_spin_button("value"))
 {
-get(m_pFrame, "frame");
-get(m_pNfValue, "value");
 }
 
 ScSolverIntegerDialog::~ScSolverIntegerDialog()
 {
-disposeOnce();
-}
-
-void ScSolverIntegerDialog::dispose()
-{
-m_pFrame.clear();
-m_pNfValue.clear();
-ModalDialog::dispose();
 }
 
 void ScSolverIntegerDialog::SetOptionName( const OUString& rName )
 {
-m_pFrame->set_label(rName);
+m_xFrame->set_label(rName);
 }
 
 void ScSolverIntegerDialog::SetValue( sal_Int32 nValue )
 {
-m_pNfValue->SetValue( nValue );
+m_xNfValue->set_value( nValue );
 }
 
 sal_Int32 ScSolverIntegerDialog::GetValue() const
 {
-sal_Int64 nValue = m_pNfValue->GetValue();
-if ( nValue < SAL_MIN_INT32 )
-return SAL_MIN_INT32;
-if ( nValue > SAL_MAX_INT32 )
-return SAL_MAX_INT32;
-return static_cast(nValue);
+return m_xNfValue->get_value();
 }
 
 ScSolverValueDialog::ScSolverValueDialog(weld::Window* pParent)
diff --git a/sc/uiconfig/scalc/ui/integerdialog.ui 
b/sc/uiconfig/scalc/ui/integerdialog.ui
index 09f383b26afc..c25dc896087e 100644
--- a/sc/uiconfig/scalc/ui/integerdialog.ui
+++ b/sc/uiconfig/scalc/ui/integerdialog.ui
@@ -1,5 +1,5 @@
 
-
+
 
   
   
@@ -13,7 +13,13 @@
 6
 Edit Setting
 False
+True
+0
+0
 dialog
+
+  
+
 
   
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: writerperfect/CppunitTest_writerperfect_wpftimport.mk writerperfect/inc writerperfect/qa writerperfect/source writerperfect/uiconfig

[Caolán McNamara]

 writerperfect/CppunitTest_writerperfect_wpftimport.mk   |3 
 writerperfect/inc/ImportFilter.hxx  |   12 +
 writerperfect/inc/WPFTEncodingDialog.hxx|   21 +-
 writerperfect/qa/unit/DrawingImportTest.cxx |7 
 writerperfect/qa/unit/PresentationImportTest.cxx|5 
 writerperfect/qa/unit/SpreadsheetImportTest.cxx |5 
 writerperfect/qa/unit/TextImportTest.cxx|7 
 writerperfect/source/calc/MSWorksCalcImportFilter.cxx   |   23 +-
 writerperfect/source/calc/MSWorksCalcImportFilter.hxx   |4 
 writerperfect/source/calc/MWAWCalcImportFilter.cxx  |2 
 writerperfect/source/calc/MWAWCalcImportFilter.hxx  |4 
 writerperfect/source/calc/NumbersImportFilter.cxx   |2 
 writerperfect/source/calc/NumbersImportFilter.hxx   |4 
 writerperfect/source/calc/StarOfficeCalcImportFilter.cxx|3 
 writerperfect/source/calc/StarOfficeCalcImportFilter.hxx|4 
 writerperfect/source/common/WPFTEncodingDialog.cxx  |   78 
++
 writerperfect/source/draw/CDRImportFilter.cxx   |2 
 writerperfect/source/draw/CDRImportFilter.hxx   |4 
 writerperfect/source/draw/CMXImportFilter.cxx   |2 
 writerperfect/source/draw/CMXImportFilter.hxx   |4 
 writerperfect/source/draw/FreehandImportFilter.cxx  |2 
 writerperfect/source/draw/FreehandImportFilter.hxx  |4 
 writerperfect/source/draw/MSPUBImportFilter.cxx |2 
 writerperfect/source/draw/MSPUBImportFilter.hxx |4 
 writerperfect/source/draw/MWAWDrawImportFilter.cxx  |2 
 writerperfect/source/draw/MWAWDrawImportFilter.hxx  |4 
 writerperfect/source/draw/PageMakerImportFilter.cxx |2 
 writerperfect/source/draw/PageMakerImportFilter.hxx |4 
 writerperfect/source/draw/QXPImportFilter.cxx   |2 
 writerperfect/source/draw/QXPImportFilter.hxx   |4 
 writerperfect/source/draw/StarOfficeDrawImportFilter.cxx|3 
 writerperfect/source/draw/StarOfficeDrawImportFilter.hxx|4 
 writerperfect/source/draw/VisioImportFilter.cxx |2 
 writerperfect/source/draw/VisioImportFilter.hxx |4 
 writerperfect/source/draw/WPGImportFilter.cxx   |2 
 writerperfect/source/draw/WPGImportFilter.hxx   |4 
 writerperfect/source/draw/ZMFImportFilter.cxx   |2 
 writerperfect/source/draw/ZMFImportFilter.hxx   |4 
 writerperfect/source/impress/KeynoteImportFilter.cxx|2 
 writerperfect/source/impress/KeynoteImportFilter.hxx|4 
 writerperfect/source/impress/MWAWPresentationImportFilter.cxx   |3 
 writerperfect/source/impress/MWAWPresentationImportFilter.hxx   |4 
 writerperfect/source/impress/StarOfficePresentationImportFilter.cxx |3 
 writerperfect/source/impress/StarOfficePresentationImportFilter.hxx |4 
 writerperfect/source/writer/AbiWordImportFilter.cxx |2 
 writerperfect/source/writer/AbiWordImportFilter.hxx |4 
 writerperfect/source/writer/EBookImportFilter.cxx   |2 
 writerperfect/source/writer/EBookImportFilter.hxx   |3 
 writerperfect/source/writer/MSWorksImportFilter.cxx |   13 -
 writerperfect/source/writer/MSWorksImportFilter.hxx |4 
 writerperfect/source/writer/MWAWImportFilter.cxx|2 
 writerperfect/source/writer/MWAWImportFilter.hxx|4 
 writerperfect/source/writer/PagesImportFilter.cxx   |2 
 writerperfect/source/writer/PagesImportFilter.hxx   |3 
 writerperfect/source/writer/StarOfficeWriterImportFilter.cxx|5 
 writerperfect/source/writer/StarOfficeWriterImportFilter.hxx|4 
 writerperfect/source/writer/WordPerfectImportFilter.cxx |7 
 writerperfect/uiconfig/ui/wpftencodingdialog.ui |9 -
 58 files changed, 165 insertions(+), 170 deletions(-)

New commits:
commit 5f170e69728b8741ce3c0af1d140023577cc470b
Author: Caolán McNamara 
Date:   Mon May 14 14:06:52 2018 +0100

weld WPFTEncodingDialog

and pass in parent window for dialog

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-5.3' - sc/qa sc/source

[Henry Castro]

 sc/qa/unit/tiledrendering/tiledrendering.cxx |   43 +++
 sc/source/ui/app/scmod.cxx   |   32 +++-
 sc/source/ui/formdlg/formula.cxx |6 +--
 sc/source/ui/inc/anyrefdg.hxx|4 +-
 sc/source/ui/miscdlgs/anyrefdg.cxx   |   32 
 5 files changed, 73 insertions(+), 44 deletions(-)

New commits:
commit ea7fba0ff338098dea5292557c418b7d8c8a100b
Author: Henry Castro 
Date:   Thu Mar 15 14:23:48 2018 -0400

lokdialog: do not lock events when opened ScFilter Dialog

When exists 2 or more views and one of the views open the ScFilter dialog,
the other views are locked and no event process.

In tiled rendering case, collaborative editing is not functional with 2 or
more views are locked, so the patch prevents locking the other views

Change-Id: I0133d38ac5ecef4d3ebc22f3e922602704dcd0b3
Reviewed-on: https://gerrit.libreoffice.org/51370
Tested-by: Jenkins 
Reviewed-by: Henry Castro 
Reviewed-on: https://gerrit.libreoffice.org/51437
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/sc/qa/unit/tiledrendering/tiledrendering.cxx 
b/sc/qa/unit/tiledrendering/tiledrendering.cxx
index 2bb0c660ff69..bcd687a77599 100644
--- a/sc/qa/unit/tiledrendering/tiledrendering.cxx
+++ b/sc/qa/unit/tiledrendering/tiledrendering.cxx
@@ -30,9 +30,11 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -83,6 +85,7 @@ public:
 void testLanguageStatus();
 void testMultiViewCopyPaste();
 void testIMESupport();
+void testFilterDlg();
 
 CPPUNIT_TEST_SUITE(ScTiledRenderingTest);
 CPPUNIT_TEST(testRowColumnSelections);
@@ -114,6 +117,7 @@ public:
 CPPUNIT_TEST(testLanguageStatus);
 CPPUNIT_TEST(testMultiViewCopyPaste);
 CPPUNIT_TEST(testIMESupport);
+CPPUNIT_TEST(testFilterDlg);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -1599,6 +1603,45 @@ void ScTiledRenderingTest::testIMESupport()
 comphelper::LibreOfficeKit::setActive(false);
 }
 
+void ScTiledRenderingTest::testFilterDlg()
+{
+comphelper::LibreOfficeKit::setActive();
+
+createDoc("empty.ods");
+
+// view #1
+SfxViewShell* pView1 = SfxViewShell::Current();
+int nView1 = SfxLokHelper::getView();
+
+// view #2
+SfxLokHelper::createView();
+SfxViewShell* pView2 = SfxViewShell::Current();
+CPPUNIT_ASSERT(pView1 != pView2);
+{
+pView2->GetViewFrame()->GetDispatcher()->Execute(SID_FILTER,
+SfxCallMode::SLOT|SfxCallMode::RECORD);
+}
+
+Scheduler::ProcessEventsToIdle();
+SfxChildWindow* pRefWindow = 
pView2->GetViewFrame()->GetChildWindow(SID_FILTER);
+CPPUNIT_ASSERT(pRefWindow);
+
+// switch to view 1
+SfxLokHelper::setView(nView1);
+CPPUNIT_ASSERT_EQUAL(true, 
pView2->GetViewFrame()->GetDispatcher()->IsLocked());
+CPPUNIT_ASSERT_EQUAL(false, 
pView1->GetViewFrame()->GetDispatcher()->IsLocked());
+
+KeyEvent aEvent(27, KEY_ESCAPE, 0);
+Application::PostKeyEvent(VclEventId::WindowKeyInput, 
pRefWindow->GetWindow(), );
+Application::PostKeyEvent(VclEventId::WindowKeyUp, 
pRefWindow->GetWindow(), );
+
+Scheduler::ProcessEventsToIdle();
+CPPUNIT_ASSERT_EQUAL(false, 
pView2->GetViewFrame()->GetDispatcher()->IsLocked());
+CPPUNIT_ASSERT_EQUAL(false, 
pView1->GetViewFrame()->GetDispatcher()->IsLocked());
+
+comphelper::LibreOfficeKit::setActive(false);
+}
+
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(ScTiledRenderingTest);
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index bc2dcead5f30..18aa66f00456 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -1554,20 +1554,25 @@ void ScModule::SetRefDialog( sal_uInt16 nId, bool bVis, 
SfxViewFrame* pViewFrm )
 }
 }
 
-static SfxChildWindow* lcl_GetChildWinFromAnyView( sal_uInt16 nId )
+static inline SfxChildWindow* lcl_GetChildWinFromCurrentView( sal_uInt16 nId )
 {
-// First, try the current view
 SfxViewFrame* pViewFrm = SfxViewFrame::Current();
 
 // #i46999# current view frame can be null (for example, when closing help)
-SfxChildWindow* pChildWnd = pViewFrm ? pViewFrm->GetChildWindow( nId ) : 
nullptr;
+return pViewFrm ? pViewFrm->GetChildWindow( nId ) : nullptr;
+}
+
+static SfxChildWindow* lcl_GetChildWinFromAnyView( sal_uInt16 nId )
+{
+// First, try the current view
+SfxChildWindow* pChildWnd = lcl_GetChildWinFromCurrentView( nId );
 if ( pChildWnd )
 return pChildWnd;   // found in the current view
 
 //  if not found there, get the child window from any open view
 //  it can be open only in one view because nCurRefDlgId is global
 
-pViewFrm = SfxViewFrame::GetFirst();
+SfxViewFrame* pViewFrm = SfxViewFrame::GetFirst();
 

[Libreoffice-commits] core.git: icon-themes/colibre icon-themes/colibre_svg

[andreas kainz]

 icon-themes/colibre/res/notebookbar.png |binary
 icon-themes/colibre_svg/res/notebookbar.svg |2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

New commits:
commit dd84c23bf604c175062cc338b79e9ca362edcb50
Author: andreas kainz 
Date:   Tue May 15 16:01:27 2018 +0200

Colibre: Hamburger icon for NB is now well aligned

Change-Id: Ie6ef7f2ca68b9f158e166a62b9cec8adfc91f006
Reviewed-on: https://gerrit.libreoffice.org/54376
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/icon-themes/colibre/res/notebookbar.png 
b/icon-themes/colibre/res/notebookbar.png
index 90418a61a0c2..35313443bb08 100644
Binary files a/icon-themes/colibre/res/notebookbar.png and 
b/icon-themes/colibre/res/notebookbar.png differ
diff --git a/icon-themes/colibre_svg/res/notebookbar.svg 
b/icon-themes/colibre_svg/res/notebookbar.svg
index 0d1f7982433c..e92faf64a577 100644
--- a/icon-themes/colibre_svg/res/notebookbar.svg
+++ b/icon-themes/colibre_svg/res/notebookbar.svg
@@ -1 +1 @@
-http://www.w3.org/2000/svg;>
\ No newline at end of file
+http://www.w3.org/2000/svg;>
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

'DaeHyun Sung' license statement

[DaeHyun Sung]

All of my past & future contributions to LibreOffice may be licensed under
the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

'DaeHyun Sung' license statement

[DaeHyun Sung]

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

성대현/成大鉉(DaeHyun Sung)
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[andreas kainz]

 sc/uiconfig/scalc/ui/notebookbar.ui   | 1700 +---
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui| 1913 +++---
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_full.ui   | 1863 +++--
 sd/uiconfig/simpress/ui/notebookbar.ui| 1865 +++--
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui | 1192 ++--
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_full.ui| 1003 ++-
 sw/uiconfig/swriter/ui/notebookbar.ui | 1287 -
 sw/uiconfig/swriter/ui/notebookbar_compact.ui |  758 +
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui  | 1711 
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui | 1432 ++
 10 files changed, 5173 insertions(+), 9551 deletions(-)

New commits:
commit 92ca8dfeb3a05178ea0698fbb519e79af2ad2408
Author: andreas kainz 
Date:   Tue May 15 13:18:34 2018 +0200

NB Implementations: update for better maintenance and sync

Change-Id: I024d597f218824d8618d113a5aaae2fd314ec807
Reviewed-on: https://gerrit.libreoffice.org/54367
Reviewed-by: andreas_kainz 
Tested-by: andreas_kainz 

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 0143661f8796..4c05b48aeacc 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -136,20 +136,6 @@
   
 
 
-  
-True
-False
-.uno:ConvertFormulaToValue
-  
-
-
-  
-True
-False
-.uno:AutomaticCalculation
-  
-
-
   
 True
 False
@@ -177,12 +163,6 @@
   
 
 
-  
-True
-False
-  
-
-
   
 True
 False
@@ -190,13 +170,6 @@
   
 
 
-  
-True
-False
-.uno:ManageXMLSource
-  
-
-
   
 True
 False
@@ -271,96 +244,6 @@
 .uno:ShowDetail
   
 
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:SamplingDialog
-  
-
-
-  
-True
-False
-.uno:DescriptiveStatisticsDialog
-  
-
-
-  
-True
-False
-.uno:AnalysisOfVarianceDialog
-  
-
-
-  
-True
-False
-.uno:CorrelationDialog
-  
-
-
-  
-True
-False
-.uno:CovarianceDialog
-  
-
-
-  
-True
-False
-.uno:ExponentialSmoothingDialog
-  
-
-
-  
-True
-False
-.uno:MovingAverageDialog
-  
-
-
-  
-True
-False
-.uno:RegressionDialog
-  
-
-
-  
-True
-False
-.uno:TTestDialog
-  
-
-
-  
-True
-False
-.uno:FTestDialog
-  
-
-
-  
-True
-False
-.uno:ZTestDialog
-  
-
-
-  
-True
-False
-.uno:ChiSquareTestDialog
-  
-
   
   
 True
@@ -600,30 +483,24 @@
 True
 False
 
-  
+  
 True
 False
-.uno:AutoPilotMenu
+.uno:AddDirect
   
 
 
-  
-True
-False
-  
-
-
-  
+  
 True
 False
-.uno:Reload
+.uno:RecentFileList
   
 
 
-  
+  
 True
 False
-.uno:VersionDialog
+.uno:CloseDoc
   
 
 
@@ -633,64 +510,24 @@
   
 
 
-  
-True
-False
-.uno:CheckOut
-  
-
-
-  
-True
-False
-.uno:CancelCheckOut
-  
-
-
-  
-True
-False
-.uno:CheckIn
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ExportToPDF
-  
-
-
-  
-True
-False
-.uno:ExportToEPUB
-  
-
-
-  
+  
 True
 False
+.uno:Save
   
 
 
-  
+  
 True
 False
-.uno:SendMail
+.uno:SaveAs
   
 
 
-  
+  
 True
 False
-.uno:SendViaBluetooth
+.uno:SaveAsRemote
   
 
 
@@ -701,285 +538,250 @@
   
 
 
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:WebHtml
-  
-
-
-  
-True
-False
-.uno:PrinterSetup
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:SetDocumentProperties
-  
-
-  
-  
-True
-False
-
-  
+  
 True
  

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

[Tomaž Vajngerl]

 sw/source/core/graphic/ndgrf.cxx |   45 +++
 1 file changed, 27 insertions(+), 18 deletions(-)

New commits:
commit 3c6b0eb0f16e4cb6d427a160e8ff766209c49f99
Author: Tomaž Vajngerl 
Date:   Tue May 15 18:28:31 2018 +0900

tdf#117427 need to check originURL when ReRead is called

Previously we checked the originURL of Graphic for SwGrfNode in
constructor which then called ReRead. This is OK for linked
graphic when they are loaded from the document, but when we change
the Graphic through API, only the ReRead method is called. So to
get this to work we need to move checking of originURL into the
ReRead method.

Change-Id: Iaa4a332459baab656740ff209b997c48b7287e16
Reviewed-on: https://gerrit.libreoffice.org/54362
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sw/source/core/graphic/ndgrf.cxx b/sw/source/core/graphic/ndgrf.cxx
index a966a29897bf..5cfd3ce51508 100644
--- a/sw/source/core/graphic/ndgrf.cxx
+++ b/sw/source/core/graphic/ndgrf.cxx
@@ -73,19 +73,11 @@ SwGrfNode::SwGrfNode(
 mbLinkedInputStreamReady( false ),
 mbIsStreamReadOnly( false )
 {
-OUString sURLLink(pGraphic->getOriginURL());
-if (sURLLink.isEmpty() && !rGrfName.isEmpty())
-{
-sURLLink = rGrfName;
-Graphic aGraphic(*pGraphic);
-aGraphic.setOriginURL(sURLLink);
-}
-
 bInSwapIn = bChgTwipSize =
 bFrameInPaint = bScaleImageMap = false;
 
 bGraphicArrived = true;
-ReRead(sURLLink, rFltName, pGraphic, false);
+ReRead(rGrfName, rFltName, pGraphic, false);
 }
 
 SwGrfNode::SwGrfNode( const SwNodeIndex & rWhere,
@@ -155,15 +147,32 @@ bool SwGrfNode::ReRead(
 OSL_ENSURE( pGraphic || !rGrfName.isEmpty(),
 "GraphicNode without a name, Graphic or GraphicObject" );
 
+OUString sURLLink;
+if (pGraphic)
+{
+Graphic aGraphic(*pGraphic);
+
+sURLLink = aGraphic.getOriginURL();
+if (sURLLink.isEmpty() && !rGrfName.isEmpty())
+{
+sURLLink = rGrfName;
+aGraphic.setOriginURL(sURLLink);
+}
+}
+else
+{
+sURLLink = rGrfName;
+}
+
 // with name
 if( refLink.is() )
 {
 OSL_ENSURE( !bInSwapIn, "ReRead: I am still in SwapIn" );
 
-if( !rGrfName.isEmpty() )
+if( !sURLLink.isEmpty() )
 {
 // Note: If there is DDE in the FltName, than it is a DDE-linked 
graphic
-OUString sCmd( rGrfName );
+OUString sCmd( sURLLink );
 if( !rFltName.isEmpty() )
 {
 sal_uInt16 nNewType;
@@ -171,7 +180,7 @@ bool SwGrfNode::ReRead(
 nNewType = OBJECT_CLIENT_DDE;
 else
 {
-sfx2::MakeLnkName( sCmd, nullptr, rGrfName, OUString(), 
 );
+sfx2::MakeLnkName( sCmd, nullptr, sURLLink, OUString(), 
 );
 nNewType = OBJECT_CLIENT_GRF;
 }
 
@@ -192,7 +201,7 @@ bool SwGrfNode::ReRead(
 
 if( pGraphic )
 {
-maGrfObj.SetGraphic( *pGraphic, rGrfName );
+maGrfObj.SetGraphic( *pGraphic, sURLLink );
 onGraphicChanged();
 bReadGrf = true;
 }
@@ -201,7 +210,7 @@ bool SwGrfNode::ReRead(
 // reset data of the old graphic so that the correct placeholder is
 // shown in case the new link could not be loaded
 Graphic aGrf; aGrf.SetDefaultType();
-maGrfObj.SetGraphic( aGrf, rGrfName );
+maGrfObj.SetGraphic( aGrf, sURLLink );
 
 if( refLink.is() )
 {
@@ -220,7 +229,7 @@ bool SwGrfNode::ReRead(
 bSetTwipSize = false;
 }
 }
-else if( pGraphic && rGrfName.isEmpty() )
+else if( pGraphic && sURLLink.isEmpty() )
 {
 maGrfObj.SetGraphic( *pGraphic );
 onGraphicChanged();
@@ -232,13 +241,13 @@ bool SwGrfNode::ReRead(
 else
 {
 // create new link for the graphic object
-InsertLink( rGrfName, rFltName );
+InsertLink( sURLLink, rFltName );
 
 if( GetNodes().IsDocNodes() )
 {
 if( pGraphic )
 {
-maGrfObj.SetGraphic( *pGraphic, rGrfName );
+maGrfObj.SetGraphic( *pGraphic, sURLLink );
 onGraphicChanged();
 bReadGrf = true;
 // create connection without update, as we have the graphic
@@ -248,7 +257,7 @@ bool SwGrfNode::ReRead(
 {
 Graphic aGrf;
 aGrf.SetDefaultType();
-maGrfObj.SetGraphic( aGrf, rGrfName );
+maGrfObj.SetGraphic( aGrf, sURLLink );
 onGraphicChanged();
 if ( bNewGrf )
 {
___
Libreoffice-commits mailing 

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide' - 103 commits - include/o3tl sw/source

[Michael Stahl]

Rebased ref, commits from common ancestor:
commit 73de1963c77a8c376d59cd3ee7e6b6ee2927c554
Author: Michael Stahl 
Date:   Tue May 15 18:04:06 2018 +0200

sw_redlinehide: adapt more functions of SwAttrIter

Change-Id: I17c14f9e66c82cafa2fb5b3e8e45b3bf94fc4a88

diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 20f25621273a..eb48340f3656 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -112,12 +112,20 @@ SwAttrIter::~SwAttrIter()
  */
 SwTextAttr *SwAttrIter::GetAttr(TextFrameIndex const nPosition) const
 {
-return (m_pTextNode) ? m_pTextNode->GetTextAttrForCharAt(nPosition) : 
nullptr;
+std::pair const pos( m_pMergedPara
+? sw::MapViewToModel(*m_pMergedPara, nPosition)
+: std::make_pair(m_pTextNode, sal_Int32(nPosition)));
+return pos.first->GetTextAttrForCharAt(pos.second);
 }
 
 bool SwAttrIter::SeekAndChgAttrIter(TextFrameIndex const nNewPos, 
OutputDevice* pOut)
 {
-bool bChg = m_nStartIndex && nNewPos == m_nPosition ? m_pFont->IsFntChg() 
: Seek( nNewPos );
+std::pair const pos( m_pMergedPara
+? sw::MapViewToModel(*m_pMergedPara, nNewPos)
+: std::make_pair(m_pTextNode, sal_Int32(nNewPos)));
+bool bChg = m_nStartIndex && pos.first == m_pTextNode && pos.second == 
m_nPosition
+? m_pFont->IsFntChg()
+: Seek( nNewPos );
 if ( m_pLastOut.get() != pOut )
 {
 m_pLastOut = pOut;
@@ -151,6 +159,14 @@ bool SwAttrIter::SeekStartAndChgAttrIter( OutputDevice* 
pOut, const bool bParaFo
 if ( m_pRedline && m_pRedline->ExtOn() )
 m_pRedline->LeaveExtend(*m_pFont, pFirstTextNode->GetIndex(), 0);
 
+if (m_pTextNode != pFirstTextNode)
+{
+assert(m_pMergedPara);
+m_pTextNode = m_pMergedPara->pFirstNode;
+m_pHints = m_pTextNode->GetpSwpHints();
+InitFontAndAttrHandler(*m_pTextNode, m_pMergedPara->mergedText, 
nullptr);
+}
+
 // reset font to its original state
 m_aAttrHandler.Reset();
 m_aAttrHandler.ResetFont( *m_pFont );
commit 61351b626cc2cc32616dd68735d6578f3719bf37
Author: Michael Stahl 
Date:   Tue May 15 17:30:22 2018 +0200

sw_redlinehide: SwAttrIter::Seek()

Change-Id: Ieb884f678d6521b609714def3f42c8494dc47769

diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index c44dc9eaa4d5..20f25621273a 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -65,6 +65,9 @@
 using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star;
 
+static sal_Int32 GetNextAttrImpl(SwTextNode const* pTextNode,
+size_t nStartIndex, size_t nEndIndex, sal_Int32 nPosition);
+
 void SwAttrIter::Chg( SwTextAttr const *pHt )
 {
 assert(pHt && m_pFont && "No attribute of font available for change");
@@ -243,18 +246,59 @@ void SwAttrIter::SeekFwd( const sal_Int32 nNewPos )
 bool SwAttrIter::Seek(TextFrameIndex const nNewPos)
 {
 // note: nNewPos isn't necessarily a index returned from GetNextAttr
-sw::MergedPara * pMerged(nullptr); // FIXME
-std::pair const newPos( pMerged
-? sw::MapViewToModel(*pMerged, nNewPos)
-: std::make_pair(m_pTextNode, nNewPos));
+std::pair const newPos( m_pMergedPara
+? sw::MapViewToModel(*m_pMergedPara, nNewPos)
+: std::make_pair(m_pTextNode, sal_Int32(nNewPos)));
 
 if ( m_pRedline && m_pRedline->ExtOn() )
 m_pRedline->LeaveExtend(*m_pFont, newPos.first->GetIndex(), 
newPos.second);
+if (m_pTextNode->GetIndex() < newPos.first->GetIndex())
+{
+// Skipping to a different node - first seek until the end of this node
+// to get rid of all hint items
+sal_Int32 nPos(m_nPosition);
+do
+{
+nPos = GetNextAttrImpl(m_pTextNode, m_nStartIndex, m_nEndIndex, 
nPos);
+if (nPos < m_pTextNode->Len())
+{
+SeekFwd(nPos);
+}
+}
+while (nPos < m_pTextNode->Len());
+if (nPos != m_pTextNode->Len())
+{
+SeekFwd(m_pTextNode->Len());
+}
+assert(m_nChgCnt == 0); // should have reset it all? there cannot be 
ExtOn() inside of a Delete redline, surely?
+// Unapply current para items:
+// the SwAttrHandler doesn't appear to be capable of *unapplying*
+// items at all; it can only apply a previously effective item.
+// So do this by recreating the font from scratch.
+// Apply new para items:
+InitFontAndAttrHandler(*newPos.first, m_pMergedPara->mergedText, 
nullptr);
+// reset to next
+m_pTextNode = newPos.first;
+m_pHints = m_pTextNode->GetpSwpHints();
+m_nStartIndex = 0;
+m_nEndIndex = 0;
+m_nPosition = 0;
+assert(m_pRedline);
+}
 
 if( m_pHints )
 {
-if( !nNewPos || nNewPos < m_nPosition )
+if (!nNewPos || newPos.second < 

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

[Caolán McNamara]

 editeng/source/rtf/svxrtf.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 409441652af3df62e742b9d7a3d80cb6b15214af
Author: Caolán McNamara 
Date:   Tue May 15 15:10:43 2018 +0100

ofz#7802 infinite loop

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

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 369995b1d293..88a3a1c110bf 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -356,7 +356,10 @@ void SvxRTFParser::ReadStyleTable()
 case RTF_CHRFMT:
 case RTF_BRDRDEF:
 case RTF_TABSTOPDEF:
-
+#ifndef NDEBUG
+auto nEnteringToken = nToken;
+#endif
+auto nEnteringIndex = m_nTokenIndex;
 if( RTF_SWGDEFS & nToken)
 {
 if( RTF_IGNOREFLAG != GetStackPtr( -1 )->nTokenId )
@@ -368,6 +371,17 @@ void SvxRTFParser::ReadStyleTable()
 }
 }
 ReadAttr( nToken, >aAttrSet );
+if (m_nTokenIndex == nEnteringIndex - 1)
+{
+// we called SkipToken to go back one, but
+// ReadAttrs read nothing, so on next loop
+// of outer while we would end up in the
+// same state again (assert that)
+assert(nEnteringToken == GetNextToken());
+// and loop endlessly, skip format a token
+// instead to avoid that
+SkipToken(1);
+}
 break;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[andreas kainz]

 sc/uiconfig/scalc/ui/notebookbar.ui   |  175 +-
 sd/uiconfig/simpress/ui/notebookbar.ui|  205 +-
 sw/uiconfig/swriter/ui/notebookbar.ui |  168 +++--
 sw/uiconfig/swriter/ui/notebookbar_compact.ui |  166 +++--
 4 files changed, 242 insertions(+), 472 deletions(-)

New commits:
commit db9a6dbbd6fad089ba69c5e9d6967caf2230a618
Author: andreas kainz 
Date:   Tue May 15 17:48:00 2018 +0200

NB Implementation: update Menu drop down menu

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index 4c05b48aeacc..bb4e493ddfbf 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -854,7 +854,7 @@
 True
 False
 vnd.sun.star.job:alias=UpdateCheck
-~Check for Updates...
+~Check for Updates...
   
 
 
@@ -882,225 +882,167 @@
 True
 False
 
-  
-True
-False
-.uno:FontDialog
-  
-
-
-  
-True
-False
-  
-
-
-  
+  
 True
 False
 .uno:Shadowed
   
 
 
-  
+  
 True
 False
 .uno:OutlineFont
   
 
 
-  
-True
-False
-.uno:UnderlineDouble
-  
-
-
-  
+  
 True
 False
 .uno:Overline
   
 
 
-  
-True
-False
-  
-
-
-  
+  
 True
 False
-.uno:ChangeCaseToLower
   
 
 
-  
+  
 True
 False
 .uno:ChangeCaseToUpper
   
 
 
-  
-True
-False
-.uno:SmallCaps
-  
-
-
-  
-True
-False
-  
-
-
-  
-True
-False
-.uno:ParagraphDialog
-  
-
-
-  
+  
 True
 False
+.uno:ChangeCaseToLower
   
 
 
-  
-True
-False
-.uno:ParaLeftToRight
-  
-
-
-  
-True
-False
-.uno:ParaRightToLeft
-  
-
-
-  
+  
 True
 False
+.uno:ChangeCaseRotateCase
   
 
 
-  
+  
 True
 False
-.uno:DecrementLevel
   
 
 
-  
+  
 True
 False
-.uno:IncrementLevel
+.uno:ChangeCaseToSentenceCase
   
 
 
-  
+  
 True
 False
-.uno:DecrementSubLevels
+.uno:ChangeCaseToTitleCase
   
 
 
-  
+  
 True
 False
-.uno:IncrementSubLevels
+.uno:ChangeCaseToToggleCase
   
 
 
-  
+  
 True
 False
   
 
 
-  
+  
 True
 False
-.uno:BulletsAndNumberingDialog
+.uno:InsertNonBreakingSpace
   
 
 
-  
+  
 True
 False
+.uno:InsertHardHyphen
   
 
 
-  
+  
 True
 False
-.uno:MoveDown
+.uno:InsertSoftHyphen
   
 
 
-  
+  
 True
 False
-.uno:MoveUp
+.uno:InsertZWSP
   
 
 
-  
+  
 True
 False
-.uno:MoveDownSubItems
+.uno:InsertZWNBSP
   
 
 
-  
+  
 True
 False
-.uno:MoveUpSubItems
+.uno:InsertLRM
   
 
 
-  
+  
 True
 False
+.uno:InsertRLM
   
 
 
-  
+  
 True
 False
-.uno:InsertNeutralParagraph
   
 
 
-  
+  
 True
 False
+.uno:SelectAll
   
 
 
-  
+  
 True
 False
-.uno:JumpDownThisLevel
+.uno:SelectRow
   
 
 
-  
+  
 True
 False
-.uno:JumpUpThisLevel
+.uno:SelectColumn
   
 
 
-  
+  
 True
 False
-.uno:ContinueNumbering
+.uno:SelectData
   
 
 
@@ -1110,44 +1052,17 @@
   
 
 
-  
-True
-False
-.uno:SelectAll
-  
-
-
-  
-True
-False
-.uno:SelectTextMode
-  
-
-
-  
-True
-False
-.uno:ShadowCursor
-  
-
-
-  
-True
-False
-  
-
-
-  
+  
 True
 False
 vnd.sun.star.findbar:FocusToFindbar
   
 
 
-  
+  
 True
 False
-.uno:GotoPage
+   

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 07a0cb64a24bd74098ad33e476bc624a936b69b1
Author: Olivier Hallot 
Date:   Tue May 15 20:10:19 2018 +0100

Updated core
Project: help  51d800a8af9637c31b1b4c6d5bdd490f8952d218

Fix "Master Slide"

Change-Id: I766d38b014282701df34f056ae7184e4d62be6c6
Reviewed-on: https://gerrit.libreoffice.org/54397
Tested-by: Jenkins 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index f7e5c512cda2..51d800a8af96 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f7e5c512cda255e1811f0b155ec37aa3addf8831
+Subproject commit 51d800a8af9637c31b1b4c6d5bdd490f8952d218
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Olivier Hallot]

 source/text/simpress/guide/layers.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 51d800a8af9637c31b1b4c6d5bdd490f8952d218
Author: Olivier Hallot 
Date:   Tue May 15 20:10:19 2018 +0100

Fix "Master Slide"

Change-Id: I766d38b014282701df34f056ae7184e4d62be6c6
Reviewed-on: https://gerrit.libreoffice.org/54397
Tested-by: Jenkins 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/simpress/guide/layers.xhp 
b/source/text/simpress/guide/layers.xhp
index 6236bec2f..5f88358ac 100644
--- a/source/text/simpress/guide/layers.xhp
+++ b/source/text/simpress/guide/layers.xhp
@@ -54,7 +54,7 @@
 The 
Layout layer is the default workspace. The Layout 
layer determines the location of title, text, and object placeholders on your 
page.
 The 
Controls layer can be used for buttons that have been assigned an 
action, but that should not be printed. Set the layer's properties to not 
printable. Objects on the Controls layer are always in front of 
objects on other layers.
 The 
Dimension Lines layer is where you draw, for example, the 
dimension lines. By switching the layer to show or hide, you can easily switch 
these lines on and off.
-You can lock a layer 
to protect its contents, or hide a layer and its contents from view or from 
printing. When you add a new layer to a page, the layer is added to all of the 
pages in your document. However, when you add an object to a layer, it is only 
added to the current page. If you want the object to appear on all of the 
pages, add the object to the master (View - 
Master).
+You can lock a layer 
to protect its contents, or hide a layer and its contents from view or from 
printing. When you add a new layer to a page, the layer is added to all of the 
pages in your document. However, when you add an object to a layer, it is only 
added to the current page. If you want the object to appear on all of the 
pages, add the object to the master slide (View - Master 
Slide).
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[no subject]

[DaeHyun Sung]

All of my past & future contributions to LibreOffice may belicensed
under the MPLv2/LGPLv3+ dual license.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Zdeněk Crhonek]

 sc/qa/uitest/calc_tests/formatCells.py |  420 +
 1 file changed, 420 insertions(+)

New commits:
commit e6c99316fbe7ed48c6011acb109348192900ca64
Author: Zdeněk Crhonek 
Date:   Tue May 15 17:02:38 2018 +0200

uitest Calc - format Cells

Change-Id: I2a2f0515d872e1affd7c1c27eb901ea2a183114b
Reviewed-on: https://gerrit.libreoffice.org/54387
Tested-by: Jenkins 
Reviewed-by: Zdenek Crhonek 

diff --git a/sc/qa/uitest/calc_tests/formatCells.py 
b/sc/qa/uitest/calc_tests/formatCells.py
new file mode 100644
index ..ea5e9eecd90b
--- /dev/null
+++ b/sc/qa/uitest/calc_tests/formatCells.py
@@ -0,0 +1,420 @@
+# -*- tab-width: 4; indent-tabs-mode: nil; py-indent-offset: 4 -*-
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+from uitest.framework import UITestCase
+from uitest.uihelper.common import get_state_as_dict
+from uitest.uihelper.common import select_pos
+from uitest.uihelper.calc import enter_text_to_cell
+from libreoffice.calc.document import get_sheet_from_doc
+from libreoffice.calc.conditional_format import 
get_conditional_format_from_sheet
+from uitest.debug import sleep
+from libreoffice.calc.document import get_cell_by_position
+from libreoffice.uno.propertyvalue import mkPropertyValues
+
+class formatCell(UITestCase):
+def test_format_cell_numbers_tab(self):
+#numberingformatpage.ui
+calc_doc = self.ui_test.create_doc_in_start_center("calc")
+xCalcDoc = self.xUITest.getTopFocusWindow()
+gridwin = xCalcDoc.getChild("grid_window")
+document = self.ui_test.get_component()
+#select cell A1
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+#format - cell
+self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")  #tab Numbers
+xliststore1 = xDialog.getChild("categorylb")  #1st list / Category
+xliststore2 = xDialog.getChild("formatlb")  #2nd list / Format
+xdecimalsed = xDialog.getChild("decimalsed")
+xleadzerosed = xDialog.getChild("leadzerosed")
+xnegnumred = xDialog.getChild("negnumred")
+xthousands = xDialog.getChild("thousands")
+xlanguagelb = xDialog.getChild("languagelb")
+xformatted = xDialog.getChild("formatted")
+#language
+props3 = {"TEXT": "English (USA)"}
+actionProps3 = mkPropertyValues(props3)
+xlanguagelb.executeAction("SELECT", actionProps3)
+#set Number
+props = {"TEXT": "Number"}
+actionProps = mkPropertyValues(props)
+xliststore1.executeAction("SELECT", actionProps)
+#set Standard
+props2 = {"TEXT": "Standard"}
+actionProps2 = mkPropertyValues(props2)
+xliststore2.executeAction("SELECT", actionProps2)
+#other properties
+xdecimalsed.executeAction("UP", tuple())
+xleadzerosed.executeAction("UP", tuple())
+xnegnumred.executeAction("CLICK", tuple())
+xthousands.executeAction("CLICK", tuple())
+#format   #,#00.0;[RED]-#,#00.0
+self.assertEqual(get_state_as_dict(xformatted)["Text"], 
"#,#00.0;[RED]-#,#00.0")
+#save
+xOk = xDialog.getChild("ok")
+self.ui_test.close_dialog_through_button(xOk)
+#verify
+gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "A1"}))
+#format - cell
+self.ui_test.execute_dialog_through_command(".uno:FormatCellDialog")
+xDialog = self.xUITest.getTopFocusWindow()
+xTabs = xDialog.getChild("tabcontrol")
+select_pos(xTabs, "0")  #tab Numbers
+xliststore1 = xDialog.getChild("categorylb")  #1st list / Category
+xliststore2 = xDialog.getChild("formatlb")  #2nd list / Format
+xdecimalsed = xDialog.getChild("decimalsed")
+xleadzerosed = xDialog.getChild("leadzerosed")
+xnegnumred = xDialog.getChild("negnumred")
+xthousands = xDialog.getChild("thousands")
+xlanguagelb = xDialog.getChild("languagelb")
+xformatted = xDialog.getChild("formatted")
+
+self.assertEqual(get_state_as_dict(xliststore1)["SelectEntryText"], 
"Number")
+self.assertEqual(get_state_as_dict(xlanguagelb)["SelectEntryText"], 
"\u202aEnglish (USA)\u202c")
+self.assertEqual(get_state_as_dict(xdecimalsed)["Text"], "1")
+self.assertEqual(get_state_as_dict(xleadzerosed)["Text"], "2")
+self.assertEqual(get_state_as_dict(xnegnumred)["Selected"], "true")
+self.assertEqual(get_state_as_dict(xthousands)["Selected"], "true")
+self.assertEqual(get_state_as_dict(xformatted)["Text"], 

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

[Eike Rathke]

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

New commits:
commit ed9416446def1a9c9af3869c3113d041ad33884e
Author: Eike Rathke 
Date:   Tue May 15 20:20:03 2018 +0200

Resolves: tdf#117617 Add Iloko [ilo-PH] to language list

Change-Id: If8444a847fa652de8b7b834e08c3e5116721c987

diff --git a/i18nlangtag/source/isolang/isolang.cxx 
b/i18nlangtag/source/isolang/isolang.cxx
index 38e8f6d89476..0570be841736 100644
--- a/i18nlangtag/source/isolang/isolang.cxx
+++ b/i18nlangtag/source/isolang/isolang.cxx
@@ -676,6 +676,7 @@ static IsoLanguageCountryEntry const aImplIsoLangEntries[] =
 { LANGUAGE_USER_ARMENIAN_CLASSIC,  "xcl", "AM", k0},
 { LANGUAGE_USER_JUHOAN,"ktz", "NA", k0},
 { LANGUAGE_USER_NARO,  "nhr", "BW", k0},
+{ LANGUAGE_USER_ILOKO, "ilo", "PH", k0},
 { LANGUAGE_MULTIPLE,   "mul", ""  , k0},// 
multiple languages, many languages are used
 { LANGUAGE_UNDETERMINED,   "und", ""  , k0},// 
undetermined language, language cannot be identified
 { LANGUAGE_NONE,   "zxx", ""  , k0},// added 
to ISO 639-2 on 2006-01-11: Used to declare the absence of linguistic 
information
diff --git a/include/i18nlangtag/lang.h b/include/i18nlangtag/lang.h
index ae7235288cfb..84adccafc6bf 100644
--- a/include/i18nlangtag/lang.h
+++ b/include/i18nlangtag/lang.h
@@ -744,6 +744,7 @@ namespace o3tl
 #define LANGUAGE_USER_MALAY_ARABIC_BRUNEI   LanguageType(0x843E)  /* 
makeLangID( 0x21, getPrimaryLanguage( LANGUAGE_MALAY_BRUNEI_DARUSSALAM)) */
 #define LANGUAGE_USER_JUHOANLanguageType(0x06A1)
 #define LANGUAGE_USER_NARO  LanguageType(0x06A2)
+#define LANGUAGE_USER_ILOKO LanguageType(0x06A3)
 
 
 /* XXX Add new user defined LCIDs ^^^ there.
diff --git a/svtools/inc/langtab.hrc b/svtools/inc/langtab.hrc
index 68e64d8a238a..ff23fc65f31c 100644
--- a/svtools/inc/langtab.hrc
+++ b/svtools/inc/langtab.hrc
@@ -414,7 +414,8 @@ const std::pair 
STR_ARR_SVT_LANGUAGE_TABLE[] =
 { 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 },
-{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO }
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Naro") , LANGUAGE_USER_NARO },
+{ NC_("STR_ARR_SVT_LANGUAGE_TABLE", "Iloko") , LANGUAGE_USER_ILOKO }
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fc3e676f56eda44e32d00fe2eea6ae479a2dd35c
Author: Olivier Hallot 
Date:   Tue May 15 17:36:37 2018 -0300

Updated core
Project: help  f3003dafc6568878d1ea4cceb658506f77567852

Add digital signature entry in help contents tree

Preparation for more on digital signatures, signature lines, etc...

Change-Id: I2cf8b5253f8c539850bb968ff1b14e85da06d4a1
Reviewed-on: https://gerrit.libreoffice.org/54402
Tested-by: Jenkins 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 35e61539e7c5..f3003dafc656 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 35e61539e7c5da38d61a042e9740494dead42ced
+Subproject commit f3003dafc6568878d1ea4cceb658506f77567852
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/auxiliary

[Olivier Hallot]

 source/auxiliary/shared.tree |4 
 1 file changed, 4 insertions(+)

New commits:
commit f3003dafc6568878d1ea4cceb658506f77567852
Author: Olivier Hallot 
Date:   Tue May 15 17:36:37 2018 -0300

Add digital signature entry in help contents tree

Preparation for more on digital signatures, signature lines, etc...

Change-Id: I2cf8b5253f8c539850bb968ff1b14e85da06d4a1
Reviewed-on: https://gerrit.libreoffice.org/54402
Tested-by: Jenkins 
Reviewed-by: Olivier Hallot 

diff --git a/source/auxiliary/shared.tree b/source/auxiliary/shared.tree
index 1d24b106f..e87fccce3 100644
--- a/source/auxiliary/shared.tree
+++ b/source/auxiliary/shared.tree
@@ -107,6 +107,10 @@
 Switching Between 
Insert Mode and Overwrite Mode
 Using 
Toolbars

+
+About Digital 
Signatures
+Applying Digital 
Signatures
+

 Printing Address 
Labels
 Printing in Black 
and White
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: String Length and Array Indexes in macros

[Eike Rathke]

Hi Andrew,

On Tuesday, 2018-05-15 13:43:15 +, Andrew Pitonyak wrote:

> Last time I documented Strings and arrays, an array index was limited to
> +/-32K and a string was similarly limited.
> 
> I am now documenting them again and I am hoping that someone knows off hand
> what the new limitations are so that I do not need to scour the code to find
> out. My best guess is that this now uses a 32-bit long, so, +/- 2G.

While internally an SbxArray can handle uint32 indices, there still are
the same limitations. For example DimArray() is limited to uint16
dimensions. The Array() function could digest uint16 (=64K) elements,
but storage index still uses a short int16. Most code has been
untouched, there still may be some other places that access things
through a short (int16) which limits the reliable size to 32K elements.

For strings OUString is used, which theoretically can hold int32 (=2G)
UTF-16 code points during runtime, so that's probably the most
interesting change (well, at least compared to 6 years ago or so).

BUT, probably for some (stream?) compatibility (or oversight?), for
example the TypeLen() function still returns an int16 value because the
result is stored as an int16 (while seeing that, I think it could be
fixed). Also, for persistent storage UTF-16 may have to be converted to
a different encoding, which may halve or third the theoretical capacity
depending on the actual characters used.

Hope that helps

  Eike

-- 
LibreOffice Calc developer. Number formatter stricken i18n transpositionizer.
GPG key 0x6A6CD5B765632D3A - 2265 D7F3 A7B0 95CC 3918  630B 6A6C D5B7 6563 2D3A
Care about Free Software, support the FSFE https://fsfe.org/support/?erack


signature.asc
Description: PGP signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: helpcontent2

[Olivier Hallot]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ab523a07715b6bb6cd9d0085c85f40c2b75ff7bb
Author: Olivier Hallot 
Date:   Tue May 15 00:33:33 2018 +0100

Updated core
Project: help  35e61539e7c5da38d61a042e9740494dead42ced

Fix external reference to blog post on pivot charts

Change-Id: Icabfdcce2ae18848793bd467fd606e20afa97f5f
Reviewed-on: https://gerrit.libreoffice.org/54347
Tested-by: Jenkins 
Reviewed-by: Olivier Hallot 

diff --git a/helpcontent2 b/helpcontent2
index 51d800a8af96..35e61539e7c5 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 51d800a8af9637c31b1b4c6d5bdd490f8952d218
+Subproject commit 35e61539e7c5da38d61a042e9740494dead42ced
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: source/text

[Olivier Hallot]

 source/text/scalc/guide/pivotchart.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 35e61539e7c5da38d61a042e9740494dead42ced
Author: Olivier Hallot 
Date:   Tue May 15 00:33:33 2018 +0100

Fix external reference to blog post on pivot charts

Change-Id: Icabfdcce2ae18848793bd467fd606e20afa97f5f
Reviewed-on: https://gerrit.libreoffice.org/54347
Tested-by: Jenkins 
Reviewed-by: Olivier Hallot 

diff --git a/source/text/scalc/guide/pivotchart.xhp 
b/source/text/scalc/guide/pivotchart.xhp
index 16377f33f..66d42375c 100644
--- a/source/text/scalc/guide/pivotchart.xhp
+++ b/source/text/scalc/guide/pivotchart.xhp
@@ -35,7 +35,7 @@
 
 
 
-https://tomazvajngerl.blogspot.com.br/2017/03/pivot-charts-in-libreoffice-part-1.html;
 name="Tomasz Vajngerl blog">Technical details on %PRODUCTNAME pivot chart 
implementation.
+https://tomazvajngerl.blogspot.com/2017/03/pivot-charts-in-libreoffice-part-1.html;
 name="Tomaž Vajngerl blog">Technical details on %PRODUCTNAME pivot chart 
implementation.
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Initializing default paragraph properties in writerfilter

[Miklos Vajna]

Hi,

On Mon, May 14, 2018 at 09:37:56PM +0300, serdar tunc  
wrote:
>  Hello, I am working on tdf#82175 and I should initialize default paragraph
> line spacing in filters but I dont know how to do it. I've tried to
> change sw/source/core/doc/DocumentStylePoolManager.cxx but its Writer's
> default. How can i set default paragraph line spacing for only writerfilter?

See if StyleSheetTable::applyDefaults() could set the relevant paragraph
property on m_pImpl->m_xTextDefaults in
writerfilter/source/dmapper/StyleSheetTable.cxx.

Regards,

Miklos


signature.asc
Description: Digital signature
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] help.git: source/text

[Adolfo Jayme Barrientos]

 source/text/shared/explorer/database/rep_main.xhp |4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit c3b0090070148eeb995eaf4d0dfb19c7e462
Author: Adolfo Jayme Barrientos 
Date:   Tue May 15 20:00:02 2018 -0500

Since LO 4.4, there’s not Edit File icon in Writer by default

Change-Id: I96b8a212df54017f67994195a5d775f2704e93b7

diff --git a/source/text/shared/explorer/database/rep_main.xhp 
b/source/text/shared/explorer/database/rep_main.xhp
index 2bd292f73..449311889 100644
--- a/source/text/shared/explorer/database/rep_main.xhp
+++ b/source/text/shared/explorer/database/rep_main.xhp
@@ -151,9 +151,7 @@
   If the 
database contents did change, execute the report again to update the result 
report.automatic? message?
   To edit a report
   First 
decide if you want to edit the generated report, which is a static Writer 
document, or if you want to edit the Report Builder view and then generate a 
new report based on the new design.
-  The 
Writer document is opened read-only. To edit the Writer document, click Edit 
File
-Icon
-on the Standard toolbar.saved automatically with the 
Base file?
+  The 
Writer document is opened read-only. To edit the Writer document, click 
Edit Document on the information bar, or choose Edit - Edit 
Mode.saved automatically with the Base 
file?
   If you 
want to edit the Report Builder view, you can change some of its 
properties.
   Click in 
the Details area. Then in the Properties window, change some properties, for 
example the background color.
   After 
finishing, click the Execute Report icon
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 34036759644328a1e58521d6a6123b91ea2d0ebf
Author: Adolfo Jayme Barrientos 
Date:   Tue May 15 20:00:02 2018 -0500

Updated core
Project: help  c3b0090070148eeb995eaf4d0dfb19c7e462

Since LO 4.4, there’s not Edit File icon in Writer by default

Change-Id: I96b8a212df54017f67994195a5d775f2704e93b7

diff --git a/helpcontent2 b/helpcontent2
index f3003dafc656..c3b009007014 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f3003dafc6568878d1ea4cceb658506f77567852
+Subproject commit c3b0090070148eeb995eaf4d0dfb19c7e462
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tomaž Vajngerl]

 sw/qa/extras/globalfilter/globalfilter.cxx |   76 +
 1 file changed, 35 insertions(+), 41 deletions(-)

New commits:
commit b2b1d0a4c4ffcba0e32e5909a61de43eeaf98c25
Author: Tomaž Vajngerl 
Date:   Tue May 15 22:16:53 2018 +0900

sw: improvements of globalfilter test

- check if linked graphic is registered in LinkManager
- remove setting of graphic cache size as it doesn't have any
  effect anymore
- improve asserts for Graphic / XGraphic objects

Change-Id: I97e2772e2a8209ff61975c273ec27401c3e7a976
Reviewed-on: https://gerrit.libreoffice.org/54373
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index 2145eb9fde55..eab2037d697e 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -12,10 +12,11 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -30,7 +31,7 @@ class Test : public SwModelTestBase
 public:
 Test() : SwModelTestBase() {}
 
-void testSwappedOutImageExport();
+void testEmbeddedGraphicRoundtrip();
 void testLinkedGraphicRT();
 void testImageWithSpecialID();
 void testGraphicShape();
@@ -45,7 +46,7 @@ public:
 void testRedlineFlags();
 
 CPPUNIT_TEST_SUITE(Test);
-CPPUNIT_TEST(testSwappedOutImageExport);
+CPPUNIT_TEST(testEmbeddedGraphicRoundtrip);
 CPPUNIT_TEST(testLinkedGraphicRT);
 CPPUNIT_TEST(testImageWithSpecialID);
 CPPUNIT_TEST(testGraphicShape);
@@ -60,7 +61,7 @@ public:
 CPPUNIT_TEST_SUITE_END();
 };
 
-void Test::testSwappedOutImageExport()
+void Test::testEmbeddedGraphicRoundtrip()
 {
 const char* aFilterNames[] = {
 "writer8",
@@ -73,11 +74,6 @@ void Test::testSwappedOutImageExport()
 {
 // Check whether the export code swaps in the image which was swapped 
out before by auto mechanism
 
-// Set cache size to a very small value to make sure one of the images 
is swapped out
-std::shared_ptr< comphelper::ConfigurationChanges > 
batch(comphelper::ConfigurationChanges::create());
-
officecfg::Office::Common::Cache::GraphicManager::TotalCacheSize::set(static_cast(1),
 batch);
-batch->commit();
-
 if (mxComponent.is())
 mxComponent->dispose();
 mxComponent = 
loadFromDesktop(m_directories.getURLFromSrc("/sw/qa/extras/globalfilter/data/document_with_two_images.odt"),
 "com.sun.star.text.TextDocument");
@@ -110,12 +106,12 @@ void Test::testSwappedOutImageExport()
 {
 uno::Reference xGraphic;
 XPropSet->getPropertyValue("Graphic") >>= xGraphic;
-CPPUNIT_ASSERT(xGraphic.is());
-CPPUNIT_ASSERT(xGraphic->getType() != graphic::GraphicType::EMPTY);
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
graphic::GraphicType::PIXEL, xGraphic->getType());
 uno::Reference xBitmap(xGraphic, uno::UNO_QUERY);
 CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xBitmap.is());
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(610), xBitmap->getSize().Width );
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(381), xBitmap->getSize().Height );
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(610), xBitmap->getSize().Width);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(381), xBitmap->getSize().Height);
 }
 
 // Second Image
@@ -126,12 +122,12 @@ void Test::testSwappedOutImageExport()
 {
 uno::Reference xGraphic;
 XPropSet->getPropertyValue("Graphic") >>= xGraphic;
-CPPUNIT_ASSERT(xGraphic.is());
-CPPUNIT_ASSERT(xGraphic->getType() != graphic::GraphicType::EMPTY);
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
graphic::GraphicType::PIXEL, xGraphic->getType());
 uno::Reference xBitmap(xGraphic, uno::UNO_QUERY);
 CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xBitmap.is());
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(900), xBitmap->getSize().Width );
-CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(600), xBitmap->getSize().Height );
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(900), xBitmap->getSize().Width);
+CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(600), xBitmap->getSize().Height);
 }
 }
 }
@@ -176,6 +172,7 @@ void Test::testLinkedGraphicRT()
 
 // Find 

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

[Tomaž Vajngerl]

 sw/qa/extras/globalfilter/globalfilter.cxx |  118 ++---
 1 file changed, 61 insertions(+), 57 deletions(-)

New commits:
commit 29cebedfbdc8a8d3bf47e9a8148dc081bf86eb10
Author: Tomaž Vajngerl 
Date:   Tue May 15 22:25:46 2018 +0900

sw: cleanup globalfilter test

- use OUString for filter names
- use modern iteration through filter names
- no change to the tests

Change-Id: Idab4183efe2b489b91b4f3c96e7cb1d639628766
Reviewed-on: https://gerrit.libreoffice.org/54374
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/sw/qa/extras/globalfilter/globalfilter.cxx 
b/sw/qa/extras/globalfilter/globalfilter.cxx
index eab2037d697e..60b3d083a0c4 100644
--- a/sw/qa/extras/globalfilter/globalfilter.cxx
+++ b/sw/qa/extras/globalfilter/globalfilter.cxx
@@ -63,26 +63,27 @@ public:
 
 void Test::testEmbeddedGraphicRoundtrip()
 {
-const char* aFilterNames[] = {
+OUString aFilterNames[] = {
 "writer8",
 "Rich Text Format",
 "MS Word 97",
 "Office Open XML Text",
 };
 
-for( size_t nFilter = 0; nFilter < SAL_N_ELEMENTS(aFilterNames); ++nFilter 
)
+for (OUString const & rFilterName : aFilterNames)
 {
 // Check whether the export code swaps in the image which was swapped 
out before by auto mechanism
 
 if (mxComponent.is())
 mxComponent->dispose();
+
 mxComponent = 
loadFromDesktop(m_directories.getURLFromSrc("/sw/qa/extras/globalfilter/data/document_with_two_images.odt"),
 "com.sun.star.text.TextDocument");
 
 // Export the document and import again for a check
 uno::Reference xStorable(mxComponent, 
uno::UNO_QUERY);
 
 utl::MediaDescriptor aMediaDescriptor;
-aMediaDescriptor["FilterName"] <<= 
OUString::createFromAscii(aFilterNames[nFilter]);
+aMediaDescriptor["FilterName"] <<= rFilterName;
 
 utl::TempFile aTempFile;
 aTempFile.EnableKillingFile();
@@ -95,7 +96,7 @@ void Test::testEmbeddedGraphicRoundtrip()
 uno::Reference 
xDrawPageSupplier(mxComponent, uno::UNO_QUERY);
 uno::Reference 
xDraws(xDrawPageSupplier->getDrawPage(), uno::UNO_QUERY);
 
-const OString sFailedMessage = OString("Failed on filter: ") + 
aFilterNames[nFilter];
+const OString sFailedMessage = OString("Failed on filter: ") + 
rFilterName.toUtf8();
 CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(2), xDraws->getCount());
 
 // First image
@@ -134,28 +135,26 @@ void Test::testEmbeddedGraphicRoundtrip()
 
 void Test::testLinkedGraphicRT()
 {
-const std::vector aFilterNames = {
+const OUString aFilterNames[] = {
 "writer8",
 //"Rich Text Format",  Note: picture is there, but SwGrfNode is not 
found?
 "MS Word 97",
 "Office Open XML Text",
 };
 
-for( size_t nFilter = 0; nFilter < aFilterNames.size(); ++nFilter )
+for (OUString const & rFilterName : aFilterNames)
 {
 if (mxComponent.is())
 mxComponent->dispose();
 mxComponent = 
loadFromDesktop(m_directories.getURLFromSrc("/sw/qa/extras/globalfilter/data/document_with_linked_graphic.odt"),
 "com.sun.star.text.TextDocument");
 
-const OString sFailedMessage = OString("Failed on filter: ")
-+ OUStringToOString(aFilterNames[nFilter], 
RTL_TEXTENCODING_ASCII_US);
-
+const OString sFailedMessage = OString("Failed on filter: ") + 
rFilterName.toUtf8();
 
 // Export the document and import again for a check
 uno::Reference xStorable(mxComponent, 
uno::UNO_QUERY);
 
 utl::MediaDescriptor aMediaDescriptor;
-aMediaDescriptor["FilterName"] <<= aFilterNames[nFilter];
+aMediaDescriptor["FilterName"] <<= rFilterName;
 
 utl::TempFile aTempFile;
 aTempFile.EnableKillingFile();
@@ -173,9 +172,9 @@ void Test::testLinkedGraphicRT()
 // Find the image
 bool bImageFound = false;
 Graphic aGraphic;
-for( sal_uLong nIndex = 0; nIndex < aNodes.Count(); ++nIndex)
+for (sal_uLong nIndex = 0; nIndex < aNodes.Count(); ++nIndex)
 {
-if( aNodes[nIndex]->IsGrfNode() )
+if (aNodes[nIndex]->IsGrfNode())
 {
 SwGrfNode* pGrfNode = aNodes[nIndex]->GetGrfNode();
 CPPUNIT_ASSERT(pGrfNode);
@@ -185,6 +184,7 @@ void Test::testLinkedGraphicRT()
 bImageFound = true;
 }
 }
+
 CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), bImageFound);
 
 CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
GraphicType::Bitmap, aGraphic.GetType());
@@ -203,14 +203,14 @@ void Test::testImageWithSpecialID()
 // Check how LO handles when the imported graphic's ID is different from 
that one
 // which is generated by LO.
 
-const char* aFilterNames[] = {
+const 

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

[Tomaž Vajngerl]

 chart2/source/view/main/VButton.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit d57c6f5d44ec7a8dff2121bd19103804329af66a
Author: Tomaž Vajngerl 
Date:   Wed May 16 12:36:28 2018 +0900

tdf#117596 set the size for Asian and Complex char height too

Change-Id: I703fc4d1cf34747d924a7fa44913a4bfe9bff67b
Reviewed-on: https://gerrit.libreoffice.org/54406
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/chart2/source/view/main/VButton.cxx 
b/chart2/source/view/main/VButton.cxx
index 54dfdbfe202b..0be4b1a3c2b0 100644
--- a/chart2/source/view/main/VButton.cxx
+++ b/chart2/source/view/main/VButton.cxx
@@ -109,6 +109,8 @@ void VButton::createShapes(const 
uno::Reference& xTextProp)
 
 tPropertyNameValueMap aTextValueMap;
 aTextValueMap["CharHeight"] <<= 10.0f;
+aTextValueMap["CharHeightAsian"] <<= 10.0f;
+aTextValueMap["CharHeightComplex"] <<= 10.0f;
 aTextValueMap["FillColor"] <<= m_nBGColor;
 aTextValueMap["FillStyle"] <<= drawing::FillStyle_SOLID;
 aTextValueMap["LineColor"] <<= sal_Int32(0xcc);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: loleaflet/README

[Mike Kaganski]

 loleaflet/README |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4c8a58db0ee1136d78320af14fc550b7ad177450
Author: Mike Kaganski 
Date:   Sun Apr 15 20:15:52 2018 +0100

loolwsd -> wsd

Change-Id: I2e5fa1d9729e21dbbfea4853d57c68d9dfa16f8d
Reviewed-on: https://gerrit.libreoffice.org/52920
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/loleaflet/README b/loleaflet/README
index 0b71b24c7..afc29f8c2 100644
--- a/loleaflet/README
+++ b/loleaflet/README
@@ -2,7 +2,7 @@ Leaflet platform for LibreOffice Online
 
 
 This is the client part of LibreOffice Online.  For the server part, see the
-../loolwsd/README, and install it first.
+../wsd/README, and install it first.
 
 Build dependencies
 --
@@ -79,7 +79,7 @@ To see an example:
 
 Note that this will, by default, set the loolwsd's file server's root to the 
parent directory of loolwsd,
 which means you can access all the files in loleaflet using /loleaflet/ path. 
It is advised to set
-file_server_root_path manually for more control. See loolwsd/README for more 
information.
+file_server_root_path manually for more control. See wsd/README for more 
information.
 
 * open dist/loleaflet.html through loolwsd's fileserver
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Justin Luth]

 svl/source/items/itemprop.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 5dcb065d24fd9b57b6dc65a19a8a8c8bbaa22c44
Author: Justin Luth 
Date:   Tue May 15 10:15:01 2018 +0300

NFC: unassigned variable pNewItem is always nullptr

In 2015 commit 2ebd79b3d214c62c0997606115ebc50700d6a760 a
possible initialization of the variable was removed. So
at this point pNewItem must return false.

Change-Id: I5af9d8440463c96323c38a01f255c1dbb0113e09
Reviewed-on: https://gerrit.libreoffice.org/54395
Reviewed-by: Noel Grandin 
Tested-by: Jenkins 
Reviewed-by: Justin Luth 

diff --git a/svl/source/items/itemprop.cxx b/svl/source/items/itemprop.cxx
index fd22a4f68733..98c19b200d90 100644
--- a/svl/source/items/itemprop.cxx
+++ b/svl/source/items/itemprop.cxx
@@ -218,7 +218,7 @@ void SfxItemPropertySet::setPropertyValue( const 
SfxItemPropertySimpleEntry& rEn
 SfxItemState eState = rSet.GetItemState( rEntry.nWID, true,  );
 if (SfxItemState::SET != eState && SfxItemPool::IsWhich(rEntry.nWID))
 pItem = ()->GetDefaultItem(rEntry.nWID);
-if(!pNewItem && pItem)
+if (pItem)
 {
 pNewItem.reset(pItem->Clone());
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-bugs] [Bug 117606] Problem opening excelfile edited with Libreoffice calc in MS excel 2010 - warning /Damaged file...

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117606

sverre48  changed:

   What|Removed |Added

 CC||sverr...@gmail.com

--- Comment #2 from sverre48  ---
Created attachment 142104
  --> https://bugs.documentfoundation.org/attachment.cgi?id=142104=edit
Version history in dropbox, created August 22, 2017

The file was created last Summer (august 22) using the latest published
libreoffice version at that time (August 22, 2017). So it was Libreoffice5.x
and always save and work only with .xlsx format. I have also set up this as
default but that information you are welcome to find out, yourself. I only
report this problem. The data is probably copied from some web source/page and
sorted using libreoffice5 calc.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103435] [META] Sidebar new decks/tabs

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=103435
Bug 103435 depends on bug 117186, which changed state.

Bug 117186 Summary: Sidebar: Shapes deck should fill the whole sidebar
https://bugs.documentfoundation.org/show_bug.cgi?id=117186

   What|Removed |Added

 Status|ASSIGNED|RESOLVED
 Resolution|--- |FIXED

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 42949] accelerating compile times by removing unnecessary header #include

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=42949

--- Comment #73 from Commit Notification 
 ---
Gabor Kelemen committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=1c2d8e870cc09e883bc7d53ff6fdefa6c9092a33

tdf#42949 Fix IWYU warnings in sc/inc/columniterator.hxx

It will be available in 6.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 42949] accelerating compile times by removing unnecessary header #include

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=42949

--- Comment #74 from Commit Notification 
 ---
Gabor Kelemen committed a patch related to this issue.
It has been pushed to "master":

http://cgit.freedesktop.org/libreoffice/core/commit/?id=8713c1ffd852817404447a507a21fc4a613914d9

tdf#42949 Fix IWYU warnings in sc/inc/e*

It will be available in 6.1.0.

The patch should be included in the daily builds available at
http://dev-builds.libreoffice.org/daily/ in the next 24-48 hours. More
information about daily builds can be found at:
http://wiki.documentfoundation.org/Testing_Daily_Builds

Affected users are encouraged to test the fix and report feedback.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 84703] VIEWING: Erratic display of slide content in Notes mode

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=84703

--- Comment #8 from Timur  ---
Repro in 6.1+.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117224] CheckPoint EndPoint Security quarantines SImpress.exe and SBase.exe due to icon

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117224

Buovjaga  changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 Resolution|--- |NOTOURBUG

--- Comment #3 from Buovjaga  ---
Ok, so report it as a false positive to CheckPoint.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 116916] Icon themes missing on LibreOffice Vanilla from macOS appstore

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=116916

--- Comment #12 from Tor Lillqvist  ---
No responses to my earlier questions, and this has been marked as a duplicate
of another bug, and that bug apparently is fixed by the colibre icon set, which
is present in master only, so doesn't really help the 6.0 branch. Thus it seems
that I will continue to use just --with-theme=tango when building LibreOffice
Vanilla from the 6.0 branch.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117618] Crash after opening too many files

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117618

Telesto  changed:

   What|Removed |Added

 CC||tele...@surfxs.nl

--- Comment #2 from Telesto  ---
Maybe bug 109852

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117224] CheckPoint EndPoint Security quarantines SImpress.exe and SBase.exe due to icon

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117224

--- Comment #2 from Philipp Gühring  ---
The "Malware Report" says: "Suspicious activity observed ( Looks like a known
icon: office2013_wordicon (14_204:12) )"

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117224] CheckPoint EndPoint Security quarantines SImpress.exe and SBase.exe due to icon

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117224

Buovjaga  changed:

   What|Removed |Added

 Status|NEEDINFO|UNCONFIRMED
 Ever confirmed|1   |0

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117618] New: Crash after opening too many files

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117618

Bug ID: 117618
   Summary: Crash after opening too many files
   Product: LibreOffice
   Version: 5.4.6.2 release
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: a...@janila.de

Description:
After accidentally marking too many files in the 'open file' window, LO crashed
see
crash report


Steps to Reproduce:
1. select open file
2. select "too many" files  - here 265
3. open

Actual Results:  
crash

Expected Results:
warning: "too many files - maximum ..."


Reproducible: Always


User Profile Reset: No



Additional Info:
crashreport.libreoffice.org/stats/crash_details/55b37536-8014-499a-8d17-c7c9d6332ce5


User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36
(KHTML, like Gecko) Chrome/66.0.3359.139 Safari/537.36

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117618] Crash after opening too many files

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117618

a...@janila.de changed:

   What|Removed |Added

Crash report or||crashreport.libreoffice.org
crash signature||/stats/crash_details/55b375
   ||36-8014-499a-8d17-c7c9d6332
   ||ce5

--- Comment #1 from a...@janila.de ---
First crash report - sorry for any ignorance on my side.

Great NAMASTE to all developers!

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117427] Get and Set GraphicURL using te API no longer working

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117427

--- Comment #7 from Fernand  ---
Tomaz,
Sorry my stupid mistake a was misslead by the UI properties who not shows the
OriginURL in the "LINKfield".
It works indeed BUT as i sayed the OriginURL is not visible as "LINK" in the
image UI properties.
Maybe my line 130 is faulty and i need to replace the Graphic in a other way to
make the OriginURL visible in the UI properties ?

oGraphic01.graphic =
getgraphfromurlAsLink(converttoURL("http://pmg.pmgroup.be/enews/deroulard/exploit1.jpg;)
) 

Do you mean that "queryGraphicDescriptor" is a waste off time and we must
forget this quering without loading
BTW: this querying is no longer possible because there we need also a "URL" to
do the query.

Grtz

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117614] GraphicExporter not always export correctly

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117614

--- Comment #1 from Fernand  ---
(when the image is selected) in the UI) can also reproduce the same behaviour
when using the "Save" option .

- when not changing the dimensions it works fine
- change the width from 10cm to 5cm and the image is misformed as with using
the API

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117614] GraphicExporter not always export correctly

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117614

Fernand  changed:

   What|Removed |Added

Version|6.1.0.0.alpha1+ Master  |unspecified

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 109852] CRASH: When creating more than 85 Writer/ Calc documents with x86 and x64 build

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=109852

Dieter Praas  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=11
   ||7618

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 109530] [META] File opening issues

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=109530

Dieter Praas  changed:

   What|Removed |Added

 Depends on||117618


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=117618
[Bug 117618] Crash after opening too many files
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117618] Crash after opening too many files

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117618

Dieter Praas  changed:

   What|Removed |Added

 Status|UNCONFIRMED |NEW
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=10
   ||9852
 Blocks||109530
 Ever confirmed|0   |1

--- Comment #4 from Dieter Praas  ---
I confirm this bug with 

Version: 5.4.6.2 (x64)
Build-ID: 4014ce260a04f1026ba855d3b8d91541c224eab8
CPU-Threads: 4; BS: Windows 6.19; UI-Render: Standard; 
Gebietsschema: de-DE (de_DE); Calc: group

I tried to open 193 documents. Crash after 82 documents.


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=109530
[Bug 109530] [META] File opening issues
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117468] FILESAVE Writer crashes trying to save image as BMP, PNG, TIFF, JPEG

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117468

--- Comment #5 from Marco Cecchetti  ---
So the dialog was already used by Draw in LO 5.X, and it had the same issue
reported above.

Essentially we end up using a too big scaling factor and try to handle an image
of > 1 GB (in the TIFF case is > 500 GB).

The solution is to limit the input for the dialog to sensible values.

I provided a proof of concept patch: https://gerrit.libreoffice.org/#/c/54361

If you can think of a better max image size value or better criteria, feel free
to modify it. ;-)

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117624] New: error in mail merge when sending emails

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117624

Bug ID: 117624
   Summary: error in mail merge when sending emails
   Product: LibreOffice
   Version: 6.0.4.2 release
  Hardware: All
OS: Windows (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Base
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: fpag...@pep.it

Description:
I want to send by email a personalized document to a list of customers.
Following
https://wiki.documentfoundation.org/images/3/3c/WG4211-UsingMailMerge.pdf, I
created the plain document using Writer and I made the list of recipients using
Calc. If I run the mail merger to create a printed version all is ok, but when
I asked to send te document by email a lot of difficulties arose:
1) since I am using SMPTP_SSL, I had to make the changes described in
https://cgit.freedesktop.org/libreoffice/core/commit/scripting/source/pyprov/mailmerge.py?id=036b51dbc49b533d1db773d8627d56ab86bca487
2) each document is sent to the email address of the next row in the database
3) even if I asked to not use a greeting, a standargreeting was added on top of
the email.
I am using Libreoffice for Windows (10) Version: 6.0.4.2 (x64) Build ID:
9b0d9b32d5dcda91d2f1a96dc04c645c450872bf.

Steps to Reproduce:
1. create a document in Writer
2. create a list in Calc
3. run the mail merge requesting to send an email to all

Actual Results:  
The email is sent to the email address of the next row

Expected Results:
The email is sent to the email address of the actual row


Reproducible: Always


User Profile Reset: No



Additional Info:


User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:60.0) Gecko/20100101
Firefox/60.0

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117625] New: FILESAVE Writer freezes when exporting to PDF

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117625

Bug ID: 117625
   Summary: FILESAVE Writer freezes when exporting to PDF
   Product: LibreOffice
   Version: 6.0.4.2 release
  Hardware: x86-64 (AMD64)
OS: Linux (All)
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: Writer
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: s...@limbozz.com

Created attachment 142114
  --> https://bugs.documentfoundation.org/attachment.cgi?id=142114=edit
ODT file that causes freeze

I'm converting ODT files to PDF, using LO Writer through unoconv. The ODT files
are generated by Appy Pod[1].

In most cases, the above works perfectly fine, however with some documents, LO
Writer freezes/takes 100% CPU load on one core, without crashing or responding
at all.

unoconv command line to reproduce: (download the file from the attachments)

  unoconv -f pdf -vvv directive_1640_56.odt

Output on my system:

  Verbosity set to level 3 
  Using office base path: /usr/lib64/libreoffice
  Using office binary path: /usr/lib/libreoffice/program
  DEBUG: Connection type: 
  socket,host=127.0.0.1,port=2002,tcpNoDelay=1;urp;StarOffice.ComponentContext
  DEBUG: Existing listener not found.
  DEBUG: Launching our own listener using 
  /usr/lib/libreoffice/program/soffice.bin.
  LibreOffice listener successfully started. (pid=31074)
  Input file: directive_1640_56.odt

Version 5.4.6.2 40m0(Build:2) is affected as well.

[1] http://appyframework.org/pod.html

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117624] error in mail merge when sending emails

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117624

--- Comment #2 from Francesco Pagano  ---
(In reply to Francesco Pagano from comment #1)
> Created attachment 142113 [details]
> the screenshot

I correct myself: the third point was my mistake.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 40929] Restart numbering is not saved for the first list in a sub-document ( when viewed from master)

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=40929

--- Comment #14 from Uwe Kindler  ---
After 7 years the bug is still there and I know that nobody cares. 

This bug is definitely still there in 5.1.5.2

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117623] Draw: need some sort of master page facility or linked fields

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117623

V Stuart Foote  changed:

   What|Removed |Added

 Status|UNCONFIRMED |RESOLVED
 CC||vstuart.fo...@utsa.edu
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=44
   ||267
 Resolution|--- |WORKSFORME

--- Comment #1 from V Stuart Foote  ---
Draw already has the Master View structure, with a default layer tab of
Background objects, some help in the Draw guide. [1]

Toggle from menu View -> [Normal | Master]

Fields and Draw objects--added to the Master will appear on each page of the
drawing document. Multiple Master Views can be laid out for use in a set of
drawings.

Saving to Template--ODF Drawing Template (.otg)--allows reuse for multiple
projects.

But of course unless linked to an external database the field values are
internal to each drawing document. Also, while internal precision remains low,
see bug 44267 LibreOffice is not my first choice for technical drawing.

=-ref-=
[1]
https://documentation.libreoffice.org/assets/Uploads/Documentation/en/DG4.3/PDF/DG4311-AdvancedDrawTechniques.pdf

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 115081] Data validity restriction can be violated by copying value into a cell

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=115081

Wolfgang Jäger  changed:

   What|Removed |Added

 CC||j...@psilosoph.de

--- Comment #5 from Wolfgang Jäger  ---
1. The described behaviour is as the 'Validity' always behaved. 
2. Since there is no explicit specification (afaik) the behaviour as it always
was cannot be proved a bug.
3. To get what the reporter wants would not require a bugfix but an
ENHANCEMENT.
4. In fact more than one enhancemnt would be neded. At least:
4.1. Add an option concerning cell protection to an effect as described by
'Inhibit Full Paste'.
4.2. Add an option under 'Validity' to an effect like 'Check Pasted Content for
Validity'. 
5. All this would not ensure actual data consistency. As soon as any contents
of a validity 'List' or a validity 'Cell Range' are changed, newly invalid
contents in cells may occur. 

The 'Validity' tool as is is a makshift at best. In specific it may mislead
designers of spreadsheets to believe they can make things fool-proof based on
it. If this is needed urgently the task should be moved to a database
application with its security features and rights management. 

Either NOTABUG or Importance = "enhancement".

(Discussion about workarounds may better be placed in ask.libreoffice.org or on
any forum on open OfficeSoftware.)

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117172] Image context menu Save fails to do anything

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117172

--- Comment #6 from Marco Cecchetti  ---
Uh, so the issue seems to be trivial, too trivial; anyway I can't remember
implementation details for commit 0b8482dfe034a5fb988da6822cf8969bb8c86cba, so
I hope that my fix is enough:

https://gerrit.libreoffice.org/#/c/54359

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 40929] Restart numbering is not saved for the first list in a sub-document ( when viewed from master)

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=40929

Timur  changed:

   What|Removed |Added

Version|3.3.1 release   |Inherited From OOo
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=11
   ||7233

--- Comment #15 from Timur  ---
Repro in 6.1+. Setting to "inherited". Adding Bug 117233.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113535] Referenced validity lists do not contain all entries

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113535

Buovjaga  changed:

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |NOTABUG

--- Comment #4 from Buovjaga  ---
Thanks, closing.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 107698] EDITING: vertical position of controls anchored to cell incorrectly updated when non-default height rows are inserted /deleted above

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=107698

--- Comment #4 from gisel.avalea...@gmail.com ---
This bug is still present in:

Version: 6.0.4.2 (x64)
Build ID: 9b0d9b32d5dcda91d2f1a96dc04c645c450872bf
CPU threads: 4; OS: Windows 10.0; UI render: default; 
Locale: en-US (nl_NL); Calc:

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117621] New: Revamp the Events tab of the Customize Dialog

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117621

Bug ID: 117621
   Summary: Revamp the Events tab of the Customize Dialog
   Product: LibreOffice
   Version: 6.0.0.0.alpha0+
  Hardware: All
OS: All
Status: UNCONFIRMED
  Severity: normal
  Priority: medium
 Component: UI
  Assignee: libreoffice-bugs@lists.freedesktop.org
  Reporter: muhammet.k...@pardus.org.tr

The Customize dialog's (Tools > Customize...) three tabs ('Menus', 'Toolbars',
'Context Menus') were revamped during GSoC 2017. The 'Keyboard', and the
'Events' tabs are yet to be revamped. This bug report is about the revamp of
the 'Events' tab.

>From the etherpad of the Design team:

* Revamp the 'Events' tab of the Customize dialog
   + Heiko's and Yousuf's designs for GSoC:
https://docs.google.com/document/d/1IPXkYMmyXQzoVUdMpnBeoQdf-LNp5_oNaqfW6OFhxqA/edit?usp=sharing
   + Maybe a combination of two designs? (Muhammet)
 + Start with Variant 2 for consistency
   + agreed (Heiko)
 + Get rid of the Function dropdown on the left, and the Function button on
the right
   + Remove exists; and save/export etc. are nice-to-haves for the future
 + Take the tree structure from Variant 1, and apply to the left box
   + yes, makes sense (Heiko)
 + It will be consistent with the other tabs visually and behaviorally
   + and the horizontal alignment benefits

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 113858] Remove color palettes Breeze, Tango and LibreOffice

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=113858

--- Comment #30 from Heiko Tietze  ---
Thomas, can we close this ticket?

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 103238] [META] Customize dialog bugs and enhancements

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=103238

Muhammet Kara  changed:

   What|Removed |Added

 Depends on||117621


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=117621
[Bug 117621] Revamp the Events tab of the Customize Dialog
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117621] Revamp the Events tab of the Customize Dialog

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117621

Muhammet Kara  changed:

   What|Removed |Added

 CC||muhammet.k...@pardus.org.tr
   ||, tietze.he...@gmail.com
 Blocks||103238


Referenced Bugs:

https://bugs.documentfoundation.org/show_bug.cgi?id=103238
[Bug 103238] [META] Customize dialog bugs and enhancements
-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 117622] Action with Interaction for media files is not saved

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=117622

--- Comment #1 from Sebastian Jentschke  ---
Created attachment 142110
  --> https://bugs.documentfoundation.org/attachment.cgi?id=142110=edit
Trial presentation where interaction is not saved.

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 44267] Two decimal digits are insufficient for specifying object position and size

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=44267

V Stuart Foote  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=11
   ||7623

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-ux-advise] [Bug 44267] Two decimal digits are insufficient for specifying object position and size

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=44267

V Stuart Foote  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=11
   ||7623

-- 
You are receiving this mail because:
You are on the CC list for the bug.
___
Libreoffice-ux-advise mailing list
Libreoffice-ux-advise@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-ux-advise

[Libreoffice-bugs] [Bug 101961] OpenGL Problem with Intel HD4400

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=101961

V Stuart Foote  changed:

   What|Removed |Added

 Status|NEW |NEEDINFO
 CC||serval2...@yahoo.fr,
   ||vstuart.fo...@utsa.edu
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=10
   ||7764

--- Comment #4 from V Stuart Foote  ---
@Dennis,

Could you please retest OpenGL with current drivers [1]; i.e. for Windows 10
the 15.40 4963 build, or for Windows 8.1 the 15.36 4889 build. The 6.19 had you
on Windows 10 when reported, right?

If updated drivers resolves, we'll set this a dupe of bug 107764 

Otherwise if still broken, we'd need the vendor and device ids and the driver
version to add to the black list. Get those from a msinfo32.exe run--the
Components -> Display panel PNP Device ID

=-ref-=
https://www.intel.com/content/www/us/en/support/products/81497/graphics-drivers/graphics-for-4th-generation-intel-processors/intel-hd-graphics-4400.html

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs

[Libreoffice-bugs] [Bug 107764] Menu bar (File, Edit, View,...) missing with OpenGL rendering enabled on Intel(R) HD Graphics in Windows (workaround: disable OpenGL; fix: update Intel graphics drivers

[bugzilla-daemon]

https://bugs.documentfoundation.org/show_bug.cgi?id=107764

V Stuart Foote  changed:

   What|Removed |Added

   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=10
   ||1961

-- 
You are receiving this mail because:
You are the assignee for the bug.___
Libreoffice-bugs mailing list
Libreoffice-bugs@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-bugs