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

2020-02-01 Thread Andrea Gelmini (via logerrit) 
 sw/source/uibase/config/fontcfg.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 32ca9f268142d2f26d0ec39ff3af989e78f51c8d
Author: Andrea Gelmini 
AuthorDate: Sat Feb 1 23:42:36 2020 +0100
Commit: Julien Nabet 
CommitDate: Sun Feb 2 08:26:13 2020 +0100

Fix typo

Change-Id: I9aac347c76e3b5612151a5c644c86199ff23f113
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87814
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/sw/source/uibase/config/fontcfg.cxx 
b/sw/source/uibase/config/fontcfg.cxx
index d05aa75feea0..e58a42bb8163 100644
--- a/sw/source/uibase/config/fontcfg.cxx
+++ b/sw/source/uibase/config/fontcfg.cxx
@@ -268,7 +268,7 @@ sal_Int32 SwStdFontConfig::GetDefaultHeightFor(sal_uInt16 
nFontType, LanguageTyp
 
 void SwStdFontConfig::ChangeInt( sal_uInt16 nFontType, sal_Int32 nHeight )
 {
-OSL_ENSURE( nFontType < DEF_FONT_COUNT, "invalid index in 
SwStdFontConfig::ChangInt()");
+OSL_ENSURE( nFontType < DEF_FONT_COUNT, "invalid index in 
SwStdFontConfig::ChangeInt()");
 if( nFontType < DEF_FONT_COUNT && nDefaultFontHeight[nFontType] != nHeight)
 {
 SvtLinguOptions aLinguOpt;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Andrea Gelmini (via logerrit) 
 avmedia/source/framework/mediacontrol.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 1f700b0abcd0b52552a1d9c618777463292df123
Author: Andrea Gelmini 
AuthorDate: Sat Feb 1 23:42:35 2020 +0100
Commit: Julien Nabet 
CommitDate: Sun Feb 2 08:25:31 2020 +0100

Fix typo

Change-Id: I40b411b6bf23e2a7240a46fff99b420b3e6f6ae3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87813
Tested-by: Jenkins
Reviewed-by: Julien Nabet 

diff --git a/avmedia/source/framework/mediacontrol.cxx 
b/avmedia/source/framework/mediacontrol.cxx
index fc83dd1baa79..ddec4f90436d 100644
--- a/avmedia/source/framework/mediacontrol.cxx
+++ b/avmedia/source/framework/mediacontrol.cxx
@@ -74,7 +74,7 @@ MediaControl::MediaControl( vcl::Window* pParent, 
MediaControlStyle eControlStyl
 mxPlayToolBox->connect_clicked( LINK( this, MediaControl, implSelectHdl ) 
);
 
 mxTimeSlider->connect_value_changed( LINK( this, MediaControl, implTimeHdl 
) );
-// when changint the time, use this to do the time change after active 
scrolling
+// when changing the time, use this to do the time change after active 
scrolling
 // has stopped for a little which
 maChangeTimeIdle.SetPriority( TaskPriority::LOWEST );
 maChangeTimeIdle.SetInvokeHandler( LINK( this, MediaControl, 
implTimeEndHdl ) );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Caolán McNamara (via logerrit) 
 vcl/inc/slider.hxx|7 ++-
 vcl/source/control/slider.cxx |   30 +++---
 2 files changed, 13 insertions(+), 24 deletions(-)

New commits:
commit 5323779173f6e988051b08b5554b7ce5d202d7a2
Author: Caolán McNamara 
AuthorDate: Fri Jan 31 21:10:54 2020 +
Commit: Caolán McNamara 
CommitDate: Sun Feb 2 08:23:13 2020 +0100

remove some newly unused code

Change-Id: I67d0053f4852f22886b260791f8d90cc136352cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87788
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/inc/slider.hxx b/vcl/inc/slider.hxx
index 6abccfceb527..ea40a214675a 100644
--- a/vcl/inc/slider.hxx
+++ b/vcl/inc/slider.hxx
@@ -51,7 +51,6 @@ private:
 boolmbScrollTypeSet;
 
 Link   maSlideHdl;
-Link   maEndSlideHdl;
 
 using Control::ImplInitSettings;
 using Window::ImplInit;
@@ -64,8 +63,8 @@ private:
 void ImplDraw(vcl::RenderContext& rRenderContext);
 bool ImplIsPageUp( const Point& rPos );
 bool ImplIsPageDown( const Point& rPos );
-long ImplSlide( long nNewPos, bool bCallEndSlide );
-long ImplDoAction( bool bCallEndSlide );
+long ImplSlide( long nNewPos );
+long ImplDoAction( );
 void ImplDoMouseAction( const Point& rPos, bool bCallAction );
 void ImplDoSlide( long nNewPos );
 void ImplDoSlideAction( ScrollType eScrollType );
@@ -83,7 +82,6 @@ public:
 virtual voidDataChanged( const DataChangedEvent& rDCEvt ) override;
 
 voidSlide();
-voidEndSlide();
 
 voidSetRangeMin(long nNewRange);
 longGetRangeMin() const { return mnMinRange; }
@@ -101,7 +99,6 @@ public:
 SizeCalcWindowSizePixel();
 
 voidSetSlideHdl( const Link& rLink ) { 
maSlideHdl = rLink; }
-voidSetEndSlideHdl( const Link& rLink ) { 
maEndSlideHdl = rLink; }
 };
 
 #endif // INCLUDED_VCL_SLIDER_HXX
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index d8d920f0718f..4b14b2e00626 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -502,7 +502,7 @@ bool Slider::ImplIsPageDown( const Point& rPos )
 return aRect.IsInside( rPos );
 }
 
-long Slider::ImplSlide( long nNewPos, bool bCallEndSlide )
+long Slider::ImplSlide( long nNewPos )
 {
 long nOldPos = mnThumbPos;
 SetThumbPos( nNewPos );
@@ -510,36 +510,34 @@ long Slider::ImplSlide( long nNewPos, bool bCallEndSlide )
 if ( nDelta )
 {
 Slide();
-if ( bCallEndSlide )
-EndSlide();
 }
 return nDelta;
 }
 
-long Slider::ImplDoAction( bool bCallEndSlide )
+long Slider::ImplDoAction()
 {
 long nDelta = 0;
 
 switch ( meScrollType )
 {
 case ScrollType::LineUp:
-nDelta = ImplSlide( mnThumbPos-mnLineSize, bCallEndSlide );
+nDelta = ImplSlide( mnThumbPos-mnLineSize );
 break;
 
 case ScrollType::LineDown:
-nDelta = ImplSlide( mnThumbPos+mnLineSize, bCallEndSlide );
+nDelta = ImplSlide( mnThumbPos+mnLineSize );
 break;
 
 case ScrollType::PageUp:
-nDelta = ImplSlide( mnThumbPos-mnPageSize, bCallEndSlide );
+nDelta = ImplSlide( mnThumbPos-mnPageSize );
 break;
 
 case ScrollType::PageDown:
-nDelta = ImplSlide( mnThumbPos+mnPageSize, bCallEndSlide );
+nDelta = ImplSlide( mnThumbPos+mnPageSize );
 break;
 
 case ScrollType::Set:
-nDelta = ImplSlide( ImplCalcThumbPos( GetPointerPosPixel().X() ), 
bCallEndSlide );
+nDelta = ImplSlide( ImplCalcThumbPos( GetPointerPosPixel().X() ) );
 break;
 default:
 break;
@@ -594,7 +592,7 @@ void Slider::ImplDoMouseAction( const Point& rMousePos, 
bool bCallAction )
 
 if ( bAction )
 {
-if ( ImplDoAction( false ) )
+if ( ImplDoAction() )
 {
 Update();
 Invalidate();
@@ -612,7 +610,7 @@ void Slider::ImplDoSlide( long nNewPos )
 return;
 
 meScrollType = ScrollType::Drag;
-ImplSlide( nNewPos, true );
+ImplSlide( nNewPos );
 meScrollType = ScrollType::DontKnow;
 }
 
@@ -624,7 +622,7 @@ void Slider::ImplDoSlideAction( ScrollType eScrollType )
 return;
 
 meScrollType = eScrollType;
-ImplDoAction( true );
+ImplDoAction();
 meScrollType = ScrollType::DontKnow;
 }
 
@@ -694,7 +692,7 @@ void Slider::MouseButtonUp( const MouseEvent& )
 {
 Invalidate(InvalidateFlags::NoChildren | InvalidateFlags::NoErase);
 }
-ImplDoAction( true );
+ImplDoAction();
 meScrollType = ScrollType::DontKnow;
 }
 }
@@ -726,7 +724,6 @@ void Slider::Tracking( const TrackingEvent& rTEvt )
 Update();
 }
 
-EndSlide();
 meScrollType = ScrollType::DontKnow;
 }
 else
@

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

2020-02-01 Thread Yusuf Keten (via logerrit) 
 sw/qa/extras/ooxmlexport/ooxmlexport9.cxx   |   44 +++-
 sw/qa/extras/ooxmlexport/ooxmlw14export.cxx |   36 +-
 2 files changed, 20 insertions(+), 60 deletions(-)

New commits:
commit a5cdcc3a17a562382fc2cc38a8aaf5b584343d12
Author: Yusuf Keten 
AuthorDate: Sun Feb 2 00:06:00 2020 +0300
Commit: Mike Kaganski 
CommitDate: Sun Feb 2 08:21:43 2020 +0100

 tdf#129423: Make export tests export-only where applicable

Change-Id: I5754534c4bd77d2b5f406b12e994427924e89e27
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87812
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 

diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
index d28322e7cedd..d0579508fabe 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport9.cxx
@@ -508,21 +508,17 @@ DECLARE_OOXMLEXPORT_TEST(testTdf112352_nextPageColumns, 
"tdf112352_nextPageColum
 CPPUNIT_ASSERT_EQUAL(sal_Int16(0), xTextColumns->getColumnCount());
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf109310_endnoteStyleForMSO, 
"tdf109310_endnoteStyleForMSO.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf109310_endnoteStyleForMSO, 
"tdf109310_endnoteStyleForMSO.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/endnotes.xml");
-if (!pXmlDoc)
-return;
 // Check w:rStyle element has w:val attribute - note that w: is not 
specified for attribute
 assertXPath(pXmlDoc, 
"/w:endnotes/w:endnote[@w:id='2']/w:p/w:r[1]/w:rPr/w:rStyle", "val",
 "EndnoteCharacters");
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf103389, "tdf103389.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf103389, "tdf103389.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
 // No geometry was exported for the second canvas
 // Check both canvases' geometry
 assertXPath(pXmlDoc, 
"/w:document/w:body/w:p[1]/w:r/mc:AlternateContent/mc:Choice/w:drawing/wp:inline/a:graphic/a:graphicData/wpg:wgp/wps:wsp/wps:spPr/a:prstGeom",
 "prst", "rect");
@@ -610,11 +606,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf79329, "tdf79329.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(2), xTables->getCount());
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf103982, "tdf103982.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf103982, "tdf103982.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
 sal_Int32 nDistB = getXPath(pXmlDoc, "//wp:anchor", "distB").toInt32();
 // This was -260350, which is not a valid value for an unsigned type.
 CPPUNIT_ASSERT(nDistB >= 0);
@@ -624,11 +618,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf103982, "tdf103982.docx")
 CPPUNIT_ASSERT(!getProperty(xPropertySet, "Shadow"));
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf104115, "tdf104115.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf104115, "tdf104115.docx")
 {
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
 // This found 0 nodes: the custom geometry was not written for the Bezier
 // curve -> Word refused to open the document.
 assertXPath(pXmlDoc, "//a:custGeom", 1);
@@ -646,15 +638,13 @@ DECLARE_OOXMLEXPORT_TEST(testTdf103651, "tdf103651.docx")
 CPPUNIT_ASSERT(getProperty(getRun(getParagraph(1), 1), 
"CharAutoKerning"));
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf99227, "tdf99227.docx")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf99227, "tdf99227.docx")
 {
 // A drawing anchored as character to a footnote caused write past end of 
document.xml at export to docx.
 // After that, importing after export failed with
 // SAXParseException: '[word/document.xml line 2]: Extra content at the 
end of the document', Stream 'word / document.xml',
 // and before commit ebf767eeb2a169ba533e1b2ffccf16f41d95df35, the drawing 
was silently lost.
 xmlDocPtr pXmlDoc = parseExport("word/footnotes.xml");
-if (!pXmlDoc)
-return;
 
 assertXPath(pXmlDoc, "//w:footnote/w:p/w:r/w:drawing", 1);
 }
@@ -822,13 +812,11 @@ DECLARE_OOXMLEXPORT_TEST(testTdf106001, "tdf106001.docx")
 CPPUNIT_ASSERT_EQUAL( static_cast( 100 ), 
getProperty(getRun(getParagraph(1), 1), "CharScaleWidth" ));
 }
 
-DECLARE_OOXMLEXPORT_TEST(testTdf106001_2, "tdf106001-2.odt")
+DECLARE_OOXMLEXPORT_EXPORTONLY_TEST(testTdf106001_2, "tdf106001-2.odt")
 {
 // In test ODT CharScaleWidth = 900, this was not changed upon OOXML 
export to stay in [1..600], now it's clamped to 600
 // Note: we disregard what's set in pPr / rPr and only care about r / rPr
 xmlDocPtr pXmlDoc = parseExport("word/document.xml");
-if (!pXmlDoc)
-return;
 assertXPath(pXmlDoc, "/w:document/w:body/w:p/w:r/w:rPr/w:w","val","600");
 }
 
@@ -1135,11 +1123,9 @@ DECLARE_OOXMLEXPORT_TEST(testTdf109184, "tdf109184.docx")
 CPPUNIT_ASSERT_EQUAL(static_cast(0xff), 
getProperty(xCell3, "BackColor"));
 }
 
-DECLARE_OOXMLEXPORT_TEST(t

License Statement

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

CppCheck Report Update

2020-02-01 Thread cppcheck.libreoff...@gmail.com 


A new cppcheck report is available at : 
http://dev-builds.libreoffice.org/cppcheck_reports/master/


Note:
The script generating this report was run at :
2020-02-02 03:39:26 with user buildslave at host vm140 as 
/home/buildslave/source/dev-tools/cppcheck/cppcheck-report.sh -s 
/home/buildslave/source/libo-core -c /home/buildslave/source/cppcheck -w 
/home/buildslave/tmp/www

It can be found and improved here:

https://gerrit.libreoffice.org/plugins/gitiles/dev-tools/+/master/cppcheck/cppcheck-report.sh


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

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

2020-02-01 Thread Jim Raykowski (via logerrit) 
 sw/inc/crsrsh.hxx  |4 -
 sw/inc/strings.hrc |4 -
 sw/source/core/crsr/crstrvl.cxx|7 +-
 sw/source/uibase/inc/conttree.hxx  |2 
 sw/source/uibase/utlui/content.cxx |  113 +++--
 5 files changed, 96 insertions(+), 34 deletions(-)

New commits:
commit dfd027342e6b4107ebd3369de96ef2be3883724d
Author: Jim Raykowski 
AuthorDate: Mon Jan 20 21:58:54 2020 -0900
Commit: Jim Raykowski 
CommitDate: Sat Feb 1 20:24:37 2020 +0100

tdf#128814 Navigator content context menu related

Adds Select menu item to Chapter, Table, and Section content context
menus to make document selection of content. Document selection made for
collapsed chapters includes all sub chapters. Multi chapter selections
can be made from the headings content navigation view.

Reworks chapter delete to follow chapter selection behavior.

Adds accelerator keys to context menu items Delete and Chapter/Level
Promote/Demote.

Makes chapter delete undo/redo entries show as 'Delete chapter' or
'Delete chapters' depending on single or multiselected chapter delete.

Renames 'Select Chapter' and 'Delete Chapter' menu items to 'Select' and
'Delete'.

Reworks an assert so as not to assert fail when delete key is pressed on
content type entry

Change-Id: I68c725bbf5c6d561615cf10a0a75d4284b698ace
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87168
Tested-by: Jenkins
Reviewed-by: Mike Kaganski 
Reviewed-by: Jim Raykowski 

diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index daf784a4c86a..5c5b71b8b8b8 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -617,8 +617,8 @@ public:
 SwOutlineNodes::size_type GetOutlinePos( sal_uInt8 nLevel = UCHAR_MAX );
 // select the given range of OutlineNodes. Optionally including the 
children
 // the sal_uInt16s are the positions in OutlineNodes-Array (EditShell)
-bool MakeOutlineSel( SwOutlineNodes::size_type nSttPos, 
SwOutlineNodes::size_type nEndPos,
- bool bWithChildren );
+bool MakeOutlineSel(SwOutlineNodes::size_type nSttPos, 
SwOutlineNodes::size_type nEndPos,
+ bool bWithChildren, bool bKillPams = true );
 
 bool GotoNextOutline();
 bool GotoPrevOutline();
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index 1193d78f9823..fbb64babe662 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -550,6 +550,8 @@
 #define STR_GRAPHIC NC_("STR_GRAPHIC", "image")
 #define STR_DRAWING_OBJECTS NC_("STR_DRAWING_OBJECTS", 
"drawing object(s)")
 #define STR_TABLE_NAME  NC_("STR_TABLE_NAME", "table: 
$1$2$3")
+#define STR_CHAPTER_NAMENC_("STR_CHAPTER_NAME", 
"chapter")
+#define STR_CHAPTERS_NAME   NC_("STR_CHAPTERS_NAME", 
"chapters")
 #define STR_PARAGRAPH_UNDO  NC_("STR_PARAGRAPH_UNDO", 
"paragraph")
 #define STR_PARAGRAPH_SIGN_UNDO NC_("STR_PARAGRAPH_SIGN_UNDO", 
"Paragraph sign")
 #define STR_UNDO_FLYFRMFMT_TITLE
NC_("STR_UNDO_FLYFRMFMT_TITLE", "Change object title of $1")
@@ -641,7 +643,7 @@
 #define STR_OUTLINE_LEVEL   NC_("STR_OUTLINE_LEVEL", 
"Outline Level")
 #define STR_DRAGMODENC_("STR_DRAGMODE", "Drag 
Mode")
 #define STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY 
NC_("STR_SEND_OUTLINE_TO_CLIPBOARD_ENTRY", "Send Outline to Clipboard")
-#define STR_DELETE_CHAPTER  NC_("STR_DELETE_CHAPTER", 
"Delete Chapter")
+#define STR_SELECT  NC_("STR_SELECT", "Select")
 #define STR_DEMOTE_CHAPTER  NC_("STR_DEMOTE_CHAPTER", 
"Demote Chapter")
 #define STR_PROMOTE_CHAPTER NC_("STR_PROMOTE_CHAPTER", 
"Promote Chapter")
 #define STR_DEMOTE_LEVELNC_("STR_DEMOTE_LEVEL", 
"Demote Level")
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index ebc9ab4306bd..fc5b606b539a 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1177,8 +1177,8 @@ SwOutlineNodes::size_type SwCursorShell::GetOutlinePos( 
sal_uInt8 nLevel )
 return SwOutlineNodes::npos; // no more left
 }
 
-bool SwCursorShell::MakeOutlineSel( SwOutlineNodes::size_type nSttPos, 
SwOutlineNodes::size_type nEndPos,
-  bool bWithChildren )
+bool SwCursorShell::MakeOutlineSel(SwOutlineNodes::size_type nSttPos, 
SwOutlineNodes::size_type nEndPos,
+  bool bWithChildren , bool bKillPams)
 {
 const SwNodes& rNds = GetDoc()->GetNodes();
 const SwOutlineNodes& rOutlNds = rNds.GetOutLineNds();
@@ -1215,7 +1215,8 @@ bool SwCursorShell::MakeOutlineSel( 
SwOutlineNodes::size_type nSttPos, SwOutline
 if( nEndPos == rOutlNds.size() ) // no end found

[Libreoffice-commits] core.git: accessibility/inc basctl/inc basegfx/inc basic/inc basic/source bin/update_pch chart2/inc chart2/source comphelper/inc configmgr/inc connectivity/inc connectivity/sourc

2020-02-01 Thread Luboš Luňák (via logerrit) 
 accessibility/inc/pch/precompiled_acc.hxx |3 
 basctl/inc/pch/precompiled_basctl.hxx |  117 -
 basegfx/inc/pch/precompiled_basegfx.hxx   |6 
 basic/inc/pch/precompiled_sb.hxx  |   45 +++
 basic/source/classes/sb.cxx   |7 
 bin/update_pch|   25 +
 chart2/inc/pch/precompiled_chartcontroller.hxx|   65 +
 chart2/inc/pch/precompiled_chartcore.hxx  |   86 ++
 chart2/source/controller/dialogs/DataBrowser.cxx  |4 
 comphelper/inc/pch/precompiled_comphelper.hxx |4 
 configmgr/inc/pch/precompiled_configmgr.hxx   |3 
 connectivity/inc/pch/precompiled_ado.hxx  |   26 +-
 connectivity/inc/pch/precompiled_calc.hxx |   30 +-
 connectivity/inc/pch/precompiled_dbase.hxx|   92 ---
 connectivity/inc/pch/precompiled_dbpool2.hxx  |8 
 connectivity/inc/pch/precompiled_dbtools.hxx  |   31 +-
 connectivity/inc/pch/precompiled_file.hxx |   84 +++---
 connectivity/inc/pch/precompiled_firebird_sdbc.hxx|   18 -
 connectivity/inc/pch/precompiled_flat.hxx |   64 ++---
 connectivity/inc/pch/precompiled_mysql_jdbc.hxx   |  176 ++
 connectivity/inc/pch/precompiled_odbc.hxx |   48 ++-
 connectivity/inc/pch/precompiled_postgresql-sdbc-impl.hxx |9 
 connectivity/source/drivers/dbase/DTable.cxx  |4 
 cppcanvas/inc/pch/precompiled_cppcanvas.hxx   |   12 
 cppuhelper/inc/pch/precompiled_cppuhelper.hxx |5 
 cui/inc/pch/precompiled_cui.hxx   |   56 
 dbaccess/inc/pch/precompiled_dba.hxx  |   70 +
 dbaccess/inc/pch/precompiled_dbaxml.hxx   |8 
 dbaccess/inc/pch/precompiled_dbu.hxx  |   91 +++
 dbaccess/inc/pch/precompiled_sdbt.hxx |4 
 desktop/inc/pch/precompiled_deployment.hxx|   27 --
 desktop/inc/pch/precompiled_deploymentgui.hxx |   20 -
 desktop/inc/pch/precompiled_deploymentmisc.hxx|   14 -
 desktop/inc/pch/precompiled_sofficeapp.hxx|   42 ---
 drawinglayer/inc/pch/precompiled_drawinglayer.hxx |   23 -
 editeng/inc/pch/precompiled_editeng.hxx   |   38 +--
 emfio/inc/pch/precompiled_emfio.hxx   |6 
 external/liborcus/inc/pch/precompiled_orcus.hxx   |3 
 external/pdfium/inc/pch/precompiled_pdfium.hxx|7 
 forms/inc/pch/precompiled_frm.hxx |   28 ++
 framework/inc/pch/precompiled_fwe.hxx |   15 -
 framework/inc/pch/precompiled_fwk.hxx |   62 
 framework/inc/pch/precompiled_fwl.hxx |   61 
 lotuswordpro/inc/pch/precompiled_lwpft.hxx|4 
 oox/inc/pch/precompiled_oox.hxx   |6 
 package/inc/pch/precompiled_package2.hxx  |3 
 reportdesign/inc/pch/precompiled_rpt.hxx  |   32 ++
 reportdesign/inc/pch/precompiled_rptui.hxx|   31 ++
 reportdesign/inc/pch/precompiled_rptxml.hxx   |5 
 sal/inc/pch/precompiled_sal.hxx   |3 
 sc/inc/pch/precompiled_sc.hxx |  101 +++-
 sc/inc/pch/precompiled_scfilt.hxx |  111 
 sc/inc/pch/precompiled_scui.hxx   |   66 +
 sc/inc/pch/precompiled_vbaobj.hxx |   13 -
 sd/inc/pch/precompiled_sd.hxx |  119 +
 sd/inc/pch/precompiled_sdui.hxx   |  138 ++
 sd/source/core/sdpage.cxx |2 
 sd/source/ui/dlg/animobjs.cxx |   16 -
 sd/source/ui/inc/OutlinerIteratorImpl.hxx |4 
 sdext/inc/pch/precompiled_PresentationMinimizer.hxx   |   13 -
 sdext/inc/pch/precompiled_PresenterScreen.hxx |   49 +--
 sfx2/inc/pch/precompiled_sfx.hxx  |  134 +++---
 slideshow/inc/pch/precompiled_slideshow.hxx   |   81 +++---
 slideshow/source/engine/shapes/gdimtftools.cxx|2 
 starmath/inc/pch/precompiled_sm.hxx   |   13 -
 svgio/inc/pch/precompiled_svgio.hxx   |6 
 svl/inc/pch/precompiled_svl.hxx   |6 
 svtools/inc/pch/precompiled_svt.hxx   |   47 +++
 svx/inc/pch/precompiled_svx.hxx   |   23 +
 svx/inc/pch/precompiled_svxcore.hxx   |   37 ++
 svx/source/xml/xmlgrhlp.cxx   |6 
 sw/inc/pch/precompiled_msword.hxx |   86

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

2020-02-01 Thread Luboš Luňák (via logerrit) 
 sc/source/ui/inc/tabview.hxx   |   12 +++-
 sc/source/ui/view/tabview3.cxx |   11 +++
 2 files changed, 14 insertions(+), 9 deletions(-)

New commits:
commit 961f7e8ec8ef188c361b2b20b60b95e78ecccd33
Author: Luboš Luňák 
AuthorDate: Sat Feb 1 10:33:23 2020 +0100
Commit: Luboš Luňák 
CommitDate: Sat Feb 1 20:12:07 2020 +0100

move internal inline function from .hxx to .cxx

This normally wouldn't make a difference, but it does when building
with Clang's -fmodules-codegen to collect duplicated templates,
inlines, etc. into extra .o file. The inline calling the template
is emitted in that .o, but the template is defined only in the .cxx
and not referenced from it, so it's never emitted.

Change-Id: I8b49030f2be6146ca1e2cd5e35734c0db6cca394
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87798
Tested-by: Jenkins
Reviewed-by: Luboš Luňák 

diff --git a/sc/source/ui/inc/tabview.hxx b/sc/source/ui/inc/tabview.hxx
index e12e53f65473..82b46318235b 100644
--- a/sc/source/ui/inc/tabview.hxx
+++ b/sc/source/ui/inc/tabview.hxx
@@ -100,15 +100,9 @@ public:
 
 ~ScExtraEditViewManager();
 
-void Add(SfxViewShell* pViewShell, ScSplitPos eWhich)
-{
-Apply(pViewShell, eWhich);
-}
-
-void Remove(SfxViewShell* pViewShell, ScSplitPos eWhich)
-{
-Apply(pViewShell, eWhich);
-}
+void Add(SfxViewShell* pViewShell, ScSplitPos eWhich);
+
+void Remove(SfxViewShell* pViewShell, ScSplitPos eWhich);
 
 private:
 template
diff --git a/sc/source/ui/view/tabview3.cxx b/sc/source/ui/view/tabview3.cxx
index a14fb12b3fc1..fa68182b2399 100644
--- a/sc/source/ui/view/tabview3.cxx
+++ b/sc/source/ui/view/tabview3.cxx
@@ -99,6 +99,17 @@ ScExtraEditViewManager::~ScExtraEditViewManager()
 DBG_ASSERT(nTotalWindows == 0, "ScExtraEditViewManager dtor: some out 
window has not yet been removed!");
 }
 
+inline void ScExtraEditViewManager::Add(SfxViewShell* pViewShell, ScSplitPos 
eWhich)
+{
+Apply(pViewShell, eWhich);
+}
+
+inline void ScExtraEditViewManager::Remove(SfxViewShell* pViewShell, 
ScSplitPos eWhich)
+{
+Apply(pViewShell, eWhich);
+}
+
+
 template
 void ScExtraEditViewManager::Apply(SfxViewShell* pViewShell, ScSplitPos eWhich)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Caolán McNamara (via logerrit) 
 lotuswordpro/source/filter/lwprowlayout.cxx |5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

New commits:
commit 0754e581b0d8569dd08cf26f88678754f249face
Author: Caolán McNamara 
AuthorDate: Sat Feb 1 12:04:26 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 1 18:04:35 2020 +0100

ofz#20456 Null-dereference READ

this is the first honggfuzz (honggfuzz_asan_libreoffice) report I've seen 
to date

Change-Id: Iac733aa63c7c94d9454b9c8596340dc2286393c0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87803
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx 
b/lotuswordpro/source/filter/lwprowlayout.cxx
index de4e0b12789e..9760dd7a5e24 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -283,14 +283,15 @@ void LwpRowLayout::RegisterCurRowStyle(XFRow* 
pXFRow,sal_uInt16 nRowMark)
 {
 pRowStyle = static_cast(
 
pXFStyleManager->FindStyle(pTableLayout->GetDefaultRowStyleName()));
-fHeight += pRowStyle->GetRowHeight();
 }
 else
 {
 pRowStyle = static_cast(
 pXFStyleManager->FindStyle(iter->second->GetStyleName()));
-fHeight+=pRowStyle->GetRowHeight();
 }
+if (!pRowStyle)
+throw std::runtime_error("missing RowStyle");
+fHeight += pRowStyle->GetRowHeight();
 }
 
 if (m_nDirection & 0x0030)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Caolán McNamara (via logerrit) 
 vcl/source/filter/png/pngread.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2d2e5d8719827e96d54368ef4d8b31feff3a434e
Author: Caolán McNamara 
AuthorDate: Sat Feb 1 12:17:22 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 1 17:20:42 2020 +0100

ofz#20422 reversed condition

Change-Id: I5f880e24aee029e3560da986969d46500b5ed044
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87804
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/filter/png/pngread.cxx 
b/vcl/source/filter/png/pngread.cxx
index d6908a9bcccf..0d85e7326db1 100644
--- a/vcl/source/filter/png/pngread.cxx
+++ b/vcl/source/filter/png/pngread.cxx
@@ -863,7 +863,7 @@ void PNGReaderImpl::ImplGetBackground()
 sal_uInt8 nGreen = ImplScaleColor();
 sal_uInt8 nBlue = ImplScaleColor();
 // ofz#18653 slow and uninteresting
-if (!utl::ConfigManager::IsFuzzing())
+if (utl::ConfigManager::IsFuzzing())
 return;
 mxAcc->Erase(Color(nRed, nGreen, nBlue));
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Eda Nur Var license statement

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

[Libreoffice-commits] core.git: include/vcl solenv/clang-format vcl/inc vcl/source

2020-02-01 Thread Caolán McNamara (via logerrit) 
 solenv/clang-format/blacklist |2 +-
 vcl/inc/slider.hxx|   30 +++---
 vcl/source/app/salvtables.cxx |2 +-
 vcl/source/control/slider.cxx |2 +-
 vcl/source/window/builder.cxx |2 +-
 5 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 6886f2d66ce24218025b5d4ce8e846ea62a0d0a1
Author: Caolán McNamara 
AuthorDate: Wed Jan 29 21:18:28 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 1 16:49:42 2020 +0100

no direct users of slider.hxx outside vcl anymore

Change-Id: I6bf80bb125512a483aba3aed3c5a6a16d14e31d6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87755
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/solenv/clang-format/blacklist b/solenv/clang-format/blacklist
index c359063ec310..10be36f3b785 100644
--- a/solenv/clang-format/blacklist
+++ b/solenv/clang-format/blacklist
@@ -7837,7 +7837,6 @@ include/vcl/scopedbitmapaccess.hxx
 include/vcl/scrbar.hxx
 include/vcl/seleng.hxx
 include/vcl/settings.hxx
-include/vcl/slider.hxx
 include/vcl/sound.hxx
 include/vcl/spinfld.hxx
 include/vcl/split.hxx
@@ -17303,6 +17302,7 @@ vcl/inc/schedulerimpl.hxx
 vcl/inc/scrptrun.h
 vcl/inc/scrwnd.hxx
 vcl/inc/sft.hxx
+vcl/inc/slider.hxx
 vcl/inc/spin.hxx
 vcl/inc/strings.hxx
 vcl/inc/svdata.hxx
diff --git a/include/vcl/slider.hxx b/vcl/inc/slider.hxx
similarity index 80%
rename from include/vcl/slider.hxx
rename to vcl/inc/slider.hxx
index 91e479f19ba1..6abccfceb527 100644
--- a/include/vcl/slider.hxx
+++ b/vcl/inc/slider.hxx
@@ -24,7 +24,7 @@
 #include 
 #include 
 
-class VCL_DLLPUBLIC Slider final : public Control
+class Slider final : public Control
 {
 private:
 tools::Rectangle   maChannel1Rect;
@@ -55,20 +55,20 @@ private:
 
 using Control::ImplInitSettings;
 using Window::ImplInit;
-SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle );
-SAL_DLLPRIVATE void ImplInitSettings();
-SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true );
-SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos );
-SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos );
-SAL_DLLPRIVATE void ImplCalc( bool bUpdate = true );
-SAL_DLLPRIVATE void ImplDraw(vcl::RenderContext& rRenderContext);
-SAL_DLLPRIVATE bool ImplIsPageUp( const Point& rPos );
-SAL_DLLPRIVATE bool ImplIsPageDown( const Point& rPos );
-SAL_DLLPRIVATE long ImplSlide( long nNewPos, bool bCallEndSlide );
-SAL_DLLPRIVATE long ImplDoAction( bool bCallEndSlide );
-SAL_DLLPRIVATE void ImplDoMouseAction( const Point& rPos, bool bCallAction 
);
-SAL_DLLPRIVATE void ImplDoSlide( long nNewPos );
-SAL_DLLPRIVATE void ImplDoSlideAction( ScrollType eScrollType );
+void ImplInit( vcl::Window* pParent, WinBits nStyle );
+void ImplInitSettings();
+void ImplUpdateRects( bool bUpdate = true );
+long ImplCalcThumbPos( long nPixPos );
+long ImplCalcThumbPosPix( long nPos );
+void ImplCalc( bool bUpdate = true );
+void ImplDraw(vcl::RenderContext& rRenderContext);
+bool ImplIsPageUp( const Point& rPos );
+bool ImplIsPageDown( const Point& rPos );
+long ImplSlide( long nNewPos, bool bCallEndSlide );
+long ImplDoAction( bool bCallEndSlide );
+void ImplDoMouseAction( const Point& rPos, bool bCallAction );
+void ImplDoSlide( long nNewPos );
+void ImplDoSlideAction( ScrollType eScrollType );
 
 public:
 Slider( vcl::Window* pParent, WinBits nStyle);
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index fedf54d2b833..fb68ee0c605d 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -56,7 +56,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/vcl/source/control/slider.cxx b/vcl/source/control/slider.cxx
index f1f447f56673..d8d920f0718f 100644
--- a/vcl/source/control/slider.cxx
+++ b/vcl/source/control/slider.cxx
@@ -19,7 +19,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 #include "thumbpos.hxx"
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 154eaaccd974..69758641ea23 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -47,7 +47,7 @@
 #include 
 #include 
 #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: avmedia/inc avmedia/source include/avmedia include/vcl solenv/sanitizers svx/source svx/uiconfig svx/UIConfig_svx.mk vcl/source vcl/unx

2020-02-01 Thread Caolán McNamara (via logerrit) 
 avmedia/inc/bitmaps.hlst|   14 -
 avmedia/inc/mediacontrol.hxx|   31 +-
 avmedia/inc/strings.hrc |3 
 avmedia/source/framework/MediaControlBase.cxx   |  301 
 avmedia/source/framework/mediacontrol.cxx   |  283 +++---
 avmedia/source/framework/mediatoolbox.cxx   |1 
 avmedia/source/viewer/mediawindow_impl.cxx  |2 
 include/avmedia/MediaControlBase.hxx|   25 -
 include/vcl/weld.hxx|5 
 solenv/sanitizers/ui/svx.suppr  |   16 -
 svx/UIConfig_svx.mk |2 
 svx/source/sidebar/media/MediaPlaybackPanel.cxx |  100 +++
 svx/source/sidebar/media/MediaPlaybackPanel.hxx |   10 
 svx/uiconfig/ui/medialine.ui|  292 +++
 svx/uiconfig/ui/mediaplayback.ui|  204 +++-
 svx/uiconfig/ui/mediawindow.ui  |  277 ++
 vcl/source/app/salvtables.cxx   |   17 +
 vcl/unx/gtk3/gtk3gtkinst.cxx|   19 +
 18 files changed, 1058 insertions(+), 544 deletions(-)

New commits:
commit ad30e7df148253c6bd8466b3b45e1ed151585c2e
Author: Caolán McNamara 
AuthorDate: Wed Jan 29 19:59:14 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 1 16:47:25 2020 +0100

weld MediaPlaybackPanel

Change-Id: I84c9e6f37de3b22b896f8109e49a5a0391630ac2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87754
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/avmedia/inc/bitmaps.hlst b/avmedia/inc/bitmaps.hlst
index 24441a26f688..682d090fe7b1 100644
--- a/avmedia/inc/bitmaps.hlst
+++ b/avmedia/inc/bitmaps.hlst
@@ -10,20 +10,6 @@
 #ifndef INCLUDED_AVMEDIA_INC_BITMAPS_HRC
 #define INCLUDED_AVMEDIA_INC_BITMAPS_HRC
 
-#define AVMEDIA_IMG_OPEN_NORMAL "avmedia/res/av02048.png"
-#define AVMEDIA_IMG_PLAY_NORMAL "avmedia/res/av02049.png"
-#define AVMEDIA_IMG_PAUSE_NORMAL"avmedia/res/av02050.png"
-#define AVMEDIA_IMG_STOP_NORMAL "avmedia/res/av02051.png"
-#define AVMEDIA_IMG_LOOP_NORMAL "avmedia/res/av02052.png"
-#define AVMEDIA_IMG_INSERT_NORMAL   "avmedia/res/av02053.png"
-#define AVMEDIA_IMG_MUTE_NORMAL "avmedia/res/av02054.png"
-#define AVMEDIA_IMG_OPEN_LARGE  "avmedia/res/avl02048.png"
-#define AVMEDIA_IMG_PLAY_LARGE  "avmedia/res/avl02049.png"
-#define AVMEDIA_IMG_PAUSE_LARGE "avmedia/res/avl02050.png"
-#define AVMEDIA_IMG_STOP_LARGE  "avmedia/res/avl02051.png"
-#define AVMEDIA_IMG_LOOP_LARGE  "avmedia/res/avl02052.png"
-#define AVMEDIA_IMG_INSERT_LARGE"avmedia/res/avl02053.png"
-#define AVMEDIA_IMG_MUTE_LARGE  "avmedia/res/avl02054.png"
 #define AVMEDIA_BMP_AUDIOLOGO   "avmedia/res/avaudiologo.png"
 #define AVMEDIA_BMP_EMPTYLOGO   "avmedia/res/avemptylogo.png"
 
diff --git a/avmedia/inc/mediacontrol.hxx b/avmedia/inc/mediacontrol.hxx
index 9172195eea71..b67ac0a36808 100644
--- a/avmedia/inc/mediacontrol.hxx
+++ b/avmedia/inc/mediacontrol.hxx
@@ -22,17 +22,14 @@
 
 #include 
 
+#include 
 #include 
 #include 
-#include 
-#include 
-#include 
+#include 
 #include 
 
 #define AVMEDIA_CONTROLOFFSET 6
 
-class ListBox;
-
 namespace avmedia
 {
 
@@ -41,12 +38,11 @@ class MediaItem;
 class MediaControl : public Control, public MediaControlBase
 {
 public:
-
 MediaControl( vcl::Window* pParent, MediaControlStyle 
eControlStyle );
 virtual ~MediaControl() override;
 virtual voiddispose() override;
 
-const Size& getMinSizePixel() const;
+SizegetMinSizePixel() const;
 
 voidsetState( const MediaItem& rItem );
 voidUpdateURLField( MediaItem const & maItem );
@@ -58,21 +54,24 @@ protected:
 
 virtual voidResize() override;
 virtual voidInitializeWidgets() override;
-VclPtrmpMediaPath;
+std::unique_ptr mxMediaPath;
 
 private:
 
-DECL_LINK( implTimeHdl, Slider*, void );
-DECL_LINK( implTimeEndHdl, Slider*, void );
-DECL_LINK( implVolumeHdl, Slider*, void );
-DECL_LINK( implSelectHdl, ToolBox*, void );
-DECL_LINK( implZoomSelectHdl, ListBox&, void );
-DECL_LINK(implTimeoutHdl, Timer *, void);
+DECL_LINK(implTimeHdl, weld::Scale&, void);
+DECL_LINK(implTimeEndHdl, Timer*, void);
+DECL_LINK(implVolumeHdl, weld::Scale&, void);
+DECL_LINK(implSelectHdl, const OString&, void);
+DECL_LINK(implZoomSelectHdl, weld::ComboBox&, void);
+DECL_LINK(implTimeoutHdl, Timer*, void);
+
+std::unique_ptr m_xBuilder;
+VclPtr m_xVclContentArea;
+std::unique_ptr m_xContainer;
 
 Id

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

2020-02-01 Thread Caolán McNamara (via logerrit) 
 lotuswordpro/source/filter/lwprowlayout.cxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit fec7e3422f4d1c5b9382518a11d0bb99b12e41c9
Author: Caolán McNamara 
AuthorDate: Sat Feb 1 11:21:10 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 1 16:26:52 2020 +0100

ofz#20447 Null-dereference READ

Change-Id: I76c1c815ab5aaf4548c886a69989fcabe3de5248
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87802
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/lotuswordpro/source/filter/lwprowlayout.cxx 
b/lotuswordpro/source/filter/lwprowlayout.cxx
index 38dc355afd1a..de4e0b12789e 100644
--- a/lotuswordpro/source/filter/lwprowlayout.cxx
+++ b/lotuswordpro/source/filter/lwprowlayout.cxx
@@ -191,7 +191,8 @@ void LwpRowLayout::Read()
 void LwpRowLayout::ConvertRow(rtl::Reference const & 
pXFTable,sal_uInt8 nStartCol,sal_uInt8 nEndCol)
 {
 LwpTableLayout* pTableLayout = GetParentTableLayout();
-assert(pTableLayout);
+if (!pTableLayout)
+throw std::runtime_error("missing TableLayout");
 LwpTable* pTable = pTableLayout->GetTable();
 
 //calculate the connected cell position
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Muhammet Kara (via logerrit) 
 cui/source/customize/acccfg.cxx |4 ++--
 include/vcl/svapp.hxx   |4 ++--
 vcl/source/app/svapp.cxx|4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 08edc74a6b6ccf0d4d1560f57ec99a1ad9b390ce
Author: Muhammet Kara 
AuthorDate: Sat Feb 1 14:20:44 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Feb 1 14:13:49 2020 +0100

sal_uLong to size_t for sizeof related types

Change-Id: I00055ffd7b79d2e5637b69390ca516f11b0cffd9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87801
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index cb1ed554d501..ca602f8e96be 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -1032,8 +1032,8 @@ void SfxAcceleratorConfigPage::Init(const 
uno::Reference= GetReservedKeyCodeCount() )
 return nullptr;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2020-02-01 Thread Seth Chaiklin (via logerrit) 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ce9924bf47dc99aa207caeea6155f464319515d3
Author: Seth Chaiklin 
AuthorDate: Sat Feb 1 12:44:09 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Feb 1 12:44:09 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to a7c86802627ba84c6990354e020aa34b2738ec57
  - tdf#130064 adjustments in help page about legacy list style positioning

  - add "access to"
  - remove "heading" / change position of note
  - add help on "Apply" control
  - add "Load/Save" control
  - corrections in description of controls (see bug report for details)

Change-Id: I8a822c44cfd0e80e5b850378a76f70f1727abe14
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87541
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 2c57fe6cecd2..a7c86802627b 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 2c57fe6cecd214f27806487e863cce14a235773e
+Subproject commit a7c86802627ba84c6990354e020aa34b2738ec57
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Seth Chaiklin (via logerrit) 
 source/text/shared/01/06050600.xhp |   15 ++-
 source/text/swriter/01/0606.xhp|4 ++--
 source/text/swriter/01/legacynumbering.xhp |   24 +---
 3 files changed, 33 insertions(+), 10 deletions(-)

New commits:
commit a7c86802627ba84c6990354e020aa34b2738ec57
Author: Seth Chaiklin 
AuthorDate: Mon Jan 27 17:28:36 2020 +0100
Commit: Seth Chaiklin 
CommitDate: Sat Feb 1 12:44:09 2020 +0100

tdf#130064 adjustments in help page about legacy list style positioning

  - add "access to"
  - remove "heading" / change position of note
  - add help on "Apply" control
  - add "Load/Save" control
  - corrections in description of controls (see bug report for details)

Change-Id: I8a822c44cfd0e80e5b850378a76f70f1727abe14
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87541
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/01/06050600.xhp 
b/source/text/shared/01/06050600.xhp
index 8cbb5e2d3..7ffdd4a5f 100644
--- a/source/text/shared/01/06050600.xhp
+++ b/source/text/shared/01/06050600.xhp
@@ -32,7 +32,7 @@
 
 
 Position (List 
Styles)
-Sets the 
indent, spacing, and alignment options for the numbered or bulleted 
list.
+Sets the indent, spacing, and alignment options for the 
numbered or bulleted list.
 do we have a how-to for numbering/bullets/outlines 
with/without styles? seems we really need one
 
 
@@ -73,8 +73,21 @@
 Default
 Resets the indent and the 
spacing values to the default values.
 
+
+  
+
+  
+
 
 
+
+  
+  
+
+This 
control appears only when modifying Paragraph style.
+  
+  
+
 
 Position for List styles (legacy)
 Paragraph 
alignment
diff --git a/source/text/swriter/01/0606.xhp 
b/source/text/swriter/01/0606.xhp
index 2d34436e3..7ed64c3a5 100644
--- a/source/text/swriter/01/0606.xhp
+++ b/source/text/swriter/01/0606.xhp
@@ -44,12 +44,12 @@
 
 
 
-
+
 Load/Save
 Saves or loads a chapter and 
outline number format. A saved outline number format is available to all text 
documents.
 The 
Load/Save button is only available for chapter and outline 
numbering. For numbered or bulleted list styles, modify the numbering styles of 
the paragraphs.
 
-
+
 Untitled 1 - 9
 Select the predefined numbering 
style that you want to assign to the selected outline level.
 
diff --git a/source/text/swriter/01/legacynumbering.xhp 
b/source/text/swriter/01/legacynumbering.xhp
index e891f1c9f..870dd8580 100644
--- a/source/text/swriter/01/legacynumbering.xhp
+++ b/source/text/swriter/01/legacynumbering.xhp
@@ -25,15 +25,18 @@
 Position 
(List Styles - Legacy)
 
 
-Includes 
‟howtoget” from text/shared/00/00040500.xhp#numposition
+Provides the 
description of what this tab does.
+
+
+
 
+%PRODUCTNAME Writer uses the 
position controls shown here when opening documents that use a different method 
for positioning and spacing. For default controls see Position (List 
Styles).see 
http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt
 
-%PRODUCTNAME Writer uses the 
position controls shown here when opening documents that use a different method 
for positioning and spacing. (For default controls see Position (List 
Styles).see 
http://specs.openoffice.org/writer/numbering/NewListLevelAttrs.odt
 
 
 
 Indent
-Enter the amount of 
space to leave between the left page margin (or the left edge of the text 
object) and the left edge of the numbering symbol. If the current paragraph 
style uses an indent, the amount you enter here is added to the 
indent.
+Enter the amount of 
space to leave between the left page margin (or the left edge of the text 
object) and the left edge of the numbering area. If the current paragraph style 
uses an indent, the amount you enter here is added to the 
indent.
 
 
 Relative
@@ -41,19 +44,26 @@
 
 
 Width 
of numberingi85347
-Enter the amount of 
space to leave between the left edge of the numbering symbol and the left edge 
of the text.UFI: fixed #i31282#
+Enter the width the 
numbering area. The numbering symbol can be left, center or right in this 
area.UFI: fixed #i31282#
 
 
 
   
   Minimum space between numbering and text.
-  Enter the minimum amount 
of space to leave between the right edge of the numbering symbol and the left 
edge of the text.
+  The alignment of the 
numbering symbol is adjusted to get the desired
+minimum space. If it is not possible because the numbering area is not wide
+enough, then the start of the text is adjusted.
   
 
-
+provides 
heading "Number Alignment
+Aligns 
the numbering symbol left, center, or right in the numbering area. The position 
might be adjusted to maintain the minimum space.
+provides 
note about "Number Alignment
 
- 
+
+
 
+provides 
Apply control help
+This control 
appears only when modifying Paragraph style.
 
 Position (List 
Styles)
 Paragraph 
alignment
___
Libreoffice-commits mailing list
libreoffice

[Libreoffice-commits] core.git: helpcontent2

2020-02-01 Thread Seth Chaiklin (via logerrit) 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2aca1384c818da3e6c465d76814247b5f3e74c11
Author: Seth Chaiklin 
AuthorDate: Sat Feb 1 12:34:11 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Feb 1 12:34:11 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 2c57fe6cecd214f27806487e863cce14a235773e
  - update access commands in Writer Tools-Update help pages

Change-Id: I3ef58f3c1e608165befaa620271f3238c6991310
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87743
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 34b4782c437a..2c57fe6cecd2 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 34b4782c437a2831d16c3e9d9f43f14b312d9784
+Subproject commit 2c57fe6cecd214f27806487e863cce14a235773e
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Seth Chaiklin (via logerrit) 
 source/text/swriter/00/0406.xhp |   14 +-
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit 2c57fe6cecd214f27806487e863cce14a235773e
Author: Seth Chaiklin 
AuthorDate: Thu Jan 30 15:48:33 2020 +0100
Commit: Seth Chaiklin 
CommitDate: Sat Feb 1 12:34:11 2020 +0100

update access commands in Writer Tools-Update help pages

Change-Id: I3ef58f3c1e608165befaa620271f3238c6991310
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87743
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/00/0406.xhp 
b/source/text/swriter/00/0406.xhp
index 748fd136e..4ee65eaed 100644
--- a/source/text/swriter/00/0406.xhp
+++ b/source/text/swriter/00/0406.xhp
@@ -27,7 +27,6 @@
 
 
 
-
 Tools 
Menu
 Choose Tools - Language - 
Hyphenation
 Choose Tools - Word Count
@@ -42,13 +41,12 @@
 
 
 Choose 
Tools - Calculate 
-Command 
-Ctrl + plus 
sign
+CommandCtrl
 + plus sign
 
 Choose Tools - Update
-Choose Tools - Update - Reformat 
Pages
+Choose Tools - Update - Page 
Formatting
 Choose Tools - Update - Current 
Index
-Choose Tools - Update - All Indexes and 
Tables
+Choose Tools - Update - Indexes and 
Tables
 Choose Tools - Update - Update All 

 
 
@@ -56,13 +54,12 @@
 F9 
key
 
 Choose Tools - Update - 
Links
-Choose Tools - Update - All 
Charts
+Choose Tools - Update - 
Charts
 
 
 Choose 
Tools - Mail Merge Wizard
 Click the 
Mail Merge icon on the Mail Merge bar:
 Click the 
Mail Merge icon on the Table Data bar:
-
 
   
 
@@ -73,8 +70,7 @@
 
   
 
-
 
-
 
+
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Seth Chaiklin (via logerrit) 
 source/text/swriter/01/04090005.xhp |4 ++--
 source/text/swriter/01/04090300.xhp |   23 +++
 2 files changed, 17 insertions(+), 10 deletions(-)

New commits:
commit 34b4782c437a2831d16c3e9d9f43f14b312d9784
Author: Seth Chaiklin 
AuthorDate: Fri Jan 31 19:44:33 2020 +0100
Commit: Seth Chaiklin 
CommitDate: Sat Feb 1 12:30:12 2020 +0100

updating help page for Edit Fields dialog in Writer

 - add labels and explanations for "Select", "Format",
   "Name", "Value", "Invisible" and "Apply"

Change-Id: If9628cefb15d41fa6d1ed9ce42b970dc56324268
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87781
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/swriter/01/04090005.xhp 
b/source/text/swriter/01/04090005.xhp
index be030b4a8..2060c11ed 100644
--- a/source/text/swriter/01/04090005.xhp
+++ b/source/text/swriter/01/04090005.xhp
@@ -128,7 +128,7 @@
 
 
 Selecton all tab pages this is called "Select", except for 
"Cross-References", which uses "Selection"
-Lists the available fields for the 
field type selected in the Type list. To insert a field, click the 
field, and then click Insert.
+Lists the 
available fields for the field type selected in the Type 
list. To insert a field, click the field, and then click 
Insert.
 To quickly insert a 
field from the Select list, hold down Command
 Ctrl and 
double-click the field.
 
@@ -151,7 +151,7 @@
 
 
 Invisible
-Hides the field contents in the 
document. The field is inserted as a thin gray mark in the document. 
This option is only available for the "Set Variable" and "User Field" field 
types.
+Hides 
the field contents in the document. The field is inserted as a thin 
gray mark in the document. This option is only available for the 
"Set Variable" and "User Field" field types.
 
 Chapter 
numbering
 Sets the 
options for resetting chapter numbers.
diff --git a/source/text/swriter/01/04090300.xhp 
b/source/text/swriter/01/04090300.xhp
index 8e6e5bde0..08fe8e6b1 100644
--- a/source/text/swriter/01/04090300.xhp
+++ b/source/text/swriter/01/04090300.xhp
@@ -11,7 +11,7 @@
 
 
 
-Edit fields
+Edit fields (variables)
 /text/swriter/01/04090300.xhp
 
 
@@ -27,20 +27,27 @@
 fields;editing
 edit;fields
 
-Edit Fields
-Edit field 
contents.
+Edit Fields 
(variables)
+Edit field 
contents.
 
 
 Choose Edit Fields of the context 
menu of the selected field.
 
-Type pane
-Shows the type of the selected field. The middle and right 
pane of the dialog contents depends on the field type. For a complete 
description of the fields see Fields page.
-Edit
-When visible, opens a dialog to edit the contents of the 
field. The dialog depends on the type of the field.
+Type
+Shows the type of the selected field.
+select 
heading
+explain 
select control
+Provides 
Format header and explanation
+invisible 
heading
+explain 
invisible control
+
+apply 
control
 Arrow buttons
 Use the arrow buttons to go to next or previous field of same 
type in the document.
+Edit
+When visible, opens a dialog to edit the contents of the 
field. The dialog depends on the type of the field.
 
-
+  
 
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2020-02-01 Thread Seth Chaiklin (via logerrit) 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c4ad09e5ce15b6e9002d0cc97a226fd105f3ff42
Author: Seth Chaiklin 
AuthorDate: Sat Feb 1 12:30:12 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Feb 1 12:30:12 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to 34b4782c437a2831d16c3e9d9f43f14b312d9784
  - updating help page for Edit Fields dialog in Writer

 - add labels and explanations for "Select", "Format",
   "Name", "Value", "Invisible" and "Apply"

Change-Id: If9628cefb15d41fa6d1ed9ce42b970dc56324268
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87781
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index f460f2970c3f..34b4782c437a 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit f460f2970c3f11ffc9b7246e0bde1d1f6a10347f
+Subproject commit 34b4782c437a2831d16c3e9d9f43f14b312d9784
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

2020-02-01 Thread Seth Chaiklin (via logerrit) 
 helpcontent2 |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 83945cfe64710a0e6a728a7f0e464f18de55f01f
Author: Seth Chaiklin 
AuthorDate: Sat Feb 1 12:17:59 2020 +0100
Commit: Gerrit Code Review 
CommitDate: Sat Feb 1 12:17:59 2020 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  to f460f2970c3f11ffc9b7246e0bde1d1f6a10347f
  - make new help page with keyboard shortcuts to embed in help pages

  - provides sys-specific variations for
  - (styles window) F11
  - (toggle "show field shading") Ctrl+F8
  - (toggle "show fields") Ctrl+F9
  - (manual page break) Crtl+Enter
  - (paste unformatted text) Ctrl+Alt+Shift+V

Change-Id: Ibee225d7654bf1898af7e6cb3009057a9e334efc
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87457
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/helpcontent2 b/helpcontent2
index 35281f4c9178..f460f2970c3f 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 35281f4c9178f373609a61f0a44e268b179c5749
+Subproject commit f460f2970c3f11ffc9b7246e0bde1d1f6a10347f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Seth Chaiklin (via logerrit) 
 source/text/shared/00/kbd_shortcuts.xhp |   76 
 1 file changed, 76 insertions(+)

New commits:
commit f460f2970c3f11ffc9b7246e0bde1d1f6a10347f
Author: Seth Chaiklin 
AuthorDate: Sun Jan 26 16:34:50 2020 +0100
Commit: Seth Chaiklin 
CommitDate: Sat Feb 1 12:17:59 2020 +0100

make new help page with keyboard shortcuts to embed in help pages

  - provides sys-specific variations for
  - (styles window) F11
  - (toggle "show field shading") Ctrl+F8
  - (toggle "show fields") Ctrl+F9
  - (manual page break) Crtl+Enter
  - (paste unformatted text) Ctrl+Alt+Shift+V

Change-Id: Ibee225d7654bf1898af7e6cb3009057a9e334efc
Reviewed-on: https://gerrit.libreoffice.org/c/help/+/87457
Tested-by: Jenkins
Reviewed-by: Seth Chaiklin 

diff --git a/source/text/shared/00/kbd_shortcuts.xhp 
b/source/text/shared/00/kbd_shortcuts.xhp
new file mode 100644
index 0..29bb9bf52
--- /dev/null
+++ b/source/text/shared/00/kbd_shortcuts.xhp
@@ -0,0 +1,76 @@
+
+
+
+
+
+  
+Keyboard Shortcuts
+/text/shared/00/kbd_shortcuts.xhp
+  
+
+
+Keyboard Shortcuts (to embed)
+
+
+  
+
+  Command+T
+  F11
+ 
+  
+
+
+
+  
+
+  Command+F8
+  Ctrl+F8
+ 
+  
+
+
+
+  
+
+  Command+F9
+  Ctrl+F9
+ 
+  
+
+
+
+  
+
+  Command+Enter
+  Ctrl+Enter
+ 
+  
+
+
+
+  
+
+  Option+Enter
+  Alt+Enter
+ 
+  
+
+
+
+  
+
+  Command+Option+Shift+V
+  Crtl+Alt+Shift+V
+ 
+  
+
+
+
+
\ No newline at end of file
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Caolán McNamara (via logerrit) 
 vcl/source/window/builder.cxx |   14 +++---
 1 file changed, 11 insertions(+), 3 deletions(-)

New commits:
commit 9b43115151f3f7a34377ad027450fd1afbb5f738
Author: Caolán McNamara 
AuthorDate: Fri Jan 31 17:49:56 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 1 12:12:56 2020 +0100

support arbitrary widgets in toolbars via children of GtkToolItem

Change-Id: I6dcc146ba3a55f263f71e29a17b5e75de2bbe130
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87784
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 400073bfda8a..154eaaccd974 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -1782,6 +1782,8 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 if (bIsPlaceHolder || name == "GtkTreeSelection")
 return nullptr;
 
+ToolBox *pToolBox = (pParent && pParent->GetType() == WindowType::TOOLBOX) 
? static_cast(pParent) : nullptr;
+
 extractButtonImage(id, rMap, name == "GtkRadioButton");
 
 VclPtr xWindow;
@@ -2316,9 +2318,8 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 return nullptr;
 }
 else if (name == "GtkToolButton" || name == "GtkMenuToolButton" ||
- name == "GtkToggleToolButton" || name == "GtkRadioToolButton")
+ name == "GtkToggleToolButton" || name == "GtkRadioToolButton" || 
name == "GtkToolItem")
 {
-ToolBox *pToolBox = dynamic_cast(pParent);
 if (pToolBox)
 {
 OUString aCommand(extractActionName(rMap));
@@ -2366,7 +2367,6 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 }
 else if (name == "GtkSeparatorToolItem")
 {
-ToolBox *pToolBox = dynamic_cast(pParent);
 if (pToolBox)
 {
 pToolBox->InsertSeparator();
@@ -2407,6 +2407,7 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 }
 }
 }
+
 SAL_INFO_IF(!xWindow, "vcl.layout", "probably need to implement " << name 
<< " or add a make" << name << " function");
 if (xWindow)
 {
@@ -2422,6 +2423,13 @@ VclPtr VclBuilder::makeObject(vcl::Window 
*pParent, const OString &
 xWindow->ImplGetWindowImpl()->mpBorderWindow.get() << ") with 
helpid " <<
 xWindow->GetHelpId());
 m_aChildren.emplace_back(id, xWindow, bVertical);
+
+// if the parent was a toolbox set it as an itemwindow for the latest 
itemid
+if (pToolBox)
+{
+pToolBox->SetItemWindow(m_pParserState->m_nLastToolbarId, xWindow);
+pToolBox->SetItemExpand(m_pParserState->m_nLastToolbarId, true);
+}
 }
 return xWindow;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/skia

2020-02-01 Thread Luboš Luňák (via logerrit) 
 external/skia/UnpackedTarball_skia.mk |1 -
 1 file changed, 1 deletion(-)

New commits:
commit fa1b12c4ce1963086c30bef222a5238485bb2219
Author: Luboš Luňák 
AuthorDate: Mon Jan 20 16:30:34 2020 +0100
Commit: Luboš Luňák 
CommitDate: Sat Feb 1 12:02:31 2020 +0100

remove outdated TODO from skia external

Change-Id: Ibe17072dd0c1f4b7f76d05a2dac0e2cbf1eb151d

diff --git a/external/skia/UnpackedTarball_skia.mk 
b/external/skia/UnpackedTarball_skia.mk
index 4d38ba89d783..33fcf05b6a81 100644
--- a/external/skia/UnpackedTarball_skia.mk
+++ b/external/skia/UnpackedTarball_skia.mk
@@ -11,7 +11,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,skia))
 
 $(eval $(call gb_UnpackedTarball_set_tarball,skia,$(SKIA_TARBALL)))
 
-# TODO
 skia_patches := \
 lerp.patch \
 fix-pch.patch.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-4' - sd/qa

2020-02-01 Thread Stephan Bergmann (via logerrit) 
 sd/qa/unit/import-tests.cxx |9 +
 1 file changed, 9 insertions(+)

New commits:
commit 56c78a4dda06fef2326ee57184363badcfb21fe6
Author: Stephan Bergmann 
AuthorDate: Tue Dec 17 08:24:39 2019 +0100
Commit: Caolán McNamara 
CommitDate: Sat Feb 1 11:54:09 2020 +0100

SdImportTest::testPDFImportShared fails for --disable-pdfium

...with

> Test name: SdImportTest::testPDFImportShared
> assertion failed
> - Expression: false
> - failed to load file:///.../sd/qa/unit/data/pdf/multipage.pdf

during CppunitTest_sd_import_tests, because vcl::ImportPDFUnloaded always
returns false then which gets propagated down to

> #0 in vcl::ImportPDFUnloaded(rtl::OUString const&, 
std::__debug::vector, 
std::allocator > >&, double) at 
vcl/source/filter/ipdf/pdfread.cxx:358
> #1 in SdPdfFilter::Import() at sd/source/filter/pdf/sdpdffilter.cxx:58
> #2 in sd::DrawDocShell::ConvertFrom(SfxMedium&) at 
sd/source/ui/docshell/docshel4.cxx:485
> #3 in SfxObjectShell::DoLoad(SfxMedium*) at 
sfx2/source/doc/objstor.cxx:768
> #4 in SdModelTestBase::loadURL(rtl::OUString const&, int, 
std::unique_ptr >) at 
sd/qa/unit/sdmodeltestbase.hxx:183
> #5 in SdImportTest::testPDFImportShared() at 
sd/qa/unit/import-tests.cxx:1218

(If the tests currently disabled with IMPORT_PDF_ELEMENTS were enabled, see 
the
mail thread starting at


"sd: disable pdf import tests", then they would work fine with 
--disable-pdfium
as I just checked, so they don't need to be covered by the new #if.)

(Found with 
.)

Change-Id: I96e83f478c344123af0c5bcd0b5a82af01b1b9da
Reviewed-on: https://gerrit.libreoffice.org/85259
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 
(cherry picked from commit ced9702c9fcba0c702f0b910c3f1f5dae69a4f5a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87796
Reviewed-by: Caolán McNamara 

diff --git a/sd/qa/unit/import-tests.cxx b/sd/qa/unit/import-tests.cxx
index 5f939f336551..57a8b83c9fff 100644
--- a/sd/qa/unit/import-tests.cxx
+++ b/sd/qa/unit/import-tests.cxx
@@ -7,6 +7,9 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
+#include 
+
+#include 
 #include 
 #include 
 #include 
@@ -146,7 +149,9 @@ public:
 void testBnc862510_6();
 void testBnc862510_7();
 #if ENABLE_PDFIMPORT
+#if HAVE_FEATURE_PDFIUM
 void testPDFImportShared();
+#endif
 #if defined(IMPORT_PDF_ELEMENTS)
 void testPDFImport();
 void testPDFImportSkipImages();
@@ -250,7 +255,9 @@ public:
 CPPUNIT_TEST(testBnc862510_6);
 CPPUNIT_TEST(testBnc862510_7);
 #if ENABLE_PDFIMPORT
+#if HAVE_FEATURE_PDFIUM
 CPPUNIT_TEST(testPDFImportShared);
+#endif
 #if defined(IMPORT_PDF_ELEMENTS)
 CPPUNIT_TEST(testPDFImport);
 CPPUNIT_TEST(testPDFImportSkipImages);
@@ -1240,6 +1247,7 @@ void SdImportTest::testBnc862510_7()
 
 #if ENABLE_PDFIMPORT
 
+#if HAVE_FEATURE_PDFIUM
 void SdImportTest::testPDFImportShared()
 {
 comphelper::LibreOfficeKit::setActive();
@@ -1296,6 +1304,7 @@ void SdImportTest::testPDFImportShared()
 xDocShRef->DoClose();
 comphelper::LibreOfficeKit::setActive(false);
 }
+#endif
 
 #if defined(IMPORT_PDF_ELEMENTS)
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: slideshow/Library_OGLTrans.mk

2020-02-01 Thread Caolán McNamara (via logerrit) 
 slideshow/Library_OGLTrans.mk |1 +
 1 file changed, 1 insertion(+)

New commits:
commit fb27784fcbd3383a7b2648714de19ae5f3818fa5
Author: Caolán McNamara 
AuthorDate: Fri Jan 31 21:45:11 2020 +
Commit: Caolán McNamara 
CommitDate: Sat Feb 1 11:06:13 2020 +0100

opengl slide transitions not working with glm >= GLM 0.9.9.0

tracked it down to...

Removed default initialization, use GLM_FORCE_CTOR_INIT to restore the old 
behavior
so adding in GLM_FORCE_CTOR_INIT to get them working again

Change-Id: I1c6e7d8eb748fce40f0c518ff708708e5fb1e3d2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87789
Tested-by: Jenkins
Reviewed-by: Caolán McNamara 

diff --git a/slideshow/Library_OGLTrans.mk b/slideshow/Library_OGLTrans.mk
index 4eca2a1ecaa3..9b64181d6a46 100644
--- a/slideshow/Library_OGLTrans.mk
+++ b/slideshow/Library_OGLTrans.mk
@@ -17,6 +17,7 @@ endif
 
 $(eval $(call gb_Library_add_defs,OGLTrans,\
 -DGLM_FORCE_RADIANS \
+-DGLM_FORCE_CTOR_INIT \
 ))
 
 $(eval $(call gb_Library_use_sdk_api,OGLTrans))
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Pelin Kuran (via logerrit) 
 vcl/source/bitmap/Octree.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 9465bc10db81d2a2d1e2a82dbaaefa02d2939db1
Author: Pelin Kuran 
AuthorDate: Tue Jan 28 11:50:52 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Feb 1 10:50:18 2020 +0100

tdf#114441: Convert use of sal_uLong to better integer types

Change-Id: I74a81434438c89538ece8438983dd639831ac4b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87584
Reviewed-by: Muhammet Kara 
Tested-by: Muhammet Kara 

diff --git a/vcl/source/bitmap/Octree.cxx b/vcl/source/bitmap/Octree.cxx
index e89b1d8c9404..fce531d4966b 100644
--- a/vcl/source/bitmap/Octree.cxx
+++ b/vcl/source/bitmap/Octree.cxx
@@ -140,7 +140,7 @@ void Octree::reduce()
 pNode = mpReduce[nIndex];
 mpReduce[nIndex] = pNode->pNext;
 
-for (sal_uLong i = 0; i < 8; i++)
+for (unsigned int i = 0; i < 8; i++)
 {
 if (pNode->pChild[i])
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Canberk TURAN (via logerrit) 
 xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx |4 
+--
 xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx |   11 
+-
 2 files changed, 4 insertions(+), 11 deletions(-)

New commits:
commit a2c9b446243c153653537227da4731ebc945fb73
Author: Canberk TURAN 
AuthorDate: Mon Jan 27 11:01:25 2020 +0300
Commit: Muhammet Kara 
CommitDate: Sat Feb 1 10:20:28 2020 +0100

tdf#54938: Adapt supportsService implementations to cppu::supportsService

Change-Id: I82fa5528c879f288822fe9795d7d7da19f0abbee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87485
Tested-by: Jenkins
Reviewed-by: Muhammet Kara 

diff --git a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx 
b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
index 586a8f70c7a1..de6cf54cd206 100644
--- a/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
+++ b/xmlsecurity/source/framework/xmlsignaturetemplateimpl.cxx
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star::uno ;
 using ::com::sun::star::lang::XMultiServiceFactory ;
@@ -97,8 +98,7 @@ OUString SAL_CALL 
XMLSignatureTemplateImpl::getImplementationName() {
 
 /* XServiceInfo */
 sal_Bool SAL_CALL XMLSignatureTemplateImpl::supportsService( const OUString& 
serviceName) {
-Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
-return comphelper::findValue(seqServiceNames, serviceName) != -1;
+return cppu::supportsService(this, serviceName);
 }
 
 /* XServiceInfo */
diff --git 
a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx 
b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
index e1e7b8d12760..d296d885e0f3 100644
--- a/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
+++ b/xmlsecurity/source/xmlsec/mscrypt/securityenvironment_mscryptimpl.cxx
@@ -34,7 +34,7 @@
 #include "x509certificate_mscryptimpl.hxx"
 #include 
 #include 
-
+#include 
 #include 
 #include "akmngr.hxx"
 
@@ -164,15 +164,8 @@ OUString SAL_CALL 
SecurityEnvironment_MSCryptImpl::getImplementationName() {
 
 /* XServiceInfo */
 sal_Bool SAL_CALL SecurityEnvironment_MSCryptImpl::supportsService( const 
OUString& serviceName) {
-uno::Sequence< OUString > seqServiceNames = getSupportedServiceNames() ;
-const OUString* pArray = seqServiceNames.getConstArray() ;
-for( sal_Int32 i = 0 ; i < seqServiceNames.getLength() ; i ++ ) {
-if( *( pArray + i ) == serviceName )
-return true ;
-}
-return false ;
+return cppu::supportsService(this, serviceName);
 }
-
 /* XServiceInfo */
 uno::Sequence< OUString > SAL_CALL 
SecurityEnvironment_MSCryptImpl::getSupportedServiceNames() {
 uno::Sequence seqServiceNames { 
"com.sun.star.xml.crypto.SecurityEnvironment" };
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

Re: build error : 'f__faststorefence': is not a member of 'GrGLInterface::Functions'

2020-02-01 Thread himajin100000 

On 2020-02-01 15:48, Kaganski Mike wrote:

On 2020-02-01 8:58, himajin10 wrote:

I'm getting the following error. how should I fix this error?(and why
doesn't Jenkis fail?)

C:/build/workdir/UnpackedTarball/skia/src/gpu/gl/GrGLGpu.cpp(3771):
error C2039: 'f__faststorefence': is not a member of
'GrGLInterface::Functions'
C:\build\workdir\UnpackedTarball\skia\include/gp/gl/GrGLInterface.h(74):
note: see declaration of 'GrGLInterface::Functions'


https://gerrit.libreoffice.org/c/core/+/87780



Thanks, I'll try rebasing and building.
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] online.git: android/lib

2020-02-01 Thread Jan Holesovsky (via logerrit) 
 android/lib/build.gradle |5 +
 1 file changed, 5 insertions(+)

New commits:
commit 02815066c8864cb8a167af104594925a59aa3a88
Author: Jan Holesovsky 
AuthorDate: Fri Jan 31 21:36:12 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Sat Feb 1 09:31:26 2020 +0100

android: Add the liblangtag data to the APK.

Without this, the app crashes with exotic locales.

Change-Id: Ia0e4ffe6e8ed512c2a0402819b84d9563d17b0f6
Reviewed-on: https://gerrit.libreoffice.org/c/online/+/87786
Reviewed-by: Michael Meeks 
Tested-by: Jan Holesovsky 

diff --git a/android/lib/build.gradle b/android/lib/build.gradle
index 6523ca683..3352febb6 100644
--- a/android/lib/build.gradle
+++ b/android/lib/build.gradle
@@ -118,6 +118,11 @@ task copyUnpackAssets(type: Copy) {
 )
 }
 }
+into('share') {
+from "${liboInstdir}/share"
+// liblangtag data is needed for locales like en-CH
+includes = ['liblangtag/**']
+}
 }
 
 task copyAssets(type: Copy) {
___
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' - i18nlangtag/source

2020-02-01 Thread Jan Holesovsky (via logerrit) 
 i18nlangtag/source/languagetag/languagetag.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 312a7d8173c2fe35c3c635f4046df8433abb68ad
Author: Jan Holesovsky 
AuthorDate: Fri Jan 31 21:35:30 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Sat Feb 1 09:29:11 2020 +0100

android: Set the correct path for the liblangtag data.

Change-Id: I8b8bf76f086812c5f995c6ef513f0b7f773475ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87785
Tested-by: Jenkins CollaboraOffice 
Reviewed-by: Jan Holesovsky 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index ef34402d02de..1dd6981bd0fc 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -30,6 +30,10 @@
 #endif
 #include 
 
+#ifdef ANDROID
+#include 
+#endif
+
 using namespace com::sun::star;
 
 
@@ -197,6 +201,9 @@ void LiblangtagDataRef::teardown()
 
 void LiblangtagDataRef::setupDataPath()
 {
+#if defined(ANDROID)
+maDataPath = OString(lo_get_app_data_dir()) + "/share/liblangtag";
+#else
 // maDataPath is assumed to be empty here.
 OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/liblangtag");
 rtl::Bootstrap::expandMacros(aURL); //TODO: detect failure
@@ -212,6 +219,7 @@ void LiblangtagDataRef::setupDataPath()
 if (osl::FileBase::getSystemPathFromFileURL( aURL, aPath) == 
osl::FileBase::E_None)
 maDataPath = OUStringToOString( aPath, RTL_TEXTENCODING_UTF8);
 }
+#endif
 if (maDataPath.isEmpty())
 maDataPath = "|";   // assume system
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Jan Holesovsky (via logerrit) 
 i18nlangtag/source/languagetag/languagetag.cxx |8 
 1 file changed, 8 insertions(+)

New commits:
commit 322f31dcf5c07025cf96b3de3fb1f258acce27c7
Author: Jan Holesovsky 
AuthorDate: Fri Jan 31 21:35:30 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Sat Feb 1 09:26:59 2020 +0100

android: Set the correct path for the liblangtag data.

Change-Id: I8b8bf76f086812c5f995c6ef513f0b7f773475ba
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87787
Tested-by: Jenkins
Reviewed-by: Jan Holesovsky 

diff --git a/i18nlangtag/source/languagetag/languagetag.cxx 
b/i18nlangtag/source/languagetag/languagetag.cxx
index 36b4a1eddb96..403981a30768 100644
--- a/i18nlangtag/source/languagetag/languagetag.cxx
+++ b/i18nlangtag/source/languagetag/languagetag.cxx
@@ -31,6 +31,10 @@
 #endif
 #include 
 
+#ifdef ANDROID
+#include 
+#endif
+
 using namespace com::sun::star;
 
 namespace {
@@ -198,6 +202,9 @@ void LiblangtagDataRef::teardown()
 
 void LiblangtagDataRef::setupDataPath()
 {
+#if defined(ANDROID)
+maDataPath = OString(lo_get_app_data_dir()) + "/share/liblangtag";
+#else
 // maDataPath is assumed to be empty here.
 OUString aURL("$BRAND_BASE_DIR/" LIBO_SHARE_FOLDER "/liblangtag");
 rtl::Bootstrap::expandMacros(aURL); //TODO: detect failure
@@ -212,6 +219,7 @@ void LiblangtagDataRef::setupDataPath()
 if (osl::FileBase::getSystemPathFromFileURL( aURL, aPath) == 
osl::FileBase::E_None)
 maDataPath = OUStringToOString( aPath, RTL_TEXTENCODING_UTF8);
 }
+#endif
 if (maDataPath.isEmpty())
 maDataPath = "|";   // assume system
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-01 Thread Jan Holesovsky (via logerrit) 
 sd/inc/strings.hrc|4 
 sd/source/core/sdpage.cxx |   33 +
 2 files changed, 21 insertions(+), 16 deletions(-)

New commits:
commit 74e46a9f2e55a1e918e03efe269abcb93cc1a10d
Author: Jan Holesovsky 
AuthorDate: Wed Jan 29 10:51:49 2020 +0100
Commit: Jan Holesovsky 
CommitDate: Sat Feb 1 09:25:40 2020 +0100

android lok: Correct the hint in the slides from click to double-tap.

Change-Id: I71744dc48f50115c9b4245ac2c81a6431ecbdce6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87678
Reviewed-by: Jan Holesovsky 
Tested-by: Jenkins

diff --git a/sd/inc/strings.hrc b/sd/inc/strings.hrc
index 3d1d90273395..0f188c5b1227 100644
--- a/sd/inc/strings.hrc
+++ b/sd/inc/strings.hrc
@@ -304,6 +304,10 @@
 #define STR_PRESOBJ_OUTLINE 
NC_("STR_PRESOBJ_OUTLINE", "Click to add Text" )
 #define STR_PRESOBJ_TEXT
NC_("STR_PRESOBJ_TEXT", "Click to add Text" )
 #define STR_PRESOBJ_NOTESTEXT   
NC_("STR_PRESOBJ_NOTESTEXT", "Click to add Notes" )
+#define STR_PRESOBJ_TITLE_MOBILE
NC_("STR_PRESOBJ_TITLE_MOBILE", "Double-tap to add Title" )
+#define STR_PRESOBJ_OUTLINE_MOBILE  
NC_("STR_PRESOBJ_OUTLINE_MOBILE", "Double-tap to add Text" )
+#define STR_PRESOBJ_TEXT_MOBILE 
NC_("STR_PRESOBJ_TEXT_MOBILE", "Double-tap to add Text" )
+#define STR_PRESOBJ_NOTESTEXT_MOBILE
NC_("STR_PRESOBJ_NOTESTEXT_MOBILE", "Double-tap to add Notes" )
 #define STR_PRESOBJ_GRAPHIC 
NC_("STR_PRESOBJ_GRAPHIC", "Double-click to add an Image" )
 #define STR_PRESOBJ_OBJECT  
NC_("STR_PRESOBJ_OBJECT", "Double-click to add an Object" )
 #define STR_PRESOBJ_CHART   
NC_("STR_PRESOBJ_CHART", "Double-click to add a Chart" )
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index 5ce948618f18..ab91aec1d9d2 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -21,6 +21,7 @@
 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -35,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -2611,36 +2613,35 @@ OUString SdPage::GetPresObjText(PresObjKind eObjKind) 
const
 aString = SdResId( STR_PRESOBJ_MPNOTESTITLE );
 }
 }
+else if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+aString = SdResId(STR_PRESOBJ_TITLE_MOBILE);
 else
-{
-aString = SdResId( STR_PRESOBJ_TITLE );
-}
+aString = SdResId(STR_PRESOBJ_TITLE);
 }
 else if (eObjKind == PRESOBJ_OUTLINE)
 {
 if (mbMaster)
-{
-aString = SdResId( STR_PRESOBJ_MPOUTLINE );
-}
+aString = SdResId(STR_PRESOBJ_MPOUTLINE);
+else if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+aString = SdResId(STR_PRESOBJ_OUTLINE_MOBILE);
 else
-{
-aString = SdResId( STR_PRESOBJ_OUTLINE );
-}
+aString = SdResId(STR_PRESOBJ_OUTLINE);
 }
 else if (eObjKind == PRESOBJ_NOTES)
 {
 if (mbMaster)
-{
-aString = SdResId( STR_PRESOBJ_MPNOTESTEXT );
-}
+aString = SdResId(STR_PRESOBJ_MPNOTESTEXT);
+else if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+aString = SdResId(STR_PRESOBJ_NOTESTEXT_MOBILE);
 else
-{
-aString = SdResId( STR_PRESOBJ_NOTESTEXT );
-}
+aString = SdResId(STR_PRESOBJ_NOTESTEXT);
 }
 else if (eObjKind == PRESOBJ_TEXT)
 {
-aString = SdResId( STR_PRESOBJ_TEXT );
+if (comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView()))
+aString = SdResId(STR_PRESOBJ_TEXT_MOBILE);
+else
+aString = SdResId(STR_PRESOBJ_TEXT);
 }
 else if (eObjKind == PRESOBJ_GRAPHIC)
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits