date:20190903

 filter/source/flash/swfwriter.hxx   |2 +-
 filter/source/graphicfilter/icgm/cgm.cxx|2 +-
 filter/source/graphicfilter/icgm/cgm.hxx|2 +-
 filter/source/graphicfilter/icgm/chart.cxx  |2 +-
 filter/source/graphicfilter/icgm/chart.hxx  |2 +-
 filter/source/graphicfilter/ios2met/ios2met.cxx |4 ++--
 filter/source/msfilter/mstoolbar.cxx|4 ++--
 filter/source/msfilter/svdfppt.cxx  |2 +-
 filter/source/svg/svgwriter.hxx |2 +-
 filter/source/xsltfilter/LibXSLTTransformer.hxx |6 +++---
 formula/source/core/api/token.cxx   |2 +-
 formula/source/ui/dlg/ControlHelper.hxx |4 ++--
 formula/source/ui/dlg/funcpage.cxx  |6 +++---
 formula/source/ui/dlg/funcpage.hxx  |8 
 formula/source/ui/dlg/funcutl.cxx   |4 ++--
 formula/source/ui/dlg/parawin.cxx   |4 ++--
 formula/source/ui/dlg/parawin.hxx   |6 +++---
 formula/source/ui/dlg/structpg.cxx  |6 +++---
 formula/source/ui/dlg/structpg.hxx  |   10 +-
 include/filter/msfilter/escherex.hxx|6 +++---
 include/filter/msfilter/mstoolbar.hxx   |   20 ++--
 include/filter/msfilter/svdfppt.hxx |2 +-
 include/formula/tokenarray.hxx  |6 +++---
 23 files changed, 56 insertions(+), 56 deletions(-)

New commits:
commit 2c7aa60b69967a80b7874503f0e9e85546a04cde
Author: Noel Grandin 
AuthorDate: Tue Sep 3 16:17:03 2019 +0200
Commit: Noel Grandin 
CommitDate: Wed Sep 4 08:16:00 2019 +0200

loplugin:constmethod in filter

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

diff --git a/filter/source/flash/swfwriter.hxx 
b/filter/source/flash/swfwriter.hxx
index 7d65a21a20fa..ecb04e9dd0ce 100644
--- a/filter/source/flash/swfwriter.hxx
+++ b/filter/source/flash/swfwriter.hxx
@@ -145,7 +145,7 @@ public:
 void write( SvStream& out );
 
 sal_uInt16 getID() const { return mnId; }
-const vcl::Font& getFont() { return maFont; }
+const vcl::Font& getFont() const { return maFont; }
 
 private:
 const vcl::Font maFont;
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx 
b/filter/source/graphicfilter/icgm/cgm.cxx
index 22240779768d..8122d399eaa6 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -75,7 +75,7 @@ CGM::~CGM()
 maDefRepSizeList.clear();
 };
 
-sal_uInt32 CGM::GetBackGroundColor()
+sal_uInt32 CGM::GetBackGroundColor() const
 {
 return pElement ? pElement->aColorTable[ 0 ] : 0;
 }
diff --git a/filter/source/graphicfilter/icgm/cgm.hxx 
b/filter/source/graphicfilter/icgm/cgm.hxx
index 388b5eea3dcc..19773b9117c1 100644
--- a/filter/source/graphicfilter/icgm/cgm.hxx
+++ b/filter/source/graphicfilter/icgm/cgm.hxx
@@ -133,7 +133,7 @@ class CGM
 ~CGM();
 
 CGM(css::uno::Reference< css::frame::XModel > 
const & rModel);
-sal_uInt32  GetBackGroundColor();
+sal_uInt32  GetBackGroundColor() const;
 boolIsValid() const { return mbStatus; };
 boolIsFinished() const { return mbIsFinished; };
 boolWrite( SvStream& rIStm );
diff --git a/filter/source/graphicfilter/icgm/chart.cxx 
b/filter/source/graphicfilter/icgm/chart.cxx
index 845fab4e0d77..439d941c33ad 100644
--- a/filter/source/graphicfilter/icgm/chart.cxx
+++ b/filter/source/graphicfilter/icgm/chart.cxx
@@ -50,7 +50,7 @@ void CGMChart::ResetAnnotation()
 mDataNode[ 0 ].nZoneEnum = 0;
 }
 
-bool CGMChart::IsAnnotation()
+bool CGMChart::IsAnnotation() const
 {
 return ( mDataNode[ 0 ].nZoneEnum == 0 );
 }
diff --git a/filter/source/graphicfilter/icgm/chart.hxx 
b/filter/source/graphicfilter/icgm/chart.hxx
index 837015614696..839be2e4a196 100644
--- a/filter/source/graphicfilter/icgm/chart.hxx
+++ b/filter/source/graphicfilter/icgm/chart.hxx
@@ -74,7 +74,7 @@ class CGMChart final
 voidInsertTextEntry( std::unique_ptr );
 
 voidResetAnnotation();
-boolIsAnnotation();
+boolIsAnnotation() const;
 };
 
 #endif
diff --git a/filter/source/graphicfilter/ios2met/ios2met.cxx 
b/filter/source/graphicfilter/ios2met/ios2met.cxx
index f1d8e5661083..236506aff7cc 100644
--- a/filter/source/graphicfilter/ios2met/ios2met.cxx
+++ b/filter/source/graphicfilter/ios2met/ios2met.cxx
@@ -378,7 +378,7 @@ private:
 Color GetPaletteColor(sal_uInt32 nIndex);
 
 
-boolIsLineInfo();
+boolIsLineInfo() const;
 voidDrawPolyLine( const tools::Polygon& rPolygon );
 voidDrawPolygon( const tools::Polygon& rPolygon );
 void

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

2019-09-03 Thread Khaled Hosny (via logerrit)

 vcl/source/font/fontmetric.cxx |4 -
 vcl/source/fontsubset/sft.cxx  |5 +-
 vcl/unx/generic/fontmanager/fontconfig.cxx |   51 -
 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |6 +-
 4 files changed, 34 insertions(+), 32 deletions(-)

New commits:
commit dcf7792da2aa2a1ef774a124f7b21f68fff0fd15
Author: Khaled Hosny 
AuthorDate: Tue Aug 27 15:19:15 2019 +0200
Commit: Khaled Hosny 
CommitDate: Tue Sep 3 23:48:17 2019 +0200

Make Noto Color Emoji font work on Linux

Noto Color Emoji is a bitmap color font, Cairo knows how to scale such
fonts and FontConfig will identify them as scalable but not outline
fonts, so change the FontConfig checks to checks for scalability.

Make sft.cxx:doOpenTTFont() accept non-outline fonts, the text will not
show in PDF but that is not worse than the status quo.

Change-Id: I756c718296d2c43e3165cd2f07b11bbb981318d3
Reviewed-on: https://gerrit.libreoffice.org/78218
Tested-by: Jenkins
Reviewed-by: Khaled Hosny 

diff --git a/vcl/source/font/fontmetric.cxx b/vcl/source/font/fontmetric.cxx
index 72a5a77cc6fe..4da3575d7597 100644
--- a/vcl/source/font/fontmetric.cxx
+++ b/vcl/source/font/fontmetric.cxx
@@ -381,8 +381,8 @@ void 
ImplFontMetricData::ImplCalcLineSpacing(LogicalFontInstance *pFontInstance)
 if (mnAscent || mnDescent)
 mnIntLeading = mnAscent + mnDescent - mnHeight;
 
-SAL_INFO("vcl.gdi.fontmetric",
-  "fsSelection: "   << rInfo.fsSelection
+SAL_INFO("vcl.gdi.fontmetric", GetFamilyName()
+ << ": fsSelection: "   << rInfo.fsSelection
  << ", typoAscender: "  << rInfo.typoAscender
  << ", typoDescender: " << rInfo.typoDescender
  << ", typoLineGap: "   << rInfo.typoLineGap
diff --git a/vcl/source/fontsubset/sft.cxx b/vcl/source/fontsubset/sft.cxx
index 47e4f7a8d7f4..52b2e0360b50 100644
--- a/vcl/source/fontsubset/sft.cxx
+++ b/vcl/source/fontsubset/sft.cxx
@@ -1669,7 +1669,10 @@ static SFErrCodes doOpenTTFont( sal_uInt32 facenum, 
TrueTypeFont* t )
 /* TODO: implement to get subsetting */
 assert(t->goffsets != nullptr);
 } else {
-return SFErrCodes::TtFormat;
+// Bitmap font, accept for now.
+t->goffsets = static_cast(calloc(1+t->nglyphs, 
sizeof(sal_uInt32)));
+/* TODO: implement to get subsetting */
+assert(t->goffsets != nullptr);
 }
 
 table = getTable(t, O_hhea);
diff --git a/vcl/unx/generic/fontmanager/fontconfig.cxx 
b/vcl/unx/generic/fontmanager/fontconfig.cxx
index 3f0a2aa4418b..9fd6b380b73a 100644
--- a/vcl/unx/generic/fontmanager/fontconfig.cxx
+++ b/vcl/unx/generic/fontmanager/fontconfig.cxx
@@ -67,7 +67,7 @@ namespace
 
 class FontCfgWrapper
 {
-FcFontSet* m_pOutlineSet;
+FcFontSet* m_pFontSet;
 
 void addFontSet( FcSetName );
 
@@ -95,17 +95,14 @@ private:
 };
 
 FontCfgWrapper::FontCfgWrapper()
-: m_pOutlineSet( nullptr )
+: m_pFontSet( nullptr )
 {
 FcInit();
 }
 
 void FontCfgWrapper::addFontSet( FcSetName eSetName )
 {
-/*
-  add only acceptable outlined fonts to our config,
-  for future fontconfig use
-*/
+// Add only acceptable fonts to our config, for future fontconfig use.
 FcFontSet* pOrig = FcConfigGetFonts( FcConfigGetCurrent(), eSetName );
 if( !pOrig )
 return;
@@ -114,10 +111,12 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
 for( int i = 0; i < pOrig->nfont; ++i )
 {
 FcPattern* pPattern = pOrig->fonts[i];
-// #i115131# ignore non-outline fonts
-FcBool bOutline = FcFalse;
-FcResult eOutRes = FcPatternGetBool( pPattern, FC_OUTLINE, 0, 
&bOutline );
-if( (eOutRes != FcResultMatch) || (bOutline == FcFalse) )
+// #i115131# ignore non-scalable fonts
+// Scalable fonts are usually outline fonts, but some bitmaps fonts
+// (like Noto Color Emoji) are also scalable.
+FcBool bScalable = FcFalse;
+FcResult eScalableRes = FcPatternGetBool(pPattern, FC_SCALABLE, 0, 
&bScalable);
+if ((eScalableRes != FcResultMatch) || (bScalable == FcFalse))
 continue;
 
 // Ignore Type 1 fonts, too.
@@ -127,7 +126,7 @@ void FontCfgWrapper::addFontSet( FcSetName eSetName )
 continue;
 
 FcPatternReference( pPattern );
-FcFontSetAdd( m_pOutlineSet, pPattern );
+FcFontSetAdd( m_pFontSet, pPattern );
 }
 
 // TODO?: FcFontSetDestroy( pOrig );
@@ -218,16 +217,16 @@ namespace
 
 FcFontSet* FontCfgWrapper::getFontSet()
 {
-if( !m_pOutlineSet )
+if( !m_pFontSet )
 {
-m_pOutlineSet = FcFontSetCreate();
+m_pFontSet = FcFontSetCreate();
 addFontSet( FcSetSystem );
 addFontSet( FcSetApplication );
 
-
::std::sort(m_pOutlineSet->fonts,m_pOutlineSet->fonts+m_pOutlineSet->nfont,SortFont());
+
::std::sort(m_pFontSet->fonts,

JunitTest_bean_complex - odk example OOoBeanViewer failed

2019-09-03 Thread gmail Vladimir Koković


Hi,

In trying to solve the JunitTest_bean_complex test problem, I tried 
everything,
to eventually find a way to show that OOoBean definitely has a problem 
with UNO.
The best example is odk/examples/ DevelopersGuide/OfficeBean/ 
OOoBeanViewer.java


when you try text document, OOoBean on line 650
com.sun.star.lang.XComponent xComponent = xLoader.loadComponentFromURL (
   aURL, "_self", 0, aArgs);
generates an exception:
com.sun.star.uno.RuntimeException: 
com.sun.star.lib.uno.environments.remote.JobQueue.removeJob - 
unexpected: java.lang.InterruptedException
at com.sun.star.lib.uno.environments.remote.JobQueue.removeJob 
(JobQueue.java:212)
at com.sun.star.lib.uno.environments.remote.JobQueue.enter 
(JobQueue.java:308)
at com.sun.star.lib.uno.environments.remote.JobQueue.enter 
(JobQueue.java:281)
at com.sun.star.lib.uno.environments.remote.JavaThreadPool.enter 
(JavaThreadPool.java:81)
at 
com.sun.star.lib.uno.bridges.java_remote.java_remote_bridge.sendRequest 
(java_remote_bridge.java:619)
at com.sun.star.lib.uno.bridges.java_remote.ProxyFactory $ 
Handler.request (ProxyFactory.java:145)
at com.sun.star.lib.uno.bridges.java_remote.ProxyFactory $ 
Handler.invoke (ProxyFactory.java:129)

at com.sun.proxy. $ proxy14.loadComponentFromURL (Unknown Source)
at com.sun.star.comp.beans.OOoBean.loadFromURL (OOoBean.java:650)

...


Someone who is more familiar with JAVA-UNO should examine what this is 
about.



Regards,

Vladimir Koković, DP senior(69)

Serbia, Belgrade, 3.sep 2019


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

[Libreoffice-commits] core.git: cui/source dbaccess/source include/vcl sfx2/source svtools/source svx/source sw/source vcl/source

 cui/source/options/optcolor.cxx   |2 ++
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx |2 ++
 include/vcl/NotebookBarAddonsMerger.hxx   |9 -
 include/vcl/builder.hxx   |7 ---
 include/vcl/builderfactory.hxx|6 ++
 sfx2/source/appl/newhelp.cxx  |   10 ++
 sfx2/source/sidebar/SidebarToolBox.cxx|4 
 svtools/source/contnr/fileview.cxx|2 ++
 svtools/source/control/ctrlbox.cxx|6 ++
 svtools/source/control/inettbc.cxx|2 ++
 svx/source/dialog/langbox.cxx |4 
 svx/source/dialog/relfld.cxx  |2 ++
 svx/source/dialog/txencbox.cxx|2 ++
 sw/source/uibase/utlui/numfmtlb.cxx   |2 ++
 vcl/source/control/notebookbar.cxx|2 +-
 vcl/source/window/NotebookBarAddonsMerger.cxx |4 ++--
 vcl/source/window/builder.cxx |   12 +++-
 vcl/source/window/printdlg.cxx|4 
 18 files changed, 66 insertions(+), 16 deletions(-)

New commits:
commit e44db461ca135fcbef7854c7304c894b65fcd497
Author: Mike Kaganski 
AuthorDate: Tue Sep 3 12:54:48 2019 +0300
Commit: Mike Kaganski 
CommitDate: Tue Sep 3 22:24:23 2019 +0200

Ensure that VCL builder entry points use proper function type

This removes duplicating typedefs from NotebookBarAddonsMerger,
and removes dependency of include/vcl/builder.hxx on
include/vcl/NotebookBarAddonsMerger.hxx.

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

diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 7cf455e821fd..d85381cc70a5 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -861,6 +861,8 @@ void ColorConfigCtrl_Impl::dispose()
 
 extern "C" SAL_DLLPUBLIC_EXPORT void makeColorConfigCtrl(VclPtr & 
rRet, const VclPtr & pParent, VclBuilder::stringmap &)
 {
+
static_assert(std::is_same_v,
+ decltype(makeColorConfigCtrl)>);
 rRet = VclPtr::Create(pParent);
 }
 
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx 
b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index cfc8143a2288..dc3296a7187a 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -81,6 +81,8 @@ static constexpr auto BROWSER_STANDARD_FLAGS = 
BrowserMode::COLUMNSELECTION | Br
 
 extern "C" SAL_DLLPUBLIC_EXPORT void 
makeDbaIndexFieldsControl(VclPtr & rRet, const VclPtr 
& pParent, VclBuilder::stringmap &)
 {
+
static_assert(std::is_same_v,
+ decltype(makeDbaIndexFieldsControl)>);
 rRet = VclPtr::Create(pParent, WB_BORDER | 
WB_NOTABSTOP);
 }
 
diff --git a/include/vcl/NotebookBarAddonsMerger.hxx 
b/include/vcl/NotebookBarAddonsMerger.hxx
index 913e50734472..9b13ff145625 100644
--- a/include/vcl/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/NotebookBarAddonsMerger.hxx
@@ -20,6 +20,7 @@
 #ifndef INCLUDED_VCL_NOTEBOOKBARADDONSMERGER_HXX
 #define INCLUDED_VCL_NOTEBOOKBARADDONSMERGER_HXX
 
+#include 
 #include 
 #include 
 #include 
@@ -60,15 +61,13 @@ struct AddonNotebookBarItem
 class NotebookBarAddonsMerger
 {
 public:
-typedef std::map stringmap;
-typedef void (*customMakeWidget)(VclPtr& rRet, const 
VclPtr& pParent,
- stringmap& rVec);
 NotebookBarAddonsMerger();
 ~NotebookBarAddonsMerger();
-static void MergeNotebookBarAddons(vcl::Window* pParent, const 
customMakeWidget& pFunction,
+static void MergeNotebookBarAddons(vcl::Window* pParent,
+   const VclBuilder::customMakeWidget& 
pFunction,
const 
css::uno::Reference& rFrame,
const NotebookBarAddonsItem& 
aNotebookBarAddonsItem,
-   stringmap rVec);
+   VclBuilder::stringmap& rVec);
 static void MergeNotebookBarMenuAddons(PopupMenu* pPopupMenu, sal_Int16 
nItemId,
const OString& sItemIdName,
NotebookBarAddonsItem& 
aNotebookBarAddonsItem);
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index 4cdd10930dea..35504dc0d701 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -15,7 +15,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
@@ -45,6 +44,7 @@ class DateField;
 class TimeField;
 class VclExpander;
 class VclMultiLineEdit;
+struct NotebookBarAddonsItem;
 namespace xmlreader { class XmlReader; }
 namespace com { namespace sun { namespace star { namespace frame { class 
XFrame; } } } }
 
@@ -73,11 +73,

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

 sd/source/ui/slidesorter/shell/SlideSorter.cxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 446f4b086ccd4cdb9524637e4808dbe6b7d40f7e
Author: Mike Kaganski 
AuthorDate: Tue Sep 3 21:01:32 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Sep 3 21:52:59 2019 +0200

Missing include

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

diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx 
b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
index f2ba97cd35d0..b59e2a3d9512 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx
@@ -19,6 +19,8 @@
 
 #include 
 
+#include 
+
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 vcl/unx/generic/glyphs/freetype_glyphcache.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b6fb63249ba01c6f1895f74a75fd4060ce016bf9
Author: Caolán McNamara 
AuthorDate: Tue Sep 3 15:07:55 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 3 21:48:29 2019 +0200

66537 was an issuezilla bug

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

diff --git a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx 
b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
index 5ed232cf4ebd..9c0773e6a340 100644
--- a/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
+++ b/vcl/unx/generic/glyphs/freetype_glyphcache.cxx
@@ -427,7 +427,7 @@ FreetypeFont::FreetypeFont(LogicalFontInstance* 
pFontInstance, FreetypeFontInfo*
 if( !mnWidth )
 mnWidth = rFSD.mnHeight;
 mfStretch = static_cast(mnWidth) / rFSD.mnHeight;
-// sanity check (e.g. #i66394#, #i66244#, #66537#)
+// sanity check (e.g. #i66394#, #i66244#, #i66537#)
 if( (mnWidth < 0) || (mfStretch > +64.0) || (mfStretch < -64.0) )
 return;
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: qadevOOo/tests

 qadevOOo/tests/java/mod/_sc/XMLContentExporter.java |2 +-
 qadevOOo/tests/java/mod/_sc/XMLExporter.java|2 +-
 qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java|2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 5bcf85f6569b37461aa542387b70d422b36b627c
Author: Andrea Gelmini 
AuthorDate: Tue Sep 3 18:36:57 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Sep 3 21:46:30 2019 +0200

Fix typo

Change-Id: I63b774a1c8f64c2f736202ed73acfe2fe2718591
Reviewed-on: https://gerrit.libreoffice.org/78572
Reviewed-by: Julien Nabet 
Tested-by: Adolfo Jayme Barrientos 

diff --git a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java 
b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
index 0d29876246c6..098866ff058d 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLContentExporter.java
@@ -130,7 +130,7 @@ public class XMLContentExporter extends TestCase {
 XCell xCell = xSheet.getCellByPosition(0, 0);
 xCell.setFormula(CELL_TEXT);
 
-log.println("fill sheet 1 with contnet...");
+log.println("fill sheet 1 with content...");
 util.CalcTools.fillCalcSheetWithContent(xSheetDoc, 1, 1, 1, 5, 5);
 
 // adding tags which must be contained in XML output
diff --git a/qadevOOo/tests/java/mod/_sc/XMLExporter.java 
b/qadevOOo/tests/java/mod/_sc/XMLExporter.java
index bddb0701d6ba..c9edb37ab54e 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLExporter.java
@@ -129,7 +129,7 @@ public class XMLExporter extends TestCase {
 XNamed xSheetNamed = UnoRuntime.queryInterface(XNamed.class, xSheet);
 xSheetNamed.setName(SHEET_NAME);
 
-log.println("fill sheet with contnet...");
+log.println("fill sheet with content...");
 util.CalcTools.fillCalcSheetWithContent(xSheet, 3, 3, 50, 50);
 
 // adding tags which must be contained in XML output
diff --git a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java 
b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
index 7ebdca4b7e5f..0f49662c1cbd 100644
--- a/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
+++ b/qadevOOo/tests/java/mod/_sc/XMLMetaExporter.java
@@ -133,7 +133,7 @@ public class XMLMetaExporter extends TestCase {
 final XDocumentProperties xDocProps = xPropSup.getDocumentProperties();
 xDocProps.setTitle("TestDocument");
 
-log.println("fill sheet 1 with contnet...");
+log.println("fill sheet 1 with content...");
 util.CalcTools.fillCalcSheetWithContent(xSheetDoc,1, 3, 3, 50, 50);
 
 // create testobject here
___
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.2' - 2 commits - comphelper/source desktop/source embeddedobj/source include/comphelper sc/source sfx2/source

2019-09-03 Thread Muhammet Kara (via logerrit)

 comphelper/source/misc/lok.cxx  |   24 ++--
 desktop/source/lib/init.cxx |4 ++--
 embeddedobj/source/commonembedding/embedobj.cxx |7 ---
 include/comphelper/lok.hxx  |4 ++--
 sc/source/ui/condformat/condformatdlg.cxx   |3 ++-
 sc/source/ui/condformat/condformatdlgentry.cxx  |3 ++-
 sfx2/source/view/ipclient.cxx   |   11 +++
 7 files changed, 37 insertions(+), 19 deletions(-)

New commits:
commit 3b9dfb7acd8b2625c39de4af94b4e01794fcd315
Author: Muhammet Kara 
AuthorDate: Wed Jul 31 21:41:41 2019 +0300
Commit: Andras Timar 
CommitDate: Tue Sep 3 21:43:36 2019 +0200

LOK: Proper use of isMobile() on embedded charts

We are moving the isMobile() check to a higher layer,
to avoid changing a published API method

This is the follow-up of the commit feae0c186e700f6a48c3fad124fb4795ad1a8f83

(cherry picked from commit 9083a07e98a32e3ce7af4bd1a817f2b870df0f55)

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

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx 
b/embeddedobj/source/commonembedding/embedobj.cxx
index 93f121cee31b..14e7246b7b42 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -227,13 +227,6 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 
nNextState )
 }
 else
 {
-if(comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile(-1))
-{
-// Disable embedded object editing (e.g. chart) on mobile
-if(nNextState == embed::EmbedStates::INPLACE_ACTIVE || 
nNextState == embed::EmbedStates::UI_ACTIVE)
-return;
-}
-
 if ( nNextState == embed::EmbedStates::INPLACE_ACTIVE )
 {
 if ( !m_xClientSite.is() )
diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx
index 9dd4503eff7f..55fbdbaea2eb 100644
--- a/sfx2/source/view/ipclient.cxx
+++ b/sfx2/source/view/ipclient.cxx
@@ -932,6 +932,17 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb )
 {
 m_xImp->m_xObject->setClientSite( m_xImp->m_xClient );
 
+// Disable embedded object editing (e.g. chart) on mobile
+if ( comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView())
+&& m_xImp->m_xObject->getCurrentState() == 
embed::EmbedStates::RUNNING )
+{
+// Also check next state
+// Needs to be embed::EmbedStates::UI_ACTIVE or 
embed::EmbedStates::INPLACE_ACTIVE
+// Conversion table is in 
embeddedobj/source/commonembedding/miscobj.cxx
+if (nVerb != embed::EmbedVerbs::MS_OLEVERB_OPEN && 
nVerb != embed::EmbedVerbs::MS_OLEVERB_HIDE)
+return nError;
+}
+
 m_xImp->m_xObject->doVerb( nVerb );
 }
 catch ( embed::UnreachableStateException& )
commit 9389bdcd6e796f4f4f9044fa7f905699eb8c9ab3
Author: Muhammet Kara 
AuthorDate: Wed Jul 31 17:04:38 2019 +0300
Commit: Andras Timar 
CommitDate: Tue Sep 3 21:43:21 2019 +0200

LOK: per-view support for isMobile()

embeddedobj/source/commonembedding/embedobj.cxx will have
a follow-up patch, which also removes the -1 case.

It is left out because it has many call-sites,
and inheritance/override relations.

(cherry picked from commit f8b2a27365b858ab5653edad75fd089b39d016d8)

Conflicts:
comphelper/source/misc/lok.cxx
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatdlgentry.cxx

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

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index a5d9689137d0..8862568608a8 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -13,6 +13,7 @@
 
 #include 
 #include 
+#include 
 
 namespace comphelper
 {
@@ -22,8 +23,6 @@ namespace LibreOfficeKit
 
 static bool g_bActive(false);
 
-static bool g_bMobile(false);
-
 static bool g_bPartInInvalidation(false);
 
 static bool g_bTiledPainting(false);
@@ -45,6 +44,9 @@ static LanguageTag g_aLanguageTag("en-US", true);
 /// Scaling of the cairo or CoreGraphics canvas painting for hi-dpi or zooming 
in Calc.
 static double g_fDPIScale(1.0);
 
+/// List of  pairs
+static std::map g_vIsViewMobile;
+
 void setActive(bool bActive)
 {
 g_bActive = bA

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

2019-09-03 Thread Muhammet Kara (via logerrit)

 comphelper/source/misc/lok.cxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit d168d78e6eecd66c7c063c6c0fff78129c4eb2dc
Author: Muhammet Kara 
AuthorDate: Sat Aug 3 00:46:59 2019 +0300
Commit: Andras Timar 
CommitDate: Tue Sep 3 21:43:56 2019 +0200

Remove work-around for isMobile()

Let's remove this dangerous work-around since
it is no longer needed after 6ceab5b233da675b25f42fadff9e85d404903322

(cherry picked from commit 610050fcd745694a6dee58152bfc1c4d85535165)

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

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 8862568608a8..5f5fc31d4421 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -67,10 +67,6 @@ void setMobile(int nViewId, bool bMobile)
 
 bool isMobile(int nViewId)
 {
-// No view given, so act as a global var
-if (nViewId == -1)
-return g_vIsViewMobile.size() > 0;
-
 if (g_vIsViewMobile.find(nViewId) != g_vIsViewMobile.end())
 return g_vIsViewMobile[nViewId];
 else
___
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.2' - embeddedobj/source

2019-09-03 Thread Tamás Zolnai (via logerrit)

 embeddedobj/source/commonembedding/embedobj.cxx |7 +++
 1 file changed, 7 insertions(+)

New commits:
commit 58644008d6c1ce9c4c1c1f33740871103225d759
Author: Tamás Zolnai 
AuthorDate: Tue Jul 30 15:15:16 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 3 21:43:01 2019 +0200

lok: Disable chart editing on mobile

Disabled editing of all embedded objects.

[ Miklos: motivation is that the UI is complex and the small mobile
screen is not suitable to expose this functionality as-is. Disable till
a more compact UI can be exposed. ]

(cherry picked from commit e56d143c36af028825a8e824201a3aa193862af4)

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

diff --git a/embeddedobj/source/commonembedding/embedobj.cxx 
b/embeddedobj/source/commonembedding/embedobj.cxx
index 14e7246b7b42..de57bec51ed3 100644
--- a/embeddedobj/source/commonembedding/embedobj.cxx
+++ b/embeddedobj/source/commonembedding/embedobj.cxx
@@ -227,6 +227,13 @@ void OCommonEmbeddedObject::SwitchStateTo_Impl( sal_Int32 
nNextState )
 }
 else
 {
+if(comphelper::LibreOfficeKit::isActive() && 
comphelper::LibreOfficeKit::isMobile())
+{
+// Disable embedded object editing (e.g. chart) on mobile
+if(nNextState == embed::EmbedStates::INPLACE_ACTIVE || 
nNextState == embed::EmbedStates::UI_ACTIVE)
+return;
+}
+
 if ( nNextState == embed::EmbedStates::INPLACE_ACTIVE )
 {
 if ( !m_xClientSite.is() )
___
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.2' - 2 commits - comphelper/source desktop/source include/comphelper sc/source sc/uiconfig sc/UIConfig_scalc.mk solenv/sanitizers

2019-09-03 Thread merttumer (via logerrit)

 comphelper/source/misc/lok.cxx|   12 
 desktop/source/lib/init.cxx   |   12 
 include/comphelper/lok.hxx|6 
 sc/UIConfig_scalc.mk  |2 
 sc/source/ui/condformat/condformatdlg.cxx |3 
 sc/source/ui/condformat/condformatdlgentry.cxx|3 
 sc/uiconfig/scalc/ui/conditionalentrymobile.ui|  455 ++
 sc/uiconfig/scalc/ui/conditionalformatdialogmobile.ui |  300 +++
 solenv/sanitizers/ui/modules/scalc.suppr  |   20 
 9 files changed, 811 insertions(+), 2 deletions(-)

New commits:
commit 6d2e25ce53b561f0b5a250f0a1b7e96811b00e17
Author: merttumer 
AuthorDate: Tue Jul 30 15:30:06 2019 +0300
Commit: Andras Timar 
CommitDate: Tue Sep 3 21:42:42 2019 +0200

Added mobile friendly ui design for ConditionalFormattingDialog

[ Miklos: added solenv/ bits to silence the same warnings as the
non-mobile layout. ]

(cherry picked from commit d2b4b608696e7a6ba7ed15c97972aa8ed3707bb2)

Conflicts:
sc/source/ui/condformat/condformatdlg.cxx
sc/source/ui/condformat/condformatdlgentry.cxx
solenv/sanitizers/ui/modules/scalc.suppr

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

diff --git a/sc/UIConfig_scalc.mk b/sc/UIConfig_scalc.mk
index 8b36d066b932..e91e9c35959b 100644
--- a/sc/UIConfig_scalc.mk
+++ b/sc/UIConfig_scalc.mk
@@ -98,7 +98,9 @@ $(eval $(call gb_UIConfig_add_uifiles,modules/scalc,\
sc/uiconfig/scalc/ui/colwidthdialog \
sc/uiconfig/scalc/ui/condformatmanager \
sc/uiconfig/scalc/ui/conditionalformatdialog \
+   sc/uiconfig/scalc/ui/conditionalformatdialogmobile \
sc/uiconfig/scalc/ui/conditionalentry \
+   sc/uiconfig/scalc/ui/conditionalentrymobile \
sc/uiconfig/scalc/ui/conditionaliconset \
sc/uiconfig/scalc/ui/conflictsdialog \
sc/uiconfig/scalc/ui/consolidatedialog \
diff --git a/sc/source/ui/condformat/condformatdlg.cxx 
b/sc/source/ui/condformat/condformatdlg.cxx
index 79e0e3f233d6..91ea772d8065 100644
--- a/sc/source/ui/condformat/condformatdlg.cxx
+++ b/sc/source/ui/condformat/condformatdlg.cxx
@@ -7,6 +7,7 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
 #include 
 
 #include 
@@ -515,7 +516,7 @@ ScCondFormatDlg::ScCondFormatDlg(SfxBindings* pB, 
SfxChildWindow* pCW,
 vcl::Window* pParent, ScViewData* pViewData,
 const ScCondFormatDlgItem* pItem)
 : ScAnyRefDlg(pB, pCW, pParent, "ConditionalFormatDialog",
-"modules/scalc/ui/conditionalformatdialog.ui")
+
(comphelper::LibreOfficeKit::isMobile()?OUString("modules/scalc/ui/conditionalformatdialogmobile.ui"):OUString("modules/scalc/ui/conditionalformatdialog.ui")))
 , mpViewData(pViewData)
 , mpLastEdit(nullptr)
 , mpDlgItem(static_cast(pItem->Clone()))
diff --git a/sc/source/ui/condformat/condformatdlgentry.cxx 
b/sc/source/ui/condformat/condformatdlgentry.cxx
index 2483ebe29d7f..4c6682253fa0 100644
--- a/sc/source/ui/condformat/condformatdlgentry.cxx
+++ b/sc/source/ui/condformat/condformatdlgentry.cxx
@@ -33,6 +33,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -48,7 +49,7 @@ ScCondFrmtEntry::ScCondFrmtEntry(vcl::Window* pParent, 
ScDocument* pDoc, const S
 , mpDoc(pDoc)
 , maPos(rPos)
 {
-m_pUIBuilder.reset(new VclBuilder(this, getUIRootDir(), 
"modules/scalc/ui/conditionalentry.ui"));
+m_pUIBuilder.reset(new VclBuilder(this, getUIRootDir(), 
(comphelper::LibreOfficeKit::isMobile()?OUString("modules/scalc/ui/conditionalentrymobile.ui"):OUString("modules/scalc/ui/conditionalentry.ui";
 
 get(maGrid, "grid");
 get(maFtCondNr, "number");
diff --git a/sc/uiconfig/scalc/ui/conditionalentrymobile.ui 
b/sc/uiconfig/scalc/ui/conditionalentrymobile.ui
new file mode 100644
index ..a4f1b39185bd
--- /dev/null
+++ b/sc/uiconfig/scalc/ui/conditionalentrymobile.ui
@@ -0,0 +1,455 @@
+
+
+
+  
+  
+  
+True
+False
+True
+6
+vertical
+7
+
+  
+True
+False
+start
+2
+
+  
+True
+False
+  
+  
+0
+0
+  
+
+
+  
+True
+False
+  
+  
+1
+0
+  
+
+  
+  
+0
+0
+  
+
+
+  
+True
+False
+True
+immediate
+12
+True
+
+  
+True
+False
+False
+
+  All Cells
+  Cell value is
+  Formula is
+  Date is
+
+  
+

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

2019-09-03 Thread Tamás Zolnai (via logerrit)

 sw/source/uibase/docvw/edtwin.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit cdecd2c2e05b47602312f0875f9e3a719749fb01
Author: Tamás Zolnai 
AuthorDate: Mon Sep 2 18:23:19 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 3 21:41:31 2019 +0200

lok: Don't change mouse pointer when hovering over table borders

Reviewed-on: https://gerrit.libreoffice.org/78411
Reviewed-by: Tamás Zolnai 
Tested-by: Tamás Zolnai 
(cherry picked from commit e015ce45c299bec5d4a571e127ca7422caea523b)

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

diff --git a/sw/source/uibase/docvw/edtwin.cxx 
b/sw/source/uibase/docvw/edtwin.cxx
index 5fcfbc9b3c5a..c7260dd99a75 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -3887,7 +3887,8 @@ void SwEditWin::MouseMove(const MouseEvent& _rMEvt)
 
 if ( PointerStyle::Null != nPointer &&
 // i#35543 - Enhanced table selection is explicitly allowed in 
table mode
-( !bChkTableSel || !rSh.IsTableMode() ) )
+( !bChkTableSel || !rSh.IsTableMode() ) &&
+!comphelper::LibreOfficeKit::isActive() )
 {
 SetPointer( nPointer );
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-03 Thread Laurent BP (via logerrit)

 extras/source/autotext/lang/fr/standard/CDOS/content.xml |4 ++--
 extras/source/autotext/lang/fr/standard/CLET/content.xml |4 ++--
 extras/source/autotext/lang/fr/standard/P/P.xml  |2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit b4f6db28dfa4a640ebbbe0854d0a1df546dd8766
Author: Laurent BP 
AuthorDate: Sat Aug 31 17:00:39 2019 +0200
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Sep 3 21:35:17 2019 +0200

Correct typos in fr Autotext

Change-Id: I07672cffdb33dfa75e609277df721d4c71d88bc5
Reviewed-on: https://gerrit.libreoffice.org/78352
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos 
(cherry picked from commit c49c81759bd5ebb4cee41c419d2747dbed982ad5)
Reviewed-on: https://gerrit.libreoffice.org/78554

diff --git a/extras/source/autotext/lang/fr/standard/CDOS/content.xml 
b/extras/source/autotext/lang/fr/standard/CDOS/content.xml
index 5acd6b20ab6e..d77c9aefe57e 100644
--- a/extras/source/autotext/lang/fr/standard/CDOS/content.xml
+++ b/extras/source/autotext/lang/fr/standard/CDOS/content.xml
@@ -16,9 +16,9 @@
 
 

-   Nous remercions pour l’intérêt que vous 
avez exprimé concernant un emploi chez .
+   Nous vous remercions pour l’intérêt que 
vous avez exprimé concernant un emploi chez .
Cependant, nous ne sommes pas 
actuellement en mesure de vous offrir un poste correspondant à vos souhaits et 
à votre qualification. Mais cette situation est susceptible de changer dans un 
très proche avenir.
Si vous n’y voyez pas d’inconvénient, 
nous aimerions donc conserver votre dossier pour un éventuel usage ultérieur. 
Si, dans un proche avenir, nous devions avoir un poste à pourvoir correspondant 
à votre profil, c’est avec plaisir que nous vous recontacterons.
   
  
-
\ No newline at end of file
+
diff --git a/extras/source/autotext/lang/fr/standard/CLET/content.xml 
b/extras/source/autotext/lang/fr/standard/CLET/content.xml
index 0fe25fadc6e2..acf3695c73d2 100644
--- a/extras/source/autotext/lang/fr/standard/CLET/content.xml
+++ b/extras/source/autotext/lang/fr/standard/CLET/content.xml
@@ -8,9 +8,9 @@
   

Votre annonce parue dans  du 
 a retenu toute mon attention. Je pense bien correspondre 
au profil du candidat recherché et me permets donc de vous présenter ma 
candidature.
-   J’occupe depuis  un poste d 
. Ces dernières années, j’ai peu à 
peu pris en charge . Bien que je sois, dans l’ensemble, satisfait de mon 
domaine d’activité, j’éprouve le besoin d’affronter un nouveau défi. C’est 
pourquoi je suis à la recherche d’un nouveau poste me permettant de faire 
pleinement usage de mon expérience  et de mon savoir-faire .
+   J’occupe depuis  un poste 
d. Ces dernières années, j’ai peu à 
peu pris en charge . Bien que je sois, dans l’ensemble, satisfait de mon 
domaine d’activité, j’éprouve le besoin d’affronter un nouveau défi. C’est 
pourquoi je suis à la recherche d’un nouveau poste me permettant de faire 
pleinement usage de mon expérience  et de mon savoir-faire .
Mon salaire actuel se monte à . Je suis sous 
contrat à durée indéterminée et pourrai donc me libérer à partir du 
.
Je serais très heureux de pouvoir vous décrire plus en détail mes 
compétences au cours d’un entretien personnel.
   
  
-
\ No newline at end of file
+
diff --git a/extras/source/autotext/lang/fr/standard/P/P.xml 
b/extras/source/autotext/lang/fr/standard/P/P.xml
index a5bc56517b79..7dfb8570a102 100644
--- a/extras/source/autotext/lang/fr/standard/P/P.xml
+++ b/extras/source/autotext/lang/fr/standard/P/P.xml
@@ -1,2 +1,2 @@
 
-http://openoffice.org/2001/

[Libreoffice-commits] core.git: sal/qa sal/textenc

2019-09-03 Thread Stephan Bergmann (via logerrit)

 sal/qa/rtl/textenc/rtl_textcvt.cxx |   21 +
 sal/textenc/tcvtutf7.cxx   |   17 ++---
 2 files changed, 31 insertions(+), 7 deletions(-)

New commits:
commit 238f6f42b381198e14f6d17649d8465425c7450f
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 15:50:09 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 3 20:18:28 2019 +0200

Fix handling of invalid bytes >= 0x80 in ImplUTF7ToUnicode

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

diff --git a/sal/qa/rtl/textenc/rtl_textcvt.cxx 
b/sal/qa/rtl/textenc/rtl_textcvt.cxx
index 339075decba3..6b5a7e55fe21 100644
--- a/sal/qa/rtl/textenc/rtl_textcvt.cxx
+++ b/sal/qa/rtl/textenc/rtl_textcvt.cxx
@@ -453,6 +453,8 @@ public:
 
 void testComplexCut();
 
+void testInvalidUtf7();
+
 void testInvalidUtf8();
 
 void testSRCBUFFERTOSMALL();
@@ -467,6 +469,7 @@ public:
 CPPUNIT_TEST(testSingleByte);
 CPPUNIT_TEST(testComplex);
 CPPUNIT_TEST(testComplexCut);
+CPPUNIT_TEST(testInvalidUtf7);
 CPPUNIT_TEST(testInvalidUtf8);
 CPPUNIT_TEST(testSRCBUFFERTOSMALL);
 CPPUNIT_TEST(testMime);
@@ -2638,6 +2641,24 @@ void Test::testComplexCut() {
 #endif
 }
 
+void Test::testInvalidUtf7() {
+auto const converter = 
rtl_createTextToUnicodeConverter(RTL_TEXTENCODING_UTF7);
+CPPUNIT_ASSERT(converter != nullptr);
+sal_Unicode buf[TEST_STRING_SIZE];
+sal_uInt32 info;
+sal_Size converted;
+auto const size = rtl_convertTextToUnicode(
+converter, nullptr, RTL_CONSTASCII_STRINGPARAM("\x80"), buf, 
TEST_STRING_SIZE,
+(RTL_TEXTTOUNICODE_FLAGS_UNDEFINED_ERROR | 
RTL_TEXTTOUNICODE_FLAGS_MBUNDEFINED_ERROR
+ | RTL_TEXTTOUNICODE_FLAGS_INVALID_DEFAULT | 
RTL_TEXTTOUNICODE_FLAGS_FLUSH),
+&info, &converted);
+CPPUNIT_ASSERT_EQUAL(sal_Size(1), size);
+CPPUNIT_ASSERT_EQUAL(OUString(u"\uFFFD"), OUString(buf, sal_Int32(size)));
+CPPUNIT_ASSERT_EQUAL(RTL_TEXTTOUNICODE_INFO_INVALID, info);
+CPPUNIT_ASSERT_EQUAL(sal_Size(1), converted);
+rtl_destroyTextToUnicodeConverter(converter);
+}
+
 void Test::testInvalidUtf8() {
 // UTF-8, invalid bytes:
 {
diff --git a/sal/textenc/tcvtutf7.cxx b/sal/textenc/tcvtutf7.cxx
index 46c135859566..dd97b213750b 100644
--- a/sal/textenc/tcvtutf7.cxx
+++ b/sal/textenc/tcvtutf7.cxx
@@ -358,15 +358,18 @@ sal_Size ImplUTF7ToUnicode( SAL_UNUSED_PARAMETER const 
void*, void* pContext,
 = RTL_TEXTENC_UNICODE_REPLACEMENT_CHARACTER;
 }
 }
-
-/* Write char to unicode buffer */
-if ( pDestBuf >= pEndDestBuf )
+else
 {
-*pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | 
RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
-break;
+/* Write char to unicode buffer */
+if ( pDestBuf >= pEndDestBuf )
+{
+*pInfo |= RTL_TEXTTOUNICODE_INFO_ERROR | 
RTL_TEXTTOUNICODE_INFO_DESTBUFFERTOOSMALL;
+break;
+}
+*pDestBuf = c;
+pDestBuf++;
+
 }
-*pDestBuf = c;
-pDestBuf++;
 }
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-03 Thread Tamas Bunth (via logerrit)

 connectivity/source/drivers/mysqlc/mysqlc_connection.cxx |3 ++-
 dbaccess/source/ui/inc/DExport.hxx   |3 ---
 dbaccess/source/ui/uno/copytablewizard.cxx   |6 --
 3 files changed, 2 insertions(+), 10 deletions(-)

New commits:
commit 91a97c5e0b7b760ec0b46ad38b28ec1419c7d48f
Author: Tamas Bunth 
AuthorDate: Tue Sep 3 15:29:55 2019 +0200
Commit: Tamás Bunth 
CommitDate: Tue Sep 3 19:59:17 2019 +0200

tdf#127093 mysqlc: set NO_AUTO_VALUE_ON_ZERO

Without setting this sql_mode, NULL or 0 inserted to an auto-incremented 
column
of a prepared statement would cause that to be auto generated.

Setting NO_AUTO_VALUE_ON_ZERO allows us to copy/paste auto-incremented
columns which may contain zero values as well.

Change-Id: I9602746371c75c82c99ff63240025e8cfb03776a
Reviewed-on: https://gerrit.libreoffice.org/78560
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx 
b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
index 193cc1c6ffe2..a9d4438dfa97 100644
--- a/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
+++ b/connectivity/source/drivers/mysqlc/mysqlc_connection.cxx
@@ -196,7 +196,8 @@ void OConnection::construct(const OUString& url, const 
Sequence&
*this, OUString(), 0, Any());
 }
 
-lcl_executeUpdate(&m_mysql, OString{ "SET session sql_mode='ANSI_QUOTES'" 
});
+lcl_executeUpdate(&m_mysql,
+  OString{ "SET session 
sql_mode='ANSI_QUOTES,NO_AUTO_VALUE_ON_ZERO'" });
 lcl_executeUpdate(&m_mysql, OString{ "SET NAMES utf8" });
 }
 
commit d783017c1ccb4e62e99f26b42250ac4e15780cff
Author: Tamas Bunth 
AuthorDate: Tue Sep 3 15:28:05 2019 +0200
Commit: Tamás Bunth 
CommitDate: Tue Sep 3 19:59:07 2019 +0200

Revert "tdf#127093, tdf#127092 Fix pasting autoincremented"

This reverts commit fa177231cd20bf3c3f4bb9b50f6646da139c6766.

Change-Id: Ia0c2d83c840c0ff8981b721766a6a1df810f971d
Reviewed-on: https://gerrit.libreoffice.org/78559
Tested-by: Jenkins
Reviewed-by: Tamás Bunth 

diff --git a/dbaccess/source/ui/inc/DExport.hxx 
b/dbaccess/source/ui/inc/DExport.hxx
index 7dbcbf31fc6a..397b527d6d7d 100644
--- a/dbaccess/source/ui/inc/DExport.hxx
+++ b/dbaccess/source/ui/inc/DExport.hxx
@@ -61,9 +61,6 @@ namespace dbaui
 public:
 typedef std::map TColumns;
 typedef std::vector 
TColumnVector;
-
-// first value is the position in the destination table. The second
-// value is the position of the column in the source table.
 typedef std::vector< std::pair >   TPositions;
 
 protected:
diff --git a/dbaccess/source/ui/uno/copytablewizard.cxx 
b/dbaccess/source/ui/uno/copytablewizard.cxx
index 6abaa55f9d54..8565ce5949de 100644
--- a/dbaccess/source/ui/uno/copytablewizard.cxx
+++ b/dbaccess/source/ui/uno/copytablewizard.cxx
@@ -1183,12 +1183,6 @@ void CopyTableWizard::impl_copyRows_throw( const 
Reference< XResultSet >& _rxSou
 // otherwise we don't get the correct value when only the 
2nd source column was selected
 continue;
 }
-else if( xMeta->isAutoIncrement( rColumnPos.second ) )
-{
-// it is auto incremented. Let the DBMS deal with it.
-++nSourceColumn;
-continue;
-}
 
 if ( ( nSourceColumn < 1 ) || ( nSourceColumn >= 
static_cast(aSourceColTypes.size()) ) )
 {   // ( we have to check here against 1 because the 
parameters are 1 based)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sd/source/ui/framework/tools/FrameworkHelper.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit a96b0e1b28dc48e6d92365cfffca232f4db30848
Author: Mike Kaganski 
AuthorDate: Tue Sep 3 18:29:28 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Sep 3 19:41:37 2019 +0200

Missing include

Change-Id: I2d45d55c30914953f7478071ce3320d9974ca497
Reviewed-on: https://gerrit.libreoffice.org/78571
Reviewed-by: Mike Kaganski 
Tested-by: Mike Kaganski 

diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx 
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index 1f51a6bba052..917d3abb3b1b 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -29,6 +29,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-03 Thread Sumit Chauhan (via logerrit)

 vcl/source/window/builder.cxx |   11 ---
 1 file changed, 4 insertions(+), 7 deletions(-)

New commits:
commit 0473141a91a686de700fd73118bcc142b4f636b4
Author: Sumit Chauhan 
AuthorDate: Tue Sep 3 02:05:07 2019 +0530
Commit: Mike Kaganski 
CommitDate: Tue Sep 3 19:36:02 2019 +0200

tdf#127272 Writer crash issue resolve

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index ad9706cd7339..c83f6339d432 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2235,14 +2235,11 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 {
 xWindow = VclPtr::Create(pParent, WB_3DLOOK | WB_TABSTOP);
 }
-else if (name == "NotebookBarAddonsToolMergePoint")
+else if(name == "NotebookBarAddonsToolMergePoint")
 {
-#ifndef DISABLE_DYNLOADING
-customMakeWidget pFunction = nullptr;
-ModuleMap::iterator aI = g_aModuleMap.find(SAL_DLLPREFIX "sfxlo" 
SAL_DLLEXTENSION);
-pFunction = 
reinterpret_cast(aI->second->getFunctionSymbol("makeNotebookbarToolBox"));
-NotebookBarAddonsMerger::MergeNotebookBarAddons( pParent, pFunction, 
m_xFrame, m_pNotebookBarAddonsItem, rMap );
-#endif
+customMakeWidget pFunction = 
GetCustomMakeWidget("sfxlo-NotebookbarToolBox");
+if(pFunction != nullptr)
+NotebookBarAddonsMerger::MergeNotebookBarAddons(pParent, 
pFunction, m_xFrame, m_pNotebookBarAddonsItem, rMap);
 return nullptr;
 }
 else if (name == "GtkToolButton" || name == "GtkMenuToolButton" ||
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-03 Thread Roman Kuznetsov (via logerrit)

 sc/uiconfig/scalc/menubar/menubar.xml|2 +-
 sd/uiconfig/sdraw/menubar/menubar.xml|2 +-
 sd/uiconfig/simpress/menubar/menubar.xml |2 +-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 sw/uiconfig/swxform/menubar/menubar.xml  |2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit 81b91d9eb70c117884d6ad16067bc151b373096c
Author: Roman Kuznetsov 
AuthorDate: Tue Sep 3 08:38:46 2019 +0200
Commit: Roman Kuznetsov 
CommitDate: Tue Sep 3 19:31:15 2019 +0200

tdf#127277 Move Insert->QR code menu item to Insert->Object->QR code

Change-Id: I3c0a1d53768e9235aa34f6c6b3367d03f19d
Reviewed-on: https://gerrit.libreoffice.org/78535
Tested-by: Jenkins
Reviewed-by: Roman Kuznetsov 

diff --git a/sc/uiconfig/scalc/menubar/menubar.xml 
b/sc/uiconfig/scalc/menubar/menubar.xml
index 163c734ec9a8..35fb4a20075f 100644
--- a/sc/uiconfig/scalc/menubar/menubar.xml
+++ b/sc/uiconfig/scalc/menubar/menubar.xml
@@ -218,6 +218,7 @@
   
 
   
+  
   
 
   
@@ -311,7 +312,6 @@
 
   
 
-
 
   
   
diff --git a/sd/uiconfig/sdraw/menubar/menubar.xml 
b/sd/uiconfig/sdraw/menubar/menubar.xml
index 9f2686f325b7..6c0388a043c3 100644
--- a/sd/uiconfig/sdraw/menubar/menubar.xml
+++ b/sd/uiconfig/sdraw/menubar/menubar.xml
@@ -200,6 +200,7 @@
   
 
   
+  
   
 
   
@@ -211,7 +212,6 @@
   
   
   
-  
   
   
   
diff --git a/sd/uiconfig/simpress/menubar/menubar.xml 
b/sd/uiconfig/simpress/menubar/menubar.xml
index 8af3e5e57c5b..cbe0950d5291 100644
--- a/sd/uiconfig/simpress/menubar/menubar.xml
+++ b/sd/uiconfig/simpress/menubar/menubar.xml
@@ -211,6 +211,7 @@
   
 
   
+  
   
 
   
@@ -243,7 +244,6 @@
   
   
   
-  
   
   
   
diff --git a/sw/uiconfig/swriter/menubar/menubar.xml 
b/sw/uiconfig/swriter/menubar/menubar.xml
index 27313ad0ae63..e42212a15229 100644
--- a/sw/uiconfig/swriter/menubar/menubar.xml
+++ b/sw/uiconfig/swriter/menubar/menubar.xml
@@ -263,6 +263,7 @@
   
 
   
+  
   
 
   
@@ -350,7 +351,6 @@
   
   
   
-  
 
   
   
diff --git a/sw/uiconfig/swxform/menubar/menubar.xml 
b/sw/uiconfig/swxform/menubar/menubar.xml
index 36505b49..d8bf502247e8 100644
--- a/sw/uiconfig/swxform/menubar/menubar.xml
+++ b/sw/uiconfig/swxform/menubar/menubar.xml
@@ -261,6 +261,7 @@
   
 
   
+  
   
 
   
@@ -346,7 +347,6 @@
   
   
   
-  
 
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 750fc507939595e8eb6071f70e748d6b1bb7c38c
Author: Mike Kaganski 
AuthorDate: Tue Sep 3 13:02:01 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Sep 3 18:21:24 2019 +0200

Omission from commit fd67c89e52441387dffab1c788007271e717571b

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

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 3f81651e15eb..ad9706cd7339 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1673,7 +1673,7 @@ VclBuilder::customMakeWidget GetCustomMakeWidget(const 
OString& name)
 SAL_WARN_IF(!pFunction, "vcl.layout", "Could not find " << sFunction);
 assert(pFunction);
 #else
-pFunction = reinterpret_cast(
+pFunction = reinterpret_cast(
 osl_getFunctionSymbol((oslModule)RTLD_DEFAULT, sFunction.pData));
 #endif
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sw/source/uibase/sidebar/StylePresetsPanel.cxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 570e5345bcb88add0b095fe3d5585915f288925d
Author: Mike Kaganski 
AuthorDate: Tue Sep 3 16:36:58 2019 +0200
Commit: Mike Kaganski 
CommitDate: Tue Sep 3 18:21:06 2019 +0200

Missing include

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

diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx 
b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index f296fe1cb3e4..915d740a6a68 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -19,6 +19,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-03 Thread Michael Stahl (via logerrit)

 offapi/com/sun/star/style/ParagraphProperties.idl |   16 
 1 file changed, 16 insertions(+)

New commits:
commit e04b6f3c0cdacf2a3cdcd3f34bad54c8764ff1ed
Author: Michael Stahl 
AuthorDate: Tue Sep 3 11:47:01 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 3 17:00:10 2019 +0200

offapi: add 2 undocumented ParagraphProperties from CWS sw301bf04

These exist since OOo 3.0.1 but were never documented; at least the
ListLabelString looks generally useful.

Append them instead of inserting them before OutlineLevel because the
compare tool complains about the changed order.

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

diff --git a/offapi/com/sun/star/style/ParagraphProperties.idl 
b/offapi/com/sun/star/style/ParagraphProperties.idl
index ba7f8b634c80..27b9457fdde9 100644
--- a/offapi/com/sun/star/style/ParagraphProperties.idl
+++ b/offapi/com/sun/star/style/ParagraphProperties.idl
@@ -391,6 +391,22 @@ published service ParagraphProperties
 @since LibreOffice 6.1
  */
 [optional, property] com::sun::star::graphic::XGraphic ParaBackGraphic;
+
+/** specifies that a child node of a parent node that is not counted
+is continuing the numbering of parent's previous node's sub tree.
+
+@since OOo 3.0.1
+
+@note misspelling retained for compatibility
+ */
+[optional, property, readonly] boolean ContinueingPreviousSubTree;
+
+/** allows reading the generated numbering list label.
+
+@since OOo 3.0.1
+ */
+[optional, property, readonly] string ListLabelString;
+
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'private/khaledhosny/vcl-cleanup-font' - 161 commits - accessibility/source android/source basic/inc basic/qa basic/source bin/update_pch chart2/qa chart2/source

2019-09-03 Thread Khaled Hosny (via logerrit)

Rebased ref, commits from common ancestor:
commit 5b241d21b737d4f91ae4eb491b5c0d8c4043a055
Author: Khaled Hosny 
AuthorDate: Tue Sep 3 14:40:42 2019 +0200
Commit: Khaled Hosny 
CommitDate: Tue Sep 3 16:34:40 2019 +0200

Consolidate GetFontCapabilities()

All implementations were basically doing the same thing. Move to
PhysicalFontFace and use HarfBuzz API to get the raw OpeenType table
data.

Change-Id: Ia5ac0d1ba6299f86e90e1b0dac34ba7672855ec0

diff --git a/vcl/inc/PhysicalFontFace.hxx b/vcl/inc/PhysicalFontFace.hxx
index 35cbf923665d..944ecceee303 100644
--- a/vcl/inc/PhysicalFontFace.hxx
+++ b/vcl/inc/PhysicalFontFace.hxx
@@ -22,6 +22,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -70,6 +71,7 @@ public:
 sal_Int32   CompareIgnoreSize( const PhysicalFontFace& ) const;
 
 const FontCharMapRef&   GetCharMap() const;
+boolGetCapabilities(vcl::FontCapabilities 
&rCapabilities) const;
 
 hb_face_t*  GetHbFace() const { return mpHbFace; }
 virtual hb_blob_t*  GetHbTable(const char* pName) = 0;
@@ -84,6 +86,8 @@ protected:
 hb_face_t*  mpHbFace;
 
 mutable FontCharMapRef  mxCharMap;
+mutable boolmbCapabilitiesRead;
+mutable vcl::FontCapabilities maCapabilities;
 };
 
 #endif // INCLUDED_VCL_INC_PHYSICALFONTFACE_HXX
diff --git a/vcl/inc/qt5/Qt5FontFace.hxx b/vcl/inc/qt5/Qt5FontFace.hxx
index 14da580393d8..d57e5e450977 100644
--- a/vcl/inc/qt5/Qt5FontFace.hxx
+++ b/vcl/inc/qt5/Qt5FontFace.hxx
@@ -42,8 +42,6 @@ public:
 
 int GetFontTable(const char pTagName[5], unsigned char*) const;
 
-bool GetFontCapabilities(vcl::FontCapabilities& rFontCapabilities) const;
-
 rtl::Reference
 CreateFontInstance(const FontSelectPattern& rFSD) const override;
 
@@ -55,8 +53,6 @@ protected:
 
 private:
 const QString m_aFontId;
-mutable vcl::FontCapabilities m_aFontCapabilities;
-mutable bool m_bFontCapabilitiesRead;
 };
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/vcl/inc/quartz/salgdi.h b/vcl/inc/quartz/salgdi.h
index fa4e6e780a47..540a4acd2d9f 100644
--- a/vcl/inc/quartz/salgdi.h
+++ b/vcl/inc/quartz/salgdi.h
@@ -67,16 +67,12 @@ public:
 int GetFontTable( uint32_t nTagCode, unsigned 
char* ) const;
 int GetFontTable( const char pTagName[5], 
unsigned char* ) const;
 
-boolGetFontCapabilities(vcl::FontCapabilities 
&rFontCapabilities) const;
-
 rtl::Reference CreateFontInstance(const 
FontSelectPattern&) const override;
 
 hb_blob_t*  GetHbTable(const char* pName) override;
 
 private:
 const sal_IntPtrmnFontId;
-mutable vcl::FontCapabilities   maFontCapabilities;
-mutable boolmbFontCapabilitiesRead;
 };
 
 class CoreTextStyle final : public LogicalFontInstance
diff --git a/vcl/inc/win/salgdi.h b/vcl/inc/win/salgdi.h
index fb2f4deac56d..04dcc4738db8 100644
--- a/vcl/inc/win/salgdi.h
+++ b/vcl/inc/win/salgdi.h
@@ -71,24 +71,16 @@ public:
 BYTEGetCharSet() const  { return meWinCharSet; 
}
 BYTEGetPitchAndFamily() const   { return 
mnPitchAndFamily; }
 
-bool GetFontCapabilities(vcl::FontCapabilities &rFontCapabilities) const;
-
 hb_blob_t*  GetHbTable(const char* pName) override;
 
 private:
 sal_IntPtr  mnId;
 
-// some members that are initialized lazily when the font gets selected 
into a HDC
-mutable boolmbFontCapabilitiesRead;
-mutable vcl::FontCapabilities   maFontCapabilities;
-
 BYTEmeWinCharSet;
 BYTEmnPitchAndFamily;
 boolmbAliasSymbolsHigh;
 boolmbAliasSymbolsLow;
 
-voidGetFontCapabilities( HDC hDC ) const;
-
 HDC mhDC;
 };
 
diff --git a/vcl/qt5/Qt5FontFace.cxx b/vcl/qt5/Qt5FontFace.cxx
index ea7770bf78a3..a7af63a4018e 100644
--- a/vcl/qt5/Qt5FontFace.cxx
+++ b/vcl/qt5/Qt5FontFace.cxx
@@ -130,7 +130,6 @@ Qt5FontFace* Qt5FontFace::fromQFontDatabase(const QString& 
aFamily, const QStrin
 Qt5FontFace::Qt5FontFace(const FontAttributes& rFA, const QString& rFontID)
 : PhysicalFontFace(rFA)
 , m_aFontId(rFontID)
-, m_bFontCapabilitiesRead(false)
 {
 }
 
@@ -142,31 +141,6 @@ Qt5FontFace::CreateFontInstance(const FontSelectPattern& 
rFSD) const
 return new Qt5Font(*this, rFSD);
 }
 
-bool Qt5FontFace::GetFontCapabilities(vcl::FontCapabilities& 
rFontCapabilities) const
-{
-// read this only once per font
-if (m_bFontCapabilitiesRead)
-{
-rFontCapabilities = m_aFontCapabilities;
-return rFontCapabilities.oUnicodeRange || 
rFontCapabilities.oCodePageRange;
-}
-m_bFontCapabilitiesRead = true;
-
-QFont aFont;
-aFont.fromString(m

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - vcl/headless

2019-09-03 Thread Jan Holesovsky (via logerrit)

 vcl/headless/svpgdi.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ba6a94476f8c32950fa96aeca64325d627c4d410
Author: Jan Holesovsky 
AuthorDate: Wed May 15 12:25:26 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 3 16:25:32 2019 +0200

Attempt to load the theme when LibreOfficeKit is active.

Change-Id: Ie8640b7179a96cb40fb774ede097ca7b3640edd8
Reviewed-on: https://gerrit.libreoffice.org/72349
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 7d55c2b8886ae00a60aa469503f596ee488c25c0)
Reviewed-on: https://gerrit.libreoffice.org/72353
Tested-by: Jenkins
Reviewed-on: https://gerrit.libreoffice.org/78561

diff --git a/vcl/headless/svpgdi.cxx b/vcl/headless/svpgdi.cxx
index aa697055030d..b0f6f530e8bd 100644
--- a/vcl/headless/svpgdi.cxx
+++ b/vcl/headless/svpgdi.cxx
@@ -596,9 +596,10 @@ SvpSalGraphics::SvpSalGraphics()
 , m_ePaintMode(PaintMode::Over)
 , m_aTextRenderImpl(*this)
 {
-if (!initWidgetDrawBackends())
+bool bLOKActive = comphelper::LibreOfficeKit::isActive();
+if (!initWidgetDrawBackends(bLOKActive))
 {
-if (comphelper::LibreOfficeKit::isActive())
+if (bLOKActive)
 m_pWidgetDraw.reset(new vcl::CustomWidgetDraw(*this));
 }
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Changes to 'private/khaledhosny/vcl-cleanup-font'

2019-09-03 Thread Khaled Hosny (via logerrit)

New branch 'private/khaledhosny/vcl-cleanup-font' available with the following 
commits:
commit c2663218c216abe3424aaf730f5379136a9e260a
Author: Khaled Hosny 
Date:   Tue Sep 3 14:40:42 2019 +0200

Consolidate GetFontCapabilities()

All implementations were basically doing the same thing. Move to
PhysicalFontFace and use HarfBuzz API to get the raw OpeenType table
data.

Change-Id: Ia5ac0d1ba6299f86e90e1b0dac34ba7672855ec0

commit d302923c758cba8e7542b7c58e0a504e2143c6ca
Author: Khaled Hosny 
Date:   Tue Sep 3 13:21:50 2019 +0200

Drop SalGraphics::GetGlyphWidths()

It was used only on two places. One use is replaced with a new
LogicalFontInstance::GetGlyphWidth() (backed by HarfBuzz font) and the
other is replaced by getting glyph widths while subsetting the font.

PDFFontCache is now unused, so dropped as well.

Change-Id: I9741f17c0a5626faa952dd0d417cc786cbc877cd

commit 7767c613625c4841a6087bb6ac2d7cd99bda1391
Author: Khaled Hosny 
Date:   Wed Aug 28 18:22:25 2019 +0200

Consolidate GetFontCharMap()

All implementations were basically doing the same thing. Move to
PhysicalFontFace and use HarfBuzz API to get the raw OpeenType table
data.

While at make a few other places use that FontCharMap as well instead of
parsing the cmap table again.

Drop unused HasChar() as well.

Change-Id: I06ff4feb61bcfb17291bf3c299caf11fc53afa4d

commit 6ed2874e2fd1a0f15dc5692756f790676c06aef4
Author: Khaled Hosny 
Date:   Wed Aug 28 17:24:51 2019 +0200

Move creating HarfBuzz face to PhysicalFontFace

The two map to each other; there are many size-specific
LogicalFontInstance's in each PhysicalFontFace, and ditto for hb_face_t
and hb_font_t.

This will make it possible to access HarfBuzz face from PhysicalFontFace
in the future.

Change-Id: I029ad8c4b619b55a2c629f813b9e60bda29b1c08

commit 81bf06c8fab6fcda3edd6cfa025732828003fbd0
Author: Khaled Hosny 
Date:   Wed Aug 28 12:50:22 2019 +0200

Merge GetFontCodeRanges() into GetFontCharMap()

Change-Id: I61d8edf0be492c1c06274c11ac5d2e65415525a9

commit bffc3a013889b27cde392f0a1e8bf2a341b0df26
Author: Khaled Hosny 
Date:   Wed Aug 28 12:46:19 2019 +0200

Remove effectively dead code

We dropped support for non-SFNT fonts for a while now.

Change-Id: Iaa2ea308effa7328bd84240cf29fc3fd117d418a

commit 4fcfa1210b6a9591f23111618868b18f4301a644
Author: Khaled Hosny 
Date:   Tue Aug 27 15:19:15 2019 +0200

Make Noto Color Emoji font work on Linux

Noto Color Emoji is a bitmap color font, Cairo knows how to scale such
fonts and FontConfig will identify them as scalable but not outline
fonts, so change the FontConfig checks to checks for scalability.

Make sft.cxx:doOpenTTFont() accept non-outline fonts, the text will not
show in PDF but that is not worse than the status quo.

Change-Id: I756c718296d2c43e3165cd2f07b11bbb981318d3

___
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.2' - 2 commits - download.lst external/libvisio include/tools solenv/flatpak-manifest.in

2019-09-03 Thread Andras Timar (via logerrit)

 download.lst   |4 +-
 external/libvisio/0001-fix-debug-build.patch.1 |   40 -
 external/libvisio/UnpackedTarball_libvisio.mk  |1 
 external/libvisio/ubsan.patch  |4 +-
 include/tools/link.hxx |2 +
 solenv/flatpak-manifest.in |6 +--
 6 files changed, 9 insertions(+), 48 deletions(-)

New commits:
commit 9a5356f41bff6f8697bff1939213c41173c4e373
Author: Andras Timar 
AuthorDate: Tue Jul 16 08:24:35 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 3 16:21:48 2019 +0200

fix warning: "TRACE_LINKS" is not defined [-Wundef] in non-debug build

Change-Id: I236a9cb312c02ed1f08a77a37e334afce10fa0ce
Reviewed-on: https://gerrit.libreoffice.org/75672
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
(cherry picked from commit aabc93537712478db00fa96859b0227397922464)
Reviewed-on: https://gerrit.libreoffice.org/78553
Tested-by: Andras Timar 

diff --git a/include/tools/link.hxx b/include/tools/link.hxx
index d4816df9b31c..e796c9b3abc8 100644
--- a/include/tools/link.hxx
+++ b/include/tools/link.hxx
@@ -34,6 +34,8 @@
 #   ifdef DBG_UTIL
 #   define TRACE_LINKS 1
 #   include 
+#   else
+#   define TRACE_LINKS 0
 #   endif
 #endif
 
commit f1d40cc59075412dce96c137b20020d6c21aca55
Author: David Tardon 
AuthorDate: Sat Aug 17 17:06:07 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 3 16:21:27 2019 +0200

upload libvisio 0.1.7

Change-Id: I4eb115c7c085b325370e9cd8f80e1b03f16f5033
Reviewed-on: https://gerrit.libreoffice.org/77640
Tested-by: Jenkins
Reviewed-by: David Tardon 
Reviewed-on: https://gerrit.libreoffice.org/77885
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/78426
Tested-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 45c5f12ab050..b026b8b53f04 100644
--- a/download.lst
+++ b/download.lst
@@ -256,8 +256,8 @@ export TWAIN_DSM_SHA256SUM := 
82c818be771f242388457aa8c807e4b52aa84dc22b21c6c561
 export TWAIN_DSM_TARBALL := twaindsm_2.4.1.orig.tar.gz
 export UCPP_SHA256SUM := 
983941d31ee8d366085cadf28db75eb1f5cb03ba1e5853b98f12f7f51c63b776
 export UCPP_TARBALL := 0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz
-export VISIO_SHA256SUM := 
fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9
-export VISIO_TARBALL := libvisio-0.1.6.tar.xz
+export VISIO_SHA256SUM := 
8faf8df870cb27b09a787a1959d6c646faa44d0d8ab151883df408b7166bea4c
+export VISIO_TARBALL := libvisio-0.1.7.tar.xz
 export WPD_SHA256SUM := 
2465b0b662fdc5d4e3bebcdc9a79027713fb629ca2bff04a3c9251fdec42dd09
 export WPD_VERSION_MICRO := 3
 export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
diff --git a/external/libvisio/0001-fix-debug-build.patch.1 
b/external/libvisio/0001-fix-debug-build.patch.1
deleted file mode 100644
index 4146e6e8bfe7..
--- a/external/libvisio/0001-fix-debug-build.patch.1
+++ /dev/null
@@ -1,40 +0,0 @@
-From 15f3774513d0181ad90da382297c175cc3424462 Mon Sep 17 00:00:00 2001
-From: David Tardon 
-Date: Sun, 22 Oct 2017 21:24:43 +0200
-Subject: [PATCH] fix debug build
-
-Change-Id: I860b6034e5d833900652aec8c3647eeae185e538

- src/lib/VDXParser.cpp  | 2 +-
- src/lib/VSDXParser.cpp | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/VDXParser.cpp b/src/lib/VDXParser.cpp
-index f2f3154..0f07efd 100644
 a/src/lib/VDXParser.cpp
-+++ b/src/lib/VDXParser.cpp
-@@ -916,7 +916,7 @@ xmlChar 
*libvisio::VDXParser::readStringData(xmlTextReaderPtr reader)
- ret = xmlTextReaderRead(reader);
- if (1 == ret && stringValue)
- {
--  VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const 
char *)stringValue));
-+  VSD_DEBUG_MSG(("VDXParser::readStringData stringValue %s\n", (const 
char *)stringValue.get()));
-   return stringValue.release();
- }
-   }
-diff --git a/src/lib/VSDXParser.cpp b/src/lib/VSDXParser.cpp
-index 488be3a..efd46b9 100644
 a/src/lib/VSDXParser.cpp
-+++ b/src/lib/VSDXParser.cpp
-@@ -555,7 +555,7 @@ xmlChar 
*libvisio::VSDXParser::readStringData(xmlTextReaderPtr reader)
-   std::unique_ptr 
stringValue(xmlTextReaderGetAttribute(reader, BAD_CAST("V")), xmlFree);
-   if (stringValue)
-   {
--VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char 
*)stringValue));
-+VSD_DEBUG_MSG(("VSDXParser::readStringData stringValue %s\n", (const char 
*)stringValue.get()));
- return stringValue.release();
-   }
-   return nullptr;
--- 
-2.14.1
-
diff --git a/external/libvisio/UnpackedTarball_libvisio.mk 
b/external/libvisio/UnpackedTarball_libvisio.mk
index 1ab8b392c4e8..eba43f3b7a6e 100644
--- a/external/libvisio/UnpackedTarball_libvisio.mk
+++ b/external/libvisio/UnpackedTarball_libvisio.mk
@@ -17,7 +17,6 @@ $(eval $(call 
gb_UnpackedTarball_update_autoconf_configs,libvis

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - download.lst external/libabw solenv/flatpak-manifest.in

2019-09-03 Thread David Tardon (via logerrit)

 download.lst  |4 +-
 external/libabw/UnpackedTarball_libabw.mk |4 --
 external/libabw/libabw-msvc.patch.1   |   46 --
 solenv/flatpak-manifest.in|6 +--
 4 files changed, 5 insertions(+), 55 deletions(-)

New commits:
commit d21dde86597dcb875ed2ba284165d7808ebe4fad
Author: David Tardon 
AuthorDate: Sat Aug 17 16:46:47 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 3 16:21:03 2019 +0200

upload libabw 0.1.3

Change-Id: Ibb45a473f49a9ba8f9cf53593dead375ac8a1951
Reviewed-on: https://gerrit.libreoffice.org/77639
Tested-by: Jenkins
Reviewed-by: David Tardon 
Reviewed-on: https://gerrit.libreoffice.org/77884
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 
Reviewed-on: https://gerrit.libreoffice.org/78425
Tested-by: Andras Timar 

diff --git a/download.lst b/download.lst
index 9c75372a2dae..45c5f12ab050 100644
--- a/download.lst
+++ b/download.lst
@@ -1,5 +1,5 @@
-export ABW_SHA256SUM := 
0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485
-export ABW_TARBALL := libabw-0.1.2.tar.xz
+export ABW_SHA256SUM := 
e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed
+export ABW_TARBALL := libabw-0.1.3.tar.xz
 export APACHE_COMMONS_LOGGING_SHA256SUM := 
49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81
 export APACHE_COMMONS_LOGGING_TARBALL := commons-logging-1.2-src.tar.gz
 export APR_SHA256SUM := 
1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb
diff --git a/external/libabw/UnpackedTarball_libabw.mk 
b/external/libabw/UnpackedTarball_libabw.mk
index 27195d3a0ab3..7b9ba49e7e69 100644
--- a/external/libabw/UnpackedTarball_libabw.mk
+++ b/external/libabw/UnpackedTarball_libabw.mk
@@ -15,10 +15,6 @@ $(eval $(call gb_UnpackedTarball_set_patchlevel,libabw,0))
 
 $(eval $(call gb_UnpackedTarball_update_autoconf_configs,libabw))
 
-$(eval $(call gb_UnpackedTarball_add_patches,libabw, \
-external/libabw/libabw-msvc.patch.1 \
-))
-
 ifeq ($(COM_IS_CLANG),TRUE)
 ifneq ($(filter -fsanitize=%,$(CC)),)
 $(eval $(call gb_UnpackedTarball_add_patches,libabw, \
diff --git a/external/libabw/libabw-msvc.patch.1 
b/external/libabw/libabw-msvc.patch.1
deleted file mode 100644
index d14b122f9575..
--- a/external/libabw/libabw-msvc.patch.1
+++ /dev/null
@@ -1,46 +0,0 @@
-From 49f6461d4751d3b16e32ab8f9c93a3856b33be49 Mon Sep 17 00:00:00 2001
-From: Miklos Vajna 
-Date: Wed, 2 Aug 2017 14:53:36 +0200
-Subject: [PATCH] m4: MSVC defines __cplusplus as 199711L still
-
-See e.g.
-,
-on MSVC we can't depend on the value of __cplusplus, since that one is a
-too low value, even if everything else works fine.

- m4/ax_cxx_compile_stdcxx.m4 | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff -Naur a/configure b/configure
 a/configure2017-08-02 14:50:09.0 +0200
-+++ b/configure2017-08-02 14:50:57.0 +0200
-@@ -16001,7 +16001,7 @@
- 
- #error "This is not a C++ compiler"
- 
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
- 
- #error "This is not a C++11 compiler"
- 
-@@ -16314,7 +16314,7 @@
- 
- #error "This is not a C++ compiler"
- 
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
- 
- #error "This is not a C++11 compiler"
- 
-@@ -16636,7 +16636,7 @@
- 
- #error "This is not a C++ compiler"
- 
--#elif __cplusplus < 201103L
-+#elif __cplusplus < 201103L && !(defined _MSC_VER)
- 
- #error "This is not a C++11 compiler"
- 
--- 
-2.12.3
-
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 45b7470a65a5..e6617fe0b590 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -192,10 +192,10 @@
 "dest-filename": 
"external/tarballs/libgpg-error-1.27.tar.bz2"
 },
 {
-"url": 
"https://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz";,
-"sha256": 
"0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485",
+"url": 
"https://dev-www.libreoffice.org/src/libabw-0.1.3.tar.xz";,
+"sha256": 
"e763a9dc21c3d2667402d66e202e3f8ef4db51b34b79ef41f56cacb86dcd6eed",
 "type": "file",
-"dest-filename": "external/tarballs/libabw-0.1.2.tar.xz"
+"dest-filename": "external/tarballs/libabw-0.1.3.tar.xz"
 },
 {
 "url": 
"https://dev-www.libreoffice.org/src/libcdr-0.1.5.tar.xz";,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/qa/uitest/calc_tests7/tdf31805.py |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fa50388b822b63e5140763dacabdf863f59854cc
Author: Andrea Gelmini 
AuthorDate: Mon Aug 19 12:12:55 2019 +0200
Commit: Zdenek Crhonek 
CommitDate: Tue Sep 3 16:00:11 2019 +0200

Fix typos

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

diff --git a/sc/qa/uitest/calc_tests7/tdf31805.py 
b/sc/qa/uitest/calc_tests7/tdf31805.py
index cb54784e31c4..76d30cf221df 100644
--- a/sc/qa/uitest/calc_tests7/tdf31805.py
+++ b/sc/qa/uitest/calc_tests7/tdf31805.py
@@ -27,7 +27,7 @@ class tdf31805(UITestCase):
 #2. click 'G1'
 #3. Menu 'edit -> Delete Cell - Delete entire Column'
 #expected: Column with cell containing "g" will be deleted,
-# a merged cell range will remainlect row 1
+# a merged cell range will remain left row 1
 
 gridwin.executeAction("SELECT", mkPropertyValues({"CELL": "G1"}))
 self.assertEqual(get_cell_by_position(document, 0, 2, 
4).getIsMerged(), True)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: cppu/source external/gpgmepp

2019-09-03 Thread Stephan Bergmann (via logerrit)

 cppu/source/uno/copy.hxx|   26 --
 external/gpgmepp/UnpackedTarball_gpgmepp.mk |1 
 external/gpgmepp/ubsan.patch|   52 
 3 files changed, 76 insertions(+), 3 deletions(-)

New commits:
commit cf2696efa0d0ea55c950d7b2898e7b7aab74812e
Author: Stephan Bergmann 
AuthorDate: Tue Sep 3 11:26:44 2019 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Sep 3 15:54:08 2019 +0200

Silence -fsanitize=object-size in --enable-optimized builds



(as of recent LLVM trunk towards LLVM 10) states:

"-fsanitize=object-size: An attempt to potentially use bytes which the 
optimizer
can determine are not part of the object being accessed. This will also 
detect
some types of undefined behavior that may not directly access memory, but 
are
provably incorrect given the size of the objects involved, such as invalid
downcasts and calling methods on invalid pointers. These checks are made in
terms of __builtin_object_size, and consequently may be able to detect more
problems at higher optimization levels."

A `make check screenshot` with --enabled-optimized runs into two such issues
that were not diagnosed with --disable-optimized, in both cases because a 
struct
with an "idiomatic trailing dynamic array member" (statically declared to 
be an
array of size 1) is allocated without any space for that array member, as 
the
dynamic array size is 0 in the specific case:

* For

> [CUT] sc_ucalc
> cppu/source/uno/copy.hxx:46:19: runtime error: member access within 
address 0x6020001aaa70 with insufficient space for an object of type 
'uno_Sequence' (aka '_sal_Sequence')
> 0x6020001aaa70: note: pointer points here
>  2b 00 80 6a  be be be be be be be be  00 00 00 00 00 00 00 00  00 00 00 
00 00 00 00 00  00 00 00 00
>   ^
>  #0 in cppu::allocSeq(int, int) at cppu/source/uno/copy.hxx:46:19 
(instdir/program/libuno_cppu.so.3 +0x41f03f)
>  #1 in uno_type_sequence_reference2One at 
cppu/source/uno/sequence.cxx:813:20 (instdir/program/libuno_cppu.so.3 +0x41f03f)
[...]

the call to

pNew = allocSeq( 0, 0 );

in uno_type_sequence_reference2One is inlined, so

sal_uInt32 nSize = calcSeqMemSize( nElementSize, nElements );

in allocSeq is known to be too small.

* For

> testSignatureLineODF::TestBody finished in: 2044ms
> engine-gpg.c:302:6: runtime error: member access within address 
0x604001f24f10 with insufficient space for an object of type 'struct 
arg_and_data_s'
> 0x604001f24f10: note: pointer points here
>  6e 01 00 26  be be be be be be be be  be be be be be be be be  be be be 
be be be be be  be be be be
>   ^
>  #0 in add_data at workdir/UnpackedTarball/gpgmepp/src/engine-gpg.c:302:6 
(instdir/program/libgpgme.so.11 +0x120c2b)
[...]
> make[1]: *** [solenv/gbuild/CppunitTest.mk:114: 
workdir/CppunitTest/xmlsecurity_signing.test] Error 1

the

   a = malloc (sizeof *a - 1);

is apparently detected to be too small only with optimization enabled.

In both cases, the solution is to operate on the too-small dynamically 
allocated
object via a reinterpret_cast'ed pointer to some newly introduced "struct
prefix" type.

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

diff --git a/cppu/source/uno/copy.hxx b/cppu/source/uno/copy.hxx
index b0811b5fab10..b24e0e337bf5 100644
--- a/cppu/source/uno/copy.hxx
+++ b/cppu/source/uno/copy.hxx
@@ -22,7 +22,9 @@
 #include "prim.hxx"
 #include "constr.hxx"
 #include 
+#include 
 #include 
+#include 
 
 namespace cppu
 {
@@ -30,6 +32,22 @@ namespace cppu
 
 // copy construction 
###
 
+namespace {
+
+// The non-dynamic prefix of sal_Sequence (aka uno_Sequence):
+struct SequencePrefix {
+sal_Int32 nRefCount;
+sal_Int32 nElements;
+};
+static_assert(sizeof (SequencePrefix) < sizeof (uno_Sequence));
+static_assert(offsetof(SequencePrefix, nRefCount) == offsetof(uno_Sequence, 
nRefCount));
+static_assert(
+std::is_same_v);
+static_assert(offsetof(SequencePrefix, nElements) == offsetof(uno_Sequence, 
nElements));
+static_assert(
+std::is_same_v);
+
+}
 
 inline uno_Sequence * allocSeq(
 sal_Int32 nElementSize, sal_Int32 nElements )
@@ -42,9 +60,11 @@ inline uno_Sequence * allocSeq(
 pSeq = static_cast(std::malloc( nSize ));
 if (pSeq != nullptr)
 {
-// header init
-pSeq->nRefCount = 1;
-pSeq->nElements = nElements;
+// header init, going via SequencePrefix to avoid UBSan 
insufficient-object-

Re: increasing no of columns to 16384

2019-09-03 Thread Noel Grandin

And some of my respones:


>What does Excel do for that ? (perhaps check names before columns or
something(?) or de-mangle and check names).

No idea. Apparently Excel clamps old documents to 1024 columns. We may need
to do something similar i.e. have an option to explicitly enable >1024
columns.


Could we push the names of the names through the address de-mangler,
> and just warn the user in this case (?) - as long as people are not
> caught unawares - I'd imagine that we can survive (?) =)



That is a possibility. The problem is really that we decide at a very low
level (down in address.cxx) what we are looking at, and that lacks context,
and we call into there from all over the place with not much more than a
string, and try and decide if it is some kind of named thing, and cell
reference, or a named reference, etc.
Not ideal.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

increasing no of columns to 16384

2019-09-03 Thread Noel Grandin

Hi All

I've been working on increasing the number of columns in calc to 16384. Where I am now is that the CUT tests pass, not
the SCK or JUT or UIT tests.

Forwarding discussion with mmeeks below:

Noel Grandin wrote:

So where I am right now is a little stuck.

Ah ! =)

I have fixed various latent overflow bugs, such that the CUT tests pass,
and we can load/save spreadsheets with lots of columns.

But the SCK/JUT/UIT tests fail because "ROW" is a valid column and
some tests are using stuff like "ROW1" as a named range.

Wow - what fun ! =) we go to XFD of course; any other fun words we can
think of that intersect.

What does Excel do for that ? (perhaps check names before columns or
something(?) or de-mangle and check names).

Now I can rename those in the test, but obviously that is not going to
work well in the wild.

Right; I wonder how common that is in the wild.

Any suggestions ?

Do we have the list of names as/when we're parsing the formulae
typically ? my hope would be that in ODF they're beforehand, and that
for XLS[X] we can get at them first (?) Of course - actually in ODF they
are at the end after the cell data which is seriously dumb (huh!)

Could we push the names of the names through the address de-mangler,
and just warn the user in this case (?) - as long as people are not
caught unawares - I'd imagine that we can survive (?) =)

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

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

 basic/inc/sbobjmod.hxx|2 -
 basic/inc/sbprop.hxx  |2 -
 basic/qa/cppunit/basictest.cxx|2 -
 basic/qa/cppunit/basictest.hxx|2 -
 basic/source/basmgr/basmgr.cxx|2 -
 basic/source/classes/sbunoobj.cxx |2 -
 basic/source/classes/sbxmod.cxx   |2 -
 basic/source/comp/codegen.cxx |2 -
 basic/source/comp/exprnode.cxx|6 ++--
 basic/source/comp/exprtree.cxx|2 -
 basic/source/inc/buffer.hxx   |2 -
 basic/source/inc/codegen.hxx  |4 +--
 basic/source/inc/dlgcont.hxx  |4 +--
 basic/source/inc/expr.hxx |   48 +++---
 basic/source/inc/image.hxx|4 +--
 basic/source/inc/runtime.hxx  |   14 +--
 basic/source/inc/sbunoobj.hxx |   26 ++--
 basic/source/inc/scanner.hxx  |   18 +++---
 basic/source/inc/symtbl.hxx   |   10 +++
 basic/source/inc/token.hxx|4 +--
 basic/source/runtime/ddectrl.cxx  |2 -
 basic/source/runtime/ddectrl.hxx  |2 -
 basic/source/runtime/iosys.cxx|2 -
 basic/source/runtime/runtime.cxx  |4 +--
 basic/source/sbx/sbxdec.cxx   |4 +--
 basic/source/sbx/sbxdec.hxx   |2 -
 include/basic/sbmeth.hxx  |2 -
 include/basic/sbmod.hxx   |6 ++--
 include/basic/sbstar.hxx  |8 +++---
 include/basic/sbx.hxx |2 -
 30 files changed, 96 insertions(+), 96 deletions(-)

New commits:
commit f1ec3c675f1fcb04de564861c24f26b2bac4244c
Author: Noel Grandin 
AuthorDate: Tue Sep 3 11:47:17 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 3 15:14:00 2019 +0200

loplugin:constmethod in basic

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

diff --git a/basic/inc/sbobjmod.hxx b/basic/inc/sbobjmod.hxx
index a00c849bfee6..64c5784d7b0b 100644
--- a/basic/inc/sbobjmod.hxx
+++ b/basic/inc/sbobjmod.hxx
@@ -76,7 +76,7 @@ public:
 void triggerLayoutEvent();
 void triggerResizeEvent();
 
-bool getInitState()
+bool getInitState() const
 { return mbInit; }
 void setInitState( bool bInit )
 { mbInit = bInit; }
diff --git a/basic/inc/sbprop.hxx b/basic/inc/sbprop.hxx
index f1f7352e9c70..383b4d914e2a 100644
--- a/basic/inc/sbprop.hxx
+++ b/basic/inc/sbprop.hxx
@@ -52,7 +52,7 @@ public:
 , mbSet( false )
 {}
 
-bool isSet()
+bool isSet() const
 { return mbSet; }
 void setSet( bool bSet )
 { mbSet = bSet; }
diff --git a/basic/qa/cppunit/basictest.cxx b/basic/qa/cppunit/basictest.cxx
index 07ce6384539f..8b0670d41dad 100644
--- a/basic/qa/cppunit/basictest.cxx
+++ b/basic/qa/cppunit/basictest.cxx
@@ -109,7 +109,7 @@ bool MacroSnippet::Compile()
 return !mbError;
 }
 
-bool MacroSnippet::HasError() { return mbError; }
+bool MacroSnippet::HasError() const { return mbError; }
 
 IMPL_LINK( MacroSnippet, BasicErrorHdl, StarBASIC *, /*pBasic*/, bool)
 {
diff --git a/basic/qa/cppunit/basictest.hxx b/basic/qa/cppunit/basictest.hxx
index d435489846fb..8b92acf93d69 100644
--- a/basic/qa/cppunit/basictest.hxx
+++ b/basic/qa/cppunit/basictest.hxx
@@ -45,7 +45,7 @@ public:
 
 DECL_LINK( BasicErrorHdl, StarBASIC *, bool );
 
-bool HasError();
+bool HasError() const;
 };
 
 #endif
diff --git a/basic/source/basmgr/basmgr.cxx b/basic/source/basmgr/basmgr.cxx
index a8707a825d0f..d5fc199e792e 100644
--- a/basic/source/basmgr/basmgr.cxx
+++ b/basic/source/basmgr/basmgr.cxx
@@ -377,7 +377,7 @@ public:
 
 static BasicLibInfo*Create( SotStorageStream& rSStream );
 
-const uno::Reference< script::XLibraryContainer >& GetLibraryContainer()
+const uno::Reference< script::XLibraryContainer >& GetLibraryContainer() 
const
 { return mxScriptCont; }
 void SetLibraryContainer( const uno::Reference< script::XLibraryContainer 
>& xScriptCont )
 { mxScriptCont = xScriptCont; }
diff --git a/basic/source/classes/sbunoobj.cxx 
b/basic/source/classes/sbunoobj.cxx
index 6e04394d5d99..3b698965abd0 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -4881,7 +4881,7 @@ StructRefInfo SbUnoStructRefObject::getStructMember( 
const OUString& rMemberName
 return aRet;
 }
 
-OUString SbUnoStructRefObject::getDbgObjectName()
+OUString SbUnoStructRefObject::getDbgObjectName() const
 {
 OUString aName = GetClassName();
 if( aName.isEmpty() )
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx
index 74f96ac2740c..35fdb4bd0937 100644
--- a/basic/source/classes/sbxmod.cxx
+++ b/basic/source/classes/sbxmod.cxx
@@ -1658,7 +1658,7 @@ public:
 StarBASIC::SetGlobalErrorHdl(mErrHandler);
 }
 DECL_LINK( BasicErrorHdl, StarBASIC *, bool );
-bool HasError() { return mbError; }
+bool HasError() const { return mbError; }
 };
 
 IMPL_LINK( ErrorHd

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

 cui/source/inc/numpages.hxx  |6 --
 cui/source/tabpages/numpages.cxx |   28 +++-
 2 files changed, 27 insertions(+), 7 deletions(-)

New commits:
commit 6c8128532e5631702ed426ed664807d6e760e195
Author: Caolán McNamara 
AuthorDate: Tue Sep 3 10:14:45 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 3 15:04:29 2019 +0200

Resolves: tdf#127120 double selection in B&N dialog

because the list wants to ensure that at least one thing is selected and the
multiselect is implemented with two events of deselect-all followed by 
select.

post a user event on getting either deselect or select and process it
once when the dust has settled

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

diff --git a/cui/source/inc/numpages.hxx b/cui/source/inc/numpages.hxx
index 54614209a779..391094109005 100644
--- a/cui/source/inc/numpages.hxx
+++ b/cui/source/inc/numpages.hxx
@@ -330,8 +330,9 @@ class SvxNumPositionTabPage : public SfxTabPage
 std::unique_ptr pActNum;
 std::unique_ptr pSaveNum;
 
-sal_uInt16  nActNumLvl;
-sal_uInt16  nNumItemId;
+ImplSVEvent*m_pLevelHdlEvent;
+sal_uInt16  nActNumLvl;
+sal_uInt16  nNumItemId;
 MapUnit eCoreUnit;
 
 boolbModified   : 1;
@@ -370,6 +371,7 @@ class SvxNumPositionTabPage : public SfxTabPage
 voidInitControls();
 
 DECL_LINK(LevelHdl_Impl, weld::TreeView&, void);
+DECL_LINK(LevelHdl, void *, void);
 DECL_LINK(EditModifyHdl_Impl, weld::ComboBox&, void);
 DECL_LINK(DistanceHdl_Impl, weld::MetricSpinButton&, void);
 DECL_LINK(DistanceFocusHdl_Impl, Control&, void);
diff --git a/cui/source/tabpages/numpages.cxx b/cui/source/tabpages/numpages.cxx
index d1a86909034b..902dd01fbea6 100644
--- a/cui/source/tabpages/numpages.cxx
+++ b/cui/source/tabpages/numpages.cxx
@@ -2485,6 +2485,7 @@ void SvxNumberingPreview::Paint(vcl::RenderContext& 
rRenderContext, const ::tool
 //merged
 SvxNumPositionTabPage::SvxNumPositionTabPage(TabPageParent pParent, const 
SfxItemSet& rSet)
 : SfxTabPage(pParent, "cui/ui/numberingpositionpage.ui", 
"NumberingPositionPage", &rSet)
+, m_pLevelHdlEvent(nullptr)
 , nActNumLvl(1)
 , nNumItemId(SID_ATTR_NUMBERING_RULE)
 , bModified(false)
@@ -2556,6 +2557,11 @@ SvxNumPositionTabPage::~SvxNumPositionTabPage()
 
 void SvxNumPositionTabPage::dispose()
 {
+if (m_pLevelHdlEvent)
+{
+Application::RemoveUserEvent(m_pLevelHdlEvent);
+m_pLevelHdlEvent = nullptr;
+}
 m_xPreviewWIN.reset();
 SfxTabPage::dispose();
 }
@@ -2996,17 +3002,29 @@ IMPL_LINK_NOARG(SvxNumPositionTabPage, 
EditModifyHdl_Impl, weld::ComboBox&, void
 SetModified();
 }
 
-IMPL_LINK(SvxNumPositionTabPage, LevelHdl_Impl, weld::TreeView&, rBox, void)
+IMPL_LINK_NOARG(SvxNumPositionTabPage, LevelHdl_Impl, weld::TreeView&, void)
+{
+if (m_pLevelHdlEvent)
+return;
+// tdf#127120 multiselection may be implemented by deselect follow by 
select so
+// fire off the handler to happen on next event loop and only process the
+// final state
+m_pLevelHdlEvent = Application::PostUserEvent(LINK(this, 
SvxNumPositionTabPage, LevelHdl));
+}
+
+IMPL_LINK_NOARG(SvxNumPositionTabPage, LevelHdl, void*, void)
 {
+m_pLevelHdlEvent = nullptr;
+
 sal_uInt16 nSaveNumLvl = nActNumLvl;
 nActNumLvl = 0;
-std::vector aSelectedRows = rBox.get_selected_rows();
+std::vector aSelectedRows = m_xLevelLB->get_selected_rows();
 if (std::find(aSelectedRows.begin(), aSelectedRows.end(), 
pActNum->GetLevelCount()) != aSelectedRows.end() &&
 (aSelectedRows.size() == 1 || nSaveNumLvl != 0x))
 {
 nActNumLvl = 0x;
 for( sal_uInt16 i = 0; i < pActNum->GetLevelCount(); i++ )
-rBox.unselect(i);
+m_xLevelLB->unselect(i);
 }
 else if (!aSelectedRows.empty())
 {
@@ -3017,7 +3035,7 @@ IMPL_LINK(SvxNumPositionTabPage, LevelHdl_Impl, 
weld::TreeView&, rBox, void)
 nActNumLvl |= nMask;
 nMask <<= 1;
 }
-rBox.unselect(pActNum->GetLevelCount());
+m_xLevelLB->unselect(pActNum->GetLevelCount());
 }
 else
 {
@@ -3027,7 +3045,7 @@ IMPL_LINK(SvxNumPositionTabPage, LevelHdl_Impl, 
weld::TreeView&, rBox, void)
 {
 if(nActNumLvl & nMask)
 {
-rBox.select(i);
+m_xLevelLB->select(i);
 break;
 }
 nMask <<=1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/cctrl/checklistmenu.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 6aade14148e3d56706b074392ca3569b2a2a8376
Author: Caolán McNamara 
AuthorDate: Tue Sep 3 09:41:12 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Sep 3 15:03:08 2019 +0200

Resolves: tdf#127168 dismiss menu before executing sort

so any error dialog which are parented to the calc window are not
hidden by the menu which is destined to be dismissed after the
sort anyway

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

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 43553d305f38..413cf36704c0 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -452,8 +452,9 @@ void ScMenuFloatingWindow::executeMenuItem(size_t nPos)
 // no action is defined.
 return;
 
-maMenuItems[nPos].mpAction->execute();
 terminateAllPopupMenus();
+
+maMenuItems[nPos].mpAction->execute();
 }
 
 void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool 
bSubMenuTimer, bool bEnsureSubMenu)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2019-09-03 Thread Olivier Hallot (via logerrit)

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

New commits:
commit 9293f5a27175bd2487c27369d9ec7cb21a2a5cdf
Author: Olivier Hallot 
AuthorDate: Mon Sep 2 15:44:03 2019 -0300
Commit: Gerrit Code Review 
CommitDate: Tue Sep 3 14:45:58 2019 +0200

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#127287 Layer dialogue help button / page

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

diff --git a/helpcontent2 b/helpcontent2
index 381a89b6b2a7..88e16d81baaf 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 381a89b6b2a7136d4e862d7f8494a32183f4f705
+Subproject commit 88e16d81baaf02dc374725243631c263242fae05
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-03 Thread Olivier Hallot (via logerrit)

 source/text/sdraw/01/insert_layer.xhp |4 
 source/text/sdraw/guide/layer_new.xhp |3 ++-
 2 files changed, 6 insertions(+), 1 deletion(-)

New commits:
commit 88e16d81baaf02dc374725243631c263242fae05
Author: Olivier Hallot 
AuthorDate: Mon Sep 2 15:44:03 2019 -0300
Commit: Olivier Hallot 
CommitDate: Tue Sep 3 14:45:58 2019 +0200

tdf#127287 Layer dialogue help button / page

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

diff --git a/source/text/sdraw/01/insert_layer.xhp 
b/source/text/sdraw/01/insert_layer.xhp
index 64c986ed9..6b0f9a1e2 100644
--- a/source/text/sdraw/01/insert_layer.xhp
+++ b/source/text/sdraw/01/insert_layer.xhp
@@ -48,5 +48,9 @@
 When printing, print or ignore 
this particular layer.
 Locked
 Prevent elements on the layer from 
being edited.
+
+
+
+
 
 
diff --git a/source/text/sdraw/guide/layer_new.xhp 
b/source/text/sdraw/guide/layer_new.xhp
index 0966d1253..042cdc75d 100644
--- a/source/text/sdraw/guide/layer_new.xhp
+++ b/source/text/sdraw/guide/layer_new.xhp
@@ -56,9 +56,10 @@
 
 To change the 
properties of a layer, click the name tab of the layer, and then choose 
Format - Layer.
 You cannot change 
the name of or delete a predefined %PRODUCTNAME 
Draw layer.
-
+
 
 
 
+
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 formula/uiconfig/ui/formuladialog.ui |1 +
 formula/uiconfig/ui/functionpage.ui  |5 -
 formula/uiconfig/ui/structpage.ui|3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit d944746150f1390df91060b60b95c0743b4c4c95
Author: Caolán McNamara 
AuthorDate: Tue Sep 3 09:27:57 2019 +0100
Commit: Eike Rathke 
CommitDate: Tue Sep 3 14:16:53 2019 +0200

Resolves: tdf#126911 make structure box expandable

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

diff --git a/formula/uiconfig/ui/formuladialog.ui 
b/formula/uiconfig/ui/formuladialog.ui
index 504fe8935107..b2f016f37508 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -140,6 +140,7 @@
   
 True
 True
+True
 True
 True
 
diff --git a/formula/uiconfig/ui/functionpage.ui 
b/formula/uiconfig/ui/functionpage.ui
index 35500f1d0f38..b19029659043 100644
--- a/formula/uiconfig/ui/functionpage.ui
+++ b/formula/uiconfig/ui/functionpage.ui
@@ -13,6 +13,7 @@
   
 True
 False
+True
 True
 6
 vertical
@@ -36,7 +37,7 @@
   
 True
 True
-start
+True
 True
   
   
@@ -94,6 +95,7 @@
   
 True
 True
+True
 True
 never
 in
@@ -102,6 +104,7 @@
 True
 True
 True
+True
 True
 liststore1
 False
diff --git a/formula/uiconfig/ui/structpage.ui 
b/formula/uiconfig/ui/structpage.ui
index 0af026f2b51c..6ff834d02a23 100644
--- a/formula/uiconfig/ui/structpage.ui
+++ b/formula/uiconfig/ui/structpage.ui
@@ -15,6 +15,7 @@
   
 True
 False
+True
 True
 6
 vertical
@@ -38,12 +39,14 @@
   
 True
 True
+True
 True
 in
 
   
 True
 True
+True
 True
 liststore1
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: common/Util.cpp wsd/Storage.cpp

2019-09-03 Thread Tor Lillqvist (via logerrit)

 common/Util.cpp |2 +-
 wsd/Storage.cpp |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 80ddb46392d5478e505eb90f51a571331023
Author: Tor Lillqvist 
AuthorDate: Tue Sep 3 13:23:32 2019 +0300
Commit: Michael Meeks 
CommitDate: Tue Sep 3 13:50:27 2019 +0200

Fix portability problems after 22f1656e08d1cc873a523bf1f869bdd75066dd2a

It is std::chrono::system_clock that has to_time_t.
std::chrono::steady_clock does not have to_time_t.

std::chrono::high_resolution_clock is either the same as system_clock
(in libstdc++, on Linux) or steady_clock (libc++, on iOS).

(This change does not fix the actual bugs in the code, just makes it
compile for iOS. The new ISO8601 fractional time code is not unit
tested at the moment. The testTime() function is not part of the test
suite in WhiteBoxTests.cpp. If it is made part of it, it reveals
problems in the code (and/or in the unit test code).)

Change-Id: Id33342bc8b26465632f3d21d6ec2f3c975ae3681
Reviewed-on: https://gerrit.libreoffice.org/78550
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 

diff --git a/common/Util.cpp b/common/Util.cpp
index 00454f0f8..80efed440 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -797,7 +797,7 @@ namespace Util
 
 std::string getIso8601FracformatTime(std::chrono::system_clock::time_point 
time){
 char time_modified[64];
-std::time_t lastModified_us_t = 
std::chrono::high_resolution_clock::to_time_t(time);
+std::time_t lastModified_us_t = 
std::chrono::system_clock::to_time_t(time);
 std::tm lastModified_tm = *std::gmtime(&lastModified_us_t);
 strftime(time_modified, sizeof(time_modified), "%FT%T.", 
&lastModified_tm);
 
diff --git a/wsd/Storage.cpp b/wsd/Storage.cpp
index db82d913a..992f4a0d3 100644
--- a/wsd/Storage.cpp
+++ b/wsd/Storage.cpp
@@ -261,7 +261,7 @@ std::unique_ptr 
LocalStorage::getLocalFileInfo()
 std::string str_path = path.toString();
 const auto& filename = path.getFileName();
 const Poco::File file = Poco::File(path);
-std::chrono::high_resolution_clock::time_point lastModified = 
Util::getFileTimestamp(str_path);
+std::chrono::system_clock::time_point lastModified = 
Util::getFileTimestamp(str_path);
 const size_t size = file.getSize();
 
 setFileInfo(FileInfo({filename, "localhost", lastModified, size}));
___
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.2' - sfx2/source

 sfx2/source/sidebar/Deck.cxx |   32 
 1 file changed, 32 deletions(-)

New commits:
commit 811a431a986a419ea98922b142206362b613e1fb
Author: Ashod Nakashian 
AuthorDate: Wed Oct 10 06:44:27 2018 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:45:04 2019 +0200

sfx2: LOK: route the parent sidebar window instead of the deck

Correct previous mis-merge by removing the notification from Deck.

(cherry picked from commit a4142984c4d8dc00fea438bd71bf2af4917c359a)

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

diff --git a/sfx2/source/sidebar/Deck.cxx b/sfx2/source/sidebar/Deck.cxx
index 48f7291e8af7..15f591fd1e64 100644
--- a/sfx2/source/sidebar/Deck.cxx
+++ b/sfx2/source/sidebar/Deck.cxx
@@ -66,20 +66,6 @@ Deck::Deck(const DeckDescriptor& rDeckDescriptor, 
vcl::Window* pParentWindow,
 
 mpVerticalScrollBar->SetScrollHdl(LINK(this, Deck, 
HandleVerticalScrollBarChange));
 
-if (comphelper::LibreOfficeKit::isActive())
-{
-SetLOKNotifier(SfxViewShell::Current());
-
-if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
-{
-std::vector aItems;
-aItems.emplace_back("type", "deck");
-aItems.emplace_back(std::make_pair("position", 
Point(GetOutOffXPixel(), GetOutOffYPixel()).toString()));
-aItems.emplace_back(std::make_pair("size", 
GetSizePixel().toString()));
-pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
-}
-}
-
 #ifdef DEBUG
 SetText(OUString("Deck"));
 mpScrollClipWindow->SetText(OUString("ScrollClipWindow"));
@@ -193,15 +179,6 @@ bool Deck::EventNotify(NotifyEvent& rEvent)
 void Deck::Resize()
 {
 Window::Resize();
-
-if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
-{
-std::vector aItems;
-aItems.emplace_back("type", "deck");
-aItems.emplace_back(std::make_pair("position", 
Point(GetOutOffXPixel(), GetOutOffYPixel()).toString()));
-aItems.emplace_back(std::make_pair("size", GetSizePixel().toString()));
-pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems);
-}
 }
 
 bool Deck::ProcessWheelEvent(CommandEvent const * pCommandEvent)
@@ -255,15 +232,6 @@ void Deck::RequestLayoutInternal()
 DeckLayouter::LayoutDeck(GetContentArea(), mnMinimalWidth, 
mnMinimalHeight, maPanels,
  *GetTitleBar(), *mpScrollClipWindow, 
*mpScrollContainer,
  *mpFiller, *mpVerticalScrollBar);
-
-if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
-{
-std::vector aItems;
-aItems.emplace_back("type", "deck");
-aItems.emplace_back(std::make_pair("position", 
Point(GetOutOffXPixel(), GetOutOffYPixel()).toString()));
-aItems.emplace_back(std::make_pair("size", GetSizePixel().toString()));
-pNotifier->notifyWindow(GetLOKWindowId(), "created", aItems);
-}
 }
 
 void Deck::RequestLayout()
___
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.2' - 2 commits - desktop/qa include/sfx2 include/tools sc/source sfx2/source

 desktop/qa/desktop_lib/test_desktop_lib.cxx |   56 +++--
 include/sfx2/objsh.hxx  |2 
 include/tools/link.hxx  |   61 
 sc/source/ui/docshell/docsh.cxx |6 ++
 sc/source/ui/inc/docsh.hxx  |2 
 sfx2/source/doc/objserv.cxx |1 
 sfx2/source/doc/objstor.cxx |7 +++
 7 files changed, 130 insertions(+), 5 deletions(-)

New commits:
commit e867404fbe7e0ff0d6f2573292c19b3a178a412d
Author: Ashod Nakashian 
AuthorDate: Thu Aug 22 09:15:15 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:44:47 2019 +0200

sc: LOK: commit cell edits before saveas

Users typically don't recognize that changes
done to a cell need to be committed (typically
by hitting RETURN) before they are saved to file.
This is especially true on the web.

This patch commits any in-flight changes before
SaveAs. This is currently done only for LOK and
unconditionally at that. This can be controlled
via a flag, if there is such a use-case.

Reviewed-on: https://gerrit.libreoffice.org/78012
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
(cherry picked from commit cc7eb4d345e3fede698a3f255c1938d275305c14)

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

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index 67e66832bbff..c08cdaeb41bc 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -86,6 +86,7 @@ public:
 comphelper::LibreOfficeKit::setActive(false);
 };
 
+LibLODocument_Impl* loadDocUrl(const OUString& rFileURL, 
LibreOfficeKitDocumentType eType);
 LibLODocument_Impl* loadDoc(const char* pName, LibreOfficeKitDocumentType 
eType = LOK_DOCTYPE_TEXT);
 void closeDoc();
 static void callback(int nType, const char* pPayload, void* pData);
@@ -140,6 +141,7 @@ public:
 void testTextSelectionHandles();
 void testComplexSelection();
 void testDialogPaste();
+void testCalcSaveAs();
 void testABI();
 
 CPPUNIT_TEST_SUITE(DesktopLOKTest);
@@ -192,6 +194,7 @@ public:
 CPPUNIT_TEST(testTextSelectionHandles);
 CPPUNIT_TEST(testComplexSelection);
 CPPUNIT_TEST(testDialogPaste);
+CPPUNIT_TEST(testCalcSaveAs);
 CPPUNIT_TEST(testABI);
 CPPUNIT_TEST_SUITE_END();
 
@@ -237,10 +240,8 @@ static Control* GetFocusControl(vcl::Window const * 
pParent)
 return nullptr;
 }
 
-LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName, 
LibreOfficeKitDocumentType eType)
+LibLODocument_Impl* DesktopLOKTest::loadDocUrl(const OUString& rFileURL, 
LibreOfficeKitDocumentType eType)
 {
-OUString aFileURL;
-createFileURL(OUString::createFromAscii(pName), aFileURL);
 OUString aService;
 switch (eType)
 {
@@ -257,7 +258,7 @@ LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* 
pName, LibreOfficeKitDoc
 CPPUNIT_ASSERT(false);
 break;
 }
-mxComponent = loadFromDesktop(aFileURL, aService);
+mxComponent = loadFromDesktop(rFileURL, aService);
 if (!mxComponent.is())
 {
 CPPUNIT_ASSERT(false);
@@ -266,6 +267,13 @@ LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* 
pName, LibreOfficeKitDoc
 return m_pDocument.get();
 }
 
+LibLODocument_Impl* DesktopLOKTest::loadDoc(const char* pName, 
LibreOfficeKitDocumentType eType)
+{
+OUString aFileURL;
+createFileURL(OUString::createFromAscii(pName), aFileURL);
+return loadDocUrl(aFileURL, eType);
+}
+
 void DesktopLOKTest::closeDoc()
 {
 if (mxComponent.is())
@@ -1748,6 +1756,7 @@ void DesktopLOKTest::testRedlineCalc()
 class ViewCallback
 {
 public:
+OString m_aCellFormula;
 bool m_bTilesInvalidated;
 tools::Rectangle m_aOwnCursor;
 boost::property_tree::ptree m_aCommentCallbackResult;
@@ -1792,6 +1801,11 @@ public:
 m_aCommentCallbackResult = 
m_aCommentCallbackResult.get_child("comment");
 }
 break;
+case LOK_CALLBACK_CELL_FORMULA:
+{
+m_aCellFormula = aPayload;
+}
+break;
 }
 }
 };
@@ -2590,6 +2604,40 @@ void DesktopLOKTest::testComplexSelection()
 CPPUNIT_ASSERT_EQUAL(static_cast(LOK_SELTYPE_COMPLEX), 
pDocument->pClass->getSelectionType(pDocument));
 }
 
+void DesktopLOKTest::testCalcSaveAs()
+{
+comphelper::LibreOfficeKit::setActive();
+
+LibLODocument_Impl* pDocument = loadDoc("sheets.ods");
+CPPUNIT_ASSERT(pDocument);
+
+// Enter some text, but don't commit.
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYINPUT, 'X', 0);
+pDocument->pClass->postKeyEvent(pDocument, LOK_KEYEVENT_KEYUP, 'X', 0);
+Scheduler::ProcessEventsToIdle();
+
+// Save

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - sw/source vcl/source

 sw/source/filter/ascii/parasc.cxx |6 +-
 vcl/source/control/field.cxx  |   25 -
 2 files changed, 29 insertions(+), 2 deletions(-)

New commits:
commit e9a48869fe1f1e90c03d299ae419ea5b1f43de50
Author: Ashod Nakashian 
AuthorDate: Mon Jun 17 23:32:04 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:44:22 2019 +0200

vcl: better decimal handling in NumericFormatter

When the user deletes the decimal point from
MetricBox, it ends up with the number
with the fractional portion (to the right of
the decimal point) appended to it, which is
(with two decimal points) a 100x larger value.

This makes such editing smarter. In the case
that we detect that the user deleted the
decimal point (which we know should've been
there, because we have a configured fixed
number of decimal points,) we restore it.
This makes it more intuitive, since when
the user enters digits, they get the correct
and expected result, but when they delete the
decimal point, they almost always didn't mean
to grow the number 100x. If that was the goal,
they could enter two extra digits before
the decimal point.

In addition, we set the default maximum to
a more user-friendly value of a million,
instead of int-max, which seems like a
random number to the uninitiated.

Change-Id: Ib535f06e4f111d20f35c4209ad65969dca5928e8
Reviewed-on: https://gerrit.libreoffice.org/75511
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
(cherry picked from commit 42761c688053155ae87628e69eb4d2a28e6c78e6)
Reviewed-on: https://gerrit.libreoffice.org/78453
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/vcl/source/control/field.cxx b/vcl/source/control/field.cxx
index 59220ac21258..bbbdbceb86e4 100644
--- a/vcl/source/control/field.cxx
+++ b/vcl/source/control/field.cxx
@@ -131,6 +131,29 @@ bool ImplNumericGetValue( const OUString& rStr, sal_Int64& 
rValue,
 aStr1.appendCopy(aStr, 0, nDecPos);
 aStr2.appendCopy(aStr, nDecPos+1);
 }
+else if (nDecDigits > 0 && aStr.getLength() > nDecDigits)
+{
+// We expect a decimal point and a certain number of decimal digits,
+// but seems the user has deleted the decimal point, so we restore it.
+// Otherwise, they end up with unexpectedly (to them) large numbers.
+
+// Find the first digit from the right.
+sal_Int32 nVirtualDecPos = aStr.getLength();
+while (--nVirtualDecPos > 0)
+{
+if ((aStr[nVirtualDecPos] >= '0') && (aStr[nVirtualDecPos] <= '9'))
+break;
+}
+
+if (nVirtualDecPos >= nDecDigits)
+{
+nVirtualDecPos -= nDecDigits - 1; // nVirtualDecPos is already on 
a digit (so discount it).
+aStr1.append(aStr.getStr(), nVirtualDecPos);
+aStr2.append(aStr.getStr() + nVirtualDecPos);
+}
+else
+aStr1 = aStr;
+}
 else
 aStr1 = aStr;
 
@@ -470,7 +493,7 @@ void NumericFormatter::ImplInit()
 mnFieldValue= 0;
 mnLastValue = 0;
 mnMin   = 0;
-mnMax   = SAL_MAX_INT32;
+mnMax   = 1; // A user-friendly round number.
 // a "large" value substantially smaller than SAL_MAX_INT64, to avoid
 // overflow in computations using this "dummy" value
 mnDecimalDigits = 2;
commit 2cd1ac593a3a47f7331d161fd113417c97313a01
Author: Ashod Nakashian 
AuthorDate: Wed Jul 10 08:31:39 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:44:09 2019 +0200

sw: fail loading when the fallback text detection fails

When we document in question fails to match any known type,
we try to open as plain text (and convert to a Writer doc).
However we should not display non-text when we have failed
to detect ascii or unicode contents in the file.

This happens with corrupted documents, for example, where
we end up displaying non-printable binary data.

Change-Id: Iccc158a4cb6051a8b17ba01987a30a9882a27fa9
Reviewed-on: https://gerrit.libreoffice.org/75512
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
(cherry picked from commit d1f6f27e2a014aa55e2762f1209dc520fb183404)
Reviewed-on: https://gerrit.libreoffice.org/78452
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/source/filter/ascii/parasc.cxx 
b/sw/source/filter/ascii/parasc.cxx
index ef7faed07197..667778886a98 100644
--- a/sw/source/filter/ascii/parasc.cxx
+++ b/sw/source/filter/ascii/parasc.cxx
@@ -261,7 +261,11 @@ ErrCode SwASCIIParser::ReadChars()
 nOrig = nLen = rInput.ReadBytes(pArr.get(), ASC_BUFFLEN);
 rtl_TextEncoding eCharSet;
 LineEnd eLineEnd;
-bool bRet = SwIoSystem::IsDetectableText(pArr.get(), nLen, &eCharSet, 
&bSwapUnicode,

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

 sc/source/ui/view/cellsh3.cxx |   12 
 1 file changed, 12 insertions(+)

New commits:
commit 5e9bf9a25dbbe08a60cc0043fbfeae48e04efe76
Author: Ashod Nakashian 
AuthorDate: Fri Jul 12 11:58:11 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:43:39 2019 +0200

LOK: emit modified status on entering cell data

Entering data into a cell without committing will
normally not set the modified flag. However clients
might want to know whether there is in-flight changes
when they need to save the document.

A possible scenario is that the user enters some
cell data and then closes the window. Both WSD and
the client app would here rely on the modified
notification to decide whether to save the document
or not.

We do not change the document modified state, since
that may be incorrect (in case the user actually
cancel the cell entry), so we preserve that so future
updates to the modified status would reflect the
correct state of the file. Instead, we emit a
client notification that the document has
been modified, to signal them that saving
is sensible.

Note that ideally we would undo this when the user
cancels the cell edit, but that would be complicated
due to multi-editor scenarios. For example, another
user might actually edit the document while we
cancel our cell edit, and in this case we should not
reset the modify flag. Since this is unreliable,
we leave the flag set, unless the Core emits
an update, which will surely be accurate.

Change-Id: Id26aa6f8ce2c0a08f8bee6812fcf99275dc24551
Reviewed-on: https://gerrit.libreoffice.org/75513
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 
(cherry picked from commit 38b899312245758381fa72ad17c2d4c281edb1ba)
Reviewed-on: https://gerrit.libreoffice.org/78451
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sc/source/ui/view/cellsh3.cxx b/sc/source/ui/view/cellsh3.cxx
index f62eecd2b881..11db51e467c1 100644
--- a/sc/source/ui/view/cellsh3.cxx
+++ b/sc/source/ui/view/cellsh3.cxx
@@ -45,6 +45,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 #include 
 
@@ -166,6 +169,15 @@ void ScCellShell::Execute( SfxRequest& rReq )
 {
 if ( pReqArgs )
 {
+if (comphelper::LibreOfficeKit::isActive())
+{
+// Let the client know about our entry, so if they save
+// (say because the user closes the document or 
window,)
+// this change gets persisted (assuming 
DontTerminateEdit
+// is set to false in the .uno:Save command).
+
SfxLokHelper::notifyAllViews(LOK_CALLBACK_STATE_CHANGED, 
".uno:ModifiedStatus=true");
+}
+
 OUString aStr( static_cast(pReqArgs->
 Get( SID_ENTER_STRING )).GetValue() );
 const SfxPoolItem* pDontCommitItem;
___
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.2' - svx/Library_svx.mk svx/source

2019-09-03 Thread Tomaž Vajngerl (via logerrit)

 svx/Library_svx.mk  |2 +-
 svx/source/sidebar/PanelFactory.cxx |6 ++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 443389343c64887ff720c97ac1c2adfd18cf0edd
Author: Tomaž Vajngerl 
AuthorDate: Mon Jun 24 14:27:19 2019 +0900
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:43:08 2019 +0200

don't compile MediaPlaybackPanel if we don't have avmedia

This sidebar panel causes missing symbols when compiling for ios,
where we disable avmedia support.

Change-Id: Ib79a6debc27e5d5be4b4c388077ac1a3bf8c97b4
Reviewed-on: https://gerrit.libreoffice.org/74617
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 293df527fc50cc11314be2adc190bec8159bc397)
Reviewed-on: https://gerrit.libreoffice.org/78450
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/svx/Library_svx.mk b/svx/Library_svx.mk
index b9acb5e380e5..8c42eca33130 100644
--- a/svx/Library_svx.mk
+++ b/svx/Library_svx.mk
@@ -202,7 +202,7 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
 svx/source/sidebar/line/LinePropertyPanelBase \
 svx/source/sidebar/line/LineWidthValueSet \
 svx/source/sidebar/line/LineWidthPopup \
-svx/source/sidebar/media/MediaPlaybackPanel \
+$(call 
gb_Helper_optional,AVMEDIA,svx/source/sidebar/media/MediaPlaybackPanel) \
 svx/source/sidebar/possize/PosSizePropertyPanel \
 svx/source/sidebar/possize/SidebarDialControl \
 svx/source/sidebar/shapes/DefaultShapesPanel \
diff --git a/svx/source/sidebar/PanelFactory.cxx 
b/svx/source/sidebar/PanelFactory.cxx
index 4eb6270dab2f..2cd676fd5e2d 100644
--- a/svx/source/sidebar/PanelFactory.cxx
+++ b/svx/source/sidebar/PanelFactory.cxx
@@ -17,6 +17,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+#include 
+
 #include "text/TextPropertyPanel.hxx"
 #include "styles/StylesPropertyPanel.hxx"
 #include "paragraph/ParaPropertyPanel.hxx"
@@ -26,7 +28,9 @@
 #include "line/LinePropertyPanel.hxx"
 #include "possize/PosSizePropertyPanel.hxx"
 #include 
+#if HAVE_FEATURE_AVMEDIA
 #include "media/MediaPlaybackPanel.hxx"
+#endif
 #include 
 #include "EmptyPanel.hxx"
 #include 
@@ -155,10 +159,12 @@ Reference SAL_CALL 
PanelFactory::createUIElement (
 {
 pControl = DefaultShapesPanel::Create(pParentWindow, xFrame);
 }
+#if HAVE_FEATURE_AVMEDIA
 else if (rsResourceURL.endsWith("/MediaPlaybackPanel"))
 {
 pControl = MediaPlaybackPanel::Create(pParentWindow, xFrame, 
pBindings);
 }
+#endif
 else if (rsResourceURL.endsWith("/GalleryPanel"))
 {
 pControl.reset(VclPtr::Create(pParentWindow));
___
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.2' - 2 commits - sd/source solenv/bin

2019-09-03 Thread Jan Holesovsky (via logerrit)

 sd/source/ui/animations/SlideTransitionPane.cxx |2 ++
 solenv/bin/native-code.py   |6 ++
 2 files changed, 8 insertions(+)

New commits:
commit 66bf346812026210582cd5f5e697d750c973c48e
Author: Jan Holesovsky 
AuthorDate: Tue Jun 18 09:54:00 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:42:44 2019 +0200

android: Add the sidebar-related constructors to liblo-native-code.so.

Change-Id: I25acb8965d190fc443d75357352e4d02c9b03cc2
Reviewed-on: https://gerrit.libreoffice.org/74265
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 05eca1ba63a2eca5e6d6be0b7a05bb6f53354ec6)
Reviewed-on: https://gerrit.libreoffice.org/78449

diff --git a/solenv/bin/native-code.py b/solenv/bin/native-code.py
index 1cde5daa971f..35e5bf98de17 100755
--- a/solenv/bin/native-code.py
+++ b/solenv/bin/native-code.py
@@ -202,11 +202,16 @@ core_constructor_list = [
 "com_sun_star_graphic_GraphicObject_get_implementation",
 "com_sun_star_comp_graphic_GraphicProvider_get_implementation",
 # svx/util/svx.component
+"com_sun_star_comp_svx_NumberingToolBoxControl_get_implementation",
 "com_sun_star_drawing_EnhancedCustomShapeEngine_get_implementation",
 "com_sun_star_drawing_SvxShapeCollection_get_implementation",
+"com_sun_star_svx_FontHeightToolBoxController_get_implementation",
+"org_apache_openoffice_comp_svx_sidebar_PanelFactory_get_implementation",
 # svx/util/svxcore.component
 "com_sun_star_comp_graphic_PrimitiveFactory2D_get_implementation",
 "com_sun_star_comp_Draw_GraphicExporter_get_implementation",
+"com_sun_star_comp_svx_ColorToolBoxControl_get_implementation",
+"com_sun_star_comp_svx_FontNameToolBoxControl_get_implementation",
 "com_sun_star_comp_Svx_GraphicExportHelper_get_implementation",
 "com_sun_star_comp_Svx_GraphicImportHelper_get_implementation",
 # toolkit/util/tk.component
@@ -268,6 +273,7 @@ edit_factory_list = [
 edit_constructor_list = [
 # framework/util/fwk.component
 
"com_sun_star_comp_framework_GlobalAcceleratorConfiguration_get_implementation",
+"com_sun_star_comp_framework_UICommandDescription_get_implementation",
 # i18npool/util/i18npool.component
 "com_sun_star_i18n_InputSequenceChecker_get_implementation",
 "com_sun_star_i18n_OrdinalSuffix_get_implementation",
commit 42d8008c03b5b0ad92a56992781632aa7f6e2bfe
Author: Jan Holesovsky 
AuthorDate: Fri May 24 23:19:53 2019 +0200
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:42:31 2019 +0200

Transition sidebar: Apply the transition duration right away.

In the desktop version, the value that is entered there always ends up
applied.  In the Online, there was a scenario when it did not: enter a
value and switch slide by clicking the slide sorter.

There is no harm to apply the value right away when the user edits,
because in the desktop version, there was no way to avoid applying the
value anyway.

Change-Id: I519423d60f682735aeb1d471b3397ff9671c15fd
Reviewed-on: https://gerrit.libreoffice.org/72923
Reviewed-by: Michael Meeks 
Tested-by: Michael Meeks 
(cherry picked from commit 5eea8c955b7632414c1d6c3ec0cbcf86c558efc6)
Reviewed-on: https://gerrit.libreoffice.org/78448
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sd/source/ui/animations/SlideTransitionPane.cxx 
b/sd/source/ui/animations/SlideTransitionPane.cxx
index e43c2f28520f..52b9eedb43ae 100644
--- a/sd/source/ui/animations/SlideTransitionPane.cxx
+++ b/sd/source/ui/animations/SlideTransitionPane.cxx
@@ -1129,6 +1129,8 @@ IMPL_LINK_NOARG(SlideTransitionPane, DurationModifiedHdl, 
Edit&, void)
 mpCBX_duration->SetValue(0);
 else
 mpCBX_duration->SetValue(duration_value);
+
+applyToSelectedPages();
 }
 
 IMPL_LINK_NOARG(SlideTransitionPane, DurationLoseFocusHdl, Control&, void)
___
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.2' - vcl/source

 vcl/source/window/dialog.cxx |   19 +--
 1 file changed, 17 insertions(+), 2 deletions(-)

New commits:
commit 19329f086f09f1dc4db589f12d73a4daae728269
Author: Ashod Nakashian 
AuthorDate: Wed May 8 08:15:52 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:41:48 2019 +0200

vcl: LOK: emit size_changed after window creation

This guarantees that the correct size of the window
is set on the client side. Some windows are created
with default (and invalid) size and rely on Resize
to be called right after. This doesn't happen
with message boxes and they need to get size_changed
right after the window is fully created and ready.

(cherry picked from commit abd504c70b7b36b20082677a1b1eef6ff937a6f7)

Change-Id: I8c281a31770de4b37b9de6d333159e5379344dff
Reviewed-on: https://gerrit.libreoffice.org/77508
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index afc975412186..314d135d973b 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -894,7 +894,7 @@ bool Dialog::ImplStartExecute()
 
 if (bKitActive)
 {
-if(const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
 {
 std::vector aItems;
 aItems.emplace_back("type", "dialog");
@@ -954,7 +954,8 @@ bool Dialog::ImplStartExecute()
 if (bModal)
 pSVData->maAppData.mnModalMode++;
 
-css::uno::Reference 
xEventBroadcaster(css::frame::theGlobalEventBroadcaster::get(xContext), 
css::uno::UNO_QUERY_THROW);
+css::uno::Reference xEventBroadcaster(
+css::frame::theGlobalEventBroadcaster::get(xContext), 
css::uno::UNO_QUERY_THROW);
 css::document::DocumentEvent aObject;
 aObject.EventName = "DialogExecute";
 xEventBroadcaster->documentEventOccured(aObject);
@@ -963,6 +964,20 @@ bool Dialog::ImplStartExecute()
 else
 UITestLogger::getInstance().log("ModelessDialogExecuted Id:" + 
get_id());
 
+if (comphelper::LibreOfficeKit::isActive())
+{
+if (const vcl::ILibreOfficeKitNotifier* pNotifier = GetLOKNotifier())
+{
+// Dialog boxes don't get the Resize call and they
+// can have invalid size at 'created' message above.
+// If there is no difference, the client should detect it and 
ignore us,
+// otherwise, this should make sure that the window has the 
correct size.
+std::vector aItems;
+aItems.emplace_back("size", GetSizePixel().toString());
+pNotifier->notifyWindow(GetLOKWindowId(), "size_changed", aItems);
+}
+}
+
 return true;
 }
 
___
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.2' - toolkit/source

 toolkit/source/awt/vclxwindows.cxx |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit eb0e79662549454d056ae07cad9a4909b60d8439
Author: Ashod Nakashian 
AuthorDate: Wed Mar 27 21:26:21 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:40:36 2019 +0200

toolkit: initialize primitive types explicitly

Change-Id: I1e09d458d1c6c4842750368fbd45ef326fa1bedb
Reviewed-on: https://gerrit.libreoffice.org/70160
Reviewed-by: Ashod Nakashian 
Tested-by: Ashod Nakashian 
(cherry picked from commit 8286ce93454e39d5669a381cb1785392ad7e43f3)
Reviewed-on: https://gerrit.libreoffice.org/78445
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/toolkit/source/awt/vclxwindows.cxx 
b/toolkit/source/awt/vclxwindows.cxx
index f50c8ffb55ec..b3cbbdd2c296 100644
--- a/toolkit/source/awt/vclxwindows.cxx
+++ b/toolkit/source/awt/vclxwindows.cxx
@@ -1849,14 +1849,14 @@ void VCLXListBox::setProperty( const OUString& 
PropertyName, const css::uno::Any
 break;
 case BASEPROPERTY_READONLY:
 {
-bool b = bool();
+bool b = false;
 if ( Value >>= b )
  pListBox->SetReadOnly( b);
 }
 break;
 case BASEPROPERTY_MULTISELECTION:
 {
-bool b = bool();
+bool b = false;
 if ( Value >>= b )
  pListBox->EnableMultiSelection( b );
 }
@@ -1866,7 +1866,7 @@ void VCLXListBox::setProperty( const OUString& 
PropertyName, const css::uno::Any
 break;
 case BASEPROPERTY_LINECOUNT:
 {
-sal_Int16 n = sal_Int16();
+sal_Int16 n = 0;
 if ( Value >>= n )
  pListBox->SetDropDownLineCount( n );
 }
___
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.2' - 2 commits - libreofficekit/qa sd/source

 libreofficekit/qa/gtktiledviewer/gtv-application.cxx |7 +++
 sd/source/ui/animations/CustomAnimationPane.cxx  |4 
 2 files changed, 11 insertions(+)

New commits:
commit fc3742a39ea2bd7a30dc4f97d5d70a173c08ca4a
Author: Ashod Nakashian 
AuthorDate: Mon Apr 29 22:21:39 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:41:10 2019 +0200

gtktiledviewer: provide activation function

This fixes the gtktiledviewer on some distros/gtk
versions that require an activation function to be
provided.

Change-Id: I95fb3ed4e92e27d9c725ca38b4cb5a4f8af51771
Reviewed-on: https://gerrit.libreoffice.org/71588
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 6ac2ce64ddd4e2fcdfc0f8f50fae36a78f87f9ab)
Reviewed-on: https://gerrit.libreoffice.org/78447
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx 
b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
index 3d802ee325d4..cd0a88a85fe2 100644
--- a/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
+++ b/libreofficekit/qa/gtktiledviewer/gtv-application.cxx
@@ -28,6 +28,12 @@ getPrivate(GtvApplication* app)
 }
 
 static void
+gtv_application_activate(GApplication*)
+{
+// If this isn't provided, some GTK versions fail to run us at all.
+}
+
+static void
 gtv_application_open(GApplication* app, GFile** file, gint /*nFiles*/, const 
gchar* /*hint*/)
 {
 // TODO: add some option to create a new view for existing document
@@ -142,6 +148,7 @@ gtv_application_handle_local_options(GApplication* app, 
GVariantDict* options)
 static void
 gtv_application_class_init(GtvApplicationClass* klass)
 {
+G_APPLICATION_CLASS(klass)->activate = gtv_application_activate;
 G_APPLICATION_CLASS(klass)->open = gtv_application_open;
 G_APPLICATION_CLASS(klass)->handle_local_options = 
gtv_application_handle_local_options;
 G_OBJECT_CLASS(klass)->dispose = gtv_application_dispose;
commit 40cb61e0943a14a6848c43dc9f4c951f540118f3
Author: Ashod Nakashian 
AuthorDate: Fri Nov 23 08:02:04 2018 -0500
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:40:53 2019 +0200

LOK: sd: no animation preview for LOK

Change-Id: I67babe9b340bafd196dedb2918d6a24bfc9c0ad5
(cherry picked from commit 259ce91cb63baa049bc57db79fd922ab5fd8be57)
Reviewed-on: https://gerrit.libreoffice.org/78446
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sd/source/ui/animations/CustomAnimationPane.cxx 
b/sd/source/ui/animations/CustomAnimationPane.cxx
index 0db0f4723d8f..fe0e5cd48571 100644
--- a/sd/source/ui/animations/CustomAnimationPane.cxx
+++ b/sd/source/ui/animations/CustomAnimationPane.cxx
@@ -2418,6 +2418,10 @@ void CustomAnimationPane::onPreview( bool bForcePreview )
 if( !bForcePreview && !mpCBAutoPreview->IsChecked() )
 return;
 
+// No preview in LOK.
+if (comphelper::LibreOfficeKit::isActive())
+return;
+
 if( maListSelection.empty() )
 {
 rtl::Reference< MotionPathTag > xMotionPathTag;
___
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.2' - sw/qa

 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx |   26 ++
 1 file changed, 26 insertions(+)

New commits:
commit 00e36fa26005128e3fcd8d4eef15577ed58c1346
Author: Ashod Nakashian 
AuthorDate: Wed Apr 3 00:23:23 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:39:48 2019 +0200

sw: oox: unit-test for default Content_Types

Change-Id: I59432487d1b995a4b3dd28396860990b73ad4252
Reviewed-on: https://gerrit.libreoffice.org/70176
Reviewed-by: Jan Holesovsky 
Tested-by: Jan Holesovsky 
(cherry picked from commit 5416cfcd31c3561b89ea8c030f15609fca02bca0)
Reviewed-on: https://gerrit.libreoffice.org/78444
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index a44c8f78d9cf..70c033794db6 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -85,6 +85,32 @@ DECLARE_OOXMLEXPORT_TEST(testDocm, "hello.docm")
 
"application/vnd.openxmlformats-officedocument.wordprocessingml.document.main+xml");
 }
 
+DECLARE_OOXMLEXPORT_TEST(testDefaultContentTypes, "fdo55381.docx")
+{
+if (xmlDocPtr pXmlDoc = parseExport("[Content_Types].xml"))
+{
+assertXPath(pXmlDoc,
+"/ContentType:Types/ContentType:Default[@Extension='xml']",
+"ContentType",
+"application/xml");
+
+assertXPath(pXmlDoc,
+
"/ContentType:Types/ContentType:Default[@Extension='rels']",
+"ContentType",
+
"application/vnd.openxmlformats-package.relationships+xml");
+
+assertXPath(pXmlDoc,
+"/ContentType:Types/ContentType:Default[@Extension='png']",
+"ContentType",
+"image/png");
+
+assertXPath(pXmlDoc,
+
"/ContentType:Types/ContentType:Default[@Extension='jpeg']",
+"ContentType",
+"image/jpeg");
+}
+}
+
 DECLARE_SW_ROUNDTRIP_TEST(testDocmSave, "hello.docm", nullptr, DocmTest)
 {
 // This was
___
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.2' - 2 commits - desktop/source sd/source

 desktop/source/lib/init.cxx   |2 +-
 sd/source/ui/inc/PaneChildWindows.hxx |9 +++--
 2 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit fa18cdce824525ebd76b542a44741a35062741ce
Author: Ashod Nakashian 
AuthorDate: Sun Mar 10 12:21:33 2019 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:39:35 2019 +0200

LOK: don't segfault when reporting error

Change-Id: Ia6d614eb15b15f43ddd3e0b5742b888060dfd581
Reviewed-on: https://gerrit.libreoffice.org/69069
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 9fa568dced78011072390320f64eae28dd06d2b9)
Reviewed-on: https://gerrit.libreoffice.org/78443

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 43e3168a49ad..e0e8aca13776 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -3315,7 +3315,7 @@ static void doc_postUnoCommand(LibreOfficeKitDocument* 
pThis, const char* pComma
 else
 bResult = comphelper::dispatchCommand(aCommand, 
comphelper::containerToSequence(aPropertyValuesVector));
 
-if (!bResult)
+if (!bResult && gImpl)
 {
 SetLastExceptionMsg("Failed to dispatch the .uno: command");
 }
commit 17d338ae7c8d6ac3e66706887aada270dccade0e
Author: Ashod Nakashian 
AuthorDate: Mon Nov 12 08:22:17 2018 -0500
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:39:11 2019 +0200

sd: document the left pane classes

Change-Id: Id037e2f5f733ef7266ef6d48ff2ff7dea956ea25
Reviewed-on: https://gerrit.libreoffice.org/69070
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 0b3c2cb3cb8c8b2ddec6063c2ea75b24abf518fc)
Reviewed-on: https://gerrit.libreoffice.org/78442

diff --git a/sd/source/ui/inc/PaneChildWindows.hxx 
b/sd/source/ui/inc/PaneChildWindows.hxx
index d277a808d6b7..ff72731b822c 100644
--- a/sd/source/ui/inc/PaneChildWindows.hxx
+++ b/sd/source/ui/inc/PaneChildWindows.hxx
@@ -24,6 +24,7 @@
 
 namespace sd {
 
+/// Base class of Impress and Draw left sidebars/panes.
 class PaneChildWindow
 : public SfxChildWindow
 {
@@ -37,20 +38,24 @@ public:
 virtual ~PaneChildWindow() override;
 };
 
+/// The slide-sorter sidebar (on the left) in Impress.
 class LeftPaneImpressChildWindow
 : public PaneChildWindow
 {
 public:
-LeftPaneImpressChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, 
SfxChildWinInfo*);
+LeftPaneImpressChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId, 
SfxBindings* pBindings,
+   SfxChildWinInfo* pInfo);
 
 SFX_DECL_CHILDWINDOW_WITHID(LeftPaneImpressChildWindow);
 };
 
+/// The pages sidebar (on the left) in Draw.
 class LeftPaneDrawChildWindow
 : public PaneChildWindow
 {
 public:
-LeftPaneDrawChildWindow (vcl::Window*, sal_uInt16, SfxBindings*, 
SfxChildWinInfo*);
+LeftPaneDrawChildWindow(vcl::Window* pParentWindow, sal_uInt16 nId, 
SfxBindings* pBindings,
+SfxChildWinInfo* pInfo);
 
 SFX_DECL_CHILDWINDOW_WITHID(LeftPaneDrawChildWindow);
 };
___
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.2' - 3 commits - desktop/qa sd/qa sd/source vcl/source

 desktop/qa/desktop_lib/test_desktop_lib.cxx  |   73 +--
 sd/qa/unit/tiledrendering/tiledrendering.cxx |   58 +
 sd/source/ui/sidebar/SlideBackground.cxx |   25 +++--
 vcl/source/window/dialog.cxx |   26 -
 4 files changed, 40 insertions(+), 142 deletions(-)

New commits:
commit ea6a67be8403a5ef422ab271f249a6f4a1ceeb63
Author: Ashod Nakashian 
AuthorDate: Sun Nov 11 16:54:59 2018 -0500
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:38:14 2019 +0200

LOK: disable LOKit in unit-tests only after destroying all

When we disable LOKit at the end of a unit-test, we do so
before any of the smart-pointers go out of scope. These
instances are then destroyed when LOKit is no longer active,
in spite of the fact that they were created while it was.

This leaves some dialog/window routing notifiers dangling,
which cause assertion failures and access-after-free (when
they are invoked on destruction inadvertently). The latter
issue was found with 'make CppunitTest_sd_tiledrendering
VALGRIND=memcheck'.

The fix is to move these flags to the setup and teardown
stages of cpp-unit.

Reviewed-on: https://gerrit.libreoffice.org/68256
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit ccb14cca567dc8bbc17fe0abde01effd08b37d4f)

Change-Id: Ic4481305ca1a5cca14d70a4ebbc820a3fdeea9cc
Reviewed-on: https://gerrit.libreoffice.org/78438
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Andras Timar 

diff --git a/desktop/qa/desktop_lib/test_desktop_lib.cxx 
b/desktop/qa/desktop_lib/test_desktop_lib.cxx
index eb8cfb605fca..67e66832bbff 100644
--- a/desktop/qa/desktop_lib/test_desktop_lib.cxx
+++ b/desktop/qa/desktop_lib/test_desktop_lib.cxx
@@ -68,6 +68,8 @@ public:
 
 virtual void setUp() override
 {
+comphelper::LibreOfficeKit::setActive(true);
+
 UnoApiTest::setUp();
 
mxDesktop.set(frame::Desktop::create(comphelper::getComponentContext(getMultiServiceFactory(;
 SfxApplication::GetOrCreate();
@@ -78,9 +80,10 @@ public:
 if (m_pDocument)
 m_pDocument->pClass->registerCallback(m_pDocument.get(), nullptr, 
nullptr);
 closeDoc();
-comphelper::LibreOfficeKit::setActive(false);
 
 UnoApiTest::tearDown();
+
+comphelper::LibreOfficeKit::setActive(false);
 };
 
 LibLODocument_Impl* loadDoc(const char* pName, LibreOfficeKitDocumentType 
eType = LOK_DOCTYPE_TEXT);
@@ -341,7 +344,6 @@ void DesktopLOKTest::callbackImpl(int nType, const char* 
pPayload)
 
 void DesktopLOKTest::testGetStyles()
 {
-comphelper::LibreOfficeKit::setActive();
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
 boost::property_tree::ptree aTree;
 char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, 
".uno:StyleApply");
@@ -376,7 +378,6 @@ void DesktopLOKTest::testGetStyles()
 
 void DesktopLOKTest::testGetFonts()
 {
-comphelper::LibreOfficeKit::setActive();
 LibLODocument_Impl* pDocument = loadDoc("blank_presentation.odp");
 boost::property_tree::ptree aTree;
 char* pJSON = pDocument->m_pDocumentClass->getCommandValues(pDocument, 
".uno:CharFontName");
@@ -397,7 +398,6 @@ void DesktopLOKTest::testGetFonts()
 
 void DesktopLOKTest::testCreateView()
 {
-comphelper::LibreOfficeKit::setActive();
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
 CPPUNIT_ASSERT_EQUAL(1, 
pDocument->m_pDocumentClass->getViewsCount(pDocument));
 
@@ -423,7 +423,6 @@ void DesktopLOKTest::testCreateView()
 
 void DesktopLOKTest::testGetPartPageRectangles()
 {
-comphelper::LibreOfficeKit::setActive();
 // Test that we get as many page rectangles as expected: blank document is
 // one page.
 LibLODocument_Impl* pDocument = loadDoc("blank_text.odt");
@@ -446,7 +445,6 @@ void DesktopLOKTest::testGetPartPageRectangles()
 
 void DesktopLOKTest::testGetFilterTypes()
 {
-comphelper::LibreOfficeKit::setActive();
 LibLibreOffice_Impl aOffice;
 char* pJSON = aOffice.m_pOfficeClass->getFilterTypes(&aOffice);
 
@@ -461,8 +459,6 @@ void DesktopLOKTest::testGetFilterTypes()
 
 void DesktopLOKTest::testSearchCalc()
 {
-comphelper::LibreOfficeKit::setActive();
-
 LibLibreOffice_Impl aOffice;
 LibLODocument_Impl* pDocument = loadDoc("search.ods");
 pDocument->pClass->initializeForRendering(pDocument, nullptr);
@@ -494,8 +490,6 @@ void DesktopLOKTest::testSearchCalc()
 
 void DesktopLOKTest::testSearchAllNotificationsCalc()
 {
-comphelper::LibreOfficeKit::setActive();
-
 LibLibreOffice_Impl aOffice;
 LibLODocument_Impl* pDocument = loadDoc("search.ods");
 pDocument->pClass->initializeForRendering(pDocument, nullptr);
@@ -518,8 +512,6 @@ void DesktopLOKTest::testSearchAllNotificationsCalc()
 
 void DesktopLOKTest::testPaintTile()
 {
-comphelper::LibreOfficeKit::setA

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 3 commits - dbaccess/source include/sfx2 scripting/Package_ScriptsPython.mk sfx2/source

 dbaccess/source/ui/browser/genericcontroller.cxx |1 +
 include/sfx2/sidebar/UnoSidebar.hxx  |   10 --
 scripting/Package_ScriptsPython.mk   |1 +
 sfx2/source/sidebar/SidebarController.cxx|2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit c4d30aa3fc562fe7662440ab682023d3a76bacb8
Author: Ashod Nakashian 
AuthorDate: Sat Mar 2 15:07:05 2019 -0500
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:38:54 2019 +0200

scripting: copy python/InsertText.py to the Scripts directory

Change-Id: I55e367f8fc3bbd2aa65ca9cdef2e97a3dfa3d117
Reviewed-on: https://gerrit.libreoffice.org/68762
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit cffa813b8213122dba1206c362ec77a2343f48ba)
Reviewed-on: https://gerrit.libreoffice.org/78441
Tested-by: Jenkins CollaboraOffice 

diff --git a/scripting/Package_ScriptsPython.mk 
b/scripting/Package_ScriptsPython.mk
index 7612b7ba58bd..0c48839ca42d 100644
--- a/scripting/Package_ScriptsPython.mk
+++ b/scripting/Package_ScriptsPython.mk
@@ -12,6 +12,7 @@ $(eval $(call 
gb_Package_Package,scripting_ScriptsPython,$(SRCDIR)/scripting/exa
 $(eval $(call 
gb_Package_add_files_with_dir,scripting_ScriptsPython,$(LIBO_SHARE_FOLDER)/Scripts,\
python/Capitalise.py \
python/HelloWorld.py \
+   python/InsertText.py \
python/NamedRanges.py \
python/SetCellColor.py \
python/pythonSamples/TableSample.py \
commit 501cb09d91a26e5a72bc46c3e6085bf35e34c29d
Author: Ashod Nakashian 
AuthorDate: Wed Jan 30 20:29:29 2019 -0500
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:38:45 2019 +0200

sfx2: include what we use only

Change-Id: If89e1ea4377549935ec27afe60543b4cf27fe5f2
Reviewed-on: https://gerrit.libreoffice.org/68266
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 48e7d857b2626f742b87cfebdc905240bc42f845)
Reviewed-on: https://gerrit.libreoffice.org/78440

diff --git a/dbaccess/source/ui/browser/genericcontroller.cxx 
b/dbaccess/source/ui/browser/genericcontroller.cxx
index 2e660ccb204d..29d4def3c7da 100644
--- a/dbaccess/source/ui/browser/genericcontroller.cxx
+++ b/dbaccess/source/ui/browser/genericcontroller.cxx
@@ -59,6 +59,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
diff --git a/include/sfx2/sidebar/UnoSidebar.hxx 
b/include/sfx2/sidebar/UnoSidebar.hxx
index a60143b65f94..3a1282d8051a 100644
--- a/include/sfx2/sidebar/UnoSidebar.hxx
+++ b/include/sfx2/sidebar/UnoSidebar.hxx
@@ -16,16 +16,14 @@
 #include 
 #include 
 
-#include 
-
 #include 
 
-#include 
-#include 
-
-#include 
 #include 
 
+namespace sfx2 { namespace sidebar {
+class SidebarController;
+} }
+
 /** get the sidebar for a given frame
 */
 class SfxUnoSidebar : public cppu::WeakImplHelper
commit 8e236993713dd1e08801a3a4233bad7958f9559f
Author: Ashod Nakashian 
AuthorDate: Thu Nov 29 07:05:52 2018 -0500
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:38:26 2019 +0200

sfx: fix -Wreturn-std-move warning

Change-Id: Ibd927983505a6924d32c45f6425a08f28bf75f9e
Reviewed-on: https://gerrit.libreoffice.org/68259
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit 441300d5782caf9874cb1f37bdece160e041adbb)
Reviewed-on: https://gerrit.libreoffice.org/78439
Tested-by: Jenkins CollaboraOffice 

diff --git a/sfx2/source/sidebar/SidebarController.cxx 
b/sfx2/source/sidebar/SidebarController.cxx
index 0b6df46d1388..6096d9730358 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -1123,7 +1123,7 @@ SidebarController::CreatePopupMenu(const 
::std::vector& rM
 
 pMenu->RemoveDisabledEntries(false);
 
-return pMenu;
+return std::move(pMenu);
 }
 
 IMPL_LINK(SidebarController, OnMenuItemSelected, Menu*, pMenu, bool)
___
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.2' - 2 commits - sd/sdi sd/source vcl/source

 sd/sdi/sdraw.sdi |2 
 sd/source/ui/func/fupage.cxx |   53 +--
 sd/source/ui/inc/fupage.hxx  |2 
 sd/source/ui/sidebar/MasterPageDescriptor.cxx|1 
 sd/source/ui/sidebar/SlideBackground.cxx |9 +++
 sd/source/ui/slidesorter/controller/SlsClipboard.cxx |   10 +--
 vcl/source/control/combobox.cxx  |   10 ++-
 vcl/source/control/listbox.cxx   |9 ++-
 8 files changed, 68 insertions(+), 28 deletions(-)

New commits:
commit 1445e909204d4991e75af95609a775b4ba12b764
Author: Ashod Nakashian 
AuthorDate: Fri Nov 23 00:00:28 2018 -0500
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:37:37 2019 +0200

LOK: dialogs: limit listbox/combobox drop-down length

Dialogs routed to the LOK client have limited real
estate on the screen because dialogs are rendered
on a canvas. When the listbox drop-down bleeds outside
the dialog area, on the desktop it's no problem, but
in the browser, that requires a larger canvas and
that brings a host of problems.

Here we limit the maximum length of listbox/combobox
drop-down lists to avoid this situation.

This would ideally be configured via ListBoxMaximumLineCount
alas it doesn't work.

Change-Id: I55fff28dbfc59dec36714e221f76cf4160ba1505
(cherry picked from commit 9c5321f577940a0cd78a3af4461e94c4fdb78d63)
Reviewed-on: https://gerrit.libreoffice.org/78435
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/vcl/source/control/combobox.cxx b/vcl/source/control/combobox.cxx
index ee0309aba33a..99203e61b793 100644
--- a/vcl/source/control/combobox.cxx
+++ b/vcl/source/control/combobox.cxx
@@ -34,7 +34,7 @@
 #include 
 #include 
 #include 
-
+#include 
 
 struct ComboBoxBounds
 {
@@ -530,8 +530,12 @@ void ComboBox::SetDropDownLineCount( sal_uInt16 nLines )
 
 void ComboBox::AdaptDropDownLineCountToMaximum()
 {
-// adapt to maximum allowed number
-
SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
+// Adapt to maximum allowed number.
+// Limit for LOK as we can't render outside of the dialog canvas.
+if (comphelper::LibreOfficeKit::isActive())
+SetDropDownLineCount(11);
+else
+
SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
 }
 
 sal_uInt16 ComboBox::GetDropDownLineCount() const
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index e85a61c4f4a4..f3d9526e09d6 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -35,6 +35,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 
@@ -537,8 +538,12 @@ void ListBox::SetDropDownLineCount( sal_uInt16 nLines )
 
 void ListBox::AdaptDropDownLineCountToMaximum()
 {
-// adapt to maximum allowed number
-
SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
+// Adapt to maximum allowed number.
+// Limit for LOK as we can't render outside of the dialog canvas.
+if (comphelper::LibreOfficeKit::isActive())
+SetDropDownLineCount(11);
+else
+
SetDropDownLineCount(GetSettings().GetStyleSettings().GetListBoxMaximumLineCount());
 }
 
 sal_uInt16 ListBox::GetDropDownLineCount() const
commit 6643bf368ac439888dce58104ac31a93f247abc5
Author: Ashod Nakashian 
AuthorDate: Wed Sep 12 20:03:11 2018 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:37:19 2019 +0200

sd: support inserting background image from file via .uno:SelectBackground

The UNO command always prompted the user via file open dialog.
This change allows for passing the filename as an argument
to allow for inserting slide background programatically.

Also, hide the Insert Image button in the sidebar
since we can't use that (just yet), because
it invokes .uno:SelectBackground directly. We would
need to send LOOL a notification to invoke this on
its own end to first prompt the user for a file.

(cherry picked from commit 2118143bdd246921439ba9e835207585203dd45f)
(cherry picked from commit d581c7723550187f5185ccd22b8c42d34cab64b4)

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

diff --git a/sd/sdi/sdraw.sdi b/sd/sdi/sdraw.sdi
index 5bfc1100cd4e..e0c6e03b254f 100644
--- a/sd/sdi/sdraw.sdi
+++ b/sd/sdi/sdraw.sdi
@@ -4043,7 +4043,7 @@ SfxVoidItem CloseMasterView SID_CLOSE_MASTER_VIEW()
 ]
 
 SfxVoidItem SelectBackground SID_SELECT_BACKGROUND
-()
+(SfxStringItem FileName SID_SELECT_BACKGROUND,SfxStringItem FilterName 
FN_PARAM_FILTER,SfxBoolItem AsLink FN_PARAM_1,SfxStringItem Style FN_PARAM_2)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sd/source/ui/func/fupage.cxx b/sd/source/ui/

[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - 2 commits - include/sfx2 sd/source sfx2/source

 include/sfx2/viewsh.hxx |  
  3 -
 sd/source/ui/framework/configuration/Configuration.cxx  |  
 17 +++---
 sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx |  
 11 ++
 sd/source/ui/framework/tools/FrameworkHelper.cxx|  
 13 +++
 sd/source/ui/inc/framework/FrameworkHelper.hxx  |  
  6 +--
 sfx2/source/view/viewsh.cxx |  
  2 -
 6 files changed, 22 insertions(+), 30 deletions(-)

New commits:
commit 400e5755eac7529622f3b09bdd9336b3145366b2
Author: Ashod Nakashian 
AuthorDate: Thu Sep 13 22:12:00 2018 -0400
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:36:59 2019 +0200

sd: modernize some loops

(cherry picked from commit beb738eb8688ddaf133a0832328073e3e2b78757)
(cherry picked from commit 808359e4def4f9dd1318c7d0330a14eacda7d02c)

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

diff --git a/sd/source/ui/framework/configuration/Configuration.cxx 
b/sd/source/ui/framework/configuration/Configuration.cxx
index 1d9639c611b1..7200e26d1cc6 100644
--- a/sd/source/ui/framework/configuration/Configuration.cxx
+++ b/sd/source/ui/framework/configuration/Configuration.cxx
@@ -133,16 +133,13 @@ Sequence > SAL_CALL 
Configuration::getResources (
 ::osl::MutexGuard aGuard (maMutex);
 ThrowIfDisposed();
 
-bool bFilterResources (!rsResourceURLPrefix.isEmpty());
+const bool bFilterResources (!rsResourceURLPrefix.isEmpty());
 
 // Collect the matching resources in a vector.
 ::std::vector > aResources;
-ResourceContainer::const_iterator iResource;
-for (iResource=mpResourceContainer->begin();
- iResource!=mpResourceContainer->end();
- ++iResource)
+for (const auto& resource : *mpResourceContainer)
 {
-if ( ! (*iResource)->isBoundTo(rxAnchorId,eMode))
+if (!resource->isBoundTo(rxAnchorId, eMode))
 continue;
 
 if (bFilterResources)
@@ -151,19 +148,17 @@ Sequence > SAL_CALL 
Configuration::getResources (
 
 // Make sure that the resource is bound directly to the anchor.
 if (eMode != AnchorBindingMode_DIRECT
-&& ! (*iResource)->isBoundTo(rxAnchorId, 
AnchorBindingMode_DIRECT))
+&& !resource->isBoundTo(rxAnchorId, AnchorBindingMode_DIRECT))
 {
 continue;
 }
 
 // Make sure that the resource URL matches the given prefix.
-if ( ! (*iResource)->getResourceURL().match(rsResourceURLPrefix))
-{
+if (!resource->getResourceURL().match(rsResourceURLPrefix))
 continue;
-}
 }
 
-aResources.push_back(*iResource);
+aResources.emplace_back(resource);
 }
 
 return comphelper::containerToSequence(aResources);
diff --git 
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx 
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
index 32e67427ee58..6bf7bfdec769 100644
--- 
a/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
+++ 
b/sd/source/ui/framework/configuration/ConfigurationControllerBroadcaster.cxx
@@ -84,20 +84,19 @@ void ConfigurationControllerBroadcaster::NotifyListeners (
 // for every listener.
 ConfigurationChangeEvent aEvent (rEvent);
 
-ListenerList::const_iterator iListener;
-for (iListener=rList.begin(); iListener!=rList.end(); ++iListener)
+for (const ListenerDescriptor& listener : rList)
 {
 try
 {
-aEvent.UserData = iListener->maUserData;
-iListener->mxListener->notifyConfigurationChange(aEvent);
+aEvent.UserData = listener.maUserData;
+listener.mxListener->notifyConfigurationChange(aEvent);
 }
 catch (const lang::DisposedException& rException)
 {
 // When the exception comes from the listener itself then
 // unregister it.
-if (rException.Context == iListener->mxListener)
-RemoveListener(iListener->mxListener);
+if (rException.Context == listener.mxListener)
+RemoveListener(listener.mxListener);
 }
 catch (const RuntimeException&)
 {
diff --git a/sd/source/ui/framework/tools/FrameworkHelper.cxx 
b/sd/source/ui/framework/tools/FrameworkHelper.cxx
index b5bcee227e43..48cb57bbb7d0 100644
--- a/sd/source/ui/framework/tools/FrameworkHelper.cxx
+++ b/sd/source/ui/framework/tools/FrameworkHelper.cxx
@@ -756,11 +756,10 @@ OUString FrameworkHelper::ResourceIdToString (const 
Reference& rxRe
 sString.append(rxResourceId->getResourceURL());
 if (rxResourceId->hasAnchor())
 {

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

 sw/source/core/doc/docredln.cxx   |4 +-
 sw/source/uibase/uno/unotxdoc.cxx |   69 ++
 2 files changed, 44 insertions(+), 29 deletions(-)

New commits:
commit cbff1b6f6d71ab721eb8dff1638cb441ac367959
Author: Ashod Nakashian 
AuthorDate: Thu Nov 8 11:02:26 2018 -0500
Commit: Andras Timar 
CommitDate: Tue Sep 3 13:36:19 2019 +0200

LOK: don't emit redline comments

Change tracking can be quite numerous. Showing the
markers (and their comments" as comment-boxes is
sensible where there is limited change in a doc.

However with extensively modified doc, this becomes
overwhelming both in terms of browser load and
editing performance. As such, we disable them
as they don't add much value. The user can still
access them from the Track Changes > Manage menu.

Use a rather nasty env. var hack to propagate this
setting from WSD for now.

Change-Id: I3f964816b4a10f565012b273added8a8413cd309
Signed-off-by: Michael Meeks 
(cherry picked from commit c99e885565f9d741a659e7e18c22d092ed90b9de)
Reviewed-on: https://gerrit.libreoffice.org/78431
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 

diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index a323b595f0fc..5656f35fb3d1 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -360,7 +360,9 @@ void lcl_LOKInvalidateStartEndFrames(SwShellCursor& rCursor)
 /// Emits LOK notification about one addition / removal of a redline item.
 void SwRedlineTable::LOKRedlineNotification(RedlineNotification nType, 
SwRangeRedline* pRedline)
 {
-if (!comphelper::LibreOfficeKit::isActive())
+// Disable since usability is very low beyond some small number of changes.
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (!comphelper::LibreOfficeKit::isActive() || bDisableRedlineComments)
 return;
 
 boost::property_tree::ptree aRedline;
diff --git a/sw/source/uibase/uno/unotxdoc.cxx 
b/sw/source/uibase/uno/unotxdoc.cxx
index d4f98f8f44ec..2c3366d575fc 100644
--- a/sw/source/uibase/uno/unotxdoc.cxx
+++ b/sw/source/uibase/uno/unotxdoc.cxx
@@ -3280,40 +3280,53 @@ Pointer SwXTextDocument::getPointer()
 
 OUString SwXTextDocument::getTrackedChanges()
 {
-const SwRedlineTable& rRedlineTable = 
pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
 boost::property_tree::ptree aTrackedChanges;
-for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
-{
-boost::property_tree::ptree aTrackedChange;
-aTrackedChange.put("index", rRedlineTable[i]->GetId());
-aTrackedChange.put("author", 
rRedlineTable[i]->GetAuthorString(1).toUtf8().getStr());
-aTrackedChange.put("type", 
nsRedlineType_t::SwRedlineTypeToOUString(rRedlineTable[i]->GetRedlineData().GetType()).toUtf8().getStr());
-aTrackedChange.put("comment", 
rRedlineTable[i]->GetRedlineData().GetComment().toUtf8().getStr());
-aTrackedChange.put("description", 
rRedlineTable[i]->GetDescr().toUtf8().getStr());
-OUString sDateTime = 
utl::toISO8601(rRedlineTable[i]->GetRedlineData().GetTimeStamp().GetUNODateTime());
-aTrackedChange.put("dateTime", sDateTime.toUtf8().getStr());
-
-SwContentNode* pContentNd = rRedlineTable[i]->GetContentNode();
-SwView* pView = dynamic_cast(SfxViewShell::Current());
-if (pView && pContentNd)
+
+// Disable since usability is very low beyond some small number of changes.
+static bool bDisableRedlineComments = getenv("DISABLE_REDLINE") != nullptr;
+if (!bDisableRedlineComments)
+{
+const SwRedlineTable& rRedlineTable
+= 
pDocShell->GetDoc()->getIDocumentRedlineAccess().GetRedlineTable();
+for (SwRedlineTable::size_type i = 0; i < rRedlineTable.size(); ++i)
 {
-SwShellCursor aCursor(pView->GetWrtShell(), 
*(rRedlineTable[i]->Start()));
-aCursor.SetMark();
-aCursor.GetMark()->nNode = *pContentNd;
-aCursor.GetMark()->nContent.Assign(pContentNd, 
rRedlineTable[i]->End()->nContent.GetIndex());
+boost::property_tree::ptree aTrackedChange;
+aTrackedChange.put("index", rRedlineTable[i]->GetId());
+aTrackedChange.put("author", 
rRedlineTable[i]->GetAuthorString(1).toUtf8().getStr());
+aTrackedChange.put("type", 
nsRedlineType_t::SwRedlineTypeToOUString(
+   
rRedlineTable[i]->GetRedlineData().GetType())
+   .toUtf8()
+   .getStr());
+aTrackedChange.put("comment",
+   
rRedlineTable[i]->GetRedlineData().GetComment().toUtf8().getStr());
+aTrackedChange.put("description", 
rRedlineTable[i]->GetDescr().toUtf8().getStr());
+OUString sDateTime =

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

 include/xmloff/ProgressBarHelper.hxx  |6 +++---
 include/xmloff/SchXMLExportHelper.hxx |2 +-
 include/xmloff/SchXMLImportHelper.hxx |2 +-
 include/xmloff/XMLTextMasterPageContext.hxx   |2 +-
 include/xmloff/shapeimport.hxx|8 
 include/xmloff/txtimp.hxx |6 +++---
 include/xmloff/txtstyli.hxx   |2 +-
 include/xmloff/xmlexp.hxx |   14 +++---
 include/xmloff/xmlimp.hxx |6 +++---
 include/xmloff/xmlnumfe.hxx   |2 +-
 include/xmloff/xmlnumfi.hxx   |2 +-
 xmloff/inc/txtfldi.hxx|2 +-
 xmloff/inc/txtvfldi.hxx   |8 
 xmloff/source/chart/SchXMLAxisContext.cxx |2 +-
 xmloff/source/chart/SchXMLAxisContext.hxx |2 +-
 xmloff/source/chart/SchXMLExport.cxx  |2 +-
 xmloff/source/chart/SchXMLSeries2Context.cxx  |4 ++--
 xmloff/source/chart/SchXMLSeries2Context.hxx  |4 ++--
 xmloff/source/core/xmlexp.cxx |2 +-
 xmloff/source/core/xmlimp.cxx |6 +++---
 xmloff/source/draw/shapeimport.cxx|2 +-
 xmloff/source/style/xmlnumfe.cxx  |6 +++---
 xmloff/source/style/xmlnumfi.cxx  |2 +-
 xmloff/source/text/XMLAutoTextEventExport.cxx |2 +-
 xmloff/source/text/XMLAutoTextEventExport.hxx |2 +-
 xmloff/source/text/XMLIndexBodyContext.hxx|4 ++--
 xmloff/source/text/txtimp.cxx |6 +++---
 xmloff/source/text/txtparai.cxx   |6 +++---
 xmloff/source/text/txtparaimphint.hxx |2 +-
 xmloff/source/transform/TransformerBase.hxx   |4 ++--
 xmloff/source/xforms/XFormsModelContext.hxx   |2 +-
 31 files changed, 61 insertions(+), 61 deletions(-)

New commits:
commit d2848c44ec0f9b04a0f9b24653ef0273ae7ace97
Author: Noel Grandin 
AuthorDate: Tue Sep 3 11:45:59 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Sep 3 13:13:06 2019 +0200

loplugin:constmethod in xmloff

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

diff --git a/include/xmloff/ProgressBarHelper.hxx 
b/include/xmloff/ProgressBarHelper.hxx
index c593b5023a5d..272ea33e9b30 100644
--- a/include/xmloff/ProgressBarHelper.hxx
+++ b/include/xmloff/ProgressBarHelper.hxx
@@ -59,9 +59,9 @@ public:
 // Progress Bar the same position as before
 void ChangeReference(sal_Int32 nNewReference);
 
-sal_Int32 GetReference() { return nReference; }
-sal_Int32 GetValue() { return nValue; }
-bool GetRepeat() { return bRepeat; }
+sal_Int32 GetReference() const { return nReference; }
+sal_Int32 GetValue() const { return nValue; }
+bool GetRepeat() const { return bRepeat; }
 };
 
 #endif
diff --git a/include/xmloff/SchXMLExportHelper.hxx 
b/include/xmloff/SchXMLExportHelper.hxx
index dbabc6932ea1..9ee9e00cf71a 100644
--- a/include/xmloff/SchXMLExportHelper.hxx
+++ b/include/xmloff/SchXMLExportHelper.hxx
@@ -44,7 +44,7 @@ public:
 virtual ~SchXMLExportHelper() override;
 
 /// returns the string corresponding to the current FileFormat CLSID for 
Chart
-const OUString& getChartCLSID();
+const OUString& getChartCLSID() const;
 
 void SetSourceShellID( const OUString& rShellID );
 void SetDestinationShellID( const OUString& rShellID );
diff --git a/include/xmloff/SchXMLImportHelper.hxx 
b/include/xmloff/SchXMLImportHelper.hxx
index e6ffd80f543f..eff5af9dfd2a 100644
--- a/include/xmloff/SchXMLImportHelper.hxx
+++ b/include/xmloff/SchXMLImportHelper.hxx
@@ -96,7 +96,7 @@ public:
 /// Fill in the autostyle.
 void FillAutoStyle(const OUString& rAutoStyleName, const 
css::uno::Reference& rProp);
 
-const css::uno::Reference< css::chart::XChartDocument >& GetChartDocument()
+const css::uno::Reference< css::chart::XChartDocument >& 
GetChartDocument() const
 { return mxChartDoc; }
 
 const SvXMLTokenMap& GetDocElemTokenMap();
diff --git a/include/xmloff/XMLTextMasterPageContext.hxx 
b/include/xmloff/XMLTextMasterPageContext.hxx
index cda2bb4a77a4..70503a5cc631 100644
--- a/include/xmloff/XMLTextMasterPageContext.hxx
+++ b/include/xmloff/XMLTextMasterPageContext.hxx
@@ -47,7 +47,7 @@ class XMLOFF_DLLPUBLIC XMLTextMasterPageContext : public 
SvXMLStyleContext
 
 SAL_DLLPRIVATE css::uno::Reference< css::style::XStyle > Create();
 protected:
-const css::uno::Reference< css::style::XStyle >& GetStyle() { return 
xStyle; }
+const css::uno::Reference< css::style::XStyle >& GetStyle() const { return 
xStyle; }
 public:
 
 
diff --git a/include/xmloff/shapeimport.hxx b/include/xmloff/shapeimport.hxx
index 0bf3999dcb9e..1d05c691018f 100644
--- a/include/xmloff/shapeimport.hxx
+++ b/include/xmloff/sha

[Libreoffice-commits] core.git: qadevOOo/tests starmath/source

 qadevOOo/tests/java/mod/_sm/SmEditAccessible.java |4 ++--
 starmath/source/accessibility.cxx |5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

New commits:
commit 815afb06b78b8fbf83f6a48b89500fb34dc4b40b
Author: Caolán McNamara 
AuthorDate: Mon Sep 2 20:45:14 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 3 12:44:50 2019 +0200

indicate that SmEditAccessible is editable

and use TEXT_FRAME like calc and other similar users of
of an EditEngine as a frame do.

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

diff --git a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java 
b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
index 710027706969..7b7a2c28d25a 100644
--- a/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
+++ b/qadevOOo/tests/java/mod/_sm/SmEditAccessible.java
@@ -63,7 +63,7 @@ public class SmEditAccessible extends TestCase {
 
 /**
  * Creates a StarMath document and obtains an accessibility
- * component with the role AccessibleRole.PANEL.
+ * component with the role AccessibleRole.TEXT_FRAME.
  */
 @Override
 protected TestEnvironment createTestEnvironment(final TestParameters 
Param, PrintWriter log) throws Exception {
@@ -86,7 +86,7 @@ public class SmEditAccessible extends TestCase {
 XAccessible xRoot = AccessibilityTools.getAccessibleObject(xWindow);
 
 oObj = AccessibilityTools.getAccessibleObjectForRole
-(xRoot, AccessibleRole.PANEL, "", "SmEditAccessible");
+(xRoot, AccessibleRole.TEXT_FRAME, "", "SmEditAccessible");
 
 log.println("ImplementationName " + utils.getImplName(oObj));
 AccessibilityTools.printAccessibleTree(log, xRoot, 
Param.getBool(util.PropertyName.DEBUG_IS_ACTIVE));
diff --git a/starmath/source/accessibility.cxx 
b/starmath/source/accessibility.cxx
index 8fb20618c701..98868df14a55 100644
--- a/starmath/source/accessibility.cxx
+++ b/starmath/source/accessibility.cxx
@@ -1648,7 +1648,7 @@ sal_Int32 SAL_CALL 
SmEditAccessible::getAccessibleChildCount(  )
 {
 SolarMutexGuard aGuard;
 if (!pTextHelper)
-throw RuntimeException();
+return 0;
 return pTextHelper->GetChildCount();
 }
 
@@ -1688,7 +1688,7 @@ sal_Int32 SAL_CALL 
SmEditAccessible::getAccessibleIndexInParent(  )
 
 sal_Int16 SAL_CALL SmEditAccessible::getAccessibleRole(  )
 {
-return AccessibleRole::PANEL /*TEXT ?*/;
+return AccessibleRole::TEXT_FRAME;
 }
 
 OUString SAL_CALL SmEditAccessible::getAccessibleDescription(  )
@@ -1723,6 +1723,7 @@ uno::Reference< XAccessibleStateSet > SAL_CALL 
SmEditAccessible::getAccessibleSt
 {
 pStateSet->AddState( AccessibleStateType::MULTI_LINE );
 pStateSet->AddState( AccessibleStateType::ENABLED );
+pStateSet->AddState( AccessibleStateType::EDITABLE );
 pStateSet->AddState( AccessibleStateType::FOCUSABLE );
 if (pWin->HasFocus())
 pStateSet->AddState( AccessibleStateType::FOCUSED );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 sc/source/ui/cctrl/checklistmenu.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 2d2b08eb1c63e1d12d2dd12abf97e34f56e921c6
Author: Caolán McNamara 
AuthorDate: Tue Sep 3 09:41:12 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 3 12:13:06 2019 +0200

Resolves: tdf#127168 dismiss menu before executing sort

so any error dialog which are parented to the calc window are not
hidden by the menu which is destined to be dismissed after the
sort anyway

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

diff --git a/sc/source/ui/cctrl/checklistmenu.cxx 
b/sc/source/ui/cctrl/checklistmenu.cxx
index 43553d305f38..413cf36704c0 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -452,8 +452,9 @@ void ScMenuFloatingWindow::executeMenuItem(size_t nPos)
 // no action is defined.
 return;
 
-maMenuItems[nPos].mpAction->execute();
 terminateAllPopupMenus();
+
+maMenuItems[nPos].mpAction->execute();
 }
 
 void ScMenuFloatingWindow::setSelectedMenuItem(size_t nPos, bool 
bSubMenuTimer, bool bEnsureSubMenu)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang cui/source dbaccess/source include/vcl sfx2/source svtools/source svx/source sw/source vcl/source

 compilerplugins/clang/methodcycles.py |4 ++--
 cui/source/options/optcolor.cxx   |2 +-
 dbaccess/source/ui/dlg/indexfieldscontrol.cxx |2 +-
 include/vcl/NotebookBarAddonsMerger.hxx   |2 +-
 include/vcl/builder.hxx   |2 +-
 include/vcl/builderfactory.hxx|8 
 sfx2/source/appl/newhelp.cxx  |   10 +-
 sfx2/source/sidebar/SidebarToolBox.cxx|4 ++--
 svtools/source/contnr/fileview.cxx|2 +-
 svtools/source/control/ctrlbox.cxx|6 +++---
 svtools/source/control/inettbc.cxx|2 +-
 svx/source/dialog/langbox.cxx |4 ++--
 svx/source/dialog/relfld.cxx  |2 +-
 svx/source/dialog/txencbox.cxx|2 +-
 sw/source/uibase/utlui/numfmtlb.cxx   |2 +-
 vcl/source/window/builder.cxx |3 +--
 vcl/source/window/printdlg.cxx|4 ++--
 17 files changed, 30 insertions(+), 31 deletions(-)

New commits:
commit a06b83ff927d8973c8b4a2de9a0c7ce5cd4b1f96
Author: Mike Kaganski 
AuthorDate: Tue Sep 3 10:47:07 2019 +0300
Commit: Noel Grandin 
CommitDate: Tue Sep 3 12:00:40 2019 +0200

Parent reference should be const in VCL builder entry points

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

diff --git a/compilerplugins/clang/methodcycles.py 
b/compilerplugins/clang/methodcycles.py
index 9093cebc420c..18b63c71f777 100755
--- a/compilerplugins/clang/methodcycles.py
+++ b/compilerplugins/clang/methodcycles.py
@@ -119,9 +119,9 @@ for caller in definitionSet:
 if "::~" in caller:
 to_be_removed.add(caller)
 # dyload entry points for VCL builder
-if "(VclPtr & rRet, VclPtr & pParent, 
VclBuilder::stringmap & rMap)" in caller:
+if "(VclPtr & rRet, const VclPtr & pParent, 
VclBuilder::stringmap & rMap)" in caller:
 to_be_removed.add(caller)
-if "(VclPtr &,VclPtr &,stdmap, std::allocator > > &)" in caller:
+if "(VclPtr &,const VclPtr 
&,stdmap, 
std::allocator > > &)" in caller:
 to_be_removed.add(caller)
 # find all the UNO load-by-symbol-name entrypoints
 uno_constructor_entrypoints = set()
diff --git a/cui/source/options/optcolor.cxx b/cui/source/options/optcolor.cxx
index 8e241ce744db..7cf455e821fd 100644
--- a/cui/source/options/optcolor.cxx
+++ b/cui/source/options/optcolor.cxx
@@ -859,7 +859,7 @@ void ColorConfigCtrl_Impl::dispose()
 VclVBox::dispose();
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void makeColorConfigCtrl(VclPtr & 
rRet, VclPtr & pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT void makeColorConfigCtrl(VclPtr & 
rRet, const VclPtr & pParent, VclBuilder::stringmap &)
 {
 rRet = VclPtr::Create(pParent);
 }
diff --git a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx 
b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
index e7782a560c8a..cfc8143a2288 100644
--- a/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
+++ b/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
@@ -79,7 +79,7 @@ static constexpr auto BROWSER_STANDARD_FLAGS = 
BrowserMode::COLUMNSELECTION | Br
 {
 }
 
-extern "C" SAL_DLLPUBLIC_EXPORT void 
makeDbaIndexFieldsControl(VclPtr & rRet, VclPtr & 
pParent, VclBuilder::stringmap &)
+extern "C" SAL_DLLPUBLIC_EXPORT void 
makeDbaIndexFieldsControl(VclPtr & rRet, const VclPtr 
& pParent, VclBuilder::stringmap &)
 {
 rRet = VclPtr::Create(pParent, WB_BORDER | 
WB_NOTABSTOP);
 }
diff --git a/include/vcl/NotebookBarAddonsMerger.hxx 
b/include/vcl/NotebookBarAddonsMerger.hxx
index ef6a3291e9f8..913e50734472 100644
--- a/include/vcl/NotebookBarAddonsMerger.hxx
+++ b/include/vcl/NotebookBarAddonsMerger.hxx
@@ -61,7 +61,7 @@ class NotebookBarAddonsMerger
 {
 public:
 typedef std::map stringmap;
-typedef void (*customMakeWidget)(VclPtr& rRet, 
VclPtr& pParent,
+typedef void (*customMakeWidget)(VclPtr& rRet, const 
VclPtr& pParent,
  stringmap& rVec);
 NotebookBarAddonsMerger();
 ~NotebookBarAddonsMerger();
diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index adefc6d39713..4cdd10930dea 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -65,7 +65,7 @@ public:
 typedef std::map stringmap;
 typedef std::map> accelmap;
 /// These functions create a new widget with parent pParent and return it 
in rRet
-typedef void (*customMakeWidget)(VclPtr &rRet, 
VclPtr &pParent, stringmap &rVec);
+typedef void (*customMakeWidget)(VclPtr &rRet, const 
VclPtr &pParent, stringmap &rVec);
 
 public:
 VclBuilder(vcl::Window* pParent, const OUString& sUIRootDir, const 
OUString& sUIFile,
diff --git a/include/vcl/builderfactory.hxx b/include/vcl/builderfactory.hxx
index 0781726c0ffb..719f1d8b206c 100644
--- a/include/vcl/builderfactory.hxx
++

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

 formula/uiconfig/ui/formuladialog.ui |1 +
 formula/uiconfig/ui/functionpage.ui  |5 -
 formula/uiconfig/ui/structpage.ui|3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c505eb427b9e678d75581c56aff16aaf31264da7
Author: Caolán McNamara 
AuthorDate: Tue Sep 3 09:27:57 2019 +0100
Commit: Adolfo Jayme Barrientos 
CommitDate: Tue Sep 3 11:35:50 2019 +0200

Resolves: tdf#126911 make structure box expandable

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

diff --git a/formula/uiconfig/ui/formuladialog.ui 
b/formula/uiconfig/ui/formuladialog.ui
index 504fe8935107..b2f016f37508 100644
--- a/formula/uiconfig/ui/formuladialog.ui
+++ b/formula/uiconfig/ui/formuladialog.ui
@@ -140,6 +140,7 @@
   
 True
 True
+True
 True
 True
 
diff --git a/formula/uiconfig/ui/functionpage.ui 
b/formula/uiconfig/ui/functionpage.ui
index 35500f1d0f38..b19029659043 100644
--- a/formula/uiconfig/ui/functionpage.ui
+++ b/formula/uiconfig/ui/functionpage.ui
@@ -13,6 +13,7 @@
   
 True
 False
+True
 True
 6
 vertical
@@ -36,7 +37,7 @@
   
 True
 True
-start
+True
 True
   
   
@@ -94,6 +95,7 @@
   
 True
 True
+True
 True
 never
 in
@@ -102,6 +104,7 @@
 True
 True
 True
+True
 True
 liststore1
 False
diff --git a/formula/uiconfig/ui/structpage.ui 
b/formula/uiconfig/ui/structpage.ui
index 0af026f2b51c..6ff834d02a23 100644
--- a/formula/uiconfig/ui/structpage.ui
+++ b/formula/uiconfig/ui/structpage.ui
@@ -15,6 +15,7 @@
   
 True
 False
+True
 True
 6
 vertical
@@ -38,12 +39,14 @@
   
 True
 True
+True
 True
 in
 
   
 True
 True
+True
 True
 liststore1
 False
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-09-03 Thread Gülşah Köse (via logerrit)

 sd/source/ui/func/fuolbull.cxx |   10 --
 1 file changed, 8 insertions(+), 2 deletions(-)

New commits:
commit 8c8b29c3f42686bf14ed84582dd02784867527f5
Author: Gülşah Köse 
AuthorDate: Sat Aug 31 00:24:40 2019 +0300
Commit: Gülşah Köse 
CommitDate: Tue Sep 3 11:13:05 2019 +0200

tdf#126656 Remove unnecessary items from itemset.

Change-Id: I62fc660ea061fe9665e0166a08871ba0a592fc41
Reviewed-on: https://gerrit.libreoffice.org/78332
Tested-by: Jenkins
Reviewed-by: Gülşah Köse 
(cherry picked from commit 438430904064e667b688275525b317fd7989af2e)
Reviewed-on: https://gerrit.libreoffice.org/78414

diff --git a/sd/source/ui/func/fuolbull.cxx b/sd/source/ui/func/fuolbull.cxx
index 7c9b8657f0f2..cdd8fd33ece9 100644
--- a/sd/source/ui/func/fuolbull.cxx
+++ b/sd/source/ui/func/fuolbull.cxx
@@ -81,8 +81,14 @@ void FuBulletAndPosition::DoExecute( SfxRequest& rReq )
 SfxItemSet aEditAttr( mpDoc->GetPool() );
 mpView->GetAttributes( aEditAttr );
 
-SfxItemSet aNewAttr( mpViewShell->GetPool(),
- svl::Items{} );
+static const sal_uInt16 aAttrMap[] =
+{
+EE_PARA_NUMBULLET,
+EE_PARA_BULLET,
+0
+};
+
+SfxItemSet aNewAttr( mpViewShell->GetPool(), aAttrMap );
 aNewAttr.Put( aEditAttr, false );
 
 auto pView = mpView;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: Branch 'libreoffice-6-3' - 2 commits - config_host.mk.in configure.ac m4/l_atomic.m4 solenv/gbuild

2019-09-03 Thread Stephan Bergmann (via logerrit)

 config_host.mk.in   |1 
 configure.ac|8 +
 m4/l_atomic.m4  |   41 
 solenv/gbuild/LinkTarget.mk |2 +
 solenv/gbuild/platform/LINUX_ARM_GCC.mk |2 -
 solenv/gbuild/platform/LINUX_GODSON_GCC.mk  |2 -
 solenv/gbuild/platform/LINUX_M68K_GCC.mk|2 -
 solenv/gbuild/platform/LINUX_POWERPC_GCC.mk |2 -
 solenv/gbuild/platform/linux.mk |4 ++
 solenv/gbuild/platform/unxgcc.mk|2 +
 10 files changed, 58 insertions(+), 8 deletions(-)

New commits:
commit ebc7912377d048fa3c183661899f02664b641485
Author: Stephan Bergmann 
AuthorDate: Mon Sep 2 10:20:24 2019 +0200
Commit: Michael Stahl 
CommitDate: Tue Sep 3 10:41:20 2019 +0200

Add -latomic to the end of Linux C++ linker command lines

b11763dbaa0c7f427ea47abe9b98995cb49a8595 "link with -latomic on mips(el),
armel, powerpc, m68k" had added -latomic to the linker command lines of just
some Linux platforms (which apparently happened to actually require it).  
But
there were three issues with that:

* The -latomic came too early on the command line, so that it wasn't used to
  satisfy dependencies of .o files that came later.  See the discussion at
   "set -Wl,--no-as-needed for
  -latomic".

* There is presumably no need to include -latomic on C linker command lines.

* 
 (matching our Linux libstdc++ 7.3.0 baseline as
  per README.md) states:  "Linking to libatomic is required for some uses of
  ISO C++11 ."  So we should better include -latomic on every Linux 
C++
  linker command line that uses libstdc++.  (This patch assumes that we 
always
  use libstdc++ on Linux.)

Ideally we could rely on -latomic always being available with our baseline
libstdc++ 7.3.0, but when using Red Hat Developer Toolset 7 that appears 
not to
be the case, as reported by a Jenkins build for an older version of this 
change
(see below), so use ATOMIC_LIB from the preceding commit
 "add -latomic configure 
check...".

:
> [build LNK] Executable/unoapploader
> /opt/rh/devtoolset-7/root/usr/libexec/gcc/x86_64-redhat-linux/7/ld: 
cannot find -latomic
> collect2: error: ld returned 1 exit status
> 
/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/solenv/gbuild/LinkTarget.mk:636:
 recipe for target 
'/home/tdf/lode/jenkins/workspace/lo_gerrit/Config/linux_gcc_release_64/workdir/LinkTarget/Executable/idxdict'
 failed

This patch adds -latomic only on Linux.  Similar changes can be made for 
other
platforms if need be.

Change-Id: I75df5410677f4c31c796d7ba85532bcdb47eb111
Reviewed-on: https://gerrit.libreoffice.org/78380
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit 32a96e44b4c073c7c61c94a7f0fe6108dde663bc)
Reviewed-on: https://gerrit.libreoffice.org/78413
Tested-by: Rene Engelhard 
Reviewed-by: Michael Stahl 

diff --git a/solenv/gbuild/LinkTarget.mk b/solenv/gbuild/LinkTarget.mk
index e1c55969a257..476ee429da33 100644
--- a/solenv/gbuild/LinkTarget.mk
+++ b/solenv/gbuild/LinkTarget.mk
@@ -775,6 +775,7 @@ $(call gb_LinkTarget_get_target,$(1)) : T_LDFLAGS := 
$$(gb_LinkTarget_LDFLAGS) $
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_LIBS :=
 $(call gb_LinkTarget_get_target,$(1)) : LINKED_STATIC_LIBS :=
 $(call gb_LinkTarget_get_target,$(1)) : T_LIBS :=
+$(call gb_LinkTarget_get_target,$(1)) : T_STDLIBS_CXX := $(gb_STDLIBS_CXX)
 $(call gb_LinkTarget_get_target,$(1)) : TARGETTYPE :=
 $(call gb_LinkTarget_get_target,$(1)) : LIBRARY_X64 :=
 $(call gb_LinkTarget_get_target,$(1)) : PCH_NAME :=
@@ -911,6 +912,7 @@ endef
 # call gb_LinkTarget_disable_standard_system_libs,linktarget
 define gb_LinkTarget_disable_standard_system_libs
 $(call gb_LinkTarget_get_target,$(1)) : T_LIBS := $$(filter-out 
$$(gb_STDLIBS),$$(T_LIBS))
+$(call gb_LinkTarget_get_target,$(1)) : T_STDLIBS_CXX :=
 
 endef
 
diff --git a/solenv/gbuild/platform/LINUX_ARM_GCC.mk 
b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
index e52cf2bb8950..cccf5772b3b4 100644
--- a/solenv/gbuild/platform/LINUX_ARM_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_ARM_GCC.mk
@@ -13,6 +13,4 @@ gb_COMPILEROPTFLAGS := -Os
 
 include $(GBUILDDIR)/platform/linux.mk
 
-gb_LinkTarget_LDFLAGS += -latomic
-
 # vim: set noet sw=4:
diff --git a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk 
b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
index f16f98530e2b..976aaedf97fe 100644
--- a/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
+++ b/solenv/gbuild/platform/LINUX_GODSON_GCC.mk
@@ -13,6 +13,4 @@ gb_COMPILE

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

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

New commits:
commit 8945724054c47afa429c30a15eec89d9e70a734c
Author: Caolán McNamara 
AuthorDate: Mon Sep 2 16:00:28 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Sep 3 10:38:44 2019 +0200

assert on selecting text from end to start in shape with a11y enabled

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

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx 
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index 7914e65383a5..1055136a3fec 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -2043,7 +2043,7 @@ namespace accessibility
 if( nIndex <= aBoundary.endPos )
 {
 nextWord =  aBoundary.endPos;
-if( sText[nextWord] == u' ' ) nextWord++;
+if (nextWord < sText.getLength() && sText[nextWord] == u' 
') nextWord++;
 bWord = implGetWordBoundary( sText, aBoundary, nextWord );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit 9c856c796f3a810ebf8c168169250eccf4eefaa0
Author: Caolán McNamara 
AuthorDate: Mon Sep 2 16:00:28 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Sep 3 10:38:51 2019 +0200

assert on selecting text from end to start in shape with a11y enabled

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

diff --git a/editeng/source/accessibility/AccessibleEditableTextPara.cxx 
b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
index b42e895f67e0..19e67b07469b 100644
--- a/editeng/source/accessibility/AccessibleEditableTextPara.cxx
+++ b/editeng/source/accessibility/AccessibleEditableTextPara.cxx
@@ -2038,7 +2038,7 @@ namespace accessibility
 if( nIndex <= aBoundary.endPos )
 {
 nextWord =  aBoundary.endPos;
-if( sText[nextWord] == u' ' ) nextWord++;
+if (nextWord < sText.getLength() && sText[nextWord] == u' 
') nextWord++;
 bWord = implGetWordBoundary( sText, aBoundary, nextWord );
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

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

New commits:
commit e4e6aa95e84314173518137eba988623125712b9
Author: Caolán McNamara 
AuthorDate: Mon Sep 2 10:02:46 2019 +0100
Commit: Michael Stahl 
CommitDate: Tue Sep 3 10:36:10 2019 +0200

Resolves: tdf#126042 measure text width with the bold font it will render 
with

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

diff --git a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx 
b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
index 560d83a95d06..3fb65ffb3fa3 100644
--- a/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
+++ b/desktop/source/deployment/gui/dp_gui_extlistbox.cxx
@@ -443,11 +443,11 @@ void ExtensionBox_Impl::DrawRow(vcl::RenderContext& 
rRenderContext, const tools:
 nMaxTitleWidth -= nLinkWidth + (2 * SPACE_BETWEEN);
 }
 long aVersionWidth = rRenderContext.GetTextWidth(rEntry->m_sVersion);
-long aTitleWidth = rRenderContext.GetTextWidth(rEntry->m_sTitle) + 
(aTextHeight / 3);
 
 aPos = rRect.TopLeft() + Point(ICON_OFFSET, TOP_OFFSET);
 
 rRenderContext.SetFont(aBoldFont);
+long aTitleWidth = rRenderContext.GetTextWidth(rEntry->m_sTitle) + 
(aTextHeight / 3);
 if (aTitleWidth > nMaxTitleWidth - aVersionWidth)
 {
 aTitleWidth = nMaxTitleWidth - aVersionWidth - (aTextHeight / 3);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

 include/svx/AccessibleControlShape.hxx|2 +-
 include/svx/AccessibleShape.hxx   |2 +-
 include/svx/AccessibleTextHelper.hxx  |2 +-
 include/svx/ChildrenManager.hxx   |2 +-
 include/svx/ColorSets.hxx |2 +-
 include/svx/EnhancedCustomShape2d.hxx |6 +++---
 include/svx/PaletteManager.hxx|8 
 include/svx/charmap.hxx   |2 +-
 include/svx/compressgraphicdialog.hxx |8 
 include/svx/connctrl.hxx  |2 +-
 include/svx/ctredlin.hxx  |   12 ++--
 include/svx/dialcontrol.hxx   |2 +-
 include/svx/dlgctl3d.hxx  |8 
 include/svx/dlgctrl.hxx   |8 
 include/svx/frmsel.hxx|4 ++--
 include/svx/hexcolorcontrol.hxx   |2 +-
 include/svx/nbdtmg.hxx|6 +++---
 include/svx/numfmtsh.hxx  |2 +-
 include/svx/rulritem.hxx  |4 ++--
 include/svx/sdr/animation/scheduler.hxx   |2 +-
 include/svx/sdr/table/tablecontroller.hxx |2 +-
 include/svx/sdrundomanager.hxx|2 +-
 include/svx/sidebar/ContextChangeEventMultiplexer.hxx |2 +-
 include/svx/srchdlg.hxx   |4 ++--
 include/svx/svddrgmt.hxx  |2 +-
 include/svx/svdmodel.hxx  |2 +-
 include/svx/svdoashp.hxx  |2 +-
 include/svx/svdobj.hxx|2 +-
 include/svx/svdograf.hxx  |2 +-
 include/svx/svdomedia.hxx |2 +-
 include/svx/svdundo.hxx   |6 +++---
 include/svx/tbcontrl.hxx  |2 +-
 include/svx/view3d.hxx|2 +-
 svx/source/accessibility/AccessibleTextHelper.cxx |   12 ++--
 svx/source/accessibility/ChildrenManager.cxx  |2 +-
 svx/source/accessibility/ChildrenManagerImpl.cxx  |2 +-
 svx/source/accessibility/ChildrenManagerImpl.hxx  |2 +-
 svx/source/accessibility/svxpixelctlaccessiblecontext.cxx |2 +-
 svx/source/customshapes/EnhancedCustomShape2d.cxx |4 ++--
 svx/source/dialog/compressgraphicdialog.cxx   |8 
 svx/source/dialog/connctrl.cxx|2 +-
 svx/source/dialog/ctredlin.cxx|   12 ++--
 svx/source/dialog/dialcontrol.cxx |2 +-
 svx/source/dialog/docrecovery.cxx |6 +++---
 svx/source/dialog/hexcolorcontrol.cxx |2 +-
 svx/source/dialog/srchdlg.cxx |2 +-
 svx/source/form/datanavi.cxx  |2 +-
 svx/source/form/fmshimp.cxx   |2 +-
 svx/source/gallery2/galbrws1.hxx  |2 +-
 svx/source/inc/cell.hxx   |6 +++---
 svx/source/inc/datanavi.hxx   |2 +-
 svx/source/inc/docrecovery.hxx|6 +++---
 svx/source/inc/filtnav.hxx|4 ++--
 svx/source/inc/fmshimp.hxx|8 
 svx/source/inc/fmvwimp.hxx|2 +-
 svx/source/inc/svxpixelctlaccessiblecontext.hxx   |2 +-
 svx/source/sidebar/ContextChangeEventMultiplexer.cxx  |2 +-
 svx/source/sidebar/line/LineWidthValueSet.hxx |2 +-
 svx/source/sidebar/text/TextCharacterSpacingControl.hxx   |2 +-
 svx/source/svdraw/svdoashp.cxx|2 +-
 svx/source/svdraw/svdobj.cxx  |2 +-
 svx/source/svdraw/svdograf.cxx|2 +-
 svx/source/svdraw/svdomedia.cxx   |2 +-
 svx/source/table/accessiblecell.hxx   |2 +-
 svx/source/table/cell.cxx |6 +++---
 svx/source/table/tablecontroller.cxx  |2 +-
 svx/source/tbxctrls/PaletteManager.cxx|6 +++---
 svx/source/tbxctrls/tbcontrl.cxx  |4 ++--
 68 files changed, 123 insertions(+), 123 deletions(-)

New commits:
commit 1e8f0940e6c6246e53550ac48eaae4f416e61777
Author: Noel Grandin 
AuthorDate: Mon Sep 2 14:27:49 2019 +0200
Commit:

[Libreoffice-commits] core.git: editeng/source filter/source framework/source oox/source svx/source sw/source writerfilter/source

 editeng/source/rtf/svxrtf.cxx  |2 +-
 filter/source/config/tools/merge/pyAltFCFGMerge|2 +-
 framework/source/jobs/jobdata.cxx  |2 +-
 framework/source/loadenv/loadenv.cxx   |2 +-
 framework/source/services/autorecovery.cxx |6 +++---
 oox/source/drawingml/diagram/diagram.cxx   |2 +-
 svx/source/sdr/contact/objectcontactofpageview.cxx |2 +-
 sw/source/uibase/dochdl/swdtflvr.cxx   |2 +-
 writerfilter/source/dmapper/DomainMapper_Impl.cxx  |2 +-
 9 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 602c6097850d6d659b760bdb0dd83baa906d416c
Author: Andrea Gelmini 
AuthorDate: Mon Sep 2 20:17:40 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 3 10:31:49 2019 +0200

Fix typos

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

diff --git a/editeng/source/rtf/svxrtf.cxx b/editeng/source/rtf/svxrtf.cxx
index 07e923c687cc..4c284248c3e8 100644
--- a/editeng/source/rtf/svxrtf.cxx
+++ b/editeng/source/rtf/svxrtf.cxx
@@ -812,7 +812,7 @@ void SvxRTFParser::AttrGroupEnd()   // process the current, 
delete from Stack
 if( pCurrent )
 {
 pCurrent->Add(std::move(pOld));
-// split up and create new entry, because it make no sense
+// split up and create new entry, because it makes no sense
 // to create a "so long" depend list. Bug 95010
 if (bCrsrBack && 50 < pCurrent->m_pChildList->size())
 {
diff --git a/filter/source/config/tools/merge/pyAltFCFGMerge 
b/filter/source/config/tools/merge/pyAltFCFGMerge
index 11a1de60cb54..70833492fd0d 100755
--- a/filter/source/config/tools/merge/pyAltFCFGMerge
+++ b/filter/source/config/tools/merge/pyAltFCFGMerge
@@ -535,7 +535,7 @@ class Merger:
 sBuffer = sBuffer + generateFooter()
 
 # Attention!
-# If the package seem to be empty, it make no sense to generate a
+# If the package seem to be empty, it makes no sense to generate a
 # corresponding xml file. We should suppress writing of this file on 
 # disk completely ...
 if nItemCount < 1:
diff --git a/framework/source/jobs/jobdata.cxx 
b/framework/source/jobs/jobdata.cxx
index 5d51c97bdeaa..fa22465e2b65 100644
--- a/framework/source/jobs/jobdata.cxx
+++ b/framework/source/jobs/jobdata.cxx
@@ -190,7 +190,7 @@ void JobData::setService( const OUString& sService )
 Because the caller must have the configuration already open to
 get the values for sEvent and sAlias! And doing so it can 
perform
 only, if the time stamp values are read outside too.
-Further it make no sense to initialize and start a disabled 
job.
+Further it makes no sense to initialize and start a disabled 
job.
 So this initialization method will be called for enabled jobs 
only.)
 
 @param  sEvent
diff --git a/framework/source/loadenv/loadenv.cxx 
b/framework/source/loadenv/loadenv.cxx
index 73180facd46a..119f7d22ffcc 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -554,7 +554,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const 
OUString&
 //  load request will fail.
 
 /* Attention: The following code can't work on such special URLs!
-  It should not break the office .. but it make no sense
+  It should not break the office .. but it makes no sense
   to start expensive object creations and complex search
   algorithm if its clear, that such URLs must be handled
   in a special way .-)
diff --git a/framework/source/services/autorecovery.cxx 
b/framework/source/services/autorecovery.cxx
index 7f2ad1f931ee..625739ec4cfe 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -638,7 +638,7 @@ private:
 
 @param  bStopListening
 sal_False: must be used in case this method is called within 
disposing() of the document,
-   where it make no sense to deregister our listener. The 
container dies...
+   where it makes no sense to deregister our listener. The 
container dies...
 sal_True : must be used in case this method is used on 
"deregistration" of this document, where
we must deregister our listener .-)
 
@@ -1371,7 +1371,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& 
aParams)
 bool bWasUserAutoSaveActive =
 ((eJob & AutoRecovery::E_USER_AUTO_SAVE) == 
AutoRecovery::E_USER_AUTO_SAVE);
 
-// On the other side it make no sense to reactivate the AutoSave operation
+//

[Libreoffice-commits] core.git: desktop/source filter/source include/comphelper offapi/com sc/source svtools/source vcl/source

 desktop/source/app/app.cxx  |2 +-
 filter/source/msfilter/msdffimp.cxx |2 +-
 include/comphelper/configurationhelper.hxx  |2 +-
 offapi/com/sun/star/embed/StorageStream.idl |2 +-
 sc/source/ui/unoobj/cursuno.cxx |2 +-
 sc/source/ui/unoobj/datauno.cxx |2 +-
 svtools/source/misc/sampletext.cxx  |4 ++--
 vcl/source/window/floatwin.cxx  |2 +-
 8 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit eced5a20b5db1364aa9feb50dfc8e55b34324b9e
Author: Andrea Gelmini 
AuthorDate: Tue Sep 3 00:19:40 2019 +0200
Commit: Julien Nabet 
CommitDate: Tue Sep 3 10:29:41 2019 +0200

Fix typos

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

diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1071dab7ce07..b733080fd94a 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1165,7 +1165,7 @@ void Desktop::Exception(ExceptionCategory nCategory)
 ( !rArgs.IsNoRestore() 
   ) && // some use cases of office must work without recovery
 ( !rArgs.IsHeadless()  
   ) &&
 ( nCategory != 
ExceptionCategory::UserInterface ) && // recovery can't work without UI ... but 
UI layer seems to be the reason for this crash
-( 
Application::IsInExecute()   )// crashes during startup and 
shutdown should be ignored (they indicates a corrupt installation ...)
+( 
Application::IsInExecute()   )// crashes during startup and 
shutdown should be ignored (they indicate a corrupted installation...)
   );
 if ( bAllowRecoveryAndSessionManagement )
 {
diff --git a/filter/source/msfilter/msdffimp.cxx 
b/filter/source/msfilter/msdffimp.cxx
index c3ee81c39d32..17be716f50c8 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -2866,7 +2866,7 @@ void DffPropertyReader::ImportGradientColor( SfxItemSet& 
aSet,MSO_FillType eMSO_
 nChgColors ^= 1;
 }
 //if the type is linear or axial, just save focus to nFocusX and nFocusY 
for export
-//Core function does no need them. They serves for rect gradient(CenterXY).
+//Core function does no need them. They serve for rect gradient(CenterXY).
 sal_uInt16 nFocusX = static_cast(nFocus);
 sal_uInt16 nFocusY = static_cast(nFocus);
 
diff --git a/include/comphelper/configurationhelper.hxx 
b/include/comphelper/configurationhelper.hxx
index eb9e7b8fd3f5..5c50aa9f5dff 100644
--- a/include/comphelper/configurationhelper.hxx
+++ b/include/comphelper/configurationhelper.hxx
@@ -159,7 +159,7 @@ public:
  *  all operations are made relative to this access point.
  *
  *  Further this method must be used only with configuration set's.
- *  Atomic keys can't be "created" ... they "exists every time".
+ *  Atomic keys can't be "created"... they "exist every time".
  *
  *  @param  xCFG
  *  the configuration root, where sRelPathToSet should be 
interpreted
diff --git a/offapi/com/sun/star/embed/StorageStream.idl 
b/offapi/com/sun/star/embed/StorageStream.idl
index cb90b6a08496..8388e2ac8213 100644
--- a/offapi/com/sun/star/embed/StorageStream.idl
+++ b/offapi/com/sun/star/embed/StorageStream.idl
@@ -84,7 +84,7 @@ published service StorageStream
 
 
 When a stream is disposed all the changes that were done for it are
-automatically flashed, so that they becomes visible from parent
+automatically flashed, so that they become visible from parent
 storage. It is also possible to flash the stream explicitly.
 
 
diff --git a/sc/source/ui/unoobj/cursuno.cxx b/sc/source/ui/unoobj/cursuno.cxx
index 28e6c92f6f50..dd9b03c57e83 100644
--- a/sc/source/ui/unoobj/cursuno.cxx
+++ b/sc/source/ui/unoobj/cursuno.cxx
@@ -127,7 +127,7 @@ void SAL_CALL ScCellCursorObj::collapseToCurrentArray()
 }
 }
 // that's a Bug, that this assertion comes; the API Reference says, that
-// if there is no Matrix, the Range is left unchanged; they says nothing
+// if there is no Matrix, the Range is left unchanged; they say nothing
 // about an exception
 /*if (!bFound)
 {
diff --git a/sc/source/ui/unoobj/datauno.cxx b/sc/source/ui/unoobj/datauno.cxx
index 89064f898c31..596da506ad14 100644
--- a/sc/source/ui/unoobj/datauno.cxx
+++ b/sc/source/ui/unoobj/datauno.cxx
@@ -533,7 +533,7 @@ ScSubTotalDescriptorBase::~ScSubTotalDescriptorBase()
 {
 }
 
-// XSubTotalDesctiptor
+// XSubTotalDescriptor
 
 ScSubTotalFieldObj* ScSubT

[Libreoffice-commits] core.git: cui/source cui/uiconfig editeng/Library_editeng.mk editeng/source include/editeng include/svx include/vcl sc/source svx/Library_svx.mk svx/source sw/source vcl/source v

 cui/source/inc/SpellDialog.hxx   |2 
 cui/uiconfig/ui/spellingdialog.ui|2 
 editeng/Library_editeng.mk   |1 
 editeng/source/misc/weldeditview.cxx |  163 ---
 include/svx/ClassificationEditView.hxx   |2 
 include/svx/weldeditview.hxx |   15 
 include/vcl/customweld.hxx   |1 
 include/vcl/weld.hxx |1 
 sc/source/ui/inc/tphfedit.hxx|2 
 svx/Library_svx.mk   |1 
 svx/source/dialog/weldeditview.cxx   | 1408 +++
 sw/source/ui/dbui/mmaddressblockpage.hxx |2 
 vcl/source/app/salvtables.cxx|5 
 vcl/unx/gtk3/gtk3gtkinst.cxx |6 
 14 files changed, 1437 insertions(+), 174 deletions(-)

New commits:
commit 5785fc06836607b3a0a25e649d81b8607b22d4af
Author: Caolán McNamara 
AuthorDate: Mon Sep 2 14:37:37 2019 +0100
Commit: Caolán McNamara 
CommitDate: Tue Sep 3 10:08:42 2019 +0200

Resolves: tdf#126935 a11y for hosted EditEngine

move it to svx so we can reuse the a11y code in svx for
EditEngines hosted in shapes to provide a11y for EditEngines
hosted in a native widget

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

diff --git a/cui/source/inc/SpellDialog.hxx b/cui/source/inc/SpellDialog.hxx
index 7f25c3fb2e68..7775ea347dbf 100644
--- a/cui/source/inc/SpellDialog.hxx
+++ b/cui/source/inc/SpellDialog.hxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include 
diff --git a/cui/uiconfig/ui/spellingdialog.ui 
b/cui/uiconfig/ui/spellingdialog.ui
index 67c6b46a9465..45221317735b 100644
--- a/cui/uiconfig/ui/spellingdialog.ui
+++ b/cui/uiconfig/ui/spellingdialog.ui
@@ -156,7 +156,7 @@
 
   
 True
-True
+False
 
   
 True
diff --git a/editeng/Library_editeng.mk b/editeng/Library_editeng.mk
index 57717ed839f8..b7c9964aab9f 100644
--- a/editeng/Library_editeng.mk
+++ b/editeng/Library_editeng.mk
@@ -99,7 +99,6 @@ $(eval $(call gb_Library_add_exception_objects,editeng,\
 editeng/source/misc/txtrange \
 editeng/source/misc/unolingu \
 editeng/source/misc/urlfieldhelper \
-editeng/source/misc/weldeditview \
 editeng/source/outliner/outleeng \
 editeng/source/outliner/outlin2 \
 editeng/source/outliner/outliner \
diff --git a/editeng/source/misc/weldeditview.cxx 
b/editeng/source/misc/weldeditview.cxx
deleted file mode 100644
index 38c253d5e6d3..
--- a/editeng/source/misc/weldeditview.cxx
+++ /dev/null
@@ -1,163 +0,0 @@
-/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
-/*
- * This file is part of the LibreOffice project.
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, You can obtain one at http://mozilla.org/MPL/2.0/.
- *
- */
-
-#include 
-#include 
-#include 
-#include 
-#include 
-#include 
-
-WeldEditView::WeldEditView() {}
-
-void WeldEditView::makeEditEngine()
-{
-m_xEditEngine.reset(new EditEngine(EditEngine::CreatePool()));
-}
-
-void WeldEditView::SetDrawingArea(weld::DrawingArea* pDrawingArea)
-{
-Size aSize(pDrawingArea->get_size_request());
-if (aSize.Width() == -1)
-aSize.setWidth(500);
-if (aSize.Height() == -1)
-aSize.setHeight(100);
-pDrawingArea->set_size_request(aSize.Width(), aSize.Height());
-
-SetOutputSizePixel(aSize);
-
-weld::CustomWidgetController::SetDrawingArea(pDrawingArea);
-
-EnableRTL(false);
-
-const StyleSettings& rStyleSettings = 
Application::GetSettings().GetStyleSettings();
-Color aBgColor = rStyleSettings.GetWindowColor();
-
-OutputDevice& rDevice = pDrawingArea->get_ref_device();
-
-rDevice.SetMapMode(MapMode(MapUnit::MapTwip));
-rDevice.SetBackground(aBgColor);
-
-Size aOutputSize(rDevice.PixelToLogic(aSize));
-aSize = aOutputSize;
-aSize.setHeight(aSize.Height());
-
-makeEditEngine();
-m_xEditEngine->SetPaperSize(aSize);
-m_xEditEngine->SetRefDevice(&rDevice);
-
-m_xEditEngine->SetControlWord(m_xEditEngine->GetControlWord() | 
EEControlBits::MARKFIELDS);
-
-m_xEditView.reset(new EditView(m_xEditEngine.get(), nullptr));
-m_xEditView->setEditViewCallbacks(this);
-m_xEditView->SetOutputArea(tools::Rectangle(Point(0, 0), aOutputSize));
-
-m_xEditView->SetBackgroundColor(aBgColor);
-m_xEditEngine->InsertView(m_xEditView.get());
-
-pDrawingArea->set_cursor(PointerStyle::Text);
-}
-
-WeldEditView::~WeldEditView() {}
-
-void WeldEditView::Resize()
-{
-OutputDevice& rDevice = GetDrawingArea()->get_ref_device();
-Size

[Libreoffice-commits] core.git: Branch 'feature/cib_contract57b' - jvmfwk/distributions jvmfwk/plugins

2019-09-03 Thread Samuel Mehrbrodt (via logerrit)

 jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml |2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml   |2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml  |2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml |2 +-
 jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml |2 +-
 jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx   |2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 7e31680aca4496168d42adfcc2e98050aff3152c
Author: Samuel Mehrbrodt 
AuthorDate: Tue Sep 3 09:57:20 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Sep 3 09:57:20 2019 +0200

Fix spelling of AdoptOpenJDK

Current version (8u222) is not detected.

Change-Id: I50fb32d1836bf2e5c6811300c8584708460089a7

diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
index b05b6c797ea8..42244847d0ab 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_freebsd.xml
@@ -31,7 +31,7 @@
 
   1.5.0
 
-
+
   1.8.0
 
   
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
index b008bb1fc0f7..3ee399d476c2 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_linux.xml
@@ -40,7 +40,7 @@
 
   1.6.0
 
-
+
   1.8.0
 
   
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
index 1fe7547d2919..417ed080b5fa 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_macosx.xml
@@ -31,7 +31,7 @@
 
   1.6.0
 
-
+
   1.8.0
 
   
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
index 7771d81527df..9f9052469b8a 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_unx.xml
@@ -25,7 +25,7 @@
 
   1.5.0
 
-
+
   1.8.0
 
   
diff --git a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml 
b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
index 429831121f7b..34284cabadf9 100644
--- a/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
+++ b/jvmfwk/distributions/OpenOfficeorg/javavendors_wnt.xml
@@ -31,7 +31,7 @@
 
   1.6.0
 
-
+
   1.8.0
 
   
diff --git a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx 
b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
index afe51216a334..8a4c47f3155f 100644
--- a/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
+++ b/jvmfwk/plugins/sunmajor/pluginlib/vendorlist.cxx
@@ -41,7 +41,7 @@ BEGIN_VENDOR_MAP()
 #endif
 VENDOR_MAP_ENTRY("Sun Microsystems Inc.", SunInfo)
 VENDOR_MAP_ENTRY("Oracle Corporation", SunInfo)
-VENDOR_MAP_ENTRY("AdoptOpenJdk", SunInfo)
+VENDOR_MAP_ENTRY("AdoptOpenJDK", SunInfo)
 #ifndef MACOSX
 VENDOR_MAP_ENTRY("IBM Corporation", OtherInfo)
 VENDOR_MAP_ENTRY("Blackdown Java-Linux Team", OtherInfo)
___
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.2' - scripting/examples