date:20150618

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

2015-06-18 Thread Miklos Vajna

 libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx |   21 
 1 file changed, 21 insertions(+)

New commits:
commit 437210d58f32177ef1829d704f7f4d2f1bbfbfdd
Author: Miklos Vajna 
Date:   Thu Jun 18 09:18:18 2015 +0200

gtktiledviewer: add copy button

Change-Id: I56ed5047da118eac01d7dea150597133215278e2

diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx 
b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
index 8b00679..9496ba5 100644
--- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx
@@ -125,6 +125,19 @@ static void toggleFindbar(GtkWidget* /*pButton*/, gpointer 
/*pItem*/)
 }
 }
 
+/// Handler for the copy button: write clipboard.
+static void doCopy(GtkWidget* /*pButton*/, gpointer /*pItem*/)
+{
+LOKDocView* pLOKDocView = LOK_DOC_VIEW(pDocView);
+LibreOfficeKitDocument* pDocument = lok_doc_view_get_document(pLOKDocView);
+char* pSelection = pDocument->pClass->getTextSelection(pDocument, 
"text/plain;charset=utf-8");
+
+GtkClipboard* pClipboard = 
gtk_clipboard_get_for_display(gtk_widget_get_display(pDocView), 
GDK_SELECTION_CLIPBOARD);
+gtk_clipboard_set_text(pClipboard, pSelection, -1);
+
+free(pSelection);
+}
+
 /// Get the visible area of the scrolled window
 static void getVisibleAreaTwips(GdkRectangle* pArea)
 {
@@ -394,6 +407,14 @@ int main( int argc, char* argv[] )
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), pPartModeSelectorToolItem, -1 );
 
 gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), 
-1);
+
+// Cut, copy & paste.
+GtkToolItem* pCopyButton = gtk_tool_button_new( NULL, NULL);
+gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(pCopyButton), 
"edit-copy-symbolic");
+gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pCopyButton, -1);
+g_signal_connect(G_OBJECT(pCopyButton), "clicked", G_CALLBACK(doCopy), 
NULL);
+gtk_toolbar_insert( GTK_TOOLBAR(pToolbar), gtk_separator_tool_item_new(), 
-1);
+
 pEnableEditing = gtk_toggle_tool_button_new();
 gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON (pEnableEditing), 
"insert-text-symbolic");
 gtk_toolbar_insert(GTK_TOOLBAR(pToolbar), pEnableEditing, -1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[GSoC] Rework the Expert Configuration dialog Week 3

2015-06-18 Thread Mihály Palenik

Hello!

Last week I finished tree view in this dialog. It works fine under linux
with accessibility. Here is the commit :
http://cgit.freedesktop.org/libreoffice/core/commit/?id=db35b73037483cd22cd7d4ac93fe40f23fbe3967

Certainly I will review whether all entries are appeared correctly.

Best regards,

Mihály Palenik
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: [Libreoffice-commits] core.git: Changes to 'private/jmux/multi-index-5-1'

2015-06-18 Thread Miklos Vajna

Hi Jan-Marek,

On Wed, Jun 17, 2015 at 06:17:35PM -0700, Jan-Marek Glogowski 
 wrote:
> New branch 'private/jmux/multi-index-5-1' available with the following 
> commits:
> commit e7a0b9e3d2699a7dd5aa1970985422c6b727a661
> Author: Jan-Marek Glogowski 
> Date:   Fri Apr 10 21:32:36 2015 +0200
> 
> Convert SwFrameFormat to boost::multi_index

Oh, this sounds nice! :-)

One nitpick: please avoid namespace aliases or using statements in
headers[1], currently ~no code does that (com::sun::star -> css is the
only exception, I think), and it helps readability: that way you can
always go to the start of the file and see all of them.

Just mentioning as I guess this affects each class where you add
multi-index support, so it saves time if you get this right from the
very beginning.

Thanks,

Miklos

[1] https://wiki.openoffice.org/wiki/Writer/Code_Conventions says
"header files, where using-statements are not permitted", AFAIK that's
still true for LO code, too

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

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

2015-06-18 Thread Stephan Bergmann

 include/vcl/btndlg.hxx   |2 +-
 vcl/source/window/btndlg.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit e5a8d8c065c50316fbdd84424794aecaa634bdb5
Author: Stephan Bergmann 
Date:   Thu Jun 18 09:54:01 2015 +0200

Don't immediately release temporary VclPtr returned from Create

...the only reason this didn't cause any problems is that the VclPtr 
returned
from Create already had an mnRefCnt > 1, because of activity in the 
PushButton
ctor.

Change-Id: I1066ff0b507b8a1ebff079f7b914235a7396368d

diff --git a/include/vcl/btndlg.hxx b/include/vcl/btndlg.hxx
index 156a50d..6ae2824 100644
--- a/include/vcl/btndlg.hxx
+++ b/include/vcl/btndlg.hxx
@@ -96,7 +96,7 @@ private:
 Link<>  maClickHdl;
 
 SAL_DLLPRIVATE void ImplInitButtonDialogData();
-SAL_DLLPRIVATE PushButton*  ImplCreatePushButton( ButtonDialogFlags 
nBtnFlags );
+SAL_DLLPRIVATE VclPtr ImplCreatePushButton( ButtonDialogFlags 
nBtnFlags );
 SAL_DLLPRIVATE ImplBtnDlgItem*  ImplGetItem( sal_uInt16 nId ) const;
 DECL_DLLPRIVATE_LINK(   ImplClickHdl, PushButton* pBtn );
 SAL_DLLPRIVATE void ImplPosControls();
diff --git a/vcl/source/window/btndlg.cxx b/vcl/source/window/btndlg.cxx
index 102f5ce..6b141fe 100644
--- a/vcl/source/window/btndlg.cxx
+++ b/vcl/source/window/btndlg.cxx
@@ -73,9 +73,9 @@ void ButtonDialog::dispose()
 Dialog::dispose();
 }
 
-PushButton* ButtonDialog::ImplCreatePushButton( ButtonDialogFlags nBtnFlags )
+VclPtr ButtonDialog::ImplCreatePushButton( ButtonDialogFlags 
nBtnFlags )
 {
-PushButton* pBtn;
+VclPtr pBtn;
 WinBits nStyle = 0;
 
 if ( nBtnFlags & ButtonDialogFlags::Default )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Jan Holesovsky

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

New commits:
commit f03f2489edfb02150a147e071a81b46c5c27c606
Author: Jan Holesovsky 
Date:   Thu Jun 18 09:59:23 2015 +0200

rendercontext: Fix rendering of double-buffered menubar.

Change-Id: Iea74564ef0ae2188ae29f106c4416df1fe827b42

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 34c485d..d2b5716 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1822,7 +1822,9 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
 aTopLeft.Y() += ImplGetSVData()->maNWFData.mnMenuFormatBorderY;
 }
 
-Size aOutSz = rRenderContext.GetOutputSizePixel();
+// for the computations, use size of the underlying window, not of 
RenderContext
+Size aOutSz = pWindow->GetOutputSizePixel();
+
 size_t nCount = pItemList->size();
 if (bLayout)
 mpLayoutData->m_aVisibleItemBoundRects.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

2015-06-18 Thread Jan Holesovsky

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

New commits:
commit c10f209a3d1ff541c38f3182f2a5c77a835637df
Author: Jan Holesovsky 
Date:   Thu Jun 18 09:59:23 2015 +0200

rendercontext: Fix rendering of double-buffered menubar.

Change-Id: Iea74564ef0ae2188ae29f106c4416df1fe827b42

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index 34c485d..d2b5716 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -1822,7 +1822,9 @@ void Menu::ImplPaint(vcl::RenderContext& rRenderContext,
 aTopLeft.Y() += ImplGetSVData()->maNWFData.mnMenuFormatBorderY;
 }
 
-Size aOutSz = rRenderContext.GetOutputSizePixel();
+// for the computations, use size of the underlying window, not of 
RenderContext
+Size aOutSz = pWindow->GetOutputSizePixel();
+
 size_t nCount = pItemList->size();
 if (bLayout)
 mpLayoutData->m_aVisibleItemBoundRects.clear();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Katarina Behrens

 sd/qa/unit/data/odp/transparent_background.odp |binary
 sd/qa/unit/export-tests.cxx|   19 +++
 2 files changed, 19 insertions(+)

New commits:
commit f3b51162b68acc7b22c2c5b41a8b29038153afab
Author: Katarina Behrens 
Date:   Wed Jun 17 21:06:37 2015 +0200

Bugfix test for tdf#88295

Change-Id: Ic9c4330e9b14e43448302132b6c01a8d93001d2f

diff --git a/sd/qa/unit/data/odp/transparent_background.odp 
b/sd/qa/unit/data/odp/transparent_background.odp
new file mode 100644
index 000..ce599db
Binary files /dev/null and b/sd/qa/unit/data/odp/transparent_background.odp 
differ
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index f82b523..4149a30 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -121,6 +121,7 @@ public:
 void testBulletColor();
 void testBulletMarginAndIndentation();
 void testParaMarginAndindentation();
+void testTransparentBackground();
 
 void testFdo90607();
 #if !defined WNT
@@ -155,6 +156,7 @@ public:
 CPPUNIT_TEST(testBulletColor);
 CPPUNIT_TEST(testBulletMarginAndIndentation);
 CPPUNIT_TEST(testParaMarginAndindentation);
+CPPUNIT_TEST(testTransparentBackground);
 
 #if !defined WNT
 CPPUNIT_TEST(testBnc822341);
@@ -333,6 +335,23 @@ void SdExportTest::testN828390_5()
 xDocShRef->DoClose();
 }
 
+void SdExportTest::testTransparentBackground()
+{
+   ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/odp/transparent_background.odp"), ODP);
+xDocShRef = saveAndReload( xDocShRef, ODP );
+
+SdDrawDocument *pDoc = xDocShRef->GetDoc();
+CPPUNIT_ASSERT_MESSAGE( "no document", pDoc != NULL );
+const SdrPage *pPage = pDoc->GetPage (1);
+CPPUNIT_ASSERT_MESSAGE( "no page", pPage != NULL );
+
+const SdrTextObj *pObj1 = dynamic_cast( pPage->GetObj( 0 ) );
+checkFontAttributes( pObj1, 
Color(COL_TRANSPARENT) );
+
+const SdrTextObj *pObj2 = dynamic_cast( pPage->GetObj( 1 ) );
+checkFontAttributes( pObj2, 
Color(COL_YELLOW));
+}
+
 void SdExportTest::testMediaEmbedding()
 {
 ::sd::DrawDocShellRef xDocShRef = 
loadURL(getURLFromSrc("/sd/qa/unit/data/media_embedding.odp"), ODP);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_opengl.h.in configure.ac vcl/source

2015-06-18 Thread David Tardon

 config_host/config_opengl.h.in  |   10 ++
 configure.ac|4 
 vcl/source/opengl/OpenGLContext.cxx |   10 +-
 3 files changed, 23 insertions(+), 1 deletion(-)

New commits:
commit 2703f4d84323c718f6fbefc8699457ab2a7aacbf
Author: David Tardon 
Date:   Thu Jun 18 10:15:28 2015 +0200

continue to support glew 1.10

Change-Id: I951c04e7d0039f1e38e3bcb2ea7e0f7c33293b9b

diff --git a/config_host/config_opengl.h.in b/config_host/config_opengl.h.in
new file mode 100644
index 000..b2c6358
--- /dev/null
+++ b/config_host/config_opengl.h.in
@@ -0,0 +1,10 @@
+/*
+Settings for OpenGL
+*/
+
+#ifndef CONFIG_OPENGL_H
+#define CONFIG_OPENGL_H
+
+#undef HAVE_GLEW_1_12
+
+#endif
diff --git a/configure.ac b/configure.ac
index 4ec301c..6a30d8a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8699,6 +8699,9 @@ dnl 
===
 dnl Check for system glew
 dnl ===
 libo_CHECK_SYSTEM_MODULE([glew], [GLEW], [glew >= 1.10.0])
+AS_IF([test "$with_system_glew" = "yes"],
+[PKG_CHECK_EXISTS([glew >= 1.12.0], [AC_DEFINE([HAVE_GLEW_1_12])])],
+[AC_DEFINE([HAVE_GLEW_1_12])])
 
 dnl ===
 dnl Check for system vigra
@@ -13075,6 +13078,7 @@ AC_CONFIG_HEADERS([config_host/config_orcus.h])
 AC_CONFIG_HEADERS([config_host/config_kde4.h])
 AC_CONFIG_HEADERS([config_host/config_mingw.h])
 AC_CONFIG_HEADERS([config_host/config_oox.h])
+AC_CONFIG_HEADERS([config_host/config_opengl.h])
 AC_CONFIG_HEADERS([config_host/config_options.h])
 AC_CONFIG_HEADERS([config_host/config_test.h])
 AC_CONFIG_HEADERS([config_host/config_telepathy.h])
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 31dc1c0..326250c 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -7,6 +7,8 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -437,7 +439,13 @@ extern "C" void
 APIENTRY
 #endif
 debug_callback(GLenum source, GLenum type, GLuint id,
-GLenum severity, GLsizei , const GLchar* message, const GLvoid* )
+GLenum severity, GLsizei , const GLchar* message,
+#if defined HAVE_GLEW_1_12
+const GLvoid*
+#else
+GLvoid*
+#endif
+)
 {
 // ignore Nvidia's : "Program/shader state performance warning: Fragment 
Shader is going to be recompiled because the shader key based on GL state 
mismatches."
 // the GLSL compiler is a bit too aggressive in optimizing the state based 
on the current OpenGL state
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Henry Castro

 sc/qa/unit/ucalc.hxx |2 
 sc/qa/unit/ucalc_formula.cxx |  116 +++
 2 files changed, 118 insertions(+)

New commits:
commit f2f9c1e09c09eaf03f2625b7d0b9720d0c62b479
Author: Henry Castro 
Date:   Fri Apr 17 08:15:17 2015 -0400

unit test for INDIRECT reference handling, tdf#83365

Change-Id: Iddacb53071bb442845d702832f1728114ca018fa

diff --git a/sc/qa/unit/ucalc.hxx b/sc/qa/unit/ucalc.hxx
index 0c3e57a..d174829 100644
--- a/sc/qa/unit/ucalc.hxx
+++ b/sc/qa/unit/ucalc.hxx
@@ -171,6 +171,7 @@ public:
 void testFuncCELL();
 void testFuncDATEDIF();
 void testFuncINDIRECT();
+void testFuncINDIRECT2();
 void testFuncIF();
 void testFuncCHOOSE();
 void testFuncIFERROR();
@@ -496,6 +497,7 @@ public:
 CPPUNIT_TEST(testFuncCELL);
 CPPUNIT_TEST(testFuncDATEDIF);
 CPPUNIT_TEST(testFuncINDIRECT);
+CPPUNIT_TEST(testFuncINDIRECT2);
 CPPUNIT_TEST(testFuncIF);
 CPPUNIT_TEST(testFuncCHOOSE);
 CPPUNIT_TEST(testFuncIFERROR);
diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index ed49635..225741e 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -4275,6 +4275,122 @@ void Test::testFuncINDIRECT()
 m_pDoc->DeleteTab(0);
 }
 
+// --
+// Test case for Bug 83365 - Other: Access across spreadsheet returns Err:504
+//
+void Test::testFuncINDIRECT2()
+{
+CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet",
+m_pDoc->InsertTab (0, OUString("foo")));
+CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet",
+m_pDoc->InsertTab (1, OUString("bar")));
+CPPUNIT_ASSERT_MESSAGE ("failed to insert sheet",
+m_pDoc->InsertTab (2, OUString("baz")));
+
+ScAddress aStart;
+ScAddress aEnd;
+ScAddress aRef;
+
+// Let be triplet ( Col, Row, Tab ) as Cell Address
+// Indirect reference triplet ( absolute, relative, relative)
+sal_uInt16 nRes = aRef.Parse("foo.$A1", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetValue(aStart, 10.0);
+
+// Indirect reference triplet ( absolute, absolute, relative)
+nRes = aRef.Parse("foo.$A$2", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetValue(aStart, 10.0);
+
+// Indirect reference triplet ( absolute, absolute, absolute)
+nRes = aRef.Parse("$foo.$A$3", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetValue(aStart, 10.0);
+
+// Fill range bar.$A1:bar.$A10 with 1s
+nRes = aStart.Parse("bar.$A1", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+nRes = aEnd.Parse("bar.$A10", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+
+for (SCROW i = aStart.Row(); i <= aEnd.Row(); ++i)
+m_pDoc->SetValue(ScAddress(aStart.Col(), i, aStart.Tab()), 1.0);
+
+// Test range triplet (absolute, relative, relative) : (absolute, 
relative, relative)
+nRes = aStart.Parse("baz.$A1", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$1),1)");
+
+// Test range triplet (absolute, relative, relative) : (absolute, 
absolute, relative)
+nRes = aStart.Parse("baz.$A2", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$2),1)");
+
+// Test range triplet (absolute, relative, relative) : (absolute, 
absolute, absolute)
+nRes = aStart.Parse("baz.$A3", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$3),1)");
+
+// Test range triplet (absolute, absolute, relative) : (absolute, 
relative, relative)
+nRes = aStart.Parse("baz.$A4", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetString(aStart, 
"=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
+
+// Test range triplet (absolute, absolute, relative) : (absolute, 
absolute, relative)
+nRes = aStart.Parse("baz.$A5", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetString(aStart, 
"=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$2),1)");
+
+// Test range triplet (absolute, absolute, relative) : (absolute, 
absolute, relative)
+nRes = aStart.Parse("baz.$A6", m_pDoc);
+CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
+m_pDoc->SetString(aStart, 
"=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$3),1)");
+
+// Test range triplet (absolute, absolute, absolute) : (absolute, 
relative, relative)
+nRes = aStart.Parse("baz.$A7", m_pDoc)

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

2015-06-18 Thread Jan Holesovsky

 vcl/source/control/fixed.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit d0b03ab8c5e33b3b4d8127650e24aa550b13fa9f
Author: Jan Holesovsky 
Date:   Thu Jun 18 10:25:31 2015 +0200

rendercontext: Fix rendering of double-buffered fixed line.

Change-Id: I809beb7187530cc30aca5dce8b2d4fb244554c55

diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 92ff28c..57741fb 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -515,7 +515,10 @@ const Color& FixedLine::GetCanonicalTextColor( const 
StyleSettings& _rStyle ) co
 
 void FixedLine::ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout)
 {
-Size aOutSize = rRenderContext.GetOutputSizePixel();
+// we need to measure according to the window, not according to the
+// RenderContext we paint to
+Size aOutSize = GetOutputSizePixel();
+
 OUString aText = GetText();
 WinBits nWinStyle = GetStyle();
 MetricVector* pVector = bLayout ? 
&mpControlData->mpLayoutData->m_aUnicodeBoundRects : NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Jan Holesovsky

 vcl/source/control/fixed.cxx |5 -
 1 file changed, 4 insertions(+), 1 deletion(-)

New commits:
commit cbe149d66de3050ff3005a5e0b9827f310e5866d
Author: Jan Holesovsky 
Date:   Thu Jun 18 10:25:31 2015 +0200

rendercontext: Fix rendering of double-buffered fixed line.

Change-Id: I809beb7187530cc30aca5dce8b2d4fb244554c55

diff --git a/vcl/source/control/fixed.cxx b/vcl/source/control/fixed.cxx
index 214db26..303b165 100644
--- a/vcl/source/control/fixed.cxx
+++ b/vcl/source/control/fixed.cxx
@@ -515,7 +515,10 @@ const Color& FixedLine::GetCanonicalTextColor( const 
StyleSettings& _rStyle ) co
 
 void FixedLine::ImplDraw(vcl::RenderContext& rRenderContext, bool bLayout)
 {
-Size aOutSize = rRenderContext.GetOutputSizePixel();
+// we need to measure according to the window, not according to the
+// RenderContext we paint to
+Size aOutSize = GetOutputSizePixel();
+
 OUString aText = GetText();
 WinBits nWinStyle = GetStyle();
 MetricVector* pVector = bLayout ? 
&mpControlData->mpLayoutData->m_aUnicodeBoundRects : NULL;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [Libreoffice-commits] core.git: Changes to 'private/jmux/multi-index-5-1'

2015-06-18 Thread Stephan Bergmann


On 06/18/2015 09:32 AM, Miklos Vajna wrote:

One nitpick: please avoid namespace aliases or using statements in
headers[1], currently ~no code does that (com::sun::star -> css is the
only exception, I think), and it helps readability: that way you can
always go to the start of the file and see all of them.

Just mentioning as I guess this affects each class where you add
multi-index support, so it saves time if you get this right from the
very beginning.

[1] https://wiki.openoffice.org/wiki/Writer/Code_Conventions says
"header files, where using-statements are not permitted", AFAIK that's
still true for LO code, too


Beware, though, the differences between

(1) namespace aliases,

  namespace foo = bar::baz;

(2) using declarations,

  using foo::bar;

(3) using directives,

  using namespace foo::bar;

Technically, only (3) is generally problematic in include files (esp. in 
global scope), as it pollutes the respective scope with a set of names 
that may change over time, for all compilation units including that file.


(1) and (2) introduce single names into a scope; whether to allow them 
in include files is more a matter of taste.


(There is no "using-statements" in C++, whatever 
 wants to talk 
about.)

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

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

2015-06-18 Thread Michael Meeks

 vcl/source/window/toolbox.cxx |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

New commits:
commit 0aa10c0b3d5794cd5b701b57de2387eee12076b6
Author: Michael Meeks 
Date:   Wed Jun 17 15:12:30 2015 +0200

tdf#92088 - don't invalidate disposed toolbar items.

Change-Id: Ie90906f1ed8dc205850df3a48688f66b7a72a4f4
Reviewed-on: https://gerrit.libreoffice.org/16343
Tested-by: Jenkins 
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/vcl/source/window/toolbox.cxx b/vcl/source/window/toolbox.cxx
index 33f3276..c003b9a 100644
--- a/vcl/source/window/toolbox.cxx
+++ b/vcl/source/window/toolbox.cxx
@@ -5609,10 +5609,12 @@ void ToolBox::ImplShowFocus()
 if( mnHighItemId && HasFocus() )
 {
 ImplToolItem* pItem = ImplGetItem( mnHighItemId );
-if( pItem->mpWindow )
+if( pItem->mpWindow && !pItem->mpWindow->IsDisposed() )
 {
-vcl::Window *pWin = 
pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow ? 
pItem->mpWindow->ImplGetWindowImpl()->mpBorderWindow : pItem->mpWindow;
-pWin->ImplGetWindowImpl()->mbDrawSelectionBackground = true;
+WindowImpl *pItemImpl = pItem->mpWindow->ImplGetWindowImpl();
+vcl::Window *pWin = pItemImpl->mpBorderWindow ?
+pItemImpl->mpBorderWindow : pItem->mpWindow;
+pItemImpl->mbDrawSelectionBackground = true;
 pWin->Invalidate();
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - include/sfx2 sfx2/source

2015-06-18 Thread László Németh

 include/sfx2/thumbnailview.hxx   |6 --
 sfx2/source/control/templateabstractview.cxx |5 +
 sfx2/source/control/thumbnailview.cxx|   23 ---
 3 files changed, 13 insertions(+), 21 deletions(-)

New commits:
commit e306e206bb9a9754e2b04569dc41badd8e46471a
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 18 00:44:45 2015 +0200

fix start center rendering

Change-Id: Ib32b299806851fd2df1fbe8a824c1fe49a4efd99
Reviewed-on: https://gerrit.libreoffice.org/16350
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/include/sfx2/thumbnailview.hxx b/include/sfx2/thumbnailview.hxx
index 04c251c..b7375dd 100644
--- a/include/sfx2/thumbnailview.hxx
+++ b/include/sfx2/thumbnailview.hxx
@@ -261,10 +261,6 @@ protected:
 
 virtual void Paint(vcl::RenderContext& rRenderContext, const Rectangle& 
rRect) SAL_OVERRIDE;
 
-virtual void PrePaint(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
-
-virtual void PostPaint(vcl::RenderContext& rRenderContext) SAL_OVERRIDE;
-
 virtual void GetFocus() SAL_OVERRIDE;
 
 virtual void LoseFocus() SAL_OVERRIDE;
@@ -339,8 +335,6 @@ protected:
 Link<> maItemStateHdl;
 ThumbnailItemAttributes* mpItemAttrs;
 
-std::unique_ptr mpProcessor;
-
 boost::function maFilterFunc;
 };
 
diff --git a/sfx2/source/control/templateabstractview.cxx 
b/sfx2/source/control/templateabstractview.cxx
index fdf246a..dbd2379 100644
--- a/sfx2/source/control/templateabstractview.cxx
+++ b/sfx2/source/control/templateabstractview.cxx
@@ -20,6 +20,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -313,6 +314,10 @@ void TemplateAbstractView::Paint(vcl::RenderContext& 
rRenderContext, const Recta
 new 
PolyPolygonColorPrimitive2D(B2DPolyPolygon(Polygon(aRect).getB2DPolygon()),
 BColor(1.0, 1.0, 1.0)));
 
+const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
+std::unique_ptr mpProcessor(
+
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext,
 aNewViewInfos));
+
 mpProcessor->process(aSeq);
 }
 
diff --git a/sfx2/source/control/thumbnailview.cxx 
b/sfx2/source/control/thumbnailview.cxx
index 4bcdf56..08675c0 100644
--- a/sfx2/source/control/thumbnailview.cxx
+++ b/sfx2/source/control/thumbnailview.cxx
@@ -252,7 +252,7 @@ void ThumbnailView::DrawItem(ThumbnailViewItem *pItem)
 Rectangle aRect = pItem->getDrawArea();
 
 if ((aRect.GetHeight() > 0) && (aRect.GetWidth() > 0))
-pItem->Paint(mpProcessor.get(), mpItemAttrs);
+Invalidate(aRect);
 }
 }
 
@@ -855,7 +855,7 @@ void ThumbnailView::Command( const CommandEvent& rCEvt )
 Control::Command( rCEvt );
 }
 
-void ThumbnailView::Paint(vcl::RenderContext& /*rRenderContext*/, const 
Rectangle& rRect)
+void ThumbnailView::Paint(vcl::RenderContext& rRenderContext, const Rectangle& 
rRect)
 {
 size_t nItemCount = mItemList.size();
 
@@ -865,6 +865,11 @@ void ThumbnailView::Paint(vcl::RenderContext& 
/*rRenderContext*/, const Rectangl
 B2DPolyPolygon(Polygon(rRect, 5, 5).getB2DPolygon()),
 maColor.getBColor()));
 
+// Create the processor and process the primitives
+const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
+
+std::unique_ptr mpProcessor(
+
drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext,
 aNewViewInfos));
 mpProcessor->process(aSeq);
 
 // draw items
@@ -874,7 +879,7 @@ void ThumbnailView::Paint(vcl::RenderContext& 
/*rRenderContext*/, const Rectangl
 
 if (pItem->isVisible())
 {
-DrawItem(pItem);
+pItem->Paint(mpProcessor.get(), mpItemAttrs);
 }
 }
 
@@ -882,18 +887,6 @@ void ThumbnailView::Paint(vcl::RenderContext& 
/*rRenderContext*/, const Rectangl
 mpScrBar->Invalidate(rRect);
 }
 
-void ThumbnailView::PrePaint(vcl::RenderContext& rRenderContext)
-{
-// Create the processor and process the primitives
-const drawinglayer::geometry::ViewInformation2D aNewViewInfos;
-
mpProcessor.reset(drawinglayer::processor2d::createBaseProcessor2DFromOutputDevice(rRenderContext,
 aNewViewInfos));
-}
-
-void ThumbnailView::PostPaint(vcl::RenderContext& /*rRenderContext*/)
-{
-mpProcessor.reset();
-}
-
 void ThumbnailView::GetFocus()
 {
 // Select the first item if nothing selected
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: SDK Java Spreadsheet CalcAddIns example

2015-06-18 Thread Bjoern Michaelsen

Hi,

(copying in LibreOffice QA list, Sophie and Robinson)

On Thu, Jun 18, 2015 at 08:51:35AM +0200, Stephan Bergmann wrote:
> The sad truth about the SDK examples is that they get about zero
> love and attention.  I occasionally verify that they at least still
> all build on the various platforms, but virtually never look into
> them beyond a successful "make".  And it happens that they get
> broken by generic code clean up activity, as happened in this case.
> 
> So, if you or anybody else is willing to make a difference here and
> test those examples systematically, that would be highly welcome.

this might be something to take up for both bug hunting sessions and as a
MozTrap test scenario.

@Robinson, Sophie: Could you consider incorporating this into prerelease
testing workflows?

Best,

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

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

2015-06-18 Thread Tor Lillqvist

 include/vcl/outdev.hxx   |2 +-
 vcl/source/outdev/bitmap.cxx |   28 +++-
 vcl/source/outdev/curvedshapes.cxx   |   10 ++
 vcl/source/outdev/gradient.cxx   |   22 +++---
 vcl/source/outdev/hatch.cxx  |8 +---
 vcl/source/outdev/line.cxx   |5 +++--
 vcl/source/outdev/mask.cxx   |   10 ++
 vcl/source/outdev/nativecontrols.cxx |4 +++-
 vcl/source/outdev/pixel.cxx  |   11 +++
 vcl/source/outdev/polygon.cxx|   11 +++
 vcl/source/outdev/polyline.cxx   |   11 +++
 vcl/source/outdev/rect.cxx   |   11 +++
 vcl/source/outdev/text.cxx   |   11 ++-
 vcl/source/outdev/textline.cxx   |7 +--
 vcl/source/outdev/transparent.cxx|   13 -
 vcl/source/outdev/wallpaper.cxx  |   12 +++-
 16 files changed, 104 insertions(+), 72 deletions(-)

New commits:
commit dc3d621411a1de2ec6b61da07741bdf1c80ffc1f
Author: Tor Lillqvist 
Date:   Thu Jun 18 10:37:01 2015 +0300

Assertions should tell the line number where the problem is

Let's not hide the assert() in a function whose sole purpose is to
call assert().

Change-Id: I7a8a04aad560b0f22398daabf12d00bbe58e89f1

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index bbf0711..279cb1e 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -613,7 +613,7 @@ protected:
 
 SAL_DLLPRIVATE void drawOutDevDirect ( const OutputDevice* 
pSrcDev, SalTwoRect& rPosAry );
 
-SAL_DLLPRIVATE void assert_if_double_buffered_window() const;
+SAL_DLLPRIVATE bool is_double_buffered_window() const;
 
 private:
 
diff --git a/vcl/source/outdev/bitmap.cxx b/vcl/source/outdev/bitmap.cxx
index 2b77d35..faf705d 100644
--- a/vcl/source/outdev/bitmap.cxx
+++ b/vcl/source/outdev/bitmap.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include 
 #include 
 #include 
@@ -36,7 +38,7 @@
 
 void OutputDevice::DrawBitmap( const Point& rDestPt, const Bitmap& rBitmap )
 {
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
 
 const Size aSizePix( rBitmap.GetSizePixel() );
 DrawBitmap( rDestPt, PixelToLogic( aSizePix ), Point(), aSizePix, rBitmap, 
MetaActionType::BMP );
@@ -44,7 +46,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const 
Bitmap& rBitmap )
 
 void OutputDevice::DrawBitmap( const Point& rDestPt, const Size& rDestSize, 
const Bitmap& rBitmap )
 {
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
 
 DrawBitmap( rDestPt, rDestSize, Point(), rBitmap.GetSizePixel(), rBitmap, 
MetaActionType::BMPSCALE );
 }
@@ -54,7 +56,7 @@ void OutputDevice::DrawBitmap( const Point& rDestPt, const 
Size& rDestSize,
const Point& rSrcPtPixel, const Size& 
rSrcSizePixel,
const Bitmap& rBitmap, const MetaActionType 
nAction )
 {
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
 
 if( ImplIsRecordLayout() )
 return;
@@ -236,7 +238,7 @@ Bitmap OutputDevice::GetDownsampledBitmap( const Size& 
rDstSz,
 void OutputDevice::DrawBitmapEx( const Point& rDestPt,
  const BitmapEx& rBitmapEx )
 {
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
 
 if( ImplIsRecordLayout() )
 return;
@@ -255,7 +257,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt,
 void OutputDevice::DrawBitmapEx( const Point& rDestPt, const Size& rDestSize,
  const BitmapEx& rBitmapEx )
 {
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
 
 if( ImplIsRecordLayout() )
 return;
@@ -275,7 +277,7 @@ void OutputDevice::DrawBitmapEx( const Point& rDestPt, 
const Size& rDestSize,
  const Point& rSrcPtPixel, const Size& 
rSrcSizePixel,
  const BitmapEx& rBitmapEx, const 
MetaActionType nAction )
 {
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
 
 if( ImplIsRecordLayout() )
 return;
@@ -492,7 +494,7 @@ void OutputDevice::DrawDeviceBitmap( const Point& rDestPt, 
const Size& rDestSize
  const Point& rSrcPtPixel, const Size& 
rSrcSizePixel,
  BitmapEx& rBitmapEx )
 {
-assert_if_double_buffered_window();
+assert(!is_double_buffered_window());
 
 if (rBitmapEx.IsAlpha())
 {
@@ -622,7 +624,7 @@ void OutputDevice::DrawDeviceAlphaBitmap( const Bitmap& 
rBmp, const AlphaMask& r
 const Point& rDestPt, const Size& 
rDestSize,
 const Point& rSrcPtPixel, const Size& 
rSrcSizePixel )
 {
-

[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-4.4' - include/sfx2 officecfg/registry sfx2/Library_sfx.mk sfx2/source sfx2/uiconfig sfx2/UIConfig_sfx.mk

2015-06-18 Thread Tomaž Vajngerl

 include/sfx2/app.hxx   |3 
 include/sfx2/sfx.hrc   |3 
 include/sfx2/sfxbasecontroller.hxx |2 
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |6 
 sfx2/Library_sfx.mk|1 
 sfx2/UIConfig_sfx.mk   |1 
 sfx2/source/appl/appdata.cxx   |3 
 sfx2/source/appl/appmisc.cxx   |   10 
 sfx2/source/dialog/ApplicationStartupDialog.cxx|  116 
 sfx2/source/inc/ApplicationStartupDialog.hxx   |   39 +
 sfx2/source/inc/appdata.hxx|1 
 sfx2/source/view/sfxbasecontroller.cxx |   25 +
 sfx2/source/view/view.src  |   12 
 sfx2/uiconfig/ui/applicationstartupdialog.ui   |  323 +
 14 files changed, 544 insertions(+), 1 deletion(-)

New commits:
commit 7b66d8c0fa2134a9b68d0209941665d3de60a3a3
Author: TomaÅ¾ Vajngerl 
Date:   Wed Apr 16 12:11:46 2014 +0200

Introducing "application startup message"

Application startup message is an infobar which is shown on LO
startup. The message can be dismissed when entering into "Details"
dialog. The code to disable the dialog between restarts is also
included in this commit.

Change-Id: I7bbf8edc87b3eec8ac9010e2c4f60fb0f4f06894

diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index ee63e40..91415a5 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -214,6 +214,9 @@ public:
 boolIsDowning() const;
 voidResetLastDir();
 
+bool shouldShowApplicationStartupMessage();
+void hideApplicationStartupMessage();
+
 SAL_DLLPRIVATE SfxDispatcher* GetAppDispatcher_Impl();
 SAL_DLLPRIVATE SfxDispatcher* GetDispatcher_Impl();
 
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 6909d1c..9de02e7 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -155,6 +155,9 @@
 #define STR_READONLY_DOCUMENT   (RID_SFX_START+128)
 #define STR_PASSWD_MIN_LEN1 (RID_SFX_START+129)
 #define STR_MODULENOTINSTALLED  (RID_SFX_START+130)
+#define BT_APPLICATION_STARTUP  (RID_SFX_START+131)
+#define STR_APPLICATION_STARTUP_MESSAGE (RID_SFX_START+132)
+
 #define STR_ACCTITLE_PRODUCTIVITYTOOLS  (RID_SFX_START+157)
 
 #define SFX_THUMBNAIL_TEXT  (RID_SFX_START+158)
diff --git a/include/sfx2/sfxbasecontroller.hxx 
b/include/sfx2/sfxbasecontroller.hxx
index 0f77a44..c95c56e 100644
--- a/include/sfx2/sfxbasecontroller.hxx
+++ b/include/sfx2/sfxbasecontroller.hxx
@@ -191,7 +191,7 @@ private:
 SAL_DLLPRIVATE void ShowInfoBars( );
 
 DECL_LINK( CheckOutHandler, void * );
-
+DECL_LINK( ApplicationStartupHandler, void * );
 
 //  private variables
 
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs 
b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index b035168..0d288d9 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -6539,6 +6539,12 @@
   Uses cfg package Jobs instead of this component.
 
   
+  
+
+  Specifies whether to display startup message in LibreOffice 
Vanilla from Apple App Store
+
+true
+  
 
 
   
diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk
index ae85eaa..bcc0be5 100644
--- a/sfx2/Library_sfx.mk
+++ b/sfx2/Library_sfx.mk
@@ -158,6 +158,7 @@ $(eval $(call gb_Library_add_exception_objects,sfx,\
 sfx2/source/control/thumbnailviewacc \
 sfx2/source/control/thumbnailview \
 sfx2/source/control/unoctitm \
+sfx2/source/dialog/ApplicationStartupDialog \
 sfx2/source/dialog/alienwarn \
 sfx2/source/dialog/backingcomp \
 sfx2/source/dialog/backingwindow \
diff --git a/sfx2/UIConfig_sfx.mk b/sfx2/UIConfig_sfx.mk
index 9a555b9..8248fba 100644
--- a/sfx2/UIConfig_sfx.mk
+++ b/sfx2/UIConfig_sfx.mk
@@ -10,6 +10,7 @@
 $(eval $(call gb_UIConfig_UIConfig,sfx))
 
 $(eval $(call gb_UIConfig_add_uifiles,sfx,\
+   sfx2/uiconfig/ui/applicationstartupdialog \
sfx2/uiconfig/ui/alienwarndialog \
sfx2/uiconfig/ui/bookmarkdialog \
sfx2/uiconfig/ui/checkin \
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index c07c94c..3023883 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -47,6 +47,8 @@
 #include 
 #include 
 
+#include 
+
 using ::basic::BasicManagerRepository;
 using ::basic::BasicManagerCreationListener;
 using ::com::sun::star::uno::Reference;
@@ -125,6 +127,7 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
 , bInQuit( false )
 , bInvalidateOnUnlock( false )
 , bODFVersionWarningLater

Anytime builder VMs for devs (was: test infrastructure ideas appreciated ...)

2015-06-18 Thread Bjoern Michaelsen

Hi,

On Wed, Jun 03, 2015 at 02:33:23PM +0100, Michael Meeks wrote:
>   Constructive thoughts appreciated in reply here.

Budget for 2-5 of our Hackfest VMs[1] to always be on standby for someone
wanting to do a fast build, and provision for Cloph to be able to hand out
log-ins at a quick ping on IRC.

Rationale:
- Cloud instances are already faster than even the fastest, most expensive and
  newest notebook and unlike the latter they do not run out of battery if you
  start compiling or do a 'make check' e.g. on an airport.
- with cloud instances getting cheaper and notebook performance has been
  stagnating in recent years, this trend will be accelerating
- building on a fast remote machine will encourage the test-oriented mindset
  that we aim for

To extend on the last point: Yes, logging into a remote machine via VNC/X11 is
somewhat cumbersome. However, that is exactly encouraging breaking bad old
habits (ad-hoc manual testing with UI-interaction) in favour of good practices:
verifying your code and changes to work with tests that do not need manual
interaction on a UI. These tests ultimately will also allow to test the
code/changes with CI on all platforms.

So in short: Remote builders instances for devs encourage good practices, are
faster than what is possible locally right now and are -- if we set this up
right -- significantly more flexible and faster to get to a developer in need.

Best,

Bjoern
  
[1] https://wiki.documentfoundation.org/Hackfests/VMs
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-06-18 Thread Philippe Jung

 vcl/source/window/menu.cxx |   29 ++---
 1 file changed, 18 insertions(+), 11 deletions(-)

New commits:
commit a18c551725d7067c8bcf5b6a5ab71b2e78ba3bfa
Author: Philippe Jung 
Date:   Thu Jun 18 11:04:10 2015 +0200

Better position for Toolbar name

The text is badly centered. Replaced GetTextHeight by GetTextBoundRect
and updated computation of text bounds.

Change-Id: I1e177a15787c6eddf2878a7d0254f71f3501ec34
Reviewed-on: https://gerrit.libreoffice.org/16354
Reviewed-by: Philippe Jung 
Tested-by: Philippe Jung 

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index d2b5716..7acd139 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star;
 using namespace vcl;
 
 #define EXTRAITEMHEIGHT 4
-#define SPACE_AROUND_TITLE  2
+#define SPACE_AROUND_TITLE  4
 
 static bool ImplAccelDisabled()
 {
@@ -1631,16 +1631,21 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
 // Additional space for title
 nTitleHeight = 0;
 if (!IsMenuBar() && aTitleText.getLength() > 0) {
-// Vertically, one height of char + extra space for decoration
-nTitleHeight = nFontHeight + 4 * SPACE_AROUND_TITLE ;
-aSz.Height() += nTitleHeight;
-
-// Horizontally, compute text width with bold font
+// Set expected font
 pWin->Push(PushFlags::FONT);
 vcl::Font aFont = pWin->GetFont();
 aFont.SetWeight(WEIGHT_BOLD);
 pWin->SetFont(aFont);
-long nWidth = pWin->GetTextWidth( aTitleText ) + 4 * 
SPACE_AROUND_TITLE;
+
+// Compute text bounding box
+Rectangle aTextBoundRect;
+pWin->GetTextBoundRect(aTextBoundRect, aTitleText);
+
+// Vertically, one height of char + extra space for decoration
+nTitleHeight =  aTextBoundRect.GetSize().Height() + 4 * 
SPACE_AROUND_TITLE ;
+aSz.Height() += nTitleHeight;
+
+long nWidth = aTextBoundRect.GetSize().Width() + 4 * 
SPACE_AROUND_TITLE;
 pWin->Pop();
 if ( nWidth > nMaxWidth )
 nMaxWidth = nWidth;
@@ -1784,10 +1789,12 @@ void Menu::ImplPaintMenuTitle(vcl::RenderContext& 
rRenderContext, const Rectangl
 rRenderContext.DrawRect(aBgRect);
 
 // Draw the text centered
-Point aTextTopLeft(rRect.TopLeft());
-long textWidth = rRenderContext.GetTextWidth(aTitleText);
-aTextTopLeft.X() += (aBgRect.getWidth() - textWidth) / 2;
-aTextTopLeft.Y() += SPACE_AROUND_TITLE;
+Point aTextTopLeft(aBgRect.TopLeft());
+Rectangle aTextBoundRect;
+rRenderContext.GetTextBoundRect( aTextBoundRect, aTitleText );
+aTextTopLeft.X() += (aBgRect.getWidth() - 
aTextBoundRect.GetSize().Width()) / 2;
+aTextTopLeft.Y() += (aBgRect.GetHeight() - 
aTextBoundRect.GetSize().Height()) / 2
+- aTextBoundRect.TopLeft().Y();
 rRenderContext.DrawText(aTextTopLeft, aTitleText, 0, 
aTitleText.getLength());
 
 // Restore
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 12 commits - bin/lo-xlate-lang formula/source include/formula odk/examples sc/inc sc/source sd/source svx/uiconfig sw/qa toolkit/sour

2015-06-18 Thread Stephan Bergmann

 bin/lo-xlate-lang |2 +-
 formula/source/ui/dlg/FormulaHelper.cxx   |4 +---
 include/formula/IFunctionDescription.hxx  |5 +++--
 odk/examples/java/Spreadsheet/CalcAddins.java |2 +-
 sc/inc/funcdesc.hxx   |   10 ++
 sc/inc/progress.hxx   |4 
 sc/inc/token.hxx  |6 ++
 sc/source/core/data/column2.cxx   |   17 +
 sc/source/core/data/document.cxx  |   11 +++
 sc/source/core/data/formulacell.cxx   |8 ++--
 sc/source/core/data/funcdesc.cxx  |7 ---
 sc/source/core/tool/progress.cxx  |   13 -
 sc/source/core/tool/token.cxx |   21 +++--
 sd/source/ui/view/drtxtob1.cxx|   15 ++-
 svx/uiconfig/ui/sidebararea.ui|7 +++
 sw/qa/extras/ooxmlimport/data/tdf8255.docx|binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx  |9 +
 toolkit/source/awt/vclxtoolkit.cxx|   22 +-
 vcl/source/app/svapp.cxx  |3 ++-
 wizards/source/access2base/Recordset.xba  |   21 +
 writerfilter/source/dmapper/PropertyMap.cxx   |   12 +++-
 21 files changed, 140 insertions(+), 59 deletions(-)

New commits:
commit 66d9cd0e0d6ed341e20c3049ea309c0da1c6e966
Author: Stephan Bergmann 
Date:   Wed Jun 17 17:54:19 2015 +0200

Fix CalcAddins example

was broken with 70f56bc22fe952c75ec714e05e1bb5296491a36a "java: reduce 
scope,
make member classes private"

Change-Id: I84a3fafbfdddf6bb04ab7787d344bf50ffd22994
(cherry picked from commit 3b07120a72a5fd28836b226becbc100e24e84edf)

Conflicts:
odk/examples/java/Spreadsheet/CalcAddins.java

(cherry picked from commit df5c4b956b7634c9f5cf2fd84a7946c7d97cd408)

diff --git a/odk/examples/java/Spreadsheet/CalcAddins.java 
b/odk/examples/java/Spreadsheet/CalcAddins.java
index 555ddde..c46fc4a 100644
--- a/odk/examples/java/Spreadsheet/CalcAddins.java
+++ b/odk/examples/java/Spreadsheet/CalcAddins.java
@@ -60,7 +60,7 @@ public class CalcAddins {
  * of the service description. It implements the needed interfaces.
  * @implements XCalcAddins, XAddIn, XServiceName, XServiceInfo, XTypeProvider
  */
-static private class _CalcAddins extends WeakBase implements
+static public class _CalcAddins extends WeakBase implements
 XCalcAddins,
 XAddIn,
 XServiceName,
commit 533225f98576ad33efbf0ead638872821db2ed3a
Author: Eike Rathke 
Date:   Wed Jun 17 00:04:30 2015 +0200

Resolves: tdf#86305 clone upper left of matrix result if double token

Change-Id: I541577e0b99b0144a755e5755adc890c0ca8d204
(cherry picked from commit ffc1ffed11dc63a69fc2db04f12b3ea266b580fe)
Reviewed-on: https://gerrit.libreoffice.org/16326
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index da4f9e9..31a598a 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -337,6 +337,12 @@ public:
 /** Reset matrix and upper left, keep matrix
 formula dimension. */
 void ResetResult();
+
+private:
+
+/** xUpperLeft is modifiable through SetUpperLeftDouble(), so clone it
+whenever an svDouble token is assigned to. */
+void CloneUpperLeftIfNecessary();
 };
 
 class SC_DLLPUBLIC ScHybridCellToken : public formula::FormulaToken
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1e5c7d2..b4d1dd0 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -918,7 +918,10 @@ void ScMatrixCellResultToken::Assign( const 
ScMatrixCellResultToken & r )
 
 ScMatrixFormulaCellToken::ScMatrixFormulaCellToken(
 SCCOL nC, SCROW nR, const ScConstMatrixRef& pMat, formula::FormulaToken* 
pUL ) :
-ScMatrixCellResultToken(pMat, pUL), nRows(nR), nCols(nC) {}
+ScMatrixCellResultToken(pMat, pUL), nRows(nR), nCols(nC)
+{
+CloneUpperLeftIfNecessary();
+}
 
 ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( SCCOL nC, SCROW nR ) :
 ScMatrixCellResultToken(NULL, NULL), nRows(nR), nCols(nC) {}
@@ -926,10 +929,7 @@ ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( SCCOL 
nC, SCROW nR ) :
 ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( const 
ScMatrixFormulaCellToken& r ) :
 ScMatrixCellResultToken(r), nRows(r.nRows), nCols(r.nCols)
 {
-// xUpperLeft is modifiable through
-// SetUpperLeftDouble(), so clone it.
-if (xUpperLeft)
-xUpperLeft = xUpperLeft->Clone();
+CloneUpperLeftIfNecessary();
 }
 
 bool ScMatrixFormulaCellToken::operator==( const FormulaToken& r ) const
@@ -939,9 +939,17 @@ bool ScMatrixFormulaCellToken::operator==( const 
FormulaToken&

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - dictionaries

2015-06-18 Thread Olivier R

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

New commits:
commit 90779d8cc409790c48df995f3bf635ae1735a833
Author: Olivier R 
Date:   Wed Apr 22 23:09:30 2015 +0200

Updated core
Project: dictionaries  83d5b3eb30bd7658719546f50d73ca05210479e8

Update French dictionary (v5.3.2)

(cherry picked from commit 6565f427350dc8ad47e8e2669c7321e5331202d7)
(cherry picked from commit 54ef13f6f93da64c8619f28ad1235562204c93fb)

diff --git a/dictionaries b/dictionaries
index 36fb7f9..83d5b3e 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit 36fb7f9b73893a445f4ed3ed29f50fbafc5148d9
+Subproject commit 83d5b3eb30bd7658719546f50d73ca05210479e8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Branch 'distro/collabora/cp-4.4' - 3 commits - da_DK/da_DK.aff da_DK/da_DK.dic da_DK/description.xml en/Lightproof.py fr_FR/description.xml fr_FR/fr.aff fr_FR/f

2015-06-18 Thread Olivier R

 da_DK/da_DK.aff   |   34 
 da_DK/da_DK.dic   |13405 +-
 da_DK/description.xml |2 
 en/Lightproof.py  |2 
 fr_FR/README_fr.txt   |2 
 fr_FR/description.xml |2 
 fr_FR/fr.aff  | 3051 -
 fr_FR/fr.dic  | 4821 ---
 fr_FR/package-description.txt |2 
 hu_HU/Lightproof.py   |2 
 pt_BR/Lightproof.py   |2 
 ru_RU/Lightproof.py   |2 
 12 files changed, 7482 insertions(+), 13845 deletions(-)

New commits:
commit 83d5b3eb30bd7658719546f50d73ca05210479e8
Author: Olivier R 
Date:   Wed Apr 22 23:09:30 2015 +0200

Update French dictionary (v5.3.2)

(cherry picked from commit 6565f427350dc8ad47e8e2669c7321e5331202d7)
(cherry picked from commit 54ef13f6f93da64c8619f28ad1235562204c93fb)

diff --git a/fr_FR/README_fr.txt b/fr_FR/README_fr.txt
index 3113b50..e2a82a3 100644
--- a/fr_FR/README_fr.txt
+++ b/fr_FR/README_fr.txt
@@ -1,7 +1,7 @@
 ___
 
DICTIONNAIRESÂ ORTHOGRAPHIQUESÂ FRANÃAIS
-   version 5.2
+   version 5.3.2
 
Olivier R. - dicollectefreefr
Dicollecte : http://www.dicollecte.org/
diff --git a/fr_FR/description.xml b/fr_FR/description.xml
index 603b941..233763a 100644
--- a/fr_FR/description.xml
+++ b/fr_FR/description.xml
@@ -1,6 +1,6 @@
 
 http://openoffice.org/extensions/description/2006"; 
xmlns:d="http://openoffice.org/extensions/description/2006";  
xmlns:xlink="http://www.w3.org/1999/xlink";>
-
+
 
 
 French spelling dictionary, hyphenation rules, and 
thesaurus
diff --git a/fr_FR/fr.aff b/fr_FR/fr.aff
index 9084093..f07f095 100644
--- a/fr_FR/fr.aff
+++ b/fr_FR/fr.aff
@@ -2,9 +2,9 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-# AFFIXES DU DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS âCLASSIQUEâ v5.2
+# AFFIXES DU DICTIONNAIRE ORTHOGRAPHIQUE FRANÃAIS âCLASSIQUEâ v5.3.2
 # par Olivier R. -- licence MPL 2.0
-# GÃ©nÃ©rÃ© le 19 09 2014 Ã  09:52
+# GÃ©nÃ©rÃ© le 14 04 2015 Ã  11:59
 # Pour amÃ©liorer le dictionnaire, allez sur http://www.dicollecte.org/
 
 
@@ -94,7 +94,7 @@ REP Ã¨l ell
 REP iÃ¨me$ e
 REP Ã¨me$ e
 REP Ã¨$ e
-REP Î© â¦
+REP mn$ min
 REP ogue$ ogiste
 REP ogiste$ ogue
 REP disez$ dites
@@ -111,13 +111,15 @@ REP email courriel
 
 KEY azertyuiop|qsdfghjklmÃ¹|wxcvbn|aÃ©z|yÃ¨u|iÃ§o|oÃ 
p|aqz|zse|edr|rft|tgy|yhu|uji|iko|olpm|qws|sxd|dcf|fvg|gbh|hnj
 
-ICONV 38
+ICONV 40
 ICONV â '
 ICONV ï¬ ffi
 ICONV ï¬ ffl
 ICONV ï¬ ff
+ICONV ï¬ ft
 ICONV ï¬ fi
 ICONV ï¬ fl
+ICONV ï¬ st
 ICONV aÌ Ã 
 ICONV aÌ Ã¢
 ICONV aÌ Ã¤
@@ -185,7 +187,7 @@ BREAK â$
 
 
 
-AM 431
+AM 436
 AM po:nom is:mas
 AM po:nom is:fem
 AM po:adj is:epi
@@ -250,11 +252,12 @@ AM po:ipsi po:3pl!
 AM po:impe po:2pl
 AM po:iimp po:spre po:2pl
 AM po:iimp po:spre po:1pl
+AM po:loc.adv
+AM po:adj is:epi is:sg
 AM po:ppas po:adj is:fem is:sg
 AM po:ppas po:adj is:fem is:pl
 AM po:v3__t_q_??
 AM po:ipre po:3sg
-AM po:loc.adv
 AM po:v2__t_q_??
 AM po:v3__t___??
 AM po:v2__t___??
@@ -266,7 +269,6 @@ AM po:ipre po:1sg po:2sg
 AM po:nom is:epi is:inv
 AM po:ipsi po:1sg po:2sg
 AM po:v1__t___?? po:infi
-AM po:adj is:epi is:sg
 AM is:mas is:sg
 AM is:mas is:pl
 AM po:ipsi po:2sg
@@ -294,6 +296,7 @@ AM po:spre po:3sg
 AM po:v1_itn__??
 AM po:v1_i___m??
 AM po:v1__tnq_??
+AM po:v1__ta
 AM po:ipre po:1isg
 AM po:v3_it___??
 AM po:v1_itnq_??
@@ -310,17 +313,19 @@ AM po:v3__t___?? po:infi
 AM po:ipre po:ipsi po:3sg
 AM po:ipre po:ipsi po:1sg po:2sg
 AM po:v1__t_q_?? po:infi
+AM po:adj is:mas is:pl
+AM po:adj is:epi is:pl
 AM po:v1_i_n__??
 AM po:v1___n__??
 AM po:v1p_e_ po:infi
-AM po:adj is:mas is:pl
 AM po:adj is:mas is:inv
 AM is:mas is:inv
 AM po:mg po:prep po:adv
 AM po:loc.adv po:loc.adj
+AM po:v1__t_q__a
 AM po:spre po:3pl
-AM po:ipre po:spre po:simp po:3pl
 AM po:adj is:mas is:sg
+AM po:ipre po:spre po:simp po:3pl
 AM po:v2p_e_
 AM po:nom po:adj is:mas is:pl
 AM po:nom po:adj is:fem is:sg
@@ -328,23 +333,23 @@ AM po:mg po:cjsub
 AM po:ipre po:3pl!
 AM po:iimp po:spre po:simp po:2pl
 AM po:iimp po:spre po:simp po:1pl
+AM po:v1_ita
 AM po:spre po:simp po:2sg
 AM po:spre po:simp po:1sg
 AM po:nom po:adj is:mas is:sg
-AM po:adj is:epi is:pl
 AM po:v3_itnq_??
 AM po:v3_ie_
 AM po:v1_it___?? po:infi
-AM po:v1__ta
 AM po:spre po:2pl
 AM po:spre po:1pl
 AM po:simp po:1isg
 AM po:pfx
 AM po:loc.adj
+AM po:adj is:fem is:sg
 AM po:v3_i_nq_??
 AM po:v3_i?? po:infi
 AM po:v3__t_q__a
-AM po:v1_ita
+AM po:v1_i_a
 AM po:nom po:adj is:mas is:inv
 AM po:nom po:adj is:fem is:pl
 AM po:nom po:adj is:epi is:pl
@@ -355,48 +360,46 @@ AM po:iimp po:1pl
 AM po:v3__tnq_??
 AM po:v3__tn__??
 AM po:v2__t_q_?? po:infi
-AM po:v1__t_q__a
+AM po:titr is:fem is:sg
 AM po:mg po:prodem is:mas is:sg
 AM po:mg po:detpos

Re: PyUNO usability improvements

2015-06-18 Thread Matthew J. Francis


So far I've had some valuable feedback - thanks to those who
contributed.

I also have the nagging feeling that any changes to behaviour will be
with us for a long time, and there are still a few questions in my mind
over the advisability of some of the details. Part of the reason for
this is that while it all seems a good idea in theory, there aren't any
actual demonstration use cases yet apart from the few unit tests.

So, given that:
- To begin with there's no way I'd recommend rushing this in for 5.0,
and nobody but me is clamouring to actually use the changes
- Some time to mature the interface changes seems like a good idea
- I have a significant actual use case (UI testing) separately in
progress that this could be developed alongside

What about converting this to a feature branch and running with it for
a while, with the aim of landing a properly mature feature for 5.1?


Regards
Matthew Francis


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

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - translations

2015-06-18 Thread Andras Timar

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

New commits:
commit ccc13bde3377ac94de2f0ace5ed94b5c80f46a22
Author: Andras Timar 
Date:   Thu Jun 18 11:35:46 2015 +0200

Updated core
Project: translations  e8d143a936fb478d68f21f6229ceabcbd86ffc2a

sync with libreoffice-4-4-4 branch

Change-Id: Ic6e860b4963daef15b1262555b73cb6c2510199b

diff --git a/translations b/translations
index d0c3d50..e8d143a 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit d0c3d50b2bf7169cc3966289ad99db2405605fc8
+Subproject commit e8d143a936fb478d68f21f6229ceabcbd86ffc2a
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Branch 'distro/collabora/cp-4.4' - source/br source/ca source/da source/de source/es source/fr source/gl source/gn source/hu source/it source/kk source/ko sourc

2015-06-18 Thread Andras Timar

 source/br/librelogo/source/pythonpath.po   |   10 
 source/br/officecfg/registry/data/org/openoffice/Office.po |   10 
 source/br/officecfg/registry/data/org/openoffice/Office/UI.po  |   12 
 source/br/sc/source/ui/src.po  |   30 
 source/br/scaddins/source/analysis.po  |   10 
 source/br/setup_native/source/mac.po   |   11 
 source/br/svtools/source/misc.po   |8 
 source/br/svtools/uiconfig/ui.po   |8 
 source/br/svx/source/engine3d.po   |   22 
 source/br/svx/source/sidebar/area.po   |   14 
 source/br/svx/source/toolbars.po   |   11 
 source/ca/chart2/uiconfig/ui.po|   10 
 source/ca/formula/source/core/resource.po  |2 
 source/ca/helpcontent2/source/text/smath/01.po |   10 
 source/da/scp2/source/extensions.po|   18 
 source/de/cui/uiconfig/ui.po   |   14 
 source/de/extensions/uiconfig/sbibliography/ui.po  |6 
 source/de/helpcontent2/source/text/scalc.po|   14 
 source/de/helpcontent2/source/text/scalc/00.po |6 
 source/de/helpcontent2/source/text/scalc/01.po |   18 
 source/de/helpcontent2/source/text/scalc/04.po |8 
 source/de/helpcontent2/source/text/scalc/guide.po  |8 
 source/de/helpcontent2/source/text/shared/00.po|   12 
 source/de/helpcontent2/source/text/shared/01.po|8 
 source/de/helpcontent2/source/text/shared/02.po|   14 
 source/de/helpcontent2/source/text/shared/04.po|   16 
 source/de/helpcontent2/source/text/shared/guide.po |8 
 source/de/helpcontent2/source/text/shared/optionen.po  |   10 
 source/de/helpcontent2/source/text/simpress/guide.po   |   10 
 source/de/helpcontent2/source/text/smath/00.po |   14 
 source/de/helpcontent2/source/text/smath/01.po |   24 
 source/de/helpcontent2/source/text/smath/guide.po  |8 
 source/de/helpcontent2/source/text/swriter.po  |   10 
 source/de/helpcontent2/source/text/swriter/01.po   |   16 
 source/de/helpcontent2/source/text/swriter/02.po   |   22 
 source/de/helpcontent2/source/text/swriter/guide.po|   20 
 source/de/officecfg/registry/data/org/openoffice/Office/UI.po  |   34 
 source/de/sc/source/ui/src.po  |   12 
 source/de/sw/source/ui/app.po  |8 
 source/es/cui/source/options.po|6 
 source/es/helpcontent2/source/text/sbasic/guide.po |6 
 source/es/helpcontent2/source/text/sbasic/shared.po|6 
 source/es/helpcontent2/source/text/scalc/00.po |6 
 source/es/helpcontent2/source/text/scalc/01.po |8 
 source/es/helpcontent2/source/text/schart/01.po|8 
 source/es/nlpsolver/help/en/com.sun.star.comp.Calc.NLPSolver.po|   16 
 source/es/nlpsolver/src/com/sun/star/comp/Calc/NLPSolver.po|   16 
 source/es/officecfg/registry/data/org/openoffice/Office/UI.po  |   14 
 source/es/sc/uiconfig/scalc/ui.po  |8 
 source/es/scp2/source/extensions.po|   12 
 source/fr/helpcontent2/source/text/scalc/01.po |   10 
 source/fr/helpcontent2/source/text/shared/01.po|   16 
 source/gl/basctl/uiconfig/basicide/ui.po   |   16 
 source/gl/chart2/uiconfig/ui.po|8 
 source/gl/connectivity/source/resource.po  |   16 
 source/gl/cui/source/dialogs.po|   14 
 source/gl/cui/source/options.po|6 
 source/gl/cui/source/tabpages.po   |6 
 source/gl/cui/uiconfig/ui.po   |   44 
 source/gl/dbaccess/source/ui/browser.po|6 
 source/gl/dbaccess/source/ui/dlg.po|   10 
 source/gl/dbaccess/source/ui/misc.po   |6 
 source/gl/dbaccess/uiconfig/ui.po  |   14 
 source/gl/extensions/uiconfig/sabpilot/ui.po   |8 
 source/gl/extensions/uiconfig/sbibliography/ui.po  |8 
 source/gl/filter/source/xsltdialog.po

[Libreoffice-commits] core.git: vcl/inc vcl/unx

2015-06-18 Thread Caolán McNamara

 vcl/inc/unx/gtk/gtkinst.hxx  |4 
 vcl/unx/gtk3/app/gtk3gtkinst.cxx |  333 +++
 2 files changed, 337 insertions(+)

New commits:
commit b461e3189b9a95deef1e6c5e03b0e657b5754dfa
Author: CaolÃ¡n McNamara 
Date:   Wed Jun 17 16:50:39 2015 +0100

gtk3 clipboard support

doesn't work yet, but reports correctly what external formats
are available

Change-Id: I11cf9440ca516d4358c341fa67cc836b30ca42d6

diff --git a/vcl/inc/unx/gtk/gtkinst.hxx b/vcl/inc/unx/gtk/gtkinst.hxx
index fa61f07..28bca36 100644
--- a/vcl/inc/unx/gtk/gtkinst.hxx
+++ b/vcl/inc/unx/gtk/gtkinst.hxx
@@ -94,6 +94,10 @@ public:
 createFolderPicker( const com::sun::star::uno::Reference<
 com::sun::star::uno::XComponentContext >& ) 
SAL_OVERRIDE;
 
+#if GTK_CHECK_VERSION(3,0,0)
+virtual css::uno::Reference< css::uno::XInterface > CreateClipboard( const 
css::uno::Sequence< css::uno::Any >& i_rArguments ) SAL_OVERRIDE;
+#endif
+
 voidRemoveTimer (SalTimer *pTimer);
 
 // for managing a mirror of the in-flight un-dispatched gdk event queue
diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index c8cf298..902dd66 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -9,4 +9,337 @@
 
 #include "../../gtk/app/gtkinst.cxx"
 
+#include 
+#include "com/sun/star/lang/XServiceInfo.hpp"
+#include "com/sun/star/lang/XSingleServiceFactory.hpp"
+#include "com/sun/star/lang/XInitialization.hpp"
+#include "com/sun/star/lang/DisposedException.hpp"
+#include "com/sun/star/datatransfer/XTransferable.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboard.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboardEx.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboardNotifier.hpp"
+#include "com/sun/star/datatransfer/clipboard/XClipboardListener.hpp"
+#include "com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp"
+#include "com/sun/star/datatransfer/dnd/XDragSource.hpp"
+#include "com/sun/star/datatransfer/dnd/XDropTarget.hpp"
+#include "com/sun/star/datatransfer/dnd/DNDConstants.hpp"
+#include 
+#include "cppuhelper/compbase.hxx"
+#include "cppuhelper/implbase1.hxx"
+#include 
+
+using namespace com::sun::star;
+using namespace com::sun::star::uno;
+using namespace com::sun::star::lang;
+
+namespace
+{
+struct TypeEntry
+{
+const char* pNativeType;// string corresponding to nAtom 
for the case of nAtom being uninitialized
+const char* pType;  // Mime encoding on our side
+};
+
+static TypeEntry aConversionTab[] =
+{
+{ "ISO10646-1", "text/plain;charset=utf-16" },
+{ "UTF8_STRING", "text/plain;charset=utf-8" },
+{ "UTF-8", "text/plain;charset=utf-8" },
+{ "text/plain;charset=UTF-8", "text/plain;charset=utf-8" },
+// ISO encodings
+{ "ISO8859-2", "text/plain;charset=iso8859-2" },
+{ "ISO8859-3", "text/plain;charset=iso8859-3" },
+{ "ISO8859-4", "text/plain;charset=iso8859-4" },
+{ "ISO8859-5", "text/plain;charset=iso8859-5" },
+{ "ISO8859-6", "text/plain;charset=iso8859-6" },
+{ "ISO8859-7", "text/plain;charset=iso8859-7" },
+{ "ISO8859-8", "text/plain;charset=iso8859-8" },
+{ "ISO8859-9", "text/plain;charset=iso8859-9" },
+{ "ISO8859-10", "text/plain;charset=iso8859-10" },
+{ "ISO8859-13", "text/plain;charset=iso8859-13" },
+{ "ISO8859-14", "text/plain;charset=iso8859-14" },
+{ "ISO8859-15", "text/plain;charset=iso8859-15" },
+// asian encodings
+{ "JISX0201.1976-0", "text/plain;charset=jisx0201.1976-0" },
+{ "JISX0208.1983-0", "text/plain;charset=jisx0208.1983-0" },
+{ "JISX0208.1990-0", "text/plain;charset=jisx0208.1990-0" },
+{ "JISX0212.1990-0", "text/plain;charset=jisx0212.1990-0" },
+{ "GB2312.1980-0", "text/plain;charset=gb2312.1980-0" },
+{ "KSC5601.1992-0", "text/plain;charset=ksc5601.1992-0" },
+// eastern european encodings
+{ "KOI8-R", "text/plain;charset=koi8-r" },
+{ "KOI8-U", "text/plain;charset=koi8-u" },
+// String (== iso8859-1)
+{ "STRING", "text/plain;charset=iso8859-1" },
+// special for compound text
+{ "COMPOUND_TEXT", "text/plain;charset=compound_text" },
+
+// PIXMAP
+{ "PIXMAP", "image/bmp" }
+};
+}
+
+class GtkTransferable : public ::cppu::WeakImplHelper1 <
+css::datatransfer::XTransferable >
+{
+public:
+GtkTransferable()
+{
+}
+
+virtual ~GtkTransferable()
+{
+}
+
+/*
+ * XTransferable
+ */
+
+virtual css::uno::Any SAL_CALL getTransferData( const 
css::datatransfer::DataFlavor& aFlavor )
+throw(css::datatransfer::UnsupportedFlavorException,
+  css::io::IOException,
+  css::uno::RuntimeException, std::exception
+

Re: Anytime builder VMs for devs (was: test infrastructure ideas appreciated ...)

2015-06-18 Thread Norbert Thiebaud

On Thu, Jun 18, 2015 at 4:14 AM, Bjoern Michaelsen
 wrote:
> Hi,
>
> On Wed, Jun 03, 2015 at 02:33:23PM +0100, Michael Meeks wrote:
>>   Constructive thoughts appreciated in reply here.
>
> Budget for 2-5 of our Hackfest VMs[1] to always be on standby for someone
> wanting to do a fast build, and provision for Cloph to be able to hand out
> log-ins at a quick ping on IRC.

The budget is already there.
some tooling to do that smartly is what is needed, as relying on cloph
being alvailable for a quick ping on IRC does not scale very well.

iow to use spot instance provisionning, and to control how many of
them there is and turn them off automatically after a while (based on
idling etc.)
there ia also the credential part of it... and the discovery part of it
One possibility would be:
have a minimal template root disk with a basic setup and a salt-client
preset to call home a given salt-server (on our infra)
have a script on the salt-server do
1/ accept incomming new client
2/ run some high-state on such client as needed (that will setup
things like user + ssh-keys for the requester on the client) and
report when the box is ready.

Note: using spot instance (which are very cheap on linux) means you
really want to use that for build.. not for coding as the instance may
disappear on you
so code on your laptop send patch/rsync/whatever code-change to the
vm, build and test there.

Note: for actual hackfest, we may provision real instance (not spot)
for the duration of the hakfest..
you can get a quite good box (like the one that I use to do windows
build in 30-40 minutes) at $60 for 72 hours
and for a hackfest we could have a setup with say 6 of these in a
icecream network... for less than $400 for the week-end
which is negligible comparing to travel expenses for these things...
and could support easely a dozen of hackers or more

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

Re: PyUNO usability improvements

2015-06-18 Thread Samuel Mehrbrodt


Hi,


I also have the nagging feeling that any changes to behaviour will be
with us for a long time, and there are still a few questions in my mind
over the advisability of some of the details. Part of the reason for
this is that while it all seems a good idea in theory, there aren't any
actual demonstration use cases yet apart from the few unit tests.


I don't know if this is what you are looking for, but here 
 
is a python app using the uno bridge.


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

track and present status of individual tests (was: test infrastructure ideas appreciated ...)

2015-06-18 Thread Bjoern Michaelsen

Hi,

On Wed, Jun 03, 2015 at 02:33:23PM +0100, Michael Meeks wrote:
>   Constructive thoughts appreciated in reply here.

This has some synergies with the dashboard proposal[1] but it is sufficiently
distict to be included as an ideas on its own:

We lack a good representation of test status. tinderbox.libreoffice.org is only
very basic and overloads one view trying to show way too much at one:
- e.g. http://tinderbox.libreoffice.org/MASTER/status.html shows:
- when something broke
- where (on which machine) something broke
  (which is already creates a ~useless table a fullscreen wide on
  my 30" 21:9 screen at default zoom levels -- quite an "achievement")
  however it doesnt show:
- _what_ (which test or module) broke

The "what" is the most important information for a developer checking if he
broke something, followed by the "when", while the "on which machine" is
less relevant in most cases.

If we really want to value tests we should be able to present a view on our
automated testing that shows what broke first -- and then allows ivestigating
the when and where from there. Take the "Test Statistics Grid" at the end of:

 https://jenkins.qa.ubuntu.com/view/vivid/view/AutoPkgTest/

as an starting point, showing e.g. the status and the stability of each and 
every
CppunitTest_ JunitTest_ and PythonTest_ individually.

Best,

Bjoern


[1] 
http://nabble.documentfoundation.org/TDF-Grant-Request-Proposal-LibreOffice-project-dashboard-quot-All-about-LibreOffice-quot-td4151652.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-4.4' - 19 commits - bin/lo-xlate-lang formula/source include/formula odk/examples readlicense_oo/license sc/inc sc/source sd/source svx/sou

2015-06-18 Thread Stephan Bergmann

 bin/lo-xlate-lang|2 
 formula/source/ui/dlg/FormulaHelper.cxx  |4 
 include/formula/IFunctionDescription.hxx |5 
 odk/examples/java/Spreadsheet/CalcAddins.java|2 
 readlicense_oo/license/CREDITS.fodt  | 1514 +--
 sc/inc/funcdesc.hxx  |   10 
 sc/inc/progress.hxx  |4 
 sc/inc/token.hxx |6 
 sc/source/core/data/column2.cxx  |   17 
 sc/source/core/data/documen9.cxx |4 
 sc/source/core/data/document.cxx |   11 
 sc/source/core/data/drwlayer.cxx |   59 
 sc/source/core/data/formulacell.cxx  |8 
 sc/source/core/data/funcdesc.cxx |7 
 sc/source/core/data/table4.cxx   |2 
 sc/source/core/tool/progress.cxx |   13 
 sc/source/core/tool/token.cxx|   62 
 sd/source/ui/view/drtxtob1.cxx   |   15 
 svx/source/svdraw/svdoashp.cxx   |1 
 svx/uiconfig/ui/sidebararea.ui   |7 
 sw/qa/extras/ooxmlimport/data/tdf8255.docx   |binary
 sw/qa/extras/ooxmlimport/ooxmlimport.cxx |9 
 sw/qa/extras/rtfimport/data/tdf90315.rtf |4 
 sw/qa/extras/rtfimport/rtfimport.cxx |9 
 sw/uiconfig/swriter/ui/frmaddpage.ui |4 
 toolkit/source/awt/vclxtoolkit.cxx   |   22 
 vcl/source/app/svapp.cxx |3 
 wizards/source/access2base/Recordset.xba |   21 
 writerfilter/source/dmapper/PropertyMap.cxx  |   12 
 writerfilter/source/dmapper/SectionColumnHandler.cxx |2 
 30 files changed, 1016 insertions(+), 823 deletions(-)

New commits:
commit 4b8394c670ec9b06abd9025d2b7132b373daa2b0
Author: Stephan Bergmann 
Date:   Wed Jun 17 17:54:19 2015 +0200

Fix CalcAddins example

was broken with 70f56bc22fe952c75ec714e05e1bb5296491a36a "java: reduce 
scope,
make member classes private"

Change-Id: I84a3fafbfdddf6bb04ab7787d344bf50ffd22994
(cherry picked from commit 3b07120a72a5fd28836b226becbc100e24e84edf)

Conflicts:
odk/examples/java/Spreadsheet/CalcAddins.java

(cherry picked from commit df5c4b956b7634c9f5cf2fd84a7946c7d97cd408)

diff --git a/odk/examples/java/Spreadsheet/CalcAddins.java 
b/odk/examples/java/Spreadsheet/CalcAddins.java
index 555ddde..c46fc4a 100644
--- a/odk/examples/java/Spreadsheet/CalcAddins.java
+++ b/odk/examples/java/Spreadsheet/CalcAddins.java
@@ -60,7 +60,7 @@ public class CalcAddins {
  * of the service description. It implements the needed interfaces.
  * @implements XCalcAddins, XAddIn, XServiceName, XServiceInfo, XTypeProvider
  */
-static private class _CalcAddins extends WeakBase implements
+static public class _CalcAddins extends WeakBase implements
 XCalcAddins,
 XAddIn,
 XServiceName,
commit 7d3f2479289417f70e76d2663adf28bde50926a3
Author: Eike Rathke 
Date:   Wed Jun 17 00:04:30 2015 +0200

Resolves: tdf#86305 clone upper left of matrix result if double token

Change-Id: I541577e0b99b0144a755e5755adc890c0ca8d204
(cherry picked from commit ffc1ffed11dc63a69fc2db04f12b3ea266b580fe)
Reviewed-on: https://gerrit.libreoffice.org/16326
Reviewed-by: CaolÃ¡n McNamara 
Tested-by: CaolÃ¡n McNamara 

diff --git a/sc/inc/token.hxx b/sc/inc/token.hxx
index da4f9e9..31a598a 100644
--- a/sc/inc/token.hxx
+++ b/sc/inc/token.hxx
@@ -337,6 +337,12 @@ public:
 /** Reset matrix and upper left, keep matrix
 formula dimension. */
 void ResetResult();
+
+private:
+
+/** xUpperLeft is modifiable through SetUpperLeftDouble(), so clone it
+whenever an svDouble token is assigned to. */
+void CloneUpperLeftIfNecessary();
 };
 
 class SC_DLLPUBLIC ScHybridCellToken : public formula::FormulaToken
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index 1e5c7d2..b4d1dd0 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -918,7 +918,10 @@ void ScMatrixCellResultToken::Assign( const 
ScMatrixCellResultToken & r )
 
 ScMatrixFormulaCellToken::ScMatrixFormulaCellToken(
 SCCOL nC, SCROW nR, const ScConstMatrixRef& pMat, formula::FormulaToken* 
pUL ) :
-ScMatrixCellResultToken(pMat, pUL), nRows(nR), nCols(nC) {}
+ScMatrixCellResultToken(pMat, pUL), nRows(nR), nCols(nC)
+{
+CloneUpperLeftIfNecessary();
+}
 
 ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( SCCOL nC, SCROW nR ) :
 ScMatrixCellResultToken(NULL, NULL), nRows(nR), nCols(nC) {}
@@ -926,10 +929,7 @@ ScMatrixFormulaCellToken::ScMatrixFormulaCellToken( S

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

2015-06-18 Thread László Németh

 sfx2/source/control/thumbnailviewitem.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 63a3d1a5e26b42859ce0868da6327afcdc0dfece
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 18 12:09:21 2015 +0200

fix start center rendering (removing selection)

Change-Id: I3f09808e43d379f473360f3746302a5d65fb8b38

diff --git a/sfx2/source/control/thumbnailviewitem.cxx 
b/sfx2/source/control/thumbnailviewitem.cxx
index 7d4cbed..ee0e559 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -154,7 +154,7 @@ Rectangle ThumbnailViewItem::updateHighlight(bool bVisible, 
const Point& rPoint)
 }
 else
 {
-if (isHighlighted())
+if (isHighlighted() || mpTitleED->SupportsDoubleBuffering())
 bNeedsPaint = true;
 setHighlight(false);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: [GSoC] Rework the Expert Configuration dialog Week 3

2015-06-18 Thread Caolán McNamara

On Thu, 2015-06-18 at 09:31 +0200, Mihály Palenik wrote:
> Hello!
> 
> 
> Last week I finished tree view in this dialog. It works fine under
> linux with accessibility. Here is the commit :
> http://cgit.freedesktop.org/libreoffice/core/commit/?id=db35b73037483cd22cd7d4ac93fe40f23fbe3967

This is really nice and shiny. Zips along with a11y enabled for me. I
think the next thing to do, as you said yourself, is to remove the
redundant FOO text from FOO.BAR entries under a FOO parent. That'll
massively pretty it up.

I see a couple of odd entries in there e.g. I have three toplevel
org/openffice/Office/Canvas properties (ForceSafeServiceImpl,
UseAcceleeratedCanvas and UseAntialiasingCanvas) when I imagine should
be under the other topevel org.openoffice.Office.Canvas tree. I wonder
what's special about them that they don't follow the usual pattern.
Might be some underlying configuration bug rather than a problem with
the expert dialog, but worth finding out.

C.

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-4.4' - translations

2015-06-18 Thread Andras Timar

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

New commits:
commit 393948b8944a12bb31cb007bb9bcc7c76a4eaf45
Author: Andras Timar 
Date:   Thu Jun 18 12:22:25 2015 +0200

Updated core
Project: translations  b10b8beb952f7d94562320bbff08cebb88574368

sync with libreoffice-4-4-4 branch

Change-Id: I1435c894e34b46567a1ef265a14b5e0f04474323

diff --git a/translations b/translations
index b11e34f..b10b8be 16
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit b11e34f1d06f02a7f7d17f01ab9a9ea259c90e87
+Subproject commit b10b8beb952f7d94562320bbff08cebb88574368
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] translations.git: Changes to 'distro/collabora/lov-4.4'

2015-06-18 Thread Andras Timar

New branch 'distro/collabora/lov-4.4' available with the following commits:
commit b10b8beb952f7d94562320bbff08cebb88574368
Author: Andras Timar 
Date:   Thu Jun 18 12:22:25 2015 +0200

sync with libreoffice-4-4-4 branch

Change-Id: I1435c894e34b46567a1ef265a14b5e0f04474323

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

[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-4.4' - dictionaries

2015-06-18 Thread Olivier R

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

New commits:
commit c81574f4a631b36d57ed2f1f64a74973348d2ce2
Author: Olivier R 
Date:   Wed Apr 22 23:09:30 2015 +0200

Updated core
Project: dictionaries  42ca37f66c81472d5bcf1a5344066b8a60c3c0a3

Update French dictionary (v5.3.2)

(cherry picked from commit 6565f427350dc8ad47e8e2669c7321e5331202d7)
(cherry picked from commit 54ef13f6f93da64c8619f28ad1235562204c93fb)

diff --git a/dictionaries b/dictionaries
index d472b00..42ca37f 16
--- a/dictionaries
+++ b/dictionaries
@@ -1 +1 @@
-Subproject commit d472b00b2ae5a65b5088f2cf4ffc7c326287392e
+Subproject commit 42ca37f66c81472d5bcf1a5344066b8a60c3c0a3
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] dictionaries.git: Changes to 'distro/collabora/lov-4.4'

2015-06-18 Thread Olivier R

New branch 'distro/collabora/lov-4.4' available with the following commits:
commit 42ca37f66c81472d5bcf1a5344066b8a60c3c0a3
Author: Olivier R 
Date:   Wed Apr 22 23:09:30 2015 +0200

Update French dictionary (v5.3.2)

(cherry picked from commit 6565f427350dc8ad47e8e2669c7321e5331202d7)
(cherry picked from commit 54ef13f6f93da64c8619f28ad1235562204c93fb)

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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

2015-06-18 Thread Jan Holesovsky

 vcl/source/window/paint.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 47636da7327574bdfdcf790c1138ba6de043cd95
Author: Jan Holesovsky 
Date:   Sat May 23 18:24:47 2015 +0200

rendercontext: PushPaintHelper needs the buffer as param too.

Change-Id: I4e787356bd17fcaffdbe0dc51a549b359f416766

diff --git a/vcl/source/window/paint.cxx b/vcl/source/window/paint.cxx
index 8fe3819..c09c495 100644
--- a/vcl/source/window/paint.cxx
+++ b/vcl/source/window/paint.cxx
@@ -229,7 +229,7 @@ void PaintHelper::DoPaint(const vcl::Region* pRegion)
 m_pBuffer->mnOutOffX = m_pWindow->GetOutOffXPixel() - 
m_pBuffer->mnOutOffX;
 m_pBuffer->mnOutOffY = m_pWindow->GetOutOffYPixel() - 
m_pBuffer->mnOutOffY;
 
-m_pWindow->PushPaintHelper(this, *m_pWindow);
+m_pWindow->PushPaintHelper(this, *m_pBuffer.get());
 m_pWindow->Paint(*m_pBuffer.get(), m_aPaintRect);
 
 // restore the mnOutOffX/Y value
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Caolán McNamara

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |   16 +---
 1 file changed, 13 insertions(+), 3 deletions(-)

New commits:
commit fe9da15401574551c34fffbd4e63eddca9743527
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 11:40:47 2015 +0100

gtk3: implement most common case of text paste into us

Change-Id: I733dd57e27330bc200f718ffb5680bbb81d5d77d

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index 902dd66..a96d1e4 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -101,9 +101,19 @@ public:
   css::uno::RuntimeException, std::exception
   ) SAL_OVERRIDE
 {
-fprintf(stderr, "TO-DO getTransferData\n");
-(void)aFlavor;
-return css::uno::Any();
+css::uno::Any aRet;
+GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
+if (aFlavor.MimeType == "text/plain;charset=utf-16")
+{
+gchar *pText = gtk_clipboard_wait_for_text(clipboard);
+OUString aStr(pText, rtl_str_getLength(pText),
+RTL_TEXTENCODING_UTF8);
+g_free(pText);
+aRet <<= aStr.replaceAll("\r\n", "\n");
+}
+else
+fprintf(stderr, "TO-DO getTransferData %s\n", 
OUStringToOString(aFlavor.MimeType, RTL_TEXTENCODING_UTF8).getStr());
+return aRet;
 }
 
 virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL 
getTransferDataFlavors(  )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - desktop/source include/LibreOfficeKit include/vcl sw/inc sw/source

2015-06-18 Thread Miklos Vajna

 desktop/source/lib/init.cxx   |   19 +
 include/LibreOfficeKit/LibreOfficeKit.h   |4 ++
 include/LibreOfficeKit/LibreOfficeKit.hxx |   10 +++
 include/vcl/ITiledRenderable.hxx  |7 +
 sw/inc/unotxdoc.hxx   |2 +
 sw/source/uibase/dochdl/swdtflvr.cxx  |3 +-
 sw/source/uibase/uno/unotxdoc.cxx |   42 ++
 7 files changed, 86 insertions(+), 1 deletion(-)

New commits:
commit 1a1d15b422bc9bb787f939c28e520ca23debe28b
Author: Miklos Vajna 
Date:   Wed Jun 17 18:00:01 2015 +0200

LOK: add lok::Document::getTextSelection()

I.e. the copy part of copy&paste. Only the Writer bits for now.

Change-Id: Ia003e76e3b234735f472cdef125514f9771d8640
(cherry picked from commit cfc4375158ee174e8dcb4df319b82c0bdd6f31cc)

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 71e9431..89fe2db 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -215,6 +215,8 @@ static void doc_setTextSelection (LibreOfficeKitDocument* 
pThis,
   int nType,
   int nX,
   int nY);
+static char* doc_getTextSelection(LibreOfficeKitDocument* pThis,
+const char* pMimeType);
 static void doc_setGraphicSelection (LibreOfficeKitDocument* pThis,
   int nType,
   int nX,
@@ -251,6 +253,7 @@ struct LibLODocument_Impl : public _LibreOfficeKitDocument
 m_pDocumentClass->postMouseEvent = doc_postMouseEvent;
 m_pDocumentClass->postUnoCommand = doc_postUnoCommand;
 m_pDocumentClass->setTextSelection = doc_setTextSelection;
+m_pDocumentClass->getTextSelection = doc_getTextSelection;
 m_pDocumentClass->setGraphicSelection = doc_setGraphicSelection;
 m_pDocumentClass->resetSelection = doc_resetSelection;
 
@@ -788,6 +791,22 @@ static void doc_setTextSelection(LibreOfficeKitDocument* 
pThis, int nType, int n
 pDoc->setTextSelection(nType, nX, nY);
 }
 
+static char* doc_getTextSelection(LibreOfficeKitDocument* pThis, const char* 
pMimeType)
+{
+ITiledRenderable* pDoc = getTiledRenderable(pThis);
+if (!pDoc)
+{
+gImpl->maLastExceptionMsg = "Document doesn't support tiled rendering";
+return 0;
+}
+
+OString aRet = pDoc->getTextSelection(pMimeType);
+
+char* pMemory = static_cast(malloc(aRet.getLength() + 1));
+strcpy(pMemory, aRet.getStr());
+return pMemory;
+}
+
 static void doc_setGraphicSelection(LibreOfficeKitDocument* pThis, int nType, 
int nX, int nY)
 {
 ITiledRenderable* pDoc = getTiledRenderable(pThis);
diff --git a/include/LibreOfficeKit/LibreOfficeKit.h 
b/include/LibreOfficeKit/LibreOfficeKit.h
index 7eb42e8..7fbf71b 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.h
+++ b/include/LibreOfficeKit/LibreOfficeKit.h
@@ -146,6 +146,10 @@ struct _LibreOfficeKitDocumentClass
   int nX,
   int nY);
 
+/// @see lok::Document::getTextSelection
+char* (*getTextSelection) (LibreOfficeKitDocument* pThis,
+   const char* pMimeType);
+
 /// @see lok::Document::setGraphicSelection
 void (*setGraphicSelection) (LibreOfficeKitDocument* pThis,
  int nType,
diff --git a/include/LibreOfficeKit/LibreOfficeKit.hxx 
b/include/LibreOfficeKit/LibreOfficeKit.hxx
index bd8832a..2b562b2 100644
--- a/include/LibreOfficeKit/LibreOfficeKit.hxx
+++ b/include/LibreOfficeKit/LibreOfficeKit.hxx
@@ -217,6 +217,16 @@ public:
 }
 
 /**
+ * Gets the currently selected text.
+ *
+ * @param pMimeType determines the return format, for example 
text/plain;charset=utf-8.
+ */
+inline char* getTextSelection(const char* pMimeType)
+{
+return mpDoc->pClass->getTextSelection(mpDoc, pMimeType);
+}
+
+/**
  * Adjusts the graphic selection.
  *
  * @param nType @see LibreOfficeKitSetGraphicSelectionType
diff --git a/include/vcl/ITiledRenderable.hxx b/include/vcl/ITiledRenderable.hxx
index 5cac9b6..7de3c32 100644
--- a/include/vcl/ITiledRenderable.hxx
+++ b/include/vcl/ITiledRenderable.hxx
@@ -122,6 +122,13 @@ public:
 virtual void setTextSelection(int nType, int nX, int nY) = 0;
 
 /**
+ * Gets the text selection.
+ *
+ * @see lok::Document::getTextSelection().
+ */
+virtual OString getTextSelection(const char* /*pMimeType*/) { return 
OString(); }
+
+/**
  * Adjusts the graphic selection.
  *
  * @see lok::Document::setGraphicSelection().
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 90e7f02..a90272a 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -417,6 +417,8 @@ public:
 virtual void postMouseEvent(int nType, int nX, int nY, int nCoun

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - accessibility/source chart2/source dbaccess/source forms/source framework/source sd/source svtools/source svx/source toolkit/sour

2015-06-18 Thread Tor Lillqvist

 accessibility/source/extended/listboxaccessible.cxx   |2 
 chart2/source/view/main/ChartView.cxx |2 
 dbaccess/source/ui/browser/genericcontroller.cxx  |1 
 dbaccess/source/ui/browser/unodatbr.cxx   |3 +
 forms/source/richtext/richtextcontrol.cxx |2 
 forms/source/richtext/richtextmodel.cxx   |5 +-
 forms/source/solar/component/navbarcontrol.cxx|   11 ++--
 framework/source/dispatch/closedispatcher.cxx |1 
 framework/source/layoutmanager/layoutmanager.cxx  |1 
 sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx |3 +
 svtools/source/uno/unoiface.cxx   |1 
 svx/source/accessibility/AccessibleShapeTreeInfo.cxx  |4 +
 svx/source/fmcomp/fmgridif.cxx|2 
 svx/source/form/fmdmod.cxx|   34 +++---
 toolkit/source/awt/vclxdevice.cxx |3 +
 toolkit/source/awt/vclxgraphics.cxx   |3 +
 toolkit/source/awt/vclxtoolkit.cxx|2 
 toolkit/source/controls/unocontrol.cxx|8 ++-
 18 files changed, 62 insertions(+), 26 deletions(-)

New commits:
commit 9284ea261eb7339733202c56e90ef881a1775afb
Author: Tor Lillqvist 
Date:   Fri Jun 5 16:45:45 2015 +0300

Fix: could not convert [...] âconst char*â to âconst rtl::OUStringâ

Change-Id: Ib94c9f5eed0da67e846705f5c2c233c10583c791
(cherry picked from commit a44b770b59d322083cac6ac22cef20ce17a89e6d)
Signed-off-by: Michael Stahl 

diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index 447ad5a..bb63fed 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -65,25 +65,25 @@ SAL_WNOUNREACHABLE_CODE_POP
 {
 static const OUString aSvxComponentServiceNameList[] =
 {
-FM_SUN_COMPONENT_TEXTFIELD,
-FM_SUN_COMPONENT_FORM,
-FM_SUN_COMPONENT_LISTBOX,
-FM_SUN_COMPONENT_COMBOBOX,
-FM_SUN_COMPONENT_RADIOBUTTON,
-FM_SUN_COMPONENT_GROUPBOX,
-FM_SUN_COMPONENT_FIXEDTEXT,
-FM_SUN_COMPONENT_COMMANDBUTTON,
+OUString(FM_SUN_COMPONENT_TEXTFIELD),
+OUString(FM_SUN_COMPONENT_FORM),
+OUString(FM_SUN_COMPONENT_LISTBOX),
+OUString(FM_SUN_COMPONENT_COMBOBOX),
+OUString(FM_SUN_COMPONENT_RADIOBUTTON),
+OUString(FM_SUN_COMPONENT_GROUPBOX),
+OUString(FM_SUN_COMPONENT_FIXEDTEXT),
+OUString(FM_SUN_COMPONENT_COMMANDBUTTON),
 OUString(FM_SUN_COMPONENT_CHECKBOX),
-FM_SUN_COMPONENT_GRIDCONTROL,
-FM_SUN_COMPONENT_IMAGEBUTTON,
-FM_SUN_COMPONENT_FILECONTROL,
-FM_SUN_COMPONENT_TIMEFIELD,
-FM_SUN_COMPONENT_DATEFIELD,
+OUString(FM_SUN_COMPONENT_GRIDCONTROL),
+OUString(FM_SUN_COMPONENT_IMAGEBUTTON),
+OUString(FM_SUN_COMPONENT_FILECONTROL),
+OUString(FM_SUN_COMPONENT_TIMEFIELD),
+OUString(FM_SUN_COMPONENT_DATEFIELD),
 OUString(FM_SUN_COMPONENT_NUMERICFIELD),
-FM_SUN_COMPONENT_CURRENCYFIELD,
-FM_SUN_COMPONENT_PATTERNFIELD,
-FM_SUN_COMPONENT_HIDDENCONTROL,
-FM_SUN_COMPONENT_IMAGECONTROL
+OUString(FM_SUN_COMPONENT_CURRENCYFIELD),
+OUString(FM_SUN_COMPONENT_PATTERNFIELD),
+OUString(FM_SUN_COMPONENT_HIDDENCONTROL),
+OUString(FM_SUN_COMPONENT_IMAGECONTROL)
 };
 
 static const sal_uInt16 nSvxComponentServiceNameListCount = 
sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] 
);
commit 8aac888a3bd933a2c67d0104077c5ec9fee448c5
Author: Stephan Bergmann 
Date:   Wed Jun 17 15:18:10 2015 +0200

Some missing SolarMutexGuard around VclPtr acquire/release

At least OutputDevice::acquire/release use a plain unguarded int and ++, 
--, so
apparently rely on the SolarMutex being locked whenever they are called.  
Fixed
those places that caused "make check" to fail for me when temporarily adding
DBG_TESTSOLARMUTEX() to OutputDevice::acquire/release.  (A recurring 
pattern is
that a class fails to ensure the SolarMutex is locked around the 
destruction of
non-null VclPtr members.)

Change-Id: I77cba6f3908f2de1b516ce28f1c3c43b3f57a9c5
(cherry picked from commit 8e1ad966262932516b3368d9b5c44becb29524d4)
Signed-off-by: Michael Stahl 

diff --git a/accessibility/source/extended/listboxaccessible.cxx 
b/accessibility/source/extended/listboxaccessible.cxx
index e02a1d6..e7e428c 100644
--- a/accessibility/source/extended/listboxaccessible.cxx
+++ b/accessibility/source/extended/listboxaccessible.cxx
@@ -19,6 +19,7 @@
 
 #include 
 #include 
+#include 
 
 namespace accessibility
 {
@@ -55,6 +56,7 @@ namespace accessibility
 
 void ListBoxAccessibleBase::disposing()
 {
+SolarMutexGuard g;
 if ( m_pWindow )
 m_pWindow->RemoveEventLi

[Libreoffice-commits] core.git: g

2015-06-18 Thread Tomofumi Yagi

 g |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 125f06dbf73c287c3559acbb3096330b5e75135b
Author: Tomofumi Yagi 
Date:   Mon Jun 15 21:20:19 2015 +0900

'g' doesn't work correctly when config_host.mk contains non-ascii 
characters.

In 'g' shell script, we use grep to get substring from config_host.mk file.
When config_host.mk file contains non-ascii characters(e.g. Japanese),
this processing doesn't work.
As a result, some variables(SUBMODULES_CONFIGURED, REFERENCED_GIT, 
LINKED_GIT) will be
assigned to "Binary file (standard input) matches".
This is an error message of grep.
The problem will reproduce on Cygwin64 with Japanese locale.

With '-a' option, grep will work well, and 'g' shell script will work 
correctly.

Please refer the following commit,too.

http://cgit.freedesktop.org/libreoffice/core/commit/?id=0293ec98c92fd58a592f7dd86fbbf47e7b9195c6

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

diff --git a/g b/g
index 2db87cf..423a200 100755
--- a/g
+++ b/g
@@ -147,7 +147,7 @@ get_configured_submodules()
 {
 SUBMODULES_CONFIGURED=""
 if [ -f config_host.mk ] ; then
-   SUBMODULES_CONFIGURED=$(cat config_host.mk | grep GIT_NEEDED_SUBMODULES 
| sed -e "s/.*=//")
+   SUBMODULES_CONFIGURED=$(cat config_host.mk | grep -a 
GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
 else
# if we need the configured submoduel before the configuration is done. 
we assumed you want them all
SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
@@ -158,11 +158,11 @@ get_git_reference()
 {
 REFERENCED_GIT=""
 if [ -f config_host.mk ]; then
-   REFERENCED_GIT=$(cat config_host.mk | grep GIT_REFERENCE_SRC | sed -e 
"s/.*=//")
+   REFERENCED_GIT=$(cat config_host.mk | grep -a GIT_REFERENCE_SRC | sed 
-e "s/.*=//")
 fi
 LINKED_GIT=""
 if [ -f config_host.mk ]; then
-   LINKED_GIT=$(cat config_host.mk | grep GIT_LINK_SRC | sed -e "s/.*=//")
+   LINKED_GIT=$(cat config_host.mk | grep -a GIT_LINK_SRC | sed -e 
"s/.*=//")
 fi
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Lionel Elie Mamane

 editeng/source/accessibility/AccessibleContextBase.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ecaf1cb3861c1b519a1495487fc796884cf37b92
Author: Lionel Elie Mamane 
Date:   Thu Jun 18 12:57:16 2015 +0200

seems to be what was meant

Change-Id: Ia7b784d820249c3d75915761dac34a2aaa190c0b
Reviewed-on: https://gerrit.libreoffice.org/16358
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/editeng/source/accessibility/AccessibleContextBase.cxx 
b/editeng/source/accessibility/AccessibleContextBase.cxx
index 057fee4..549ec14 100644
--- a/editeng/source/accessibility/AccessibleContextBase.cxx
+++ b/editeng/source/accessibility/AccessibleContextBase.cxx
@@ -215,7 +215,7 @@ uno::Reference SAL_CALL
 {
 ThrowIfDisposed ();
 throw lang::IndexOutOfBoundsException (
-"no child with index " + OUString(nIndex),
+"no child with index " + OUString::number(nIndex),
 NULL);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Caolán McNamara

 sw/source/uibase/dochdl/swdtflvr.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit ae4d51b8d835b47e70bc6a0d2f92c2f4057bce16
Author: CaolÃ¡n McNamara 
Date:   Wed Jun 17 10:43:44 2015 +0100

Resolves: tdf#86017 calc has more rows than writer tables can support

as things stand right now in writer if the table doesn't fit it
doesn't fit and don't try

for back-ports reuse same bogus error used for 0 rows/cells

(cherry picked from commit 550cff762d816c336adaf015f481443af1c6edab)

(cherry picked from commit 799eef80581f2b39025ab1f388d6f4d741eabeac)

Change-Id: I90cea4c8566460f614d9a1143a638597d5ab8ce6
Reviewed-on: https://gerrit.libreoffice.org/16338
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx 
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 7d458b2..e7a4fa0 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -2167,6 +2167,14 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper& 
rData,
 sTmp = sTmp.getToken( 0, '\n' );
 sal_Int32 nCols = comphelper::string::getTokenCount(sTmp, 
'\t');
 
+if (nRows > USHRT_MAX || nCols > USHRT_MAX)
+{
+if( bMsg )
+MessageDialog(0, SW_RESSTR(STR_NO_TABLE), 
VCL_MESSAGE_INFO).Execute();
+pDDETyp = 0;
+break;
+}
+
 // at least one column & row must be there
 if( !nRows || !nCols )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: solenv/bin

2015-06-18 Thread Andras Timar

 solenv/bin/modules/installer/download.pm |2 --
 1 file changed, 2 deletions(-)

New commits:
commit a63b8b4afc687d49ad25cbb77e16f835b9820522
Author: Andras Timar 
Date:   Thu Jun 18 12:16:01 2015 +0200

dead code

Change-Id: I0f8de2b856be65e070f9d9b121515aa15ae3ea09

diff --git a/solenv/bin/modules/installer/download.pm 
b/solenv/bin/modules/installer/download.pm
index 37a9123..6b5caab 100644
--- a/solenv/bin/modules/installer/download.pm
+++ b/solenv/bin/modules/installer/download.pm
@@ -305,8 +305,6 @@ sub get_downloadname_productname
 
 elsif ( $allvariables->{'PRODUCTNAME'} eq "LibreOfficeDev" ) { $start = 
"LibreOfficeDev"; }
 
-elsif ( $allvariables->{'PRODUCTNAME'} eq "OxygenOffice" ) { $start = 
"OOOP"; }
-
 elsif ( $allvariables->{'PRODUCTNAME'} eq "" ) { $start = "LibreOffice"; }
 
 else  { $start = $allvariables->{'PRODUCTNAME'}; }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source connectivity/source dbaccess/source dtrans/source editeng/source extensions/source filter/source forms/source fpicker/source framework/source include/conn

2015-06-18 Thread Andrea Gelmini

 chart2/source/model/template/ChartTypeTemplate.hxx   |
2 +-
 chart2/source/view/axes/DateScaling.cxx  |
2 +-
 chart2/source/view/main/VDataSeries.cxx  |
2 +-
 connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx |
2 +-
 connectivity/source/drivers/odbc/OConnection.cxx |
2 +-
 dbaccess/source/ui/inc/dsmeta.hxx|
2 +-
 dbaccess/source/ui/inc/sbagrid.hxx   |
2 +-
 dtrans/source/win32/clipb/WinClipboard.hxx   |
2 +-
 editeng/source/editeng/editundo.cxx  |
2 +-
 extensions/source/abpilot/datasourcehandling.hxx |
2 +-
 filter/source/graphicfilter/idxf/dxfentrd.hxx|
2 +-
 forms/source/component/FormsCollection.hxx   |
2 +-
 fpicker/source/win32/filepicker/previewadapter.cxx   |
2 +-
 framework/source/dispatch/closedispatcher.cxx|
2 +-
 framework/source/jobs/job.cxx|
2 +-
 include/connectivity/parameters.hxx  |
2 +-
 include/osl/thread.hxx   |
2 +-
 include/sfx2/msg.hxx |
2 +-
 include/svtools/editbrowsebox.hxx|
2 +-
 include/toolkit/controls/unocontrolcontainer.hxx |
2 +-
 include/ucbhelper/interactionrequest.hxx |
2 +-
 include/ucbhelper/registerucb.hxx|
2 +-
 include/vcl/textview.hxx |
2 +-
 sc/JunitTest_sc_complex.mk   |
2 +-
 sc/source/filter/inc/pivotcachebuffer.hxx|
2 +-
 sc/source/ui/vba/vbarange.cxx|
2 +-
 sc/source/ui/vba/vbatitle.hxx|
2 +-
 sd/source/ui/remotecontrol/Server.cxx|
2 +-
 sd/source/ui/slidesorter/inc/cache/SlsCacheContext.hxx   |
2 +-
 sdext/source/presenter/PresenterNotesView.hxx|
2 +-
 setup_native/source/win32/customactions/reg4allmsdoc/reg4allmsi.cxx  |
2 +-
 sfx2/source/appl/lnkbase2.cxx|
2 +-
 sfx2/source/appl/newhelp.cxx |
2 +-
 shell/source/win32/shlxthandler/infotips/infotips.cxx|
2 +-
 svx/source/customshapes/EnhancedCustomShape2d.cxx|
2 +-
 svx/source/xoutdev/xattrbmp.cxx  |
2 +-
 sw/qa/extras/ooxmlexport/ooxmlexport5.cxx|
2 +-
 sw/source/core/crsr/findtxt.cxx  |
2 +-
 sw/source/core/doc/docnew.cxx|
2 +-
 sw/source/core/doc/docsort.cxx   |
2 +-
 sw/source/core/docnode/ndsect.cxx|
2 +-
 sw/source/filter/basflt/fltshell.cxx |
2 +-
 sw/source/filter/html/swhtml.cxx |
4 ++--
 sw/source/filter/ww8/docxattributeoutput.hxx |
2 +-
 sw/source/filter/ww8/ww8par6.cxx |
2 +-
 sw/source/uibase/uiview/scroll.cxx   |
2 +-
 unotools/source/ucbhelper/ucblockbytes.cxx   |
4 ++--
 vcl/generic/print/genprnpsp.cxx  |
6 +++---
 vcl/source/window/mouse.cxx  |
2 +-
 xmloff/source/draw/ximpshap.cxx  |
2 +-
 xmloff/source/forms/elementexport.cxx|
2 +-
 xmloff/source/forms/elementexport.hxx|
4 ++--
 xmloff/source/forms/formattributes.hxx   |
2 +-
 xmloff/source/forms/propertyexport.cxx   |
2 +-
 xmloff/source/text/txtexppr.cxx  |
2 +-
 xmloff/source/transform/AttrTransformerAction.hxx|
2 +-
 56 files changed, 61 insertions(+), 61 deletions(-)

New commits:
commit ae150c6a5424d021ce5eb46dc9573f12a4d05445
Author: Andrea Gelmini 
Date:   Tue Jun 16 18:21:52 2015 +0200

Fix typos

Change-Id: Ibfa971952cd330d

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - connectivity/source

2015-06-18 Thread Lionel Elie Mamane

 connectivity/source/drivers/postgresql/pq_preparedstatement.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 729c8baa415ce5dd29597d43f0161c25b4961482
Author: Lionel Elie Mamane 
Date:   Wed Jun 17 12:36:37 2015 +0200

postgresql-sdbc: include error message in SQLException

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

diff --git a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx 
b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
index 73f74bb..57804c0 100644
--- a/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
+++ b/connectivity/source/drivers/postgresql/pq_preparedstatement.cxx
@@ -329,7 +329,7 @@ void PreparedStatement::raiseSQLException(
 buf.appendAscii( "')" );
 OUString error = buf.makeStringAndClear();
 log( m_pSettings, LogLevel::ERROR, error );
-throw SQLException( buf.makeStringAndClear(), *this, OUString(), 1, Any() 
);
+throw SQLException( error, *this, OUString(), 1, Any() );
 }
 
 Reference< XResultSet > PreparedStatement::executeQuery( )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - connectivity/source include/connectivity

2015-06-18 Thread Lionel Elie Mamane

 connectivity/source/commontools/parameters.cxx |   34 +
 include/connectivity/parameters.hxx|3 +-
 2 files changed, 26 insertions(+), 11 deletions(-)

New commits:
commit e1c5fca182e970cb7ce1e3921ba85eb394fcb62b
Author: Lionel Elie Mamane 
Date:   Wed Jun 17 14:32:29 2015 +0200

parameter handling: fix confusion between column name and realname

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

diff --git a/connectivity/source/commontools/parameters.cxx 
b/connectivity/source/commontools/parameters.cxx
index 8459ae9..1f94a59 100644
--- a/connectivity/source/commontools/parameters.cxx
+++ b/connectivity/source/commontools/parameters.cxx
@@ -105,6 +105,8 @@ namespace dbtools
 m_aMasterFields.realloc( 0 );
 m_aDetailFields.realloc( 0 );
 m_sIdentifierQuoteString.clear();
+m_sSpecialCharacters.clear();
+m_xConnectionMetadata.clear();
 ::std::vector< bool > aEmptyArray;
 m_aParametersVisited.swap( aEmptyArray );
 m_bUpToDate = false;
@@ -208,24 +210,32 @@ namespace dbtools
 
 
 OUString ParameterManager::createFilterConditionFromColumnLink(
-const OUString& _rMasterColumn, const OUString& _rDetailLink, 
OUString& _rNewParamName )
+const OUString &_rMasterColumn, const Reference < XPropertySet > 
&xDetailField, OUString &o_rNewParamName )
 {
 OUString sFilter;
-
 // format is:
 //  = :
-sFilter = quoteName( m_sIdentifierQuoteString, _rDetailLink );
-sFilter += " = :";
+{
+OUString tblName;
+xDetailField->getPropertyValue("TableName") >>= tblName;
+if (!tblName.isEmpty())
+sFilter = ::dbtools::quoteTableName( m_xConnectionMetadata, 
tblName, ::dbtools::eInDataManipulation ) + ".";
+}
+{
+OUString colName;
+xDetailField->getPropertyValue("RealName") >>= colName;
+sFilter += quoteName( m_sIdentifierQuoteString, colName ) + " = :";
+}
 
 // generate a parameter name which is not already used
-_rNewParamName = "link_from_";
-_rNewParamName += convertName2SQLName( _rMasterColumn, 
m_sSpecialCharacters );
-while ( m_aParameterInformation.find( _rNewParamName ) != 
m_aParameterInformation.end() )
+o_rNewParamName = "link_from_";
+o_rNewParamName += convertName2SQLName( _rMasterColumn, 
m_sSpecialCharacters );
+while ( m_aParameterInformation.find( o_rNewParamName ) != 
m_aParameterInformation.end() )
 {
-_rNewParamName += "_";
+o_rNewParamName += "_";
 }
 
-return sFilter += _rNewParamName;
+return sFilter += o_rNewParamName;
 }
 
 
@@ -279,8 +289,11 @@ namespace dbtools
 // does the detail name denote a column?
 if ( _rxColumns->hasByName( *pDetailFields ) )
 {
+Reference< XPropertySet > 
xDetailField(_rxColumns->getByName( *pDetailFields ), UNO_QUERY);
+assert(xDetailField.is());
+
 OUString sNewParamName;
-const OUString sFilterCondition = 
createFilterConditionFromColumnLink( *pMasterFields, *pDetailFields, 
sNewParamName );
+const OUString sFilterCondition = 
createFilterConditionFromColumnLink( *pMasterFields, xDetailField, 
sNewParamName );
 OSL_PRECOND( !sNewParamName.isEmpty(), 
"ParameterManager::classifyLinks: createFilterConditionFromColumnLink returned 
nonsense!" );
 
 // remember meta information about this new parameter
@@ -754,6 +767,7 @@ namespace dbtools
 xMeta = xConnection->getMetaData();
 if ( xMeta.is() )
 {
+m_xConnectionMetadata = xMeta;
 m_sIdentifierQuoteString = xMeta->getIdentifierQuoteString();
 m_sSpecialCharacters = xMeta->getExtraNameCharacters();
 }
diff --git a/include/connectivity/parameters.hxx 
b/include/connectivity/parameters.hxx
index dce18c7..ce49959 100644
--- a/include/connectivity/parameters.hxx
+++ b/include/connectivity/parameters.hxx
@@ -126,6 +126,7 @@ namespace dbtools
 
 OUString m_sIdentifierQuoteString;
 OUString m_sSpecialCharacters;
+::com::sun::star::uno::Reference< 
::com::sun::star::sdbc::XDatabaseMetaData > m_xConnectionMetadata;
 
 ::std::vector< bool >   m_aParametersVisited;
 
@@ -244,7 +245,7 @@ namespace dbtools
 OUString
 createFilterConditionFromColumnLink(
 const OUString& /* [in]  */ _rMasterColumn,
-const OUString& /* [in]  */ _rDetailColumn,
+const ::com::sun::star::uno::Reference<

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - connectivity/source

2015-06-18 Thread Lionel Elie Mamane

 connectivity/source/drivers/postgresql/pq_tools.cxx |   34 ++--
 1 file changed, 24 insertions(+), 10 deletions(-)

New commits:
commit 35d939bb69fdc02b6baa47dc1e3181e5cfe23980
Author: Lionel Elie Mamane 
Date:   Wed Jun 17 14:00:46 2015 +0200

postgresql-sdbc: fixup string2intarray

this allows getGeneratedValues to work

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

diff --git a/connectivity/source/drivers/postgresql/pq_tools.cxx 
b/connectivity/source/drivers/postgresql/pq_tools.cxx
index 8cd156f..4d75e8c3 100644
--- a/connectivity/source/drivers/postgresql/pq_tools.cxx
+++ b/connectivity/source/drivers/postgresql/pq_tools.cxx
@@ -862,33 +862,46 @@ com::sun::star::uno::Sequence< sal_Int32 > 
string2intarray( const OUString & str
 if( str.getLength() > 1 )
 {
 sal_Int32 start = 0;
-while ( iswspace( str.iterateCodePoints(&start) ) )
+sal_uInt32 c;
+while ( iswspace( (c=str.iterateCodePoints(&start)) ) )
 if ( start == strlen)
 return ret;
-if ( str.iterateCodePoints(&start) != L'{' )
+if ( c != L'{' )
 return ret;
-while ( iswspace( str.iterateCodePoints(&start) ) )
+while ( iswspace( c=str.iterateCodePoints(&start) ) )
 if ( start == strlen)
 return ret;
-if ( str.iterateCodePoints(&start, 0) == L'}' )
+if ( c == L'}' )
 return ret;
 
 std::vector< sal_Int32 > vec;
 do
 {
 OUString digits;
-sal_Int32 c;
-while ( isdigit( c = str.iterateCodePoints(&start) ) )
+do
 {
+if(!iswspace(c))
+break;
 if ( start == strlen)
 return ret;
-digits += OUString(c);
-}
+} while ( (c=str.iterateCodePoints(&start)) );
+do
+{
+if (!iswdigit(c))
+break;
+if ( start == strlen)
+return ret;
+digits += OUString(&c, 1);
+} while ( (c = str.iterateCodePoints(&start)) );
 vec.push_back( digits.toInt32() );
-while ( iswspace( str.iterateCodePoints(&start) ) )
+do
+{
+if(!iswspace(c))
+break;
 if ( start == strlen)
 return ret;
-if ( str.iterateCodePoints(&start, 0) == L'}' )
+} while ( (c=str.iterateCodePoints(&start)) );
+if ( c == L'}' )
 break;
 if ( str.iterateCodePoints(&start) != L',' )
 return ret;
@@ -896,6 +909,7 @@ com::sun::star::uno::Sequence< sal_Int32 > string2intarray( 
const OUString & str
 return ret;
 } while( true );
 // vec is guaranteed non-empty
+assert(vec.size() > 0);
 ret = com::sun::star::uno::Sequence< sal_Int32 > ( &vec[0] , 
vec.size() );
 }
 return ret;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Miklos Vajna

 sw/source/uibase/uno/unotxdoc.cxx |   16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

New commits:
commit 193b907b2bc49b9e48cfab2583e81a24aaa2e666
Author: Miklos Vajna 
Date:   Thu Jun 18 14:03:00 2015 +0200

SwXTextDocument::getTextSelection: fix missing editeng forward

When editing shape text, the text selection should be provided by
editeng.

Change-Id: I379f89fc28d2ff8172d0411bba347c959de6ab29

diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index 268148e..6b81c637 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -142,6 +142,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -3256,8 +3257,21 @@ void SwXTextDocument::setTextSelection(int nType, int 
nX, int nY)
 
 OString SwXTextDocument::getTextSelection(const char* pMimeType)
 {
+uno::Reference xTransferable;
+
 SwWrtShell* pWrtShell = pDocShell->GetWrtShell();
-uno::Reference xTransferable(new 
SwTransferable(*pWrtShell));
+if (SdrView* pSdrView = pWrtShell->GetDrawView())
+{
+if (pSdrView->GetTextEditObject())
+{
+// Editing shape text
+EditView& rEditView = 
pSdrView->GetTextEditOutlinerView()->GetEditView();
+xTransferable = 
rEditView.GetEditEngine()->CreateTransferable(rEditView.GetSelection());
+}
+}
+
+if (!xTransferable.is())
+xTransferable = new SwTransferable(*pWrtShell);
 
 // Take care of UTF-8 text here.
 OString aMimeType(pMimeType);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - scaddins/source

2015-06-18 Thread Caolán McNamara

 scaddins/source/analysis/analysis.cxx |   29 +
 scaddins/source/datefunc/datefunc.cxx |   23 +++
 scaddins/source/pricing/pricing.cxx   |   25 +++--
 3 files changed, 23 insertions(+), 54 deletions(-)

New commits:
commit e66fa90393c29c4d5ac3c963ff436c5edc5dedce
Author: CaolÃ¡n McNamara 
Date:   Mon Feb 16 14:49:45 2015 +

Related: tdf#91214 crash on exit after loading comment #20

was Related: fdo#74880 small leak in scaddins

(cherry picked from commit d929a1715da3088229f6b41b03e9713fe110b881)

Change-Id: I331a3a358c5275b770aa1319f43af21b9bb3fd83
Reviewed-on: https://gerrit.libreoffice.org/16298
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/scaddins/source/analysis/analysis.cxx 
b/scaddins/source/analysis/analysis.cxx
index ddd5c53..1179673 100644
--- a/scaddins/source/analysis/analysis.cxx
+++ b/scaddins/source/analysis/analysis.cxx
@@ -119,14 +119,10 @@ OUString AnalysisAddIn::GetFuncDescrStr( sal_uInt16 
nResId, sal_uInt16 nStrIndex
 
 void AnalysisAddIn::InitData( void )
 {
-if( pResMgr )
-delete pResMgr;
-
-OString aModName( "analysis" );
-pResMgr = ResMgr::CreateResMgr( aModName.getStr(), LanguageTag( aFuncLoc) 
);
+delete pResMgr;
+pResMgr = ResMgr::CreateResMgr("analysis", LanguageTag(aFuncLoc));
 
-if( pFD )
-delete pFD;
+delete pFD;
 
 if( pResMgr )
 pFD = new FuncDataList( *pResMgr );
@@ -152,17 +148,11 @@ AnalysisAddIn::AnalysisAddIn( const uno::Reference< 
uno::XComponentContext >& xC
 
 AnalysisAddIn::~AnalysisAddIn()
 {
-if( pFD )
-delete pFD;
-
-if( pFactDoubles )
-delete[] pFactDoubles;
-
-if( pCDL )
-delete pCDL;
-
-if( pDefLocales )
-delete[] pDefLocales;
+delete pResMgr;
+delete pCDL;
+delete[] pFactDoubles;
+delete pFD;
+delete[] pDefLocales;
 }
 
 sal_Int32 AnalysisAddIn::getDateMode(
@@ -234,8 +224,7 @@ uno::Sequence< OUString > 
AnalysisAddIn::getSupportedServiceNames_Static()
 uno::Reference< uno::XInterface > SAL_CALL AnalysisAddIn_CreateInstance(
 const uno::Reference< lang::XMultiServiceFactory >& xServiceFact )
 {
-static uno::Reference< uno::XInterface > xInst = (cppu::OWeakObject*) new 
AnalysisAddIn( comphelper::getComponentContext(xServiceFact) );
-return xInst;
+return (cppu::OWeakObject*) new AnalysisAddIn( 
comphelper::getComponentContext(xServiceFact) );
 }
 
 // XServiceName
diff --git a/scaddins/source/datefunc/datefunc.cxx 
b/scaddins/source/datefunc/datefunc.cxx
index df62929..4163253 100644
--- a/scaddins/source/datefunc/datefunc.cxx
+++ b/scaddins/source/datefunc/datefunc.cxx
@@ -166,8 +166,7 @@ ScaFuncRes::ScaFuncRes( ResId& rResId, ResMgr& rResMgr, 
sal_uInt16 nIndex, OUStr
 uno::Reference< uno::XInterface > SAL_CALL ScaDateAddIn_CreateInstance(
 const uno::Reference< lang::XMultiServiceFactory >& )
 {
-static uno::Reference< uno::XInterface > xInst = (cppu::OWeakObject*) new 
ScaDateAddIn();
-return xInst;
+return (cppu::OWeakObject*) new ScaDateAddIn();
 }
 
 extern "C" {
@@ -208,12 +207,9 @@ ScaDateAddIn::ScaDateAddIn() :
 
 ScaDateAddIn::~ScaDateAddIn()
 {
-if( pFuncDataList )
-delete pFuncDataList;
-if( pDefLocales )
-delete[] pDefLocales;
-
-// pResMgr already deleted (_all_ resource managers are deleted _before_ 
this dtor is called)
+delete pFuncDataList;
+delete pResMgr;
+delete[] pDefLocales;
 }
 
 static const sal_Char*  pLang[] = { "de", "en" };
@@ -252,14 +248,9 @@ ResMgr& ScaDateAddIn::GetResMgr() throw( 
uno::RuntimeException )
 
 void ScaDateAddIn::InitData()
 {
-if( pResMgr )
-delete pResMgr;
-
-OString aModName( "date" );
-pResMgr = ResMgr::CreateResMgr( aModName.getStr(), LanguageTag( aFuncLoc) 
);
-
-if( pFuncDataList )
-delete pFuncDataList;
+delete pResMgr;
+pResMgr = ResMgr::CreateResMgr("date", LanguageTag(aFuncLoc));
+delete pFuncDataList;
 
 pFuncDataList = pResMgr ? new ScaFuncDataList( *pResMgr ) : NULL;
 
diff --git a/scaddins/source/pricing/pricing.cxx 
b/scaddins/source/pricing/pricing.cxx
index 7453fd8..f181d06 100644
--- a/scaddins/source/pricing/pricing.cxx
+++ b/scaddins/source/pricing/pricing.cxx
@@ -171,11 +171,9 @@ ScaFuncRes::ScaFuncRes( ResId& rResId, ResMgr& rResMgr, 
sal_uInt16 nIndex, OUStr
 uno::Reference< uno::XInterface > SAL_CALL ScaPricingAddIn_CreateInstance(
 const uno::Reference< lang::XMultiServiceFactory >& )
 {
-static uno::Reference< uno::XInterface > xInst = (cppu::OWeakObject*) new 
ScaPricingAddIn();
-return xInst;
+return (cppu::OWeakObject*) new ScaPricingAddIn();
 }
 
-
 extern "C" {
 
 SAL_DLLPUBLIC_EXPORT void * SAL_CALL pricing_component_getFactory(
@@ -214,12 +212,9 @@ ScaPricingAddIn::ScaPricingAddIn() :
 
 ScaPricingAddIn::~ScaPricingAddIn()
 {
-if( pFuncDataList )
-delet

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

2015-06-18 Thread Caolán McNamara

 sfx2/source/appl/linkmgr2.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a2d8798e42cc11c0ed414014a8453e89bb6ab410
Author: CaolÃ¡n McNamara 
Date:   Tue Jun 16 16:43:15 2015 +0100

crash on use of 'echo hello' as dde command in insert section

Change-Id: Ic46be8ac6da04663096e682d17faa214b324e8bf
(cherry picked from commit ff2dd7942e42476432c2db08da71d85be7a14075)
(cherry picked from commit b5fa5c0324298e70fcbfbde482fea6d554fc8760)
Reviewed-on: https://gerrit.libreoffice.org/16313
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx
index 314cd81..ebcb1d5 100644
--- a/sfx2/source/appl/linkmgr2.cxx
+++ b/sfx2/source/appl/linkmgr2.cxx
@@ -272,7 +272,7 @@ bool LinkManager::GetDisplayNames( const SvBaseLink * pLink,
 if( pFile )
 *pFile = sTopic;
 if( pLinkStr )
-*pLinkStr = sCmd.copy( nTmp );
+*pLinkStr = nTmp != -1 ? sCmd.copy(nTmp) : OUString();
 bRet = true;
 }
 break;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Caolán McNamara

 sfx2/source/appl/appopen.cxx |   10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)

New commits:
commit c6ae5e6bb11e0cb810df61a888e62dde831eb60d
Author: CaolÃ¡n McNamara 
Date:   Tue Jun 16 09:29:39 2015 +0100

Resolves: tdf#88911 Crash when dragging unsupported url to navigator pane

Change-Id: I9d4fc8e3edac699c8543ab9dce8d0e35bbf40e5b
(cherry picked from commit 9ef671364ff9fbb552a5433053af9283d12d90c7)
(cherry picked from commit 527496750bbead21f33766d6ec0aba02a2380ab2)
Reviewed-on: https://gerrit.libreoffice.org/16304
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx
index 742d841..2339d3d 100644
--- a/sfx2/source/appl/appopen.cxx
+++ b/sfx2/source/appl/appopen.cxx
@@ -1118,10 +1118,14 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq 
)
 }
 }
 
-if ( pLinkItem )
+if (pLinkItem)
 {
-SfxPoolItem* pRet = rReq.GetReturnValue()->Clone();
-pLinkItem->GetValue().Call(pRet);
+const SfxPoolItem* pRetValue = rReq.GetReturnValue();
+if (pRetValue)
+{
+SfxPoolItem* pClone = pRetValue->Clone();
+pLinkItem->GetValue().Call(pClone);
+}
 delete pLinkItem;
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Varun

 sw/inc/docary.hxx  |2 +-
 sw/inc/unocrsrhelper.hxx   |2 +-
 sw/qa/extras/uiwriter/uiwriter.cxx |   22 ++
 3 files changed, 24 insertions(+), 2 deletions(-)

New commits:
commit 69295a44dc8b1e78a32f074cbfcf1ed84fd93b43
Author: Varun 
Date:   Thu Jun 18 01:22:54 2015 +0530

Added test for del of table redlines rhbz#1198848

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

diff --git a/sw/inc/docary.hxx b/sw/inc/docary.hxx
index 5544dab..dcacc21 100644
--- a/sw/inc/docary.hxx
+++ b/sw/inc/docary.hxx
@@ -257,7 +257,7 @@ public:
 SwExtraRedline* GetRedline( sal_uInt16 uIndex ) const   { return 
m_aExtraRedlines.operator[]( uIndex );  }
 bool IsEmpty() const  { return 
m_aExtraRedlines.empty();   }
 
-bool DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& rTable, bool 
bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
+SW_DLLPUBLIC bool DeleteAllTableRedlines( SwDoc* pDoc, const SwTable& 
rTable, bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
 bool DeleteTableRowRedline ( SwDoc* pDoc, const SwTableLine& rTableLine, 
bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
 bool DeleteTableCellRedline( SwDoc* pDoc, const SwTableBox& rTableBox, 
bool bSaveInUndo, sal_uInt16 nRedlineTypeToDelete );
 };
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index a7bd39e..9550362 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -126,7 +126,7 @@ namespace SwUnoCursorHelper
 const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >& RedlineProperties )
 throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
 
-voidmakeTableCellRedline( SwTableBox& rTableBox, const OUString& 
RedlineType,
+SW_DLLPUBLIC voidmakeTableCellRedline( SwTableBox& rTableBox, const 
OUString& RedlineType,
 const ::com::sun::star::uno::Sequence< 
::com::sun::star::beans::PropertyValue >& RedlineProperties )
 throw (::com::sun::star::lang::IllegalArgumentException, 
::com::sun::star::uno::RuntimeException);
 
diff --git a/sw/qa/extras/uiwriter/uiwriter.cxx 
b/sw/qa/extras/uiwriter/uiwriter.cxx
index b416777..22cd38a 100644
--- a/sw/qa/extras/uiwriter/uiwriter.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -91,6 +92,7 @@ public:
 void testTdf68183();
 void testCp1000115();
 void testTdf90003();
+void testdelofTableRedlines();
 void testExportToPicture();
 void testSearchWithTransliterate();
 void testTableBackgroundColor();
@@ -132,6 +134,7 @@ public:
 CPPUNIT_TEST(testTdf68183);
 CPPUNIT_TEST(testCp1000115);
 CPPUNIT_TEST(testTdf90003);
+CPPUNIT_TEST(testdelofTableRedlines);
 CPPUNIT_TEST(testExportToPicture);
 CPPUNIT_TEST(testSearchWithTransliterate);
 CPPUNIT_TEST(testTableBackgroundColor);
@@ -875,6 +878,25 @@ void SwUiWriterTest::testTdf90003()
 assertXPath(pXmlDoc, "//Special[@nType='POR_FLY']", 0);
 }
 
+void SwUiWriterTest::testdelofTableRedlines()
+{
+SwDoc* pDoc = createDoc();
+SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
+SwInsertTableOptions TableOpt(tabopts::DEFAULT_BORDER, 0);
+const SwTable& tbl = pWrtShell->InsertTable(TableOpt, 1, 3);
+uno::Reference xTable(getParagraphOrTable(1), 
uno::UNO_QUERY);
+CPPUNIT_ASSERT_EQUAL(sal_Int32(1), xTable->getRows()->getCount());
+CPPUNIT_ASSERT_EQUAL(sal_Int32(3), xTable->getColumns()->getCount());
+uno::Sequence aDescriptor;
+
SwUnoCursorHelper::makeTableCellRedline((*const_cast(tbl.GetTableBox(OUString("A1",
 OUString("TableCellInsert"), aDescriptor);
+
SwUnoCursorHelper::makeTableCellRedline((*const_cast(tbl.GetTableBox(OUString("B1",
 OUString("TableCellInsert"), aDescriptor);
+
SwUnoCursorHelper::makeTableCellRedline((*const_cast(tbl.GetTableBox(OUString("C1",
 OUString("TableCellInsert"), aDescriptor);
+IDocumentRedlineAccess& pDocRed = pDoc->getIDocumentRedlineAccess();
+SwExtraRedlineTable& redtbl = pDocRed.GetExtraRedlineTable();
+redtbl.DeleteAllTableRedlines(pDoc, tbl, false, sal_uInt16(USHRT_MAX));
+CPPUNIT_ASSERT(redtbl.IsEmpty());
+}
+
 void SwUiWriterTest::testExportToPicture()
 {
 createDoc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: PyUNO usability improvements

2015-06-18 Thread Stephan Bergmann


On 06/18/2015 11:34 AM, Matthew J. Francis wrote:

What about converting this to a feature branch and running with it for
a while, with the aim of landing a properly mature feature for 5.1?


Avoid feature branches at all cost.  If you are reasonably confident 
about a change, push it to master.  If it later turns out to be a bad 
idea, revert.


Feature branches are virtually non-existent in peoples' minds (except 
the author's, maybe).  And an unpleasant surprise for all when they do 
hit master.

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

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

2015-06-18 Thread Caolán McNamara

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |   28 +++-
 1 file changed, 23 insertions(+), 5 deletions(-)

New commits:
commit 50cfcd91a0893ff795fc1cf1a2e7c3f7c6da5326
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 13:37:52 2015 +0100

gtk3: implement paste everything else into us

Change-Id: I39c3e5646a5a1ea07aa881cad584a0b7ae9bd005

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index a96d1e4..cb26b26 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -82,6 +82,8 @@ namespace
 class GtkTransferable : public ::cppu::WeakImplHelper1 <
 css::datatransfer::XTransferable >
 {
+private:
+std::map m_aMimeTypeToAtom;
 public:
 GtkTransferable()
 {
@@ -95,24 +97,37 @@ public:
  * XTransferable
  */
 
-virtual css::uno::Any SAL_CALL getTransferData( const 
css::datatransfer::DataFlavor& aFlavor )
+virtual css::uno::Any SAL_CALL getTransferData(const 
css::datatransfer::DataFlavor& rFlavor)
 throw(css::datatransfer::UnsupportedFlavorException,
   css::io::IOException,
   css::uno::RuntimeException, std::exception
   ) SAL_OVERRIDE
 {
-css::uno::Any aRet;
 GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
-if (aFlavor.MimeType == "text/plain;charset=utf-16")
+if (rFlavor.MimeType == "text/plain;charset=utf-16")
 {
 gchar *pText = gtk_clipboard_wait_for_text(clipboard);
 OUString aStr(pText, rtl_str_getLength(pText),
 RTL_TEXTENCODING_UTF8);
 g_free(pText);
+css::uno::Any aRet;
 aRet <<= aStr.replaceAll("\r\n", "\n");
+return aRet;
 }
-else
-fprintf(stderr, "TO-DO getTransferData %s\n", 
OUStringToOString(aFlavor.MimeType, RTL_TEXTENCODING_UTF8).getStr());
+
+auto it = m_aMimeTypeToAtom.find(rFlavor.MimeType);
+if (it == m_aMimeTypeToAtom.end())
+return css::uno::Any();
+
+css::uno::Any aRet;
+GtkSelectionData* data = gtk_clipboard_wait_for_contents(clipboard,
+ it->second);
+gint length;
+const guchar *rawdata = gtk_selection_data_get_data_with_length(data,
+
&length);
+Sequence aSeq(reinterpret_cast(rawdata), 
length);
+gtk_selection_data_free(data);
+aRet <<= aSeq;
 return aRet;
 }
 
@@ -146,6 +161,9 @@ public:
 aFlavor.MimeType = OUString(pFinalName,
 rtl_str_getLength(pFinalName),
 RTL_TEXTENCODING_UTF8);
+
+m_aMimeTypeToAtom[aFlavor.MimeType] = targets[i];
+
 aFlavor.DataType = cppu::UnoType>::get();
 
 sal_Int32 nIndex(0);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host/config_opengl.h.in vcl/source

2015-06-18 Thread Stephan Bergmann

 config_host/config_opengl.h.in  |2 +-
 vcl/source/opengl/OpenGLContext.cxx |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 83fc2cfb34b584f41d27a5f04dd9405cf55bd528
Author: Stephan Bergmann 
Date:   Thu Jun 18 14:42:03 2015 +0200

loplugin:checkconfigmacros

Change-Id: Ia94c53457e328db9bdd8dd22d7a39e49c358301c

diff --git a/config_host/config_opengl.h.in b/config_host/config_opengl.h.in
index b2c6358..67b9e47 100644
--- a/config_host/config_opengl.h.in
+++ b/config_host/config_opengl.h.in
@@ -5,6 +5,6 @@ Settings for OpenGL
 #ifndef CONFIG_OPENGL_H
 #define CONFIG_OPENGL_H
 
-#undef HAVE_GLEW_1_12
+#define HAVE_GLEW_1_12 0
 
 #endif
diff --git a/vcl/source/opengl/OpenGLContext.cxx 
b/vcl/source/opengl/OpenGLContext.cxx
index 326250c..f7f2d0f 100644
--- a/vcl/source/opengl/OpenGLContext.cxx
+++ b/vcl/source/opengl/OpenGLContext.cxx
@@ -440,7 +440,7 @@ APIENTRY
 #endif
 debug_callback(GLenum source, GLenum type, GLuint id,
 GLenum severity, GLsizei , const GLchar* message,
-#if defined HAVE_GLEW_1_12
+#if HAVE_GLEW_1_12
 const GLvoid*
 #else
 GLvoid*
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: PyUNO usability improvements

2015-06-18 Thread Matthew J. Francis


On 18/06/2015 20:27, Stephan Bergmann wrote:

On 06/18/2015 11:34 AM, Matthew J. Francis wrote:

What about converting this to a feature branch and running with it for
a while, with the aim of landing a properly mature feature for 5.1?


Avoid feature branches at all cost.  If you are reasonably confident
about a change, push it to master.  If it later turns out to be a bad
idea, revert.


OK. That being the case, I will go ahead with what I'm confident of and
keep working on the rest.

Regards
Matthew Francis
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-06-18 Thread Caolán McNamara

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |   35 +++
 1 file changed, 27 insertions(+), 8 deletions(-)

New commits:
commit a26d21acb34d6e35a12cf8afa3cc64701f384687
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 13:56:29 2015 +0100

gtk3: implement isDataFlavorSupported

Change-Id: Ia381d26a1c6a8f22aafef924215bc64b3c3473c6

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index cb26b26..0b5ea9f 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -77,6 +77,19 @@ namespace
 // PIXMAP
 { "PIXMAP", "image/bmp" }
 };
+
+class DataFlavorEq : public std::unary_function
+{
+private:
+const css::datatransfer::DataFlavor& m_rData;
+public:
+explicit DataFlavorEq(const css::datatransfer::DataFlavor& rData) : 
m_rData(rData) {}
+bool operator() (const css::datatransfer::DataFlavor& rData) const
+{
+return rData.MimeType == m_rData.MimeType &&
+   rData.DataType  == m_rData.DataType;
+}
+};
 }
 
 class GtkTransferable : public ::cppu::WeakImplHelper1 <
@@ -131,12 +144,12 @@ public:
 return aRet;
 }
 
-virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL 
getTransferDataFlavors(  )
-throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+std::vector getTransferDataFlavorsAsVector()
 {
+std::vector aVector;
+
 GtkClipboard* clipboard = gtk_clipboard_get(GDK_SELECTION_CLIPBOARD);
 
-std::vector aVector;
 GdkAtom *targets;
 gint n_targets;
 if (gtk_clipboard_wait_for_targets(clipboard, &targets, &n_targets))
@@ -195,16 +208,22 @@ public:
 }
 }
 
-return comphelper::containerToSequence(aVector);
+return aVector;
+}
+
+virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL 
getTransferDataFlavors()
+throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
+{
+return 
comphelper::containerToSequence(getTransferDataFlavorsAsVector());
 }
 
-virtual sal_Bool SAL_CALL isDataFlavorSupported( const 
css::datatransfer::DataFlavor& aFlavor )
+virtual sal_Bool SAL_CALL isDataFlavorSupported(const 
css::datatransfer::DataFlavor& rFlavor)
 throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
 {
-fprintf(stderr, "TODO isDataFlavorSupported\n");
+const std::vector aAll =
+getTransferDataFlavorsAsVector();
 
-(void)aFlavor;
-return false;
+return std::find_if(aAll.begin(), aAll.end(), DataFlavorEq(rFlavor)) 
!= aAll.end();
 }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: editeng/inc framework/inc include/comphelper oox/inc sw/inc

2015-06-18 Thread Caolán McNamara

 editeng/inc/pch/precompiled_editeng.hxx |1 
 framework/inc/pch/precompiled_fwk.hxx   |1 
 include/comphelper/sequenceasvector.hxx |  251 
 oox/inc/pch/precompiled_oox.hxx |1 
 sw/inc/pch/precompiled_msword.hxx   |1 
 5 files changed, 255 deletions(-)

New commits:
commit c60c3704c69c94bb9e44b4a0d456f842f962d198
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 13:58:39 2015 +0100

drop unused sequenceasvector.hxx (see sequence.hxx)

Change-Id: Ib6d91f1ee427d5f94eed75e478f0809346f38e05

diff --git a/editeng/inc/pch/precompiled_editeng.hxx 
b/editeng/inc/pch/precompiled_editeng.hxx
index 4502080..5fa420b 100644
--- a/editeng/inc/pch/precompiled_editeng.hxx
+++ b/editeng/inc/pch/precompiled_editeng.hxx
@@ -190,7 +190,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/framework/inc/pch/precompiled_fwk.hxx 
b/framework/inc/pch/precompiled_fwk.hxx
index 22f6ddd..fe6602d 100644
--- a/framework/inc/pch/precompiled_fwk.hxx
+++ b/framework/inc/pch/precompiled_fwk.hxx
@@ -273,7 +273,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/comphelper/sequenceasvector.hxx 
b/include/comphelper/sequenceasvector.hxx
deleted file mode 100644
index 6b85e72..000
--- a/include/comphelper/sequenceasvector.hxx
+++ /dev/null
@@ -1,251 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- * This file incorporates work covered by the following license notice:
- *
- *   Licensed to the Apache Software Foundation (ASF) under one or more
- *   contributor license agreements. See the NOTICE file distributed
- *   with this work for additional information regarding copyright
- *   ownership. The ASF licenses this file to you under the Apache
- *   License, Version 2.0 (the "License"); you may not use this file
- *   except in compliance with the License. You may obtain a copy of
- *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#ifndef INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
-#define INCLUDED_COMPHELPER_SEQUENCEASVECTOR_HXX
-
-#include 
-#include 
-#include 
-
-#include 
-
-/** This should not be used. Use the functions in
- * comphelper/vectortosequence.hxx
- * @deprecated
- */
-
-namespace comphelper{
-
-
-/** @short  Implements a stl vector on top of any
-uno sequence.
-
-@descr  That provides the possibility to modify
-sequences very easy ...
-Of course this can be useful only, if
-count of modifications is high, so copying
-of the sequence make sense!
- */
-template< class TElementType >
-class SequenceAsVector : public ::std::vector< TElementType >
-{
-
-// types
-
-public:
-
-
-/** @short  When inheriting from a template using typename is 
generally required when using
-types from the base! */
-typedef typename ::std::vector< TElementType >::const_iterator 
const_iterator;
-
-
-/** @short  When inheriting from a template using typename is 
generally required when using
-types from the base! */
-typedef typename ::std::vector< TElementType >::iterator iterator;
-
-
-// interface
-public:
-
-
-/** @short  default ctor, to create an empty list.
- */
-SequenceAsVector()
-{}
-
-
-/** @short  default dtor
- */
-~SequenceAsVector()
-{}
-
-
-/** @short  creates a new vector with the given length.
-
-@param  nLength
-the number of elements for the new vector.
- */
-explicit SequenceAsVector(sal_Int32 nLength) :
-::std::vector< TElementType >( static_cast< size_t >( nLength ) )
-{
-}
-
-
-/** @short  creates a new deque from the given uno sequence.
-
-@param  lSource
-contains the new items for this deque.
- */
-SequenceAsVector(const ::com::sun::star::uno::Sequence< TElementType 
>& lSource)
-{
-(*this) << lSource;
-}
-
-
-/** @short  creates a new instance from the given Any, which
-of course must contain a valid sequence using the
-right element type for every item.
-
-@attention  If the given Any is an empty one
-(if its set to VOID), no exception
-is thrown. In such case this instance will
-be created as an empty one too!
-
-@param  aSource
-this any must contain a suitable sequence. :-)
-
-

Crash test update

2015-06-18 Thread Crashtest VM

New crashtest update available at 
http://dev-builds.libreoffice.org/crashtest/8e1ad966262932516b3368d9b5c44becb29524d4/


exportCrashes.csv
Description: Binary data


importCrash.csv
Description: Binary data


validationErrors.csv
Description: Binary data
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

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

2015-06-18 Thread Maxim Monastirsky

 svx/source/sidebar/nbdtmg.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 820383be6221bf0fc0ed972f2bda786affaf1a74
Author: Maxim Monastirsky 
Date:   Thu Jun 18 16:15:29 2015 +0300

There are only 8 available strings

for RID_SVXSTR_SINGLENUM_DESCRIPTIONS, but since
71b35212265bb93b10ca35ab964a36e6b6cc552b, we're
allowing here more than 8 items. So don't try to get
strings for those items, the same way we
restrict that in SvxNumValueSet::SetNumberingSettings.
(Although these string are (still) not used anywhere
AFAIK.)

Change-Id: Iaa538e4aebfc72729646f0befc7bcf8e58d6cbee

diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 69384f1..d9ccf68 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -1312,7 +1312,8 @@ void NumberingTypeMgr::Init()
 pNumEntry->nIndex = i + 1;
 pNumEntry->nIndexDefault = i;
 pNumEntry->pNumSetting = pNew;
-pNumEntry->sDescription = SVX_RESSTR( 
RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
+if ( i < 8 )
+pNumEntry->sDescription = SVX_RESSTR( 
RID_SVXSTR_SINGLENUM_DESCRIPTIONS + i );
 
pNumberSettingsArr->push_back(std::shared_ptr(pNumEntry));
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Philippe Jung

 framework/source/uielement/toolbarmanager.cxx |   53 +-
 1 file changed, 27 insertions(+), 26 deletions(-)

New commits:
commit 79be3a5e3856593bb759b6e521f06dc99c69c0ae
Author: Philippe Jung 
Date:   Thu Jun 18 15:16:00 2015 +0200

Rename some toolbarmanager related variables

Renames some variable to ease the understanding of what does what

Change-Id: Idd84eb89b7c1fb56dd43d66edfbbeafedc319095
Reviewed-on: https://gerrit.libreoffice.org/16360
Reviewed-by: Philippe Jung 
Tested-by: Philippe Jung 

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index ee1fe47..ac34a54 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1678,12 +1678,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 // popup menu for quick customization
 bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled();
-::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
+::PopupMenu aQuickCustomizationMenu( FwkResId( 
POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
 
 if ( m_pToolBar->IsCustomize() )
 {
 sal_uInt16nPos( 0 );
-::PopupMenu*  pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
+::PopupMenu*  pVisibleItemsPopupMenu( 
aQuickCustomizationMenu.GetPopupMenu( 1 ));
 
 boolbIsFloating( false );
 
@@ -1693,72 +1693,73 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 if ( !bIsFloating )
 {
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
+aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, 
false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
 Reference< XDockableWindow > xDockable( 
VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
 if( xDockable.is() )
-aPopupMenu.CheckItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, 
xDockable->isLocked() );
+aQuickCustomizationMenu.CheckItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable->isLocked() );
 }
 else
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false 
);
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
 
 if ( SvtMiscOptions().DisableUICustomization() )
 {
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false 
);
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
 }
 
 // Disable menu item CLOSE if the toolbar has no closer
 if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) )
-aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
+aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
 
+// Go through all toolbar items and add them to the context menu
 for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
 {
 if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON )
 {
 sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
 OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
-pItemMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
-pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
m_pToolBar->IsItemVisible( nId ) );
-pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
aCommandURL );
-pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
- GetImageFromURL( m_xFrame, 
aCommandURL, false )
-   );
+pVisibleItemsPopupMenu->InsertItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), 
MenuItemBits::CHECKABLE );
+pVisibleItemsPopupMenu->CheckItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
+pVisibleItemsPopupMenu->SetItemCommand( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
+Image aImage( GetImageFromURL( m_xFrame, aCommandURL, false ) 
);
+pVisibleItemsPopupMenu->SetItemImage( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
 }
 else
 {
-pItemMenu->InsertSeparator();
+pVisibleItemsPopupMenu->InsertS

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

2015-06-18 Thread Philippe Jung

 framework/source/uielement/toolbarmanager.cxx |   18 ++
 vcl/source/window/toolbox2.cxx|2 ++
 2 files changed, 20 insertions(+)

New commits:
commit 3090550b5297c86b63ba09ed1aa13bce4c0e5b70
Author: Philippe Jung 
Date:   Thu Jun 18 15:19:14 2015 +0200

tdf#91953 Mixture of icon sizes

Now, whatever the size of toolbar icons, the toolbar
context menu always shows small icons.

Change-Id: Id17df15278d74ae75a3e82d54ecf7af310e0ceb4
Reviewed-on: https://gerrit.libreoffice.org/16361
Reviewed-by: Philippe Jung 
Tested-by: Philippe Jung 

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index ac34a54..fbb1301 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1713,6 +1713,11 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) )
 aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
 
+// Temporary stores a Command --> Url map to update contextual menu 
with the
+// correct icons. The popup icons are by default the same as those in 
the
+// toolbar. They are not correct for contextual popup menu.
+std::map< OUString, Image > commandToImage;
+
 // Go through all toolbar items and add them to the context menu
 for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
 {
@@ -1724,6 +1729,7 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 pVisibleItemsPopupMenu->CheckItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
 pVisibleItemsPopupMenu->SetItemCommand( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
 Image aImage( GetImageFromURL( m_xFrame, aCommandURL, false ) 
);
+commandToImage[aCommandURL] = aImage;
 pVisibleItemsPopupMenu->SetItemImage( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aImage );
 }
 else
@@ -1731,6 +1737,18 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 pVisibleItemsPopupMenu->InsertSeparator();
 }
 }
+
+// Now we go through all the contextual menu to update the icons
+std::map< OUString, Image >::iterator it;
+for ( nPos = 0; nPos < pMenu->GetItemCount(); ++nPos )
+{
+sal_uInt16 nId = pMenu->GetItemId( nPos );
+OUString cmdUrl = pMenu->GetItemCommand( nId );
+it = commandToImage.find( cmdUrl );
+if (it != commandToImage.end()) {
+pMenu->SetItemImage( nId, it->second );
+}
+}
 }
 else
 {
diff --git a/vcl/source/window/toolbox2.cxx b/vcl/source/window/toolbox2.cxx
index 3e04d1b..585cdb7 100644
--- a/vcl/source/window/toolbox2.cxx
+++ b/vcl/source/window/toolbox2.cxx
@@ -1827,6 +1827,7 @@ void ToolBox::UpdateCustomMenu()
 {
 sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START;
 pMenu->InsertItem( id, it->maText, it->maImageOriginal, 
MenuItemBits::NONE, OString());
+pMenu->SetItemCommand( id, it->maCommandStr );
 pMenu->EnableItem( id, it->mbEnabled );
 pMenu->CheckItem ( id, it->meState == TRISTATE_TRUE );
 }
@@ -1843,6 +1844,7 @@ void ToolBox::UpdateCustomMenu()
 {
 sal_uInt16 id = it->mnId + TOOLBOX_MENUITEM_START;
 pMenu->InsertItem( id, it->maText, it->maImageOriginal, 
MenuItemBits::NONE, OString() );
+pMenu->SetItemCommand( id, it->maCommandStr );
 pMenu->EnableItem( id, it->mbEnabled );
 pMenu->CheckItem( id, it->meState == TRISTATE_TRUE );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - vcl/source

2015-06-18 Thread Philippe Jung

 vcl/source/window/menu.cxx |   29 ++---
 1 file changed, 18 insertions(+), 11 deletions(-)

New commits:
commit fd5c9d91b1d3b1cb7c8a66487c1cb2b27b982199
Author: Philippe Jung 
Date:   Thu Jun 18 11:04:10 2015 +0200

Better position for Toolbar name

The text is badly centered. Replaced GetTextHeight by GetTextBoundRect
and updated computation of text bounds.

Change-Id: I1e177a15787c6eddf2878a7d0254f71f3501ec34
Reviewed-on: https://gerrit.libreoffice.org/16355
Tested-by: Jenkins 
Reviewed-by: Jan Holesovsky 

diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx
index d2b5716..7acd139 100644
--- a/vcl/source/window/menu.cxx
+++ b/vcl/source/window/menu.cxx
@@ -85,7 +85,7 @@ using namespace ::com::sun::star;
 using namespace vcl;
 
 #define EXTRAITEMHEIGHT 4
-#define SPACE_AROUND_TITLE  2
+#define SPACE_AROUND_TITLE  4
 
 static bool ImplAccelDisabled()
 {
@@ -1631,16 +1631,21 @@ Size Menu::ImplCalcSize( vcl::Window* pWin )
 // Additional space for title
 nTitleHeight = 0;
 if (!IsMenuBar() && aTitleText.getLength() > 0) {
-// Vertically, one height of char + extra space for decoration
-nTitleHeight = nFontHeight + 4 * SPACE_AROUND_TITLE ;
-aSz.Height() += nTitleHeight;
-
-// Horizontally, compute text width with bold font
+// Set expected font
 pWin->Push(PushFlags::FONT);
 vcl::Font aFont = pWin->GetFont();
 aFont.SetWeight(WEIGHT_BOLD);
 pWin->SetFont(aFont);
-long nWidth = pWin->GetTextWidth( aTitleText ) + 4 * 
SPACE_AROUND_TITLE;
+
+// Compute text bounding box
+Rectangle aTextBoundRect;
+pWin->GetTextBoundRect(aTextBoundRect, aTitleText);
+
+// Vertically, one height of char + extra space for decoration
+nTitleHeight =  aTextBoundRect.GetSize().Height() + 4 * 
SPACE_AROUND_TITLE ;
+aSz.Height() += nTitleHeight;
+
+long nWidth = aTextBoundRect.GetSize().Width() + 4 * 
SPACE_AROUND_TITLE;
 pWin->Pop();
 if ( nWidth > nMaxWidth )
 nMaxWidth = nWidth;
@@ -1784,10 +1789,12 @@ void Menu::ImplPaintMenuTitle(vcl::RenderContext& 
rRenderContext, const Rectangl
 rRenderContext.DrawRect(aBgRect);
 
 // Draw the text centered
-Point aTextTopLeft(rRect.TopLeft());
-long textWidth = rRenderContext.GetTextWidth(aTitleText);
-aTextTopLeft.X() += (aBgRect.getWidth() - textWidth) / 2;
-aTextTopLeft.Y() += SPACE_AROUND_TITLE;
+Point aTextTopLeft(aBgRect.TopLeft());
+Rectangle aTextBoundRect;
+rRenderContext.GetTextBoundRect( aTextBoundRect, aTitleText );
+aTextTopLeft.X() += (aBgRect.getWidth() - 
aTextBoundRect.GetSize().Width()) / 2;
+aTextTopLeft.Y() += (aBgRect.GetHeight() - 
aTextBoundRect.GetSize().Height()) / 2
+- aTextBoundRect.TopLeft().Y();
 rRenderContext.DrawText(aTextTopLeft, aTitleText, 0, 
aTitleText.getLength());
 
 // Restore
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering

2015-06-18 Thread Lionel Elie Mamane

On Mon, Jun 15, 2015 at 02:32:23PM +0200, Miklos Vajna wrote:
> On Wed, Jun 03, 2015 at 02:54:45PM +0200, Lionel Elie Mamane 
>  wrote:
> > > What are those autogen.input options? Can you follow the instructions of
> > > the failed test and get a backtrace?
> > 
> > Both are attached. To me the backtrace looks unrelated to "tile
> > rendering", but then this is the only failing thing in a
> >  make check -k
> 
> I only have an implicit --without-system-libs dbgutil build from
> libreoffice-5-0, and there I don't see this problem. It would be
> interesting to know if the failure is indeed conditional on
> --with-system-libs or it's something else.
> 
> An other approach is to see if the branch point was good for you, if so,
> then bisect what commit broke the test with your build options.

Nope, branch point is not good. Given that a recompile takes hours,
I'm rather unlikely to pursue this in detail. I started a "git
bisect", let's see if I have enough patience to get to the end.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - readlicense_oo/Package_files.mk sfx2/source

2015-06-18 Thread Andras Timar

 readlicense_oo/Package_files.mk |9 +++--
 sfx2/source/appl/appserv.cxx|5 +
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit ed4fe167a9705e714970ab5725aaae8854b1125b
Author: Andras Timar 
Date:   Thu Jun 18 16:24:28 2015 +0200

Make 'Show License' button work on OS X

Change-Id: I947033790476f982efd6a275831d2439b2859d8f

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 8efbbb6..694c6ef 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -201,8 +201,13 @@ static bool checkURL( const char *pName, const char *pExt, 
OUString &rURL )
 using namespace osl;
 DirectoryItem aDirItem;
 
+#ifdef MACOSX
+rURL = "$BRAND_BASE_DIR/Resources/" + OUString::createFromAscii( pName ) +
+   OUString::createFromAscii( pExt );
+#else
 rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) +
OUString::createFromAscii( pExt );
+#endif
 rtl::Bootstrap::expandMacros( rURL );
 
 if (!rURL.isEmpty())
commit df1fa04b0d1341e7cb87ef16e2ec2c6447835cc5
Author: Andras Timar 
Date:   Thu Jun 18 15:43:15 2015 +0200

Put LICENSE/NOTICE files to Resources on OSX in instdir case, too

Change-Id: I59444cf36d829f8f726c9301ee8393d5ca16196c

diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index e84681f..1f06bdd 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -15,11 +15,16 @@ ifneq ($(OS),WNT)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE))
 endif
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
-
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.fodt))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
-
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
+else
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.fodt,LICENSE.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.html,LICENSE.html))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - 2 commits - readlicense_oo/Package_files.mk sfx2/source

2015-06-18 Thread Andras Timar

 readlicense_oo/Package_files.mk |9 +++--
 sfx2/source/appl/appserv.cxx|5 +
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit bb65cdafedd1e461d43a90cda018e7fe3a1b9663
Author: Andras Timar 
Date:   Thu Jun 18 16:24:28 2015 +0200

Make 'Show License' button work on OS X

Change-Id: I947033790476f982efd6a275831d2439b2859d8f
(cherry picked from commit ed4fe167a9705e714970ab5725aaae8854b1125b)

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 40c8014..7ff0da2 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -201,8 +201,13 @@ static bool checkURL( const char *pName, const char *pExt, 
OUString &rURL )
 using namespace osl;
 DirectoryItem aDirItem;
 
+#ifdef MACOSX
+rURL = "$BRAND_BASE_DIR/Resources/" + OUString::createFromAscii( pName ) +
+   OUString::createFromAscii( pExt );
+#else
 rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) +
OUString::createFromAscii( pExt );
+#endif
 rtl::Bootstrap::expandMacros( rURL );
 
 if (!rURL.isEmpty())
commit 7fdf8c36f6ae032af3f76a15ebb815e110d94694
Author: Andras Timar 
Date:   Thu Jun 18 15:43:15 2015 +0200

Put LICENSE/NOTICE files to Resources on OSX in instdir case, too

Change-Id: I59444cf36d829f8f726c9301ee8393d5ca16196c
(cherry picked from commit df1fa04b0d1341e7cb87ef16e2ec2c6447835cc5)

diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index e84681f..1f06bdd 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -15,11 +15,16 @@ ifneq ($(OS),WNT)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE))
 endif
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
-
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.fodt))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
-
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
+else
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.fodt,LICENSE.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.html,LICENSE.html))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering

2015-06-18 Thread Lionel Elie Mamane

On Thu, Jun 18, 2015 at 04:23:36PM +0200, Lionel Elie Mamane wrote:
> On Mon, Jun 15, 2015 at 02:32:23PM +0200, Miklos Vajna wrote:
> > On Wed, Jun 03, 2015 at 02:54:45PM +0200, Lionel Elie Mamane 
> >  wrote:
> > > > What are those autogen.input options? Can you follow the instructions of
> > > > the failed test and get a backtrace?
> > > 
> > > Both are attached. To me the backtrace looks unrelated to "tile
> > > rendering", but then this is the only failing thing in a
> > >  make check -k
> > 
> > I only have an implicit --without-system-libs dbgutil build from
> > libreoffice-5-0, and there I don't see this problem. It would be
> > interesting to know if the failure is indeed conditional on
> > --with-system-libs or it's something else.
> > 
> > An other approach is to see if the branch point was good for you, if so,
> > then bisect what commit broke the test with your build options.
> 
> Nope, branch point is not good. Given that a recompile takes hours,
> I'm rather unlikely to pursue this in detail. I started a "git
> bisect", let's see if I have enough patience to get to the end.

Grrr... "git bisect" refuses to work in the direction "find the commit
that fixed this", it insists to do "find the commit that broke
this". So I cannot bisect between (known bad) branch point and (known
good) master.

-- 
Lionel 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering

2015-06-18 Thread Matthew J. Francis


On 18/06/2015 22:23, Lionel Elie Mamane wrote:

Nope, branch point is not good. Given that a recompile takes hours,
I'm rather unlikely to pursue this in detail. I started a "git
bisect", let's see if I have enough patience to get to the end.


Note that if you have an automated reproducer - a failing test which 
gives a nice obvious exit code is perfect - you can drive your bisect 
automatically with "git bisect run"


It might not make it any faster, but at least you can ignore it and get 
on with something else


(The argument it takes is a script which should exit with code:
  0 == good
  125 == skip (build failure)
  anything else == bad
so in this case it should suffice to first build without tests, exit 125 
on failure, then run the tests and exit with whatever the result of that 
was)




Regards
Matthew Francis

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

Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering

2015-06-18 Thread Miklos Vajna

On Thu, Jun 18, 2015 at 10:38:44PM +0800, "Matthew J. Francis" 
 wrote:
> I.e. reverse the meanings of "git bisect good" and "git bisect bad"

Right, I use that a lot to find out what commit to backport to release
branches when something is fixed on master.

Regards,

Miklos


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

Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering

2015-06-18 Thread Matthew J. Francis


On 18/06/2015 22:36, Lionel Elie Mamane wrote:


Grrr... "git bisect" refuses to work in the direction "find the commit
that fixed this", it insists to do "find the commit that broke
this". So I cannot bisect between (known bad) branch point and (known
good) master.


In this case you have to drive it in what I call "Macbeth mode" - "Fair 
is foul and foul is fair"


I.e. reverse the meanings of "git bisect good" and "git bisect bad"


Regards
Matthew Francis


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

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - framework/source

2015-06-18 Thread Philippe Jung

 framework/source/uielement/toolbarmanager.cxx |   53 +-
 1 file changed, 27 insertions(+), 26 deletions(-)

New commits:
commit 46d9cecf1e5e317a324ff1370ebb0548e34d7200
Author: Philippe Jung 
Date:   Thu Jun 18 15:16:00 2015 +0200

Rename some toolbarmanager related variables

Renames some variable to ease the understanding of what does what

Change-Id: Idd84eb89b7c1fb56dd43d66edfbbeafedc319095
Reviewed-on: https://gerrit.libreoffice.org/16360
Reviewed-by: Philippe Jung 
Tested-by: Philippe Jung 
(cherry picked from commit 79be3a5e3856593bb759b6e521f06dc99c69c0ae)
Reviewed-on: https://gerrit.libreoffice.org/16363
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 

diff --git a/framework/source/uielement/toolbarmanager.cxx 
b/framework/source/uielement/toolbarmanager.cxx
index a0492af..bf8fc49 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1680,12 +1680,12 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 // popup menu for quick customization
 bool bHideDisabledEntries = !SvtMenuOptions().IsEntryHidingEnabled();
-::PopupMenu aPopupMenu( FwkResId( POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
+::PopupMenu aQuickCustomizationMenu( FwkResId( 
POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION ));
 
 if ( m_pToolBar->IsCustomize() )
 {
 sal_uInt16nPos( 0 );
-::PopupMenu*  pItemMenu( aPopupMenu.GetPopupMenu( 1 ));
+::PopupMenu*  pVisibleItemsPopupMenu( 
aQuickCustomizationMenu.GetPopupMenu( 1 ));
 
 boolbIsFloating( false );
 
@@ -1695,72 +1695,73 @@ bool ToolBarManager::MenuItemAllowed( sal_uInt16 ) const
 
 if ( !bIsFloating )
 {
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
+aQuickCustomizationMenu.EnableItem( MENUITEM_TOOLBAR_DOCKTOOLBAR, 
false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_DOCKALLTOOLBAR, false );
 Reference< XDockableWindow > xDockable( 
VCLUnoHelper::GetInterface( m_pToolBar ), UNO_QUERY );
 if( xDockable.is() )
-aPopupMenu.CheckItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, 
xDockable->isLocked() );
+aQuickCustomizationMenu.CheckItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, xDockable->isLocked() );
 }
 else
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false 
);
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
 
 if ( SvtMiscOptions().DisableUICustomization() )
 {
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
-aPopupMenu.EnableItem( MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false 
);
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_VISIBLEBUTTON, false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_CUSTOMIZETOOLBAR, false );
+aQuickCustomizationMenu.EnableItem( 
MENUITEM_TOOLBAR_LOCKTOOLBARPOSITION, false );
 }
 
 // Disable menu item CLOSE if the toolbar has no closer
 if( !(pToolBar->GetFloatStyle() & WB_CLOSEABLE) )
-aPopupMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
+aQuickCustomizationMenu.EnableItem(MENUITEM_TOOLBAR_CLOSE, false);
 
+// Go through all toolbar items and add them to the context menu
 for ( nPos = 0; nPos < m_pToolBar->GetItemCount(); ++nPos )
 {
 if ( m_pToolBar->GetItemType(nPos) == ToolBoxItemType::BUTTON )
 {
 sal_uInt16 nId = m_pToolBar->GetItemId(nPos);
 OUString aCommandURL = m_pToolBar->GetItemCommand( nId );
-pItemMenu->InsertItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
m_pToolBar->GetItemText( nId ), MenuItemBits::CHECKABLE );
-pItemMenu->CheckItem( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
m_pToolBar->IsItemVisible( nId ) );
-pItemMenu->SetItemCommand( STARTID_CUSTOMIZE_POPUPMENU+nPos, 
aCommandURL );
-pItemMenu->SetItemImage( STARTID_CUSTOMIZE_POPUPMENU+nPos,
- GetImageFromURL( m_xFrame, 
aCommandURL, false )
-   );
+pVisibleItemsPopupMenu->InsertItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->GetItemText( nId ), 
MenuItemBits::CHECKABLE );
+pVisibleItemsPopupMenu->CheckItem( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, m_pToolBar->IsItemVisible( nId ) );
+pVisibleItemsPopupMenu->SetItemCommand( 
STARTID_CUSTOMIZE_POPUPMENU+nPos, aCommandURL );
+Image aImage( GetImageFromURL( m_xFrame, aCommandURL, false ) 
);
+pVisibleItemsPopupMenu->SetItemImag

Building LO java extension with Gradle or Ant

2015-06-18 Thread Mikhail Zemlyanukha

Hi all,

I'm working on a LO java extension. Examples in LO SDK use Makefiles,
while in Java dev there are other build tools commonly used, such as
Gradle, Maven and Ant.

I'm looking for a script to build LO extension with those tools,
preferable Gradle because it's builtin into IntelliJ Idea which I'm
using. Ant script would do too.

I found a Maven script in languagetool extension, but I do not know
maven well enough, and languagetool build script is quite complex.
Something simpler would be better ))

Any info on Gradle or Ant scripts samples to build LO Java extension
is appreciated.

Thanks,
Mike
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.3' - sfx2/source

2015-06-18 Thread Andras Timar

 sfx2/source/appl/appserv.cxx |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 4e6e1fc9690c48654809f05ced643508d1819bac
Author: Andras Timar 
Date:   Thu Jun 18 16:24:28 2015 +0200

Make 'Show License' button work on OS X

(cherry picked from commit ed4fe167a9705e714970ab5725aaae8854b1125b)

Change-Id: I947033790476f982efd6a275831d2439b2859d8f

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 7730e32..f3303f5 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -199,8 +199,13 @@ static bool checkURL( const char *pName, const char *pExt, 
OUString &rURL )
 using namespace osl;
 DirectoryItem aDirItem;
 
+#ifdef HAVE_FEATURE_MACOSX_MACLIKE_APP_STRUCTURE
+rURL = "$BRAND_BASE_DIR/Resources/" + OUString::createFromAscii( pName ) +
+   OUString::createFromAscii( pExt );
+#else
 rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) +
OUString::createFromAscii( pExt );
+#endif
 rtl::Bootstrap::expandMacros( rURL );
 
 if (!rURL.isEmpty())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

New Defects reported by Coverity Scan for LibreOffice

2015-06-18 Thread scan-admin


Hi,

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

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

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


** CID 1307698:  Uninitialized members  (UNINIT_CTOR)
/reportdesign/source/ui/dlg/dlgpage.cxx: 72 in 
rptui::ORptPageDialog::ORptPageDialog(vcl::Window *, const SfxItemSet *, const 
rtl::OUString &)()



*** CID 1307698:  Uninitialized members  (UNINIT_CTOR)
/reportdesign/source/ui/dlg/dlgpage.cxx: 72 in 
rptui::ORptPageDialog::ORptPageDialog(vcl::Window *, const SfxItemSet *, const 
rtl::OUString &)()
66 else
67 OSL_FAIL("Unknown page id");
68 
69 SvtCJKOptions aCJKOptions;
70 if ( !aCJKOptions.IsDoubleLinesEnabled() )
71 RemoveTabPage("asianlayout");
>>> CID 1307698:  Uninitialized members  (UNINIT_CTOR)
>>> Non-static class member "m_nCharBgdId" is not initialized in this 
>>> constructor nor in any functions that it calls.
72 }
73 
74 void ORptPageDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
75 {
76 SfxAllItemSet aSet(*(GetInputSetImpl()->GetPool()));
77 if (nId == m_nCharBgdId)

** CID 1307697:  Null pointer dereferences  (NULL_RETURNS)



*** CID 1307697:  Null pointer dereferences  (NULL_RETURNS)
/cui/source/tabpages/backgrnd.cxx: 715 in 
SvxBackgroundTabPage::FillItemSet(SfxItemSet *)()
709 const bool  bWasLink = (NULL != 
rOldItem.GetGraphicLink() );
710 
711 
712 if ( !bIsLink && !bIsGraphicValid )
713 bIsGraphicValid = LoadLinkedGraphic_Impl();
714 
>>> CID 1307697:  Null pointer dereferences  (NULL_RETURNS)
>>> Dereferencing a pointer that might be null 
>>> "rOldItem->GetGraphic(rtl::OUString())" when calling "GetBitmap".
715 if (  eNewPos != eOldPos
716 || bIsLink != bWasLink
717 || ( bWasLink  && rOldItem.GetGraphicLink()
718!= aBgdGraphicPath )
719 || ( !bWasLink && rOldItem.GetGraphic()->GetBitmap()
720!= aBgdGraphic.GetBitmap() )

** CID 1307696:  Error handling issues  (CHECKED_RETURN)
/framework/source/uifactory/menubarfactory.cxx: 127 in 
framework::MenuBarFactory::CreateUIElement(const rtl::OUString &, const 
com::sun::star::uno::Sequence &, const 
char *, const rtl::OUString &, const 
com::sun::star::uno::Reference &, const 
com::sun::star::uno::Reference &)()



*** CID 1307696:  Error handling issues  (CHECKED_RETURN)
/framework/source/uifactory/menubarfactory.cxx: 127 in 
framework::MenuBarFactory::CreateUIElement(const rtl::OUString &, const 
com::sun::star::uno::Sequence &, const 
char *, const rtl::OUString &, const 
com::sun::star::uno::Reference &, const 
com::sun::star::uno::Reference &)()
121 OUString aModuleIdentifier = xModuleManager->identify( 
Reference( xFrame, UNO_QUERY ) );
122 if ( !aModuleIdentifier.isEmpty() )
123 {
124 Reference< XModuleUIConfigurationManagerSupplier > 
xModuleCfgSupplier =
125 theModuleUIConfigurationManagerSupplier::get( 
_rxContext );
126 xCfgMgr = 
xModuleCfgSupplier->getUIConfigurationManager( aModuleIdentifier );
>>> CID 1307696:  Error handling issues  (CHECKED_RETURN)
>>> Calling "hasSettings" without checking return value (as is done 
>>> elsewhere 16 out of 17 times).
127 xCfgMgr->hasSettings( aResourceURL );
128 }
129 }
130 }
131 
132 PropertyValue aPropValue;



To view the defects in Coverity Scan visit, 
https://scan.coverity.com/projects/211?tab=overview

To manage Coverity Scan email notifications for 
"libreoffice@lists.freedesktop.org", click 
https://scan.coverity.com/subscriptions/edit?email=libreoffice%40lists.freedesktop.org&token=d6481d718a775246b2340f282ebe5939
 .

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

[Libreoffice-commits] core.git: 2 commits - vcl/unx

2015-06-18 Thread Caolán McNamara

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |  184 ++-
 1 file changed, 164 insertions(+), 20 deletions(-)

New commits:
commit 698120857eecc0afa90bc408a3e0a41eee21f1dd
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 16:28:52 2015 +0100

gtk3: implement paste from us

Change-Id: Iea25d633a833965814a08d87954906e0133f7076

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index ae5b338..baa558d 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -203,7 +203,7 @@ public:
 return aVector;
 }
 
-virtual css::uno::Sequence< css::datatransfer::DataFlavor > SAL_CALL 
getTransferDataFlavors()
+virtual css::uno::Sequence SAL_CALL 
getTransferDataFlavors()
 throw(css::uno::RuntimeException, std::exception) SAL_OVERRIDE
 {
 return 
comphelper::containerToSequence(getTransferDataFlavorsAsVector());
@@ -222,13 +222,14 @@ public:
 class VclGtkClipboard :
 public cppu::WeakComponentImplHelper<
 datatransfer::clipboard::XSystemClipboard,
-XServiceInfo
->
+XServiceInfo>
 {
-osl::Mutex  
m_aMutex;
-Reference< css::datatransfer::XTransferable >  m_aContents;
-Reference< css::datatransfer::clipboard::XClipboardOwner > m_aOwner;
-std::list< Reference< css::datatransfer::clipboard::XClipboardListener > > 
m_aListeners;
+osl::Mutex   m_aMutex;
+Reference  m_aContents;
+Reference m_aOwner;
+std::list< Reference > 
m_aListeners;
+std::vector m_aGtkTargets;
+std::vector m_aInfoToFlavor;
 
 public:
 
@@ -238,6 +239,7 @@ public:
 >( m_aMutex )
 {
 }
+
 virtual ~VclGtkClipboard()
 {
 }
@@ -285,6 +287,11 @@ public:
 virtual void SAL_CALL removeClipboardListener(
 const Reference< css::datatransfer::clipboard::XClipboardListener >& 
listener )
 throw(RuntimeException, std::exception) SAL_OVERRIDE;
+
+void ClipboardGet(GtkClipboard *clipboard, GtkSelectionData 
*selection_data, guint info);
+void ClipboardClear(GtkClipboard *clipboard);
+private:
+GtkTargetEntry makeGtkTargetEntry(const css::datatransfer::DataFlavor& 
rFlavor);
 };
 
 OUString VclGtkClipboard::getImplementationName_static()
@@ -322,6 +329,107 @@ Reference< css::datatransfer::XTransferable > 
VclGtkClipboard::getContents() thr
 return m_aContents;
 }
 
+namespace
+{
+void ClipboardGetFunc(GtkClipboard *clipboard, GtkSelectionData 
*selection_data,
+  guint info,
+  gpointer user_data_or_owner)
+{
+VclGtkClipboard* pThis = 
static_cast(user_data_or_owner);
+pThis->ClipboardGet(clipboard, selection_data, info);
+}
+
+void ClipboardClearFunc(GtkClipboard *clipboard, gpointer 
user_data_or_owner)
+{
+VclGtkClipboard* pThis = 
static_cast(user_data_or_owner);
+pThis->ClipboardClear(clipboard);
+}
+}
+
+void VclGtkClipboard::ClipboardGet(GtkClipboard *clipboard, GtkSelectionData 
*selection_data,
+   guint info)
+{
+
+GdkAtom 
type(gdk_atom_intern(OUStringToOString(m_aInfoToFlavor[info].MimeType,
+   
RTL_TEXTENCODING_UTF8).getStr(),
+ false));
+
+css::datatransfer::DataFlavor aFlavor(m_aInfoToFlavor[info]);
+if (aFlavor.MimeType == "UTF8_STRING" || aFlavor.MimeType == "STRING")
+aFlavor.MimeType = "text/plain;charset=utf-8";
+
+Sequence aData;
+Any aValue;
+
+try
+{
+aValue = m_aContents->getTransferData(aFlavor);
+}
+catch(...)
+{
+}
+
+if (aValue.getValueTypeClass() == TypeClass_STRING)
+{
+OUString aString;
+aValue >>= aString;
+aData = Sequence< sal_Int8 >( reinterpret_cast(aString.getStr()), aString.getLength() * sizeof( sal_Unicode ) );
+}
+else if (aValue.getValueType() == cppu::UnoType>::get())
+{
+aValue >>= aData;
+}
+else if (aFlavor.MimeType == "text/plain;charset=utf-8")
+{
+//didn't have utf-8, try utf-16 and convert
+aFlavor.MimeType = "text/plain;charset=utf-16";
+aFlavor.DataType = cppu::UnoType::get();
+try
+{
+aValue = m_aContents->getTransferData(aFlavor);
+}
+catch(...)
+{
+}
+OUString aString;
+aValue >>= aString;
+OString aUTF8String(OUStringToOString(aString, RTL_TEXTENCODING_UTF8));
+gtk_selection_data_set(selection_data, type, 8,
+   reinterpret_cast(aUTF8String.getStr()),
+   aUTF8String.getLength());
+return;
+}
+
+gtk_selection_data_set(selection_data, type, 8,
+   reinterpret_cast(aData.getArray()),
+

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

2015-06-18 Thread Caolán McNamara

 reportdesign/source/ui/dlg/dlgpage.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit e915c1cc1e406e4a4183f373a268490373b1b761
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 16:31:01 2015 +0100

coverity#1307698 Uninitialized scalar field

Change-Id: I1229b4cdfcc741899b3ae8694e7db5d7e506ce0c

diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx 
b/reportdesign/source/ui/dlg/dlgpage.cxx
index 3e8ff66..e99a7d0 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -41,6 +41,7 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const 
SfxItemSet* pAttr, c
 : SfxTabDialog (pParent, rDialog, "modules/dbreport/ui/" +
 rDialog.toAsciiLowerCase() +
 ".ui", pAttr)
+, m_nCharBgdId(0)
 {
 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
 assert(pFact && "Dialog creation failed!");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Caolán McNamara

 vcl/unx/gtk3/app/gtk3gtkinst.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit babe536ec227c04d10e55cd780e7021bf905aa82
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 16:33:16 2015 +0100

gtk3: unused param

Change-Id: I91fc320acf816d028186d25fd136f58c1c785d9d

diff --git a/vcl/unx/gtk3/app/gtk3gtkinst.cxx b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
index baa558d..6a67255 100644
--- a/vcl/unx/gtk3/app/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/app/gtk3gtkinst.cxx
@@ -346,7 +346,7 @@ namespace
 }
 }
 
-void VclGtkClipboard::ClipboardGet(GtkClipboard *clipboard, GtkSelectionData 
*selection_data,
+void VclGtkClipboard::ClipboardGet(GtkClipboard* /*clipboard*/, 
GtkSelectionData *selection_data,
guint info)
 {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - reportdesign/source

2015-06-18 Thread Caolán McNamara

 reportdesign/source/ui/dlg/dlgpage.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 23b5284f8c4e9b784a748e765b4d48abbf615d47
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 16:31:01 2015 +0100

coverity#1307698 Uninitialized scalar field

Change-Id: I1229b4cdfcc741899b3ae8694e7db5d7e506ce0c
(cherry picked from commit e915c1cc1e406e4a4183f373a268490373b1b761)

diff --git a/reportdesign/source/ui/dlg/dlgpage.cxx 
b/reportdesign/source/ui/dlg/dlgpage.cxx
index 3e8ff66..e99a7d0 100644
--- a/reportdesign/source/ui/dlg/dlgpage.cxx
+++ b/reportdesign/source/ui/dlg/dlgpage.cxx
@@ -41,6 +41,7 @@ ORptPageDialog::ORptPageDialog( vcl::Window* pParent, const 
SfxItemSet* pAttr, c
 : SfxTabDialog (pParent, rDialog, "modules/dbreport/ui/" +
 rDialog.toAsciiLowerCase() +
 ".ui", pAttr)
+, m_nCharBgdId(0)
 {
 SfxAbstractDialogFactory* pFact = SfxAbstractDialogFactory::Create();
 assert(pFact && "Dialog creation failed!");
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Caolán McNamara

 cui/source/tabpages/backgrnd.cxx |   19 ---
 1 file changed, 12 insertions(+), 7 deletions(-)

New commits:
commit a7e7d057a4a574b337f3df6e9a600aac918be09c
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 16:37:23 2015 +0100

coverity#1307697 Dereference null return value

Change-Id: I48bf70689153b83bd1da7ff1553a4a3ec823d1b2

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index 8d731f3..8e21658 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -712,13 +712,18 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* 
rCoreSet )
 if ( !bIsLink && !bIsGraphicValid )
 bIsGraphicValid = LoadLinkedGraphic_Impl();
 
-if (  eNewPos != eOldPos
-|| bIsLink != bWasLink
-|| ( bWasLink  && rOldItem.GetGraphicLink()
-   != aBgdGraphicPath )
-|| ( !bWasLink && rOldItem.GetGraphic()->GetBitmap()
-   != aBgdGraphic.GetBitmap() )
-   )
+bool bModifyBrush = false;
+if (eNewPos != eOldPos || bIsLink != bWasLink)
+bModifyBrush = true;
+else if (bWasLink && rOldItem.GetGraphicLink() != 
aBgdGraphicPath)
+bModifyBrush = true;
+else if (!bWasLink)
+{
+const Graphic* pGraphic = rOldItem.GetGraphic();
+if (pGraphic)
+bModifyBrush = pGraphic->GetBitmap() != 
aBgdGraphic.GetBitmap();
+}
+if (bModifyBrush)
 {
 bModified = true;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - cui/source

2015-06-18 Thread Caolán McNamara

 cui/source/tabpages/backgrnd.cxx |   20 
 1 file changed, 12 insertions(+), 8 deletions(-)

New commits:
commit 5ffdce457326366154fb6c50d14f4b2bc322f355
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 16:37:23 2015 +0100

coverity#1307697 Dereference null return value

(cherry picked from commit a7e7d057a4a574b337f3df6e9a600aac918be09c)

Change-Id: I48bf70689153b83bd1da7ff1553a4a3ec823d1b2

diff --git a/cui/source/tabpages/backgrnd.cxx b/cui/source/tabpages/backgrnd.cxx
index a396f49..2e7e2b4 100644
--- a/cui/source/tabpages/backgrnd.cxx
+++ b/cui/source/tabpages/backgrnd.cxx
@@ -837,14 +837,18 @@ bool SvxBackgroundTabPage::FillItemSet( SfxItemSet* 
rCoreSet )
 if ( !bIsLink && !bIsGraphicValid )
 bIsGraphicValid = LoadLinkedGraphic_Impl();
 
-if (   bGraphTransparencyChanged ||
-   eNewPos != eOldPos
-|| bIsLink != bWasLink
-|| ( bWasLink  && rOldItem.GetGraphicLink()
-   != aBgdGraphicPath )
-|| ( !bWasLink && rOldItem.GetGraphic()->GetBitmap()
-   != aBgdGraphic.GetBitmap() )
-   )
+bool bModifyBrush = false;
+if (bGraphTransparencyChanged || eNewPos != eOldPos || bIsLink 
!= bWasLink)
+bModifyBrush = true;
+else if (bWasLink && rOldItem.GetGraphicLink() != 
aBgdGraphicPath)
+bModifyBrush = true;
+else if (!bWasLink)
+{
+const Graphic* pGraphic = rOldItem.GetGraphic();
+if (pGraphic)
+bModifyBrush = pGraphic->GetBitmap() != 
aBgdGraphic.GetBitmap();
+}
+if (bModifyBrush)
 {
 bModified = true;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/lov-4.4' - 2 commits - readlicense_oo/Package_files.mk sfx2/source

2015-06-18 Thread Andras Timar

 readlicense_oo/Package_files.mk |9 +++--
 sfx2/source/appl/appserv.cxx|5 +
 2 files changed, 12 insertions(+), 2 deletions(-)

New commits:
commit 41c058010a493517d0120de6a88beafe61d327b0
Author: Andras Timar 
Date:   Thu Jun 18 16:24:28 2015 +0200

Make 'Show License' button work on OS X

Change-Id: I947033790476f982efd6a275831d2439b2859d8f
(cherry picked from commit ed4fe167a9705e714970ab5725aaae8854b1125b)

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 29a47a0..1c3e1bd 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -201,8 +201,13 @@ static bool checkURL( const char *pName, const char *pExt, 
OUString &rURL )
 using namespace osl;
 DirectoryItem aDirItem;
 
+#ifdef MACOSX
+rURL = "$BRAND_BASE_DIR/Resources/" + OUString::createFromAscii( pName ) +
+   OUString::createFromAscii( pExt );
+#else
 rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) +
OUString::createFromAscii( pExt );
+#endif
 rtl::Bootstrap::expandMacros( rURL );
 
 if (!rURL.isEmpty())
commit a06158a69e4692af34a12dfed68a5f2cf6b8be29
Author: Andras Timar 
Date:   Thu Jun 18 15:43:15 2015 +0200

Put LICENSE/NOTICE files to Resources on OSX in instdir case, too

Change-Id: I59444cf36d829f8f726c9301ee8393d5ca16196c
(cherry picked from commit df1fa04b0d1341e7cb87ef16e2ec2c6447835cc5)

diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index e84681f..1f06bdd 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -15,11 +15,16 @@ ifneq ($(OS),WNT)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE))
 endif
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
-
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.fodt))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
-
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
+else
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.fodt,LICENSE.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.html,LICENSE.html))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering

2015-06-18 Thread Lionel Elie Mamane

On Thu, Jun 18, 2015 at 10:38:44PM +0800, Matthew J. Francis wrote:
> On 18/06/2015 22:36, Lionel Elie Mamane wrote:

>> Grrr... "git bisect" refuses to work in the direction "find the
>> commit that fixed this", it insists to do "find the commit that
>> broke this". So I cannot bisect between (known bad) branch point
>> and (known good) master.

> In this case you have to drive it in what I call "Macbeth mode" - "Fair is
> foul and foul is fair"

> I.e. reverse the meanings of "git bisect good" and "git bisect bad"

Aha, that is indeed a good idea.

-- 
Lionel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

Re: libreoffice-5-0 failure in [ CUT ] libreofficekit_tiledrendering

2015-06-18 Thread Lionel Elie Mamane

On Thu, Jun 18, 2015 at 10:37:34PM +0800, Matthew J. Francis wrote:
> On 18/06/2015 22:23, Lionel Elie Mamane wrote:

>> Nope, branch point is not good. Given that a recompile takes hours,
>> I'm rather unlikely to pursue this in detail. I started a "git
>> bisect", let's see if I have enough patience to get to the end.

> Note that if you have an automated reproducer - a failing test which
> gives a nice obvious exit code is perfect - you can drive your
> bisect automatically with "git bisect run"

> It might not make it any faster, but at least you can ignore it and
> get on with something else

> (The argument it takes is a script which should exit with code:
>   0 == good
>   125 == skip (build failure)
>   anything else == bad
> so in this case it should suffice to first build without tests, exit 125 on
> failure, then run the tests and exit with whatever the result of that was)

Sounds like our "bin/" directory should contain a script that takes
the test name and does that :)

-- 
Lioel
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-4.4' - 2 commits - readlicense_oo/Package_files.mk sfx2/source

2015-06-18 Thread Andras Timar

 readlicense_oo/Package_files.mk |   11 +--
 sfx2/source/appl/appserv.cxx|5 +
 2 files changed, 14 insertions(+), 2 deletions(-)

New commits:
commit 45e75a51373c97fa192f68aa1f43c3022a804cf9
Author: Andras Timar 
Date:   Thu Jun 18 16:24:28 2015 +0200

Make 'Show License' button work on OS X

Change-Id: I947033790476f982efd6a275831d2439b2859d8f
(cherry picked from commit ed4fe167a9705e714970ab5725aaae8854b1125b)

diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 29a47a0..1c3e1bd 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -201,8 +201,13 @@ static bool checkURL( const char *pName, const char *pExt, 
OUString &rURL )
 using namespace osl;
 DirectoryItem aDirItem;
 
+#ifdef MACOSX
+rURL = "$BRAND_BASE_DIR/Resources/" + OUString::createFromAscii( pName ) +
+   OUString::createFromAscii( pExt );
+#else
 rURL = "$BRAND_BASE_DIR/" + OUString::createFromAscii( pName ) +
OUString::createFromAscii( pExt );
+#endif
 rtl::Bootstrap::expandMacros( rURL );
 
 if (!rURL.isEmpty())
commit 9b5fe57adc4b9c195fd52bc31bc9dc9aafa1509e
Author: Andras Timar 
Date:   Thu Jun 18 15:43:15 2015 +0200

Put LICENSE/NOTICE files to Resources on OSX in instdir case, too

(cherry picked from commit df1fa04b0d1341e7cb87ef16e2ec2c6447835cc5)

Conflicts:
readlicense_oo/Package_files.mk

Change-Id: I59444cf36d829f8f726c9301ee8393d5ca16196c

diff --git a/readlicense_oo/Package_files.mk b/readlicense_oo/Package_files.mk
index 025e13b..1fa672d 100644
--- a/readlicense_oo/Package_files.mk
+++ b/readlicense_oo/Package_files.mk
@@ -15,13 +15,20 @@ ifneq ($(OS),WNT)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,LICENSE,LICENSE))
 endif
 
+ifneq ($(OS),MACOSX)
 $(eval $(call gb_Package_add_file,readlicense_oo_files,NOTICE,NOTICE))
-
 $(eval $(call gb_Package_add_file,readlicense_oo_files,EULA.odt,EULA.odt))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,EULA_en-US.rtf,EULA_en-US.rtf))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.fodt,LICENSE.fodt))
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,CREDITS.fodt,CREDITS.fodt))
-
 $(eval $(call 
gb_Package_add_file,readlicense_oo_files,LICENSE.html,LICENSE.html))
+else
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/NOTICE,NOTICE))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/EULA.odt,EULA.odt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/EULA_en-US.rtf,EULA_en-US.rtf))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.fodt,LICENSE.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/CREDITS.fodt,CREDITS.fodt))
+$(eval $(call 
gb_Package_add_file,readlicense_oo_files,Resources/LICENSE.html,LICENSE.html))
+endif
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Caolán McNamara

 framework/source/uifactory/menubarfactory.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 839b50f7e64b01045d98a7fed52f9cc6c5e06a51
Author: CaolÃ¡n McNamara 
Date:   Thu Jun 18 16:43:35 2015 +0100

coverity#1307696 Unchecked return value

Change-Id: Id30efd398cc5ee3df0c31cae53028e1a1b6ea025

diff --git a/framework/source/uifactory/menubarfactory.cxx 
b/framework/source/uifactory/menubarfactory.cxx
index cb29ca6..75e5ca4 100644
--- a/framework/source/uifactory/menubarfactory.cxx
+++ b/framework/source/uifactory/menubarfactory.cxx
@@ -124,7 +124,6 @@ void MenuBarFactory::CreateUIElement(const OUString& 
ResourceURL
 Reference< XModuleUIConfigurationManagerSupplier > 
xModuleCfgSupplier =
 theModuleUIConfigurationManagerSupplier::get( _rxContext );
 xCfgMgr = xModuleCfgSupplier->getUIConfigurationManager( 
aModuleIdentifier );
-xCfgMgr->hasSettings( aResourceURL );
 }
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Eike Rathke

 sc/qa/unit/ucalc_formula.cxx |   83 ++-
 1 file changed, 20 insertions(+), 63 deletions(-)

New commits:
commit 9d5061d3027eab106479b7f3697a0edfd11858cd
Author: Eike Rathke 
Date:   Thu Jun 18 18:00:04 2015 +0200

simplify the unit test, tdf#83365 follow-up

We do not test ScAddress::Parse() here ...

Change-Id: I4e8b1278033e101727890f75bb2a5faf366989a3

diff --git a/sc/qa/unit/ucalc_formula.cxx b/sc/qa/unit/ucalc_formula.cxx
index 225741e..6219eaa 100644
--- a/sc/qa/unit/ucalc_formula.cxx
+++ b/sc/qa/unit/ucalc_formula.cxx
@@ -4276,7 +4276,7 @@ void Test::testFuncINDIRECT()
 }
 
 // --
-// Test case for Bug 83365 - Other: Access across spreadsheet returns Err:504
+// Test case for tdf#83365 - Access across spreadsheet returns Err:504
 //
 void Test::testFuncINDIRECT2()
 {
@@ -4291,98 +4291,55 @@ void Test::testFuncINDIRECT2()
 ScAddress aEnd;
 ScAddress aRef;
 
-// Let be triplet ( Col, Row, Tab ) as Cell Address
-// Indirect reference triplet ( absolute, relative, relative)
-sal_uInt16 nRes = aRef.Parse("foo.$A1", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetValue(aStart, 10.0);
-
-// Indirect reference triplet ( absolute, absolute, relative)
-nRes = aRef.Parse("foo.$A$2", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetValue(aStart, 10.0);
-
-// Indirect reference triplet ( absolute, absolute, absolute)
-nRes = aRef.Parse("$foo.$A$3", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetValue(aStart, 10.0);
+m_pDoc->SetValue(0,0,0, 10.0);
+m_pDoc->SetValue(0,1,0, 10.0);
+m_pDoc->SetValue(0,2,0, 10.0);
 
 // Fill range bar.$A1:bar.$A10 with 1s
-nRes = aStart.Parse("bar.$A1", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-nRes = aEnd.Parse("bar.$A10", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-
-for (SCROW i = aStart.Row(); i <= aEnd.Row(); ++i)
-m_pDoc->SetValue(ScAddress(aStart.Col(), i, aStart.Tab()), 1.0);
+for (SCROW i = 0; i < 10; ++i)
+m_pDoc->SetValue(0,i,1, 1.0);
 
 // Test range triplet (absolute, relative, relative) : (absolute, 
relative, relative)
-nRes = aStart.Parse("baz.$A1", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$1),1)");
+m_pDoc->SetString(0,0,2, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$1),1)");
 
 // Test range triplet (absolute, relative, relative) : (absolute, 
absolute, relative)
-nRes = aStart.Parse("baz.$A2", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$2),1)");
+m_pDoc->SetString(0,1,2, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$2),1)");
 
 // Test range triplet (absolute, relative, relative) : (absolute, 
absolute, absolute)
-nRes = aStart.Parse("baz.$A3", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetString(aStart, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$3),1)");
+m_pDoc->SetString(0,2,2, "=COUNTIF(bar.$A1:INDIRECT(\"$A\"&foo.$A$3),1)");
 
 // Test range triplet (absolute, absolute, relative) : (absolute, 
relative, relative)
-nRes = aStart.Parse("baz.$A4", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetString(aStart, 
"=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
+m_pDoc->SetString(0,3,2, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
 
 // Test range triplet (absolute, absolute, relative) : (absolute, 
absolute, relative)
-nRes = aStart.Parse("baz.$A5", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetString(aStart, 
"=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$2),1)");
+m_pDoc->SetString(0,4,2, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$2),1)");
 
 // Test range triplet (absolute, absolute, relative) : (absolute, 
absolute, relative)
-nRes = aStart.Parse("baz.$A6", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetString(aStart, 
"=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$3),1)");
+m_pDoc->SetString(0,5,2, "=COUNTIF(bar.$A$1:INDIRECT(\"$A\"&foo.$A$3),1)");
 
 // Test range triplet (absolute, absolute, absolute) : (absolute, 
relative, relative)
-nRes = aStart.Parse("baz.$A7", m_pDoc);
-CPPUNIT_ASSERT_MESSAGE("Failed to parse.", (nRes & SCA_VALID) != 0);
-m_pDoc->SetString(aStart, 
"=COUNTIF($bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
+m_pDoc->SetString(0,6,2, 
"=COUNTIF($bar.$A$1:INDIRECT(\"$A\"&foo.$A$1),1)");
 
 // Test

[Bug 54169] LibO doesn't obey OS setting “only show the accelerator underline when the Alt key is being pressed”

2015-06-18 Thread bugzilla-daemon

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

Dennis Roczek  changed:

   What|Removed |Added

 CC||dennisroc...@gmail.com
   See Also||https://bugs.documentfounda
   ||tion.org/show_bug.cgi?id=92
   ||008

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

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

2015-06-18 Thread Miklos Vajna

 comphelper/source/misc/lok.cxx|8 ++--
 include/comphelper/lok.hxx|2 -
 sw/qa/extras/tiledrendering/data/shape-with-text.fodt |   17 +
 sw/qa/extras/tiledrendering/tiledrendering.cxx|   33 ++
 4 files changed, 55 insertions(+), 5 deletions(-)

New commits:
commit bcace9acafa24d5251e90587af776fdb0a808ed8
Author: Miklos Vajna 
Date:   Thu Jun 18 14:12:04 2015 +0200

Add SwTiledRenderingTest::testGetTextSelection() testcase.

Fails without commit 193b907b2bc49b9e48cfab2583e81a24aaa2e666
(SwXTextDocument::getTextSelection: fix missing editeng forward,
2015-06-18).

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

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index fc8a09d..a6abd2a 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -15,16 +15,16 @@ namespace comphelper
 namespace LibreOfficeKit
 {
 
-static bool bActive(false);
+static bool g_bActive(false);
 
-void setActive()
+void setActive(bool bActive)
 {
-bActive = true;
+g_bActive = bActive;
 }
 
 bool isActive()
 {
-return bActive;
+return g_bActive;
 }
 
 static void (*pStatusIndicatorCallback)(void *data, 
statusIndicatorCallbackType type, int percent)(nullptr);
diff --git a/include/comphelper/lok.hxx b/include/comphelper/lok.hxx
index 704fb1f..79fa115 100644
--- a/include/comphelper/lok.hxx
+++ b/include/comphelper/lok.hxx
@@ -24,7 +24,7 @@ namespace LibreOfficeKit
 // Functions to be called only from the LibreOfficeKit implementation in 
desktop, not from other
 // places in LibreOffice code.
 
-COMPHELPER_DLLPUBLIC void setActive();
+COMPHELPER_DLLPUBLIC void setActive(bool bActive = true);
 
 enum class statusIndicatorCallbackType { Start, SetValue, Finish };
 
diff --git a/sw/qa/extras/tiledrendering/data/shape-with-text.fodt 
b/sw/qa/extras/tiledrendering/data/shape-with-text.fodt
new file mode 100644
index 000..ce76aaf
--- /dev/null
+++ b/sw/qa/extras/tiledrendering/data/shape-with-text.fodt
@@ -0,0 +1,17 @@
+
+http://www.w3.org/1999/xlink"; 
xmlns:dc="http://purl.org/dc/elements/1.1/"; 
xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" 
xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" 
xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" 
xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" 
xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" 
xmlns:math="http://www.w3.org/1998/Math/MathML"; 
xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" 
xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" 
xmlns:config="urn:oas
 is:names:tc:opendocument:xmlns:config:1.0" 
xmlns:ooo="http://openoffice.org/2004/office"; 
xmlns:ooow="http://openoffice.org/2004/writer"; 
xmlns:oooc="http://openoffice.org/2004/calc"; 
xmlns:dom="http://www.w3.org/2001/xml-events"; 
xmlns:xforms="http://www.w3.org/2002/xforms"; 
xmlns:xsd="http://www.w3.org/2001/XMLSchema"; 
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; 
xmlns:rpt="http://openoffice.org/2005/report"; 
xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" 
xmlns:xhtml="http://www.w3.org/1999/xhtml"; 
xmlns:grddl="http://www.w3.org/2003/g/data-view#"; 
xmlns:officeooo="http://openoffice.org/2009/office"; 
xmlns:tableooo="http://openoffice.org/2009/table"; 
xmlns:drawooo="http://openoffice.org/2010/draw"; 
xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
 
xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
 xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" 
xmlns:formx="urn:openoffice:names:
 experimental:ooxml-odf-interop:xmlns:form:1.0" 
xmlns:css3t="http://www.w3.org/TR/css3-text/"; office:version="1.2" 
office:mimetype="application/vnd.oasis.opendocument.text">
+ 
+  
+   
+
+
+
+
+   
+   
+ Shape text
+ 
+Hello.
+  
+ 
+
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx 
b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index b139b16..989e1c7 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -12,9 +12,12 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -31,6 +34,7 @@ public:
 void testPostKeyEvent();
 void testPostMouseEvent();
 void testSetTextSelection();
+void testGetTextSelection();
 void testSetGraphicSelection();
 void testResetSelection();
 void testSearch();
@@ -44,6 +48,7 @@ public:
 CPPUNIT_TEST(testPostKeyEvent);
 CPPUNIT_TEST(testPostMouseEvent);
 CPPUNIT_TEST(testSetTextSelection);
+CPPUNIT_TEST(testGetTextSelection);
 CPPUNIT_TEST(testSetGraphicSelection);

minutes of ESC call ...

2015-06-18 Thread Michael Meeks

* Present:
+ Lionel, Christian, Andras, Caolan, Bjoern, Kendy, Michael M, Miklos,
  Stephan, Thorsten, Sophie,Norbert, Muthu, Robinson, Eike, Michael S,
  David
 
* Completed Action Items:
+ send updated ESC composition -> board approval (Michael)
+ https://wiki.documentfoundation.org/Development/ESC
AI:  [ rubber stamp ~applied - just need to edit the wiki ... (Michael) 
]
+ move problem writer tests from check -> subsequentcheck for sw.all 
(Michael S)
+ link from the developer pages: (Sophie)
  + 
https://wiki.documentfoundation.org/Documentation/RecentStringChanges
 
* Pending Action Items:
+ find some developer/sysadmin'y type people to train in CI maintenance 
(Cloph/Norbert)
[ Cloph can login to slaves & most stuff works already ]
+ can we get Win64 tinderbox builds up-loaded ? (Cloph)
[ installing windows updates & then will up-load
  no problem with tinderbox but was annoyed by make check failing - 
which broke the build and thusly the uploads (Thorsten) ]
+ encourage QA guys to test mork / thunderbird bits on Win64 (Robinson)
[ we now have builds
AI:   test mork builds (Robinson) ].
+ re-arrange the help XML for the menu changes (Jay)
[ did not get to the help yet - now finished impress & will begin on 
this ]
+ add testing sdk-examples to bug hunting sessions or MozTrap 
(Robinson/Sophie)
[ Bjoern added, sometimes the SDK examples fail, it'd be lovely to have 
them
  tested by someone pre-release.
 + Can't we automate that ? (Michael)
 + Totally different build environment (Miklos)
 + scripts to generate / unpack extensions eg. (Bjoern)
   
https://gerrit.libreoffice.org/gitweb?p=sdk-examples.git;a=blob;f=TuesdayPython/README;h=b2c7aa664235e97535513e28e6411f5aea3d0b3a;hb=c11a547c5b81d83ee510a6a4138b342740b18eaa
   ^- should be rather self-explaining
 + not convinced it's useful for QA people (Stephan)
 + do occasionally break; 1x broken - someone on ML reported.
 + needs someone into doing that work.
 + breakage not easily automateable (Bjoern)
 + stuff appearing at wrong place in toolbars etc.
 + sample should not break, unless sample changed (Norbert)
 + mostly code-changes (Stephan)
 + if people cleanup odk/examples - they need to run tests
   to ensure it didn't break.
 + already tests that they compile occasionally (Stephan)
 + is there an easy way to compile all of them ? (Miklos)
AI:  + dig out documentation on compiling SDK examples -> odk/README 
(Stephan)
]
 
* Release Engineering update (Cloph)
+ 5.0.0 - RC1 status
  + planned to be tagged today
  + to early testers @ the weekend.
  + still some gerrit issues needing review.
  + no branch-off yet.
  + string & UI freeze for RC1.
  + heavy-duty process & branch-off June 29th - 1st week July.
  + 5.0.0 branch & RC2.
  + small update of the schedule: the final release will be 1 week 
later due to Marketing
  + push out 5.0.1 1x week too ...
  + Late Feature Status (Michael)
  + LibreOfficeKit / Online tweaks (Kendy)
  + some fixes time to time.
  + support for copy functionality -> in the tagged 'unstable' 
LOK API.
  + writer part already in; rest just bug fixes.
  + OpenGL / double-buffer RenderContext (Michael)
  + continuing to fix double buffered bugs
  + OpenGL by default not achievable for 5.0.0
  + propose re-visit @ ESC for 5.0.1 for some H/W on 
Windows.
  + double buffering makes start-center beautiful now when 
re-sizing (Kendy)
  + gtk3+ embedded video, cut/paste (Caolan)
  + working on cut/paste - when done plan to have it
built and used by default for 5.0.
  + Win64
  + pending more QA work
  + crasher bug when auto-spellcheck enabled in writer (Cloph)
  + also when manual spell-check.
  + UNO bridge ? (Michael)
  + 
https://bugs.documentfoundation.org/show_bug.cgi?id=92014
+ 4.4.5 - July 6th next deadline
+ 4.4.4 not yet announced; pending hot-fix.
+ Android & iOS Remote
 
* UX Update (Kendy)
+ 5.0 graphics
+ poked Barak, gave some details on what we're after.
+ an updated color scheme for start center - agreed by design
+ it will be more grey.
+ templates contest
+ Jay - running another round of the competition, hopefully get more.
+ upda

Minutes of the Design Hangout: 2015-06-17

2015-06-18 Thread Jan Holesovsky

* Present: Heiko, Jay, Mattias, Kendy
 
* UI changes integrated the last week:
 
+ Impress menubar reorganized (Jay)
+ Added outline buttons to impress sidebar (Maxim)
+ Adapted the numbering popup to more than 8 items (Maxim)
+ Enabled gtk3 backend by default (Caolán, Miklos)
+ Fixed icon links (Jay)
+ More Background / Highlighting fixes (Tamas)
+ .ui improvements (Maxim)
+ More sifr icons (Matthias)
+ More breeze icons (Andreas)
+ TreeView in the Expert configuration dialog (Mihály)
 
* Sifr icon patches that need to be cherry picked for 5.0 (Jay)
 
+ https://gerrit.libreoffice.org/#/c/16115/
  https://gerrit.libreoffice.org/#/c/16120/
  https://gerrit.libreoffice.org/#/c/16128/
+ Adolfo pushed
+ https://gerrit.libreoffice.org/#/c/16261/
  https://gerrit.libreoffice.org/#/c/16254/
+ pushed by Adolfo too
 
* Important icons were removed by Andrew like lc_styleupdatebyexample.png (Jay)

+ 
http://cgit.freedesktop.org/libreoffice/core/commit/?id=18f41dfaf19d656d290c47d196ef2702e169a522
+ restored lc_styleupdatebyexample.png
+ will check with Andrew what was the criteria for removal (Jay)
 
* Problems with Icons (Jay)
 
   + MAB - links.txt
   + https://bugs.documentfoundation.org/show_bug.cgi?id=90790
   + https://bugs.documentfoundation.org/show_bug.cgi?id=92105
   + is it possible to do build-time?  Like, can one icon point to one icon in 
one theme,
 but to other in another theme  (Kendy)
   + turns out there is some support for more links.txt's in the code, so a 
bug,
 not a missing functionality (Kendy)
AI + fix it... (Kendy)
 
* Icon Updates / Issues (Jay)
 
+ if an icon is missing, Jay can add the needed XML snippet (Andreas/Jay)
 
+ Tango (Alex/Adolfo/Jay)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/1OErlXIDDGM7V1mOGW8oSCLuhqw5fulT1XhkTik1u2UY/edit?usp=sharing
 
+ Sifr (Papamatti/Jay)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/15ZpVaTxg7TAFYhOyQUP3mp-cVtKA1vP5uZAT38t-taA/edit?usp=sharing
+ Papamatti has pushed new icons (Jay)
 
+ Breeze (Andreas/Jay)
+ nearly finished with icons (Andreas)
+ Latest status of updates available here (Jay)
  
https://docs.google.com/document/d/1dpMFgmkQy4BsyRIKH97ZLPTU6NdvXIYk3Yossj6sSQM/edit?usp=sharing
 
+ Extra-Large (32x32) Icons for large resolutions
+ Status - 
https://docs.google.com/document/d/1mPqD2gGsMkfVCI6ByUd2XYX1NJm26hcGjRVe6gcCSEU/edit?usp=sharing
 
+ UI-freeze for 5.0.0 this week (cloph)
+ last chance to change default icon theme for other OS/decide not to 
change it
 
* Templates Competition (Jay)
 
+ Wiki page setup
  
https://wiki.documentfoundation.org/Design/Whiteboards/Templates_for_LibreOffice_5.0
+ need to sync with Italo, poked him (Jay)
 
* Next Friday's design session (Jay)
 
+ Friday session this week
+ context menus, sidebars?  Menus?
+ 1:00pm CEST / 11:00 UTC
 
+ List of possible future topics
+ 
https://docs.google.com/document/d/1XiJauFHrSmM5LsaV0AlglhfUh8D1IxAg8qistP0KAQA/edit?usp=sharing
+ Steve wants the sidebar "configuration menu" icon gone: "it's useless 
confusing, thus user unfriendly,
  creates frustration and clutters the UI."
  https://bugs.documentfoundation.org/show_bug.cgi?id=91824
 
* UI Guidelines (Heiko)
 
+ 
https://docs.google.com/document/d/1hSYOFoG6jnj2G0zWDbUYkrGZoj7YCSI9j3onkTZ65bU/edit
 
+ content now in the wiki
+ next steps: context menu, sidebar, dialogs
 
* Calc default styles
 
+ https://bugs.documentfoundation.org/show_bug.cgi?id=90937
+ 
https://docs.google.com/spreadsheets/d/1Bt2Gr0JslOLL86xb-bCl76mji5AhHT_8VI-5Wp5Qyq0/edit?usp=sharing
+ agreed the new default: H217:H238 in the spreadsheet
+ when done, will send the colors / style to Jay/Moggi (Mattias)
 
+ code for this is here:
+ 
http://cgit.freedesktop.org/libreoffice/core/tree/sc/source/core/data/stlpool.cxx#n275

+ moggi willing to spend some hacking on using an actual template file 
instead of the hardcoded stuff (Jay)

* Improving the Use of Styles in Writer (Jay)

+ 
https://docs.google.com/document/d/1onHj7GLNs-x9jMJBRsYaRLv_xsN3UJhP13P690L6ci8/edit?usp=sharing



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

Re: ScPostIt revision

2015-06-18 Thread Markus Mohrhard

Hey,

On Wed, Jun 17, 2015 at 12:20 PM, Mike Kaganski  wrote:

>  Hello!
>
> While working on tdf#89226, I found out that there are a number of places
> in calc where ScPostIt's, as well as the SdrCaptionObj's (controlled by
> ScPostIt) are used after delete.
>
> Turns out that quite a few regressions issued in bugzilla are rooted to
> that. To number a few:
> tdf#89226
> tdf#83192
> tdf#91995
> tdf#90741
> tdf#83192
>
> Another crash that I haven't issued to bugzilla (it would only add up to
> those already mentioned; don't know if it is already reported): Copy a cell
> with comment to clipboard → close original document → paste to another
> document.
>
> So, I thought it's  manifestation of obscure interface/protocol of the
> objects that leads to broken conditions when implementers use them.
> Currently I'm evaluating possible changes to (mainly) ScPostIt that would
> make its usage more safe and robust.
>

Notes are not a sim[ple object as they combine a drawinglayer object + a
calc core object. So the lifecycle of these will always be a bit more
complicated than that of a normal cell, ...


>
> This message is intended to notify everyone interested of this work, and
> to initiate a discussion on it, if someone happens to have an opinion on
> how to do things best. I would be most grateful for any opinion that could
> help me avoid making other's lives more difficult.
>
> So, these are the outline of what I found and what intend to do.
>
> 1. Classes and their relationship.
> ScPostIt is a class that represents a cell's note in calc documents. Its
> main "place of life" is in ScColumn::maCellNotes (sparse multitype vector
> of pointers to ScPostIt objects). The ScPostIt's that are pointed from
> maCellNotes of columns of ordinary documents (SCDOCMODE_DOCUMENT) are
> "ordinary" notes: they represent real notes that belong to some specific
> cells, have a reference to owning document, an author, creation date, and
> (possibly) a graphic caption object (SdrCaptionObj) with its text, size,
> position, formatting etc., or an information required to construct such
> object on demand. They may be used to add new notes, to control the caption
> objects (show/hide, etc.), or to remove existing notes.
> Also, there are other kinds of documents and other objects that may "own"
> or use pointers to ScPostIt objects: Undo documents (SCDOCMODE_UNDO),
> Clipboard documents (SCDOCMODE_CLIP); CopyFromClipContext::maSingleNotes.
> Depending on the its document kind, the ScPostIt behaviour differ: e.g.
> when in Undo document, it doesn't try to delete caption object it points
> to, because the caption is "shared" with an "ordinary" note.
>

That is the correct and useful behavior. You don't want to create new
drawinglayer objects in copy and undo documents if possible as they are
quite expensive and are causing quite a lot of pain.


>
> SdrCaptionObj is the graphic object (a rectangle with a text and a
> callout) of the note. It usually belongs to a ScPostIt (ScPostIt has a
> pointer to it). In the normal edit mode, it is created using ScPostIt
> methods and belong to it right away. Also, other ways are possible:
> - creation of "temporary" caption that does not belong to any ScPostIt;
> - creation of SdrCaptionObj during import (to later create an ScPostIt to
> hold it);
> - passing ownership of the SdrCaptionObj to different Undo objects (like
> SdrUndoDelObj);
> - passing pointers to SdrCaptionObj of an "ordinary" ScPostIt to different
> objects (like Undo objects: SdrUndoGeoObj, ScUndoObjData, Undo/Clipboard
> ScPostIt's, and so on) without transferring ownership.
>
> This leads to these currently implemented crash scenarios:
> 1. When forming an undo/redo documents for an action, the ScPostIt's are
> not copied to the documents, but pointers to them (see current
> ScColumn::CopyCellToDocument). If afterwards the action is undone, the
> restoration of the note is implemented as "cloning", i.e. creating a new
> copy of the ScPostIt, and assigning that copy to cell (thus deleting
> original ScPostIt, that is still pointed to from Undo/Redo documents).
> Thus, subsequent Redo naturally crashes LO.
> 2. When creating a note, then modifying cell, then undoing twice - the
> first undo deletes the note, the second tries to delete already deleted
> note;
> 3. When creating a note, then modifying a cell, then removing the note,
> then undo twice, then redo twice - the same.
> 4. When copying a cell with a note to clipboard, then closing original
> document, then pasting to another document (that was open before closing
> the first) - the inserted note is badly formatted.
> 5. Same as above, but the second document is created after the first was
> closed - crash (has nothing to do with unloading DLLs, because another calc
> document may be open all the time) - the clipboard references already
> deleted object.
> ... and so on.
>
> 2. Intended modifications.
> One possible approach is to avoid multiple pointers to same
> ScPos

[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - sfx2/source

2015-06-18 Thread László Németh

 sfx2/source/control/thumbnailviewitem.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b33e7ccf4cd4f58d61188b9fa2ec1a37bdd92eaf
Author: LÃ¡szlÃ³ NÃ©meth 
Date:   Thu Jun 18 12:09:21 2015 +0200

fix start center rendering (removing selection)

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

diff --git a/sfx2/source/control/thumbnailviewitem.cxx 
b/sfx2/source/control/thumbnailviewitem.cxx
index 7d4cbed..ee0e559 100644
--- a/sfx2/source/control/thumbnailviewitem.cxx
+++ b/sfx2/source/control/thumbnailviewitem.cxx
@@ -154,7 +154,7 @@ Rectangle ThumbnailViewItem::updateHighlight(bool bVisible, 
const Point& rPoint)
 }
 else
 {
-if (isHighlighted())
+if (isHighlighted() || mpTitleED->SupportsDoubleBuffering())
 bNeedsPaint = true;
 setHighlight(false);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Bug 79641] LibreOffice 4.4 most annoying bugs

2015-06-18 Thread bugzilla-daemon

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

Bug 91242 Summary: Saving as .docx adds the outline number, which is not 
applied, before the header after reopening
https://bugs.documentfoundation.org/show_bug.cgi?id=91242

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |DUPLICATE

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - include/svx svx/source

2015-06-18 Thread matteocam

 include/svx/textchain.hxx   |   24 -
 svx/source/svdraw/textchain.cxx |   44 +---
 2 files changed, 59 insertions(+), 9 deletions(-)

New commits:
commit d674ed2e472d555a0eb4ec46c7d104ae85907794
Author: matteocam 
Date:   Thu Jun 18 15:24:10 2015 -0400

Prototype of TextChain having support for overwrite on overflow

Change-Id: I6ea6e4053663ecdb3e484d857e0a9dd3b7fc1dae

diff --git a/include/svx/textchain.hxx b/include/svx/textchain.hxx
index b3eda9b..01798d5 100644
--- a/include/svx/textchain.hxx
+++ b/include/svx/textchain.hxx
@@ -29,16 +29,19 @@ namespace rtl {
 class OUString;
 }
 
-typedef std::map< rtl::OUString, ImpChainLinkProperties > LinkPropertiesMaps;
+typedef rtl::OUString ChainLinkId;
+typedef std::map< ChainLinkId, ImpChainLinkProperties *> LinkPropertiesMap;
 
 
 class ImpChainLinkProperties
 {
-public:
+protected:
 friend class TextChain;
 
-private:
-// all kind of stuff such has MergeableFirstParagraphs or if 
overflapping should occurr on overflow
+ImpChainLinkProperties();
+
+bool bOverwriteOnOverflow;
+// all kind of stuff such has MergeableFirstParagraphs or if overwrite 
should occurr on overflow
 };
 
 
@@ -46,13 +49,22 @@ class TextChain {
 
 public:
 TextChain();
+~TextChain();
+
 void AppendLink(SdrTextObj *);
-SdrTextObj *GetNextLink(SdrTextObj *);
+bool IsLinkInChain(SdrTextObj *) const;
+SdrTextObj *GetNextLink(SdrTextObj *) const;
+
+ChainLinkId GetId(SdrTextObj *) const;
+ImpChainLinkProperties *GetLinkProperties(SdrTextObj *);
 
 // return whether a paragraph is split between the two links in the 
argument
-bool GetLinksHaveMergeableFirstPara(SdrTextObj *pPrevLink, SdrTextObj 
*pNextLink);
+bool GetLinksHaveMergeableFirstPara(SdrTextObj *, SdrTextObj *);
 void SetOverwriteOnOverflow(SdrTextObj *, bool );
 bool GetOverwriteOnOverflow(SdrTextObj *pTarget);
+
+protected:
+LinkPropertiesMap maLinkPropertiesMap;
 };
 
 #endif // INCLUDED_SVX_TEXTCHAIN_HXX
diff --git a/svx/source/svdraw/textchain.cxx b/svx/source/svdraw/textchain.cxx
index 709d562..3637d45 100644
--- a/svx/source/svdraw/textchain.cxx
+++ b/svx/source/svdraw/textchain.cxx
@@ -20,20 +20,40 @@
 #include 
 #include 
 
+
+ImpChainLinkProperties::ImpChainLinkProperties()
+{
+// give defaults
+bOverwriteOnOverflow = false;
+}
+
+// XXX: All getters in the class assume that the guy is in the chain
+
 TextChain::TextChain()
 {
 }
 
+TextChain::~TextChain()
+{
+// XXX: Should free all LinkProperties
+}
+
+bool TextChain::IsLinkInChain(SdrTextObj *) const
+{
+return true;// XXX: Should make an actual check
+}
+
 void TextChain::AppendLink(SdrTextObj *)
 {
+// XXX
 }
 
-SdrTextObj *TextChain::GetNextLink(SdrTextObj *)
+SdrTextObj *TextChain::GetNextLink(SdrTextObj *) const
 {
-return NULL; // XXX
+return NULL; // XXX: To be changed. It'd be a mess to implement now
 }
 
-bool TextChain::GetLinksHaveMergeableFirstPara(SdrTextObj *pPrevLink, 
SdrTextObj *pNextLink)
+bool TextChain::GetLinksHaveMergeableFirstPara(SdrTextObj* /* pPrevLink */, 
SdrTextObj* /* pNextLink */)
 {
 // XXX
 return false;
@@ -41,12 +61,30 @@ bool TextChain::GetLinksHaveMergeableFirstPara(SdrTextObj 
*pPrevLink, SdrTextObj
 
 void TextChain::SetOverwriteOnOverflow(SdrTextObj *pTarget, bool bOverwrite)
 {
+ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget);
+pLinkProperties->bOverwriteOnOverflow = bOverwrite;
+}
+
+ImpChainLinkProperties *TextChain::GetLinkProperties(SdrTextObj *pLink)
+{
+// if the guy does not already have properties in the map make them
+ChainLinkId aLinkId = GetId(pLink);
+if (maLinkPropertiesMap.find(aLinkId) == maLinkPropertiesMap.end()) {
+maLinkPropertiesMap[aLinkId] = new ImpChainLinkProperties;
+}
 
+return maLinkPropertiesMap[aLinkId];
 }
 
 bool TextChain::GetOverwriteOnOverflow(SdrTextObj *pTarget)
 {
+ImpChainLinkProperties *pLinkProperties = GetLinkProperties(pTarget);
+return pLinkProperties->bOverwriteOnOverflow;
+}
 
+ChainLinkId TextChain::GetId(SdrTextObj *pLink) const
+{
+return pLink->GetName();
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-06-18 Thread Eike Rathke

 sc/qa/unit/data/xlsx/ceiling-floor.xlsx |binary
 sc/qa/unit/helper/shared_test_impl.hxx  |   15 +++
 sc/qa/unit/subsequent_export-test.cxx   |   41 +++-
 sc/qa/unit/subsequent_filters-test.cxx  |   14 ++
 4 files changed, 69 insertions(+), 1 deletion(-)

New commits:
commit ba70050dc37f82306a8a3c5815372a4b9fff18fc
Author: Eike Rathke 
Date:   Thu Jun 18 21:30:22 2015 +0200

add test case document to unit tests, tdf#69552

Change-Id: I73da1e00dd2b19088fbbe7e999611835f2ed4882

diff --git a/sc/qa/unit/data/xlsx/ceiling-floor.xlsx 
b/sc/qa/unit/data/xlsx/ceiling-floor.xlsx
new file mode 100644
index 000..a98a355
Binary files /dev/null and b/sc/qa/unit/data/xlsx/ceiling-floor.xlsx differ
diff --git a/sc/qa/unit/helper/shared_test_impl.hxx 
b/sc/qa/unit/helper/shared_test_impl.hxx
index bc2ee65..666be99 100644
--- a/sc/qa/unit/helper/shared_test_impl.hxx
+++ b/sc/qa/unit/helper/shared_test_impl.hxx
@@ -271,6 +271,21 @@ void testFunctionsExcel2010_Impl( ScDocument& rDoc )
 }
 }
 
+void testCeilingFloor_Impl( ScDocument& rDoc )
+{
+// Original test case document is ceiling-floor.xlsx
+// Sheet1.K1 has =AND(K3:K81) to evaluate all results.
+const char* pORef = "Sheet1.K1";
+OUString aRef( OUString::createFromAscii( pORef));
+ScAddress aPos;
+aPos.Parse(aRef);
+if (!checkFormula( rDoc, aPos, "AND(K3:K81)"))
+CPPUNIT_FAIL("Wrong formula.");
+CPPUNIT_ASSERT_MESSAGE( OString( OString(pORef) + " result is 
error.").getStr(),
+isFormulaWithoutError( rDoc, aPos));
+CPPUNIT_ASSERT_EQUAL(1.0, rDoc.GetValue(aPos));
+}
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index e529e08..d54a9e5 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -126,6 +126,11 @@ public:
 void testFunctionsExcel2010XLS();
 void testFunctionsExcel2010ODS();
 
+void testCeilingFloor( sal_uLong nFormatType );
+void testCeilingFloorXLSX();
+void testCeilingFloorXLS();
+void testCeilingFloorODS();
+
 void testRelativePaths();
 void testSheetProtection();
 
@@ -182,13 +187,16 @@ public:
 CPPUNIT_TEST(testSharedFormulaStringResultExportXLSX);
 CPPUNIT_TEST(testFunctionsExcel2010XLSX);
 CPPUNIT_TEST(testFunctionsExcel2010XLS);
+CPPUNIT_TEST(testFunctionsExcel2010ODS);
+CPPUNIT_TEST(testCeilingFloorXLSX);
+CPPUNIT_TEST(testCeilingFloorXLS);
+CPPUNIT_TEST(testCeilingFloorODS);
 #if !defined(WNT)
 CPPUNIT_TEST(testRelativePaths);
 #endif
 CPPUNIT_TEST(testSheetProtection);
 CPPUNIT_TEST(testPivotTableXLSX);
 CPPUNIT_TEST(testPivotTableTwoDataFieldsXLSX);
-CPPUNIT_TEST(testFunctionsExcel2010ODS);
 #if !defined(WNT)
 CPPUNIT_TEST(testSupBookVirtualPath);
 #endif
@@ -1988,6 +1996,37 @@ void ScExportTest::testFunctionsExcel2010XLS()
 testFunctionsExcel2010(XLS);
 }
 
+void ScExportTest::testCeilingFloor( sal_uLong nFormatType )
+{
+ScDocShellRef xShell = loadDoc("ceiling-floor.", XLSX);
+CPPUNIT_ASSERT_MESSAGE("Failed to load the document.", xShell.Is());
+
+ScDocShellRef xDocSh = saveAndReload(xShell, nFormatType);
+ScDocument& rDoc = xDocSh->GetDocument();
+rDoc.CalcAll(); // perform hard re-calculation.
+
+testCeilingFloor_Impl(rDoc);
+
+xDocSh->DoClose();
+}
+
+void ScExportTest::testCeilingFloorXLSX()
+{
+testCeilingFloor(XLSX);
+}
+
+void ScExportTest::testCeilingFloorXLS()
+{
+// CEILING.PRECISE() and FLOOR.PRECISE() with one parameter only currently
+// (2015-06-18) don't survive .xls save/reload and give NA()
+//testCeilingFloor(XLS);
+}
+
+void ScExportTest::testCeilingFloorODS()
+{
+testCeilingFloor(ODS);
+}
+
 void ScExportTest::testRelativePaths()
 {
 ScDocShellRef xDocSh = loadDoc("fdo79305.", ODS);
diff --git a/sc/qa/unit/subsequent_filters-test.cxx 
b/sc/qa/unit/subsequent_filters-test.cxx
index 4ac4bf8..33431ca 100644
--- a/sc/qa/unit/subsequent_filters-test.cxx
+++ b/sc/qa/unit/subsequent_filters-test.cxx
@@ -107,6 +107,7 @@ public:
 void testHardRecalcODS();
 void testFunctionsODS();
 void testFunctionsExcel2010();
+void testCeilingFloorXLSX();
 void testCachedFormulaResultsODS();
 void testCachedMatrixFormulaResultsODS();
 void testFormulaDepAcrossSheetsODS();
@@ -213,6 +214,7 @@ public:
 CPPUNIT_TEST(testHardRecalcODS);
 CPPUNIT_TEST(testFunctionsODS);
 CPPUNIT_TEST(testFunctionsExcel2010);
+CPPUNIT_TEST(testCeilingFloorXLSX);
 CPPUNIT_TEST(testCachedFormulaResultsODS);
 CPPUNIT_TEST(testFormulaDepAcrossSheetsODS);
 CPPUNIT_TEST(testFormulaDepDeleteContentsODS);
@@ -547,6 +549,18 @@ void ScFiltersTest::testFunctionsExcel2010()
 xDocSh->DoClose();
 }
 
+void ScFiltersTest::testCeilingFloorXLSX()
+{
+ScDocShellRef xDocSh = loadDoc("ceiling-floor.", XLSX);
+CPPUNIT_ASSER

[Bug 75025] LibreOffice 4.3 most annoying bugs

2015-06-18 Thread bugzilla-daemon

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

Bug 76595 Summary: FILESAVE: After deleting an image in a loaded file, it 
reappears in saved .odf
https://bugs.documentfoundation.org/show_bug.cgi?id=76595

   What|Removed |Added

 Status|NEW |RESOLVED
 Resolution|--- |WORKSFORME

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

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

2015-06-18 Thread matteocam

 svx/source/svdraw/svdotextdecomposition.cxx |   29 ++--
 1 file changed, 27 insertions(+), 2 deletions(-)

New commits:
commit d50fd94d02ab9dc97619e788c8607ebfa3482c45
Author: matteocam 
Date:   Thu Jun 18 16:13:37 2015 -0400

Implements overwriting behavior in SdrTextObj for underflow. Bugged.

Change-Id: I20e8d7e7343621f652603ce76d0d7ae92a6e6483

diff --git a/svx/source/svdraw/svdotextdecomposition.cxx 
b/svx/source/svdraw/svdotextdecomposition.cxx
index 009bb4a..7fb4dc6 100644
--- a/svx/source/svdraw/svdotextdecomposition.cxx
+++ b/svx/source/svdraw/svdotextdecomposition.cxx
@@ -796,8 +796,33 @@ OutlinerParaObject 
*SdrTextObj::impGetOverflowingParaObject(SdrOutliner *pOutlin
 if (mpOverflowingText == NULL)
 return NULL;
 
-// XXX: Not sure if necessary
-//pOutliner->Clear();
+// XXX: Put following code in a separate method (possibly in another class)
+if ( GetTextChain()->GetOverwriteOnOverflow(pNextTextObj) )
+{
+// We only make three blocks of paragraphs and ignore the rest
+
+// reset behavior
+GetTextChain()->SetOverwriteOnOverflow(pNextTextObj, false);
+
+if (mpOverflowingText->HasOtherParas()) {
+// Make first paragraph
+impSetOutlinerToEmptyTxt(pOutliner);
+Paragraph *pFstPara = pOutliner->GetParagraph(0);
+pOutliner->SetText(mpOverflowingText->GetHeadingLines(), pFstPara);
+
+// Add middle paragraphs
+if (mpOverflowingText->mpMidParas)
+pOutliner->AddText(*mpOverflowingText->mpMidParas);
+
+pOutliner->Insert(mpOverflowingText->GetEndingLines());
+} else {
+impSetOutlinerToEmptyTxt(pOutliner);
+Paragraph *pFstPara = pOutliner->GetParagraph(0);
+pOutliner->SetText(mpOverflowingText->GetEndingLines(), pFstPara);
+}
+
+return pOutliner->CreateParaObject();
+}
 
 OutlinerParaObject *pCurTxt = pNextTextObj->GetOutlinerParaObject();
 pOutliner->SetText(*pCurTxt);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-4-4' - editeng/source include/editeng svx/source

2015-06-18 Thread Katarina Behrens

 editeng/source/items/textitem.cxx |   45 ++
 include/editeng/colritem.hxx  |2 +
 include/editeng/unotext.hxx   |1 
 svx/source/unodraw/unoprov.cxx|1 
 svx/source/unodraw/unoshap2.cxx   |1 
 5 files changed, 50 insertions(+)

New commits:
commit cf1ea5197ca0d76de23d1d21a4701b38ddec15f1
Author: Katarina Behrens 
Date:   Tue Jun 9 11:53:12 2015 +0200

tdf#88295: Don't export transparent background colour as white

The fix is twofold:
1. retrieve transparency from colour in SvxBackgroundColorItem
(add QueryValue, PutValue methods, use additional memberID to
retrieve alpha channel as a bool property)
2. add CharBackTransparent bool property to Draw [text] shapes,
xmloff needs it to be able to output 'transparent' string instead of
'#XXYYZZ' colour code in ODF format

Conflicts:
include/editeng/colritem.hxx

Change-Id: I6e14b81cc82f6b4d7fdd4756ff2e4f75e9270361
Reviewed-on: https://gerrit.libreoffice.org/16243
Reviewed-by: Muthu Subramanian K 
Reviewed-by: Michael Stahl 
Tested-by: Michael Stahl 

diff --git a/editeng/source/items/textitem.cxx 
b/editeng/source/items/textitem.cxx
index b4f5303..b55d9ad 100644
--- a/editeng/source/items/textitem.cxx
+++ b/editeng/source/items/textitem.cxx
@@ -1830,6 +1830,51 @@ SfxPoolItem* SvxBackgroundColorItem::Create(SvStream& 
rStrm, sal_uInt16 ) const
 return new SvxBackgroundColorItem( rStrm, Which() );
 }
 
+bool SvxBackgroundColorItem::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) 
const
+{
+nMemberId &= ~CONVERT_TWIPS;
+Color aColor = SvxColorItem::GetValue();
+
+switch( nMemberId )
+{
+case MID_GRAPHIC_TRANSPARENT:
+{
+rVal <<= Bool2Any (aColor.GetTransparency() == 0xff);
+break;
+}
+default:
+{
+rVal <<= (sal_Int32)(aColor.GetColor());
+break;
+}
+}
+return true;
+}
+
+bool SvxBackgroundColorItem::PutValue( const uno::Any& rVal, sal_uInt8 
nMemberId )
+{
+nMemberId &= ~CONVERT_TWIPS;
+sal_Int32 nColor = 0;
+Color aColor = SvxColorItem::GetValue();
+
+switch( nMemberId )
+{
+case MID_GRAPHIC_TRANSPARENT:
+{
+aColor.SetTransparency( Any2Bool( rVal ) ? 0xff : 0 );
+SvxColorItem::SetValue( aColor );
+break;
+}
+default:
+{
+if(!(rVal >>= nColor))
+return false;
+SvxColorItem::SetValue( Color(nColor) );
+break;
+}
+}
+return true;
+}
 
 // class SvxColorItem 
 
diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index 31a7af4..bead03e 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -94,6 +94,8 @@ class EDITENG_DLLPUBLIC SvxBackgroundColorItem : public 
SvxColorItem
 virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const 
SAL_OVERRIDE;
 virtual SfxPoolItem* Create(SvStream &, sal_uInt16) const 
SAL_OVERRIDE;
 
+virtual bool QueryValue(com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0) const SAL_OVERRIDE;
+virtual bool PutValue(const com::sun::star::uno::Any& rVal, sal_uInt8 
nMemberId = 0) SAL_OVERRIDE;
 };
 
 #endif
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index da7708c..71bacb2 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -91,6 +91,7 @@ class SvxItemPropertySet;
 { OUString(UNO_NAME_EDIT_CHAR_LOCALE),  EE_CHAR_LANGUAGE,   
::cppu::UnoType::get(),0, MID_LANG_LOCALE }, \
 { OUString(UNO_NAME_EDIT_CHAR_COLOR),   EE_CHAR_COLOR,  
::cppu::UnoType::get(),0, 0 }, \
 { OUString("CharBackColor"),EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(),0, 0 }, \
+{ OUString("CharBackTransparent"),  EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
 { OUString(UNO_NAME_EDIT_CHAR_ESCAPEMENT),  EE_CHAR_ESCAPEMENT, 
::cppu::UnoType::get(),0, MID_ESC }, \
 { OUString(UNO_NAME_EDIT_CHAR_UNDERLINE),   EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_STYLE }, \
 { OUString("CharUnderlineColor"),   EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_COLOR }, \
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 4bd4151..7366166 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -588,6 +588,7 @@ SfxItemPropertyMapEntry const * 
ImplGetSvxControlShapePropertyMap()
 { OUString(UNO_NAME_EDIT_CHAR_CASEMAP), 0,  
cppu::UnoType::get(),0, 0 },
 { OUString(UNO_NAME_EDIT_CHAR_COLOR),   0,  
cppu::UnoType::get(),0, 0 },
 { OUString("CharBackColor"),0,  
cppu::UnoType::get(),0

[Libreoffice-commits] core.git: Branch 'feature/gsoc14-draw-chained-text-boxes' - svx/source

2015-06-18 Thread matteocam

 svx/source/svdraw/svdotext.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit d2f0ea3a37ba07e29d3841ae46818ad2a5e38fc1
Author: matteocam 
Date:   Thu Jun 18 16:29:06 2015 -0400

Updating editing outliner in case of underflow

Change-Id: I4d5fa2c9e33db614dbe3352cddc1e3c6cb8cafd2

diff --git a/svx/source/svdraw/svdotext.cxx b/svx/source/svdraw/svdotext.cxx
index 2ff88aa..8ac625e 100644
--- a/svx/source/svdraw/svdotext.cxx
+++ b/svx/source/svdraw/svdotext.cxx
@@ -2016,6 +2016,9 @@ void SdrTextObj::onUnderflowStatusEvent( )
 // (since this happens automatically by overflow we just "order to" 
reset the destination box's text)
 GetTextChain()->SetOverwriteOnOverflow(pNextLink, true);
 
+if (pEdtOutl != NULL)
+pEdtOutl->SetText(*pNewText);
+
 const_cast(this)->NbcSetOutlinerParaObject(pNewText);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

1 2 >

1 - 100 of 117 matches

Mail list logo