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

[Libreoffice Gerrit user]

 basctl/source/inc/IDEComboBox.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1620fc40320a05d622074dc4175fac74cf40f4c0
Author: Andrea Gelmini 
AuthorDate: Sun Dec 16 23:51:56 2018 +
Commit: Julien Nabet 
CommitDate: Mon Dec 17 09:03:54 2018 +0100

Fix typo

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

diff --git a/basctl/source/inc/IDEComboBox.hxx 
b/basctl/source/inc/IDEComboBox.hxx
index 8c183ff30793..0afc4fe60c34 100644
--- a/basctl/source/inc/IDEComboBox.hxx
+++ b/basctl/source/inc/IDEComboBox.hxx
@@ -237,7 +237,7 @@ protected:
 private:
 /// Delete all languages from ComboBox
 void ClearBox();
-/// Switch inferface of dialog to selected language
+/// Switch interface of dialog to selected language
 void SetLanguage();
 
 /// Fill up the language combobox
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlimport/ooxmlimport2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit bdc82e277759a2df68855fce0a3fdd58f9b1ea66
Author: Andrea Gelmini 
AuthorDate: Sun Dec 16 21:40:20 2018 +
Commit: Julien Nabet 
CommitDate: Mon Dec 17 09:04:17 2018 +0100

Fix typo

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

diff --git a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx 
b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
index 2882d9ff0778..fea9c91dfced 100644
--- a/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
+++ b/sw/qa/extras/ooxmlimport/ooxmlimport2.cxx
@@ -217,7 +217,7 @@ DECLARE_OOXMLIMPORT_TEST(testTdf113946, "tdf113946.docx")
 // tdf#106792 Checked loading of tdf113946.docx. Before the change, the 
expected
 // value of this test was "1696". Opening the file shows a single short 
line anchored
 // at the doc start. Only diff is that in 'old' version it is slightly 
rotated, in 'new'
-// version line is strict hiorizontal. Checked against MSWord2013, there 
the line
+// version line is strict horizontal. Checked against MSWord2013, there 
the line
 // is also not rotated -> the change is to the better, correct the 
expected result here.
 CPPUNIT_ASSERT_EQUAL(OUString("1695"), aTop);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: gtk3 include handling - Improving IDE support

[Stephan Bergmann]

On 15/12/2018 22:42, Michael Weghorn wrote:

1) make sure the include-related compiler flags actually end up in the
'INCLUDE' section in the generated JSON file

As far as I can see, 'gb_Library_set_include' is the way to set the
'-I'/'-isystem' compiler flags in gbuild, and that approach is used for
pretty much all other libraries.
https://gerrit.libreoffice.org/#/c/65207 demonstrates this approach.


Indeed, for better or worse, e.g. all the *_CFLAGS in 
RepositoryExternal.mk are passed into gb_LinkTarget_set_include, not 
gb_LinkTarget_set_cxxflags.  Feel free to go with this approach, I'd say 
in vcl/Library_vclplug_gtk3.mk, I'd say.

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

[Libreoffice-commits] online.git: common/UnitHTTP.hpp

[Libreoffice Gerrit user]

 common/UnitHTTP.hpp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit daa3384b53bec1aee4e56a4d3f8013d54ff497a6
Author: Miklos Vajna 
AuthorDate: Mon Dec 17 09:14:56 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 09:15:05 2018 +0100

UnitHTTPServerRequest: make members private

None of this was used by subclasses.

Change-Id: Iaaa3e726e9aabec581f2c0599f65d7513e0a0e07

diff --git a/common/UnitHTTP.hpp b/common/UnitHTTP.hpp
index 9ff24caab..d87ce8e3f 100644
--- a/common/UnitHTTP.hpp
+++ b/common/UnitHTTP.hpp
@@ -63,7 +63,7 @@ public:
 /// Unit test stub for a server request
 class UnitHTTPServerRequest : public Poco::Net::HTTPServerRequest
 {
-protected:
+private:
 UnitHTTPServerResponse& _response;
 Poco::Net::SocketAddress _clientAddress;
 Poco::Net::SocketAddress _serverAddress;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_chart2_xshape Failure with Display Scaling on Windows

[Stephan Bergmann]

On 16/12/2018 22:35, Kaganski Mike wrote:

Unfortunately cannot repro locally. Possibly it's worth trying to only
add manifest to soffice.bin, not to all console applications. Will try
that tomorrow.


While that might fix CppunitTests, it likely would leave a similar 
(potential) issue in other tests like JunitTests that internally spawn 
an soffice.bin process.


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

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

[Libreoffice Gerrit user]

 sw/qa/extras/ww8export/data/tdf121110_absJustify.doc |binary
 sw/qa/extras/ww8export/ww8export2.cxx|6 +
 sw/source/filter/ww8/ww8par.hxx  |9 +-
 sw/source/filter/ww8/ww8par6.cxx |   77 +--
 sw/source/filter/ww8/ww8scan.hxx |2 
 5 files changed, 85 insertions(+), 9 deletions(-)

New commits:
commit f10404e30ab2f468147457f0304e0e9fe64eefa3
Author: Justin Luth 
AuthorDate: Thu Dec 6 22:09:47 2018 +0300
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 09:38:20 2018 +0100

tdf#121110 ww8import Jc80 justify is absolute, not Bidi relative

Paragraph justification can be specified either absolutely
(in old versions or with eWW8:Jc80) or relatively (with eWW8:Jc).
The last processed SPRM wins (I assume).

The WW8 format seems to ALWAYS specify Jc80,
and that is overwritten by an optional Jc SPRM.
I haven't seen Jc be processed before a Jc80 SPRM,
but if it does, then the justify would need to be treated as absolute.

If for some reason neither of these exist, BiDi will adjust by default
only if it is the newer WW8 format. Again, that is an assumption
because I haven't seen such a document to test.

Change-Id: I966077d743f1d148fe2fb9faba87fbdd8f3507f3
Reviewed-on: https://gerrit.libreoffice.org/63591
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/sw/qa/extras/ww8export/data/tdf121110_absJustify.doc 
b/sw/qa/extras/ww8export/data/tdf121110_absJustify.doc
new file mode 100644
index ..0b9f581d4119
Binary files /dev/null and 
b/sw/qa/extras/ww8export/data/tdf121110_absJustify.doc differ
diff --git a/sw/qa/extras/ww8export/ww8export2.cxx 
b/sw/qa/extras/ww8export/ww8export2.cxx
index e1597f634a0c..9154d45350ab 100644
--- a/sw/qa/extras/ww8export/ww8export2.cxx
+++ b/sw/qa/extras/ww8export/ww8export2.cxx
@@ -262,6 +262,12 @@ DECLARE_WW8EXPORT_TEST(testTdf98620_rtlJustify, 
"tdf98620_rtlJustify.doc")
 CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_RIGHT, 
static_cast(getProperty(getParagraph(1), 
"ParaAdjust")) );
 }
 
+DECLARE_WW8EXPORT_TEST(testTdf121110_absJustify, "tdf121110_absJustify.doc")
+{
+CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_RIGHT, 
static_cast(getProperty(getParagraph(1), 
"ParaAdjust")) );
+CPPUNIT_ASSERT_EQUAL( style::ParagraphAdjust_LEFT, 
static_cast(getProperty(getParagraph(3), 
"ParaAdjust")) );
+}
+
 DECLARE_WW8EXPORT_TEST(testTdf106174_rtlParaAlign, 
"tdf106174_rtlParaAlign.docx")
 {
 CPPUNIT_ASSERT_EQUAL(sal_Int16(style::ParagraphAdjust_CENTER), 
getProperty(getParagraph(1), "ParaAdjust"));
diff --git a/sw/source/filter/ww8/ww8par.hxx b/sw/source/filter/ww8/ww8par.hxx
index fc8ab8c5d2b7..4a91dc1da609 100644
--- a/sw/source/filter/ww8/ww8par.hxx
+++ b/sw/source/filter/ww8/ww8par.hxx
@@ -253,6 +253,7 @@ public:
  //for L of the LR space independently
 bool m_bParaAutoBefore;   // For Auto spacing before a paragraph
 bool m_bParaAutoAfter;// For Auto Spacing after a paragraph
+sal_Int16 m_nRelativeJustify;
 
 SwWW8StyInf() :
 m_sWWStyleName( OUString() ),
@@ -279,7 +280,8 @@ public:
 m_bHasBrokenWW6List(false),
 m_bListReleventIndentSet(false),
 m_bParaAutoBefore(false),
-m_bParaAutoAfter(false)
+m_bParaAutoAfter(false),
+m_nRelativeJustify(-1)
 
 {}
 
@@ -1747,7 +1749,12 @@ public: // really private, but can only be done 
public
 void Read_ParaAutoAfter(sal_uInt16 , const sal_uInt8 *pData, short nLen);
 void Read_ParaContextualSpacing( sal_uInt16 nId, const sal_uInt8* pData, 
short nLen );
 void Read_LineSpace(sal_uInt16, const sal_uInt8*, short nLen );
+
+void SetRelativeJustify( bool bRel );
+bool IsRelativeJustify();
+bool IsRelativeJustify( sal_uInt16 nColl );
 void Read_Justify(sal_uInt16, const sal_uInt8*, short nLen);
+
 void Read_IdctHint(sal_uInt16, const sal_uInt8*, short nLen);
 bool IsRightToLeft();
 void Read_RTLJustify(sal_uInt16, const sal_uInt8*, short nLen);
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index 32b822aee523..f743d11cd7cf 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -310,6 +310,59 @@ void SwWW8ImplReader::SetDocumentGrid(SwFrameFormat 
&rFormat, const wwSection &r
 rFormat.SetFormatAttr(aGrid);
 }
 
+void SwWW8ImplReader::SetRelativeJustify( bool bRel )
+{
+if ( m_pCurrentColl && StyleExists(m_nCurrentColl) ) // importing style
+m_vColl[m_nCurrentColl].m_nRelativeJustify = bRel ? 1 : 0;
+else if ( m_xPlcxMan && m_xPlcxMan->GetPap() ) // importing paragraph
+m_xPlcxMan->GetPap()->nRelativeJustify = bRel ? 1 : 0;
+}
+
+bool SwWW8ImplReader::IsRelativeJustify()
+{
+bool bRet = m_xWwFib->GetFIBVersion() >= ww::eWW8;
+if ( bRet )
+{
+// 

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

[Libreoffice Gerrit user]

 cui/source/options/treeopt.cxx   |5 +++--
 include/svtools/restartdialog.hxx|4 ++--
 svtools/source/dialogs/restartdialog.cxx |6 --
 3 files changed, 9 insertions(+), 6 deletions(-)

New commits:
commit 9be9b4072741ac3c7282f272484df1f65aa2765e
Author: Mike Kaganski 
AuthorDate: Thu Dec 13 14:24:01 2018 +0300
Commit: Xisco Faulí 
CommitDate: Mon Dec 17 09:45:25 2018 +0100

tdf#121180: close Options dialog when restart is confirmed

Change-Id: Ieb6e62ca83921abed6b6432d70c6717dadfaaa34
Reviewed-on: https://gerrit.libreoffice.org/65090
Reviewed-by: Caolán McNamara 
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
(cherry picked from commit 0fa14d58457e9418ff756a0efd66e365c4403a67)
Reviewed-on: https://gerrit.libreoffice.org/65184
Reviewed-by: Xisco Faulí 

diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index a0ced4fccd16..cebb55371923 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -697,8 +697,9 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, ApplyHdl_Impl, 
Button*, void)
 if ( bNeedsRestart )
 {
 SolarMutexGuard aGuard;
-
::svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
-GetFrameWeld(), eRestartReason);
+if 
(svtools::executeRestartDialog(comphelper::getProcessComponentContext(),
+GetFrameWeld(), eRestartReason))
+EndDialog(RET_OK);
 }
 }
 
diff --git a/include/svtools/restartdialog.hxx 
b/include/svtools/restartdialog.hxx
index 750542a37459..f29366c1b592 100644
--- a/include/svtools/restartdialog.hxx
+++ b/include/svtools/restartdialog.hxx
@@ -58,8 +58,8 @@ enum RestartReason {
 RESTART_REASON_NONE
 };
 
-// Must be called with the solar mutex locked:
-SVT_DLLPUBLIC void executeRestartDialog(
+// Must be called with the solar mutex locked; returns if restart was 
initiated:
+SVT_DLLPUBLIC bool executeRestartDialog(
 css::uno::Reference< css::uno::XComponentContext > const & context,
 weld::Window* parent, RestartReason reason);
 
diff --git a/svtools/source/dialogs/restartdialog.cxx 
b/svtools/source/dialogs/restartdialog.cxx
index 1de2e09cc014..079cc5e28f21 100644
--- a/svtools/source/dialogs/restartdialog.cxx
+++ b/svtools/source/dialogs/restartdialog.cxx
@@ -90,18 +90,20 @@ IMPL_LINK_NOARG(RestartDialog, hdlNo, weld::Button&, void)
 
 }
 
-void svtools::executeRestartDialog(
+bool svtools::executeRestartDialog(
 css::uno::Reference< css::uno::XComponentContext > const & context,
 weld::Window* parent, RestartReason reason)
 {
 auto xRestartManager = css::task::OfficeRestartManager::get(context);
 if (xRestartManager->isRestartRequested(false))
-return; // don't try to show another dialog when restart is already in 
progress
+return true; // don't try to show another dialog when restart is 
already in progress
 RestartDialog aDlg(parent, reason);
 if (aDlg.run()) {
 xRestartManager->requestRestart(
 css::uno::Reference< css::task::XInteractionHandler >());
+return true;
 }
+return false;
 }
 
 /* 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: Branch 'libreoffice-6-2' - sc/source

[Libreoffice Gerrit user]

 sc/source/ui/condformat/condformatdlg.cxx |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 264c0bd303fa77932959e4265d2dd05a29a4da09
Author: Mike Kaganski 
AuthorDate: Tue Dec 4 21:28:46 2018 +0300
Commit: Xisco Faulí 
CommitDate: Mon Dec 17 09:46:07 2018 +0100

tdf#117332: select replaced text to properly replace it next time

... othervise the next drag event will insert the new range immediately
after the just inserted, resulting in invalid reference.

Regression after commit 42aece949ec96c775b31216bddd723aa5321e966

  don't replace content of formula field when selecting range, tdf#58635

Change-Id: I7dfdc1ce041ebadf4406dbb605676d87cd489efa
Reviewed-on: https://gerrit.libreoffice.org/64574
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit 6c5839d399c6277a7f2f0e214a20996761563525)
Reviewed-on: https://gerrit.libreoffice.org/65026
Tested-by: Jenkins
Reviewed-by: Xisco Faulí 

diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 64952101d0ea..79e0e3f233d6 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -674,7 +674,13 @@ void ScCondFormatDlg::SetReference(const ScRange& rRef, 
ScDocument*)
 OUString aRefStr(rRef.Format(nFlags, mpViewData->GetDocument(),
 
ScAddress::Details(mpViewData->GetDocument()->GetAddressConvention(), 0, 0)));
 if (pEdit != mpEdRange)
+{
+Selection sel = pEdit->GetSelection();
+sel.Justify();// in case of RtL selection
+sel.Max() = sel.Min() + aRefStr.getLength();
 pEdit->ReplaceSelected(aRefStr);
+pEdit->SetSelection(sel); // to replace it again with next drag 
event
+}
 else
 pEdit->SetRefString( aRefStr );
 updateTitle();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/core/bastyp/calc.cxx |9 +++--
 1 file changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 045c1d2da74b224e011cb6fc1c33fcef874ac0b4
Author: Mike Kaganski 
AuthorDate: Mon Dec 17 08:50:00 2018 +0100
Commit: Mike Kaganski 
CommitDate: Mon Dec 17 09:53:05 2018 +0100

Simplify getting selected record it a bit

Change-Id: Ifb3cc0e62b88562fdf4050186b51a56316a15d07
Reviewed-on: https://gerrit.libreoffice.org/65240
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index c3621b0b1a3d..982abef78a34 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -503,18 +503,15 @@ SwCalcExp* SwCalc::VarLook( const OUString& rStr, bool 
bIns )
 // Initialize again because this doesn't happen in docfld anymore 
for
 // elements != SwFieldIds::Database. E.g. if there is an 
expression field before
 // an DB_Field in a document.
-VarChange( sDBNum, pMgr->GetSelectedRecordId(sSourceName, 
sTableName));
+const sal_uInt32 nTmpRec = pMgr->GetSelectedRecordId(sSourceName, 
sTableName);
+VarChange(sDBNum, nTmpRec);
 
 if( sDBNum.equalsIgnoreAsciiCase(sColumnName) )
 {
-
m_aErrExpr.nValue.PutLong(long(pMgr->GetSelectedRecordId(sSourceName, 
sTableName)));
+m_aErrExpr.nValue.PutULong(nTmpRec);
 return &m_aErrExpr;
 }
 
-sal_uLong nTmpRec = 0;
-if( nullptr != ( pFnd = m_aVarTable.Find( sDBNum ) ) )
-nTmpRec = pFnd->nValue.GetULong();
-
 OUString sResult;
 double nNumber = DBL_MAX;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/unx

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   56 ---
 1 file changed, 56 deletions(-)

New commits:
commit 3efc0b2fe087fb8c5e0291efbda417b819a43f83
Author: Caolán McNamara 
AuthorDate: Fri Dec 14 16:17:26 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 17 09:59:55 2018 +0100

drop scroll-wheel moves notebook page workaround

now that the double-decker monstrosity is in place

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index dffb42ced571..b9155e2da687 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3111,7 +3111,6 @@ private:
 gulong m_nSwitchPageSignalId;
 gulong m_nOverFlowSwitchPageSignalId;
 gulong m_nSizeAllocateSignalId;
-gulong m_nScrollSignalId;
 bool m_bOverFlowBoxActive;
 bool m_bOverFlowBoxIsStart;
 int m_nStartTabCount;
@@ -3206,59 +3205,6 @@ private:
 enable_notify_events();
 }
 
-static gboolean signalScroll(GtkWidget*, GdkEventScroll* event, gpointer 
widget)
-{
-GtkInstanceNotebook* pThis = static_cast(widget);
-return pThis->signal_scroll(event);
-}
-
-bool signal_scroll(GdkEventScroll* event)
-{
-GtkWidget* pEventWidget = 
gtk_get_event_widget(reinterpret_cast(event));
-if (!pEventWidget)
-return false;
-
-/* ignore page content scroll events */
-GtkWidget* pPage = gtk_notebook_get_nth_page(m_pNotebook, 
gtk_notebook_get_current_page(m_pNotebook));
-if (gtk_widget_is_ancestor(pEventWidget, pPage) || pPage == 
pEventWidget)
-return false;
-
-bool bNext(false), bPrev(false);
-switch (event->direction)
-{
-case GDK_SCROLL_RIGHT:
-case GDK_SCROLL_DOWN:
-bNext = true;
-break;
-case GDK_SCROLL_LEFT:
-case GDK_SCROLL_UP:
-bPrev = true;
-break;
-case GDK_SCROLL_SMOOTH:
-{
-switch (gtk_notebook_get_tab_pos(m_pNotebook))
-{
-case GTK_POS_LEFT:
-case GTK_POS_RIGHT:
-bNext = event->delta_y > 0;
-bPrev = event->delta_y < 0;
-break;
-case GTK_POS_TOP:
-case GTK_POS_BOTTOM:
-bNext = event->delta_x > 0;
-bPrev = event->delta_x < 0;
-break;
-}
-break;
-}
-}
-if (bNext)
-gtk_notebook_next_page(m_pNotebook);
-else if (bPrev)
-gtk_notebook_prev_page(m_pNotebook);
-return true;
-}
-
 static OString get_page_ident(GtkNotebook *pNotebook, guint nPage)
 {
 const GtkWidget* pTabWidget = gtk_notebook_get_tab_label(pNotebook, 
gtk_notebook_get_nth_page(pNotebook, nPage));
@@ -3539,7 +3485,6 @@ public:
 , m_nEndTabCount(0)
 {
 gtk_widget_add_events(GTK_WIDGET(pNotebook), GDK_SCROLL_MASK);
-m_nScrollSignalId = g_signal_connect(pNotebook, "scroll-event", 
G_CALLBACK(signalScroll), this);
 if (get_n_pages() > 6)
 m_nSizeAllocateSignalId = g_signal_connect_after(pNotebook, 
"size-allocate", G_CALLBACK(signalSizeAllocate), this);
 else
@@ -3709,7 +3654,6 @@ public:
 {
 if (m_nSizeAllocateSignalId)
 g_signal_handler_disconnect(m_pNotebook, m_nSizeAllocateSignalId);
-g_signal_handler_disconnect(m_pNotebook, m_nScrollSignalId);
 g_signal_handler_disconnect(m_pNotebook, m_nSwitchPageSignalId);
 g_signal_handler_disconnect(m_pOverFlowNotebook, 
m_nOverFlowSwitchPageSignalId);
 gtk_widget_destroy(GTK_WIDGET(m_pOverFlowNotebook));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit b3eb3ef769642b2fa5b9453a8900bcb944643215
Author: Sumit Chauhan 
AuthorDate: Sun Dec 16 14:24:39 2018 +0530
Commit: Heiko Tietze 
CommitDate: Mon Dec 17 10:21:09 2018 +0100

tdf#121638 , Different angle shown between sidebar & size and position 
dialog

Bug solved , Changed the nTmp = 360+nTmp ,if nTmp <0.

Change-Id: I855e634540c55ab91e8bbe5824014d304d87c8e9
Reviewed-on: https://gerrit.libreoffice.org/65211
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 294c38229a37604fe2d0d82a6ebc7bcd086963f4)
Reviewed-on: https://gerrit.libreoffice.org/65224
Tested-by: Xisco Faulí 

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx 
b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 1afdf1e725b9..667e7834caa2 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -682,6 +682,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
 if(pItem)
 {
 long nTmp = pItem->GetValue();
+nTmp = nTmp < 0 ? 36000+nTmp : nTmp;
 
 mpMtrAngle->SetValue( nTmp );
 mpDial->SetRotation( nTmp );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/unosett.hxx |   12 +--
 sw/source/core/unocore/unosett.cxx |  136 ++---
 2 files changed, 74 insertions(+), 74 deletions(-)

New commits:
commit e0f9839a16a016045ed06cd34d680f6fa03129ad
Author: Miklos Vajna 
AuthorDate: Mon Dec 17 09:12:43 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 10:55:14 2018 +0100

sw: prefix members of SwXNumberingRules

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

diff --git a/sw/inc/unosett.hxx b/sw/inc/unosett.hxx
index 19a53bd83031..768a351b2da5 100644
--- a/sw/inc/unosett.hxx
+++ b/sw/inc/unosett.hxx
@@ -147,11 +147,11 @@ private:
 OUStringm_sNewCharStyleNames[MAXLEVEL];
 OUStringm_sNewBulletFontNames[MAXLEVEL];
 OUStringm_sCreatedNumRuleName; //connects to a 
numbering in SwDoc
-SwDoc*  pDoc;
-SwDocShell* pDocShell; // Only if used as chapter 
numbering.
-SwNumRule*  pNumRule;
+SwDoc*  m_pDoc;
+SwDocShell* m_pDocShell; // Only if used as chapter 
numbering.
+SwNumRule*  m_pNumRule;
 const SfxItemPropertySet*   m_pPropertySet;
-bool const  bOwnNumRuleCreated;
+bool const  m_bOwnNumRuleCreated;
 protected:
 virtual ~SwXNumberingRules() override;
 
@@ -202,10 +202,10 @@ public:
 
 const OUString* GetNewCharStyleNames() const {return 
m_sNewCharStyleNames;}
 const OUString* GetBulletFontNames() const {return 
m_sNewBulletFontNames;}
-const SwNumRule*GetNumRule() {return pNumRule;}
+const SwNumRule*GetNumRule() {return m_pNumRule;}
 
 static bool isInvalidStyle(const OUString &rName);
-voidInvalidate(){pDocShell = nullptr;}
+voidInvalidate(){m_pDocShell = nullptr;}
 const OUString&   GetCreatedNumRuleName() const {return 
m_sCreatedNumRuleName;}
 
 static css::uno::Sequence 
GetPropertiesForNumFormat(
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index 23892086cbe2..4a82db8bd944 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1063,26 +1063,26 @@ Sequence< OUString > 
SwXNumberingRules::getSupportedServiceNames()
 
 SwXNumberingRules::SwXNumberingRules(const SwNumRule& rRule, SwDoc* doc) :
 m_pImpl(new SwXNumberingRules::Impl(*this)),
-pDoc(doc),
-pDocShell(nullptr),
-pNumRule(new SwNumRule(rRule)),
+m_pDoc(doc),
+m_pDocShell(nullptr),
+m_pNumRule(new SwNumRule(rRule)),
 m_pPropertySet(GetNumberingRulesSet()),
-bOwnNumRuleCreated(true)
+m_bOwnNumRuleCreated(true)
 {
 // first organize the document - it is dependent on the set character 
formats
 // if no format is set, it should work as well
 for( sal_uInt16 i = 0; i < MAXLEVEL; ++i)
 {
-SwNumFormat rFormat(pNumRule->Get(i));
+SwNumFormat rFormat(m_pNumRule->Get(i));
 SwCharFormat* pCharFormat = rFormat.GetCharFormat();
 if(pCharFormat)
 {
-pDoc = pCharFormat->GetDoc();
+m_pDoc = pCharFormat->GetDoc();
 break;
 }
 }
-if(pDoc)
-m_pImpl->StartListening(GetPageDescNotifier(pDoc));
+if(m_pDoc)
+m_pImpl->StartListening(GetPageDescNotifier(m_pDoc));
 for(sal_uInt16 i = 0; i < MAXLEVEL; ++i)
 {
 m_sNewCharStyleNames[i] = aInvalidStyle;
@@ -1092,22 +1092,22 @@ SwXNumberingRules::SwXNumberingRules(const SwNumRule& 
rRule, SwDoc* doc) :
 
 SwXNumberingRules::SwXNumberingRules(SwDocShell& rDocSh) :
 m_pImpl(new SwXNumberingRules::Impl(*this)),
-pDoc(nullptr),
-pDocShell(&rDocSh),
-pNumRule(nullptr),
+m_pDoc(nullptr),
+m_pDocShell(&rDocSh),
+m_pNumRule(nullptr),
 m_pPropertySet(GetNumberingRulesSet()),
-bOwnNumRuleCreated(false)
+m_bOwnNumRuleCreated(false)
 {
-m_pImpl->StartListening(GetPageDescNotifier(pDocShell->GetDoc()));
+m_pImpl->StartListening(GetPageDescNotifier(m_pDocShell->GetDoc()));
 }
 
 SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) :
 m_pImpl(new SwXNumberingRules::Impl(*this)),
-pDoc(&rDoc),
-pDocShell(nullptr),
-pNumRule(nullptr),
+m_pDoc(&rDoc),
+m_pDocShell(nullptr),
+m_pNumRule(nullptr),
 m_pPropertySet(GetNumberingRulesSet()),
-bOwnNumRuleCreated(false)
+m_bOwnNumRuleCreated(false)
 {
 m_pImpl->StartListening(GetPageDescNotifier(&rDoc));
 m_sCreatedNumRuleName = rDoc.GetUniqueNumRuleName();
@@ -1119,10 +1119,10 @@ SwXNumberingRules::SwXNumberingRules(SwDoc& rDoc) :
 SwXNumberingRules::~SwXNumberingRules()
 {
 SolarMutexGuard aGuard;
-if(pDoc && !m_sCreatedNumRuleName.isEmpty())
-pDoc->DelNumRule( m_sCreatedNu

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

[Libreoffice Gerrit user]

 source/text/shared/02/0202.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 720c5c4aa52b4f7319a31a8cc55d330bf82fb017
Author: sabri unal 
AuthorDate: Mon Dec 17 00:59:41 2018 +0100
Commit: Olivier Hallot 
CommitDate: Mon Dec 17 11:06:14 2018 +0100

Preview in fonts lists is corrected as Show preview of fonts

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

diff --git a/source/text/shared/02/0202.xhp 
b/source/text/shared/02/0202.xhp
index f27affd39..08b602b4e 100644
--- a/source/text/shared/02/0202.xhp
+++ b/source/text/shared/02/0202.xhp
@@ -52,7 +52,7 @@
 
 
 In $[officename] 
you see the available fonts only if a printer is installed as the default 
printer in your system. In order to install a printer as the default printer 
please refer to your operating system documentation.
-You can see the name of the fonts formatted in their 
respective font if you mark the Preview in fonts lists field in 
$[officename] - View in the Options 
dialog box.
+You can see the name of the fonts formatted in their 
respective font if you mark the Show preview of fonts field in 
$[officename] - View in the Options 
dialog box.
 
 
 If you receive 
an error message that states that certain fonts have not been found, you can 
install them with $[officename] Setup in the Repair 
mode if it is a $[officename] font.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit 5a45b45eb63c26d5c4138ea3f12afdd9d34de90c
Author: sabri unal 
AuthorDate: Mon Dec 17 00:59:41 2018 +0100
Commit: Gerrit Code Review 
CommitDate: Mon Dec 17 11:06:14 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Preview in fonts lists is corrected as Show preview of fonts

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

diff --git a/helpcontent2 b/helpcontent2
index 77c68eec99a7..720c5c4aa52b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 77c68eec99a72504cc9a69adf48649b0ecd4938b
+Subproject commit 720c5c4aa52b4f7319a31a8cc55d330bf82fb017
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 source/text/sbasic/python/python_locations.xhp |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c87f47920ff8524fb73ea39f5cafe42d1dc3c193
Author: Olivier Hallot 
AuthorDate: Mon Dec 17 07:45:01 2018 -0200
Commit: Olivier Hallot 
CommitDate: Mon Dec 17 11:06:40 2018 +0100

Python: Remove wrong statement on modules.

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

diff --git a/source/text/sbasic/python/python_locations.xhp 
b/source/text/sbasic/python/python_locations.xhp
index 0e6d01d5a..4f50af421 100644
--- a/source/text/sbasic/python/python_locations.xhp
+++ b/source/text/sbasic/python/python_locations.xhp
@@ -48,7 +48,7 @@
 Document macros
 Document macros are 
embedded in the document and are accessible only when the document is 
open.
 Libraries, Modules and Macros
-Like BASIC macros, 
Python macros can organized in libraries, modules and macros. Note that a 
module may not be part of a library.
+Like BASIC macros, 
Python macros can organized in libraries, modules and macros.
 Creating a Python Library
 Libraries are 
folders in the container tree. To create a library, add a folder in the target 
container. The library name is the folder name.
 Creating a Python Module.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit a11a2665509f84a29b04e8941bb28d4c5e798fc2
Author: Olivier Hallot 
AuthorDate: Mon Dec 17 07:45:01 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Mon Dec 17 11:06:40 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Python: Remove wrong statement on modules.

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

diff --git a/helpcontent2 b/helpcontent2
index 720c5c4aa52b..c87f47920ff8 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 720c5c4aa52b4f7319a31a8cc55d330bf82fb017
+Subproject commit c87f47920ff8524fb73ea39f5cafe42d1dc3c193
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_chart2_xshape Failure with Display Scaling on Windows

[Michael Stahl]

On 17.12.18 09:25, Stephan Bergmann wrote:

On 16/12/2018 22:35, Kaganski Mike wrote:

Unfortunately cannot repro locally. Possibly it's worth trying to only
add manifest to soffice.bin, not to all console applications. Will try
that tomorrow.


While that might fix CppunitTests, it likely would leave a similar 
(potential) issue in other tests like JunitTests that internally spawn 
an soffice.bin process.


but that isn't a new problem, since soffice.bin had that manifest 
applied to it before the recent changes?

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

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

[Libreoffice Gerrit user]

 sw/source/uibase/dbui/dbmgr.cxx |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit e8b57d319cfd46816cc41aeccbcb6aa4a2f7cdef
Author: Mike Kaganski 
AuthorDate: Mon Dec 17 09:46:44 2018 +0100
Commit: Mike Kaganski 
CommitDate: Mon Dec 17 11:08:39 2018 +0100

Simplify static initializer

Change-Id: I82d5e2ad7373fb9d39aa087426ea80ca4559b556
Reviewed-on: https://gerrit.libreoffice.org/65245
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/source/uibase/dbui/dbmgr.cxx b/sw/source/uibase/dbui/dbmgr.cxx
index b7956cc7ec11..09f88dd03632 100644
--- a/sw/source/uibase/dbui/dbmgr.cxx
+++ b/sw/source/uibase/dbui/dbmgr.cxx
@@ -1172,16 +1172,12 @@ bool SwDBManager::MergeMailFiles(SwWrtShell* 
pSourceShell,
 const OUString sDescriptorPrefix = sPrefix_;
 
 // Setup for dumping debugging documents
-static const char *sMaxDumpDocs = nullptr;
-static sal_Int32 nMaxDumpDocs = 0;
-if (!sMaxDumpDocs)
-{
-sMaxDumpDocs = getenv("SW_DEBUG_MAILMERGE_DOCS");
-if (!sMaxDumpDocs)
-sMaxDumpDocs = "";
+static const sal_Int32 nMaxDumpDocs = []() {
+if (const char* sEnv = getenv("SW_DEBUG_MAILMERGE_DOCS"))
+return OUString(sEnv, strlen(sEnv), 
osl_getThreadTextEncoding()).toInt32();
 else
-nMaxDumpDocs = OUString(sMaxDumpDocs, strlen(sMaxDumpDocs), 
osl_getThreadTextEncoding()).toInt32();
-}
+return sal_Int32(0);
+}();
 
 ::rtl::Reference< MailDispatcher >  xMailDispatcher;
 ::rtl::Reference< IMailDispatcherListener > xMailListener;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: gtk3 include handling - Improving IDE support

[Michael Weghorn]

On 17/12/2018 09.14, Stephan Bergmann wrote:

> Indeed, for better or worse, e.g. all the *_CFLAGS in
> RepositoryExternal.mk are passed into gb_LinkTarget_set_include, not
> gb_LinkTarget_set_cxxflags.  Feel free to go with this approach, I'd say
> in vcl/Library_vclplug_gtk3.mk, I'd say.

Thanks for the quick reply! I'll go with the updated
https://gerrit.libreoffice.org/#/c/65207 then.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Libreoffice Gerrit user]

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

New commits:
commit ae44404b7dd4fa7074393f95ce0497e859d106e8
Author: Samuel Mehrbrodt 
AuthorDate: Mon Dec 17 11:13:37 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 17 11:47:08 2018 +0100

Use correct pronoun (its, not his)

Change-Id: I25280099333a315dd6d6cae0d478287a96f45961
Reviewed-on: https://gerrit.libreoffice.org/65257
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/offapi/com/sun/star/frame/XModel.idl 
b/offapi/com/sun/star/frame/XModel.idl
index 7bd8139ef374..7eff8dc6c788 100644
--- a/offapi/com/sun/star/frame/XModel.idl
+++ b/offapi/com/sun/star/frame/XModel.idl
@@ -86,7 +86,7 @@ published interface XModel: com::sun::star::lang::XComponent
 
 /** provides read access on currently representation of the
 com::sun::star::document::MediaDescriptor
-of this model which describes the model and his state
+of this model which describes the model and its state
 
 @returns
 the arguments with which the model was originally created or
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - 4 commits - dbaccess/source framework/qa framework/source include/sfx2 include/unotools offapi/com sfx2/source sw/PythonTest_sw_pytho

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/databasedocument.cxx |6 +
 dbaccess/source/core/dataaccess/databasedocument.hxx |1 
 framework/qa/complex/XTitle/CheckXTitle.java |   34 +-
 framework/source/fwe/helper/titlehelper.cxx  |   15 
 include/sfx2/sfxbasemodel.hxx|2 
 include/unotools/mediadescriptor.hxx |1 
 offapi/com/sun/star/frame/XModel2.idl|   21 ++
 sfx2/source/doc/sfxbasemodel.cxx |   30 +
 sw/PythonTest_sw_python.mk   |1 
 sw/qa/python/check_xmodel.py |   59 +++
 sw/source/uibase/uno/unotxdoc.cxx|5 -
 unotools/source/misc/mediadescriptor.cxx |6 +
 12 files changed, 174 insertions(+), 7 deletions(-)

New commits:
commit a66e11492b847a53c84211d78da2c946adaaaf4e
Author: Samuel Mehrbrodt 
AuthorDate: Thu Dec 13 19:58:36 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 17 12:07:30 2018 +0100

tdf#121962 Update fields after layout has been calculated

Change-Id: Ic4a49494652dab416ddb1545da02eb8a7f533828
Reviewed-on: https://gerrit.libreoffice.org/65126
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 
(cherry picked from commit 2bc1d00af6863d5c92389f1f4a99d2ab9bb73f81)

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 3a8a7ada5119..6095b8801cbe 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -2594,8 +2594,6 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
 bStateChanged = true;
 }
 
-// #122919# Force field update before PDF export
-pViewShell->SwViewShell::UpdateFields(true);
 if( bStateChanged )
 pRenderDocShell->EnableSetModified();
 
@@ -2605,6 +2603,9 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
 pViewShell->CalcLayout();
 pViewShell->CalcPagesForPrint( pViewShell->GetPageCount() );
 
+// #122919# Force field update before PDF export, but after layout 
init (tdf#121962)
+pViewShell->SwViewShell::UpdateFields(true);
+
 pViewShell->SetPDFExportOption( false );
 
 // enable view again
commit f3104f39740979839135886f42caf204ddb0e477
Author: Samuel Mehrbrodt 
AuthorDate: Thu Dec 13 09:09:52 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 17 12:06:24 2018 +0100

Allow setting some MediaDescriptor properties during runtime

Change-Id: Id6bb554c0e165c6d1f9c28c48fdbcd7156f42316

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index 9e0ee5eceb92..6722be2e6ccb 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -823,6 +824,11 @@ Sequence< PropertyValue > SAL_CALL 
ODatabaseDocument::getArgs(  ) throw (Runtime
 return m_pImpl->getMediaDescriptor().getPropertyValues();
 }
 
+void SAL_CALL ODatabaseDocument::setArgs(const Sequence& 
/* aArgs */)
+{
+throw NoSupportException();
+}
+
 void SAL_CALL ODatabaseDocument::connectController( const Reference< 
XController >& _xController ) throw (RuntimeException, std::exception)
 {
 DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx 
b/dbaccess/source/core/dataaccess/databasedocument.hxx
index f9d4107a07ba..80d411272b06 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -327,6 +327,7 @@ public:
 virtual css::uno::Sequence< OUString > SAL_CALL 
getAvailableViewControllerNames(  ) throw (css::uno::RuntimeException, 
std::exception) override ;
 virtual css::uno::Reference< css::frame::XController2 > SAL_CALL 
createDefaultViewController( const css::uno::Reference< css::frame::XFrame >& 
Frame ) throw (css::lang::IllegalArgumentException, css::uno::Exception, 
css::uno::RuntimeException, std::exception) override ;
 virtual css::uno::Reference< css::frame::XController2 > SAL_CALL 
createViewController( const OUString& ViewName, const css::uno::Sequence< 
css::beans::PropertyValue >& Arguments, const css::uno::Reference< 
css::frame::XFrame >& Frame ) throw (css::lang::IllegalArgumentException, 
css::uno::Exception, css::uno::RuntimeException, std::exception) override ;
+virtual void SAL_CALL setArgs(const 
css::uno::Sequence& aArgs) override;
 
 // XStorable
 virtual sal_Bool SAL_CALL hasLocation(  ) throw 
(css::uno::RuntimeException, std::exception) override ;
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 8e678caf59e0..051b56f54685 100644
--- a/include/sfx2/sfxbase

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

[Libreoffice Gerrit user]

 wsd/LOOLWSD.cpp |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6c08d7e3c818c4a876052c454c91633c17da0cad
Author: Jan Holesovsky 
AuthorDate: Mon Dec 17 12:46:34 2018 +0100
Commit: Jan Holesovsky 
CommitDate: Mon Dec 17 13:05:14 2018 +0100

capabilities: Add 'version' and 'hasTemplateSaveAs'.

hasTemplateSaveAs is not supported yet.

Change-Id: Ic4af44a38ce6a36fd0bbd63f5d94a860280283cd
Reviewed-on: https://gerrit.libreoffice.org/65260
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 87cbd070c..7907fbf3d 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2777,10 +2777,15 @@ private:
 Poco::Dynamic::Var available = allowConvertTo(socket->clientAddress(), 
request);
 convert_to->set("available", available);
 
-// Compose the content of http://server/hosting/capabilities
 Poco::JSON::Object::Ptr capabilities = new Poco::JSON::Object;
 capabilities->set("convert-to", convert_to);
 
+// Supports the TemplateSaveAs in CheckFileInfo?
+capabilities->set("hasTemplateSaveAs", false);
+
+// Version
+capabilities->set("version", LOOLWSD_VERSION);
+
 std::ostringstream ostrJSON;
 capabilities->stringify(ostrJSON);
 return ostrJSON.str();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 wsd/LOOLWSD.cpp |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5d151290e1c1a5c2c6f2df6785f0a7b5530b4d9c
Author: Jan Holesovsky 
AuthorDate: Mon Dec 17 12:46:34 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 17 13:17:16 2018 +0100

capabilities: Add 'version' and 'hasTemplateSaveAs'.

hasTemplateSaveAs is not supported yet.

Change-Id: Ic4af44a38ce6a36fd0bbd63f5d94a860280283cd
Reviewed-on: https://gerrit.libreoffice.org/65261
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 87cbd070c..7907fbf3d 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2777,10 +2777,15 @@ private:
 Poco::Dynamic::Var available = allowConvertTo(socket->clientAddress(), 
request);
 convert_to->set("available", available);
 
-// Compose the content of http://server/hosting/capabilities
 Poco::JSON::Object::Ptr capabilities = new Poco::JSON::Object;
 capabilities->set("convert-to", convert_to);
 
+// Supports the TemplateSaveAs in CheckFileInfo?
+capabilities->set("hasTemplateSaveAs", false);
+
+// Version
+capabilities->set("version", LOOLWSD_VERSION);
+
 std::ostringstream ostrJSON;
 capabilities->stringify(ostrJSON);
 return ostrJSON.str();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt |1 +
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt |1 +
 scp2/source/ooo/ucrt.scp   |4 ++--
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 4a8677150c428855cd67c71341b6bb6d07b59f84
Author: Mike Kaganski 
AuthorDate: Mon Dec 17 00:23:24 2018 +0300
Commit: Christian Lohmaier 
CommitDate: Mon Dec 17 13:19:08 2018 +0100

tdf#122134: use CurrentMajorVersionNumber to filter out Windows 10

On Windows 8.1, the one that is problematic to tell from Windows 10
(because the latter also exposes its version as 603 to the msiexec),
the registry value doesn't exist at
HKLM\SOFTWARE\Microsoft\Windows NT\CurrentVersion
but let's play safe and also check for "#6" value just in case.

Reference:

https://stackoverflow.com/questions/31072543/reliable-way-to-get-windows-version-from-registry

Thanks to Mitchell  for the idea!

Change-Id: Ic907c4d992a7cb1d12e392686c19cd6fd6da3c7c
Reviewed-on: https://gerrit.libreoffice.org/65231
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 
(cherry picked from commit d87fa557ff58c3b9f5c9079a1d7595e095694111)
Reviewed-on: https://gerrit.libreoffice.org/65239
Tested-by: Jenkins
Reviewed-by: Christian Lohmaier 

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
index 46ceccc26c60..cb0ca0c1ccbb 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/AppSearc.idt
@@ -6,3 +6,4 @@ INSTALLLOCATION installuser_
 INSTALLLOCATIONinstallmachine
 INSTALLLOCATIONinstallmachine_
 WIN81S14   win81s14
+WINMAJORVERWinMajorVer
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 1a7074acb7f8..b9b53a02e3ac 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -43,7 +43,7 @@ ProgressType3 installs
 Quickstarterlinkname   QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNoYes
 ReinstallModeText  omus
-SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14
+SecureCustomProperties NEWPRODUCTS;OLDPRODUCTS;WIN81S14;WINMAJORVER
 SetupType  Typical
 SELECT_WORD0
 SELECT_EXCEL   0
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt 
b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
index c082322086ad..7788815d3a6e 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/RegLocat.idt
@@ -5,3 +5,4 @@ installuser 1   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]
 installuser_   1   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
 installmachine 2   
Software\LibreOffice\Layers\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION]  
INSTALLLOCATION 2
 installmachine_2   
Software\LibreOffice\Layers_\[DEFINEDPRODUCT]\[BRANDPACKAGEVERSION] 
INSTALLLOCATION 2
+WinMajorVer2   Software\Microsoft\Windows NT\CurrentVersion
CurrentMajorVersionNumber   2
diff --git a/scp2/source/ooo/ucrt.scp b/scp2/source/ooo/ucrt.scp
index ae2eb27a4dbe..a2d6965e2ecb 100644
--- a/scp2/source/ooo/ucrt.scp
+++ b/scp2/source/ooo/ucrt.scp
@@ -111,7 +111,7 @@ WindowsCustomAction gid_Customaction_check_win81x64_ucrt
Source = "InstMSUBinary";
Target = "Windows81-KB2999226-x64msu";
Inbinarytable = 0;
-   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And VersionNT64", "check_win8x64_ucrt");
+   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And VersionNT64", 
"check_win8x64_ucrt");
Styles = "NO_FILE";
 End
 
@@ -147,7 +147,7 @@ WindowsCustomAction gid_Customaction_check_win81x32_ucrt
Source = "InstMSUBinary";
Target = "Windows81-KB2999226-x86msu";
Inbinarytable = 0;
-   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And Not VersionNT64", "check_win8x32_ucrt");
+   Assignment1 = ("InstallExecuteSequence", "Not Installed And VersionNT = 
603 And (Not WINMAJORVER Or WINMAJORVER = \"#6\") And Not VersionNT64", 
"check_win8x32_ucrt");
Styles = "NO_FILE";
 End
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/docxexport.cxx |3 +--
 sw/source/filter/ww8/wrtw8nds.cxx   |4 ++--
 sw/source/filter/ww8/ww8atr.cxx |1 -
 3 files changed, 3 insertions(+), 5 deletions(-)

New commits:
commit 397195cd43249851bb89d0a2ba82ffdf975b7317
Author: Justin Luth 
AuthorDate: Sat Dec 15 08:33:55 2018 +0300
Commit: Justin Luth 
CommitDate: Mon Dec 17 13:22:25 2018 +0100

sw filter/ww8 code cleanup

cleanup of various nonsense that I ran across.

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

diff --git a/sw/source/filter/ww8/docxexport.cxx 
b/sw/source/filter/ww8/docxexport.cxx
index 96d41d44bafa..0965d01942a9 100644
--- a/sw/source/filter/ww8/docxexport.cxx
+++ b/sw/source/filter/ww8/docxexport.cxx
@@ -577,8 +577,7 @@ void DocxExport::OutputEndNode( const SwEndNode& rEndNode )
 else
 nRstLnNum = 0;
 
-AttrOutput().SectionBreak( msword::PageBreak, 
m_pSections->CurrentSectionInfo( ) );
-m_pSections->AppendSection( m_pCurrentPageDesc, pParentFormat, 
nRstLnNum );
+AppendSection( m_pCurrentPageDesc, pParentFormat, nRstLnNum );
 }
 else
 {
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx 
b/sw/source/filter/ww8/wrtw8nds.cxx
index b5b1eccfe2dc..02e946af9a9d 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -3042,7 +3042,7 @@ void MSWordExportBase::OutputSectionNode( const 
SwSectionNode& rSectionNode )
 {
 // new Section with no own PageDesc/-Break
 //  -> write follow section break;
-const SwSectionFormat& rFormat = *rSection.GetFormat();
+const SwSectionFormat* pFormat = rSection.GetFormat();
 ReplaceCr( msword::PageBreak ); // Indicator for Page/Section-Break
 
 // Get the page in use at the top of this section
@@ -3052,7 +3052,7 @@ void MSWordExportBase::OutputSectionNode( const 
SwSectionNode& rSectionNode )
 if (!pCurrent)
 pCurrent = m_pCurrentPageDesc;
 
-AppendSection( pCurrent, &rFormat, nRstLnNum );
+AppendSection( pCurrent, pFormat, nRstLnNum );
 }
 }
 if ( TOX_CONTENT_SECTION == rSection.GetType() )
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 249ce32a6f99..5120aa5f9094 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -436,7 +436,6 @@ void MSWordExportBase::OutputSectionBreaks( const 
SfxItemSet *pSet, const SwNode
 Converting a page break to section break would cause serious 
issues while importing
 the RT files with different first page being set.
 */
-bNewPageDesc = false;
 
 /*
  * If Table cell is open and page header types are different
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: CppunitTest_chart2_xshape Failure with Display Scaling on Windows

[Stephan Bergmann]

On 17/12/2018 11:07, Michael Stahl wrote:

On 17.12.18 09:25, Stephan Bergmann wrote:

On 16/12/2018 22:35, Kaganski Mike wrote:

Unfortunately cannot repro locally. Possibly it's worth trying to only
add manifest to soffice.bin, not to all console applications. Will try
that tomorrow.


While that might fix CppunitTests, it likely would leave a similar 
(potential) issue in other tests like JunitTests that internally spawn 
an soffice.bin process.


but that isn't a new problem, since soffice.bin had that manifest 
applied to it before the recent changes?


Probably (and it is apparently a hypothetical problem as of now anyway). 
 Just sounds like adapting cppunittester to solve that immediate issue 
would be a workaround rather than a proper fix.

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

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

[Libreoffice Gerrit user]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |2 +-
 sd/qa/unit/import-tests-smartart.cxx|   17 -
 2 files changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 8d6e14765145ab7c9cb0cbf6956eaf07db10139a
Author: Miklos Vajna 
AuthorDate: Wed Nov 21 16:17:42 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 13:33:07 2018 +0100

oox smartart, accent process: fix overlapping shape pairs

Linear algorithm had an idea how to take width from constrains, but that
was unused for embedded child algorithms.

Change-Id: If4c497e053ea0d134a1ffc529f1d233ec4fc50db
Reviewed-on: https://gerrit.libreoffice.org/63725
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 67e062aa5e5946d4985921fe2b6f87766f363ddc)
Reviewed-on: https://gerrit.libreoffice.org/65248

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index c053aa4c441a..bb5ed2ad7704 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -523,7 +523,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 aSize.Width *= fWidthScale;
 aCurrShape->setSize(aSize);
 
-aCurrShape->setChildSize(aChildSize);
+aCurrShape->setChildSize(aSize);
 aCurrPos.X += nIncX * (aSize.Width + fSpace*aSize.Width);
 aCurrPos.Y += nIncY * (aChildSize.Height + 
fSpace*aChildSize.Height);
 }
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index edb64c3ba600..f431cdddfa03 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -472,7 +472,7 @@ void SdImportTestSmartArt::testAccentProcess()
 CPPUNIT_ASSERT(xFirstParentText.is());
 CPPUNIT_ASSERT_EQUAL(OUString("a"), xFirstParentText->getString());
 uno::Reference xFirstParent(xFirstParentText, 
uno::UNO_QUERY);
-CPPUNIT_ASSERT(xFirstParentText.is());
+CPPUNIT_ASSERT(xFirstParent.is());
 int nFirstParentTop = xFirstParent->getPosition().Y;
 
 uno::Reference xFirstChildText(xFirstPair->getByIndex(2), 
uno::UNO_QUERY);
@@ -481,6 +481,7 @@ void SdImportTestSmartArt::testAccentProcess()
 uno::Reference xFirstChild(xFirstChildText, 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xFirstChildText.is());
 int nFirstChildTop = xFirstChild->getPosition().Y;
+int nFirstChildRight = xFirstChild->getPosition().X + 
xFirstChild->getSize().Width;
 
 // First child is below the first parent.
 // Without the accompanying fix in place, this test would have failed with
@@ -488,6 +489,20 @@ void SdImportTestSmartArt::testAccentProcess()
 // below xFirstParent (a good position is 9081).
 CPPUNIT_ASSERT_LESS(nFirstChildTop, nFirstParentTop);
 
+uno::Reference xSecondPair(xGroup->getByIndex(2), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xSecondPair.is());
+CPPUNIT_ASSERT_EQUAL(static_cast(3), xSecondPair->getCount());
+uno::Reference xSecondParentText(xSecondPair->getByIndex(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xFirstParentText.is());
+CPPUNIT_ASSERT_EQUAL(OUString("c"), xSecondParentText->getString());
+uno::Reference xSecondParent(xSecondParentText, 
uno::UNO_QUERY);
+CPPUNIT_ASSERT(xSecondParent.is());
+int nSecondParentLeft = xSecondParent->getPosition().X;
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected less than: 12700; Actual  : 18540', i.e. the "b" and "c"
+// shapes overlapped.
+CPPUNIT_ASSERT_LESS(nSecondParentLeft, nFirstChildRight);
+
 xDocShRef->DoClose();
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |6 --
 sd/qa/unit/data/pptx/smartart-accent-process.pptx   |binary
 sd/qa/unit/import-tests-smartart.cxx|4 +++-
 3 files changed, 7 insertions(+), 3 deletions(-)

New commits:
commit 1571c42e1fe64c6146161b08585737d3ba288629
Author: Miklos Vajna 
AuthorDate: Wed Nov 21 17:40:36 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 13:33:27 2018 +0100

oox smartart, accent process: handle multiple runs from a data point

Multiple paragraphs indeed are impossible for those containers, but
multiple runs can happen.

Change-Id: I47a2f72cae4cbb822f31a5b7cd0169a663e2a6a8
Reviewed-on: https://gerrit.libreoffice.org/63732
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit cfa76f538a44d4396574ece59e8a3953c22c6eb7)
Reviewed-on: https://gerrit.libreoffice.org/65249

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index bb5ed2ad7704..52a05ccdb53d 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -875,8 +875,10 @@ bool LayoutNode::setupShape( const ShapePtr& rShape, const 
dgm::Point* pPresNode
 if( aVecIter->second != -1 )
 rPara.getProperties().setLevel(aVecIter->second);
 
-rPara.addRun(
-
aDataNode2->second->mpShape->getTextBody()->getParagraphs().front()->getRuns().front());
+std::shared_ptr pSourceParagraph
+= 
aDataNode2->second->mpShape->getTextBody()->getParagraphs().front();
+for (const auto& pRun : pSourceParagraph->getRuns())
+rPara.addRun(pRun);
 rPara.getProperties().apply(
 
aDataNode2->second->mpShape->getTextBody()->getParagraphs().front()->getProperties());
 }
diff --git a/sd/qa/unit/data/pptx/smartart-accent-process.pptx 
b/sd/qa/unit/data/pptx/smartart-accent-process.pptx
index de556bdc6066..8710e7f170a9 100644
Binary files a/sd/qa/unit/data/pptx/smartart-accent-process.pptx and 
b/sd/qa/unit/data/pptx/smartart-accent-process.pptx differ
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index f431cdddfa03..7c46270015ee 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -494,7 +494,9 @@ void SdImportTestSmartArt::testAccentProcess()
 CPPUNIT_ASSERT_EQUAL(static_cast(3), xSecondPair->getCount());
 uno::Reference xSecondParentText(xSecondPair->getByIndex(1), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xFirstParentText.is());
-CPPUNIT_ASSERT_EQUAL(OUString("c"), xSecondParentText->getString());
+// Without the accompanying fix in place, this test would have failed with
+// 'Expected: cc; Actual  : c', i.e. non-first runs on data points were 
ignored.
+CPPUNIT_ASSERT_EQUAL(OUString("cc"), xSecondParentText->getString());
 uno::Reference xSecondParent(xSecondParentText, 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xSecondParent.is());
 int nSecondParentLeft = xSecondParent->getPosition().X;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 oox/source/drawingml/diagram/layoutatomvisitors.cxx |   14 ++
 oox/source/drawingml/diagram/layoutatomvisitors.hxx |2 ++
 sd/qa/unit/import-tests-smartart.cxx|3 ++-
 3 files changed, 18 insertions(+), 1 deletion(-)

New commits:
commit 467a2ab7e52be376ee7f0dee9bd44f7a4ed38267
Author: Miklos Vajna 
AuthorDate: Tue Nov 27 17:41:05 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 13:35:08 2018 +0100

oox smartart, accent process: handle followSib axis of forEach

Currently the accept process document creates 0 connectors. Instead, it
creates empty custom shapes: this commit fixes the loop, so that only
one of them is created.

The whole purpose of the follow sibling axis is that N - 1 connectors
are created for N shapes, not N connectors.

Change-Id: I54244c7615b83f607ef53a4ff8d01d3c9594856e
Reviewed-on: https://gerrit.libreoffice.org/64122
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit aedc5427e4b6645ff3257e523c33190cf5e1934d)
Reviewed-on: https://gerrit.libreoffice.org/65250

diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.cxx 
b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
index 700b48080bc6..ced94784aff4 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.cxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.cxx
@@ -48,6 +48,14 @@ void ShapeCreationVisitor::visit(AlgAtom& rAtom)
 
 void ShapeCreationVisitor::visit(ForEachAtom& rAtom)
 {
+if (rAtom.iterator().mnAxis == XML_followSib)
+{
+// If the axis is the follow sibling, then the last atom should not be
+// visited.
+if (mnCurrIdx + mnCurrStep >= mnCurrCnt)
+return;
+}
+
 const std::vector& rChildren=rAtom.getChildren();
 
 sal_Int32 nChildren=1;
@@ -67,7 +75,11 @@ void ShapeCreationVisitor::visit(ForEachAtom& rAtom)
 rAtom.iterator().mnCnt==-1 ? nChildren : rAtom.iterator().mnCnt);
 
 const sal_Int32 nOldIdx=mnCurrIdx;
+const sal_Int32 nOldStep = mnCurrStep;
+const sal_Int32 nOldCnt = mnCurrCnt;
 const sal_Int32 nStep=rAtom.iterator().mnStep;
+mnCurrStep = nStep;
+mnCurrCnt = nCnt;
 for( mnCurrIdx=0; mnCurrIdx0; mnCurrIdx+=nStep )
 {
 // TODO there is likely some conditions
@@ -77,6 +89,8 @@ void ShapeCreationVisitor::visit(ForEachAtom& rAtom)
 
 // and restore idx
 mnCurrIdx = nOldIdx;
+mnCurrStep = nOldStep;
+mnCurrCnt = nOldCnt;
 }
 
 void ShapeCreationVisitor::visit(ConditionAtom& rAtom)
diff --git a/oox/source/drawingml/diagram/layoutatomvisitors.hxx 
b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
index 299739186315..f395f6a68668 100644
--- a/oox/source/drawingml/diagram/layoutatomvisitors.hxx
+++ b/oox/source/drawingml/diagram/layoutatomvisitors.hxx
@@ -33,6 +33,8 @@ class ShapeCreationVisitor : public LayoutAtomVisitor
 ShapePtr mpParentShape;
 const Diagram& mrDgm;
 sal_Int32 mnCurrIdx;
+sal_Int32 mnCurrStep = 0;
+sal_Int32 mnCurrCnt = 0;
 const dgm::Point* mpCurrentNode;
 
 void defaultVisit(LayoutAtom const & rAtom);
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index 7c46270015ee..aa8498b73ce9 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -458,7 +458,8 @@ void SdImportTestSmartArt::testAccentProcess()
 
m_directories.getURLFromSrc("/sd/qa/unit/data/pptx/smartart-accent-process.pptx"),
 PPTX);
 uno::Reference xGroup(getShapeFromPage(0, 0, xDocShRef), 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xGroup.is());
-CPPUNIT_ASSERT_EQUAL(static_cast(4), xGroup->getCount());
+// 3 children: first pair, connector, second pair.
+CPPUNIT_ASSERT_EQUAL(static_cast(3), xGroup->getCount());
 uno::Reference xGroupShape(xGroup, uno::UNO_QUERY);
 CPPUNIT_ASSERT(xGroupShape.is());
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: dbaccess/source include/sfx2 offapi/com sfx2/source sw/PythonTest_sw_python.mk sw/qa

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/databasedocument.cxx |6 +
 dbaccess/source/core/dataaccess/databasedocument.hxx |1 
 include/sfx2/sfxbasemodel.hxx|2 
 offapi/com/sun/star/frame/XModel2.idl|   21 ++
 sfx2/source/doc/sfxbasemodel.cxx |   30 +
 sw/PythonTest_sw_python.mk   |1 
 sw/qa/python/check_xmodel.py |   59 +++
 7 files changed, 120 insertions(+)

New commits:
commit 43a63b725208bfa378355011ea56cb936afa4411
Author: Samuel Mehrbrodt 
AuthorDate: Thu Dec 13 09:09:52 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Mon Dec 17 13:58:56 2018 +0100

Allow setting some MediaDescriptor properties during runtime

Change-Id: Id6bb554c0e165c6d1f9c28c48fdbcd7156f42316
Reviewed-on: https://gerrit.libreoffice.org/65256
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/dbaccess/source/core/dataaccess/databasedocument.cxx 
b/dbaccess/source/core/dataaccess/databasedocument.cxx
index e84af4dfe653..c20bb36c3566 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.cxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.cxx
@@ -44,6 +44,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -797,6 +798,11 @@ Sequence< PropertyValue > SAL_CALL 
ODatabaseDocument::getArgs(  )
 return m_pImpl->getMediaDescriptor().getPropertyValues();
 }
 
+void SAL_CALL ODatabaseDocument::setArgs(const Sequence& 
/* aArgs */)
+{
+throw NoSupportException();
+}
+
 void SAL_CALL ODatabaseDocument::connectController( const Reference< 
XController >& _xController )
 {
 DocumentGuard aGuard(*this, DocumentGuard::DefaultMethod);
diff --git a/dbaccess/source/core/dataaccess/databasedocument.hxx 
b/dbaccess/source/core/dataaccess/databasedocument.hxx
index df5765855df7..8a951d61d868 100644
--- a/dbaccess/source/core/dataaccess/databasedocument.hxx
+++ b/dbaccess/source/core/dataaccess/databasedocument.hxx
@@ -328,6 +328,7 @@ public:
 virtual css::uno::Sequence< OUString > SAL_CALL 
getAvailableViewControllerNames(  ) override ;
 virtual css::uno::Reference< css::frame::XController2 > SAL_CALL 
createDefaultViewController( const css::uno::Reference< css::frame::XFrame >& 
Frame ) override ;
 virtual css::uno::Reference< css::frame::XController2 > SAL_CALL 
createViewController( const OUString& ViewName, const css::uno::Sequence< 
css::beans::PropertyValue >& Arguments, const css::uno::Reference< 
css::frame::XFrame >& Frame ) override ;
+virtual void SAL_CALL setArgs(const 
css::uno::Sequence& aArgs) override;
 
 // XStorable
 virtual sal_Bool SAL_CALL hasLocation(  ) override ;
diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx
index 8c513d515f3f..d885f1385333 100644
--- a/include/sfx2/sfxbasemodel.hxx
+++ b/include/sfx2/sfxbasemodel.hxx
@@ -336,6 +336,8 @@ public:

   const css::uno::Sequence< css::beans::PropertyValue >& Arguments 
 ,

   const css::uno::Reference< css::frame::XFrame >&   Frame 
 ) override;
 
+virtual void SAL_CALL setArgs(const 
css::uno::Sequence& aArgs) override;
+
 
 //  XModifiable2
 
diff --git a/offapi/com/sun/star/frame/XModel2.idl 
b/offapi/com/sun/star/frame/XModel2.idl
index 0a0e15f1b738..41d44512149a 100644
--- a/offapi/com/sun/star/frame/XModel2.idl
+++ b/offapi/com/sun/star/frame/XModel2.idl
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
  module com {  module sun {  module star {  module frame {
@@ -129,6 +130,26 @@ interface XModel2 : com::sun::star::frame::XModel
   [in]  
com::sun::star::frame::XFrameFrame  )
 raises (com::sun::star::lang::IllegalArgumentException,
 com::sun::star::uno::Exception);
+
+/** Sets com::sun::star::document::MediaDescriptor properties
+of the current model during runtime.
+
+@since LibreOffice 6.3
+
+@param Arguments
+Properties which should be set
+Supported properties:
+
+
com::sun::star::document::MediaDescriptor::SuggestedSaveAsDir
+
com::sun::star::document::MediaDescriptor::SuggestedSaveAsName
+
+
+@throws com::sun::star::lang::IllegalArgumentException When trying to 
set an unsupported property
+@throws com::sun::star::util::InvalidStateException When the document 
model can not be retrieved
+ */
+void setArgs([in] sequence< com::sun::star::beans::PropertyValue > 
Arguments)
+raises(com::sun::star::lang::IllegalArgumentException,
+   com::sun::star::util::InvalidStateException);
 };

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4b' - 8 commits - sw/inc sw/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit 91d68118b279f841252f9943f0b67c6728224506
Author: Michael Stahl 
AuthorDate: Thu Dec 13 13:26:20 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 14:11:39 2018 +0100

Revert "HACK: ODF import: always hide redlines"

This reverts commit 4382312c0160ab799ff1f8f2432da6b87d7a7302.

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 60cc3a5f46a9..f36ffb47a147 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,11 +856,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-#if 0
-  !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
-#else
-  true))
-#endif
+  (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
+!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
 {
 try
 {
@@ -893,10 +890,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
-#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
-#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 96d5adb606e752a4aac01ee47562e57cc4636638
Author: Michael Stahl 
AuthorDate: Fri Nov 30 18:00:19 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 14:11:39 2018 +0100

HACK: ODF import: always hide redlines

Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index f36ffb47a147..60cc3a5f46a9 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,8 +856,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-  (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
-!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
+#if 0
+  !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
+#else
+  true))
+#endif
 {
 try
 {
@@ -890,8 +893,10 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 0fb82a01837fb01162413e095cde26130589aed8
Author: Michael Stahl 
AuthorDate: Wed Dec 5 16:37:18 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 14:11:39 2018 +0100

temp?

Change-Id: Ide2abf0c2ce054b75c917063a5d5aa8d13430426

diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 7b6411163cb3..c756aedf4cd2 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -267,6 +267,7 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const 
SwPosition &rPos,
 
 bool bGoOn = true;
 TextFrameIndex const nOffset = MapModelToViewPos(rPos);
+assert(nOffset != TextFrameIndex(COMPLETE_STRING)); // not going to 
end well
 TextFrameIndex nNextOfst;
 
 do
commit c46d4816d264656f6e09eabe7e984f16094300d2
Author: Michael Stahl 
AuthorDate: Mon Dec 17 14:10:26 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 14:11:38 2018 +0100

sw_redlinehide_4b: adapt FindFormat()

Change-Id: I78cfca1cd629bf518f8294450a34ee228a360ef9

diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 482d5691a01a..80ceff38be49 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -122,7 +122,8 @@ public:
 SwDocPositions nStart, SwDocPositions nEnde,
 bool& bCancel,
 FindRanges,
-const SwTextFormatColl* pReplFormat );
+const SwTextFormatColl* pReplFormat,
+SwRootFrame const*const pLayout = nullptr);
 sal_uLong FindAttrs( const SfxItemSet& rSet, bool bNoCollections,
 SwDocPositions nStart, SwDocPositions nEnde,
 bool& bCancel,
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw

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

[Libreoffice Gerrit user]

 sfx2/source/appl/sfxhelp.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 0574f8241acbe07c87a014fb0c8f12d2f3a8b785
Author: Stephan Bergmann 
AuthorDate: Mon Dec 17 11:41:27 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 17 14:42:57 2018 +0100

Remove unnecessary OUString aInternal

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

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 4a8929af5a31..7a3eb65a1867 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -721,10 +721,9 @@ static bool impl_showOnlineHelp( const OUString& rURL )
 static bool impl_showOfflineHelp( const OUString& rURL )
 {
 const OUString& aBaseInstallPath = getHelpRootURL();
-OUString const aInternal( "vnd.sun.star.help://"  );
 
 OUString aHelpLink( aBaseInstallPath + "/index.html?" );
-OUString aTarget = "Target=" + rURL.copy(aInternal.getLength());
+OUString aTarget = "Target=" + 
rURL.copy(RTL_CONSTASCII_LENGTH("vnd.sun.star.help://"));
 aTarget = aTarget.replaceAll("%2F","/").replaceAll("?","&");
 aHelpLink += aTarget;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cui/source fpicker/source sc/source sd/source sfx2/source svx/source sw/source vcl/source

[Libreoffice Gerrit user]

 cui/source/dialogs/cuigaldlg.cxx|2 +-
 fpicker/source/office/OfficeFilePicker.cxx  |2 +-
 fpicker/source/office/OfficeFolderPicker.cxx|2 +-
 sc/source/ui/view/tabvwsha.cxx  |2 +-
 sd/source/ui/animations/CustomAnimationPane.cxx |2 +-
 sd/source/ui/func/fuarea.cxx|2 +-
 sd/source/ui/func/fuline.cxx|2 +-
 sd/source/ui/func/futransf.cxx  |2 +-
 sfx2/source/appl/childwin.cxx   |2 +-
 svx/source/gallery2/galbrws1.cxx|4 ++--
 sw/source/uibase/app/apphdl.cxx |2 +-
 sw/source/uibase/app/docst.cxx  |2 +-
 sw/source/uibase/shells/txtnum.cxx  |2 +-
 sw/source/uibase/uiview/viewling.cxx|2 +-
 vcl/source/window/dialog.cxx|2 +-
 15 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit c56a8280bdd605f77f0075a7f2bfa474aa2a26e5
Author: Stephan Bergmann 
AuthorDate: Mon Dec 17 08:53:07 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 17 14:44:14 2018 +0100

Resolve deprecated implicit capture of *this by reference in C++20

...as flagged with -Werror=deprecated by trunk GCC in -std=c++2a mode.  But
C++17 forbids "this" in combination with a capture-default of "=", so in 
such
cases list any entities explicitly that shall be captured by value.

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

diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 41200fc04cc8..0595c2680be2 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -818,7 +818,7 @@ void TPGalleryThemeProperties::SearchFiles()
 xProgress->SetDirectory( INetURLObject() );
 
 xProgress->LaunchThread();
-weld::DialogController::runAsync(xProgress, [=](sal_Int32 nResult) {
+weld::DialogController::runAsync(xProgress, [this](sal_Int32 nResult) {
 EndSearchProgressHdl(nResult);
 });
 }
diff --git a/fpicker/source/office/OfficeFilePicker.cxx 
b/fpicker/source/office/OfficeFilePicker.cxx
index 0651b70eb1c0..a1a23de36db7 100644
--- a/fpicker/source/office/OfficeFilePicker.cxx
+++ b/fpicker/source/office/OfficeFilePicker.cxx
@@ -503,7 +503,7 @@ void SAL_CALL SvtFilePicker::startExecuteModal( const 
Reference< css::ui::dialog
 prepareExecute();
 SvtFileDialog_Base* pDialog = getDialog();
 pDialog->EnableAutocompletion();
-pDialog->StartExecuteAsync([=](sal_Int32 nResult){
+pDialog->StartExecuteAsync([this](sal_Int32 nResult){
 DialogClosedHdl(nResult);
 });
 }
diff --git a/fpicker/source/office/OfficeFolderPicker.cxx 
b/fpicker/source/office/OfficeFolderPicker.cxx
index 06703055fb4b..b95f0f972980 100644
--- a/fpicker/source/office/OfficeFolderPicker.cxx
+++ b/fpicker/source/office/OfficeFolderPicker.cxx
@@ -65,7 +65,7 @@ void SAL_CALL SvtFolderPicker::startExecuteModal( const 
Reference< css::ui::dial
 prepareExecute();
 SvtFileDialog_Base* pDialog = getDialog();
 pDialog->EnableAutocompletion();
-pDialog->StartExecuteAsync([=](sal_Int32 nResult){
+pDialog->StartExecuteAsync([this](sal_Int32 nResult){
 DialogClosedHdl(nResult);
 });
 }
diff --git a/sc/source/ui/view/tabvwsha.cxx b/sc/source/ui/view/tabvwsha.cxx
index 2778d5d79c90..58ef3735f30a 100644
--- a/sc/source/ui/view/tabvwsha.cxx
+++ b/sc/source/ui/view/tabvwsha.cxx
@@ -547,7 +547,7 @@ void ScTabViewShell::ExecuteCellFormatDlg(SfxRequest& rReq, 
const OString &rName
 std::shared_ptr pRequest(new SfxRequest(rReq));
 rReq.Ignore(); // the 'old' request is not relevant any more
 
-pDlg->StartExecuteAsync([=](sal_Int32 nResult){
+pDlg->StartExecuteAsync([pDlg, pOldSet, pRequest, this](sal_Int32 nResult){
 bInFormatDialog = false;
 
 if ( nResult == RET_OK )
diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index d8306a805def..f87eb0153538 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -1645,7 +1645,7 @@ void CustomAnimationPane::showOptions(const OString& 
rPage)
 
 std::shared_ptr xDlg(new 
CustomAnimationDialog(GetFrameWeld(), std::move(xSet), rPage));
 
-weld::DialogController::runAsync(xDlg, [=](sal_Int32 nResult){
+weld::DialogController::runAsync(xDlg, [xDlg, this](sal_Int32 nResult){
 if (nResult )
 {
 addUndo();
diff --git a/sd/source/ui/func/fuarea.cxx b/sd/source/ui/func/fuarea.cxx
index 85eaef244991..a7cfa3fef87f 100644
--- a/sd/source/ui/func/fuarea.cxx
+++ b/sd/source/ui/func/fuarea.cxx
@@ -63,7 +63,7 @@ void FuArea::DoExecute( SfxRequest& rReq )
 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui|   83 ++-
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui|2 
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |  324 +-
 3 files changed, 392 insertions(+), 17 deletions(-)

New commits:
commit c7261db775b5b97660dd44e32a2f08195f2c15cf
Author: andreas kainz 
AuthorDate: Tue Dec 11 21:37:14 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 14:50:31 2018 +0100

tdf#122154 add DataSort action to data group

and update some alignments

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 66dc9cab8955..8d3438a991df 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -3456,8 +3456,21 @@
 False
   
 
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+True
+icons
+False
 
-  
+  
 True
 False
 .uno:Color
@@ -3471,7 +3484,7 @@
   
 False
 True
-1
+2
   
 
   
@@ -3546,8 +3559,6 @@
   
 True
 False
-True
-Specify 
the borders of the selected cells.
 .uno:SetBorderStyle
   
   
@@ -3555,8 +3566,23 @@
 False
   
 
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+True
+end
+True
+icons
+False
 
-  
+  
 True
 False
 .uno:BackgroundColor
@@ -3570,7 +3596,7 @@
   
 False
 True
-1
+2
   
 
   
@@ -4166,10 +4192,10 @@
   
 
 
-  
+  
 True
 False
-.uno:SortAscending
+.uno:DataSort
   
   
 False
@@ -4757,6 +4783,7 @@
   
 True
 True
+5
 icons
 False
 
@@ -4770,8 +4797,21 @@
 False
   
 
+   

[Libreoffice-commits] core.git: icon-themes/colibre officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 icon-themes/colibre/links.txt|2 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 
 sc/uiconfig/scalc/ui/notebookbar.ui  |   54 
+++---
 sd/uiconfig/sdraw/ui/notebookbar.ui  |   54 
+++---
 sd/uiconfig/simpress/ui/notebookbar.ui   |   54 
+++---
 sw/uiconfig/swriter/ui/notebookbar.ui|4 
 6 files changed, 64 insertions(+), 107 deletions(-)

New commits:
commit e25f270d45e78399cbbf4d66d4d02af064ad4f79
Author: andreas kainz 
AuthorDate: Tue Dec 11 22:04:23 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 14:52:43 2018 +0100

tdf#121581 update Tools tabb in NB

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

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 7d498f287ab0..eef9e8db1b75 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -919,6 +919,8 @@ cmd/sc_browseforward.png cmd/sc_nextrecord.png
 
 # Macro
 cmd/sc_macrosmenu.png res/im30821.png
+cmd/sc_macrodialog.png cmd/sc_scriptorganizer.png
+cmd/lc_macrodialog.png cmd/lc_scriptorganizer.png
 
 # Help
 cmd/sc_about.png res/mainapp_16.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 9dec9ccaf542..eb1c3092d08f 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5176,6 +5176,9 @@
 
   %PRODUCTNAME ~Basic...
 
+
+  1
+
   
   
 
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index f4efe6df47f9..fb3e5adbc753 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1554,52 +1554,45 @@
 True
 False
 
-  
-True
-False
-.uno:MacroOrganizer?TabId:short=1
-  
-
-
-  
+  
 True
 False
-.uno:MacroSignature
+.uno:MacroRecorder
   
 
 
-  
+  
 True
 False
-.uno:ScriptOrganizer
+.uno:RunMacro
   
 
 
-  
+  
 True
 False
-.uno:ViewDataSourceBrowser
+.uno:BasicIDEAppear
   
 
 
-  
+  
 True
 False
-.uno:BasicIDEAppear
+.uno:MacroOrganizer?TabId:short=1
   
 
 
-  
+  
 True
 False
-.uno:RunMacro
+.uno:ScriptOrganizer
   
 
 
-  
+  
 True
 False
-.uno:MacroRecorder
+.uno:MacroSignature
   
 
 
@@ -1656,32 +1649,23 @@
   
 
 
-  
-True
-False
-.uno:OpenXMLFilterSettings
-  
-
-
-  
+  
 True
 False
-service:com.sun.star.deployment.ui.PackageManagerDialog
+.uno:ViewDataSourceBrowser
   
 
 
-  
+  
 True
 False
-vnd.sun.star.job:alias=UpdateCheck
-_Check for Updates...
   
 
 
-  
+  
 True
 False
-.uno:OptionsTreeDialog
+.uno:OpenXMLFilterSettings
   
 
   
@@ -13320,10 +13304,10 @@
 both-horiz
 False
 
-  
+  
 True
 False
-.uno:ScriptOrganizer
+.uno:MacroDialog
   
   
 False
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index bf497332dac1..fc6508027afd 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1694,52 +1694,45 @@
 True
 False
 
-  
-True
-False
-.uno:MacroOrganizer?TabId:short=1
-  
-
-
-  
+  
 True
 False
-.uno:MacroSignature
+.uno:MacroRecorder
   
 
 
-  
+  
 True
 False
-.uno:ScriptOrganizer
+.uno:RunMacro
   
 
 
-  
+  
 True
 False
-.uno:ViewDataSourceBrowser
+.uno:BasicIDEAppear
   
 
 
-  
+  
 True
 False
-.uno:BasicIDEAppear
+.uno:MacroOrganizer?TabId:short=1
   
 
 
-  
+  
 

[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-6.2.0.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.2.0.1' created by Andras Timar  
at 2018-12-17 14:15 +

libreoffice-6.2.0.1

Changes since libreoffice-6.2.0.0.beta1-15:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'libreoffice-6-2' - configure.ac

[Libreoffice Gerrit user]

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

New commits:
commit 87434c02265f1e346775d692d23e5fea8eb22b35
Author: Andras Timar 
AuthorDate: Mon Dec 17 15:15:17 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 17 15:15:17 2018 +0100

Bump version to 6.2.0.1

Change-Id: I8eca42d55a8a3765893ae258b756e22d45c88e1e

diff --git a/configure.ac b/configure.ac
index 386fc1a32..7a57bc01d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ([2.63])
 
-AC_INIT([libreoffice-online], [6.2.0.0.beta1], 
[libreoffice@lists.freedesktop.org])
+AC_INIT([libreoffice-online], [6.2.0.1], [libreoffice@lists.freedesktop.org])
 LT_INIT([shared, disable-static, dlopen])
 
 AM_INIT_AUTOMAKE([1.10 subdir-objects tar-pax -Wno-portability])
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Branch 'refs/tags/libreoffice-6.2.0.1' - 0 commits -

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/odfexport/data/tdf99631.docx |binary
 sw/qa/extras/odfexport/odfexport.cxx  |9 +
 sw/source/uibase/wrtsh/wrtsh1.cxx |   13 -
 3 files changed, 21 insertions(+), 1 deletion(-)

New commits:
commit 75656a933e7a503f114aa64c67397cb375c9dbe8
Author: László Németh 
AuthorDate: Wed Dec 12 12:58:07 2018 +0100
Commit: László Németh 
CommitDate: Mon Dec 17 15:20:02 2018 +0100

tdf#99631 DOCX import: set 1:1 scale in embedded XLSX

based on the OLE object size, instead of applying
different scales for the bad (non-imported) VisibleArea
settings.

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

diff --git a/sw/qa/extras/odfexport/data/tdf99631.docx 
b/sw/qa/extras/odfexport/data/tdf99631.docx
new file mode 100644
index ..7fcb612c7f6d
Binary files /dev/null and b/sw/qa/extras/odfexport/data/tdf99631.docx differ
diff --git a/sw/qa/extras/odfexport/odfexport.cxx 
b/sw/qa/extras/odfexport/odfexport.cxx
index 6bc9b8fa006b..c8468eb90cdd 100644
--- a/sw/qa/extras/odfexport/odfexport.cxx
+++ b/sw/qa/extras/odfexport/odfexport.cxx
@@ -2123,6 +2123,15 @@ DECLARE_ODFEXPORT_TEST(tdf118502, "tdf118502.odt")
 CPPUNIT_ASSERT(xReplacementGraphic.is());
 }
 
+DECLARE_ODFEXPORT_TEST(tdf99631, "tdf99631.docx")
+{
+// File asserting while saving in LO.
+xmlDocPtr pXmlDoc = parseExport("Object 1/settings.xml");
+if (!pXmlDoc)
+return;
+assertXPathContent(pXmlDoc, 
"//config:config-item[@config:name='VisibleAreaWidth']", "4515");
+assertXPathContent(pXmlDoc, 
"//config:config-item[@config:name='VisibleAreaHeight']", "903");
+}
 #endif
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 57fb431a5cc5..23319adb5691 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -49,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -631,11 +632,20 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& 
xObj,
 
 try
 {
+SvGlobalName aCLSID( xObj->getClassID() );
+// tdf#99631 VisibleArea settings of embedded XLSX haven't been 
imported in DOCX, yet:
+// set the 1:1 scale based on the OLE object size instead of bad 
scaling in non-modified documents
+bool bUpdateDOCXSheet = !GetDoc()->GetDocShell()->IsModified() &&
+   // embedded spreadsheet
+   aCLSID == SvGlobalName( SO3_SC_CLASSID_60 ) &&
+   // in docx
+   
GetView().GetViewFrame()->GetFrame().GetCurrentDocument()->GetModel()->getURL().endsWithIgnoreAsciiCase(".docx");
+
 nMisc = xObj->getStatus( nAspect );
 
 // This can surely only be a non-active object, if desired they
 // get the new size set as VisArea (StarChart).
-if( embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE & nMisc )
+if ((embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE & nMisc) || 
bUpdateDOCXSheet)
 {
 // TODO/MBA: testing
 SwRect aRect( pFlyPrtRect ? *pFlyPrtRect
@@ -672,6 +682,7 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& 
xObj,
 // nothing has been changed.
 // If the replacement graphic changes by this action, the 
document
 // will be already modified via other mechanisms.
+if (embed::EmbedMisc::MS_EMBED_RECOMPOSEONRESIZE & nMisc)
 {
 bool bResetEnableSetModified(false);
 if ( GetDoc()->GetDocShell()->IsEnableSetModified() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: Changes to 'refs/tags/libreoffice-6.2.0.1'

[Libreoffice Gerrit user]

Tag 'libreoffice-6.2.0.1' created by Andras Timar  
at 2018-12-17 14:23 +

libreoffice-6.2.0.1

Changes since libreoffice-6.2.0.0.beta1-15:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   93 +++-
 oox/source/drawingml/diagram/diagramlayoutatoms.hxx |9 +
 oox/source/drawingml/diagram/layoutatomvisitors.cxx |2 
 sd/qa/unit/import-tests-smartart.cxx|   19 
 4 files changed, 117 insertions(+), 6 deletions(-)

New commits:
commit 967f2ac350330a28a3fc2ec0993cbaf976e6cf60
Author: Miklos Vajna 
AuthorDate: Fri Nov 30 17:57:21 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 15:39:55 2018 +0100

oox smartart, accent process: adjust size of connector from constraints

The constraints explicitly said that the width should be larger than the
height, but it was the opposite as constraints were not parsed.

Unfortunately it would be too brave for globally start handling all
constraints which lack a forName, so add a switch to opt in for this,
and use that with the conn algorithm. All clients should migrate to
bRequireForName=true at some stage, though.

Change-Id: I24ae79b141c0f7a11e4d19f141759fc1dd2169b0
Reviewed-on: https://gerrit.libreoffice.org/64350
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit ddc2786831367577967e806d603f337a2e42806a)
Reviewed-on: https://gerrit.libreoffice.org/65252

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index f5a7b410de03..74cd2ed7d06c 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -314,11 +314,14 @@ void ConstraintAtom::accept( LayoutAtomVisitor& rVisitor )
 rVisitor.visit(*this);
 }
 
-void ConstraintAtom::parseConstraint(std::vector& rConstraints) 
const
+void ConstraintAtom::parseConstraint(std::vector& rConstraints,
+ bool bRequireForName) const
 {
+if (bRequireForName && maConstraint.msForName.isEmpty())
+return;
+
 // accepting only basic equality constraints
-if (!maConstraint.msForName.isEmpty()
-&& (maConstraint.mnOperator == XML_none || maConstraint.mnOperator == 
XML_equ)
+if ((maConstraint.mnOperator == XML_none || maConstraint.mnOperator == 
XML_equ)
 && maConstraint.mnType != XML_none)
 {
 rConstraints.push_back(maConstraint);
@@ -342,7 +345,7 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 {
 auto pConstraintAtom = dynamic_cast(pChild.get());
 if (pConstraintAtom)
-pConstraintAtom->parseConstraint(aMergedConstraints);
+pConstraintAtom->parseConstraint(aMergedConstraints, 
/*bRequireForName=*/true);
 }
 }
 aMergedConstraints.insert(aMergedConstraints.end(), 
rOwnConstraints.begin(),
@@ -444,6 +447,42 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 rShape->setSubType(nType);
 rShape->getCustomShapeProperties()->setShapePresetType(nType);
 }
+
+// Parse constraints to adjust the size.
+std::vector aDirectConstraints;
+const LayoutNode& rLayoutNode = getLayoutNode();
+for (const auto& pChild : rLayoutNode.getChildren())
+{
+auto pConstraintAtom = 
dynamic_cast(pChild.get());
+if (pConstraintAtom)
+pConstraintAtom->parseConstraint(aDirectConstraints, 
/*bRequireForName=*/false);
+}
+
+LayoutPropertyMap aProperties;
+LayoutProperty& rParent = aProperties[""];
+rParent[XML_w] = rShape->getSize().Width;
+rParent[XML_h] = rShape->getSize().Height;
+rParent[XML_l] = 0;
+rParent[XML_t] = 0;
+rParent[XML_r] = rShape->getSize().Width;
+rParent[XML_b] = rShape->getSize().Height;
+for (const auto& rConstr : aDirectConstraints)
+{
+const LayoutPropertyMap::const_iterator aRef
+= aProperties.find(rConstr.msRefForName);
+if (aRef != aProperties.end())
+{
+const LayoutProperty::const_iterator aRefType
+= aRef->second.find(rConstr.mnRefType);
+if (aRefType != aRef->second.end())
+aProperties[rConstr.msForName][rConstr.mnType]
+= aRefType->second * rConstr.mfFactor;
+}
+}
+awt::Size aSize;
+aSize.Width = rParent[XML_w];
+aSize.Height = rParent[XML_h];
+rShape->setSize(aSize);
 break;
 }
 
diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
index 024cdaa1b61a..440db0ef21ed 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.hxx
@@ -141,7 +141,7 @@ publi

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

[Libreoffice Gerrit user]

 oox/source/drawingml/diagram/diagramlayoutatoms.cxx |   43 +++---
 sd/qa/unit/data/pptx/smartart-continuous-block-process.pptx |binary
 sd/qa/unit/import-tests-smartart.cxx|   48 
 3 files changed, 78 insertions(+), 13 deletions(-)

New commits:
commit 9fb15b5bcde121f1aeedc1843a9a055479530753
Author: Miklos Vajna 
AuthorDate: Fri Dec 14 16:01:27 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 15:40:14 2018 +0100

oox smartart, accent process: fix missing bullets and large para indent

Bulleted paragraphs had a large left indent because we assumed the
bullet levels are inherited from the normal master page styles.

But that's not true, as


points out:

"It is not possible to change the bullet style for text in a SmartArt
graphic."

This explains why the margin and bullet char info is missing from the
file format, and hints that just hardcoding these to the importer is
correct.

The result is less linebreaks in the shape text and the lost bullets are
also fixed.

Change-Id: I60bbee75f3e834551ebb1963a2f42101f3bd91d4
Reviewed-on: https://gerrit.libreoffice.org/65168
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins
(cherry picked from commit 6277a767f33bb5327408dafff2fed199087e938d)
Reviewed-on: https://gerrit.libreoffice.org/65254

diff --git a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx 
b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
index 15a064f2d66b..7a71ec106db9 100644
--- a/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
+++ b/oox/source/drawingml/diagram/diagramlayoutatoms.cxx
@@ -853,13 +853,27 @@ void AlgAtom::layoutShape( const ShapePtr& rShape,
 }
 
 ParamMap::const_iterator aBulletLvl = maMap.find(XML_stBulletLvl);
+int nStartBulletsAtLevel = 0;
 if (aBulletLvl != maMap.end())
+{
 nBaseLevel -= aBulletLvl->second;
+nStartBulletsAtLevel = aBulletLvl->second;
+}
 
 for (auto & aParagraph : pTextBody->getParagraphs())
 {
 sal_Int32 nLevel = aParagraph->getProperties().getLevel();
 aParagraph->getProperties().setLevel(nLevel - nBaseLevel);
+if (nStartBulletsAtLevel > 0 && nLevel >= nStartBulletsAtLevel)
+{
+// It is not possible to change the bullet style for text.
+sal_Int32 nLeftMargin = 285750 * (nLevel - 
nStartBulletsAtLevel) / EMU_PER_HMM;
+aParagraph->getProperties().getParaLeftMargin() = 
nLeftMargin;
+aParagraph->getProperties().getFirstLineIndentation() = 
-285750 / EMU_PER_HMM;
+OUString aBulletChar = OUString::fromUtf8(u8"•");
+
aParagraph->getProperties().getBulletList().setBulletChar(aBulletChar);
+
aParagraph->getProperties().getBulletList().setSuffixNone();
+}
 }
 
 // explicit alignment
diff --git a/sd/qa/unit/import-tests-smartart.cxx 
b/sd/qa/unit/import-tests-smartart.cxx
index bb5b4b3c8e6a..944c40716795 100644
--- a/sd/qa/unit/import-tests-smartart.cxx
+++ b/sd/qa/unit/import-tests-smartart.cxx
@@ -485,6 +485,23 @@ void SdImportTestSmartArt::testAccentProcess()
 CPPUNIT_ASSERT_EQUAL(OUString("b"), xFirstChildText->getString());
 uno::Reference xFirstChild(xFirstChildText, 
uno::UNO_QUERY);
 CPPUNIT_ASSERT(xFirstChildText.is());
+
+{
+uno::Reference 
xParasAccess(xFirstChildText, uno::UNO_QUERY);
+uno::Reference xParas = 
xParasAccess->createEnumeration();
+uno::Reference xPara(xParas->nextElement(), 
uno::UNO_QUERY);
+// Without the accompanying fix in place, this test would have failed
+// with 'Expected: 0; Actual  : 1270', i.e. there was a large
+// unexpected left margin.
+CPPUNIT_ASSERT_EQUAL(static_cast(0),
+ 
xPara->getPropertyValue("ParaLeftMargin").get());
+
+uno::Reference 
xRules(xPara->getPropertyValue("NumberingRules"),
+   uno::UNO_QUERY);
+comphelper::SequenceAsHashMap aRule(xRules->getByIndex(1));
+CPPUNIT_ASSERT_EQUAL(OUString::fromUtf8(u8"•"), 
aRule["BulletChar"].get());
+}
+
 int nFirstChildTop = xFirstChild->getPosition().Y;
 int nFirstChildRight = xFirstChild->getPosition().X + 
xFirstChild->getSize().Width;
 
commit 6f2b06a279ecfeeeb7948a6373dd85bc7b4041e3
Author: Miklos Vajna 
AuthorDate: Wed Dec 12 18:09:12 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 15:40:05 2018 +0100

oox smartart, continuous block process: read space width from constraint

The information is needed by the 

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

[Libreoffice Gerrit user]

 sc/IwyuFilter_sc.yaml |   33 
 sc/inc/scitems.hxx|   23 +
 sc/source/filter/excel/colrowst.cxx   |5 ---
 sc/source/filter/excel/excdoc.cxx |   31 --
 sc/source/filter/excel/excel.cxx  |   11 
 sc/source/filter/excel/excform.cxx|3 --
 sc/source/filter/excel/excform8.cxx   |3 --
 sc/source/filter/excel/excimp8.cxx|   46 --
 sc/source/filter/excel/excrecds.cxx   |   40 -
 sc/source/filter/excel/exctools.cxx   |   17 
 sc/source/filter/excel/expop2.cxx |   11 +---
 sc/source/filter/excel/fontbuff.cxx   |   12 
 sc/source/filter/excel/impop.cxx  |   27 ---
 sc/source/filter/excel/namebuff.cxx   |5 ---
 sc/source/filter/excel/read.cxx   |2 -
 sc/source/filter/excel/tokstack.cxx   |2 -
 sc/source/filter/excel/xechart.cxx|3 --
 sc/source/filter/excel/xecontent.cxx  |2 -
 sc/source/filter/excel/xedbdata.cxx   |1 
 sc/source/filter/excel/xeescher.cxx   |   16 ---
 sc/source/filter/excel/xeextlst.cxx   |5 ---
 sc/source/filter/excel/xeformula.cxx  |3 --
 sc/source/filter/excel/xehelper.cxx   |1 
 sc/source/filter/excel/xelink.cxx |1 
 sc/source/filter/excel/xename.cxx |5 ---
 sc/source/filter/excel/xepage.cxx |1 
 sc/source/filter/excel/xepivot.cxx|5 ---
 sc/source/filter/excel/xepivotxml.cxx |1 
 sc/source/filter/excel/xeroot.cxx |5 ---
 sc/source/filter/excel/xestream.cxx   |8 +
 sc/source/filter/excel/xestyle.cxx|   10 ---
 sc/source/filter/excel/xetable.cxx|1 
 sc/source/filter/excel/xichart.cxx|3 --
 sc/source/filter/excel/xicontent.cxx  |   11 
 sc/source/filter/excel/xiescher.cxx   |   18 ++---
 sc/source/filter/excel/xihelper.cxx   |2 -
 sc/source/filter/excel/xilink.cxx |2 -
 sc/source/filter/excel/xipivot.cxx|2 -
 sc/source/filter/excel/xiroot.cxx |1 
 sc/source/filter/excel/xistyle.cxx|3 --
 sc/source/filter/excel/xlchart.cxx|4 --
 sc/source/filter/excel/xlescher.cxx   |2 -
 sc/source/filter/excel/xlformula.cxx  |5 ---
 sc/source/filter/excel/xlpage.cxx |5 ---
 sc/source/filter/excel/xlpivot.cxx|1 
 sc/source/filter/excel/xlroot.cxx |2 -
 sc/source/filter/excel/xltoolbar.cxx  |8 -
 sc/source/filter/excel/xltools.cxx|   10 ++-
 sc/source/filter/excel/xlview.cxx |1 
 49 files changed, 81 insertions(+), 338 deletions(-)

New commits:
commit 0aff4d06e706fde2543fc0926f2e48e0c2139700
Author: Gabor Kelemen 
AuthorDate: Sun Dec 9 03:35:37 2018 +0100
Commit: Miklos Vajna 
CommitDate: Mon Dec 17 15:41:12 2018 +0100

tdf#42949 Fix IWYU warnings in sc/source/filter/excel/*cxx

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

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

diff --git a/sc/IwyuFilter_sc.yaml b/sc/IwyuFilter_sc.yaml
index 44f20377fe97..59f5f1677751 100644
--- a/sc/IwyuFilter_sc.yaml
+++ b/sc/IwyuFilter_sc.yaml
@@ -392,9 +392,19 @@ blacklist:
 sc/source/filter/inc/xerecord.hxx:
 # Needed for member access
 - xestream.hxx
+sc/source/filter/inc/xetable.hxx:
+# Needed for typedef
+- class XclExpNote
+sc/source/filter/inc/xilink.hxx:
+# Needed for typedef
+- class XclImpCachedMatrix
+- class ScTokenArray
 sc/source/filter/inc/xistream.hxx:
 # Needed for implicit dtor
 - com/sun/star/beans/NamedValue.hpp
+sc/source/filter/inc/xlpage.hxx:
+# Needed for typedef
+- class SvxBrushItem
 sc/source/ui/inc/AccessibleContextBase.hxx:
 # base class has to be a complete type
 - com/sun/star/accessibility/XAccessibleComponent.hpp
@@ -649,3 +659,26 @@ blacklist:
 sc/source/filter/xml/xmldrani.hxx:
 # Complex type needs complete type
 - com/sun/star/beans/PropertyValue.hpp
+sc/source/filter/excel/excimp8.cxx:
+# base class has to be a complete type
+- com/sun/star/container/XIndexContainer.hpp
+sc/source/filter/excel/xechart.cxx:
+# Complex type needs complete type
+- com/sun/star/chart2/RelativePosition.hpp
+- com/sun/star/chart2/RelativeSize.hpp
+sc/source/filter/excel/xeescher.cxx:
+# base class has to be a complete type
+- com/sun/star/chart/XChartDocument.hpp
+sc/source/filter/excel/xeroot.cxx:
+# Complex type needs complete type
+- com/sun/star/sheet/FormulaOpCodeMapEntry.hpp
+sc/source/filter/excel/xicontent.cxx:
+# Needed for implicit dtor
+- editeng/editobj.hxx
+sc/source/filter/excel/xiescher.cxx:
+# Needed for implicit dtor
+- editeng/editobj.hxx
+- com/sun/star/form/XForm.hpp
+sc/source/filt

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

[Libreoffice Gerrit user]

 filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu |   
 2 
 filter/source/config/fragments/filters/calc_OOXML_Template.xcu |   
 2 
 filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu|   
 2 
 sc/qa/unit/helper/qahelper.cxx |   
 3 
 sc/qa/unit/helper/qahelper.hxx |   
 2 
 sc/qa/unit/subsequent_export-test.cxx  |   
21 ++
 sc/source/filter/excel/xestream.cxx|   
31 --
 sc/source/filter/inc/xestream.hxx  |   
 3 
 sc/source/filter/oox/excelfilter.cxx   |   
 2 
 9 files changed, 56 insertions(+), 12 deletions(-)

New commits:
commit 8cc29e7040ed02afd5f979e23c9ec154c0cb2c83
Author: Vasily Melenchuk 
AuthorDate: Thu Dec 13 15:47:38 2018 +0100
Commit: Thorsten Behrens 
CommitDate: Mon Dec 17 15:54:14 2018 +0100

tdf#99438: sc: support for .xltx export

Added support for content types for template and template
with macros (.xltm, but no user interface for this yet).

Fixed preferred extension for template: by default it is .xltx
and not .xltm (macro-enabled), because MS Excel is very strict
about matching of content-type and extension here.

Fixed wrong namespace in FilterService for ExcelFilter.

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

diff --git 
a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu 
b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
index f42c60d71630..db5cb9a21390 100644
--- a/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_MS_Excel_2007_XML_Template.xcu
@@ -16,7 +16,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
 -->
 
-IMPORT ALIEN 3RDPARTYFILTER TEMPLATE 
TEMPLATEPATH
+IMPORT EXPORT ALIEN 3RDPARTYFILTER TEMPLATE 
TEMPLATEPATH
 
 com.sun.star.comp.oox.xls.ExcelFilter
 
diff --git a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu 
b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
index 848e7ee38fe8..b65a756088be 100644
--- a/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
+++ b/filter/source/config/fragments/filters/calc_OOXML_Template.xcu
@@ -18,7 +18,7 @@
 
 IMPORT ALIEN 3RDPARTYFILTER TEMPLATE 
TEMPLATEPATH
 
-com.sun.star.comp.oox.ExcelFilter
+com.sun.star.comp.oox.xls.ExcelFilter
 OOXML
 1
 Office Open XML Spreadsheet 
Template
diff --git 
a/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu 
b/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu
index c55f6393bb5a..35c18e47ac30 100644
--- a/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu
+++ b/filter/source/config/fragments/types/MS_Excel_2007_XML_Template.xcu
@@ -18,7 +18,7 @@
 
 com.sun.star.comp.oox.FormatDetector
 
-xltm xltx
+xltx xltm
 application/vnd.openxmlformats-officedocument.spreadsheetml.template
 false
 Calc MS Excel 2007 XML 
Template
diff --git a/sc/qa/unit/helper/qahelper.cxx b/sc/qa/unit/helper/qahelper.cxx
index e3b2db0cbec4..81c4431f7512 100644
--- a/sc/qa/unit/helper/qahelper.cxx
+++ b/sc/qa/unit/helper/qahelper.cxx
@@ -87,7 +87,8 @@ const FileFormat ScBootstrapFixture::aFileFormats[] = {
 { "xml", "MS Excel 2003 XML Orcus", "calc_MS_Excel_2003_XML", 
XLS_XML_FORMAT_TYPE },
 { "xlsb", "Calc MS Excel 2007 Binary", "MS Excel 2007 Binary", 
XLSB_XML_FORMAT_TYPE },
 { "fods", "OpenDocument Spreadsheet Flat XML", "calc_ODS_FlatXML", 
FODS_FORMAT_TYPE },
-{ "gnumeric", "Gnumeric Spreadsheet", "Gnumeric XML", GNUMERIC_FORMAT_TYPE 
}
+{ "gnumeric", "Gnumeric Spreadsheet", "Gnumeric XML", GNUMERIC_FORMAT_TYPE 
},
+{ "xltx", "Calc Office Open XML Template", "Office Open XML Spreadsheet 
Template", XLTX_FORMAT_TYPE }
 };
 
 bool testEqualsWithTolerance( long nVal1, long nVal2, long nTol )
diff --git a/sc/qa/unit/helper/qahelper.hxx b/sc/qa/unit/helper/qahelper.hxx
index 2482248a1754..96268dbb9272 100644
--- a/sc/qa/unit/helper/qahelper.hxx
+++ b/sc/qa/unit/helper/qahelper.hxx
@@ -47,6 +47,7 @@ namespace utl { class TempFile; }
 #define XLSB_XML_FORMAT_TYPE (SfxFilterFlags::IMPORT | 
 SfxFilterFlags::ALIEN | SfxFilterFlags::STARONEFILTER | 
SfxFilterFlags::PREFERED)
 #define FODS_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::EXPORT 
| SfxFilterFlags::OWN | SfxFilterFlags::STARONEFILTER )
 #define GNUMERIC_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFlags::ALIEN | 
SfxFilterFlags::PREFERED )
+#define XLTX_FORMAT_TYPE (SfxFilterFlags::IMPORT | SfxFilterFla

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - icon-themes/colibre officecfg/registry sc/uiconfig sd/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 icon-themes/colibre/links.txt|2 
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |3 
 sc/uiconfig/scalc/ui/notebookbar.ui  |   54 
+++---
 sd/uiconfig/sdraw/ui/notebookbar.ui  |   54 
+++---
 sd/uiconfig/simpress/ui/notebookbar.ui   |   54 
+++---
 sw/uiconfig/swriter/ui/notebookbar.ui|4 
 6 files changed, 64 insertions(+), 107 deletions(-)

New commits:
commit 1173358e599f9dc3ea086300e935a43ac3c3bb67
Author: andreas kainz 
AuthorDate: Tue Dec 11 22:04:23 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 15:59:03 2018 +0100

tdf#121581 update Tools tabb in NB

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

diff --git a/icon-themes/colibre/links.txt b/icon-themes/colibre/links.txt
index 7d498f287ab0..eef9e8db1b75 100644
--- a/icon-themes/colibre/links.txt
+++ b/icon-themes/colibre/links.txt
@@ -919,6 +919,8 @@ cmd/sc_browseforward.png cmd/sc_nextrecord.png
 
 # Macro
 cmd/sc_macrosmenu.png res/im30821.png
+cmd/sc_macrodialog.png cmd/sc_scriptorganizer.png
+cmd/lc_macrodialog.png cmd/lc_scriptorganizer.png
 
 # Help
 cmd/sc_about.png res/mainapp_16.png
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index e13acb9d192f..f4613e2aa533 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -5176,6 +5176,9 @@
 
   %PRODUCTNAME ~Basic...
 
+
+  1
+
   
   
 
diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index f4efe6df47f9..fb3e5adbc753 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -1554,52 +1554,45 @@
 True
 False
 
-  
-True
-False
-.uno:MacroOrganizer?TabId:short=1
-  
-
-
-  
+  
 True
 False
-.uno:MacroSignature
+.uno:MacroRecorder
   
 
 
-  
+  
 True
 False
-.uno:ScriptOrganizer
+.uno:RunMacro
   
 
 
-  
+  
 True
 False
-.uno:ViewDataSourceBrowser
+.uno:BasicIDEAppear
   
 
 
-  
+  
 True
 False
-.uno:BasicIDEAppear
+.uno:MacroOrganizer?TabId:short=1
   
 
 
-  
+  
 True
 False
-.uno:RunMacro
+.uno:ScriptOrganizer
   
 
 
-  
+  
 True
 False
-.uno:MacroRecorder
+.uno:MacroSignature
   
 
 
@@ -1656,32 +1649,23 @@
   
 
 
-  
-True
-False
-.uno:OpenXMLFilterSettings
-  
-
-
-  
+  
 True
 False
-service:com.sun.star.deployment.ui.PackageManagerDialog
+.uno:ViewDataSourceBrowser
   
 
 
-  
+  
 True
 False
-vnd.sun.star.job:alias=UpdateCheck
-_Check for Updates...
   
 
 
-  
+  
 True
 False
-.uno:OptionsTreeDialog
+.uno:OpenXMLFilterSettings
   
 
   
@@ -13320,10 +13304,10 @@
 both-horiz
 False
 
-  
+  
 True
 False
-.uno:ScriptOrganizer
+.uno:MacroDialog
   
   
 False
diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index bf497332dac1..fc6508027afd 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1694,52 +1694,45 @@
 True
 False
 
-  
-True
-False
-.uno:MacroOrganizer?TabId:short=1
-  
-
-
-  
+  
 True
 False
-.uno:MacroSignature
+.uno:MacroRecorder
   
 
 
-  
+  
 True
 False
-.uno:ScriptOrganizer
+.uno:RunMacro
   
 
 
-  
+  
 True
 False
-.uno:ViewDataSourceBrowser
+.uno:BasicIDEAppear
   
 
 
-  
+  
 True
 False
-.uno:BasicIDEAppear
+.uno:MacroOrganizer?TabId:short=1
   
 
 
-  
+  
 

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/uiconfig sd/uiconfig

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui|   83 ++-
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui|2 
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |  324 +-
 3 files changed, 392 insertions(+), 17 deletions(-)

New commits:
commit eb881a4c35d6d34b7824a41c9af6a5f3ef29b3b7
Author: andreas kainz 
AuthorDate: Tue Dec 11 21:37:14 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 17:04:58 2018 +0100

tdf#122154 add DataSort action to data group

and update some alignments

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui 
b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
index 66dc9cab8955..8d3438a991df 100644
--- a/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui
@@ -3456,8 +3456,21 @@
 False
   
 
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+True
+icons
+False
 
-  
+  
 True
 False
 .uno:Color
@@ -3471,7 +3484,7 @@
   
 False
 True
-1
+2
   
 
   
@@ -3546,8 +3559,6 @@
   
 True
 False
-True
-Specify 
the borders of the selected cells.
 .uno:SetBorderStyle
   
   
@@ -3555,8 +3566,23 @@
 False
   
 
+  
+  
+False
+True
+1
+  
+
+
+  
+True
+True
+end
+True
+icons
+False
 
-  
+  
 True
 False
 .uno:BackgroundColor
@@ -3570,7 +3596,7 @@
   
 False
 True
-1
+2
   
 
   
@@ -4166,10 +4192,10 @@
   
 
 
-  
+  
 True
 False
-.uno:SortAscending
+.uno:DataSort
   
   
 False
@@ -4757,6 +4783,7 @@
   
 True
 True
+5
 icons
 False
 
@@ -4770,8 +4797,21 @@
 False
   
 
+   

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-4' - loleaflet/js

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 11acfb14dd0de4ae502f1b3beed92e58c177815c
Author: Szymon Kłos 
AuthorDate: Mon Dec 17 13:33:06 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 17 17:27:41 2018 +0100

Don't show '>>' in calc's toolbar

Change-Id: I780967325655d25d1a1484c9ffbfb98b2dd5197e
Reviewed-on: https://gerrit.libreoffice.org/65280
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index c2088739b..82fd2eaa1 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1739,6 +1739,12 @@ function onDocLayerInit() {
$('#tb_editbar_item_fonts').css({'display': 'none'});
$('#tb_editbar_item_fontsizes').css({'display': 'none'});
}
+
+   if (docType == 'spreadsheet') {
+   var el = w2ui['spreadsheet-toolbar'];
+   if (el)
+   el.resize();
+   }
 }
 
 function onCommandStateChanged(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/js/toolbar.js |6 ++
 1 file changed, 6 insertions(+)

New commits:
commit 323627a8b24dbc8d7c97b288fa63a2c73dba55d4
Author: Szymon Kłos 
AuthorDate: Mon Dec 17 13:33:06 2018 +0100
Commit: Andras Timar 
CommitDate: Mon Dec 17 17:27:30 2018 +0100

Don't show '>>' in calc's toolbar

Change-Id: I780967325655d25d1a1484c9ffbfb98b2dd5197e
Reviewed-on: https://gerrit.libreoffice.org/65279
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/loleaflet/js/toolbar.js b/loleaflet/js/toolbar.js
index c2088739b..82fd2eaa1 100644
--- a/loleaflet/js/toolbar.js
+++ b/loleaflet/js/toolbar.js
@@ -1739,6 +1739,12 @@ function onDocLayerInit() {
$('#tb_editbar_item_fonts').css({'display': 'none'});
$('#tb_editbar_item_fontsizes').css({'display': 'none'});
}
+
+   if (docType == 'spreadsheet') {
+   var el = w2ui['spreadsheet-toolbar'];
+   if (el)
+   el.resize();
+   }
 }
 
 function onCommandStateChanged(e) {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/appl/sfxhelp.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 7d8eec83535dbae5b392fae52fd5c41bf5afea06
Author: Stephan Bergmann 
AuthorDate: Mon Dec 17 11:41:27 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Mon Dec 17 17:29:19 2018 +0100

Remove unnecessary OUString aInternal

Change-Id: I37112fdb971a60012a4cb4f1aebfbb79dda3f92e
Reviewed-on: https://gerrit.libreoffice.org/65258
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 0574f8241acbe07c87a014fb0c8f12d2f3a8b785)
Reviewed-on: https://gerrit.libreoffice.org/65268

diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx
index 3651e9425c96..42748f9cc52d 100644
--- a/sfx2/source/appl/sfxhelp.cxx
+++ b/sfx2/source/appl/sfxhelp.cxx
@@ -735,10 +735,9 @@ static bool impl_showOnlineHelp( const OUString& rURL )
 static bool impl_showOfflineHelp( const OUString& rURL )
 {
 const OUString& aBaseInstallPath = getHelpRootURL();
-OUString const aInternal( "vnd.sun.star.help://"  );
 
 OUString aHelpLink( aBaseInstallPath + "/index.html?" );
-OUString aTarget = "Target=" + rURL.copy(aInternal.getLength());
+OUString aTarget = "Target=" + 
rURL.copy(RTL_CONSTASCII_LENGTH("vnd.sun.star.help://"));
 aTarget = aTarget.replaceAll("%2F","/").replaceAll("?","&");
 aHelpLink += aTarget;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 extensions/source/update/ui/onlineupdate_16.png |binary
 extensions/source/update/ui/onlineupdate_26.png |binary
 2 files changed

New commits:
commit 4f89c98d715592be42d8d378786d79eb27acadcb
Author: andreas kainz 
AuthorDate: Tue Dec 11 22:16:40 2018 +0100
Commit: Heiko Tietze 
CommitDate: Mon Dec 17 18:03:43 2018 +0100

tdf#113205 add onlineupdate icons to core/extensions/source/update/ui

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

diff --git a/extensions/source/update/ui/onlineupdate_16.png 
b/extensions/source/update/ui/onlineupdate_16.png
new file mode 100644
index ..7dab836e0625
Binary files /dev/null and b/extensions/source/update/ui/onlineupdate_16.png 
differ
diff --git a/extensions/source/update/ui/onlineupdate_26.png 
b/extensions/source/update/ui/onlineupdate_26.png
new file mode 100644
index ..05d4de622ae9
Binary files /dev/null and b/extensions/source/update/ui/onlineupdate_26.png 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4b' - 13 commits - sw/inc sw/qa sw/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit 06a5b80f9757ce4af0bf25e558a287e2a928f07f
Author: Michael Stahl 
AuthorDate: Thu Dec 13 13:26:20 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 18:04:09 2018 +0100

Revert "HACK: ODF import: always hide redlines"

This reverts commit 4382312c0160ab799ff1f8f2432da6b87d7a7302.

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 60cc3a5f46a9..f36ffb47a147 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,11 +856,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-#if 0
-  !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
-#else
-  true))
-#endif
+  (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
+!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
 {
 try
 {
@@ -893,10 +890,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
-#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
-#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 7f8cd257e1671ceda325c9dbf92117c010463b43
Author: Michael Stahl 
AuthorDate: Fri Nov 30 18:00:19 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 18:04:09 2018 +0100

HACK: ODF import: always hide redlines

Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index f36ffb47a147..60cc3a5f46a9 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,8 +856,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-  (officecfg::Office::Common::Misc::ExperimentalMode::get(xContext) &&
-!*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges)
+#if 0
+  !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
+#else
+  true))
+#endif
 {
 try
 {
@@ -890,8 +893,10 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 72c7c0d3ce98afb0dfbeeec510fb9b15162d7a12
Author: Michael Stahl 
AuthorDate: Wed Dec 5 16:37:18 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 18:04:09 2018 +0100

temp?

Change-Id: Ide2abf0c2ce054b75c917063a5d5aa8d13430426

diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx
index 7b6411163cb3..c756aedf4cd2 100644
--- a/sw/source/core/text/frmcrsr.cxx
+++ b/sw/source/core/text/frmcrsr.cxx
@@ -267,6 +267,7 @@ bool SwTextFrame::GetCharRect( SwRect& rOrig, const 
SwPosition &rPos,
 
 bool bGoOn = true;
 TextFrameIndex const nOffset = MapModelToViewPos(rPos);
+assert(nOffset != TextFrameIndex(COMPLETE_STRING)); // not going to 
end well
 TextFrameIndex nNextOfst;
 
 do
commit 6b89a267553642db1e585269503197150d73615c
Author: Michael Stahl 
AuthorDate: Mon Dec 17 14:10:26 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 18:04:09 2018 +0100

sw_redlinehide_4b: adapt FindFormat()

Change-Id: I78cfca1cd629bf518f8294450a34ee228a360ef9

diff --git a/sw/inc/swcrsr.hxx b/sw/inc/swcrsr.hxx
index 482d5691a01a..80ceff38be49 100644
--- a/sw/inc/swcrsr.hxx
+++ b/sw/inc/swcrsr.hxx
@@ -122,7 +122,8 @@ public:
 SwDocPositions nStart, SwDocPositions nEnde,
 bool& bCancel,
 FindRanges,
-const SwTextFormatColl* pReplFormat );
+const SwTextFormatColl* pReplFormat,
+SwRootFrame const*const pLayout = nullptr);
 sal_uLong FindAttrs( const SfxItemSet& rSet, bool bNoCollections,
 SwDocPositions nStart, SwDocPositions nEnde,
 bool& bCancel,
diff --git a/sw/source/core/crsr/findcoll.cxx b/sw

[Libreoffice-commits] core.git: vcl/Library_vclplug_gtk3.mk

[Libreoffice Gerrit user]

 vcl/Library_vclplug_gtk3.mk |6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

New commits:
commit 6a53832080cf201e960113de8e1887d99e857606
Author: Michael Weghorn 
AuthorDate: Mon Dec 17 15:35:58 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 18:22:31 2018 +0100

Use 'gb_Library_set_include' for GTK3_CFLAGS

This among others makes sure that the '-I'/'-isystem' compiler
flags for the gtk3 includes end up in the 'INCLUDE' section
in 'workdir/GbuildToJson/Library/libvclplug_gtk3lo.so' when
that file is generated by 'gbuildtojson'.

That file is used by 'gbuild-to-ide' to generate IDE-specific
config files.
Having the gtk3 headers in the 'INCLUDE' section makes sure that
the includes are properly taken into account when generating
the IDE-specific files, and the included files can thus
actually be found.

Also, there's no need to set '$$(INCLUDE)' via
'gb_Library_add_cxxflags', since the flags are already set via
'gb_Library_set_include', so drop the 'gb_Library_add_cxxflags'
part altogether.

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

diff --git a/vcl/Library_vclplug_gtk3.mk b/vcl/Library_vclplug_gtk3.mk
index 999eac743a9e..cfb2f1b2d30b 100644
--- a/vcl/Library_vclplug_gtk3.mk
+++ b/vcl/Library_vclplug_gtk3.mk
@@ -27,16 +27,12 @@ $(eval $(call gb_Library_add_cxxflags,vclplug_gtk3, \
 
 $(eval $(call gb_Library_set_include,vclplug_gtk3,\
 $$(INCLUDE) \
+$$(GTK3_CFLAGS) \
 -I$(SRCDIR)/vcl/inc \
 -I$(SRCDIR)/vcl/unx \
 -I$(SRCDIR)/vcl/unx/gtk3 \
 ))
 
-$(eval $(call gb_Library_add_cxxflags,vclplug_gtk3,\
-$$(INCLUDE) \
-$$(GTK3_CFLAGS) \
-))
-
 $(eval $(call gb_Library_add_defs,vclplug_gtk3,\
 -DVCLPLUG_GTK_IMPLEMENTATION \
 ))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: bin/check-elf-dynamic-objects bin/distro-install-file-lists config_host/config_kde4.h.in config_host/config_vclplug.h.in config_host.mk.in configure.ac cppuhelper/sourc

[Libreoffice Gerrit user]

 Repository.mk   |8 
 RepositoryExternal.mk   |   27 
 bin/check-elf-dynamic-objects   |4 
 bin/distro-install-file-lists   |6 
 config_host.mk.in   |6 
 config_host/config_kde4.h.in|   10 
 config_host/config_vclplug.h.in |1 
 configure.ac|  322 --
 cppuhelper/source/servicemanager.cxx|8 
 cui/Library_cui.mk  |1 
 cui/source/options/optgdlg.cxx  |6 
 distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf |2 
 distro-configs/Jenkins/Linux_dev_master.conf|2 
 distro-configs/Jenkins/Linux_rel_master.conf|2 
 distro-configs/LibreOfficeCoverity.conf |2 
 distro-configs/LibreOfficeLinux.conf|2 
 distro-configs/LibreOfficeOpenBSD.conf  |3 
 distro-configs/LibreOfficeiOS.conf  |2 
 include/sal/log-areas.dox   |1 
 postprocess/Rdb_services.mk |3 
 scp2/InstallScript_setup_osl.mk |2 
 scp2/Module_scp2.mk |2 
 shell/Library_kde4be.mk |   32 
 shell/Module_shell.mk   |6 
 shell/source/backends/desktopbe/desktopbackend.cxx  |   16 
 shell/source/backends/kde4be/kde4access.cxx |  300 -
 shell/source/backends/kde4be/kde4access.hxx |   39 
 shell/source/backends/kde4be/kde4backend.cxx|  180 ---
 shell/source/backends/kde4be/kde4be1.component  |   25 
 solenv/gbuild/CppunitTest.mk|1 
 svtools/source/uno/fpicker.cxx  |   12 
 sysui/CustomTarget_share.mk |2 
 vcl/CustomTarget_kde4_moc.mk|   24 
 vcl/Library_vclplug_kde4.mk |   99 -
 vcl/Module_vcl.mk   |7 
 vcl/README  |6 
 vcl/README.scheduler|4 
 vcl/inc/vclpluginapi.h  |6 
 vcl/source/app/salplug.cxx  |5 
 vcl/source/opengl/OpenGLHelper.cxx  |2 
 vcl/unx/kde4/FPServiceInfo.hxx  |   28 
 vcl/unx/kde4/KDE4FilePicker.cxx |  823 
 vcl/unx/kde4/KDE4FilePicker.hxx |  258 -
 vcl/unx/kde4/KDEData.cxx|   68 -
 vcl/unx/kde4/KDEData.hxx|   37 
 vcl/unx/kde4/KDESalDisplay.cxx  |   91 -
 vcl/unx/kde4/KDESalDisplay.hxx  |   45 
 vcl/unx/kde4/KDESalFrame.cxx|  373 ---
 vcl/unx/kde4/KDESalFrame.hxx|   53 -
 vcl/unx/kde4/KDESalGraphics.cxx | 1025 
 vcl/unx/kde4/KDESalGraphics.hxx |   53 -
 vcl/unx/kde4/KDESalInstance.cxx |   66 -
 vcl/unx/kde4/KDESalInstance.hxx |   45 
 vcl/unx/kde4/KDEXLib.cxx|  426 
 vcl/unx/kde4/KDEXLib.hxx|  101 -
 vcl/unx/kde4/VCLKDEApplication.cxx  |   87 -
 vcl/unx/kde4/VCLKDEApplication.hxx  |   39 
 vcl/unx/kde4/main.cxx   |   89 -
 vcl/unx/kde4/tst_exclude_posted_events.hxx  |   67 -
 vcl/unx/kde4/tst_exclude_socket_notifiers.hxx   |   80 -
 vcl/unx/kde5/KDE5FilePicker2.cxx|3 
 vcl/unx/kde5/KDE5SalInstance.cxx|1 
 62 files changed, 30 insertions(+), 5016 deletions(-)

New commits:
commit 410bf59de02192c2daf1158b9de76ec0ebab4c56
Author: Thorsten Behrens 
AuthorDate: Wed Sep 5 02:53:07 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Mon Dec 17 18:33:13 2018 +0100

kde5: remove older kde/tde plugins, and references to that

KDE4 is out of maintenance upstream since Nov. 2014, and binaries
provided by TDF have switched to KDE5 as the official backend.

Change-Id: I165465b56d3ba3a18912b203c06ae8fc6111c0c9
Reviewed-on: https://gerrit.libreoffice.org/60014
Reviewed-by: Thorsten Behrens 
Tested-by: Thorsten Behrens 

diff --git a/Repository.mk b/Repository.mk
index 12a104dd0eab..9fed0b942c91 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -294,18 +294,16 @@ $(eval $(call 
gb_Helper_register_libraries_for_install,OOOLIBS,gnome, \
 ))
 
 $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,kde, \
-   $(if $(ENABLE_KDE4),kde4be1) \
$(if $(ENABLE_KDE5),kde5be1) \
$(if $(USING_X11), \
-   $(if $(ENABLE_KDE4),vclplug_kde4) \
-   $(if $(ENABLE

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

[Libreoffice Gerrit user]

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

New commits:
commit 06e022e7e3329d8e469b8cbf860cd4916db908e5
Author: Caolán McNamara 
AuthorDate: Mon Dec 17 15:51:26 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 17 18:43:37 2018 +0100

give dbaccess save query dialog a parent

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

diff --git a/dbaccess/source/ui/uno/dbinteraction.cxx 
b/dbaccess/source/ui/uno/dbinteraction.cxx
index e3e3173238e9..53f6468dcdeb 100644
--- a/dbaccess/source/ui/uno/dbinteraction.cxx
+++ b/dbaccess/source/ui/uno/dbinteraction.cxx
@@ -243,7 +243,7 @@ namespace dbaui
 if ( -1 != nApprovePos )
 {
 // ask whether it should be saved
-nRet = ExecuteQuerySaveDocument(nullptr,_rDocuRequest.Name);
+nRet = 
ExecuteQuerySaveDocument(Application::GetFrameWeld(m_xParentWindow), 
_rDocuRequest.Name);
 }
 
 if ( RET_CANCEL == nRet )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/win/gdi/gdiimpl.cxx |   58 
 1 file changed, 30 insertions(+), 28 deletions(-)

New commits:
commit 5bc0cbc77f0a8be6b241e644bdac56989a0974a4
Author: Dmitriy Shilin 
AuthorDate: Fri Dec 14 08:13:53 2018 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 17 19:32:04 2018 +0100

vcl/win/gdi: merge ImplRenderPath into drawPolyLineBezier

Change-Id: I6e0a5d81bc155c8ad3603c4451a557f8412245bd
Reviewed-on: https://gerrit.libreoffice.org/65139
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/vcl/win/gdi/gdiimpl.cxx b/vcl/win/gdi/gdiimpl.cxx
index 1f161619589a..eecd9f350164 100644
--- a/vcl/win/gdi/gdiimpl.cxx
+++ b/vcl/win/gdi/gdiimpl.cxx
@@ -65,33 +65,6 @@
 
 namespace {
 
-// #100127# draw an array of points which might also contain bezier control 
points
-void ImplRenderPath( HDC hdc, sal_uLong nPoints, const SalPoint* pPtAry, const 
PolyFlags* pFlgAry )
-{
-if( nPoints )
-{
-// TODO: profile whether the following options are faster:
-// a) look ahead and draw consecutive bezier or line segments by 
PolyBezierTo/PolyLineTo resp.
-// b) convert our flag array to window's and use PolyDraw
-
-MoveToEx( hdc, pPtAry->mnX, pPtAry->mnY, nullptr );
-++pPtAry; ++pFlgAry;
-
-for( sal_uLong i=1; imnX, pPtAry->mnY );
-}
-else if( nPoints - i > 2 )
-{
-PolyBezierTo( hdc, reinterpret_cast(pPtAry), 3 );
-i += 2; pPtAry += 2; pFlgAry += 2;
-}
-}
-}
-}
-
 // #100127# Fill point and flag memory from array of points which
 // might also contain bezier control points for the PolyDraw() GDI method
 // Make sure pWinPointAry and pWinFlagAry are big enough
@@ -1763,7 +1736,36 @@ bool WinSalGraphicsImpl::drawPolyLineBezier( sal_uInt32 
nPoints, const SalPoint*
 {
 static_assert( sizeof( POINT ) == sizeof( SalPoint ), "must be the same 
size" );
 
-ImplRenderPath( mrParent.getHDC(), nPoints, pPtAry, pFlgAry );
+// #100127# draw an array of points which might also contain bezier 
control points
+if (!nPoints)
+return true;
+
+const HDC hdc = mrParent.getHDC();
+
+// TODO: profile whether the following options are faster:
+// a) look ahead and draw consecutive bezier or line segments by 
PolyBezierTo/PolyLineTo resp.
+// b) convert our flag array to window's and use PolyDraw
+MoveToEx(hdc, pPtAry->mnX, pPtAry->mnY, nullptr);
+++pPtAry;
+++pFlgAry;
+
+for(sal_uInt32 i = 1; i < nPoints; ++i)
+{
+if(*pFlgAry != PolyFlags::Control)
+{
+LineTo(hdc, pPtAry->mnX, pPtAry->mnY);
+}
+else if(nPoints - i > 2)
+{
+PolyBezierTo(hdc, reinterpret_cast(pPtAry), 3);
+i += 2;
+pPtAry += 2;
+pFlgAry += 2;
+}
+
+++pPtAry;
+++pFlgAry;
+}
 
 return true;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/mailmerge/data/linked-with-condition.odt |binary
 sw/qa/extras/mailmerge/mailmerge.cxx  |   81 ++
 sw/source/core/docnode/section.cxx|1 
 3 files changed, 81 insertions(+), 1 deletion(-)

New commits:
commit fdf4afb25ba38c7be3278bb4bde462c3f9e722fc
Author: Mike Kaganski 
AuthorDate: Mon Dec 17 16:15:59 2018 +0300
Commit: Mike Kaganski 
CommitDate: Mon Dec 17 20:17:38 2018 +0100

tdf#122156: closing a section link should not clear its Hidden flag

If a section is hidden or not does not depend on whether it's linked
or not. Clearing the Hidden flag made all linked sections not hidden
in DocumentLinksAdministrationManager::EmbedAllLinks() during mail
merge.

Existed since commit 84a3db80b4fd66c6854b3135b5f69b61fd828e62
initial import

Change-Id: If347008e4cf48ab1327eb04db9fdf69750ce8fa5
Reviewed-on: https://gerrit.libreoffice.org/65286
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/mailmerge/data/linked-with-condition.odt 
b/sw/qa/extras/mailmerge/data/linked-with-condition.odt
new file mode 100644
index ..17fefa29b6b8
Binary files /dev/null and 
b/sw/qa/extras/mailmerge/data/linked-with-condition.odt differ
diff --git a/sw/qa/extras/mailmerge/mailmerge.cxx 
b/sw/qa/extras/mailmerge/mailmerge.cxx
index 6efa3aaa4f6b..12fe9cade56b 100644
--- a/sw/qa/extras/mailmerge/mailmerge.cxx
+++ b/sw/qa/extras/mailmerge/mailmerge.cxx
@@ -974,5 +974,86 @@ DECLARE_FILE_MAILMERGE_TEST(testTd78611_file, 
"tdf78611.odt", "10-testing-addres
 }
 }
 
+DECLARE_SHELL_MAILMERGE_TEST(testTdf122156_shell, "linked-with-condition.odt", 
"5-with-blanks.ods",
+ "names")
+{
+// A document with a linked section hidden on an "empty field" condition
+// For combined documents, hidden sections are removed completely
+executeMailMerge();
+SwXTextDocument* pTextDoc = 
dynamic_cast(mxMMComponent.get());
+CPPUNIT_ASSERT(pTextDoc);
+// 5 documents 1 page each, starting at odd page numbers => 9
+CPPUNIT_ASSERT_EQUAL(sal_uInt16(9), 
pTextDoc->GetDocShell()->GetWrtShell()->GetPhyPageNum());
+uno::Reference 
xSectionsSupplier(mxMMComponent,
+  
uno::UNO_QUERY_THROW);
+uno::Reference 
xSections(xSectionsSupplier->getTextSections(),
+  uno::UNO_QUERY_THROW);
+// 2 out of 5 dataset records have empty "Title" field => no sections in 
respective documents
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xSections->getCount());
+}
+
+DECLARE_FILE_MAILMERGE_TEST(testTdf122156_file, "linked-with-condition.odt", 
"5-with-blanks.ods",
+"names")
+{
+// A document with a linked section hidden on an "empty field" condition
+// For separate documents, the sections are hidden, but not removed
+executeMailMerge();
+{
+loadMailMergeDocument(0);
+uno::Reference 
xSectionsSupplier(mxComponent,
+  
uno::UNO_QUERY_THROW);
+uno::Reference 
xSections(xSectionsSupplier->getTextSections(),
+  
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
+uno::Reference xSect(xSections->getByIndex(0), 
uno::UNO_QUERY_THROW);
+// Record 1 has empty "Title" field => section is not shown
+CPPUNIT_ASSERT_EQUAL(false, getProperty(xSect, 
"IsCurrentlyVisible"));
+}
+{
+loadMailMergeDocument(1);
+uno::Reference 
xSectionsSupplier(mxComponent,
+  
uno::UNO_QUERY_THROW);
+uno::Reference 
xSections(xSectionsSupplier->getTextSections(),
+  
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
+uno::Reference xSect(xSections->getByIndex(0), 
uno::UNO_QUERY_THROW);
+// Record 2 has non-empty "Title" field => section is shown
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xSect, 
"IsCurrentlyVisible"));
+}
+{
+loadMailMergeDocument(2);
+uno::Reference 
xSectionsSupplier(mxComponent,
+  
uno::UNO_QUERY_THROW);
+uno::Reference 
xSections(xSectionsSupplier->getTextSections(),
+  
uno::UNO_QUERY_THROW);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xSections->getCount());
+uno::Reference xSect(xSections->getByIndex(0), 
uno::UNO_QUERY_THROW);
+// Record 3 has non-empty "Title" field => section is shown
+CPPUNIT_ASSERT_EQUAL(true, getProperty(xSect, 
"IsCurrentlyVisible"));
+}
+{
+loadMailMergeDocument(3);
+  

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

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Graphics_Text.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 5d13f3efe0157559d3625c6b8fe7e9741e601215
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 17 15:07:26 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 17 21:19:18 2018 +0100

Qt5 don't re-register system fonts

System fonts are already registered in the QFontDatabase. And
addApplicationFont seems to be really expensive especially when
registering large fonts like the Noto CJK fonts, which increases
load time by 4 seconds per font.

This skips all font + style combinations already known in the DB.
Since addApplicationFont already relies on fontconfig on Unix/X11
this should be fine.

Change-Id: Ief13a613abd99b9fe391d9afe868541035340d1c
Reviewed-on: https://gerrit.libreoffice.org/65270
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 

diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
index ba7133f7b53e..19a05f8410fc 100644
--- a/vcl/qt5/Qt5Graphics_Text.cxx
+++ b/vcl/qt5/Qt5Graphics_Text.cxx
@@ -98,6 +98,7 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC)
 
 if (bUseFontconfig)
 {
+const QStringList aFontFamilyList = aFDB.families();
 ::std::vector aList;
 psp::FastPrintFontInfo aInfo;
 
@@ -109,7 +110,11 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* 
pPFC)
 continue;
 QString aFilename = toQString(
 OStringToOUString(rMgr.getFontFileSysPath(aInfo.m_nID), 
RTL_TEXTENCODING_UTF8));
-QFontDatabase::addApplicationFont(aFilename);
+QRawFont aRawFont(aFilename, 0.0);
+QString aFamilyName = aRawFont.familyName();
+if (!aFontFamilyList.contains(aFamilyName)
+|| !aFDB.styles(aFamilyName).contains(aRawFont.styleName()))
+QFontDatabase::addApplicationFont(aFilename);
 }
 
 SalGenericInstance::RegisterFontSubstitutors(pPFC);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: ios/ios.mm ios/Mobile ios/Mobile.xcodeproj wsd/LOOLWSD.cpp

[Libreoffice Gerrit user]

 ios/Mobile.xcodeproj/project.pbxproj   |4 
 ios/Mobile/AppDelegate.h   |3 
 ios/Mobile/AppDelegate.mm  |  150 -
 ios/Mobile/Document.mm |7 
 ios/Mobile/DocumentBrowserViewController.mm|4 
 ios/Mobile/Resources/Settings.bundle/Root.plist|   49 
 ios/Mobile/Resources/Settings.bundle/en.lproj/Root.strings |binary
 ios/Mobile/TemplateCollectionViewController.h  |3 
 ios/Mobile/TemplateCollectionViewController.mm |   40 ++-
 ios/ios.mm |2 
 wsd/LOOLWSD.cpp|2 
 11 files changed, 245 insertions(+), 19 deletions(-)

New commits:
commit 61bd04fefb4cbcca34b81e88991eed5a1ccfcfd2
Author: Tor Lillqvist 
AuthorDate: Mon Dec 17 22:18:49 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Mon Dec 17 22:56:14 2018 +0200

Add a way to have templates specific to a customer deployment

Add two settings: One setting "Template list URL" is a string that
should either be empty (the typical case for a random user of the
app), or contain a https: URL. If this setting is empty, only the
templates bundled in the app are provided.

If the "Template list URL" is non-empty, it should be a https: URL
pointing to a text file (or dynamically generated text resource). That
file is downloaded and read when the app starts. Each line in the file
should either be a comment (starting with a hash '#'), or a https: URL
pointing to a template document, that is of type .ott, .ots, or .otp.
That document is downloaded if it hasn't been downloaded already, or
if its time stamp is newer than that of the already downloaded copy.
Also a thumbnail image for the template, formed by appending ".png" to
its URL, is downloaded, if available.

Any previously downloaded templates that aren't mentioned in the list
file are removed.

The intent is that in some managed mass deployment environment, the
mobile device management software would set up this setting, so that
the end-user devices would see the same templates.

Obviously, this URL does not have to point to a static file on a web
server, but could point to some dynamically generated resource on a
web server, that enumerates the templates available on the server and
returns their URLs as a text document.

Another setting is "Empty tile cache next time". This is a toggle. If
toggled on, the next time a document is opened in the app, the tile
cache is emptied (and the toggle is reset off). This is mostly for
potential problem solving, and might be removd later.

Various refactoring to support the new functionality.

Change-Id: Ie2ebf032acb9e43bb1c6f7ae4d0c449ae66eaa05

diff --git a/ios/Mobile.xcodeproj/project.pbxproj 
b/ios/Mobile.xcodeproj/project.pbxproj
index 7fcce4ae4..cdb1af4b8 100644
--- a/ios/Mobile.xcodeproj/project.pbxproj
+++ b/ios/Mobile.xcodeproj/project.pbxproj
@@ -63,6 +63,7 @@
BEA2835D21498AD400848631 /* Socket.cpp in Sources */ = {isa = 
PBXBuildFile; fileRef = BEA2835C21498AD400848631 /* Socket.cpp */; };
BEA28360214ACA8500848631 /* FakeSocket.cpp in Sources */ = {isa 
= PBXBuildFile; fileRef = BEA2835F214ACA8500848631 /* FakeSocket.cpp */; };
BEA28377214FFD8C00848631 /* Unit.cpp in Sources */ = {isa = 
PBXBuildFile; fileRef = BEA28376214FFD8C00848631 /* Unit.cpp */; };
+   BEB0E5D921C7CA800085A0CF /* Settings.bundle in Resources */ = 
{isa = PBXBuildFile; fileRef = BEB0E5D821C7CA800085A0CF /* Settings.bundle */; 
};
BEFB1EE121C29CC70081D757 /* L10n.mm in Sources */ = {isa = 
PBXBuildFile; fileRef = BEFB1EE021C29CC70081D757 /* L10n.mm */; };
 /* End PBXBuildFile section */
 
@@ -502,6 +503,7 @@
BEA8CDC32199AC9D009FE17E /* lok.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = lok.cxx; path 
= "../../ios-device/comphelper/source/misc/lok.cxx"; sourceTree = ""; };
BEA8CDC52199E621009FE17E /* languagetagicu.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
languagetagicu.cxx; path = 
"../../ios-device/i18nlangtag/source/languagetag/languagetagicu.cxx"; 
sourceTree = ""; };
BEA8CDC62199E621009FE17E /* languagetag.cxx */ = {isa = 
PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = 
languagetag.cxx; path = 
"../../ios-device/i18nlangtag/source/languagetag/languagetag.cxx"; sourceTree = 
""; };
+   BEB0E5D821C7CA800085A0CF /* Settings.bundle */ = {isa = 
PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = 
Settings.bundle; sourceTree = ""; };
BEB6521C216F5D8B00B8C09A /* file_path_helper.hxx */ = {isa = 
PBXFil

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

[Libreoffice Gerrit user]

 dbaccess/source/core/dataaccess/documentdefinition.cxx |   14 --
 dbaccess/source/core/dataaccess/documentdefinition.hxx |3 ++-
 dbaccess/source/core/dataaccess/intercept.cxx  |2 +-
 3 files changed, 11 insertions(+), 8 deletions(-)

New commits:
commit c58d4c1990df4dcdc09f0e5841069d6a42cd07cd
Author: Caolán McNamara 
AuthorDate: Mon Dec 17 17:21:34 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 17 22:05:36 2018 +0100

Related: tdf#122153 set more correct dialog parents

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

diff --git a/dbaccess/source/core/dataaccess/documentdefinition.cxx 
b/dbaccess/source/core/dataaccess/documentdefinition.cxx
index e9887caa6697..ad9cca9716ed 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.cxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.cxx
@@ -29,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -1196,7 +1195,7 @@ void ODocumentDefinition::onCommandInsert( const 
OUString& _sURL, const Referenc
 aGuard.clear();
 }
 
-bool ODocumentDefinition::save(bool _bApprove)
+bool ODocumentDefinition::save(bool _bApprove, const 
css::uno::Reference& rDialogParent)
 {
 // default handling: instantiate an interaction handler and let it handle 
the parameter request
 if ( !m_bOpenInDesign )
@@ -1244,8 +1243,10 @@ bool ODocumentDefinition::save(bool _bApprove)
 OInteractionAbort* pAbort = new OInteractionAbort;
 pRequest->addContinuation(pAbort);
 
+Reference xDialogParent(rDialogParent, UNO_QUERY);
+
 // create the handler, let it handle the request
-Reference< XInteractionHandler2 > xHandler( 
InteractionHandler::createWithParent(m_aContext, nullptr) );
+Reference 
xHandler(InteractionHandler::createWithParent(m_aContext, xDialogParent));
 xHandler->handle(xRequest);
 
 if ( pAbort->wasSelected() )
@@ -1293,7 +1294,7 @@ void ODocumentDefinition::saveAs()
 if ( m_pImpl->m_aProps.aTitle.isEmpty() )
 {
 aGuard.clear();
-save(false); // (sal_False) : we don't want an approve dialog
+save(false, css::uno::Reference()); // 
(sal_False) : we don't want an approve dialog
 return;
 }
 }
@@ -1977,12 +1978,13 @@ bool ODocumentDefinition::prepareClose()
 if ( isModified() )
 {
 Reference< XFrame > xFrame( xController->getFrame() );
+Reference xTopWindow;
 if ( xFrame.is() )
 {
-Reference< XTopWindow > xTopWindow( 
xFrame->getContainerWindow(), UNO_QUERY_THROW );
+xTopWindow = 
Reference(xFrame->getContainerWindow(), UNO_QUERY_THROW);
 xTopWindow->toFront();
 }
-if ( !save( true ) )
+if (!save(true, xTopWindow))
 {
 // revert suspension
 xController->suspend(false);
diff --git a/dbaccess/source/core/dataaccess/documentdefinition.hxx 
b/dbaccess/source/core/dataaccess/documentdefinition.hxx
index b153b1371b8f..501433e7b3d7 100644
--- a/dbaccess/source/core/dataaccess/documentdefinition.hxx
+++ b/dbaccess/source/core/dataaccess/documentdefinition.hxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -138,7 +139,7 @@ public:
 css::uno::Reference< css::embed::XStorage >
 getContainerStorage() const;
 
-bool save(bool _bApprove);
+bool save(bool _bApprove, const css::uno::Reference& 
rDialogParent);
 void saveAs();
 void closeObject();
 bool isModified();
diff --git a/dbaccess/source/core/dataaccess/intercept.cxx 
b/dbaccess/source/core/dataaccess/intercept.cxx
index 9668c273d0ec..7a567de02326 100644
--- a/dbaccess/source/core/dataaccess/intercept.cxx
+++ b/dbaccess/source/core/dataaccess/intercept.cxx
@@ -104,7 +104,7 @@ void SAL_CALL OInterceptor::dispatch( const URL& URL,const 
Sequencesave( false );
+m_pContentHolder->save(false, 
css::uno::Reference());
 return;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |   26 ++
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx  |4 --
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx  |2 -
 3 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit cabc14a343142e53ab1ef0085b023bb7fadcf449
Author: Caolán McNamara 
AuthorDate: Mon Dec 17 16:53:35 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 17 22:06:09 2018 +0100

Resolves: tdf#122153 keep Execute for modal dialogs

and not modeless ones

cause you get one main loop running inside another, and everything
is running inside the modeless dialog main loop until it exits.

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

diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx 
b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index ffa2eebdcf7b..9b5dd734002f 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -265,7 +265,6 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( 
const EventObject& /*
 mpDialog->Close();
 }
 
-
 void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& 
/* Event */ )
 {
 // we are going down, so dispose us!
@@ -276,35 +275,41 @@ void SAL_CALL XMLFilterDialogComponent::disposing( const 
EventObject& /* Source
 {
 }
 
-
 void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle 
*/ )
 {
 }
 
-
-sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  )
+sal_Int16 SAL_CALL XMLFilterDialogComponent::execute()
 {
 ::SolarMutexGuard aGuard;
 
-if( nullptr == mpDialog )
+bool bLaunch = false;
+if (!mpDialog)
 {
 Reference< XComponent > xComp( this );
 if (mxParent.is())
 mpDialog = 
VclPtr::Create(VCLUnoHelper::GetWindow(mxParent), 
mxContext);
 else
 mpDialog = VclPtr::Create(nullptr, 
mxContext, Dialog::InitFlag::NoParent);
-mpDialog->Execute();
+bLaunch = true;
 }
-else if( !mpDialog->IsVisible() )
+
+mpDialog->UpdateWindow();
+
+if (!bLaunch)
 {
-mpDialog->Execute();
+mpDialog->ToTop();
+return 0;
 }
-mpDialog->ToTop();
+
+mpDialog->StartExecuteAsync([this](sal_Int32)
+{
+mpDialog.reset();
+});
 
 return 0;
 }
 
-
 void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& 
aArguments )
 {
 for(const Any& rArgument : aArguments)
@@ -320,7 +325,6 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const 
Sequence< Any >& aArgu
 }
 }
 
-
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT void * xsltdlg_component_getFactory(
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index 1f7f769c39ac..5ae90948e75c 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -179,15 +179,13 @@ IMPL_LINK_NOARG(XMLFilterSettingsDialog, 
DoubleClickHdl_Impl, SvTreeListBox*, bo
 return false;
 }
 
-short XMLFilterSettingsDialog::Execute()
+void XMLFilterSettingsDialog::UpdateWindow()
 {
 m_pCtrlFilterList->GrabFocus();
 disposeFilterList();
 m_pFilterListBox->Clear();
 initFilterList();
 updateStates();
-
-return ModelessDialog::Execute();
 }
 
 void XMLFilterSettingsDialog::updateStates()
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 816e75ac72bb..ff55a19f9b5a 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -92,7 +92,7 @@ public:
 DECL_LINK(SelectionChangedHdl_Impl, SvTreeListBox*, void );
 DECL_LINK(DoubleClickHdl_Impl, SvTreeListBox*, bool );
 
-virtual short Execute() override;
+voidUpdateWindow();
 
 voidonNew();
 voidonEdit();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 cui/source/tabpages/numfmt.cxx |   13 +++--
 1 file changed, 11 insertions(+), 2 deletions(-)

New commits:
commit b9505d6be5ff62930ec68a1baeb7c4bcf01442a4
Author: Caolán McNamara 
AuthorDate: Mon Dec 17 17:42:09 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 17 22:06:56 2018 +0100

Related: tdf#122120 left align text if preview won't fit

in the number format page

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

diff --git a/cui/source/tabpages/numfmt.cxx b/cui/source/tabpages/numfmt.cxx
index 46b3279b3a18..79430d39afc0 100644
--- a/cui/source/tabpages/numfmt.cxx
+++ b/cui/source/tabpages/numfmt.cxx
@@ -168,8 +168,17 @@ void SvxNumberPreview::Paint(vcl::RenderContext& 
rRenderContext, const ::tools::
 aTmpStr = aTmpStr.replaceAt(mnPos, 0, OUString(mnChar));
 }
 }
-Point aPosText = Point((mnPos != -1) ? 0 : nLeadSpace,
-   (aSzWnd.Height() - GetTextHeight()) / 2);
+long nX;
+if (mnPos != -1)
+nX = 0;
+else
+{
+//tdf#122120 if it won't fit anyway, then left align it
+if (nLeadSpace > 0)
+nX = nLeadSpace;
+nX = 0;
+}
+Point aPosText = Point(nX, (aSzWnd.Height() - GetTextHeight()) / 2);
 rRenderContext.DrawText(aPosText, aTmpStr);
 rRenderContext.Pop();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 dbaccess/source/ui/uno/composerdialogs.cxx |8 +++-
 forms/source/runtime/formoperations.cxx|   21 ++---
 offapi/com/sun/star/sdb/OrderDialog.idl|4 +++-
 3 files changed, 28 insertions(+), 5 deletions(-)

New commits:
commit 0a9917b756cf49b117766c9236a7bf63d6d4b607
Author: Caolán McNamara 
AuthorDate: Mon Dec 17 15:19:07 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 17 22:06:35 2018 +0100

tdf#122152 set dialog parent

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

diff --git a/dbaccess/source/ui/uno/composerdialogs.cxx 
b/dbaccess/source/ui/uno/composerdialogs.cxx
index 95186c74be02..c9b1973bb4a9 100644
--- a/dbaccess/source/ui/uno/composerdialogs.cxx
+++ b/dbaccess/source/ui/uno/composerdialogs.cxx
@@ -198,7 +198,7 @@ namespace dbaui
 
 void SAL_CALL RowsetOrderDialog::initialize( const Sequence< Any >& 
aArguments )
 {
-if( aArguments.getLength() == 2 )
+if (aArguments.getLength() == 2 || aArguments.getLength() == 3)
 {
 Reference xQueryComposer;
 aArguments[0] >>= xQueryComposer;
@@ -206,6 +206,12 @@ namespace dbaui
 aArguments[1] >>= xRowSet;
 setPropertyValue( "QueryComposer", makeAny( xQueryComposer ) );
 setPropertyValue( "RowSet",makeAny( xRowSet ) );
+if (aArguments.getLength() == 3)
+{
+Reference xParentWindow;
+aArguments[2] >>= xParentWindow;
+setPropertyValue("ParentWindow",  makeAny(xParentWindow));
+}
 }
 else
 ComposerDialog::initialize(aArguments);
diff --git a/forms/source/runtime/formoperations.cxx 
b/forms/source/runtime/formoperations.cxx
index 0ff115326e09..35798286fa3d 100644
--- a/forms/source/runtime/formoperations.cxx
+++ b/forms/source/runtime/formoperations.cxx
@@ -28,6 +28,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1685,18 +1686,32 @@ namespace frm
 return;
 try
 {
+css::uno::Reference xDialogParent;
+
+//tdf#122152 extract parent for dialog
+css::uno::Reference 
xTabController(m_xController, css::uno::UNO_QUERY);
+if (xTabController.is())
+{
+css::uno::Reference 
xContainerControl(xTabController->getContainer(), css::uno::UNO_QUERY);
+if (xContainerControl.is())
+{
+css::uno::Reference 
xContainerPeer(xContainerControl->getPeer(), css::uno::UNO_QUERY);
+xDialogParent = 
css::uno::Reference(xContainerPeer, css::uno::UNO_QUERY);
+}
+}
+
 Reference< XExecutableDialog> xDialog;
 if ( _bFilter )
 {
 xDialog = css::sdb::FilterDialog::createWithQuery(m_xContext, 
m_xParser, m_xCursor,
-  Reference());
+  
xDialogParent);
 }
 else
 {
-xDialog = css::sdb::OrderDialog::createWithQuery(m_xContext, 
m_xParser, m_xCursorProperties);
+xDialog = css::sdb::OrderDialog::createWithQuery(m_xContext, 
m_xParser, m_xCursorProperties,
+ 
xDialogParent);
 }
 
-
 if ( RET_OK == xDialog->execute() )
 {
 WaitObject aWO( nullptr );
diff --git a/offapi/com/sun/star/sdb/OrderDialog.idl 
b/offapi/com/sun/star/sdb/OrderDialog.idl
index 461fef0f966b..456e70f69fd6 100644
--- a/offapi/com/sun/star/sdb/OrderDialog.idl
+++ b/offapi/com/sun/star/sdb/OrderDialog.idl
@@ -20,6 +20,7 @@
 #ifndef __com_sun_star_sdb_OrderDialog_idl__
 #define __com_sun_star_sdb_OrderDialog_idl__
 
+#include 
 #include 
 #include 
 #include 
@@ -37,7 +38,8 @@ service OrderDialog : 
com::sun::star::ui::dialogs::XExecutableDialog
 createDefault();
 
 createWithQuery([in] com::sun::star::sdb::XSingleSelectQueryComposer 
QueryComposer,
-[in] com::sun::star::beans::XPropertySet RowSet);
+[in] com::sun::star::beans::XPropertySet RowSet,
+[in] com::sun::star::awt::XWindow ParentWindow);
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 filter/source/xsltdialog/xmlfilterdialogcomponent.cxx |   26 ++
 filter/source/xsltdialog/xmlfiltersettingsdialog.cxx  |4 --
 filter/source/xsltdialog/xmlfiltersettingsdialog.hxx  |2 -
 3 files changed, 17 insertions(+), 15 deletions(-)

New commits:
commit c821da3ecc3c309be2ec2db204a4c853b53fa979
Author: Caolán McNamara 
AuthorDate: Mon Dec 17 16:53:35 2018 +
Commit: Caolán McNamara 
CommitDate: Mon Dec 17 22:07:39 2018 +0100

Resolves: tdf#122153 keep Execute for modal dialogs

and not modeless ones

cause you get one main loop running inside another, and everything
is running inside the modeless dialog main loop until it exits.

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

diff --git a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx 
b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
index ffa2eebdcf7b..9b5dd734002f 100644
--- a/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
+++ b/filter/source/xsltdialog/xmlfilterdialogcomponent.cxx
@@ -265,7 +265,6 @@ void SAL_CALL XMLFilterDialogComponent::queryTermination( 
const EventObject& /*
 mpDialog->Close();
 }
 
-
 void SAL_CALL XMLFilterDialogComponent::notifyTermination( const EventObject& 
/* Event */ )
 {
 // we are going down, so dispose us!
@@ -276,35 +275,41 @@ void SAL_CALL XMLFilterDialogComponent::disposing( const 
EventObject& /* Source
 {
 }
 
-
 void SAL_CALL XMLFilterDialogComponent::setTitle( const OUString& /* _rTitle 
*/ )
 {
 }
 
-
-sal_Int16 SAL_CALL XMLFilterDialogComponent::execute(  )
+sal_Int16 SAL_CALL XMLFilterDialogComponent::execute()
 {
 ::SolarMutexGuard aGuard;
 
-if( nullptr == mpDialog )
+bool bLaunch = false;
+if (!mpDialog)
 {
 Reference< XComponent > xComp( this );
 if (mxParent.is())
 mpDialog = 
VclPtr::Create(VCLUnoHelper::GetWindow(mxParent), 
mxContext);
 else
 mpDialog = VclPtr::Create(nullptr, 
mxContext, Dialog::InitFlag::NoParent);
-mpDialog->Execute();
+bLaunch = true;
 }
-else if( !mpDialog->IsVisible() )
+
+mpDialog->UpdateWindow();
+
+if (!bLaunch)
 {
-mpDialog->Execute();
+mpDialog->ToTop();
+return 0;
 }
-mpDialog->ToTop();
+
+mpDialog->StartExecuteAsync([this](sal_Int32)
+{
+mpDialog.reset();
+});
 
 return 0;
 }
 
-
 void SAL_CALL XMLFilterDialogComponent::initialize( const Sequence< Any >& 
aArguments )
 {
 for(const Any& rArgument : aArguments)
@@ -320,7 +325,6 @@ void SAL_CALL XMLFilterDialogComponent::initialize( const 
Sequence< Any >& aArgu
 }
 }
 
-
 extern "C"
 {
 SAL_DLLPUBLIC_EXPORT void * xsltdlg_component_getFactory(
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
index f1d82327ca75..f5afa3d1125a 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.cxx
@@ -178,15 +178,13 @@ IMPL_LINK_NOARG(XMLFilterSettingsDialog, 
DoubleClickHdl_Impl, SvTreeListBox*, bo
 return false;
 }
 
-short XMLFilterSettingsDialog::Execute()
+void XMLFilterSettingsDialog::UpdateWindow()
 {
 m_pCtrlFilterList->GrabFocus();
 disposeFilterList();
 m_pFilterListBox->Clear();
 initFilterList();
 updateStates();
-
-return ModelessDialog::Execute();
 }
 
 void XMLFilterSettingsDialog::updateStates()
diff --git a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx 
b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
index 816e75ac72bb..ff55a19f9b5a 100644
--- a/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
+++ b/filter/source/xsltdialog/xmlfiltersettingsdialog.hxx
@@ -92,7 +92,7 @@ public:
 DECL_LINK(SelectionChangedHdl_Impl, SvTreeListBox*, void );
 DECL_LINK(DoubleClickHdl_Impl, SvTreeListBox*, bool );
 
-virtual short Execute() override;
+voidUpdateWindow();
 
 voidonNew();
 voidonEdit();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - vcl/qt5

[Libreoffice Gerrit user]

 vcl/qt5/Qt5Graphics_Text.cxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 6d3faf6a048eedf3fe4a1f43545eeda38adb2763
Author: Jan-Marek Glogowski 
AuthorDate: Mon Dec 17 15:07:26 2018 +0100
Commit: Jan-Marek Glogowski 
CommitDate: Mon Dec 17 22:31:41 2018 +0100

Qt5 don't re-register system fonts

System fonts are already registered in the QFontDatabase. And
addApplicationFont seems to be really expensive especially when
registering large fonts like the Noto CJK fonts, which increases
load time by 4 seconds per font.

This skips all font + style combinations already known in the DB.
Since addApplicationFont already relies on fontconfig on Unix/X11
this should be fine.

Change-Id: Ief13a613abd99b9fe391d9afe868541035340d1c
Reviewed-on: https://gerrit.libreoffice.org/65270
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski 
(cherry picked from commit 5d13f3efe0157559d3625c6b8fe7e9741e601215)
Reviewed-on: https://gerrit.libreoffice.org/65290

diff --git a/vcl/qt5/Qt5Graphics_Text.cxx b/vcl/qt5/Qt5Graphics_Text.cxx
index ba7133f7b53e..19a05f8410fc 100644
--- a/vcl/qt5/Qt5Graphics_Text.cxx
+++ b/vcl/qt5/Qt5Graphics_Text.cxx
@@ -98,6 +98,7 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* pPFC)
 
 if (bUseFontconfig)
 {
+const QStringList aFontFamilyList = aFDB.families();
 ::std::vector aList;
 psp::FastPrintFontInfo aInfo;
 
@@ -109,7 +110,11 @@ void Qt5Graphics::GetDevFontList(PhysicalFontCollection* 
pPFC)
 continue;
 QString aFilename = toQString(
 OStringToOUString(rMgr.getFontFileSysPath(aInfo.m_nID), 
RTL_TEXTENCODING_UTF8));
-QFontDatabase::addApplicationFont(aFilename);
+QRawFont aRawFont(aFilename, 0.0);
+QString aFamilyName = aRawFont.familyName();
+if (!aFontFamilyList.contains(aFamilyName)
+|| !aFDB.styles(aFamilyName).contains(aRawFont.styleName()))
+QFontDatabase::addApplicationFont(aFilename);
 }
 
 SalGenericInstance::RegisterFontSubstitutors(pPFC);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4b' - 7 commits - sw/source xmloff/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit f03da46aaaf234f8221fcb86911738ef3d231090
Author: Michael Stahl 
AuthorDate: Mon Dec 17 22:37:32 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 22:40:52 2018 +0100

Revert "HACK: ODF import: always hide redlines"

This reverts commit da23ebcb675ce57d84bb02a3db04751b8988afa9.

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 60c8445d59b0..138dc19981c8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,11 +856,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-#if 0
   !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
-#else
-  true))
-#endif
 {
 try
 {
@@ -893,10 +889,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
-#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
-#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 51afbd862d42e3637fe400203ef10378fb8bd019
Author: Michael Stahl 
AuthorDate: Fri Nov 30 18:00:19 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 22:40:51 2018 +0100

HACK: ODF import: always hide redlines

Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 138dc19981c8..60c8445d59b0 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,7 +856,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
+#if 0
   !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
+#else
+  true))
+#endif
 {
 try
 {
@@ -889,8 +893,10 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit 0f26e42214fb628903a7f2caac8c6c1b0c9bd0e8
Author: Michael Stahl 
AuthorDate: Fri Nov 30 17:54:41 2018 +0100
Commit: Michael Stahl 
CommitDate: Mon Dec 17 22:40:51 2018 +0100

sw_redlinehide: make layout based Show/Hide mode the default

remove ExperimentalMode checks

Change-Id: Ie098eda0840bbd3231696cae43cc572ad61379fc

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index dcfe450037a1..130d67cfb396 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2272,21 +2272,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFormatFlags const &
  m_pDoc->GetDocShell() );
 }
 
-uno::Reference const xContext(
-comphelper::getProcessComponentContext());
-bool const 
isExp(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext));
 RedlineFlags eRedlMode = 
m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(), eOldMode = eRedlMode;
 if( m_aFlags.bWithRedlining )
 {
 m_pDoc->SetAutoFormatRedline( true );
-eRedlMode = isExp
-? RedlineFlags::On | (eOldMode & RedlineFlags::ShowMask)
-: RedlineFlags::On | RedlineFlags::ShowInsert;
+eRedlMode = RedlineFlags::On | (eOldMode & RedlineFlags::ShowMask);
 }
 else
-  eRedlMode = isExp
-  ? RedlineFlags::Ignore | (eOldMode & RedlineFlags::ShowMask)
-  : RedlineFlags::ShowInsert | RedlineFlags::Ignore;
+  eRedlMode = RedlineFlags::Ignore | (eOldMode & RedlineFlags::ShowMask);
 m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( eRedlMode );
 
 // save undo state (might be turned off)
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index cec28a9b596a..d78e7e6b4849 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -344,19 +344,12 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
 aAny <<= bSho

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

[Libreoffice Gerrit user]

 extensions/source/update/ui/onlineupdate_16.png |binary
 extensions/source/update/ui/onlineupdate_26.png |binary
 2 files changed

New commits:
commit 8c7473e2998e13fc9c62aaa9ce9d7b536e81be57
Author: andreas kainz 
AuthorDate: Tue Dec 11 22:16:40 2018 +0100
Commit: andreas_kainz 
CommitDate: Mon Dec 17 23:27:11 2018 +0100

tdf#113205 add onlineupdate icons to core/extensions/source/update/ui

Change-Id: Ideebf1ed3dc0ed7db94873ffe28e6241f8b9e808
Reviewed-on: https://gerrit.libreoffice.org/65267
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 4f89c98d715592be42d8d378786d79eb27acadcb)
Reviewed-on: https://gerrit.libreoffice.org/65287
Reviewed-by: andreas_kainz 

diff --git a/extensions/source/update/ui/onlineupdate_16.png 
b/extensions/source/update/ui/onlineupdate_16.png
new file mode 100644
index ..7dab836e0625
Binary files /dev/null and b/extensions/source/update/ui/onlineupdate_16.png 
differ
diff --git a/extensions/source/update/ui/onlineupdate_26.png 
b/extensions/source/update/ui/onlineupdate_26.png
new file mode 100644
index ..05d4de622ae9
Binary files /dev/null and b/extensions/source/update/ui/onlineupdate_26.png 
differ
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Fw: [Libreoffice-commits] kde5: remove older kde/tde plugins, and references to that

[Thorsten Behrens]

Hi,

with the below commit, I've removed the old kde4 backend from vcl
(plus some glue code across the code base) - we've talked about that
briefly I believe during the CentOS7 baseline discussion at the
in-person ESC meeting in Tirana.

There's now actually two contemporary KDE backends for vcl: the
gtk3_kde5 one, and the native kde5 version, both targetting KF5/Plasma
desktops.

I hope this change is broadly uncontroversial; KDE4 was released in
2008, with a final maintenance update in 2014, and only (if at all)
receives minimal legacy runtime support in recent distros.

I've also changed jenkins config defaults to 'on' for kde5 (with some
fallout apparently for tinderboxes; seems baseline support was missing
on a few of them - apologies if you got spammed inadvertently).

Cheers, Thorsten

- Forwarded message from Libreoffice Gerrit user 
 -

Date: Mon, 17 Dec 2018 17:33:37 + (UTC)
From: Libreoffice Gerrit user 
Subject: [Libreoffice-commits] core.git

 Repository.mk   |8 
 RepositoryExternal.mk   |   27 
 bin/check-elf-dynamic-objects   |4 
 bin/distro-install-file-lists   |6 
 config_host.mk.in   |6 
 config_host/config_kde4.h.in|   10 
 config_host/config_vclplug.h.in |1 
 configure.ac|  322 --
 cppuhelper/source/servicemanager.cxx|8 
 cui/Library_cui.mk  |1 
 cui/source/options/optgdlg.cxx  |6 
 distro-configs/Jenkins/LibreOfficeLinuxUpdater.conf |2 
 distro-configs/Jenkins/Linux_dev_master.conf|2 
 distro-configs/Jenkins/Linux_rel_master.conf|2 
 distro-configs/LibreOfficeCoverity.conf |2 
 distro-configs/LibreOfficeLinux.conf|2 
 distro-configs/LibreOfficeOpenBSD.conf  |3 
 distro-configs/LibreOfficeiOS.conf  |2 
 include/sal/log-areas.dox   |1 
 postprocess/Rdb_services.mk |3 
 scp2/InstallScript_setup_osl.mk |2 
 scp2/Module_scp2.mk |2 
 shell/Library_kde4be.mk |   32 
 shell/Module_shell.mk   |6 
 shell/source/backends/desktopbe/desktopbackend.cxx  |   16 
 shell/source/backends/kde4be/kde4access.cxx |  300 -
 shell/source/backends/kde4be/kde4access.hxx |   39 
 shell/source/backends/kde4be/kde4backend.cxx|  180 ---
 shell/source/backends/kde4be/kde4be1.component  |   25 
 solenv/gbuild/CppunitTest.mk|1 
 svtools/source/uno/fpicker.cxx  |   12 
 sysui/CustomTarget_share.mk |2 
 vcl/CustomTarget_kde4_moc.mk|   24 
 vcl/Library_vclplug_kde4.mk |   99 -
 vcl/Module_vcl.mk   |7 
 vcl/README  |6 
 vcl/README.scheduler|4 
 vcl/inc/vclpluginapi.h  |6 
 vcl/source/app/salplug.cxx  |5 
 vcl/source/opengl/OpenGLHelper.cxx  |2 
 vcl/unx/kde4/FPServiceInfo.hxx  |   28 
 vcl/unx/kde4/KDE4FilePicker.cxx |  823 
 vcl/unx/kde4/KDE4FilePicker.hxx |  258 -
 vcl/unx/kde4/KDEData.cxx|   68 -
 vcl/unx/kde4/KDEData.hxx|   37 
 vcl/unx/kde4/KDESalDisplay.cxx  |   91 -
 vcl/unx/kde4/KDESalDisplay.hxx  |   45 
 vcl/unx/kde4/KDESalFrame.cxx|  373 ---
 vcl/unx/kde4/KDESalFrame.hxx|   53 -
 vcl/unx/kde4/KDESalGraphics.cxx | 1025 
 vcl/unx/kde4/KDESalGraphics.hxx |   53 -
 vcl/unx/kde4/KDESalInstance.cxx |   66 -
 vcl/unx/kde4/KDESalInstance.hxx |   45 
 vcl/unx/kde4/KDEXLib.cxx|  426 
 vcl/unx/kde4/KDEXLib.hxx|  101 -
 vcl/unx/kde4/VCLKDEApplication.cxx  |   87 -
 vcl/unx/kde4/VCLKDEApplication.hxx  |   39 
 vcl/unx/kde4/main.cxx   |   89 -
 vcl/unx/kde4/tst_exclude_posted_events.hxx  |   67 -
 vcl/unx/kde4/tst_exclude_socket_notifiers.hxx   |   80 -
 vcl/unx/kde5/KDE5FilePicker2.cxx|3 
 vcl/unx/kde5/KDE5SalInstance.cxx|1 
 62 files changed, 30 insertions(+), 5016 deletions(-)

- End forwarded message -


signature.asc
Description: PGP signature
_

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4b' - 12 commits - sw/inc sw/source xmloff/source

[Libreoffice Gerrit user]

Rebased ref, commits from common ancestor:
commit e849231da8f1a93afdf4cd07c2812a5a5b8865a5
Author: Michael Stahl 
AuthorDate: Mon Dec 17 22:37:32 2018 +0100
Commit: Michael Stahl 
CommitDate: Tue Dec 18 00:06:34 2018 +0100

Revert "HACK: ODF import: always hide redlines"

This reverts commit da23ebcb675ce57d84bb02a3db04751b8988afa9.

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 60c8445d59b0..138dc19981c8 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,11 +856,7 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
-#if 0
   !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
-#else
-  true))
-#endif
 {
 try
 {
@@ -893,10 +889,8 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
-#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
-#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit e6b0d37355bc3583a28d4f1c72b6f0f18a9e592e
Author: Michael Stahl 
AuthorDate: Fri Nov 30 18:00:19 2018 +0100
Commit: Michael Stahl 
CommitDate: Tue Dec 18 00:06:34 2018 +0100

HACK: ODF import: always hide redlines

Change-Id: I275c6738943ee0d74ccacea69af1c1f4c9ede1df

diff --git a/sw/source/filter/xml/swxml.cxx b/sw/source/filter/xml/swxml.cxx
index 138dc19981c8..60c8445d59b0 100644
--- a/sw/source/filter/xml/swxml.cxx
+++ b/sw/source/filter/xml/swxml.cxx
@@ -856,7 +856,11 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 if( !(IsOrganizerMode() || IsBlockMode() || m_bInsertMode ||
   m_aOption.IsFormatsOnly() ||
 // sw_redlinehide: disable layout cache for now
+#if 0
   !*o3tl::doAccess(xInfoSet->getPropertyValue(sShowChanges
+#else
+  true))
+#endif
 {
 try
 {
@@ -889,8 +893,10 @@ ErrCode XMLReader::Read( SwDoc &rDoc, const OUString& 
rBaseURL, SwPaM &rPaM, con
 // restore redline mode from import info property set
 RedlineFlags nRedlineFlags = RedlineFlags::ShowInsert;
 aAny = xInfoSet->getPropertyValue( sShowChanges );
+#if 0
 if ( *o3tl::doAccess(aAny) )
 nRedlineFlags |= RedlineFlags::ShowDelete;
+#endif
 aAny = xInfoSet->getPropertyValue( sRecordChanges );
 if ( *o3tl::doAccess(aAny) || (aKey.getLength() > 0) )
 nRedlineFlags |= RedlineFlags::On;
commit bdfad8e6768c560271400db957e97141a8f96ca7
Author: Michael Stahl 
AuthorDate: Fri Nov 30 17:54:41 2018 +0100
Commit: Michael Stahl 
CommitDate: Tue Dec 18 00:06:34 2018 +0100

sw_redlinehide: make layout based Show/Hide mode the default

remove ExperimentalMode checks

Change-Id: Ie098eda0840bbd3231696cae43cc572ad61379fc

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index dcfe450037a1..130d67cfb396 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2272,21 +2272,14 @@ SwAutoFormat::SwAutoFormat( SwEditShell* pEdShell, 
SvxSwAutoFormatFlags const &
  m_pDoc->GetDocShell() );
 }
 
-uno::Reference const xContext(
-comphelper::getProcessComponentContext());
-bool const 
isExp(officecfg::Office::Common::Misc::ExperimentalMode::get(xContext));
 RedlineFlags eRedlMode = 
m_pDoc->getIDocumentRedlineAccess().GetRedlineFlags(), eOldMode = eRedlMode;
 if( m_aFlags.bWithRedlining )
 {
 m_pDoc->SetAutoFormatRedline( true );
-eRedlMode = isExp
-? RedlineFlags::On | (eOldMode & RedlineFlags::ShowMask)
-: RedlineFlags::On | RedlineFlags::ShowInsert;
+eRedlMode = RedlineFlags::On | (eOldMode & RedlineFlags::ShowMask);
 }
 else
-  eRedlMode = isExp
-  ? RedlineFlags::Ignore | (eOldMode & RedlineFlags::ShowMask)
-  : RedlineFlags::ShowInsert | RedlineFlags::Ignore;
+  eRedlMode = RedlineFlags::Ignore | (eOldMode & RedlineFlags::ShowMask);
 m_pDoc->getIDocumentRedlineAccess().SetRedlineFlags( eRedlMode );
 
 // save undo state (might be turned off)
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx 
b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index cec28a9b596a..d78e7e6b4849 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -344,19 +344,12 @@ XMLRedlineImportHelper::~XMLRedlineImportHelper()
 aAny <<= bSho

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

[Libreoffice Gerrit user]

 download.lst   |8 
 solenv/flatpak-manifest.in |   12 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 9eacb42ca081302faa62ac0f8c0af0adfa0e920b
Author: heiko tietze 
AuthorDate: Mon Dec 17 16:13:54 2018 +0100
Commit: Heiko Tietze 
CommitDate: Tue Dec 18 01:40:02 2018 +0100

Resolves: tdf#121676 - Update Liberation fonts from new source

Liberation updated from 2.00.1 to 2.00.4 and
Liberation-Narrow from 1.07.4 to 1.07.6

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

diff --git a/download.lst b/download.lst
index 937e5cc35d18..f29a1c072073 100644
--- a/download.lst
+++ b/download.lst
@@ -56,10 +56,10 @@ export FONT_DEJAVU_SHA256SUM := 
7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a
 export FONT_DEJAVU_TARBALL := 
33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
 export FONT_GENTIUM_SHA256SUM := 
2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc
 export FONT_GENTIUM_TARBALL := 
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
-export FONT_LIBERATION_NARROW_SHA256SUM := 
61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c
-export FONT_LIBERATION_NARROW_TARBALL := 
134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz
-export FONT_LIBERATION_SHA256SUM := 
7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504
-export FONT_LIBERATION_TARBALL := 
5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
+export FONT_LIBERATION_NARROW_SHA256SUM := 
8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
+export FONT_LIBERATION_NARROW_TARBALL := 
liberation-narrow-fonts-ttf-1.07.6.tar.gz
+export FONT_LIBERATION_SHA256SUM := 
c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45
+export FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.00.4.tar.gz
 export FONT_LINLIBERTINEG_SHA256SUM := 
54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
 export FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 export FONT_SOURCECODE_SHA256SUM := 
09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 805af3be2b2f..8ab750dffddd 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -103,16 +103,16 @@
 "dest-filename": 
"external/tarballs/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz";,
-"sha256": 
"61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c",
+"url": 
"https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz";,
+"sha256": 
"8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3",
 "type": "file",
-"dest-filename": 
"external/tarballs/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"
+"dest-filename": 
"external/tarballs/liberation-narrow-fonts-ttf-1.07.6.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz";,
-"sha256": 
"7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504",
+"url": 
"https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz";,
+"sha256": 
"c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45",
 "type": "file",
-"dest-filename": 
"external/tarballs/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"
+"dest-filename": 
"external/tarballs/liberation-fonts-ttf-2.00.4.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sfx2/source/doc/docfile.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 8dc3fe631583228fe5bb49b44d2308470ec30df0
Author: Mike Kaganski 
AuthorDate: Tue Dec 18 02:51:31 2018 +0100
Commit: Mike Kaganski 
CommitDate: Tue Dec 18 03:46:05 2018 +0100

tdf#116320: properly decode file name for File Locked dialog

Change-Id: I51bd7c6695ef52b08e0b6d809160d74daebb8505
Reviewed-on: https://gerrit.libreoffice.org/65298
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 45449a26731b..7c23cfa90046 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -1002,7 +1002,8 @@ SfxMedium::ShowLockResult 
SfxMedium::ShowLockedDocumentDialog(const OUString& aD
 
 if ( xHandler.is() && ( bIsLoading || !bHandleSysLocked || bOwnLock ) )
 {
-OUString aDocumentURL = GetURLObject().GetLastName();
+OUString aDocumentURL
+= 
GetURLObject().GetLastName(INetURLObject::DecodeMechanism::WithCharset);
 OUString aInfo;
 ::rtl::Reference< ::ucbhelper::InteractionRequest > 
xInteractionRequestImpl;
 
___
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

[Libreoffice Gerrit user]

 include/sfx2/docfile.hxx|2 +-
 sfx2/source/doc/docfile.cxx |   14 +++---
 2 files changed, 8 insertions(+), 8 deletions(-)

New commits:
commit c49ea4f3155dcb3538c81734e911eb2910570553
Author: Mike Kaganski 
AuthorDate: Tue Dec 18 03:05:02 2018 +0100
Commit: Mike Kaganski 
CommitDate: Tue Dec 18 05:00:30 2018 +0100

Simplify ShowLockedDocumentDialog argument list

No need to pass file URL explicitly - it's available as GetURLObject().
commit 607b80ca3cddc239a35580470944a438ce144fc8 follow-up.

Change-Id: I6a2ceb6d3ae78c277f40215082af22112f9e2d27
Reviewed-on: https://gerrit.libreoffice.org/65300
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/include/sfx2/docfile.hxx b/include/sfx2/docfile.hxx
index 8e22b0a40b31..8019c8a676d2 100644
--- a/include/sfx2/docfile.hxx
+++ b/include/sfx2/docfile.hxx
@@ -295,7 +295,7 @@ public:
 
 private:
 enum class ShowLockResult { NoLock, Succeeded, Try };
-ShowLockResult ShowLockedDocumentDialog(const OUString& aDocURL, const 
LockFileEntry& aData,
+ShowLockResult ShowLockedDocumentDialog(const LockFileEntry& aData,
 bool bIsLoading, bool bOwnLock, 
bool bHandleSysLocked);
 enum class MessageDlg { LockFileIgnore, LockFileCorrupt };
 boolShowLockFileProblemDialog(MessageDlg nWhichDlg);
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 7c23cfa90046..e6eefe86e6b6 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -986,8 +986,7 @@ OUString tryForeignLockfiles(const OUString& sDocURL)
 }
 }
 
-SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const OUString& 
aDocURL,
-  const 
LockFileEntry& aData,
+SfxMedium::ShowLockResult SfxMedium::ShowLockedDocumentDialog(const 
LockFileEntry& aData,
   bool bIsLoading, 
bool bOwnLock,
   bool 
bHandleSysLocked)
 {
@@ -1028,9 +1027,10 @@ SfxMedium::ShowLockResult 
SfxMedium::ShowLockedDocumentDialog(const OUString& aD
 else
 aInfo = aData[LockFileComponent::SYSUSERNAME];
 
-if (aInfo.isEmpty() && !aDocURL.isEmpty())
+if (aInfo.isEmpty() && !GetURLObject().isAnyKnownWebDAVScheme())
 // Try to get name of user who has locked the file using other 
applications
-aInfo = tryForeignLockfiles(aDocURL);
+aInfo = tryForeignLockfiles(
+
GetURLObject().GetMainURL(INetURLObject::DecodeMechanism::NONE));
 
 if ( !aInfo.isEmpty() && 
!aData[LockFileComponent::EDITTIME].isEmpty() )
 aInfo += " ( " + aData[LockFileComponent::EDITTIME] + " )";
@@ -1265,7 +1265,8 @@ SfxMedium::LockFileResult 
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
 
 if ( !bResult && !bNoUI )
 {
-bUIStatus = ShowLockedDocumentDialog("", 
aLockData, bLoading, false , true );
+bUIStatus
+= ShowLockedDocumentDialog(aLockData, 
bLoading, false, true);
 }
 }
 catch( ucb::InteractiveNetworkWriteException& )
@@ -1488,8 +1489,7 @@ SfxMedium::LockFileResult 
SfxMedium::LockOrigFileOnDemand( bool bLoading, bool b
 {
 if (!bNoUI)
 bUIStatus = ShowLockedDocumentDialog(
-pImpl->m_aLogicName, aData, 
bLoading, bOwnLock,
-bHandleSysLocked);
+aData, bLoading, bOwnLock, 
bHandleSysLocked);
 else if (bLoading && bTryIgnoreLockFile && 
!bHandleSysLocked)
 bUIStatus = ShowLockResult::Succeeded;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Student research project: A Survey about Open Source Projects

[Sven Kirtz]

I would like to ask you to participate in a survey for a student research 
project.


The topic of the thesis will be an evaluation of criteria for open source 
projects, so that beginners can make their work as meaningful as possible 
depending on their motivation.


The aim of the survey is to evaluate these criteria, depending your motivation, 
when your first started to work on open source project. The survey should take 
max. ~3-4 minutes.


Here‘s the link for the survey: https://goo.gl/forms/xhdUqNnNHOat3KDl1

[https://lh3.googleusercontent.com/JlKKB2OakrK7RQ7lp-qV-pGbLqGMOwdNUiJSN2GGAaoyz6XiqFSkxqJNt8YqGEP4mig=w1200-h630-p]

Expert survey to validate criteria for an easy start into Open 
Source
goo.gl
Thank you very much for participating in this survey. The goal of this survey 
is to collect data to help beginners priorities open source projects, regarding 
their motivations. Upon request, I will send you the results of the survey for 
your use.






If you are interested in the anonymous result of the survey, I would be happy 
to send it to you by e-mail.


If you have any further questions, please do not hesitate to contact me. I 
would also be very pleased to receive your feedback.



Yours sincerely,


Sven Kirtz

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

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

[Libreoffice Gerrit user]

 lotuswordpro/inc/xfilter/xfcellstyle.hxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 80d44971b6e857a40f2716645fb22b84ac15deef
Author: Andrea Gelmini 
AuthorDate: Mon Dec 17 11:20:03 2018 +
Commit: Julien Nabet 
CommitDate: Tue Dec 18 07:04:15 2018 +0100

Fix typo

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

diff --git a/lotuswordpro/inc/xfilter/xfcellstyle.hxx 
b/lotuswordpro/inc/xfilter/xfcellstyle.hxx
index 8e0fc8c5dd7a..ff081b58a97c 100644
--- a/lotuswordpro/inc/xfilter/xfcellstyle.hxx
+++ b/lotuswordpro/inc/xfilter/xfcellstyle.hxx
@@ -108,10 +108,10 @@ public:
 voidSetAlignType(enumXFAlignType hori, enumXFAlignType vert);
 
 /**
- * @descr:  The borders is complex,so you have to create one before use.
-Very few paragraphs will readly have borders property,this way
+ * @descr:  The borders are complex, so you have to create one before use.
+Very few paragraphs will already have borders property, this 
way
 we can save much memory.
- * @param:  pBorders borders of the paragraph,please reference the 
XFBorders.
+ * @param:  pBorders borders of the paragraph, please reference the 
XFBorders.
  */
 voidSetBorders(XFBorders *pBorders);
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 xmloff/source/text/XMLPropertyBackpatcher.cxx |   16 ++--
 xmloff/source/text/XMLPropertyBackpatcher.hxx |8 ++--
 2 files changed, 8 insertions(+), 16 deletions(-)

New commits:
commit b06b3bcc6900014989da8060d126a45f31c9b8b7
Author: Noel Grandin 
AuthorDate: Thu Dec 13 09:48:54 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Dec 18 07:22:32 2018 +0100

use unique_ptr in XMLPropertyBackpatcher

and drop what looks like a very old (from 2000) workaround for long
typenames and linker problems

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

diff --git a/xmloff/source/text/XMLPropertyBackpatcher.cxx 
b/xmloff/source/text/XMLPropertyBackpatcher.cxx
index a456283b2afc..a9f245d7229e 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.cxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.cxx
@@ -54,14 +54,14 @@ void XMLPropertyBackpatcher::ResolveId(
 aIDMap[sName] = aValue;
 
 // backpatch old references, if backpatch list exists
-if (aBackpatchListMap.count(sName))
+auto it = aBackpatchListMap.find(sName);
+if (it != aBackpatchListMap.end())
 {
 // aah, we have a backpatch list!
-BackpatchListType* pList =
-static_cast(aBackpatchListMap[sName]);
+std::unique_ptr pList = std::move(it->second);
 
 // a) remove list from list map
-aBackpatchListMap.erase(sName);
+aBackpatchListMap.erase(it);
 
 // b) for every item, set SequenceNumber
 //(and preserve Property, if appropriate)
@@ -71,9 +71,6 @@ void XMLPropertyBackpatcher::ResolveId(
 {
 rBackpatch->setPropertyValue(sPropertyName, aAny);
 }
-
-// c) delete list
-delete pList;
 }
 // else: no backpatch list -> then we're finished
 }
@@ -103,12 +100,11 @@ void XMLPropertyBackpatcher::SetProperty(
 if (! aBackpatchListMap.count(sName))
 {
 // create backpatch list for this name
-BackpatchListType* pTmp = new BackpatchListType;
-aBackpatchListMap[sName] = static_cast(pTmp);
+aBackpatchListMap.emplace(sName, new BackpatchListType);
 }
 
 // insert footnote
-
static_cast(aBackpatchListMap[sName])->push_back(xPropSet);
+aBackpatchListMap[sName]->push_back(xPropSet);
 }
 }
 
diff --git a/xmloff/source/text/XMLPropertyBackpatcher.hxx 
b/xmloff/source/text/XMLPropertyBackpatcher.hxx
index 8747b8aad00b..029f25e66e4a 100644
--- a/xmloff/source/text/XMLPropertyBackpatcher.hxx
+++ b/xmloff/source/text/XMLPropertyBackpatcher.hxx
@@ -22,6 +22,7 @@
 #define INCLUDED_XMLOFF_SOURCE_TEXT_XMLPROPERTYBACKPATCHER_HXX
 
 #include 
+#include 
 #include 
 
 namespace com { namespace sun { namespace star {
@@ -65,13 +66,8 @@ class XMLPropertyBackpatcher
 typedef ::std::vector<
 css::uno::Reference > 
BackpatchListType;
 
-/* use void* instead of BackpatchListType to avoid linker problems
-   with long typenames. The real typename (commented out) contains
-   >1200 chars. */
-
 /// backpatch list for unresolved IDs
-//::std::map aBackpatchListMap;
-::std::map aBackpatchListMap;
+::std::map> 
aBackpatchListMap;
 
 /// mapping of names -> IDs
 ::std::map aIDMap;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 filter/source/msfilter/svdfppt.cxx  |   13 +++---
 include/filter/msfilter/svdfppt.hxx |2 -
 include/xmloff/txtimppr.hxx |9 ++--
 xmloff/source/text/txtimppr.cxx |   72 ++--
 4 files changed, 48 insertions(+), 48 deletions(-)

New commits:
commit 49fb2a24c46e5097650c0951eeabe336d242834a
Author: Noel Grandin 
AuthorDate: Fri Dec 14 09:11:26 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Dec 18 07:23:01 2018 +0100

use unique_ptr in SdrPowerPointImport

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

diff --git a/filter/source/msfilter/svdfppt.cxx 
b/filter/source/msfilter/svdfppt.cxx
index 99430c9abc0f..18aacd8e6803 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -1972,9 +1972,9 @@ SdrObject* SdrPowerPointImport::ImportOLE( sal_uInt32 
nOLEId,
 return pRet;
 }
 
-SvMemoryStream* SdrPowerPointImport::ImportExOleObjStg( sal_uInt32 
nPersistPtr, sal_uInt32& nOleId ) const
+std::unique_ptr SdrPowerPointImport::ImportExOleObjStg( 
sal_uInt32 nPersistPtr, sal_uInt32& nOleId ) const
 {
-SvMemoryStream* pRet = nullptr;
+std::unique_ptr pRet;
 if ( nPersistPtr && ( nPersistPtr < nPersistPtrCnt ) )
 {
 sal_uInt32 nOldPos, nOfs = pPersistPtr[ nPersistPtr ];
@@ -1988,14 +1988,13 @@ SvMemoryStream* SdrPowerPointImport::ImportExOleObjStg( 
sal_uInt32 nPersistPtr,
 if ( static_cast(nLen) > 0 )
 {
 rStCtrl.ReadUInt32( nOleId );
-pRet = new SvMemoryStream;
+pRet.reset(new SvMemoryStream);
 ZCodec aZCodec( 0x8000, 0x8000 );
 aZCodec.BeginCompression();
 aZCodec.Decompress( rStCtrl, *pRet );
 if ( !aZCodec.EndCompression() )
 {
-delete pRet;
-pRet = nullptr;
+pRet.reset();
 }
 }
 }
@@ -2028,10 +2027,10 @@ void SdrPowerPointImport::SeekOle( SfxObjectShell* 
pShell, sal_uInt32 nFilterOpt
.ReadUInt32( nIDoNotKnow2 );
 
 sal_uInt32 nOleId;
-SvMemoryStream* pBas = ImportExOleObjStg( nPersistPtr, 
nOleId );
+std::unique_ptr pBas = 
ImportExOleObjStg( nPersistPtr, nOleId );
 if ( pBas )
 {
-tools::SvRef xSource( new SotStorage( 
pBas, true ) );
+tools::SvRef xSource( new SotStorage( 
pBas.release(), true ) );
 tools::SvRef xDest( new SotStorage( 
new SvMemoryStream(), true ) );
 if ( xSource.is() && xDest.is() )
 {
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index 36229fb5044a..59fa807c35ff 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -604,7 +604,7 @@ protected:
 const tools::Rectangle& rVisArea,
 const int _nCalledByGroup
 ) const override;
-SvMemoryStream* ImportExOleObjStg( sal_uInt32 nPersistPtr, 
sal_uInt32& nOleId ) const;
+std::unique_ptr ImportExOleObjStg( sal_uInt32 nPersistPtr, 
sal_uInt32& nOleId ) const;
 SdrPage*MakeBlancPage(bool bMaster) const;
 boolReadFontCollection();
 PptSlidePersistList*GetPageList(PptPageKind ePageKind) const;
commit ebad2d305cd727dd94caef21031f4f268b7c642c
Author: Noel Grandin 
AuthorDate: Thu Dec 13 11:39:27 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Dec 18 07:22:53 2018 +0100

use unique_ptr in XMLTextImportPropertyMapper

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

diff --git a/include/xmloff/txtimppr.hxx b/include/xmloff/txtimppr.hxx
index bd1338fd1884..3786de22f478 100644
--- a/include/xmloff/txtimppr.hxx
+++ b/include/xmloff/txtimppr.hxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 
 class XMLFontStylesContext;
 
@@ -42,10 +43,10 @@ class XMLOFF_DLLPUBLIC XMLTextImportPropertyMapper : public 
SvXMLImportPropertyM
 XMLPropertyState const * pFontFamily,
 XMLPropertyState const * pFontPitch,
 XMLPropertyState const * pFontCharSet,
-XMLPropertyState** ppNewFontStyleName,
-XMLPropertyState** ppNewFontFamily,
-XMLPropertyState** ppNewFontPitch,
-XMLPropertyState** ppNewFontCharSet ) const;
+std::unique_ptr* ppNewFontStyleName,
+std::unique_ptr* ppNewFontFamily,
+   

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

[Libreoffice Gerrit user]

 xmloff/source/draw/sdxmlexp.cxx |   28 
 1 file changed, 8 insertions(+), 20 deletions(-)

New commits:
commit c2a91dc53431b5658f54ca4fd32ca79165e865af
Author: Noel Grandin 
AuthorDate: Fri Dec 14 09:11:46 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Dec 18 07:23:21 2018 +0100

use unique_ptr in ImpXMLAutoLayoutInfo

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

diff --git a/xmloff/source/draw/sdxmlexp.cxx b/xmloff/source/draw/sdxmlexp.cxx
index 2383e4344321..3e16678ced13 100644
--- a/xmloff/source/draw/sdxmlexp.cxx
+++ b/xmloff/source/draw/sdxmlexp.cxx
@@ -205,9 +205,8 @@ class ImpXMLAutoLayoutInfo
 public:
 ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, ImpXMLEXPPageMasterInfo* pInf);
 
-bool operator==(const ImpXMLAutoLayoutInfo& rInfo) const;
-
 sal_uInt16 GetLayoutType() const { return mnType; }
+ImpXMLEXPPageMasterInfo* GetPageMasterInfo() const { return 
mpPageMasterInfo; }
 sal_Int32 GetGapX() const { return mnGapX; }
 sal_Int32 GetGapY() const { return mnGapY; }
 
@@ -229,12 +228,6 @@ bool ImpXMLAutoLayoutInfo::IsCreateNecessary(sal_uInt16 
nTyp)
 return true;
 }
 
-bool ImpXMLAutoLayoutInfo::operator==(const ImpXMLAutoLayoutInfo& rInfo) const
-{
-return mnType == rInfo.mnType
-   && mpPageMasterInfo == rInfo.mpPageMasterInfo;
-}
-
 ImpXMLAutoLayoutInfo::ImpXMLAutoLayoutInfo(sal_uInt16 nTyp, 
ImpXMLEXPPageMasterInfo* pInf)
 : mnType(nTyp)
 , mpPageMasterInfo(pInf)
@@ -712,21 +705,16 @@ bool SdXMLExport::ImpPrepAutoLayoutInfo(const 
Reference& xPage, OUStr
 }
 
 // create entry and look for existence
-ImpXMLAutoLayoutInfo* pNew = new ImpXMLAutoLayoutInfo(nType, 
pInfo);
-bool bDidExist(false);
-
-for( size_t nCnt = 0; !bDidExist && nCnt < 
mvAutoLayoutInfoList.size(); nCnt++)
+ImpXMLAutoLayoutInfo* pNew;
+auto it = std::find_if(mvAutoLayoutInfoList.begin(), 
mvAutoLayoutInfoList.end(),
+[=](std::unique_ptr const & 
rInfo) { return nType == rInfo->GetLayoutType() && pInfo == 
rInfo->GetPageMasterInfo(); });
+if (it != mvAutoLayoutInfoList.end())
 {
-if( *mvAutoLayoutInfoList.at( nCnt ) == *pNew)
-{
-delete pNew;
-pNew = mvAutoLayoutInfoList.at( nCnt ).get();
-bDidExist = true;
-}
+pNew = it->get();
 }
-
-if(!bDidExist)
+else
 {
+pNew = new ImpXMLAutoLayoutInfo(nType, pInfo);
 mvAutoLayoutInfoList.emplace_back( pNew );
 OUString sNewName = "AL";
 sNewName += OUString::number(mvAutoLayoutInfoList.size() - 
1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/inc/swtypes.hxx   |3 --
 sw/source/core/bastyp/swtypes.cxx|2 -
 sw/source/core/doc/docnum.cxx|2 -
 sw/source/core/doc/fmtcol.cxx|2 -
 sw/source/core/fields/reffld.cxx |2 -
 sw/source/core/layout/colfrm.cxx |2 -
 sw/source/core/layout/paintfrm.cxx   |4 +-
 sw/source/core/text/frmpaint.cxx |2 -
 sw/source/core/text/inftxt.cxx   |2 -
 sw/source/core/undo/SwUndoField.cxx  |2 -
 sw/source/core/unocore/unocoll.cxx   |2 -
 sw/source/core/unocore/unoframe.cxx  |4 +-
 sw/source/filter/html/css1atr.cxx|2 -
 sw/source/filter/html/htmlbas.cxx|2 -
 sw/source/filter/html/htmlcss1.cxx   |   16 +-
 sw/source/filter/html/htmldrawreader.cxx |4 +-
 sw/source/filter/html/htmldrawwriter.cxx |2 -
 sw/source/filter/html/htmlfld.cxx|2 -
 sw/source/filter/html/htmlflywriter.cxx  |6 ++--
 sw/source/filter/html/htmlform.cxx   |4 +-
 sw/source/filter/html/htmlforw.cxx   |4 +-
 sw/source/filter/html/htmlftn.cxx|8 ++---
 sw/source/filter/html/htmlgrin.cxx   |6 ++--
 sw/source/filter/html/htmlsect.cxx   |2 -
 sw/source/filter/html/htmltab.cxx|4 +-
 sw/source/filter/html/swhtml.cxx |   28 +-
 sw/source/filter/ww8/ww8par3.cxx |2 -
 sw/source/ui/config/optpage.cxx  |6 ++--
 sw/source/ui/dbui/mmlayoutpage.cxx   |   12 
 sw/source/ui/dbui/mmoutputtypepage.cxx   |2 -
 sw/source/ui/dialog/uiregionsw.cxx   |   13 +---
 sw/source/ui/fldui/changedb.cxx  |2 -
 sw/source/ui/fldui/flddb.cxx |8 ++---
 sw/source/ui/fldui/flddinf.cxx   |2 -
 sw/source/ui/fldui/flddok.cxx|6 ++--
 sw/source/ui/fldui/fldref.cxx|6 ++--
 sw/source/ui/index/cnttab.cxx|   40 +-
 sw/source/ui/misc/glosbib.cxx|2 -
 sw/source/ui/misc/glossary.cxx   |4 +-
 sw/source/ui/misc/num.cxx|   18 ++--
 sw/source/uibase/app/appenv.cxx  |2 -
 sw/source/uibase/app/applab.cxx  |2 -
 sw/source/uibase/app/docsh.cxx   |8 ++---
 sw/source/uibase/app/docsh2.cxx  |6 ++--
 sw/source/uibase/app/docshini.cxx|   12 
 sw/source/uibase/app/docst.cxx   |6 ++--
 sw/source/uibase/app/docstyle.cxx|5 ++-
 sw/source/uibase/dbui/dbmgr.cxx  |2 -
 sw/source/uibase/dochdl/gloshdl.cxx  |8 ++---
 sw/source/uibase/dochdl/swdtflvr.cxx |   46 +++
 sw/source/uibase/envelp/envimg.cxx   |1 
 sw/source/uibase/index/toxmgr.cxx|   20 ++---
 sw/source/uibase/misc/glshell.cxx|4 +-
 sw/source/uibase/misc/redlndlg.cxx   |2 -
 sw/source/uibase/ribbar/inputwin.cxx |1 
 sw/source/uibase/utlui/navipi.cxx|2 -
 56 files changed, 185 insertions(+), 184 deletions(-)

New commits:
commit d8037ae18a297229d1b79f8f76331abfd548350d
Author: Mike Kaganski 
AuthorDate: Tue Dec 18 04:55:34 2018 +0300
Commit: Mike Kaganski 
CommitDate: Tue Dec 18 07:27:47 2018 +0100

Get rid of aEmptyOUStr

Commit 8051bb7e18ccae0f639e65dfa86bcc18a5fb9108 had removed its "String"
counterpart.

Change-Id: Id873a259e7f4b2794e94dec83d08ed6b57298beb
Reviewed-on: https://gerrit.libreoffice.org/65299
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index a89413ccfa7d..0206535fcd37 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -80,9 +80,6 @@ const SwTwips lMinBorder = 1134;
 //TODO: Replace with SwViewOption::defDocumentBorder
 #define DOCUMENTBORDER  284
 
-// Constant strings.
-SW_DLLPUBLIC extern OUString aEmptyOUStr;  // remove once aEmptyOUStr can be 
changed to OUString
-
 // For inserting of captions (what and where to insert).
 // It's here because it is not big enough to justify its own hxx
 // and does not seem to fit somewhere else.
diff --git a/sw/source/core/bastyp/swtypes.cxx 
b/sw/source/core/bastyp/swtypes.cxx
index 7e83817497f1..c86f93fa1a94 100644
--- a/sw/source/core/bastyp/swtypes.cxx
+++ b/sw/source/core/bastyp/swtypes.cxx
@@ -46,8 +46,6 @@
 
 using namespace com::sun::star;
 
-OUString aEmptyOUStr;  // remove once aEmptyOUStr can be changed to OUString
-
 Size GetGraphicSizeTwip(const Graphic& rGraphic, vcl::RenderContext* pOutDev)
 {
 const MapMode aMapTwip(MapUnit::MapTwip);
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 852cd0c8ff48..8e67ea7e17ec 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -1334,7 +1334,7 @@ void SwDoc::DelNumRules(const SwPaM& rPam, SwRootFrame 
const*const pLayout)
 
 SwRegHistory aRegH( pUndo ? pUndo->GetHistory() : nullptr );
 
-SwNumRuleItem aE

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - sc/uiconfig sd/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui   | 2201 ++---
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui|  801 +++
 sd/uiconfig/sdraw/ui/notebookbar.ui   | 2004 ++--
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui|  768 +++
 sd/uiconfig/simpress/ui/notebookbar.ui| 1971 ++--
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |  768 +++
 sw/uiconfig/swriter/ui/notebookbar.ui | 3244 +-
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui  |  820 +++
 8 files changed, 9726 insertions(+), 2851 deletions(-)

New commits:
commit e34f51bc082016bedec9aa2f58145ff67ac45707
Author: andreas kainz 
AuthorDate: Wed Dec 12 00:58:44 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Dec 18 07:40:22 2018 +0100

tdf#121592 add context-Form toolbar to NB

tabbed and groupedbar_compact add context-form support

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index fb3e5adbc753..adeb29754cde 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -528,6 +528,166 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+.uno:Label
+  
+
+
+  
+True
+False
+.uno:Edit
+  
+
+
+  
+True
+False
+.uno:CheckBox
+  
+
+
+  
+True
+False
+.uno:RadioButton
+  
+
+
+  
+True
+False
+.uno:ListBox
+  
+
+
+  
+True
+False
+.uno:ComboBox
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:Pushbutton
+  
+
+
+  
+True
+False
+.uno:Imagebutton
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:FormattedField
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:DateField
+  
+
+
+  
+True
+False
+.uno:TimeField
+  
+
+
+  
+True
+False
+.uno:NumericField
+  
+
+
+  
+True
+False
+.uno:CurrencyField
+  
+
+
+  
+True
+False
+.uno:PatternField
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:ImageControl
+  
+
+
+  
+True
+False
+.uno:FileControl
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:Grid
+  
+
+
+  
+True
+False
+.uno:NavigationBar
+  
+
+  
   
 True
 False
@@ -10138,7 +10298,6 @@
   
   
 7
-False
   
 
 
@@ -11211,7 +11370,7 @@
 
   
   
-9
+8
   
 
 
@@ -11223,32 +11382,33 @@
 
   
   
-  
+  
+  
 
   
   
-9
+8
 False
   
 
 
-  
+  
 True
 False
 
-  
+  
 True
 False
 center
 True
 
-  
+  
 True
 False
 center
 True
 
-  
+  
 True
 True
 center
@@ -11258,7 +11418,7 @@
 False
 3
 
-  
+  
 True
 False
 center
@@ -11266,25 +11426,25 @@
 .uno:AssignMacro
   
 

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui   | 2201 ++---
 sc/uiconfig/scalc/ui/notebookbar_groupedbar_compact.ui|  801 +++
 sd/uiconfig/sdraw/ui/notebookbar.ui   | 2004 ++--
 sd/uiconfig/sdraw/ui/notebookbar_groupedbar_compact.ui|  768 +++
 sd/uiconfig/simpress/ui/notebookbar.ui| 1971 ++--
 sd/uiconfig/simpress/ui/notebookbar_groupedbar_compact.ui |  768 +++
 sw/uiconfig/swriter/ui/notebookbar.ui | 3244 +-
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui  |  820 +++
 8 files changed, 9726 insertions(+), 2851 deletions(-)

New commits:
commit cd41b2b7d6e6d808738a7a9f776346442da13855
Author: andreas kainz 
AuthorDate: Wed Dec 12 00:58:44 2018 +0100
Commit: andreas_kainz 
CommitDate: Tue Dec 18 07:40:34 2018 +0100

tdf#121592 add context-Form toolbar to NB

tabbed and groupedbar_compact add context-form support

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index fb3e5adbc753..adeb29754cde 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -528,6 +528,166 @@
   
 
   
+  
+True
+False
+
+  
+True
+False
+.uno:Label
+  
+
+
+  
+True
+False
+.uno:Edit
+  
+
+
+  
+True
+False
+.uno:CheckBox
+  
+
+
+  
+True
+False
+.uno:RadioButton
+  
+
+
+  
+True
+False
+.uno:ListBox
+  
+
+
+  
+True
+False
+.uno:ComboBox
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:Pushbutton
+  
+
+
+  
+True
+False
+.uno:Imagebutton
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:FormattedField
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:DateField
+  
+
+
+  
+True
+False
+.uno:TimeField
+  
+
+
+  
+True
+False
+.uno:NumericField
+  
+
+
+  
+True
+False
+.uno:CurrencyField
+  
+
+
+  
+True
+False
+.uno:PatternField
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:ImageControl
+  
+
+
+  
+True
+False
+.uno:FileControl
+  
+
+
+  
+True
+False
+  
+
+
+  
+True
+False
+.uno:Grid
+  
+
+
+  
+True
+False
+.uno:NavigationBar
+  
+
+  
   
 True
 False
@@ -10138,7 +10298,6 @@
   
   
 7
-False
   
 
 
@@ -11211,7 +11370,7 @@
 
   
   
-9
+8
   
 
 
@@ -11223,32 +11382,33 @@
 
   
   
-  
+  
+  
 
   
   
-9
+8
 False
   
 
 
-  
+  
 True
 False
 
-  
+  
 True
 False
 center
 True
 
-  
+  
 True
 False
 center
 True
 
-  
+  
 True
 True
 center
@@ -11258,7 +11418,7 @@
 False
 3
 
-  
+  
 True
 False
 center
@@ -11266,25 +11426,25 @@
 .uno:AssignMacro
   
 

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

[Libreoffice Gerrit user]

 sw/inc/strings.hrc  |1 +
 sw/source/uibase/app/apphdl.cxx |   13 +
 2 files changed, 14 insertions(+)

New commits:
commit 6dc36d343aeacb3d1e14ec0c847937d63f4e68a7
Author: Mike Kaganski 
AuthorDate: Tue Dec 18 08:14:01 2018 +0300
Commit: Mike Kaganski 
CommitDate: Tue Dec 18 08:02:34 2018 +0100

tdf#122164: inform user that Base is needed for MailMerge

Change-Id: Id62a2e4cd2d8d8b6aa79e43448513a9791a55d91
Reviewed-on: https://gerrit.libreoffice.org/65302
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index d224701501b0..d2a2ad8fed9a 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -1302,6 +1302,7 @@
 
 #define STR_QUERY_SPECIAL_FORCED
NC_("STR_QUERY_SPECIAL_FORCED", "Check special regions is deactivated. Check 
anyway?")
 #define STR_NO_MERGE_ENTRY  NC_("STR_NO_MERGE_ENTRY", 
"Could not merge documents.")
+#define STR_NO_BASE_FOR_MERGE   NC_("STR_NO_BASE_FOR_MERGE", 
"%PRODUCTNAME Base component is absent, and it is required to use Mail Merge.")
 #define STR_ERR_SRCSTREAM   NC_("STR_ERR_SRCSTREAM", "The 
source cannot be loaded.")
 #define STR_ERR_NO_FAX  NC_("STR_ERR_NO_FAX", "No fax 
printer has been set under Tools/Options/%1/Print.")
 #define STR_WEBOPTIONS  NC_("STR_WEBOPTIONS", "HTML 
document")
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 5fea962e10b4..3c7616a3e4fa 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -60,10 +60,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -417,6 +419,17 @@ void SwMailMergeWizardExecutor::ExecuteMailMergeWizard( 
const SfxItemSet * pArgs
 SAL_INFO(
 "sw.core",
 "trying to install LibreOffice Base, caught " << e);
+auto xRestartManager
+= 
css::task::OfficeRestartManager::get(comphelper::getProcessComponentContext());
+if (!xRestartManager->isRestartRequested(false))
+{
+// Base is absent, and could not initiate its install - ask 
user to do that manually
+// Only show the dialog if restart is not initiated yet
+std::unique_ptr 
xWarnBox(Application::CreateMessageDialog(
+nullptr, VclMessageType::Info, VclButtonsType::Ok,
+SwResId(STR_NO_BASE_FOR_MERGE)));
+xWarnBox->run();
+}
 }
 return;
 }
___
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

[Libreoffice Gerrit user]

 sc/inc/matrixoperators.hxx  |8 
 sc/inc/scmatrix.hxx |2 +-
 sc/source/core/tool/interpr3.cxx|6 +++---
 sc/source/core/tool/matrixoperators.cxx |6 +++---
 sc/source/core/tool/scmatrix.cxx|   20 ++--
 5 files changed, 21 insertions(+), 21 deletions(-)

New commits:
commit 7a46f18d30285c7632eac70bedcb9f339c3aaa9c
Author: Noel Grandin 
AuthorDate: Thu Dec 13 12:15:33 2018 +0200
Commit: Noel Grandin 
CommitDate: Tue Dec 18 08:30:56 2018 +0100

no need to allocate sc::op::Op on the heap here

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

diff --git a/sc/inc/matrixoperators.hxx b/sc/inc/matrixoperators.hxx
index 25ecf63331f6..cadf5541b778 100644
--- a/sc/inc/matrixoperators.hxx
+++ b/sc/inc/matrixoperators.hxx
@@ -25,7 +25,7 @@ struct Op_
 mInitVal(InitVal), maOp(aOp)
 {
 }
-void operator()(double& rAccum, double fVal)
+void operator()(double& rAccum, double fVal) const
 {
 maOp(rAccum, fVal);
 }
@@ -36,19 +36,19 @@ using Op = Op_>;
 struct Sum
 {
 static const double InitVal;
-void operator()(double& rAccum, double fVal);
+void operator()(double& rAccum, double fVal) const;
 };
 
 struct SumSquare
 {
 static const double InitVal;
-void operator()(double& rAccum, double fVal);
+void operator()(double& rAccum, double fVal) const;
 };
 
 struct Product
 {
 static const double InitVal;
-void operator()(double& rAccum, double fVal);
+void operator()(double& rAccum, double fVal) const;
 };
 
 }
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index cb6f170cfcce..2538ac2d4c27 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -399,7 +399,7 @@ public:
 void DivOp(bool bFlag, double fVal, ScMatrix& rMat) ;
 void PowOp(bool bFlag, double fVal, ScMatrix& rMat) ;
 
-std::vector Collect(const 
std::vector>& aOp) ;
+std::vector Collect(const 
std::vector& aOp) ;
 
 void ExecuteOperation(const std::pair& rStartPos, const 
std::pair& rEndPos,
 DoubleOpFunction aDoubleFunc, BoolOpFunction aBoolFunc, 
StringOpFunction aStringFunc,
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx
index 2d7a8bafec5b..1015d8cfc78a 100644
--- a/sc/source/core/tool/interpr3.cxx
+++ b/sc/source/core/tool/interpr3.cxx
@@ -2745,9 +2745,9 @@ void ScInterpreter::ScFTest()
 double fSum2= 0.0;
 double fSumSqr2 = 0.0;
 
-std::vector> aOp;
-aOp.emplace_back(new sc::op::Op(0.0, [](double& rAccum, double 
fVal){rAccum += fVal;}));
-aOp.emplace_back(new sc::op::Op(0.0, [](double& rAccum, double 
fVal){rAccum += fVal * fVal;}));
+std::vector aOp;
+aOp.emplace_back(sc::op::Op(0.0, [](double& rAccum, double fVal){rAccum += 
fVal;}));
+aOp.emplace_back(sc::op::Op(0.0, [](double& rAccum, double fVal){rAccum += 
fVal * fVal;}));
 
 auto aVal1 = pMat1->Collect(aOp);
 fSum1 = aVal1[0].mfFirst + aVal1[0].mfRest;
diff --git a/sc/source/core/tool/matrixoperators.cxx 
b/sc/source/core/tool/matrixoperators.cxx
index d9b1c116f465..cc2d2d9bbf89 100644
--- a/sc/source/core/tool/matrixoperators.cxx
+++ b/sc/source/core/tool/matrixoperators.cxx
@@ -15,21 +15,21 @@ namespace sc {
 
 namespace op {
 
-void Sum::operator()(double& rAccum, double fVal)
+void Sum::operator()(double& rAccum, double fVal) const
 {
 rAccum += fVal;
 }
 
 const double Sum::InitVal = 0.0;
 
-void SumSquare::operator()(double& rAccum, double fVal)
+void SumSquare::operator()(double& rAccum, double fVal) const
 {
 rAccum += fVal * fVal;
 }
 
 const double SumSquare::InitVal = 0.0;
 
-void Product::operator()(double& rAccum, double fVal)
+void Product::operator()(double& rAccum, double fVal) const
 {
 rAccum *= fVal;
 }
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 59231e7fcb62..8b3c8ffd5407 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -330,7 +330,7 @@ public:
 const ScMatrix::EmptyOpFunction& aEmptyFunc) const;
 
 template
-std::vector ApplyCollectOperation(const 
std::vector>& aOp);
+std::vector ApplyCollectOperation(const 
std::vector& aOp);
 
 void MatConcat(SCSIZE nMaxCol, SCSIZE nMaxRow, const ScMatrixRef& xMat1, 
const ScMatrixRef& xMat2,
 SvNumberFormatter& rFormatter, svl::SharedStringPool& rPool);
@@ -1181,16 +1181,16 @@ public:
 template
 class WalkElementBlocksMultipleValues
 {
-const std::vector>* mpOp;
+const std::vector* mpOp;
 std::vector maRes;
 bool mbFirst:1;
 public:
-WalkElementBlocksMultipleValues(const std::vector>& 
aOp) :
+WalkElementBlocksMultipleValues(const std::vector& aOp) :
 mpOp(&aOp), mbFirst(true)
 {
 for (const auto& rpOp : *mpOp)
 {
-maRes.emplace_back(rpOp->mI

Re: Fw: [Libreoffice-commits] kde5: remove older kde/tde plugins, and references to that

[Stephan Bergmann]

On 17/12/2018 23:43, Thorsten Behrens wrote:

I've also changed jenkins config defaults to 'on' for kde5 (with some
fallout apparently for tinderboxes; seems baseline support was missing
on a few of them - apologies if you got spammed inadvertently).


FYI, gandalf appears to still have issues, see 
 and following 
builds all done on gandalf this morning.

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

[Libreoffice-commits] core.git: Branch 'libreoffice-6-2' - download.lst solenv/flatpak-manifest.in

[Libreoffice Gerrit user]

 download.lst   |8 
 solenv/flatpak-manifest.in |   12 ++--
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 56cbc21e0a5837726f4a68c311b68433ad5064d1
Author: heiko tietze 
AuthorDate: Mon Dec 17 16:13:54 2018 +0100
Commit: Heiko Tietze 
CommitDate: Tue Dec 18 08:57:46 2018 +0100

Resolves: tdf#121676 - Update Liberation fonts from new source

Liberation updated from 2.00.1 to 2.00.4 and
Liberation-Narrow from 1.07.4 to 1.07.6

Change-Id: I295f82d5b8230cdf8b3347491dd71c8689636d94
Reviewed-on: https://gerrit.libreoffice.org/65273
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 
(cherry picked from commit 9eacb42ca081302faa62ac0f8c0af0adfa0e920b)
Reviewed-on: https://gerrit.libreoffice.org/65297

diff --git a/download.lst b/download.lst
index be331f8264fc..1d9603368c5e 100644
--- a/download.lst
+++ b/download.lst
@@ -56,10 +56,10 @@ export FONT_DEJAVU_SHA256SUM := 
7576310b219e04159d35ff61dd4a4ec4cdba4f35c00e002a
 export FONT_DEJAVU_TARBALL := 
33e1e61fab06a547851ed308b4ffef42-dejavu-fonts-ttf-2.37.zip
 export FONT_GENTIUM_SHA256SUM := 
2f1a2c5491d7305dffd3520c6375d2f3e14931ee35c6d8ae1e8f098bf1a7b3cc
 export FONT_GENTIUM_TARBALL := 
1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip
-export FONT_LIBERATION_NARROW_SHA256SUM := 
61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c
-export FONT_LIBERATION_NARROW_TARBALL := 
134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz
-export FONT_LIBERATION_SHA256SUM := 
7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504
-export FONT_LIBERATION_TARBALL := 
5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz
+export FONT_LIBERATION_NARROW_SHA256SUM := 
8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3
+export FONT_LIBERATION_NARROW_TARBALL := 
liberation-narrow-fonts-ttf-1.07.6.tar.gz
+export FONT_LIBERATION_SHA256SUM := 
c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45
+export FONT_LIBERATION_TARBALL := liberation-fonts-ttf-2.00.4.tar.gz
 export FONT_LINLIBERTINEG_SHA256SUM := 
54adcb2bc8cac0927a647fbd9362f45eff48130ce6e2379dc3867643019e08c5
 export FONT_LINLIBERTINEG_TARBALL := 
e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip
 export FONT_SOURCECODE_SHA256SUM := 
09466dce8765f189acd8358c60c6736dcd95f042dee0b644bdcf65b6ae2f
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 3d0b87afb335..6f654c998263 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -92,16 +92,16 @@
 "dest-filename": 
"external/tarballs/1725634df4bb3dcb1b2c91a6175f8789-GentiumBasic_1102.zip"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz";,
-"sha256": 
"61a7e2b6742a43c73e8762cdfeaf6dfcf9abdd2cfa0b099a9854d69bc4cfee5c",
+"url": 
"https://dev-www.libreoffice.org/src/liberation-narrow-fonts-ttf-1.07.6.tar.gz";,
+"sha256": 
"8879d89b5ff7b506c9fc28efc31a5c0b954bbe9333e66e5283d27d20a8519ea3",
 "type": "file",
-"dest-filename": 
"external/tarballs/134d8262145fc793c6af494dcace3e71-liberation-fonts-ttf-1.07.4.tar.gz"
+"dest-filename": 
"external/tarballs/liberation-narrow-fonts-ttf-1.07.6.tar.gz"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz";,
-"sha256": 
"7890278a6cd17873c57d9cd785c2d230d9abdea837e96516019c5885dd271504",
+"url": 
"https://dev-www.libreoffice.org/src/liberation-fonts-ttf-2.00.4.tar.gz";,
+"sha256": 
"c40e95fc5e0ecb73d4be565ae2afc1114e2bc7dc5253e00ee92d8fd6cc4adf45",
 "type": "file",
-"dest-filename": 
"external/tarballs/5c781723a0d9ed6188960defba8e91cf-liberation-fonts-ttf-2.00.1.tar.gz"
+"dest-filename": 
"external/tarballs/liberation-fonts-ttf-2.00.4.tar.gz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits