remove followed by a push_back of same var (SwSpellDialogChildWindow)

[julien2412]

Hello,

I noticed these lines:
737 if(pCurrentTextObj)
738 {
739 m_pSpellState->m_aTextObjects.remove(pCurrentTextObj);
740
m_pSpellState->m_aTextObjects.push_back(pCurrentTextObj);
741 }
See
https://opengrok.libreoffice.org/xref/core/sw/source/uibase/dialog/SwSpellDialogChildWindow.cxx#737

Is it a special trick so some other vars are notified or just a plain error?


Looking at the git history, it comes from a cleaning refactoring with
 de60fd06b84bc1aa080ef209b0eeb36914bd8b32 in 2010-12-17

Any thoughts?

Julien



--
Sent from: 
http://document-foundation-mail-archive.969070.n3.nabble.com/Dev-f1639786.html
___
LibreOffice mailing list
LibreOffice@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice

[Libreoffice-commits] core.git: 2 commits - canvas/source compilerplugins/clang cui/source

[Libreoffice Gerrit user]

 canvas/source/cairo/cairo_canvashelper.hxx  |5 ---
 compilerplugins/clang/unusedenumconstants.untouched.results |   16 
 cui/source/dialogs/hldoctp.cxx  |8 +++---
 cui/source/inc/hldoctp.hxx  |4 ---
 4 files changed, 5 insertions(+), 28 deletions(-)

New commits:
commit c756f32851e8a0b7eb9c0fee9991f154c758a95c
Author: Noel Grandin 
AuthorDate: Thu Nov 22 11:15:04 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 24 07:06:20 2018 +0100

drop unused ColorType in canvas

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

diff --git a/canvas/source/cairo/cairo_canvashelper.hxx 
b/canvas/source/cairo/cairo_canvashelper.hxx
index 3e14b672df40..0ee7b1011552 100644
--- a/canvas/source/cairo/cairo_canvashelper.hxx
+++ b/canvas/source/cairo/cairo_canvashelper.hxx
@@ -211,11 +211,6 @@ namespace cairocanvas
 
 css::rendering::IntegerBitmapLayout getMemoryLayout();
 
-enum ColorType
-{
-LINE_COLOR, FILL_COLOR, TEXT_COLOR, IGNORE_COLOR
-};
-
 void doPolyPolygonPath( const css::uno::Reference< 
css::rendering::XPolyPolygon2D >& xPolyPolygon,
 Operation aOperation,
 bool bNoLineJoin = false,
diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index cfec89df35b9..2910a535304b 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -1,11 +1,3 @@
-canvas/source/cairo/cairo_canvashelper.hxx:216
-enum cairocanvas::CanvasHelper::ColorType IGNORE_COLOR
-canvas/source/cairo/cairo_canvashelper.hxx:216
-enum cairocanvas::CanvasHelper::ColorType TEXT_COLOR
-canvas/source/cairo/cairo_canvashelper.hxx:216
-enum cairocanvas::CanvasHelper::ColorType LINE_COLOR
-canvas/source/cairo/cairo_canvashelper.hxx:216
-enum cairocanvas::CanvasHelper::ColorType FILL_COLOR
 drawinglayer/source/tools/emfpbrush.hxx:32
 enum emfplushelper::EmfPlusHatchStyle HatchStyleVertical
 drawinglayer/source/tools/emfpbrush.hxx:33
commit 0e585562d7ae706c52c6d872690904012e79b3b6
Author: Noel Grandin 
AuthorDate: Thu Nov 22 11:14:16 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 24 07:06:11 2018 +0100

convert EPathType to scoped enum

and drop unused values

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index 2639cbe180bb..cfec89df35b9 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -6,14 +6,6 @@ canvas/source/cairo/cairo_canvashelper.hxx:216
 enum cairocanvas::CanvasHelper::ColorType LINE_COLOR
 canvas/source/cairo/cairo_canvashelper.hxx:216
 enum cairocanvas::CanvasHelper::ColorType FILL_COLOR
-cui/source/inc/hldoctp.hxx:54
-enum SvxHyperlinkDocTp::EPathType Type_Unknown
-cui/source/inc/hldoctp.hxx:55
-enum SvxHyperlinkDocTp::EPathType Type_File
-cui/source/inc/hldoctp.hxx:56
-enum SvxHyperlinkDocTp::EPathType Type_ExistsDir
-cui/source/inc/hldoctp.hxx:56
-enum SvxHyperlinkDocTp::EPathType Type_Dir
 drawinglayer/source/tools/emfpbrush.hxx:32
 enum emfplushelper::EmfPlusHatchStyle HatchStyleVertical
 drawinglayer/source/tools/emfpbrush.hxx:33
diff --git a/cui/source/dialogs/hldoctp.cxx b/cui/source/dialogs/hldoctp.cxx
index e0dc67de6695..9c3033b693c7 100644
--- a/cui/source/dialogs/hldoctp.cxx
+++ b/cui/source/dialogs/hldoctp.cxx
@@ -233,7 +233,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickFileopenHdl_Impl, 
Button*, void)
 
 IMPL_LINK_NOARG(SvxHyperlinkDocTp, ClickTargetHdl_Impl, Button*, void)
 {
-if ( GetPathType ( maStrURL ) == Type_ExistsFile  ||
+if ( GetPathType ( maStrURL ) == EPathType::ExistsFile  ||
  maStrURL.isEmpty() ||
  maStrURL.equalsIgnoreAsciiCase( sFileScheme ) ||
  maStrURL.startsWith( sHash ) )
@@ -279,7 +279,7 @@ IMPL_LINK_NOARG(SvxHyperlinkDocTp, ModifiedPathHdl_Impl, 
Edit&, void)
 
 IMPL_LINK_NOARG(SvxHyperlinkDocTp, TimeoutHdl_Impl, Timer *, void)
 {
-if ( IsMarkWndVisible() && ( GetPathType( maStrURL )==Type_ExistsFile ||
+if ( IsMarkWndVisible() && ( GetPathType( maStrURL )== 
EPathType::ExistsFile ||
   maStrURL.isEmpty() ||
   maStrURL.equalsIgnoreAsciiCase( sFileScheme 
) ) )
 {
@@ -347,9 +347,9 @@ SvxHyperlinkDocTp::EPathType SvxHyperlinkDocTp::GetPathType 
( const OUString& rS
 INetURLObject

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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.readonly.results |2 --
 xmloff/source/forms/propertyexport.cxx |4 ++--
 xmloff/source/forms/propertyexport.hxx |1 -
 3 files changed, 2 insertions(+), 5 deletions(-)

New commits:
commit 82cc30a832dde298832d9f029e0ead94a9d2d14b
Author: Noel Grandin 
AuthorDate: Thu Nov 22 12:43:59 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 24 07:06:31 2018 +0100

BoolAttrFlags::DefaultMask is unnecessary

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

diff --git a/compilerplugins/clang/unusedenumconstants.readonly.results 
b/compilerplugins/clang/unusedenumconstants.readonly.results
index cae51737565f..f92ea5feb9c0 100644
--- a/compilerplugins/clang/unusedenumconstants.readonly.results
+++ b/compilerplugins/clang/unusedenumconstants.readonly.results
@@ -1542,5 +1542,3 @@ writerfilter/source/ooxml/OOXMLFactory.hxx:57
 enum writerfilter::ooxml::ResourceType HpsMeasure
 writerfilter/source/ooxml/OOXMLFactory.hxx:58
 enum writerfilter::ooxml::ResourceType MeasurementOrPercent
-xmloff/source/forms/propertyexport.hxx:38
-enum BoolAttrFlags DefaultMask
diff --git a/xmloff/source/forms/propertyexport.cxx 
b/xmloff/source/forms/propertyexport.cxx
index 73b49f19400c..7ebe2fe1d896 100644
--- a/xmloff/source/forms/propertyexport.cxx
+++ b/xmloff/source/forms/propertyexport.cxx
@@ -267,8 +267,8 @@ namespace xmloff
 // no check of the property value type: this method is allowed to be 
called with any integer properties
 // (e.g. sal_Int32, sal_uInt16 etc)
 
-bool bDefault = (BoolAttrFlags::DefaultTrue == 
(BoolAttrFlags::DefaultMask & _nBooleanAttributeFlags));
-bool bDefaultVoid = (BoolAttrFlags::DefaultVoid == 
(BoolAttrFlags::DefaultMask & _nBooleanAttributeFlags));
+bool bDefault(BoolAttrFlags::DefaultTrue & _nBooleanAttributeFlags);
+bool bDefaultVoid(BoolAttrFlags::DefaultVoid & 
_nBooleanAttributeFlags);
 
 // get the value
 bool bCurrentValue = bDefault;
diff --git a/xmloff/source/forms/propertyexport.hxx 
b/xmloff/source/forms/propertyexport.hxx
index 2d940bf392df..6cd35a2ba4e4 100644
--- a/xmloff/source/forms/propertyexport.hxx
+++ b/xmloff/source/forms/propertyexport.hxx
@@ -35,7 +35,6 @@ enum class BoolAttrFlags {
 DefaultFalse  = 0x00,
 DefaultTrue   = 0x01,
 DefaultVoid   = 0x02,
-DefaultMask   = 0x03,
 InverseSemantics  = 0x04,
 };
 namespace o3tl {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |4 
 dbaccess/source/core/api/query.cxx  |6 +++---
 dbaccess/source/core/api/query.hxx  |6 +++---
 dbaccess/source/core/api/querycontainer.cxx |6 +++---
 dbaccess/source/core/inc/querycontainer.hxx |6 +++---
 5 files changed, 12 insertions(+), 16 deletions(-)

New commits:
commit c9d4adb3cf08376ca1b5c7cef88340e294ca168f
Author: Noel Grandin 
AuthorDate: Thu Nov 22 11:11:41 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 24 07:05:49 2018 +0100

convert AGGREGATE_ACTION to scoped enum

and rename, and drop unused values

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index 11c0bae17d1f..2639cbe180bb 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -14,10 +14,6 @@ cui/source/inc/hldoctp.hxx:56
 enum SvxHyperlinkDocTp::EPathType Type_ExistsDir
 cui/source/inc/hldoctp.hxx:56
 enum SvxHyperlinkDocTp::EPathType Type_Dir
-dbaccess/source/core/api/query.hxx:66
-enum dbaccess::OQuery::AGGREGATE_ACTION FLUSHING
-dbaccess/source/core/inc/querycontainer.hxx:72
-enum dbaccess::OQueryContainer::AGGREGATE_ACTION FLUSHING
 drawinglayer/source/tools/emfpbrush.hxx:32
 enum emfplushelper::EmfPlusHatchStyle HatchStyleVertical
 drawinglayer/source/tools/emfpbrush.hxx:33
diff --git a/dbaccess/source/core/api/query.cxx 
b/dbaccess/source/core/api/query.cxx
index 5ffdde485357..bb15f191e67e 100644
--- a/dbaccess/source/core/api/query.cxx
+++ b/dbaccess/source/core/api/query.cxx
@@ -74,7 +74,7 @@ OQuery::OQuery( const Reference< XPropertySet >& 
_rxCommandDefinition
 ,m_xCommandDefinition(_rxCommandDefinition)
 ,m_xConnection(_rxConn)
 ,m_pWarnings( nullptr )
-,m_eDoingCurrently(NONE)
+,m_eDoingCurrently(AggregateAction::NONE)
 {
 registerProperties();
 ODataSettings::registerPropertiesFor(this);
@@ -220,7 +220,7 @@ void SAL_CALL OQuery::propertyChange( const 
PropertyChangeEvent& _rSource )
 OSL_ENSURE(_rSource.Source.get() == Reference< XInterface 
>(m_xCommandDefinition, UNO_QUERY).get(),
 "OQuery::propertyChange : where did this call come from ?");
 
-if (m_eDoingCurrently == SETTING_PROPERTIES)
+if (m_eDoingCurrently == AggregateAction::SettingProperties)
 // we're setting the property ourself, so we will do the necessary 
notifications later
 return;
 
@@ -284,7 +284,7 @@ void OQuery::setFastPropertyValue_NoBroadcast( sal_Int32 
_nHandle, const Any& _r
 m_xCommandPropInfo->hasPropertyByName(sAggPropName))
 {   // the base class holds the property values itself, but we have to 
forward this to our CommandDefinition
 
-m_eDoingCurrently = SETTING_PROPERTIES;
+m_eDoingCurrently = AggregateAction::SettingProperties;
 OAutoActionReset aAutoReset(*this);
 m_xCommandDefinition->setPropertyValue(sAggPropName, _rValue);
 
diff --git a/dbaccess/source/core/api/query.hxx 
b/dbaccess/source/core/api/query.hxx
index fc0f499d0bb6..7a7b8c2fcd9f 100644
--- a/dbaccess/source/core/api/query.hxx
+++ b/dbaccess/source/core/api/query.hxx
@@ -63,8 +63,8 @@ protected:
 ::dbtools::WarningsContainer* m_pWarnings;
 
 // possible actions on our "aggregate"
-enum AGGREGATE_ACTION { NONE, SETTING_PROPERTIES, FLUSHING };
-AGGREGATE_ACTIONm_eDoingCurrently;
+enum class AggregateAction { NONE, SettingProperties };
+AggregateActionm_eDoingCurrently;
 
 /** a class which automatically resets m_eDoingCurrently in its destructor
 */
@@ -75,7 +75,7 @@ protected:
 OQuery& m_rActor;
 public:
 explicit OAutoActionReset(OQuery& _rActor) : m_rActor(_rActor) { }
-~OAutoActionReset() { m_rActor.m_eDoingCurrently = NONE; }
+~OAutoActionReset() { m_rActor.m_eDoingCurrently = 
AggregateAction::NONE; }
 };
 
 protected:
diff --git a/dbaccess/source/core/api/querycontainer.cxx 
b/dbaccess/source/core/api/querycontainer.cxx
index edf1237070c7..a9536a4e789b 100644
--- a/dbaccess/source/core/api/querycontainer.cxx
+++ b/dbaccess/source/core/api/querycontainer.cxx
@@ -67,7 +67,7 @@ OQueryContainer::OQueryContainer(
 ,m_pWarnings( _pWarnings )
 ,m_xCommandDefinitions(_rxCommandDefinitions)
 ,m_xConnection(_rxConn)
-,m_eDoingCurrently(NONE)
+,m_eDoingCurrently(AggregateAction::NONE)
 {
 }
 
@@ -180,7 +180,7 @@ void SAL_CALL OQueryContainer::appendByDescriptor( const 
Reference< XPropertySet
 
 // insert the basic object into the definition container
 {
- 

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang filter/source include/canvas

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |   34 
 filter/source/graphicfilter/idxf/dxf2mtf.hxx|4 -
 filter/source/graphicfilter/ipict/ipict.cxx |2 
 filter/source/msfilter/eschesdo.hxx |2 
 include/canvas/spriteredrawmanager.hxx  |2 
 5 files changed, 2 insertions(+), 42 deletions(-)

New commits:
commit f359f87d5f56c0d5905a8852cebe8b95bd47d9f3
Author: Noel Grandin 
AuthorDate: Thu Nov 22 11:04:36 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 24 07:05:39 2018 +0100

remove some unused enums in filter

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index 6daa7bc07636..11c0bae17d1f 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -100,38 +100,6 @@ drawinglayer/source/tools/emfpbrush.hxx:83
 enum emfplushelper::EmfPlusHatchStyle HatchStyleSolidDiamond
 drawinglayer/source/tools/emfpimage.hxx:31
 emfplushelper::ImageDataType ImageDataTypeUnknown
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:28
-enum BrushStyle BRUSH_NULL
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:28
-enum BrushStyle BRUSH_HORZ
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:28
-enum BrushStyle BRUSH_VERT
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:28
-enum BrushStyle BRUSH_SOLID
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:29
-enum BrushStyle BRUSH_CROSS
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:29
-enum BrushStyle BRUSH_DIAGCROSS
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:29
-enum BrushStyle BRUSH_DOWNDIAG
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:29
-enum BrushStyle BRUSH_UPDIAG
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:30
-enum BrushStyle BRUSH_75
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:30
-enum BrushStyle BRUSH_25
-filter/source/graphicfilter/idxf/dxf2mtf.hxx:30
-enum BrushStyle BRUSH_50
-filter/source/graphicfilter/ipict/ipict.cxx:71
-enum PictReaderInternal::Pattern::BrushStyle BRUSH_NULL
-filter/source/msfilter/eschesdo.hxx:29
-enum ImplEESdrPageType NORMAL
-filter/source/msfilter/eschesdo.hxx:29
-enum ImplEESdrPageType UNDEFINED
-filter/source/msfilter/eschesdo.hxx:29
-enum ImplEESdrPageType NOTICE
-filter/source/msfilter/eschesdo.hxx:29
-enum ImplEESdrPageType MASTER
 include/connectivity/dbtools.hxx:822
 enum connectivity::dbase::DBFType dBaseIVMemo
 include/desktop/exithelper.h:25
diff --git a/filter/source/graphicfilter/idxf/dxf2mtf.hxx 
b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
index ba5cc3ac84c5..e510c3e16789 100644
--- a/filter/source/graphicfilter/idxf/dxf2mtf.hxx
+++ b/filter/source/graphicfilter/idxf/dxf2mtf.hxx
@@ -25,10 +25,6 @@
 #include 
 
 enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
-  BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG,
-  BRUSH_25, BRUSH_50, BRUSH_75 };
-
 
 class DXF2GDIMetaFile {
 private:
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx 
b/filter/source/graphicfilter/ipict/ipict.cxx
index afe4236071be..5f88c398e975 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -68,7 +68,7 @@ namespace PictReaderInternal {
 bool isDefault() const { return !isRead; }
 
 enum PenStyle { PEN_NULL, PEN_SOLID, PEN_DOT, PEN_DASH, PEN_DASHDOT };
-enum BrushStyle { BRUSH_NULL, BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
+enum BrushStyle { BRUSH_SOLID, BRUSH_HORZ, BRUSH_VERT,
   BRUSH_CROSS, BRUSH_DIAGCROSS, BRUSH_UPDIAG, BRUSH_DOWNDIAG,
   BRUSH_25, BRUSH_50, BRUSH_75 };
 // Data
diff --git a/filter/source/msfilter/eschesdo.hxx 
b/filter/source/msfilter/eschesdo.hxx
index 537e78aa5761..4602a320b557 100644
--- a/filter/source/msfilter/eschesdo.hxx
+++ b/filter/source/msfilter/eschesdo.hxx
@@ -26,8 +26,6 @@
 
 // fractions of Draw PPTWriter etc.
 
-enum ImplEESdrPageType { NORMAL = 0, MASTER = 1, NOTICE = 2, UNDEFINED = 3 };
-
 class ImplEESdrWriter;
 class SdrObject;
 class SdrPage;
commit cfb09a460d236861c88380cbf6d5ebbf5c84cf71
Author: Noel Grandin 
AuthorDate: Thu Nov 22 11:01:26 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 24 07:05:29 2018 +0100

remove unused SpriteChangeRecord::ChangeType::none

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumcons

[Libreoffice-commits] core.git: 2 commits - compilerplugins/clang include/desktop include/editeng

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |6 --
 include/desktop/exithelper.h|2 --
 include/editeng/editdata.hxx|2 +-
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit a78118a94efb8a13be368f73fae3f567a2d2e1e4
Author: Noel Grandin 
AuthorDate: Thu Nov 22 10:59:28 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 24 07:05:03 2018 +0100

remove unused EXITHELPER_SECOND_OFFICE

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index 2bdb2a97c26f..eee40dba2f0a 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -140,10 +140,6 @@ include/desktop/exithelper.h:25
 enum EExitCodes EXITHELPER_NO_ERROR
 include/desktop/exithelper.h:25
 int EXITHELPER_NO_ERROR
-include/desktop/exithelper.h:27
-int EXITHELPER_SECOND_OFFICE
-include/desktop/exithelper.h:27
-enum EExitCodes EXITHELPER_SECOND_OFFICE
 include/desktop/exithelper.h:29
 int EXITHELPER_FATAL_ERROR
 include/editeng/borderline.hxx:128
diff --git a/include/desktop/exithelper.h b/include/desktop/exithelper.h
index 76942393a4c8..4b81c68b895c 100644
--- a/include/desktop/exithelper.h
+++ b/include/desktop/exithelper.h
@@ -23,8 +23,6 @@
 enum EExitCodes {
 /* e.g. used to force showing of the command line help */
 EXITHELPER_NO_ERROR = 0,
-/* pipe was detected - second office must terminate itself */
-EXITHELPER_SECOND_OFFICE = 1,
 /* an uno exception was caught during startup */
 EXITHELPER_FATAL_ERROR = 77,
 /* user force automatic restart after crash */
commit 3ff1f462ea4b277b367048e52a068d877fe01c97
Author: Noel Grandin 
AuthorDate: Thu Nov 22 10:48:32 2018 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 24 07:04:53 2018 +0100

remove unused EESpellState::LanguageNotInstalled

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index 5504738812fe..2bdb2a97c26f 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -148,8 +148,6 @@ include/desktop/exithelper.h:29
 int EXITHELPER_FATAL_ERROR
 include/editeng/borderline.hxx:128
 enum SvxBorderLineStyle BORDER_LINE_STYLE_MAX
-include/editeng/editdata.hxx:41
-enum EESpellState LanguageNotInstalled
 include/i18nutil/transliteration.hxx:45
 enum TransliterationFlags NumToTextLower_zh_CN
 include/i18nutil/transliteration.hxx:47
diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 0b2e464ca015..d0517d1dc413 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -38,7 +38,7 @@ enum class EEHorizontalTextDirection { Default, L2R, R2L };
 enum class EESelectionMode  { Std, Hidden };
 // EESelectionMode::Hidden can be used to completely hide the selection. 
This is useful e.g. when you want show the selection
 // only as long as your window (which the edit view works on) has the focus
-enum class EESpellState  { Ok, LanguageNotInstalled, NoSpeller, ErrorFound };
+enum class EESpellState  { Ok, NoSpeller, ErrorFound };
 enum class EEAnchorMode {
 TopLeft, TopHCenter, TopRight,
 VCenterLeft, VCenterHCenter, VCenterRight,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 basegfx/source/polygon/b2dpolypolygoncutter.cxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit ecb962ed5441d4e48e39fd0746a672b620202176
Author: Andrea Gelmini 
AuthorDate: Fri Nov 23 22:12:50 2018 +0100
Commit: Julien Nabet 
CommitDate: Sat Nov 24 06:28:44 2018 +0100

Fix typo

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

diff --git a/basegfx/source/polygon/b2dpolypolygoncutter.cxx 
b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
index d80c670fe04f..1388a10f360e 100644
--- a/basegfx/source/polygon/b2dpolypolygoncutter.cxx
+++ b/basegfx/source/polygon/b2dpolypolygoncutter.cxx
@@ -142,7 +142,7 @@ namespace basegfx
 // with border.
 if(rVecA.cross(rVecB) > 0.0)
 {
-// b is left turn seen from a, test if Test is left of 
both and so inside (left is seeen as inside)
+// b is left turn seen from a, test if Test is left of 
both and so inside (left is seen as inside)
 const bool bBoolA(fTools::moreOrEqual(rVecA.cross(rTest), 
0.0));
 const bool bBoolB(fTools::lessOrEqual(rVecB.cross(rTest), 
0.0));
 
@@ -150,7 +150,7 @@ namespace basegfx
 }
 else
 {
-// b is right turn seen from a, test if Test is right of 
both and so outside (left is seeen as inside)
+// b is right turn seen from a, test if Test is right of 
both and so outside (left is seen as inside)
 const bool bBoolA(fTools::lessOrEqual(rVecA.cross(rTest), 
0.0));
 const bool bBoolB(fTools::moreOrEqual(rVecB.cross(rTest), 
0.0));
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: config_host.mk.in configure.ac solenv/gbuild

[Libreoffice Gerrit user]

 config_host.mk.in|1 -
 configure.ac |1 -
 solenv/gbuild/platform/macosx.mk |4 
 3 files changed, 6 deletions(-)

New commits:
commit 70970f8b72eddc66693ec28d26c2dc764009d3e3
Author: Stephan Bergmann 
AuthorDate: Fri Nov 23 18:38:30 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 23 23:38:14 2018 +0100

Revert "Do use -O1 for Apple Clang older than 9.1.0"

This reverts commit 55b9706bea5aa9b654ab39bc7d56339422e17087, which is 
obsoleted
by b4f666f2e677b05cab8395fe7972b45b15f60c3f "Bump Xcode baseline to 9.3".

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

diff --git a/config_host.mk.in b/config_host.mk.in
index 9ed3802ad761..a095f430464b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -62,7 +62,6 @@ export CDR_LIBS=$(gb_SPACE)@CDR_LIBS@
 @x_CFLAGS@ export CFLAGS=@CFLAGS@
 export CLANGDIR=@CLANGDIR@
 export CLANGLIBDIR=@CLANGLIBDIR@
-export CLANGVER=@CLANGVER@
 export CLUCENE_CFLAGS=$(gb_SPACE)@CLUCENE_CFLAGS@
 export CLUCENE_LIBS=$(gb_SPACE)@CLUCENE_LIBS@
 export LIBCMIS_CFLAGS=$(gb_SPACE)@LIBCMIS_CFLAGS@
diff --git a/configure.ac b/configure.ac
index cddfd825e4a3..ea2229e3324d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3667,7 +3667,6 @@ if test "$COM_IS_CLANG" = TRUE; then
 AC_DEFINE_UNQUOTED(CLANG_FULL_VERSION,$CLANG_FULL_VERSION)
 fi
 AC_SUBST(COM_IS_CLANG)
-AC_SUBST(CLANGVER)
 
 SHOWINCLUDES_PREFIX=
 if test "$_os" = WINNT; then
diff --git a/solenv/gbuild/platform/macosx.mk b/solenv/gbuild/platform/macosx.mk
index b8f5335fca7f..d51ce5887956 100644
--- a/solenv/gbuild/platform/macosx.mk
+++ b/solenv/gbuild/platform/macosx.mk
@@ -19,10 +19,6 @@
 
 gb_SDKDIR := $(MACOSX_SDK_PATH)
 
-ifeq (PRE_9_1_0,$(shell test $(CLANGVER) -lt 90100 && echo PRE_9_1_0))
-gb_COMPILEROPTFLAGS := -O1
-endif
-
 include $(GBUILDDIR)/platform/com_GCC_defs.mk
 
 # Darwin mktemp -t expects a prefix, not a pattern
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 basctl/source/dlged/dlgedview.cxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7668e3df2da8883c80b49ac9ce2a3122c3c27d61
Author: Andrea Gelmini 
AuthorDate: Thu Nov 22 18:22:00 2018 +0100
Commit: Julien Nabet 
CommitDate: Fri Nov 23 22:31:42 2018 +0100

Fix typo

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

diff --git a/basctl/source/dlged/dlgedview.cxx 
b/basctl/source/dlged/dlgedview.cxx
index b1a2603abb30..e8c28ea017df 100644
--- a/basctl/source/dlged/dlgedview.cxx
+++ b/basctl/source/dlged/dlgedview.cxx
@@ -177,7 +177,7 @@ SdrObject* DlgEdView::CheckSingleSdrObjectHit(const Point& 
rPnt, sal_uInt16 nTol
 
 if(pRetval)
 {
-// check hitted object locally
+// check hit object locally
 pRetval = impLocalHitCorrection(pRetval, rPnt, nTol);
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/ui/notebookbar.ui |  482 ++--
 1 file changed, 241 insertions(+), 241 deletions(-)

New commits:
commit f6b3a8e308d923ff5a034ae277c0fee0c3d8370f
Author: andreas kainz 
AuthorDate: Fri Nov 23 00:25:33 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Nov 23 22:23:02 2018 +0100

add keyboard navigation to tabbed draw

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

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index 0239202d9deb..33dd28c5d95e 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -2005,7 +2005,7 @@
 
   
 True
-False
+True
 end
 True
 icons
@@ -2032,7 +2032,7 @@
 
   
 True
-False
+True
 end
 True
 icons
@@ -2075,7 +2075,7 @@
   
 _File
 True
-False
+True
 False
 False
 center
@@ -2094,7 +2094,7 @@
   
 _Help
 True
-False
+True
 False
 False
 center
@@ -2157,7 +2157,7 @@
 
   
 True
-False
+True
 center
 5
 True
@@ -2191,7 +2191,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2216,7 +2216,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2276,7 +2276,7 @@
 
   
 True
-False
+True
 center
 True
 both
@@ -2310,7 +2310,7 @@
 
   
 True
-False
+True
 False
 False
 .uno:RecentFileList
@@ -2326,7 +2326,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2386,7 +2386,7 @@
 
   
 True
-False
+True
 center
 True
 both
@@ -2420,7 +2420,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2445,7 +2445,7 @@
 
   
 True
-False
+True
 both-horiz
 False
 
@@ -2508,7 +2508,7 @@
 
   
 True
-False
+True
 center
 True
 both
@@ -2542,7 +2542,7 @@

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

[Libreoffice Gerrit user]

 sd/uiconfig/sdraw/ui/notebookbar.ui|2 +-
 sd/uiconfig/simpress/ui/notebookbar.ui |2 +-
 sw/uiconfig/swriter/ui/notebookbar.ui  |   28 ++--
 3 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 953f8c7b53f159a702ee68ad970e58709696d66a
Author: andreas kainz 
AuthorDate: Thu Nov 22 23:43:43 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Nov 23 22:22:08 2018 +0100

tdf#121401 add can_focus to tabbs

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

diff --git a/sd/uiconfig/sdraw/ui/notebookbar.ui 
b/sd/uiconfig/sdraw/ui/notebookbar.ui
index fcc38d94417b..0239202d9deb 100644
--- a/sd/uiconfig/sdraw/ui/notebookbar.ui
+++ b/sd/uiconfig/sdraw/ui/notebookbar.ui
@@ -1980,7 +1980,7 @@
 
   
 True
-False
+True
 True
 
   
diff --git a/sd/uiconfig/simpress/ui/notebookbar.ui 
b/sd/uiconfig/simpress/ui/notebookbar.ui
index 0a6ca3bfc998..a9e6f7e171c7 100644
--- a/sd/uiconfig/simpress/ui/notebookbar.ui
+++ b/sd/uiconfig/simpress/ui/notebookbar.ui
@@ -2134,7 +2134,7 @@
 
   
 True
-False
+True
 True
 
   
diff --git a/sw/uiconfig/swriter/ui/notebookbar.ui 
b/sw/uiconfig/swriter/ui/notebookbar.ui
index ac3b50f4d4fe..62cbe6516834 100644
--- a/sw/uiconfig/swriter/ui/notebookbar.ui
+++ b/sw/uiconfig/swriter/ui/notebookbar.ui
@@ -1836,7 +1836,7 @@
 
   
 True
-False
+True
 True
 
   
@@ -2716,7 +2716,7 @@
 
   
 True
-False
+True
 ~File
 True
   
@@ -4226,7 +4226,7 @@
 
   
 True
-False
+True
 ~Home
 True
 

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

[Libreoffice Gerrit user]

 include/vcl/builder.hxx   |4 ++--
 vcl/source/app/salvtables.cxx |   17 ++---
 vcl/source/window/builder.cxx |   21 +++--
 3 files changed, 23 insertions(+), 19 deletions(-)

New commits:
commit 88ecd04a2b5d4a500fccf5c4e4dcd6e4094870f1
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 14:56:54 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 21:32:12 2018 +0100

SvHeaderTabListBox a11y assumes it has a HeaderBar and fails if not

so only use it if there is a existing HeaderBar

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

diff --git a/include/vcl/builder.hxx b/include/vcl/builder.hxx
index a1a47b9f7047..5fdb061f7b1e 100644
--- a/include/vcl/builder.hxx
+++ b/include/vcl/builder.hxx
@@ -38,7 +38,7 @@ class PopupMenu;
 class SalInstanceBuilder;
 class ScreenshotTest;
 class ScrollBar;
-class SvHeaderTabListBox;
+class SvTabListBox;
 class Slider;
 class DateField;
 class TimeField;
@@ -220,7 +220,7 @@ private:
 const ListStore* get_model_by_name(const OString& sID) const;
 void mungeModel(ListBox &rTarget, const ListStore &rStore, sal_uInt16 
nActiveId);
 void mungeModel(ComboBox &rTarget, const ListStore &rStore, sal_uInt16 
nActiveId);
-void mungeModel(SvHeaderTabListBox &rTarget, const ListStore &rStore, 
sal_uInt16 nActiveId);
+void mungeModel(SvTabListBox &rTarget, const ListStore &rStore, 
sal_uInt16 nActiveId);
 
 typedef stringmap TextBuffer;
 const TextBuffer* get_buffer_by_name(const OString& sID) const;
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 513717687e99..389a0b03c572 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -1765,7 +1765,7 @@ class SalInstanceTreeView : public SalInstanceContainer, 
public virtual weld::Tr
 private:
 // owner for UserData
 std::vector> m_aUserData;
-VclPtr m_xTreeView;
+VclPtr m_xTreeView;
 
 DECL_LINK(SelectHdl, SvTreeListBox*, void);
 DECL_LINK(DoubleClickHdl, SvTreeListBox*, bool);
@@ -1773,7 +1773,7 @@ private:
 DECL_LINK(EndDragHdl, HeaderBar*, void);
 
 public:
-SalInstanceTreeView(SvHeaderTabListBox* pTreeView, bool bTakeOwnership)
+SalInstanceTreeView(SvTabListBox* pTreeView, bool bTakeOwnership)
 : SalInstanceContainer(pTreeView, bTakeOwnership)
 , m_xTreeView(pTreeView)
 {
@@ -1783,7 +1783,8 @@ public:
 m_xTreeView->SetExpandingHdl(LINK(this, SalInstanceTreeView, 
ExpandingHdl));
 const long aTabPositions[] = { 0 };
 m_xTreeView->SetTabs(SAL_N_ELEMENTS(aTabPositions), aTabPositions);
-if (HeaderBar* pHeaderBar = m_xTreeView->GetHeaderBar())
+SvHeaderTabListBox* pHeaderBox = 
dynamic_cast(m_xTreeView.get());
+if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : 
nullptr)
 {
 //make the last entry fill available space
 
pHeaderBar->SetItemSize(pHeaderBar->GetItemId(pHeaderBar->GetItemCount() - 1 ), 
HEADERBAR_FULLSIZE);
@@ -1797,7 +1798,8 @@ public:
 aTabPositions.push_back(0);
 aTabPositions.insert(aTabPositions.end(), rWidths.begin(), 
rWidths.end());
 m_xTreeView->SetTabs(aTabPositions.size(), aTabPositions.data(), 
MapUnit::MapPixel);
-if (HeaderBar* pHeaderBar = m_xTreeView->GetHeaderBar())
+SvHeaderTabListBox* pHeaderBox = 
dynamic_cast(m_xTreeView.get());
+if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : 
nullptr)
 {
 for (size_t i = 0; i < rWidths.size(); ++i)
 pHeaderBar->SetItemSize(pHeaderBar->GetItemId(i), rWidths[i]);
@@ -2172,14 +2174,15 @@ public:
 m_xTreeView->SetStyle(m_xTreeView->GetStyle() | WB_SORT);
 }
 
-SvHeaderTabListBox& getTreeView()
+SvTabListBox& getTreeView()
 {
 return *m_xTreeView;
 }
 
 virtual ~SalInstanceTreeView() override
 {
-if (HeaderBar* pHeaderBar = m_xTreeView->GetHeaderBar())
+SvHeaderTabListBox* pHeaderBox = 
dynamic_cast(m_xTreeView.get());
+if (HeaderBar* pHeaderBar = pHeaderBox ? pHeaderBox->GetHeaderBar() : 
nullptr)
 {
 pHeaderBar->SetEndDragHdl(Link());
 }
@@ -3318,7 +3321,7 @@ public:
 
 virtual std::unique_ptr weld_tree_view(const OString &id, 
bool bTakeOwnership) override
 {
-SvHeaderTabListBox* pTreeView = 
m_xBuilder->get(id);
+SvTabListBox* pTreeView = m_xBuilder->get(id);
 return pTreeView ? o3tl::make_unique(pTreeView, 
bTakeOwnership) : nullptr;
 }
 
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index a97608b1873f..30981b107533 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -519,7 +519,7 @@ VclBuilder::VclBuilder(vcl::Windo

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

[Libreoffice Gerrit user]

 cui/source/customize/cfgutil.cxx |  779 ++-
 cui/source/customize/macropg.cxx |   11 
 cui/source/inc/cfgutil.hxx   |   93 
 cui/source/inc/headertablistbox.hxx  |   16 
 cui/source/inc/macroass.hxx  |   14 
 cui/source/tabpages/macroass.cxx |  272 +---
 cui/uiconfig/ui/eventassignpage.ui   |  191 +---
 include/sfx2/sfxhelp.hxx |3 
 include/vcl/builder.hxx  |4 
 include/vcl/help.hxx |3 
 include/vcl/weld.hxx |3 
 sfx2/source/appl/sfxhelp.cxx |   43 +
 sfx2/source/dialog/filedlghelper.cxx |2 
 vcl/source/app/help.cxx  |5 
 vcl/source/app/salvtables.cxx|   43 +
 vcl/source/treelist/treelistbox.cxx  |4 
 vcl/source/window/builder.cxx|   23 -
 vcl/source/window/menu.cxx   |4 
 vcl/unx/gtk/salprn-gtk.cxx   |2 
 vcl/unx/gtk3/gtk3gtkinst.cxx |   31 +
 20 files changed, 1284 insertions(+), 262 deletions(-)

New commits:
commit f27bfc190d4105b9d057980a5e6f0eac07f88aba
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:14:32 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 21:28:16 2018 +0100

weld SfxMacroTabPage

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

diff --git a/cui/source/customize/cfgutil.cxx b/cui/source/customize/cfgutil.cxx
index 828205e31f93..d0900c2ccbab 100644
--- a/cui/source/customize/cfgutil.cxx
+++ b/cui/source/customize/cfgutil.cxx
@@ -330,7 +330,7 @@ OUString SfxConfigFunctionListBox::GetHelpText( bool 
bConsiderParent )
 if (bConsiderParent)
 return Application::GetHelp()->GetHelpText( 
pData->sCommand, this );
 else
-return Application::GetHelp()->GetHelpText( 
pData->sCommand, nullptr );
+return Application::GetHelp()->GetHelpText( 
pData->sCommand, static_cast(nullptr) );
 }
 else if ( pData->nKind == SfxCfgKind::FUNCTION_SCRIPT )
 {
@@ -365,6 +365,108 @@ OUString SfxConfigFunctionListBox::GetCurLabel()
 return pData->sCommand;
 }
 
+CuiConfigFunctionListBox::CuiConfigFunctionListBox(std::unique_ptr
 xTreeView)
+: m_xTreeView(std::move(xTreeView))
+{
+m_xTreeView->make_sorted();
+}
+
+CuiConfigFunctionListBox::~CuiConfigFunctionListBox()
+{
+ClearAll();
+}
+
+void CuiConfigFunctionListBox::ClearAll()
+/*  Description
+Deletes all entries in the FunctionListBox, all UserData and all
+possibly existing MacroInfo.
+*/
+{
+sal_uInt16 nCount = aArr.size();
+for ( sal_uInt16 i=0; inKind == SfxCfgKind::FUNCTION_SCRIPT )
+{
+OUString* pScriptURI = static_cast(pData->pObject);
+delete pScriptURI;
+}
+
+if ( pData->nKind == SfxCfgKind::GROUP_SCRIPTCONTAINER )
+{
+XInterface* xi = static_cast(pData->pObject);
+if (xi != nullptr)
+{
+xi->release();
+}
+}
+}
+
+aArr.clear();
+m_xTreeView->clear();
+}
+
+OUString CuiConfigFunctionListBox::GetSelectedScriptURI()
+{
+int nSelected = m_xTreeView->get_selected_index();
+if (nSelected != -1)
+{
+SfxGroupInfo_Impl *pData = 
reinterpret_cast(m_xTreeView->get_id(nSelected).toInt64());
+if (pData && pData->nKind == SfxCfgKind::FUNCTION_SCRIPT)
+return *static_cast(pData->pObject);
+}
+return OUString();
+}
+
+OUString CuiConfigFunctionListBox::GetHelpText( bool bConsiderParent )
+{
+int nSelected = m_xTreeView->get_selected_index();
+if (nSelected != -1)
+{
+SfxGroupInfo_Impl *pData = 
reinterpret_cast(m_xTreeView->get_id(nSelected).toInt64());
+if ( pData )
+{
+if ( pData->nKind == SfxCfgKind::FUNCTION_SLOT )
+{
+if (bConsiderParent)
+return 
Application::GetHelp()->GetHelpText(pData->sCommand, m_xTreeView.get());
+else
+return 
Application::GetHelp()->GetHelpText(pData->sCommand, 
static_cast(nullptr));
+}
+else if ( pData->nKind == SfxCfgKind::FUNCTION_SCRIPT )
+{
+return pData->sHelpText;
+}
+}
+}
+return OUString();
+}
+
+OUString CuiConfigFunctionListBox::GetCurCommand()
+{
+int nSelected = m_xTreeView->get_selected_index();
+if (nSelected == -1)
+return OUString();
+SfxGroupInfo_Impl *pData = 
reinterpret_cast(m_xTreeView->get_id(nSelected).toInt64());
+if (!pData)
+return OUString();
+return pData->sCommand;
+}
+
+OUString CuiConfigFunctionListBox::GetCurLabel()
+{
+int nSelected = m_xTreeView->get_selected_index();
+if (nSelected == -1)
+return OUSt

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

[Libreoffice Gerrit user]

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

New commits:
commit 10c6c35220c0c6e2c0aa7cdf146bff564da95eb7
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:23:34 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 21:27:47 2018 +0100

Resolves: tdf#121644 clear pointer to customlines when customlines cleared

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

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index c6e336e0231b..9631fac4358a 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1588,7 +1588,7 @@ bool CustomPropertiesWindow::IsLineValid( 
CustomPropertyLine* pLine ) const
 
 void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool 
bIsFromTypeBox )
 {
-if ( !IsLineValid( pLine ) )
+if (pLine && !IsLineValid(pLine))
 {
 if ( bIsFromTypeBox ) // LoseFocus of TypeBox
 pLine->m_bTypeLostFocus = true;
@@ -1714,6 +1714,7 @@ bool CustomPropertiesWindow::AreAllLinesValid() const
 void CustomPropertiesWindow::ClearAllLines()
 {
 m_aCustomPropertiesLines.clear();
+m_pCurrentLine = nullptr;
 m_aCustomProperties.clear();
 m_nScrollPos = 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang formula/source include/formula sc/source

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |2 -
 compilerplugins/clang/unusedenumconstants.writeonly.results |2 -
 formula/source/ui/dlg/formula.cxx   |   14 ++--
 include/formula/formdata.hxx|8 --
 include/formula/formula.hxx |2 -
 sc/source/ui/formdlg/formula.cxx|4 +--
 6 files changed, 16 insertions(+), 16 deletions(-)

New commits:
commit 9c0c5bc5ba01f1a07abe918730675dd3c7497bb7
Author: Noel Grandin 
AuthorDate: Thu Nov 22 09:38:40 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 23 20:31:42 2018 +0100

convert FormulaDlgMode to scoped enum

and drop unused ARGS value

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index 76fb5a7d19e2..5504738812fe 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -150,8 +150,6 @@ include/editeng/borderline.hxx:128
 enum SvxBorderLineStyle BORDER_LINE_STYLE_MAX
 include/editeng/editdata.hxx:41
 enum EESpellState LanguageNotInstalled
-include/formula/formula.hxx:52
-enum formula::FormulaDlgMode FORMULA_FORMDLG_ARGS
 include/i18nutil/transliteration.hxx:45
 enum TransliterationFlags NumToTextLower_zh_CN
 include/i18nutil/transliteration.hxx:47
diff --git a/compilerplugins/clang/unusedenumconstants.writeonly.results 
b/compilerplugins/clang/unusedenumconstants.writeonly.results
index 77ba253369ff..a117857554ae 100644
--- a/compilerplugins/clang/unusedenumconstants.writeonly.results
+++ b/compilerplugins/clang/unusedenumconstants.writeonly.results
@@ -1535,7 +1535,7 @@ include/editeng/svxrtf.hxx:223
 include/filter/msfilter/msdffimp.hxx:377
 enum DffSeekToContentMode SEEK_FROM_CURRENT
 include/formula/formula.hxx:52
-enum formula::FormulaDlgMode FORMULA_FORMDLG_EDIT
+enum formula::FormulaDlgMode FormulaDlgMode::Edit
 include/formula/tokenarray.hxx:60
 enum ScRecalcMode ONLOAD_MUST
 include/formula/tokenarray.hxx:62
diff --git a/formula/source/ui/dlg/formula.cxx 
b/formula/source/ui/dlg/formula.cxx
index 55135ebc11cf..b5469edc0081 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -368,9 +368,9 @@ void FormulaDlg_Impl::StoreFormEditData(FormEditData* pData)
 pData->SetSelection(m_pMEdit->GetSelection());
 
 if (m_pTabCtrl->GetCurPageId() == TP_FUNCTION)
-pData->SetMode( sal_uInt16(FORMULA_FORMDLG_FORMULA) );
+pData->SetMode( FormulaDlgMode::Formula );
 else
-pData->SetMode( sal_uInt16(FORMULA_FORMDLG_EDIT) );
+pData->SetMode( FormulaDlgMode::Edit );
 pData->SetUndoStr(m_pMEdit->GetText());
 pData->SetMatrixFlag(m_pBtnMatrix->IsChecked());
 }
@@ -1309,7 +1309,7 @@ IMPL_LINK( FormulaDlg_Impl, FxHdl, ParaWin&, rPtr, void )
 sal_Int32 n1 = m_aFormulaHelper.GetArgStart( aFormula, nFormulaStrPos, 
nEdFocus + pData->GetOffset() );
 
 pData->SaveValues();
-pData->SetMode( sal_uInt16(FORMULA_FORMDLG_FORMULA) );
+pData->SetMode( FormulaDlgMode::Formula );
 pData->SetFStart( n1 );
 pData->SetUndoStr( aUndoStr );
 ClearAllParas();
@@ -1582,7 +1582,7 @@ void FormulaDlg_Impl::Update()
 UpdateTokenArray(sExpression);
 FormulaCursorHdl(*m_pMEFormula);
 CalcStruct(sExpression);
-if (pData->GetMode() == FORMULA_FORMDLG_FORMULA)
+if (pData->GetMode() == FormulaDlgMode::Formula)
 m_pTabCtrl->SetCurPageId(TP_FUNCTION);
 else
 m_pTabCtrl->SetCurPageId(TP_STRUCT);
@@ -1606,7 +1606,7 @@ void FormulaDlg_Impl::SetMeText(const OUString& _sText)
 
 FormulaDlgMode FormulaDlg_Impl::SetMeText( const OUString& _sText, sal_Int32 
PrivStart, sal_Int32 PrivEnd, bool bMatrix, bool _bSelect, bool _bUpdate)
 {
-FormulaDlgMode eMode = FORMULA_FORMDLG_FORMULA;
+FormulaDlgMode eMode = FormulaDlgMode::Formula;
 if (!m_bEditFlag)
 m_pMEdit->SetText(_sText);
 
@@ -1617,7 +1617,7 @@ FormulaDlgMode FormulaDlg_Impl::SetMeText( const 
OUString& _sText, sal_Int32 Pri
 m_pMEFormula->UpdateOldSel();
 m_pMEdit->Invalidate();
 m_pHelper->showReference(m_pMEdit->GetSelected());
-eMode = FORMULA_FORMDLG_EDIT;
+eMode = FormulaDlgMode::Edit;
 
 m_pBtnMatrix->Check( bMatrix );
 } // if ( _bUpdate )
@@ -1951,7 +1951,7 @@ void FormEditData::SaveValues()
 
 void FormEditData::Reset()
 {
-nMode = 0;
+nMode = FormulaDlgMode::Formula;
 nFStart = 0;
 nOffset = 0;
 bMatrix = false;
diff --git a/include/formula/formdata.hxx b/include/formula/formdata.hxx
index 1188a

[Libreoffice-commits] core.git: compilerplugins/clang include/svx include/vcl l10ntools/inc linguistic/source reportdesign/source

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |   60 
 include/svx/nbdtmg.hxx  |5 -
 include/svx/xenum.hxx   |1 
 include/vcl/pdfwriter.hxx   |7 -
 include/vcl/vclenum.hxx |6 -
 l10ntools/inc/export.hxx|   11 --
 linguistic/source/defs.hxx  |2 
 reportdesign/source/ui/inc/ReportDefines.hxx|2 
 8 files changed, 1 insertion(+), 93 deletions(-)

New commits:
commit 49b1107b6ea81c32628a52202ffbbcd44b042e38
Author: Noel Grandin 
AuthorDate: Thu Nov 22 08:57:37 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 23 20:31:22 2018 +0100

remove unused enums in reportdesign,linguistic,l10ntools,vcl,svx

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index e038f28ec873..76fb5a7d19e2 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -178,14 +178,6 @@ include/oox/ole/axfontdata.hxx:40
 enum AxFontFlags AutoColor
 include/oox/ppt/animationspersist.hxx:43
 enum oox::ppt::(anonymous at 
/home/noel/libo2/include/oox/ppt/animationspersist.hxx:36:5) NP_ENDSYNC
-include/svx/nbdtmg.hxx:40
-enum svx::sidebar::NBType Bullets
-include/svx/nbdtmg.hxx:40
-enum svx::sidebar::NBType GraphicBullets
-include/svx/xenum.hxx:27
-enum XBitmapType Import
-include/svx/xenum.hxx:27
-enum XBitmapType N8x8
 include/unotools/eventcfg.hxx:29
 enum GlobalEventId STARTAPP
 include/unotools/eventcfg.hxx:30
@@ -222,64 +214,12 @@ include/vcl/keycod.hxx:33
 enum KeyFuncType PROPERTIES
 include/vcl/keycod.hxx:33
 enum KeyFuncType FINDBACKWARD
-include/vcl/pdfwriter.hxx:201
-enum vcl::PDFWriter::WidgetState Up
-include/vcl/pdfwriter.hxx:201
-enum vcl::PDFWriter::WidgetState Down
 include/vcl/syswin.hxx:54
 enum WindowStateState FullScreen
-include/vcl/vclenum.hxx:191
-enum FontAutoHint DontKnow
-include/vcl/vclenum.hxx:191
-enum FontAutoHint Yes
-include/vcl/vclenum.hxx:191
-enum FontAutoHint No
-include/vcl/vclenum.hxx:193
-enum FontHinting DontKnow
-include/vcl/vclenum.hxx:193
-enum FontHinting No
-include/vcl/vclenum.hxx:193
-enum FontHinting Yes
-include/vcl/vclenum.hxx:195
-enum FontHintStyle Slight
-include/vcl/vclenum.hxx:195
-enum FontHintStyle Medium
-include/vcl/vclenum.hxx:195
-enum FontHintStyle Full
-l10ntools/inc/export.hxx:63
-enum IdLevel Identifier
-l10ntools/inc/export.hxx:63
-enum IdLevel Null
-l10ntools/inc/export.hxx:63
-enum IdLevel Text
-l10ntools/inc/export.hxx:85
-enum ExportListType Filter
-l10ntools/inc/export.hxx:85
-enum ExportListType String
-l10ntools/inc/export.hxx:85
-enum ExportListType Item
-l10ntools/inc/export.hxx:85
-enum ExportListType Paired
-l10ntools/inc/export.hxx:89
-enum StringType QuickHelpText
-l10ntools/inc/export.hxx:89
-enum StringType Text
-l10ntools/inc/export.hxx:89
-enum StringType Title
 libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:61
 enum (anonymous at 
/home/noel/libo2/libreofficekit/qa/gtktiledviewer/gtv-lok-dialog.cxx:59:1) 
PROP_0
 libreofficekit/source/gtk/lokdocview.cxx:287
 enum (anonymous at 
/home/noel/libo2/libreofficekit/source/gtk/lokdocview.cxx:285:1) PROP_0
-linguistic/source/defs.hxx:85
-enum LinguDispatcher::DspType DSP_GRAMMAR
-linguistic/source/defs.hxx:85
-enum LinguDispatcher::DspType DSP_THES
-linguistic/source/defs.hxx:85
-enum LinguDispatcher::DspType DSP_HYPH
-linguistic/source/defs.hxx:85
-enum LinguDispatcher::DspType DSP_SPELL
-reportdesign/source/ui/inc/ReportDefines.hxx:24
-enum rptui::DlgEdMode Test
 sc/source/filter/excel/xiescher.cxx:460
 enum (anonymous at 
/home/noel/libo2/sc/source/filter/excel/xiescher.cxx:460:17) eCreateFromOffice
 sc/source/filter/inc/decl.h:24
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index 9379d1da9282..f6d085902db5 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -35,11 +35,6 @@ enum class NBOType
 Bullets = 1, Numbering, Outline
 };
 
-enum class NBType
-{
-Bullets = 1, GraphicBullets
-};
-
 class  SVX_DLLPUBLIC NumSettings_Impl
 {
 public:
diff --git a/include/svx/xenum.hxx b/include/svx/xenum.hxx
index c17551586f28..f3620bdfa194 100644
--- a/include/svx/xenum.hxx
+++ b/include/svx/xenum.hxx
@@ -24,7 +24,6 @@
 enum class XFormTextStyle   { Rotate, Upright, SlantX, SlantY, NONE };
 enum class XFormTextAdjust  { Left, Right, AutoSize, Center };
 enum class XFormTextShadow  { NONE, Normal, Slant };
-enum c

[Libreoffice-commits] online.git: Branch 'distro/collabora/collabora-online-3' - loleaflet/po

[Libreoffice Gerrit user]

 loleaflet/po/ui-pt_BR.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 81dae22cac5bab622ec9b2be91d35a65c46b8191
Author: Andras Timar 
AuthorDate: Fri Nov 23 20:16:08 2018 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 23 20:19:01 2018 +0100

loleaflet: Updated pt-BR translation

Change-Id: Ia4cc7588ffe4a79908e2ffe91a848384a19e1426
Reviewed-on: https://gerrit.libreoffice.org/63900
Reviewed-by: Andras Timar 
Tested-by: Andras Timar 
(cherry picked from commit f3e0aa25a6b7c8f6481f7301c0fa50750dab8bd4)
Reviewed-on: https://gerrit.libreoffice.org/63901

diff --git a/loleaflet/po/ui-pt_BR.po b/loleaflet/po/ui-pt_BR.po
index 766764b04..e556d2de7 100644
--- a/loleaflet/po/ui-pt_BR.po
+++ b/loleaflet/po/ui-pt_BR.po
@@ -834,4 +834,4 @@ msgstr "Carregando..."
 
 #: src/map/handler/Map.WOPI.js:250
 msgid "Creating copy..."
-msgstr ""
+msgstr "Criar cópia..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/po/ui-pt_BR.po |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f3e0aa25a6b7c8f6481f7301c0fa50750dab8bd4
Author: Andras Timar 
AuthorDate: Fri Nov 23 20:16:08 2018 +0100
Commit: Andras Timar 
CommitDate: Fri Nov 23 20:17:44 2018 +0100

loleaflet: Updated pt-BR translation

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

diff --git a/loleaflet/po/ui-pt_BR.po b/loleaflet/po/ui-pt_BR.po
index 766764b04..e556d2de7 100644
--- a/loleaflet/po/ui-pt_BR.po
+++ b/loleaflet/po/ui-pt_BR.po
@@ -834,4 +834,4 @@ msgstr "Carregando..."
 
 #: src/map/handler/Map.WOPI.js:250
 msgid "Creating copy..."
-msgstr ""
+msgstr "Criar cópia..."
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang sax/source

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |6 --
 sax/source/fastparser/fastparser.cxx|   26 ++--
 2 files changed, 13 insertions(+), 19 deletions(-)

New commits:
commit c110bfc810ed381409d0f3742d8ce58a690d840f
Author: Noel Grandin 
AuthorDate: Thu Nov 22 08:48:59 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 23 19:52:13 2018 +0100

convert CallbackType to scoped enum

and drop unused INVALID constant

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index e0009e76a1fa..e038f28ec873 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -280,8 +280,6 @@ linguistic/source/defs.hxx:85
 enum LinguDispatcher::DspType DSP_SPELL
 reportdesign/source/ui/inc/ReportDefines.hxx:24
 enum rptui::DlgEdMode Test
-sax/source/fastparser/fastparser.cxx:80
-enum (anonymous namespace)::CallbackType INVALID
 sc/source/filter/excel/xiescher.cxx:460
 enum (anonymous at 
/home/noel/libo2/sc/source/filter/excel/xiescher.cxx:460:17) eCreateFromOffice
 sc/source/filter/inc/decl.h:24
@@ -390,10 +388,6 @@ sw/source/ui/fldui/fldref.cxx:767
 enum FMT_REF_IDX FMT_REF_ONLYNUMBER_IDX
 sw/source/ui/fldui/fldref.cxx:768
 enum FMT_REF_IDX FMT_REF_ONLYCAPTION_IDX
-sw/source/uibase/docvw/edtwin.cxx:1570
-enum SwKeyState ColTopBig
-sw/source/uibase/docvw/edtwin.cxx:1571
-enum SwKeyState ColTopSmall
 sw/source/uibase/utlui/content.cxx:824
 enum STR_CONTEXT_IDX IDX_STR_LINK_REGION
 sw/source/uibase/utlui/content.cxx:825
diff --git a/sax/source/fastparser/fastparser.cxx 
b/sax/source/fastparser/fastparser.cxx
index c910ad83381f..d7b5446a7423 100644
--- a/sax/source/fastparser/fastparser.cxx
+++ b/sax/source/fastparser/fastparser.cxx
@@ -77,7 +77,7 @@ struct EventList
 bool mbIsAttributesEmpty;
 };
 
-enum CallbackType { INVALID, START_ELEMENT, END_ELEMENT, CHARACTERS, 
PROCESSING_INSTRUCTION, DONE, EXCEPTION };
+enum class CallbackType { START_ELEMENT, END_ELEMENT, CHARACTERS, 
PROCESSING_INSTRUCTION, DONE, EXCEPTION };
 
 struct Event
 {
@@ -295,7 +295,7 @@ private:
 catch (...)
 {
 Entity &rEntity = mpParser->getEntity();
-rEntity.getEvent( EXCEPTION );
+rEntity.getEvent( CallbackType::EXCEPTION );
 mpParser->produce( true );
 }
 }
@@ -985,22 +985,22 @@ bool FastSaxParserImpl::consume(EventList& rEventList)
 {
 switch ((*aEventIt).maType)
 {
-case START_ELEMENT:
+case CallbackType::START_ELEMENT:
 rEntity.startElement( &(*aEventIt) );
 break;
-case END_ELEMENT:
+case CallbackType::END_ELEMENT:
 rEntity.endElement();
 break;
-case CHARACTERS:
+case CallbackType::CHARACTERS:
 rEntity.characters( (*aEventIt).msChars );
 break;
-case PROCESSING_INSTRUCTION:
+case CallbackType::PROCESSING_INSTRUCTION:
 rEntity.processingInstruction(
 (*aEventIt).msNamespace, (*aEventIt).msElementName ); // ( 
target, data )
 break;
-case DONE:
+case CallbackType::DONE:
 return false;
-case EXCEPTION:
+case CallbackType::EXCEPTION:
 rEntity.throwException( mxDocumentLocator, false );
 SAL_FALLTHROUGH; // avoid unreachable code warning with some 
compilers
 default:
@@ -1094,7 +1094,7 @@ void FastSaxParserImpl::parse()
 rEntity.throwException( mxDocumentLocator, true );
 }
 } while( nRead > 0 );
-rEntity.getEvent( DONE );
+rEntity.getEvent( CallbackType::DONE );
 if( rEntity.mbEnableThreads )
 produce( true );
 }
@@ -1117,7 +1117,7 @@ void FastSaxParserImpl::callbackStartElement(const 
xmlChar *localName , const xm
 }
 
 // create attribute map and process namespace instructions
-Event& rEvent = rEntity.getEvent( START_ELEMENT );
+Event& rEvent = rEntity.getEvent( CallbackType::START_ELEMENT );
 bool bIsAttributesEmpty = false;
 if ( rEntity.mbEnableThreads )
 bIsAttributesEmpty = rEntity.getEventList().mbIsAttributesEmpty;
@@ -1285,7 +1285,7 @@ void FastSaxParserImpl::callbackEndElement()
 if( !rEntity.maNamespaceStack.empty() )
 rEntity.maNamespaceStack.pop();
 
-rEntity.getEvent( END_ELEMENT );
+rEntity.getEvent( CallbackType::END_ELEMENT );
 if (rEntity.mbEnableThreads)
 produce();
 else
@@ -1314,7 +1314,7 @@ void FastSaxParserImpl::sendPendingCharacters()
  

[Libreoffice-commits] core.git: Branch 'private/mst/sw_redlinehide_4a' - 2 commits - sw/source sw/uiconfig

[Libreoffice Gerrit user]

 sw/source/core/edit/autofmt.cxx  |   61 ---
 sw/uiconfig/swriter/ui/queryredlinedialog.ui |2 
 2 files changed, 57 insertions(+), 6 deletions(-)

New commits:
commit a2a046bb0d13e05215ac67dabcdcab637aa545c6
Author: Michael Stahl 
AuthorDate: Fri Nov 23 18:02:49 2018 +0100
Commit: Michael Stahl 
CommitDate: Fri Nov 23 18:02:49 2018 +0100

sw_redlinehide_4a: SwAutoFormat: manually skip redlines when deleting

Change-Id: I001e61305ee8416f851f834d3068bd91de8281f8

diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index fac1e373b1bb..1fad5bd5e5b1 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -38,6 +38,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -172,6 +174,7 @@ class SwAutoFormat
 static bool HasSelBlanks( SwPaM& rPam );
 static bool HasBreakAttr( const SwTextNode& );
 void DeleteSel( SwPaM& rPam );
+void DeleteSelImpl(SwPaM & rDelPam, SwPaM & rPamToCorrect);
 bool DeleteCurNxtPara( const OUString& rNxtPara );
 /// delete in the node start and/or end
 void DeleteLeadingTrailingBlanks( bool bStart = true, bool bEnd = true );
@@ -1079,7 +1082,55 @@ void SwAutoFormat::DeleteLeadingTrailingBlanks(bool 
bStart, bool bEnd)
 }
 }
 
-void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
+bool GetRanges(std::vector> & rRanges,
+SwDoc & rDoc, SwPaM const& rDelPam)
+{
+bool isNoRedline(true);
+SwRedlineTable::size_type tmp;
+IDocumentRedlineAccess const& rIDRA(rDoc.getIDocumentRedlineAccess());
+rIDRA.GetRedline(*rDelPam.Start(), &tmp);
+SwPosition const* pCurrent(rDelPam.Start());
+for ( ; tmp < rIDRA.GetRedlineTable().size(); ++tmp)
+{
+SwRangeRedline const*const pRedline(rIDRA.GetRedlineTable()[tmp]);
+if (rDelPam.End() <= pRedline->Start())
+{
+break;
+}
+if (pRedline->GetType() == nsRedlineType_t::REDLINE_DELETE)
+{
+assert(*pRedline->Start() != *pRedline->End());
+isNoRedline = false;
+if (*pCurrent < *pRedline->Start())
+{
+rRanges.push_back(rDoc.CreateUnoCursor(*pCurrent, 
pRedline->Start()));
+}
+else
+{
+pCurrent = pRedline->End();
+}
+}
+}
+return isNoRedline;
+}
+
+void SwAutoFormat::DeleteSel(SwPaM & rDelPam)
+{
+std::vector> ranges; // need correcting cursor
+if (GetRanges(ranges, *m_pDoc, rDelPam))
+{
+DeleteSelImpl(rDelPam, rDelPam);
+}
+else
+{
+for (auto const& pCursor : ranges)
+{
+DeleteSelImpl(*pCursor, rDelPam);
+}
+}
+}
+
+void SwAutoFormat::DeleteSelImpl(SwPaM & rDelPam, SwPaM & rPamToCorrect)
 {
 if( m_aFlags.bWithRedlining )
 {
@@ -1087,18 +1138,18 @@ void SwAutoFormat::DeleteSel( SwPaM& rDelPam )
 SwPaM* pShCursor = m_pEditShell->GetCursor_();
 SwPaM aTmp( *m_pCurTextNd, 0, pShCursor );
 
-SwPaM* pPrev = rDelPam.GetPrev();
-rDelPam.GetRingContainer().merge( pShCursor->GetRingContainer() );
+SwPaM* pPrev = rPamToCorrect.GetPrev();
+rPamToCorrect.GetRingContainer().merge( pShCursor->GetRingContainer() 
);
 
 m_pEditShell->DeleteSel( rDelPam );
 
 // and remove Pam again:
 SwPaM* p;
-SwPaM* pNext = &rDelPam;
+SwPaM* pNext = &rPamToCorrect;
 do {
 p = pNext;
 pNext = p->GetNext();
-p->MoveTo( &rDelPam );
+p->MoveTo( &rPamToCorrect );
 } while( p != pPrev );
 
 m_aNdIdx = aTmp.GetPoint()->nNode;
commit cc5d238e74e588aab4bd3dea696acacf904b744d
Author: Michael Stahl 
AuthorDate: Fri Nov 23 14:14:17 2018 +0100
Commit: Michael Stahl 
CommitDate: Fri Nov 23 14:14:17 2018 +0100

sw: fix wrong title of AutoFormat with redlining dialog

(regression from 9fcef57a34dbd88a98621dfaf8668fa076dd98f1)

Change-Id: Id6ea5841dd25a30519deb825c3ae0aaa7469c250

diff --git a/sw/uiconfig/swriter/ui/queryredlinedialog.ui 
b/sw/uiconfig/swriter/ui/queryredlinedialog.ui
index 946547f6fb43..490d09a7ebbc 100644
--- a/sw/uiconfig/swriter/ui/queryredlinedialog.ui
+++ b/sw/uiconfig/swriter/ui/queryredlinedialog.ui
@@ -4,7 +4,7 @@
   
   
 False
-Delete this theme?
+AutoCorrect
 False
 True
 dialog
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sw/qa/extras/unowriter/unowriter.cxx |   25 +
 1 file changed, 25 insertions(+)

New commits:
commit d112ffd5f101a8533c48b2ce250951d8a1332252
Author: Thorsten Behrens 
AuthorDate: Tue Aug 7 15:20:23 2018 +0200
Commit: Thorsten Behrens 
CommitDate: Fri Nov 23 18:32:31 2018 +0100

Unit test for 0853b05b1fabb231a7d57d811c5a06ee542d3295

Change-Id: Iea6554448f7a3fcc621eac7248abcee9c4285688
Related: i#117783 and tdf#38443
Reviewed-on: https://gerrit.libreoffice.org/58687
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/sw/qa/extras/unowriter/unowriter.cxx 
b/sw/qa/extras/unowriter/unowriter.cxx
index 933e17b928bb..96e29c303319 100644
--- a/sw/qa/extras/unowriter/unowriter.cxx
+++ b/sw/qa/extras/unowriter/unowriter.cxx
@@ -320,6 +320,31 @@ DECLARE_UNOAPI_TEST(testXURI)
  lang::IllegalArgumentException);
 }
 
+DECLARE_UNOAPI_TEST(testSetPagePrintSettings)
+{
+// Create an empty new document with a single char
+loadURL("private:factory/swriter", nullptr);
+
+uno::Reference xTextDocument(mxComponent, 
uno::UNO_QUERY);
+uno::Reference xBodyText(xTextDocument->getText(), 
uno::UNO_QUERY);
+xBodyText->insertString(xBodyText->getStart(), "x", false);
+
+uno::Reference xPagePrintable(mxComponent, 
uno::UNO_QUERY);
+
+// set some stuff, try to get it back
+uno::Sequence aProps(2);
+aProps[0].Name = "PageColumns";
+aProps[0].Value <<= sal_Int16(2);
+aProps[1].Name = "IsLandscape";
+aProps[1].Value <<= true;
+
+xPagePrintable->setPagePrintSettings(aProps);
+const comphelper::SequenceAsHashMap 
aMap(xPagePrintable->getPagePrintSettings());
+
+CPPUNIT_ASSERT_EQUAL(sal_Int16(2), 
aMap.getValue("PageColumns").get());
+CPPUNIT_ASSERT_EQUAL(true, aMap.getValue("IsLandscape").get());
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Menu.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 4cc183111a03032809b415ac7d2aa0934d170b3b
Author: Stephan Bergmann 
AuthorDate: Fri Nov 23 18:31:01 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 23 18:31:01 2018 +0100

loplugin:override

Change-Id: Ia45b5f7c126c082d8f3835c3c3529a34a9e20975

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index b7432a3c11e3..43641f023542 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -77,7 +77,7 @@ class Qt5MenuItem : public SalMenuItem
 {
 public:
 Qt5MenuItem(const SalItemParams*);
-virtual ~Qt5MenuItem();
+virtual ~Qt5MenuItem() override;
 
 Qt5Menu* mpParentMenu; // The menu into which this menu item is inserted
 Qt5Menu* mpSubMenu; // Submenu of this item (if defined)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 starmath/source/parse.cxx |   50 ++
 1 file changed, 33 insertions(+), 17 deletions(-)

New commits:
commit 0dbb5f09e0c5ee71205d8544f5047be830f462ee
Author: Noel Grandin 
AuthorDate: Fri Nov 23 14:43:59 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 23 17:55:10 2018 +0100

use binary search for starmath token

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

diff --git a/starmath/source/parse.cxx b/starmath/source/parse.cxx
index 3cd64af729db..937ef8d5b9cf 100644
--- a/starmath/source/parse.cxx
+++ b/starmath/source/parse.cxx
@@ -68,11 +68,7 @@ SmToken::SmToken(SmTokenType eTokenType,
 
 static const SmTokenTableEntry aTokenTable[] =
 {
-{ "Im" , TIM, MS_IM, TG::Standalone, 5 },
-{ "Re" , TRE, MS_RE, TG::Standalone, 5 },
 { "abs", TABS, '\0', TG::UnOper, 13 },
-{ "arcosh", TACOSH, '\0', TG::Function, 5 },
-{ "arcoth", TACOTH, '\0', TG::Function, 5 },
 { "acute", TACUTE, MS_ACUTE, TG::Attribute, 5 },
 { "aleph" , TALEPH, MS_ALEPH, TG::Standalone, 5 },
 { "alignb", TALIGNC, '\0', TG::Align, 0},
@@ -86,6 +82,8 @@ static const SmTokenTableEntry aTokenTable[] =
 { "aqua", TAQUA, '\0', TG::Color, 0},
 { "arccos", TACOS, '\0', TG::Function, 5},
 { "arccot", TACOT, '\0', TG::Function, 5},
+{ "arcosh", TACOSH, '\0', TG::Function, 5 },
+{ "arcoth", TACOTH, '\0', TG::Function, 5 },
 { "arcsin", TASIN, '\0', TG::Function, 5},
 { "arctan", TATAN, '\0', TG::Function, 5},
 { "arsinh", TASINH, '\0', TG::Function, 5},
@@ -131,7 +129,6 @@ static const SmTokenTableEntry aTokenTable[] =
 { "emptyset" , TEMPTYSET, MS_EMPTYSET, TG::Standalone, 5},
 { "equiv", TEQUIV, MS_EQUIV, TG::Relation, 0},
 { "exists", TEXISTS, MS_EXISTS, TG::Standalone, 5},
-{ "notexists", TNOTEXISTS, MS_NOTEXISTS, TG::Standalone, 5},
 { "exp", TEXP, '\0', TG::Function, 5},
 { "fact", TFACT, MS_FACT, TG::UnOper, 5},
 { "fixed", TFIXED, '\0', TG::Font, 0},
@@ -151,6 +148,7 @@ static const SmTokenTableEntry aTokenTable[] =
 { "hbar" , THBAR, MS_HBAR, TG::Standalone, 5},
 { "iiint", TIIINT, MS_IIINT, TG::Oper, 5},
 { "iint", TIINT, MS_IINT, TG::Oper, 5},
+{ "im" , TIM, MS_IM, TG::Standalone, 5 },
 { "in", TIN, MS_IN, TG::Relation, 0},
 { "infinity" , TINFINITY, MS_INFINITY, TG::Standalone, 5},
 { "infty" , TINFINITY, MS_INFINITY, TG::Standalone, 5},
@@ -200,11 +198,14 @@ static const SmTokenTableEntry aTokenTable[] =
 { "nitalic", TNITALIC, '\0', TG::FontAttr, 5},
 { "none", TNONE, '\0', TG::LBrace | TG::RBrace, 0},
 { "nospace", TNOSPACE, '\0', TG::Standalone, 5},
+{ "notexists", TNOTEXISTS, MS_NOTEXISTS, TG::Standalone, 5},
 { "notin", TNOTIN, MS_NOTIN, TG::Relation, 0},
+{ "nprec", TNOTPRECEDES, MS_NOTPRECEDES, TG::Relation, 0 },
 { "nroot", TNROOT, MS_SQRT, TG::UnOper, 5},
 { "nsubset", TNSUBSET, MS_NSUBSET, TG::Relation, 0 },
-{ "nsupset", TNSUPSET, MS_NSUPSET, TG::Relation, 0 },
 { "nsubseteq", TNSUBSETEQ, MS_NSUBSETEQ, TG::Relation, 0 },
+{ "nsucc", TNOTSUCCEEDS, MS_NOTSUCCEEDS, TG::Relation, 0 },
+{ "nsupset", TNSUPSET, MS_NSUPSET, TG::Relation, 0 },
 { "nsupseteq", TNSUPSETEQ, MS_NSUPSETEQ, TG::Relation, 0 },
 { "odivide", TODIVIDE, MS_ODIVIDE, TG::Product, 0},
 { "odot", TODOT, MS_ODOT, TG::Product, 0},
@@ -227,7 +228,6 @@ static const SmTokenTableEntry aTokenTable[] =
 { "prec", TPRECEDES, MS_PRECEDES, TG::Relation, 0 },
 { "preccurlyeq", TPRECEDESEQUAL, MS_PRECEDESEQUAL, TG::Relation, 0 },
 { "precsim", TPRECEDESEQUIV, MS_PRECEDESEQUIV, TG::Relation, 0 },
-{ "nprec", TNOTPRECEDES, MS_NOTPRECEDES, TG::Relation, 0 },
 { "prod", TPROD, MS_PROD, TG::Oper, 5},
 { "prop", TPROP, MS_PROP, TG::Relation, 0},
 { "purple", TPURPLE, '\0', TG::Color, 0},
@@ -236,6 +236,7 @@ static const SmTokenTableEntry aTokenTable[] =
 { "rceil", TRCEIL, MS_RCEIL, TG::RBrace, 0},
 { "rdbracket", TRDBRACKET, MS_RDBRACKET, TG::RBrace, 0},
 { "rdline", TRDLINE, MS_DVERTLINE, TG::RBrace, 0},
+{ "re" , TRE, MS_RE, TG::Standalone, 5 },
 { "red", TRED, '\0', TG::Color, 0},
 { "rfloor", TRFLOOR, MS_RFLOOR, TG::RBrace, 0},  //! 0 to terminate 
expression
 { "right", TRIGHT, '\0', TG::NONE, 0},
@@ -246,11 +247,11 @@ static const SmTokenTableEntry aTokenTable[] =
 { "sans", TSANS, '\0', TG::Font, 0},
 { "serif", TSERIF, '\0', TG::Font, 0},
 { "setC" , TSETC, MS_SETC, TG::Standalone, 5},
+{ "setminus", TBACKSLASH, MS_BACKSLASH, TG::Product, 0 },
 { "setN" , TSETN, MS_SETN, TG::Standalone, 5},
 { "setQ" , TSETQ, MS_SETQ, TG::Standalone, 5},
 { "setR" , TSETR, MS_SETR, TG::Standalone, 5},
 { "setZ" , TSETZ, MS_SETZ, TG::Standalone, 5},
-{ "setminus", TBACKSLASH, MS_BACKSLASH, TG::Product, 0 },
 { "silver", TSILVER, '\0', TG::Color, 0},

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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |6 ---
 sc/inc/scmatrix.hxx |4 --
 sc/qa/unit/ucalc.cxx|2 -
 sc/source/core/tool/interpr5.cxx|2 -
 sc/source/core/tool/scmatrix.cxx|   21 +++-
 5 files changed, 9 insertions(+), 26 deletions(-)

New commits:
commit baf08f569fb629211e4f9679bbb30fd61272dd46
Author: Noel Grandin 
AuthorDate: Wed Nov 21 19:21:48 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 23 17:53:55 2018 +0100

enum ScMatrix::Op is unnecessary

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index c6810008b394..e0009e76a1fa 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -282,12 +282,6 @@ reportdesign/source/ui/inc/ReportDefines.hxx:24
 enum rptui::DlgEdMode Test
 sax/source/fastparser/fastparser.cxx:80
 enum (anonymous namespace)::CallbackType INVALID
-sc/inc/scmatrix.hxx:130
-enum ScMatrix::Op Div
-sc/inc/scmatrix.hxx:130
-enum ScMatrix::Op Add
-sc/inc/scmatrix.hxx:130
-enum ScMatrix::Op Sub
 sc/source/filter/excel/xiescher.cxx:460
 enum (anonymous at 
/home/noel/libo2/sc/source/filter/excel/xiescher.cxx:460:17) eCreateFromOffice
 sc/source/filter/inc/decl.h:24
diff --git a/sc/inc/scmatrix.hxx b/sc/inc/scmatrix.hxx
index 4b58cd19217b..cb6f170cfcce 100644
--- a/sc/inc/scmatrix.hxx
+++ b/sc/inc/scmatrix.hxx
@@ -127,8 +127,6 @@ public:
 ScMatrix( size_t nC, size_t nR, const std::vector& rInitVals );
 ~ScMatrix();
 
-enum Op { Add, Sub, Mul, Div };
-
 typedef std::function DoubleOpFunction;
 typedef std::function BoolOpFunction;
 typedef std::function 
StringOpFunction;
@@ -391,7 +389,7 @@ public:
  * otherwise they become NaN values.
  */
 void GetDoubleArray( std::vector& rArray, bool bEmptyAsZero = true 
) const ;
-void MergeDoubleArray( std::vector& rArray, Op eOp ) const ;
+void MergeDoubleArrayMultiply( std::vector& rArray ) const ;
 
 void NotOp(ScMatrix& rMat) ;
 void NegOp(ScMatrix& rMat) ;
diff --git a/sc/qa/unit/ucalc.cxx b/sc/qa/unit/ucalc.cxx
index 6853c66ac0ae..be249c6f647e 100644
--- a/sc/qa/unit/ucalc.cxx
+++ b/sc/qa/unit/ucalc.cxx
@@ -1855,7 +1855,7 @@ void Test::testMatrix()
 
 pMat2 = new ScMatrix(3, 3, 10.0);
 pMat2->PutString(rPool.intern("B"), 1, 0);
-pMat2->MergeDoubleArray(aDoubles, ScMatrix::Mul);
+pMat2->MergeDoubleArrayMultiply(aDoubles);
 
 {
 const double pChecks[] = { 25, 12, 0, fNaN, fNaN, 0, 0, 23, -200 };
diff --git a/sc/source/core/tool/interpr5.cxx b/sc/source/core/tool/interpr5.cxx
index b1c840e4fd94..2ab00919d6fa 100644
--- a/sc/source/core/tool/interpr5.cxx
+++ b/sc/source/core/tool/interpr5.cxx
@@ -1672,7 +1672,7 @@ void ScInterpreter::ScSumProduct()
 return;
 }
 
-pMat->MergeDoubleArray(aResArray, ScMatrix::Mul);
+pMat->MergeDoubleArrayMultiply(aResArray);
 }
 
 double fSum = std::for_each(aResArray.begin(), aResArray.end(), 
SumValues()).getValue();
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 5a736dd005b8..6cd50a560050 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -319,7 +319,7 @@ public:
 ScMatrixRef CompareMatrix( sc::Compare& rComp, size_t nMatPos, 
sc::CompareOptions* pOptions ) const;
 
 void GetDoubleArray( std::vector& rArray, bool bEmptyAsZero ) 
const;
-void MergeDoubleArray( std::vector& rArray, ScMatrix::Op eOp ) 
const;
+void MergeDoubleArrayMultiply( std::vector& rArray ) const;
 
 template
 void ApplyOperation(T aOp, ScMatrixImpl& rMat);
@@ -2181,24 +2181,15 @@ void ScMatrixImpl::GetDoubleArray( std::vector& 
rArray, bool bEmptyAsZer
 aFunc.swap(rArray);
 }
 
-void ScMatrixImpl::MergeDoubleArray( std::vector& rArray, ScMatrix::Op 
eOp ) const
+void ScMatrixImpl::MergeDoubleArrayMultiply( std::vector& rArray ) 
const
 {
 MatrixImplType::size_pair_type aSize = maMat.size();
 size_t nSize = aSize.row*aSize.column;
 if (nSize != rArray.size())
 return;
 
-switch (eOp)
-{
-case ScMatrix::Mul:
-{
-MergeDoubleArrayFunc aFunc(rArray);
-maMat.walk(std::move(aFunc));
-}
-break;
-default:
-;
-}
+MergeDoubleArrayFunc aFunc(rArray);
+maMat.walk(std::move(aFunc));
 }
 
 namespace Op {
@@ -3289,9 +3280,9 @@ void ScMatrix::GetDoubleArray( std::vector& 
rArray, bool bEmptyAsZero )
 pImpl->GetDoubleArray(rArray, bEmptyAsZero);
 }
 

Re: Compiler baselines

[Stephan Bergmann]

On 23/11/2018 08:57, Stephan Bergmann wrote:

On 21/11/2018 17:42, Stephan Bergmann wrote:
If nobody objects, we'd update the build baselines on master (towards 
* macOS: from Xcode 8 to Xcode 9.3


(Nothing needs to be done for this on the Jenkins side, as reportedly 
all relevant macOS nodes are already on some Xcode 9.3 or later.)


Enforced now with 
 
"Bump Xcode baseline to 9.3".

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

[Libreoffice-commits] core.git: configure.ac README.md

[Libreoffice Gerrit user]

 README.md|2 +-
 configure.ac |   10 ++
 2 files changed, 11 insertions(+), 1 deletion(-)

New commits:
commit b4f666f2e677b05cab8395fe7972b45b15f60c3f
Author: Stephan Bergmann 
AuthorDate: Fri Nov 23 12:11:19 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 23 17:03:59 2018 +0100

Bump Xcode baseline to 9.3

...as discussed at


"minutes of ESC call ..."

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

diff --git a/README.md b/README.md
index 39fe759836c6..9192f828be10 100644
--- a/README.md
+++ b/README.md
@@ -37,7 +37,7 @@ run and compile LibreOffice, also used by the TDF builds:
 * Build: Cygwin + Visual Studio 2017
 * macOS:
 * Runtime: 10.9
-* Build: 10.12 + Xcode 8
+* Build: 10.12 + Xcode 9.3
 * Linux:
 * Runtime: RHEL 6 or CentOS 6
 * Build: GCC 4.8.1 or Clang
diff --git a/configure.ac b/configure.ac
index 827b5f6c995e..cddfd825e4a3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2773,6 +2773,16 @@ if test $_os = Darwin -o $_os = iOS; then
 FRAMEWORKSHOME="$MACOSX_SDK_PATH/System/Library/Frameworks"
 MACOSX_DEPLOYMENT_TARGET="$with_macosx_version_min_required"
 
+AC_MSG_CHECKING([whether Xcode is new enough])
+my_xcode_ver1=$(xcrun xcodebuild -version | head -n 1)
+my_xcode_ver2=${my_xcode_ver1#Xcode }
+my_xcode_ver3=$(printf %s "$my_xcode_ver2" | $AWK -F. '{ print 
$1*100+($2<100?$2:99) }')
+if test "$my_xcode_ver3" -ge 903; then
+AC_MSG_RESULT([yes ($my_xcode_ver2)])
+else
+AC_MSG_ERROR(["$my_xcode_ver1" is too old or unrecognized, must be at 
least Xcode 9.3])
+fi
+
 case "$with_macosx_version_min_required" in
 10.9)
 MAC_OS_X_VERSION_MIN_REQUIRED="1090"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 desktop/source/lib/init.cxx |9 +
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit e514e19274919c522c1b53e035c99713e37232aa
Author: Tor Lillqvist 
AuthorDate: Fri Nov 23 17:36:33 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 23 17:56:32 2018 +0200

Use the correct DPI scaling factor in LibreOfficeKit for iOS, too

Fixes the rendering of spreadsheets in the iOS app. (The cell area was
rendered at half the scale of the row and column headers.)

(In this branch I don't bother updating the comments to mention
CoreGraphics in addition to cairo.)

Change-Id: Ife99c6a2d58e592cfea3b4ed1ab09c19fba77e72

diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 2db450c19acf..13c9e4a0d591 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2142,9 +2142,10 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 // what Calc's internal scaling would do - because that one is trying to
 // fit the lines between cells to integer multiples of pixels.
 comphelper::ScopeGuard dpiScaleGuard([]() { 
comphelper::LibreOfficeKit::setDPIScale(1.0); });
+double fDPIScaleX = 1;
 if (doc_getDocumentType(pThis) == LOK_DOCTYPE_SPREADSHEET)
 {
-double fDPIScaleX = (nCanvasWidth * 3840.0) / (256.0 * nTileWidth);
+fDPIScaleX = (nCanvasWidth * 3840.0) / (256.0 * nTileWidth);
 assert(fabs(fDPIScaleX - ((nCanvasHeight * 3840.0) / (256.0 * 
nTileHeight))) < 0.0001);
 comphelper::LibreOfficeKit::setDPIScale(fDPIScaleX);
 }
@@ -2155,7 +2156,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 CGContextRef cgc = CGBitmapContextCreate(pBuffer, nCanvasWidth, 
nCanvasHeight, 8, nCanvasWidth*4, CGColorSpaceCreateDeviceRGB(), 
kCGImageAlphaNoneSkipFirst | kCGImageByteOrder32Little);
 
 CGContextTranslateCTM(cgc, 0, nCanvasHeight);
-CGContextScaleCTM(cgc, 1, -1);
+CGContextScaleCTM(cgc, fDPIScaleX, -fDPIScaleX);
 
 doc_paintTileToCGContext(pThis, (void*) cgc, nCanvasWidth, nCanvasHeight, 
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
 
@@ -3633,7 +3634,7 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument* 
/*pThis*/, unsigned nLOKW
 CGContextRef cgc = CGBitmapContextCreate(pBuffer, nWidth, nHeight, 8, 
nWidth*4, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaNoneSkipFirst | 
kCGImageByteOrder32Little);
 
 CGContextTranslateCTM(cgc, 0, nHeight);
-CGContextScaleCTM(cgc, 1, -1);
+CGContextScaleCTM(cgc, fDPIScale, -fDPIScale);
 
 SystemGraphicsData aData;
 aData.rCGContext = cgc;
@@ -3644,7 +3645,7 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument* 
/*pThis*/, unsigned nLOKW
 pDevice->SetOutputSizePixel(Size(nWidth, nHeight));
 
 MapMode aMapMode(pDevice->GetMapMode());
-aMapMode.SetOrigin(Point(-nX, -nY));
+aMapMode.SetOrigin(Point(-(nX / fDPIScale), -(nY / fDPIScale)));
 pDevice->SetMapMode(aMapMode);
 
 comphelper::LibreOfficeKit::setDialogPainting(true);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 comphelper/source/misc/lok.cxx |2 +-
 desktop/source/lib/init.cxx|   23 ---
 sc/source/ui/view/gridwin4.cxx |   12 ++--
 3 files changed, 19 insertions(+), 18 deletions(-)

New commits:
commit 3ace447b0fe1926945f739479a7be39276e81fb5
Author: Tor Lillqvist 
AuthorDate: Fri Nov 23 17:36:33 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 23 17:48:20 2018 +0200

Use the correct DPI scaling factor in LibreOfficeKit for iOS, too

Fixes the rendering of spreadsheets in the iOS app. (The cell area was
rendered at half the scale of the row and column headers.)

Actual code change only in desktop/source/lib/init.cxx, but update
related comments elsewhere to mention CoreGraphics, too, and not just
cairo.

Change-Id: Ife99c6a2d58e592cfea3b4ed1ab09c19fba77e72

diff --git a/comphelper/source/misc/lok.cxx b/comphelper/source/misc/lok.cxx
index 5934ed58c297..e5f3573cb391 100644
--- a/comphelper/source/misc/lok.cxx
+++ b/comphelper/source/misc/lok.cxx
@@ -38,7 +38,7 @@ static bool g_bLocalRendering(false);
 
 static LanguageTag g_aLanguageTag("en-US", true);
 
-/// Scaling of the cairo canvas painting for hi-dpi or zooming in Calc.
+/// Scaling of the cairo or CoreGraphics canvas painting for hi-dpi or zooming 
in Calc.
 static double g_fDPIScale(1.0);
 
 void setActive(bool bActive)
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index 3cb194b5ab38..a7ce8182ebd1 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2134,15 +2134,16 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 
 #if defined(UNX) && !defined(MACOSX) && !defined(ENABLE_HEADLESS)
 
-// Painting of zoomed or hi-dpi spreadsheets is special, we actually draw
-// everything at 100%, and only set cairo's scale factor accordingly, so
-// that everything is painted bigger or smaller.  This is different to
-// what Calc's internal scaling would do - because that one is trying to
-// fit the lines between cells to integer multiples of pixels.
+// Painting of zoomed or hi-dpi spreadsheets is special, we actually draw 
everything at 100%,
+// and only set cairo's (or CoreGraphic's, in the iOS case) scale factor 
accordingly, so that
+// everything is painted bigger or smaller. This is different to what 
Calc's internal scaling
+// would do - because that one is trying to fit the lines between cells to 
integer multiples of
+// pixels.
 comphelper::ScopeGuard dpiScaleGuard([]() { 
comphelper::LibreOfficeKit::setDPIScale(1.0); });
+double fDPIScaleX = 1;
 if (doc_getDocumentType(pThis) == LOK_DOCTYPE_SPREADSHEET)
 {
-double fDPIScaleX = (nCanvasWidth * 3840.0) / (256.0 * nTileWidth);
+fDPIScaleX = (nCanvasWidth * 3840.0) / (256.0 * nTileWidth);
 assert(fabs(fDPIScaleX - ((nCanvasHeight * 3840.0) / (256.0 * 
nTileHeight))) < 0.0001);
 comphelper::LibreOfficeKit::setDPIScale(fDPIScaleX);
 }
@@ -2151,7 +2152,7 @@ static void doc_paintTile(LibreOfficeKitDocument* pThis,
 CGContextRef cgc = CGBitmapContextCreate(pBuffer, nCanvasWidth, 
nCanvasHeight, 8, nCanvasWidth*4, CGColorSpaceCreateDeviceRGB(), 
kCGImageAlphaNoneSkipFirst | kCGImageByteOrder32Little);
 
 CGContextTranslateCTM(cgc, 0, nCanvasHeight);
-CGContextScaleCTM(cgc, 1, -1);
+CGContextScaleCTM(cgc, fDPIScaleX, -fDPIScaleX);
 
 doc_paintTileToCGContext(pThis, (void*) cgc, nCanvasWidth, nCanvasHeight, 
nTilePosX, nTilePosY, nTileWidth, nTileHeight);
 
@@ -3618,8 +3619,8 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument* 
/*pThis*/, unsigned nLOKW
 return;
 }
 
-// Setup cairo to draw with the changed DPI scale (and return back to 1.0
-// when the painting finishes)
+// Setup cairo (or CoreGraphics, in the iOS case) to draw with the changed 
DPI scale (and return
+// back to 1.0 when the painting finishes)
 comphelper::ScopeGuard dpiScaleGuard([]() { 
comphelper::LibreOfficeKit::setDPIScale(1.0); });
 comphelper::LibreOfficeKit::setDPIScale(fDPIScale);
 
@@ -3628,7 +3629,7 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument* 
/*pThis*/, unsigned nLOKW
 CGContextRef cgc = CGBitmapContextCreate(pBuffer, nWidth, nHeight, 8, 
nWidth*4, CGColorSpaceCreateDeviceRGB(), kCGImageAlphaNoneSkipFirst | 
kCGImageByteOrder32Little);
 
 CGContextTranslateCTM(cgc, 0, nHeight);
-CGContextScaleCTM(cgc, 1, -1);
+CGContextScaleCTM(cgc, fDPIScale, -fDPIScale);
 
 SystemGraphicsData aData;
 aData.rCGContext = cgc;
@@ -3639,7 +3640,7 @@ static void doc_paintWindowDPI(LibreOfficeKitDocument* 
/*pThis*/, unsigned nLOKW
 pDevice->SetOutputSizePixel(Size(nWidth, nHeight));
 
 MapMode aMapMode(pDevice->GetMapMode());
-aMapMode.SetOrigin(Point(-nX, -nY));
+aMapMode.SetOrigin(Point(-(nX / fDPIScale), -(nY / fDPIScale)));
 pDevice->SetMapMode(aMapMode);
 
 comphelper::LibreOfficeKit::setDialog

[Libreoffice-commits] online.git: loolwsd.xml.in wsd/FileServer.cpp

[Libreoffice Gerrit user]

 loolwsd.xml.in |1 
 wsd/FileServer.cpp |   55 ++---
 2 files changed, 24 insertions(+), 32 deletions(-)

New commits:
commit 296aba1beae64a65e4e86631a9c1458073ec8c2e
Author: Samuel Mehrbrodt 
AuthorDate: Fri Nov 23 09:33:13 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Fri Nov 23 16:33:55 2018 +0100

Improve allowed frame-ancestors

Beforehand, any host could embed the iframe as the Referer was always 
allowed.

Now, only the loolwsd and the WOPI host are allowed to do that.
Additionally, a config option has been added to add more allowed hosts.

X-Frame-Options supports has been removed as it supports only one host
and CSP is meanwhile supported in ~all major browsers.

Change-Id: I222720e1220116102708c50edaf08e2a4a0aebda
Reviewed-on: https://gerrit.libreoffice.org/63864
Reviewed-by: Thorsten Behrens 
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/loolwsd.xml.in b/loolwsd.xml.in
index 6842a782c..48c053adb 100644
--- a/loolwsd.xml.in
+++ b/loolwsd.xml.in
@@ -79,6 +79,7 @@
 :::127\.0\.0\.1
 ::1
   
+  
 
 
 
diff --git a/wsd/FileServer.cpp b/wsd/FileServer.cpp
index 0129070eb..651654364 100644
--- a/wsd/FileServer.cpp
+++ b/wsd/FileServer.cpp
@@ -681,50 +681,41 @@ void FileServerRequestHandler::preprocessFile(const 
HTTPRequest& request, Poco::
<< "font-src 'self' data:; "
<< "object-src blob:; ";
 
-std::string frameAncestor;
-const auto it = request.find("Referer"); // Referer[sic]
-if (it != request.end())
+// Frame ancestors: Allow loolwsd host, wopi host and anything configured.
+std::string configFrameAncestor = config.getString("net.frame_ancestors", 
"");
+std::string frameAncestors = configFrameAncestor;
+Poco::URI uriHost(host);
+if (uriHost.getHost() != configFrameAncestor)
+frameAncestors += " " + uriHost.getHost();
+
+for (const auto& param : params)
 {
-frameAncestor = it->second;
-LOG_TRC("Picking frame ancestor from HTTP Referer header: " << 
frameAncestor);
-}
-else // Use WOPISrc value if Referer is absent
-{
-for (const auto& param : params)
+if (param.first == "WOPISrc")
 {
-if (param.first == "WOPISrc")
+std::string wopiFrameAncestor;
+Poco::URI::decode(param.second, wopiFrameAncestor);
+if (wopiFrameAncestor != uriHost.getHost() && wopiFrameAncestor != 
configFrameAncestor)
 {
-Poco::URI::decode(param.second, frameAncestor);
-LOG_TRC("Picking frame ancestor from WOPISrc: " << 
frameAncestor);
-break;
+frameAncestors += " " + wopiFrameAncestor;
+LOG_TRC("Picking frame ancestor from WOPISrc: " << 
wopiFrameAncestor);
 }
+break;
 }
 }
 
-// Keep only the origin, reject everything else
-Poco::URI uriFrameAncestor(frameAncestor);
-const std::string& frameAncestorScheme = uriFrameAncestor.getScheme();
-const std::string& frameAncestorHost = uriFrameAncestor.getHost();
-
-if (!frameAncestor.empty() && Util::isValidURIScheme(frameAncestorScheme) 
&& Util::isValidURIHost(frameAncestorHost))
+if (!frameAncestors.empty())
 {
-frameAncestor = frameAncestorScheme + "://" + frameAncestorHost + ":" 
+ std::to_string(uriFrameAncestor.getPort());
-
-LOG_TRC("Final frame ancestor: " << frameAncestor);
-
-// Replaced by frame-ancestors in CSP but some oldies don't know about 
that
-oss << "X-Frame-Options: allow-from " << frameAncestor << "\r\n";
-cspOss << "img-src 'self' data: " << frameAncestor << "; "
-   << "frame-ancestors " << frameAncestor;
+LOG_TRC("Allowed frame ancestors: " << frameAncestors);
+// X-Frame-Options supports only one ancestor, ignore that
+//(it's deprecated anyway and CSP works in all major browsers)
+cspOss << "img-src 'self' data: " << frameAncestors << "; "
+<< "frame-ancestors " << frameAncestors;
 }
 else
 {
-LOG_TRC("Denied frame ancestor: " << frameAncestor);
-
-cspOss << "img-src 'self' data: ;";
-oss << "X-Frame-Options: deny\r\n";
+LOG_TRC("Denied all frame ancestors");
+cspOss << "img-src 'self' data: none;";
 }
-
 cspOss << "\r\n";
 // Append CSP to response headers too
 oss << cspOss.str();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 6c90a05e6cdd65d3656f1a559ff5a1e911741edf
Author: Adolfo Jayme Barrientos 
AuthorDate: Fri Nov 23 09:14:02 2018 -0600
Commit: Adolfo Jayme Barrientos 
CommitDate: Fri Nov 23 09:14:02 2018 -0600

Hyphenate pre-noun adjective phrase

Change-Id: I108cb3b91031327f7d775857f8e7d55042eccb6c

diff --git a/source/text/sbasic/shared/GetPathSeparator.xhp 
b/source/text/sbasic/shared/GetPathSeparator.xhp
index d4c63c536..4223e0d3b 100644
--- a/source/text/sbasic/shared/GetPathSeparator.xhp
+++ b/source/text/sbasic/shared/GetPathSeparator.xhp
@@ -20,7 +20,7 @@
 
 
 GetPathSeparator Function
-Return the operating system 
dependent directory separator used to specify file paths.
+Return the operating 
system-dependent directory separator used to specify file paths.
 
 Syntax:
 GetPathSeparator()
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit c9b0766aee1f13c07c1f3decbc2e8b0388e5f8e5
Author: Adolfo Jayme Barrientos 
AuthorDate: Fri Nov 23 09:14:02 2018 -0600
Commit: Gerrit Code Review 
CommitDate: Fri Nov 23 16:14:44 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - Hyphenate pre-noun adjective phrase

Change-Id: I108cb3b91031327f7d775857f8e7d55042eccb6c

diff --git a/helpcontent2 b/helpcontent2
index 3954a99fbd09..6c90a05e6cdd 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit 3954a99fbd09ead9543cb0e9c682cbf2f69dae8f
+Subproject commit 6c90a05e6cdd65d3656f1a559ff5a1e911741edf
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: compilerplugins/clang

[Libreoffice Gerrit user]

 compilerplugins/clang/test/unoany.cxx |4 ++--
 compilerplugins/clang/unoany.cxx  |6 --
 2 files changed, 6 insertions(+), 4 deletions(-)

New commits:
commit d20d4420870b586a3e8233ab1d8640d39eb714aa
Author: Stephan Bergmann 
AuthorDate: Fri Nov 23 10:44:34 2018 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 23 14:39:44 2018 +0100

Improve wording of loplugin:unoany warnings

...which apparently caused confusion occasionally, cf.
 "Unit test for
0853b05b1fabb231a7d57d811c5a06ee542d3295".

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

diff --git a/compilerplugins/clang/test/unoany.cxx 
b/compilerplugins/clang/test/unoany.cxx
index 8c7ba7e90179..1b4bfaa2beec 100644
--- a/compilerplugins/clang/test/unoany.cxx
+++ b/compilerplugins/clang/test/unoany.cxx
@@ -19,8 +19,8 @@ int main()
 css::uno::Any b;
 a = b;
 a = getAny();
-a = css::uno::makeAny(true); // expected-error {{unnecessary copy, rather 
use <<= operator [loplugin:unoany]}}
-a = css::uno::Any(true); // expected-error {{unnecessary copy, rather use 
<<= operator [loplugin:unoany]}}
+a = css::uno::makeAny(true); // expected-error {{unnecessary copy, rather 
use <<= operator directly with the 'makeAny' argument [loplugin:unoany]}}
+a = css::uno::Any(true); // expected-error {{unnecessary copy, rather use 
<<= operator directly with the 'Any' constructor argument [loplugin:unoany]}}
 }
 
 
diff --git a/compilerplugins/clang/unoany.cxx b/compilerplugins/clang/unoany.cxx
index 07b9da435752..7d10a2361878 100644
--- a/compilerplugins/clang/unoany.cxx
+++ b/compilerplugins/clang/unoany.cxx
@@ -48,7 +48,8 @@ bool UnoAny::VisitCXXOperatorCallExpr(CXXOperatorCallExpr 
const * expr)
 
Namespace("uno").Namespace("star").Namespace("sun").Namespace("com").GlobalNamespace())
 {
 report(
 DiagnosticsEngine::Warning,
-"unnecessary copy, rather use <<= operator",
+("unnecessary copy, rather use <<= operator 
directly with the 'makeAny'"
+ " argument"),
 expr->getOperatorLoc())
   << expr->getSourceRange();
 return true;
@@ -59,7 +60,8 @@ bool UnoAny::VisitCXXOperatorCallExpr(CXXOperatorCallExpr 
const * expr)
 //expr->getArg(1)->dump();
 report(
 DiagnosticsEngine::Warning,
-"unnecessary copy, rather use <<= operator",
+("unnecessary copy, rather use <<= operator directly with 
the 'Any' constructor"
+ " argument"),
 expr->getOperatorLoc())
   << expr->getSourceRange();
 return true;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 AllLangHelp_sbasic.mk  |1 
 source/auxiliary/sbasic.tree   |1 
 source/text/sbasic/shared/03020400.xhp |5 +
 source/text/sbasic/shared/GetPathSeparator.xhp |   72 +
 4 files changed, 77 insertions(+), 2 deletions(-)

New commits:
commit 3954a99fbd09ead9543cb0e9c682cbf2f69dae8f
Author: Alain Romedenne 
AuthorDate: Thu Nov 22 12:49:14 2018 -0200
Commit: Olivier Hallot 
CommitDate: Fri Nov 23 14:06:17 2018 +0100

tdf#114263 add help page for GetPathSelector()

Change-Id: I021dcde2c5bb27713cbbff03af9f3662f187be4b
Signed-off-by: Olivier Hallot 
Reviewed-on: https://gerrit.libreoffice.org/63807
Tested-by: Jenkins

diff --git a/AllLangHelp_sbasic.mk b/AllLangHelp_sbasic.mk
index a236018f4..8515bb65a 100644
--- a/AllLangHelp_sbasic.mk
+++ b/AllLangHelp_sbasic.mk
@@ -354,6 +354,7 @@ $(eval $(call gb_AllLangHelp_add_helpfiles,sbasic,\
 helpcontent2/source/text/sbasic/shared/03170010 \
 helpcontent2/source/text/sbasic/shared/05060700 \
 helpcontent2/source/text/sbasic/shared/code-stubs \
+helpcontent2/source/text/sbasic/shared/GetPathSeparator \
 helpcontent2/source/text/sbasic/shared/keys \
 helpcontent2/source/text/sbasic/shared/main0211 \
 helpcontent2/source/text/sbasic/shared/main0601 \
diff --git a/source/auxiliary/sbasic.tree b/source/auxiliary/sbasic.tree
index d2eb5ea53..fbae74d0d 100644
--- a/source/auxiliary/sbasic.tree
+++ b/source/auxiliary/sbasic.tree
@@ -153,6 +153,7 @@
 GetDefaultContext 
Function
 GetGUIType Function
 GetProcessServiceManager 
Function
+GetPathSeparator 
Function
 GetSolarVersion 
Function
 GetSystemTicks 
Function
 Get Statement
diff --git a/source/text/sbasic/shared/03020400.xhp 
b/source/text/sbasic/shared/03020400.xhp
index d7df5e848..27592c63a 100644
--- a/source/text/sbasic/shared/03020400.xhp
+++ b/source/text/sbasic/shared/03020400.xhp
@@ -30,8 +30,8 @@
 
 
 
-  
-  
+
+
   
   Managing 
Files
   The 
functions and statements for managing files are described here.
@@ -46,6 +46,7 @@
   
   
   
+  
   
   
   
diff --git a/source/text/sbasic/shared/GetPathSeparator.xhp 
b/source/text/sbasic/shared/GetPathSeparator.xhp
new file mode 100644
index 0..d4c63c536
--- /dev/null
+++ b/source/text/sbasic/shared/GetPathSeparator.xhp
@@ -0,0 +1,72 @@
+
+
+
+
+
+Libre Librәries : GetPathSeparator function
+/text/sbasic/shared/GetPathSeparator.xhp
+
+
+
+
+GetPathSeparator function
+
+
+GetPathSeparator Function
+Return the operating system 
dependent directory separator used to specify file paths.
+
+Syntax:
+GetPathSeparator()
+
+Return value:
+
+String
+
+"\" Windows
+
+
+"/" UNIX, including MacOS
+
+
+Parameters:
+
+
+None.
+
+
+Error codes:
+
+
+5 Invalid procedure call
+
+
+Example:
+
+
+Sub 
ExampleGetPathSeparator
+MsgBox 
GetPathSeparator()
+End Sub
+
+
+
+It is recommended to use:
+
+
+ConvertFromURL function to convert a file URL to s system 
file name.
+
+
+ConvertToURL function to convert a system file name to a 
file URL.
+
+
+See also URL Notation
+
+
+
+
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: helpcontent2

[Libreoffice Gerrit user]

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

New commits:
commit ea297ab09792fbab6daea2f383be2fbda4e046ab
Author: Alain Romedenne 
AuthorDate: Thu Nov 22 12:49:14 2018 -0200
Commit: Gerrit Code Review 
CommitDate: Fri Nov 23 14:06:17 2018 +0100

Update git submodules

* Update helpcontent2 from branch 'master'
  - tdf#114263 add help page for GetPathSelector()

Change-Id: I021dcde2c5bb27713cbbff03af9f3662f187be4b
Signed-off-by: Olivier Hallot 
Reviewed-on: https://gerrit.libreoffice.org/63807
Tested-by: Jenkins

diff --git a/helpcontent2 b/helpcontent2
index ad162dec44f8..3954a99fbd09 16
--- a/helpcontent2
+++ b/helpcontent2
@@ -1 +1 @@
-Subproject commit ad162dec44f8dc15cfa7405cba597b76cba8b3bd
+Subproject commit 3954a99fbd09ead9543cb0e9c682cbf2f69dae8f
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit b3e5d954dccbac85c77d6096ea3be2b59d6288fd
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:23:34 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 13:58:00 2018 +0100

Resolves: tdf#121644 clear pointer to customlines when customlines cleared

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

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 77909e8f44f0..ec7f55819b53 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1588,7 +1588,7 @@ bool CustomPropertiesWindow::IsLineValid( 
CustomPropertyLine* pLine ) const
 
 void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool 
bIsFromTypeBox )
 {
-if ( !IsLineValid( pLine ) )
+if (pLine && !IsLineValid(pLine))
 {
 if ( bIsFromTypeBox ) // LoseFocus of TypeBox
 pLine->m_bTypeLostFocus = true;
@@ -1714,6 +1714,7 @@ bool CustomPropertiesWindow::AreAllLinesValid() const
 void CustomPropertiesWindow::ClearAllLines()
 {
 m_aCustomPropertiesLines.clear();
+m_pCurrentLine = nullptr;
 m_aCustomProperties.clear();
 m_nScrollPos = 0;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |   28 
 sc/inc/filter.hxx   |3 -
 sc/source/core/inc/doubleref.hxx|2 
 sc/source/ui/inc/autofmt.hxx|2 
 4 files changed, 1 insertion(+), 34 deletions(-)

New commits:
commit 981a98af300eb5247e6ecfb6ec54c590acb54538
Author: Noel Grandin 
AuthorDate: Wed Nov 21 19:17:55 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 23 13:44:17 2018 +0100

remove some unused enums in sc/

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index 7404d91512c0..c6810008b394 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -282,32 +282,12 @@ reportdesign/source/ui/inc/ReportDefines.hxx:24
 enum rptui::DlgEdMode Test
 sax/source/fastparser/fastparser.cxx:80
 enum (anonymous namespace)::CallbackType INVALID
-sc/inc/filter.hxx:43
-enum ExportFormatLotus ExpWK4
-sc/inc/filter.hxx:43
-enum ExportFormatLotus ExpWK1
-sc/inc/filter.hxx:43
-enum ExportFormatLotus ExpWK3
-sc/inc/filter.hxx:44
-enum ExportFormatExcel ExpBiff4W
-sc/inc/filter.hxx:44
-enum ExportFormatExcel ExpBiff4
-sc/inc/filter.hxx:44
-enum ExportFormatExcel ExpBiff3
-sc/inc/filter.hxx:44
-enum ExportFormatExcel ExpBiff2
-sc/inc/filter.hxx:44
-enum ExportFormatExcel Exp2007Xml
 sc/inc/scmatrix.hxx:130
 enum ScMatrix::Op Div
 sc/inc/scmatrix.hxx:130
 enum ScMatrix::Op Add
 sc/inc/scmatrix.hxx:130
 enum ScMatrix::Op Sub
-sc/source/core/inc/doubleref.hxx:41
-enum ScDBRangeBase::RefType EXTERNAL
-sc/source/core/inc/doubleref.hxx:41
-enum ScDBRangeBase::RefType INTERNAL
 sc/source/filter/excel/xiescher.cxx:460
 enum (anonymous at 
/home/noel/libo2/sc/source/filter/excel/xiescher.cxx:460:17) eCreateFromOffice
 sc/source/filter/inc/decl.h:24
@@ -316,14 +296,6 @@ sc/source/ui/inc/anyrefdg.hxx:192
 enum ScRefHdlrImpl::(anonymous at /home/noel/libo2/sc/source/ui/inc/anyrefdg.hxx:192:5) 
SLOTID
 sc/source/ui/inc/anyrefdg.hxx:192
 enum ScRefHdlrImpl::(anonymous at 
/home/noel/libo2/sc/source/ui/inc/anyrefdg.hxx:192:5) SLOTID
-sc/source/ui/inc/autofmt.hxx:33
-enum AutoFmtLine BOTTOM_LINE
-sc/source/ui/inc/autofmt.hxx:33
-enum AutoFmtLine LEFT_LINE
-sc/source/ui/inc/autofmt.hxx:33
-enum AutoFmtLine RIGHT_LINE
-sc/source/ui/inc/autofmt.hxx:33
-enum AutoFmtLine TOP_LINE
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx:105
 enum (anonymous namespace)::ScRegType LINEAR
 svx/inc/sxmkitm.hxx:25
diff --git a/sc/inc/filter.hxx b/sc/inc/filter.hxx
index 3739a0ec1953..f9201d01951c 100644
--- a/sc/inc/filter.hxx
+++ b/sc/inc/filter.hxx
@@ -40,8 +40,7 @@ class ScOrcusFilters;
 enum EXCIMPFORMAT { EIF_AUTO, EIF_BIFF5, EIF_BIFF8, EIF_BIFF_LE4 };
 
 // for export
-enum ExportFormatLotus { ExpWK1, ExpWK3, ExpWK4 };
-enum ExportFormatExcel { ExpBiff2, ExpBiff3, ExpBiff4, ExpBiff4W, ExpBiff5, 
ExpBiff8, Exp2007Xml };
+enum ExportFormatExcel { ExpBiff5, ExpBiff8 };
 
 // These are implemented inside the scfilt library and lazy loaded
 
diff --git a/sc/source/core/inc/doubleref.hxx b/sc/source/core/inc/doubleref.hxx
index 7786104e8de2..bd35b7d905e1 100644
--- a/sc/source/core/inc/doubleref.hxx
+++ b/sc/source/core/inc/doubleref.hxx
@@ -38,8 +38,6 @@ enum class FormulaError : sal_uInt16;
 class ScDBRangeBase
 {
 public:
-enum RefType { INTERNAL, EXTERNAL }; // TODO: We may not need this after 
all... (kohei)
-
 ScDBRangeBase() = delete;
 
 virtual ~ScDBRangeBase() = 0;
diff --git a/sc/source/ui/inc/autofmt.hxx b/sc/source/ui/inc/autofmt.hxx
index ecd89380def8..2a650ef77223 100644
--- a/sc/source/ui/inc/autofmt.hxx
+++ b/sc/source/ui/inc/autofmt.hxx
@@ -30,8 +30,6 @@ class SvNumberFormatter;
 class VirtualDevice;
 class ScViewData;
 
-enum AutoFmtLine { TOP_LINE, BOTTOM_LINE, LEFT_LINE, RIGHT_LINE };
-
 class SC_DLLPUBLIC ScAutoFmtPreview : public vcl::Window
 {
 public:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: chart2/source unotools/source vcl/opengl vcl/source vcl/unx xmloff/source

[Libreoffice Gerrit user]

 chart2/source/controller/dialogs/DialogModel.cxx |   81 +++
 unotools/source/config/fltrcfg.cxx   |   13 ---
 vcl/opengl/win/WinDeviceInfo.cxx |9 +-
 vcl/source/window/window.cxx |5 -
 vcl/unx/gtk/gtksys.cxx   |4 -
 xmloff/source/forms/propertyimport.cxx   |   13 +--
 6 files changed, 53 insertions(+), 72 deletions(-)

New commits:
commit 70894bcdb3912dbe87031da0af9ae5d591275e2a
Author: Noel Grandin 
AuthorDate: Tue Nov 20 13:09:09 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 23 13:35:25 2018 +0100

improve function local statics

simplify the initialisaion and make them thread-safe i.e. initialise
them using the runtime's local static locking.

Thanks to mike kaganski for pointing out the nice lambda approach that
makes this feasible.

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

diff --git a/chart2/source/controller/dialogs/DialogModel.cxx 
b/chart2/source/controller/dialogs/DialogModel.cxx
index d38ee3c68cbe..281f66c309f7 100644
--- a/chart2/source/controller/dialogs/DialogModel.cxx
+++ b/chart2/source/controller/dialogs/DialogModel.cxx
@@ -75,28 +75,26 @@ OUString lcl_ConvertRole( const OUString & rRoleString )
 OUString aResult( rRoleString );
 
 typedef std::map< OUString, OUString > tTranslationMap;
-static tTranslationMap aTranslationMap;
-
-if( aTranslationMap.empty() )
+static tTranslationMap aTranslationMap =
 {
-aTranslationMap[ "categories" ] =   ::chart::SchResId( 
STR_DATA_ROLE_CATEGORIES );
-aTranslationMap[ "error-bars-x" ] = ::chart::SchResId( 
STR_DATA_ROLE_X_ERROR );
-aTranslationMap[ "error-bars-x-positive" ] = ::chart::SchResId( 
STR_DATA_ROLE_X_ERROR_POSITIVE );
-aTranslationMap[ "error-bars-x-negative" ] = ::chart::SchResId( 
STR_DATA_ROLE_X_ERROR_NEGATIVE );
-aTranslationMap[ "error-bars-y" ] = ::chart::SchResId( 
STR_DATA_ROLE_Y_ERROR );
-aTranslationMap[ "error-bars-y-positive" ] = ::chart::SchResId( 
STR_DATA_ROLE_Y_ERROR_POSITIVE );
-aTranslationMap[ "error-bars-y-negative" ] = ::chart::SchResId( 
STR_DATA_ROLE_Y_ERROR_NEGATIVE );
-aTranslationMap[ "label" ] =::chart::SchResId( 
STR_DATA_ROLE_LABEL );
-aTranslationMap[ "values-first" ] = ::chart::SchResId( 
STR_DATA_ROLE_FIRST );
-aTranslationMap[ "values-last" ] =  ::chart::SchResId( 
STR_DATA_ROLE_LAST );
-aTranslationMap[ "values-max" ] =   ::chart::SchResId( 
STR_DATA_ROLE_MAX );
-aTranslationMap[ "values-min" ] =   ::chart::SchResId( 
STR_DATA_ROLE_MIN );
-aTranslationMap[ "values-x" ] = ::chart::SchResId( STR_DATA_ROLE_X 
);
-aTranslationMap[ "values-y" ] = ::chart::SchResId( STR_DATA_ROLE_Y 
);
-aTranslationMap[ "values-size" ] =  ::chart::SchResId( 
STR_DATA_ROLE_SIZE );
-aTranslationMap[ "FillColor" ] =::chart::SchResId( 
STR_PROPERTY_ROLE_FILLCOLOR );
-aTranslationMap[ "BorderColor" ] =  ::chart::SchResId( 
STR_PROPERTY_ROLE_BORDERCOLOR );
-}
+{ "categories", ::chart::SchResId( STR_DATA_ROLE_CATEGORIES ) },
+{ "error-bars-x", ::chart::SchResId( STR_DATA_ROLE_X_ERROR ) },
+{ "error-bars-x-positive", ::chart::SchResId( 
STR_DATA_ROLE_X_ERROR_POSITIVE ) },
+{ "error-bars-x-negative", ::chart::SchResId( 
STR_DATA_ROLE_X_ERROR_NEGATIVE ) },
+{ "error-bars-y", ::chart::SchResId( STR_DATA_ROLE_Y_ERROR ) },
+{ "error-bars-y-positive", ::chart::SchResId( 
STR_DATA_ROLE_Y_ERROR_POSITIVE ) },
+{ "error-bars-y-negative", ::chart::SchResId( 
STR_DATA_ROLE_Y_ERROR_NEGATIVE ) },
+{ "label",::chart::SchResId( STR_DATA_ROLE_LABEL ) },
+{ "values-first", ::chart::SchResId( STR_DATA_ROLE_FIRST ) },
+{ "values-last",  ::chart::SchResId( STR_DATA_ROLE_LAST ) },
+{ "values-max",   ::chart::SchResId( STR_DATA_ROLE_MAX ) },
+{ "values-min",   ::chart::SchResId( STR_DATA_ROLE_MIN ) },
+{ "values-x", ::chart::SchResId( STR_DATA_ROLE_X ) },
+{ "values-y", ::chart::SchResId( STR_DATA_ROLE_Y ) },
+{ "values-size",  ::chart::SchResId( STR_DATA_ROLE_SIZE ) },
+{ "FillColor",::chart::SchResId( STR_PROPERTY_ROLE_FILLCOLOR ) },
+{ "BorderColor",  ::chart::SchResId( STR_PROPERTY_ROLE_BORDERCOLOR ) },
+};
 
 tTranslationMap::const_iterator aIt( aTranslationMap.find( rRoleString ));
 if( aIt != aTranslationMap.end())
@@ -108,26 +106,28 @@ OUString lcl_ConvertRole( const OUString & rRoleString )
 
 typedef std::map< OUString, sal_Int32 > lcl_tRoleIndexMap;
 
-void lcl_createRoleIndexMap( lcl_tRoleIndexMap & rOutMap )
+lcl_tRoleIndexMap lcl_createRoleIndexMap()
 {
-rOutMap.clear();
+lcl_tRoleIndexMap aMap;
 sal_Int32 nInde

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

[Libreoffice Gerrit user]

 chart2/uiconfig/ui/dlg_InsertLegend.ui  |2 +-
 chart2/uiconfig/ui/tp_3D_SceneAppearance.ui |6 +++---
 chart2/uiconfig/ui/tp_3D_SceneGeometry.ui   |4 ++--
 chart2/uiconfig/ui/tp_PolarOptions.ui   |4 ++--
 chart2/uiconfig/ui/tp_SeriesToAxis.ui   |6 +++---
 sd/uiconfig/sdraw/ui/paranumberingtab.ui|4 ++--
 sd/uiconfig/simpress/ui/prntopts.ui |   14 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit da6c3fe58abdea9aeefd21454b84396ee4f1f1a2
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:13:20 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 13:29:12 2018 +0100

Related: tdf#118764 last of the GtkCheckButtons with can-focus False

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

diff --git a/chart2/uiconfig/ui/dlg_InsertLegend.ui 
b/chart2/uiconfig/ui/dlg_InsertLegend.ui
index 7ca2db0744ee..cf386794ef30 100644
--- a/chart2/uiconfig/ui/dlg_InsertLegend.ui
+++ b/chart2/uiconfig/ui/dlg_InsertLegend.ui
@@ -105,7 +105,7 @@
   
 _Display legend
 True
-False
+True
 False
 True
 0
diff --git a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui 
b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
index 83f851cbcafc..a214ebe21247 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
@@ -89,7 +89,7 @@
   
 _Shading
 True
-False
+True
 False
 True
 0
@@ -105,7 +105,7 @@
   
 _Object borders
 True
-False
+True
 False
 True
 0
@@ -121,7 +121,7 @@
   
 _Rounded edges
 True
-False
+True
 False
 True
 0
diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui 
b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
index 005e24eaa3f6..a09bb40eec32 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
@@ -23,7 +23,7 @@
   
 _Right-angled 
axes
 True
-False
+True
 False
 True
 0
@@ -81,7 +81,7 @@
   
 _Perspective
 True
-False
+True
 False
 True
 0
diff --git a/chart2/uiconfig/ui/tp_PolarOptions.ui 
b/chart2/uiconfig/ui/tp_PolarOptions.ui
index 85d3434813f2..17c3f47fb3dc 100644
--- a/chart2/uiconfig/ui/tp_PolarOptions.ui
+++ b/chart2/uiconfig/ui/tp_PolarOptions.ui
@@ -29,7 +29,7 @@
   
 _Clockwise direction
 True
-False
+True
 False
 True
 0
@@ -167,7 +167,7 @@
   
 Include _values from 
hidden cells
 True
-False
+True
 False
 True
 0
diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui 
b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
index a075ad066391..f5957b407eb0 100644
--- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui
+++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
@@ -177,7 +177,7 @@
   
 Show _bars side by 
side
 True
-False
+True
 False
 True
 0
@@ -193,7 +193,7 @@
   
 Connection lines
 True
-False
+True
 False
 True
 0
@@ -329,7 +329,7 @@
   
 Include _values from hidden 
cells
 True
-False
+True
 False
 True
 0
diff --git a/sd/uiconfig/sdraw/ui/paranumberingtab.ui 
b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
index a2c4b18e9424..b3fa29eaeecb 100644
--- a/sd/uiconfig/sdraw/ui/paranumberingtab.ui
+++ b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
@@ -29,7 +29,7 @@
   
 R_estart at this 
paragraph
 True
-False
+True
 False
 True
 0
@@ -59,7 +59,7 @@
 S_tart 
with:
 True
 False
-False
+True
 False
 start
 12
diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/s

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

[Libreoffice Gerrit user]

 vcl/unx/gtk3/gtk3gtkinst.cxx |   19 +++
 1 file changed, 19 insertions(+)

New commits:
commit 3760cfe1cb146bf99077579a5d3939a6b668a7d4
Author: Caolán McNamara 
AuthorDate: Mon Nov 12 13:31:13 2018 +
Commit: Eike Rathke 
CommitDate: Fri Nov 23 12:33:49 2018 +0100

honor getNumDecimalSep for keypad input in native gtk3 dialogs

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index ee3dc615243a..e5b1cdf4f1d6 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1182,6 +1182,7 @@ private:
 bool m_bTakeOwnership;
 gulong m_nFocusInSignalId;
 gulong m_nFocusOutSignalId;
+gulong m_nKeyPressSignalId;
 
 static void signalFocusIn(GtkWidget*, GdkEvent*, gpointer widget)
 {
@@ -1197,6 +1198,17 @@ private:
 pThis->signal_focus_out();
 }
 
+static gboolean signalKeyPress(GtkWidget*, GdkEventKey* pEvent, gpointer)
+{
+// #i1820# use locale specific decimal separator
+if (pEvent->keyval == GDK_KEY_KP_Decimal && 
Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
+{
+OUString 
aSep(Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep());
+pEvent->keyval = aSep[0];
+}
+return false;
+}
+
 public:
 GtkInstanceWidget(GtkWidget* pWidget, bool bTakeOwnership)
 : m_pWidget(pWidget)
@@ -1204,6 +1216,11 @@ public:
 , m_nFocusInSignalId(0)
 , m_nFocusOutSignalId(0)
 {
+GdkEventMask 
eEventMask(static_cast(gtk_widget_get_events(pWidget)));
+if (eEventMask & GDK_BUTTON_PRESS_MASK)
+m_nKeyPressSignalId = g_signal_connect(pWidget, "key-press-event", 
G_CALLBACK(signalKeyPress), this);
+else
+m_nKeyPressSignalId = 0;
 }
 
 virtual void set_sensitive(bool sensitive) override
@@ -1474,6 +1491,8 @@ public:
 
 virtual ~GtkInstanceWidget() override
 {
+if (m_nKeyPressSignalId)
+g_signal_handler_disconnect(m_pWidget, m_nKeyPressSignalId);
 if (m_nFocusInSignalId)
 g_signal_handler_disconnect(m_pWidget, m_nFocusInSignalId);
 if (m_nFocusOutSignalId)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 sc/source/core/tool/interpr1.cxx |   16 +++-
 1 file changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 0c8b936734285ee7f373c41ecbad5a65953789dc
Author: Eike Rathke 
AuthorDate: Thu Nov 22 21:37:52 2018 +0100
Commit: Eike Rathke 
CommitDate: Fri Nov 23 12:31:51 2018 +0100

Check isEmptyStringQuery() early to avoid call ..., tdf#121052 follow-up

... and comparison of lcl_getPrevRowWithEmptyValueLookup() result.

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

diff --git a/sc/source/core/tool/interpr1.cxx b/sc/source/core/tool/interpr1.cxx
index b1bca830b582..c659f0f93ae3 100644
--- a/sc/source/core/tool/interpr1.cxx
+++ b/sc/source/core/tool/interpr1.cxx
@@ -9769,9 +9769,10 @@ static bool lcl_LookupQuery( ScAddress & o_rResultPos, 
ScDocument * pDoc, const
 //  [RangeArray] is the reference, which is to comprise at least two columns.
 //  [Index] is the number of the column in the array that contains the value 
to be returned. The first column has the number 1.
 //
+// Prerequisite of lcl_getPrevRowWithEmptyValueLookup():
+//  Value referenced by [SearchCriterion] is empty.
 // lcl_getPrevRowWithEmptyValueLookup() performs following checks:
-// - if value referenced by [SearchCriterion] is empty
-// - and if we run query with "exact match" mode (i.e. VLOOKUP)
+// - if we run query with "exact match" mode (i.e. VLOOKUP)
 // - and if we already have the same lookup done before but for another row
 //   which is also had empty [SearchCriterion]
 //
@@ -9786,12 +9787,9 @@ static bool lcl_LookupQuery( ScAddress & o_rResultPos, 
ScDocument * pDoc, const
 // This method was added only for speed up to avoid several useless complete
 // lookups inside [RangeArray] for searching empty strings.
 //
-static SCROW lcl_getPrevRowWithEmptyValueLookup(const ScLookupCache& rCache, 
const ScLookupCache::QueryCriteria& aCriteria, const ScQueryParam & rParam)
+static SCROW lcl_getPrevRowWithEmptyValueLookup( const ScLookupCache& rCache,
+const ScLookupCache::QueryCriteria& rCriteria, const ScQueryParam & 
rParam)
 {
-// is search with equal match?
-if (! aCriteria.isEmptyStringQuery())
-return -1; // not found
-
 // is lookup value empty?
 const ScQueryEntry& rEntry = rParam.GetEntry(0);
 const ScQueryEntry::Item& rItem = rEntry.GetQueryItem();
@@ -9800,7 +9798,7 @@ static SCROW lcl_getPrevRowWithEmptyValueLookup(const 
ScLookupCache& rCache, con
 
 // try to find the row index for which we have already performed lookup
 // and have some result of it inside cache
-return rCache.lookup( aCriteria );
+return rCache.lookup( rCriteria );
 }
 
 bool ScInterpreter::LookupQueryWithCache( ScAddress & o_rResultPos,
@@ -9830,7 +9828,7 @@ bool ScInterpreter::LookupQueryWithCache( ScAddress & 
o_rResultPos,
 // tdf#121052: Slow load of cells with VLOOKUP with references to 
empty cells
 // This check was added only for speed up to avoid several useless 
complete
 // lookups inside [RangeArray] for searching empty strings.
-if (eCacheResult == ScLookupCache::NOT_CACHED)
+if (eCacheResult == ScLookupCache::NOT_CACHED && 
aCriteria.isEmptyStringQuery())
 {
 const SCROW nPrevRowWithEmptyValueLookup = 
lcl_getPrevRowWithEmptyValueLookup(rCache, aCriteria, rParam);
 if (nPrevRowWithEmptyValueLookup >= 0)
___
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' - chart2/uiconfig cui/uiconfig sd/uiconfig

[Libreoffice Gerrit user]

 chart2/uiconfig/ui/tp_SeriesToAxis.ui |   10 +-
 cui/uiconfig/ui/paratabspage.ui   |   12 ++--
 sd/uiconfig/simpress/ui/prntopts.ui   |8 
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 173937d66a48b2e4c1f2ca60a44373fff72a505c
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:05:55 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 12:31:00 2018 +0100

Related: tdf#118764 last of the GtkRadioButtons with can-focus False

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

diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui 
b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
index a321664dcd49..a075ad066391 100644
--- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui
+++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
@@ -41,7 +41,7 @@
   
 Primary Y axis
 True
-False
+True
 False
 True
 0
@@ -58,7 +58,7 @@
   
 Secondary Y axis
 True
-False
+True
 False
 True
 0
@@ -266,7 +266,7 @@
   
 _Leave gap
 True
-False
+True
 False
 True
 0
@@ -282,7 +282,7 @@
   
 _Assume zero
 True
-False
+True
 False
 True
 0
@@ -299,7 +299,7 @@
   
 _Continue line
 True
-False
+True
 False
 True
 0
diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index cf7e369695c2..bedddbba6fe4 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -160,7 +160,7 @@
   
 Deci_mal
 True
-False
+True
 False
 True
 0
@@ -231,7 +231,7 @@
 
   
 _Left
-False
+True
 False
 True
 0
@@ -247,7 +247,7 @@
 
   
 _Left/Top
-False
+True
 False
 True
 0
@@ -274,7 +274,7 @@
 
   
 Righ_t
-False
+True
 False
 True
 0
@@ -290,7 +290,7 @@
 
   
 Righ_t/Bottom
-False
+True
 False
 True
 0
@@ -313,7 +313,7 @@
   
 C_entered
 True
-False
+True
 False
 True
 0
diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/sd/uiconfig/simpress/ui/prntopts.ui
index 4ff1efd84192..d3c855d7f5de 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -144,7 +144,7 @@
   
 Default
 True
-False
+True
 False
 True
 0
@@ -163,7 +163,7 @@
   
 _Fit to page
 True
-False
+True
 False
 True
 0
@@ -181,7 +181,7 @@
   
 _Tile pages
 True
-False
+True
 False
 True
 0
@@ -199,7 +199,7 @@
   
 B_rochure
 True
-False
+True
 

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

[Libreoffice Gerrit user]

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

New commits:
commit b3b42112a3b1821b369c68277ba9284d6c4a162b
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:00:56 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 12:30:29 2018 +0100

check EnableLocalizedDecimalSep

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index c5b3d3e32489..c35088723a29 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1208,7 +1208,7 @@ private:
 static gboolean signalKeyPress(GtkWidget*, GdkEventKey* pEvent, gpointer)
 {
 // #i1820# use locale specific decimal separator
-if (pEvent->keyval == GDK_KEY_KP_Decimal)
+if (pEvent->keyval == GDK_KEY_KP_Decimal && 
Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
 {
 OUString 
aSep(Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep());
 pEvent->keyval = aSep[0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/uiconfig/ui/tp_SeriesToAxis.ui |   10 +-
 cui/uiconfig/ui/paratabspage.ui   |   12 ++--
 sd/uiconfig/simpress/ui/prntopts.ui   |8 
 3 files changed, 15 insertions(+), 15 deletions(-)

New commits:
commit 01e479272ae419384d2fa088370b52fc7160709f
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:05:55 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 12:30:00 2018 +0100

Related: tdf#118764 last of the GtkRadioButtons with can-focus False

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

diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui 
b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
index 4d9234b93b08..f5957b407eb0 100644
--- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui
+++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
@@ -41,7 +41,7 @@
   
 Primary Y axis
 True
-False
+True
 False
 True
 0
@@ -58,7 +58,7 @@
   
 Secondary Y axis
 True
-False
+True
 False
 True
 0
@@ -266,7 +266,7 @@
   
 _Leave gap
 True
-False
+True
 False
 True
 0
@@ -282,7 +282,7 @@
   
 _Assume zero
 True
-False
+True
 False
 True
 0
@@ -299,7 +299,7 @@
   
 _Continue line
 True
-False
+True
 False
 True
 0
diff --git a/cui/uiconfig/ui/paratabspage.ui b/cui/uiconfig/ui/paratabspage.ui
index cf7e369695c2..bedddbba6fe4 100644
--- a/cui/uiconfig/ui/paratabspage.ui
+++ b/cui/uiconfig/ui/paratabspage.ui
@@ -160,7 +160,7 @@
   
 Deci_mal
 True
-False
+True
 False
 True
 0
@@ -231,7 +231,7 @@
 
   
 _Left
-False
+True
 False
 True
 0
@@ -247,7 +247,7 @@
 
   
 _Left/Top
-False
+True
 False
 True
 0
@@ -274,7 +274,7 @@
 
   
 Righ_t
-False
+True
 False
 True
 0
@@ -290,7 +290,7 @@
 
   
 Righ_t/Bottom
-False
+True
 False
 True
 0
@@ -313,7 +313,7 @@
   
 C_entered
 True
-False
+True
 False
 True
 0
diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/sd/uiconfig/simpress/ui/prntopts.ui
index 80660d699081..0d24f4969df0 100644
--- a/sd/uiconfig/simpress/ui/prntopts.ui
+++ b/sd/uiconfig/simpress/ui/prntopts.ui
@@ -144,7 +144,7 @@
   
 Default
 True
-False
+True
 False
 True
 0
@@ -163,7 +163,7 @@
   
 _Fit to page
 True
-False
+True
 False
 True
 0
@@ -181,7 +181,7 @@
   
 _Tile pages
 True
-False
+True
 False
 True
 0
@@ -199,7 +199,7 @@
   
 B_rochure
 True
-False
+True
 

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

[Libreoffice Gerrit user]

 chart2/uiconfig/ui/dlg_InsertLegend.ui  |2 +-
 chart2/uiconfig/ui/tp_3D_SceneAppearance.ui |6 +++---
 chart2/uiconfig/ui/tp_3D_SceneGeometry.ui   |4 ++--
 chart2/uiconfig/ui/tp_PolarOptions.ui   |4 ++--
 chart2/uiconfig/ui/tp_SeriesToAxis.ui   |6 +++---
 sd/uiconfig/sdraw/ui/paranumberingtab.ui|4 ++--
 sd/uiconfig/simpress/ui/prntopts.ui |   14 +++---
 7 files changed, 20 insertions(+), 20 deletions(-)

New commits:
commit af1cac1fd5cdab9ce02332eb41d1cdbdbde98bf3
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:13:20 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 12:29:42 2018 +0100

Related: tdf#118764 last of the GtkCheckButtons with can-focus False

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

diff --git a/chart2/uiconfig/ui/dlg_InsertLegend.ui 
b/chart2/uiconfig/ui/dlg_InsertLegend.ui
index 7ca2db0744ee..cf386794ef30 100644
--- a/chart2/uiconfig/ui/dlg_InsertLegend.ui
+++ b/chart2/uiconfig/ui/dlg_InsertLegend.ui
@@ -105,7 +105,7 @@
   
 _Display legend
 True
-False
+True
 False
 True
 0
diff --git a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui 
b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
index 83f851cbcafc..a214ebe21247 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneAppearance.ui
@@ -89,7 +89,7 @@
   
 _Shading
 True
-False
+True
 False
 True
 0
@@ -105,7 +105,7 @@
   
 _Object borders
 True
-False
+True
 False
 True
 0
@@ -121,7 +121,7 @@
   
 _Rounded edges
 True
-False
+True
 False
 True
 0
diff --git a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui 
b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
index 005e24eaa3f6..a09bb40eec32 100644
--- a/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
+++ b/chart2/uiconfig/ui/tp_3D_SceneGeometry.ui
@@ -23,7 +23,7 @@
   
 _Right-angled 
axes
 True
-False
+True
 False
 True
 0
@@ -81,7 +81,7 @@
   
 _Perspective
 True
-False
+True
 False
 True
 0
diff --git a/chart2/uiconfig/ui/tp_PolarOptions.ui 
b/chart2/uiconfig/ui/tp_PolarOptions.ui
index 85d3434813f2..17c3f47fb3dc 100644
--- a/chart2/uiconfig/ui/tp_PolarOptions.ui
+++ b/chart2/uiconfig/ui/tp_PolarOptions.ui
@@ -29,7 +29,7 @@
   
 _Clockwise direction
 True
-False
+True
 False
 True
 0
@@ -167,7 +167,7 @@
   
 Include _values from 
hidden cells
 True
-False
+True
 False
 True
 0
diff --git a/chart2/uiconfig/ui/tp_SeriesToAxis.ui 
b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
index a321664dcd49..4d9234b93b08 100644
--- a/chart2/uiconfig/ui/tp_SeriesToAxis.ui
+++ b/chart2/uiconfig/ui/tp_SeriesToAxis.ui
@@ -177,7 +177,7 @@
   
 Show _bars side by 
side
 True
-False
+True
 False
 True
 0
@@ -193,7 +193,7 @@
   
 Connection lines
 True
-False
+True
 False
 True
 0
@@ -329,7 +329,7 @@
   
 Include _values from hidden 
cells
 True
-False
+True
 False
 True
 0
diff --git a/sd/uiconfig/sdraw/ui/paranumberingtab.ui 
b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
index a2c4b18e9424..b3fa29eaeecb 100644
--- a/sd/uiconfig/sdraw/ui/paranumberingtab.ui
+++ b/sd/uiconfig/sdraw/ui/paranumberingtab.ui
@@ -29,7 +29,7 @@
   
 R_estart at this 
paragraph
 True
-False
+True
 False
 True
 0
@@ -59,7 +59,7 @@
 S_tart 
with:
 True
 False
-False
+True
 False
 start
 12
diff --git a/sd/uiconfig/simpress/ui/prntopts.ui 
b/s

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Menu.hxx |5 +
 vcl/qt5/Qt5Menu.cxx |  128 
 2 files changed, 113 insertions(+), 20 deletions(-)

New commits:
commit bc023edb6a8c9d4179ce18b1f6cec990d0107201
Author: Aleksei Nikiforov 
AuthorDate: Thu Nov 22 12:55:06 2018 +0300
Commit: Katarina Behrens 
CommitDate: Fri Nov 23 12:26:52 2018 +0100

tdf#121417 Allow dynamic menu changes for Qt5 and KDE5 interfaces

Separate HandleMenuActivateEvent function call from HandleMenuCommandEvent 
function call
since first one might update some of menus. Also add call to 
HandleMenuDeActivateEvent function.

Delete action with Qt5MenuItem to reflect the change in actual menu.

Also update underlying qt-based menu from Qt5Menu::InsertItem function.

And update Qt5Menu::SetItemImage to work with different types of 
descendants of SalBitmap.
This code is shared between Qt5 and KDE5 plugins, but KDE5 plugin uses 
SvpSalBitmap instead of Qt5Bitmap.
New image conversion process is borrowed from GTK plugin code.
This approach is used in order to properly process transparency channel if 
it's present, and it is present usually.

This change also fixes tdf#120789.

Change-Id: Ifdc64c3e5d80782955b52e2da8fcff4844d2dc25
Reviewed-on: https://gerrit.libreoffice.org/63862
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index 92d2e18b9c5c..b7432a3c11e3 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -34,7 +34,7 @@ private:
 void DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu = nullptr);
 static void NativeItemText(OUString& rItemText);
 
-QMenu* InsertMenuItem(Qt5MenuItem* pSalMenuItem);
+QMenu* InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos);
 
 public:
 Qt5Menu(bool bMenuBar);
@@ -69,12 +69,15 @@ Q_SIGNALS:
 
 private slots:
 static void slotMenuTriggered(Qt5MenuItem* pQItem);
+static void slotMenuAboutToShow(Qt5MenuItem* pQItem);
+static void slotMenuAboutToHide(Qt5MenuItem* pQItem);
 };
 
 class Qt5MenuItem : public SalMenuItem
 {
 public:
 Qt5MenuItem(const SalItemParams*);
+virtual ~Qt5MenuItem();
 
 Qt5Menu* mpParentMenu; // The menu into which this menu item is inserted
 Qt5Menu* mpSubMenu; // Submenu of this item (if defined)
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index ed26f31f2761..15e0136b18f3 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -10,6 +10,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -17,6 +18,8 @@
 
 #include 
 #include 
+#include 
+#include 
 
 Qt5Menu::Qt5Menu(bool bMenuBar)
 : mpVCLMenu(nullptr)
@@ -34,7 +37,7 @@ Qt5Menu::~Qt5Menu() { maItems.clear(); }
 
 bool Qt5Menu::VisibleMenuBar() { return true; }
 
-QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem)
+QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem, unsigned nPos)
 {
 QMenu* pQMenu = mpQMenu;
 sal_uInt16 nId = pSalMenuItem->mnId;
@@ -44,25 +47,73 @@ QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem)
 bool bChecked = mpVCLMenu->IsItemChecked(nId);
 MenuItemBits itemBits = mpVCLMenu->GetItemBits(nId);
 
-if (mbMenuBar && mpQMenuBar)
+if (mbMenuBar)
+{
 // top-level menu
-pQMenu = mpQMenuBar->addMenu(toQString(aText));
-else
+if (mpQMenuBar)
+{
+if ((nPos != MENU_APPEND)
+&& (static_cast(nPos) < 
static_cast(mpQMenuBar->actions().size(
+{
+pQMenu = new QMenu(toQString(aText), mpQMenuBar);
+mpQMenuBar->insertMenu(mpQMenuBar->actions()[nPos], pQMenu);
+}
+else
+{
+pQMenu = mpQMenuBar->addMenu(toQString(aText));
+}
+
+connect(pQMenu, &QMenu::aboutToShow, this,
+[pSalMenuItem] { slotMenuAboutToShow(pSalMenuItem); });
+connect(pQMenu, &QMenu::aboutToHide, this,
+[pSalMenuItem] { slotMenuAboutToHide(pSalMenuItem); });
+}
+}
+else if (pQMenu)
 {
 if (pSalMenuItem->mpSubMenu)
 {
 // submenu
 pQMenu = pQMenu->addMenu(toQString(aText));
 mpQActionGroup = new QActionGroup(pQMenu);
+
+connect(pQMenu, &QMenu::aboutToShow, this,
+[pSalMenuItem] { slotMenuAboutToShow(pSalMenuItem); });
+connect(pQMenu, &QMenu::aboutToHide, this,
+[pSalMenuItem] { slotMenuAboutToHide(pSalMenuItem); });
 }
 else
 {
+delete pSalMenuItem->mpAction;
+
 if (pSalMenuItem->mnType == MenuItemType::SEPARATOR)
-pQMenu->addSeparator();
+{
+if ((nPos != MENU_APPEND)
+&& (static_cast(nPos) < 
static_cast(pQMenu->actions().size(
+{
+

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

[Libreoffice Gerrit user]

 sw/source/ui/chrdlg/swuiccoll.cxx |3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit c0acd3532e8604dfe19bc117fcf6cce3413a7606
Author: Caolán McNamara 
AuthorDate: Thu Nov 22 15:33:19 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 12:04:12 2018 +0100

coverity#1441484 Logically dead code

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

diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx 
b/sw/source/ui/chrdlg/swuiccoll.cxx
index 16fa6e1761db..b79c721ba593 100644
--- a/sw/source/ui/chrdlg/swuiccoll.cxx
+++ b/sw/source/ui/chrdlg/swuiccoll.cxx
@@ -243,8 +243,7 @@ void SwCondCollPage::SelectHdl(const weld::Widget* pBox)
 }
 pBase = pPool->Next();
 }
-if (!bEmpty)
-m_xStyleLB->select(bEmpty ? -1 : 0);
+m_xStyleLB->select(bEmpty ? -1 : 0);
 SelectHdl(m_xStyleLB.get());
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

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

New commits:
commit 262377d1b45e46a426b705edb5b513f069f06d33
Author: Caolán McNamara 
AuthorDate: Fri Nov 23 09:00:56 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 12:03:22 2018 +0100

check EnableLocalizedDecimalSep

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

diff --git a/vcl/unx/gtk3/gtk3gtkinst.cxx b/vcl/unx/gtk3/gtk3gtkinst.cxx
index c5b3d3e32489..c35088723a29 100644
--- a/vcl/unx/gtk3/gtk3gtkinst.cxx
+++ b/vcl/unx/gtk3/gtk3gtkinst.cxx
@@ -1208,7 +1208,7 @@ private:
 static gboolean signalKeyPress(GtkWidget*, GdkEventKey* pEvent, gpointer)
 {
 // #i1820# use locale specific decimal separator
-if (pEvent->keyval == GDK_KEY_KP_Decimal)
+if (pEvent->keyval == GDK_KEY_KP_Decimal && 
Application::GetSettings().GetMiscSettings().GetEnableLocalizedDecimalSep())
 {
 OUString 
aSep(Application::GetSettings().GetLocaleDataWrapper().getNumDecimalSep());
 pEvent->keyval = aSep[0];
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Menu.hxx |5 +
 vcl/qt5/Qt5Menu.cxx |  124 +---
 2 files changed, 72 insertions(+), 57 deletions(-)

New commits:
commit e0d6fe0b55c91fd45531438dfc8a5ee28a99de94
Author: Aleksei Nikiforov 
AuthorDate: Thu Nov 22 12:27:26 2018 +0300
Commit: Katarina Behrens 
CommitDate: Fri Nov 23 11:48:22 2018 +0100

Move menu item insertion into separate function

Change-Id: I721910bbbd558827e9a5de1f8763426b460f08fa
Reviewed-on: https://gerrit.libreoffice.org/63861
Tested-by: Jenkins
Reviewed-by: Katarina Behrens 

diff --git a/vcl/inc/qt5/Qt5Menu.hxx b/vcl/inc/qt5/Qt5Menu.hxx
index e31c44fa8b55..92d2e18b9c5c 100644
--- a/vcl/inc/qt5/Qt5Menu.hxx
+++ b/vcl/inc/qt5/Qt5Menu.hxx
@@ -12,6 +12,7 @@
 #include 
 
 class MenuItemList;
+class QActionGroup;
 class QMenu;
 class QMenuBar;
 class Qt5MenuItem;
@@ -27,10 +28,14 @@ private:
 Qt5Frame* mpFrame;
 bool mbMenuBar;
 QMenuBar* mpQMenuBar;
+QMenu* mpQMenu;
+QActionGroup* mpQActionGroup;
 
 void DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu = nullptr);
 static void NativeItemText(OUString& rItemText);
 
+QMenu* InsertMenuItem(Qt5MenuItem* pSalMenuItem);
+
 public:
 Qt5Menu(bool bMenuBar);
 virtual ~Qt5Menu() override;
diff --git a/vcl/qt5/Qt5Menu.cxx b/vcl/qt5/Qt5Menu.cxx
index c3228bdd90c0..ed26f31f2761 100644
--- a/vcl/qt5/Qt5Menu.cxx
+++ b/vcl/qt5/Qt5Menu.cxx
@@ -23,6 +23,9 @@ Qt5Menu::Qt5Menu(bool bMenuBar)
 , mpParentSalMenu(nullptr)
 , mpFrame(nullptr)
 , mbMenuBar(bMenuBar)
+, mpQMenuBar(nullptr)
+, mpQMenu(nullptr)
+, mpQActionGroup(nullptr)
 {
 connect(this, &Qt5Menu::setFrameSignal, this, &Qt5Menu::SetFrame, 
Qt::BlockingQueuedConnection);
 }
@@ -31,6 +34,67 @@ Qt5Menu::~Qt5Menu() { maItems.clear(); }
 
 bool Qt5Menu::VisibleMenuBar() { return true; }
 
+QMenu* Qt5Menu::InsertMenuItem(Qt5MenuItem* pSalMenuItem)
+{
+QMenu* pQMenu = mpQMenu;
+sal_uInt16 nId = pSalMenuItem->mnId;
+OUString aText = mpVCLMenu->GetItemText(nId);
+NativeItemText(aText);
+vcl::KeyCode nAccelKey = mpVCLMenu->GetAccelKey(nId);
+bool bChecked = mpVCLMenu->IsItemChecked(nId);
+MenuItemBits itemBits = mpVCLMenu->GetItemBits(nId);
+
+if (mbMenuBar && mpQMenuBar)
+// top-level menu
+pQMenu = mpQMenuBar->addMenu(toQString(aText));
+else
+{
+if (pSalMenuItem->mpSubMenu)
+{
+// submenu
+pQMenu = pQMenu->addMenu(toQString(aText));
+mpQActionGroup = new QActionGroup(pQMenu);
+}
+else
+{
+if (pSalMenuItem->mnType == MenuItemType::SEPARATOR)
+pQMenu->addSeparator();
+else
+{
+// leaf menu
+QAction* pAction = pQMenu->addAction(toQString(aText));
+pSalMenuItem->mpAction = pAction;
+
pAction->setShortcut(toQString(nAccelKey.GetName(GetFrame()->GetWindow(;
+
+if (itemBits & MenuItemBits::CHECKABLE)
+{
+pAction->setCheckable(true);
+pAction->setChecked(bChecked);
+}
+else if (itemBits & MenuItemBits::RADIOCHECK)
+{
+pAction->setCheckable(true);
+if (!mpQActionGroup)
+{
+mpQActionGroup = new QActionGroup(pQMenu);
+mpQActionGroup->setExclusive(true);
+}
+mpQActionGroup->addAction(pAction);
+pAction->setChecked(bChecked);
+}
+
+pAction->setEnabled(pSalMenuItem->mbEnabled);
+pAction->setVisible(pSalMenuItem->mbVisible);
+
+connect(pAction, &QAction::triggered, this,
+[pSalMenuItem] { slotMenuTriggered(pSalMenuItem); });
+}
+}
+}
+
+return pQMenu;
+}
+
 void Qt5Menu::InsertItem(SalMenuItem* pSalMenuItem, unsigned nPos)
 {
 SolarMutexGuard aGuard;
@@ -88,70 +152,16 @@ void Qt5Menu::SetFrame(const SalFrame* pFrame)
 
 void Qt5Menu::DoFullMenuUpdate(Menu* pMenuBar, QMenu* pParentMenu)
 {
-Menu* pVCLMenu = mpVCLMenu;
+mpQMenu = pParentMenu;
 
 if (mbMenuBar && mpQMenuBar)
 mpQMenuBar->clear();
-QActionGroup* pQAG = nullptr;
+mpQActionGroup = nullptr;
 
 for (sal_Int32 nItem = 0; nItem < static_cast(GetItemCount()); 
nItem++)
 {
 Qt5MenuItem* pSalMenuItem = GetItemAtPos(nItem);
-sal_uInt16 nId = pSalMenuItem->mnId;
-OUString aText = pVCLMenu->GetItemText(nId);
-QMenu* pQMenu = pParentMenu;
-NativeItemText(aText);
-vcl::KeyCode nAccelKey = pVCLMenu->GetAccelKey(nId);
-bool bChecked = pVCLMenu->IsItemChecked(nId);
-MenuItemBits itemBits = pVCLMenu->GetItemBits(nId);
-
-if (mbMenuBar && mpQMenuBar)
-  

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

[Libreoffice Gerrit user]

 sc/uiconfig/scalc/ui/notebookbar.ui |5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

New commits:
commit 8d53e34c52ae2604da4cb1dafd24bcb1d42d251d
Author: andreas kainz 
AuthorDate: Thu Nov 22 23:29:14 2018 +0100
Commit: andreas_kainz 
CommitDate: Fri Nov 23 11:16:26 2018 +0100

Tabbed NB calc: fix drop down menues

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

diff --git a/sc/uiconfig/scalc/ui/notebookbar.ui 
b/sc/uiconfig/scalc/ui/notebookbar.ui
index bb4cbb0bd921..a70bd3443f71 100644
--- a/sc/uiconfig/scalc/ui/notebookbar.ui
+++ b/sc/uiconfig/scalc/ui/notebookbar.ui
@@ -4928,8 +4928,6 @@
   
 True
 False
-center
-True
 
   
 Fiel_d
@@ -7235,8 +7233,6 @@
   
 True
 False
-center
-True
 
   
 _Statistics
@@ -7247,6 +7243,7 @@
 .uno:StatisticsMenu
 StatisticsImg
 none
+True
 top
 True
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 loleaflet/src/layer/tile/TileLayer.js |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df5d96efa88fff2549fb5d1fedfc4dc59cc20977
Author: Tor Lillqvist 
AuthorDate: Fri Nov 23 11:41:48 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 23 11:43:07 2018 +0200

Fix scrolling when moving the cell cursor outside view in a spreadsheet

Follow-up to the touch pinch zooming fixes in
e27ae38bebf4b57aa7563357a188e33d0e1e0be8. Need to pass the special
calledFromInvalidateCursorMsg property to the scrollto handler here,
too.

The calledFromInvalidateCursorMsg property is now slightly
misleadingly named. Should rename it to something that covers both use
cases.

Change-Id: I232b6a40708c7635fcebef37ff5640e1ba9eaac5

diff --git a/loleaflet/src/layer/tile/TileLayer.js 
b/loleaflet/src/layer/tile/TileLayer.js
index dab81ba49..2a179ecec 100644
--- a/loleaflet/src/layer/tile/TileLayer.js
+++ b/loleaflet/src/layer/tile/TileLayer.js
@@ -1916,7 +1916,7 @@ L.TileLayer = L.GridLayer.extend({
center = 
center.subtract(this._map.getSize().divideBy(2));
center.x = Math.round(center.x < 0 ? 0 
: center.x);
center.y = Math.round(center.y < 0 ? 0 
: center.y);
-   this._map.fire('scrollto', {x: 
center.x, y: center.y});
+   this._map.fire('scrollto', {x: 
center.x, y: center.y, calledFromInvalidateCursorMsg: true});
}
this._prevCellCursorXY = this._cellCursorXY;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/unodraw/unoshape.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit d4190685ac208677bc77f66976287dda0360c42d
Author: Markus Mohrhard 
AuthorDate: Fri Nov 23 01:21:29 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 10:35:33 2018 +0100

tdf#114836, only set changed SfxItemSet properties

By always setting all existing properties again the calls started
to differ between XMultiPropertySet::setPropertyValues and
XPropertySet::setPropertyValue. This patch reduces the changes in
the called methods. We can not avoid slight differences but at least
the risk is minimized that something is unexpectedly changed.

Change-Id: I5866db7be2829e6aba930f620f45db655df4e3f7
Reviewed-on: https://gerrit.libreoffice.org/63854
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 80cf278d365a2d357c70b8c28947c91fa97e7a99)
Reviewed-on: https://gerrit.libreoffice.org/63856
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index 5314fffc2050..b89188720c65 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1623,7 +1623,11 @@ void SvxShape::_setPropertyValue( const OUString& 
rPropertyName, const uno::Any&
 {
 if( mpImpl->mpItemSet == nullptr )
 {
-mpImpl->mpItemSet = GetSdrObject()->GetMergedItemSet().Clone();
+mpImpl->mpItemSet.reset(new SfxItemSet( 
GetSdrObject()->getSdrModelFromSdrObject().GetItemPool(),  {{pMap->nWID, 
pMap->nWID}}));
+}
+else
+{
+mpImpl->mpItemSet->MergeRange(pMap->nWID, pMap->nWID);
 }
 pSet = mpImpl->mpItemSet.get();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 svx/source/unodraw/unoshape.cxx |6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit b3af23568f9b9b444ae09f2a1ab4a61d212b422a
Author: Markus Mohrhard 
AuthorDate: Fri Nov 23 01:21:29 2018 +0100
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 10:35:18 2018 +0100

tdf#114836, only set changed SfxItemSet properties

By always setting all existing properties again the calls started
to differ between XMultiPropertySet::setPropertyValues and
XPropertySet::setPropertyValue. This patch reduces the changes in
the called methods. We can not avoid slight differences but at least
the risk is minimized that something is unexpectedly changed.

Change-Id: I5866db7be2829e6aba930f620f45db655df4e3f7
Reviewed-on: https://gerrit.libreoffice.org/63854
Tested-by: Jenkins
Reviewed-by: Markus Mohrhard 
(cherry picked from commit 80cf278d365a2d357c70b8c28947c91fa97e7a99)
Reviewed-on: https://gerrit.libreoffice.org/63857
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/source/unodraw/unoshape.cxx b/svx/source/unodraw/unoshape.cxx
index f2bfa4f94bd8..1a187f773d64 100644
--- a/svx/source/unodraw/unoshape.cxx
+++ b/svx/source/unodraw/unoshape.cxx
@@ -1687,7 +1687,11 @@ void SvxShape::_setPropertyValue( const OUString& 
rPropertyName, const uno::Any&
 {
 if( mpImpl->mpItemSet == nullptr )
 {
-mpImpl->mpItemSet = GetSdrObject()->GetMergedItemSet().Clone();
+mpImpl->mpItemSet.reset(new SfxItemSet( 
GetSdrObject()->getSdrModelFromSdrObject().GetItemPool(),  {{pMap->nWID, 
pMap->nWID}}));
+}
+else
+{
+mpImpl->mpItemSet->MergeRange(pMap->nWID, pMap->nWID);
 }
 pSet = mpImpl->mpItemSet.get();
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] online.git: configure.ac ios/README

[Libreoffice Gerrit user]

 configure.ac |2 +-
 ios/README   |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit a9f6d57dc831dd245bed01304c2da5d0e0cb
Author: Tor Lillqvist 
AuthorDate: Fri Nov 23 11:26:05 2018 +0200
Commit: Tor Lillqvist 
CommitDate: Fri Nov 23 11:26:57 2018 +0200

Correct a few leftover mentions of "Mobile/Mobile" to "ios/Mobile"

Change-Id: Ie2e44bda495f3a08fc91c8d9fe40f9d1d9607283

diff --git a/configure.ac b/configure.ac
index 4446e4b51..cc23e8c31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -99,7 +99,7 @@ AC_ARG_WITH([lo-builddir],
 AS_HELP_STRING([--with-lo-builddir=],
[Mandatory, and relevant, in a tree where building 
the iOS app.
 Path to a the build directory of the LibreOffice 
core source tree you want to use.
-In addition you MUST manually edit the 
Mobile/Mobile.xcodeproj/project.pbxproj
+In addition you MUST manually edit the 
ios/Mobile.xcodeproj/project.pbxproj
 file and change the references to "../ios-device" 
to refer to the corresponding
 LibreOffice core source directory (which typically 
would be the same as the build
 directory you specify with this option).]))
diff --git a/ios/README b/ios/README
index 923ff08b2..525d8c9b4 100644
--- a/ios/README
+++ b/ios/README
@@ -36,7 +36,7 @@ where misan.local is the macOS machine where I build the app, 
in the
 ~lo/online-ios-device folder.
 
 4) In the online folder form step 2, edit the
-Mobile/Mobile.xcodeproj/project.pbxproj file in your favourite text
+ios/Mobile.xcodeproj/project.pbxproj file in your favourite text
 editor.
 
 Change LOSRCDIR and all instances of "../ios-device" to refer the the
@@ -51,7 +51,7 @@ and
 ./configure --enable-iosapp --with-iosapp-name="My Own Mobile LibreOffice" 
--with-lo-builddir=$HOME/lo/ios --with-poco-includes=/opt/ios-poco/include 
--with-poco-libs=/opt/ios-poco/lib
 
 The configure script puts the app name as the CFBundleDisplayName
-property into the Mobile/Mobile/Info.plist file, and set up some
+property into the ios/Mobile/Info.plist file, and set up some
 symbolic links that point to the LIbreOffice core source and build
 directories (which can be the same, of course).
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 compilerplugins/clang/unusedenumconstants.untouched.results |   36 
 sd/inc/CustomAnimationEffect.hxx|2 
 sd/inc/Outliner.hxx |2 
 sd/inc/sdenumdef.hxx|3 -
 sd/source/ui/inc/RemoteServer.hxx   |1 
 sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx |1 
 6 files changed, 45 deletions(-)

New commits:
commit 6c19de47131f15c88eef004ef52babb3d69070d2
Author: Noel Grandin 
AuthorDate: Wed Nov 21 16:00:29 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 23 10:28:32 2018 +0100

remove some dead enums in sd/

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

diff --git a/compilerplugins/clang/unusedenumconstants.untouched.results 
b/compilerplugins/clang/unusedenumconstants.untouched.results
index d41fe9284f19..7404d91512c0 100644
--- a/compilerplugins/clang/unusedenumconstants.untouched.results
+++ b/compilerplugins/clang/unusedenumconstants.untouched.results
@@ -326,42 +326,6 @@ sc/source/ui/inc/autofmt.hxx:33
 enum AutoFmtLine TOP_LINE
 sc/source/ui/StatisticsDialogs/RegressionDialog.cxx:105
 enum (anonymous namespace)::ScRegType LINEAR
-sd/inc/CustomAnimationEffect.hxx:212
-enum sd::ESequenceHint EFFECT_ADDED
-sd/inc/CustomAnimationEffect.hxx:212
-enum sd::ESequenceHint EFFECT_REMOVED
-sd/inc/CustomAnimationEffect.hxx:212
-enum sd::ESequenceHint EFFECT_EDITED
-sd/inc/Outliner.hxx:185
-enum SdOutliner::ChangeHint CH_VIEW_SHELL_VALID
-sd/inc/Outliner.hxx:185
-enum SdOutliner::ChangeHint CH_VIEW_SHELL_INVALID
-sd/inc/sdenumdef.hxx:23
-enum OutputType OUTPUT_PAGE
-sd/inc/sdenumdef.hxx:23
-enum OutputType OUTPUT_ORIGINAL
-sd/inc/sdenumdef.hxx:23
-enum OutputType OUTPUT_SLIDE
-sd/inc/sdenumdef.hxx:23
-enum OutputType OUTPUT_OVERHEAD
-sd/inc/sdenumdef.hxx:23
-enum OutputType OUTPUT_WIDESCREEN
-sd/inc/sdenumdef.hxx:23
-enum OutputType OUTPUT_PRESENTATION
-sd/inc/sdenumdef.hxx:24
-enum StartType ST_EMPTY
-sd/inc/sdenumdef.hxx:24
-enum StartType ST_TEMPLATE
-sd/inc/sdenumdef.hxx:24
-enum StartType ST_OPEN
-sd/source/ui/inc/RemoteServer.hxx:42
-enum sd::ClientInfo::PROTOCOL NETWORK
-sd/source/ui/inc/RemoteServer.hxx:42
-enum sd::ClientInfo::PROTOCOL BLUETOOTH
-sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx:45
-enum sd::slidesorter::view::InsertAnimator::ResetMode RM_AbortAnimations
-sd/source/ui/slidesorter/inc/view/SlsInsertAnimator.hxx:45
-enum sd::slidesorter::view::InsertAnimator::ResetMode RM_Normal
 svx/inc/sxmkitm.hxx:25
 enum SdrMeasureKind SDRMEASURE_RADIUS
 sw/inc/docary.hxx:74
diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 0319e9ea8669..d3d6be34d9b1 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -209,8 +209,6 @@ struct stl_CustomAnimationEffect_search_node_predict
 const css::uno::Reference< css::animations::XAnimationNode >& mxSearchNode;
 };
 
-enum ESequenceHint { EFFECT_EDITED, EFFECT_REMOVED, EFFECT_ADDED };
-
 /** this listener is implemented by UI components to track changes in the 
animation core */
 class ISequenceListener
 {
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index 7f25e9a0fcf4..5f4056fdb556 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -182,8 +182,6 @@ public:
 /** Release all resources that have been created during the conversion */
 void EndConversion();
 
-enum ChangeHint { CH_VIEW_SHELL_INVALID, CH_VIEW_SHELL_VALID };
-
 int GetIgnoreCurrentPageChangesLevel() const { return 
mnIgnoreCurrentPageChangesLevel; };
 voidIncreIgnoreCurrentPageChangesLevel() { 
mnIgnoreCurrentPageChangesLevel++; };
 voidDecreIgnoreCurrentPageChangesLevel() { 
mnIgnoreCurrentPageChangesLevel--; };
diff --git a/sd/inc/sdenumdef.hxx b/sd/inc/sdenumdef.hxx
index f6ed689f2e93..cb9f9a8def34 100644
--- a/sd/inc/sdenumdef.hxx
+++ b/sd/inc/sdenumdef.hxx
@@ -20,9 +20,6 @@
 #ifndef INCLUDED_SD_INC_SDENUMDEF_HXX
 #define INCLUDED_SD_INC_SDENUMDEF_HXX
 
-enum OutputType { OUTPUT_PAGE, OUTPUT_OVERHEAD, OUTPUT_SLIDE, 
OUTPUT_PRESENTATION, OUTPUT_ORIGINAL, OUTPUT_WIDESCREEN };
-enum StartType { ST_EMPTY, ST_TEMPLATE, ST_OPEN };
-
 #define RET_SNAP_DELETE 111
 enum SnapKind { SK_HORIZONTAL, SK_VERTICAL, SK_POINT };
 
diff --git a/sd/source/ui/inc/RemoteServer.hxx 
b/sd/source/ui/inc/RemoteServer.hxx
index 88962404848c..cd8fa1a0ad24 100644
--- a/sd/source/ui/inc/RemoteServer.hxx
+++ b/sd/source/ui/inc/RemoteServer.hxx
@@ -39,7 +39,6 @@ namespace sd
 
 bool const mbIsAlreadyAuthorised;
 
-enum PROTOCOL { NETWORK = 1, BLUETOOTH };
 ClientInfo( const OUString& rName,
 const bool bIsAlreadyAuthorised ) :
 mName( 

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

[Libreoffice Gerrit user]

 sd/uiconfig/simpress/ui/customanimationspanel.ui |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 10aebd07f7bef6338de967b2dedfed2589d080eb
Author: Jim Raykowski 
AuthorDate: Mon Nov 12 15:55:57 2018 -0900
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 10:02:24 2018 +0100

tdf#118764 Animation panel tab stop fixes

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

diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui 
b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index ab043f157e31..d8c02002cf81 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -85,7 +85,7 @@
 
   
 True
-False
+True
 True
 True
 Add Effect
@@ -100,7 +100,7 @@
 
   
 True
-False
+True
 True
 True
 Remove 
Effect
@@ -115,7 +115,7 @@
 
   
 True
-False
+True
 True
 True
 Move Up
@@ -130,7 +130,7 @@
 
   
 True
-False
+True
 True
 True
 Move Down
@@ -187,7 +187,7 @@
 
   
 True
-False
+True
 False
 
   Entrance
@@ -279,7 +279,7 @@
 
   
 True
-False
+True
 True
 
   On click
@@ -301,7 +301,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -333,7 +333,7 @@
 
   
 True
-False
+True
 True
 True
   
@@ -446,7 +446,7 @@
   
 Play
 True
-False
+True
 True
 True
 Preview Effect
___
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' - sw/source sw/uiconfig

[Libreoffice Gerrit user]

 sw/source/ui/frmdlg/frmpage.cxx  |   81 ++-
 sw/source/uibase/inc/frmpage.hxx |   17 +++
 sw/uiconfig/swriter/ui/frmurlpage.ui |   30 +++-
 3 files changed, 49 insertions(+), 79 deletions(-)

New commits:
commit 19805f580fcbcf890790f8c6ab736aab80c08de7
Author: Caolán McNamara 
AuthorDate: Thu Nov 22 16:31:04 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 09:56:39 2018 +0100

weld SwFrameURLPage

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

diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 70e81edb4375..bf1320c2a466 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -2656,18 +2656,16 @@ void BmpWindow::SetBitmapEx(const BitmapEx& rBmp)
 }
 
 // set URL and ImageMap at frames
-SwFrameURLPage::SwFrameURLPage( vcl::Window *pParent, const SfxItemSet &rSet ) 
:
-SfxTabPage(pParent, "FrameURLPage" , "modules/swriter/ui/frmurlpage.ui", 
&rSet)
+SwFrameURLPage::SwFrameURLPage(TabPageParent pParent, const SfxItemSet &rSet)
+: SfxTabPage(pParent, "modules/swriter/ui/frmurlpage.ui", "FrameURLPage", 
&rSet)
+, m_xURLED(m_xBuilder->weld_entry("url"))
+, m_xSearchPB(m_xBuilder->weld_button("search"))
+, m_xNameED(m_xBuilder->weld_entry("name"))
+, m_xFrameCB(m_xBuilder->weld_combo_box("frame"))
+, m_xServerCB(m_xBuilder->weld_check_button("server"))
+, m_xClientCB(m_xBuilder->weld_check_button("client"))
 {
-get(pURLED,"url");
-get(pSearchPB,"search");
-get(pNameED,"name");
-get(pFrameCB,"frame");
-
-get(pServerCB,"server");
-get(pClientCB,"client");
-
-pSearchPB->SetClickHdl(LINK(this, SwFrameURLPage, InsertFileHdl));
+m_xSearchPB->connect_clicked(LINK(this, SwFrameURLPage, InsertFileHdl));
 }
 
 SwFrameURLPage::~SwFrameURLPage()
@@ -2675,17 +2673,6 @@ SwFrameURLPage::~SwFrameURLPage()
 disposeOnce();
 }
 
-void SwFrameURLPage::dispose()
-{
-pURLED.clear();
-pSearchPB.clear();
-pNameED.clear();
-pFrameCB.clear();
-pServerCB.clear();
-pClientCB.clear();
-SfxTabPage::dispose();
-}
-
 void SwFrameURLPage::Reset( const SfxItemSet *rSet )
 {
 const SfxPoolItem* pItem;
@@ -2696,9 +2683,9 @@ void SwFrameURLPage::Reset( const SfxItemSet *rSet )
 if( !pList->empty() )
 {
 size_t nCount = pList->size();
-for ( size_t i = 0; i < nCount; i++ )
+for (size_t i = 0; i < nCount; ++i)
 {
-pFrameCB->InsertEntry( pList->at( i ) );
+m_xFrameCB->append_text(pList->at(i));
 }
 }
 }
@@ -2706,22 +2693,22 @@ void SwFrameURLPage::Reset( const SfxItemSet *rSet )
 if ( SfxItemState::SET == rSet->GetItemState( RES_URL, true, &pItem ) )
 {
 const SwFormatURL* pFormatURL = static_cast(pItem);
-pURLED->SetText( INetURLObject::decode( pFormatURL->GetURL(),
-   
INetURLObject::DecodeMechanism::Unambiguous ));
-pNameED->SetText( pFormatURL->GetName());
+m_xURLED->set_text(INetURLObject::decode(pFormatURL->GetURL(),
+   
INetURLObject::DecodeMechanism::Unambiguous));
+m_xNameED->set_text(pFormatURL->GetName());
 
-pClientCB->Enable( pFormatURL->GetMap() != nullptr );
-pClientCB->Check ( pFormatURL->GetMap() != nullptr );
-pServerCB->Check ( pFormatURL->IsServerMap() );
+m_xClientCB->set_sensitive(pFormatURL->GetMap() != nullptr);
+m_xClientCB->set_active(pFormatURL->GetMap() != nullptr);
+m_xServerCB->set_active(pFormatURL->IsServerMap());
 
-pFrameCB->SetText(pFormatURL->GetTargetFrameName());
-pFrameCB->SaveValue();
+m_xFrameCB->set_entry_text(pFormatURL->GetTargetFrameName());
+m_xFrameCB->save_value();
 }
 else
-pClientCB->Enable( false );
+m_xClientCB->set_sensitive(false);
 
-pServerCB->SaveValue();
-pClientCB->SaveValue();
+m_xServerCB->save_state();
+m_xClientCB->save_state();
 }
 
 bool SwFrameURLPage::FillItemSet(SfxItemSet *rSet)
@@ -2735,27 +2722,27 @@ bool SwFrameURLPage::FillItemSet(SfxItemSet *rSet)
 pFormatURL.reset(new SwFormatURL());
 
 {
-const OUString sText = pURLED->GetText();
+const OUString sText = m_xURLED->get_text();
 
 if( pFormatURL->GetURL() != sText ||
-pFormatURL->GetName() != pNameED->GetText() ||
-pServerCB->IsChecked() != pFormatURL->IsServerMap() )
+pFormatURL->GetName() != m_xNameED->get_text() ||
+m_xServerCB->get_active() != pFormatURL->IsServerMap() )
 {
-pFormatURL->SetURL( sText, pServerCB->IsChecked() );
-pFormatURL->SetName( pNameED->GetT

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

[Libreoffice Gerrit user]

 svx/uiconfig/ui/sidebarpossize.ui |4 ++--
 svx/uiconfig/ui/sidebarshadow.ui  |6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit ea9bfd76d218088954268cdbf8bf34f41fee1b8e
Author: Jim Raykowski 
AuthorDate: Mon Nov 12 14:59:07 2018 -0900
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 09:56:10 2018 +0100

tdf#118764 Pos&Size and Shadow panels tab stop fixes

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

diff --git a/svx/uiconfig/ui/sidebarpossize.ui 
b/svx/uiconfig/ui/sidebarpossize.ui
index e1f632d245c7..46a920313d95 100644
--- a/svx/uiconfig/ui/sidebarpossize.ui
+++ b/svx/uiconfig/ui/sidebarpossize.ui
@@ -263,7 +263,7 @@
 
   
 True
-False
+True
 True
 Select the angle for 
rotation.
 True
@@ -299,7 +299,7 @@
 
   
 True
-False
+True
 end
 
   
diff --git a/svx/uiconfig/ui/sidebarshadow.ui b/svx/uiconfig/ui/sidebarshadow.ui
index 0a0644dc1196..3bcd4e4439ea 100644
--- a/svx/uiconfig/ui/sidebarshadow.ui
+++ b/svx/uiconfig/ui/sidebarshadow.ui
@@ -77,7 +77,7 @@
 
   
 True
-False
+True
 True
 adjustment1
   
@@ -89,7 +89,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -187,7 +187,7 @@
 
   
 True
-False
+True
 end
   
   
___
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' - chart2/uiconfig sd/uiconfig sw/uiconfig

[Libreoffice Gerrit user]

 chart2/uiconfig/ui/tp_DataSource.ui   |8 
 sd/uiconfig/simpress/ui/presentationdialog.ui |2 +-
 sd/uiconfig/simpress/ui/slidedesigndialog.ui  |2 +-
 sw/uiconfig/swriter/ui/numparapage.ui |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit e111b2629f7e2b36b5898a0b907714cbb5f94d8f
Author: Caolán McNamara 
AuthorDate: Thu Nov 22 21:14:40 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 09:55:36 2018 +0100

Related: tdf#118764 last of the GtkButtons with can-focus False

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

diff --git a/chart2/uiconfig/ui/tp_DataSource.ui 
b/chart2/uiconfig/ui/tp_DataSource.ui
index a1fe9453fea1..a6fce7637052 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -94,7 +94,7 @@
   
 _Add
 True
-False
+True
 True
 True
   
@@ -106,7 +106,7 @@
 
   
 True
-False
+True
 True
 True
 
@@ -124,7 +124,7 @@
   
 _Remove
 True
-False
+True
 True
 True
 True
@@ -137,7 +137,7 @@
 
   
 True
-False
+True
 True
 
   
diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui 
b/sd/uiconfig/simpress/ui/presentationdialog.ui
index d85e2f19edee..d2c5227f948d 100644
--- a/sd/uiconfig/simpress/ui/presentationdialog.ui
+++ b/sd/uiconfig/simpress/ui/presentationdialog.ui
@@ -60,7 +60,7 @@
   
 gtk-help
 True
-False
+True
 False
 True
   
diff --git a/sd/uiconfig/simpress/ui/slidedesigndialog.ui 
b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
index 01559519b050..df92adf38718 100644
--- a/sd/uiconfig/simpress/ui/slidedesigndialog.ui
+++ b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
@@ -72,7 +72,7 @@
   
 gtk-help
 True
-False
+True
 False
 True
   
diff --git a/sw/uiconfig/swriter/ui/numparapage.ui 
b/sw/uiconfig/swriter/ui/numparapage.ui
index ff45098165bf..0ff72c8eadfd 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -167,7 +167,7 @@
   
 Edit Style
 True
-False
+True
 False
   
   
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

[Libreoffice Gerrit user]

 chart2/uiconfig/ui/tp_DataSource.ui   |8 
 sd/uiconfig/simpress/ui/presentationdialog.ui |2 +-
 sd/uiconfig/simpress/ui/slidedesigndialog.ui  |2 +-
 sw/uiconfig/swriter/ui/numparapage.ui |2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit a0131f3200bddb068eee9bb72f9bfa1cf24fd643
Author: Caolán McNamara 
AuthorDate: Thu Nov 22 21:14:40 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 09:55:57 2018 +0100

Related: tdf#118764 last of the GtkButtons with can-focus False

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

diff --git a/chart2/uiconfig/ui/tp_DataSource.ui 
b/chart2/uiconfig/ui/tp_DataSource.ui
index a1fe9453fea1..a6fce7637052 100644
--- a/chart2/uiconfig/ui/tp_DataSource.ui
+++ b/chart2/uiconfig/ui/tp_DataSource.ui
@@ -94,7 +94,7 @@
   
 _Add
 True
-False
+True
 True
 True
   
@@ -106,7 +106,7 @@
 
   
 True
-False
+True
 True
 True
 
@@ -124,7 +124,7 @@
   
 _Remove
 True
-False
+True
 True
 True
 True
@@ -137,7 +137,7 @@
 
   
 True
-False
+True
 True
 
   
diff --git a/sd/uiconfig/simpress/ui/presentationdialog.ui 
b/sd/uiconfig/simpress/ui/presentationdialog.ui
index d85e2f19edee..d2c5227f948d 100644
--- a/sd/uiconfig/simpress/ui/presentationdialog.ui
+++ b/sd/uiconfig/simpress/ui/presentationdialog.ui
@@ -60,7 +60,7 @@
   
 gtk-help
 True
-False
+True
 False
 True
   
diff --git a/sd/uiconfig/simpress/ui/slidedesigndialog.ui 
b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
index 01559519b050..df92adf38718 100644
--- a/sd/uiconfig/simpress/ui/slidedesigndialog.ui
+++ b/sd/uiconfig/simpress/ui/slidedesigndialog.ui
@@ -72,7 +72,7 @@
   
 gtk-help
 True
-False
+True
 False
 True
   
diff --git a/sw/uiconfig/swriter/ui/numparapage.ui 
b/sw/uiconfig/swriter/ui/numparapage.ui
index ff45098165bf..0ff72c8eadfd 100644
--- a/sw/uiconfig/swriter/ui/numparapage.ui
+++ b/sw/uiconfig/swriter/ui/numparapage.ui
@@ -167,7 +167,7 @@
   
 Edit Style
 True
-False
+True
 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-2' - sw/uiconfig

[Libreoffice Gerrit user]

 sw/uiconfig/swriter/ui/pagestylespanel.ui |   14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)

New commits:
commit da89a85bbba71a965b75f06e628e001f48c57c2c
Author: Jim Raykowski 
AuthorDate: Wed Nov 21 23:12:09 2018 -0900
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 09:55:12 2018 +0100

tdf#118764 Writer Page Styles panel tab stop fixes

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

diff --git a/sw/uiconfig/swriter/ui/pagestylespanel.ui 
b/sw/uiconfig/swriter/ui/pagestylespanel.ui
index e2c4d34bed49..dc6f70b1b821 100644
--- a/sw/uiconfig/swriter/ui/pagestylespanel.ui
+++ b/sw/uiconfig/swriter/ui/pagestylespanel.ui
@@ -76,7 +76,7 @@
 
   
 True
-False
+True
   
   
 1
@@ -132,7 +132,7 @@
 
   
 True
-False
+True
 
   1 
Column
   2 
Columns
@@ -152,7 +152,7 @@
   
 150
 True
-False
+True
   
   
 1
@@ -165,7 +165,7 @@
   
 150
 True
-False
+True
   
   
 1
@@ -178,7 +178,7 @@
   
 150
 True
-False
+True
   
   
 1
@@ -191,7 +191,7 @@
   
 150
 True
-False
+True
   
   
 1
@@ -203,7 +203,7 @@
 
   
 True
-False
+True
   
   
 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-2' - sd/uiconfig

[Libreoffice Gerrit user]

 sd/uiconfig/simpress/ui/customanimationspanel.ui |   18 +-
 1 file changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 393965067c43f866790c744991532cc3776db5fd
Author: Jim Raykowski 
AuthorDate: Mon Nov 12 15:55:57 2018 -0900
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 09:54:41 2018 +0100

tdf#118764 Animation panel tab stop fixes

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

diff --git a/sd/uiconfig/simpress/ui/customanimationspanel.ui 
b/sd/uiconfig/simpress/ui/customanimationspanel.ui
index ab043f157e31..d8c02002cf81 100644
--- a/sd/uiconfig/simpress/ui/customanimationspanel.ui
+++ b/sd/uiconfig/simpress/ui/customanimationspanel.ui
@@ -85,7 +85,7 @@
 
   
 True
-False
+True
 True
 True
 Add Effect
@@ -100,7 +100,7 @@
 
   
 True
-False
+True
 True
 True
 Remove 
Effect
@@ -115,7 +115,7 @@
 
   
 True
-False
+True
 True
 True
 Move Up
@@ -130,7 +130,7 @@
 
   
 True
-False
+True
 True
 True
 Move Down
@@ -187,7 +187,7 @@
 
   
 True
-False
+True
 False
 
   Entrance
@@ -279,7 +279,7 @@
 
   
 True
-False
+True
 True
 
   On click
@@ -301,7 +301,7 @@
 
   
 True
-False
+True
 True
   
   
@@ -333,7 +333,7 @@
 
   
 True
-False
+True
 True
 True
   
@@ -446,7 +446,7 @@
   
 Play
 True
-False
+True
 True
 True
 Preview Effect
___
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' - extras/source include/svx solenv/bin svx/source sw/source sw/uiconfig

[Libreoffice Gerrit user]

 extras/source/glade/libreoffice-catalog.xml.in |3 
 include/svx/swframeexample.hxx |   64 -
 solenv/bin/native-code.py  |1 
 svx/source/dialog/swframeexample.cxx   |  693 
 sw/source/ui/frmdlg/column.cxx |   24 
 sw/source/ui/frmdlg/frmpage.cxx| 1033 +++--
 sw/source/ui/table/tabledlg.cxx|   42 -
 sw/source/uibase/inc/frmpage.hxx   |  137 +--
 sw/source/uibase/inc/prcntfld.hxx  |   73 -
 sw/source/uibase/utlui/prcntfld.cxx|  271 --
 sw/uiconfig/swriter/ui/frmtypepage.ui  |   51 -
 11 files changed, 645 insertions(+), 1747 deletions(-)

New commits:
commit 998d11b44eb3c57583703fa0df67e087ba187195
Author: Caolán McNamara 
AuthorDate: Wed Nov 21 21:21:35 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 23 09:54:21 2018 +0100

weld SwFramePage

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

diff --git a/extras/source/glade/libreoffice-catalog.xml.in 
b/extras/source/glade/libreoffice-catalog.xml.in
index a02836e94439..629a835e5232 100644
--- a/extras/source/glade/libreoffice-catalog.xml.in
+++ b/extras/source/glade/libreoffice-catalog.xml.in
@@ -250,9 +250,6 @@
 
-
 
diff --git a/include/svx/swframeexample.hxx b/include/svx/swframeexample.hxx
index ddcc5961b95a..814f0d84aa22 100644
--- a/include/svx/swframeexample.hxx
+++ b/include/svx/swframeexample.hxx
@@ -27,7 +27,7 @@
 #include 
 #include 
 
-class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
+class SVX_DLLPUBLIC SwFrameExample : public weld::CustomWidgetController
 {
 Color   m_aTransColor;  ///< transparency
 Color   m_aBgCol;   ///< background
@@ -63,65 +63,6 @@ class SVX_DLLPUBLIC SvxSwFrameExample : public vcl::Window
 
 void InitColors_Impl();
 void InitAllRects_Impl(vcl::RenderContext& rRenderContext);
-void CalcBoundRect_Impl(tools::Rectangle &rRect);
-tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, 
const tools::Rectangle &rRect, const Color &rFillColor, const Color 
&rBorderColor);
-
-virtual void Paint(vcl::RenderContext& rRenderContext, const 
tools::Rectangle&) override;
-virtual Size GetOptimalSize() const override;
-protected:
-virtual void DataChanged( const DataChangedEvent& rDCEvt ) override;
-public:
-
-SvxSwFrameExample(vcl::Window* pParent, WinBits nStyle);
-
-void SetWrap(css::text::WrapTextMode nW) { nWrap = nW; }
-
-void SetHAlign(short nH)  { nHAlign   = nH; }
-void SetHoriRel(short nR) { nHRel = nR; }
-
-void SetVAlign(short nV)  { nVAlign   = nV; }
-void SetVertRel(short nR) { nVRel = nR; }
-
-void SetTransparent(bool bT)  { bTrans= bT; }
-void SetAnchor(RndStdIds nA) { nAnchor   = nA; }
-
-void SetRelPos(const Point& rP);
-};
-
-class SVX_DLLPUBLIC SwFrameExample : public weld::CustomWidgetController
-{
-Color   m_aTransColor;  ///< transparency
-Color   m_aBgCol;   ///< background
-Color   m_aFrameColor;  ///< graphic frame
-Color   m_aAlignColor;  ///< align anchor
-Color   m_aBorderCol;   ///< frame of doc
-Color   m_aPrintAreaCol;///< frame of printable area of doc
-Color   m_aTxtCol;  ///< symbolised text
-Color   m_aBlankCol;///< area of symbol for blank
-Color   m_aBlankFrameCol;   ///< frame of symbol for blank
-
-tools::Rectangle   aPage;
-tools::Rectangle   aPagePrtArea;
-tools::Rectangle   aTextLine;
-tools::Rectangle   aPara;
-tools::Rectangle   aParaPrtArea;
-tools::Rectangle   aFrameAtFrame;
-tools::Rectangle   aDrawObj;
-tools::Rectangle   aAutoCharFrame;
-SizeaFrmSize;
-
-short   nHAlign;
-short   nHRel;
-
-short   nVAlign;
-short   nVRel;
-
-RndStdIds   nAnchor;
-
-Point   aRelPos;
-
-void InitColors_Impl();
-void InitAllRects_Impl(vcl::RenderContext& rRenderContext);
 void CalcBoundRect_Impl(vcl::RenderContext& rRenderContext, 
tools::Rectangle &rRect);
 tools::Rectangle DrawInnerFrame_Impl(vcl::RenderContext& rRenderContext, 
const tools::Rectangle &rRect, const Color &rFillColor, const Color 
&rBorderColor);
 
@@ -133,12 +74,15 @@ public:
 
 virtual void SetDrawingArea(weld::DrawingArea* pDrawingArea) override;
 
+void SetWrap(css::text::WrapTextMode nW) { nWrap = nW; }
+
 void SetHAlign(short nH)  { nHAlign   = nH; }
 void SetHoriRel(short nR) { nHRel = nR; }
 
 void SetVAlign(short nV)  { nVAlign   = nV; }
 void SetVertRel(short nR) { nVRel = nR; }
 
+void SetTransparent(bool bT) 

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

[Libreoffice Gerrit user]

 sw/qa/extras/ooxmlexport/data/tdf121597.odt |binary
 sw/qa/extras/ooxmlexport/ooxmlexport11.cxx  |   15 +
 sw/source/filter/ww8/ww8atr.cxx |   31 ++--
 3 files changed, 18 insertions(+), 28 deletions(-)

New commits:
commit 626504ee27d853d70a5a8b3b62d69313b9b6eb98
Author: László Németh 
AuthorDate: Wed Nov 21 17:18:39 2018 +0100
Commit: László Németh 
CommitDate: Fri Nov 23 09:15:29 2018 +0100

tdf#121597 DOCX: don't export empty paragraphs at tracked deletion

of non-empty multiple paragraphs. Complete the fix for
"tdf#115521 DOCX export: keep empty paragraphs in tracked deletion"
in commit 2cdc870a7ee82d0faf35cdb5b2bf4e687cfd2b8d

This solves the regression reported in tdf#121109
"FILESAVE: Page break is added after removed paragraph".

Change-Id: Ic3446e2a2118e604a7a4d269c8fed1f9f157846f
Reviewed-on: https://gerrit.libreoffice.org/63731
Tested-by: Jenkins
Reviewed-by: László Németh 
(cherry picked from commit d1ee27cf9b83ad9b69d1ee00e2e8969fb35446c9)
Reviewed-on: https://gerrit.libreoffice.org/63825

diff --git a/sw/qa/extras/ooxmlexport/data/tdf121597.odt 
b/sw/qa/extras/ooxmlexport/data/tdf121597.odt
new file mode 100644
index ..760b46e76379
Binary files /dev/null and b/sw/qa/extras/ooxmlexport/data/tdf121597.odt differ
diff --git a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx 
b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
index 40e9fb19c3ca..c4a76e33ad92 100644
--- a/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
+++ b/sw/qa/extras/ooxmlexport/ooxmlexport11.cxx
@@ -815,6 +815,21 @@ DECLARE_OOXMLEXPORT_TEST(testTdf58944RepeatingTableHeader, 
"tdf58944-repeating-t
  
parseDump("/root/page[2]/body/tab/row[2]/cell[1]/txt/text()"));
 }
 
+DECLARE_OOXMLEXPORT_TEST(testTdf121597TrackedDeletionOfMultipleParagraphs, 
"tdf121597.odt")
+{
+xmlDocPtr pXmlDoc = parseExport("word/document.xml");
+if (!pXmlDoc)
+return;
+
+// check paragraphs with removed paragraph mark
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[1]/w:pPr/w:rPr/w:del");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[2]/w:pPr/w:rPr/w:del");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[4]/w:pPr/w:rPr/w:del");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[5]/w:pPr/w:rPr/w:del");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[7]/w:pPr/w:rPr/w:del");
+assertXPath(pXmlDoc, "/w:document/w:body/w:p[10]/w:pPr/w:rPr/w:del");
+}
+
 CPPUNIT_PLUGIN_IMPLEMENT();
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index d8411eed8796..b911ef83b6a7 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -5505,37 +5505,12 @@ const SwRedlineData* 
AttributeOutputBase::GetParagraphMarkerRedline( const SwTex
 if ( pRedl->GetRedlineData().GetType() != aRedlineType )
 continue;
 
-const SwPosition* pCheckedEnd = pRedl->End();
-const SwPosition* pCheckedStt = pRedl->Start();
-sal_uLong uStartNodeIndex = pCheckedStt->nNode.GetIndex();
-sal_uLong uStartCharIndex = pCheckedStt->nContent.GetIndex();
-sal_uLong uEndNodeIndex   = pCheckedEnd->nNode.GetIndex();
-sal_uLong uEndCharIndex   = pCheckedEnd->nContent.GetIndex();
+sal_uLong uStartNodeIndex = pRedl->Start()->nNode.GetIndex();
+sal_uLong uEndNodeIndex   = pRedl->End()->nNode.GetIndex();
 sal_uLong uNodeIndex = rNode.GetIndex();
 
 if( uStartNodeIndex <= uNodeIndex && uNodeIndex < uEndNodeIndex )
-{
-// Maybe add here a check that also the start & end of the redline 
is the entire paragraph
-if ( ( uStartNodeIndex < uEndNodeIndex ) &&
- // check start:
- // 1. start in the same node
- (( uStartNodeIndex == uNodeIndex &&
-uStartCharIndex == static_cast(rNode.Len()) ) ||
- // 2. or in a previous node
-uStartNodeIndex < uNodeIndex
- ) &&
- // check end:
- // 1. end in the same node
- (( uEndNodeIndex == (uNodeIndex + 1) &&
-uEndCharIndex == 0) ||
- // 2. or end in after that
-uEndNodeIndex > (uNodeIndex + 1)
- )
-   )
-{
-return &( pRedl->GetRedlineData() );
-}
-}
+return &( pRedl->GetRedlineData() );
 }
 return nullptr;
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits