Re: libreoffice 6.1.0.0.beta1 failing hsqldb test

[Miklos Vajna]

Hi Tom,

On Wed, May 30, 2018 at 04:33:41PM +0200, Tomáš Chvátal 
 wrote:
> I am updating libreoffice in openSUSE to the above version and now the
> testBinaryImport fails on not finding sdbc:embedded:hsqldb. As this is
> bundled with LO is this something I did wrong and should check up or is it
> some issue with the test?

Do you have any environment variables set that might influence the test
result? IIRC Rene had SAL_USE_VCLPLUGIN=svp set globally. master had
fixes to tolerate that but not sure if that was cherry-picked to
libreoffice-6-1.

Regards,

Miklos


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

Re: libreoffice 6.1.0.0.beta1 failing hsqldb test

[Kaganski Mike]

On 5/31/2018 10:47 AM, Miklos Vajna wrote:
> IIRC Rene had SAL_USE_VCLPLUGIN=svp set globally. master had
> fixes to tolerate that but not sure if that was cherry-picked to
> libreoffice-6-1.

The https://gerrit.libreoffice.org/54068 was reverted in 
https://gerrit.libreoffice.org/54123 after mst fixed it properly.


-- 
Best regards,
Mike Kaganski
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: Branch 'distro/vector/vector-5.4' - 4 commits - embeddedobj/source filter/source include/filter include/sfx2 sfx2/source sw/qa sw/source

[Miklos Vajna]

 embeddedobj/source/inc/commonembobj.hxx  |4 
 embeddedobj/source/inc/dummyobject.hxx   |4 
 embeddedobj/source/inc/oleembobj.hxx |4 
 filter/source/msfilter/msdffimp.cxx  |   16 +-
 include/filter/msfilter/msdffimp.hxx |6 
 include/sfx2/docfile.hxx |2 
 sfx2/source/doc/docfile.cxx  |   11 +
 sfx2/source/doc/objstor.cxx  |2 
 sw/qa/extras/htmlexport/data/reqif-ole-odg.ole   |  146 +++
 sw/qa/extras/htmlexport/data/reqif-ole-odg.png   |binary
 sw/qa/extras/htmlexport/data/reqif-ole-odg.xhtml |9 +
 sw/qa/extras/htmlexport/htmlexport.cxx   |   15 ++
 sw/qa/extras/uiwriter/data/tdf117225.odt |binary
 sw/qa/extras/uiwriter/uiwriter.cxx   |   43 ++
 sw/source/filter/html/htmlplug.cxx   |   70 ---
 sw/source/filter/html/htmlreqifreader.cxx|   36 -
 sw/source/filter/html/htmlreqifreader.hxx|8 -
 17 files changed, 350 insertions(+), 26 deletions(-)

New commits:
commit 0eecb1607ef4e67b6651c6bfcc41f9addcb7d874
Author: Miklos Vajna 
Date:   Wed May 30 17:32:45 2018 +0200

sw HTML filter: handle embedded ODF content in xhtml/reqif mode

Embedded native data (what we don't parse just carry on) and real OLE2
embedding already worked, this adds the case where the actual content is
ODF, just inside OLE2.

The DOC import/export had support for handleing ODF content inside OLE2,
so reuse that code: add new functions to SvxMSDffManager for import
purposes and reuse SvxMSExportOLEObjects for export purposes.

Change-Id: I0acf65d4bf29af896b8f1dd625e8672050aae350
Reviewed-on: https://gerrit.libreoffice.org/55088
Reviewed-by: Miklos Vajna 
Tested-by: Jenkins 
(cherry picked from commit 0258bcdedd710d78de99c9cefc9d8c3e2ca85fdf)

diff --git a/embeddedobj/source/inc/oleembobj.hxx 
b/embeddedobj/source/inc/oleembobj.hxx
index 5e37b3a26c19..1ef712927a8d 100644
--- a/embeddedobj/source/inc/oleembobj.hxx
+++ b/embeddedobj/source/inc/oleembobj.hxx
@@ -105,6 +105,10 @@ public:
 
 class OleComponent;
 class OwnView_Impl;
+/**
+ * Represents an OLE object that has native data and we try to let an external
+ * application handle that data.
+ */
 class OleEmbeddedObject : public ::cppu::WeakImplHelper
 < css::embed::XEmbeddedObject
 , css::embed::XEmbeddedOleObject
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index cfcc429c389b..3e3a5fcaf1c3 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -6872,7 +6872,7 @@ const char* GetInternalServerName_Impl( const 
SvGlobalName& aGlobName )
 return nullptr;
 }
 
-OUString GetFilterNameFromClassID_Impl( const SvGlobalName& aGlobName )
+OUString SvxMSDffManager::GetFilterNameFromClassID( const SvGlobalName& 
aGlobName )
 {
 if ( aGlobName == SvGlobalName( SO3_SW_OLE_EMBED_CLASSID_60 ) )
 return OUString( "StarOffice XML (Writer)" );
@@ -6913,6 +6913,13 @@ OUString GetFilterNameFromClassID_Impl( const 
SvGlobalName& aGlobName )
 return OUString();
 }
 
+void SvxMSDffManager::ExtractOwnStream(SotStorage& rSrcStg, SvMemoryStream& 
rMemStream)
+{
+tools::SvRef xStr
+= rSrcStg.OpenSotStream("package_stream", StreamMode::STD_READ);
+xStr->ReadStream(rMemStream);
+}
+
 css::uno::Reference < css::embed::XEmbeddedObject >  
SvxMSDffManager::CheckForConvertToSOObj( sal_uInt32 nConvertFlags,
 SotStorage& rSrcStg, const uno::Reference < 
embed::XStorage >& rDestStorage,
 const Graphic& rGrf,
@@ -6977,8 +6984,7 @@ css::uno::Reference < css::embed::XEmbeddedObject >  
SvxMSDffManager::CheckForCo
 if ( pName )
 {
 // TODO/LATER: perhaps we need to retrieve VisArea and Metafile 
from the storage also
-tools::SvRef xStr = rSrcStg.OpenSotStream( 
"package_stream", StreamMode::STD_READ );
-xStr->ReadStream( *xMemStream );
+SvxMSDffManager::ExtractOwnStream(rSrcStg, *xMemStream);
 }
 else
 {
@@ -7013,7 +7019,7 @@ css::uno::Reference < css::embed::XEmbeddedObject >  
SvxMSDffManager::CheckForCo
 if ( pFilter )
 aFilterName = pFilter->GetName();
 else
-aFilterName = GetFilterNameFromClassID_Impl( aStgNm );
+aFilterName = SvxMSDffManager::GetFilterNameFromClassID( 
aStgNm );
 
 uno::Sequence aMedium(aFilterName.isEmpty() 
? 3 : 4);
 aMedium[0].Name = "InputStream";
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index 3d4752768a58..be876a557857 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -63,6 +63,7 @@ struct SvxMSDffShapeOrder;
 class SvxMSDff

Re: Crash test update

[Luboš Luňák]

On Wednesday 30 of May 2018, Crashtest VM wrote:
> New crashtest update available at
> http://dev-builds.libreoffice.org/crashtest/c4041a3b6c703254ee3977eef1a9899
>92506772b/

 Hello,

 does somebody know more about the following two crashes?

 xls/ooo71730-1.xls
 ods/fdo79770-2.ods

 I'm sorting out all the remaining problems caused by Calc's threading being 
enabled by default now, and I cannot reproduce these two, so I wonder if it 
was something random unrelated, or if I should try harder to trigger them.

-- 
 Luboš Luňák
 l.lu...@collabora.com
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 vcl/unx/gtk/a11y/atkwrapper.hxx |8 
 vcl/unx/gtk3/gtk3gtkinst.cxx|   25 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit e547b1a36061f3ece12baa348bdd3814aa745ae4
Author: Caolán McNamara 
Date:   Wed May 30 16:26:40 2018 +0100

tdf#117859 crash in Tab Color a11y

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

diff --git a/vcl/unx/gtk/a11y/atkwrapper.hxx b/vcl/unx/gtk/a11y/atkwrapper.hxx
index c45f0f9c839b..381f3c074fdf 100644
--- a/vcl/unx/gtk/a11y/atkwrapper.hxx
+++ b/vcl/unx/gtk/a11y/atkwrapper.hxx
@@ -21,6 +21,10 @@
 #define INCLUDED_VCL_UNX_GTK_A11Y_ATKWRAPPER_HXX
 
 #include 
+#include 
+#if GTK_CHECK_VERSION(3,0,0)
+#include 
+#endif
 #include 
 
 extern "C" {
@@ -70,7 +74,11 @@ struct AtkObjectWrapper
 
 struct AtkObjectWrapperClass
 {
+#if GTK_CHECK_VERSION(3,0,0)
+GtkWidgetAccessibleClass aParentClass;
+#else
 AtkObjectClass aParentClass;
+#endif
 };
 
 GType  atk_object_wrapper_get_type() G_GNUC_CONST;
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 577d5e1d2744..5d801c5c 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3653,6 +3653,14 @@ static MouseEventModifiers 
ImplGetMouseMoveMode(sal_uInt16 nCode)
 return nMode;
 }
 
+namespace
+{
+
+AtkObject* (*default_drawing_area_get_accessible)(GtkWidget *widget);
+
+}
+
+
 class GtkInstanceDrawingArea : public GtkInstanceWidget, public virtual 
weld::DrawingArea
 {
 private:
@@ -3928,6 +3936,21 @@ public:
 return uno::Reference();
 }
 
+virtual void set_accessible_name(const OUString& rName) override
+{
+AtkObject* pAtkObject = default_drawing_area_get_accessible(m_pWidget);
+if (!pAtkObject)
+return;
+atk_object_set_name(pAtkObject, OUStringToOString(rName, 
RTL_TEXTENCODING_UTF8).getStr());
+}
+
+virtual OUString get_accessible_name() const override
+{
+AtkObject* pAtkObject = default_drawing_area_get_accessible(m_pWidget);
+const char* pStr = pAtkObject ? atk_object_get_name(pAtkObject) : 
nullptr;
+return OUString(pStr, pStr ? strlen(pStr) : 0, RTL_TEXTENCODING_UTF8);
+}
+
 virtual ~GtkInstanceDrawingArea() override
 {
 g_object_steal_data(G_OBJECT(m_pDrawingArea), 
"g-lo-GtkInstanceDrawingArea");
@@ -4411,8 +4434,6 @@ namespace
 namespace
 {
 
-AtkObject* (*default_drawing_area_get_accessible)(GtkWidget *widget);
-
 AtkObject* drawing_area_get_accessibity(GtkWidget *pWidget)
 {
 AtkObject* pDefaultAccessible = 
default_drawing_area_get_accessible(pWidget);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - sc/CppunitTest_sc_addin_functions_test.mk sc/CppunitTest_sc_anchor_test.mk sc/CppunitTest_sc_array_functions_test.mk sc/CppunitTest_sc_bugfix_test.mk sc/Cpp

[Caolán McNamara]

 sc/CppunitTest_sc_addin_functions_test.mk|1 
 sc/CppunitTest_sc_anchor_test.mk |6 +++
 sc/CppunitTest_sc_array_functions_test.mk|1 
 sc/CppunitTest_sc_bugfix_test.mk |6 +++
 sc/CppunitTest_sc_chart2dataprovider.mk  |6 +++
 sc/CppunitTest_sc_cond_format_merge.mk   |6 +++
 sc/CppunitTest_sc_copypaste.mk   |6 +++
 sc/CppunitTest_sc_database_functions_test.mk |1 
 sc/CppunitTest_sc_dataprovider.mk|6 +++
 sc/CppunitTest_sc_datatransformation.mk  |6 +++
 sc/CppunitTest_sc_datetime_functions_test.mk |1 
 sc/CppunitTest_sc_filters_test.mk|6 +++
 sc/CppunitTest_sc_financial_functions_test.mk|1 
 sc/CppunitTest_sc_functions_test_old.mk  |1 
 sc/CppunitTest_sc_html_export_test.mk|6 +++
 sc/CppunitTest_sc_information_functions_test.mk  |1 
 sc/CppunitTest_sc_logical_functions_test.mk  |1 
 sc/CppunitTest_sc_mathematical_functions_test.mk |1 
 sc/CppunitTest_sc_opencl_test.mk |6 +++
 sc/CppunitTest_sc_parallelism.mk |6 +++
 sc/CppunitTest_sc_pivottable_filters_test.mk |6 +++
 sc/CppunitTest_sc_spreadsheet_functions_test.mk  |1 
 sc/CppunitTest_sc_statistical_functions_test.mk  |1 
 sc/CppunitTest_sc_subsequent_export_test.mk  |6 +++
 sc/CppunitTest_sc_subsequent_filters_test.mk |6 +++
 sc/CppunitTest_sc_text_functions_test.mk |1 
 sc/CppunitTest_sc_ucalc.mk   |6 +++
 sc/Library_scqahelper.mk |6 +++
 svtools/CppunitTest_svtools_graphic.mk   |6 +++
 sw/CppunitTest_sw_docbookexport.mk   |6 +++
 sw/CppunitTest_sw_filters_test.mk|6 +++
 sw/CppunitTest_sw_fodfexport.mk  |6 +++
 sw/CppunitTest_sw_globalfilter.mk|6 +++
 sw/CppunitTest_sw_htmlexport.mk  |6 +++
 sw/CppunitTest_sw_htmlimport.mk  |6 +++
 sw/CppunitTest_sw_layoutwriter.mk|6 +++
 sw/CppunitTest_sw_mailmerge.mk   |6 +++
 sw/CppunitTest_sw_odfexport.mk   |6 +++
 sw/CppunitTest_sw_odfimport.mk   |6 +++
 sw/CppunitTest_sw_ooxmlencryption.mk |7 +++-
 sw/CppunitTest_sw_ooxmlexport8.mk|6 +++
 sw/CppunitTest_sw_ooxmlfieldexport.mk|6 +++
 sw/CppunitTest_sw_ooxmlimport.mk |6 +++
 sw/CppunitTest_sw_ooxmlimport2.mk|6 +++
 sw/CppunitTest_sw_ooxmllinks.mk  |6 +++
 sw/CppunitTest_sw_ooxmlw14export.mk  |6 +++
 sw/CppunitTest_sw_rtfexport.mk   |6 +++
 sw/CppunitTest_sw_rtfexport2.mk  |6 +++
 sw/CppunitTest_sw_rtfexport3.mk  |6 +++
 sw/CppunitTest_sw_rtfimport.mk   |6 +++
 sw/CppunitTest_sw_tiledrendering.mk  |6 +++
 sw/CppunitTest_sw_txtexport.mk   |6 +++
 sw/CppunitTest_sw_uiwriter.mk|6 +++
 sw/CppunitTest_sw_uwriter.mk |6 +++
 sw/CppunitTest_sw_ww8export.mk   |6 +++
 sw/CppunitTest_sw_ww8export2.mk  |6 +++
 sw/CppunitTest_sw_ww8import.mk   |6 +++
 sw/Library_msword.mk |6 +++
 sw/Library_sw.mk |6 +++
 sw/Library_swui.mk   |6 +++
 sw/inc/swmodule.hxx  |6 +++
 sw/ooxmlexport_setup.mk  |6 +++
 sw/source/ui/vba/vbaapplication.cxx  |   35 +--
 sw/source/ui/vba/vbaapplication.hxx  |   15 +
 sw/source/uibase/app/docsh2.cxx  |3 +
 sw/source/uibase/app/swmodule.cxx|   12 +++
 vcl/unx/gtk3/gtk3gtkinst.cxx |   17 ++-
 67 files changed, 330 insertions(+), 65 deletions(-)

New commits:
commit c1dc72e9e853a80ce0876df6958c18bb881deb85
Author: Caolán McNamara 
Date:   Wed May 30 21:28:22 2018 +0100

RTL support for custom widgets

Change-Id: I34038f047c002a1ec1276f8c523db0e1c4d29065
Reviewed-on: https://gerrit.libreoffice.org/55100
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 5d801c5c..d13cb73df419 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1689,6 +1689,8 @@ public:
 {
 GdkRectangle aRect{static_cast(rRect.Left()), 
static_cast(rRect.Top()),
static_cast(rRect.GetWidth()), 
static_cast(rRect.GetHeight())};
+if (AllSettings::GetLayoutRTL())
+aRect.x = gtk_widget_get_allocated_width(p

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

[Caolán McNamara]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   17 -
 1 file changed, 16 insertions(+), 1 deletion(-)

New commits:
commit f5f182e6d0894576d9e16d3de26eaacb2236a171
Author: Caolán McNamara 
Date:   Wed May 30 21:28:22 2018 +0100

RTL support for custom widgets

Change-Id: I34038f047c002a1ec1276f8c523db0e1c4d29065
Reviewed-on: https://gerrit.libreoffice.org/55102
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index 5d801c5c..d13cb73df419 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1689,6 +1689,8 @@ public:
 {
 GdkRectangle aRect{static_cast(rRect.Left()), 
static_cast(rRect.Top()),
static_cast(rRect.GetWidth()), 
static_cast(rRect.GetHeight())};
+if (AllSettings::GetLayoutRTL())
+aRect.x = gtk_widget_get_allocated_width(pWidget) - 
aRect.width - 1 - aRect.x;
 gtk_menu_popup_at_rect(m_pMenu, gtk_widget_get_window(pWidget), 
&aRect, GDK_GRAVITY_NORTH_WEST, GDK_GRAVITY_NORTH_WEST, nullptr);
 }
 else
@@ -3741,7 +3743,7 @@ private:
 {
 m_aStyleUpdatedHdl.Call(*this);
 }
-static gboolean signalQueryTooltip(GtkWidget*, gint x, gint y,
+static gboolean signalQueryTooltip(GtkWidget* pGtkWidget, gint x, gint y,
  gboolean /*keyboard_mode*/, 
GtkTooltip *tooltip,
  gpointer widget)
 {
@@ -3756,6 +3758,8 @@ private:
 aGdkHelpArea.y = aHelpArea.Top();
 aGdkHelpArea.width = aHelpArea.GetWidth();
 aGdkHelpArea.height = aHelpArea.GetHeight();
+if (AllSettings::GetLayoutRTL())
+aGdkHelpArea.x = gtk_widget_get_allocated_width(pGtkWidget) - 
aGdkHelpArea.width - 1 - aGdkHelpArea.x;
 gtk_tooltip_set_tip_area(tooltip, &aGdkHelpArea);
 return true;
 }
@@ -3816,6 +3820,8 @@ private:
 }
 
 Point aPos(pEvent->x, pEvent->y);
+if (AllSettings::GetLayoutRTL())
+aPos.setX(gtk_widget_get_allocated_width(m_pWidget) - 1 - 
aPos.X());
 sal_uInt32 nModCode = GtkSalFrame::GetMouseModCode(pEvent->state);
 sal_uInt16 nCode = m_nLastMouseButton | (nModCode & (KEY_SHIFT | 
KEY_MOD1 | KEY_MOD2));
 MouseEvent aMEvt(aPos, nClicks, 
ImplGetMouseButtonMode(m_nLastMouseButton, nModCode), nCode, nCode);
@@ -3836,6 +3842,8 @@ private:
 bool signal_motion(GdkEventMotion* pEvent)
 {
 Point aPos(pEvent->x, pEvent->y);
+if (AllSettings::GetLayoutRTL())
+aPos.setX(gtk_widget_get_allocated_width(m_pWidget) - 1 - 
aPos.X());
 sal_uInt32 nModCode = GtkSalFrame::GetMouseModCode(pEvent->state);
 sal_uInt16 nCode = m_nLastMouseButton | (nModCode & (KEY_SHIFT | 
KEY_MOD1 | KEY_MOD2));
 MouseEvent aMEvt(aPos, 0, ImplGetMouseMoveMode(nModCode), nCode, 
nCode);
@@ -3890,6 +3898,7 @@ public:
 {
 gtk_widget_set_has_tooltip(m_pWidget, true);
 g_object_set_data(G_OBJECT(m_pDrawingArea), 
"g-lo-GtkInstanceDrawingArea", this);
+m_xDevice->EnableRTL(get_direction());
 }
 
 AtkObject* GetAtkObject(AtkObject* pDefaultAccessible)
@@ -3903,6 +3912,12 @@ public:
 return m_pAccessible;
 }
 
+virtual void set_direction(bool bRTL) override
+{
+GtkInstanceWidget::set_direction(bRTL);
+m_xDevice->EnableRTL(bRTL);
+}
+
 virtual void queue_draw() override
 {
 gtk_widget_queue_draw(GTK_WIDGET(m_pDrawingArea));
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 chart2/source/controller/main/ChartController_Tools.cxx |3 ++-
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx   |4 
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 0b40212c18bb3c518bf54e55b9060f908ed84ed1
Author: Caolán McNamara 
Date:   Wed May 30 13:57:02 2018 +0100

tdf#117864 TransferableHelper::GetSystemClipboard requires a focus window

Change-Id: Ibd9b9218cf12e80db1fc9a70bdbab38d3df950f7
Reviewed-on: https://gerrit.libreoffice.org/55073
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index a89f2ef70821..59444c95d5fb 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -524,7 +524,8 @@ void ChartController::executeDispatch_Copy()
 }
 if ( xTransferable.is() )
 {
-Reference< datatransfer::clipboard::XClipboard > xClipboard( 
TransferableHelper::GetSystemClipboard() );
+SolarMutexGuard aSolarGuard;
+Reference 
xClipboard(GetChartWindow()->GetClipboard());
 if ( xClipboard.is() )
 {
 xClipboard->setContents( xTransferable, Reference< 
datatransfer::clipboard::XClipboardOwner >() );
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx 
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 836aaaba3002..edf0190d75fc 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -266,6 +266,10 @@ OUString getCID(const 
css::uno::Reference& xModel)
 
 OUString aCID;
 aAny >>= aCID;
+
+if (aCID.isEmpty())
+return OUString();
+
 #ifdef DBG_UTIL
 ObjectType eType = ObjectIdentifier::getObjectType(aCID);
 assert(eType == OBJECTTYPE_DATA_SERIES);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - chart2/source

[Caolán McNamara]

 chart2/source/controller/main/ChartController_Tools.cxx |3 ++-
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx   |4 
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 2a0d8106a558845357d39648656e08ec6f091cf8
Author: Caolán McNamara 
Date:   Wed May 30 13:57:02 2018 +0100

tdf#117864 TransferableHelper::GetSystemClipboard requires a focus window

Change-Id: Ibd9b9218cf12e80db1fc9a70bdbab38d3df950f7
Reviewed-on: https://gerrit.libreoffice.org/55074
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index 8c19e816dad4..0616dba18644 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -526,7 +526,8 @@ void ChartController::executeDispatch_Copy()
 }
 if ( xTransferable.is() )
 {
-Reference< datatransfer::clipboard::XClipboard > xClipboard( 
TransferableHelper::GetSystemClipboard() );
+SolarMutexGuard aSolarGuard;
+Reference 
xClipboard(GetChartWindow()->GetClipboard());
 if ( xClipboard.is() )
 {
 xClipboard->setContents( xTransferable, Reference< 
datatransfer::clipboard::XClipboardOwner >() );
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx 
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 836aaaba3002..edf0190d75fc 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -266,6 +266,10 @@ OUString getCID(const 
css::uno::Reference& xModel)
 
 OUString aCID;
 aAny >>= aCID;
+
+if (aCID.isEmpty())
+return OUString();
+
 #ifdef DBG_UTIL
 ObjectType eType = ObjectIdentifier::getObjectType(aCID);
 assert(eType == OBJECTTYPE_DATA_SERIES);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/svtools/transfer.hxx |1 -
 sc/source/ui/view/gridwin.cxx|2 +-
 svtools/source/misc/transfer.cxx |   13 -
 3 files changed, 1 insertion(+), 15 deletions(-)

New commits:
commit 78bed16e17f5128d3523413255d95de85c0ebf36
Author: Caolán McNamara 
Date:   Wed May 30 14:02:33 2018 +0100

drop last use of TransferableHelper::GetSystemClipboard

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

diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 5bc3f7a86320..4091a8f087d1 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -251,7 +251,6 @@ public:
 
 static void ClearSelection( vcl::Window *pWindow );
 
-static css::uno::Reference< css::datatransfer::clipboard::XClipboard > 
GetSystemClipboard();
 static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
 
 public:
diff --git a/sc/source/ui/view/gridwin.cxx b/sc/source/ui/view/gridwin.cxx
index 96a3f7e16239..018367bfdb51 100644
--- a/sc/source/ui/view/gridwin.cxx
+++ b/sc/source/ui/view/gridwin.cxx
@@ -3168,7 +3168,7 @@ void ScGridWindow::KeyInput(const KeyEvent& rKEvt)
 
 // Clear clipboard content.
 uno::Reference xSystemClipboard =
-TransferableHelper::GetSystemClipboard();
+GetClipboard();
 if (xSystemClipboard.is())
 {
 xSystemClipboard->setContents(
diff --git a/svtools/source/misc/transfer.cxx b/svtools/source/misc/transfer.cxx
index 7f6d83dee5a7..49d08ef3d979 100644
--- a/svtools/source/misc/transfer.cxx
+++ b/svtools/source/misc/transfer.cxx
@@ -991,7 +991,6 @@ void TransferableHelper::StartDrag( vcl::Window* pWindow, 
sal_Int8 nDnDSourceAct
 }
 }
 
-
 void TransferableHelper::ClearSelection( vcl::Window *pWindow )
 {
 DBG_ASSERT( pWindow, "Window pointer is NULL" );
@@ -1001,17 +1000,6 @@ void TransferableHelper::ClearSelection( vcl::Window 
*pWindow )
 xSelection->setContents( nullptr, nullptr );
 }
 
-
-Reference< XClipboard> TransferableHelper::GetSystemClipboard()
-{
-vcl::Window *pFocusWindow = Application::GetFocusWindow();
-
-if( pFocusWindow )
-return pFocusWindow->GetClipboard();
-
-return  Reference< XClipboard > ();
-}
-
 namespace
 {
 class theTransferableHelperUnoTunnelId : public rtl::Static< 
UnoTunnelIdInit, theTransferableHelperUnoTunnelId > {};
@@ -1022,7 +1010,6 @@ const Sequence< sal_Int8 >& 
TransferableHelper::getUnoTunnelId()
 return theTransferableHelperUnoTunnelId::get().getSeq();
 }
 
-
 class TransferableClipboardNotifier : public ::cppu::WeakImplHelper< 
XClipboardListener >
 {
 private:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: Crash test update

[Caolán McNamara]

On Thu, 2018-05-31 at 10:01 +0200, Luboš Luňák wrote:
>  does somebody know more about the following two crashes?
> 
>  xls/ooo71730-1.xls
>  ods/fdo79770-2.ods
> 
> I'm sorting out all the remaining problems caused by Calc's threading
> being enabled by default now, and I cannot reproduce these two, so I
> wonder if it was something random unrelated, or if I should try
> harder to trigger them.

The test box is a 64 core one, that might be relevant. 
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

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

[Caolán McNamara]

 chart2/source/controller/main/ChartController_Tools.cxx |3 ++-
 chart2/source/controller/sidebar/ChartSeriesPanel.cxx   |4 
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit d4c1975fc0411cdd30ea96fa188ac77c099bd58e
Author: Caolán McNamara 
Date:   Wed May 30 13:57:02 2018 +0100

tdf#117864 TransferableHelper::GetSystemClipboard requires a focus window

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

diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index d06524480847..ae1d02a106fa 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -522,7 +522,8 @@ void ChartController::executeDispatch_Copy()
 }
 if ( xTransferable.is() )
 {
-Reference< datatransfer::clipboard::XClipboard > xClipboard( 
TransferableHelper::GetSystemClipboard() );
+SolarMutexGuard aSolarGuard;
+Reference 
xClipboard(GetChartWindow()->GetClipboard());
 if ( xClipboard.is() )
 {
 xClipboard->setContents( xTransferable, Reference< 
datatransfer::clipboard::XClipboardOwner >() );
diff --git a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx 
b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
index 023f548b485a..fb64cb64b5ac 100644
--- a/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
+++ b/chart2/source/controller/sidebar/ChartSeriesPanel.cxx
@@ -267,6 +267,10 @@ OUString getCID(const 
css::uno::Reference& xModel)
 
 OUString aCID;
 aAny >>= aCID;
+
+if (aCID.isEmpty())
+return OUString();
+
 #ifdef DBG_UTIL
 ObjectType eType = ObjectIdentifier::getObjectType(aCID);
 assert(eType == OBJECTTYPE_DATA_SERIES);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mike Kaganski]

 sd/inc/stlsheet.hxx |3 +
 sd/qa/unit/misc-tests.cxx   |   34 +++
 sd/source/core/stlsheet.cxx |  126 ++--
 3 files changed, 114 insertions(+), 49 deletions(-)

New commits:
commit 9c508e87be1f8fa252a9c6ffdb82a977be070143
Author: Mike Kaganski 
Date:   Sun May 27 14:02:09 2018 +0300

tdf#38225: update API name when renaming using a base class ref

... but don't update it in case it's a predefined API name

Change-Id: I20075a4e085bdeab8374860c16e7eb2a72772c33
Reviewed-on: https://gerrit.libreoffice.org/54879
Tested-by: Jenkins 
Reviewed-by: Mike Kaganski 
Reviewed-on: https://gerrit.libreoffice.org/54890
Reviewed-by: Christian Lohmaier 

diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index a24a2b31cafc..4407c63b631b 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -81,6 +81,9 @@ public:
 static void BroadcastSdStyleSheetChange(SfxStyleSheetBase const * 
pStyleSheet, PresentationObjects ePO,
 SfxStyleSheetBasePool* pSSPool);
 
+// SfxStyleSheetBase
+virtual bool SetName(const OUString& rNewName, bool bReindexNow = true) 
override;
+
 // XInterface
 virtual void SAL_CALL release(  ) throw () override;
 
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index e995d0146957..f0e493683737 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -62,6 +62,7 @@ public:
 void testTdf99396TextEdit();
 void testFillGradient();
 void testTdf44774();
+void testTdf38225();
 
 CPPUNIT_TEST_SUITE(SdMiscTest);
 CPPUNIT_TEST(testTdf96206);
@@ -70,6 +71,7 @@ public:
 CPPUNIT_TEST(testTdf99396TextEdit);
 CPPUNIT_TEST(testFillGradient);
 CPPUNIT_TEST(testTdf44774);
+CPPUNIT_TEST(testTdf38225);
 CPPUNIT_TEST_SUITE_END();
 
 private:
@@ -328,6 +330,38 @@ void SdMiscTest::testTdf44774()
 CPPUNIT_ASSERT_EQUAL(OUString("StyleA"), pStyle->GetParent());
 }
 
+void SdMiscTest::testTdf38225()
+{
+sd::DrawDocShellRef xDocShRef = new 
sd::DrawDocShell(SfxObjectCreateMode::EMBEDDED, false,
+DocumentType::Draw);
+const uno::Reference xLoadable(xDocShRef->GetModel(), 
uno::UNO_QUERY_THROW);
+xLoadable->initNew();
+SfxStyleSheetBasePool* pSSPool = xDocShRef->GetStyleSheetPool();
+
+// Create a new style with a name
+pSSPool->Make("StyleWithName1", SfxStyleFamily::Para, SFXSTYLEBIT_USERDEF);
+
+// Now save the file and reload
+xDocShRef = saveAndReload(xDocShRef.get(), ODG);
+pSSPool = xDocShRef->GetStyleSheetPool();
+
+SfxStyleSheetBase* pStyle = pSSPool->Find("StyleWithName1", 
SfxStyleFamily::Para);
+CPPUNIT_ASSERT(pStyle);
+
+// Rename the style
+CPPUNIT_ASSERT(pStyle->SetName("StyleWithName2"));
+
+// Save the file and reload again
+xDocShRef = saveAndReload(xDocShRef.get(), ODG);
+pSSPool = xDocShRef->GetStyleSheetPool();
+
+// The problem was that the style kept the old name upon reloading
+pStyle = pSSPool->Find("StyleWithName1", SfxStyleFamily::Para);
+CPPUNIT_ASSERT(!pStyle);
+pStyle = pSSPool->Find("StyleWithName2", SfxStyleFamily::Para);
+CPPUNIT_ASSERT(pStyle);
+}
+
 CPPUNIT_TEST_SUITE_REGISTRATION(SdMiscTest);
 
 CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sd/source/core/stlsheet.cxx b/sd/source/core/stlsheet.cxx
index 3cd669294b1a..585d0b6cbfae 100644
--- a/sd/source/core/stlsheet.cxx
+++ b/sd/source/core/stlsheet.cxx
@@ -580,55 +580,76 @@ bool SdStyleSheet::HasClearParentSupport() const
 return true;
 }
 
-void SdStyleSheet::SetHelpId( const OUString& r, sal_uLong nId )
+namespace
 {
-SfxStyleSheet::SetHelpId( r, nId );
+struct ApiNameMap
+{
+OUStringLiteral mpApiName;
+sal_uInt32 mnHelpId;
+} const pApiNameMap[]
+= { { OUStringLiteral("title"), HID_PSEUDOSHEET_TITLE },
+{ OUStringLiteral("subtitle"), HID_PSEUDOSHEET_SUBTITLE },
+{ OUStringLiteral("background"), HID_PSEUDOSHEET_BACKGROUND },
+{ OUStringLiteral("backgroundobjects"), 
HID_PSEUDOSHEET_BACKGROUNDOBJECTS },
+{ OUStringLiteral("notes"), HID_PSEUDOSHEET_NOTES },
+{ OUStringLiteral("standard"), HID_STANDARD_STYLESHEET_NAME },
+{ OUStringLiteral("objectwitharrow"), HID_POOLSHEET_OBJWITHARROW },
+{ OUStringLiteral("objectwithshadow"), HID_POOLSHEET_OBJWITHSHADOW },
+{ OUStringLiteral("objectwithoutfill"), HID_POOLSHEET_OBJWITHOUTFILL },
+{ OUStringLiteral("text"), HID_POOLSHEET_TEXT },
+{ OUStringLiteral("textbody"), HID_POOLSHEET_TEXTBODY },
+{ OUStringLiteral("textbodyjustfied"), HID_POOLSHEET_TEXTBODY_JUSTIFY 
},
+{ OUStringLiteral("textbodyindent"), HID_POOLSHEET_TEXTBODY_INDENT },
+{ OUStringLiteral("title"), HID_POOLSHEET_TITLE },
+{ OUStringLiteral("title1"), HID_POOLSHEET_TITLE1 },
+{ OUStringLiteral("title2"), HID_POOLSHEET_TITLE2 },
+{ OUStringLiteral("headline"), HID_POOLSHEET_HEADLINE },
+{ O

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

[Christian Lohmaier]

New branch 'libreoffice-6-0-5' available with the following commits:
commit 7677ed84b627563072214fb4e6c5a53c65bd5a07
Author: Christian Lohmaier 
Date:   Thu May 31 11:04:13 2018 +0200

Branch libreoffice-6-0-5

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

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

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

Change-Id: I5b3ad10c7ac201b00df5f916998d260ae71fe790

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

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

[Christian Lohmaier]

New branch 'libreoffice-6-0-5' available with the following commits:
commit 9e1114417296d420d04893c094fc6562b48e9953
Author: Christian Lohmaier 
Date:   Thu May 31 11:04:13 2018 +0200

Branch libreoffice-6-0-5

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

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

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

Change-Id: Iace7a6ea62b96ae495843f8d290b22f79327c496

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

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

[Christian Lohmaier]

New branch 'libreoffice-6-0-5' available with the following commits:
commit e2f57daf7d3c98bef21b4c4c89f71d18bef0d7d4
Author: Christian Lohmaier 
Date:   Thu May 31 11:04:26 2018 +0200

Branch libreoffice-6-0-5

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

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

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

Change-Id: I53c242726ee31d2755f7abffaef772a831a1c945

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

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

[Christian Lohmaier]

New branch 'libreoffice-6-0-5' available with the following commits:
commit 3aebf42f5f5768f61e2d29758621e371aa506838
Author: Christian Lohmaier 
Date:   Thu May 31 11:04:13 2018 +0200

Branch libreoffice-6-0-5

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

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

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

Change-Id: Iabab14ba125800cd593ba810045b7b5bd000c1b6

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

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

[Christian Lohmaier]

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

New commits:
commit 7ed3f82db9b59e79e2d5b4575c69b2091f73b49e
Author: Christian Lohmaier 
Date:   Thu May 31 11:06:41 2018 +0200

bump product version to 6.0.6.0.0+

Change-Id: I5e12d275d59ad01efd1980c7719413425e8b2096

diff --git a/configure.ac b/configure.ac
index d0f0cbdf0e07..e35db48d1a9e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.6.0.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.5.1' created by Christian Lohmaier 
 at 2018-05-31 09:08 +

Tag libreoffice-6.0.5.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJbD7t2AAoJEPQ0oe+v7q6jrjsQAJcRUHtoheL1mkOjweb1Kdws
C+hAUdj3oI4wDt9Du1vbYCXSuqSMCQ2n4zJf40aV2nqvQTxHRdrGSiW44rz/Wo7F
haGs/bX2frmfDUUWA0byjp6LDNbKCAi2mOgE/hX1SI8g+zKiU/H3NO2JzsqXwhMO
ASw0l7i3fmULKMcvrYjVlyK57R3vqsp2nb6CS71jgae8yLiVySMEkcGNEQ2YJTc/
o43ygYMjvCL5MHp4CK6MpxZqQXoMNb+S6+EjuODtE0Nmo8TOXaHHgg9VcDwMR7+I
8qw0U13urg6s66MchO5WsiVL82G1O9egv8H1JPN7iAkvEz3AR3NbnI/r8NlQ4OGb
10ZZglBd34cIdH4nOCwzwXz6Z/8y8gWo3WLJtckZDPL6eGvzAyP9FpTDv2vURSks
Yoyks89LH8up+bD5wutWrFzd/WOQzJ6fVMv/VrMy7+dfwWqr4WB+owNr2uzKiygU
I1KSkjCO0efAz31W5J3xgCT14x0cvN4ocXEb0NTgH7+MxdtUu4cNthoCAYXbs1jj
3fQk2b0fCAYcsoV0hsFTkgJR7ZDeOFMid1kdyW0nyFTAyaAisCXut8ZDAV1jb9yH
vkkBTFvoMAaqoc7Z6KNkXmFp5U/gNoWb77HR9Ss57lUP0z+e7GVlYhJbtX8MK/Yb
rprq+QjfT6qapeEbIasJ
=Ir7z
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

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

New commits:
commit cb1000e372ad2bf5a250d33711f75ad6a5474373
Author: Christian Lohmaier 
Date:   Thu May 31 11:08:42 2018 +0200

bump product version to 6.0.5.1.0+

Change-Id: I508f0a499faa87d6d4e22ebba4cbddf2059bfefb

diff --git a/configure.ac b/configure.ac
index d0f0cbdf0e07..9c946f0a9aeb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ dnl in order to create a configure script.
 # several non-alphanumeric characters, those are split off and used only for 
the
 # ABOUTBOXPRODUCTVERSIONSUFFIX in openoffice.lst. Why that is necessary, no 
idea.
 
-AC_INIT([LibreOffice],[6.0.5.0.0+],[],[],[http://documentfoundation.org/])
+AC_INIT([LibreOffice],[6.0.5.1.0+],[],[],[http://documentfoundation.org/])
 
 AC_PREREQ([2.59])
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.5.1' created by Christian Lohmaier 
 at 2018-05-31 09:07 +

Tag libreoffice-6.0.5.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJbD7ttAAoJEPQ0oe+v7q6jVg4P/jGDXcU96fLCduVzSgqxhez+
20EHORWeqcBVu5tjAwBR73YS417fNdZV5N5zsxnwGKLxoCaZ8giWLtJb5lNKGJY5
IBmBqxUvOxszN88bPPG9D8K2O4P1sdlfVnnVScR/zBxVH/fTu6IGmYVb98FsXyh0
oWeBrLEdYZRH0jEzHGGTaHo+IGYJdmWMQi5aOVlErQjRA0J0+LvnOSSFbpWXfpFw
WWAs3H53AypJfJzFlrPReogHhUVrTw5bh8hZ6jlWmUAHEcs/EpRx9GYdpzsTK3Rx
KBgi5BZfjuGjqyMY0tsy5nvw2DTNkcf8XBx7CTRuc7aPloalJJYZCcuCm30XM/hY
6WmKtFC+uzAkRAZ80A9uwRKI5Ln7GrAz1O2M890PLX8p/8ULqEUNw3OxupcTFxTU
L3P5XqI2V+nTl10NKuJ7ubpYLrzQcIrHSILAHi5jQTUUaZkalcm74km28JGdNMjV
wMh0CXk1XdSX1J/vvrnHx6dSknC/CQ0rgR9KI2hQaVbu7ShiX3D6yAD+iWz0rJCO
9xFC1XPi0pWRt7maRaNd8S46Vl68cKV0V6rr4lXL0ntOZlMdd2Qffak+PMN78uXE
FCBV+TxFUroGAw2tK5FT0Tzs8Dyz81nmUs5mHzabIrykn7E/nS/18iK9L0XiKgON
xEwSMuCz6P+4YUzN/n+A
=P09r
-END PGP SIGNATURE-

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

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.5.1' created by Christian Lohmaier 
 at 2018-05-31 09:08 +

Tag libreoffice-6.0.5.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJbD7twAAoJEPQ0oe+v7q6jhzIQAKfACiqgbzj2e05KRvPf2CNe
hkrE1Hvxl31t4p8eldmpquEMKNZ/FowPJihEmQ/HF9aZqBeWhPFzVM0sdR4u63s1
U2S8p6Do7Zws8iGcKcSgkjl5+ooa280tvhE57V6U9koTPA4FwYpIGFKzAcdDHNiK
b2Ytdm9iHzdnVT7eW8KjGDDZFetP66rZWuHifCAawu2k2NkXE1oIyAlsqWuBRrH+
yKKKw0OsJpDyJFLLqeLOlBKoA2Phm1c/WcDupuSydKB4ZQcavPcMKjhYdQawmccw
hf0SJ93MlD2Ug/Wh+LXR38uhQsvmkAN2QPVIqdkiT/PGpiqBzne+cSQhBnoevBWK
XhO9eXxY86rD+WR6I7Z2pIWugt5d2BIaciAroeZWDh7ZL22yjLnMTkPAv2Uixjwi
bh4xqNvCkxInuX4YarkqDZIH7wmTUx4uUo5hj/Xn71b8NReIUkGl0LZc+rj6bkXj
dsRUUJ0zyo++ia6qexVuNX9ZwQndqJ9RtVOOFk/s44K7kUaUvLhs0bJKpS51iThy
2iCzd6egppqf4SomeyAt4T7SuNlGqDuP56eo0NPj5oXpbeo2nGTeeQ4dmpnf/9Na
XNUSix8B7T2pJUS9vmBI9icA7aTm+NBt4UIQWuFyJxTpEP5Wc4n+cA9DEtk/Cy/l
LNgSTrw+8veDx+ZWfjIn
=85+q
-END PGP SIGNATURE-

Changes since cp-6.0-2-1:
---
 0 files changed
---
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Christian Lohmaier]

Tag 'libreoffice-6.0.5.1' created by Christian Lohmaier 
 at 2018-05-31 09:08 +

Tag libreoffice-6.0.5.1
-BEGIN PGP SIGNATURE-

iQIcBAABAgAGBQJbD7tzAAoJEPQ0oe+v7q6jA80P/jlA28QnY8jiIqfeUz9xNP3n
14dYAhXAvWIaFO5H/FZFM1zKEwMuyYdjVnIoQheXppSyaRKIzqJoyk7ePLfNnoHD
xEXlzhTBsAD7XCp6JOGdNYldyDG5Y6v1+gOxgfc8WgtK9TWeChmEnUDe98Oh2lo+
Dz3XdqvPAfnWXZYQcuxK9h4nV63wOneJzHQNgj5RW18JFOV9CQWlr4lpVucX36z8
R4BIF+da41YgGM3G7gR0vBqtsBuxttLjXn5pWr2NXBhD+aJPey5MNcJRRX5Ie658
pe14LrhlRh+QtfHy6ce4BhhzY6vC+30gS/auyhBO8xobDy4ZNq0gb8qRXyV/7Fg5
XApgtaichl68eF8xuq4vcP3Q5BAvPMCPpUQHvMcSkRgt3G7Za4qM9Krlqz7jX/c+
aDd8Ty+aRsDc/ZL3XLBA6GIy6uR7llXPFEcemR1TYTizZM2kjujAAGFmwoBcFyjG
Tbj/qae7xLGNePMxhsbhYHkY4RVRLgjhPKmBFzN5+5JomhwDytHgaofaIexHobeg
8kBdYUeqo8uA6hhWhma15SzIkVaKF1M1qcVJpaA7BeFYmvUJgJQ01DgvGbGIIxvp
vuu8ENVQJZIDvfputa3P8aenp+Wzm6Isz8/rqd8yCBjsebQdgjAjmD+SrUGLYKyl
lVSTm5b1KeP/m010lNLw
=fm7Y
-END PGP SIGNATURE-

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

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

[Tor Lillqvist]

 extensions/source/ole/servprov.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9673511526660ff23169456b2cce560d968107b3
Author: Tor Lillqvist 
Date:   Thu May 31 12:35:50 2018 +0300

Add one more #define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING 1

Change-Id: I228ae626532b3ae6f632701e71d3da182c496612

diff --git a/extensions/source/ole/servprov.cxx 
b/extensions/source/ole/servprov.cxx
index 843e6c128af0..2fccd9a59b9f 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -17,6 +17,9 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+// See 
https://blogs.msdn.microsoft.com/vcblog/2017/12/08/c17-feature-removals-and-deprecations/
+#define _SILENCE_CXX17_CODECVT_HEADER_DEPRECATION_WARNING 1
+
 #include 
 
 #include "ole2uno.hxx"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 oovbaapi/ooo/vba/word/XDocument.idl |5 +
 sw/inc/docsh.hxx|6 ++
 sw/source/ui/vba/vbadocument.cxx|   98 
 sw/source/ui/vba/vbadocument.hxx|   20 ++-
 sw/source/uibase/app/docsh.cxx  |   11 
 sw/source/uibase/uno/unotxdoc.cxx   |1 
 6 files changed, 139 insertions(+), 2 deletions(-)

New commits:
commit 6c8c727ffd97e247f1ea43c1a47a55e6d5f68331
Author: Tor Lillqvist 
Date:   Fri Mar 23 14:35:24 2018 +0200

Add Document.Close event generation

Use a similar idea as for the Application events. Use the SwDocShell
to keep the XSinkCaller. Call the Close event from
SwXTextDocument::close().

Change-Id: Ie873238c5a966fc859d45b59f424ae0e9f4fbfc7
Reviewed-on: https://gerrit.libreoffice.org/55110
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 

diff --git a/oovbaapi/ooo/vba/word/XDocument.idl 
b/oovbaapi/ooo/vba/word/XDocument.idl
index 1dde907ca342..b6cb4fc45def 100644
--- a/oovbaapi/ooo/vba/word/XDocument.idl
+++ b/oovbaapi/ooo/vba/word/XDocument.idl
@@ -26,8 +26,11 @@
 
 module ooo {  module vba {  module word {
 
-interface XDocument : com::sun::star::script::XInvocation
+interface XDocument
 {
+interface com::sun::star::script::XInvocation;
+interface XConnectable;
+
 [attribute, readonly] XRange Content;
 [attribute] any AttachedTemplate;
 [attribute] long ProtectionType;
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 0be7ea783433..dc8214c534d8 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "swdllapi.h"
@@ -86,6 +87,8 @@ class SW_DLLPUBLIC SwDocShell
 ///< whether SID_MAIL_PREPAREEXPORT removed content that
 ///< SID_MAIL_EXPORT_FINISHED needs to restore
 
+css::uno::Reference< ooo::vba::XSinkCaller > 
mxAutomationDocumentEventsCaller;
+
 /// Methods for access to doc.
 SAL_DLLPRIVATE void  AddLink();
 SAL_DLLPRIVATE void  RemoveLink();
@@ -309,6 +312,9 @@ public:
 virtual voidSetChangeRecording( bool bActivate ) override;
 virtual voidSetProtectionPassword( const OUString &rPassword ) 
override;
 virtual boolGetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > 
&rPasswordHash ) override;
+
+void RegisterAutomationDocumentEventsCaller(css::uno::Reference< 
ooo::vba::XSinkCaller > const& xCaller);
+void CallAutomationDocumentEventSinks(const OUString& Method, const 
css::uno::Sequence< css::uno::Any >& Arguments);
 };
 
 /** Find the right DocShell and create a new one:
diff --git a/sw/source/ui/vba/vbadocument.cxx b/sw/source/ui/vba/vbadocument.cxx
index ca77dc62a799..47abf61c1b03 100644
--- a/sw/source/ui/vba/vbadocument.cxx
+++ b/sw/source/ui/vba/vbadocument.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include "wordvbahelper.hxx"
@@ -58,6 +59,19 @@
 using namespace ::ooo::vba;
 using namespace ::com::sun::star;
 
+class SwVbaDocumentOutgoingConnectionPoint : public 
cppu::WeakImplHelper
+{
+private:
+SwVbaDocument* mpDoc;
+
+public:
+SwVbaDocumentOutgoingConnectionPoint( SwVbaDocument* pDoc );
+
+// XConnectionPoint
+sal_uInt32 SAL_CALL Advise(const uno::Reference< XSink >& Sink ) override;
+void SAL_CALL Unadvise( sal_uInt32 Cookie ) override;
+};
+
 SwVbaDocument::SwVbaDocument( const uno::Reference< XHelperInterface >& 
xParent, const uno::Reference< uno::XComponentContext >& xContext, 
uno::Reference< frame::XModel > const & xModel ): SwVbaDocument_BASE( xParent, 
xContext, xModel )
 {
 Initialize();
@@ -76,6 +90,23 @@ void SwVbaDocument::Initialize()
 mxTextDocument.set( getModel(), uno::UNO_QUERY_THROW );
 }
 
+sal_uInt32
+SwVbaDocument::AddSink( const uno::Reference< XSink >& xSink )
+{
+word::getDocShell( mxModel )->RegisterAutomationDocumentEventsCaller( 
uno::Reference< XSinkCaller >(this) );
+mvSinks.push_back(xSink);
+return mvSinks.size();;
+}
+
+void
+SwVbaDocument::RemoveSink( sal_uInt32 nNumber )
+{
+if (nNumber < 1 || nNumber > mvSinks.size())
+return;
+
+mvSinks[nNumber-1] = uno::Reference< XSink >();
+}
+
 uno::Reference< word::XRange > SAL_CALL
 SwVbaDocument::getContent()
 {
@@ -500,6 +531,73 @@ SwVbaDocument::getFormControls()
 return xFormControls;
 }
 
+// XInterfaceWithIID
+
+OUString SAL_CALL
+SwVbaDocument::getIID()
+{
+return OUString("{82154424-0FBF-11d4-8313-005004526AB4}");
+}
+
+// XConnectable
+
+OUString SAL_CALL
+SwVbaDocument::GetIIDForClassItselfNotCoclass()
+{
+return OUString("{82154425-0FBF-11D4-8313-005004526AB4}");
+}
+
+TypeAndIID SAL_CALL
+SwVbaDocument::GetConnectionPoint()
+{
+TypeAndIID aResult =
+{ word::XDocumentOutgoing::static_type(),
+  "{82154426-0FBF-11D4-8313-005004526AB4}"
+};
+
+return aResult;
+}
+
+// XSinkCaller
+
+void SAL_CALL
+SwVbaDocument::CallSinks( cons

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx   |4 ++--
 oovbaapi/ooo/vba/XSink.idl  |2 +-
 oovbaapi/ooo/vba/XSinkCaller.idl|2 +-
 sw/inc/docsh.hxx|2 +-
 sw/inc/swmodule.hxx |2 +-
 sw/source/ui/vba/vbaapplication.cxx |2 +-
 sw/source/ui/vba/vbaapplication.hxx |2 +-
 sw/source/ui/vba/vbadocument.cxx|2 +-
 sw/source/ui/vba/vbadocument.hxx|2 +-
 sw/source/uibase/app/docsh.cxx  |2 +-
 sw/source/uibase/app/docsh2.cxx |5 -
 sw/source/uibase/app/swmodule.cxx   |5 +++--
 sw/source/uibase/uno/unotxdoc.cxx   |3 ++-
 13 files changed, 20 insertions(+), 15 deletions(-)

New commits:
commit 2ee43cff5cf0e4125e7b2bbb7c763069c6aca95c
Author: Tor Lillqvist 
Date:   Mon Apr 9 15:10:40 2018 +0300

Prepare to handle out (and inout) parameters to event callbacks

Change-Id: I47054c1df40d1058618b0fbd3fdb82fa93ca8836

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 4acd25081315..c76320195abe 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -1977,7 +1977,7 @@ public:
  ooo::vba::TypeAndIID aTypeAndIID);
 
 // XSink
-void SAL_CALL Call( const OUString& Method, const Sequence< Any >& 
Arguments ) override;
+void SAL_CALL Call( const OUString& Method, Sequence< Any >& Arguments ) 
override;
 
 private:
 IUnknown* mpUnkSink;
@@ -1996,7 +1996,7 @@ Sink::Sink(IUnknown* pUnkSink,
 }
 
 void SAL_CALL
-Sink::Call( const OUString& Method, const Sequence< Any >& Arguments )
+Sink::Call( const OUString& Method, Sequence< Any >& Arguments )
 {
 SAL_INFO("extensions.olebridge", "Sink::Call(" << Method << ", " << 
Arguments.getLength() << " arguments)");
 
diff --git a/oovbaapi/ooo/vba/XSink.idl b/oovbaapi/ooo/vba/XSink.idl
index 110c9b6a573f..de37dae959e3 100644
--- a/oovbaapi/ooo/vba/XSink.idl
+++ b/oovbaapi/ooo/vba/XSink.idl
@@ -26,7 +26,7 @@ interface XSink
 // Automation client.
 
 // FIXME: Add "out" arguments, and perhaps exceptions?
-void Call([in] string Method, [in] sequence Arguments);
+void Call([in] string Method, [inout] sequence Arguments);
 };
 
 }; };
diff --git a/oovbaapi/ooo/vba/XSinkCaller.idl b/oovbaapi/ooo/vba/XSinkCaller.idl
index 33be504fbe62..4bc5f34f7fa2 100644
--- a/oovbaapi/ooo/vba/XSinkCaller.idl
+++ b/oovbaapi/ooo/vba/XSinkCaller.idl
@@ -19,7 +19,7 @@ module ooo {  module vba {
 
 interface XSinkCaller
 {
-void CallSinks([in] string Method, [in] sequence Arguments);
+void CallSinks([in] string Method, [inout] sequence Arguments);
 };
 
 }; };
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index dc8214c534d8..d93f626b585b 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -314,7 +314,7 @@ public:
 virtual boolGetProtectionHash( /*out*/ css::uno::Sequence< sal_Int8 > 
&rPasswordHash ) override;
 
 void RegisterAutomationDocumentEventsCaller(css::uno::Reference< 
ooo::vba::XSinkCaller > const& xCaller);
-void CallAutomationDocumentEventSinks(const OUString& Method, const 
css::uno::Sequence< css::uno::Any >& Arguments);
+void CallAutomationDocumentEventSinks(const OUString& Method, 
css::uno::Sequence< css::uno::Any >& Arguments);
 };
 
 /** Find the right DocShell and create a new one:
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index b9d871a50b08..8539f7fd479c 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -248,7 +248,7 @@ public:
 GetLanguageGuesser();
 
 void RegisterAutomationApplicationEventsCaller(css::uno::Reference< 
ooo::vba::XSinkCaller > const& xCaller);
-void CallAutomationApplicationEventSinks(const OUString& Method, const 
css::uno::Sequence< css::uno::Any >& Arguments);
+void CallAutomationApplicationEventSinks(const OUString& Method, 
css::uno::Sequence< css::uno::Any >& Arguments);
 };
 
 inline const css::uno::Reference< css::linguistic2::XLinguServiceEventListener 
>&
diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index d76e7730a783..45c53114e2cc 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -267,7 +267,7 @@ 
SwVbaApplicationOutgoingConnectionPoint::SwVbaApplicationOutgoingConnectionPoint
 // XSinkCaller
 
 void SAL_CALL
-SwVbaApplication::CallSinks( const OUString& Method, const uno::Sequence< 
uno::Any >& Arguments )
+SwVbaApplication::CallSinks( const OUString& Method, uno::Sequence< uno::Any 
>& Arguments )
 {
 for (auto& i : mvSinks)
 {
diff --git a/sw/source/ui/vba/vbaapplication.hxx 
b/sw/source/ui/vba/vbaapplication.hxx
index 681c4f9159c6..a8763cc15d6e 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -87,7 +87,7 @@ public:
 virtual css::uno::Sequence getServiceNames() override;
 
 // XSinkCaller
-virtual void SAL_CALL CallSinks( const OUString& Method, const 
css::uno::Sequence< css::uno::Any >& Arguments ) overr

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 8d/04f84ef940b408f184e634f179cd0fc262d0ff

[Caolán McNamara]

 8d/04f84ef940b408f184e634f179cd0fc262d0ff |1 +
 1 file changed, 1 insertion(+)

New commits:
commit c2a3ecff88fee16b3865a707f0851f9fb9b80d8d
Author: Caolán McNamara 
Date:   Thu May 31 11:40:02 2018 +0100

Notes added by 'git notes add'

diff --git a/8d/04f84ef940b408f184e634f179cd0fc262d0ff 
b/8d/04f84ef940b408f184e634f179cd0fc262d0ff
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/8d/04f84ef940b408f184e634f179cd0fc262d0ff
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 72/e9f7b402b4ecf80fb392143aba9dc5b02118bc

[Caolán McNamara]

 72/e9f7b402b4ecf80fb392143aba9dc5b02118bc |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 690b808674349bcd2d23f6ca88e36a592dcebe47
Author: Caolán McNamara 
Date:   Thu May 31 11:39:39 2018 +0100

Notes added by 'git notes add'

diff --git a/72/e9f7b402b4ecf80fb392143aba9dc5b02118bc 
b/72/e9f7b402b4ecf80fb392143aba9dc5b02118bc
new file mode 100644
index ..8e5c182e7789
--- /dev/null
+++ b/72/e9f7b402b4ecf80fb392143aba9dc5b02118bc
@@ -0,0 +1 @@
+ignore: aoo
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - 2 commits - solenv/clang-format vcl/inc vcl/qt5 vcl/unx

[Katarina Behrens]

 solenv/clang-format/blacklist |   18 
 vcl/inc/qt5/Qt5FilePicker.hxx |  186 ---
 vcl/inc/qt5/Qt5Frame.hxx  |2 
 vcl/inc/qt5/Qt5Instance.hxx   |   20 
 vcl/inc/qt5/Qt5Menu.hxx   |   73 +-
 vcl/inc/qt5/Qt5Tools.hxx  |2 
 vcl/inc/qt5/Qt5Widget.hxx |4 
 vcl/qt5/Qt5FilePicker.cxx |  558 +++---
 vcl/qt5/Qt5Font.cxx   |3 
 vcl/qt5/Qt5Frame.cxx  |   15 
 vcl/qt5/Qt5Graphics_Text.cxx  |   22 
 vcl/qt5/Qt5Instance.cxx   |   36 -
 vcl/qt5/Qt5Menu.cxx   |  160 ++
 vcl/qt5/Qt5Widget.cxx |   56 --
 vcl/unx/kde5/FPServiceInfo.hxx|2 
 vcl/unx/kde5/KDE5SalData.cxx  |   22 
 vcl/unx/kde5/KDE5SalData.hxx  |8 
 vcl/unx/kde5/KDE5SalDisplay.cxx   |   25 -
 vcl/unx/kde5/KDE5SalDisplay.hxx   |   24 
 vcl/unx/kde5/KDE5SalFrame.cxx |  219 
 vcl/unx/kde5/KDE5SalFrame.hxx |   30 -
 vcl/unx/kde5/KDE5SalGraphics.cxx  |  642 +-
 vcl/unx/kde5/KDE5SalGraphics.hxx  |   16 
 vcl/unx/kde5/KDE5SalInstance.cxx  |   17 
 vcl/unx/kde5/KDE5SalInstance.hxx  |7 
 vcl/unx/kde5/VCLKDE5Application.cxx   |   12 
 vcl/unx/kde5/VCLKDE5Application.hxx   |9 
 vcl/unx/kde5/tst_exclude_posted_events.hxx|   36 -
 vcl/unx/kde5/tst_exclude_socket_notifiers.hxx |   58 +-
 29 files changed, 1146 insertions(+), 1136 deletions(-)

New commits:
commit 1bc048066ae0c169768fbec2286ab356df641ae6
Author: Katarina Behrens 
Date:   Thu May 31 12:34:16 2018 +0200

Hullo Jenkins, please build this branch TY

Change-Id: Idfc1c0ca9645068bb4d7dadc8db9381d753516ef
commit 34d8744ec3a17e6080f9e7a40d116160db7a41cf
Author: Katarina Behrens 
Date:   Thu May 31 12:14:55 2018 +0200

Make clang-format happy, remove vcl/unx/kde5 from blacklist

just between us girls, I hate you clang-format

Change-Id: I4cd041eff7a9fa01eb9192cf357e3f07a26fa6ad

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 7dcd63136243..79c639c82cb9 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -18501,24 +18501,6 @@ vcl/unx/kde4/VCLKDEApplication.hxx
 vcl/unx/kde4/main.cxx
 vcl/unx/kde4/tst_exclude_posted_events.hxx
 vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
-vcl/unx/kde5/FPServiceInfo.hxx
-vcl/unx/kde5/KDE5Data.cxx
-vcl/unx/kde5/KDE5Data.hxx
-vcl/unx/kde5/KDE5SalDisplay.cxx
-vcl/unx/kde5/KDE5SalDisplay.hxx
-vcl/unx/kde5/KDE5SalFrame.cxx
-vcl/unx/kde5/KDE5SalFrame.hxx
-vcl/unx/kde5/KDE5SalGraphics.cxx
-vcl/unx/kde5/KDE5SalGraphics.hxx
-vcl/unx/kde5/KDE5SalInstance.cxx
-vcl/unx/kde5/KDE5SalInstance.hxx
-vcl/unx/kde5/KDE5XLib.cxx
-vcl/unx/kde5/KDE5XLib.hxx
-vcl/unx/kde5/VCLKDE5Application.cxx
-vcl/unx/kde5/VCLKDE5Application.hxx
-vcl/unx/kde5/main.cxx
-vcl/unx/kde5/tst_exclude_posted_events.hxx
-vcl/unx/kde5/tst_exclude_socket_notifiers.hxx
 vcl/unx/x11/x11sys.cxx
 vcl/unx/x11/xlimits.cxx
 vcl/win/app/saldata.cxx
diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index 1aa19b3459f4..9133c4353295 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -43,190 +43,218 @@ class QGridLayout;
 class QLabel;
 class QWidget;
 
-typedef ::cppu::WeakComponentImplHelper
-< css::ui::dialogs::XFilePicker3
-, css::ui::dialogs::XFilePickerControlAccess
-, css::ui::dialogs::XFolderPicker2
-, css::lang::XInitialization
-, css::lang::XServiceInfo
-> Qt5FilePicker_Base;
-
-class Qt5FilePicker
-: public QObject
-, public Qt5FilePicker_Base
+typedef ::cppu::WeakComponentImplHelper<
+css::ui::dialogs::XFilePicker3, css::ui::dialogs::XFilePickerControlAccess,
+css::ui::dialogs::XFolderPicker2, css::lang::XInitialization, 
css::lang::XServiceInfo>
+Qt5FilePicker_Base;
+
+class Qt5FilePicker : public QObject, public Qt5FilePicker_Base
 {
 Q_OBJECT
 
 protected:
-css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener;
+css::uno::Reference m_xListener;
 
-QFileDialog* m_pFileDialog;///< the non-extendable file picker dialog
+QFileDialog* m_pFileDialog; ///< the non-extendable file picker dialog
 
-osl::Mutex   m_aHelperMutex;   ///< mutex used by the 
WeakComponentImplHelper
+osl::Mutex m_aHelperMutex; ///< mutex used by the WeakComponentImplHelper
 
-QStringList  m_aNamedFilterList; ///< named filter list for the 
QFileDialog
-QStringList  m_aFilterTitleList; ///< the original filter titles
-QString  m_aCurrentFilterTitle;  ///< the current filter title
+QStringList m_aNamedFilterList; ///< named filter list for the QFileDialog
+QStringLis

[Libreoffice-commits] core.git: bin/oss-fuzz-build.sh

[Caolán McNamara]

 bin/oss-fuzz-build.sh |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fbb95cd1800b6283c0cad35da360a50aca880e1f
Author: Caolán McNamara 
Date:   Thu May 31 11:23:48 2018 +0100

ofz#8644 oss build broken

Change-Id: I51daa79f3f2772d054b7ece248a37b9e5cca4960
Reviewed-on: https://gerrit.libreoffice.org/55121
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/bin/oss-fuzz-build.sh b/bin/oss-fuzz-build.sh
index 08330daffe2b..b988d00bd2eb 100755
--- a/bin/oss-fuzz-build.sh
+++ b/bin/oss-fuzz-build.sh
@@ -27,7 +27,7 @@ for a in *fuzzer; do
 #some minimal fonts required
 cp $a $OUT
 mkdir -p $OUT/$a.fonts
-cp $SRC/libreoffice/extras/source/truetype/symbol/opens___.ttf 
../share/fonts/truetype/Liberation* $OUT/$a.fonts
+cp ../share/fonts/truetype/opens___.ttf 
../share/fonts/truetype/Liberation* $OUT/$a.fonts
 #minimal runtime requirements
 cp templateservices.rdb $OUT/$a.services.rdb
 cp types.rdb $OUT/$a.types.rdb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'refs/notes/commits' - 2a/49d4b65f653b929b45c74a5da86bae5ac14eab

[Caolán McNamara]

 2a/49d4b65f653b929b45c74a5da86bae5ac14eab |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 5325b330ec8c21ba38d27c414da52d7d1ca08146
Author: Caolán McNamara 
Date:   Thu May 31 11:40:21 2018 +0100

Notes added by 'git notes add'

diff --git a/2a/49d4b65f653b929b45c74a5da86bae5ac14eab 
b/2a/49d4b65f653b929b45c74a5da86bae5ac14eab
new file mode 100644
index ..8ebbe55237b1
--- /dev/null
+++ b/2a/49d4b65f653b929b45c74a5da86bae5ac14eab
@@ -0,0 +1 @@
+ignore: obsolete
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |  107 +++---
 1 file changed, 100 insertions(+), 7 deletions(-)

New commits:
commit b34d42129178731a841c52aac186f5d9f4fa817e
Author: Tor Lillqvist 
Date:   Mon Apr 9 15:35:40 2018 +0300

A few SAL_INFO tweaks

Change-Id: I4a9c6341891bc80d8ab7648ed972d57739aa4f4a

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 57b054e66ec4..ddcf1ddf89f5 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -792,7 +792,7 @@ HRESULT STDMETHODCALLTYPE CXTypeInfo::GetNames(MEMBERID 
memid,
UINT cMaxNames,
UINT *pcNames)
 {
-SAL_WARN("extensions.olebridge", "CXTypeInfo@" << this << "::GetNames(" << 
memid << ")");
+SAL_INFO("extensions.olebridge", "CXTypeInfo@" << this << "::GetNames(" << 
memid << ")");
 assert(meKind != Kind::COCLASS);
 
 if (!rgBstrNames)
@@ -827,6 +827,7 @@ HRESULT STDMETHODCALLTYPE CXTypeInfo::GetNames(MEMBERID 
memid,
 if (memid > aMethods.getLength() - 3)
 return E_INVALIDARG;
 
+SAL_INFO("extensions.olebridge", "...CXTypeInfo@" << this << "::GetNames(" 
<< memid << "): " << aMethods[memid + 2]->getName());
 rgBstrNames[0] = SysAllocString((LPOLESTR) aMethods[memid + 
2]->getName().pData->buffer);
 *pcNames = 1;
 
commit 27a1351122dbab79536870d7080307defbcae433
Author: Tor Lillqvist 
Date:   Mon Apr 9 15:33:03 2018 +0300

First attempt at implementing CXTypeInfo::GetFuncDesc() and 
ReleaseFuncDesc()

The returned information for the methods is fairly bogus, though. Not
sure now (a few months after I wrote the code) whether this added
functionality was actually needed, or whether I just added it for
potential future need, and with the intent that it needs to be
improved significantly then later if actually needed.

Change-Id: Ifb132f494cdd7172b4b1d05cc26e2370ea595f41

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index c76320195abe..57b054e66ec4 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -681,10 +681,101 @@ HRESULT STDMETHODCALLTYPE 
CXTypeInfo::GetTypeComp(ITypeComp **ppTComp)
 HRESULT STDMETHODCALLTYPE CXTypeInfo::GetFuncDesc(UINT index,
   FUNCDESC **ppFuncDesc)
 {
-(void) index;
-(void) ppFuncDesc;
-SAL_WARN("extensions.olebridge", "CXTypeInfo@" << this << "::GetFuncDesc: 
NOTIMPL");
-return E_NOTIMPL;
+if (!ppFuncDesc)
+return E_POINTER;
+
+if (meKind != Kind::OUTGOING)
+return E_NOTIMPL;
+
+if (index <= 6)
+{
+*ppFuncDesc = new FUNCDESC;
+(*ppFuncDesc)->memid = 0x6000 + index;
+(*ppFuncDesc)->lprgscode = NULL;
+(*ppFuncDesc)->lprgelemdescParam = NULL;
+(*ppFuncDesc)->funckind = FUNC_DISPATCH;
+(*ppFuncDesc)->invkind = INVOKE_FUNC;
+(*ppFuncDesc)->callconv = CC_STDCALL;
+switch (index)
+{
+case 0: // QueryInterface
+(*ppFuncDesc)->cParams = 2;
+(*ppFuncDesc)->elemdescFunc.tdesc.lptdesc = NULL;
+(*ppFuncDesc)->elemdescFunc.tdesc.vt = VT_VOID;
+break;
+case 1: // AddRef
+(*ppFuncDesc)->cParams = 0;
+(*ppFuncDesc)->elemdescFunc.tdesc.lptdesc = NULL;
+(*ppFuncDesc)->elemdescFunc.tdesc.vt = VT_UI4;
+break;
+case 2: // Release
+(*ppFuncDesc)->cParams = 1;
+(*ppFuncDesc)->elemdescFunc.tdesc.lptdesc = NULL;
+(*ppFuncDesc)->elemdescFunc.tdesc.vt = VT_UI4;
+break;
+case 3: // GetTypeInfoCount
+(*ppFuncDesc)->cParams = 1;
+(*ppFuncDesc)->elemdescFunc.tdesc.lptdesc = NULL;
+(*ppFuncDesc)->elemdescFunc.tdesc.vt = VT_VOID;
+break;
+case 4: // GetTypeInfo
+(*ppFuncDesc)->cParams = 3;
+(*ppFuncDesc)->elemdescFunc.tdesc.lptdesc = NULL;
+(*ppFuncDesc)->elemdescFunc.tdesc.vt = VT_VOID;
+break;
+case 5: // GetIDsOfNames
+(*ppFuncDesc)->cParams = 5;
+(*ppFuncDesc)->elemdescFunc.tdesc.lptdesc = NULL;
+(*ppFuncDesc)->elemdescFunc.tdesc.vt = VT_VOID;
+break;
+case 6: // Invoke
+(*ppFuncDesc)->cParams = 8;
+(*ppFuncDesc)->elemdescFunc.tdesc.lptdesc = NULL;
+(*ppFuncDesc)->elemdescFunc.tdesc.vt = VT_VOID;
+break;
+}
+(*ppFuncDesc)->cParamsOpt = 0;
+(*ppFuncDesc)->oVft = index * sizeof(void*);
+(*ppFuncDesc)->cScodes = 0;
+(*ppFuncDesc)->wFuncFlags = FUNCFLAG_FRESTRICTED;
+
+SAL_INFO("extensions.olebridge", "CXTypeInfo@" << this << 
"::GetFuncDesc(" << index << "): S_OK: " << *ppFuncDesc);
+
+return S_OK;
+

[Libreoffice-commits] core.git: Branch 'feature/qt5+kde5' - 2 commits - solenv/clang-format vcl/inc vcl/qt5 vcl/unx

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit 26284ef5df7442a6bd66b960c87e117a94c4038b
Author: Katarina Behrens 
Date:   Thu May 31 12:57:05 2018 +0200

Hullo Jenkins, please build this branch TY

Change-Id: Idfc1c0ca9645068bb4d7dadc8db9381d753516ef
commit 3bd7aa9136353f1bef7b6c49584d24cfc9f68b72
Author: Katarina Behrens 
Date:   Thu May 31 12:14:55 2018 +0200

Make clang-format happy, remove vcl/unx/kde5 from blacklist

just between us girls, I hate you clang-format

Change-Id: I4cd041eff7a9fa01eb9192cf357e3f07a26fa6ad

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 7dcd63136243..79c639c82cb9 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -18501,24 +18501,6 @@ vcl/unx/kde4/VCLKDEApplication.hxx
 vcl/unx/kde4/main.cxx
 vcl/unx/kde4/tst_exclude_posted_events.hxx
 vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
-vcl/unx/kde5/FPServiceInfo.hxx
-vcl/unx/kde5/KDE5Data.cxx
-vcl/unx/kde5/KDE5Data.hxx
-vcl/unx/kde5/KDE5SalDisplay.cxx
-vcl/unx/kde5/KDE5SalDisplay.hxx
-vcl/unx/kde5/KDE5SalFrame.cxx
-vcl/unx/kde5/KDE5SalFrame.hxx
-vcl/unx/kde5/KDE5SalGraphics.cxx
-vcl/unx/kde5/KDE5SalGraphics.hxx
-vcl/unx/kde5/KDE5SalInstance.cxx
-vcl/unx/kde5/KDE5SalInstance.hxx
-vcl/unx/kde5/KDE5XLib.cxx
-vcl/unx/kde5/KDE5XLib.hxx
-vcl/unx/kde5/VCLKDE5Application.cxx
-vcl/unx/kde5/VCLKDE5Application.hxx
-vcl/unx/kde5/main.cxx
-vcl/unx/kde5/tst_exclude_posted_events.hxx
-vcl/unx/kde5/tst_exclude_socket_notifiers.hxx
 vcl/unx/x11/x11sys.cxx
 vcl/unx/x11/xlimits.cxx
 vcl/win/app/saldata.cxx
diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index 1aa19b3459f4..9133c4353295 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -43,190 +43,218 @@ class QGridLayout;
 class QLabel;
 class QWidget;
 
-typedef ::cppu::WeakComponentImplHelper
-< css::ui::dialogs::XFilePicker3
-, css::ui::dialogs::XFilePickerControlAccess
-, css::ui::dialogs::XFolderPicker2
-, css::lang::XInitialization
-, css::lang::XServiceInfo
-> Qt5FilePicker_Base;
-
-class Qt5FilePicker
-: public QObject
-, public Qt5FilePicker_Base
+typedef ::cppu::WeakComponentImplHelper<
+css::ui::dialogs::XFilePicker3, css::ui::dialogs::XFilePickerControlAccess,
+css::ui::dialogs::XFolderPicker2, css::lang::XInitialization, 
css::lang::XServiceInfo>
+Qt5FilePicker_Base;
+
+class Qt5FilePicker : public QObject, public Qt5FilePicker_Base
 {
 Q_OBJECT
 
 protected:
-css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener;
+css::uno::Reference m_xListener;
 
-QFileDialog* m_pFileDialog;///< the non-extendable file picker dialog
+QFileDialog* m_pFileDialog; ///< the non-extendable file picker dialog
 
-osl::Mutex   m_aHelperMutex;   ///< mutex used by the 
WeakComponentImplHelper
+osl::Mutex m_aHelperMutex; ///< mutex used by the WeakComponentImplHelper
 
-QStringList  m_aNamedFilterList; ///< named filter list for the 
QFileDialog
-QStringList  m_aFilterTitleList; ///< the original filter titles
-QString  m_aCurrentFilterTitle;  ///< the current filter title
+QStringList m_aNamedFilterList; ///< named filter list for the QFileDialog
+QStringList m_aFilterTitleList; ///< the original filter titles
+QString m_aCurrentFilterTitle; ///< the current filter title
 
-QDialog*m_pOptionsDialog;///< an extra options 
dialog window
-QLabel *m_pFilenameLabel;///< label to display the 
filename
-QLabel *m_pFilterLabel;  ///< label to display the 
filter
-QHash  m_aCustomWidgetsMap; ///< map of SAL control 
ID's to widget
+QDialog* m_pOptionsDialog; ///< an extra options dialog window
+QLabel* m_pFilenameLabel; ///< label to display the filename
+QLabel* m_pFilterLabel; ///< label to display the filter
+QHash m_aCustomWidgetsMap; ///< map of SAL control 
ID's to widget
 
 public:
-explicit Qt5FilePicker( QFileDialog::FileMode );
+explicit Qt5FilePicker(QFileDialog::FileMode);
 virtual ~Qt5FilePicker() override;
 
 // XFilePickerNotifier
-virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< 
css::ui::dialogs::XFilePickerListener >& xListener ) override;
-virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< 
css::ui::dialogs::XFilePickerListener >& xListener ) override;
+virtual void SAL_CALL addFilePickerListener(
+const css::uno::Reference& 
xListener) override;
+virtual void SAL_CALL removeFilePickerListener(
+const css::uno::Reference& 
xListener) override;
 
 // XFilterManager functions
-virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString 
&rFilter ) override;
-virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) override;
+virtual void SAL_CALL appendFilter(const OUString& rTitle

[Libreoffice-commits] core.git: 3 commits - extensions/source oovbaapi/ooo sw/inc sw/source

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx  |  126 +++--
 oovbaapi/ooo/vba/word/XApplicationOutgoing.idl |1 
 sw/inc/docsh.hxx   |3 
 sw/source/uibase/app/docsh.cxx |5 
 4 files changed, 129 insertions(+), 6 deletions(-)

New commits:
commit b01c131e5776c104e86da2966d5ac93aa4601d24
Author: Tor Lillqvist 
Date:   Mon Apr 9 16:19:36 2018 +0300

Add ooo::vba::word::XApplicationOutgoing::DocumentBeforeClose() callback

Change-Id: Iccdb7bc262b8f85caf7efb4407a1f00ff0cfb4a8

diff --git a/oovbaapi/ooo/vba/word/XApplicationOutgoing.idl 
b/oovbaapi/ooo/vba/word/XApplicationOutgoing.idl
index e38dba8479e8..9b62f02ad27c 100644
--- a/oovbaapi/ooo/vba/word/XApplicationOutgoing.idl
+++ b/oovbaapi/ooo/vba/word/XApplicationOutgoing.idl
@@ -27,6 +27,7 @@ interface XApplicationOutgoing : XInterfaceWithIID
 {
 void DocumentChange();
 void Quit();
+void DocumentBeforeClose([in] any Document, [out] any Cancel);
 };
 
 }; }; };
commit a9f7d22fa80c422275259c57e9c0d50cd8a0447e
Author: Tor Lillqvist 
Date:   Mon Apr 9 15:57:12 2018 +0300

We need to keep an ooo::vba::word::XDocument ref in the SwDocShell for...

... Application callbacks that want to pass a
such. DocumentBeforeClose() is one. (Not yet implemented.)

Change-Id: I1e065d608a55e054fb41b0006a76c731915f3ebb

diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index d93f626b585b..d61cd712a51a 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -23,6 +23,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include "swdllapi.h"
@@ -88,6 +89,7 @@ class SW_DLLPUBLIC SwDocShell
 ///< SID_MAIL_EXPORT_FINISHED needs to restore
 
 css::uno::Reference< ooo::vba::XSinkCaller > 
mxAutomationDocumentEventsCaller;
+css::uno::Reference< ooo::vba::word::XDocument> mxAutomationDocumentObject;
 
 /// Methods for access to doc.
 SAL_DLLPRIVATE void  AddLink();
@@ -315,6 +317,7 @@ public:
 
 void RegisterAutomationDocumentEventsCaller(css::uno::Reference< 
ooo::vba::XSinkCaller > const& xCaller);
 void CallAutomationDocumentEventSinks(const OUString& Method, 
css::uno::Sequence< css::uno::Any >& Arguments);
+void RegisterAutomationDocumentObject(css::uno::Reference< 
ooo::vba::word::XDocument > const& xDocument);
 };
 
 /** Find the right DocShell and create a new one:
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index fadf271a19c3..96608f2f1dee 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -1389,4 +1389,9 @@ void SwDocShell::CallAutomationDocumentEventSinks(const 
OUString& Method, css::u
 mxAutomationDocumentEventsCaller->CallSinks(Method, Arguments);
 }
 
+void SwDocShell::RegisterAutomationDocumentObject(css::uno::Reference< 
ooo::vba::word::XDocument > const& xDocument)
+{
+mxAutomationDocumentObject = xDocument;
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 2774593a4b23ba831b3b4d5729a241416634e917
Author: Tor Lillqvist 
Date:   Mon Apr 9 15:43:41 2018 +0300

First attempt at passing arguments, also in and inout, to Automation 
callbacks

Change-Id: Iff629243888153250b655a5e942ced024e3338a7

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index ddcf1ddf89f5..0a30609fc03e 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2067,7 +2067,8 @@ class Sink : public cppu::WeakImplHelper
 public:
 Sink(IUnknown* pUnkSink,
  Reference xMSF,
- ooo::vba::TypeAndIID aTypeAndIID);
+ ooo::vba::TypeAndIID aTypeAndIID,
+ InterfaceOleWrapper* pInterfaceOleWrapper);
 
 // XSink
 void SAL_CALL Call( const OUString& Method, Sequence< Any >& Arguments ) 
override;
@@ -2076,14 +2077,17 @@ private:
 IUnknown* mpUnkSink;
 Reference mxMSF;
 ooo::vba::TypeAndIID maTypeAndIID;
+InterfaceOleWrapper* mpInterfaceOleWrapper;
 };
 
 Sink::Sink(IUnknown* pUnkSink,
Reference xMSF,
-   ooo::vba::TypeAndIID aTypeAndIID) :
+   ooo::vba::TypeAndIID aTypeAndIID,
+   InterfaceOleWrapper* pInterfaceOleWrapper) :
 mpUnkSink(pUnkSink),
 mxMSF(xMSF),
-maTypeAndIID(aTypeAndIID)
+maTypeAndIID(aTypeAndIID),
+mpInterfaceOleWrapper(pInterfaceOleWrapper)
 {
 mpUnkSink->AddRef();
 }
@@ -2117,16 +2121,126 @@ Sink::Call( const OUString& Method, Sequence< Any >& 
Arguments )
 {
 if (aMethods[i]->getName() == Method)
 {
+// FIXME: Handle mismatch in type of actual argument and parameter 
of the method.
+
+// FIXME: Handle mismatch in number of arguments passed and actual 
number of parameters
+// of the method.
+
+auto aParamInfos = aMethods[i]->getParameterInfos();
+
+assert(Arguments.getLength() == aParamInfos.getLength());
+
 DISPPARAMS aDispParam

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

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit be906bddf6c6541a5290a7619ff132148f33d97e
Author: Katarina Behrens 
Date:   Thu May 31 12:57:05 2018 +0200

Hullo Jenkins, please build this branch TY

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

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

[Tor Lillqvist]

 oovbaapi/ooo/vba/word/XDocuments.idl |8 +++-
 sw/source/ui/vba/vbadocument.cxx |1 +
 sw/source/ui/vba/vbadocuments.cxx|6 ++
 sw/source/ui/vba/vbadocuments.hxx|1 +
 sw/source/uibase/app/docsh2.cxx  |   16 ++--
 5 files changed, 25 insertions(+), 7 deletions(-)

New commits:
commit fd01684f639fc7d47215ba8dfa334b876e19de12
Author: Tor Lillqvist 
Date:   Mon Apr 9 17:19:27 2018 +0300

Add ooo::vba::word::XDocuments::OpenNoRepairDialog()

Just call Open() with the same parameters. (Most of which are
cheerfully ignored.)

Change-Id: Ia9b980bf870bac04fab7e23843d29f66d5859037

diff --git a/oovbaapi/ooo/vba/word/XDocuments.idl 
b/oovbaapi/ooo/vba/word/XDocuments.idl
index c51a34fb6175..a9b6cdac8056 100644
--- a/oovbaapi/ooo/vba/word/XDocuments.idl
+++ b/oovbaapi/ooo/vba/word/XDocuments.idl
@@ -22,18 +22,16 @@
 #include 
 #include 
 
-
-
-
 module ooo {  module vba {  module word {
 
-
-
 interface XDocuments : com::sun::star::uno::XInterface
 {
 any Add([in] any Template, [in] any NewTemplate, [in] any DocumentType, 
[in] any Visible);
+
 any Open([in] string Filename, [in] any ConfirmConversions, [in] any 
ReadOnly, [in] any AddToRecentFiles, [in] any PasswordDocument, [in] any 
PasswordTemplate, [in] any Revert, [in] any WritePasswordDocument, [in] any 
WritePasswordTemplate, [in] any Format, [in] any Encoding, [in] any Visible, 
[in] any OpenAndRepair, [in] any DocumentDirection, [in] any NoEncodingDialog, 
[in] any XMLTransform);
 
+any OpenNoRepairDialog([in] string Filename, [in] any ConfirmConversions, 
[in] any ReadOnly, [in] any AddToRecentFiles, [in] any PasswordDocument, [in] 
any PasswordTemplate, [in] any Revert, [in] any WritePasswordDocument, [in] any 
WritePasswordTemplate, [in] any Format, [in] any Encoding, [in] any Visible, 
[in] any OpenAndRepair, [in] any DocumentDirection, [in] any NoEncodingDialog, 
[in] any XMLTransform);
+
 void Close([in] any SaveChanges,[in] any OriginalFormat,[in] any 
RouteDocument);
 };
 
diff --git a/sw/source/ui/vba/vbadocuments.cxx 
b/sw/source/ui/vba/vbadocuments.cxx
index a12d5c91dc75..7cada2510f34 100644
--- a/sw/source/ui/vba/vbadocuments.cxx
+++ b/sw/source/ui/vba/vbadocuments.cxx
@@ -138,6 +138,12 @@ SwVbaDocuments::Open( const OUString& Filename, const 
uno::Any& /*ConfirmConvers
 return aRet;
 }
 
+uno::Any SAL_CALL
+SwVbaDocuments::OpenNoRepairDialog( const OUString& Filename, const uno::Any& 
ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToRecentFiles, 
const uno::Any& PasswordDocument, const uno::Any& PasswordTemplate, const 
uno::Any& Revert, const uno::Any& WritePasswordDocument, const uno::Any& 
WritePasswordTemplate, const uno::Any& Format, const uno::Any& Encoding, const 
uno::Any& Visible, const uno::Any& OpenAndRepair, const uno::Any& 
DocumentDirection, const uno::Any& NoEncodingDialog, const uno::Any& 
XMLTransform )
+{
+return Open( Filename, ConfirmConversions, ReadOnly, AddToRecentFiles, 
PasswordDocument, PasswordTemplate, Revert, WritePasswordDocument, 
WritePasswordTemplate, Format, Encoding, Visible, OpenAndRepair, 
DocumentDirection, NoEncodingDialog, XMLTransform );
+}
+
 OUString
 SwVbaDocuments::getServiceImplName()
 {
diff --git a/sw/source/ui/vba/vbadocuments.hxx 
b/sw/source/ui/vba/vbadocuments.hxx
index ccf3a4d9b938..45dcfab61b88 100644
--- a/sw/source/ui/vba/vbadocuments.hxx
+++ b/sw/source/ui/vba/vbadocuments.hxx
@@ -45,6 +45,7 @@ public:
 // Methods
 virtual css::uno::Any SAL_CALL Add( const css::uno::Any& Template, const 
css::uno::Any& NewTemplate, const css::uno::Any& DocumentType, const 
css::uno::Any& Visible ) override;
 virtual css::uno::Any SAL_CALL Open( const OUString& Filename, const 
css::uno::Any& ConfirmConversions, const css::uno::Any& ReadOnly, const 
css::uno::Any& AddToRecentFiles, const css::uno::Any& PasswordDocument, const 
css::uno::Any& PasswordTemplate, const css::uno::Any& Revert, const 
css::uno::Any& WritePasswordDocument, const css::uno::Any& 
WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& 
Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, 
const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, 
const css::uno::Any& XMLTransform ) override;
+virtual css::uno::Any SAL_CALL OpenNoRepairDialog( const OUString& 
Filename, const css::uno::Any& ConfirmConversions, const css::uno::Any& 
ReadOnly, const css::uno::Any& AddToRecentFiles, const css::uno::Any& 
PasswordDocument, const css::uno::Any& PasswordTemplate, const css::uno::Any& 
Revert, const css::uno::Any& WritePasswordDocument, const css::uno::Any& 
WritePasswordTemplate, const css::uno::Any& Format, const css::uno::Any& 
Encoding, const css::uno::Any& Visible, const css::uno::Any& OpenAndRepair, 
const css::uno::Any& DocumentDirection, const css::uno::Any& NoEncodingDialog, 
const css::uno::Any& XMLTransform ) override;
 virtual void SAL_

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |   10 ++
 1 file changed, 10 insertions(+)

New commits:
commit 552b62f24a8804b6875cfcf1191093af80af2923
Author: Tor Lillqvist 
Date:   Tue Apr 10 15:53:28 2018 +0300

Add informative comment

Change-Id: I428c2bbaa273d893fa5a3cc42bb7f3d060f375ad

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 0a30609fc03e..fc8457f3129d 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2180,6 +2180,16 @@ Sink::Call( const OUString& Method, Sequence< Any >& 
Arguments )
 VariantInit(&aVarResult);
 UINT uArgErr;
 
+// In the case of a VBScript client, which uses "late binding", 
calling Invoke on the
+// sink it provides will cause a callback to our 
CXTypeInfo::GetNames for the given
+// member id, and in that we will tell it the name of the 
corresponding method, and the
+// client will know what event handler to invoke based on that 
name.
+//
+// As the outgoing interfaces used 
(ooo::vba::word::XApplicationOutgoing and others) are
+// totally not stable and not published in any way, there can be 
no client that would
+// have done "compile-time binding" and where the sink would 
actually be an object with
+// a vtbl corresponding to the outgoing interface. Late binding 
clients that work like
+// VBScript is all we support.
 nResult = pDispatch->Invoke(nMemId, IID_NULL, LOCALE_USER_DEFAULT, 
DISPATCH_METHOD, &aDispParams, &aVarResult, NULL, &uArgErr);
 SAL_WARN_IF(!SUCCEEDED(nResult), "extensions.olebridge", "Call to 
" << Method << " failed: " << WindowsErrorStringFromHRESULT(nResult));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx |9 ++---
 1 file changed, 6 insertions(+), 3 deletions(-)

New commits:
commit 4bf4895739ea16f0fbc68099fd3372e9d8a389a5
Author: Tor Lillqvist 
Date:   Tue Apr 10 21:38:21 2018 +0300

Initialise mxMSF in all cases

Change-Id: Ib7fcdbe934b66971995574226f982a6865faab1b

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index fc8457f3129d..0ba804420174 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -311,7 +311,8 @@ public:
 Reference xMSF);
 void InitForClassItself(Reference xOrigin,
 const OUString& sImplementationName,
-const IID& rIID);
+const IID& rIID,
+Reference xMSF);
 void InitForOutgoing(Reference xOrigin,
  const OUString& sInterfaceName,
  const IID& rIID,
@@ -567,13 +568,15 @@ void CXTypeInfo::InitForCoclass(Reference 
xOrigin,
 
 void CXTypeInfo::InitForClassItself(Reference xOrigin,
 const OUString& sImplementationName,
-const IID& rIID)
+const IID& rIID,
+Reference xMSF)
 {
 SAL_INFO("extensions.olebridge", "CXTypeInfo::InitForClassItself() this=" 
<< this << " for " << rIID << " (" << sImplementationName << ")");
 meKind = Kind::MAIN;
 mxOrigin = xOrigin;
 msImplementationName = sImplementationName;
 maIID = rIID;
+mxMSF = xMSF;
 }
 
 void CXTypeInfo::InitForOutgoing(Reference xOrigin,
@@ -1092,7 +1095,7 @@ STDMETHODIMP InterfaceOleWrapper::GetTypeInfo(unsigned 
int iTInfo, LCID, ITypeIn
 
 pTypeInfo->AddRef();
 
-pTypeInfo->InitForClassItself(m_xOrigin, m_sImplementationName, aIID);
+pTypeInfo->InitForClassItself(m_xOrigin, m_sImplementationName, aIID, 
m_smgr);
 
 *ppTInfo = pTypeInfo;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 sw/source/uibase/app/docsh2.cxx |   17 ++---
 1 file changed, 14 insertions(+), 3 deletions(-)

New commits:
commit 7fbfd070f97b048534725e1d89840031631c52d2
Author: Tor Lillqvist 
Date:   Fri Apr 13 14:43:59 2018 +0300

Emit DocumentChange events less eagerly (to Automation clients)

They are supposed to be emitten when a new document is created, an
existing document opened, or a document is made the active
document. (Hopefully our SfxEventHintId::ActivateDoc matches the last
one semantically.)

Change-Id: Ic53285fc3d1b9a61ababf77f06477081cef20f27

diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 22696b2af35f..40d5976c64d2 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -254,10 +254,21 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 if( xVbaEvents.is() )
 lcl_processCompatibleSfxHint( xVbaEvents, rHint );
 
-if ( rHint.GetId() == SfxHintId::DocChanged )
+if ( const SfxEventHint* pSfxEventHint = dynamic_cast(&rHint) )
 {
-uno::Sequence< css::uno::Any > aArgs;
-SW_MOD()->CallAutomationApplicationEventSinks( "DocumentChange", aArgs 
);
+switch( pSfxEventHint->GetEventId() )
+{
+case SfxEventHintId::ActivateDoc:
+case SfxEventHintId::CreateDoc:
+case SfxEventHintId::OpenDoc:
+{
+uno::Sequence< css::uno::Any > aArgs;
+SW_MOD()->CallAutomationApplicationEventSinks( 
"DocumentChange", aArgs );
+break;
+}
+default:
+break;
+}
 }
 
 sal_uInt16 nAction = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 2 commits - extensions/source oovbaapi/ooo sw/source

[Tor Lillqvist]

 extensions/source/ole/unoobjw.cxx  |8 
 oovbaapi/ooo/vba/word/XApplicationOutgoing.idl |4 +++-
 sw/source/uibase/app/docsh2.cxx|   24 
 3 files changed, 31 insertions(+), 5 deletions(-)

New commits:
commit bbe55ee8e78b2e293234ea8d2b234c4cd7091aa1
Author: Tor Lillqvist 
Date:   Mon Apr 16 18:01:03 2018 +0300

Use correct index for incoming Arguments sequence

Change-Id: I1c706a2139cb2596969c6c1d166d3f9fe9f91d39

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 0ba804420174..f0e533a43025 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -2208,21 +2208,21 @@ Sink::Call( const OUString& Method, Sequence< Any >& 
Arguments )
 case VT_BYREF|VT_I2:
 {
 SHORT *pI = (SHORT*)aDispParams.rgvarg[i].byref;
-Arguments[i] <<= (sal_Int16)*pI;
+Arguments[nIncomingArgIndex] <<= (sal_Int16)*pI;
 delete pI;
 }
 break;
 case VT_BYREF|VT_I4:
 {
 LONG *pL = (LONG*)aDispParams.rgvarg[i].byref;
-Arguments[i] <<= (sal_Int32)*pL;
+Arguments[nIncomingArgIndex] <<= (sal_Int32)*pL;
 delete pL;
 }
 break;
 case VT_BYREF|VT_BSTR:
 {
 BSTR *pBstr = (BSTR*)aDispParams.rgvarg[i].byref;
-Arguments[i] <<= OUString(o3tl::toU(*pBstr));
+Arguments[nIncomingArgIndex] <<= 
OUString(o3tl::toU(*pBstr));
 // Undo SysAllocString() done in anyToVariant()
 SysFreeString(*pBstr);
 delete pBstr;
@@ -2232,7 +2232,7 @@ Sink::Call( const OUString& Method, Sequence< Any >& 
Arguments )
 {
 VARIANT_BOOL *pBool = 
(VARIANT_BOOL*)aDispParams.rgvarg[i].byref;
 // SAL_ DEBUG("===> VT_BOOL: byref is now " << 
aDispParams.rgvarg[i].byref << ", " << (int)*pBool);
-Arguments[i] <<= (sal_Bool)(*pBool != 
VARIANT_FALSE ? sal_True : sal_False);
+Arguments[nIncomingArgIndex] <<= (sal_Bool)(*pBool 
!= VARIANT_FALSE ? sal_True : sal_False);
 delete pBool;
 }
 break;
commit 05101334e6d15eb77782dfc36c2065561f7e57e6
Author: Tor Lillqvist 
Date:   Mon Apr 16 17:02:25 2018 +0300

Add DocumentOpen and NewDocument to XApplicationOutgoing and emit such

Change-Id: Ia2a0ade0af45f1ba99b0cfa860bd1986edcf272e

diff --git a/oovbaapi/ooo/vba/word/XApplicationOutgoing.idl 
b/oovbaapi/ooo/vba/word/XApplicationOutgoing.idl
index 9b62f02ad27c..3eab2dd5a291 100644
--- a/oovbaapi/ooo/vba/word/XApplicationOutgoing.idl
+++ b/oovbaapi/ooo/vba/word/XApplicationOutgoing.idl
@@ -25,9 +25,11 @@ module ooo {  module vba {  module word {
 
 interface XApplicationOutgoing : XInterfaceWithIID
 {
-void DocumentChange();
 void Quit();
+void DocumentChange();
+void DocumentOpen([in] any Document);
 void DocumentBeforeClose([in] any Document, [out] any Cancel);
+void NewDocument([in] any Document);
 };
 
 }; }; };
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 40d5976c64d2..2042640d66c9 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -269,6 +269,30 @@ void SwDocShell::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 default:
 break;
 }
+
+switch( pSfxEventHint->GetEventId() )
+{
+case SfxEventHintId::CreateDoc:
+{
+uno::Any aDocument;
+aDocument <<= mxAutomationDocumentObject;
+uno::Sequence< uno::Any > aArgs(1);
+aArgs[0] = aDocument;
+SW_MOD()->CallAutomationApplicationEventSinks( 
"NewDocument", aArgs );
+}
+break;
+case SfxEventHintId::OpenDoc:
+{
+uno::Any aDocument;
+aDocument <<= mxAutomationDocumentObject;
+uno::Sequence< uno::Any > aArgs(1);
+aArgs[0] = aDocument;
+SW_MOD()->CallAutomationApplicationEventSinks( 
"DocumentOpen", aArgs );
+}
+break;
+default:
+break;
+}
 }
 
 sal_uInt16 nAction = 0;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.fr

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

[Tor Lillqvist]

 sw/source/uibase/app/docsh2.cxx |   24 +---
 1 file changed, 17 insertions(+), 7 deletions(-)

New commits:
commit 91fd5449c6f3f2c2114992da7def915a9f90a580
Author: Tor Lillqvist 
Date:   Mon Apr 16 18:42:25 2018 +0300

If a DocumentBeforeClose event handler says no, don't then

Change-Id: I13601337a78d22eca1df185fb4d51b34a90925f3

diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index 2042640d66c9..a6b11a5f4500 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -365,23 +365,33 @@ bool SwDocShell::PrepareClose( bool bUI )
 {
 bool bRet = SfxObjectShell::PrepareClose( bUI );
 
-if( bRet )
-EndListening( *this );
-
-if (m_xDoc && IsInPrepareClose())
+// If we are going to close it at this point, let potential 
DocumentBeforeClose event handlers
+// in Automation clients veto it.
+if (bRet && m_xDoc && IsInPrepareClose())
 {
 uno::Any aDocument;
 aDocument <<= mxAutomationDocumentObject;
 
 uno::Sequence< uno::Any > aArgs(2);
+// Arg 0: Document
 aArgs[0] = aDocument;
-// FIXME: This should be an out argument, hmm?
+// Arg 1: Cancel
 aArgs[1] <<= false;
 
 SW_MOD()->CallAutomationApplicationEventSinks( "DocumentBeforeClose", 
aArgs );
 
-// FIXME: Do something based on what value the callback set the second 
argument to
+// If the Cancel argument was set to True by an event handler, return 
false.
+bool bCancel;
+aArgs[1] >>= bCancel;
+if (bCancel)
+bRet = false;
+}
+
+if( bRet )
+EndListening( *this );
 
+if (m_xDoc && IsInPrepareClose())
+{
 uno::Reference< script::vba::XVBAEventProcessor > const xVbaEvents =
 m_xDoc->GetVbaEventProcessor();
 if( xVbaEvents.is() )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 oovbaapi/ooo/vba/word/XApplication.idl |   12 
 sw/source/ui/vba/vbaapplication.cxx|   26 ++
 sw/source/ui/vba/vbaapplication.hxx|2 ++
 3 files changed, 32 insertions(+), 8 deletions(-)

New commits:
commit 269c29131f5921ab92acf167ca24e8880cfa8bd4
Author: Tor Lillqvist 
Date:   Mon Apr 16 21:09:01 2018 +0300

Add a WindowState attribute to ooo.vba.word.XApplication, too

It seems to be something 3rd-party VB6 clients expect to be able to
get and put.

Change-Id: If5079da8ba99fde74b12b9590737d575f6636210

diff --git a/oovbaapi/ooo/vba/word/XApplication.idl 
b/oovbaapi/ooo/vba/word/XApplication.idl
index a0ad911370a9..ea709e7ec2b2 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -34,6 +34,7 @@ interface XApplication : XConnectable
 [attribute, readonly] XSelection Selection;
 [attribute] boolean DisplayAutoCompleteTips;
 [attribute] long EnableCancelKey;
+[attribute] long WindowState;
 
 any CommandBars( [in] any Index );
 any Documents( [in] any Index );
diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index 45c53114e2cc..d9d245a12d49 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -29,6 +29,7 @@
 #include "vbadialogs.hxx"
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -189,6 +190,31 @@ void SAL_CALL SwVbaApplication::setEnableCancelKey( 
sal_Int32/* _enableCancelKey
 // seems not supported in Writer
 }
 
+sal_Int32 SAL_CALL SwVbaApplication::getWindowState()
+{
+auto xWindow = getActiveWindow();
+if (xWindow.is())
+{
+uno::Any aState = xWindow->getWindowState();
+sal_Int32 nState;
+if (aState >>= nState)
+return nState;
+}
+
+return word::WdWindowState::wdWindowStateNormal; // ?
+}
+
+void SAL_CALL SwVbaApplication::setWindowState( sal_Int32 _windowstate )
+{
+auto xWindow = getActiveWindow();
+if (xWindow.is())
+{
+uno::Any aState;
+aState <<= _windowstate;
+xWindow->setWindowState( aState );
+}
+}
+
 float SAL_CALL SwVbaApplication::CentimetersToPoints( float Centimeters )
 {
 return VbaApplicationBase::CentimetersToPoints( Centimeters );
diff --git a/sw/source/ui/vba/vbaapplication.hxx 
b/sw/source/ui/vba/vbaapplication.hxx
index a8763cc15d6e..808f7c1c10b8 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -71,6 +71,8 @@ public:
 virtual void SAL_CALL setDisplayAutoCompleteTips( sal_Bool 
_displayAutoCompleteTips ) override;
 virtual sal_Int32 SAL_CALL getEnableCancelKey() override;
 virtual void SAL_CALL setEnableCancelKey( sal_Int32 _enableCancelKey ) 
override;
+virtual sal_Int32 SAL_CALL getWindowState() override;
+virtual void SAL_CALL setWindowState( sal_Int32 _windowstate ) override;
 virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override;
 virtual void SAL_CALL ShowMe() override;
 
commit a5a8346cca567b7657fd144c4f0ad7f2113c5dae
Author: Tor Lillqvist 
Date:   Mon Apr 16 21:00:42 2018 +0300

Can simplify, our IDL compiler is more clever nowadays

Change-Id: I785c115ab7bcb7cfddc8e79bd5d31278f0c544dc

diff --git a/oovbaapi/ooo/vba/word/XApplication.idl 
b/oovbaapi/ooo/vba/word/XApplication.idl
index de6fafc085a7..a0ad911370a9 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -24,19 +24,14 @@
 
 module ooo {  module vba {  module word {
 
-interface XDocument;
-interface XWindow;
-interface XSystem;
-interface XOptions;
-interface XSelection;
 interface XApplication : XConnectable
 {
 [attribute, readonly] XDocument ActiveDocument;
 [attribute, readonly] XWindow ActiveWindow;
 [attribute, readonly] string Name;
-[attribute, readonly] ooo::vba::word::XSystem System;
-[attribute, readonly] ooo::vba::word::XOptions Options;
-[attribute, readonly] ooo::vba::word::XSelection Selection;
+[attribute, readonly] XSystem System;
+[attribute, readonly] XOptions Options;
+[attribute, readonly] XSelection Selection;
 [attribute] boolean DisplayAutoCompleteTips;
 [attribute] long EnableCancelKey;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 oovbaapi/ooo/vba/word/XApplication.idl |1 +
 sw/source/ui/vba/vbaapplication.cxx|   17 +++--
 sw/source/ui/vba/vbaapplication.hxx|4 
 3 files changed, 20 insertions(+), 2 deletions(-)

New commits:
commit 5abf9d268d51afeaea2ed6f2a81a92ad46dea1cd
Author: Tor Lillqvist 
Date:   Mon Apr 16 21:50:55 2018 +0300

Add Resize() method to ooo.vba.word.XApplication

Seems to be commonly called by 3rd-party Automation (and VB6) client
code.

Change-Id: I29ee5e7d95f3da2ffae0fac44151148be6e272ee

diff --git a/oovbaapi/ooo/vba/word/XApplication.idl 
b/oovbaapi/ooo/vba/word/XApplication.idl
index ea709e7ec2b2..ce047e0d08ac 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -43,6 +43,7 @@ interface XApplication : XConnectable
 any ListGalleries( [in] any aIndex );
 float CentimetersToPoints([in] float Centimeters );
 void ShowMe();
+void Resize( [in] long Width, [in] long Height );
 };
 
 }; }; };
diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index d9d245a12d49..ee743252c698 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -99,8 +99,8 @@ SwVbaApplication::getActiveDocument()
 return new SwVbaDocument( this, mxContext, getCurrentDocument() );
 }
 
-uno::Reference< word::XWindow > SAL_CALL
-SwVbaApplication::getActiveWindow()
+SwVbaWindow *
+SwVbaApplication::getActiveSwVbaWindow()
 {
 // #FIXME so far can't determine Parent
 uno::Reference< frame::XModel > xModel( getCurrentDocument(), 
uno::UNO_SET_THROW );
@@ -108,6 +108,12 @@ SwVbaApplication::getActiveWindow()
 return new SwVbaWindow( uno::Reference< XHelperInterface >(), mxContext, 
xModel, xController );
 }
 
+uno::Reference< word::XWindow > SAL_CALL
+SwVbaApplication::getActiveWindow()
+{
+return getActiveSwVbaWindow();
+}
+
 uno::Reference SAL_CALL
 SwVbaApplication::getSystem()
 {
@@ -225,6 +231,13 @@ void SAL_CALL SwVbaApplication::ShowMe()
 // No idea what we should or could do
 }
 
+void SAL_CALL SwVbaApplication::Resize( sal_Int32 Width, sal_Int32 Height )
+{
+auto pWindow = getActiveSwVbaWindow();
+pWindow->setWidth( Width );
+pWindow->setHeight( Height );
+}
+
 // XInterfaceWithIID
 
 OUString SAL_CALL
diff --git a/sw/source/ui/vba/vbaapplication.hxx 
b/sw/source/ui/vba/vbaapplication.hxx
index 808f7c1c10b8..137db4d95591 100644
--- a/sw/source/ui/vba/vbaapplication.hxx
+++ b/sw/source/ui/vba/vbaapplication.hxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 
+#include "vbawindow.hxx"
+
 typedef cppu::ImplInheritanceHelper< VbaApplicationBase, 
ooo::vba::word::XApplication, ooo::vba::XSinkCaller > SwVbaApplication_BASE;
 
 // This class is currently not a singleton. One instance is created per 
document with (potential?)
@@ -47,6 +49,7 @@ typedef cppu::ImplInheritanceHelper< VbaApplicationBase, 
ooo::vba::word::XApplic
 class SwVbaApplication : public SwVbaApplication_BASE
 {
 std::vector> mvSinks;
+SwVbaWindow* getActiveSwVbaWindow();
 
 public:
 explicit SwVbaApplication( css::uno::Reference< 
css::uno::XComponentContext >& m_xContext );
@@ -75,6 +78,7 @@ public:
 virtual void SAL_CALL setWindowState( sal_Int32 _windowstate ) override;
 virtual float SAL_CALL CentimetersToPoints( float Centimeters ) override;
 virtual void SAL_CALL ShowMe() override;
+virtual void SAL_CALL Resize( sal_Int32 Width, sal_Int32 Height ) override;
 
 // XInterfaceWithIID
 virtual OUString SAL_CALL getIID() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 5 commits - oovbaapi/ooo scp2/source sw/source

[Tor Lillqvist]

 oovbaapi/ooo/vba/excel/XApplication.idl |   11 
 oovbaapi/ooo/vba/word/XApplication.idl  |5 ++
 scp2/source/calc/registryitem_calc.scp  |   15 ++
 sw/source/ui/vba/vbaapplication.cxx |   79 +++-
 sw/source/ui/vba/vbaapplication.hxx |9 +++
 5 files changed, 97 insertions(+), 22 deletions(-)

New commits:
commit b7939ff897a173086643819451c7b2b4553c11c3
Author: Tor Lillqvist 
Date:   Sun Apr 22 10:02:53 2018 +0300

Add entries for Calc.Applcation

Change-Id: Icee6f97abf9182621e43a0039b52c2f2e141fa01

diff --git a/scp2/source/calc/registryitem_calc.scp 
b/scp2/source/calc/registryitem_calc.scp
index beb890f472d9..7464e701ca7c 100644
--- a/scp2/source/calc/registryitem_calc.scp
+++ b/scp2/source/calc/registryitem_calc.scp
@@ -806,6 +806,21 @@ RegistryItem 
gid_Regitem_Openoffice_Calcdocument_1_Shell_Printto_Command
 Value = "\"\program\soffice.exe\" -pt \"%2\" \"%1\"";
 End
 
+RegistryItem gid_Regitem_CalcApplication
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Calc_Bin;
+Subkey = "Calc.Application\CLSID";
+Value = "{82154425-0FBF-11d4-8313-005004526AB4}";
+Styles = ();
+End
+
+RegistryItem 
gid_Regitem_Clsid__82154425_0FBF_11d4_8313_005004526AB4__Localserver32
+ParentID = PREDEFINED_HKEY_CLASSES_ROOT;
+ModuleID = gid_Module_Prg_Wrt_Bin;
+Subkey = "CLSID\{82154425-0FBF-11d4-8313-005004526AB4}\LocalServer32";
+Value = "\program\soffice.exe --nodefault --nologo";
+End
+
 // .fods
 
 RegistryItem gid_Regitem__Fods
commit fcf5a8f0f32dd97acee8271c1ccfc50e159667b5
Author: Tor Lillqvist 
Date:   Sat Apr 21 01:50:16 2018 +0300

Move two functions to perhaps less confusing locations

Change-Id: I4360c588ee4866f4e680095c0cd0e8f7aceaa6d7

diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index 52cb6411d1ce..897be10a8c11 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -305,12 +305,6 @@ SwVbaApplication::getIID()
 return OUString("{82154421-0FBF-11d4-8313-005004526AB4}");
 }
 
-uno::Reference< frame::XModel >
-SwVbaApplication::getCurrentDocument()
-{
-return getCurrentWordDoc( mxContext );
-}
-
 // XConnectable
 
 OUString SAL_CALL
@@ -337,8 +331,6 @@ SwVbaApplication::FindConnectionPoint()
 return xCP;
 }
 
-// XHelperInterface
-
 OUString
 SwVbaApplication::getServiceImplName()
 {
@@ -357,9 +349,10 @@ SwVbaApplication::getServiceNames()
 return aServiceNames;
 }
 
-SwVbaApplicationOutgoingConnectionPoint::SwVbaApplicationOutgoingConnectionPoint(
 SwVbaApplication* pApp ) :
-mpApp(pApp)
+uno::Reference< frame::XModel >
+SwVbaApplication::getCurrentDocument()
 {
+return getCurrentWordDoc( mxContext );
 }
 
 // XSinkCaller
@@ -376,6 +369,11 @@ SwVbaApplication::CallSinks( const OUString& Method, 
uno::Sequence< uno::Any >&
 
 // SwVbaApplicationOutgoingConnectionPoint
 
+SwVbaApplicationOutgoingConnectionPoint::SwVbaApplicationOutgoingConnectionPoint(
 SwVbaApplication* pApp ) :
+mpApp(pApp)
+{
+}
+
 // XConnectionPoint
 sal_uInt32 SAL_CALL
 SwVbaApplicationOutgoingConnectionPoint::Advise( const uno::Reference< XSink 
>& Sink )
commit c4cd61e7efd0c898c7bd304747c595871e97be6f
Author: Tor Lillqvist 
Date:   Sat Apr 21 00:29:04 2018 +0300

Can simplify, our IDL compiler is more clever nowadays

Change-Id: Ia5f8c0fcc8d1eb9f6ec3db82b947a16ed3762d01

diff --git a/oovbaapi/ooo/vba/excel/XApplication.idl 
b/oovbaapi/ooo/vba/excel/XApplication.idl
index e08627651507..e315b27ddaf3 100644
--- a/oovbaapi/ooo/vba/excel/XApplication.idl
+++ b/oovbaapi/ooo/vba/excel/XApplication.idl
@@ -21,20 +21,9 @@
 
 #include 
 #include 
-#include 
-#include 
-#include 
 
 module ooo {  module vba {  module excel {
 
-interface XRange;
-interface XWorkbook;
-interface XWorkbooks;
-interface XWorksheets;
-interface XWorksheetFunction;
-interface XWindow;
-interface XWorksheet;
-
 interface XApplication
 {
 // Application serves as WorksheetFunction object with little differences
commit fe1438c1bee05f81039787c8c533bdecaa56e90b
Author: Tor Lillqvist 
Date:   Tue Apr 17 00:35:56 2018 +0300

Add window geometry attributes, too, to ooo.vba.word.XApplication

Like the other similar attributes and methods added lately, they just
forward to the corresponding attributes of the "active
window". Whether setting and retrieving such then actually does
something useful or not I don't know. My main concern is that
Automation and COM clients at least won't complain and abort because
of unimplemented APIs.

Change-Id: Ia8d22e3137d314268ac6771bb355e9f0686f52dc

diff --git a/oovbaapi/ooo/vba/word/XApplication.idl 
b/oovbaapi/ooo/vba/word/XApplication.idl
index 52ece92a4178..4b0f4f4e9a2a 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -35,6 +35,10 @@ interface XApplication : XConnectable
 [attribute] boolean Displ

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

[Katarina Behrens]

Rebased ref, commits from common ancestor:
commit 9e2528e19beeed25e41bf069edf6083d36429b22
Author: Katarina Behrens 
Date:   Thu May 31 12:14:55 2018 +0200

Make clang-format happy, remove vcl/unx/kde5 from blacklist

just between us girls, I hate you clang-format

Change-Id: I4cd041eff7a9fa01eb9192cf357e3f07a26fa6ad

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index 7dcd63136243..79c639c82cb9 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -18501,24 +18501,6 @@ vcl/unx/kde4/VCLKDEApplication.hxx
 vcl/unx/kde4/main.cxx
 vcl/unx/kde4/tst_exclude_posted_events.hxx
 vcl/unx/kde4/tst_exclude_socket_notifiers.hxx
-vcl/unx/kde5/FPServiceInfo.hxx
-vcl/unx/kde5/KDE5Data.cxx
-vcl/unx/kde5/KDE5Data.hxx
-vcl/unx/kde5/KDE5SalDisplay.cxx
-vcl/unx/kde5/KDE5SalDisplay.hxx
-vcl/unx/kde5/KDE5SalFrame.cxx
-vcl/unx/kde5/KDE5SalFrame.hxx
-vcl/unx/kde5/KDE5SalGraphics.cxx
-vcl/unx/kde5/KDE5SalGraphics.hxx
-vcl/unx/kde5/KDE5SalInstance.cxx
-vcl/unx/kde5/KDE5SalInstance.hxx
-vcl/unx/kde5/KDE5XLib.cxx
-vcl/unx/kde5/KDE5XLib.hxx
-vcl/unx/kde5/VCLKDE5Application.cxx
-vcl/unx/kde5/VCLKDE5Application.hxx
-vcl/unx/kde5/main.cxx
-vcl/unx/kde5/tst_exclude_posted_events.hxx
-vcl/unx/kde5/tst_exclude_socket_notifiers.hxx
 vcl/unx/x11/x11sys.cxx
 vcl/unx/x11/xlimits.cxx
 vcl/win/app/saldata.cxx
diff --git a/vcl/inc/qt5/Qt5FilePicker.hxx b/vcl/inc/qt5/Qt5FilePicker.hxx
index 1aa19b3459f4..9133c4353295 100644
--- a/vcl/inc/qt5/Qt5FilePicker.hxx
+++ b/vcl/inc/qt5/Qt5FilePicker.hxx
@@ -43,190 +43,218 @@ class QGridLayout;
 class QLabel;
 class QWidget;
 
-typedef ::cppu::WeakComponentImplHelper
-< css::ui::dialogs::XFilePicker3
-, css::ui::dialogs::XFilePickerControlAccess
-, css::ui::dialogs::XFolderPicker2
-, css::lang::XInitialization
-, css::lang::XServiceInfo
-> Qt5FilePicker_Base;
-
-class Qt5FilePicker
-: public QObject
-, public Qt5FilePicker_Base
+typedef ::cppu::WeakComponentImplHelper<
+css::ui::dialogs::XFilePicker3, css::ui::dialogs::XFilePickerControlAccess,
+css::ui::dialogs::XFolderPicker2, css::lang::XInitialization, 
css::lang::XServiceInfo>
+Qt5FilePicker_Base;
+
+class Qt5FilePicker : public QObject, public Qt5FilePicker_Base
 {
 Q_OBJECT
 
 protected:
-css::uno::Reference< css::ui::dialogs::XFilePickerListener > m_xListener;
+css::uno::Reference m_xListener;
 
-QFileDialog* m_pFileDialog;///< the non-extendable file picker dialog
+QFileDialog* m_pFileDialog; ///< the non-extendable file picker dialog
 
-osl::Mutex   m_aHelperMutex;   ///< mutex used by the 
WeakComponentImplHelper
+osl::Mutex m_aHelperMutex; ///< mutex used by the WeakComponentImplHelper
 
-QStringList  m_aNamedFilterList; ///< named filter list for the 
QFileDialog
-QStringList  m_aFilterTitleList; ///< the original filter titles
-QString  m_aCurrentFilterTitle;  ///< the current filter title
+QStringList m_aNamedFilterList; ///< named filter list for the QFileDialog
+QStringList m_aFilterTitleList; ///< the original filter titles
+QString m_aCurrentFilterTitle; ///< the current filter title
 
-QDialog*m_pOptionsDialog;///< an extra options 
dialog window
-QLabel *m_pFilenameLabel;///< label to display the 
filename
-QLabel *m_pFilterLabel;  ///< label to display the 
filter
-QHash  m_aCustomWidgetsMap; ///< map of SAL control 
ID's to widget
+QDialog* m_pOptionsDialog; ///< an extra options dialog window
+QLabel* m_pFilenameLabel; ///< label to display the filename
+QLabel* m_pFilterLabel; ///< label to display the filter
+QHash m_aCustomWidgetsMap; ///< map of SAL control 
ID's to widget
 
 public:
-explicit Qt5FilePicker( QFileDialog::FileMode );
+explicit Qt5FilePicker(QFileDialog::FileMode);
 virtual ~Qt5FilePicker() override;
 
 // XFilePickerNotifier
-virtual void SAL_CALL addFilePickerListener( const css::uno::Reference< 
css::ui::dialogs::XFilePickerListener >& xListener ) override;
-virtual void SAL_CALL removeFilePickerListener( const css::uno::Reference< 
css::ui::dialogs::XFilePickerListener >& xListener ) override;
+virtual void SAL_CALL addFilePickerListener(
+const css::uno::Reference& 
xListener) override;
+virtual void SAL_CALL removeFilePickerListener(
+const css::uno::Reference& 
xListener) override;
 
 // XFilterManager functions
-virtual void SAL_CALL appendFilter( const OUString &rTitle, const OUString 
&rFilter ) override;
-virtual void SAL_CALL setCurrentFilter( const OUString &rTitle ) override;
+virtual void SAL_CALL appendFilter(const OUString& rTitle, const OUString& 
rFilter) override;
+virtual void SAL_CALL setCurrentFilter(const OUString& rTitle) override;
 virtual OUString SAL_CALL getCurrentFilter() override;
 
 // XFilterGroupManager functions
-vi

[Libreoffice-commits] core.git: cppcanvas/source cui/source drawinglayer/source filter/source include/vcl sc/source sd/source sfx2/source svtools/source svx/source sw/qa sw/source vcl/source vcl/workb

[Noel Grandin]

 cppcanvas/source/mtfrenderer/emfpimage.cxx |2 +-
 cui/source/options/personalization.cxx |6 +++---
 cui/source/tabpages/backgrnd.cxx   |8 
 cui/source/tabpages/grfpage.cxx|6 ++
 cui/source/tabpages/numpages.cxx   |2 +-
 cui/source/tabpages/tpline.cxx |2 +-
 drawinglayer/source/tools/emfpimage.cxx|2 +-
 filter/source/flash/swfexporter.cxx|2 +-
 filter/source/graphicfilter/egif/egif.cxx  |7 +--
 filter/source/graphicfilter/eps/eps.cxx|6 +++---
 filter/source/graphicfilter/ieps/ieps.cxx  |9 -
 filter/source/msfilter/msdffimp.cxx|2 +-
 filter/source/msfilter/svdfppt.cxx |2 +-
 include/vcl/dibtools.hxx   |7 ---
 include/vcl/graph.hxx  |1 -
 sc/source/filter/excel/xeescher.cxx|2 +-
 sd/source/ui/dlg/PhotoAlbumDialog.cxx  |2 +-
 sd/source/ui/func/fuvect.cxx   |4 +++-
 sfx2/source/dialog/filedlghelper.cxx   |4 ++--
 svtools/source/filter/exportdialog.cxx |6 +++---
 svtools/source/filter/exportdialog.hxx |4 ++--
 svx/source/dialog/_bmpmask.cxx |8 
 svx/source/dialog/_contdlg.cxx |4 ++--
 svx/source/sidebar/nbdtmg.cxx  |2 +-
 svx/source/unodraw/UnoGraphicExporter.cxx  |2 +-
 svx/source/xoutdev/_xoutbmp.cxx|   21 +
 sw/qa/extras/inc/swmodeltestbase.hxx   |5 -
 sw/qa/extras/ooxmlexport/ooxmlexport10.cxx |   24 ++--
 sw/source/uibase/dochdl/swdtflvr.cxx   |2 +-
 vcl/source/filter/graphicfilter.cxx|8 
 vcl/source/filter/jpeg/JpegWriter.cxx  |4 ++--
 vcl/source/gdi/dibtools.cxx|5 +++--
 vcl/source/gdi/graph.cxx   |5 -
 vcl/source/gdi/pdfextoutdevdata.cxx|2 +-
 vcl/source/gdi/pdfwriter_impl.cxx  |8 
 vcl/source/gdi/svmconverter.cxx|   12 ++--
 vcl/source/graphic/UnoGraphicProvider.cxx  |7 +--
 vcl/workben/icontest.cxx   |2 +-
 vcl/workben/svpclient.cxx  |4 ++--
 39 files changed, 92 insertions(+), 119 deletions(-)

New commits:
commit d4442ac1ac9aae36dbc08fda8154d71ea0f81708
Author: Noel Grandin 
Date:   Wed May 30 13:02:25 2018 +0200

drop Graphic::GetBitmap

so that we flush out various code using Bitmap, in favour of using
BitmapEx.
This is part of the process of making Bitmap largely an internal detail
of vcl

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

diff --git a/cppcanvas/source/mtfrenderer/emfpimage.cxx 
b/cppcanvas/source/mtfrenderer/emfpimage.cxx
index e3f1fc3d31a3..e249d5c1acca 100644
--- a/cppcanvas/source/mtfrenderer/emfpimage.cxx
+++ b/cppcanvas/source/mtfrenderer/emfpimage.cxx
@@ -59,7 +59,7 @@ namespace cppcanvas
 GraphicFilter filter;
 
 filter.ImportGraphic(graphic, OUString(), s);
-SAL_INFO("cppcanvas.emf", "EMF+\tbitmap width: " << 
graphic.GetBitmap().GetSizePixel().Width() << " height: " << 
graphic.GetBitmap().GetSizePixel().Height());
+SAL_INFO("cppcanvas.emf", "EMF+\tbitmap width: " << 
graphic.GetSizePixel().Width() << " height: " << 
graphic.GetSizePixel().Height());
 }
 
 }
diff --git a/cui/source/options/personalization.cxx 
b/cui/source/options/personalization.cxx
index d05775e93a53..a4ab78bed8a6 100644
--- a/cui/source/options/personalization.cxx
+++ b/cui/source/options/personalization.cxx
@@ -436,7 +436,7 @@ void SvxPersonalizationTabPage::LoadDefaultImages()
 
 INetURLObject aURLObj( gallery + aPreviewFile );
 aFilter.ImportGraphic( aGraphic, aURLObj );
-Bitmap aBmp = aGraphic.GetBitmap();
+BitmapEx aBmp = aGraphic.GetBitmapEx();
 m_vDefaultPersonaImages[nIndex]->Show();
 m_vDefaultPersonaImages[nIndex++]->SetModeImage( Image( aBmp ) );
 }
@@ -531,7 +531,7 @@ IMPL_LINK_NOARG( SvxPersonalizationTabPage, 
SelectInstalledPersona, ListBox&, vo
 Graphic aGraphic;
 INetURLObject aURLObj( aPreviewFile );
 aFilter.ImportGraphic( aGraphic, aURLObj );
-Bitmap aBmp = aGraphic.GetBitmap();
+BitmapEx aBmp = aGraphic.GetBitmapEx();
 m_pExtensionPersonaPreview->SetModeImage( Image( aBmp ) );
 }
 
@@ -781,7 +781,7 @@ void SearchAndParseThread::execute()
 // for VCL to be able to create bitmaps / do visual changes in the 
thread
 SolarMutexGuard aGuard;
 aFilter.ImportGraphic( aGraphic, aURLObj );
-Bitmap aBmp = aGraphic.GetBitmap();
+BitmapEx aBmp = aGraphic.GetBitmapEx();
 
 if( !m_bExecute )
 return;
diff --git a/cui/source/tabpages

[Libreoffice-commits] core.git: 10 commits - comphelper/Library_comphelper.mk comphelper/source extensions/source include/comphelper oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk sc/inc sc/Library_scd.mk s

[Tor Lillqvist]

 comphelper/Library_comphelper.mk |1 
 comphelper/source/misc/automationinvokedzone.cxx |   36 ++
 extensions/source/ole/servprov.cxx   |   16 
 extensions/source/ole/unoobjw.cxx|  381 +--
 include/comphelper/automationinvokedzone.hxx |   39 ++
 oovbaapi/UnoApi_oovbaapi.mk  |1 
 oovbaapi/ooo/vba/excel/XApplication.idl  |2 
 oovbaapi/ooo/vba/excel/XApplicationOutgoing.idl  |   36 ++
 sc/Library_sc.mk |6 
 sc/Library_scd.mk|6 
 sc/Library_scfilt.mk |6 
 sc/Library_scui.mk   |6 
 sc/inc/scmod.hxx |7 
 sc/source/ui/app/scmod.cxx   |   11 
 sc/source/ui/vba/vbaapplication.cxx  |  102 ++
 sc/source/ui/vba/vbaapplication.hxx  |   23 +
 stoc/source/invocation/invocation.cxx|  132 ---
 sw/source/uibase/uno/unotxdoc.cxx|7 
 vbahelper/source/vbahelper/vbahelper.cxx |8 
 19 files changed, 670 insertions(+), 156 deletions(-)

New commits:
commit 469b8334ad858723b83be1c285cde1d991df86c6
Author: Tor Lillqvist 
Date:   Wed Apr 25 16:41:50 2018 +0300

Enter AutomationInvokedZone appropriately

Change-Id: Ic76fc43fc521a6fd6642e22b71c311370788d4aa

diff --git a/extensions/source/ole/unoobjw.cxx 
b/extensions/source/ole/unoobjw.cxx
index 083688683e0b..fb86cee88821 100644
--- a/extensions/source/ole/unoobjw.cxx
+++ b/extensions/source/ole/unoobjw.cxx
@@ -61,6 +61,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -188,6 +189,8 @@ InterfaceOleWrapper::~InterfaceOleWrapper()
 
 STDMETHODIMP InterfaceOleWrapper::QueryInterface(REFIID riid, LPVOID FAR * ppv)
 {
+comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
 SAL_INFO("extensions.olebridge", this << 
"@InterfaceOleWrapper::QueryInterface(" << riid << ")");
 
 HRESULT ret= S_OK;
@@ -264,6 +267,8 @@ STDMETHODIMP InterfaceOleWrapper::getOriginalUnoObject( 
Reference* p
 }
 STDMETHODIMP  InterfaceOleWrapper::getOriginalUnoStruct( Any * pStruct)
 {
+comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
 HRESULT ret= E_FAIL;
 if( !m_xOrigin.is())
 {
@@ -425,6 +430,8 @@ public:
 virtual HRESULT STDMETHODCALLTYPE GetTypeInfoOfGuid(REFGUID guid,
 ITypeInfo **ppTInfo) 
override
 {
+comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
 SAL_INFO("extensions.olebridge", this << 
"@CXTypeLib::GetTypeInfoOfGuid(" << guid << ")");
 if (!ppTInfo)
 return E_POINTER;
@@ -596,6 +603,8 @@ void CXTypeInfo::InitForOutgoing(Reference 
xOrigin,
 
 HRESULT STDMETHODCALLTYPE CXTypeInfo::GetTypeAttr(TYPEATTR **ppTypeAttr)
 {
+comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
 SAL_INFO("extensions.olebridge", this << "@CXTypeInfo::GetTypeAttr");
 
 if (!ppTypeAttr)
@@ -684,6 +693,8 @@ HRESULT STDMETHODCALLTYPE CXTypeInfo::GetTypeComp(ITypeComp 
**ppTComp)
 HRESULT STDMETHODCALLTYPE CXTypeInfo::GetFuncDesc(UINT index,
   FUNCDESC **ppFuncDesc)
 {
+comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
 if (!ppFuncDesc)
 return E_POINTER;
 
@@ -795,6 +806,8 @@ HRESULT STDMETHODCALLTYPE CXTypeInfo::GetNames(MEMBERID 
memid,
UINT cMaxNames,
UINT *pcNames)
 {
+comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
 SAL_INFO("extensions.olebridge", this << "@CXTypeInfo::GetNames(" << memid 
<< ")");
 assert(meKind != Kind::COCLASS);
 
@@ -855,6 +868,8 @@ HRESULT STDMETHODCALLTYPE 
CXTypeInfo::GetRefTypeOfImplType(UINT index,
 HRESULT STDMETHODCALLTYPE CXTypeInfo::GetImplTypeFlags(UINT index,
INT *pImplTypeFlags)
 {
+comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
 SAL_INFO("extensions.olebridge", this << "@CXTypeInfo::GetImplTypeFlags(" 
<< index << ")");
 
 if (!pImplTypeFlags)
@@ -907,7 +922,10 @@ HRESULT STDMETHODCALLTYPE 
CXTypeInfo::GetDocumentation(MEMBERID memid,
DWORD *pdwHelpContext,
BSTR *pBstrHelpFile)
 {
+comphelper::Automation::AutomationInvokedZone aAutomationActive;
+
 SAL_INFO("extensions.olebridge", this << "@CXTypeInfo::GetDocumentation(" 
<< memid << ")");
+
 if (pBstrName)
 {
 if (memid == MEMBERID_NIL)
@@ -952,6 +970,8 @@ HRESULT STDMETHODCALLTYPE CXTypeInfo::GetDllEntry(MEMBERID 
memid,
 HRESULT STDMETHODCALLTYPE CXTypeInfo::GetRefTypeInfo(HREFTYPE hRefType,
  

[Libreoffice-commits] core.git: include/comphelper include/IwyuFilter_include.yaml

[Miklos Vajna]

 include/IwyuFilter_include.yaml|2 ++
 include/comphelper/anytostring.hxx |3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

New commits:
commit fad591f79ef175e62bb1ea8ce861513d518c1518
Author: Miklos Vajna 
Date:   Wed May 30 21:07:34 2018 +0200

comphelper: fix an IWYU warning

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

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
new file mode 100644
index ..2398dc61771f
--- /dev/null
+++ b/include/IwyuFilter_include.yaml
@@ -0,0 +1,2 @@
+---
+assumeFilename: desktop/source/app/app.cxx
diff --git a/include/comphelper/anytostring.hxx 
b/include/comphelper/anytostring.hxx
index 7edab7b16972..e5a0e4ab2eb0 100644
--- a/include/comphelper/anytostring.hxx
+++ b/include/comphelper/anytostring.hxx
@@ -21,9 +21,10 @@
 #define INCLUDED_COMPHELPER_ANYTOSTRING_HXX
 
 #include 
-#include 
 #include 
 
+namespace com { namespace sun { namespace star { namespace uno { class Any; } 
} } }
+
 namespace comphelper
 {
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: 9 commits - extensions/CustomTarget_automationtest.mk extensions/Module_extensions.mk extensions/qa extensions/source oovbaapi/ooo sc/source stoc/Library_invocation.mk

[Tor Lillqvist]

 extensions/CustomTarget_automationtest.mk|   24 
 extensions/Module_extensions.mk  |4 
 extensions/qa/ole/automationtest.vbs |  127 +++
 extensions/source/ole/servprov.cxx   |3 
 extensions/source/ole/unoconversionutilities.hxx |3 
 extensions/source/ole/unoobjw.cxx|2 
 oovbaapi/ooo/vba/excel/XApplicationOutgoing.idl  |1 
 oovbaapi/ooo/vba/excel/XWorkbook.idl |   11 -
 sc/source/ui/docshell/docsh.cxx  |   32 +
 sc/source/ui/inc/docsh.hxx   |6 -
 sc/source/ui/vba/vbaworkbook.cxx |   21 +++
 sc/source/ui/vba/vbaworkbook.hxx |2 
 stoc/Library_invocation.mk   |1 
 stoc/source/invocation/invocation.cxx|   43 ++-
 vbahelper/source/vbahelper/vbahelper.cxx |9 +
 15 files changed, 246 insertions(+), 43 deletions(-)

New commits:
commit 7d275e3ab35b3f9bfd7ff16290393ca027c50355
Author: Tor Lillqvist 
Date:   Wed May 2 14:57:48 2018 +0300

Implement NewWorkbook and WorkbookOpen Automation callbacks in Calc

Change-Id: I1ff31d692100695a706bf128c18c4e3ae8b55ce3

diff --git a/oovbaapi/ooo/vba/excel/XApplicationOutgoing.idl 
b/oovbaapi/ooo/vba/excel/XApplicationOutgoing.idl
index 9e601c5331d6..6ca5b4581d75 100644
--- a/oovbaapi/ooo/vba/excel/XApplicationOutgoing.idl
+++ b/oovbaapi/ooo/vba/excel/XApplicationOutgoing.idl
@@ -25,6 +25,7 @@ module ooo {  module vba {  module excel {
 
 interface XApplicationOutgoing : XInterfaceWithIID
 {
+void NewWorkbook([in] any Wb);
 void WorkbookOpen([in] any Wb);
 void WorkbookBeforeClose([in] any Wb, [out] any Cancel);
 };
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index d2ae9a945c18..362ddbd0a6e7 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -1080,6 +1080,33 @@ void ScDocShell::Notify( SfxBroadcaster&, const SfxHint& 
rHint )
 pClipDoc->ClosingClipboardSource();
 }
 }
+
+if ( const SfxEventHint* pSfxEventHint = dynamic_cast(&rHint) )
+{
+switch( pSfxEventHint->GetEventId() )
+{
+   case SfxEventHintId::CreateDoc:
+{
+uno::Any aWorkbook;
+aWorkbook <<= mxAutomationWorkbookObject;
+uno::Sequence< uno::Any > aArgs(1);
+aArgs[0] = aWorkbook;
+SC_MOD()->CallAutomationApplicationEventSinks( 
"NewWorkbook", aArgs );
+}
+break;
+case SfxEventHintId::OpenDoc:
+{
+uno::Any aWorkbook;
+aWorkbook <<= mxAutomationWorkbookObject;
+uno::Sequence< uno::Any > aArgs(1);
+aArgs[0] = aWorkbook;
+SC_MOD()->CallAutomationApplicationEventSinks( 
"WorkbookOpen", aArgs );
+}
+break;
+default:
+break;
+}
+}
 }
 
 // Load contents for organizer
@@ -3340,6 +3367,11 @@ void ScDocShell::SetIsInUcalc()
 mbUcalcTest = true;
 }
 
+void ScDocShell::RegisterAutomationWorkbookObject(css::uno::Reference< 
ooo::vba::excel::XWorkbook > const& xWorkbook)
+{
+mxAutomationWorkbookObject = xWorkbook;
+}
+
 extern "C" SAL_DLLPUBLIC_EXPORT bool TestImportSLK(SvStream &rStream)
 {
 ScDLL::Init();
diff --git a/sc/source/ui/inc/docsh.hxx b/sc/source/ui/inc/docsh.hxx
index 29fe6de0873d..55cbdb91e652 100644
--- a/sc/source/ui/inc/docsh.hxx
+++ b/sc/source/ui/inc/docsh.hxx
@@ -20,8 +20,8 @@
 #ifndef INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX
 #define INCLUDED_SC_SOURCE_UI_INC_DOCSH_HXX
 
+#include 
 #include 
-
 #include 
 #include 
 #include 
@@ -114,6 +114,8 @@ class SC_DLLPUBLIC ScDocShell final: public SfxObjectShell, 
public SfxListener
 
 ScDocShellModificator* pModificator; // #109979#; is used to load XML 
(created in BeforeXMLLoading and destroyed in AfterXMLLoading)
 
+css::uno::Reference< ooo::vba::excel::XWorkbook> 
mxAutomationWorkbookObject;
+
 // Only used by Vba helper functions
 css::uno::Reference   m_xVBAListener;
 css::uno::Reference  m_xClipData;
@@ -427,6 +429,8 @@ public:
 void SnapVisArea( tools::Rectangle& rRect ) const;
 
 void SetIsInUcalc();
+
+void RegisterAutomationWorkbookObject(css::uno::Reference< 
ooo::vba::excel::XWorkbook > const& xWorkbook);
 };
 
 void UpdateAcceptChangesDialog();
diff --git a/sc/source/ui/vba/vbaworkbook.cxx b/sc/source/ui/vba/vbaworkbook.cxx
index 96ee2bf64a99..93f773838195 100644
--- a/sc/source/ui/vba/vbaworkbook.cxx
+++ b/sc/source/ui/vba/vbaworkbook.cxx
@@ -201,6 +201,9 @@ ScVbaWorkbook::init()
 {
 if ( !ColorData.getLength() )
 ResetColors();
+uno::Reference< frame::XModel > xModel( getModel(), uno::UNO_QUERY );
+if ( xModel.is() )
+excel::getDocShell( xModel 

[Libreoffice-commits] core.git: basctl/source chart2/source cui/source include/svx reportdesign/source sc/source sd/source svx/source sw/source

[Armin Le Grand]

 basctl/source/dlged/dlgedmod.cxx  |2 
 chart2/source/controller/drawinglayer/ViewElementListProvider.cxx |5 
 chart2/source/controller/main/ChartController_Tools.cxx   |5 
 chart2/source/controller/main/DrawCommandDispatch.cxx |3 
 chart2/source/view/main/DrawModelWrapper.cxx  |8 -
 cui/source/tabpages/tpline.cxx|6 -
 include/svx/fmmodel.hxx   |9 -
 include/svx/svdmodel.hxx  |   20 ++-
 reportdesign/source/core/sdr/RptModel.cxx |6 -
 sc/source/core/data/drwlayer.cxx  |9 -
 sc/source/ui/drawfunc/fuconcustomshape.cxx|3 
 sc/source/ui/view/notemark.cxx|5 
 sc/source/ui/view/viewfun5.cxx|   10 -
 sd/source/core/drawdoc.cxx|4 
 sd/source/ui/func/fuconcs.cxx |3 
 svx/source/dialog/graphctl.cxx|2 
 svx/source/engine3d/float3d.cxx   |4 
 svx/source/form/fmmodel.cxx   |   31 +
 svx/source/svdraw/svdmodel.cxx|   53 
++
 svx/source/toolbars/fontworkbar.cxx   |3 
 svx/source/unogallery/unogalitem.cxx  |2 
 sw/source/core/draw/drawdoc.cxx   |   15 --
 sw/source/core/frmedt/fecopy.cxx  |9 -
 sw/source/uibase/ribbar/concustomshape.cxx|3 
 24 files changed, 94 insertions(+), 126 deletions(-)

New commits:
commit 4be44a7a6f2f480e55255d7cdd119f3d6577d085
Author: Armin Le Grand 
Date:   Thu May 24 19:09:44 2018 +0200

SOSAW080: Cleanup of SdrModel

First step: Find all constructors/derivations, mark
all of them.

Removed two-value-constructors, adapted code as needed

Reduced constructors for SdrModel/FmFormModel
to a single one.

Removed PathName for List creation, this is not
needed and anyways all calls used the default
SvtPathOptions().GetPalettePath(). This is also
true for usage of IsFuzzing() that is also part
of the default creation process (without path).
All usages that need an extra-List were setting
it after construction explicitely.

Removed UseExtColorTable. This prevents a single
List to be not created by default, the ColorTable
which is replaced later by all callers that used
this. This is not needed since the default
ColorTable gets constructed just by default, no
expensive stuff is triggered (e.g. loading the
ColorTable). Thus now a default ColorTable is
created and kept for a short moment, destructed
again when a ColorTable is explicitely set.
Doing so is also more safe - it avoids not
creating a default-ColorTable and then not setting
one (what would be urgently required).

f23c24a8548d5246b77b1cc359ba89564538e81a
f124468c3898c5842d37123bdeb87d79a2b19c62

Change-Id: I865de4bb23f673c6684d83c2c6390439506dc5b6
Reviewed-on: https://gerrit.libreoffice.org/55028
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/basctl/source/dlged/dlgedmod.cxx b/basctl/source/dlged/dlgedmod.cxx
index 8d3580fff092..1e8d58192ef2 100644
--- a/basctl/source/dlged/dlgedmod.cxx
+++ b/basctl/source/dlged/dlgedmod.cxx
@@ -24,7 +24,7 @@ namespace basctl
 {
 
 DlgEdModel::DlgEdModel()
-:SdrModel()
+:   SdrModel()
 {
 }
 
diff --git a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx 
b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
index 8ddfd08f3578..b7bba4a1bfb9 100644
--- a/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
+++ b/chart2/source/controller/drawinglayer/ViewElementListProvider.cxx
@@ -156,7 +156,10 @@ Graphic ViewElementListProvider::GetSymbolGraphic( 
sal_Int32 nStandardSymbol, co
 
 ScopedVclPtrInstance< VirtualDevice > pVDev;
 pVDev->SetMapMode(MapMode(MapUnit::Map100thMM));
-std::unique_ptr pModel( new SdrModel );
+
+std::unique_ptr pModel(
+new SdrModel());
+
 pModel->GetItemPool().FreezeIdRanges();
 SdrPage* pPage = new SdrPage( *pModel, false );
 pPage->SetSize(Size(1000,1000));
diff --git a/chart2/source/controller/main/ChartController_Tools.cxx 
b/chart2/source/controller/main/ChartController_Tools.cxx
index 59444c95d5fb..312d701c2add 100644
--- a/chart2/source/controller/main/ChartController_Tools.cxx
+++ b/chart2/source/controller/main/ChartController_Tools.cxx
@@ -271,7 +271,10 @@ void ChartController::executeDispatch_Paste()
 {
 xStm->Seek( 0 );
   

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

[Mark Hung]

 sw/qa/extras/layout/data/table-extrusion1.odt |binary
 sw/qa/extras/layout/data/table-extrusion2.odt |binary
 sw/qa/extras/layout/layout.cxx|   43 ++
 sw/source/core/layout/paintfrm.cxx|   28 ++--
 4 files changed, 53 insertions(+), 18 deletions(-)

New commits:
commit 1e21902106cbe57658bed03ed24d4d0863685cfd
Author: Mark Hung 
Date:   Sat May 26 22:34:49 2018 +0800

tdf#117884: intersect border with paint area of upper frame.

This patch fix regression caused by e87cc12eaf53 and allow
table borders rendered in the left or right page margin.

Also add another test case (testTableExtrusion2) to assure
inner table can't have wider border than outer table.

Change-Id: I7a86b379dee08fb2f23385183a42d0ebde007370
Reviewed-on: https://gerrit.libreoffice.org/54862
Tested-by: Jenkins 
Reviewed-by: Mark Hung 

diff --git a/sw/qa/extras/layout/data/table-extrusion1.odt 
b/sw/qa/extras/layout/data/table-extrusion1.odt
new file mode 100755
index ..10600fa54c86
Binary files /dev/null and b/sw/qa/extras/layout/data/table-extrusion1.odt 
differ
diff --git a/sw/qa/extras/layout/data/table-extrusion2.odt 
b/sw/qa/extras/layout/data/table-extrusion2.odt
new file mode 100755
index ..63fc74f46db8
Binary files /dev/null and b/sw/qa/extras/layout/data/table-extrusion2.odt 
differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
old mode 100644
new mode 100755
index a7eb24e89208..2356832cc4ba
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -20,6 +20,8 @@ public:
 void testTdf116925();
 void testTdf117028();
 void testTdf106390();
+void testTableExtrusion1();
+void testTableExtrusion2();
 void testTdf116848();
 void testTdf117245();
 
@@ -28,6 +30,8 @@ public:
 CPPUNIT_TEST(testTdf116925);
 CPPUNIT_TEST(testTdf117028);
 CPPUNIT_TEST(testTdf106390);
+CPPUNIT_TEST(testTableExtrusion1);
+CPPUNIT_TEST(testTableExtrusion2);
 CPPUNIT_TEST(testTdf116848);
 CPPUNIT_TEST(testTdf117245);
 CPPUNIT_TEST_SUITE_END();
@@ -132,6 +136,45 @@ void SwLayoutWriter::testTdf106390()
 assertXPath(pXmlDoc, sXPath, 0);
 }
 
+void SwLayoutWriter::testTableExtrusion1()
+{
+SwDoc* pDoc = createDoc("table-extrusion1.odt");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumper.dumpAndParse(*xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+sal_Int32 nRight = getXPath(pXmlDoc, "//sectrectclipregion", 
"right").toInt32();
+sal_Int32 nLeft = (nRight + getXPath(pXmlDoc, "(//rect)[1]", 
"right").toInt32()) / 2;
+
+// Expect table borders in right page margin.
+const OString sXPath = "//polyline/point[@x>" + OString::number(nLeft) + " 
and @x<"
+   + OString::number(nRight) + "]";
+
+assertXPath(pXmlDoc, sXPath, 4);
+}
+
+void SwLayoutWriter::testTableExtrusion2()
+{
+SwDoc* pDoc = createDoc("table-extrusion2.odt");
+SwDocShell* pShell = pDoc->GetDocShell();
+
+// Dump the rendering of the first page as an XML file.
+std::shared_ptr xMetaFile = pShell->GetPreviewMetaFile();
+MetafileXmlDump dumper;
+xmlDocPtr pXmlDoc = dumper.dumpAndParse(*xMetaFile);
+CPPUNIT_ASSERT(pXmlDoc);
+// End point position of the outer table.
+sal_Int32 nX = getXPath(pXmlDoc, "(//polyline[1]/point)[2]", 
"x").toInt32();
+
+// Do not allow inner table extrude outer table.
+const OString sXPath = "//polyline/point[@x>" + OString::number(nX) + "]";
+
+assertXPath(pXmlDoc, sXPath, 0);
+}
+
 void SwLayoutWriter::testTdf116848()
 {
 SwDoc* pDoc = createDoc("tdf116848.odt");
diff --git a/sw/source/core/layout/paintfrm.cxx 
b/sw/source/core/layout/paintfrm.cxx
index cd76c222b040..b684c5ac1b2c 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -2308,8 +2308,8 @@ class SwTabFramePainter
 const SwTabFrame& mrTabFrame;
 
 void Insert( SwLineEntry&, bool bHori );
-void Insert( const SwFrame& rFrame, const SvxBoxItem& rBoxItem );
-void HandleFrame( const SwLayoutFrame& rFrame );
+void Insert(const SwFrame& rFrame, const SvxBoxItem& rBoxItem, const 
SwRect &rPaintArea);
+void HandleFrame(const SwLayoutFrame& rFrame, const SwRect& rPaintArea);
 void FindStylesForLine( const Point&,
 const Point&,
 svx::frame::Style*,
@@ -2324,10 +2324,11 @@ public:
 SwTabFramePainter::SwTabFramePainter( const SwTabFrame& rTabFrame )
 : mrTabFrame( rTabFrame )
 {
-HandleFrame( rTabFrame );
+SwRect aPaintArea = rTabFrame.GetUpper()->GetPaintArea();
+HandleFrame(rTabFrame, aPaintArea);
 }
 
-void SwTabFramePainter::HandleFrame( const SwLayoutFrame& rLayoutFrame )
+vo

[Libreoffice-commits] core.git: extensions/Module_extensions.mk

[Tor Lillqvist]

 extensions/Module_extensions.mk |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d79fe79a53899c5b3273a40b77cdc4ee151f07f0
Author: Tor Lillqvist 
Date:   Thu May 31 17:08:47 2018 +0300

Comment out CustomTarget_automationtest for now, it can't work properly

Can't assume that the necessary entries are in the Registry. Need to
fix it to start soffice explcitly before running the VBScript.

Change-Id: I809be88a2fe2afbda1f087501785ec7a9e2a358b

diff --git a/extensions/Module_extensions.mk b/extensions/Module_extensions.mk
index 0e8dadafea47..d4f16af946f6 100644
--- a/extensions/Module_extensions.mk
+++ b/extensions/Module_extensions.mk
@@ -74,9 +74,9 @@ $(eval $(call gb_Module_add_targets,extensions,\
Library_oleautobridge \
 ))
 
-$(eval $(call gb_Module_add_subsequentcheck_targets,extensions,\
-   CustomTarget_automationtest \
-))
+# $(eval $(call gb_Module_add_subsequentcheck_targets,extensions,\
+#  CustomTarget_automationtest \
+# ))
 
 endif # WNT
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 extensions/source/ole/unoconversionutilities.hxx |3 +
 stoc/Library_invocation.mk   |1 
 stoc/source/invocation/invocation.cxx|   39 +++
 3 files changed, 29 insertions(+), 14 deletions(-)

New commits:
commit 2b7690d5a1a2c3064b47bd2648ba2452bf4726af
Author: Tor Lillqvist 
Date:   Thu May 31 17:49:11 2018 +0300

Revert "Simplify: Use AutomationInvokedZone::isActive()"

Can't have the URE library 'stoc' depend on the non-URE library
'comphelper'.

This reverts commit 3c041720304ec77202741b5d5c8df9b93bc70a70.

diff --git a/extensions/source/ole/unoconversionutilities.hxx 
b/extensions/source/ole/unoconversionutilities.hxx
index cbec71299953..f0ef703bd845 100644
--- a/extensions/source/ole/unoconversionutilities.hxx
+++ b/extensions/source/ole/unoconversionutilities.hxx
@@ -1395,8 +1395,9 @@ void 
UnoConversionUtilities::createUnoObjectWrapper(const Any & rObj, VARIANT
 Reference xInvFactory= getInvocationFactory(rObj);
 if (xInvFactory.is())
 {
-Sequence params(1);
+Sequence params(2);
 params.getArray()[0] = rObj;
+params.getArray()[1] = makeAny(OUString("FromOLE"));
 Reference xInt2 = 
xInvFactory->createInstanceWithArguments(params);
 xInv.set(xInt2, UNO_QUERY);
 }
diff --git a/stoc/Library_invocation.mk b/stoc/Library_invocation.mk
index dc22a2acb51b..42f17556433c 100644
--- a/stoc/Library_invocation.mk
+++ b/stoc/Library_invocation.mk
@@ -16,7 +16,6 @@ $(eval $(call gb_Library_use_udk_api,invocation))
 $(eval $(call gb_Library_use_libraries,invocation,\
 cppu \
 cppuhelper \
-comphelper \
 sal \
 ))
 
diff --git a/stoc/source/invocation/invocation.cxx 
b/stoc/source/invocation/invocation.cxx
index 3001993db4e9..68caa503d044 100644
--- a/stoc/source/invocation/invocation.cxx
+++ b/stoc/source/invocation/invocation.cxx
@@ -18,7 +18,6 @@
  */
 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -100,7 +99,8 @@ class Invocation_Impl
 public:
 Invocation_Impl( const Any & rAdapted, const Reference &,
const Reference &,
-   const Reference & );
+   const Reference &,
+   bool bFromOLE );
 
 // XInterface
 virtual Any SAL_CALL queryInterface( const Type & aType) override;
@@ -214,6 +214,8 @@ private:
 
 
 Reference   _xENDirect, _xENIntrospection;
+
+boolmbFromOLE;
 };
 
 
@@ -222,11 +224,13 @@ Invocation_Impl::Invocation_Impl
 const Any & rAdapted,
 const Reference & rTC,
 const Reference & rI,
-const Reference & rCR
+const Reference & rCR,
+bool bFromOLE
 )
 : xTypeConverter( rTC )
 , xIntrospection( rI )
 , xCoreReflection( rCR )
+, mbFromOLE( bFromOLE )
 {
 setMaterial( rAdapted );
 }
@@ -250,7 +254,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & 
aType )
 {
 // Invocation does not support XExactName, if direct object supports
 // XInvocation, but not XExactName. Except when called from OLE 
Automation.
-if (comphelper::Automation::AutomationInvokedZone::isActive() ||
+if (mbFromOLE ||
 (_xDirect.is() && _xENDirect.is()) ||
 (!_xDirect.is() && _xENIntrospection.is()))
 {
@@ -304,7 +308,7 @@ Any SAL_CALL Invocation_Impl::queryInterface( const Type & 
aType )
 {
 // Invocation does not support XInvocation2, if direct object supports
 // XInvocation, but not XInvocation2.
-if ( comphelper::Automation::AutomationInvokedZone::isActive() ||
+if ( mbFromOLE ||
  ( _xDirect.is() && _xDirect2.is()) ||
  (!_xDirect.is() && _xIntrospectionAccess.is() ) )
 {
@@ -348,7 +352,7 @@ void Invocation_Impl::setMaterial( const Any& rMaterial )
 // First do this outside the guard
 _xDirect.set( rMaterial, UNO_QUERY );
 
-if( !comphelper::Automation::AutomationInvokedZone::isActive() && 
_xDirect.is() )
+if( !mbFromOLE && _xDirect.is() )
 {
 // Consult object directly
 _xElementAccess.set( _xDirect, UNO_QUERY );
@@ -444,7 +448,7 @@ Reference 
Invocation_Impl::getIntrospection()
 
 sal_Bool Invocation_Impl::hasMethod( const OUString& Name )
 {
-if (!comphelper::Automation::AutomationInvokedZone::isActive() && 
_xDirect.is())
+if (!mbFromOLE && _xDirect.is())
 return _xDirect->hasMethod( Name );
 if( _xIntrospectionAccess.is() )
 return _xIntrospectionAccess->hasMethod( Name, MethodConcept::ALL ^ 
MethodConcept::DANGEROUS );
@@ -457,7 +461,7 @@ sal_Bool Invocation_Impl::hasProperty( const OUString& Name 
)
 if (_xDirect.is())
 {
 bool bRet = _xDirect->hasProperty( Name );
-if (bRet || !comphelper::Automation::AutomationInvokedZone::isActive())
+   

Re: [global-libreoffice-ci] Daily Screenshot Build on Windows - Build # 410 - Failure!

[Stephan Bergmann]

CppunitTest_sc_screenshots (executed as part of `make screenshot`) 
reliably fails on Windows (but is known to work on other platforms) 
since the below build, so one of the commits listed is likely the 
culprit.  The failure is always



C:/cygwin/home/tdf/lode/jenkins/workspace/lo_tb_master_win_screenshot/sc/qa/unit/screenshots/screenshots.cxx(312)
 : error : Assertion
Test name: ScScreenshotTest::testMultiViewCopyPaste
assertion failed
- Expression: SfxItemState::DISABLED != 
pView1->GetViewFrame()->GetBindings().QueryState(SID_PASTE, xItem1)



On 24/05/18 04:25, c...@libreoffice.org wrote:

Daily Screenshot Build on Windows - Build # 410 - Failure:

Changes for Build #410
[j.carl43] Fix typos

[Julien Nabet] Fix typo

[Miklos Vajna] tdf#117505 RTF export: fix incorrect header distance for 
first/follow

[Miklos Vajna] find-unneeded-includes: Make the output user friendlier

[Caolán McNamara] ofz#8473 Null-dereference READ

[michael.meeks] extend mutex protection to the whole of ScEditUtil::GetString()

[Mike Kaganski] tdf#115386: Show Mail Merge toolbar for documents with MM fields

[Rene Engelhard] rename config_extension_update.h.in to config_extensions.h.in

[Noel Grandin] Revert "vcl: StartPresentationMode should be using a 
sal_uInt32.."

[Michael Stahl] remove Linux ("UNX") systray "Quickstarter"

[erack] tdf#117228: crash in SfxItemSet::GetItemState...

[quikee] sd: convert XGraphic to XBitmap for the "GraphicBitmap" property

[quikee] sd: extend bitmap bullet tests

[Christian Lohmaier] tdf#117729 add Frisian (fy) UI langauge

[quikee] tdf#117247 just send a GRAPHIC_ARRIVED hint after update

[tml] Add debug output operator<< for SalFrameGeometry

[Christian Lohmaier] toolbar:id is not valid attribute of toolbar:toolbar

[kainz.a] tdf#117481 Add dbaccess icons for base sidebar

[quikee] colibre_svg: add links.txt from colibre

[Michael Stahl] sw: fix max->min in SwTextNode::GetScalingOfSelectedText()

[Michael Stahl] sw: prefix members of SwScriptInfo

[Miklos Vajna] tdf#104086 cui: enable OpenGL when ignoring its blacklist

[Julien Nabet] Fix typo

[Rene Engelhard] actually add AC_MSG_CHECKING/_RESULTs for

[Caolán McNamara] forward more a11y stuff for native drawing area widget

[Rene Engelhard] deb#899380 apparmor: fix gpg encryption hang trying to lock 
random_seed

[Stephan Bergmann] Remove leftover "#undef DEBUG"

[kainz.a] tdf#117481 Elementary: Add dbaccess icons for base sidebar

[Armin.Le.Grand] tdf#117629 Fix FontWork UNO API/SdrPage settings

[kainz.a] tdf#117481 Breeze Add dbaccess icons for base sidebar




Check console output at 
https://ci.libreoffice.org/job/lo_tb_master_win_screenshot/410/ to view the 
results.



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

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

[Caolán McNamara]

 include/vcl/outdev.hxx  |2 ++
 svtools/source/control/valueset.cxx |4 
 vcl/source/app/salvtables.cxx   |2 +-
 vcl/source/window/window2.cxx   |7 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 9447068e261c4d0e7852a2c0147a17407561c302
Author: Caolán McNamara 
Date:   Wed May 30 21:28:41 2018 +0100

focus rect for value set

Change-Id: I208cf42db4256bb7286222781cf2bf29f843c673
Reviewed-on: https://gerrit.libreoffice.org/55101
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index bd4af96456aa..174987e51757 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -308,6 +308,8 @@ namespace vcl {
 typedef OutputDevice RenderContext;
 }
 
+VCL_DLLPUBLIC void DrawFocusRect(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect, int nBorder = 1);
+
 /**
 * Some things multiple-inherit from VclAbstractDialog and OutputDevice,
 * so we need to use virtual inheritance to keep the referencing counting
diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 3c8e5cbcc753..dc5e52896641 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -3244,6 +3244,8 @@ void SvtValueSet::ImplDrawSelect(vcl::RenderContext& 
rRenderContext, sal_uInt16
 WinBits nStyle = GetStyle();
 if (nStyle & WB_MENUSTYLEVALUESET)
 {
+if (bFocus)
+DrawFocusRect(rRenderContext, aRect);
 if (bDrawSel)
 {
 rRenderContext.SetLineColor(mbBlackSel ? COL_BLACK : aDoubleColor);
@@ -3296,6 +3298,8 @@ void SvtValueSet::ImplDrawSelect(vcl::RenderContext& 
rRenderContext, sal_uInt16
 rRenderContext.SetLineColor(COL_LIGHTGRAY);
 }
 rRenderContext.DrawRect(aRect2);
+if (bFocus)
+DrawFocusRect(rRenderContext, aRect2);
 }
 
 ImplDrawItemText(rRenderContext, pItem->maText);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 260e6c056c4c..065818715ff4 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1853,7 +1853,7 @@ IMPL_LINK(SalInstanceDrawingArea, PaintHdl, 
target_and_area, aPayload, void)
 m_aDrawHdl.Call(aPayload);
 tools::Rectangle aFocusRect(m_aGetFocusRectHdl.Call(*this));
 if (!aFocusRect.IsEmpty())
-aPayload.first.Invert(aFocusRect, InvertFlags(0x));
+DrawFocusRect(aPayload.first, aFocusRect);
 }
 
 IMPL_LINK(SalInstanceDrawingArea, ResizeHdl, const Size&, rSize, void)
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 8b7e07dbc19e..bdef8b58c215 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -2006,5 +2006,12 @@ const std::vector >& 
Window::list_mnemonic_labels() const
 
 } /* namespace vcl */
 
+void DrawFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle& 
rRect, int nBorder)
+{
+rRenderContext.Invert(tools::Rectangle(Point(rRect.Left(), rRect.Top()), 
Size(rRect.GetWidth(), nBorder)), InvertFlags::N50);
+rRenderContext.Invert(tools::Rectangle(Point(rRect.Left(), 
rRect.Bottom()-nBorder+1), Size(rRect.GetWidth(), nBorder)), InvertFlags::N50);
+rRenderContext.Invert(tools::Rectangle(Point(rRect.Left(), 
rRect.Top()+nBorder), Size(nBorder, rRect.GetHeight()-(nBorder*2))), 
InvertFlags::N50);
+rRenderContext.Invert(tools::Rectangle(Point(rRect.Right()-nBorder+1, 
rRect.Top()+nBorder), Size(nBorder, rRect.GetHeight()-(nBorder*2))), 
InvertFlags::N50);
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/outdev.hxx  |2 ++
 svtools/source/control/valueset.cxx |4 
 vcl/source/app/salvtables.cxx   |2 +-
 vcl/source/window/window2.cxx   |7 +++
 4 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 91d8af2c5cf4e8ec0f1ce0e532e0c896de77750b
Author: Caolán McNamara 
Date:   Wed May 30 21:28:41 2018 +0100

focus rect for value set

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

diff --git a/include/vcl/outdev.hxx b/include/vcl/outdev.hxx
index bd4af96456aa..174987e51757 100644
--- a/include/vcl/outdev.hxx
+++ b/include/vcl/outdev.hxx
@@ -308,6 +308,8 @@ namespace vcl {
 typedef OutputDevice RenderContext;
 }
 
+VCL_DLLPUBLIC void DrawFocusRect(vcl::RenderContext& rRenderContext, const 
tools::Rectangle& rRect, int nBorder = 1);
+
 /**
 * Some things multiple-inherit from VclAbstractDialog and OutputDevice,
 * so we need to use virtual inheritance to keep the referencing counting
diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index 3c8e5cbcc753..dc5e52896641 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -3244,6 +3244,8 @@ void SvtValueSet::ImplDrawSelect(vcl::RenderContext& 
rRenderContext, sal_uInt16
 WinBits nStyle = GetStyle();
 if (nStyle & WB_MENUSTYLEVALUESET)
 {
+if (bFocus)
+DrawFocusRect(rRenderContext, aRect);
 if (bDrawSel)
 {
 rRenderContext.SetLineColor(mbBlackSel ? COL_BLACK : aDoubleColor);
@@ -3296,6 +3298,8 @@ void SvtValueSet::ImplDrawSelect(vcl::RenderContext& 
rRenderContext, sal_uInt16
 rRenderContext.SetLineColor(COL_LIGHTGRAY);
 }
 rRenderContext.DrawRect(aRect2);
+if (bFocus)
+DrawFocusRect(rRenderContext, aRect2);
 }
 
 ImplDrawItemText(rRenderContext, pItem->maText);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 260e6c056c4c..065818715ff4 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1853,7 +1853,7 @@ IMPL_LINK(SalInstanceDrawingArea, PaintHdl, 
target_and_area, aPayload, void)
 m_aDrawHdl.Call(aPayload);
 tools::Rectangle aFocusRect(m_aGetFocusRectHdl.Call(*this));
 if (!aFocusRect.IsEmpty())
-aPayload.first.Invert(aFocusRect, InvertFlags(0x));
+DrawFocusRect(aPayload.first, aFocusRect);
 }
 
 IMPL_LINK(SalInstanceDrawingArea, ResizeHdl, const Size&, rSize, void)
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 8b7e07dbc19e..bdef8b58c215 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -2006,5 +2006,12 @@ const std::vector >& 
Window::list_mnemonic_labels() const
 
 } /* namespace vcl */
 
+void DrawFocusRect(vcl::RenderContext& rRenderContext, const tools::Rectangle& 
rRect, int nBorder)
+{
+rRenderContext.Invert(tools::Rectangle(Point(rRect.Left(), rRect.Top()), 
Size(rRect.GetWidth(), nBorder)), InvertFlags::N50);
+rRenderContext.Invert(tools::Rectangle(Point(rRect.Left(), 
rRect.Bottom()-nBorder+1), Size(rRect.GetWidth(), nBorder)), InvertFlags::N50);
+rRenderContext.Invert(tools::Rectangle(Point(rRect.Left(), 
rRect.Top()+nBorder), Size(nBorder, rRect.GetHeight()-(nBorder*2))), 
InvertFlags::N50);
+rRenderContext.Invert(tools::Rectangle(Point(rRect.Right()-nBorder+1, 
rRect.Top()+nBorder), Size(nBorder, rRect.GetHeight()-(nBorder*2))), 
InvertFlags::N50);
+}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 0 files changed

New commits:
commit a28fa7a41a9e9e7b02d359587171abd761a91ae8
Author: Tor Lillqvist 
Date:   Thu May 31 19:17:42 2018 +0300

chmod -x

Change-Id: Ied9d506281bba7e8e5c63151c2294eec6b8b52e1

diff --git a/sw/qa/extras/layout/data/table-extrusion1.odt 
b/sw/qa/extras/layout/data/table-extrusion1.odt
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/layout/data/table-extrusion2.odt 
b/sw/qa/extras/layout/data/table-extrusion2.odt
old mode 100755
new mode 100644
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
old mode 100755
new mode 100644
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Tor Lillqvist]

 extensions/source/ole/servprov.cxx |3 +++
 1 file changed, 3 insertions(+)

New commits:
commit 9d2e7c3c07b471a89e7fc375eb9094510a3cacd7
Author: Tor Lillqvist 
Date:   Thu May 31 19:04:25 2018 +0300

Log the call to CoRegisterClassObject()

Change-Id: Idfca38ec2c931572b6978440862c7bfca8d536e6

diff --git a/extensions/source/ole/servprov.cxx 
b/extensions/source/ole/servprov.cxx
index de929c621778..f0ebc858f841 100644
--- a/extensions/source/ole/servprov.cxx
+++ b/extensions/source/ole/servprov.cxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -92,6 +93,8 @@ bool OneInstanceOleWrapper::registerClass(GUID const * pGuid)
 REGCLS_MULTIPLEUSE,
 &m_factoryHandle);
 
+SAL_INFO("extensions.olebridge", "CoRegisterClassObject(" << *pGuid << "): 
" << WindowsErrorStringFromHRESULT(hresult));
+
 return (hresult == NOERROR);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: extensions/CustomTarget_automationtest.mk extensions/qa

[Tor Lillqvist]

 extensions/CustomTarget_automationtest.mk |9 ++---
 extensions/qa/ole/automationtest.vbs  |5 +
 2 files changed, 11 insertions(+), 3 deletions(-)

New commits:
commit ff7e2868d61f2958ec86fbd53bb3e2957ca3da39
Author: Tor Lillqvist 
Date:   Thu May 31 19:06:04 2018 +0300

Run soffice frpm instdir (but CustomTarget_automationtest still can't work)

WScript.CreateObject() takes the symbolic name of the object class
that it then looks up from the Registry to find the CLSID of the
class. I don't really know how we could make this unit test work at
build time. Keep it still commented out in the module makefile.

Change-Id: I73418754db9ccc3f5d384754d4d3be74ae1f9dca

diff --git a/extensions/CustomTarget_automationtest.mk 
b/extensions/CustomTarget_automationtest.mk
index b1984d98d153..1c115b09a8b5 100644
--- a/extensions/CustomTarget_automationtest.mk
+++ b/extensions/CustomTarget_automationtest.mk
@@ -11,14 +11,17 @@ $(eval $(call 
gb_CustomTarget_CustomTarget,extensions/automationtest))
 
 extensions_AUTOMATIONTESTDIR := $(call 
gb_CustomTarget_get_workdir,extensions/automationtest)
 
-extensions_AUTOMATIONTESTLOG := 
$(extensions_AUTOMATIONTESTDIR)/automationtest.log
+extensions_AUTOMATIONTESTLOG1 := 
$(extensions_AUTOMATIONTESTDIR)/automationtest.1.log
+extensions_AUTOMATIONTESTLOG2 := 
$(extensions_AUTOMATIONTESTDIR)/automationtest.2.log
 
 $(call gb_CustomTarget_get_target,extensions/automationtest) : \
$(SRCDIR)/extensions/qa/ole/automationtest.vbs \
| $(extensions_AUTOMATIONTESTDIR)/.dir
$(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),VBS,1) \
+   SAL_LOG=+INFO.extensions.olebridge+WARN $(INSTDIR)/program/soffice 
2>$(extensions_AUTOMATIONTESTLOG1) &
+   sleep 10
$(call gb_Helper_abbreviate_dirs, \
-   cscript -nologo $(SRCDIR)/extensions/qa/ole/automationtest.vbs 
$(SRCDIR)) >$(extensions_AUTOMATIONTESTLOG) || \
-(cat $(extensions_AUTOMATIONTESTLOG) && exit 1)
+   cscript -nologo $(SRCDIR)/extensions/qa/ole/automationtest.vbs 
$(SRCDIR)) >$(extensions_AUTOMATIONTESTLOG2) || \
+(cat $(extensions_AUTOMATIONTESTLOG1) 
$(extensions_AUTOMATIONTESTLOG2) && exit 1)
 
 # vim:set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/extensions/qa/ole/automationtest.vbs 
b/extensions/qa/ole/automationtest.vbs
index efd4b8a60eda..9b5dff05e957 100644
--- a/extensions/qa/ole/automationtest.vbs
+++ b/extensions/qa/ole/automationtest.vbs
@@ -81,6 +81,11 @@ WScript.Echo "Running Automation client tests"
 
 On Error Resume Next
 
+' FIXME: How can we ever make this work specifically with the
+' LibreOffice in instdir, when WScript.CreateObject() wants the
+' symbolic name that it then looks up from the Registry to find the
+' CLSID of the class?
+
 CheckErrorFatal "Set writer = WScript.CreateObject(""Writer.Application"")"
 CheckErrorFatal "writer.Visible = True"
 CheckErrorFatal "writer.Caption = ""=== This is Writer ==="""
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: libreoffice 6.1.0.0.beta1 failing hsqldb test

[Tomáš Chvátal]

čt 31. 5. 2018 v 9:47 odesílatel Miklos Vajna 
napsal:

> Hi Tom,
>
> On Wed, May 30, 2018 at 04:33:41PM +0200, Tomáš Chvátal <
> tomas.chva...@gmail.com> wrote:
> > I am updating libreoffice in openSUSE to the above version and now the
> > testBinaryImport fails on not finding sdbc:embedded:hsqldb. As this is
> > bundled with LO is this something I did wrong and should check up or is
> it
> > some issue with the test?
>
> Do you have any environment variables set that might influence the test
> result? IIRC Rene had SAL_USE_VCLPLUGIN=svp set globally. master had
> fixes to tolerate that but not sure if that was cherry-picked to
> libreoffice-6-1.
>
> I am not setting any enviroment variables in the check phase... there
simply is just "make" call in that phase.
I can of course define any variables for testing if I should.

Steps are:
%build
%configure
make nocheck

%check
make # sometimes breaks buildroot copied unoil.jar

Cheers

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

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

[Marco Cecchetti]

 sc/inc/strings.hrc |1 
 sc/inc/validat.hxx |   20 +
 sc/source/core/data/conditio.cxx   |3 +
 sc/source/core/data/validat.cxx|   54 ++---
 sc/source/filter/excel/xicontent.cxx   |9 
 sc/source/filter/oox/worksheethelper.cxx   |6 ++
 sc/source/filter/xml/XMLStylesExportHelper.cxx |6 ++
 sc/source/filter/xml/xmlcvali.cxx  |1 
 sc/source/ui/app/inputhdl.cxx  |   12 +
 sc/source/ui/dbgui/validate.cxx|   26 +---
 sc/source/ui/inc/validate.hxx  |1 
 sc/source/ui/view/cellsh2.cxx  |2 
 sc/uiconfig/scalc/ui/validationcriteriapage.ui |4 +
 13 files changed, 130 insertions(+), 15 deletions(-)

New commits:
commit f15c4b0f3c2cdfa7a72c97301ff32cc1764c54da
Author: Marco Cecchetti 
Date:   Thu Feb 1 12:28:54 2018 +0100

tdf#96698 - calc: add support for custom validation (through a formula)

Now it is possible to select a `custom` validation in the validation
dialog: this type of validation let's the user to define a formula,
the cell content is valid when the formula is evaluted to true, and
not valid when evaluated to false.

The `cutom` validation is correctly saved and restored for ods
documents, and is correctly imported and exported to xlsx documents

This patch contains an adaptation of a preliminary work of Justin Luth
for importing custom validation from xlsx documents. Thanks Justin!

Change-Id: Idc26654ba69a6f73d1b208d63acdad4b880c776d
Reviewed-on: https://gerrit.libreoffice.org/49084
Reviewed-by: Michael Meeks 
Tested-by: Jenkins 
Reviewed-by: Eike Rathke 

diff --git a/sc/inc/strings.hrc b/sc/inc/strings.hrc
index ed0fc8df5663..ad3a8fa583dd 100644
--- a/sc/inc/strings.hrc
+++ b/sc/inc/strings.hrc
@@ -65,6 +65,7 @@
 #define SCSTR_VALID_MINIMUM NC_("SCSTR_VALID_MINIMUM", 
"~Minimum")
 #define SCSTR_VALID_MAXIMUM NC_("SCSTR_VALID_MAXIMUM", 
"~Maximum")
 #define SCSTR_VALID_VALUE   NC_("SCSTR_VALID_VALUE", 
"~Value")
+#define SCSTR_VALID_FORMULA NC_("SCSTR_VALID_FORMULA", 
"~Formula")
 #define SCSTR_VALID_RANGE   NC_("SCSTR_VALID_RANGE", 
"~Source")
 #define SCSTR_VALID_LISTNC_("SCSTR_VALID_LIST", 
"~Entries")
 // for dialogues:
diff --git a/sc/inc/validat.hxx b/sc/inc/validat.hxx
index bc13663a7e6d..92e87901fc9d 100644
--- a/sc/inc/validat.hxx
+++ b/sc/inc/validat.hxx
@@ -132,6 +132,26 @@ public:
 bool IsDataValid(
 const OUString& rTest, const ScPatternAttr& rPattern, const ScAddress& 
rPos ) const;
 
+// Custom validations (SC_VALID_CUSTOM) should be validated using this 
specific method.
+// Take care that internally this method commits to the to be validated 
cell the new input,
+// in order to be able to interpret the validating boolean formula on the 
new input.
+// After the formula has been evaluated the original cell content is 
restored.
+// At present is only used in ScInputHandler::EnterHandler: handling this 
case in the
+// regular IsDataValid method would have been unsafe since it can be 
invoked
+// by ScFormulaCell::InterpretTail.
+
+struct CustomValidationPrivateAccess
+{
+// so IsDataValidCustom can be invoked only by ScInputHandler methods
+friend class ScInputHandler;
+private:
+CustomValidationPrivateAccess() {}
+};
+
+bool IsDataValidCustom(
+const OUString& rTest, const ScPatternAttr& rPattern,
+const ScAddress& rPos, const CustomValidationPrivateAccess& ) const;
+
 bool IsDataValid( ScRefCellValue& rCell, const ScAddress& rPos ) const;
 
 // TRUE -> break
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index d07c98ebbf8d..173aa43dc763 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -1242,6 +1242,9 @@ bool ScConditionEntry::IsCellValid( ScRefCellValue& 
rCell, const ScAddress& rPos
 {
 const_cast(this)->Interpret(rPos); // Evaluate formula
 
+if ( eOp == ScConditionMode::Direct )
+return nVal1 != 0.0;
+
 double nArg = 0.0;
 OUString aArgStr;
 bool bVal = lcl_GetCellContent( rCell, bIsStr1, nArg, aArgStr, mpDoc );
diff --git a/sc/source/core/data/validat.cxx b/sc/source/core/data/validat.cxx
index 01e1fa41ca38..813c9940ff9f 100644
--- a/sc/source/core/data/validat.cxx
+++ b/sc/source/core/data/validat.cxx
@@ -426,6 +426,51 @@ bool ScValidationData::DoError(weld::Window* pParent, 
const OUString& rInput,
 return ( eErrorStyle == SC_VALERR_STOP || nRet == RET_CANCEL );
 }
 
+bool ScValidationData::IsDataValidCustom(
+const OUString& rTest,
+const ScPatternAttr& rPattern,
+const

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

[Armin Le Grand]

 sd/qa/unit/data/xml/fdo71434_0.xml|2 
 sd/qa/unit/data/xml/tdf100491_0.xml   |   32 -
 svx/source/sdr/properties/attributeproperties.cxx |   74 ++
 svx/source/sdr/properties/graphicproperties.cxx   |3 
 svx/source/sdr/properties/oleproperties.cxx   |3 
 svx/source/sdr/properties/properties.cxx  |3 
 6 files changed, 59 insertions(+), 58 deletions(-)

New commits:
commit 6ebe8b9068be019d9e8ce4f558eb07304e2023f6
Author: Armin Le Grand 
Date:   Tue May 29 20:04:34 2018 +0200

Corrected PresObj Styles

When SdrPresObj's get constructed, e.g. when loading/
opening an Impress, the Styles for the PresObj's
(PresentationObjects) need to be constructed carefully
the same way as in former versions. This is a combination
of creating the SdrObject, adding a Style and setting default
Attributes, combined with in.-between corrections. All these
combinations make these fragile, plus the im/export using
ODF XML format and UNO API. With last SOSaw080 changes
not all places were correctly converted (mainly due to
new timing when and how a SdrObject belongs to a SdrPage).
Corrected this now, checked im/export/echange with
libreoffice-6-0 versions.

Stuff is more complicated that initially thought, see comment
added at AttributeProperties::GetObjectItemSet() for more info.
Adaption of the two UnitTest-Files is explained there, too.

Change-Id: Ia90a37492f3a92030790fbd27b7c532883bce923
Reviewed-on: https://gerrit.libreoffice.org/55029
Tested-by: Jenkins 
Reviewed-by: Armin Le Grand 

diff --git a/sd/qa/unit/data/xml/fdo71434_0.xml 
b/sd/qa/unit/data/xml/fdo71434_0.xml
index 5c58fa290095..0ec2570dcb7e 100644
--- a/sd/qa/unit/data/xml/fdo71434_0.xml
+++ b/sd/qa/unit/data/xml/fdo71434_0.xml
@@ -1,6 +1,6 @@
 
 
- 
+ 
   


diff --git a/sd/qa/unit/data/xml/tdf100491_0.xml 
b/sd/qa/unit/data/xml/tdf100491_0.xml
index 7e9c39007f0a..0c250e6fc840 100755
--- a/sd/qa/unit/data/xml/tdf100491_0.xml
+++ b/sd/qa/unit/data/xml/tdf100491_0.xml
@@ -1,6 +1,6 @@
 
 
- 
+ 
   
   

@@ -35,7 +35,7 @@

   
  
- 
+ 
   
   

@@ -70,7 +70,7 @@

   
  
- 
+ 
   
   

@@ -105,7 +105,7 @@

   
  
- 
+ 
   
   

@@ -140,7 +140,7 @@

   
  
- 
+ 
   
   

@@ -175,7 +175,7 @@

   
  
- 
+ 
   
   

@@ -210,7 +210,7 @@

   
  
- 
+ 
   
   

@@ -245,7 +245,7 @@

   
  
- 
+ 
   
   

@@ -280,7 +280,7 @@

   
  
- 
+ 
   
   

@@ -315,7 +315,7 @@

   
  
- 
+ 
   
   

@@ -350,7 +350,7 @@

   
  
- 
+ 
   
   

@@ -385,7 +385,7 @@

   
  
- 
+ 
   
   

@@ -420,7 +420,7 @@

   
  
- 
+ 
   
   

@@ -455,7 +455,7 @@

   
  
- 
+ 
   
   

@@ -490,7 +490,7 @@

   
  
- 
+ 
   
   

@@ -525,7 +525,7 @@

   
  
- 
+ 
   
   

diff --git a/svx/source/sdr/properties/attributeproperties.cxx 
b/svx/source/sdr/properties/attributeproperties.cxx
index 4e8711341b82..4089438d959e 100644
--- a/svx/source/sdr/properties/attributeproperties.cxx
+++ b/svx/source/sdr/properties/attributeproperties.cxx
@@ -233,35 +233,42 @@ namespace sdr
 // remember if we had a SfxItemSet already
 const bool bHadSfxItemSet(HasSfxItemSet());
 
-// call parent - this will then guarantee
-// SfxItemSet existence
+// call parent - this will guarantee SfxItemSet existence
 DefaultProperties::GetObjectItemSet();
 
 if(!bHadSfxItemSet)
 {
-// SfxItemSet was created and ForceDefaultAttributes() is done.
-// We now need to set a default SfxStyleSheet at the 
SdrObject. This
-// is possible now since we always have the SdrModel in 
SdrObject,
-// so use applyDefaultStyleSheetFromSdrModel() which will do 
the
-// right thing in each derivation of BaseProperties.
-// We also need to 'rescue' mpStyleSheet if it is already set,
-// which means a SfxStyleSheet was already set/ocopied but not
-// yet set at the SdrObject. See copy-constructor and how it 
remembers
-// the SfxStyleSheet there. This time, do not reset the
-// attributes already set - this is done above.
-SfxStyleSheet* pImplicitelyAlreadySet(mpStyleSheet);
-
-// Set missing defaults and do RemoveHardAttributes. This is
-// important, it deletes again the attributes set in
-// ForceDefaultAttributes() which are set in the default
-// SfxStyleSheet.
-const_cast< AttributeProperties* 
>(this)->applyDefaultStyleSheetFromSdrModel();
-
-if(pImplicitelyAlreadySet)
+// need to take care for SfxStyleSheet for newly
+// created SfxItemSet
+if

Re: libreoffice 6.1.0.0.beta1 failing hsqldb test

[Arnaud Versini]

Hello,

I had exactly the same issue with my buiild on Tumbleweed. I solved this
issue by not using system firebird and ICU. I don't think that's the
solution for you but perhaps it could help.

Cheers

Le 31/05/2018 à 19:06, Tomáš Chvátal a écrit :
>
>
> čt 31. 5. 2018 v 9:47 odesílatel Miklos Vajna  > napsal:
>
> Hi Tom,
>
> On Wed, May 30, 2018 at 04:33:41PM +0200, Tomáš Chvátal
> mailto:tomas.chva...@gmail.com>> wrote:
> > I am updating libreoffice in openSUSE to the above version and
> now the
> > testBinaryImport fails on not finding sdbc:embedded:hsqldb. As
> this is
> > bundled with LO is this something I did wrong and should check
> up or is it
> > some issue with the test?
>
> Do you have any environment variables set that might influence the
> test
> result? IIRC Rene had SAL_USE_VCLPLUGIN=svp set globally. master had
> fixes to tolerate that but not sure if that was cherry-picked to
> libreoffice-6-1.
>
> I am not setting any enviroment variables in the check phase... there
> simply is just "make" call in that phase.
> I can of course define any variables for testing if I should.
>
> Steps are:
> %build
> %configure
> make nocheck
>
> %check
> make # sometimes breaks buildroot copied unoil.jar
>
> Cheers
>
> Tom
>
>
>
>
> ___
> LibreOffice mailing list
> LibreOffice@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/libreoffice


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

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

[Arnaud Versini]

 cppuhelper/source/unourl.cxx |   22 ++
 1 file changed, 6 insertions(+), 16 deletions(-)

New commits:
commit e93c3662b31d14b75ebca90802848e9021b1f3d2
Author: Arnaud Versini 
Date:   Sun May 13 16:30:52 2018 +0200

cppuhelper : use rtl::isAlphaNumeric instead of recreate the method.

Change-Id: I30bd9e0bf99c2a115b67a59377b2d2ef6fdefef0
Reviewed-on: https://gerrit.libreoffice.org/54194
Tested-by: Jenkins 
Reviewed-by: Arnaud Versini 

diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index cfd62ef23e6f..22250e5568eb 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -35,17 +36,6 @@
 using cppu::UnoUrl;
 using cppu::UnoUrlDescriptor;
 
-namespace {
-
-inline bool isAlphanum(sal_Unicode c)
-{
-return (c >= 0x30 && c <= 0x39) // '0'--'9'
-|| (c >= 0x41 && c <= 0x5A) // 'A'--'Z'
-|| (c >= 0x61 && c <= 0x7A); // 'a'--'z'
-}
-
-}
-
 class UnoUrlDescriptor::Impl
 {
 public:
@@ -76,7 +66,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & 
rDescriptor)
 switch (eState)
 {
 case STATE_NAME0:
-if (bEnd || !isAlphanum(c))
+if (bEnd || !rtl::isAsciiAlphanumeric(c))
 throw rtl::MalformedUriException(
 "UNO URL contains bad descriptor name");
 nStart = i;
@@ -90,13 +80,13 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & 
rDescriptor)
 = rDescriptor.copy(nStart, i - nStart).toAsciiLowerCase();
 eState = STATE_KEY0;
 }
-else if (!isAlphanum(c))
+else if (!rtl::isAsciiAlphanumeric(c))
 throw rtl::MalformedUriException(
 "UNO URL contains bad descriptor name");
 break;
 
 case STATE_KEY0:
-if (bEnd || !isAlphanum(c))
+if (bEnd || !rtl::isAsciiAlphanumeric(c))
 throw rtl::MalformedUriException(
 "UNO URL contains bad parameter key");
 nStart = i;
@@ -110,7 +100,7 @@ inline UnoUrlDescriptor::Impl::Impl(rtl::OUString const & 
rDescriptor)
 nStart = i + 1;
 eState = STATE_VALUE;
 }
-else if (bEnd || !isAlphanum(c))
+else if (bEnd || !rtl::isAsciiAlphanumeric(c))
 throw rtl::MalformedUriException(
 "UNO URL contains bad parameter key");
 break;
@@ -222,7 +212,7 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString 
const & rUrl)
 for (j = i; j < rUrl.getLength(); ++j)
 {
 sal_Unicode c = rUrl[j];
-if (!isAlphanum(c) && c != 0x21 && c != 0x24 // '!', '$'
+if (!rtl::isAsciiAlphanumeric(c) && c != 0x21 && c != 0x24 // '!', '$'
 && c != 0x26 && c != 0x27 && c != 0x28 // '&', ''', '('
 && c != 0x29 && c != 0x2A && c != 0x2B // ')', '*', '+'
 && c != 0x2C && c != 0x2D && c != 0x2E // ',', '-', '.'
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'aoo/trunk' - chart2/source comphelper/inc cui/source dbaccess/source filter/source i18npool/source javaunohelper/com sal/inc stoc/source svx/sdi sw/inc toolkit/

[Matthias Seidel]

 chart2/source/inc/NameContainer.hxx
 |2 -
 comphelper/inc/comphelper/implementationreference.hxx  
 |2 -
 cui/source/dialogs/cuihyperdlg.cxx 
 |2 -
 cui/source/dialogs/hldocntp.cxx
 |2 -
 cui/source/dialogs/hldoctp.cxx 
 |2 -
 cui/source/dialogs/hlinettp.cxx
 |2 -
 cui/source/dialogs/hlmailtp.cxx
 |2 -
 cui/source/dialogs/hlmarkwn.cxx
 |4 +--
 cui/source/dialogs/hltpbase.cxx
 |4 +--
 dbaccess/source/ui/inc/ScrollHelper.hxx
 |2 -
 filter/source/pdf/pdfexport.cxx
 |2 -
 i18npool/source/collator/collator_unicode.cxx  
 |2 -
 javaunohelper/com/sun/star/lib/uno/helper/PropertySet.java 
 |   11 ++
 sal/inc/rtl/strbuf.hxx 
 |4 +--
 sal/inc/rtl/ustrbuf.hxx
 |4 +--
 stoc/source/javaloader/javaloader.cxx  
 |2 -
 svx/sdi/fmslots.sdi
 |2 -
 sw/inc/tox.hxx 
 |6 ++---
 toolkit/source/awt/vclxtoolkit.cxx 
 |2 -
 
xmerge/source/pexcel/java/org/openoffice/xmerge/converter/xml/sxc/pexcel/records/Worksheet.java
 |4 +--
 20 files changed, 29 insertions(+), 34 deletions(-)

New commits:
commit a13841aca2519a7272fba336bf643f7d0ad2fcf3
Author: Matthias Seidel 
Date:   Thu May 31 17:29:02 2018 +

Fixed typos:

contructor -> constructor
convinient -> convenient

diff --git a/chart2/source/inc/NameContainer.hxx 
b/chart2/source/inc/NameContainer.hxx
index 0cdf85e2319c..7bacaceba032 100644
--- a/chart2/source/inc/NameContainer.hxx
+++ b/chart2/source/inc/NameContainer.hxx
@@ -82,7 +82,7 @@ public:
 virtual ::com::sun::star::uno::Reference< 
::com::sun::star::util::XCloneable > SAL_CALL createClone() throw 
(::com::sun::star::uno::RuntimeException);
 
 private: //methods
-NameContainer();//no default contructor
+NameContainer();//no default constructor
 
 private: //member
 const ::com::sun::star::uno::Type   m_aType;
diff --git a/comphelper/inc/comphelper/implementationreference.hxx 
b/comphelper/inc/comphelper/implementationreference.hxx
index b0fb49d07a80..b066941454d0 100644
--- a/comphelper/inc/comphelper/implementationreference.hxx
+++ b/comphelper/inc/comphelper/implementationreference.hxx
@@ -152,7 +152,7 @@ namespace comphelper
 queried for the template-parameterized UNO type.
 
 @param dummy
-Dummy parameter, to distinguish this contructor from the
+Dummy parameter, to distinguish this constructor from the
 default unary one (which does not perform a
 QueryInterface)
  */
diff --git a/cui/source/dialogs/cuihyperdlg.cxx 
b/cui/source/dialogs/cuihyperdlg.cxx
index dce804b6cea1..1573e77270b3 100644
--- a/cui/source/dialogs/cuihyperdlg.cxx
+++ b/cui/source/dialogs/cuihyperdlg.cxx
@@ -92,7 +92,7 @@ void SvxHlinkCtrl::StateChanged( sal_uInt16 nSID, 
SfxItemState eState,
 
 /*
 |*
-|* Contructor / Destructor
+|* Constructor / Destructor
 |*
 |/
 
diff --git a/cui/source/dialogs/hldocntp.cxx b/cui/source/dialogs/hldocntp.cxx
index 7b7273041f07..ec4eba883502 100644
--- a/cui/source/dialogs/hldocntp.cxx
+++ b/cui/source/dialogs/hldocntp.cxx
@@ -103,7 +103,7 @@ sal_Bool SvxHyperlinkNewDocTp::ImplGetURLObject( const 
String& rPath, const Stri
 
 /*
 |*
-|* Contructor / Destructor
+|* Constructor / Destructor
 |*
 |/
 
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index 9a37e01ba5cf..cd34851aea77 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -41,7 +41,7 @@ sal_Char __READONLY_DATA sHTTPScheme[]= INET_HTTP_SCHEME;
 
 /**

[Libreoffice-commits] core.git: oovbaapi/ooo oovbaapi/UnoApi_oovbaapi.mk sw/source

[Tor Lillqvist]

 oovbaapi/UnoApi_oovbaapi.mk|1 
 oovbaapi/ooo/vba/word/XApplication.idl |1 
 oovbaapi/ooo/vba/word/XWordBasic.idl   |   24 
 sw/source/ui/vba/vbaapplication.cxx|   38 +
 sw/source/ui/vba/vbaapplication.hxx|1 
 5 files changed, 65 insertions(+)

New commits:
commit 56a7ddaadc4a6fd7fc4019813041e93b10c91504
Author: Tor Lillqvist 
Date:   Tue May 15 14:33:17 2018 +0300

Add WordBasic property and its FileOpen "command"

Change-Id: I74aca823bb871040b15f35b92f961dfe48807843
Reviewed-on: https://gerrit.libreoffice.org/55136
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 

diff --git a/oovbaapi/UnoApi_oovbaapi.mk b/oovbaapi/UnoApi_oovbaapi.mk
index bb9601f8152b..421dd057a347 100644
--- a/oovbaapi/UnoApi_oovbaapi.mk
+++ b/oovbaapi/UnoApi_oovbaapi.mk
@@ -1100,6 +1100,7 @@ $(eval $(call 
gb_UnoApi_add_idlfiles,oovbaapi,ooo/vba/word,\
XVariables \
XView \
XWindow \
+   XWordBasic \
XWrapFormat \
 ))
 
diff --git a/oovbaapi/ooo/vba/word/XApplication.idl 
b/oovbaapi/ooo/vba/word/XApplication.idl
index 4b0f4f4e9a2a..62319f63a932 100644
--- a/oovbaapi/ooo/vba/word/XApplication.idl
+++ b/oovbaapi/ooo/vba/word/XApplication.idl
@@ -32,6 +32,7 @@ interface XApplication : XConnectable
 [attribute, readonly] XSystem System;
 [attribute, readonly] XOptions Options;
 [attribute, readonly] XSelection Selection;
+[attribute, readonly] XWordBasic WordBasic;
 [attribute] boolean DisplayAutoCompleteTips;
 [attribute] long EnableCancelKey;
 [attribute] long WindowState;
diff --git a/oovbaapi/ooo/vba/word/XWordBasic.idl 
b/oovbaapi/ooo/vba/word/XWordBasic.idl
new file mode 100644
index ..1920f20543a6
--- /dev/null
+++ b/oovbaapi/ooo/vba/word/XWordBasic.idl
@@ -0,0 +1,24 @@
+/* -*- 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/.
+ *
+ */
+#ifndef __ooo_vba_word_XWordBasic_idl__
+#define __ooo_vba_word_XWordBasic_idl__
+
+module ooo {  module vba {  module word {
+
+interface XWordBasic
+{
+void FileOpen( [in] string Name, [in] any ConfirmConversions, [in] any 
ReadOnly, [in] any AddToMru, [in] any PasswordDoc, [in] any PasswordDot, [in] 
any Revert, [in] any WritePasswordDoc, [in] any WritePasswordDot );
+};
+
+}; }; };
+
+#endif
+
+/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbaapplication.cxx 
b/sw/source/ui/vba/vbaapplication.cxx
index 897be10a8c11..37358d2cc51d 100644
--- a/sw/source/ui/vba/vbaapplication.cxx
+++ b/sw/source/ui/vba/vbaapplication.cxx
@@ -56,6 +56,18 @@ public:
 void SAL_CALL Unadvise( sal_uInt32 Cookie ) override;
 };
 
+class SwWordBasic : public cppu::WeakImplHelper
+{
+private:
+SwVbaApplication* mpApp;
+
+public:
+SwWordBasic( SwVbaApplication* pApp );
+
+// XWordBasic
+virtual void SAL_CALL FileOpen( const OUString& Name, const uno::Any& 
ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToMru, const 
uno::Any& PasswordDoc, const uno::Any& PasswordDot, const uno::Any& Revert, 
const uno::Any& WritePasswordDoc, const uno::Any& WritePasswordDot ) override;
+};
+
 SwVbaApplication::SwVbaApplication( uno::Reference& 
xContext ):
 SwVbaApplication_BASE( xContext )
 {
@@ -138,6 +150,13 @@ SwVbaApplication::getSelection()
 return new SwVbaSelection( this, mxContext, getCurrentDocument() );
 }
 
+uno::Reference< word::XWordBasic > SAL_CALL
+SwVbaApplication::getWordBasic()
+{
+uno::Reference< word::XWordBasic > xWB( new SwWordBasic( this ) );
+return xWB;
+}
+
 uno::Any SAL_CALL
 SwVbaApplication::Documents( const uno::Any& index )
 {
@@ -387,4 +406,23 @@ SwVbaApplicationOutgoingConnectionPoint::Unadvise( 
sal_uInt32 Cookie )
 mpApp->RemoveSink( Cookie );
 }
 
+// SwWordBasic
+
+SwWordBasic::SwWordBasic( SwVbaApplication* pApp ) :
+mpApp(pApp)
+{
+}
+
+// XWordBasic
+void SAL_CALL
+SwWordBasic::FileOpen( const OUString& Name, const uno::Any& 
ConfirmConversions, const uno::Any& ReadOnly, const uno::Any& AddToMru, const 
uno::Any& PasswordDoc, const uno::Any& PasswordDot, const uno::Any& Revert, 
const uno::Any& WritePasswordDoc, const uno::Any& WritePasswordDot )
+{
+uno::Any aDocuments = mpApp->Documents( uno::Any() );
+
+uno::Reference rDocuments;
+
+if (aDocuments >>= rDocuments)
+rDocuments->Open( Name, ConfirmConversions, ReadOnly, AddToMru, 
PasswordDoc, PasswordDot, Revert, WritePasswordDoc, WritePasswordDot, 
uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), uno::Any(), 
uno::Any() );
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/vba/vbaapplication.hxx 
b/sw/source/ui/vba/vbaapplicat

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - configure.ac

[Tor Lillqvist]

 configure.ac |8 ++--
 1 file changed, 2 insertions(+), 6 deletions(-)

New commits:
commit 54767afcb7179afe733152dcf93802cc2f99e7b6
Author: Tor Lillqvist 
Date:   Thu May 10 14:43:10 2018 +0300

Also for SDK 10.0.17134 the winsdklibsubdir needs to have a .0 tacked on

Also remove questionable old "Hack needed at least by tml".

Change-Id: I478358ea114cee2f8a181b98cb3433447b3ed560
Reviewed-on: https://gerrit.libreoffice.org/54081
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit fc00041df85fd508d1fc34658d4c9ceeb10084b1)

diff --git a/configure.ac b/configure.ac
index 6a7e539ab8e5..bdfe52a494d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5083,12 +5083,8 @@ find_winsdk_version()
 winsdklibsubdir="10.0.16299.0"
 elif test "$regvalue" = "10.0.15063"; then
 winsdklibsubdir="10.0.15063.0"
-dnl Hack needed at least by tml:
-if test ! -f "${winsdktest}/Include/10.0.15063.0/um/sqlext.h" \
--a -f "${winsdktest}/Include/10.0.14393.0/um/sqlext.h"
-then
-winsdklibsubdir="10.0.14393.0"
-fi
+elif test "$regvalue" = "10.0.17134"; then
+winsdklibsubdir="$regvalue.0"
 fi
 return
 fi
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 22 commits - basic/source extensions/Library_oleautobridge.mk extensions/source external/boost include/comphelper oovbaapi/ooo stoc/s

[Tor Lillqvist]

 basic/source/classes/sbxmod.cxx   |   27 -
 extensions/Library_oleautobridge.mk   |6 
 extensions/source/ole/ole2uno.hxx |5 
 extensions/source/ole/oleobjw.cxx |  144 ++---
 extensions/source/ole/oleobjw.hxx |   10 
 extensions/source/ole/servprov.cxx|  277 +++
 extensions/source/ole/servprov.hxx|  130 +
 extensions/source/ole/servreg.cxx |8 
 extensions/source/ole/unoconversionutilities.hxx  |   32 -
 extensions/source/ole/unoobjw.cxx |  539 +++---
 extensions/source/ole/unoobjw.hxx |   42 -
 external/boost/UnpackedTarball_boost.mk   |2 
 external/boost/windows-no-utf8-locales.patch.0|   20 
 include/comphelper/asyncquithandler.hxx   |   60 ++
 include/comphelper/windowsdebugoutput.hxx |2 
 oovbaapi/ooo/vba/XApplicationBase.idl |8 
 stoc/source/invocation/invocation.cxx |   62 +-
 unotools/source/i18n/resmgr.cxx   |   70 ++
 vbahelper/source/vbahelper/vbaapplicationbase.cxx |   20 
 19 files changed, 911 insertions(+), 553 deletions(-)

New commits:
commit 01ebbba2bbd2333c9bade8bf5b41e61ab9a3ec65
Author: Tor Lillqvist 
Date:   Mon Mar 5 22:00:54 2018 +0200

Add code to VbaApplicationBase::Quit() for the Automation client case

Change-Id: I4354adf5353bdfb0b080b24a5c49e3d22539eb23
Reviewed-on: https://gerrit.libreoffice.org/55051
Tested-by: Jenkins 
Reviewed-by: Tor Lillqvist 
(cherry picked from commit d7f69b1cb4dbdd39970d56d0c340d7abb92fbdc1)

diff --git a/vbahelper/source/vbahelper/vbaapplicationbase.cxx 
b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
index 61cb7d3d0e74..b09de686dd31 100644
--- a/vbahelper/source/vbahelper/vbaapplicationbase.cxx
+++ b/vbahelper/source/vbahelper/vbaapplicationbase.cxx
@@ -1,4 +1,4 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; 
fill-column: 100 -*- */
 /*
  * This file is part of the LibreOffice project.
  *
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -45,6 +46,8 @@
 #include 
 #include 
 
+#include 
+
 #include "vbacommandbars.hxx"
 
 #include 
@@ -441,6 +444,15 @@ void VbaApplicationBase::Quit()
 pBasic->QuitAndExitApplication();
 }
 }
+else
+{
+// This is the case of a call from an (OLE) Automation client.
+
+// TODO: Probably we should just close any document windows open by 
the "application"
+// (Writer or Calc) the call being handled is for. And only then, if 
no document windows
+// are left open, quit the actual LibreOffice application.
+Application::PostUserEvent( LINK( &AsyncQuitHandler::instance(), 
AsyncQuitHandler, OnAsyncQuit ) );
+}
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 737ea470d16f6b323811029c33abd2945decc087
Author: Tor Lillqvist 
Date:   Wed Mar 7 09:47:03 2018 +0200

Whitespace fix

Change-Id: Ife4040b181f0688d67de4a2a36e2d2f810e4fce5
(cherry picked from commit 925fe6609f39098ee69d94087f11e593a60476a1)

diff --git a/oovbaapi/ooo/vba/XApplicationBase.idl 
b/oovbaapi/ooo/vba/XApplicationBase.idl
index ab9ca062bd1e..90ba919407d4 100644
--- a/oovbaapi/ooo/vba/XApplicationBase.idl
+++ b/oovbaapi/ooo/vba/XApplicationBase.idl
@@ -24,16 +24,14 @@
 
 module ooo {  module vba {
 
-
-
 interface XApplicationBase
 {
 interface ::ooo::vba::XHelperInterface;
 
 [attribute] boolean ScreenUpdating;
 [attribute] boolean DisplayStatusBar;
- [attribute] boolean Interactive;
- [attribute] boolean Visible;
+[attribute] boolean Interactive;
+[attribute] boolean Visible;
 
 [attribute, readonly] string Version;
 [attribute, readonly] any VBE;
@@ -47,8 +45,6 @@ interface XApplicationBase
 void Undo();
 };
 
-
-
 }; };
 
 #endif
commit 5e1ce67cc5b86ef59aa8767cbe99f9fe95aea51a
Author: Tor Lillqvist 
Date:   Mon Mar 5 21:52:05 2018 +0200

Factor out AsyncQuitHandler to be usable elsewhere, too

Or do we already have the corresponding functionality somewhere, and
SbModule::Run() could be changed to use that instead?

Change-Id: I6f45d4a023f9f9d9a24ab6934117a712ccbe75e2
Reviewed-on: https://gerrit.libreoffice.org/55048
Reviewed-by: Tor Lillqvist 
Tested-by: Tor Lillqvist 
(cherry picked from commit cac718bfe606c363fa4538db8c6d21f28f139f58)

diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index f68d541d69a9..aa1b4684e920 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -55,6 +55,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -416,32 +417,6 @@ bool getDefaultVBAMode( StarBASIC* pb )
 return xVBACompat.is() && xVBACompat->getVB

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 56 commits - comphelper/Library_comphelper.mk comphelper/source extensions/source external/python3 include/comphelper include/vbahelp

[Stephan Bergmann]

 comphelper/Library_comphelper.mk  |1 
 comphelper/source/misc/automationinvokedzone.cxx  |   36 
 extensions/source/ole/servprov.cxx|   37 
 extensions/source/ole/unoobjw.cxx | 1653 +++---
 extensions/source/ole/unoobjw.hxx |   26 
 external/python3/ExternalPackage_python3.mk   |1 
 include/comphelper/automationinvokedzone.hxx  |   39 
 include/comphelper/windowsdebugoutput.hxx |5 
 include/vbahelper/vbaapplicationbase.hxx  |7 
 oovbaapi/UnoApi_oovbaapi.mk   |9 
 oovbaapi/ooo/vba/TypeAndIID.idl   |   30 
 oovbaapi/ooo/vba/XApplicationBase.idl |1 
 oovbaapi/ooo/vba/XConnectable.idl |   38 
 oovbaapi/ooo/vba/XConnectionPoint.idl |   34 
 oovbaapi/ooo/vba/XInterfaceWithIID.idl|   34 
 oovbaapi/ooo/vba/XSink.idl|   36 
 oovbaapi/ooo/vba/XSinkCaller.idl  |   29 
 oovbaapi/ooo/vba/excel/XApplication.idl   |   13 
 oovbaapi/ooo/vba/excel/XApplicationOutgoing.idl   |   37 
 oovbaapi/ooo/vba/excel/XWorkbook.idl  |   11 
 oovbaapi/ooo/vba/word/XApplication.idl|   21 
 oovbaapi/ooo/vba/word/XApplicationOutgoing.idl|   39 
 oovbaapi/ooo/vba/word/XDocument.idl   |5 
 oovbaapi/ooo/vba/word/XDocumentOutgoing.idl   |   35 
 oovbaapi/ooo/vba/word/XDocuments.idl  |8 
 sc/CppunitTest_sc_addin_functions_test.mk |1 
 sc/CppunitTest_sc_anchor_test.mk  |6 
 sc/CppunitTest_sc_array_functions_test.mk |1 
 sc/CppunitTest_sc_bugfix_test.mk  |6 
 sc/CppunitTest_sc_cond_format_merge.mk|6 
 sc/CppunitTest_sc_copypaste.mk|6 
 sc/CppunitTest_sc_database_functions_test.mk  |1 
 sc/CppunitTest_sc_dataprovider.mk |6 
 sc/CppunitTest_sc_datatransformation.mk   |6 
 sc/CppunitTest_sc_datetime_functions_test.mk  |1 
 sc/CppunitTest_sc_filters_test.mk |6 
 sc/CppunitTest_sc_financial_functions_test.mk |1 
 sc/CppunitTest_sc_functions_test_old.mk   |1 
 sc/CppunitTest_sc_html_export_test.mk |6 
 sc/CppunitTest_sc_information_functions_test.mk   |1 
 sc/CppunitTest_sc_logical_functions_test.mk   |1 
 sc/CppunitTest_sc_mathematical_functions_test.mk  |1 
 sc/CppunitTest_sc_opencl_test.mk  |6 
 sc/CppunitTest_sc_parallelism.mk  |6 
 sc/CppunitTest_sc_pivottable_filters_test.mk  |6 
 sc/CppunitTest_sc_spreadsheet_functions_test.mk   |1 
 sc/CppunitTest_sc_statistical_functions_test.mk   |1 
 sc/CppunitTest_sc_subsequent_export_test.mk   |6 
 sc/CppunitTest_sc_subsequent_filters_test.mk  |6 
 sc/CppunitTest_sc_text_functions_test.mk  |1 
 sc/CppunitTest_sc_ucalc.mk|6 
 sc/Library_sc.mk  |6 
 sc/Library_scd.mk |6 
 sc/Library_scfilt.mk  |6 
 sc/Library_scqahelper.mk  |6 
 sc/Library_scui.mk|6 
 sc/inc/scmod.hxx  |7 
 sc/source/ui/app/scmod.cxx|   11 
 sc/source/ui/docshell/docsh.cxx   |   32 
 sc/source/ui/inc/docsh.hxx|6 
 sc/source/ui/vba/vbaapplication.cxx   |  102 +
 sc/source/ui/vba/vbaapplication.hxx   |   23 
 sc/source/ui/vba/vbaworkbook.cxx  |   21 
 sc/source/ui/vba/vbaworkbook.hxx  |2 
 scp2/source/calc/registryitem_calc.scp|   15 
 scp2/source/writer/registryitem_writer.scp|   15 
 stoc/source/invocation/invocation.cxx |  130 -
 svtools/CppunitTest_svtools_graphic.mk|6 
 sw/CppunitTest_sw_docbookexport.mk|6 
 sw/CppunitTest_sw_filters_test.mk |6 
 sw/CppunitTest_sw_fodfexport.mk   |6 
 sw/CppunitTest_sw_globalfilter.mk |6 
 sw/CppunitTest_sw_htmlexport.mk   |6 
 sw/CppunitTest_sw_htmlimport.mk   |6 
 sw/CppunitTest_sw_layoutwriter.mk |6 
 sw/CppunitTest_sw_mailmerge.mk|6 
 sw/CppunitTest_sw_odfexport.mk|6 
 sw/CppunitTest_sw_odfimport.mk|6 
 sw/CppunitTest_sw_ooxmlencryption.mk  |7 
 sw/CppunitTest_sw_ooxmlexport8.mk |6 
 sw/CppunitTest_sw_ooxmlfieldexport.mk |6 
 sw/CppunitTest_sw_ooxmlimport.mk  |6 
 sw/CppunitTest_sw_ooxmllinks.mk   |6 
 sw/CppunitTest_sw_ooxmlw14export.mk   |6 
 sw/CppunitTest_sw_

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

[Caolán McNamara]

 oox/source/vml/vmlshape.cxx |   11 +--
 1 file changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 7488943c329516c35504fe86c36251c83b24cf74
Author: Caolán McNamara 
Date:   Thu May 31 17:22:36 2018 +0100

ofz#8651 Integer-overflow

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

diff --git a/oox/source/vml/vmlshape.cxx b/oox/source/vml/vmlshape.cxx
index 6b496b50e3a0..d304e63ca1d3 100644
--- a/oox/source/vml/vmlshape.cxx
+++ b/oox/source/vml/vmlshape.cxx
@@ -22,6 +22,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -201,8 +202,14 @@ awt::Rectangle ShapeType::getAbsRectangle() const
 if ( nHeight == 0 )
 nHeight = 1;
 
-sal_Int32 nLeft = ConversionHelper::decodeMeasureToHmm( rGraphicHelper, 
maTypeModel.maLeft, 0, true, true )
-+ ConversionHelper::decodeMeasureToHmm( rGraphicHelper, 
maTypeModel.maMarginLeft, 0, true, true );
+sal_Int32 nLeft;
+if 
(o3tl::checked_add(ConversionHelper::decodeMeasureToHmm(rGraphicHelper,
 maTypeModel.maLeft, 0, true, true),
+ 
ConversionHelper::decodeMeasureToHmm(rGraphicHelper, maTypeModel.maMarginLeft, 
0, true, true),
+ nLeft))
+{
+SAL_WARN("oox", "overflow in addition");
+nLeft = 0;
+}
 if (nLeft == 0 && maTypeModel.maPosition == "absolute")
 nLeft = 1;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/tbxctrls/tbcontrl.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 1b6026f6661674439a638ae6c4d5c3771fafdb22
Author: Caolán McNamara 
Date:   Thu May 31 13:49:40 2018 +0100

tdf#117537 block rentry to CheckAndMarkUnknownFont

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

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 41145935cf5f..ae103afddc21 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -193,6 +193,7 @@ private:
 Reference< XDispatchProvider > m_xDispatchProvider;
 Reference< XFrame >m_xFrame;
 boolmbEndPreview;
+boolmbCheckingUnknownFont;
 
 voidReleaseFocus_Impl();
 voidEnableControls_Impl();
@@ -971,7 +972,8 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* 
pParent, const Reference<
 bRelease   ( true ),
 m_xDispatchProvider( rDispatchProvider ),
 m_xFrame (_xFrame),
-mbEndPreview(false)
+mbEndPreview(false),
+mbCheckingUnknownFont(false)
 {
 SetOptimalSize();
 EnableControls_Impl();
@@ -1003,6 +1005,9 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, 
VclWindowEvent&, event,
 {
 if( event.GetId() != VclEventId::EditModify )
 return;
+if (mbCheckingUnknownFont) //tdf#117537 block rentry
+return;
+mbCheckingUnknownFont = true;
 OUString fontname = GetSubEdit()->GetText();
 lcl_GetDocFontList( &pFontList, this );
 // If the font is unknown, show it in italic.
@@ -1025,6 +1030,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, 
VclWindowEvent&, event,
 SetQuickHelpText( SvxResId( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE 
));
 }
 }
+mbCheckingUnknownFont = false;
 }
 
 void SvxFontNameBox_Impl::Update( const css::awt::FontDescriptor* pFontDesc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/inc/view.hxx  |4 ++--
 sw/source/uibase/uiview/view.cxx |   28 +---
 sw/source/uibase/uiview/view1.cxx|4 ++--
 sw/source/uibase/uiview/view2.cxx|8 
 sw/source/uibase/uiview/viewdraw.cxx |   18 +-
 sw/source/uibase/uiview/viewling.cxx |   14 +++---
 sw/source/uibase/uiview/viewmdi.cxx  |4 ++--
 sw/source/uibase/uiview/viewport.cxx |2 +-
 sw/source/uibase/uiview/viewsrch.cxx |   12 ++--
 9 files changed, 46 insertions(+), 48 deletions(-)

New commits:
commit 053d4b0bc3288c6e7e09ff2e1cdb0f8219bc3821
Author: Caolán McNamara 
Date:   Thu May 31 16:34:36 2018 +0100

use std::unique_ptr

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

diff --git a/sw/inc/view.hxx b/sw/inc/view.hxx
index c8b03778acc2..eca967473ae6 100644
--- a/sw/inc/view.hxx
+++ b/sw/inc/view.hxx
@@ -166,7 +166,7 @@ class SW_DLLPUBLIC SwView: public SfxViewShell
 tools::Rectangle   m_aVisArea;   // visible region
 
 VclPtrm_pEditWin;
-SwWrtShell  *m_pWrtShell;
+std::unique_ptr m_pWrtShell;
 
 SfxShell*m_pShell;// current SubShell at the dispatcher
 FmFormShell *m_pFormShell;// DB-FormShell
@@ -387,7 +387,7 @@ public:
 voidStopShellTimer();
 
 SwWrtShell&  GetWrtShell   () const { return *m_pWrtShell; }
-SwWrtShell*  GetWrtShellPtr() const { return  m_pWrtShell; }
+SwWrtShell*  GetWrtShellPtr() const { return  m_pWrtShell.get(); }
 
 SwEditWin &GetEditWin(){ return *m_pEditWin; }
 const SwEditWin &GetEditWin () const { return *m_pEditWin; }
diff --git a/sw/source/uibase/uiview/view.cxx b/sw/source/uibase/uiview/view.cxx
index c67ae50f800d..8d5703a0bfcf 100644
--- a/sw/source/uibase/uiview/view.cxx
+++ b/sw/source/uibase/uiview/view.cxx
@@ -178,7 +178,7 @@ void SwView::GotFocus() const
 if ( pAsFormShell )
 {
 pAsFormShell->ForgetActiveControl();
-const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell );
+const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell.get() );
 }
 else if ( m_pPostItMgr )
 {
@@ -186,7 +186,7 @@ void SwView::GotFocus() const
 if ( pAsAnnotationShell )
 {
 m_pPostItMgr->SetActiveSidebarWin(nullptr);
-const_cast< SwView* >( this )->AttrChangedNotify( m_pWrtShell );
+const_cast< SwView* >( this )->AttrChangedNotify( 
m_pWrtShell.get() );
 }
 }
 if( GetWrtShellPtr() )
@@ -215,7 +215,7 @@ IMPL_LINK_NOARG(SwView, FormControlActivated, 
LinkParamNone*, void)
 if ( pSdrView && pSdrView->IsTextEdit() )
 pSdrView->SdrEndTextEdit( true );
 
-AttrChangedNotify( m_pWrtShell );
+AttrChangedNotify( m_pWrtShell.get() );
 }
 }
 
@@ -821,11 +821,11 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* 
pOldSh )
 SAL_INFO( "sw.ui", "before create WrtShell" );
 if (SwView *pView = dynamic_cast(pExistingSh))
 {
-m_pWrtShell = new SwWrtShell(*pView->m_pWrtShell, m_pEditWin, *this);
+m_pWrtShell.reset(new SwWrtShell(*pView->m_pWrtShell, m_pEditWin, 
*this));
 }
 else if (SwWrtShell *pWrtShell = 
dynamic_cast(rDocSh.GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell()))
 {
-m_pWrtShell = new SwWrtShell(*pWrtShell, m_pEditWin, *this);
+m_pWrtShell.reset(new SwWrtShell(*pWrtShell, m_pEditWin, *this));
 }
 else
 {
@@ -848,7 +848,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh 
)
 aUsrPref.SetViewLayoutBookMode( false );
 aUsrPref.SetViewLayoutColumns( 1 );
 }
-m_pWrtShell = new SwWrtShell( rDoc, m_pEditWin, *this, &aUsrPref );
+m_pWrtShell.reset(new SwWrtShell(rDoc, m_pEditWin, *this, &aUsrPref));
 // creating an SwView from a SwPagePreview needs to
 // add the SwViewShell to the ring of the other SwViewShell(s)
 if(m_bOldShellWasPagePreview)
@@ -873,7 +873,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh 
)
 }
 }
 SAL_INFO( "sw.ui", "after create WrtShell" );
-m_pHRuler = VclPtr::Create(m_pWrtShell, 
&GetViewFrame()->GetWindow(), m_pEditWin,
+m_pHRuler = VclPtr::Create(m_pWrtShell.get(), 
&GetViewFrame()->GetWindow(), m_pEditWin,
 SvxRulerSupportFlags::TABS |
 SvxRulerSupportFlags::PARAGRAPH_MARGINS |
 SvxRulerSupportFlags::BORDERS |
@@ -970,7 +970,7 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh 
)
 {
 if 
(m_pWrtShell->GetDoc()->GetDocumentFieldsManager().containsUpdatableFields())
 {
-SET_CURR_SHELL( m_pWrtShell );
+SET_CURR_SHELL(m_pWrtShell.get());
 

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

[Caolán McNamara]

 sw/source/ui/fldui/fldvar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b83ec344f914ec6571d6d53b1ea7d0924db7a6a4
Author: Caolán McNamara 
Date:   Thu May 31 14:22:18 2018 +0100

Resolves: tdf#116268 use on/off data, not pos to determine which is which

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

diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index 14c47ba94e71..3886a510694a 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -531,7 +531,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox)
 if (IsFieldEdit() || pBox)// only when interacting via 
mouse
 m_pNameED->SetText(OUString());
 
-if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND)
+if (nSelData != 0 && nSelData != SIZE_MAX)
 {
 bValue = true;  // SubType OFF - knows no Offset
 if (GetCurField() && IsFieldEdit())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/core/edit/edws.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ea49b0f30d227df3d75991a3d3369aac70aa944d
Author: Caolán McNamara 
Date:   Thu May 31 16:36:01 2018 +0100

dynamic_cast followed by static_cast

Change-Id: I79c1766a76a5b3b7077c812e3ae9197010e36d40
Reviewed-on: https://gerrit.libreoffice.org/55141
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/sw/source/core/edit/edws.cxx b/sw/source/core/edit/edws.cxx
index d9ce2329e225..32770a346284 100644
--- a/sw/source/core/edit/edws.cxx
+++ b/sw/source/core/edit/edws.cxx
@@ -88,8 +88,8 @@ void SwEditShell::StartAllAction()
 {
 for(SwViewShell& rCurrentShell : GetRingContainer())
 {
-if( dynamic_cast(&rCurrentShell) != nullptr )
-static_cast(&rCurrentShell)->StartAction();
+if (SwEditShell* pEditShell = 
dynamic_cast(&rCurrentShell))
+pEditShell->StartAction();
 else
 rCurrentShell.StartAction();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 svx/source/tbxctrls/tbcontrl.cxx |8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)

New commits:
commit d406785b057811e49e74abd62c45abe8fcaa782d
Author: Caolán McNamara 
Date:   Thu May 31 13:49:40 2018 +0100

tdf#117537 block rentry to CheckAndMarkUnknownFont

Change-Id: I70e75a39d13e93e929c7aef5407b1100bb2a7c12
Reviewed-on: https://gerrit.libreoffice.org/55130
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index 41145935cf5f..ae103afddc21 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -193,6 +193,7 @@ private:
 Reference< XDispatchProvider > m_xDispatchProvider;
 Reference< XFrame >m_xFrame;
 boolmbEndPreview;
+boolmbCheckingUnknownFont;
 
 voidReleaseFocus_Impl();
 voidEnableControls_Impl();
@@ -971,7 +972,8 @@ SvxFontNameBox_Impl::SvxFontNameBox_Impl( vcl::Window* 
pParent, const Reference<
 bRelease   ( true ),
 m_xDispatchProvider( rDispatchProvider ),
 m_xFrame (_xFrame),
-mbEndPreview(false)
+mbEndPreview(false),
+mbCheckingUnknownFont(false)
 {
 SetOptimalSize();
 EnableControls_Impl();
@@ -1003,6 +1005,9 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, 
VclWindowEvent&, event,
 {
 if( event.GetId() != VclEventId::EditModify )
 return;
+if (mbCheckingUnknownFont) //tdf#117537 block rentry
+return;
+mbCheckingUnknownFont = true;
 OUString fontname = GetSubEdit()->GetText();
 lcl_GetDocFontList( &pFontList, this );
 // If the font is unknown, show it in italic.
@@ -1025,6 +1030,7 @@ IMPL_LINK( SvxFontNameBox_Impl, CheckAndMarkUnknownFont, 
VclWindowEvent&, event,
 SetQuickHelpText( SvxResId( RID_SVXSTR_CHARFONTNAME_NOTAVAILABLE 
));
 }
 }
+mbCheckingUnknownFont = false;
 }
 
 void SvxFontNameBox_Impl::Update( const css::awt::FontDescriptor* pFontDesc )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 include/vcl/weld.hxx|6 --
 svtools/source/control/valueacc.cxx |   13 +
 svtools/source/control/valueset.cxx |6 +++---
 vcl/source/app/salvtables.cxx   |5 +
 vcl/unx/gtk3/gtk3gtkinst.cxx|9 +
 5 files changed, 26 insertions(+), 13 deletions(-)

New commits:
commit 66a1cec7366f28e9287ce88d64bb357bb9dd6c99
Author: Caolán McNamara 
Date:   Thu May 31 11:03:56 2018 +0100

connect up accessibility location

Change-Id: I226e42cf6bd7aa455514439f7303b490aa6d192d
Reviewed-on: https://gerrit.libreoffice.org/55137
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/include/vcl/weld.hxx b/include/vcl/weld.hxx
index fe45e32e0b03..7caac3ec0686 100644
--- a/include/vcl/weld.hxx
+++ b/include/vcl/weld.hxx
@@ -833,10 +833,12 @@ public:
 virtual void queue_draw() = 0;
 virtual void queue_draw_area(int x, int y, int width, int height) = 0;
 virtual void queue_resize() = 0;
-virtual a11yref get_accessible_parent() = 0;
-virtual a11yrelationset get_accessible_relation_set() = 0;
 // use return here just to generate matching VirtualDevices
 virtual OutputDevice& get_ref_device() = 0;
+
+virtual a11yref get_accessible_parent() = 0;
+virtual a11yrelationset get_accessible_relation_set() = 0;
+virtual Point get_accessible_location() = 0;
 };
 
 class VCL_DLLPUBLIC Menu
diff --git a/svtools/source/control/valueacc.cxx 
b/svtools/source/control/valueacc.cxx
index 34cf5c41a0aa..093fd4d2de92 100644
--- a/svtools/source/control/valueacc.cxx
+++ b/svtools/source/control/valueacc.cxx
@@ -1373,18 +1373,15 @@ awt::Point SAL_CALL SvtValueItemAcc::getLocation()
 awt::Point SAL_CALL SvtValueItemAcc::getLocationOnScreen()
 {
 const SolarMutexGuard aSolarGuard;
-uno::Reference xParent(getAccessibleParent());
 awt::Point  aRet;
 
-if (mpParent && xParent)
+if( mpParent )
 {
-uno::Reference 
xParentContext(xParent->getAccessibleContext());
-uno::Reference 
xParentComponent(xParentContext, css::uno::UNO_QUERY_THROW);
-awt::Point aParentScreenLoc(xParentComponent->getLocationOnScreen());
-const Point aOwnRelativeLoc = 
mpParent->mrParent.GetItemRect(mpParent->mnId).TopLeft();
+const Point aPos = 
mpParent->mrParent.GetItemRect(mpParent->mnId).TopLeft();
+const Point aScreenPos( 
mpParent->mrParent.GetDrawingArea()->get_accessible_location() );
 
-aRet.X = aParentScreenLoc.X + aOwnRelativeLoc.X();
-aRet.X = aParentScreenLoc.Y + aOwnRelativeLoc.Y();
+aRet.X = aPos.X() + aScreenPos.X();
+aRet.Y = aPos.Y() + aScreenPos.Y();
 }
 
 return aRet;
diff --git a/svtools/source/control/valueset.cxx 
b/svtools/source/control/valueset.cxx
index dc5e52896641..292c89a097b2 100644
--- a/svtools/source/control/valueset.cxx
+++ b/svtools/source/control/valueset.cxx
@@ -2824,7 +2824,7 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId )
 
 if( nPos != VALUESET_ITEM_NOTFOUND )
 {
-ValueItemAcc* pItemAcc = ValueItemAcc::getImplementation(
+SvtValueItemAcc* pItemAcc = SvtValueItemAcc::getImplementation(
 mItemList[nPos]->GetAccessible( 
false/*bIsTransientChildrenDisabled*/ ) );
 
 if( pItemAcc )
@@ -2846,9 +2846,9 @@ void SvtValueSet::SelectItem( sal_uInt16 nItemId )
 else
 pItem = mpNoneItem.get();
 
-ValueItemAcc* pItemAcc = nullptr;
+SvtValueItemAcc* pItemAcc = nullptr;
 if (pItem != nullptr)
-pItemAcc = ValueItemAcc::getImplementation( pItem->GetAccessible( 
false/*bIsTransientChildrenDisabled*/ ) );
+pItemAcc = SvtValueItemAcc::getImplementation( 
pItem->GetAccessible( false/*bIsTransientChildrenDisabled*/ ) );
 
 if( pItemAcc )
 {
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 065818715ff4..590d0acefa8d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1829,6 +1829,11 @@ public:
 return xSet;
 }
 
+virtual Point get_accessible_location() override
+{
+return m_xDrawingArea->OutputToAbsoluteScreenPixel(Point());
+}
+
 virtual ~SalInstanceDrawingArea() override
 {
 m_xDrawingArea->SetQueryTooltipHdl(Link());
diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index d13cb73df419..78d81061bb34 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -3951,6 +3951,15 @@ public:
 return uno::Reference();
 }
 
+virtual Point get_accessible_location() override
+{
+AtkObject* pAtkObject = default_drawing_area_get_accessible(m_pWidget);
+gint x(0), y(0);
+if (pAtkObject && ATK_IS_COMPONENT(pAtkObject))
+atk_component_get_extents(ATK_COMPONENT(pAtkObject), &x, &y, 
nullptr, nullptr, ATK_XY_WINDOW);
+return Point(

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

[Luboš Luňák]

 sc/inc/document.hxx |   12 ++--
 sc/inc/global.hxx   |2 ++
 sc/source/core/data/column2.cxx |2 +-
 sc/source/core/data/documen2.cxx|   11 +--
 sc/source/core/data/documen8.cxx|4 ++--
 sc/source/core/data/document.cxx|2 +-
 sc/source/core/data/formulacell.cxx |   14 +++---
 sc/source/core/data/global.cxx  |2 ++
 8 files changed, 26 insertions(+), 23 deletions(-)

New commits:
commit 9dae52bbcb70e95c56a068c5c31f38500b7e465e
Author: Luboš Luňák 
Date:   Wed May 30 09:22:03 2018 +0200

move mbThreadedGroupCalcInProgress from ScDocument to ScGlobal

Some code, such as statics in ScGlobal, cannot(?) easily access ScDocument.
Moreover whether Calc is currently performing threaded calculations
is not really a state of a document but of Calc itself. Still keep
the state accessible via ScDocument for the pipe-dream future where it
possibly really will be a state of the document.

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

diff --git a/sc/inc/document.hxx b/sc/inc/document.hxx
index ccade9f02c6f..813d388abb4d 100644
--- a/sc/inc/document.hxx
+++ b/sc/inc/document.hxx
@@ -435,8 +435,6 @@ private:
 css::uno::Reference< css::script::vba::XVBAEventProcessor >
 mxVbaEvents;
 public:
-boolmbThreadedGroupCalcInProgress;
-
 /// list of ScInterpreterTableOpParams currently in use
 std::vector> m_TableOpList;
 ScInterpreterTableOpParams  aLastTableOpParams; // remember last params
@@ -575,6 +573,8 @@ public:
 maInterpreterContext.mpFormatter = GetFormatTable();
 return maInterpreterContext;
 }
+void SetThreadedGroupCalcInProgress( bool set ) { (void)this; 
ScGlobal::bThreadedGroupCalcInProgress = set; }
+bool IsThreadedGroupCalcInProgress() const { (void)this; return 
ScGlobal::bThreadedGroupCalcInProgress; }
 
 SC_DLLPUBLIC sfx2::LinkManager*   GetLinkManager();
 SC_DLLPUBLIC const sfx2::LinkManager* GetLinkManager() const;
@@ -2216,26 +2216,26 @@ public:
 
 voidIncInterpretLevel()
 {
-assert(!mbThreadedGroupCalcInProgress);
+assert(!IsThreadedGroupCalcInProgress());
 if ( nInterpretLevel < USHRT_MAX )
 nInterpretLevel++;
 }
 voidDecInterpretLevel()
 {
-assert(!mbThreadedGroupCalcInProgress);
+assert(!IsThreadedGroupCalcInProgress());
 if ( nInterpretLevel )
 nInterpretLevel--;
 }
 sal_uInt16  GetMacroInterpretLevel() { return 
nMacroInterpretLevel; }
 voidIncMacroInterpretLevel()
 {
-assert(!mbThreadedGroupCalcInProgress);
+assert(!IsThreadedGroupCalcInProgress());
 if ( nMacroInterpretLevel < USHRT_MAX )
 nMacroInterpretLevel++;
 }
 voidDecMacroInterpretLevel()
 {
-assert(!mbThreadedGroupCalcInProgress);
+assert(!IsThreadedGroupCalcInProgress());
 if ( nMacroInterpretLevel )
 nMacroInterpretLevel--;
 }
diff --git a/sc/inc/global.hxx b/sc/inc/global.hxx
index 050e38250508..56fe91be4aca 100644
--- a/sc/inc/global.hxx
+++ b/sc/inc/global.hxx
@@ -801,6 +801,8 @@ public:
 FormulaError & rError, FormulaError nStringNoValueError,
 SvNumberFormatter* pFormatter, SvNumFormatType & rCurFmtType );
 
+/// Calc's threaded group calculation is in progress.
+static bool bThreadedGroupCalcInProgress;
 };
 
 // maybe move to dbdata.hxx (?):
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index 79654808a14f..3c856fd161cd 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -2912,7 +2912,7 @@ void ScColumn::SetFormulaResults( SCROW nRow, const 
formula::FormulaConstTokenRe
 
 void ScColumn::CalculateInThread( ScInterpreterContext& rContext, SCROW nRow, 
size_t nLen, unsigned nThisThread, unsigned nThreadsTotal)
 {
-assert(GetDoc()->mbThreadedGroupCalcInProgress);
+assert(GetDoc()->IsThreadedGroupCalcInProgress());
 
 sc::CellStoreType::position_type aPos = maCells.position(nRow);
 sc::CellStoreType::iterator it = aPos.first;

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

[Luboš Luňák]

 sc/source/core/data/global.cxx |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit e0edc647d8eb17e69f7a807c7f4cdde7b4190b61
Author: Luboš Luňák 
Date:   Fri May 25 12:29:12 2018 +0200

assert(!bThreadedGroupCalcInProgress) in ScGlobal get-or-create functions

Similarly to ScGlobal::Get(Case)Collator() these could possibly lead
to a race condition of several singleton creations at the same time. That
doesn't seem to be the case after few tests, but better check.

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

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 531619a101a5..0ac839200cb3 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -205,6 +205,7 @@ sal_uInt16 ScGlobal::GetStandardRowHeight()
 
 SvNumberFormatter* ScGlobal::GetEnglishFormatter()
 {
+assert(!bThreadedGroupCalcInProgress);
 if ( !pEnglishFormatter )
 {
 pEnglishFormatter = new SvNumberFormatter(
@@ -251,6 +252,7 @@ bool ScGlobal::CheckWidthInvalidate( bool& 
bNumFormatChanged,
 
 const SvxSearchItem& ScGlobal::GetSearchItem()
 {
+assert(!bThreadedGroupCalcInProgress);
 if (!pSearchItem)
 {
 pSearchItem = new SvxSearchItem( SID_SEARCH_ITEM );
@@ -261,6 +263,7 @@ const SvxSearchItem& ScGlobal::GetSearchItem()
 
 void ScGlobal::SetSearchItem( const SvxSearchItem& rNew )
 {
+assert(!bThreadedGroupCalcInProgress);
 // FIXME: An assignment operator would be nice here
 delete pSearchItem;
 pSearchItem = static_cast(rNew.Clone());
@@ -271,6 +274,7 @@ void ScGlobal::SetSearchItem( const SvxSearchItem& rNew )
 
 void ScGlobal::ClearAutoFormat()
 {
+assert(!bThreadedGroupCalcInProgress);
 if (pAutoFormat)
 {
 //  When modified via StarOne then only the SaveLater flag is set and 
no saving is done.
@@ -289,6 +293,7 @@ ScAutoFormat* ScGlobal::GetAutoFormat()
 
 ScAutoFormat* ScGlobal::GetOrCreateAutoFormat()
 {
+assert(!bThreadedGroupCalcInProgress);
 if ( !pAutoFormat )
 {
 pAutoFormat = new ScAutoFormat;
@@ -300,6 +305,7 @@ ScAutoFormat* ScGlobal::GetOrCreateAutoFormat()
 
 LegacyFuncCollection* ScGlobal::GetLegacyFuncCollection()
 {
+assert(!bThreadedGroupCalcInProgress);
 if (!pLegacyFuncCollection)
 pLegacyFuncCollection = new LegacyFuncCollection();
 return pLegacyFuncCollection;
@@ -307,6 +313,7 @@ LegacyFuncCollection* ScGlobal::GetLegacyFuncCollection()
 
 ScUnoAddInCollection* ScGlobal::GetAddInCollection()
 {
+assert(!bThreadedGroupCalcInProgress);
 if (!pAddInCollection)
 pAddInCollection = new ScUnoAddInCollection();
 return pAddInCollection;
@@ -314,6 +321,7 @@ ScUnoAddInCollection* ScGlobal::GetAddInCollection()
 
 ScUserList* ScGlobal::GetUserList()
 {
+assert(!bThreadedGroupCalcInProgress);
 // Hack: Load Cfg item at the App
 global_InitAppOptions();
 
@@ -324,6 +332,7 @@ ScUserList* ScGlobal::GetUserList()
 
 void ScGlobal::SetUserList( const ScUserList* pNewList )
 {
+assert(!bThreadedGroupCalcInProgress);
 if ( pNewList )
 {
 if ( !pUserList )
@@ -459,6 +468,7 @@ OUString ScGlobal::GetLongErrorString(FormulaError nErr)
 
 SvxBrushItem* ScGlobal::GetButtonBrushItem()
 {
+assert(!bThreadedGroupCalcInProgress);
 pButtonBrushItem->SetColor( 
Application::GetSettings().GetStyleSettings().GetFaceColor() );
 return pButtonBrushItem;
 }
@@ -517,6 +527,7 @@ const OUString& ScGlobal::GetClipDocName()
 
 void ScGlobal::SetClipDocName( const OUString& rNew )
 {
+assert(!bThreadedGroupCalcInProgress);
 *pStrClipDocName = rNew;
 }
 
@@ -658,6 +669,7 @@ bool ScGlobal::HasStarCalcFunctionList()
 
 ScFunctionList* ScGlobal::GetStarCalcFunctionList()
 {
+assert(!bThreadedGroupCalcInProgress);
 if ( !pStarCalcFunctionList )
 pStarCalcFunctionList = new ScFunctionList;
 
@@ -666,6 +678,7 @@ ScFunctionList* ScGlobal::GetStarCalcFunctionList()
 
 ScFunctionMgr* ScGlobal::GetStarCalcFunctionMgr()
 {
+assert(!bThreadedGroupCalcInProgress);
 if ( !pStarCalcFunctionMgr )
 pStarCalcFunctionMgr = new ScFunctionMgr;
 
@@ -681,6 +694,7 @@ void ScGlobal::ResetFunctionList()
 
 ScUnitConverter* ScGlobal::GetUnitConverter()
 {
+assert(!bThreadedGroupCalcInProgress);
 if ( !pUnitConverter )
 pUnitConverter = new ScUnitConverter;
 
@@ -994,6 +1008,7 @@ void ScGlobal::AddLanguage( SfxItemSet& rSet, const 
SvNumberFormatter& rFormatte
 
 utl::TransliterationWrapper* ScGlobal::GetpTransliteration()
 {
+assert(!bThreadedGroupCalcInProgress);
 if ( !pTransliteration )
 {
 const LanguageType eOfficeLanguage = 
Application::GetSettings().GetLanguageTag().getLanguageType();
@@ -1016,6 +1031,7 @@ const LocaleDataWrapper* ScGlobal::GetpLocaleData()
 }
 CalendarWrapper* ScGlobal::GetCal

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

[Luboš Luňák]

 sc/source/core/data/global.cxx |   25 +++--
 1 file changed, 11 insertions(+), 14 deletions(-)

New commits:
commit 0c5dbc94220f6fa0829f61cfaf4ca658868563ce
Author: Luboš Luňák 
Date:   Wed May 30 09:26:42 2018 +0200

move related functions next to each other

And remove a pointless assert (the object is now created on demand).

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

diff --git a/sc/source/core/data/global.cxx b/sc/source/core/data/global.cxx
index 0ac839200cb3..6e258407653d 100644
--- a/sc/source/core/data/global.cxx
+++ b/sc/source/core/data/global.cxx
@@ -1016,11 +1016,19 @@ utl::TransliterationWrapper* 
ScGlobal::GetpTransliteration()
 ::comphelper::getProcessComponentContext(), 
TransliterationFlags::IGNORE_CASE );
 pTransliteration->loadModuleIfNeeded( eOfficeLanguage );
 }
-OSL_ENSURE(
-pTransliteration,
-"ScGlobal::GetpTransliteration() called before ScGlobal::Init()");
 return pTransliteration;
 }
+::utl::TransliterationWrapper* ScGlobal::GetCaseTransliteration()
+{
+assert(!bThreadedGroupCalcInProgress);
+if ( !pCaseTransliteration )
+{
+const LanguageType eOfficeLanguage = 
Application::GetSettings().GetLanguageTag().getLanguageType();
+pCaseTransliteration = new 
::utl::TransliterationWrapper(::comphelper::getProcessComponentContext(), 
TransliterationFlags::NONE );
+pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage );
+}
+return pCaseTransliteration;
+}
 
 const LocaleDataWrapper* ScGlobal::GetpLocaleData()
 {
@@ -1059,17 +1067,6 @@ CollatorWrapper*ScGlobal::GetCaseCollator()
 return p;
 });
 }
-::utl::TransliterationWrapper* ScGlobal::GetCaseTransliteration()
-{
-assert(!bThreadedGroupCalcInProgress);
-if ( !pCaseTransliteration )
-{
-const LanguageType eOfficeLanguage = 
Application::GetSettings().GetLanguageTag().getLanguageType();
-pCaseTransliteration = new 
::utl::TransliterationWrapper(::comphelper::getProcessComponentContext(), 
TransliterationFlags::NONE );
-pCaseTransliteration->loadModuleIfNeeded( eOfficeLanguage );
-}
-return pCaseTransliteration;
-}
 css::lang::Locale* ScGlobal::GetLocale()
 {
 assert(!bThreadedGroupCalcInProgress);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: sysui/desktop

[andreas kainz]

 sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet-template.png 
|binary
 sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet-template.svg 
|2 +-
 sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet.png  
|binary
 sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-spreadsheet.svg  
|2 +-
 sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-text-template.png
|binary
 sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-text-template.svg
|2 +-
 sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-text.png 
|binary
 sysui/desktop/icons/hicolor/1024x1024/mimetypes/oasis-text.svg 
|2 +-
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.png   
|binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet-template.svg   
|2 +-
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.png
|binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-spreadsheet.svg
|2 +-
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.png  
|binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text-template.svg  
|2 +-
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.png   
|binary
 sysui/desktop/icons/hicolor/128x128/mimetypes/oasis-text.svg   
|2 +-
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.png 
|binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet-template.svg 
|2 +-
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.png  
|binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-spreadsheet.svg  
|2 +-
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.png
|binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text-template.svg
|2 +-
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.png 
|binary
 sysui/desktop/icons/hicolor/16x16/mimetypes/oasis-text.svg 
|2 +-
 sysui/desktop/icons/hicolor/22x22/mimetypes/oasis-spreadsheet-template.png 
|binary
 sysui/desktop/icons/hicolor/22x22/mimetypes/oasis-spreadsheet-template.svg 
|1 +
 sysui/desktop/icons/hicolor/22x22/mimetypes/oasis-spreadsheet.png  
|binary
 sysui/desktop/icons/hicolor/22x22/mimetypes/oasis-spreadsheet.svg  
|1 +
 sysui/desktop/icons/hicolor/22x22/mimetypes/oasis-text-template.png
|binary
 sysui/desktop/icons/hicolor/22x22/mimetypes/oasis-text-template.svg
|1 +
 sysui/desktop/icons/hicolor/22x22/mimetypes/oasis-text.png 
|binary
 sysui/desktop/icons/hicolor/22x22/mimetypes/oasis-text.svg 
|1 +
 sysui/desktop/icons/hicolor/24x24/mimetypes/oasis-spreadsheet-template.png 
|binary
 sysui/desktop/icons/hicolor/24x24/mimetypes/oasis-spreadsheet-template.svg 
|1 +
 sysui/desktop/icons/hicolor/24x24/mimetypes/oasis-spreadsheet.png  
|binary
 sysui/desktop/icons/hicolor/24x24/mimetypes/oasis-spreadsheet.svg  
|1 +
 sysui/desktop/icons/hicolor/24x24/mimetypes/oasis-text-template.png
|binary
 sysui/desktop/icons/hicolor/24x24/mimetypes/oasis-text-template.svg
|1 +
 sysui/desktop/icons/hicolor/24x24/mimetypes/oasis-text.png 
|binary
 sysui/desktop/icons/hicolor/24x24/mimetypes/oasis-text.svg 
|1 +
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet-template.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet-template.svg   
|2 +-
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet.png
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-spreadsheet.svg
|2 +-
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text-template.png  
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text-template.svg  
|2 +-
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text.png   
|binary
 sysui/desktop/icons/hicolor/256x256/mimetypes/oasis-text.svg   
|2 +-
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.png 
|binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet-template.svg 
|2 +-
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.png  
|binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-spreadsheet.svg  
|2 +-
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.png
|binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text-template.svg
|2 +-
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.png 
|binary
 sysui/desktop/icons/hicolor/32x32/mimetypes/oasis-text.sv

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.0' - 2 commits - sc/CppunitTest_sc_tiledrendering.mk sw/source

[Tor Lillqvist]

 sc/CppunitTest_sc_tiledrendering.mk |6 +-
 sw/source/ui/vba/vbadocument.hxx|2 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 2832d53de6432aa3d42b85ace39deffa44cdecb4
Author: Tor Lillqvist 
Date:   Fri Jun 1 00:21:20 2018 +0300

Need oovbaapi here, too

Change-Id: I36cfb223c0884d0ed09c4b0065bedcc846523f0f

diff --git a/sc/CppunitTest_sc_tiledrendering.mk 
b/sc/CppunitTest_sc_tiledrendering.mk
index ac70a06453ad..e361870785ce 100644
--- a/sc/CppunitTest_sc_tiledrendering.mk
+++ b/sc/CppunitTest_sc_tiledrendering.mk
@@ -46,7 +46,11 @@ $(eval $(call gb_CppunitTest_set_include,sc_tiledrendering,\
 $$(INCLUDE) \
 ))
 
-$(eval $(call gb_CppunitTest_use_sdk_api,sc_tiledrendering))
+$(eval $(call gb_CppunitTest_use_api,sc_tiledrendering,\
+   udkapi \
+   offapi \
+   oovbaapi \
+))
 
 $(eval $(call gb_CppunitTest_use_ure,sc_tiledrendering))
 $(eval $(call gb_CppunitTest_use_vcl,sc_tiledrendering))
commit 081811832d5cb1f7a89c681168e04021f7b5bce4
Author: Tor Lillqvist 
Date:   Fri Jun 1 00:13:54 2018 +0300

Need to include 

Change-Id: Ia08088720bd2c809ba6d2be4c2e42be91f161bae

diff --git a/sw/source/ui/vba/vbadocument.hxx b/sw/source/ui/vba/vbadocument.hxx
index 7cbc63773319..19ca2eed8caa 100644
--- a/sw/source/ui/vba/vbadocument.hxx
+++ b/sw/source/ui/vba/vbadocument.hxx
@@ -19,6 +19,8 @@
 #ifndef INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENT_HXX
 #define INCLUDED_SW_SOURCE_UI_VBA_VBADOCUMENT_HXX
 
+#include 
+
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit 4db29b7297a9fff6ef73d23d6e711fbf0cf32be2
Author: Adolfo Jayme Barrientos 
Date:   Thu May 31 18:53:51 2018 -0500

Updated core
Project: help  5c2b056fd305b90dfbe4dc7168c8c1208ec0a41c

Update documentation for augmented AutoCorrect formatting feature

After two years.

See core commits 6bfe94a631b5c5029a1f96a52b000d25e33bad4a
and 125ea721e1988bb815ef8c72ef58d00938e3e45a.

Change-Id: Ie966813ef1f8b4a82bdb7478b9565cf3a8702ab2

diff --git a/helpcontent2 b/helpcontent2
index fc875c6ab376..5c2b056fd305 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit fc875c6ab3763e36008fd872b3670d953f18ba9d
+Subproject commit 5c2b056fd305b90dfbe4dc7168c8c1208ec0a41c
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos]

 source/text/shared/01/06040100.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5c2b056fd305b90dfbe4dc7168c8c1208ec0a41c
Author: Adolfo Jayme Barrientos 
Date:   Thu May 31 18:53:51 2018 -0500

Update documentation for augmented AutoCorrect formatting feature

After two years.

See core commits 6bfe94a631b5c5029a1f96a52b000d25e33bad4a
and 125ea721e1988bb815ef8c72ef58d00938e3e45a.

Change-Id: Ie966813ef1f8b4a82bdb7478b9565cf3a8702ab2

diff --git a/source/text/shared/01/06040100.xhp 
b/source/text/shared/01/06040100.xhp
index 4c8bfa8ca..6fd128ee8 100644
--- a/source/text/shared/01/06040100.xhp
+++ b/source/text/shared/01/06040100.xhp
@@ -73,9 +73,9 @@
 The first letter in 
a Calc cell will never be capitalized automatically.see 
i78661
 
 
-Automatic *bold* and _underline_
-  Automatically applies bold formatting to text enclosed by 
asterisks (*), and underline to text enclosed by underscores ( _ ), for 
example, *bold*. The asterisks and underscores are not displayed after the 
formatting is applied.
-  This feature 
does not work if the formatting characters * or _ are entered with an Input Method 
Editor.
+Automatic *bold*, /italic/, -strikeout- and _underline_
+  Automatically applies bold, italic, strikethrough or underline 
formatting to text enclosed by asterisks (*), slashes (/), underscores (_), and 
hyphens (-), respectively. These characters disappear after the formatting is 
applied.
+  This feature 
does not work if the formatting characters * / - _ 
are entered with an Input Method Editor.
   URL Recognition
   Automatically creates a hyperlink when you type a URL.
 UFI: moved "replace 1st" to Localized Options tab page, cws 
cbosdo01
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] help.git: Branch 'libreoffice-6-1' - source/text

[Adolfo Jayme Barrientos]

 source/text/shared/01/06040100.xhp |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9969ea3317dd159479553c6d0e747ec4ba22aacb
Author: Adolfo Jayme Barrientos 
Date:   Thu May 31 18:53:51 2018 -0500

Update documentation for augmented AutoCorrect formatting feature

After two years.

See core commits 6bfe94a631b5c5029a1f96a52b000d25e33bad4a
and 125ea721e1988bb815ef8c72ef58d00938e3e45a.

Change-Id: Ie966813ef1f8b4a82bdb7478b9565cf3a8702ab2
(cherry picked from commit 5c2b056fd305b90dfbe4dc7168c8c1208ec0a41c)
Reviewed-on: https://gerrit.libreoffice.org/55150
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/01/06040100.xhp 
b/source/text/shared/01/06040100.xhp
index 4c8bfa8ca..826f30fe4 100644
--- a/source/text/shared/01/06040100.xhp
+++ b/source/text/shared/01/06040100.xhp
@@ -73,9 +73,9 @@
 The first letter in 
a Calc cell will never be capitalized automatically.see 
i78661
 
 
-Automatic *bold* and _underline_
-  Automatically applies bold formatting to text enclosed by 
asterisks (*), and underline to text enclosed by underscores ( _ ), for 
example, *bold*. The asterisks and underscores are not displayed after the 
formatting is applied.
-  This feature 
does not work if the formatting characters * or _ are entered with an Input Method 
Editor.
+Automatic *bold*, /italic/, -strikeout- and _underline_
+  Automatically applies bold, italic, strikethrough or underline 
formatting to text enclosed by asterisks (*), slashes (/), hyphens (-), and 
underscores (_), respectively. These characters disappear after the formatting 
is applied.
+  This feature 
does not work if the formatting characters * / - _ 
are entered with an Input Method Editor.
   URL Recognition
   Automatically creates a hyperlink when you type a URL.
 UFI: moved "replace 1st" to Localized Options tab page, cws 
cbosdo01
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit 37098d5b3fc6e1218e5a3465df8bac2882abf5c7
Author: Adolfo Jayme Barrientos 
Date:   Thu May 31 18:53:51 2018 -0500

Updated core
Project: help  9969ea3317dd159479553c6d0e747ec4ba22aacb

Update documentation for augmented AutoCorrect formatting feature

After two years.

See core commits 6bfe94a631b5c5029a1f96a52b000d25e33bad4a
and 125ea721e1988bb815ef8c72ef58d00938e3e45a.

Change-Id: Ie966813ef1f8b4a82bdb7478b9565cf3a8702ab2
(cherry picked from commit 5c2b056fd305b90dfbe4dc7168c8c1208ec0a41c)
Reviewed-on: https://gerrit.libreoffice.org/55150
Reviewed-by: Adolfo Jayme Barrientos 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 68a448eb80ce..9969ea3317dd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 68a448eb80ce2127001d65af18a48ac4616effbd
+Subproject commit 9969ea3317dd159479553c6d0e747ec4ba22aacb
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Adolfo Jayme Barrientos]

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

New commits:
commit cf07a8c8dbc38bcc7894a45adce91fc5d8add36c
Author: Adolfo Jayme Barrientos 
Date:   Thu May 31 19:17:56 2018 -0500

Updated core
Project: help  86550547983760f747983ca4b4ee91ad5bd21fdf

Remove some whitespace

Change-Id: I13d97a011fa8ee4accaa90dd9cbf8457e4571071

diff --git a/helpcontent2 b/helpcontent2
index 5c2b056fd305..865505479837 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 5c2b056fd305b90dfbe4dc7168c8c1208ec0a41c
+Subproject commit 86550547983760f747983ca4b4ee91ad5bd21fdf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Adolfo Jayme Barrientos]

 source/text/shared/01/06040100.xhp   |6 +++---
 source/text/shared/guide/line_intext.xhp |2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 86550547983760f747983ca4b4ee91ad5bd21fdf
Author: Adolfo Jayme Barrientos 
Date:   Thu May 31 19:17:56 2018 -0500

Remove some whitespace

Change-Id: I13d97a011fa8ee4accaa90dd9cbf8457e4571071

diff --git a/source/text/shared/01/06040100.xhp 
b/source/text/shared/01/06040100.xhp
index 6fd128ee8..067a8512c 100644
--- a/source/text/shared/01/06040100.xhp
+++ b/source/text/shared/01/06040100.xhp
@@ -74,7 +74,7 @@
 
 
 Automatic *bold*, /italic/, -strikeout- and _underline_
-  Automatically applies bold, italic, strikethrough or underline 
formatting to text enclosed by asterisks (*), slashes (/), underscores (_), and 
hyphens (-), respectively. These characters disappear after the formatting is 
applied.
+  Automatically applies bold, italic, strikethrough or underline 
formatting to text enclosed by asterisks (*), slashes (/), hyphens (-), and 
underscores (_), respectively. These characters disappear after the formatting 
is applied.
   This feature 
does not work if the formatting characters * / - _ 
are entered with an Input Method Editor.
   URL Recognition
   Automatically creates a hyperlink when you type a URL.
@@ -166,7 +166,7 @@
 
 
 Apply 
border
-  Automatically applies a border at the base of the preceding 
paragraph when you type three or more specific characters, and then press 
Enter. To create a single line, type three or more hyphens (-), or underscores 
( _ ), and then press Enter. To create a double line, type three or more equal 
signs (=), asterisks (*), tildes (~), or hash marks (#), and then press 
Enter.
+  Automatically applies a border at the base of the preceding 
paragraph when you type three or more specific characters, and then press 
Enter. To create a single line, type three or more hyphens (-), or underscores 
(_), and then press Enter. To create a double line, type three or more equal 
signs (=), asterisks (*), tildes (~), or hash marks (#), and then press 
Enter.
   To delete 
the created line, click the paragraph above the line, choose Format - 
Paragraph - Borders, delete the bottom border.
   The 
following table summarizes the line thickness for the different characters: 

   
@@ -245,7 +245,7 @@
   Converts paragraphs that start with a hyphen (-), a plus sign 
(+), or an asterisk (*) directly followed by a space or a tab, to bulleted 
lists. This option only works on paragraphs that are formatted with the 
"Default", "Text Body", or "Text Body Indent" paragraph styles. To change the 
bullet style that is used, select this option, and then click Edit.
 
 removed "replace standard quotes..." cws cbosdo01
-Combine 
single line paragraphs if length greater than ...
+Combine 
single line paragraphs if length greater than...
 
   Combines consecutive single-line paragraphs into a single 
paragraph. This option only works on paragraphs that use the "Default" 
paragraph style. If a paragraph is longer than the specified length value, the 
paragraph is combined with the next paragraph. To enter a different length 
value, select the option, and then click Edit.
 
diff --git a/source/text/shared/guide/line_intext.xhp 
b/source/text/shared/guide/line_intext.xhp
index 7d67fb60f..06575b389 100644
--- a/source/text/shared/guide/line_intext.xhp
+++ b/source/text/shared/guide/line_intext.xhp
@@ -103,7 +103,7 @@
 
 
 If you start a 
new line in a Writer text document by typing three or more hyphen characters 
and press the Enter key, the characters are removed and the previous paragraph 
gets a line as a bottom border.
-To create a 
single line, type three or more hyphens (-), or underscores ( _ ), and then 
press Enter. To create a double line, type three or more equal signs (=), 
asterisks (*), tildes (~), or hash marks (#), and then press Enter.
+To create a 
single line, type three or more hyphens (-), or underscores (_), and then press 
Enter. To create a double line, type three or more equal signs (=), asterisks 
(*), tildes (~), or hash marks (#), and then press Enter.
 
 
 To remove an 
automatically drawn border, choose Format - Paragraph - Borders 
and select no border.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sophia Schröder]

 source/text/shared/00/0402.xhp |  147 +
 source/text/shared/00/0403.xhp |   69 ++---
 source/text/shared/00/0404.xhp |   72 ++
 source/text/shared/00/0406.xhp |   28 +++
 source/text/shared/00/0407.xhp |7 -
 source/text/shared/00/0408.xhp |   11 +-
 source/text/shared/00/0409.xhp |   18 ++--
 source/text/shared/00/0450.xhp |   98 
 8 files changed, 166 insertions(+), 284 deletions(-)

New commits:
commit 9f2d4891c943ad0fcc88ca483ab8305c56904cd9
Author: Sophia Schröder 
Date:   Sat May 19 19:12:02 2018 +0100

Cleanups and improvements

Help files in shared/00/ (partial)

Change-Id: I500d84668560ea125c39df03d2553658b5ac2f87
Reviewed-on: https://gerrit.libreoffice.org/54573
Tested-by: Jenkins 
Reviewed-by: Martin Srebotnjak 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/00/0402.xhp 
b/source/text/shared/00/0402.xhp
index 95f8f17b2..52b456241 100644
--- a/source/text/shared/00/0402.xhp
+++ b/source/text/shared/00/0402.xhp
@@ -29,17 +29,15 @@
 
 Edit 
Menu
 
-Choose 
Edit - Undo
-
+Choose 
Edit - Undo.
 CommandCtrl+Z
-On the 
Standard Bar or Table Data bar, click
+On the 
Standard bar or Table Data bar, click
 
 
 
 
 
-Icon
-   
+Icon
 
 
 Undo
@@ -50,16 +48,14 @@
 
 
 
-Choose 
Edit - Redo
-
-On the 
Standard Bar, click
+Choose 
Edit - Redo.
+On the 
Standard bar, click
 
 
 
 
 
-Icon
-   
+Icon
 
 
 Redo
@@ -69,20 +65,17 @@
 
 
 
-Choose Edit - Repeat
-
+Choose Edit - Repeat.
 
-Choose 
Edit - Cut
-
+Choose 
Edit - Cut.
 CommandCtrl+X
-On the 
Standard Bar, click
+On the 
Standard bar, click
 
 
 
 
 
-Icon
-   
+Icon
 
 
 Cut
@@ -93,17 +86,15 @@
 
 
 
-Choose 
Edit - Copy
-
+Choose 
Edit - Copy.
 CommandCtrl+C
-On the 
Standard Bar, click
+On the 
Standard bar, click
 
 
 
 
 
-Icon
-   
+Icon
 
 
 Copy
@@ -114,17 +105,15 @@
 
 
 
-Choose 
Edit - Paste
-
+Choose 
Edit - Paste.
 CommandCtrl+V
-On the 
Standard Bar, click
+On the 
Standard bar, click
 
 
 
 
 
-Icon
-   
+Icon
 
 
 Paste
@@ -134,19 +123,16 @@
 
 
 
-Choose Edit - Paste Special
-
+Choose Edit - Paste Special.
 
-Choose 
Edit - Select All
-
+Choose 
Edit - Select All.
 CommandCtrl+A
 
 
 
 
 
-Icon
-   
+Icon
 
 
 Select 
All
@@ -156,49 +142,38 @@
 
 
 
-Choose Edit - Track Changes
-
-Choose Edit - Track Changes - Record
-
-Choose 
Edit - Track Changes - Show
-Choose Edit - Track Changes - 
Show
+Choose Edit - Track 
Changes.
+Choose Edit - Track Changes - 
Record.
+Choose 
Edit - Track Changes - Show.
+Choose Edit - Track Changes - 
Show.
 
 
-Choose Edit - Track Changes - Manage
-
+Choose Edit - Track Changes - 
Manage.
 
-Choose 
Edit - Track Changes - Manage - List tab
-Choose 
Tools - AutoCorrect - Apply and Edit Changes. The AutoCorrect 
dialog appears. Click the Edit Changes button and navigate to the 
List tab.
+Choose 
Edit - Track Changes - Manage - List tab.
+Choose 
Tools - AutoCorrect - Apply and Edit Changes. The 
AutoCorrect dialog appears.Click the Edit 
Changes button and navigate to the List tab.
 
-Choose Edit - Track Changes - Manage - Filter 
tab
-
-Choose Edit - Track Changes - Merge Document
-
-Choose Edit - Track Changes - Compare Document
-
+Choose Edit - Track Changes - Manage - Filter 
tab.
+Choose Edit - Track Changes - Merge 
Document.
+Choose Edit - Track Changes - Compare 
Document.
 
-Choose 
Edit - Track Changes - Comment
-
-Choose 
Edit - Track Changes - Manage - List tab. Click an entry in the 
list and open the context menu. Choose Edit Comment
-
+Choose 
Edit - Track Changes - Comment.
+Choose 
Edit - Track Changes - Manage - List tab.Click an entry in 
the list and open the context menu.Choose Edit 
Comment.
 
 
-Choose 
Edit - Find
-
+Choose 
Edit - Find.
 CommandCtrl+F
 
 
-Choose 
Edit - Find & Replace
-
+Choose 
Edit - Find & Replace.
 CommandCtrl+H
-On Standard 
bar, click
+  On the 
Standard bar, click
 
 
 
 
 
-Icon
-   
+Icon
 
 
 Find & 
Replace
@@ -208,25 +183,21 @@
 
 
 
-Choose Edit - Find & Replace - Attributes
-
-Choose Edit - Find & Replace - Format button 
-
+Choose Edit - Find & Replace - 
Attributes.
+Choose Edit - Find & Replace - Format 
button.
 
-Choose 
Edit - Find & Replace - Similarity search check box and 
Similarities button.
-On the 
Table Data Bar, click Find icon - Similarity 
search check box - Similarities button (database table 
view)
-On Form 
Design Bar, click Record Search - Similarity 
search check box - Similarities button (form 
view)
+Choose 
Edit - Find & Replace - Similarity search check box, then 
click the Similarities button.
+On the 
Table Data bar, click Find icon, then 
Similarity search check box,then click the 
Similarities button (database table view).
+On the 
Form Design bar, click Record Search icon, then 
Similarity search check box,then click the 
Similarities button (form view).
 
 
-Choose 
View - Navigator
-
-On 
Stan

[Libreoffice-commits] core.git: helpcontent2

[Sophia Schröder]

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

New commits:
commit 6346b6236e1b2a5bd1c20bb83023c43d9728c77c
Author: Sophia Schröder 
Date:   Sat May 19 19:12:02 2018 +0100

Updated core
Project: help  9f2d4891c943ad0fcc88ca483ab8305c56904cd9

Cleanups and improvements

Help files in shared/00/ (partial)

Change-Id: I500d84668560ea125c39df03d2553658b5ac2f87
Reviewed-on: https://gerrit.libreoffice.org/54573
Tested-by: Jenkins 
Reviewed-by: Martin Srebotnjak 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 865505479837..9f2d4891c943 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 86550547983760f747983ca4b4ee91ad5bd21fdf
+Subproject commit 9f2d4891c943ad0fcc88ca483ab8305c56904cd9
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Sophia Schröder]

 source/text/shared/00/0401.xhp |  339 -
 1 file changed, 118 insertions(+), 221 deletions(-)

New commits:
commit 144741785f13606aaecd37b5fd9769c746fc71a8
Author: Sophia Schröder 
Date:   Sat May 19 18:33:35 2018 +0100

Some rework / cleanups (take2)

Change-Id: I1c8707ed4d86322455500f5ca55047fd9b276c65
Reviewed-on: https://gerrit.libreoffice.org/54568
Tested-by: Jenkins 
Reviewed-by: Martin Srebotnjak 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/source/text/shared/00/0401.xhp 
b/source/text/shared/00/0401.xhp
index fa1c6e079..e3c04ed08 100644
--- a/source/text/shared/00/0401.xhp
+++ b/source/text/shared/00/0401.xhp
@@ -28,20 +28,17 @@
 
 
 File 
Menu
-Choose File - Preview in Web Browser
-
+Choose File - Preview in Web 
Browser.
 
-Choose 
File - New
-
+Choose 
File - New.
 
-New icon on the Standard Bar (the icon shows the 
type of the new document)
+New icon on the Standard bar (the icon shows the 
type of the new document).
 
 
 
 
 
-Icon
-   
+Icon
 
 
 New
@@ -53,44 +50,34 @@
 Key 
CommandCtrl+N
 
 
-Menu 
File - New
-- Templates.
+Menu 
File - New - Templates.
 Key 
Shift+CommandCtrl+N
 
-Choose File - New - Labels
-
-Choose File - New - Labels - Labels tab
-
+Choose File - New - Labels.
+Choose File - New - Labels - Labels 
tab.
 
-Choose 
File - New - Labels - Format tab
-Choose 
File - New - Business Cards - Format tab
+Choose 
File - New - Labels - Format tab.
+Choose 
File - New - Business Cards - Format tab.
 
 
-Choose 
File - New - Labels - Options tab
-Choose 
File - New - Business Cards - Options tab
+Choose 
File - New - Labels - Options tab.
+Choose 
File - New - Business Cards - Options tab.
 
-Choose File - New - Business Cards
-
-Choose File - New - Business Cards - Medium tab
-
-Choose File - New - Business Cards - Business 
cards tab
-
-Choose File - New - Business Cards - Private tab
-
-Choose File - New - Business Cards - Business tab
-
+Choose File - New - Business 
Cards.
+Choose File - New - Business Cards - Medium 
tab.
+Choose File - New - Business Cards - Business 
cards tab.
+Choose File - New - Business Cards - Private 
tab.
+Choose File - New - Business Cards - Business 
tab.
 
-Choose 
File - Open
-
+Choose 
File - Open.
 CommandCtrl+O
-On the 
Standard Bar, click
+On the 
Standard bar, click
 
 
 
 
 
-Icon
-   
+Icon
 
 
 Open 
File
@@ -101,115 +88,66 @@
 
 
 
-Menu 
File - Open, File type Text Encoded 
selected
-Menu 
File - Save As, File type Text Encoded 
selected
+Menu 
File - Open, File type Text Encoded 
selected.
+Menu 
File - Save As, File type Text Encoded 
selected.
 
-Choose File - Wizards
-
-Choose File - Wizards - Letter
-
-Choose File - Wizards - Letter - Page design
-
-Choose File - Wizards - Letter - Letterhead 
layout
-
-Choose File - Wizards - Letter - Printed items
-
-Choose File - Wizards - Letter - Recipient and 
sender
-
-Choose File - Wizards - Letter - Footer
-
-Choose File - Wizards - Letter - 
-Name and Location
-
-Choose File - Wizards - Fax
-
-Choose File - Wizards - Fax - Page Design
-
-Choose File - Wizards - Fax - Items to include
-
-Choose File - Wizards - Fax - Sender and 
Recipient
-
-Choose File - Wizards - Fax - Footer
-
-Choose File - Wizards - Fax - Name and location
-
-Choose File - Wizards - Agenda
-
-Choose File - Wizards - Agenda - Page Design
-
-Choose File - Wizards - Agenda - General 
Attributes
-
-Choose File - Wizards - Agenda - Headings
-
-Choose File - Wizards - Agenda - Names
-
-Choose File - Wizards - Agenda - Topics
-
-Choose File - Wizards - Agenda - Title and 
Location
-
-Choose File - Wizards - Presentation
-
-Choose File - Wizards - Presentation - Page 1
-
-Choose File - Wizards - Presentation - Page 2
-
-Choose File - Wizards - Presentation - Page 3
-
-Choose File - Wizards - Presentation - Page 4
-
-Choose File - Wizards - Presentation - Page 5
-
-Click Use Wizard to Create Form in a 
database file window.
-
-Click Use Wizard to Create Report in a 
database file window.
-
-In form design, click the Group Box icon on the 
toolbar and use the mouse to create a frame.
-
-In form design, click the Group Box icon on the 
toolbar and use the mouse to create a frame - Wizards page 1
-
-In form design, click the Group Box icon on the 
toolbar and use the mouse to create a frame - Wizards page 2
-
-In form design, click the Group Box icon on the 
toolbar and use the mouse to create a frame - Wizards page 3
-
-In form design, click the Group Box icon on the 
toolbar and use the mouse to create a frame - Wizards page 4, there must be a 
database connection.
-
-In form design, click the Group Box icon on the 
toolbar and use the mouse to create a frame - last page of Wizards
-
-Choose File - Wizards - Document Converter
-
-Choose File - Wizards - Document Converter
-
-Choose File - Wizards - Document Converter
-
-Choose File - Wizards - Euro Converter
-
+Choose File - Wizards.
+Choose File - Wizards - 
Letter.
+Choose File 

[Libreoffice-commits] core.git: helpcontent2

[Sophia Schröder]

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

New commits:
commit 85849a28bf45a16f76ebf9b82ba59de15670c0f4
Author: Sophia Schröder 
Date:   Sat May 19 18:33:35 2018 +0100

Updated core
Project: help  144741785f13606aaecd37b5fd9769c746fc71a8

Some rework / cleanups (take2)

Change-Id: I1c8707ed4d86322455500f5ca55047fd9b276c65
Reviewed-on: https://gerrit.libreoffice.org/54568
Tested-by: Jenkins 
Reviewed-by: Martin Srebotnjak 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/helpcontent2 b/helpcontent2
index 9f2d4891c943..144741785f13 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 9f2d4891c943ad0fcc88ca483ab8305c56904cd9
+Subproject commit 144741785f13606aaecd37b5fd9769c746fc71a8
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Patrick Jaap]

 sw/qa/extras/odfimport/data/tdf116195.odt |binary
 sw/qa/extras/odfimport/odfimport.cxx  |8 
 sw/source/filter/xml/xmlimp.cxx   |2 +-
 3 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 39f2125c4952063f4bdc36d9abba18daaee72d68
Author: Patrick Jaap 
Date:   Tue Apr 10 15:29:56 2018 +0200

tdf#116195 swap a compatibility value

There was a minor bug in the compat flag, leading
to a regression from commit 8d62b79f168180c6992eb483ec864d473050635f

Change-Id: I1e468e665a583ef15b6e474c3adb32f1dcf98f46
Reviewed-on: https://gerrit.libreoffice.org/52674
Tested-by: Jenkins 
Reviewed-by: Miklos Vajna 
(cherry picked from commit fe3d5766fa3c42f6cf8d1ea47af820e0b1c1cf48)
Reviewed-on: https://gerrit.libreoffice.org/55120
Reviewed-by: Patrick Jaap 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/qa/extras/odfimport/data/tdf116195.odt 
b/sw/qa/extras/odfimport/data/tdf116195.odt
new file mode 100644
index ..21a601f69d66
Binary files /dev/null and b/sw/qa/extras/odfimport/data/tdf116195.odt differ
diff --git a/sw/qa/extras/odfimport/odfimport.cxx 
b/sw/qa/extras/odfimport/odfimport.cxx
index 175fa31c888e..8c57b5b2ffc7 100644
--- a/sw/qa/extras/odfimport/odfimport.cxx
+++ b/sw/qa/extras/odfimport/odfimport.cxx
@@ -902,5 +902,13 @@ DECLARE_ODFIMPORT_TEST(testTdf108482, "tdf108482.odt")
 );
 }
 
+DECLARE_ODFIMPORT_TEST(testTdf116195, "tdf116195.odt")
+{
+// The image was set to zero height due to a regression
+CPPUNIT_ASSERT_EQUAL(
+sal_Int32(12960), 
parseDump("/root/page/anchored/fly/notxt/infos/bounds", "height").toInt32()
+);
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index dfbc7f832105..18ca69cb9589 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -1399,7 +1399,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence 
< PropertyValue > & aC
 if (!bSubtractFlysAnchoredAtFlys)
 xProps->setPropertyValue("SubtractFlysAnchoredAtFlys", makeAny(true));
 
-if ( !bDisableOffPagePositioning )
+if ( bDisableOffPagePositioning )
 xProps->setPropertyValue("DisableOffPagePositioning", makeAny(true));
 
 SwDoc *pDoc = getDoc();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Fred Kruse]

 linguistic/source/gciterator.cxx  |   62 +
 linguistic/source/gciterator.hxx  |   28 +
 offapi/com/sun/star/text/TextMarkupDescriptor.idl |   10 +++
 sw/source/core/inc/wrong.hxx  |   64 +-
 4 files changed, 161 insertions(+), 3 deletions(-)

New commits:
commit 7e428cac54c0a10aa7885923b836562e8fa82235
Author: Fred Kruse 
Date:   Mon May 28 13:04:48 2018 +0200

linguistic: add functionality to change spellcheck color

This adds a way for the grammar checker extension to change color
and line type of the 'wiggly lines' LibreOffice uses to highlight
spelling or grammar errors.

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

diff --git a/linguistic/source/gciterator.cxx b/linguistic/source/gciterator.cxx
index b1dce0de8543..a1bba7cbf739 100644
--- a/linguistic/source/gciterator.cxx
+++ b/linguistic/source/gciterator.cxx
@@ -233,6 +233,50 @@ static lang::Locale lcl_GetPrimaryLanguageOfSentence(
 }
 
 
+SwXStringKeyMap::SwXStringKeyMap() {}
+
+void SAL_CALL SwXStringKeyMap::insertValue(const OUString& aKey, const 
css::uno::Any& aValue)
+{
+std::map::const_iterator aIter = maMap.find(aKey);
+if (aIter != maMap.end())
+throw css::container::ElementExistException();
+
+maMap[aKey] = aValue;
+}
+
+css::uno::Any SAL_CALL SwXStringKeyMap::getValue(const OUString& aKey)
+{
+std::map::const_iterator aIter = maMap.find(aKey);
+if (aIter == maMap.end())
+throw css::container::NoSuchElementException();
+
+return (*aIter).second;
+}
+
+sal_Bool SAL_CALL SwXStringKeyMap::hasValue(const OUString& aKey)
+{
+return maMap.find(aKey) != maMap.end();
+}
+
+::sal_Int32 SAL_CALL SwXStringKeyMap::getCount() { return maMap.size(); }
+
+OUString SAL_CALL SwXStringKeyMap::getKeyByIndex(::sal_Int32 nIndex)
+{
+if (static_cast(nIndex) >= maMap.size())
+throw css::lang::IndexOutOfBoundsException();
+
+return OUString();
+}
+
+css::uno::Any SAL_CALL SwXStringKeyMap::getValueByIndex(::sal_Int32 nIndex)
+{
+if (static_cast(nIndex) >= maMap.size())
+throw css::lang::IndexOutOfBoundsException();
+
+return css::uno::Any();
+}
+
+
 GrammarCheckingIterator::GrammarCheckingIterator() :
 m_bEnd( false ),
 m_aCurCheckedDocId(),
@@ -382,6 +426,24 @@ void GrammarCheckingIterator::ProcessResult(
 // differently for example. But no special handling right 
now.
 if (rDesc.nType == text::TextMarkupType::SPELLCHECK)
 rDesc.nType = text::TextMarkupType::PROOFREADING;
+
+uno::Reference< container::XStringKeyMap > xKeyMap(
+new SwXStringKeyMap());
+for( const beans::PropertyValue& rProperty : 
rError.aProperties )
+{
+if ( rProperty.Name == "LineColor" )
+{
+xKeyMap->insertValue(rProperty.Name,
+ rProperty.Value);
+rDesc.xMarkupInfoContainer = xKeyMap;
+}
+else if ( rProperty.Name == "LineType" )
+{
+xKeyMap->insertValue(rProperty.Name,
+ rProperty.Value);
+rDesc.xMarkupInfoContainer = xKeyMap;
+}
+}
 }
 
 // at pos nErrors -> sentence markup
diff --git a/linguistic/source/gciterator.hxx b/linguistic/source/gciterator.hxx
index 568a30f50150..9241b4136dd7 100644
--- a/linguistic/source/gciterator.hxx
+++ b/linguistic/source/gciterator.hxx
@@ -37,6 +37,10 @@
 #include 
 #include 
 
+#include 
+#include 
+#include 
+
 #include 
 #include 
 
@@ -180,6 +184,30 @@ public:
 };
 
 
+/** Implementation of the css::container::XStringKeyMap interface
+ */
+class SwXStringKeyMap : public 
::cppu::WeakImplHelper
+{
+public:
+SwXStringKeyMap();
+
+virtual css::uno::Any SAL_CALL getValue(const OUString& aKey) override;
+virtual sal_Bool SAL_CALL hasValue(const OUString& aKey) override;
+virtual void SAL_CALL insertValue(const OUString& aKey, const 
css::uno::Any& aValue) override;
+virtual ::sal_Int32 SAL_CALL getCount() override;
+virtual OUString SAL_CALL getKeyByIndex(::sal_Int32 nIndex) override;
+virtual css::uno::Any SAL_CALL getValueByIndex(::sal_Int32 nIndex) 
override;
+
+private:
+SwXStringKeyMap(SwXStringKeyMap&) = delete;
+void operator=(SwXStringKeyMap&) = delete;
+
+~SwXStringKeyMap() override{};
+
+std::map maMap;
+};
+
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/offapi/com/sun/star/text/TextMarkupDescriptor.idl 

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

[Henry Castro]

 sc/qa/unit/screenshots/screenshots.cxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 25d6789e0e7949fa2e7441eeeb0f6e9cf701dbed
Author: Henry Castro 
Date:   Thu May 31 21:54:42 2018 -0400

sc: disable test that fails on Windows

reference "Daily Screenshot Build on Windows - Build # 410 - Failure!"

https://ci.libreoffice.org/job/lo_tb_master_win_screenshot/410/

Change-Id: I4fe6b46e7c2a7a1904ffb86dd68d689f7ada9def

diff --git a/sc/qa/unit/screenshots/screenshots.cxx 
b/sc/qa/unit/screenshots/screenshots.cxx
index a758ef0369ba..b04d49b43fe3 100644
--- a/sc/qa/unit/screenshots/screenshots.cxx
+++ b/sc/qa/unit/screenshots/screenshots.cxx
@@ -77,7 +77,6 @@ public:
 
 CPPUNIT_TEST_SUITE(ScScreenshotTest);
 CPPUNIT_TEST(testOpeningModalDialogs);
-CPPUNIT_TEST(testMultiViewCopyPaste);
 CPPUNIT_TEST_SUITE_END();
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski]

 sw/source/core/crsr/crstrvl.cxx |   62 +++-
 1 file changed, 43 insertions(+), 19 deletions(-)

New commits:
commit cdc6075e41a9f920b47dbf2c48fbb0c3632a0c8a
Author: Jim Raykowski 
Date:   Sat May 26 11:52:57 2018 -0800

tdf#115600 Display messages in Findbar for Index entry navigation

...and make Index entry navigation wrap

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

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index c12c9900cfed..fe4c0f8e8ed1 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -493,6 +493,8 @@ bool SwCursorShell::GotoNxtPrvTableFormula( bool bNext, 
bool bOnlyErrors )
 /// jump to next/previous index marker
 bool SwCursorShell::GotoNxtPrvTOXMark( bool bNext )
 {
+SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+
 if( IsTableMode() )
 return false;
 
@@ -515,30 +517,52 @@ bool SwCursorShell::GotoNxtPrvTOXMark( bool bNext )
 const SwTextTOXMark* pTextTOX;
 sal_uInt32 n, nMaxItems = GetDoc()->GetAttrPool().GetItemCount2( 
RES_TXTATR_TOXMARK );
 
-for( n = 0; n < nMaxItems; ++n )
+if( nMaxItems > 0 )
 {
-const SfxPoolItem* pItem;
-const SwContentFrame* pCFrame;
-
-if( nullptr != (pItem = GetDoc()->GetAttrPool().GetItem2(
-RES_TXTATR_TOXMARK, n ) ) &&
-nullptr != (pTextTOX = static_cast(pItem)->GetTextTOXMark() ) &&
-( pTextNd = &pTextTOX->GetTextNode())->GetNodes().IsDocNodes() 
&&
-nullptr != ( pCFrame = pTextNd->getLayoutFrame( GetLayout(), 
&aPt, nullptr, false )) &&
-( IsReadOnlyAvailable() || !pCFrame->IsProtected() ))
-{
-SwNodeIndex aNdIndex( *pTextNd ); // UNIX needs this object
-SetGetExpField aCmp( aNdIndex, *pTextTOX );
-aCmp.SetBodyPos( *pCFrame );
+do {
+for( n = 0; n < nMaxItems; ++n )
+{
+const SfxPoolItem* pItem;
+const SwContentFrame* pCFrame;
+
+if( nullptr != (pItem = GetDoc()->GetAttrPool().GetItem2(
+RES_TXTATR_TOXMARK, n ) ) &&
+nullptr != (pTextTOX = static_cast(pItem)->GetTextTOXMark() ) &&
+( pTextNd = 
&pTextTOX->GetTextNode())->GetNodes().IsDocNodes() &&
+nullptr != ( pCFrame = pTextNd->getLayoutFrame( 
GetLayout(), &aPt, nullptr, false )) &&
+( IsReadOnlyAvailable() || !pCFrame->IsProtected() ))
+{
+SwNodeIndex aNdIndex( *pTextNd ); // UNIX needs this 
object
+SetGetExpField aCmp( aNdIndex, *pTextTOX );
+aCmp.SetBodyPos( *pCFrame );
 
-if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
-  : ( aCmp < aCurGEF && aFndGEF < aCmp ))
+if( bNext ? ( aCurGEF < aCmp && aCmp < aFndGEF )
+  : ( aCmp < aCurGEF && aFndGEF < aCmp ))
+{
+aFndGEF = aCmp;
+bFnd = true;
+}
+}
+}
+if( !bFnd )
 {
-aFndGEF = aCmp;
-bFnd = true;
+if ( bNext )
+{
+rPos.nNode = 0;
+rPos.nContent = 0;
+aCurGEF = SetGetExpField( rPos );
+SvxSearchDialogWrapper::SetSearchLabel( 
SearchLabel::EndWrapped );
+}
+else
+{
+aCurGEF = SetGetExpField( SwPosition( 
GetDoc()->GetNodes().GetEndOfContent() ) );
+SvxSearchDialogWrapper::SetSearchLabel( 
SearchLabel::StartWrapped );
+}
 }
-}
+} while ( !bFnd );
 }
+else
+SvxSearchDialogWrapper::SetSearchLabel( 
SearchLabel::NavElementNotFound );
 }
 
 if( bFnd )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Jim Raykowski]

 sw/source/core/crsr/crstrvl.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 9e1a58a5d317215f91c3fa7745a2dab73783bc24
Author: Jim Raykowski 
Date:   Fri May 25 18:05:23 2018 -0800

tdf#115600 Use "Navigation element not found" message for Headings

...navigation when no Headings are found

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

diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index fe4c0f8e8ed1..45114ba97a35 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -969,7 +969,7 @@ bool SwCursorShell::GotoNextOutline()
 
 if ( rNds.GetOutLineNds().size() == 0 )
 {
-SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+SvxSearchDialogWrapper::SetSearchLabel( 
SearchLabel::NavElementNotFound );
 return false;
 }
 
@@ -1008,7 +1008,7 @@ bool SwCursorShell::GotoPrevOutline()
 
 if ( rNds.GetOutLineNds().size() == 0 )
 {
-SvxSearchDialogWrapper::SetSearchLabel( SearchLabel::Empty );
+SvxSearchDialogWrapper::SetSearchLabel( 
SearchLabel::NavElementNotFound );
 return false;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Mert Tümer]

 android/source/res/layout/activity_document_browser.xml
|1 
 
android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
   |4 
 
android/source/src/java/org/libreoffice/storage/external/OTGDocumentsProvider.java
 |2 
 
android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
 |2 
 
android/source/src/java/org/libreoffice/storage/local/LocalDocumentsProvider.java
  |5 
 android/source/src/java/org/libreoffice/storage/owncloud/OwnCloudProvider.java 
|5 
 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java  
|   53 +++---
 7 files changed, 55 insertions(+), 17 deletions(-)

New commits:
commit 22ef830aa01bfe1e74d649d3ad01ece29a72c44d
Author: Mert Tümer 
Date:   Sat Apr 14 12:00:59 2018 +0300

Added Storage permission handling on the Android Viewer

This patch prevents document browsing and creating
a new document from happening when write external
storage permission is denied by the user.
Signed-off-by: Mert Tümer 

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

diff --git a/android/source/res/layout/activity_document_browser.xml 
b/android/source/res/layout/activity_document_browser.xml
index 1f26195c2025..63f72346c0c6 100644
--- a/android/source/res/layout/activity_document_browser.xml
+++ b/android/source/res/layout/activity_document_browser.xml
@@ -125,6 +125,7 @@
 android:layout_width="wrap_content"
 android:layout_height="wrap_content"
 android:clickable="true"
+android:visibility="invisible"
 app:backgroundTint="@color/background_normal"
 app:fabSize="normal"
 app:layout_constraintBottom_toBottomOf="parent"
diff --git 
a/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
 
b/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
index f21dc258474a..e45929374bbd 100644
--- 
a/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/external/ExtsdDocumentsProvider.java
@@ -1,8 +1,10 @@
 package org.libreoffice.storage.external;
 
+import android.Manifest;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
+import android.content.pm.PackageManager;
 import android.net.Uri;
 import android.os.Build;
 import android.os.Environment;
@@ -160,7 +162,7 @@ public class ExtsdDocumentsProvider implements 
IExternalDocumentProvider,
 // getExternalStorageState().equals(Environment.MEDIA_MOUNTED) && 
isExternalStorageRemovable()
 // but they refer to the primary external storage anyway, so what 
currently is covered by the
 // "LocalDocumentsProvider"
-return rootPathURI!=null;
+return rootPathURI!=null && ContextCompat.checkSelfPermission(context, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) == 
PackageManager.PERMISSION_GRANTED;
 }
 
 @Override
diff --git 
a/android/source/src/java/org/libreoffice/storage/external/OTGDocumentsProvider.java
 
b/android/source/src/java/org/libreoffice/storage/external/OTGDocumentsProvider.java
index 138ec9479755..4341bc3541e6 100644
--- 
a/android/source/src/java/org/libreoffice/storage/external/OTGDocumentsProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/external/OTGDocumentsProvider.java
@@ -85,6 +85,6 @@ public class OTGDocumentsProvider implements 
IExternalDocumentProvider,
 @Override
 public boolean checkProviderAvailability(Context context) {
 // check if system supports USB Host
-return 
context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_USB_HOST);
+return rootPathURI.length()>0 && 
context.getPackageManager().hasSystemFeature(PackageManager.FEATURE_USB_HOST);
 }
 }
diff --git 
a/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
 
b/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
index d8e6e1870044..c2e03dfc7bdd 100644
--- 
a/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
+++ 
b/android/source/src/java/org/libreoffice/storage/local/LocalDocumentsDirectoryProvider.java
@@ -71,6 +71,6 @@ public class LocalDocumentsDirectoryProvider extends 
LocalDocumentsProvider {
 @Override
 public boolean checkProviderAvailability(Context context) {
 File documentsDirectory = getDocumentsDir();
-return documentsDirectory.exists() || 
ContextCompat.checkSelfPermission(context, 
Manifest.permission.WRITE_EXTERNAL_STORAGE) == 
PackageManager.PERMISSION_GRANTED;
+return documents

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

[Mert Tümer]

 android/source/res/drawable/ic_grid_off_black_24dp.xml|9 
 android/source/res/drawable/ic_grid_on_black_24dp.xml |9 
 android/source/res/layout/number_picker.xml   |  130 
+++
 android/source/res/layout/toolbar_bottom.xml  |   20 +
 android/source/res/values/strings.xml |   16 
 android/source/src/java/org/libreoffice/FormattingController.java |  164 
++
 6 files changed, 348 insertions(+)

New commits:
commit ea62d02cedd7b6c90ebcb0ce73e30dc6ddd342c8
Author: Mert Tümer 
Date:   Fri May 25 15:15:29 2018 +0300

[Pardus] tdf#106371 ability to insert/delete tables Android Viewer

This patch is sponsored by ULAKBIM/PARDUS project.
Signed-off-by: Mert Tümer 

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

diff --git a/android/source/res/drawable/ic_grid_off_black_24dp.xml 
b/android/source/res/drawable/ic_grid_off_black_24dp.xml
new file mode 100644
index ..7cf3c950cc4b
--- /dev/null
+++ b/android/source/res/drawable/ic_grid_off_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/drawable/ic_grid_on_black_24dp.xml 
b/android/source/res/drawable/ic_grid_on_black_24dp.xml
new file mode 100644
index ..b2ff9e5be07b
--- /dev/null
+++ b/android/source/res/drawable/ic_grid_on_black_24dp.xml
@@ -0,0 +1,9 @@
+http://schemas.android.com/apk/res/android";
+android:width="24dp"
+android:height="24dp"
+android:viewportWidth="24.0"
+android:viewportHeight="24.0">
+
+
diff --git a/android/source/res/layout/number_picker.xml 
b/android/source/res/layout/number_picker.xml
new file mode 100644
index ..51463926c70f
--- /dev/null
+++ b/android/source/res/layout/number_picker.xml
@@ -0,0 +1,130 @@
+
+http://schemas.android.com/apk/res/android";
+xmlns:app="http://schemas.android.com/apk/res-auto";
+android:layout_width="match_parent"
+android:layout_height="match_parent"
+android:padding="15dp"
+android:id="@+id/numberpickerLayout">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/android/source/res/layout/toolbar_bottom.xml 
b/android/source/res/layout/toolbar_bottom.xml
index d944b2713f2a..d1476a57fa57 100644
--- a/android/source/res/layout/toolbar_bottom.xml
+++ b/android/source/res/layout/toolbar_bottom.xml
@@ -366,6 +366,26 @@
 android:paddingBottom="12dp"
 android:paddingTop="12dp"
 
app:srcCompat="@drawable/ic_folder_black_24dp" />
+
+
+
+
 
 
 
diff --git a/android/source/res/values/strings.xml 
b/android/source/res/values/strings.xml
index 2a4ca0ab4e21..cbbce88d158c 100644
--- a/android/source/res/values/strings.xml
+++ b/android/source/res/values/strings.xml
@@ -179,5 +179,21 @@
 Cut
 Back
 Text copied to the clipboard
+Insert table
+Select insert options:
+Select delete options:
+
+
+Insert Rows Before
+Insert Rows After
+Insert Columns Before
+Insert Columns After
+Insert Table
+
+
+Delete Rows
+Delete Columns
+Delete Table
+
 
 
diff --git a/android/source/src/java/org/libreoffice/FormattingController.java 
b/android/source/src/java/org/libreoffice/FormattingController.java
index 0ba72cf50875..0f49a57de997 100644
--- a/android/source/src/java/org/libreoffice/FormattingController.java
+++ b/android/source/src/java/org/libreoffice/FormattingController.java
@@ -14,8 +14,10 @@ import android.provider.MediaStore;
 import android.support.design.widget.Snackbar;
 import android.support.v4.content.FileProvider;
 import android.util.Log;
+import android.view.LayoutInflater;
 import android.view.View;
 import android.widget.ImageButton;
+import android.widget.TextView;
 
 import org.json.JSONException;
 import org.json.JSONObject;
@@ -61,6 +63,9 @@ class FormattingController implements View.OnClickListener {
 
mContext.findViewById(R.id.button_insert_rect).setOnClickListener(this);
 
mContext.findViewById(R.id.button_insert_picture).setOnClickListener(this);
 
+
mContext.findViewById(R.id.button_insert_table).setOnClickListener(this);
+
mContext.findViewById(R.id.button_delete_table).setOnClickListener(this);
+
 
mContext.findViewById(R.id.button_font_shrink).setOnClickListener(this);
 mContext.findViewById(R.id.button_font_grow).setOnClickLi

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

[Mert Tümer]

 android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java |   12 
+-
 1 file changed, 11 insertions(+), 1 deletion(-)

New commits:
commit 9d2f37474b5420def2ad3c41074d3f20b86363f8
Author: Mert Tümer 
Date:   Thu May 24 17:28:08 2018 +0300

tdf#11 fix show hidden files/folders option on Android

Change-Id: Ic80ca7f8ebb93f78a58cc0ad778db90deb0c51ba
Signed-off-by: Mert Tümer 
Reviewed-on: https://gerrit.libreoffice.org/54771
Tested-by: Jenkins 
Reviewed-by: Thorsten Behrens 

diff --git 
a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java 
b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
index c2b939383d20..d7b0ab41c015 100644
--- a/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
+++ b/android/source/src/java/org/libreoffice/ui/LibreOfficeUIActivity.java
@@ -435,8 +435,18 @@ public class LibreOfficeUIActivity extends 
AppCompatActivity implements Settings
 documentProvider = provider[0];
 homeDirectory = 
documentProvider.getRootDirectory(LibreOfficeUIActivity.this);
 currentDirectory = homeDirectory;
-filePaths = currentDirectory.listFiles(FileUtilities
+List paths = 
currentDirectory.listFiles(FileUtilities
 .getFileFilter(filterMode));
+filePaths = new ArrayList();
+for(IFile file: paths) {
+if(showHiddenFiles){
+filePaths.add(file);
+} else {
+if(!file.getName().startsWith(".")){
+filePaths.add(file);
+}
+}
+}
 }
 catch (final RuntimeException e) {
 final Activity activity = LibreOfficeUIActivity.this;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Caolán McNamara]

 sw/source/ui/fldui/fldvar.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit a828a0fe795fb44e1daa0ece9c994973b3975fce
Author: Caolán McNamara 
Date:   Thu May 31 14:22:18 2018 +0100

Resolves: tdf#116268 use on/off data, not pos to determine which is which

Change-Id: I73127bc6ea78daaf1e79596067c1cdeb692e1566
Reviewed-on: https://gerrit.libreoffice.org/55134
Tested-by: Jenkins 
Reviewed-by: Adolfo Jayme Barrientos 

diff --git a/sw/source/ui/fldui/fldvar.cxx b/sw/source/ui/fldui/fldvar.cxx
index cf3434c42e80..2594567d3c6e 100644
--- a/sw/source/ui/fldui/fldvar.cxx
+++ b/sw/source/ui/fldui/fldvar.cxx
@@ -531,7 +531,7 @@ void SwFieldVarPage::SubTypeHdl(ListBox const * pBox)
 if (IsFieldEdit() || pBox)// only when interacting via 
mouse
 m_pNameED->SetText(OUString());
 
-if (nSelPos != 0 && nSelPos != LISTBOX_ENTRY_NOTFOUND)
+if (nSelData != 0 && nSelData != SIZE_MAX)
 {
 bValue = true;  // SubType OFF - knows no Offset
 if (GetCurField() && IsFieldEdit())
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits