[Libreoffice-commits] core.git: include/editeng include/svx offapi/com oox/inc oox/qa oox/source svx/source xmloff/source

2023-11-30 Thread Regina Henschel (via logerrit) 
 include/editeng/unoprnms.hxx|1 
 include/svx/svddef.hxx  |6 +
 include/svx/svdoedge.hxx|8 +
 include/svx/unoshprp.hxx|3 
 offapi/com/sun/star/drawing/ConnectorProperties.idl |7 +
 oox/inc/drawingml/connectorhelper.hxx   |   33 ++-
 oox/qa/unit/data/WPC_CurvedConnector2.docx  |binary
 oox/qa/unit/data/WPC_CurvedConnector5.docx  |binary
 oox/qa/unit/wpc_drawing_canvas.cxx  |   32 ++-
 oox/source/drawingml/connectorhelper.cxx|   89 +++-
 oox/source/export/shapes.cxx|   52 +++
 oox/source/shape/ShapeContextHandler.cxx|   13 +-
 svx/source/sdr/properties/connectorproperties.cxx   |1 
 svx/source/svdraw/svdattr.cxx   |1 
 svx/source/svdraw/svdoedge.cxx  |   83 +++---
 xmloff/source/draw/ximpshap.cxx |   54 +++-
 xmloff/source/draw/ximpshap.hxx |5 +
 17 files changed, 338 insertions(+), 50 deletions(-)

New commits:
commit 44ee19c99bfb3bf0f550d9656e87bca3e20e5ca0
Author: Regina Henschel 
AuthorDate: Sun Nov 19 00:26:16 2023 +0100
Commit: Miklos Vajna 
CommitDate: Fri Dec 1 08:44:01 2023 +0100

[API CHANGE] Add OOXML way of curved connector routing

The paths generated for curved connectors are basically incompatible
between LibreOffice and OOXML. Thus it was not possible to render curved
connectors the same way as MS Office. The patch adds an OOXML compatible
method for calculating the path. The new method results in a different
svg:d attribute when saved in ODF, but needs no change to ODF.

The patch introduces the boolean connector property 'EdgeOOXMLCurve' to
switch between the two methods. The property value is determined from
the svg:d attribute in case of import from ODF. In case of missing
svg:d attribute the property value is set to 'true', because Word
currently does not write a svg:d attribute when it exports to ODF.
The property value is set to 'true' for import of connectors on a
drawing canvas in docx. Default value for new connectors is 'false'.

The new property has no UI, but can be used via macro.

Currently the new method is used for import of curved connectors on
drawing canvas in docx documents.

Change-Id: I53d99f44febe4d74c2b611f5fdb9de86628c4519
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/159708
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 1300effe179f..7f742f549833 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -56,6 +56,7 @@ inline constexpr OUString UNO_NAME_EDGENODE1HORZDIST = 
u"EdgeNode1HorzDist"_ustr
 inline constexpr OUString UNO_NAME_EDGENODE1VERTDIST = 
u"EdgeNode1VertDist"_ustr;
 inline constexpr OUString UNO_NAME_EDGENODE2HORZDIST = 
u"EdgeNode2HorzDist"_ustr;
 inline constexpr OUString UNO_NAME_EDGENODE2VERTDIST = 
u"EdgeNode2VertDist"_ustr;
+inline constexpr OUString UNO_NAME_EDGEOOXMLCURVE = u"EdgeOOXMLCurve"_ustr;
 
 inline constexpr OUString UNO_NAME_FILLBMP_OFFSET_X = 
u"FillBitmapOffsetX"_ustr;
 inline constexpr OUString UNO_NAME_FILLBMP_OFFSET_Y = 
u"FillBitmapOffsetY"_ustr;
diff --git a/include/svx/svddef.hxx b/include/svx/svddef.hxx
index fa57a8aa0bfc..500d68fc3916 100644
--- a/include/svx/svddef.hxx
+++ b/include/svx/svddef.hxx
@@ -441,7 +441,11 @@ constexpr sal_uInt16  
SDRATTR_WRITINGMODE2_FIRST(SDRATTR
 constexpr TypedWhichId 
SDRATTR_WRITINGMODE2(SDRATTR_WRITINGMODE2_FIRST+0);// 1248
 constexpr sal_uInt16  
SDRATTR_WRITINGMODE2_LAST(SDRATTR_WRITINGMODE2);   // 1248
 
-constexpr sal_uInt16 SDRATTR_END (SDRATTR_WRITINGMODE2_LAST);  // 1248
+constexpr sal_uInt16  
SDRATTR_EDGEOOXMLCURVE_FIRST(SDRATTR_WRITINGMODE2_LAST+1);// 1249
+constexpr TypedWhichId   
SDRATTR_EDGEOOXMLCURVE(SDRATTR_EDGEOOXMLCURVE_FIRST+0);   // 1249
+constexpr sal_uInt16  
SDRATTR_EDGEOOXMLCURVE_LAST(SDRATTR_EDGEOOXMLCURVE);  // 1249
+
+constexpr sal_uInt16 SDRATTR_END (SDRATTR_EDGEOOXMLCURVE_LAST);  // 1249
 
 #endif // INCLUDED_SVX_SVDDEF_HXX
 
diff --git a/include/svx/svdoedge.hxx b/include/svx/svdoedge.hxx
index 94bb89a00a3e..9c987e259ea3 100644
--- a/include/svx/svdoedge.hxx
+++ b/include/svx/svdoedge.hxx
@@ -91,13 +91,19 @@ public:
 sal_uInt16  m_nObj2Lines;// 1..3
 sal_uInt16  m_nMiddleLine;   // 0x=none, otherwise 
point number of the beginning of the line
 
+// The value determines how curved connectors are routed. With value 
'true' it is routed
+// compatible to OOXML, with value 'false' LO routing is used.
+// The value is

[Libreoffice-commits] core.git: include/editeng include/oox include/svx sd/source sw/source

2023-10-06 Thread Stephan Bergmann (via logerrit) 
 include/editeng/unotext.hxx |   36 +-
 include/oox/core/relations.hxx  |2 
 include/svx/unoshprp.hxx|   82 +++
 sd/source/ui/unoidl/unoobj.cxx  |   54 +++
 sd/source/ui/unoidl/unopage.cxx |   96 ++--
 sw/source/core/unocore/unomapproperties.hxx |2 
 6 files changed, 136 insertions(+), 136 deletions(-)

New commits:
commit 002b0a9d5793e07609f953b9961b04bcab7a7e3f
Author: Stephan Bergmann 
AuthorDate: Fri Oct 6 08:30:39 2023 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Oct 6 17:41:42 2023 +0200

loplugin:ostr: manual modifications

Change-Id: I06a76e82e330b0250ce8f2d3d00cbb257703ba4e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157646
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index eab4961c1288..a8e2a335c82b 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -73,12 +73,12 @@ struct SfxItemPropertyMapEntry;
 #define SVX_UNOEDIT_OUTLINER_PROPERTIES \
 SVX_UNOEDIT_NUMBERING_PROPERTY, \
 { UNO_NAME_NUMBERING_LEVEL,EE_PARA_OUTLLEVEL,   
::cppu::UnoType::get(), 0, 0 }, \
-{u"NumberingStartValue",   WID_NUMBERINGSTARTVALUE, 
::cppu::UnoType::get(), 0, 0 }, \
-{u"ParaIsNumberingRestart",WID_PARAISNUMBERINGRESTART, 
cppu::UnoType::get(), 0, 0 }
+{u"NumberingStartValue"_ustr,  WID_NUMBERINGSTARTVALUE, 
::cppu::UnoType::get(), 0, 0 }, \
+{u"ParaIsNumberingRestart"_ustr,   WID_PARAISNUMBERINGRESTART, 
cppu::UnoType::get(), 0, 0 }
 
 #define SVX_UNOEDIT_CHAR_PROPERTIES \
 { UNO_NAME_EDIT_CHAR_HEIGHT,  EE_CHAR_FONTHEIGHT, 
cppu::UnoType::get(),0, MID_FONTHEIGHT|CONVERT_TWIPS }, \
-{ u"CharScaleWidth",   EE_CHAR_FONTWIDTH,  
::cppu::UnoType::get(),0, 0 }, \
+{ u"CharScaleWidth"_ustr,  EE_CHAR_FONTWIDTH,  
::cppu::UnoType::get(),0, 0 }, \
 { UNO_NAME_EDIT_CHAR_FONTNAME,EE_CHAR_FONTINFO,   
::cppu::UnoType::get(),  0, MID_FONT_FAMILY_NAME },\
 { UNO_NAME_EDIT_CHAR_FONTSTYLENAME,EE_CHAR_FONTINFO,  
::cppu::UnoType::get(),  0, MID_FONT_STYLE_NAME }, \
 { UNO_NAME_EDIT_CHAR_FONTFAMILY,  EE_CHAR_FONTINFO,   
::cppu::UnoType::get(),0, MID_FONT_FAMILY }, \
@@ -99,21 +99,21 @@ struct SfxItemPropertyMapEntry;
 { UNO_NAME_EDIT_CHAR_BACKGROUND_TRANSPARENT, EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
 { UNO_NAME_EDIT_CHAR_ESCAPEMENT,  EE_CHAR_ESCAPEMENT, 
::cppu::UnoType::get(),0, MID_ESC }, \
 { UNO_NAME_EDIT_CHAR_UNDERLINE,   EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_STYLE }, \
-{ u"CharUnderlineColor",   EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_COLOR }, \
-{ u"CharUnderlineHasColor",EE_CHAR_UNDERLINE,  
cppu::UnoType::get(),0, MID_TL_HASCOLOR } , \
+{ u"CharUnderlineColor"_ustr,  EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_COLOR }, \
+{ u"CharUnderlineHasColor"_ustr,   EE_CHAR_UNDERLINE,  
cppu::UnoType::get(),0, MID_TL_HASCOLOR } , \
 { UNO_NAME_EDIT_CHAR_OVERLINE,EE_CHAR_OVERLINE,   
::cppu::UnoType::get(),0, MID_TL_STYLE }, \
-{ u"CharOverlineColor",EE_CHAR_OVERLINE,   
::cppu::UnoType::get(),0, MID_TL_COLOR }, \
-{ u"CharOverlineHasColor", EE_CHAR_OVERLINE,   
cppu::UnoType::get(),0, MID_TL_HASCOLOR } , \
+{ u"CharOverlineColor"_ustr,   EE_CHAR_OVERLINE,   
::cppu::UnoType::get(),0, MID_TL_COLOR }, \
+{ u"CharOverlineHasColor"_ustr,EE_CHAR_OVERLINE,   
cppu::UnoType::get(),0, MID_TL_HASCOLOR } , \
 { UNO_NAME_EDIT_CHAR_CROSSEDOUT,  EE_CHAR_STRIKEOUT,  
cppu::UnoType::get(),0, MID_CROSSED_OUT }, \
 { UNO_NAME_EDIT_CHAR_STRIKEOUT,   EE_CHAR_STRIKEOUT,  
::cppu::UnoType::get(),0, MID_CROSS_OUT}, \
 { UNO_NAME_EDIT_CHAR_CASEMAP, EE_CHAR_CASEMAP,
::cppu::UnoType::get(),0, 0 }, \
 { UNO_NAME_EDIT_CHAR_SHADOWED,EE_CHAR_SHADOW, 
cppu::UnoType::get(),0, 0 }, \
-{ u"CharContoured",EE_CHAR_OUTLINE,
cppu::UnoType::get(),0, 0 }, \
-{ u"CharEscapementHeight", EE_CHAR_ESCAPEMENT, 
cppu::UnoType::get(), 0, MID_ESC_HEIGHT },\
-{ u"CharAutoKerning",  
EE_CHAR_PAIRKERNING,cppu::UnoType::get(),0, 0 } , \
-{ u"CharKerning",  EE_CHAR_KERNING,
::cppu::UnoType::get()  ,  0, 0 }, \
-{ u"CharWordMode", EE_CHAR_WLM,
cppu::UnoType::get(),0, 0 }, \
-{ u"CharEmphasis", EE_CHAR_EMPHASISMARK, 
::cppu::UnoType::get(),   0, MID_EMPHASIS},\
+{

[Libreoffice-commits] core.git: include/editeng include/filter include/formula include/i18nutil include/IwyuFilter_include.yaml include/jvmaccess

2023-09-23 Thread Gabor Kelemen (via logerrit) 
 include/IwyuFilter_include.yaml|1 +
 include/editeng/AccessibleContextBase.hxx  |1 -
 include/editeng/AccessibleEditableTextPara.hxx |1 -
 include/editeng/eerdll.hxx |1 -
 include/editeng/smallcaps.hxx  |1 +
 include/editeng/unotext.hxx|1 -
 include/filter/msfilter/rtfutil.hxx|1 -
 include/filter/msfilter/svdfppt.hxx|1 +
 include/formula/IFunctionDescription.hxx   |1 -
 include/formula/formulahelper.hxx  |1 -
 include/i18nutil/scripttypedetector.hxx|3 ++-
 include/jvmaccess/classpath.hxx|3 ++-
 12 files changed, 7 insertions(+), 9 deletions(-)

New commits:
commit 7d66020d291928d03b638e03371359e756583178
Author: Gabor Kelemen 
AuthorDate: Thu Sep 14 02:59:53 2023 +0200
Commit: Gabor Kelemen 
CommitDate: Sat Sep 23 10:39:02 2023 +0200

tdf#146619 Recheck include/[e-j]* with IWYU

Change-Id: I705becd4618989ca274ca8c42eeff3bc18a4ae76
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156986
Tested-by: Jenkins
Reviewed-by: Gabor Kelemen 

diff --git a/include/IwyuFilter_include.yaml b/include/IwyuFilter_include.yaml
index acf7d21552b0..c0b87cd559c8 100644
--- a/include/IwyuFilter_include.yaml
+++ b/include/IwyuFilter_include.yaml
@@ -754,6 +754,7 @@ excludelist:
 - com/sun/star/awt/FontDescriptor.hpp
 - com/sun/star/style/LineSpacing.hpp
 - com/sun/star/style/TabStop.hpp
+- com/sun/star/util/XComplexColor.hpp
 - editeng/eeitem.hxx
 include/formula/FormulaOpCodeMapperObj.hxx:
 # base class has to be a complete type
diff --git a/include/editeng/AccessibleContextBase.hxx 
b/include/editeng/AccessibleContextBase.hxx
index c5257fdb9e6d..d2152a9a4026 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -28,7 +28,6 @@
 #include 
 #include 
 #include 
-#include 
 
 namespace com::sun::star::accessibility { class XAccessibleRelationSet; }
 namespace com::sun::star::accessibility { struct AccessibleEventObject; }
diff --git a/include/editeng/AccessibleEditableTextPara.hxx 
b/include/editeng/AccessibleEditableTextPara.hxx
index 4890f4abffc7..616c31c772c0 100644
--- a/include/editeng/AccessibleEditableTextPara.hxx
+++ b/include/editeng/AccessibleEditableTextPara.hxx
@@ -21,7 +21,6 @@
 #define INCLUDED_EDITENG_ACCESSIBLEEDITABLETEXTPARA_HXX
 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/editeng/eerdll.hxx b/include/editeng/eerdll.hxx
index 017ff72972a4..b77d6a0d4703 100644
--- a/include/editeng/eerdll.hxx
+++ b/include/editeng/eerdll.hxx
@@ -24,7 +24,6 @@
 #include 
 #include 
 #include 
-#include 
 
 class GlobalEditData;
 namespace editeng
diff --git a/include/editeng/smallcaps.hxx b/include/editeng/smallcaps.hxx
index 8a453b1185f6..31b12dadf3aa 100644
--- a/include/editeng/smallcaps.hxx
+++ b/include/editeng/smallcaps.hxx
@@ -19,6 +19,7 @@
 #pragma once
 
 #include 
+#include 
 
 /*
  *  class SvxDoCapitals
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 62f9fe192c4c..eab4961c1288 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -44,7 +44,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/filter/msfilter/rtfutil.hxx 
b/include/filter/msfilter/rtfutil.hxx
index 7c678402abd9..44ed15c70857 100644
--- a/include/filter/msfilter/rtfutil.hxx
+++ b/include/filter/msfilter/rtfutil.hxx
@@ -12,7 +12,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/filter/msfilter/svdfppt.hxx 
b/include/filter/msfilter/svdfppt.hxx
index 76173bf855c4..55a648a70354 100644
--- a/include/filter/msfilter/svdfppt.hxx
+++ b/include/filter/msfilter/svdfppt.hxx
@@ -40,6 +40,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/formula/IFunctionDescription.hxx 
b/include/formula/IFunctionDescription.hxx
index 121456b600cc..216389451f9d 100644
--- a/include/formula/IFunctionDescription.hxx
+++ b/include/formula/IFunctionDescription.hxx
@@ -25,7 +25,6 @@
 
 #include 
 #include 
-#include 
 #include 
 #include 
 
diff --git a/include/formula/formulahelper.hxx 
b/include/formula/formulahelper.hxx
index 3b6cb88a67d3..b298dfa36b07 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -20,7 +20,6 @@
 #ifndef INCLUDED_FORMULA_FORMULAHELPER_HXX
 #define INCLUDED_FORMULA_FORMULAHELPER_HXX
 
-#include 
 #include 
 
 #include 
diff --git a/include/i18nutil/scripttypedetector.hxx 
b/include/i18nutil/scripttypedetector.hxx
index b5d0186fb5c6..8e92f46b5f8a 100644
--- a/include/i18nutil/scripttypedetector.hxx
+++ b/include/i18nutil/scripttypedetector.hxx
@@ -20,7 +20,8 @@
 #define

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

2023-09-09 Thread Noel Grandin (via logerrit) 
 include/editeng/unotext.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0a4f79e13ca41697d96e7c4b0d80d402f0cab1d5
Author: Noel Grandin 
AuthorDate: Fri Sep 8 13:51:14 2023 +0200
Commit: Noel Grandin 
CommitDate: Sat Sep 9 17:39:00 2023 +0200

SvxUnoTextContentEnumeration does not need to implement XAggreggation

Checked on jenkins using 'make check' and

+void SAL_CALL setDelegator(css::uno::Reference const 
&) final { assert(false); }

Change-Id: Iabe77c0bd01177066a7a565c0d83c03f61f5fc13
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156716
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 59e670a0f06d..62f9fe192c4c 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -594,7 +594,7 @@ public:
 };
 
 
-class SvxUnoTextContentEnumeration final : public ::cppu::WeakAggImplHelper1< 
css::container::XEnumeration >
+class SvxUnoTextContentEnumeration final : public ::cppu::WeakImplHelper< 
css::container::XEnumeration >
 {
 private:
 css::uno::Reference< css::text::XText > mxParentText;

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

2023-09-08 Thread Noel Grandin (via logerrit) 
 include/editeng/unotext.hxx |3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 59bf2fbb5f6ebe62b4176c040054ff1c80e2d29a
Author: Noel Grandin 
AuthorDate: Fri Sep 8 13:52:00 2023 +0200
Commit: Noel Grandin 
CommitDate: Fri Sep 8 20:20:56 2023 +0200

SvUnoTextRangeEnumeration does not need to implement XAggreggation

Checked on jenkins using 'make check' and

+void SAL_CALL setDelegator(css::uno::Reference 
const &) final { assert(false); }
+

Change-Id: I4313e8c25ab3fec4b96c7a0643c7acf9ba89785f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/156717
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 213c5efa6b4f..59e670a0f06d 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -611,7 +612,7 @@ public:
 };
 
 
-class SvxUnoTextRangeEnumeration final : public ::cppu::WeakAggImplHelper1< 
css::container::XEnumeration >
+class SvxUnoTextRangeEnumeration final : public ::cppu::WeakImplHelper< 
css::container::XEnumeration >
 {
 private:
 std::unique_ptr  mpEditSource;

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

2023-06-29 Thread Mike Kaganski (via logerrit) 
 include/editeng/brushitem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3eba3f6c22b9de02b22a2e3fe3d348940db81e13
Author: Mike Kaganski 
AuthorDate: Thu Jun 29 12:05:34 2023 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jun 29 12:55:38 2023 +0200

getComplexColor: return a const reference, to avoid an extra copy

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

diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index b995c7fa0637..26e5458bc5bf 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -91,7 +91,7 @@ public:
 Color&  GetColor()  { return aColor; }
 voidSetColor( const Color& rCol){ aColor = rCol; }
 
-model::ComplexColor getComplexColor() const
+const model::ComplexColor& getComplexColor() const
 {
 return maComplexColor;
 }

[Libreoffice-commits] core.git: include/editeng oox/source sw/source writerfilter/source

2023-06-18 Thread Tomaž Vajngerl (via logerrit) 
 include/editeng/unoprnms.hxx |4 +
 include/editeng/unotext.hxx  |5 -
 oox/source/drawingml/textcharacterproperties.cxx |6 +
 oox/source/token/properties.txt  |2 
 sw/source/filter/ww8/docxattributeoutput.cxx |   28 ++---
 writerfilter/source/dmapper/CellColorHandler.cxx |   70 ++-
 writerfilter/source/dmapper/CellColorHandler.hxx |   15 
 writerfilter/source/dmapper/PropertyIds.cxx  |7 +-
 writerfilter/source/dmapper/PropertyIds.hxx  |3 
 9 files changed, 125 insertions(+), 15 deletions(-)

New commits:
commit 9e121f3a6b95dab7525aa1583f810b2b504ce1b3
Author: Tomaž Vajngerl 
AuthorDate: Sun Jun 11 00:57:36 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sun Jun 18 13:32:12 2023 +0200

ooxml: import and export background and fill theme colors props.

This adds support to import and export background and fill theme
color properties.

Change-Id: I0f40615fe2d06cdcb4f2f9752602fe2ec699c7b3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/152835
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 8859dfe5a4a5..214b8fd53dea 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -350,6 +350,10 @@ inline constexpr OUStringLiteral 
UNO_NAME_EDIT_CHAR_SHADOWED = u"CharShadowed";
 inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_UNDERLINE = 
u"CharUnderline";
 inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_OVERLINE = u"CharOverline";
 
+inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_COLOR = 
u"CharBackColor";
+inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_COMPLEX_COLOR = 
u"CharBackgroundComplexColor";
+inline constexpr OUStringLiteral UNO_NAME_EDIT_CHAR_BACKGROUND_TRANSPARENT = 
u"CharBackTransparent";
+
 inline constexpr OUStringLiteral UNO_NAME_BITMAP = u"Bitmap";
 
 inline constexpr OUStringLiteral UNO_NAME_LINKDISPLAYNAME = u"LinkDisplayName";
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index de79cae965f2..213c5efa6b4f 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -94,8 +94,9 @@ struct SfxItemPropertyMapEntry;
 { UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD,   EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_LUM_MOD }, \
 { UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF,   EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_LUM_OFF }, \
 { UNO_NAME_EDIT_CHAR_COMPLEX_COLOR, EE_CHAR_COLOR,
::cppu::UnoType::get(), 0, MID_COMPLEX_COLOR }, \
-{ u"CharBackColor",EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(),0, 0 }, \
-{ u"CharBackTransparent",  EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
+{ UNO_NAME_EDIT_CHAR_BACKGROUND_COLOR, EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(),0, MID_COLOR_RGB }, \
+{ UNO_NAME_EDIT_CHAR_BACKGROUND_COMPLEX_COLOR, EE_CHAR_BKGCOLOR, 
::cppu::UnoType::get(), 0, MID_COMPLEX_COLOR }, \
+{ UNO_NAME_EDIT_CHAR_BACKGROUND_TRANSPARENT, EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
 { UNO_NAME_EDIT_CHAR_ESCAPEMENT,  EE_CHAR_ESCAPEMENT, 
::cppu::UnoType::get(),0, MID_ESC }, \
 { UNO_NAME_EDIT_CHAR_UNDERLINE,   EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_STYLE }, \
 { u"CharUnderlineColor",   EE_CHAR_UNDERLINE,  
::cppu::UnoType::get(),0, MID_TL_COLOR }, \
diff --git a/oox/source/drawingml/textcharacterproperties.cxx 
b/oox/source/drawingml/textcharacterproperties.cxx
index 1217c19441ae..c3dde4889a64 100644
--- a/oox/source/drawingml/textcharacterproperties.cxx
+++ b/oox/source/drawingml/textcharacterproperties.cxx
@@ -216,7 +216,11 @@ void TextCharacterProperties::pushToPropMap( PropertyMap& 
rPropMap, const XmlFil
 }
 
 if (maHighlightColor.isUsed() && maHighlightColor.getTransparency() != 100)
-rPropMap.setProperty( PROP_CharBackColor, maHighlightColor.getColor( 
rFilter.getGraphicHelper() ));
+{
+rPropMap.setProperty(PROP_CharBackColor, maHighlightColor.getColor( 
rFilter.getGraphicHelper() ));
+model::ComplexColor aComplexColor = maHighlightColor.getComplexColor();
+rPropMap.setProperty(PROP_CharBackgroundComplexColor, 
model::color::createXComplexColor(aComplexColor));
+}
 else
 rPropMap.setProperty( PROP_CharBackColor, sal_Int32(-1));
 }
diff --git a/oox/source/token/properties.txt b/oox/source/token/properties.txt
index 025b0628b9d8..a6de5458b663 100644
--- a/oox/source/token/properties.txt
+++ b/oox/source/token/properties.txt
@@ -24,6 +24,7 @@ BackGraphicLocation
 BackGraphic
 Background
 BackgroundColor
+BackgroundComplexColor
 BasicLibraries
 BlackDay
 BlockIncrement
@@ -52,6 +53,7 @@ CenterHorizontally
 CenterVertically
 Change
 CharBackColor
+CharBackgroundComplexColor

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

2023-06-12 Thread Justin Luth (via logerrit) 
 include/editeng/escapementitem.hxx  |4 ++--
 sw/qa/extras/uiwriter/uiwriter2.cxx |   14 ++
 sw/source/uibase/shells/txtattr.cxx |4 
 3 files changed, 16 insertions(+), 6 deletions(-)

New commits:
commit d384ccdb04ebeb8b094e6d9a2ddf4e5aea5327c8
Author: Justin Luth 
AuthorDate: Tue Feb 18 11:05:51 2020 +0300
Commit: Miklos Vajna 
CommitDate: Mon Jun 12 09:30:30 2023 +0200

related tdf#80194 SvxEscapementItem: set auto flag as default

This OUGHT to effectively be identical - since nProp
is the default, and the DFLT_ESC_ values match what
_AUTO_ ought to calculate. So it shouldn't be too scary.
It would ?only? expose areas that deficiently handle _AUTO_.

The primary intended effect is on calling .uno:SubScript
(via the properties panel or toolbar) and getting an
automatic subscript/superscript for editeng text
(which would be draw/impress/calc objects, or Writer textboxes).

Instead of setting the default value for subscript/superscript,
set the auto-flag so the computer can more intelligently handle
the positioning. That's what I would expect as a user,
especially since this is the default in the character format dialog,
and Writer already did this explicitly.

One possible downside to this is that "automatic" is less
clearly defined for pixel-exact compatibility with other
programs, or for export/import. But we already do that with
Writer - which is the most concerned about pixel-exactness...

Prior to 7.0, editeng automatic subscripts weren't calculated very well
(i.e. subscripts were placed way too low).
So don't enable automatic mode until after 7.6,
so that the older, stable versions have a chance
to not mess up positioning an automatic value
on newly created documents.

CAUTION: Doing this at such a low level might be too radical.
The other option would be to specify it at all of the
SID_SET_SUB_SCRIPT locations - similar to the way that
Writer did it.

Change-Id: Ic6fb866477653ff57edd02bb894769545a60acf3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88998
Tested-by: Jenkins
Reviewed-by: Justin Luth 
Reviewed-by: Miklos Vajna 

diff --git a/include/editeng/escapementitem.hxx 
b/include/editeng/escapementitem.hxx
index ea8f99e3519c..d9d4f7d3006f 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -73,9 +73,9 @@ public:
 {
 nProp = DFLT_ESC_PROP;
 if( SvxEscapement::Superscript == eNew )
-nEsc = DFLT_ESC_SUPER;
+nEsc = DFLT_ESC_AUTO_SUPER;
 else
-nEsc = DFLT_ESC_SUB;
+nEsc = DFLT_ESC_AUTO_SUB;
 }
 }
 SvxEscapement GetEscapement() const { return static_cast< SvxEscapement >( 
GetEnumValue() ); }
diff --git a/sw/qa/extras/uiwriter/uiwriter2.cxx 
b/sw/qa/extras/uiwriter/uiwriter2.cxx
index 6c9714367bf7..fad17768fec2 100644
--- a/sw/qa/extras/uiwriter/uiwriter2.cxx
+++ b/sw/qa/extras/uiwriter/uiwriter2.cxx
@@ -1840,6 +1840,20 @@ CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf147310)
 }
 }
 
+CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf80194_autoSubscript)
+{
+createSwDoc();
+
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+"Automatic mode enabled", false,
+getProperty(getRun(getParagraph(1), 1), "CharAutoEscapement"));
+dispatchCommand(mxComponent, ".uno:SubScript", {});
+// Writer has always had automatic mode enabled when creating 
subscript/superscripts.
+CPPUNIT_ASSERT_EQUAL_MESSAGE(
+"Automatic mode enabled", true,
+getProperty(getRun(getParagraph(1), 1), "CharAutoEscapement"));
+}
+
 CPPUNIT_TEST_FIXTURE(SwUiWriterTest2, testTdf64242_optimizeTable)
 {
 createSwDoc("tdf64242_optimizeTable.odt");
diff --git a/sw/source/uibase/shells/txtattr.cxx 
b/sw/source/uibase/shells/txtattr.cxx
index c5c90c8afc7c..68f4197f5437 100644
--- a/sw/source/uibase/shells/txtattr.cxx
+++ b/sw/source/uibase/shells/txtattr.cxx
@@ -115,10 +115,6 @@ void SwTextShell::ExecCharAttr(SfxRequest )
 break;
 }
 SvxEscapementItem aEscape( eEscape, RES_CHRATR_ESCAPEMENT );
-if(eEscape == SvxEscapement::Superscript)
-aEscape.GetEsc() = DFLT_ESC_AUTO_SUPER;
-else if(eEscape == SvxEscapement::Subscript)
-aEscape.GetEsc() = DFLT_ESC_AUTO_SUB;
 rSh.SetAttrItem( aEscape );
 rReq.AppendItem( aEscape );
 rReq.Done();

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

2023-05-15 Thread Andrea Gelmini (via logerrit) 
 include/editeng/svxacorr.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c35e5ce3fc1de78762e03cf2b38fce1398841b20
Author: Andrea Gelmini 
AuthorDate: Sun May 14 17:22:43 2023 +0200
Commit: Julien Nabet 
CommitDate: Mon May 15 08:43:09 2023 +0200

Remove duplicated include

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

diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index b7372a431865..fcb5f97aca2b 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -33,7 +33,6 @@
 #include 
 #include 
 #include 
-#include 
 #include 
 #include

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

2023-04-29 Thread Tomaž Vajngerl (via logerrit) 
 include/editeng/unotext.hxx |3 ++-
 include/svx/unoshprp.hxx|4 ++--
 svx/source/unodraw/unoprov.cxx  |2 +-
 sw/source/core/unocore/unomap.cxx   |3 ++-
 sw/source/core/unocore/unomap1.cxx  |5 +++--
 sw/source/core/unocore/unomapproperties.hxx |6 +++---
 6 files changed, 13 insertions(+), 10 deletions(-)

New commits:
commit 0cda9cdba77bfe3c5f4b78f7538e2b6c96a01493
Author: Tomaž Vajngerl 
AuthorDate: Sat Apr 29 23:04:27 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Sat Apr 29 18:00:39 2023 +0200

use XThemeColor instead of XInterface for *ThemeReference props

Change-Id: I23b6a7429bbcf7901f3d817c970ee7ef4a453197
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151184
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index a5fc41c4547a..935f6ce1b66b 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -41,6 +41,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -91,7 +92,7 @@ struct SfxItemPropertyMapEntry;
 { UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_TINT_OR_SHADE }, \
 { UNO_NAME_EDIT_CHAR_COLOR_LUM_MOD,   EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_LUM_MOD }, \
 { UNO_NAME_EDIT_CHAR_COLOR_LUM_OFF,   EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_LUM_OFF }, \
-{ UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, EE_CHAR_COLOR,
::cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE }, \
+{ UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, EE_CHAR_COLOR,
::cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE }, 
\
 { u"CharBackColor",EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(),0, 0 }, \
 { u"CharBackTransparent",  EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
 { UNO_NAME_EDIT_CHAR_ESCAPEMENT,  EE_CHAR_ESCAPEMENT, 
::cppu::UnoType::get(),0, MID_ESC }, \
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index c385f0766358..828e02771e4b 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -237,7 +237,7 @@
 #define LINE_PROPERTIES_DEFAULTS\
 { UNO_NAME_LINECAP,   XATTR_LINECAP,  
::cppu::UnoType::get(), 0, 0}, \
 { UNO_NAME_LINECOLOR, XATTR_LINECOLOR,
::cppu::UnoType::get() ,   0, 0}, \
-{ UNO_NAME_LINECOLOR_THEME_REFERENCE, XATTR_LINECOLOR, 
::cppu::UnoType::get() ,   0, 
MID_COLOR_THEME_REFERENCE}, \
+{ UNO_NAME_LINECOLOR_THEME_REFERENCE, XATTR_LINECOLOR, 
::cppu::UnoType::get() ,   0, 
MID_COLOR_THEME_REFERENCE}, \
 { UNO_NAME_LINEENDCENTER, XATTR_LINEENDCENTER,
cppu::UnoType::get() ,   0, 0}, \
 { UNO_NAME_LINEENDWIDTH,  XATTR_LINEENDWIDTH, 
::cppu::UnoType::get() ,   0, 0, 
PropertyMoreFlags::METRIC_ITEM}, \
 { UNO_NAME_LINEJOINT, XATTR_LINEJOINT,
::cppu::UnoType::get(), 0, 0}, \
@@ -294,7 +294,7 @@
 { UNO_NAME_FILLCOLOR_THEME,   XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_THEME_INDEX}, \
 { UNO_NAME_FILLCOLOR_LUM_MOD, XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_LUM_MOD}, \
 { UNO_NAME_FILLCOLOR_LUM_OFF, XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_LUM_OFF}, \
-{ UNO_NAME_FILLCOLOR_THEME_REFERENCE,   XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, 
MID_COLOR_THEME_REFERENCE}, \
+{ UNO_NAME_FILLCOLOR_THEME_REFERENCE,   XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, 
MID_COLOR_THEME_REFERENCE}, \
 { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP  , 
::cppu::UnoType::get(), 0, 0 }, \
 { UNO_NAME_FILLUSESLIDEBACKGROUND, XATTR_FILLUSESLIDEBACKGROUND, 
cppu::UnoType::get(), 0,   0},
 
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index aeb16d9800d9..08c7f5ba6933 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -566,7 +566,7 @@ static o3tl::span 
ImplGetSvxControlShapePropertyM
 { UNO_NAME_EDIT_CHAR_COLOR,   0,  
cppu::UnoType::get(),0, MID_COLOR_RGB },
 { UNO_NAME_EDIT_CHAR_COLOR_THEME, 0,  
cppu::UnoType::get(),0, MID_COLOR_THEME_INDEX },
 { UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, 0, 
cppu::UnoType::get(), 0, MID_COLOR_TINT_OR_SHADE },
-{ UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, 0,  
cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE },
+{ UNO_NAME_EDIT_CHAR_COLOR_THEME_REFERENCE, 0,  
cppu::UnoType::get(), 0, MID_COLOR_THEME_REFERENCE },
 { u"CharBackColor",0,  
cppu::UnoType::get(),0, 0 },
 { u"CharBackTransparent",  0,  cppu::UnoType::get(), 
0, 0 },

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

2023-04-27 Thread Andrea Gelmini (via logerrit) 
 include/editeng/svxacorr.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 233057d98258e9dee7cc50d86f26c1d681df5ba1
Author: Andrea Gelmini 
AuthorDate: Thu Apr 27 16:17:32 2023 +0200
Commit: Julien Nabet 
CommitDate: Thu Apr 27 20:04:12 2023 +0200

Fix typo

Change-Id: If5a1b306db1a3abd49ed9a554fbff3f5dfa72771
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151130
Tested-by: Julien Nabet 
Reviewed-by: Julien Nabet 

diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index eddf8c9296a1..b2eaeff9f9e3 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -76,7 +76,7 @@ enum class ACFlags : sal_uInt32 {
 CorrectCapsLock  = 0x2000,   // Correct accidental use of cAPS 
LOCK key
 TransliterateRTL = 0x4000,   // Transliterate RTL text
 ChgAngleQuotes   = 0x8000,   // >>, << -> angle quotes in some 
languages
-SetDOIAttr   = 0x0001,   // Set DOIAttribut
+SetDOIAttr   = 0x0001,   // Set DOIAttribute
 
 ChgWordLstLoad   = 0x2000,   // Replacement list loaded
 CplSttLstLoad= 0x4000,   // Exception list for Capital letters 
Start loaded

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

2023-04-26 Thread Julien Nabet (via logerrit) 
 include/editeng/unoprnms.hxx |2 +-
 include/editeng/unotext.hxx  |2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 281c121bb3119db28c164a7b1ec7fde87abeccbf
Author: Julien Nabet 
AuthorDate: Wed Apr 26 17:04:13 2023 +0200
Commit: Julien Nabet 
CommitDate: Wed Apr 26 19:28:54 2023 +0200

Typo UNO_NAME_EDIT_PARA_TAPSTOPS->UNO_NAME_EDIT_PARA_TABSTOPS

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

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 63d52d7537a6..9c96b29e8681 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -296,7 +296,7 @@ inline constexpr OUStringLiteral 
UNO_NAME_EDIT_PARA_LASTLINEADJ = u"ParaLastLine
 inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_LMARGIN = 
u"ParaLeftMargin";
 inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_LINESPACING = 
u"ParaLineSpacing";
 inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_RMARGIN = 
u"ParaRightMargin";
-inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_TAPSTOPS = u"ParaTabStops";
+inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_TABSTOPS = u"ParaTabStops";
 inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_TABSTOP_DEFAULT_DISTANCE = 
u"ParaTabStopDefaultDistance";
 inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_TMARGIN = u"ParaTopMargin";
 inline constexpr OUStringLiteral UNO_NAME_EDIT_PARA_IS_HYPHEN = 
u"ParaIsHyphenation";
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 6307480cea31..a5fc41c4547a 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -146,7 +146,7 @@ struct SfxItemPropertyMapEntry;
 { UNO_NAME_EDIT_PARA_LMARGIN,  EE_PARA_LRSPACE,
::cppu::UnoType::get(),0, MID_TXT_LMARGIN, 
PropertyMoreFlags::METRIC_ITEM }, \
 { UNO_NAME_EDIT_PARA_LINESPACING,  EE_PARA_SBL,
cppu::UnoType::get(), 0, CONVERT_TWIPS}, \
 { UNO_NAME_EDIT_PARA_RMARGIN,  EE_PARA_LRSPACE,
::cppu::UnoType::get(),0, MID_R_MARGIN, 
PropertyMoreFlags::METRIC_ITEM }, \
-{ UNO_NAME_EDIT_PARA_TAPSTOPS, EE_PARA_TABS,   
cppu::UnoType>::get(), 0, 0 }, \
+{ UNO_NAME_EDIT_PARA_TABSTOPS, EE_PARA_TABS,   
cppu::UnoType>::get(), 0, 0 }, \
 { UNO_NAME_EDIT_PARA_TABSTOP_DEFAULT_DISTANCE, EE_PARA_TABS, 
::cppu::UnoType::get(), 0, MID_TABSTOP_DEFAULT_DISTANCE }, \
 { UNO_NAME_EDIT_PARA_TMARGIN,  EE_PARA_ULSPACE,
::cppu::UnoType::get(),0, MID_UP_MARGIN, 
PropertyMoreFlags::METRIC_ITEM },\
 { UNO_NAME_EDIT_PARA_FIRST_LINE_INDENT, EE_PARA_LRSPACE,   
::cppu::UnoType::get(),0, MID_FIRST_LINE_INDENT, 
PropertyMoreFlags::METRIC_ITEM}, \

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

2023-03-30 Thread Sarper Akdemir (via logerrit) 
 include/editeng/tstpitem.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 6b19f32252f8ba5540ce3b1e38f8ac6112421906
Author: Sarper Akdemir 
AuthorDate: Thu Mar 30 01:37:07 2023 +0300
Commit: Sarper Akdemir 
CommitDate: Thu Mar 30 11:30:10 2023 +

add docstring for unclear default distance property in SvxTabStopItem

Change-Id: I6c9eef0a2167f738cdab8171d082becfca401d25
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149740
Tested-by: Jenkins
Reviewed-by: Sarper Akdemir 

diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 4c015d6677ec..037e76636641 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -92,6 +92,7 @@ typedef o3tl::sorted_vector SvxTabStopArr;
 class EDITENG_DLLPUBLIC SvxTabStopItem final : public SfxPoolItem
 {
 SvxTabStopArr maTabStops;
+/// Defines default tab width for tabs without dedicated tab stop in the 
paragraph.
 sal_Int32 mnDefaultDistance = 0;
 
 public:

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

2023-03-28 Thread Miklos Vajna (via logerrit) 
 include/editeng/orphitem.hxx |   11 ---
 include/editeng/widwitem.hxx |   11 ---
 2 files changed, 8 insertions(+), 14 deletions(-)

New commits:
commit 98cf5157d69d9f1692be7f2cac958b1dfb387ca9
Author: Miklos Vajna 
AuthorDate: Mon Mar 27 21:58:10 2023 +0100
Commit: Miklos Vajna 
CommitDate: Tue Mar 28 07:48:45 2023 +

editeng: document SvxOrphansItem and SvxWidowsItem

Replace boilerplate with something that actually helps remembering which
one is which.

Change-Id: Ia74b69d756cd31006b6f56726aeb37dc86880238
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/149636
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/editeng/orphitem.hxx b/include/editeng/orphitem.hxx
index 4181e7c741eb..251dc5150dc0 100644
--- a/include/editeng/orphitem.hxx
+++ b/include/editeng/orphitem.hxx
@@ -22,13 +22,10 @@
 #include 
 #include 
 
-// class SvxOrphansItem --
-
-/*  [Description]
-
-This item describes the number of lines for the orphans system.
-*/
-
+/// An orphan line is a paragraph-starting line that is still on the previous 
page or column (has
+/// future, but no past).
+///
+/// nL specifies the minimum number of lines, to prevent orphans.
 class EDITENG_DLLPUBLIC SvxOrphansItem final : public SfxByteItem
 {
 public:
diff --git a/include/editeng/widwitem.hxx b/include/editeng/widwitem.hxx
index 5d64962d32ef..0bb6138fd082 100644
--- a/include/editeng/widwitem.hxx
+++ b/include/editeng/widwitem.hxx
@@ -22,13 +22,10 @@
 #include 
 #include 
 
-// class SvxWidowsItem ---
-
-/*  [Description]
-
-This item describes the number of lines for the widows control.
-*/
-
+/// A widow line is a paragraph-ending line that goes to the following page or 
column (has past, but
+/// no future).
+///
+/// nL specifies the minimum number of lines, to prevent widows.
 class EDITENG_DLLPUBLIC SvxWidowsItem final : public SfxByteItem
 {
 public:

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

2023-02-28 Thread Andrea Gelmini (via logerrit) 
 include/editeng/outliner.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ed206ccb9e24bd4bf0040c42d26f73363baf3d20
Author: Andrea Gelmini 
AuthorDate: Tue Feb 28 15:55:49 2023 +0100
Commit: Julien Nabet 
CommitDate: Tue Feb 28 17:54:34 2023 +

Fix typo

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

diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index bee57d13bca8..a4f02568a64f 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -989,7 +989,7 @@ public:
 // convenient method to determine the bullets/numbering status for all 
paragraphs
 sal_Int32 GetBulletsNumberingStatus() const;
 
-// overriden in SdrOutliner
+// overridden in SdrOutliner
 virtual std::optional GetCompatFlag(SdrCompatibilityFlag /*eFlag*/) 
const { return {}; };
 };

[Libreoffice-commits] core.git: include/editeng include/oox include/svx oox/inc oox/qa oox/source sd/source svx/source

2023-01-13 Thread Tomaž Vajngerl (via logerrit) 
 include/editeng/unoprnms.hxx   |1 
 include/oox/export/drawingml.hxx   |2 
 include/svx/unoshprp.hxx   |1 
 oox/inc/drawingml/lineproperties.hxx   |3 -
 oox/qa/unit/data/ThemeShapesReference.pptx |binary
 oox/qa/unit/drawingml.cxx  |   71 -
 oox/source/drawingml/lineproperties.cxx|   34 -
 oox/source/drawingml/shape.cxx |4 +
 oox/source/export/drawingml.cxx|   64 +-
 oox/source/token/properties.txt|1 
 sd/source/core/stlsheet.cxx|   10 
 svx/source/table/cell.cxx  |   12 
 svx/source/unodraw/unoshape.cxx|   10 
 svx/source/xoutdev/xattr.cxx   |   44 +++--
 14 files changed, 192 insertions(+), 65 deletions(-)

New commits:
commit af8fdba1194e657237f9abc460381a1c4bc49982
Author: Tomaž Vajngerl 
AuthorDate: Thu Jan 5 13:12:34 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Fri Jan 13 23:07:22 2023 +

support theme color for lines + oox support + tests

Extended XLineColor to handle model::ThemeColor which then maps
to the newly added LineColorThemeData property.

Extended oox import and export to map the scheme color elements
to and from ThemeColor. Added a new test to check the theme line
color in impress shapes.

Change-Id: I23ecc18c88b5b47608c9110f5681f189d02e2f36
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145071
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 7f82cd0b1fea..300a0a2b7765 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -77,6 +77,7 @@ inline constexpr OUStringLiteral UNO_NAME_LINESTYLE = 
u"LineStyle";
 inline constexpr OUStringLiteral UNO_NAME_LINEDASH = u"LineDash";
 inline constexpr OUStringLiteral UNO_NAME_LINEWIDTH = u"LineWidth";
 inline constexpr OUStringLiteral UNO_NAME_LINECOLOR = u"LineColor";
+inline constexpr OUStringLiteral UNO_NAME_LINECOLOR_THEME_REFERENCE = 
u"LineColorThemeReference";
 inline constexpr OUStringLiteral UNO_NAME_LINEJOINT = u"LineJoint";
 inline constexpr OUStringLiteral UNO_NAME_LINESTART = u"LineStart";
 inline constexpr OUStringLiteral UNO_NAME_LINEEND = u"LineEnd";
diff --git a/include/oox/export/drawingml.hxx b/include/oox/export/drawingml.hxx
index eb0fea23b95c..c131632aea8d 100644
--- a/include/oox/export/drawingml.hxx
+++ b/include/oox/export/drawingml.hxx
@@ -235,7 +235,7 @@ public:
 void WriteConnectorConnections( sal_Int32 nStartGlueId, sal_Int32 
nEndGlueId, sal_Int32 nStartID, sal_Int32 nEndID );
 
 bool WriteCharColor(const css::uno::Reference& 
xPropertySet);
-bool WriteFillColor(const css::uno::Reference& 
xPropertySet);
+bool WriteSchemeColor(OUString const& rPropertyName, const 
css::uno::Reference& xPropertySet);
 
 void WriteSolidFill( ::Color nColor, sal_Int32 nAlpha = MAX_PERCENT );
 void WriteSolidFill( const OUString& sSchemeName, const 
css::uno::Sequence< css::beans::PropertyValue >& aTransformations, sal_Int32 
nAlpha = MAX_PERCENT );
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 8af8142c1d43..70be33007013 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -236,6 +236,7 @@
 #define LINE_PROPERTIES_DEFAULTS\
 { UNO_NAME_LINECAP,   XATTR_LINECAP,  
::cppu::UnoType::get(), 0, 0}, \
 { UNO_NAME_LINECOLOR, XATTR_LINECOLOR,
::cppu::UnoType::get() ,   0, 0}, \
+{ UNO_NAME_LINECOLOR_THEME_REFERENCE, XATTR_LINECOLOR, 
::cppu::UnoType::get() ,   0, 
MID_COLOR_THEME_REFERENCE}, \
 { UNO_NAME_LINEENDCENTER, XATTR_LINEENDCENTER,
cppu::UnoType::get() ,   0, 0}, \
 { UNO_NAME_LINEENDWIDTH,  XATTR_LINEENDWIDTH, 
::cppu::UnoType::get() ,   0, 0, 
PropertyMoreFlags::METRIC_ITEM}, \
 { UNO_NAME_LINEJOINT, XATTR_LINEJOINT,
::cppu::UnoType::get(), 0, 0}, \
diff --git a/oox/inc/drawingml/lineproperties.hxx 
b/oox/inc/drawingml/lineproperties.hxx
index f2d37a7f8a9f..52c27825bdaf 100644
--- a/oox/inc/drawingml/lineproperties.hxx
+++ b/oox/inc/drawingml/lineproperties.hxx
@@ -69,7 +69,8 @@ struct LineProperties
 voidpushToPropMap(
 ShapePropertyMap& rPropMap,
 const GraphicHelper& rGraphicHelper,
-::Color nPhClr = API_RGB_TRANSPARENT ) const;
+::Color nPhClr = API_RGB_TRANSPARENT,
+sal_Int16 nPhClrTheme = -1) const;
 
 /** Calculates the line style attribute from the internal state of the 
object */
 css::drawing::LineStyle  getLineStyle() const;
diff --git a/oox/qa/unit/data/ThemeShapesReference.pptx

[Libreoffice-commits] core.git: include/editeng sw/CppunitTest_sw_core_theme.mk sw/Module_sw.mk sw/qa sw/source writerfilter/source xmloff/inc xmloff/source

2022-12-24 Thread Tomaž Vajngerl (via logerrit) 
 include/editeng/unoprnms.hxx  |2 
 sw/CppunitTest_sw_core_theme.mk   |   62 ++
 sw/Module_sw.mk   |1 
 sw/qa/core/theme/ThemeTest.cxx|   35 ++
 sw/qa/core/theme/data/ThemeColorInHeading.docx|binary
 sw/source/core/unocore/unomap.cxx |4 -
 sw/source/core/unocore/unomap1.cxx|6 +
 sw/source/core/unocore/unomapproperties.hxx   |6 +
 sw/source/uibase/sidebar/ThemePanel.cxx   |   29 ++--
 sw/source/uibase/sidebar/WriterInspectorTextPanel.cxx |   14 ++--
 writerfilter/source/dmapper/DomainMapper.cxx  |   16 
 writerfilter/source/dmapper/PropertyIds.cxx   |2 
 writerfilter/source/dmapper/PropertyIds.hxx   |2 
 writerfilter/source/dmapper/TDefTableHandler.cxx  |   44 
 writerfilter/source/dmapper/TDefTableHandler.hxx  |1 
 xmloff/inc/XMLThemeColorHandler.hxx   |   49 ++
 xmloff/inc/enummaps.hxx   |2 
 xmloff/source/draw/sdpropls.cxx   |3 
 xmloff/source/text/txtprhdl.cxx   |6 +
 19 files changed, 254 insertions(+), 30 deletions(-)

New commits:
commit df9f3f3fd81d4f81ee2ff984d1e1abea2963
Author: Tomaž Vajngerl 
AuthorDate: Sun Sep 20 19:27:09 2015 +0200
Commit: Tomaž Vajngerl 
CommitDate: Sun Dec 25 02:06:58 2022 +

sw: support for reading back theme color from OOXML

OOXML supports theme colors and tint/shade value that additionally
changed the theme color. Read back which theme color + tint/shade
value was applied in the resulting color and add this attributes
as properties to be used by writer.
In sidebar theme panel the changing the theme colors now doesn't
takes this into account and changes the colors correctly.

Change-Id: I3a2d49d485fd37a1611483ee0bb5e6034ac5f88e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143697
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 0df739ee5285..8569a3370464 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -21,6 +21,8 @@
 #include 
 
 inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR = u"CharColor";
+inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_THEME = u"CharColorTheme";
+inline constexpr OUStringLiteral UNO_NAME_CHAR_COLOR_TINT_OR_SHADE = 
u"CharColorTintOrShade";
 inline constexpr OUStringLiteral UNO_NAME_CHAR_HEIGHT = u"CharHeight";
 inline constexpr OUStringLiteral UNO_NAME_CHAR_POSTURE = u"CharPosture";
 inline constexpr OUStringLiteral UNO_NAME_CHAR_SHADOWED = u"CharShadowed";
diff --git a/sw/CppunitTest_sw_core_theme.mk b/sw/CppunitTest_sw_core_theme.mk
new file mode 100644
index ..84b462ea8245
--- /dev/null
+++ b/sw/CppunitTest_sw_core_theme.mk
@@ -0,0 +1,62 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#*
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+#*
+
+$(eval $(call gb_CppunitTest_CppunitTest,sw_core_theme))
+
+$(eval $(call gb_CppunitTest_use_common_precompiled_header,sw_core_theme))
+
+$(eval $(call gb_CppunitTest_add_exception_objects,sw_core_theme, \
+sw/qa/core/theme/ThemeTest \
+))
+
+$(eval $(call gb_CppunitTest_use_libraries,sw_core_theme, \
+comphelper \
+cppu \
+cppuhelper \
+sal \
+sfx \
+subsequenttest \
+sw \
+swqahelper \
+test \
+unotest \
+utl \
+vcl \
+svt \
+tl \
+svl \
+svxcore \
+))
+
+$(eval $(call gb_CppunitTest_use_externals,sw_core_theme,\
+boost_headers \
+libxml2 \
+))
+
+$(eval $(call gb_CppunitTest_set_include,sw_core_theme,\
+-I$(SRCDIR)/sw/inc \
+-I$(SRCDIR)/sw/source/core/inc \
+-I$(SRCDIR)/sw/source/uibase/inc \
+-I$(SRCDIR)/sw/qa/inc \
+$$(INCLUDE) \
+))
+
+$(eval $(call gb_CppunitTest_use_api,sw_core_theme,\
+udkapi \
+offapi \
+))
+
+$(eval $(call gb_CppunitTest_use_ure,sw_core_theme))
+$(eval $(call gb_CppunitTest_use_vcl,sw_core_theme))
+$(eval $(call gb_CppunitTest_use_rdb,sw_core_theme,services))
+$(eval $(call gb_CppunitTest_use_configuration,sw_core_theme))
+
+# vim: set noet sw=4 ts=4:
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 8a217a85fbf6..a15763330763 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -154,6 +154,7 @@ $(eval $(call gb_Module_add_slowcheck_targets,sw,\
 CppunitTest_sw_filter_ww8 \
 CppunitTest_sw_filter_html \

[Libreoffice-commits] core.git: include/editeng solenv/clang-format solenv/gdb solenv/vs sw/inc sw/qa sw/source vcl/ios

2022-07-25 Thread Noel Grandin (via logerrit) 
 include/editeng/svxrtf.hxx  |2 
 solenv/clang-format/excludelist |2 
 solenv/gdb/libreoffice/sw.py|6 
 solenv/vs/LibreOffice.natvis|2 
 sw/inc/IDocumentMarkAccess.hxx  |4 
 sw/inc/contentindex.hxx |   97 +++-
 sw/inc/ndtxt.hxx|   36 ++---
 sw/inc/node.hxx |   12 -
 sw/inc/pam.hxx  |8 -
 sw/inc/pch/precompiled_msword.hxx   |2 
 sw/inc/pch/precompiled_swui.hxx |2 
 sw/inc/pch/precompiled_vbaswobj.hxx |2 
 sw/inc/splargs.hxx  |   26 ++--
 sw/qa/core/unocore/unocore.cxx  |2 
 sw/qa/extras/mailmerge/mailmerge.cxx|2 
 sw/qa/extras/uiwriter/uiwriter7.cxx |2 
 sw/source/core/access/parachangetrackinginfo.cxx|2 
 sw/source/core/bastyp/index.cxx |   78 ++--
 sw/source/core/crsr/crsrsh.cxx  |8 -
 sw/source/core/crsr/crstrvl.cxx |4 
 sw/source/core/crsr/findattr.cxx|2 
 sw/source/core/crsr/findtxt.cxx |4 
 sw/source/core/crsr/pam.cxx |   14 +-
 sw/source/core/crsr/swcrsr.cxx  |4 
 sw/source/core/doc/DocumentContentOperationsManager.cxx |   40 +++---
 sw/source/core/doc/DocumentLayoutManager.cxx|2 
 sw/source/core/doc/DocumentRedlineManager.cxx   |2 
 sw/source/core/doc/docbm.cxx|   22 +--
 sw/source/core/doc/docedt.cxx   |   16 +-
 sw/source/core/doc/docfld.cxx   |2 
 sw/source/core/doc/docfmt.cxx   |2 
 sw/source/core/doc/doclay.cxx   |4 
 sw/source/core/doc/docnew.cxx   |4 
 sw/source/core/doc/docredln.cxx |4 
 sw/source/core/doc/doctxm.cxx   |8 -
 sw/source/core/doc/extinput.cxx |6 
 sw/source/core/docnode/ndcopy.cxx   |2 
 sw/source/core/docnode/ndtbl.cxx|   10 -
 sw/source/core/docnode/node.cxx |4 
 sw/source/core/docnode/nodes.cxx|4 
 sw/source/core/docnode/section.cxx  |2 
 sw/source/core/edit/autofmt.cxx |4 
 sw/source/core/edit/edattr.cxx  |2 
 sw/source/core/edit/edglss.cxx  |4 
 sw/source/core/edit/editsh.cxx  |2 
 sw/source/core/edit/edlingu.cxx |2 
 sw/source/core/fields/ddetbl.cxx|4 
 sw/source/core/frmedt/fecopy.cxx|   10 -
 sw/source/core/inc/MarkManager.hxx  |2 
 sw/source/core/inc/docfld.hxx   |4 
 sw/source/core/inc/mvsave.hxx   |   14 +-
 sw/source/core/inc/pamtyp.hxx   |8 -
 sw/source/core/inc/txmsrt.hxx   |   12 -
 sw/source/core/layout/ftnfrm.cxx|2 
 sw/source/core/layout/trvlfrm.cxx   |2 
 sw/source/core/swg/SwXMLTextBlocks.cxx  |2 
 sw/source/core/table/swtable.cxx|8 -
 sw/source/core/text/porlay.cxx  |2 
 sw/source/core/text/porrst.cxx  |2 
 sw/source/core/tox/ToxTextGenerator.cxx |4 
 sw/source/core/tox/txmsrt.cxx   |   10 -
 sw/source/core/txtnode/atrfld.cxx   |2 
 sw/source/core/txtnode/atrflyin.cxx |2 
 sw/source/core/txtnode/ndtxt.cxx|   72 +--
 sw/source/core/txtnode/thints.cxx   |   40 +++---
 sw/source/core/txtnode/txtedt.cxx   |8 -
 sw/source/core/undo/SwUndoField.cxx |2 
 sw/source/core/undo/unattr.cxx  |4 
 sw/source/core/undo/undel.cxx   |4 
 sw/source/core/undo/undobj.cxx  |8 -
 sw/source/core/undo/undobj1.cxx |4 
 sw/source/core/undo/undraw.cxx  |2 
 sw/source/core/undo/unins.cxx   |2 
 sw/source/core/undo/unmove.cxx  |6 
 sw/source/core/undo/unovwr.cxx  |8 -
 sw/source/core/undo/unsect.cxx

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

2022-06-02 Thread Noel Grandin (via logerrit) 
 include/editeng/fontitem.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit 86922db292f5708d2431959d15c5ceea70aee7fb
Author: Noel Grandin 
AuthorDate: Thu Jun 2 15:07:04 2022 +0200
Commit: Noel Grandin 
CommitDate: Thu Jun 2 15:55:55 2022 +0200

Revert "mark SvxFontItem as IsSortable"

This reverts commit c390c2e3f44953e236389467c7c090cee9ebc1b7.

Causes crashes like
./instdir/program/soffice --headless --convert-to pdf ooo30162-3.xls
because code likes modifying items that are in existing
pools.

Change-Id: I988745a538509f90f357ec6a321b2e37828a4111
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/135308
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index 35743b9949e1..2ccaade20121 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -47,7 +47,6 @@ public:
 // "pure virtual Methods" from SfxPoolItem
 virtual bool operator==(const SfxPoolItem& rItem) const override;
 bool operator<(const SfxPoolItem& rCmp) const override;
-virtual bool IsSortable() const override { return true; }
 virtual SvxFontItem* Clone(SfxItemPool *pPool = nullptr) const override;
 virtual bool QueryValue(css::uno::Any& rVal, sal_uInt8 nMemberId = 0) 
const override;
 virtual bool PutValue(const css::uno::Any& rVal, sal_uInt8 nMemberId) 
override;

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

2022-04-13 Thread Miklos Vajna (via logerrit) 
 include/editeng/unoprnms.hxx |2 ++
 include/svx/unoshprp.hxx |2 ++
 svx/qa/unit/xoutdev.cxx  |   14 ++
 svx/source/xoutdev/xattr.cxx |   26 ++
 4 files changed, 44 insertions(+)

New commits:
commit c7970e3204f7e2d958d213c42a9f0db232578a62
Author: Miklos Vajna 
AuthorDate: Tue Apr 12 20:22:22 2022 +0200
Commit: Miklos Vajna 
CommitDate: Wed Apr 13 08:05:09 2022 +0200

sd theme: add UNO API for shape fill color effects

XColorItem::maThemeColor already provided the document model for this.

Change-Id: Iefbd0aeaa37a813bb4c86386801e0116e8fae40d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/132933
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index d7045b5b56be..8d02798ea4e2 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -32,6 +32,8 @@ inline constexpr OUStringLiteral UNO_NAME_CHAR_WEIGHT = 
u"CharWeight";
 inline constexpr OUStringLiteral UNO_NAME_FILLSTYLE = u"FillStyle";
 inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR = u"FillColor";
 inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_THEME = u"FillColorTheme";
+inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_LUM_MOD = 
u"FillColorLumMod";
+inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_LUM_OFF = 
u"FillColorLumOff";
 inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENT = u"FillGradient";
 inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENTNAME = 
u"FillGradientName";
 inline constexpr OUStringLiteral UNO_NAME_FILLHATCH = u"FillHatch";
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 4dba8617f7a2..bd08927d5039 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -290,6 +290,8 @@
 { UNO_NAME_FILLTRANSPARENCEGRADIENTNAME, XATTR_FILLFLOATTRANSPARENCE, 
::cppu::UnoType::get(), 0, MID_NAME }, \
 { UNO_NAME_FILLCOLOR_2,   XATTR_SECONDARYFILLCOLOR, 
::cppu::UnoType::get(),  0, 0}, \
 { UNO_NAME_FILLCOLOR_THEME,   XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_THEME_INDEX}, \
+{ UNO_NAME_FILLCOLOR_LUM_MOD, XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_LUM_MOD}, \
+{ UNO_NAME_FILLCOLOR_LUM_OFF, XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_LUM_OFF}, \
 { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP  , 
::cppu::UnoType::get(), 0, 0 },
 
 #define EDGERADIUS_PROPERTIES \
diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx
index ed5b75189c3a..78af484555de 100644
--- a/svx/qa/unit/xoutdev.cxx
+++ b/svx/qa/unit/xoutdev.cxx
@@ -129,6 +129,12 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest, testFillColorThemeUnoApi)
 sal_Int16 nExpected = 4; // Accent 1
 xShape->setPropertyValue("FillColorTheme", uno::makeAny(nExpected));
 
+// 80% lighter
+sal_Int16 nExpectedLumMod = 2000;
+xShape->setPropertyValue("FillColorLumMod", uno::makeAny(nExpectedLumMod));
+sal_Int16 nExpectedLumOff = 8000;
+xShape->setPropertyValue("FillColorLumOff", uno::makeAny(nExpectedLumOff));
+
 // Then make sure the value we read back is the expected one:
 sal_Int16 nActual = -1;
 xShape->getPropertyValue("FillColorTheme") >>= nActual;
@@ -137,6 +143,14 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest, testFillColorThemeUnoApi)
 // - Actual  : -1
 // i.e. setting the value was broken.
 CPPUNIT_ASSERT_EQUAL(nExpected, nActual);
+xShape->getPropertyValue("FillColorLumMod") >>= nActual;
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 2000
+// - Actual  : 8000
+// i.e. FillColorLumOff was set as FillColor, then getting FillColorLumMod 
returned FillColor.
+CPPUNIT_ASSERT_EQUAL(nExpectedLumMod, nActual);
+xShape->getPropertyValue("FillColorLumOff") >>= nActual;
+CPPUNIT_ASSERT_EQUAL(nExpectedLumOff, nActual);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index d94d51a398a8..aceba42bbb61 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -1911,6 +1911,16 @@ bool XFillColorItem::QueryValue( css::uno::Any& rVal, 
sal_uInt8 nMemberId ) cons
 rVal <<= GetThemeColor().GetThemeIndex();
 break;
 }
+case MID_COLOR_LUM_MOD:
+{
+rVal <<= GetThemeColor().GetLumMod();
+break;
+}
+case MID_COLOR_LUM_OFF:
+{
+rVal <<= GetThemeColor().GetLumOff();
+break;
+}
 default:
 {
 rVal <<= GetColorValue().GetRGBColor();
@@ -1934,6 +1944,22 @@ bool XFillColorItem::PutValue( const css::uno::Any& 
rVal, sal_uInt8 nMemberId )
 GetThemeColor().SetThemeIndex(nIndex);
 break;
 }
+case MID_COLOR_LUM_MOD:
+{
+sal_Int16 nLumMod = -1;
+

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

2022-02-23 Thread Miklos Vajna (via logerrit) 
 include/editeng/unoprnms.hxx |1 
 include/svx/unoshprp.hxx |1 
 svx/qa/unit/xoutdev.cxx  |   63 ---
 svx/source/xoutdev/xattr.cxx |   43 -
 4 files changed, 91 insertions(+), 17 deletions(-)

New commits:
commit 0e083387551acc677efc903bffc866f5aadb3642
Author: Miklos Vajna 
AuthorDate: Wed Feb 23 20:54:01 2022 +0100
Commit: Miklos Vajna 
CommitDate: Thu Feb 24 08:43:12 2022 +0100

sd theme: add UNO API for shape fill color

In preparation of adding import/export for this.

Change-Id: I195be9e9ccdbb25fa41878a2858c22ee11d189a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130467
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 7fc084e79102..d7045b5b56be 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -31,6 +31,7 @@ inline constexpr OUStringLiteral UNO_NAME_CHAR_WEIGHT = 
u"CharWeight";
 
 inline constexpr OUStringLiteral UNO_NAME_FILLSTYLE = u"FillStyle";
 inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR = u"FillColor";
+inline constexpr OUStringLiteral UNO_NAME_FILLCOLOR_THEME = u"FillColorTheme";
 inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENT = u"FillGradient";
 inline constexpr OUStringLiteral UNO_NAME_FILLGRADIENTNAME = 
u"FillGradientName";
 inline constexpr OUStringLiteral UNO_NAME_FILLHATCH = u"FillHatch";
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index b20e67ee5dc5..4dba8617f7a2 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -289,6 +289,7 @@
 { UNO_NAME_FILLTRANSPARENCEGRADIENT, XATTR_FILLFLOATTRANSPARENCE, 
::cppu::UnoType::get(), 0, MID_FILLGRADIENT}, \
 { UNO_NAME_FILLTRANSPARENCEGRADIENTNAME, XATTR_FILLFLOATTRANSPARENCE, 
::cppu::UnoType::get(), 0, MID_NAME }, \
 { UNO_NAME_FILLCOLOR_2,   XATTR_SECONDARYFILLCOLOR, 
::cppu::UnoType::get(),  0, 0}, \
+{ UNO_NAME_FILLCOLOR_THEME,   XATTR_FILLCOLOR, 
::cppu::UnoType::get(),  0, MID_COLOR_THEME_INDEX}, \
 { UNO_NAME_GRAPHIC_GRAPHICCROP, SDRATTR_GRAFCROP  , 
::cppu::UnoType::get(), 0, 0 },
 
 #define EDGERADIUS_PROPERTIES \
diff --git a/svx/qa/unit/xoutdev.cxx b/svx/qa/unit/xoutdev.cxx
index 35eac21cda72..ed5b75189c3a 100644
--- a/svx/qa/unit/xoutdev.cxx
+++ b/svx/qa/unit/xoutdev.cxx
@@ -7,10 +7,12 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-#include 
-#include 
-#include 
-#include 
+#include 
+#include 
+
+#include 
+#include 
+#include 
 
 #include 
 #include 
@@ -22,16 +24,33 @@
 #include 
 #include 
 
-class XOutdevTest : public CppUnit::TestFixture
+using namespace com::sun::star;
+
+class XOutdevTest : public test::BootstrapFixture, public unotest::MacrosTest
 {
+uno::Reference mxComponent;
+
 public:
-virtual void setUp() override
-{
-CppUnit::TestFixture::setUp();
-SfxApplication::GetOrCreate();
-}
+virtual void setUp() override;
+void tearDown() override;
+uno::Reference& getComponent() { return mxComponent; }
 };
 
+void XOutdevTest::setUp()
+{
+test::BootstrapFixture::setUp();
+
+mxDesktop.set(frame::Desktop::create(mxComponentContext));
+}
+
+void XOutdevTest::tearDown()
+{
+if (mxComponent.is())
+mxComponent->dispose();
+
+test::BootstrapFixture::tearDown();
+}
+
 CPPUNIT_TEST_FIXTURE(XOutdevTest, testPdfGraphicExport)
 {
 auto pPdfium = vcl::pdf::PDFiumLibrary::get();
@@ -96,4 +115,28 @@ CPPUNIT_TEST_FIXTURE(XOutdevTest, testTdf60684)
 CPPUNIT_ASSERT_EQUAL(static_cast('G'), sFirstBytes[3]);
 }
 
+CPPUNIT_TEST_FIXTURE(XOutdevTest, testFillColorThemeUnoApi)
+{
+// Given an empty Impress document with a (title) shape:
+getComponent() = loadFromDesktop("private:factory/simpress",
+ 
"com.sun.star.presentation.PresentationDocument");
+
+// When setting the theme index of the shape's fill color:
+uno::Reference xPagesSupplier(getComponent(), 
uno::UNO_QUERY);
+uno::Reference 
xPage(xPagesSupplier->getDrawPages()->getByIndex(0),
+ uno::UNO_QUERY);
+uno::Reference xShape(xPage->getByIndex(0), 
uno::UNO_QUERY);
+sal_Int16 nExpected = 4; // Accent 1
+xShape->setPropertyValue("FillColorTheme", uno::makeAny(nExpected));
+
+// Then make sure the value we read back is the expected one:
+sal_Int16 nActual = -1;
+xShape->getPropertyValue("FillColorTheme") >>= nActual;
+// Without the accompanying fix in place, this test would have failed with:
+// - Expected: 4
+// - Actual  : -1
+// i.e. setting the value was broken.
+CPPUNIT_ASSERT_EQUAL(nExpected, nActual);
+}
+
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 81d10a97061c..e28c85b4a70b 100644
---

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

2021-11-27 Thread Noel Grandin (via logerrit) 
 include/editeng/unotext.hxx |4 ++--
 sw/source/core/unocore/unofield.cxx |1 +
 sw/source/core/unocore/unoframe.cxx |1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

New commits:
commit f5e9012dcf2ad14a82a879beed645f83439d08bf
Author: Noel Grandin 
AuthorDate: Mon Nov 22 21:18:54 2021 +0200
Commit: Noel Grandin 
CommitDate: Sat Nov 27 19:52:23 2021 +0100

use more OInterfaceContainerHelper3 in SvxUnoTextContent

Change-Id: Ibef254a6391fb93d4ecfa91ef3ef3a31b4e146a3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125929
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index bd41ffd16940..e4b5aad31eac 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -41,7 +41,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
@@ -523,7 +523,7 @@ private:
 
 // for xComponent
 ::osl::Mutex maDisposeContainerMutex;
-::comphelper::OInterfaceContainerHelper2 maDisposeListeners;
+::comphelper::OInterfaceContainerHelper3 
maDisposeListeners;
 bool mbDisposing;
 
 protected:
diff --git a/sw/source/core/unocore/unofield.cxx 
b/sw/source/core/unocore/unofield.cxx
index a09e6785c864..176ecc5f56e6 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -43,6 +43,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index 4c35a9248665..e4e73fe4460f 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -109,6 +109,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include

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

2021-11-17 Thread Sarper Akdemir (via logerrit) 
 include/editeng/unoprnms.hxx|2 ++
 include/editeng/unotext.hxx |4 +++-
 svx/source/unodraw/unoprov.cxx  |4 +++-
 svx/source/unodraw/unoshap2.cxx |2 ++
 4 files changed, 10 insertions(+), 2 deletions(-)

New commits:
commit 013ec5ef7ac038b6b1b8b937e81880f30434098a
Author: Sarper Akdemir 
AuthorDate: Wed Aug 18 16:04:37 2021 +0300
Commit: Miklos Vajna 
CommitDate: Wed Nov 17 15:40:25 2021 +0100

expose the SvxColorItem theme related uno for draw/impress

[ Miklos: added the missing SvxShapeControlPropertyMapping entries,
breaking tests. ]

(cherry picked from commit 88b6801ff2aa61ed2f0d64cef94fe6a9c09f3a35,
from the feature/themesupport2 branch)

Change-Id: Ifdcde6c4643eb9ac1c36040f5ccb490b9d900efd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125394
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 97aaa77dd86a..91273845fbd2 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -327,6 +327,8 @@
 #define UNO_NAME_EDIT_CHAR_LOCALE_COMPLEX   "CharLocaleComplex"
 
 #define UNO_NAME_EDIT_CHAR_COLOR"CharColor"
+#define UNO_NAME_EDIT_CHAR_COLOR_THEME  "CharColorTheme"
+#define UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE  "CharColorTintOrShade"
 #define UNO_NAME_EDIT_CHAR_TRANSPARENCE "CharTransparence"
 #define UNO_NAME_EDIT_CHAR_CROSSEDOUT   "CharCrossedOut"
 #define UNO_NAME_EDIT_CHAR_STRIKEOUT"CharStrikeout"
diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 5b92daf4d8aa..c9c4b9580f72 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -85,8 +85,10 @@ struct SfxItemPropertyMapEntry;
 { u"" UNO_NAME_EDIT_CHAR_POSTURE, EE_CHAR_ITALIC, 
::cppu::UnoType::get(),0, MID_POSTURE }, \
 { u"" UNO_NAME_EDIT_CHAR_WEIGHT,  EE_CHAR_WEIGHT, 
cppu::UnoType::get(),0, MID_WEIGHT }, \
 { u"" UNO_NAME_EDIT_CHAR_LOCALE,  EE_CHAR_LANGUAGE,   
::cppu::UnoType::get(),0, MID_LANG_LOCALE }, \
-{ u"" UNO_NAME_EDIT_CHAR_COLOR,   EE_CHAR_COLOR,  
::cppu::UnoType::get(),0, 0 }, \
+{ u"" UNO_NAME_EDIT_CHAR_COLOR,   EE_CHAR_COLOR,  
::cppu::UnoType::get(),0, MID_COLOR_RGB }, \
 { u"" UNO_NAME_EDIT_CHAR_TRANSPARENCE,EE_CHAR_COLOR,  
::cppu::UnoType::get(),0, MID_COLOR_ALPHA }, \
+{ u"" UNO_NAME_EDIT_CHAR_COLOR_THEME, EE_CHAR_COLOR,  
::cppu::UnoType::get(),0, MID_COLOR_THEME_INDEX }, \
+{ u"" UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, EE_CHAR_COLOR, 
::cppu::UnoType::get(), 0, MID_COLOR_TINT_OR_SHADE }, \
 { u"CharBackColor",EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(),0, 0 }, \
 { u"CharBackTransparent",  EE_CHAR_BKGCOLOR,   
::cppu::UnoType::get(), 0, MID_GRAPHIC_TRANSPARENT }, \
 { u"" UNO_NAME_EDIT_CHAR_ESCAPEMENT,  EE_CHAR_ESCAPEMENT, 
::cppu::UnoType::get(),0, MID_ESC }, \
diff --git a/svx/source/unodraw/unoprov.cxx b/svx/source/unodraw/unoprov.cxx
index 39369d880448..b459280c8b01 100644
--- a/svx/source/unodraw/unoprov.cxx
+++ b/svx/source/unodraw/unoprov.cxx
@@ -582,7 +582,9 @@ static SfxItemPropertyMapEntry const * 
ImplGetSvxControlShapePropertyMap()
 { u"" UNO_NAME_EDIT_CHAR_UNDERLINE,   0,  
cppu::UnoType::get(),0, 0 },
 { u"" UNO_NAME_EDIT_CHAR_STRIKEOUT,   0,  
cppu::UnoType::get(),0, 0},
 { u"" UNO_NAME_EDIT_CHAR_CASEMAP, 0,  
cppu::UnoType::get(),0, 0 },
-{ u"" UNO_NAME_EDIT_CHAR_COLOR,   0,  
cppu::UnoType::get(),0, 0 },
+{ u"" UNO_NAME_EDIT_CHAR_COLOR,   0,  
cppu::UnoType::get(),0, MID_COLOR_RGB },
+{ u"" UNO_NAME_EDIT_CHAR_COLOR_THEME, 0,  
cppu::UnoType::get(),0, MID_COLOR_THEME_INDEX },
+{ u"" UNO_NAME_EDIT_CHAR_COLOR_TINT_OR_SHADE, 0, 
cppu::UnoType::get(), 0, MID_COLOR_TINT_OR_SHADE },
 { u"CharBackColor",0,  
cppu::UnoType::get(),0, 0 },
 { u"CharBackTransparent",  0,  cppu::UnoType::get(), 
0, 0 },
 { u"CharRelief",   0,  
cppu::UnoType::get(),0, 0 },
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index 710f2e38099d..415ddf95eeb9 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -595,6 +595,8 @@ const SvxShapeControlPropertyMapping[] =
 { RTL_CONSTASCII_STRINGPARAM("ControlTypeinMSO"), 
RTL_CONSTASCII_STRINGPARAM("ControlTypeinMSO") },
 { RTL_CONSTASCII_STRINGPARAM("ObjIDinMSO"), 
RTL_CONSTASCII_STRINGPARAM("ObjIDinMSO") },
 { RTL_CONSTASCII_STRINGPARAM("CharCaseMap"), 
RTL_CONSTASCII_STRINGPARAM("CharCaseMap") },
+{ RTL_CONSTASCII_STRINGPARAM("CharColorTheme"), 
RTL_CONSTASCII_STRINGPARAM("CharColorTheme") },
+{

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

2021-11-16 Thread Tomaž Vajngerl (via logerrit) 
 include/editeng/unoprnms.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 84b817130a1b19591c3add9af5db0f42af64be68
Author: Tomaž Vajngerl 
AuthorDate: Sun Sep 20 19:27:09 2015 +0200
Commit: Miklos Vajna 
CommitDate: Tue Nov 16 15:40:36 2021 +0100

Support reading back theme color from an ooxml document

ooxml supports theme colors and tint/shade value that additionally
changed the theme color. Read back which theme color + tint/shade
value was applied in the resulting color and add this attributes
as properties to be used by writer.
In sidebar theme panel the changing the theme colors now doesn't
takes this into account and changes the colors correctly.

[ Miklos: left out the Wrtier bits for now, focusing on Impress first. ]

(cherry picked from commit 16a0a2089e8572a35a36a7e649703893ecd06299,
from the feature/themesupport2 branch)

Change-Id: I8e0d62ec8c0534e603fb1e5fb000dcf84aea5da2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125304
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 4f1d4ad4b0e1..97aaa77dd86a 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -22,6 +22,8 @@
 
 
 #define UNO_NAME_CHAR_COLOR "CharColor"
+#define UNO_NAME_CHAR_COLOR_THEME   "CharColorTheme"
+#define UNO_NAME_CHAR_COLOR_TINT_OR_SHADE   "CharColorTintOrShade"
 #define UNO_NAME_CHAR_HEIGHT"CharHeight"
 #define UNO_NAME_CHAR_POSTURE   "CharPosture"
 #define UNO_NAME_CHAR_SHADOWED  "CharShadowed"

[Libreoffice-commits] core.git: include/editeng officecfg/registry svx/sdi sw/sdi sw/source sw/uiconfig

2021-10-19 Thread Jim Raykowski (via logerrit) 
 include/editeng/editids.hrc  |2 -
 officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu |8 
+
 svx/sdi/svx.sdi  |   15 
++
 sw/sdi/_annotsh.sdi  |7 

 sw/sdi/_textsh.sdi   |6 

 sw/sdi/drwtxtsh.sdi  |7 

 sw/source/uibase/shells/annotsh.cxx  |   10 
++
 sw/source/uibase/shells/drwtxtex.cxx |   10 
++
 sw/source/uibase/shells/txtattr.cxx  |4 ++
 sw/uiconfig/swriter/menubar/menubar.xml  |1 
 10 files changed, 69 insertions(+), 1 deletion(-)

New commits:
commit 40458226fda358bd90c25ddfe6a9b2cf25b2fcad
Author: Jim Raykowski 
AuthorDate: Wed Oct 13 13:24:39 2021 -0800
Commit: Heiko Tietze 
CommitDate: Tue Oct 19 08:22:43 2021 +0200

tdf#113512 Writer: 1.15 line spacing UNO command

Resolves the Writer 1.15 line spacing part of the request for 1.15,
2.5, and 3 line spacing UNO commands.

Change-Id: I2a654063df3549e8a23021bc4fc76bc17c270d69
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123569
Tested-by: Jenkins
Reviewed-by: Heiko Tietze 

diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 129afc52234e..5560eea1336a 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -51,7 +51,6 @@
 #define SID_ATTR_CHAR_FONTLIST  ( SID_SVX_START + 22 )
 #define SID_ATTR_BORDER_OUTER   ( SID_SVX_START + 24 )
 #define SID_ATTR_BORDER_SHADOW  ( SID_SVX_START + 25 )
-  // free
 #define SID_ATTR_PARA_ADJUST( SID_SVX_START + 27 )
 #define SID_ATTR_PARA_ADJUST_LEFT   ( SID_SVX_START + 28 )
 #define SID_ATTR_PARA_ADJUST_RIGHT  ( SID_SVX_START + 29 )
@@ -60,6 +59,7 @@
 #define SID_ATTR_PARA_LINESPACE ( SID_SVX_START + 33 )
 #define SID_ATTR_PARA_LINESPACE_10  ( SID_SVX_START + 34 )
 #define SID_ATTR_PARA_LINESPACE_15  ( SID_SVX_START + 35 )
+#define SID_ATTR_PARA_LINESPACE_115 ( SID_SVX_START + 26 )
 #define SID_ATTR_PARA_LINESPACE_20  ( SID_SVX_START + 36 )
 #define SID_ATTR_PARA_PAGEBREAK ( SID_SVX_START + 37 )
 #define SID_ATTR_PARA_HYPHENZONE( SID_SVX_START + 38 )
diff --git 
a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu 
b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index 37fa7fc9ffb0..c45aab0823b4 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1828,6 +1828,14 @@ bit 3 (0x8): #define 
UICOMMANDDESCRIPTION_PROPERTIES_TOGGLEBUTTON 8
   15
 
   
+  
+
+  Line Spacing: 1.15
+
+
+  15
+
+  
   
 
   Line Spacing: 1.5
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 4cb657ee48b5..1e08145d3644 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8100,6 +8100,21 @@ SfxBoolItem SpacePara1 SID_ATTR_PARA_LINESPACE_10
 GroupId = SfxGroupId::Format;
 ]
 
+SfxBoolItem SpacePara115 SID_ATTR_PARA_LINESPACE_115
+[
+AutoUpdate = TRUE,
+FastCall = FALSE,
+ReadOnlyDoc = FALSE,
+Toggle = FALSE,
+Container = FALSE,
+RecordAbsolute = FALSE,
+RecordPerSet;
+
+AccelConfig = TRUE,
+MenuConfig = TRUE,
+ToolBoxConfig = TRUE,
+GroupId = SfxGroupId::Format;
+]
 
 SfxBoolItem SpacePara15 SID_ATTR_PARA_LINESPACE_15
 
diff --git a/sw/sdi/_annotsh.sdi b/sw/sdi/_annotsh.sdi
index 66242a1f52ca..b335fb9e0676 100644
--- a/sw/sdi/_annotsh.sdi
+++ b/sw/sdi/_annotsh.sdi
@@ -417,6 +417,13 @@ interface _Annotation
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
 
+SID_ATTR_PARA_LINESPACE_115
+[
+ExecMethod = Exec ;
+StateMethod = GetState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
+
 SID_ATTR_PARA_LINESPACE_15 // api:
 [
 ExecMethod = Exec ;
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 6af93a628eb6..38359c593471 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1167,6 +1167,12 @@ interface BaseText
 StateMethod = GetAttrState ;
 DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
 ]
+SID_ATTR_PARA_LINESPACE_115
+[
+ExecMethod = ExecParaAttr ;
+StateMethod = GetAttrState ;
+DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+]
 SID_ATTR_PARA_LINESPACE_15
 [

[Libreoffice-commits] core.git: include/editeng include/o3tl

2021-08-18 Thread Noel Grandin (via logerrit) 
 include/editeng/outlobj.hxx  |   90 +--
 include/o3tl/cow_wrapper.hxx |   27 
 2 files changed, 113 insertions(+), 4 deletions(-)

New commits:
commit 62d11b0e072b2f34b9f52c33a73cbb54d8112307
Author: Noel Grandin 
AuthorDate: Mon Aug 16 18:47:58 2021 +0200
Commit: Noel Grandin 
CommitDate: Wed Aug 18 12:09:09 2021 +0200

specialise std::optional for OutlineParaObject

we can re-use the o3tl::wrapper pointer to indicate empty

Change-Id: I26e502a7dacfb2bd3d465e71c8fdd89a6a80969b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/120553
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index fac9bed9ffb9..8ba1dedb3f16 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_EDITENG_OUTLOBJ_HXX
-#define INCLUDED_EDITENG_OUTLOBJ_HXX
+#pragma once
 
 #include 
 #include 
@@ -26,6 +25,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class EditTextObject;
@@ -36,7 +36,7 @@ enum class TextRotation;
  * This is the guts of OutlinerParaObject, refcounted and shared among
  * multiple instances of OutlinerParaObject.
  */
-struct OutlinerParaObjData
+struct EDITENG_DLLPUBLIC OutlinerParaObjData
 {
 // data members
 std::unique_ptr  mpEditTextObject;
@@ -64,8 +64,14 @@ struct OutlinerParaObjData
 
 class EDITENG_DLLPUBLIC OutlinerParaObject
 {
+friend class std::optional;
 ::o3tl::cow_wrapper< OutlinerParaObjData > mpImpl;
 
+OutlinerParaObject(std::nullopt_t) noexcept
+: mpImpl(std::nullopt) {}
+OutlinerParaObject( const OutlinerParaObject& other, std::nullopt_t ) 
noexcept
+: mpImpl(other.mpImpl, std::nullopt) {}
+
 public:
 // constructors/destructor
 OutlinerParaObject(std::unique_ptr, const 
ParagraphDataVector&, bool bIsEditDoc);
@@ -117,6 +123,82 @@ public:
 void dumpAsXml(xmlTextWriterPtr pWriter) const;
 };
 
-#endif
+namespace std
+{
+/** Specialise std::optional template for the case where we are wrapping a 
o3tl::cow_wrapper
+type, and we can make the pointer inside the cow_wrapper act as an 
empty value,
+and save ourselves some storage */
+template<>
+class optional
+{
+public:
+optional() noexcept : maParaObject(std::nullopt) {}
+optional(std::nullopt_t) noexcept : maParaObject(std::nullopt) {}
+optional(const optional& other) :
+maParaObject(other.maParaObject, std::nullopt) {}
+optional(optional&& other) noexcept :
+maParaObject(std::move(other.maParaObject)) {}
+optional(OutlinerParaObject&& para) noexcept :
+maParaObject(std::move(para)) {}
+optional(const OutlinerParaObject& para) noexcept :
+maParaObject(para) {}
+template< class... Args >
+explicit optional( std::in_place_t, Args&&... args ) :
+maParaObject(std::forward(args)...) {}
+
+optional& operator=(optional const & other)
+{
+maParaObject = other.maParaObject;
+return *this;
+}
+optional& operator=(optional&& other) noexcept
+{
+maParaObject = std::move(other.maParaObject);
+return *this;
+}
+template< class... Args >
+void emplace(Args&&... args )
+{
+maParaObject = OutlinerParaObject(std::forward(args)...);
+}
+
+bool has_value() const noexcept { return !maParaObject.mpImpl.empty(); 
}
+explicit operator bool() const noexcept { return 
!maParaObject.mpImpl.empty(); }
+void reset() { maParaObject.mpImpl.set_empty(); }
+
+OutlinerParaObject& value()
+{
+throwIfEmpty();
+return maParaObject;
+}
+OutlinerParaObject& operator*()
+{
+throwIfEmpty();
+return maParaObject;
+}
+const OutlinerParaObject& operator*() const
+{
+throwIfEmpty();
+return maParaObject;
+}
+OutlinerParaObject* operator->()
+{
+throwIfEmpty();
+return 
+}
+const OutlinerParaObject* operator->() const
+{
+throwIfEmpty();
+return 
+}
+private:
+void throwIfEmpty() const
+{
+if (maParaObject.mpImpl.empty())
+throw std::logic_error("empty 
std::optional");
+}
+OutlinerParaObject maParaObject;
+};
+};
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index c05d28699259..ced27c1fda32 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -22,6 +22,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 
@@ -252,6

[Libreoffice-commits] core.git: include/editeng include/oox include/svl include/svx oox/source sc/source svx/source sw/qa sw/sdi sw/source sw/uiconfig writerfilter/source xmloff/source

2021-07-26 Thread Samuel Mehrbrodt (via logerrit) 
 include/editeng/unoprnms.hxx |2 
 include/oox/vml/vmlshape.hxx |1 
 include/oox/vml/vmlshapecontext.hxx  |2 
 include/svl/solar.hrc|2 
 include/svx/svdobj.hxx   |5 +
 include/svx/unoshprp.hxx |6 +
 oox/source/export/vmlexport.cxx  |4 +
 oox/source/token/properties.txt  |1 
 oox/source/vml/vmlshape.cxx  |4 +
 oox/source/vml/vmlshapecontext.cxx   |6 +
 sc/source/filter/xml/xmlexprt.cxx|   34 
 svx/source/unodraw/unoshape.cxx  |   17 
 sw/qa/extras/odfexport/data/shape-with-hyperlink.odt |binary
 sw/qa/extras/odfexport/odfexport2.cxx|   10 ++
 sw/qa/extras/ooxmlexport/data/hyperlinkshape.docx|binary
 sw/qa/extras/ooxmlexport/ooxmlexport16.cxx   |7 +
 sw/sdi/_drwbase.sdi  |   33 
 sw/source/filter/ww8/docxsdrexport.cxx   |   16 +++-
 sw/source/uibase/shells/drwbassh.cxx |   74 +++
 sw/uiconfig/sglobal/popupmenu/draw.xml   |5 +
 sw/uiconfig/swform/popupmenu/draw.xml|5 +
 sw/uiconfig/swreport/popupmenu/draw.xml  |5 +
 sw/uiconfig/swriter/popupmenu/draw.xml   |5 +
 sw/uiconfig/swxform/popupmenu/draw.xml   |5 +
 writerfilter/source/dmapper/GraphicImport.cxx|   16 +++-
 writerfilter/source/dmapper/PropertyIds.cxx  |1 
 writerfilter/source/dmapper/PropertyIds.hxx  |1 
 xmloff/source/draw/shapeexport.cxx   |   28 ++-
 xmloff/source/text/XMLTextFrameContext.cxx   |4 +
 xmloff/source/text/XMLTextFrameHyperlinkContext.cxx  |   12 +++
 xmloff/source/text/XMLTextFrameHyperlinkContext.hxx  |1 
 31 files changed, 269 insertions(+), 43 deletions(-)

New commits:
commit a23b44fd9f0119f7ea3523e32875f55c1a07c1cd
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jul 19 08:11:43 2021 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Mon Jul 26 14:13:53 2021 +0200

tdf#123626 Allow adding hyperlinks to shapes

* Support hyperlinks on Shapes in Writer
* Add menu items
* Add context menu items
* ODF import/export + test
* OOXML import/export + test

Change-Id: I7269064c4cabd16fdb8259a48429c508184d3ccf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119164
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 011e504ae7f4..f99ddac50414 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -163,6 +163,8 @@
 #define UNO_NAME_MISC_OBJ_TITLE "Title"
 #define UNO_NAME_MISC_OBJ_DESCRIPTION   "Description"
 
+#define UNO_NAME_HYPERLINK  "Hyperlink"
+
 #define UNO_NAME_GRAPHOBJ_FILLBITMAP"GraphicObjectFillBitmap"
 #define UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC   "ReplacementGraphic"
 #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL"
diff --git a/include/oox/vml/vmlshape.hxx b/include/oox/vml/vmlshape.hxx
index 0e50e5b6ee1f..d90ecc2865bf 100644
--- a/include/oox/vml/vmlshape.hxx
+++ b/include/oox/vml/vmlshape.hxx
@@ -112,6 +112,7 @@ struct ShapeTypeModel
 OptValue moCropRight; ///< Specifies how much to crop the image 
from the right in as a fraction of picture size.
 OptValue moCropTop; ///< Specifies how much to crop the image 
from the top down as a fraction of picture size.
 OUString maLayoutFlowAlt; ///< Specifies the alternate layout flow for 
text in textboxes.
+OUString maHyperlink; ///< The hyperlink assigned to the shape
 
 explicitShapeTypeModel();
 
diff --git a/include/oox/vml/vmlshapecontext.hxx 
b/include/oox/vml/vmlshapecontext.hxx
index ddca7b13ad93..0d4b3ddd9e7e 100644
--- a/include/oox/vml/vmlshapecontext.hxx
+++ b/include/oox/vml/vmlshapecontext.hxx
@@ -107,6 +107,8 @@ public:
 private:
 /** Processes the 'style' attribute. */
 voidsetStyle( const OUString& rStyle );
+/** Processes the 'href' attribute. */
+voidsetHyperlink( const OUString& rHyperlink );
 
 /** Resolve a relation identifier to a fragment path. */
 OptValue< OUString > decodeFragmentPath( const AttributeList& rAttribs, 
sal_Int32 nToken ) const;
diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc
index 521e24365f9f..5caeb64f40c2 100644
--- a/include/svl/solar.hrc
+++ b/include/svl/solar.hrc
@@ -23,7 +23,7 @@
 // defines --
 
 #define OWN_ATTR_VALUE_START3900
-#define OWN_ATTR_VALUE_END  4006
+#define OWN_ATTR_VALUE_END  4007
 
 #define

[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svl include/svx sc/inc sfx2/source svl/source

2021-07-04 Thread Noel Grandin (via logerrit) 
 include/editeng/scripttypeitem.hxx |2 -
 include/sfx2/tabdlg.hxx|1 
 include/svl/poolitem.hxx   |   28 ---
 include/svl/setitem.hxx|   52 +
 include/svx/pageitem.hxx   |2 -
 include/svx/xflasit.hxx|2 -
 include/svx/xlnasit.hxx|2 -
 sc/inc/patattr.hxx |2 -
 sfx2/source/control/shell.cxx  |1 
 svl/source/items/itempool.cxx  |1 
 svl/source/items/itemset.cxx   |1 
 svl/source/items/poolcach.cxx  |1 
 svl/source/items/sitem.cxx |1 
 13 files changed, 63 insertions(+), 33 deletions(-)

New commits:
commit 9f669d2271d5ac64e4cd38ba450fb4ce3dadd5f2
Author: Noel Grandin 
AuthorDate: Sat Jul 3 21:18:24 2021 +0200
Commit: Noel Grandin 
CommitDate: Sun Jul 4 16:12:17 2021 +0200

move SfxSetItem to own header file

Change-Id: I77ba873ed236091443627e26e6127e89cd8e15bd
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/118360
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/scripttypeitem.hxx 
b/include/editeng/scripttypeitem.hxx
index e69ea0bdc4da..bfe84f5f6a9a 100644
--- a/include/editeng/scripttypeitem.hxx
+++ b/include/editeng/scripttypeitem.hxx
@@ -20,7 +20,7 @@
 #define INCLUDED_EDITENG_SCRIPTTYPEITEM_HXX
 
 #include 
-#include 
+#include 
 #include 
 
 class EDITENG_DLLPUBLIC SvxScriptSetItem final : public SfxSetItem
diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx
index e6aee128f4bf..7d338e40c342 100644
--- a/include/sfx2/tabdlg.hxx
+++ b/include/sfx2/tabdlg.hxx
@@ -30,6 +30,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class SfxTabPage;
diff --git a/include/svl/poolitem.hxx b/include/svl/poolitem.hxx
index 7dbd7d85c24b..ba22aed9a9cc 100644
--- a/include/svl/poolitem.hxx
+++ b/include/svl/poolitem.hxx
@@ -305,34 +305,6 @@ public:
 virtual boolIsVoidItem() const override;
 };
 
-class SVL_DLLPUBLIC SfxSetItem: public SfxPoolItem
-{
-std::unique_ptr  pSet;
-
-SfxSetItem & operator=( const SfxSetItem& ) = delete;
-
-public:
-SfxSetItem( sal_uInt16 nWhich, 
std::unique_ptr & );
-SfxSetItem( sal_uInt16 nWhich, const SfxItemSet 
 );
-SfxSetItem( const SfxSetItem&, SfxItemPool *pPool 
= nullptr );
-virtual ~SfxSetItem() override;
-
-virtual booloperator==( const SfxPoolItem& ) const override;
-
-virtual bool GetPresentation( SfxItemPresentation ePres,
-MapUnit eCoreMetric,
-MapUnit ePresMetric,
-OUString ,
-const IntlWrapper& ) const override;
-
-// create a copy of itself
-virtual SfxSetItem* Clone( SfxItemPool *pPool = nullptr ) const 
override = 0;
-
-const SfxItemSet&   GetItemSet() const
-{ return *pSet; }
-SfxItemSet& GetItemSet()
-{ return *pSet; }
-};
 
 class SVL_DLLPUBLIC SfxPoolItemHint final : public SfxHint
 {
diff --git a/include/svl/setitem.hxx b/include/svl/setitem.hxx
new file mode 100644
index ..81f832b756ae
--- /dev/null
+++ b/include/svl/setitem.hxx
@@ -0,0 +1,52 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#pragma once
+
+#include 
+
+#include 
+#include 
+
+class SVL_DLLPUBLIC SfxSetItem : public SfxPoolItem
+{
+std::unique_ptr pSet;
+
+SfxSetItem& operator=(const SfxSetItem&) = delete;
+
+public:
+SfxSetItem(sal_uInt16 nWhich, std::unique_ptr&& pSet);
+SfxSetItem(sal_uInt16 nWhich, const SfxItemSet& rSet);
+SfxSetItem(const SfxSetItem&, SfxItemPool* pPool = nullptr);
+virtual ~SfxSetItem() override;
+
+virtual bool operator==(const SfxPoolItem&) const override;
+
+virtual bool GetPresentation(SfxItemPresentation ePres, MapUnit 
eCoreMetric,
+ MapUnit ePresMetric, OUString& rText,
+

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

2021-06-01 Thread Stephan Bergmann (via logerrit) 
 include/editeng/svxrtf.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c275617a9d547e13def33e3d06068c08bf492f78
Author: Stephan Bergmann 
AuthorDate: Tue Jun 1 13:53:14 2021 +0200
Commit: Stephan Bergmann 
CommitDate: Tue Jun 1 16:25:47 2021 +0200

Avoid -Werror,-Wdeprecated-copy

...at least on macOS against LLVM 13 trunk libc++,

> In file included from ~/lo/core/editeng/source/rtf/svxrtf.cxx:35:
> ~/lo/core/include/editeng/svxrtf.hxx:66:5: error: definition of implicit 
copy assignment operator for 'EditPosition' is deprecated because it has a 
user-declared copy constructor [-Werror,-Wdeprecated-copy]
> EditPosition(const EditPosition &) = default;
> ^
> ~/llvm/inst/bin/../include/c++/v1/optional:790:27: note: in implicit copy 
assignment operator for 'EditPosition' first required here
> this->__get() = _VSTD::forward<_Up>(__v);
>   ^
> ~/lo/core/editeng/source/rtf/svxrtf.cxx:86:22: note: in instantiation of 
function template specialization 'std::optional::operator=' requested here
> mxInsertPosition = rNew;
>  ^

21ad3e6cbdf9568c1152a2eab8178e4219e40c33 "EditPosition does not need to be
allocated separately" had introduced the defaulted copy ctor, for no 
apparent
reason.

Change-Id: If61743c4e873a5ac95ba72a4ae24160f8713205f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116535
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann 

diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 87283eadf11d..d19c542885bf 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -63,7 +63,6 @@ private:
 
 public:
 EditPosition(EditEngine* pIEE, EditSelection* pSel);
-EditPosition(const EditPosition &) = default;
 
 sal_Int32   GetNodeIdx() const;
 sal_Int32   GetCntIdx() const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2021-01-26 Thread Justin Luth (via logerrit) 
 include/editeng/numitem.hxx   |2 +-
 sw/source/ui/misc/outline.cxx |9 -
 2 files changed, 9 insertions(+), 2 deletions(-)

New commits:
commit 55933f49f5a04708d27dc69e8778ec126646e3a5
Author: Justin Luth 
AuthorDate: Sat Jan 23 12:01:48 2021 +0300
Commit: Justin Luth 
CommitDate: Tue Jan 26 17:00:48 2021 +0100

tdf#139147 sw outline UI: allow clearing of custom list format

Since LO 6.4.5, primarily for DOCX support, numbering can
have a custom format that ignores the suffix, prefix etc.
Well, the UI has no way to see or edit that. So allow the
UI to throw that away and go back to the normal
prefix/subLevels/suffix model.

Change-Id: I84f93d37c95dabb18facf9140bf8f85b4bac5006
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109839
Tested-by: Jenkins
Reviewed-by: Vasily Melenchuk 
Reviewed-by: Justin Luth 

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 961b5301206f..992f07b08241 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -172,7 +172,7 @@ public:
 const OUString& GetPrefix() const { return sPrefix;}
 voidSetSuffix(const OUString& rSet) { sSuffix = rSet;}
 const OUString& GetSuffix() const { return sSuffix;}
-voidSetListFormat(const OUString& rSet) { sListFormat = rSet; }
+voidSetListFormat(std::optional oSet = std::nullopt) 
{ sListFormat = oSet; }
 boolHasListFormat() const { return sListFormat.has_value(); }
 const OUString& GetListFormat() const { return *sListFormat; }
 
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index bdaa59f9015f..f5a10e35177c 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -510,11 +510,12 @@ voidSwOutlineSettingsTabPage::Update()
 else
 
m_xCharFormatLB->set_active_text(SwViewShell::GetShellRes()->aStrNone);
 
-if(nTmpLevel)
+if (nTmpLevel || rFormat.HasListFormat())
 {
 m_xAllLevelFT->set_sensitive(true);
 m_xAllLevelNF->set_sensitive(true);
 m_xAllLevelNF->set_max(nTmpLevel + 1);
+m_xAllLevelNF->set_min(rFormat.HasListFormat() ? 0 : 1);
 m_xAllLevelNF->set_value(rFormat.GetIncludeUpperLevels());
 }
 else
@@ -560,6 +561,11 @@ IMPL_LINK(SwOutlineSettingsTabPage, ToggleComplete, 
weld::SpinButton&, rEdit, vo
 SwNumFormat aNumFormat(pNumRule->Get(i));
 aNumFormat.SetIncludeUpperLevels( std::min( 
static_cast(rEdit.get_value()),
 static_cast(i + 1)) 
);
+if (aNumFormat.HasListFormat())
+{
+aNumFormat.SetListFormat();  // clear custom format
+m_xAllLevelNF->set_min(1);
+}
 pNumRule->Set(i, aNumFormat);
 }
 nMask <<= 1;
@@ -644,6 +650,7 @@ IMPL_LINK_NOARG(SwOutlineSettingsTabPage, DelimModify, 
weld::Entry&, void)
 SwNumFormat aNumFormat(pNumRule->Get(i));
 aNumFormat.SetPrefix( m_xPrefixED->get_text() );
 aNumFormat.SetSuffix( m_xSuffixED->get_text() );
+aNumFormat.SetListFormat();  // clear custom format
 pNumRule->Set(i, aNumFormat);
 }
 nMask <<= 1;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng offapi/com sax/source starmath/source

2020-12-26 Thread dante (via logerrit) 
 include/editeng/editview.hxx|2 -
 offapi/com/sun/star/xml/sax/XWriter.idl |7 -
 sax/source/expatwrap/saxwriter.cxx  |   44 ++--
 starmath/source/mathmlexport.cxx|2 +
 starmath/source/xparsmlbase.cxx |   10 +++
 starmath/source/xparsmlbase.hxx |   10 +--
 6 files changed, 69 insertions(+), 6 deletions(-)

New commits:
commit 78552cb9b167a677952bf80eb0c7af62baaf015a
Author: dante 
AuthorDate: Sat Dec 26 18:53:18 2020 +0100
Commit: Noel Grandin 
CommitDate: Sun Dec 27 08:29:27 2020 +0100

Preparations for customized xml entities on export

Change-Id: I8ad4af7e27ae5f8908f4c932242cb96abbf3de90
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108354
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index ae6ebd521a2a..debc7b6efe71 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -177,7 +177,7 @@ public:
 voidInvalidateWindow(const tools::Rectangle& rClipRect);
 voidInvalidateOtherViewWindows( const tools::Rectangle& 
rInvRect );
 voidInvalidate();
-PairScroll( tools::Long nHorzScroll, tools::Long nVertScroll, 
ScrollRangeCheck nRangeCheck = ScrollRangeCheck::NoNegative );
+::PairScroll( tools::Long nHorzScroll, tools::Long 
nVertScroll, ScrollRangeCheck nRangeCheck = ScrollRangeCheck::NoNegative );
 
 voidSetBroadcastLOKViewCursor(bool bSet);
 tools::Rectangle   GetEditCursor() const;
diff --git a/offapi/com/sun/star/xml/sax/XWriter.idl 
b/offapi/com/sun/star/xml/sax/XWriter.idl
index a79e7b156a1a..62d3d74256af 100644
--- a/offapi/com/sun/star/xml/sax/XWriter.idl
+++ b/offapi/com/sun/star/xml/sax/XWriter.idl
@@ -21,7 +21,7 @@
 
 #include 
 #include 
-
+#include 
 
 module com {  module sun {  module star {  module xml {  module sax {
 
@@ -35,6 +35,11 @@ interface XWriter
 {
 interface com::sun::star::io::XActiveDataSource;
 interface com::sun::star::xml::sax::XExtendedDocumentHandler;
+
+/** Adds support for custom entity names list
+  * @since LibreOffice 7.2
+  */
+void setCustomEntityNames( [in] sequence< 
com::sun::star::beans::Pair > replacements );
 };
 
 
diff --git a/sax/source/expatwrap/saxwriter.cxx 
b/sax/source/expatwrap/saxwriter.cxx
index 8566cab2b7e6..03ca1f765d82 100644
--- a/sax/source/expatwrap/saxwriter.cxx
+++ b/sax/source/expatwrap/saxwriter.cxx
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -72,6 +73,17 @@ enum SaxInvalidCharacterError
 SAX_ERROR
 };
 
+// Stuff for custom entity names
+struct ReplacementPair
+{
+OUString name;
+OUString replacement;
+};
+inline bool operator<(const ReplacementPair& lhs, const ReplacementPair& rhs)
+{
+return lhs.replacement.compareTo(rhs.replacement) < 0;
+}
+
 class SaxWriterHelper
 {
 #ifdef DBG_UTIL
@@ -88,6 +100,8 @@ private:
 sal_uInt32  nCurrentPos;
 boolm_bStartElementFinished;
 
+std::vector m_Replacements;
+
 /// @throws SAXException
 sal_uInt32 writeSequence();
 
@@ -175,6 +189,10 @@ public:
 
 /// @throws SAXException
 void clearBuffer();
+
+// Use custom entity names
+void setCustomEntityNames(
+const ::css::uno::Sequence<::css::beans::Pair<::rtl::OUString, 
::rtl::OUString>>& replacements);
 };
 
 const bool g_bValidCharsBelow32[32] =
@@ -239,6 +257,19 @@ void SaxWriterHelper::AddBytes(sal_Int8* pTarget, 
sal_uInt32& rPos,
 AddBytes(pTarget, rPos, [nCount], nRestCount);
 }
 
+void SaxWriterHelper::setCustomEntityNames(
+const ::css::uno::Sequence<::css::beans::Pair<::rtl::OUString, 
::rtl::OUString>>& replacements)
+{
+m_Replacements.resize(replacements.size());
+for (size_t i = 0; i < replacements.size(); ++i)
+{
+m_Replacements[i].name = replacements[i].First;
+m_Replacements[i].replacement = replacements[i].Second;
+}
+if (replacements.size() > 1)
+std::sort(m_Replacements.begin(), m_Replacements.end());
+}
+
 /** Converts a UTF-16 string to UTF-8 and does XML normalization
 
 @param pTarget
@@ -300,7 +331,7 @@ bool SaxWriterHelper::convertToXML( const sal_Unicode * 
pStr,
 }
 }
 break;
-case 39: // 39 == '''
+case '\'':
 {
 if ((rPos + 6) > SEQUENCESIZE)
 AddBytes(pTarget, rPos, reinterpret_cast(""), 6);
@@ -855,7 +886,7 @@ sal_Int32 calcXMLByteLength( const OUString& rStr,
 case '>':   // 
 nOutputLength +=4;
 break;
-case 39:// 39 == ''', 
+case '\'':  // 
 case '"':   //

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

2020-12-10 Thread Caolán McNamara (via logerrit) 
 include/editeng/editview.hxx |6 ++
 include/svx/weldeditview.hxx |2 ++
 2 files changed, 8 insertions(+)

New commits:
commit c913406274eb794115e6ce00abf8b01a098d2f37
Author: Caolán McNamara 
AuthorDate: Thu Dec 10 16:11:17 2020 +
Commit: Caolán McNamara 
CommitDate: Thu Dec 10 21:38:59 2020 +0100

add a way to provide a parent for a popup menu

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

diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index e89cd356be72..5552e05b1313 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -45,6 +45,7 @@ class OutlinerViewShell;
 class SvxSearchItem;
 class SvxFieldItem;
 namespace vcl { class Window; }
+namespace weld { class Widget; }
 class KeyEvent;
 class MouseEvent;
 class CommandEvent;
@@ -108,6 +109,11 @@ public:
 // return the OutputDevice that the EditView will draw to
 virtual OutputDevice& EditViewOutputDevice() const = 0;
 
+virtual weld::Widget* EditViewPopupParent() const
+{
+return nullptr;
+}
+
 // Triggered to update InputEngine context information
 virtual void EditViewInputContext(const InputContext& rInputContext) = 0;
 
diff --git a/include/svx/weldeditview.hxx b/include/svx/weldeditview.hxx
index 1b96c4954da9..930573f97856 100644
--- a/include/svx/weldeditview.hxx
+++ b/include/svx/weldeditview.hxx
@@ -89,6 +89,8 @@ protected:
 SetCursorRect(rRefDevice.LogicToPixel(rRect),
   rRefDevice.LogicToPixel(Size(nExtTextInputWidth, 
0)).Width());
 }
+
+virtual weld::Widget* EditViewPopupParent() const override { return 
GetDrawingArea(); }
 };
 
 /* 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: include/editeng sw/source

2020-11-20 Thread Caolán McNamara (via logerrit) 
 include/editeng/AccessibleContextBase.hxx |   16 
 sw/source/core/access/accmap.cxx  |2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

New commits:
commit 09e032aad1ae08458d067d94f2fc3b8341e11903
Author: Caolán McNamara 
AuthorDate: Thu Nov 19 20:38:22 2020 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 20 11:06:03 2020 +0100

tdf#138108 terminate on uncaught exception in a11y callback

 #1  0x75d3fafe in 
accessibility::AccessibleContextBase::ThrowIfDisposed() (this=0x85de440) at 
editeng/source/accessibility/AccessibleContextBase.cxx:513
 #2  0x75d3fbee in 
accessibility::AccessibleContextBase::getAccessibleParent() (this=0x85de440) at 
editeng/source/accessibility/AccessibleContextBase.cxx:203
 #3  0x7fff999cad24 in 
SwAccessibleMap::DoInvalidateShapeSelection(bool) (this=0x687e610, 
bInvalidateFocusMode=false) at sw/source/core/access/accmap.cxx:1647
 #4  0x7fff999cc5a5 in SwAccessibleMap::InvalidateShapeSelection() 
(this=0x687e610) at sw/source/core/access/accmap.cxx:1152
 #5  0x7fff999d78b0 in 
SwAccessibleMap::InvalidateCursorPosition(SwFrame const*) (this=0x687e610, 
pFrame=0x5a3faa0) at sw/source/core/access/accmap.cxx:2744
 #6  0x7fff9aae5c32 in 
SwViewShellImp::InvalidateAccessibleCursorPosition(SwFrame const*) 
(this=0x6594330, pFrame=0x5a3faa0) at sw/source/core/view/viewimp.cxx:345
 #7  0x7fff99b01fcd in SwCursorShell::UpdateCursor(unsigned short, 
bool) (this=0x6594840, eFlags=7, bIdleEnd=false) at 
sw/source/core/crsr/crsrsh.cxx:2020
 #8  0x7fff99b02db4 in SwCursorShell::EndAction(bool, bool) 
(this=0x6594840, bIdleEnd=false, DoSetPosX=false) at 
sw/source/core/crsr/crsrsh.cxx:279
 #9  0x7fff9a2249b2 in SwFEShell::SelectObj(Point const&, unsigned 
char, SdrObject*) (this=0x6594840, rPt=Point = {...}, nFlag=0 '\000', pObj=0x0)
 at sw/source/core/frmedt/feshview.cxx:323
 #10 0x7fff9b30eacb in SwWrtShell::UnSelectFrame() (this=0x6594840) at 
sw/source/uibase/wrtsh/select.cxx:326

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

diff --git a/include/editeng/AccessibleContextBase.hxx 
b/include/editeng/AccessibleContextBase.hxx
index 9c5027f4d9c3..183c097fed0e 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -250,6 +250,14 @@ public:
 virtual css::uno::Sequence SAL_CALL
 getImplementationId() override;
 
+/** Check whether or not the object has been disposed (or is in the
+state of being disposed).
+
+@return TRUE, if the object is disposed or in the course
+of being disposed. Otherwise, FALSE is returned.
+*/
+bool IsDisposed() const;
+
 protected:
 /** The state set.
 */
@@ -282,14 +290,6 @@ protected:
 */
 void ThrowIfDisposed();
 
-/** Check whether or not the object has been disposed (or is in the
-state of being disposed).
-
-@return TRUE, if the object is disposed or in the course
-of being disposed. Otherwise, FALSE is returned.
-*/
-bool IsDisposed() const;
-
 /** sets the role as returned by XaccessibleContext::getAccessibleRole
 
 Caution: This is only to be used in the construction phase (means 
within
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index f45c30224b41..8f3543dcd4df 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1642,7 +1642,7 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool 
bInvalidateFocusMode /*=fa
 for (const auto& rpShape : vecxShapeRemove)
 {
 ::accessibility::AccessibleShape *pAccShape = rpShape.get();
-if (pAccShape)
+if (pAccShape && !pAccShape->IsDisposed())
 {
 uno::Reference< XAccessible > xPara = 
pAccShape->getAccessibleParent();
 uno::Reference< XAccessibleContext > xParaContext = 
xPara->getAccessibleContext();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/tools svx/source sw/source tools/source vcl/source

2020-11-13 Thread Noel Grandin (via logerrit) 
 include/editeng/itemtype.hxx  |2 +-
 include/tools/bigint.hxx  |   14 ++
 svx/source/svdraw/svdattr.cxx |2 +-
 svx/source/svdraw/svdedtv1.cxx|8 
 svx/source/svdraw/svdobj.cxx  |8 
 svx/source/svdraw/svdotxdr.cxx|8 
 svx/source/svdraw/svdtrans.cxx|2 +-
 svx/source/svdraw/svdxcgv.cxx |4 ++--
 svx/source/xoutdev/xattr.cxx  |2 +-
 sw/source/uibase/wrtsh/wrtsh1.cxx |4 ++--
 tools/source/generic/poly.cxx |4 ++--
 vcl/source/control/longcurr.cxx   |8 
 vcl/source/filter/wmf/wmfwr.cxx   |4 ++--
 vcl/source/outdev/map.cxx |   12 ++--
 14 files changed, 48 insertions(+), 34 deletions(-)

New commits:
commit d55e0fbde49ad3b1e678419588dd58df6d9e06c4
Author: Noel Grandin 
AuthorDate: Thu Nov 12 09:31:42 2020 +0100
Commit: Noel Grandin 
CommitDate: Fri Nov 13 13:38:26 2020 +0100

Revert "remove BigInt::operator tools::Long()"

This reverts commit 1397a1c8e4995b0dd336478e564880fe8ad91d1d.

Reason for revert: Some discussion required

Change-Id: Id39ee8260790e0722c5bf8338b0b76ca34da83d7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105539
Tested-by: Noel Grandin 
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 9adcb98cb370..19d2a19b4ee3 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -42,7 +42,7 @@ inline tools::Long Scale( tools::Long nVal, tools::Long 
nMult, tools::Long nDiv
 aVal *= nMult;
 aVal += nDiv/2;
 aVal /= nDiv;
-return static_cast(aVal);
+return aVal;
 }
 
 #endif
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index 6683f07e3121..db8c3bcd1b1c 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -88,6 +88,9 @@ public:
 operatorsal_Int32() const;
 operatorsal_uInt32() const;
 operatordouble() const;
+#if SAL_TYPES_SIZEOFPOINTER == 8
+operatortools::Long() const;
+#endif
 
 boolIsSet() const { return bIsSet; }
 boolIsNeg() const;
@@ -153,6 +156,17 @@ inline BigInt::operator sal_uInt32() const
 return 0;
 }
 
+#if SAL_TYPES_SIZEOFPOINTER == 8
+inline BigInt::operator tools::Long() const
+{
+// Clamp to int32 since long is int32 on Windows.
+if (!bIsBig)
+return nVal;
+assert(false && "out of range");
+return 0;
+}
+#endif
+
 inline BigInt& BigInt::operator =( sal_Int32 nValue )
 {
 bIsSet = true;
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 58aa365e02ae..2e007ea7d513 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -855,7 +855,7 @@ void SdrMetricItem::ScaleMetrics(tools::Long nMul, 
tools::Long nDiv)
 aVal*=nMul;
 aVal+=nDiv/2; // to round accurately
 aVal/=nDiv;
-SetValue(sal_Int32(aVal));
+SetValue(tools::Long(aVal));
 }
 }
 
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 5f98c816c65f..0beba3a215aa 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -131,10 +131,10 @@ void SdrEditView::SetMarkedObjRect(const 
tools::Rectangle& rRect)
 } else {
 t=0; b=h1;
 }
-aR1.SetLeft(sal_Int32(l) );
-aR1.SetRight(sal_Int32(r) );
-aR1.SetTop(sal_Int32(t) );
-aR1.SetBottom(sal_Int32(b) );
+aR1.SetLeft(tools::Long(l) );
+aR1.SetRight(tools::Long(r) );
+aR1.SetTop(tools::Long(t) );
+aR1.SetBottom(tools::Long(b) );
 aR1.Move(x1,y1);
 }
 pO->SetSnapRect(aR1);
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 6b2db29caf7d..638c590a52cd 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1236,12 +1236,12 @@ tools::Rectangle SdrObject::ImpDragCalcRect(const 
SdrDragStat& rDrag) const
 if (bEcke) { // corner point handles
 bool bUseX=(aXFactSetLogicRect(aR);
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 072448f7121c..f8b532ab554e 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -103,7 +103,7 @@ static tools::Long ScaleMetricValue( tools::Long nVal, 
tools::Long nMul, tools::
 
 aVal/=nDiv;
 
-return sal_Int32( aVal );
+return tools::Long( aVal );
 }
 
 NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) :
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 1bab729db9a5..8251a9978142 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -337,13 +337,13 @@ void SwWrtShell::Insert( const OUString , const 
OUString ,
 if( aGrfSize.Width() >

[Libreoffice-commits] core.git: include/editeng include/tools svx/source sw/source tools/source vcl/source

2020-11-11 Thread Noel (via logerrit) 
 include/editeng/itemtype.hxx  |2 +-
 include/tools/bigint.hxx  |   14 --
 svx/source/svdraw/svdattr.cxx |2 +-
 svx/source/svdraw/svdedtv1.cxx|8 
 svx/source/svdraw/svdobj.cxx  |8 
 svx/source/svdraw/svdotxdr.cxx|8 
 svx/source/svdraw/svdtrans.cxx|2 +-
 svx/source/svdraw/svdxcgv.cxx |4 ++--
 svx/source/xoutdev/xattr.cxx  |2 +-
 sw/source/uibase/wrtsh/wrtsh1.cxx |4 ++--
 tools/source/generic/poly.cxx |4 ++--
 vcl/source/control/longcurr.cxx   |8 
 vcl/source/filter/wmf/wmfwr.cxx   |4 ++--
 vcl/source/outdev/map.cxx |   12 ++--
 14 files changed, 34 insertions(+), 48 deletions(-)

New commits:
commit 1397a1c8e4995b0dd336478e564880fe8ad91d1d
Author: Noel 
AuthorDate: Wed Nov 11 18:08:40 2020 +0200
Commit: Noel Grandin 
CommitDate: Thu Nov 12 07:37:38 2020 +0100

remove BigInt::operator tools::Long()

which was introduced in
commit adf0738d2dbfa742d0e9ef130954fb4638a8e90d
Author: Noel Grandin 
Date:   Wed Jan 3 14:25:15 2018 +0200
long->sal_Int32 in BigInt
presumably to make the conversion easier.

Instead just fix the call-sites to select a better
conversion, BigInt only returns 32-bits of precision
anyway.

Change-Id: I2e4354bcfded01763fe3312a715ef37800297876
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105602
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index 19d2a19b4ee3..9adcb98cb370 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -42,7 +42,7 @@ inline tools::Long Scale( tools::Long nVal, tools::Long 
nMult, tools::Long nDiv
 aVal *= nMult;
 aVal += nDiv/2;
 aVal /= nDiv;
-return aVal;
+return static_cast(aVal);
 }
 
 #endif
diff --git a/include/tools/bigint.hxx b/include/tools/bigint.hxx
index de03339f041d..a07ba53d7f92 100644
--- a/include/tools/bigint.hxx
+++ b/include/tools/bigint.hxx
@@ -88,9 +88,6 @@ public:
 operatorsal_Int32() const;
 operatorsal_uInt32() const;
 operatordouble() const;
-#if SAL_TYPES_SIZEOFPOINTER == 8
-operatortools::Long() const;
-#endif
 
 boolIsSet() const { return bIsSet; }
 boolIsNeg() const;
@@ -156,17 +153,6 @@ inline BigInt::operator sal_uInt32() const
 return 0;
 }
 
-#if SAL_TYPES_SIZEOFPOINTER == 8
-inline BigInt::operator tools::Long() const
-{
-// Clamp to int32 since long is int32 on Windows.
-if (!bIsBig)
-return nVal;
-assert(false && "out of range");
-return 0;
-}
-#endif
-
 inline BigInt& BigInt::operator =( sal_Int32 nValue )
 {
 bIsSet = true;
diff --git a/svx/source/svdraw/svdattr.cxx b/svx/source/svdraw/svdattr.cxx
index 2e007ea7d513..58aa365e02ae 100644
--- a/svx/source/svdraw/svdattr.cxx
+++ b/svx/source/svdraw/svdattr.cxx
@@ -855,7 +855,7 @@ void SdrMetricItem::ScaleMetrics(tools::Long nMul, 
tools::Long nDiv)
 aVal*=nMul;
 aVal+=nDiv/2; // to round accurately
 aVal/=nDiv;
-SetValue(tools::Long(aVal));
+SetValue(sal_Int32(aVal));
 }
 }
 
diff --git a/svx/source/svdraw/svdedtv1.cxx b/svx/source/svdraw/svdedtv1.cxx
index 0beba3a215aa..5f98c816c65f 100644
--- a/svx/source/svdraw/svdedtv1.cxx
+++ b/svx/source/svdraw/svdedtv1.cxx
@@ -131,10 +131,10 @@ void SdrEditView::SetMarkedObjRect(const 
tools::Rectangle& rRect)
 } else {
 t=0; b=h1;
 }
-aR1.SetLeft(tools::Long(l) );
-aR1.SetRight(tools::Long(r) );
-aR1.SetTop(tools::Long(t) );
-aR1.SetBottom(tools::Long(b) );
+aR1.SetLeft(sal_Int32(l) );
+aR1.SetRight(sal_Int32(r) );
+aR1.SetTop(sal_Int32(t) );
+aR1.SetBottom(sal_Int32(b) );
 aR1.Move(x1,y1);
 }
 pO->SetSnapRect(aR1);
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index 638c590a52cd..6b2db29caf7d 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -1236,12 +1236,12 @@ tools::Rectangle SdrObject::ImpDragCalcRect(const 
SdrDragStat& rDrag) const
 if (bEcke) { // corner point handles
 bool bUseX=(aXFactSetLogicRect(aR);
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index f8b532ab554e..072448f7121c 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -103,7 +103,7 @@ static tools::Long ScaleMetricValue( tools::Long nVal, 
tools::Long nMul, tools::
 
 aVal/=nDiv;
 
-return tools::Long( aVal );
+return sal_Int32( aVal );
 }
 
 NameOrIndex::NameOrIndex(sal_uInt16 _nWhich, sal_Int32 nIndex) :
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx 
b/sw/source/uibase/wrtsh/wrtsh1.cxx
index

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

2020-10-26 Thread Mike Kaganski (via logerrit) 
 include/editeng/svxrtf.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 0b0d350707fedcf04b43978182b6a8e03d3a4693
Author: Mike Kaganski 
AuthorDate: Mon Oct 26 19:45:08 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Oct 26 17:48:02 2020 +0100

Fix build with --disable-pch: missing include

...after 39ae9d29be0b4308b6e6ab7ee52c3fe6d6dc7d0c

Change-Id: I94e5bd87cae736e4503d6f86f4a818fdcb72f1f9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104820
Tested-by: Mike Kaganski 
Reviewed-by: Mike Kaganski 

diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index 5457cf9765ae..faff107c1496 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -27,6 +27,7 @@
 
 #include 
 
+#include 
 #include 
 #include 
 #include 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-06-03 Thread Noel Grandin (via logerrit) 
 include/editeng/wghtitem.hxx   |8 
 sc/source/core/data/table1.cxx |4 
 2 files changed, 12 insertions(+)

New commits:
commit 9073a47b99e22585c6d1603dd747cb14f081fca1
Author: Noel Grandin 
AuthorDate: Tue Jun 2 17:15:15 2020 +0200
Commit: Noel Grandin 
CommitDate: Wed Jun 3 08:09:57 2020 +0200

tdf#88109 improve autofill perf (2)

make SvxWeightItem sortable, which shaves off 1%

and turn the tree search off while performing this operation, which
shaves off about 25% of the time on my machine.

Change-Id: I94358ed565a0d9f1cc0ddb36b8349e83c9deb959
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/95369
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/wghtitem.hxx b/include/editeng/wghtitem.hxx
index 121cfcf318a6..6f5f4b31ccc3 100644
--- a/include/editeng/wghtitem.hxx
+++ b/include/editeng/wghtitem.hxx
@@ -59,6 +59,14 @@ public:
 FontWeight  GetWeight() const { return GetValue(); }
 
 void dumpAsXml(xmlTextWriterPtr pWriter) const override;
+
+virtual bool IsSortable() const override { return true; }
+
+virtual bool operator<(const SfxPoolItem& rCmp) const override
+{
+auto const & other = static_cast(rCmp);
+return GetValue() < other.GetValue();
+}
 };
 
 #endif // INCLUDED_EDITENG_WGHTITEM_HXX
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 022a57f2503f..16e6e5d594d5 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -464,6 +464,8 @@ bool ScTable::SetOptimalHeight(
 
 ScProgress* pProgress = GetProgressBar(nCount, GetWeightedCount(), 
pOuterProgress, pDocument);
 
+mpRowHeights->enableTreeSearch(false);
+
 GetOptimalHeightsInColumn(rCxt, aCol, nStartRow, nEndRow, pProgress, 
nProgressStart);
 
 SetRowHeightRangeFunc aFunc(this, rCxt.getPPTY());
@@ -472,6 +474,8 @@ bool ScTable::SetOptimalHeight(
 if ( pProgress != pOuterProgress )
 delete pProgress;
 
+mpRowHeights->enableTreeSearch(true);
+
 return bChanged;
 }
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng uitest/ui_logger_dsl writerfilter/source

2020-05-17 Thread Andrea Gelmini (via logerrit) 
 include/editeng/numitem.hxx  |2 +-
 uitest/ui_logger_dsl/dsl_core.py |2 +-
 writerfilter/source/dmapper/NumberingManager.hxx |4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 9786f2b0b7979a4cb781ea52b4510eecfd15dc49
Author: Andrea Gelmini 
AuthorDate: Sun May 17 13:36:29 2020 +0200
Commit: Julien Nabet 
CommitDate: Sun May 17 16:02:30 2020 +0200

Fix typos

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

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 629d4c56f071..38dbfe90370a 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -105,7 +105,7 @@ private:
 OUStringsPrefix;
 OUStringsSuffix;
 std::optional sListFormat;// Format string ">%1.%2<" can 
be used instead of prefix/suffix
-// Right now it is optional 
value to dostinguish empty list format
+// Right now it is optional 
value to distinguish empty list format
 // and not set list format 
when we need to fallback to prefix/suffix.
 
 SvxAdjust   eNumAdjust;
diff --git a/uitest/ui_logger_dsl/dsl_core.py b/uitest/ui_logger_dsl/dsl_core.py
index d4a9601f3997..7390ec03f46a 100644
--- a/uitest/ui_logger_dsl/dsl_core.py
+++ b/uitest/ui_logger_dsl/dsl_core.py
@@ -371,7 +371,7 @@ class ul_Compiler:
 else:
 self.flag_for_QuerySaveDialog = False
 
-# This is to solve the problem of re-using the same id again in 
diffrent Dialogs
+# This is to solve the problem of re-using the same id again in 
different Dialogs
 
 self.objects.clear()
 
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx 
b/writerfilter/source/dmapper/NumberingManager.hxx
index e1d2f2f1bef2..f5c2d01e6e64 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -126,13 +126,13 @@ private:
 // levels of a numbering.
 ::std::vector< ListLevel::Pointer >  m_aLevels;
 
-// Only used during the numberings import
+// Only used during the numbering import
 ListLevel::Pointer m_pCurrentLevel;
 
 // The style name linked to.
 OUString  m_sNumStyleLink;
 
-// This absract numbering is a base definition for this style
+// This abstract numbering is a base definition for this style
 OUString  m_sStyleLink;
 
 /// list id to use for all derived numbering definitions
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-05-16 Thread Vasily Melenchuk (via logerrit) 
 include/editeng/numitem.hxx|8 ++--
 sw/source/core/doc/number.cxx  |4 ++--
 sw/source/core/unocore/unosett.cxx |7 ---
 sw/source/filter/ww8/wrtw8num.cxx  |2 +-
 4 files changed, 13 insertions(+), 8 deletions(-)

New commits:
commit d8329149394e4e5758a9e293b0162db050379a4e
Author: Vasily Melenchuk 
AuthorDate: Fri May 15 18:17:34 2020 +0300
Commit: Thorsten Behrens 
CommitDate: Sun May 17 03:06:52 2020 +0200

tdf#120394: list format string can be empty

We need to distunguish when we have list format string, but it
is empty (no level text will be diplayed) or it does not exist
at all, so we need to fallback to old prefix-suffix syntax.

Change-Id: Ifd4ccd5a676db86c39d2ef48e91d191d92b9b2a0
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94322
Tested-by: Jenkins
Reviewed-by: Thorsten Behrens 

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index fda3169cbfd9..629d4c56f071 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -31,6 +31,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 class SvxBrushItem;
@@ -103,7 +104,9 @@ public:
 private:
 OUStringsPrefix;
 OUStringsSuffix;
-OUStringsListFormat;// Format string ">%1.%2<" can be 
used instead of prefix/suffix
+std::optional sListFormat;// Format string ">%1.%2<" can 
be used instead of prefix/suffix
+// Right now it is optional 
value to dostinguish empty list format
+// and not set list format 
when we need to fallback to prefix/suffix.
 
 SvxAdjust   eNumAdjust;
 
@@ -169,7 +172,8 @@ public:
 voidSetSuffix(const OUString& rSet) { sSuffix = rSet;}
 const OUString& GetSuffix() const { return sSuffix;}
 voidSetListFormat(const OUString& rSet) { sListFormat = rSet; }
-const OUString& GetListFormat() const { return sListFormat; }
+boolHasListFormat() const { return sListFormat.has_value(); }
+const OUString& GetListFormat() const { return *sListFormat; }
 
 voidSetCharFormatName(const OUString& rSet){ 
sCharStyleName = rSet; }
 virtual OUStringGetCharFormatName()const;
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 0c7810f058f4..fa58d9ed789f 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -644,9 +644,9 @@ OUString SwNumRule::MakeNumString( const 
SwNumberTree::tNumberVector & rNumVecto
 {
 css::lang::Locale aLocale( LanguageTag::convertToLocale(nLang));
 
-OUString sLevelFormat = rMyNFormat.GetListFormat();
-if (!sLevelFormat.isEmpty())
+if (rMyNFormat.HasListFormat())
 {
+OUString sLevelFormat = rMyNFormat.GetListFormat();
 // In this case we are ignoring GetIncludeUpperLevels: we put 
all
 // level numbers requested by level format
 for (SwNumberTree::tNumberVector::size_type i=0; i <= nLevel; 
++i)
diff --git a/sw/source/core/unocore/unosett.cxx 
b/sw/source/core/unocore/unosett.cxx
index ebffc9ae2852..817938749bf7 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -1335,11 +1335,12 @@ uno::Sequence 
SwXNumberingRules::GetPropertiesForNumFormat
 aPropertyValues.push_back(comphelper::makePropertyValue("Suffix", 
aUString));
 
 //listformat
-aUString = rFormat.GetListFormat();
-aPropertyValues.push_back(comphelper::makePropertyValue("ListFormat", 
aUString));
+if (rFormat.HasListFormat())
+{
+aPropertyValues.push_back(comphelper::makePropertyValue("ListFormat", 
rFormat.GetListFormat()));
+}
 
 //char style name
-
 aUString.clear();
 SwStyleNameMapper::FillProgName( rCharFormatName, aUString, 
SwGetPoolIdFromName::ChrFmt);
 aPropertyValues.push_back(comphelper::makePropertyValue("CharStyleName", 
aUString));
diff --git a/sw/source/filter/ww8/wrtw8num.cxx 
b/sw/source/filter/ww8/wrtw8num.cxx
index ca3a026f2323..e2aad33206d3 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -494,7 +494,7 @@ void MSWordExportBase::NumberingLevel(
 const vcl::Font* pBulletFont=nullptr;
 rtl_TextEncoding eChrSet=0;
 FontFamily eFamily=FAMILY_DECORATIVE;
-if (!rRule.Get(nLvl).GetListFormat().isEmpty())
+if (rRule.Get(nLvl).HasListFormat())
 {
 // Nothing to construct: we have it already
 sNumStr = rRule.Get(nLvl).GetListFormat();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-04-21 Thread Thorsten Behrens (via logerrit) 
 include/editeng/charrotateitem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2e9261415006ce782a7ae699c69f5be3cec29dff
Author: Thorsten Behrens 
AuthorDate: Tue Apr 21 21:37:34 2020 +0200
Commit: Thorsten Behrens 
CommitDate: Wed Apr 22 02:32:51 2020 +0200

Partial revert "make more classes private in mergedlibs"

Turns out x86 linux needs some item vtables in cui, which does
not get linked into mergedlib.

This reverts bits of commit 01159643623de55f9e1de84d568032ca919dbd8f

Change-Id: I442aa2efca9941e9c5bf656c73cc5a5577db8781
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/92658
Tested-by: Thorsten Behrens 
Reviewed-by: Thorsten Behrens 

diff --git a/include/editeng/charrotateitem.hxx 
b/include/editeng/charrotateitem.hxx
index 9d7bb6935b05..25af247428d3 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -32,7 +32,7 @@
 
  */
 
-class UNLESS_MERGELIBS(EDITENG_DLLPUBLIC) SvxTextRotateItem : public 
SfxUInt16Item
+class EDITENG_DLLPUBLIC SvxTextRotateItem : public SfxUInt16Item
 {
 public:
 SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nId);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-29 Thread Julien Nabet (via logerrit) 
 include/editeng/outliner.hxx |4 
 1 file changed, 4 deletions(-)

New commits:
commit d5079f26e55cf2922db35034340023cfb9d0464d
Author: Julien Nabet 
AuthorDate: Sat Mar 28 20:08:41 2020 +0100
Commit: Noel Grandin 
CommitDate: Sun Mar 29 14:03:45 2020 +0200

OutlinerMode is not a typed_flags, it's not a bitmask (editeng)

Thank you Noel for having spotted this!

Change-Id: I37162504f19b163da570aac3ac27b24e94b9ce47
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91306
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 991a5e3ba58f..7037e30da288 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -545,10 +545,6 @@ enum class OutlinerMode {
 OutlineObject  = 0x0003,
 OutlineView= 0x0004
 };
-namespace o3tl
-{
-template<> struct typed_flags : is_typed_flags {};
-}
 
 class EDITENG_DLLPUBLIC Outliner : public SfxBroadcaster
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-29 Thread Julien Nabet (via logerrit) 
 include/editeng/numitem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 90c807bfd1fe65e3c94199fd1cd47df711a47d42
Author: Julien Nabet 
AuthorDate: Sat Mar 28 19:58:52 2020 +0100
Commit: Noel Grandin 
CommitDate: Sun Mar 29 09:11:51 2020 +0200

Fix is_typed_flags for SvxNumRuleFlags (editeng)

Since 
https://cgit.freedesktop.org/libreoffice/core/commit/?id=2b1f0d31c34464bdece4eea158097b3e4923cf5f
author  Tamás Zolnai2017-11-11 18:17:52 
+0100
committer   Tamás Zolnai2017-11-11 
20:44:48 +0100
commit  2b1f0d31c34464bdece4eea158097b3e4923cf5f (patch)
tree66fff19490e124a00321590eb5a5ba00ab149714
parent  019e6ae7be38176978943d95fa3b586830e1b3b1 (diff)
tdf#111738: Duplicated numbering alignment option on numbering dialog

Change-Id: I65defa76c3b325f1cf4d33482216f2663bbb82b2
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91284
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index e70281c7b0a1..12686b80b2aa 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -233,7 +233,7 @@ enum class SvxNumRuleFlags
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 enum class SvxNumRuleType
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-29 Thread Julien Nabet (via logerrit) 
 include/editeng/editstat.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 2c6d60783a534dc0cf7d4946488e7e5e6ec80cc6
Author: Julien Nabet 
AuthorDate: Sat Mar 28 20:02:47 2020 +0100
Commit: Noel Grandin 
CommitDate: Sun Mar 29 09:11:09 2020 +0200

Fix is_typed_flags for EEControlBits (editeng)

Change-Id: I40b719f58e7c41e33ce68cde217161924de6e3cf
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91285
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index a9e634246a0c..e23007899267 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -52,7 +52,7 @@ enum class EEControlBits
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
 enum class EVControlBits
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-03-02 Thread Miklos Vajna (via logerrit) 
 include/editeng/svxenum.hxx |3 ++-
 offapi/com/sun/star/style/NumberingType.idl |7 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

New commits:
commit 6b80bd446de4bf19df3a9b124881e1fe12402ca8
Author: Miklos Vajna 
AuthorDate: Mon Mar 2 17:17:56 2020 +0100
Commit: Miklos Vajna 
CommitDate: Tue Mar 3 07:58:13 2020 +0100

sw padded numbering: add doc model and UNO API

The idea is to behave similar to Arabic numbering, but pad the result on
the left up to 2 characters. Word has this feature, so far Writer falled
back to plain Arabic numbering.

This is just the document model, not layout yet.

Change-Id: I8ac90536848d00b8678129184db0849130724dee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89846
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index 3c4bbe266347..f425e97cde0c 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -205,7 +205,8 @@ enum SvxNumType : sal_Int16
 SVX_NUM_TEXT_NUMBER   = css::style::NumberingType::TEXT_NUMBER,
 SVX_NUM_TEXT_CARDINAL = css::style::NumberingType::TEXT_CARDINAL,
 SVX_NUM_TEXT_ORDINAL  = css::style::NumberingType::TEXT_ORDINAL,
-SVX_NUM_SYMBOL_CHICAGO= css::style::NumberingType::SYMBOL_CHICAGO
+SVX_NUM_SYMBOL_CHICAGO= css::style::NumberingType::SYMBOL_CHICAGO,
+SVX_NUM_ARABIC_ZERO   = css::style::NumberingType::ARABIC_ZERO
 };
 
 #endif
diff --git a/offapi/com/sun/star/style/NumberingType.idl 
b/offapi/com/sun/star/style/NumberingType.idl
index 0cc07b3eebc6..21ad4c73c3a4 100644
--- a/offapi/com/sun/star/style/NumberingType.idl
+++ b/offapi/com/sun/star/style/NumberingType.idl
@@ -492,6 +492,13 @@ published constants NumberingType
 ASTERISK ASTERISK, DAGGER DAGGER, etc.
   */
 const short SYMBOL_CHICAGO = 63;
+
+/** Numbering is in Arabic numbers, padded with zero to have a length of 
at least two, as "01,
+02, ..., 10, 11, ...".
+
+@since LibreOffice 7.0
+ */
+const short ARABIC_ZERO = 64;
 };
 
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-02-18 Thread Justin Luth (via logerrit) 
 include/editeng/escapementitem.hxx   |4 ++--
 sw/qa/extras/htmlimport/data/tdf80194_subscript.html |4 
 sw/qa/extras/htmlimport/htmlimport.cxx   |   19 +++
 sw/source/filter/ww8/docxattributeoutput.cxx |2 +-
 sw/source/filter/ww8/ww8atr.cxx  |2 +-
 5 files changed, 27 insertions(+), 4 deletions(-)

New commits:
commit 5f4a65b7a3a29972c90a5ef4eb5fd7795b205cdf
Author: Justin Luth 
AuthorDate: Mon Feb 17 12:52:28 2020 +0300
Commit: Justin Luth 
CommitDate: Tue Feb 18 19:31:45 2020 +0100

tdf#80194 UI: revert subscript DFLT_ESC_SUB to 8% (from 33%)

Originally this was at 8%, but long ago for some reason that
I couldn't find, it was changed to match superscript's 33%.
This primarily affects UI for editeng.

33% was completely wrong. It puts the subscript WAY
too low. The font's descent is only 20% of the total font height,
so to lower the character by 33% pushes it below the line
instead of towards the bottom of the line.

Many export fixes that match the formula which calculated the
values for DFLT_ESC_AUTO_* were made to LO6.4 for tdf#127316.

Changing this default suprisingly has almost no effect.
Import and export do not depend on a specific escapement
to determine whether to treat it as automatic or not.
That is generally handled with special keywords,
or in the case of RTF with a +1 on the nPROP value.
Writerfilter's use is in a never-to-be-encountered
failsafe edge-case. HTML's import is affected,
but for the good, so I made it into a unit test.

Primarily it affects the UI dialog - suggesting
8% when automatic checkbox is cleared, and the biggest
impact comes with the toolbar button for Draw/Impress
which don't set "automatic" mode, so they just take
the DFLT_ESC_SUB value. Looks much better now.
And that was the heart of the bug report - that
editeng defaults for subscript were way off.

Change-Id: I6769072d483467e86fea82dfc534eb5e04802491
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88910
Tested-by: Jenkins
Reviewed-by: Justin Luth 

diff --git a/include/editeng/escapementitem.hxx 
b/include/editeng/escapementitem.hxx
index 6811511c4076..ea8f99e3519c 100644
--- a/include/editeng/escapementitem.hxx
+++ b/include/editeng/escapementitem.hxx
@@ -25,8 +25,8 @@
 
 // class SvxEscapementItem ---
 
-#define DFLT_ESC_SUPER   33 // 1/3
-#define DFLT_ESC_SUB-33 // also 1/3 previously 8/100
+#define DFLT_ESC_SUPER   33 // 42% (100 - DFLT_ESC_PROP) of ascent (~80% 
of font height) = 33% of total font height
+#define DFLT_ESC_SUB -8 // 42% of descent (~20% of font height) = -8%. 
previously -33% (pre-2020), previously 8/100 (pre-2000?)
 #define DFLT_ESC_PROP58
 #define MAX_ESC_POS  13999
 #define DFLT_ESC_AUTO_SUPER  (MAX_ESC_POS+1)
diff --git a/sw/qa/extras/htmlimport/data/tdf80194_subscript.html 
b/sw/qa/extras/htmlimport/data/tdf80194_subscript.html
new file mode 100644
index ..5b00f5dd8d3f
--- /dev/null
+++ b/sw/qa/extras/htmlimport/data/tdf80194_subscript.html
@@ -0,0 +1,4 @@
+
+  Does the subscript go lower than the descent? qp.
+  We want to know about the ascent for a superscripTL also.
+
diff --git a/sw/qa/extras/htmlimport/htmlimport.cxx 
b/sw/qa/extras/htmlimport/htmlimport.cxx
index 86e123e62e59..6259b1141520 100644
--- a/sw/qa/extras/htmlimport/htmlimport.cxx
+++ b/sw/qa/extras/htmlimport/htmlimport.cxx
@@ -317,6 +317,25 @@ DECLARE_HTMLIMPORT_TEST(testReqIfBr, "reqif-br.xhtml")
 CPPUNIT_ASSERT(getParagraph(1)->getString().startsWith("aaa\nbbb"));
 }
 
+DECLARE_HTMLIMPORT_TEST(testTdf80194_subscript, "tdf80194_subscript.html")
+{
+uno::Reference xPara = getParagraph(1);
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.f, getProperty(getRun(xPara, 1), 
"CharEscapement"), 0);
+// Most recently, the default subscript was 33%, which is much too large 
for a subscript.
+// The original 8% (derived from a mathematical calculation) is much 
better in general,
+// and for HTML was a better match when testing with firefox.
+// DFLT_ESC_AUTO_SUB was tested, but HTML specs are pretty loose, and 
generally
+// it exceeds the font ascent - so the formula-based-escapement is not 
appropriate.
+CPPUNIT_ASSERT_DOUBLES_EQUAL( -8.f, getProperty(getRun(xPara, 2, 
"p"), "CharEscapement"), 1);
+
+xPara.set(getParagraph(2));
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 0.f, getProperty(getRun(xPara, 1), 
"CharEscapement"), 0);
+uno::Reference xRun (getRun(xPara, 2, "L"));
+CPPUNIT_ASSERT_DOUBLES_EQUAL( 33.f, getProperty(xRun, 
"CharEscapement"), 1);
+// HTML (although unspecified) tends to use a fairly large font. 
Definitely more than DFLT_ESC_PROP.
+CPPUNIT_ASSERT( 70 < getProperty(xRun, "CharEscapementHeight"));
+}
+
 DECLARE_HTMLIMPORT_TEST(testReqIfTable,

[Libreoffice-commits] core.git: include/editeng sc/source sd/source sw/source

2020-01-02 Thread Mike Kaganski (via logerrit) 
 include/editeng/urlfieldhelper.hxx   |4 
 sc/source/ui/drawfunc/drtxtob.cxx|2 +-
 sd/source/ui/view/drviews2.cxx   |4 +++-
 sd/source/ui/view/drviews7.cxx   |3 +--
 sd/source/ui/view/drviewsf.cxx   |2 +-
 sw/source/uibase/shells/drwtxtex.cxx |2 +-
 6 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit e590d1ab4a3f605141d653b575d645453dba57c9
Author: Mike Kaganski 
AuthorDate: Thu Jan 2 11:34:05 2020 +0300
Commit: Mike Kaganski 
CommitDate: Thu Jan 2 11:02:18 2020 +0100

tdf#129712: check if outliner view pointer is valid to avoid crash

Regression after commit 64233bbaa0e91ddf14d59ae7547df6bbfa60adcc.


editenglo.dll!std::unique_ptr>::operator*()
at C:\Program Files (x86)\Microsoft Visual 
Studio\2019\Community\VC\Tools\MSVC\14.24.28314\include\memory(1886)
editenglo.dll!OutlinerView::GetEditView()
at C:\lo\src\core\include\editeng\outliner.hxx(208)
sdlo.dll!sd::DrawViewShell::GetAttrState(SfxItemSet & rSet)
at C:\lo\src\core\sd\source\ui\view\drviewsf.cxx(514)
sdlo.dll!SfxStubGraphicViewShellGetAttrState(SfxShell * pShell, SfxItemSet 
& rSet)
at C:\lo\src\core\workdir\SdiTarget\sd\sdi\sdgslots.hxx(1524)
sfxlo.dll!SfxShell::CallState(void(*)(SfxShell *, SfxItemSet &) pFunc, 
SfxItemSet & rSet)
at C:\lo\src\core\include\sfx2\shell.hxx(199)
sfxlo.dll!SfxDispatcher::FillState_(const SfxSlotServer & rSvr, SfxItemSet 
& rState, const SfxSlot * pRealSlot)
at C:\lo\src\core\sfx2\source\control\dispatch.cxx(1672)
sfxlo.dll!SfxBindings::Update_Impl(SfxStateCache & rCache)
at C:\lo\src\core\sfx2\source\control\bindings.cxx(270)
sfxlo.dll!SfxBindings::NextJob_Impl(const Timer * pTimer)
at C:\lo\src\core\sfx2\source\control\bindings.cxx(1285)
sfxlo.dll!SfxBindings::NextJob(Timer * pTimer)
at C:\lo\src\core\sfx2\source\control\bindings.cxx(1230)
sfxlo.dll!SfxBindings::LinkStubNextJob(void * instance, Timer * data)
at C:\lo\src\core\sfx2\source\control\bindings.cxx(1227)
vcllo.dll!Link::Call(Timer * data)
at C:\lo\src\core\include\tools\link.hxx(111)
vcllo.dll!Timer::Invoke()
at C:\lo\src\core\vcl\source\app\timer.cxx(76)
vcllo.dll!Scheduler::ProcessTaskScheduling()
at C:\lo\src\core\vcl\source\app\scheduler.cxx(478)
vcllo.dll!Scheduler::CallbackTaskScheduling()
at C:\lo\src\core\vcl\source\app\scheduler.cxx(288)
vcllo.dll!SalTimer::CallCallback()
at C:\lo\src\core\vcl\inc\saltimer.hxx(55)
vclplug_winlo.dll!WinSalTimer::ImplHandleElapsedTimer()
at C:\lo\src\core\vcl\win\app\saltimer.cxx(164)
vclplug_winlo.dll!WinSalTimer::ImplHandleTimerEvent(unsigned __int64 
aWPARAM)
at C:\lo\src\core\vcl\win\app\saltimer.cxx(174)
vclplug_winlo.dll!SalComWndProc(HWND__ * __formal, unsigned int nMsg, 
unsigned __int64 wParam, __int64 lParam, bool & rDef)
at C:\lo\src\core\vcl\win\app\salinst.cxx(626)
vclplug_winlo.dll!SalComWndProcW(HWND__ * hWnd, unsigned int nMsg, unsigned 
__int64 wParam, __int64 lParam)
at C:\lo\src\core\vcl\win\app\salinst.cxx(658)
user32.dll!UserCallWinProcCheckWow()
user32.dll!DispatchMessageWorker()
vclplug_winlo.dll!ImplSalDispatchMessage(const tagMSG * pMsg)
at C:\lo\src\core\vcl\win\app\salinst.cxx(420)
vclplug_winlo.dll!ImplSalYield(bool bWait, bool bHandleAllCurrentEvents)
at C:\lo\src\core\vcl\win\app\salinst.cxx(493)
vclplug_winlo.dll!WinSalInstance::DoYield(bool bWait, bool 
bHandleAllCurrentEvents)
at C:\lo\src\core\vcl\win\app\salinst.cxx(522)
vcllo.dll!ImplYield(bool i_bWait, bool i_bAllEvents)
at C:\lo\src\core\vcl\source\app\svapp.cxx(446)
vcllo.dll!Application::Yield()
at C:\lo\src\core\vcl\source\app\svapp.cxx(511)
vcllo.dll!Application::Execute()
at C:\lo\src\core\vcl\source\app\svapp.cxx(427)
sofficeapp.dll!desktop::Desktop::Main()
at C:\lo\src\core\desktop\source\app\app.cxx(1609)
vcllo.dll!ImplSVMain()
at C:\lo\src\core\vcl\source\app\svmain.cxx(191)
vcllo.dll!SVMain()
at C:\lo\src\core\vcl\source\app\svmain.cxx(226)
sofficeapp.dll!soffice_main()
at C:\lo\src\core\desktop\source\app\sofficemain.cxx(171)
soffice.bin!sal_main()
at C:\lo\src\core\desktop\source\app\main.c(48)
soffice.bin!main(int argc, char * * argv)
at C:\lo\src\core\desktop\source\app\main.c(47)
soffice.bin!invoke_main()
at 
d:\agent\_work\5\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl(79)
soffice.bin!__scrt_common_main_seh()
at 
d:\agent\_work\5\s\src\vctools\crt\vcstartup\src\startup\exe_common.inl(288)
soffice.bin!__scrt_common_main()
at

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

2019-12-10 Thread Samuel Mehrbrodt (via logerrit) 
 include/editeng/eeitem.hxx |   42 +-
 1 file changed, 21 insertions(+), 21 deletions(-)

New commits:
commit b802c11396f2d3538f97e128b3ddeceb399438a4
Author: Samuel Mehrbrodt 
AuthorDate: Fri Dec 6 12:11:11 2019 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue Dec 10 09:32:46 2019 +0100

Use EE_PARA_START to count para items

Change-Id: I936c1cddb8777fa01ecafe9cd6fef8cd47ad65cd
Reviewed-on: https://gerrit.libreoffice.org/84616
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/editeng/eeitem.hxx b/include/editeng/eeitem.hxx
index 9c746ee55b05..060fa9a6f1a2 100644
--- a/include/editeng/eeitem.hxx
+++ b/include/editeng/eeitem.hxx
@@ -69,29 +69,29 @@ class SvxNumBulletItem;
 
 // Paragraph attributes:
 #define EE_PARA_START   (EE_ITEMS_START+0)
-#define EE_PARA_WRITINGDIR  
TypedWhichId(EE_ITEMS_START+0)
-#define EE_PARA_XMLATTRIBS  
TypedWhichId(EE_ITEMS_START+1)
-#define EE_PARA_HANGINGPUNCTUATION  
TypedWhichId(EE_ITEMS_START+2)
-#define EE_PARA_FORBIDDENRULES  
TypedWhichId(EE_ITEMS_START+3)
-#define EE_PARA_ASIANCJKSPACING 
TypedWhichId(EE_ITEMS_START+4)
-#define EE_PARA_NUMBULLET   
TypedWhichId(EE_ITEMS_START+5)
-#define EE_PARA_HYPHENATE   TypedWhichId(EE_ITEMS_START+6)
-#define EE_PARA_HYPHENATE_NO_CAPS   TypedWhichId(EE_ITEMS_START+7)
-#define EE_PARA_BULLETSTATE TypedWhichId(EE_ITEMS_START+8)
-#define EE_PARA_OUTLLRSPACE 
TypedWhichId(EE_ITEMS_START+9)
-#define EE_PARA_OUTLLEVEL   
TypedWhichId(EE_ITEMS_START+10)
-#define EE_PARA_BULLET  
TypedWhichId(EE_ITEMS_START+11)
-#define EE_PARA_LRSPACE 
TypedWhichId(EE_ITEMS_START+12)
-#define EE_PARA_ULSPACE 
TypedWhichId(EE_ITEMS_START+13)
-#define EE_PARA_SBL 
TypedWhichId(EE_ITEMS_START+14)
-#define EE_PARA_JUST
TypedWhichId(EE_ITEMS_START+15)
-#define EE_PARA_TABS
TypedWhichId(EE_ITEMS_START+16)
-#define EE_PARA_JUST_METHOD 
TypedWhichId(EE_ITEMS_START+17)
-#define EE_PARA_VER_JUST
TypedWhichId(EE_ITEMS_START+18)
-#define EE_PARA_END (EE_ITEMS_START+18)
+#define EE_PARA_WRITINGDIR  
TypedWhichId(EE_PARA_START+0)
+#define EE_PARA_XMLATTRIBS  
TypedWhichId(EE_PARA_START+1)
+#define EE_PARA_HANGINGPUNCTUATION  
TypedWhichId(EE_PARA_START+2)
+#define EE_PARA_FORBIDDENRULES  
TypedWhichId(EE_PARA_START+3)
+#define EE_PARA_ASIANCJKSPACING 
TypedWhichId(EE_PARA_START+4)
+#define EE_PARA_NUMBULLET   
TypedWhichId(EE_PARA_START+5)
+#define EE_PARA_HYPHENATE   TypedWhichId(EE_PARA_START+6)
+#define EE_PARA_HYPHENATE_NO_CAPS   TypedWhichId(EE_PARA_START+7)
+#define EE_PARA_BULLETSTATE TypedWhichId(EE_PARA_START+8)
+#define EE_PARA_OUTLLRSPACE 
TypedWhichId(EE_PARA_START+9)
+#define EE_PARA_OUTLLEVEL   
TypedWhichId(EE_PARA_START+10)
+#define EE_PARA_BULLET  
TypedWhichId(EE_PARA_START+11)
+#define EE_PARA_LRSPACE 
TypedWhichId(EE_PARA_START+12)
+#define EE_PARA_ULSPACE 
TypedWhichId(EE_PARA_START+13)
+#define EE_PARA_SBL 
TypedWhichId(EE_PARA_START+14)
+#define EE_PARA_JUST
TypedWhichId(EE_PARA_START+15)
+#define EE_PARA_TABS
TypedWhichId(EE_PARA_START+16)
+#define EE_PARA_JUST_METHOD 
TypedWhichId(EE_PARA_START+17)
+#define EE_PARA_VER_JUST
TypedWhichId(EE_PARA_START+18)
+#define EE_PARA_END (EE_PARA_START+18)
 
 // Character attributes:
-#define EE_CHAR_START   (EE_ITEMS_START+19)
+#define EE_CHAR_START   (EE_PARA_END+1)
 #define EE_CHAR_COLOR   TypedWhichId(EE_CHAR_START+0)
 #define EE_CHAR_FONTINFOTypedWhichId(EE_CHAR_START+1)
 #define EE_CHAR_FONTHEIGHT  
TypedWhichId(EE_CHAR_START+2)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/i18nlangtag

2019-11-29 Thread Stephan Bergmann (via logerrit) 
 include/editeng/frmdiritem.hxx  |5 +
 include/i18nlangtag/languagetag.hxx |5 +
 2 files changed, 10 insertions(+)

New commits:
commit e9e4eb0736d5582fa37dcad20bf5826c50029249
Author: Stephan Bergmann 
AuthorDate: Fri Nov 29 11:58:10 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Fri Nov 29 17:07:09 2019 +0100

Fix some -Werror=deprecated-copy-dtor

...which would be found by GCC 10 trunk when explicitly enabling
-Wdeprecated-copy-dtor (warning about cases where the non-deleted 
definition of
an implicit copy ctor or assignment op is deprecated because of a 
user-provided
dtor; looks like breaking it out into its own option, which, unlike
-Wdeprecated-copy, isn't enabled by -Wextra, isn't all too helpful going
forward, see discussion at 

"-Wdeprecated-copy is draconian and shouldn't be in -Wall").

Using =delete instead of =default in cases that would otherwise cause Clang
-Wdefaulted-function-deleted, cf. 3db830d354de80b319fb818a0373365a1e647264
"Silence new Clang trunk -Wdefaulted-function-deleted".

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

diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 6a0327dd051e..89524b743a4f 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -34,6 +34,11 @@ public:
 SvxFrameDirectionItem( SvxFrameDirection nValue, sal_uInt16 nWhich  );
 virtual ~SvxFrameDirectionItem() override;
 
+SvxFrameDirectionItem(SvxFrameDirectionItem const &) = default;
+SvxFrameDirectionItem(SvxFrameDirectionItem &&) = default;
+SvxFrameDirectionItem & operator =(SvxFrameDirectionItem const &) = delete;
+SvxFrameDirectionItem & operator =(SvxFrameDirectionItem &&) = delete;
+
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
 
 virtual boolGetPresentation( SfxItemPresentation ePres,
diff --git a/include/i18nlangtag/languagetag.hxx 
b/include/i18nlangtag/languagetag.hxx
index 2d102a500c27..66b18d3faec7 100644
--- a/include/i18nlangtag/languagetag.hxx
+++ b/include/i18nlangtag/languagetag.hxx
@@ -109,6 +109,11 @@ public:
 
 ~LanguageTag();
 
+LanguageTag(LanguageTag const &) = default;
+LanguageTag(LanguageTag &&) = default;
+LanguageTag & operator =(LanguageTag const &) = default;
+LanguageTag & operator =(LanguageTag &&) = default;
+
 /** Obtain BCP 47 language tag.
 
 @param bResolveSystem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/o3tl

2019-11-06 Thread Caolán McNamara (via logerrit) 
 include/editeng/outlobj.hxx  |2 ++
 include/o3tl/cow_wrapper.hxx |   13 +
 2 files changed, 15 insertions(+)

New commits:
commit 8cdf166552aea7cb3dbdc183b76b5457c6651cf7
Author: Caolán McNamara 
AuthorDate: Wed Nov 6 09:51:48 2019 +
Commit: Caolán McNamara 
CommitDate: Wed Nov 6 11:44:46 2019 +0100

ofz#12553 Timeout

before:

real1m37.479s
user1m30.682s
sys 0m0.261s

after:

real0m44.166s
user0m44.010s
sys 0m0.056s

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

diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 364ec740b57f..a28e255634e5 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -47,6 +47,8 @@ struct OutlinerParaObjData
 
 OutlinerParaObjData( const OutlinerParaObjData& r );
 
+OutlinerParaObjData( OutlinerParaObjData&& r ) = default;
+
 // assignment operator
 OutlinerParaObjData& operator=(const OutlinerParaObjData& rCandidate) = 
delete;
 
diff --git a/include/o3tl/cow_wrapper.hxx b/include/o3tl/cow_wrapper.hxx
index 2fa7f03f276f..b9c463b852e4 100644
--- a/include/o3tl/cow_wrapper.hxx
+++ b/include/o3tl/cow_wrapper.hxx
@@ -194,6 +194,12 @@ int cow_wrapper_client::queryUnmodified() const
 {
 }
 
+explicit impl_t( T&& v ) :
+m_value(std::move(v)),
+m_ref_count(1)
+{
+}
+
 T  m_value;
 typename MTPolicy::ref_count_t m_ref_count;
 };
@@ -227,6 +233,13 @@ int cow_wrapper_client::queryUnmodified() const
 {
 }
 
+/** Move-construct wrapped type instance from given object
+ */
+explicit cow_wrapper( value_type&& r ) :
+m_pimpl( new impl_t(std::move(r)) )
+{
+}
+
 /** Shallow-copy given cow_wrapper
  */
 explicit cow_wrapper( const cow_wrapper& rSrc ) : // nothrow
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-29 Thread Noel Grandin (via logerrit) 
 include/editeng/AccessibleImageBullet.hxx |2 +-
 include/editeng/CustomPropertyField.hxx   |2 +-
 include/editeng/acorrcfg.hxx  |5 +++--
 include/editeng/adjustitem.hxx|2 +-
 include/editeng/autokernitem.hxx  |2 +-
 include/editeng/blinkitem.hxx |2 +-
 include/editeng/boxitem.hxx   |4 ++--
 include/editeng/brushitem.hxx |2 +-
 include/editeng/bulletitem.hxx|2 +-
 include/editeng/charhiddenitem.hxx|2 +-
 include/editeng/charreliefitem.hxx|2 +-
 include/editeng/charrotateitem.hxx|2 +-
 include/editeng/charscaleitem.hxx |2 +-
 include/editeng/cmapitem.hxx  |2 +-
 include/editeng/colritem.hxx  |2 +-
 include/editeng/contouritem.hxx   |2 +-
 include/editeng/crossedoutitem.hxx|2 +-
 include/editeng/editobj.hxx   |2 +-
 include/editeng/emphasismarkitem.hxx  |2 +-
 include/editeng/escapementitem.hxx|2 +-
 include/editeng/fhgtitem.hxx  |2 +-
 include/editeng/flditem.hxx   |   12 ++--
 include/editeng/flstitem.hxx  |2 +-
 include/editeng/fontitem.hxx  |2 +-
 include/editeng/forbiddenruleitem.hxx |2 +-
 include/editeng/formatbreakitem.hxx   |2 +-
 include/editeng/frmdiritem.hxx|2 +-
 include/editeng/hngpnctitem.hxx   |2 +-
 include/editeng/hyphenzoneitem.hxx|2 +-
 include/editeng/justifyitem.hxx   |6 +++---
 include/editeng/keepitem.hxx  |2 +-
 include/editeng/kernitem.hxx  |2 +-
 include/editeng/langitem.hxx  |2 +-
 include/editeng/lineitem.hxx  |2 +-
 include/editeng/lrspitem.hxx  |2 +-
 include/editeng/lspcitem.hxx  |2 +-
 include/editeng/measfld.hxx   |2 +-
 include/editeng/nhypitem.hxx  |2 +-
 include/editeng/numitem.hxx   |2 +-
 include/editeng/opaqitem.hxx  |2 +-
 include/editeng/optitems.hxx  |2 +-
 include/editeng/orphitem.hxx  |2 +-
 include/editeng/paravertalignitem.hxx |2 +-
 include/editeng/pbinitem.hxx  |2 +-
 include/editeng/pgrditem.hxx  |2 +-
 include/editeng/pmdlitem.hxx  |2 +-
 include/editeng/postitem.hxx  |2 +-
 include/editeng/prntitem.hxx  |2 +-
 include/editeng/protitem.hxx  |2 +-
 include/editeng/rsiditem.hxx  |2 +-
 include/editeng/scriptspaceitem.hxx   |2 +-
 include/editeng/scripttypeitem.hxx|2 +-
 include/editeng/shaditem.hxx  |2 +-
 include/editeng/shdditem.hxx  |2 +-
 include/editeng/spltitem.hxx  |2 +-
 include/editeng/tstpitem.hxx  |2 +-
 include/editeng/twolinesitem.hxx  |2 +-
 include/editeng/udlnitem.hxx  |4 ++--
 include/editeng/ulspitem.hxx  |2 +-
 include/editeng/unoedhlp.hxx  |2 +-
 include/editeng/unoedprx.hxx  |6 +++---
 include/editeng/unofored.hxx  |2 +-
 include/editeng/unoforou.hxx  |2 +-
 include/editeng/unonrule.hxx  |2 +-
 include/editeng/unopracc.hxx  |2 +-
 include/editeng/unotext.hxx   |6 +++---
 include/editeng/unoviwou.hxx  |2 +-
 include/editeng/wghtitem.hxx  |2 +-
 include/editeng/widwitem.hxx  |2 +-
 include/editeng/writingmodeitem.hxx   |2 +-
 include/editeng/wrlmitem.hxx  |2 +-
 include/editeng/xmlcnitm.hxx  |2 +-
 72 files changed, 87 insertions(+), 86 deletions(-)

New commits:
commit e73d13a11a00431d47322d18d44fdedbfe7f9f93
Author: Noel Grandin 
AuthorDate: Tue Oct 29 09:57:35 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Oct 29 10:51:31 2019 +0100

loplugin:finalclasses in editeng

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

diff --git a/include/editeng/AccessibleImageBullet.hxx 
b/include/editeng/AccessibleImageBullet.hxx
index 6bc049b7fc02..b09e393cbae0 100644
--- a/include/editeng/AccessibleImageBullet.hxx
+++ b/include/editeng/AccessibleImageBullet.hxx
@@ -44,7 +44,7 @@ namespace accessibility
 
 /** This class implements the image bullets for the EditEngine/Outliner UAA
  */
-class AccessibleImageBullet : public AccessibleImageBulletInterfaceBase
+class AccessibleImageBullet final : public 
AccessibleImageBulletInterfaceBase
 {
 
 public:
diff --git a/include/editeng/CustomPropertyField.hxx 
b/include/editeng/CustomPropertyField.hxx
index a49eba7bad3c..b44af7330bbc 100644

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

2019-07-09 Thread Andrea Gelmini (via logerrit) 
 include/editeng/svxrtf.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit df6c28b3c51cdf7b41baee912a9db0a750715347
Author: Andrea Gelmini 
AuthorDate: Mon Jul 8 10:44:42 2019 +
Commit: Julien Nabet 
CommitDate: Tue Jul 9 12:16:31 2019 +0200

Fix typo

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

diff --git a/include/editeng/svxrtf.hxx b/include/editeng/svxrtf.hxx
index a2de114fffaa..d38d1c605460 100644
--- a/include/editeng/svxrtf.hxx
+++ b/include/editeng/svxrtf.hxx
@@ -80,7 +80,7 @@ typedef std::map> SvxRTFStyleTbl;
 // own helper classes for the RTF Parser
 struct SvxRTFStyleType
 {
-SfxItemSet aAttrSet;// the attributes of Style (+ derivate!)
+SfxItemSet aAttrSet;// the attributes of Style (+ derivated!)
 OUString sName;
 sal_uInt16 nBasedOn;
 sal_uInt8 nOutlineNo;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-07-09 Thread Andrea Gelmini (via logerrit) 
 include/editeng/lineitem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d426bbfabc884d787b594907e0ad4ff24be9af9f
Author: Andrea Gelmini 
AuthorDate: Mon Jul 8 10:44:43 2019 +
Commit: Julien Nabet 
CommitDate: Tue Jul 9 12:14:58 2019 +0200

Fix typo

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

diff --git a/include/editeng/lineitem.hxx b/include/editeng/lineitem.hxx
index 8d74b66ce462..4c3de568a9e3 100644
--- a/include/editeng/lineitem.hxx
+++ b/include/editeng/lineitem.hxx
@@ -29,7 +29,7 @@
 
 /*
 [Description]
-This Item transports a editeng::SvxBorderLine.
+This Item transports an editeng::SvxBorderLine.
 */
 
 namespace editeng {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-07-09 Thread Andrea Gelmini (via logerrit) 
 include/editeng/unoedsrc.hxx |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit a7fb765e44696d307c789b146cd851a8474283dc
Author: Andrea Gelmini 
AuthorDate: Mon Jul 8 10:44:41 2019 +
Commit: Julien Nabet 
CommitDate: Tue Jul 9 11:16:19 2019 +0200

Fix typo

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

diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index e83cb4208060..a55cdf72adf7 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -115,7 +115,7 @@ public:
 object to inform all created text ranges about changes
 and also allows to re use already created instances.
 All SvxUnoTextRangeBase must remove itself with
-removeRange() before theire deleted. */
+removeRange() before they are deleted. */
 virtual void addRange( SvxUnoTextRangeBase* pNewRange );
 
 /** removes the given SvxUnoTextRangeBase from the text
@@ -364,7 +364,7 @@ public:
  */
 virtual voidGetLineBoundaries( /*out*/sal_Int32 , 
/*out*/sal_Int32 , sal_Int32 nParagraph, sal_Int32 nLine ) const = 0;
 
-/** Query the line number for a index in the paragraphs text
+/** Query the line number for an index in the paragraphs text
 
 @param nPara[0 .. n-1]
 Index of paragraph to query line length in
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-07-09 Thread Samuel Mehrbrodt (via logerrit) 
 include/editeng/editeng.hxx|4 
 sd/source/ui/view/drviews2.cxx |   39 +--
 2 files changed, 37 insertions(+), 6 deletions(-)

New commits:
commit 5314d69b0b2fa0d04c4562559552ef6b4126d1b1
Author: Samuel Mehrbrodt 
AuthorDate: Mon Jul 8 17:31:48 2019 +0200
Commit: Samuel Mehrbrodt 
CommitDate: Tue Jul 9 09:21:25 2019 +0200

tdf#111707 Only remove the selected hyperlink

Not all hyperlinks in current text box

Change-Id: Ia4ceeaeec776244e81b2c8fc401f7582a17d372f
Reviewed-on: https://gerrit.libreoffice.org/75229
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/editeng/editeng.hxx b/include/editeng/editeng.hxx
index f585ce8b5796..e531b6c8d9f5 100644
--- a/include/editeng/editeng.hxx
+++ b/include/editeng/editeng.hxx
@@ -129,10 +129,6 @@ namespace o3tl
 {
 template<> struct typed_flags : 
is_typed_flags {};
 }
-template bool checkSvxFieldData(const SvxFieldData* pData)
-{
-return dynamic_cast(pData) != nullptr;
-}
 
 enum class SetAttribsMode {
 NONE, WholeWord, Edge
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index 0c0f17717bf8..988fae4fc746 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -1151,13 +1151,48 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
 if (mpDrawView->IsTextEdit())
 {
 Outliner* pOutl = mpDrawView->GetTextEditOutliner();
-if (pOutl)
+OutlinerView* pOLV = mpDrawView->GetTextEditOutlinerView();
+if (pOutl && pOLV)
 {
-pOutl->RemoveFields(checkSvxFieldData);
+const SvxFieldItem* pFieldItem = 
pOLV->GetFieldAtSelection();
+if (pFieldItem)
+{
+// Make sure the whole field is selected
+ESelection aSel = pOLV->GetSelection();
+if (aSel.nStartPos == aSel.nEndPos)
+{
+aSel.nEndPos++;
+pOLV->SetSelection(aSel);
+}
+}
+if (!pFieldItem)
+{
+// Cursor probably behind the field - extend selection 
to select the field
+ESelection aSel = pOLV->GetSelection();
+if (aSel.nStartPos == aSel.nEndPos)
+{
+aSel.nStartPos--;
+pOLV->SetSelection(aSel);
+pFieldItem = pOLV->GetFieldAtSelection();
+}
+}
+
+if (pFieldItem)
+{
+ESelection aSel = pOLV->GetSelection();
+const SvxFieldData* pField = pFieldItem->GetField();
+if( auto pUrlField = dynamic_cast< const SvxURLField 
*>( pField ) )
+{
+
pOutl->QuickInsertText(pUrlField->GetRepresentation(), aSel);
+}
+}
 }
 }
 }
+Cancel();
+rReq.Done ();
 break;
+
 case SID_SET_DEFAULT:
 {
 std::unique_ptr pSet;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-07-08 Thread Andrea Gelmini (via logerrit) 
 include/editeng/unoedhlp.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 570119ac367880799291cefe10dc12c12165bfc1
Author: Andrea Gelmini 
AuthorDate: Mon Jul 8 10:44:42 2019 +
Commit: Jens Carl 
CommitDate: Tue Jul 9 04:55:43 2019 +0200

Fix typo

Change-Id: I03ab598b2d1e0b5c5969e8bb9e2700c6ada8864a
Reviewed-on: https://gerrit.libreoffice.org/75269
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/include/editeng/unoedhlp.hxx b/include/editeng/unoedhlp.hxx
index 45f51e9b38e6..fdb4f910ac4a 100644
--- a/include/editeng/unoedhlp.hxx
+++ b/include/editeng/unoedhlp.hxx
@@ -63,7 +63,7 @@ public:
 /** Translates EditEngine notifications into broadcastable hints
 
 @param aNotify
-Notification object send by the EditEngine.
+Notification object sent by the EditEngine.
 
 @return the translated hint
  */
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-07-08 Thread Andrea Gelmini (via logerrit) 
 include/editeng/AccessibleContextBase.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit ef1e659aed3936bcb128f0ed3c9c1ddc8a14782d
Author: Andrea Gelmini 
AuthorDate: Mon Jul 8 10:44:44 2019 +
Commit: Jens Carl 
CommitDate: Tue Jul 9 04:53:02 2019 +0200

Fix typo

Change-Id: I8319d3350fd5c9f6738ad6329dbd8a2252809515
Reviewed-on: https://gerrit.libreoffice.org/75266
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/include/editeng/AccessibleContextBase.hxx 
b/include/editeng/AccessibleContextBase.hxx
index 50f27af5cef1..1293c31e2d32 100644
--- a/include/editeng/AccessibleContextBase.hxx
+++ b/include/editeng/AccessibleContextBase.hxx
@@ -245,7 +245,7 @@ public:
 
 //=  XTypeProvider  ===
 
-/** Returns a implementation id.
+/** Returns an implementation id.
 */
 virtual css::uno::Sequence SAL_CALL
 getImplementationId() override;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-07-08 Thread Andrea Gelmini (via logerrit) 
 include/editeng/AccessibleComponentBase.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 3ae7373800121f33d2a4bd363aaf6be39cbf4a4b
Author: Andrea Gelmini 
AuthorDate: Mon Jul 8 10:44:45 2019 +
Commit: Jens Carl 
CommitDate: Tue Jul 9 04:52:32 2019 +0200

Fix typo

Change-Id: I20328956a55aa717b898ff5f77d4353de4182de5
Reviewed-on: https://gerrit.libreoffice.org/75265
Tested-by: Jenkins
Reviewed-by: Jens Carl 

diff --git a/include/editeng/AccessibleComponentBase.hxx 
b/include/editeng/AccessibleComponentBase.hxx
index 50a9155933a1..d3c5805ef75a 100644
--- a/include/editeng/AccessibleComponentBase.hxx
+++ b/include/editeng/AccessibleComponentBase.hxx
@@ -30,7 +30,7 @@ namespace com::sun::star::accessibility { class XAccessible; }
 namespace accessibility {
 
 /** @descr
-This base class provides (will provice) a base implementation of the
+This base class provides (will provide) a base implementation of the
 XAccessibleComponent and the
 XAccessibleExtendedComponent for all shapes.  For
 more detailed documentation about the methods refer to the interface
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-06-05 Thread Miklos Vajna (via logerrit) 
 include/editeng/frmdiritem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f9c6f40ef0dc42af810466ff8cad59fe69daa6bb
Author: Miklos Vajna 
AuthorDate: Tue Jun 4 21:33:02 2019 +0200
Commit: Miklos Vajna 
CommitDate: Wed Jun 5 09:16:44 2019 +0200

editeng: consider btlr in SvxFrameDirectionItem::GetValueCount()

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

diff --git a/include/editeng/frmdiritem.hxx b/include/editeng/frmdiritem.hxx
index 840cae4a2f9e..e7dede30ce90 100644
--- a/include/editeng/frmdiritem.hxx
+++ b/include/editeng/frmdiritem.hxx
@@ -47,7 +47,7 @@ public:
 
 virtual sal_uInt16  GetValueCount() const override
 {
-return sal_uInt16(SvxFrameDirection::Environment) + 1;
+return sal_uInt16(SvxFrameDirection::Vertical_LR_BT) + 1;
 }
 
 // SfxPoolItem copy function dichotomy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-05-11 Thread Andrea Gelmini (via logerrit) 
 include/editeng/editstat.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 42a57840a86665f1a74010ff1e3da27934c85df9
Author: Andrea Gelmini 
AuthorDate: Sat May 11 08:35:28 2019 +
Commit: Julien Nabet 
CommitDate: Sat May 11 12:04:08 2019 +0200

Fix typo

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

diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index 0d71fdda6625..242d179b36a5 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -38,7 +38,7 @@ enum class EEControlBits
 ALLOWBIGOBJS   = 0x0800,  // Portion info in text object
 ONLINESPELLING = 0x1000,  // During the edit Spelling
 STRETCHING = 0x2000,  // Stretch mode
-MARKNONURLFIELDS   = 0x4000,  // Mark fields other tha URL with color
+MARKNONURLFIELDS   = 0x4000,  // Mark fields other than URL with color
 MARKURLFIELDS  = 0x8000,  // Mark URL fields with color
 MARKFIELDS = (MARKNONURLFIELDS | MARKURLFIELDS),
 RTFSTYLESHEETS = 0x0002,  // Use Stylesheets when imported
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-02-19 Thread Libreoffice Gerrit user 
 include/editeng/outliner.hxx   |   17 +++--
 sd/source/ui/app/sdmod2.cxx|2 +-
 sw/source/core/doc/docdraw.cxx |4 ++--
 3 files changed, 10 insertions(+), 13 deletions(-)

New commits:
commit d4cafd20506a60a148b55e716c690a74c943def7
Author: Noel Grandin 
AuthorDate: Mon Feb 18 15:05:28 2019 +0200
Commit: Noel Grandin 
CommitDate: Tue Feb 19 09:40:22 2019 +0100

use boost::optional in EditFieldInfo

it is inefficient to allocate a tiny object like Color separately on the
heap

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

diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index 1158f7195fea..67d2c47bb222 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -49,6 +49,7 @@
 #include 
 #include 
 
+#include 
 #include 
 #include 
 #include 
@@ -497,8 +498,8 @@ private:
 Outliner*   pOutliner;
 const SvxFieldItem& rFldItem;
 
-std::unique_ptr pTxtColor;
-std::unique_ptr pFldColor;
+boost::optional mxTxtColor;
+boost::optional mxFldColor;
 
 OUStringaRepresentation;
 
@@ -522,15 +523,11 @@ public:
 
 const SvxFieldItem& GetField() const { return rFldItem; }
 
-Color*  GetTextColor() const { return pTxtColor.get(); }
-voidSetTextColor( const Color& rColor )
-{ pTxtColor.reset( new Color( rColor ) ); }
+boost::optional const & GetTextColor() const { return mxTxtColor; }
+voidSetTextColor( boost::optional xCol ) { mxTxtColor = 
xCol; }
 
-Color*  GetFieldColor() const { return pFldColor.get(); }
-voidSetFieldColor( const Color& rColor )
-{ pFldColor.reset( new Color( rColor ) ); }
-voidClearFieldColor()
-{ pFldColor.reset(); }
+boost::optional const & GetFieldColor() const { return mxFldColor; }
+voidSetFieldColor( boost::optional xCol ) { mxFldColor 
= xCol; }
 
 sal_Int32   GetPara() const { return nPara; }
 sal_Int32   GetPos() const { return nPos; }
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 34584c4cd3e3..5fd4dc940116 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -343,7 +343,7 @@ IMPL_LINK(SdModule, CalcFieldValueHdl, EditFieldInfo*, 
pInfo, void)
 }
 else if ( dynamic_cast< const SdrMeasureField* >(pField))
 {
-pInfo->ClearFieldColor();
+pInfo->SetFieldColor(boost::optional()); // clear the field 
color
 }
 else if ((pCustomPropertyField = dynamic_cast(pField)) != nullptr)
 {
diff --git a/sw/source/core/doc/docdraw.cxx b/sw/source/core/doc/docdraw.cxx
index 9eb49b95a44b..2087fbbe58d8 100644
--- a/sw/source/core/doc/docdraw.cxx
+++ b/sw/source/core/doc/docdraw.cxx
@@ -541,8 +541,8 @@ IMPL_LINK(SwDoc, CalcFieldValueHdl, EditFieldInfo*, pInfo, 
void)
 }
 else if (dynamic_cast( pField))
 {
-// Measure field
-pInfo->ClearFieldColor();
+// Clear measure field
+pInfo->SetFieldColor(boost::optional());
 }
 else if ( auto pTimeField = dynamic_cast( pField) )
 {
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-01-30 Thread Libreoffice Gerrit user 
 include/editeng/flstitem.hxx |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 6f658d9278dae4033a41b23937e49dba19c10873
Author: Stephan Bergmann 
AuthorDate: Wed Jan 30 14:54:33 2019 +0100
Commit: Stephan Bergmann 
CommitDate: Wed Jan 30 19:12:15 2019 +0100

css::uno::Sequence needs to be a complete type here

...in implicitly defined special members of EDITENG_DLLPUBLIC 
SvxFontListItem,
due to aFontNameSeq member (Windows --disable-pch)

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

diff --git a/include/editeng/flstitem.hxx b/include/editeng/flstitem.hxx
index 72948d94fc70..624eef3f866e 100644
--- a/include/editeng/flstitem.hxx
+++ b/include/editeng/flstitem.hxx
@@ -21,7 +21,7 @@
 
 #include 
 #include 
-#include 
+#include 
 #include 
 
 // class SvxFontListItem -
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-11-30 Thread Libreoffice Gerrit user 
 include/editeng/editstat.hxx |   18 +-
 1 file changed, 5 insertions(+), 13 deletions(-)

New commits:
commit cabf739612a0e979ebcf76f40a24e66a354b10a5
Author: Noel Grandin 
AuthorDate: Fri Nov 30 08:45:09 2018 +0200
Commit: Noel Grandin 
CommitDate: Fri Nov 30 11:56:27 2018 +0100

remove unused EditStatusFlags::CRSRLEFTPARA

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

diff --git a/include/editeng/editstat.hxx b/include/editeng/editstat.hxx
index f6894923c2e5..5c8c9873b08a 100644
--- a/include/editeng/editstat.hxx
+++ b/include/editeng/editstat.hxx
@@ -80,20 +80,15 @@ enum class EditStatusFlags
 VSCROLL = 0x0002,
 CURSOROUT   = 0x0004,
 CRSRMOVEFAIL= 0x0008,
-CRSRLEFTPARA= 0x0010,
-TEXTWIDTHCHANGED= 0x0020,
-TextHeightChanged   = 0x0040,
-WRONGWORDCHANGED= 0x0080
+TEXTWIDTHCHANGED= 0x0010,
+TextHeightChanged   = 0x0020,
+WRONGWORDCHANGED= 0x0040
 };
 namespace o3tl
 {
-template<> struct typed_flags : 
is_typed_flags {};
+template<> struct typed_flags : 
is_typed_flags {};
 }
 
-/*
-EditStatusFlags::CRSRLEFTPARA at the time cursor movement and the enter.
-*/
-
 inline void SetFlags( EVControlBits& rBits, EVControlBits nMask, bool bOn )
 {
 if ( bOn )
@@ -107,10 +102,9 @@ class EditStatus
 protected:
 EditStatusFlags nStatusBits;
 EEControlBits   nControlBits;
-sal_Int32   nPrevPara;  // for 
EditStatusFlags::CRSRLEFTPARA
 
 public:
-EditStatus(){ nStatusBits = EditStatusFlags::NONE; 
nControlBits = EEControlBits::NONE; nPrevPara = -1; }
+EditStatus(){ nStatusBits = EditStatusFlags::NONE; 
nControlBits = EEControlBits::NONE; }
 
 voidClear() { nStatusBits = EditStatusFlags::NONE; 
}
 
@@ -118,8 +112,6 @@ public:
 EditStatusFlags& GetStatusWord() { return nStatusBits; }
 
 EEControlBits& GetControlWord(){ return nControlBits; }
-
-sal_Int32&  GetPrevParagraph()  { return nPrevPara; }
 };
 
 enum class SpellCallbackCommand
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/svtools sc/inc sc/source solenv/clang-format svtools/source sw/inc sw/source

2018-11-16 Thread Libreoffice Gerrit user 
 include/editeng/borderline.hxx   |2 
 include/svtools/borderline.hxx   |   81 +++
 include/svtools/ctrlbox.hxx  |   54 --
 sc/inc/dpoutput.hxx  |1 
 sc/source/core/data/attarray.cxx |1 
 sc/source/core/data/colorscale.cxx   |1 
 sc/source/core/data/dpoutput.cxx |1 
 sc/source/filter/html/htmlimp.cxx|1 
 sc/source/filter/oox/sheetdatabuffer.cxx |1 
 sc/source/filter/oox/stylesbuffer.cxx|1 
 sc/source/ui/miscdlgs/scuiautofmt.cxx|1 
 sc/source/ui/unoobj/afmtuno.cxx  |1 
 solenv/clang-format/blacklist|1 
 svtools/source/control/ctrlbox.cxx   |1 
 sw/inc/fmtclds.hxx   |1 
 sw/source/core/crsr/annotationmark.cxx   |1 
 sw/source/core/doc/DocumentFieldsManager.cxx |1 
 sw/source/core/doc/DocumentLayoutManager.cxx |3 -
 sw/source/core/doc/docfly.cxx|1 
 sw/source/core/doc/docftn.cxx|1 
 sw/source/core/doc/docnum.cxx|1 
 sw/source/core/doc/gctable.cxx   |3 -
 sw/source/core/docnode/ndsect.cxx|1 
 sw/source/core/docnode/ndtbl.cxx |1 
 sw/source/core/draw/dview.cxx|1 
 sw/source/core/edit/edglbldc.cxx |1 
 sw/source/core/inc/frame.hxx |1 
 sw/source/core/undo/undraw.cxx   |1 
 sw/source/core/undo/unsect.cxx   |1 
 sw/source/filter/basflt/shellio.cxx  |1 
 sw/source/filter/html/htmlflywriter.cxx  |1 
 sw/source/filter/writer/wrtswtbl.cxx |1 
 sw/source/filter/ww8/ww8struc.hxx|1 
 sw/source/filter/xml/xmlexpit.cxx|1 
 sw/source/filter/xml/xmlfmte.cxx |1 
 sw/source/filter/xml/xmlimpit.cxx|1 
 sw/source/filter/xml/xmlithlp.cxx|1 
 sw/source/uibase/frmdlg/colmgr.cxx   |1 
 sw/source/uibase/utlui/uiitems.cxx   |1 
 39 files changed, 121 insertions(+), 56 deletions(-)

New commits:
commit f5f5a17be7bdcd0adb3928631bdeac275a5abdd9
Author: Caolán McNamara 
AuthorDate: Thu Nov 15 13:50:26 2018 +
Commit: Caolán McNamara 
CommitDate: Fri Nov 16 14:09:38 2018 +0100

entirity of writer rebuilding when vcl widget headers change

which seems a bit excessive

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

diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index b1133825b842..14135e2f30d6 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -25,7 +25,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 
 // Line defaults in twips (former Writer defaults):
 
diff --git a/include/svtools/borderline.hxx b/include/svtools/borderline.hxx
new file mode 100644
index ..d4811ffa267c
--- /dev/null
+++ b/include/svtools/borderline.hxx
@@ -0,0 +1,81 @@
+/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * This file incorporates work covered by the following license notice:
+ *
+ *   Licensed to the Apache Software Foundation (ASF) under one or more
+ *   contributor license agreements. See the NOTICE file distributed
+ *   with this work for additional information regarding copyright
+ *   ownership. The ASF licenses this file to you under the Apache
+ *   License, Version 2.0 (the "License"); you may not use this file
+ *   except in compliance with the License. You may obtain a copy of
+ *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
+ */
+
+#ifndef INCLUDED_SVTOOLS_BORDERLINE_HXX
+#define INCLUDED_SVTOOLS_BORDERLINE_HXX
+
+#include 
+#include 
+#include 
+
+/**
+Class computing border widths shared between Line style listbox and the
+SvxBorderLine implementation.
+
+This class doesn't know anything about units: it all depends on the 
different
+values set. A border is composed of 2 lines separated by a gap. The 
computed
+widths are the ones of each line and the gap and they can either be fix or 
vary.
+
+The #m_nflags member will define which widths will vary (value 0 means 
that all
+widths are fixed). The available flags are:
+ - CHANGE_LINE1
+ - CHANGE_LINE2
+ - CHANGE_DIST
+
+For each line, the rate member is used as a multiplication factor is the 
width
+isn't fixed. Otherwise it is the width in the unit

[Libreoffice-commits] core.git: include/editeng include/svl include/svx offapi/com oox/source sc/source svx/source sw/inc sw/source xmloff/source

2018-11-06 Thread Libreoffice Gerrit user 
 include/editeng/unoprnms.hxx   |1 
 include/svl/solar.hrc  |2 -
 include/svx/svdograf.hxx   |3 ++
 include/svx/unoshprp.hxx   |6 +++--
 offapi/com/sun/star/drawing/GraphicObjectShape.idl |3 ++
 oox/source/vml/vmlshape.cxx|3 ++
 sc/source/ui/inc/tabvwsh.hxx   |1 
 sc/source/ui/view/tabvwshb.cxx |   22 -
 svx/source/svdraw/svdograf.cxx |4 +++
 svx/source/unodraw/unoshap2.cxx|   17 
 sw/inc/view.hxx|1 
 sw/source/uibase/uiview/viewdlg2.cxx   |   21 
 sw/source/uibase/uiview/viewstat.cxx   |2 -
 xmloff/source/draw/SignatureLineContext.cxx|3 ++
 14 files changed, 84 insertions(+), 5 deletions(-)

New commits:
commit 7b6f477799d55d80775b6120ba0b5ce1bb45fb3c
Author: Samuel Mehrbrodt 
AuthorDate: Tue Nov 6 10:16:25 2018 +0100
Commit: Samuel Mehrbrodt 
CommitDate: Tue Nov 6 15:00:58 2018 +0100

tdf#118582 Disable signature line signing once it is signed

Change-Id: I720d7d4920ae9c2f5d74ad827e1e214a62fe81a9
Reviewed-on: https://gerrit.libreoffice.org/62947
Tested-by: Jenkins
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 8ac52ede237f..67ccc1975329 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -175,6 +175,7 @@
 #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_SHOW_SIGN_DATE 
"SignatureLineShowSignDate"
 #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT 
"SignatureLineCanAddComment"
 #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE 
"SignatureLineUnsignedImage"
+#define UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED "SignatureLineIsSigned"
 
 #define UNO_NAME_OLE2_METAFILE  "MetaFile"
 #define UNO_NAME_OLE2_PERSISTNAME   "PersistName"
diff --git a/include/svl/solar.hrc b/include/svl/solar.hrc
index 1945323042b5..b783e898964d 100644
--- a/include/svl/solar.hrc
+++ b/include/svl/solar.hrc
@@ -23,7 +23,7 @@
 // defines --
 
 #define OWN_ATTR_VALUE_START3900
-#define OWN_ATTR_VALUE_END  4002
+#define OWN_ATTR_VALUE_END  4003
 
 #define RID_LIB_START   1
 #define RID_LIB_END 1
diff --git a/include/svx/svdograf.hxx b/include/svx/svdograf.hxx
index 8cc7395a2283..c3e2ae0c1874 100644
--- a/include/svx/svdograf.hxx
+++ b/include/svx/svdograf.hxx
@@ -110,6 +110,7 @@ private:
 OUString maSignatureLineSigningInstructions;
 bool mbIsSignatureLineShowSignDate;
 bool mbIsSignatureLineCanAddComment;
+bool mbSignatureLineIsSigned;
 css::uno::Reference mpSignatureLineUnsignedGraphic;
 
 voidImpRegisterLink();
@@ -280,6 +281,8 @@ public:
 {
 mpSignatureLineUnsignedGraphic = rGraphic;
 };
+bool isSignatureLineSigned() const { return mbSignatureLineIsSigned; };
+void setSignatureLineIsSigned(bool bIsSigned) { mbSignatureLineIsSigned = 
bIsSigned; }
 };
 
 #endif // INCLUDED_SVX_SVDOGRAF_HXX
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 6341c37f3dc6..0ac66b706ebd 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -190,7 +190,8 @@
 #define OWN_ATTR_SIGNATURELINE_SHOW_SIGN_DATE   (OWN_ATTR_VALUE_START+100)
 #define OWN_ATTR_SIGNATURELINE_CAN_ADD_COMMENT  (OWN_ATTR_VALUE_START+101)
 #define OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE   (OWN_ATTR_VALUE_START+102)
-// ATTENTION: maximum is OWN_ATTR_VALUE_START+102 svx, see 
include/svl/solar.hrc
+#define OWN_ATTR_SIGNATURELINE_IS_SIGNED(OWN_ATTR_VALUE_START+103)
+// ATTENTION: maximum is OWN_ATTR_VALUE_START+103 svx, see 
include/svl/solar.hrc
 
 // #FontWork#
 #define FONTWORK_PROPERTIES \
@@ -440,7 +441,8 @@
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_SIGNING_INSTRUCTIONS), 
OWN_ATTR_SIGNATURELINE_SIGNING_INSTRUCTIONS, cppu::UnoType::get(), 0, 
0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_SHOW_SIGN_DATE), 
OWN_ATTR_SIGNATURELINE_SHOW_SIGN_DATE, cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_CAN_ADD_COMMENT), 
OWN_ATTR_SIGNATURELINE_CAN_ADD_COMMENT, cppu::UnoType::get(), 0, 0}, \
-{ OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE), 
OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE, 
cppu::UnoType::get(), 0, 0},
+{ OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_UNSIGNED_IMAGE), 
OWN_ATTR_SIGNATURELINE_UNSIGNED_IMAGE, 
cppu::UnoType::get(), 0, 0}, \
+{ OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_IS_SIGNED), 
OWN_ATTR_SIGNATURELINE_IS_SIGNED, cppu::UnoType::get(), 0, 0},
 
 #define SPECIAL_3DSCENEOBJECT_PROPERTIES_DEFAULTS \
 {

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

2018-07-27 Thread Libreoffice Gerrit user 
 include/editeng/colritem.hxx|1 +
 include/editeng/contouritem.hxx |1 +
 include/editeng/crossedoutitem.hxx  |1 +
 include/editeng/fhgtitem.hxx|1 +
 include/editeng/fontitem.hxx|1 +
 include/editeng/formatbreakitem.hxx |1 +
 include/editeng/frmdiritem.hxx  |2 ++
 include/editeng/justifyitem.hxx |2 ++
 include/editeng/keepitem.hxx|1 +
 include/editeng/langitem.hxx|1 +
 include/editeng/lrspitem.hxx|1 +
 include/editeng/opaqitem.hxx|1 +
 include/editeng/postitem.hxx|1 +
 include/editeng/protitem.hxx|1 +
 include/editeng/shaditem.hxx|1 +
 include/editeng/shdditem.hxx|2 +-
 include/editeng/sizeitem.hxx|1 +
 include/editeng/tstpitem.hxx|1 +
 include/editeng/udlnitem.hxx|1 +
 include/editeng/ulspitem.hxx|1 +
 include/editeng/wghtitem.hxx|1 +
 include/svx/algitem.hxx |2 ++
 sw/inc/fmtftntx.hxx |2 ++
 sw/inc/fmtornt.hxx  |2 ++
 sw/inc/paratr.hxx   |1 +
 sw/source/uibase/inc/envimg.hxx |1 +
 sw/source/uibase/inc/labimg.hxx |1 +
 27 files changed, 32 insertions(+), 1 deletion(-)

New commits:
commit dea2c65032eafb0398ffd10bcd3485499be17eb4
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 10:26:52 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Jul 28 00:12:53 2018 +0200

-Werror=deprecated-copy (GCC trunk towards GCC 9)

...in SfxPoolItem-derived classes that have a user-provided copy assignment 
op
(to override the explicitly deleted one of SfxPoolItem, cf.
727878a7d8ae25342db75173cc314fa330ccc077 "Remove unused copy assignment ops 
of
SfxPoolItem-derived classes"), so GCC 9 would warn about the 
implicitly-defined
copy ctor.  Mark all those with "SfxPoolItem copy function dichotomy" 
comments
so they can be found again should the odd design of SfxPoolItem ever be 
changed.

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

diff --git a/include/editeng/colritem.hxx b/include/editeng/colritem.hxx
index d58ee5866817..49415c9a7b82 100644
--- a/include/editeng/colritem.hxx
+++ b/include/editeng/colritem.hxx
@@ -61,6 +61,7 @@ public:
 SetValue(rColor.GetValue());
 return *this;
 }
+SvxColorItem(SvxColorItem const &) = default; // SfxPoolItem copy function 
dichotomy
 
 const Color& GetValue() const
 {
diff --git a/include/editeng/contouritem.hxx b/include/editeng/contouritem.hxx
index 34602f575ede..d0514da0d174 100644
--- a/include/editeng/contouritem.hxx
+++ b/include/editeng/contouritem.hxx
@@ -51,6 +51,7 @@ public:
 SetValue(rCont.GetValue());
 return *this;
 }
+SvxContourItem(SvxContourItem const &) = default; // SfxPoolItem copy 
function dichotomy
 };
 
 #endif
diff --git a/include/editeng/crossedoutitem.hxx 
b/include/editeng/crossedoutitem.hxx
index 536d1fd44f03..834f4840fb15 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -64,6 +64,7 @@ public:
 SetValue( rCross.GetValue() );
 return *this;
 }
+SvxCrossedOutItem(SvxCrossedOutItem const &) = default; // SfxPoolItem 
copy function dichotomy
 
 // enum cast
 FontStrikeout   GetStrikeout() const
diff --git a/include/editeng/fhgtitem.hxx b/include/editeng/fhgtitem.hxx
index 799c17cc6da3..de6079c221f8 100644
--- a/include/editeng/fhgtitem.hxx
+++ b/include/editeng/fhgtitem.hxx
@@ -72,6 +72,7 @@ public:
 ePropUnit = rSize.ePropUnit;
 return *this;
 }
+SvxFontHeightItem(SvxFontHeightItem const &) = default; // SfxPoolItem 
copy function dichotomy
 
 void SetHeight( sal_uInt32 nNewHeight, const sal_uInt16 nNewProp = 100,
  MapUnit eUnit = MapUnit::MapRelative );
diff --git a/include/editeng/fontitem.hxx b/include/editeng/fontitem.hxx
index ddb974acbea5..224ebf682002 100644
--- a/include/editeng/fontitem.hxx
+++ b/include/editeng/fontitem.hxx
@@ -107,6 +107,7 @@ public:
 }
 
 SvxFontItem& operator=(const SvxFontItem& rFont);
+SvxFontItem(SvxFontItem const &) = default; // SfxPoolItem copy function 
dichotomy
 
 void dumpAsXml(struct _xmlTextWriter* pWriter) const override;
 };
diff --git a/include/editeng/formatbreakitem.hxx 
b/include/editeng/formatbreakitem.hxx
index 2a1292e4e4af..f26f516d72b9 100644
--- a/include/editeng/formatbreakitem.hxx
+++ b/include/editeng/formatbreakitem.hxx
@@ -41,6 +41,7 @@ public:
 inline SvxFormatBreakItem( const SvxBreak eBrk /*= SvxBreak::NONE*/,
 const sal_uInt16 nWhich );
 inline SvxFormatBreakItem& operator=( const SvxFormatBreakItem& rCpy );
+SvxFormatBreakItem(SvxFormatBreakItem const &) =

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

2018-07-27 Thread Libreoffice Gerrit user 
 include/editeng/numitem.hxx |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 3280281b8f766490688a6e27130418981ee31b05
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 09:50:14 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Sat Jul 28 00:12:11 2018 +0200

-Werror=deprecated-copy (GCC trunk towards GCC 9)

(the SvxNumberType ctors/dtor update static nRefCount, so the copy ctor 
cannot
be defaulted)

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

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index 520e12cfbdc5..9c434419058e 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -65,6 +65,7 @@ public:
 explicit SvxNumberType(SvxNumType nType = SVX_NUM_ARABIC);
 SvxNumberType(const SvxNumberType& rType);
 ~SvxNumberType();
+SvxNumberType & operator =(SvxNumberType const &) = default;
 
 OUStringGetNumStr( sal_Int32 nNo ) const;
 OUStringGetNumStr( sal_Int32 nNo, const css::lang::Locale& rLocale 
) const;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-27 Thread Libreoffice Gerrit user 
 include/editeng/flditem.hxx  |5 +
 include/editeng/measfld.hxx  |5 +
 include/editeng/tstpitem.hxx |8 
 include/editeng/unoedsrc.hxx |6 ++
 4 files changed, 16 insertions(+), 8 deletions(-)

New commits:
commit c21612e5e18d632fd2073e4f3c717613051133ed
Author: Stephan Bergmann 
AuthorDate: Fri Jul 27 09:43:17 2018 +0200
Commit: Stephan Bergmann 
CommitDate: Fri Jul 27 13:31:56 2018 +0200

editeng: avoid -Werror=deprecated-copy (GCC trunk towards GCC 9)

...by explicitly defaulting the copy/move functions (and, where needed in 
turn,
also a default ctor) for classes that have a user-declared dtor that does
nothing other than an implicitly-defined one would do, but needs to be user-
declared because it is virtual and potentially serves as a key function to
emit the vtable, or is non-public, etc.; and by removing explicitly user-
provided functions that do the same as their implicitly-defined 
counterparts,
but may prevent implicitly declared copy functions from being defined as 
non-
deleted in the future.  (Even if such a user-provided function was declared
non-inline in an include file, the apparently-used implicitly-defined copy
functions are already include, so why bother with non-inline functions.)

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

diff --git a/include/editeng/flditem.hxx b/include/editeng/flditem.hxx
index 9ed775c01c1c..47dbe869be9b 100644
--- a/include/editeng/flditem.hxx
+++ b/include/editeng/flditem.hxx
@@ -52,6 +52,11 @@ public:
 SvxFieldData();
 virtual ~SvxFieldData();
 
+SvxFieldData(SvxFieldData const &) = default;
+SvxFieldData(SvxFieldData &&) = default;
+SvxFieldData & operator =(SvxFieldData const &) = default;
+SvxFieldData & operator =(SvxFieldData &&) = default;
+
 virtual std::unique_ptr Clone() const;
 virtual booloperator==( const SvxFieldData& ) const;
 
diff --git a/include/editeng/measfld.hxx b/include/editeng/measfld.hxx
index 2422ed9a8462..a860dc2d91f0 100644
--- a/include/editeng/measfld.hxx
+++ b/include/editeng/measfld.hxx
@@ -38,6 +38,11 @@ public:
 virtual std::unique_ptr Clone() const override;
 virtual bool operator==(const SvxFieldData&) const override;
 SdrMeasureFieldKind GetMeasureFieldKind() const { return 
eMeasureFieldKind; }
+
+SdrMeasureField(SdrMeasureField const &) = default;
+SdrMeasureField(SdrMeasureField &&) = default;
+SdrMeasureField & operator =(SdrMeasureField const &) = default;
+SdrMeasureField & operator =(SdrMeasureField &&) = default;
 };
 
 
diff --git a/include/editeng/tstpitem.hxx b/include/editeng/tstpitem.hxx
index 35032596883e..1e8c061ecf03 100644
--- a/include/editeng/tstpitem.hxx
+++ b/include/editeng/tstpitem.hxx
@@ -77,14 +77,6 @@ public:
 booloperator <( const SvxTabStop& rTS ) const
 { return nTabPos < rTS.nTabPos; }
 
-SvxTabStop& operator=( const SvxTabStop& rTS )
-{
-nTabPos = rTS.nTabPos;
-eAdjustment = rTS.eAdjustment;
-m_cDecimal = rTS.m_cDecimal;
-cFill = rTS.cFill;
-return *this;
-}
 void dumpAsXml(struct _xmlTextWriter* pWriter) const;
 };
 
diff --git a/include/editeng/unoedsrc.hxx b/include/editeng/unoedsrc.hxx
index c4077bccc758..3c7952bad1cc 100644
--- a/include/editeng/unoedsrc.hxx
+++ b/include/editeng/unoedsrc.hxx
@@ -56,6 +56,12 @@ typedef std::vector< SvxUnoTextRangeBase* > 
SvxUnoTextRangeBaseVec;
 class EDITENG_DLLPUBLIC SvxEditSource
 {
 public:
+SvxEditSource() = default;
+SvxEditSource(SvxEditSource const &) = default;
+SvxEditSource(SvxEditSource &&) = default;
+SvxEditSource & operator =(SvxEditSource const &) = default;
+SvxEditSource & operator =(SvxEditSource &&) = default;
+
 virtual ~SvxEditSource();
 
 /// Returns a new reference to the same object. This is a shallow copy
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-06-28 Thread Stephan Bergmann 
 include/editeng/pmdlitem.hxx |7 ---
 1 file changed, 7 deletions(-)

New commits:
commit 3017995579af5c8a74f8d04bc92dc24eac1ded9f
Author: Stephan Bergmann 
Date:   Thu Jun 28 13:57:49 2018 +0200

Curious inconsistency of SvxPageModelItem copy functions

...where the implicitly-defined copy ctor will copy the bAuto member while 
the
user-provided copy assignment op does not.  The code is like that ever 
since at
least c779feb1dfa340d61902dcd9d0b754046ffd8e5b "INTEGRATION: CWS
hedaburemove01".

The bAuto member is only used in Put/QueryValue with MID_AUTO, but MID_AUTO
appears to be effectively unused?  So lets assume that the user-provided 
copy
assignment op is like that due to a (presumably harmless?) accident, and 
make it
implicit, too.  (Avoids -Wdeprecated-copy with GCC trunk towards GCC 9.)

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

diff --git a/include/editeng/pmdlitem.hxx b/include/editeng/pmdlitem.hxx
index a1c895fe98cb..f6343e8342e5 100644
--- a/include/editeng/pmdlitem.hxx
+++ b/include/editeng/pmdlitem.hxx
@@ -40,7 +40,6 @@ public:
 explicit inline SvxPageModelItem( sal_uInt16 nWh  );
 inline SvxPageModelItem( const OUString& rModel, bool bA /*= false*/,
  sal_uInt16 nWh  );
-inline SvxPageModelItem& operator=( const SvxPageModelItem& rModel );
 
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
 
@@ -66,12 +65,6 @@ inline SvxPageModelItem::SvxPageModelItem( const OUString& 
rModel, bool bA,
 bAuto( bA )
 {}
 
-inline SvxPageModelItem& SvxPageModelItem::operator=( const SvxPageModelItem& 
rModel )
-{
-SetValue( rModel.GetValue() );
-return *this;
-}
-
 #endif
 
 /* 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: include/editeng include/svx offapi/com offapi/type_reference svx/source sw/inc sw/source

2018-05-03 Thread Tomaž Vajngerl 
 include/editeng/unoprnms.hxx   |1 
 include/svx/unoshprp.hxx   |3 +
 offapi/com/sun/star/drawing/GraphicObjectShape.idl |   21 ---
 offapi/com/sun/star/style/NumberingLevel.idl   |   17 +++--
 offapi/com/sun/star/text/TextGraphicObject.idl |   15 ++--
 offapi/type_reference/offapi.idl   |5 +-
 svx/source/unodraw/unoshap2.cxx|   22 
 sw/inc/cmdid.h |2 -
 sw/source/core/unocore/unoframe.cxx|   37 -
 sw/source/core/unocore/unomap1.cxx |1 
 10 files changed, 99 insertions(+), 25 deletions(-)

New commits:
commit 2bf4d69e0bfa98d641939e62945a7f8915441297
Author: Tomaž Vajngerl 
Date:   Thu Apr 26 19:28:35 2018 +0900

[API CHANGE] revert and deprecate GraphicURL, modify Graphic prop.

Revert the state of GraphicURL property so it supports setting a
external URL, but getting throws and exception.

Modify the Graphic property, so it reflects what was used with
GraphicURL before.

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

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index d90be0f6b45d..8ac52ede237f 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -165,6 +165,7 @@
 #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL"
 #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX  "vnd.sun.star.Package:"
 #define UNO_NAME_GRAPHOBJ_GRAPHIC   "Graphic"
+#define UNO_NAME_GRAPHOBJ_GRAPHIC_URL   "GraphicURL"
 #define UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE  "IsSignatureLine"
 #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID  "SignatureLineId"
 #define UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME 
"SignatureLineSuggestedSignerName"
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 1794f1d9d96d..6341c37f3dc6 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -98,7 +98,7 @@
 #define OWN_ATTR_LDNAME (OWN_ATTR_VALUE_START+30)
 #define OWN_ATTR_LDBITMAP   (OWN_ATTR_VALUE_START+31)
 #define OWN_ATTR_OLESIZE(OWN_ATTR_VALUE_START+32)
-//#define free  (OWN_ATTR_VALUE_START+33)
+#define OWN_ATTR_GRAPHIC_URL(OWN_ATTR_VALUE_START+33)
 #define OWN_ATTR_OLEMODEL   (OWN_ATTR_VALUE_START+34)
 #define OWN_ATTR_MIRRORED   (OWN_ATTR_VALUE_START+35)
 #define OWN_ATTR_CLSID  (OWN_ATTR_VALUE_START+36)
@@ -431,6 +431,7 @@
 { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL),OWN_ATTR_GRAFSTREAMURL 
 , ::cppu::UnoType::get(), 
css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP),   
OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType::get()  ,0,  
   0},\
 { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC),  OWN_ATTR_VALUE_GRAPHIC 
 , cppu::UnoType::get()  ,   0, 0}, \
+{ OUString(UNO_NAME_GRAPHOBJ_GRAPHIC_URL),  OWN_ATTR_GRAPHIC_URL   
 , cppu::UnoType::get(), 0, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE), 
OWN_ATTR_IS_SIGNATURELINE   , cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_ID), 
OWN_ATTR_SIGNATURELINE_ID   , cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_SIGNATURELINE_SUGGESTED_SIGNER_NAME), 
OWN_ATTR_SIGNATURELINE_SUGGESTED_SIGNER_NAME, cppu::UnoType::get(), 
0, 0}, \
diff --git a/offapi/com/sun/star/drawing/GraphicObjectShape.idl 
b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
index 522d0019bd48..7ca7706b3f2c 100644
--- a/offapi/com/sun/star/drawing/GraphicObjectShape.idl
+++ b/offapi/com/sun/star/drawing/GraphicObjectShape.idl
@@ -50,15 +50,28 @@ published service GraphicObjectShape
 service com::sun::star::drawing::RotationDescriptor;
 
 /** This is an url to the source bitmap for this graphic shape.
+
+@deprecated as of LibreOffice 6.1 - use Graphic instead
+
+Note the new behaviour since it was deprecated:
+This property can only be set and only external URLs are
+supported (no more vnd.sun.star.GraphicObject scheme). When a
+URL is set, then it will load the image and set the Graphic
+property.
 */
 [property] string GraphicURL;
 
+/** This is the graphic that represents this graphic shape
+*/
+[property] com::sun::star::graphic::XGraphic Graphic;
+
 /** This is an url to the stream ("in document" or linked graphic) for 
this graphic shape.
 */
 [property] string GraphicStreamURL;
 
-/** Deprecated. Use graphic property

[Libreoffice-commits] core.git: include/editeng include/svx offapi/com svx/source sw/inc sw/source

2018-04-27 Thread Tomaž Vajngerl 
 include/editeng/unoprnms.hxx   |1 
 include/svx/unoshprp.hxx   |1 
 offapi/com/sun/star/drawing/FillProperties.idl |8 +
 svx/source/xoutdev/xattrbmp.cxx|   37 -
 sw/inc/unoprnms.hxx|1 
 sw/source/core/unocore/unomapproperties.hxx|1 
 6 files changed, 43 insertions(+), 6 deletions(-)

New commits:
commit dfdc165a48d711b867961d1f75ee36a1c9596dc0
Author: Tomaž Vajngerl 
Date:   Wed Apr 25 19:36:21 2018 +0900

restore and deprecate FillBitmapURL

FillBitmapURL was restored so when setting the property, it loads
the Bitmap from the provided URL and creates a XBitmap. Get is
not supported anymore however.

Change-Id: Ie250d9f751ba33fc45b759dd3a773b4ec5c864d3
Reviewed-on: https://gerrit.libreoffice.org/53443
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 5e56fdd5d2d1..d90be0f6b45d 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -35,6 +35,7 @@
 #define UNO_NAME_FILLHATCH  "FillHatch"
 #define UNO_NAME_FILLHATCHNAME  "FillHatchName"
 #define UNO_NAME_FILLBITMAP "FillBitmap"
+#define UNO_NAME_FILLBITMAPURL  "FillBitmapURL"
 #define UNO_NAME_FILLBITMAPNAME "FillBitmapName"
 #define UNO_NAME_FILLGRADIENTSTEPCOUNT  "FillGradientStepCount"
 #define UNO_NAME_FILLBACKGROUND "FillBackground"
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 56050252fd58..1794f1d9d96d 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -258,6 +258,7 @@
 FILL_PROPERTIES_DEFAULTS \
 { OUString(UNO_NAME_FILLBACKGROUND),XATTR_FILLBACKGROUND, 
cppu::UnoType::get(),  0,   0}, \
 { OUString(UNO_NAME_FILLBITMAP),XATTR_FILLBITMAP, 
cppu::UnoType::get()  ,   0, MID_BITMAP}, \
+{ OUString(UNO_NAME_FILLBITMAPURL), XATTR_FILLBITMAP, 
cppu::UnoType::get(),  0, MID_BITMAP }, \
 { OUString(UNO_NAME_FILLBITMAPNAME),   XATTR_FILLBITMAP, 
::cppu::UnoType::get(), 0, MID_NAME }, \
 { OUString(UNO_NAME_FILLGRADIENTSTEPCOUNT),XATTR_GRADIENTSTEPCOUNT , 
::cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_FILLGRADIENT),  XATTR_FILLGRADIENT  , 
::cppu::UnoType::get(),0, MID_FILLGRADIENT}, \
diff --git a/offapi/com/sun/star/drawing/FillProperties.idl 
b/offapi/com/sun/star/drawing/FillProperties.idl
index 8897a826a07a..a1fdbf41189f 100644
--- a/offapi/com/sun/star/drawing/FillProperties.idl
+++ b/offapi/com/sun/star/drawing/FillProperties.idl
@@ -104,6 +104,14 @@ published service FillProperties
 
 /** If the property #FillStyle is set to
 FillStyle::BITMAP, this is a URL to the bitmap used.
+
+@deprecated as of LibreOffice 6.1, use FillBitmap
+
+Note the new behaviour since it this was deprecated:
+This property can only be set and only external URLs are
+supported (no more vnd.sun.star.GraphicObject scheme). When a
+URL is set, then it will load the bitmap and set the FillBitmap
+property.
 */
 [optional, property] string FillBitmapURL;
 
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index bad890bdc1a5..c4328daef724 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -38,6 +38,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include 
@@ -262,8 +263,8 @@ bool XFillBitmapItem::QueryValue(css::uno::Any& rVal, 
sal_uInt8 nMemberId) const
 aInternalName = GetName();
 }
 
-if( nMemberId == MID_BITMAP ||
-nMemberId == 0  )
+if (nMemberId == MID_BITMAP ||
+nMemberId == 0)
 {
 xBmp.set(GetGraphicObject().GetGraphic().GetXGraphic(), 
uno::UNO_QUERY);
 }
@@ -294,9 +295,11 @@ bool XFillBitmapItem::PutValue( const css::uno::Any& rVal, 
sal_uInt8 nMemberId )
 nMemberId &= ~CONVERT_TWIPS;
 
 OUString aName;
+OUString aURL;
 css::uno::Reference< css::awt::XBitmap > xBmp;
 css::uno::Reference< css::graphic::XGraphic > xGraphic;
 
+bool bSetURL= false;
 bool bSetName   = false;
 bool bSetBitmap = false;
 
@@ -304,9 +307,21 @@ bool XFillBitmapItem::PutValue( const css::uno::Any& rVal, 
sal_uInt8 nMemberId )
 bSetName = (rVal >>= aName);
 else if( nMemberId == MID_BITMAP )
 {
-bSetBitmap = (rVal >>= xBmp);
-if ( !bSetBitmap )
-bSetBitmap = (rVal >>= xGraphic );
+if (rVal.has())
+{
+bSetURL = true;
+aURL = rVal.get();
+}
+else if (rVal.has())
+{
+bSetBitmap = true;
+

[Libreoffice-commits] core.git: include/editeng include/svl include/svtools include/svx svl/source svx/inc

2018-03-29 Thread Noel Grandin 
 include/editeng/adjustitem.hxx  |2 +-
 include/editeng/charreliefitem.hxx  |2 +-
 include/editeng/cmapitem.hxx|2 +-
 include/editeng/crossedoutitem.hxx  |2 +-
 include/editeng/escapementitem.hxx  |2 +-
 include/editeng/formatbreakitem.hxx |2 +-
 include/editeng/lspcitem.hxx|2 +-
 include/editeng/postitem.hxx|2 +-
 include/editeng/shaditem.hxx|2 +-
 include/editeng/udlnitem.hxx|2 +-
 include/editeng/wghtitem.hxx|2 +-
 include/svl/aeitem.hxx  |4 ++--
 include/svl/cenumitm.hxx|4 
 include/svtools/treelist.hxx|4 
 include/svtools/treelistbox.hxx |3 +--
 include/svx/sdgmoitm.hxx|2 +-
 include/svx/sdtaditm.hxx|2 +-
 include/svx/sdtaitm.hxx |4 ++--
 include/svx/sdtakitm.hxx|2 +-
 include/svx/sdtfsitm.hxx|2 +-
 include/svx/sxcecitm.hxx|2 +-
 include/svx/sxctitm.hxx |2 +-
 include/svx/sxekitm.hxx |2 +-
 include/svx/sxmtpitm.hxx|4 ++--
 include/svx/sxmuitm.hxx |2 +-
 svl/source/items/cenumitm.cxx   |   12 
 svx/inc/sxcikitm.hxx|2 +-
 svx/inc/sxmkitm.hxx |2 +-
 28 files changed, 28 insertions(+), 49 deletions(-)

New commits:
commit 63c6668f06ca5921432020b5a527e43c251e5154
Author: Noel Grandin 
Date:   Wed Mar 28 15:35:52 2018 +0200

loplugin:virtualdown in svl,svtools

I expect a lot of the overriding methods will be removed as soon as I
run the unusedmethods plugin

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

diff --git a/include/editeng/adjustitem.hxx b/include/editeng/adjustitem.hxx
index 7ef144c78d8a..a335ab5e0c76 100644
--- a/include/editeng/adjustitem.hxx
+++ b/include/editeng/adjustitem.hxx
@@ -63,7 +63,7 @@ public:
   MapUnit ePresMetric,
   OUString , const IntlWrapper& ) const 
override;
 virtual sal_uInt16   GetValueCount() const override;
-virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const 
override;
+virtual OUString GetValueTextByPos( sal_uInt16 nPos ) const;
 virtual sal_uInt16   GetEnumValue() const override;
 virtual void SetEnumValue( sal_uInt16 nNewVal ) override;
 virtual SfxPoolItem* Clone( SfxItemPool *pPool = nullptr ) const 
override;
diff --git a/include/editeng/charreliefitem.hxx 
b/include/editeng/charreliefitem.hxx
index cb63498f66db..8abe6c5e9455 100644
--- a/include/editeng/charreliefitem.hxx
+++ b/include/editeng/charreliefitem.hxx
@@ -42,7 +42,7 @@ public:
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
 virtual sal_uInt16  GetVersion( sal_uInt16 nFileVersion ) const 
override;
 
-virtual OUStringGetValueTextByPos( sal_uInt16 nPos ) const 
override;
+virtual OUStringGetValueTextByPos( sal_uInt16 nPos ) const;
 virtual sal_uInt16  GetValueCount() const override;
 
 virtual bool GetPresentation( SfxItemPresentation ePres,
diff --git a/include/editeng/cmapitem.hxx b/include/editeng/cmapitem.hxx
index 57863ecdde1b..13b68875ffc1 100644
--- a/include/editeng/cmapitem.hxx
+++ b/include/editeng/cmapitem.hxx
@@ -47,7 +47,7 @@ public:
 OUString , const IntlWrapper& ) 
const override;
 
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
-virtual OUStringGetValueTextByPos( sal_uInt16 nPos ) const 
override;
+virtual OUStringGetValueTextByPos( sal_uInt16 nPos ) const;
 virtual sal_uInt16  GetValueCount() const override;
 
 SvxCaseMapItem& operator=(const SvxCaseMapItem& rMap)
diff --git a/include/editeng/crossedoutitem.hxx 
b/include/editeng/crossedoutitem.hxx
index 6e460cd869ca..fa1d79ab7ef7 100644
--- a/include/editeng/crossedoutitem.hxx
+++ b/include/editeng/crossedoutitem.hxx
@@ -48,7 +48,7 @@ public:
 virtual SfxPoolItem*Clone( SfxItemPool *pPool = nullptr ) const 
override;
 virtual SfxPoolItem*Create(SvStream &, sal_uInt16) const override;
 virtual SvStream&   Store(SvStream &, sal_uInt16 nItemVersion) const 
override;
-virtual OUStringGetValueTextByPos( sal_uInt16 nPos ) const 
override;
+virtual OUStringGetValueTextByPos( sal_uInt16 nPos ) const;
 virtual sal_uInt16  GetValueCount() const override;
 virtual boolQueryValue( css::uno::Any& rVal, sal_uInt8 
nMemberId = 0 ) const override;
 virtual boolPutValue( const css::uno::Any& rVal, sal_uInt8 
nMemberId ) override;
diff --git

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

2018-03-13 Thread Tomaž Vajngerl 
 include/editeng/unoprnms.hxx |1 -
 1 file changed, 1 deletion(-)

New commits:
commit c110b916b2662be2ddf7966fc102cc75ad72b5a6
Author: Tomaž Vajngerl 
Date:   Tue Mar 13 08:38:24 2018 +0900

remove unused define

Change-Id: Ie674196c19e7c61dcec370b8958d79ca8b3aebc4
Reviewed-on: https://gerrit.libreoffice.org/51187
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 0e1175eb4bf4..5e56fdd5d2d1 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -162,7 +162,6 @@
 #define UNO_NAME_GRAPHOBJ_FILLBITMAP"GraphicObjectFillBitmap"
 #define UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC   "ReplacementGraphic"
 #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL"
-#define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
 #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX  "vnd.sun.star.Package:"
 #define UNO_NAME_GRAPHOBJ_GRAPHIC   "Graphic"
 #define UNO_NAME_GRAPHOBJ_IS_SIGNATURELINE  "IsSignatureLine"
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng sc/source svx/sdi sw/inc sw/source

2018-03-09 Thread Tomaž Vajngerl 
 include/editeng/memberids.h |1 -
 sc/source/filter/excel/xlchart.cxx  |2 +-
 svx/sdi/xoitems.sdi |1 -
 sw/inc/unoprnms.hxx |2 --
 sw/source/core/unocore/unoframe.cxx |   17 +++--
 sw/source/core/unocore/unomap1.cxx  |2 --
 sw/source/core/unocore/unostyle.cxx |6 ++
 7 files changed, 6 insertions(+), 25 deletions(-)

New commits:
commit 9900c6bd96c23921757c2db0849bf7bbb8249c89
Author: Tomaž Vajngerl 
Date:   Fri Mar 9 16:39:29 2018 +0900

completely remove MID_GRAFURL, replace with MID_BITMAP

Change-Id: I39b055760320abb2575958d525b4db3185a11d4a
Reviewed-on: https://gerrit.libreoffice.org/50990
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h
index 83860f672b2d..71de74d3a859 100644
--- a/include/editeng/memberids.h
+++ b/include/editeng/memberids.h
@@ -35,7 +35,6 @@
 
 //NameOrIndex
 #define MID_NAME16
-#define MID_GRAFURL 32
 
 // SvxPageModelItem
 #define MID_AUTO1
diff --git a/sc/source/filter/excel/xlchart.cxx 
b/sc/source/filter/excel/xlchart.cxx
index b583c2df42ff..f1f8b287b5d4 100644
--- a/sc/source/filter/excel/xlchart.cxx
+++ b/sc/source/filter/excel/xlchart.cxx
@@ -1032,7 +1032,7 @@ void XclChPropSetHelper::WriteEscherProperties( 
ScfPropertySet& rPropSet,
 if( const XFillBitmapItem* pBmpItem = 
rEscherFmt.mxItemSet->GetItem( XATTR_FILLBITMAP, false ) )
 {
 uno::Any aBitmapAny;
-if( pBmpItem->QueryValue( aBitmapAny, MID_GRAFURL ) )
+if (pBmpItem->QueryValue(aBitmapAny, MID_BITMAP))
 {
 OUString aBmpName = rBitmapTable.InsertObject( 
aBitmapAny );
 if( !aBmpName.isEmpty() )
diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi
index fdab81d817f3..015ead6e0d72 100644
--- a/svx/sdi/xoitems.sdi
+++ b/svx/sdi/xoitems.sdi
@@ -20,7 +20,6 @@
 struct XFillBitmap
 {
 String  NameMID_NAME;
-String  GraphicsURL MID_GRAFURL;
 //  com::sun::star::awt::XBitmap
 };
 item XFillBitmap XFillBitmapItem;
diff --git a/sw/inc/unoprnms.hxx b/sw/inc/unoprnms.hxx
index 45a811a0e4eb..135071cc128c 100644
--- a/sw/inc/unoprnms.hxx
+++ b/sw/inc/unoprnms.hxx
@@ -636,7 +636,6 @@
 #define UNO_NAME_HEADER_FILLBACKGROUND "HeaderFillBackground"
 #define UNO_NAME_HEADER_FILLBITMAP "HeaderFillBitmap"
 #define UNO_NAME_HEADER_FILLBITMAPNAME "HeaderFillBitmapName"
-#define UNO_NAME_HEADER_FILLBITMAPURL "HeaderFillBitmapURL"
 #define UNO_NAME_HEADER_FILLGRADIENTSTEPCOUNT "HeaderFillGradientStepCount"
 #define UNO_NAME_HEADER_FILLGRADIENT "HeaderFillGradient"
 #define UNO_NAME_HEADER_FILLGRADIENTNAME "HeaderFillGradientName"
@@ -663,7 +662,6 @@
 #define UNO_NAME_FOOTER_FILLBACKGROUND "FooterFillBackground"
 #define UNO_NAME_FOOTER_FILLBITMAP "FooterFillBitmap"
 #define UNO_NAME_FOOTER_FILLBITMAPNAME "FooterFillBitmapName"
-#define UNO_NAME_FOOTER_FILLBITMAPURL "FooterFillBitmapURL"
 #define UNO_NAME_FOOTER_FILLGRADIENTSTEPCOUNT "FooterFillGradientStepCount"
 #define UNO_NAME_FOOTER_FILLGRADIENT "FooterFillGradient"
 #define UNO_NAME_FOOTER_FILLGRADIENTNAME "FooterFillGradientName"
diff --git a/sw/source/core/unocore/unoframe.cxx 
b/sw/source/core/unocore/unoframe.cxx
index dcd9b5295fba..c5576b90add4 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -236,7 +236,6 @@ bool 
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
 // XFillBitmapItem: three possible slots supported in UNO API
 const uno::Any* pXFillBitmapItem = nullptr; GetProperty(XATTR_FILLBITMAP, 
MID_BITMAP, pXFillBitmapItem);
 const uno::Any* pXFillBitmapNameItem = nullptr; 
GetProperty(XATTR_FILLBITMAP, MID_NAME, pXFillBitmapNameItem);
-const uno::Any* pXFillBitmapURLItem = nullptr; 
GetProperty(XATTR_FILLBITMAP, MID_GRAFURL, pXFillBitmapURLItem);
 
 const uno::Any* pXFillTransparenceItem = nullptr; 
GetProperty(XATTR_FILLTRANSPARENCE, 0, pXFillTransparenceItem);
 const uno::Any* pXGradientStepCountItem = nullptr; 
GetProperty(XATTR_GRADIENTSTEPCOUNT, 0, pXGradientStepCountItem);
@@ -268,7 +267,7 @@ bool 
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
 pXFillColorItem ||
 pXFillGradientItem || pXFillGradientNameItem ||
 pXFillHatchItem || pXFillHatchNameItem ||
-pXFillBitmapItem || pXFillBitmapNameItem || pXFillBitmapURLItem ||
+pXFillBitmapItem || pXFillBitmapNameItem ||
 pXFillTransparenceItem ||
 pXGradientStepCountItem ||
 pXFillBmpPosItem ||
@@ -435,7 +434,7 @@ bool 
BaseFrameProperties_Impl::FillBaseProperties(SfxItemSet& rToSet, const SfxI
 }
 }
 
-

[Libreoffice-commits] core.git: include/editeng include/svx sc/qa sd/qa sd/source svx/source sw/qa vcl/source writerfilter/source

2018-03-08 Thread Tomaž Vajngerl 
 include/editeng/unoprnms.hxx  |1 
 include/svx/unoshprp.hxx  |3 
 sc/qa/unit/subsequent_export-test.cxx |   47 +-
 sd/qa/unit/export-tests.cxx   |   45 +
 sd/source/filter/eppt/pptx-epptooxml.cxx  |2 
 svx/source/unodraw/unoshap2.cxx   |   84 +-
 sw/qa/extras/ooxmlexport/ooxmlexport8.cxx |   14 +++-
 vcl/source/graphic/GraphicLoader.cxx  |   16 
 writerfilter/source/dmapper/GraphicImport.cxx |   38 +--
 writerfilter/source/dmapper/GraphicImport.hxx |4 -
 10 files changed, 84 insertions(+), 170 deletions(-)

New commits:
commit fb29e6eeeaad5255bb924ff59162a83ed80bfb0a
Author: Tomaž Vajngerl 
Date:   Thu Mar 8 17:54:37 2018 +0900

svx: removing GraphicURL and OWN_ATTR_GRAFURL, fix writerfilter

Change-Id: I5b84788a324cc68e3c4561e9a7376fcb1cfeeb67
Reviewed-on: https://gerrit.libreoffice.org/50933
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 42292c38b2dd..0e1175eb4bf4 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -160,7 +160,6 @@
 #define UNO_NAME_MISC_OBJ_DESCRIPTION   "Description"
 
 #define UNO_NAME_GRAPHOBJ_FILLBITMAP"GraphicObjectFillBitmap"
-#define UNO_NAME_GRAPHOBJ_GRAFURL   "GraphicURL"
 #define UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC   "ReplacementGraphic"
 #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL"
 #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 73217bffb40c..56050252fd58 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -98,7 +98,7 @@
 #define OWN_ATTR_LDNAME (OWN_ATTR_VALUE_START+30)
 #define OWN_ATTR_LDBITMAP   (OWN_ATTR_VALUE_START+31)
 #define OWN_ATTR_OLESIZE(OWN_ATTR_VALUE_START+32)
-#define OWN_ATTR_GRAFURL(OWN_ATTR_VALUE_START+33)
+//#define free  (OWN_ATTR_VALUE_START+33)
 #define OWN_ATTR_OLEMODEL   (OWN_ATTR_VALUE_START+34)
 #define OWN_ATTR_MIRRORED   (OWN_ATTR_VALUE_START+35)
 #define OWN_ATTR_CLSID  (OWN_ATTR_VALUE_START+36)
@@ -426,7 +426,6 @@
 #define SPECIAL_GRAPHOBJ_PROPERTIES \
 SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
 { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP),   SDRATTR_GRAFCROP   
 , ::cppu::UnoType::get(),0,  0 }, \
-{ OUString(UNO_NAME_GRAPHOBJ_GRAFURL),  OWN_ATTR_GRAFURL   
 , ::cppu::UnoType::get(), 0, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC),  
OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType::get()  ,   
0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL),OWN_ATTR_GRAFSTREAMURL 
 , ::cppu::UnoType::get(), 
css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP),   
OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType::get()  ,0,  
   0},\
diff --git a/sc/qa/unit/subsequent_export-test.cxx 
b/sc/qa/unit/subsequent_export-test.cxx
index ff4063f8ed84..fe073203818b 100644
--- a/sc/qa/unit/subsequent_export-test.cxx
+++ b/sc/qa/unit/subsequent_export-test.cxx
@@ -74,6 +74,7 @@
 #include 
 #include 
 #include 
+#include 
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -3151,16 +3152,13 @@ void ScExportTest::testSwappedOutImageExport()
 
 uno::Reference xImage(xDraws->getByIndex(0), 
uno::UNO_QUERY);
 uno::Reference< beans::XPropertySet > XPropSet( xImage, 
uno::UNO_QUERY_THROW );
-// Check URL
-{
-OUString sURL;
-XPropSet->getPropertyValue("GraphicURL") >>= sURL;
-CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), sURL != 
"vnd.sun.star.GraphicObject:");
-}
-// Check size
+
+// Check Graphic, Size
 {
 uno::Reference xGraphic;
 XPropSet->getPropertyValue("Graphic") >>= xGraphic;
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xGraphic.is());
+CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), 
xGraphic->getType() != graphic::GraphicType::EMPTY);
 uno::Reference xBitmap(xGraphic, uno::UNO_QUERY);
 CPPUNIT_ASSERT_MESSAGE(sFailedMessage.getStr(), xBitmap.is());
 CPPUNIT_ASSERT_EQUAL_MESSAGE(sFailedMessage.getStr(), 
static_cast(610), xBitmap->getSize().Width );
@@ -3169,16 +3167,13 @@ void ScExportTest::testSwappedOutImageExport()
 // Second Image
 xImage.set(xDraws->getByIndex(1), uno::UNO_QUERY);
 XPropSet.set( xImage, uno::UNO_QUERY_THROW );
-

[Libreoffice-commits] core.git: include/editeng include/oox include/xmloff oox/source sc/qa sw/qa sw/source writerfilter/source xmloff/inc xmloff/source

2018-03-06 Thread Tomaž Vajngerl 
 include/editeng/memberids.h   |   19 ++---
 include/oox/helper/modelobjecthelper.hxx  |4 -
 include/xmloff/xmltypes.hxx   |1 
 oox/source/drawingml/fillproperties.cxx   |7 --
 oox/source/drawingml/shape.cxx|   14 ++--
 oox/source/drawingml/shapepropertymap.cxx |   17 ++--
 oox/source/export/drawingml.cxx   |   17 
 oox/source/helper/modelobjecthelper.cxx   |9 ++
 oox/source/token/properties.txt   |2 
 sc/qa/unit/subsequent_export-test.cxx |9 +-
 sw/qa/extras/ooxmlexport/ooxmlexport2.cxx |   13 ++-
 sw/qa/extras/rtfexport/rtfexport.cxx  |   13 ++-
 sw/source/core/unocore/unosett.cxx|   48 +++---
 sw/source/core/unocore/unotbl.cxx |1 
 sw/source/filter/ww8/docxattributeoutput.cxx  |2 
 sw/source/filter/xml/xmlbrsh.cxx  |   75 ++
 sw/source/filter/xml/xmlbrshi.hxx |7 +-
 sw/source/filter/xml/xmlexpit.cxx |   12 ---
 sw/source/filter/xml/xmlimpit.cxx |   11 ---
 writerfilter/source/dmapper/NumberingManager.cxx  |   25 ---
 writerfilter/source/dmapper/NumberingManager.hxx  |2 
 writerfilter/source/dmapper/PropertyIds.cxx   |1 
 writerfilter/source/dmapper/PropertyIds.hxx   |1 
 xmloff/inc/XMLBackgroundImageContext.hxx  |4 -
 xmloff/source/style/PageMasterStyleMap.cxx|6 -
 xmloff/source/style/XMLBackgroundImageContext.cxx |   29 
 xmloff/source/style/XMLBackgroundImageExport.cxx  |   30 
 xmloff/source/style/prstylei.cxx  |8 +-
 xmloff/source/style/xmlnume.cxx   |   30 +++-
 xmloff/source/text/txtprhdl.cxx   |   38 ++-
 xmloff/source/text/txtprmap.cxx   |6 -
 31 files changed, 257 insertions(+), 204 deletions(-)

New commits:
commit d72145f9307c732ced4a546ac1e5093ec7c1a982
Author: Tomaž Vajngerl 
Date:   Thu Mar 1 08:39:11 2018 +0900

Move BackGraphicURL property & friends to BackGraphic + fixes

This moves BackGraphicURL, HeaderGraphicURL, FooterGraphicURL and
ParaBackGraphicURL properties to BackGraphic, HeaderBackGraphic,
FooterBackGraphic and ParaBackGraphic. With this the property type
changes from String to XGraphic.

This change also fixes a bunch of test failures, changes the tests
to use the new properties and the correct type, changes the import
and export filters like xmloff and oox, to make the tests happy.

Change-Id: Ie66097514203c6dc36ab27420faf265322e9279e
Reviewed-on: https://gerrit.libreoffice.org/50760
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/memberids.h b/include/editeng/memberids.h
index d7d0a538ee4d..2f13be47a0f2 100644
--- a/include/editeng/memberids.h
+++ b/include/editeng/memberids.h
@@ -157,16 +157,15 @@
 //BrushItem
 #define MID_BACK_COLOR  0
 #define MID_GRAPHIC_POSITION1
-#define MID_GRAPHIC_LINK2
-#define MID_GRAPHIC 3
-#define MID_GRAPHIC_TRANSPARENT 4
-#define MID_GRAPHIC_URL 5
-#define MID_GRAPHIC_FILTER  6
-#define MID_GRAPHIC_REPEAT  7
-#define MID_GRAPHIC_TRANSPARENCY 8
-#define MID_BACK_COLOR_R_G_B9
-#define MID_BACK_COLOR_TRANSPARENCY 10
-#define MID_SHADING_VALUE   11
+#define MID_GRAPHIC 2
+#define MID_GRAPHIC_TRANSPARENT 3
+#define MID_GRAPHIC_URL 4
+#define MID_GRAPHIC_FILTER  5
+#define MID_GRAPHIC_REPEAT  6
+#define MID_GRAPHIC_TRANSPARENCY 7
+#define MID_BACK_COLOR_R_G_B8
+#define MID_BACK_COLOR_TRANSPARENCY 9
+#define MID_SHADING_VALUE   10
 
 //SvxFormatBreakItem
 #define MID_BREAK_BEFORE0
diff --git a/include/oox/helper/modelobjecthelper.hxx 
b/include/oox/helper/modelobjecthelper.hxx
index 67980b57f6c8..694bdf13ddb7 100644
--- a/include/oox/helper/modelobjecthelper.hxx
+++ b/include/oox/helper/modelobjecthelper.hxx
@@ -27,7 +27,8 @@
 #include 
 
 namespace com { namespace sun { namespace star {
-namespace awt { struct Gradient; }
+namespace awt { struct Gradient;
+class XBitmap; }
 namespace graphic { class XGraphic; }
 namespace container { class XNameContainer; }
 namespace drawing { struct LineDash; }
@@ -113,6 +114,7 @@ public:
 OUString 
insertFillBitmapXGraphic(css::uno::Reference const & 
rxGraphic);
 
 OUString getFillBitmapUrl( const OUString& rGraphicName );
+css::uno::Reference getFillBitmap(OUString const & 
rGraphicName);
 
 private:
 ObjectContainer maMarkerContainer;  ///< Contains all named line 
markers (line end polygons).
diff --git a/include/xmloff/xmltypes.hxx b/include/xmloff/xmltypes.hxx
index 8b7fc23981c7..dc2e6558321e 100644
---

[Libreoffice-commits] core.git: include/editeng include/svx svx/source sw/inc sw/qa sw/source

2018-02-25 Thread Tomaž Vajngerl 
 include/editeng/unoprnms.hxx|1 
 include/svx/unoshprp.hxx|1 
 svx/source/xoutdev/xattrbmp.cxx |   34 
 sw/inc/unoprnms.hxx |1 
 sw/qa/extras/ooxmlexport/ooxmlexport4.cxx   |3 +-
 sw/source/core/unocore/unomapproperties.hxx |1 
 6 files changed, 7 insertions(+), 34 deletions(-)

New commits:
commit c8b1432e8fd2c6a7d3d0039816884f33dafb97cb
Author: Tomaž Vajngerl 
Date:   Thu Feb 22 07:10:02 2018 +0900

remove "FillBitmapURL" property

Change-Id: Icac13a412ae16e4b367362ca85a37fa29802c68b
Reviewed-on: https://gerrit.libreoffice.org/50169
Tested-by: Jenkins 
Reviewed-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 6c98921dddaf..42292c38b2dd 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -36,7 +36,6 @@
 #define UNO_NAME_FILLHATCHNAME  "FillHatchName"
 #define UNO_NAME_FILLBITMAP "FillBitmap"
 #define UNO_NAME_FILLBITMAPNAME "FillBitmapName"
-#define UNO_NAME_FILLBITMAPURL  "FillBitmapURL"
 #define UNO_NAME_FILLGRADIENTSTEPCOUNT  "FillGradientStepCount"
 #define UNO_NAME_FILLBACKGROUND "FillBackground"
 #define UNO_NAME_FILLCOLOR_2"FillColor2"
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index 9fea5f41ab73..73217bffb40c 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -259,7 +259,6 @@
 { OUString(UNO_NAME_FILLBACKGROUND),XATTR_FILLBACKGROUND, 
cppu::UnoType::get(),  0,   0}, \
 { OUString(UNO_NAME_FILLBITMAP),XATTR_FILLBITMAP, 
cppu::UnoType::get()  ,   0, MID_BITMAP}, \
 { OUString(UNO_NAME_FILLBITMAPNAME),   XATTR_FILLBITMAP, 
::cppu::UnoType::get(), 0, MID_NAME }, \
-{ OUString(UNO_NAME_FILLBITMAPURL),XATTR_FILLBITMAP, 
::cppu::UnoType::get(), 0, MID_GRAFURL }, \
 { OUString(UNO_NAME_FILLGRADIENTSTEPCOUNT),XATTR_GRADIENTSTEPCOUNT , 
::cppu::UnoType::get(), 0, 0}, \
 { OUString(UNO_NAME_FILLGRADIENT),  XATTR_FILLGRADIENT  , 
::cppu::UnoType::get(),0, MID_FILLGRADIENT}, \
 { OUString(UNO_NAME_FILLGRADIENTNAME), XATTR_FILLGRADIENT  , 
::cppu::UnoType::get(), 0, MID_NAME }, \
diff --git a/svx/source/xoutdev/xattrbmp.cxx b/svx/source/xoutdev/xattrbmp.cxx
index 8e28d1ab2646..fa318829e613 100644
--- a/svx/source/xoutdev/xattrbmp.cxx
+++ b/svx/source/xoutdev/xattrbmp.cxx
@@ -252,7 +252,6 @@ bool XFillBitmapItem::QueryValue(css::uno::Any& rVal, 
sal_uInt8 nMemberId) const
 // needed for complete item (MID 0)
 OUString aInternalName;
 
-OUString aURL;
 css::uno::Reference< css::awt::XBitmap > xBmp;
 
 if( nMemberId == MID_NAME )
@@ -264,23 +263,14 @@ bool XFillBitmapItem::QueryValue(css::uno::Any& rVal, 
sal_uInt8 nMemberId) const
 aInternalName = GetName();
 }
 
-if (nMemberId == MID_GRAFURL)
-{
-aURL = UNO_NAME_GRAPHOBJ_URLPREFIX;
-aURL += OStringToOUString(
-GetGraphicObject().GetUniqueID(),
-RTL_TEXTENCODING_ASCII_US);
-}
 if( nMemberId == MID_BITMAP ||
 nMemberId == 0  )
 {
-
xBmp.set(VCLUnoHelper::CreateBitmap(GetGraphicObject().GetGraphic().GetBitmapEx()));
+xBmp.set(GetGraphicObject().GetGraphic().GetXGraphic(), 
uno::UNO_QUERY);
 }
 
 if( nMemberId == MID_NAME )
 rVal <<= aApiName;
-else if( nMemberId == MID_GRAFURL )
-rVal <<= aURL;
 else if( nMemberId == MID_BITMAP )
 rVal <<= xBmp;
 else
@@ -305,12 +295,10 @@ bool XFillBitmapItem::PutValue( const css::uno::Any& 
rVal, sal_uInt8 nMemberId )
 nMemberId &= ~CONVERT_TWIPS;
 
 OUString aName;
-OUString aURL;
 css::uno::Reference< css::awt::XBitmap > xBmp;
 css::uno::Reference< css::graphic::XGraphic > xGraphic;
 
 bool bSetName   = false;
-bool bSetURL= false;
 bool bSetBitmap = false;
 
 if( nMemberId == MID_NAME )
@@ -341,31 +329,19 @@ bool XFillBitmapItem::PutValue( const css::uno::Any& 
rVal, sal_uInt8 nMemberId )
 {
 SetName( aName );
 }
-if( bSetURL )
-{
-GraphicObject aGraphicObject  = 
GraphicObject::CreateGraphicObjectFromURL(aURL);
-if( aGraphicObject.GetType() != GraphicType::NONE )
-maGraphicObject = aGraphicObject;
-
-// #121194# Prefer GraphicObject over bitmap object if both are 
provided
-if(bSetBitmap && GraphicType::NONE != maGraphicObject.GetType())
-{
-bSetBitmap = false;
-}
-}
 if( bSetBitmap )
 {
-if(xBmp.is())
+if (xBmp.is())
 {
-maGraphicObject.SetGraphic(VCLUnoHelper::GetBitmap(xBmp));
+

[Libreoffice-commits] core.git: include/editeng include/svx sd/qa svx/source sw/inc sw/source xmloff/source

2018-02-22 Thread Tomaž Vajngerl 
 include/editeng/unoprnms.hxx|2 +-
 include/svx/unoshprp.hxx|4 ++--
 sd/qa/unit/export-tests.cxx |6 +++---
 svx/source/unodraw/unoshap2.cxx |8 +++-
 sw/inc/unoprnms.hxx |1 +
 sw/source/core/unocore/unoframe.cxx |   21 +
 sw/source/core/unocore/unomap1.cxx  |1 +
 xmloff/source/draw/shapeexport.cxx  |   27 +--
 xmloff/source/text/txtparae.cxx |   23 +++
 9 files changed, 56 insertions(+), 37 deletions(-)

New commits:
commit 1cf55d6397418dd3cd86eae59c2f75085dbb0d51
Author: Tomaž Vajngerl 
Date:   Mon Feb 19 21:52:33 2018 +0900

Replace "ReplacementGraphicURL" with "ReplacementGraphic" property

To transport the replacement graphic we use "ReplacementGraphicURL"
property, but as it uses an GraphicObject URL it needs to be
replaced. The new "ReplacementGraphic" does this with an XGraphic
object as instead of the String URL.

Change-Id: Iddf01c9aecb2a31a467e7b9d399495e0428d1859
Reviewed-on: https://gerrit.libreoffice.org/49993
Reviewed-by: Tomaž Vajngerl 
Tested-by: Tomaž Vajngerl 

diff --git a/include/editeng/unoprnms.hxx b/include/editeng/unoprnms.hxx
index 44b4ce8843c9..6c98921dddaf 100644
--- a/include/editeng/unoprnms.hxx
+++ b/include/editeng/unoprnms.hxx
@@ -162,7 +162,7 @@
 
 #define UNO_NAME_GRAPHOBJ_FILLBITMAP"GraphicObjectFillBitmap"
 #define UNO_NAME_GRAPHOBJ_GRAFURL   "GraphicURL"
-#define UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL"ReplacementGraphicURL"
+#define UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC   "ReplacementGraphic"
 #define UNO_NAME_GRAPHOBJ_GRAFSTREAMURL "GraphicStreamURL"
 #define UNO_NAME_GRAPHOBJ_URLPREFIX "vnd.sun.star.GraphicObject:"
 #define UNO_NAME_GRAPHOBJ_URLPKGPREFIX  "vnd.sun.star.Package:"
diff --git a/include/svx/unoshprp.hxx b/include/svx/unoshprp.hxx
index b68e473e339e..9fea5f41ab73 100644
--- a/include/svx/unoshprp.hxx
+++ b/include/svx/unoshprp.hxx
@@ -115,7 +115,7 @@
 #define OWN_ATTR_BASE_GEOMETRY  (OWN_ATTR_VALUE_START+47)
 
 /// reuse attr slots for GraphicObject which will never be used together with 
graphic object
-#define OWN_ATTR_REPLACEMENTGRAFURL (OWN_ATTR_VALUE_START+14)
+#define OWN_ATTR_REPLACEMENT_GRAPHIC(OWN_ATTR_VALUE_START+14)
 
 #define OWN_ATTR_APPLET_DOCBASE (OWN_ATTR_VALUE_START+48)
 #define OWN_ATTR_APPLET_CODEBASE(OWN_ATTR_VALUE_START+49)
@@ -428,7 +428,7 @@
 SPECIAL_GRAPHOBJ_PROPERTIES_DEFAULTS \
 { OUString(UNO_NAME_GRAPHIC_GRAPHICCROP),   SDRATTR_GRAFCROP   
 , ::cppu::UnoType::get(),0,  0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_GRAFURL),  OWN_ATTR_GRAFURL   
 , ::cppu::UnoType::get(), 0, 0 }, \
-{ OUString(UNO_NAME_GRAPHOBJ_REPLACEMENTGRAFURL),   
OWN_ATTR_REPLACEMENTGRAFURL , ::cppu::UnoType::get(), 0, 0 }, \
+{ OUString(UNO_NAME_GRAPHOBJ_REPLACEMENT_GRAPHIC),  
OWN_ATTR_REPLACEMENT_GRAPHIC, cppu::UnoType::get()  ,   
0, 0}, \
 { OUString(UNO_NAME_GRAPHOBJ_GRAFSTREAMURL),OWN_ATTR_GRAFSTREAMURL 
 , ::cppu::UnoType::get(), 
css::beans::PropertyAttribute::MAYBEVOID, 0 }, \
 { OUString(UNO_NAME_GRAPHOBJ_FILLBITMAP),   
OWN_ATTR_VALUE_FILLBITMAP   , cppu::UnoType::get()  ,0,  
   0},\
 { OUString(UNO_NAME_GRAPHOBJ_GRAPHIC),  OWN_ATTR_VALUE_GRAPHIC 
 , cppu::UnoType::get()  ,   0, 0}, \
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 8994f0d8883c..e0c31b2b0da3 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -736,9 +736,9 @@ void SdExportTest::testEmbeddedPdf()
 xShell = saveAndReload( xShell.get(), ODP );
 uno::Reference xPage = getPage(0, xShell);
 uno::Reference xShape(xPage->getByIndex(0), 
uno::UNO_QUERY);
-OUString aReplacementGraphicURL;
-xShape->getPropertyValue("ReplacementGraphicURL") >>= 
aReplacementGraphicURL;
-CPPUNIT_ASSERT(!aReplacementGraphicURL.isEmpty());
+uno::Reference xGraphic;
+xShape->getPropertyValue("ReplacementGraphic") >>= xGraphic;
+CPPUNIT_ASSERT(xGraphic.is());
 xShell->DoClose();
 #endif
 }
diff --git a/svx/source/unodraw/unoshap2.cxx b/svx/source/unodraw/unoshap2.cxx
index b8500ac7643b..79e7c24296b6 100644
--- a/svx/source/unodraw/unoshap2.cxx
+++ b/svx/source/unodraw/unoshap2.cxx
@@ -1579,15 +1579,13 @@ bool SvxGraphicObject::getPropertyValueImpl( const 
OUString& rName, const SfxIte
 break;
 }
 
-case OWN_ATTR_REPLACEMENTGRAFURL:
+case OWN_ATTR_REPLACEMENT_GRAPHIC:
 {
 const GraphicObject* pGrafObj = static_cast< SdrGrafObj* 
>(mpObj.get())->GetReplacementGraphicObject();
 
-if(pGrafObj)
+if (pGrafObj)
 {
-OUString aURL(UNO_NAME_GRAPHOBJ_URLPREFIX);
-

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

2018-01-18 Thread Caolán McNamara 
 include/editeng/unotext.hxx |7 ++-
 1 file changed, 6 insertions(+), 1 deletion(-)

New commits:
commit a46ff530d4cf3d7d87fc58f0c9201949b8cb832d
Author: Caolán McNamara 
Date:   Thu Jan 18 12:52:30 2018 +

ofz#5471 Null-dereference READ

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

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 73e2afdf366d..4ee3bf4fc11d 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -309,7 +309,12 @@ protected:
 
 public:
 // Internal
-const ESelection&   GetSelection() const throw() { CheckSelection( 
const_cast(this)->maSelection, 
mpEditSource->GetTextForwarder() ); return maSelection; };
+const ESelection& GetSelection() const throw()
+{
+const SvxTextForwarder* pForwarder = mpEditSource ? 
mpEditSource->GetTextForwarder() : nullptr;
+CheckSelection(const_cast(this)->maSelection, 
pForwarder);
+return maSelection;
+}
 voidSetSelection( const ESelection& rSelection ) 
throw();
 
 voidCollapseToStart() throw();
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/oox oox/source qadevOOo/tests reportdesign/source sc/source slideshow/source sw/inc sw/qa sw/source

2018-01-18 Thread Andrea Gelmini 
 include/editeng/hangulhanja.hxx|2 +-
 include/oox/mathml/importutils.hxx |2 +-
 oox/source/drawingml/chart/seriesconverter.cxx |2 +-
 qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java |4 ++--
 reportdesign/source/ui/inc/GeometryHandler.hxx |2 +-
 sc/source/filter/inc/richstring.hxx|2 +-
 slideshow/source/inc/shape.hxx |2 +-
 sw/inc/numrule.hxx |2 +-
 sw/qa/extras/rtfimport/rtfimport.cxx   |2 +-
 sw/source/core/ole/ndole.cxx   |2 +-
 sw/source/core/view/viewsh.cxx |2 +-
 11 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit c0a70da29a213e11717fc1dad96f808a170dc53b
Author: Andrea Gelmini 
Date:   Wed Jan 17 20:10:53 2018 +0100

Fix typos

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

diff --git a/include/editeng/hangulhanja.hxx b/include/editeng/hangulhanja.hxx
index 0d85988e2464..2fcf02077129 100644
--- a/include/editeng/hangulhanja.hxx
+++ b/include/editeng/hangulhanja.hxx
@@ -162,7 +162,7 @@ namespace editeng
 
 This will be called whenever it is necessary to interactively 
ask the user for
 a conversion. In such a case, a range within the current portion 
(see GetNextPortion)
-is presented to the user for chosing a substitution. Additionally, 
this method is called,
+is presented to the user for choosing a substitution. 
Additionally, this method is called,
 so that derived classes can e.g. highlight this text range in a 
document view.
 
 Note that the indexes are relative to the most recent replace 
action. See
diff --git a/include/oox/mathml/importutils.hxx 
b/include/oox/mathml/importutils.hxx
index 6beacf9e8795..448262f001d0 100644
--- a/include/oox/mathml/importutils.hxx
+++ b/include/oox/mathml/importutils.hxx
@@ -191,7 +191,7 @@ public:
 Tag checkOpeningTag( int token );
 /**
  Ensures that a closing tag with the given token is read. Like 
ensureOpeningTag(),
- if not, writes out a warning and tries to recover by skiping tags until 
found (or until the current element would end).
+ if not, writes out a warning and tries to recover by skipping tags until 
found (or until the current element would end).
  If found, the position in the stream is afterwards moved to the next tag.
 */
 void ensureClosingTag( int token );
diff --git a/oox/source/drawingml/chart/seriesconverter.cxx 
b/oox/source/drawingml/chart/seriesconverter.cxx
index 6eceb213ea04..e257bdbf9141 100644
--- a/oox/source/drawingml/chart/seriesconverter.cxx
+++ b/oox/source/drawingml/chart/seriesconverter.cxx
@@ -316,7 +316,7 @@ void ErrorBarConverter::convertFromModel( const Reference< 
XDataSeries >& rxData
 {
 // #i87806# manual error bars
 aBarProp.setProperty( PROP_ErrorBarStyle, 
cssc::ErrorBarStyle::FROM_DATA );
-// attach data sequences to erorr bar
+// attach data sequences to error bar
 Reference< XDataSink > xDataSink( xErrorBar, UNO_QUERY );
 if( xDataSink.is() )
 {
diff --git a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java 
b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
index ebd7226c0415..fa875234cbda 100644
--- a/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
+++ b/qadevOOo/tests/java/ifc/view/_XMultiSelectionSupplier.java
@@ -120,7 +120,7 @@ public class _XMultiSelectionSupplier extends 
MultiMethodTest {
 
 oObj.addSelection(oObj);
 
-log.println("ERORR: expected exception 
'com.sun.star.lang.IllegalArgumentException' was not thrown => FAILED");
+log.println("ERROR: expected exception 
'com.sun.star.lang.IllegalArgumentException' was not thrown => FAILED");
 bOK = false;
 } catch (com.sun.star.lang.IllegalArgumentException ex) {
 log.println("expected exception 
'com.sun.star.lang.IllegalArgumentException' => OK");
@@ -197,7 +197,7 @@ public class _XMultiSelectionSupplier extends 
MultiMethodTest {
 
 oObj.removeSelection(oObj);
 
-log.println("ERORR: expected exception 
'com.sun.star.lang.IllegalArgumentException' was not thrown => FAILED");
+log.println("ERROR: expected exception 
'com.sun.star.lang.IllegalArgumentException' was not thrown => FAILED");
 bOK = false;
 } catch (com.sun.star.lang.IllegalArgumentException ex) {
 log.println("expected exception 
'com.sun.star.lang.IllegalArgumentException' => OK");
diff

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

2018-01-15 Thread Stephan Bergmann 
 include/editeng/lrspitem.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 8f28db9515e049fa7e0aa26fe32513e3486dcfaf
Author: Stephan Bergmann 
Date:   Mon Jan 15 20:10:21 2018 +0100

Remove unused LRSPACE_{16,AUTOFIRST}_VERSION

...unused since 1e4b1e4a1aca3b333820b0a865997e6f62e80064 "Removing unused
SfxItemPool serialisation from editeng"

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

diff --git a/include/editeng/lrspitem.hxx b/include/editeng/lrspitem.hxx
index 4a2d9bd3992d..6a1a16d61144 100644
--- a/include/editeng/lrspitem.hxx
+++ b/include/editeng/lrspitem.hxx
@@ -43,9 +43,7 @@
 700   -500   200   700 -500
 */
 
-#define LRSPACE_16_VERSION  ((sal_uInt16)0x0001)
 #define LRSPACE_TXTLEFT_VERSION (sal_uInt16(0x0002))
-#define LRSPACE_AUTOFIRST_VERSION ((sal_uInt16)0x0003)
 #define LRSPACE_NEGATIVE_VERSION (sal_uInt16(0x0004))
 
 class EDITENG_DLLPUBLIC SvxLRSpaceItem : public SfxPoolItem
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svx starmath/inc starmath/sdi starmath/source

2018-01-04 Thread Noel Grandin 
 include/editeng/editids.hrc |2 -
 include/sfx2/sfxsids.hrc|   49 +---
 include/svx/svxids.hrc  |   41 
 starmath/inc/starmath.hrc   |2 -
 starmath/inc/view.hxx   |2 -
 starmath/sdi/smath.sdi  |2 -
 starmath/sdi/smslots.sdi|2 -
 starmath/source/dialog.cxx  |4 +--
 starmath/source/view.cxx|4 +--
 9 files changed, 32 insertions(+), 76 deletions(-)

New commits:
commit 08209f2b67cf84b96dd03c90d87bc2d8dad26c8c
Author: Noel Grandin 
Date:   Thu Jan 4 10:21:24 2018 +0200

de-duplicate some defines in hrc files

and rename SID_INSERTSYMBOL -> SID_INSERTSPECIAL in starmath to make it
unique

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

diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index f728255f4285..5921eff49866 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -138,8 +138,6 @@
 #error Resource-Overflow in #line, #file
 #endif
 
-#define SID_DRAW_TEXT_VERTICAL
SID_ATTR_CHAR_VERTICAL
-
 #endif
 
 // *** EOF
diff --git a/include/sfx2/sfxsids.hrc b/include/sfx2/sfxsids.hrc
index 995f3641a744..8ded365cdc6e 100644
--- a/include/sfx2/sfxsids.hrc
+++ b/include/sfx2/sfxsids.hrc
@@ -550,41 +550,41 @@
 // SlotIds for Basic ---
 #define SID_BASICIDE_TOGGLEBRKPNT   ( SID_BASICIDE_START +  0 )
 #define SID_BASICIDE_ADDWATCH   ( SID_BASICIDE_START +  1 )
-#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 )
-#define SID_BASICIDE_BRKPNTSCHANGED ( SID_BASICIDE_START + 36 )
 #define SID_BASICIDE_CHOOSEMACRO( SID_BASICIDE_START +  2 )
-#define SID_BASICIDE_CREATEMACRO( SID_BASICIDE_START +  4 )
-#define SID_BASICIDE_DELETECURRENT  ( SID_BASICIDE_START + 22 )
 #define SID_BASICIDE_EDITMACRO  ( SID_BASICIDE_START +  3 )
-#define SID_BASICIDE_HIDECURPAGE( SID_BASICIDE_START + 10 )
-#define SID_BASICIDE_LIBLOADED  ( SID_BASICIDE_START + 27 )
-#define SID_BASICIDE_LIBSELECTOR( SID_BASICIDE_START + 19 )
-#define SID_BASICIDE_LIBSELECTED( SID_BASICIDE_START + 18 )
-#define SID_BASICIDE_LIBREMOVED ( SID_BASICIDE_START + 28 )
-#define SID_BASICIDE_ARG_LIBNAME( SID_BASICIDE_START + 34 )
-#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 )
+#define SID_BASICIDE_CREATEMACRO( SID_BASICIDE_START +  4 )
 #define SID_BASICIDE_MODULEDLG  ( SID_BASICIDE_START +  5 )
-#define SID_BASICIDE_NAMECHANGEDONTAB   ( SID_BASICIDE_START + 11 )
-#define SID_BASICIDE_ARG_TABID  ( SID_BASICIDE_START + 30 )
-#define SID_BASICIDE_ARG_MACROINFO  ( SID_BASICIDE_START + 32 )
-#define SID_BASICIDE_ARG_MODULENAME ( SID_BASICIDE_START + 35 )
-#define SID_BASICIDE_ARG_SBX( SID_BASICIDE_START + 31 )
-#define SID_BASICIDE_NEWMODULE  ( SID_BASICIDE_START + 21 )
-#define SID_BASICIDE_NEWDIALOG  ( SID_BASICIDE_START + 20 )
 #define SID_BASICIDE_OBJCAT ( SID_BASICIDE_START +  6 )
 #define SID_BASICIDE_REMOVEWATCH( SID_BASICIDE_START +  7 )
+#define SID_BASICIDE_SHOWSBX( SID_BASICIDE_START +  9 )
+#define SID_BASICIDE_HIDECURPAGE( SID_BASICIDE_START + 10 )
+#define SID_BASICIDE_NAMECHANGEDONTAB   ( SID_BASICIDE_START + 11 )
+#define SID_BASICIDE_UPDATEMODULESOURCE ( SID_BASICIDE_START + 12 )
+#define SID_BASICIDE_STOREMODULESOURCE  ( SID_BASICIDE_START + 13 )
+#define SID_BASICIDE_MATCHGROUP ( SID_BASICIDE_START + 14 )
+#define SID_BASICIDE_APPEAR ( SID_BASICIDE_START + 15 )
+#define SID_BASICIDE_STOREALLMODULESOURCES  ( SID_BASICIDE_START + 16 )
+#define SID_BASICIDE_UPDATEALLMODULESOURCES ( SID_BASICIDE_START + 17 )
+#define SID_BASICIDE_LIBSELECTED( SID_BASICIDE_START + 18 )
+#define SID_BASICIDE_LIBSELECTOR( SID_BASICIDE_START + 19 )
+#define SID_BASICIDE_NEWDIALOG  ( SID_BASICIDE_START + 20 )
+#define SID_BASICIDE_NEWMODULE  ( SID_BASICIDE_START + 21 )
+#define SID_BASICIDE_DELETECURRENT  ( SID_BASICIDE_START + 22 )
 #define SID_BASICIDE_RENAMECURRENT  ( SID_BASICIDE_START + 23 )
 #define SID_BASICIDE_SBXDELETED ( SID_BASICIDE_START + 24 )
 #define SID_BASICIDE_SBXINSERTED( SID_BASICIDE_START + 25 )
 #define SID_BASICIDE_SBXRENAMED ( SID_BASICIDE_START + 26 )
-#define SID_BASICIDE_SHOWSBX( SID_BASICIDE_START +  9 )
+#define SID_BASICIDE_LIBLOADED

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

2017-11-08 Thread Yousuf Philips 
 include/editeng/borderline.hxx |1 +
 sw/source/core/doc/tblafmt.cxx |   37 +++--
 2 files changed, 4 insertions(+), 34 deletions(-)

New commits:
commit 0ba318b895c164750dc3c7bac6948b04b606f2b8
Author: Yousuf Philips 
Date:   Mon Nov 6 18:14:55 2017 +0400

tdf#107554 New default table style

Change-Id: I7811ac11c0a92f85698fc5cd43016d85f4661b98
Reviewed-on: https://gerrit.libreoffice.org/44363
Reviewed-by: Heiko Tietze 
Tested-by: Heiko Tietze 

diff --git a/include/editeng/borderline.hxx b/include/editeng/borderline.hxx
index b873852fc7a0..848c4308ce33 100644
--- a/include/editeng/borderline.hxx
+++ b/include/editeng/borderline.hxx
@@ -35,6 +35,7 @@
 #define DEF_LINE_WIDTH_380
 #define DEF_LINE_WIDTH_4100
 #define DEF_LINE_WIDTH_510
+#define DEF_LINE_WIDTH_65   // 0.25pt
 
 
 // Abstracts over values from css::table::BorderLineStyle
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 8235c52f77dd..d8932eb774e5 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1234,44 +1234,13 @@ SwTableAutoFormatTable::SwTableAutoFormatTable()
 std::unique_ptr pNew(new SwTableAutoFormat(
 SwStyleNameMapper::GetUIName(RES_POOLTABSTYLE_DEFAULT, 
OUString(;
 
-SwBoxAutoFormat aNew;
-
 sal_uInt8 i;
 
-Color aColor( COL_BLUE );
-SvxBrushItem aBrushItem( aColor, RES_BACKGROUND );
-aNew.SetBackground( aBrushItem );
-aNew.SetColor( SvxColorItem(Color( COL_WHITE ), RES_CHRATR_COLOR) );
-
-for( i = 0; i < 4; ++i )
-pNew->SetBoxFormat( aNew, i );
-
-// 70% gray
-aBrushItem.SetColor( RGB_COLORDATA( 0x4d, 0x4d, 0x4d ) );
-aNew.SetBackground( aBrushItem );
-for( i = 4; i <= 12; i += 4 )
-pNew->SetBoxFormat( aNew, i );
-
-// 20% gray
-aBrushItem.SetColor( RGB_COLORDATA( 0xcc, 0xcc, 0xcc ) );
-aNew.SetBackground( aBrushItem );
-aColor.SetColor( COL_BLACK );
-aNew.SetColor( SvxColorItem( aColor, RES_CHRATR_COLOR) );
-for( i = 7; i <= 15; i += 4 )
-pNew->SetBoxFormat( aNew, i );
-for( i = 13; i <= 14; ++i )
-pNew->SetBoxFormat( aNew, i );
-
-aBrushItem.SetColor( Color( COL_WHITE ) );
-aNew.SetBackground( aBrushItem );
-for( i = 5; i <= 6; ++i )
-pNew->SetBoxFormat( aNew, i );
-for( i = 9; i <= 10; ++i )
-pNew->SetBoxFormat( aNew, i );
-
+Color aColor( COL_BLACK );
 SvxBoxItem aBox( RES_BOX );
+
 aBox.SetAllDistances(55);
-SvxBorderLine aLn( , DEF_LINE_WIDTH_0 );
+SvxBorderLine aLn( , DEF_LINE_WIDTH_5 );
 aBox.SetLine( , SvxBoxItemLine::LEFT );
 aBox.SetLine( , SvxBoxItemLine::BOTTOM );
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng sc/source sfx2/source xmloff/source

2017-10-04 Thread Andrea Gelmini 
 include/editeng/outlobj.hxx|2 +-
 sc/source/filter/inc/pivotcachebuffer.hxx  |2 +-
 sfx2/source/control/objface.cxx|2 +-
 xmloff/source/transform/RenameElemTContext.hxx |4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

New commits:
commit f840a0b03856d776efd53892ef513b63aeaa8ccc
Author: Andrea Gelmini 
Date:   Wed Oct 4 22:10:35 2017 +0200

Fix typos

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

diff --git a/include/editeng/outlobj.hxx b/include/editeng/outlobj.hxx
index 394a878d1085..db135f692ca2 100644
--- a/include/editeng/outlobj.hxx
+++ b/include/editeng/outlobj.hxx
@@ -41,7 +41,7 @@ struct OutlinerParaObjData
 ParagraphDataVector  maParagraphDataVector;
 bool mbIsEditDoc;
 
-// constuctor
+// constructor
 OutlinerParaObjData( EditTextObject* pEditTextObject, const 
ParagraphDataVector& rParagraphDataVector, bool bIsEditDoc );
 
 OutlinerParaObjData( const OutlinerParaObjData& r );
diff --git a/sc/source/filter/inc/pivotcachebuffer.hxx 
b/sc/source/filter/inc/pivotcachebuffer.hxx
index 05ddb336d54f..b0755936b8b1 100644
--- a/sc/source/filter/inc/pivotcachebuffer.hxx
+++ b/sc/source/filter/inc/pivotcachebuffer.hxx
@@ -81,7 +81,7 @@ public:
 /** Returns the string representation of the item. */
 OUString getName() const;
 
-/** Returns the string representation of the item, using the actual 
formating. */
+/** Returns the string representation of the item, using the actual 
formatting. */
 OUString getFormattedName(const ScDPSaveDimension& rSaveDim, 
ScDPObject* pObj, const DateTime& rNullDate) const;
 /** Returns true if the item is unused. */
 bool isUnused() const { return mbUnused; }
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 0019f6d57905..e45991db8d2b 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -99,7 +99,7 @@ struct SfxInterface_Impl
 
 static SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, 
SfxVisibilityFlags nFlags, ToolbarId eId, SfxShellFeature nFeature);
 
-// constuctor, registers a new unit
+// constructor, registers a new unit
 SfxInterface::SfxInterface( const char *pClassName,
 bool bUsableSuperClass,
 SfxInterfaceId nId,
diff --git a/xmloff/source/transform/RenameElemTContext.hxx 
b/xmloff/source/transform/RenameElemTContext.hxx
index 776c312e1c3c..052279d1129b 100644
--- a/xmloff/source/transform/RenameElemTContext.hxx
+++ b/xmloff/source/transform/RenameElemTContext.hxx
@@ -31,14 +31,14 @@ class XMLRenameElemTransformerContext : public 
XMLTransformerContext
 OUString m_aAttrValue;
 
 public:
-// The following consutructor renames the element names "rQName"
+// The following constructor renames the element names "rQName"
 // to bPrefix/eToken
 XMLRenameElemTransformerContext( XMLTransformerBase& rTransformer,
const OUString& rQName,
   sal_uInt16 nPrefix,
   ::xmloff::token::XMLTokenEnum eToken  );
 
-// The following consutructor renames the element names "rQName"
+// The following constructor renames the element names "rQName"
 // to bPrefix/eToken and adds an attribute nAPrefix/eAToken that has
 // the value eVToken.
 XMLRenameElemTransformerContext( XMLTransformerBase& rTransformer,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-14 Thread Noel Grandin 
 include/editeng/svxenum.hxx |   10 +--
 include/svx/algitem.hxx |4 -
 sc/source/core/data/attarray.cxx|2 
 sc/source/core/data/column2.cxx |   18 +++---
 sc/source/core/data/patattr.cxx |   10 +--
 sc/source/core/tool/autoform.cxx|4 -
 sc/source/filter/qpro/qprostyle.cxx |4 -
 sc/source/ui/inc/output.hxx |2 
 sc/source/ui/view/gridwin.cxx   |2 
 sc/source/ui/view/output2.cxx   |  106 ++--
 svx/source/items/algitem.cxx|   44 +++---
 sw/source/core/doc/tblafmt.cxx  |4 -
 12 files changed, 105 insertions(+), 105 deletions(-)

New commits:
commit 01062f27774a5c0adec8ba6e3bb10994538c8a82
Author: Noel Grandin 
Date:   Thu Sep 14 10:47:47 2017 +0200

convert SvxCellOrientation to scoped enum

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

diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index 626383329990..a6d00920a2b5 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -121,12 +121,12 @@ enum SvxCellVerJustify
 SVX_VER_JUSTIFY_BLOCK
 };
 
-enum SvxCellOrientation
+enum class SvxCellOrientation
 {
-SVX_ORIENTATION_STANDARD,
-SVX_ORIENTATION_TOPBOTTOM,
-SVX_ORIENTATION_BOTTOMTOP,
-SVX_ORIENTATION_STACKED
+Standard,
+TopBottom,
+BottomUp,
+Stacked
 };
 
 enum class SvxSpellArea
diff --git a/include/svx/algitem.hxx b/include/svx/algitem.hxx
index 4438d9148553..00ab5145fec7 100644
--- a/include/svx/algitem.hxx
+++ b/include/svx/algitem.hxx
@@ -35,7 +35,7 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC SvxOrientationItem: 
public SfxEnumItemGetCellOrientation() != SVX_ORIENTATION_STANDARD)
+if (pPattern->GetCellOrientation() != SvxCellOrientation::Standard)
 bFound = true;
 else if (static_cast(pPattern->GetItem( 
ATTR_LINEBREAK )).GetValue())
 bFound = true;
diff --git a/sc/source/core/data/column2.cxx b/sc/source/core/data/column2.cxx
index b6432a735132..4f8183938a3c 100644
--- a/sc/source/core/data/column2.cxx
+++ b/sc/source/core/data/column2.cxx
@@ -191,7 +191,7 @@ long ScColumn::GetNeededSize(
 //  get other attributes from pattern and conditional formatting
 
 SvxCellOrientation eOrient = pPattern->GetCellOrientation( pCondSet );
-bool bAsianVertical = ( eOrient == SVX_ORIENTATION_STACKED &&
+bool bAsianVertical = ( eOrient == SvxCellOrientation::Stacked &&
 static_cast(pPattern->GetItem( 
ATTR_VERTICAL_ASIAN, pCondSet )).GetValue() );
 if ( bAsianVertical )
 bBreak = false;
@@ -201,7 +201,7 @@ long ScColumn::GetNeededSize(
 
 long nRotate = 0;
 SvxRotateMode eRotMode = SVX_ROTATE_MODE_STANDARD;
-if ( eOrient == SVX_ORIENTATION_STANDARD )
+if ( eOrient == SvxCellOrientation::Standard )
 {
 if (pCondSet &&
 pCondSet->GetItemState(ATTR_ROTATE_VALUE, true, ) == 
SfxItemState::SET)
@@ -225,7 +225,7 @@ long ScColumn::GetNeededSize(
 if ( eHorJust == SvxCellHorJustify::Repeat )
 {
 // ignore orientation/rotation if "repeat" is active
-eOrient = SVX_ORIENTATION_STANDARD;
+eOrient = SvxCellOrientation::Standard;
 nRotate = 0;
 bAsianVertical = false;
 }
@@ -253,7 +253,7 @@ long ScColumn::GetNeededSize(
 //  bGetFont is set also if script type changes
 if (rOptions.bGetFont)
 {
-Fraction aFontZoom = ( eOrient == SVX_ORIENTATION_STANDARD ) ? rZoomX 
: rZoomY;
+Fraction aFontZoom = ( eOrient == SvxCellOrientation::Standard ) ? 
rZoomX : rZoomY;
 vcl::Font aFont;
 // font color doesn't matter here
 pPattern->GetFont( aFont, SC_AUTOCOL_BLACK, pDev, , 
pCondSet, nScript );
@@ -264,7 +264,7 @@ long ScColumn::GetNeededSize(
 CellType eCellType = aCell.meType;
 
 bool bEditEngine = (eCellType == CELLTYPE_EDIT ||
-eOrient == SVX_ORIENTATION_STACKED ||
+eOrient == SvxCellOrientation::Stacked ||
 IsAmbiguousScript(nScript) ||
 ((eCellType == CELLTYPE_FORMULA) && 
aCell.mpFormula->IsMultilineResult()));
 
@@ -280,7 +280,7 @@ long ScColumn::GetNeededSize(
 //  SetFont is moved up
 
 Size aSize( pDev->GetTextWidth( aValStr ), pDev->GetTextHeight() );
-if ( eOrient != SVX_ORIENTATION_STANDARD )
+if ( eOrient != SvxCellOrientation::Standard )
 {
 long nTemp = aSize.Width();
 aSize.Width() = aSize.Height();
@@ -398,7 +398,7 @@ long ScColumn::GetNeededSize(
 }
 
 Size aPaper = Size( 100, 100 );
-if ( eOrient==SVX_ORIENTATION_STACKED && !bAsianVertical )
+if (

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

2017-08-11 Thread Armin Le Grand 
 include/editeng/editview.hxx  |7 +++
 svx/source/svdraw/svdedxv.cxx |   39 ++-
 2 files changed, 29 insertions(+), 17 deletions(-)

New commits:
commit 5131f5ba19ebc5de17139dbcf373866a9b155b2b
Author: Armin Le Grand 
Date:   Thu Aug 10 20:08:56 2017 +0200

editviewoverlay: corrected AttributeChange

EditView on Overlay visualization needs to handle
selection change when e.g. FontSize attribute of
a selected text portion changes. Changed handling
so that selection overlay is an integral part of
text visualization overlay and refreshing text
visualization always refreshes selection visuals,
but not the other way around. Both anyways check
for real change, so just extra testing is avoided
which is still the better solution

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

diff --git a/include/editeng/editview.hxx b/include/editeng/editview.hxx
index 8b98d1f28360..84e41d4af2f2 100644
--- a/include/editeng/editview.hxx
+++ b/include/editeng/editview.hxx
@@ -92,7 +92,14 @@ public:
 EditViewCallbacks() {}
 virtual ~EditViewCallbacks();
 
+// call this when text visualization changed in any way. It
+// will also update selection, so no need to call this self
+// additionally (but will also do no harm)
 virtual void EditViewInvalidate() const = 0;
+
+// call this when only selection is changed. Text change will
+// then *not* be checked and not be reacted on. Still, when
+// only the selection is changed, this is useful and faster
 virtual void EditViewSelectionChange() const = 0;
 };
 
diff --git a/svx/source/svdraw/svdedxv.cxx b/svx/source/svdraw/svdedxv.cxx
index aa369a9e61d4..7cd8dc363b4b 100644
--- a/svx/source/svdraw/svdedxv.cxx
+++ b/svx/source/svdraw/svdedxv.cxx
@@ -395,7 +395,6 @@ namespace
 
 public:
 TextEditOverlayObject(
-sdr::overlay::OverlaySelection* pOverlaySelection,
 const Color& rColor,
 OutlinerView& rOutlinerView,
 bool bVisualizeSurroundingFrame);
@@ -443,12 +442,11 @@ namespace
 }
 
 TextEditOverlayObject::TextEditOverlayObject(
-sdr::overlay::OverlaySelection* pOverlaySelection,
 const Color& rColor,
 OutlinerView& rOutlinerView,
 bool bVisualizeSurroundingFrame)
 :   OverlayObject(rColor),
-mpOverlaySelection(pOverlaySelection),
+mpOverlaySelection(nullptr),
 mrOutlinerView(rOutlinerView),
 maLastRange(),
 maRange(),
@@ -458,6 +456,15 @@ namespace
 {
 // no AA for TextEdit overlay
 allowAntiAliase(false);
+
+// create local OverlaySelection - this is an integral part of EditText
+// visualization
+const std::vector< basegfx::B2DRange > aEmptySelection;
+mpOverlaySelection = new sdr::overlay::OverlaySelection(
+sdr::overlay::OverlayType::Transparent,
+rColor,
+aEmptySelection,
+true);
 }
 
 TextEditOverlayObject::~TextEditOverlayObject()
@@ -564,6 +571,10 @@ namespace
 // if there really *was* a change signal the OverlayManager to
 // refresh this object's visualization
 objectChange();
+
+// on data change, always do a SelectionChange, too
+// since the selection is an integral part of text visualization
+checkSelectionChange();
 }
 }
 
@@ -596,7 +607,8 @@ namespace
 // TextEdit
 
 // callback from the active EditView, forward to evtl. existing instances of 
the
-// TextEditOverlayObject(s)
+// TextEditOverlayObject(s). This will additionally update the selection which
+// is an integral part of the text visualization
 void SdrObjEditView::EditViewInvalidate() const
 {
 if (IsTextEdit())
@@ -618,6 +630,9 @@ void SdrObjEditView::EditViewInvalidate() const
 }
 }
 
+// callback from the active EditView, forward to evtl. existing instances of 
the
+// TextEditOverlayObject(s). This cvall *only* updates the selection 
visualization
+// which is e.g. used when only the selection is changed, but not the text
 void SdrObjEditView::EditViewSelectionChange() const
 {
 if (IsTextEdit())
@@ -639,10 +654,9 @@ void SdrObjEditView::TextEditDrawing(SdrPaintWindow& 
rPaintWindow) const
 if (!comphelper::LibreOfficeKit::isActive())
 {
 // adapt all TextEditOverlayObject(s), so call EditViewInvalidate()
-// and EditViewSelectionChange() to update accordingly. Suppress new
+// to update accordingly (will update selection, too). Suppress new
 // stuff when LibreOficeKit is active
 EditViewInvalidate();
-EditViewSelectionChange();
 }
 else
 {
@@ -1180,22 +1194,13 @@ bool

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

2017-06-21 Thread Noel Grandin 
 include/editeng/editdata.hxx |2 --
 1 file changed, 2 deletions(-)

New commits:
commit 452ad2afc5a474f78783ddabd04980e962532935
Author: Noel Grandin 
Date:   Wed Jun 21 13:27:40 2017 +0200

remove unused EE_READWRITE constants

just as well EE_READWRITE_GENERALERROR is unused, since it's value
overlaps with ERRCODE_SVX_LINGU_LANGUAGENOTEXISTS

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

diff --git a/include/editeng/editdata.hxx b/include/editeng/editdata.hxx
index 4c493865659f..be5cc4377077 100644
--- a/include/editeng/editdata.hxx
+++ b/include/editeng/editdata.hxx
@@ -55,9 +55,7 @@ enum class EEAnchorMode {
 EDITENG_DLLPUBLIC extern const size_t EE_APPEND;
 
 // Error messages for Read / Write Method
-#define EE_READWRITE_OK  ERRCODE_NONE
 #define EE_READWRITE_WRONGFORMAT ErrCode(SVSTREAM_ERRBASE_USER+1)
-#define EE_READWRITE_GENERALERRORErrCode(SVSTREAM_ERRBASE_USER+2)
 
 #define EDITUNDO_REMOVECHARS100
 #define EDITUNDO_CONNECTPARAS   101
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/svx svx/sdi svx/source svx/uiconfig sw/sdi sw/source sw/uiconfig

2017-04-04 Thread Szymon Kłos 
 include/editeng/editids.hrc |5 +
 include/svx/ParaSpacingControl.hxx  |   47 +
 svx/sdi/svx.sdi |   98 
 svx/source/sidebar/paragraph/ParaSpacingControl.cxx |   91 --
 svx/source/sidebar/paragraph/ParaSpacingWindow.cxx  |   58 +++
 svx/source/sidebar/paragraph/ParaSpacingWindow.hxx  |   44 
 svx/uiconfig/ui/paralrspacing.ui|   81 
 svx/uiconfig/ui/paraulspacing.ui|   62 
 sw/sdi/_annotsh.sdi |   25 +
 sw/sdi/_textsh.sdi  |   12 ++
 sw/sdi/_viewsh.sdi  |   25 +
 sw/sdi/drwtxtsh.sdi |   25 +
 sw/source/uibase/app/swmodule.cxx   |7 +
 sw/source/uibase/shells/annotsh.cxx |   16 ++-
 sw/source/uibase/shells/drwtxtex.cxx|   14 ++
 sw/source/uibase/shells/txtattr.cxx |5 -
 sw/source/uibase/uiview/viewtab.cxx |   14 ++
 sw/uiconfig/swriter/ui/notebookbar.ui   |   91 +-
 18 files changed, 567 insertions(+), 153 deletions(-)

New commits:
commit 387cdc35d79cd3dd235e4bb61e01e17d8781630a
Author: Szymon Kłos 
Date:   Tue Mar 28 10:40:16 2017 +0200

Notebookbar: Separated paragraph spacing controls

One big paragraph spacing control was splitted
to separated widgets. It will be possible to
reuse that in the sidebar. Also layout is better
because explicit size setting is no longer needed.

Change-Id: Ieb200af4a9a6120ae03b22b27da56256aa816193
Reviewed-on: https://gerrit.libreoffice.org/35801
Tested-by: Jenkins 
Reviewed-by: Samuel Mehrbrodt 

diff --git a/include/editeng/editids.hrc b/include/editeng/editids.hrc
index 3f2fd5f65d66..94099c8943a5 100644
--- a/include/editeng/editids.hrc
+++ b/include/editeng/editids.hrc
@@ -68,8 +68,13 @@
 #define SID_ATTR_PARA_WIDOWS( SID_SVX_START + 41 )
 #define SID_ATTR_PARA_ULSPACE   ( SID_SVX_START + 42 )
 #define SID_ATTR_PARA_LRSPACE   ( SID_SVX_START + 43 )
+#define SID_ATTR_PARA_LEFTSPACE ( SID_SVX_START + 44 )
+#define SID_ATTR_PARA_RIGHTSPACE( SID_SVX_START + 45 )
+#define SID_ATTR_PARA_FIRSTLINESPACE( SID_SVX_START + 46 )
+#define SID_ATTR_PARA_BELOWSPACE( SID_SVX_START + 47 )
 #define SID_ATTR_LRSPACE( SID_SVX_START + 48 )
 #define SID_ATTR_ULSPACE( SID_SVX_START + 49 )
+#define SID_ATTR_PARA_ABOVESPACE( SID_SVX_START + 64 )
 #define SID_ATTR_PARA_MODEL ( SID_SVX_START + 65 )
 #define SID_ATTR_PARA_KEEP  ( SID_SVX_START + 66 )
 #define SID_ATTR_CHAR_AUTOKERN  ( SID_SVX_START + 67 )
diff --git a/include/svx/ParaSpacingControl.hxx 
b/include/svx/ParaSpacingControl.hxx
index 6efecb8b5289..cefcc81dee30 100644
--- a/include/svx/ParaSpacingControl.hxx
+++ b/include/svx/ParaSpacingControl.hxx
@@ -38,6 +38,24 @@ public:
 
 virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
   const SfxPoolItem* pState) override;
+virtual VclPtr CreateItemWindow(vcl::Window* pParent) 
override = 0;
+};
+
+class SVX_DLLPUBLIC ParaAboveSpacingControl : public ParaULSpacingControl
+{
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+
+ParaAboveSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
+virtual VclPtr CreateItemWindow(vcl::Window* pParent) 
override;
+};
+
+class SVX_DLLPUBLIC ParaBelowSpacingControl : public ParaULSpacingControl
+{
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+
+ParaBelowSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
 virtual VclPtr CreateItemWindow(vcl::Window* pParent) 
override;
 };
 
@@ -54,7 +72,7 @@ public:
 
 virtual void StateChanged(sal_uInt16 nSID, SfxItemState eState,
   const SfxPoolItem* pState) override;
-virtual VclPtr CreateItemWindow(vcl::Window* pParent) 
override;
+virtual VclPtr CreateItemWindow(vcl::Window* pParent) 
override = 0;
 
 // XContextChangeEventListener
 virtual void SAL_CALL notifyContextChangeEvent(const 
css::ui::ContextChangeEventObject& rEvent) override;
@@ -71,6 +89,33 @@ private:
 css::uno::Reference 
m_xMultiplexer;
 };
 
+class SVX_DLLPUBLIC ParaLeftSpacingControl : public ParaLRSpacingControl
+{
+public:
+SFX_DECL_TOOLBOX_CONTROL();
+
+ParaLeftSpacingControl(sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx);
+virtual VclPtr CreateItemWindow(vcl::Window* pParent) 
override;
+};
+
+class

[Libreoffice-commits] core.git: include/editeng include/svl include/vcl include/xmloff svl/source vcl/source writerfilter/source xmloff/source

2017-04-04 Thread Noel Grandin 
 include/editeng/charrotateitem.hxx   |2 --
 include/svl/aeitem.hxx   |1 -
 include/vcl/imagerepository.hxx  |4 
 include/xmloff/fasttokenhandler.hxx  |3 ---
 svl/source/items/aeitem.cxx  |7 ---
 vcl/source/image/ImageRepository.cxx |6 --
 writerfilter/source/dmapper/NumberingManager.hxx |1 -
 xmloff/source/core/fasttokenhandler.cxx  |7 ---
 8 files changed, 31 deletions(-)

New commits:
commit e63116602b8f49508d0aef1dd1afe746a29cc219
Author: Noel Grandin 
Date:   Mon Apr 3 16:19:02 2017 +0200

loplugin:unusedmethods

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

diff --git a/include/editeng/charrotateitem.hxx 
b/include/editeng/charrotateitem.hxx
index 922cbdff11cb..fec33b5d4944 100644
--- a/include/editeng/charrotateitem.hxx
+++ b/include/editeng/charrotateitem.hxx
@@ -34,8 +34,6 @@
 class EDITENG_DLLPUBLIC SvxTextRotateItem : public SfxUInt16Item
 {
 public:
-static SfxPoolItem* CreateDefault();
-
 SvxTextRotateItem(sal_uInt16 nValue, const sal_uInt16 nId);
 
 virtual SfxPoolItem*Clone(SfxItemPool *pPool = nullptr) const override;
diff --git a/include/svl/aeitem.hxx b/include/svl/aeitem.hxx
index f0334fb0ca46..10aaa1f30d26 100644
--- a/include/svl/aeitem.hxx
+++ b/include/svl/aeitem.hxx
@@ -49,7 +49,6 @@ class SVL_DLLPUBLIC SfxAllEnumItem: public SfxAllEnumItem_Base
 std::size_t GetPosByValue_( sal_uInt16 nValue ) const;
 
 public:
-SfxAllEnumItem();
 explicitSfxAllEnumItem( sal_uInt16 nWhich);
 SfxAllEnumItem( sal_uInt16 nWhich, sal_uInt16 nVal 
);
 SfxAllEnumItem( sal_uInt16 nWhich, SvStream 
 );
diff --git a/include/vcl/imagerepository.hxx b/include/vcl/imagerepository.hxx
index 5983825f4236..d7553802afe1 100644
--- a/include/vcl/imagerepository.hxx
+++ b/include/vcl/imagerepository.hxx
@@ -51,10 +51,6 @@ namespace vcl
 BitmapEx& _out_rImage,
 bool bSearchLanguageDependent
 );
-
-static bool loadDefaultImage(
-BitmapEx& _out_rImage
-);
 };
 
 
diff --git a/include/xmloff/fasttokenhandler.hxx 
b/include/xmloff/fasttokenhandler.hxx
index 4a514f568170..ca20d687ad7f 100644
--- a/include/xmloff/fasttokenhandler.hxx
+++ b/include/xmloff/fasttokenhandler.hxx
@@ -26,9 +26,6 @@ public:
 explicit TokenMap();
 ~TokenMap();
 
-/** Returns the token identifier for the passed OUString (UTF-16) token 
name. */
-static sal_Int32 getTokenFromUnicode( const OUString& rUnicodeName );
-
 /** Returns the UTF-8 name of the passed token identifier as byte 
sequence. */
 css::uno::Sequence< sal_Int8 > getUtf8TokenName( sal_Int32 nToken ) const
 {
diff --git a/svl/source/items/aeitem.cxx b/svl/source/items/aeitem.cxx
index d50b77d85761..819a0d61fa77 100644
--- a/svl/source/items/aeitem.cxx
+++ b/svl/source/items/aeitem.cxx
@@ -32,13 +32,6 @@ struct SfxAllEnumValue_Impl
 class SfxAllEnumValueArr : public std::vector {};
 
 
-SfxAllEnumItem::SfxAllEnumItem() :
-SfxAllEnumItem_Base(0, 0),
-pValues( nullptr ),
-pDisabledValues( nullptr )
-{
-}
-
 SfxAllEnumItem::SfxAllEnumItem(sal_uInt16 which, sal_uInt16 nVal):
 SfxAllEnumItem_Base(which, nVal),
 pValues( nullptr ),
diff --git a/vcl/source/image/ImageRepository.cxx 
b/vcl/source/image/ImageRepository.cxx
index 7b9255f32348..5e14a70fdb47 100644
--- a/vcl/source/image/ImageRepository.cxx
+++ b/vcl/source/image/ImageRepository.cxx
@@ -32,12 +32,6 @@ namespace vcl
 return ImageTree::get().loadImage( _rName, sIconTheme, _out_rImage, 
_bSearchLanguageDependent );
 }
 
-bool ImageRepository::loadDefaultImage( BitmapEx& _out_rImage)
-{
-OUString sIconTheme = 
Application::GetSettings().GetStyleSettings().DetermineIconTheme();
-return ImageTree::get().loadDefaultImage( sIconTheme,_out_rImage);
-}
-
 } // namespace vcl
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/writerfilter/source/dmapper/NumberingManager.hxx 
b/writerfilter/source/dmapper/NumberingManager.hxx
index cd09b3d10f9d..f2cb1d2c637e 100644
--- a/writerfilter/source/dmapper/NumberingManager.hxx
+++ b/writerfilter/source/dmapper/NumberingManager.hxx
@@ -86,7 +86,6 @@ public:
 
 // Getters
 const OUString& GetBulletChar( ) { return m_sBulletChar; };
-const css::awt::Size& GetGraphicSize( ) { return m_aGraphicSize; };
 const std::shared_ptr< StyleSheetEntry >& GetParaStyle( ) { return 
m_pParaStyle; };
 bool isOutlineNumbering() const { return m_outline; }
 
diff --git a/xmloff/source/core/fasttokenhandler.cxx

[Libreoffice-commits] core.git: include/editeng include/filter include/formula include/svl include/svtools include/svx include/toolkit include/unotools include/vcl

2017-03-31 Thread Jens Carl 
 include/editeng/brushitem.hxx   |2 
 include/filter/msfilter/msdffimp.hxx|2 
 include/filter/msfilter/msocximex.hxx   |4 -
 include/filter/msfilter/msoleexp.hxx|2 
 include/formula/formulahelper.hxx   |2 
 include/svl/filerec.hxx |2 
 include/svtools/parrtf.hxx  |2 
 include/svtools/ruler.hxx   |2 
 include/svtools/soerr.hxx   |4 -
 include/svtools/wizdlg.hxx  |   80 
 include/svx/cube3d.hxx  |2 
 include/svx/svdmrkv.hxx |2 
 include/svx/svdotext.hxx|2 
 include/svx/svxids.hrc  |   38 ++---
 include/svx/sxcaitm.hxx |   10 +--
 include/svx/sxcecitm.hxx|   12 ++--
 include/svx/sxmbritm.hxx|4 -
 include/svx/tbcontrl.hxx|2 
 include/toolkit/controls/unocontrolbase.hxx |4 -
 include/unotools/tempfile.hxx   |2 
 include/vcl/menu.hxx|4 -
 include/vcl/spinfld.hxx |2 
 include/vcl/vclenum.hxx |2 
 23 files changed, 88 insertions(+), 100 deletions(-)

New commits:
commit bb37c73bdc7544f67d1acb98af6248fb43140ca7
Author: Jens Carl 
Date:   Fri Mar 31 05:28:14 2017 +

tdf#39468 Translate German comments

Translate German comments in filter/

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

diff --git a/include/editeng/brushitem.hxx b/include/editeng/brushitem.hxx
index daa379b690fa..350b4d6cd977 100644
--- a/include/editeng/brushitem.hxx
+++ b/include/editeng/brushitem.hxx
@@ -57,7 +57,7 @@ class EDITENG_DLLPUBLIC SvxBrushItem : public SfxPoolItem
 mutable boolbLoadAgain;
 
 voidApplyGraphicTransparency_Impl();
-// wird nur von Create benutzt
+// only used by Create
 SvxBrushItem( SvStream& rStrm,
   sal_uInt16 nVersion, sal_uInt16 nWhich  );
 
diff --git a/include/filter/msfilter/msdffimp.hxx 
b/include/filter/msfilter/msdffimp.hxx
index 5016902e5994..b5362e61aef2 100644
--- a/include/filter/msfilter/msdffimp.hxx
+++ b/include/filter/msfilter/msdffimp.hxx
@@ -143,7 +143,7 @@ typedef ::std::multiset< std::shared_ptr,
 #define SP_FBACKGROUND  0x400   ///< Background shape
 
 // for the CreateSdrOLEFromStorage we need the information, how we handle
-// convert able OLE-Objects - this ist stored in
+// convert able OLE-Objects - this is stored in
 #define OLE_MATHTYPE_2_STARMATH 0x0001
 #define OLE_WINWORD_2_STARWRITER0x0002
 #define OLE_EXCEL_2_STARCALC0x0004
diff --git a/include/filter/msfilter/msocximex.hxx 
b/include/filter/msfilter/msocximex.hxx
index 262d6514bd2f..ae29caae8374 100644
--- a/include/filter/msfilter/msocximex.hxx
+++ b/include/filter/msfilter/msocximex.hxx
@@ -69,12 +69,12 @@ protected:
 
 css::uno::Reference< css::frame::XModel >   mxModel;
 
-// gecachte Interfaces
+// cached interfaces
 css::uno::Reference< css::drawing::XDrawPage >  xDrawPage;
 css::uno::Reference< css::drawing::XShapes >xShapes;
 css::uno::Reference< css::lang::XMultiServiceFactory >  xServiceFactory;
 
-// das einzige Formular
+// the only form
 css::uno::Reference< css::container::XIndexContainer >  xFormComps;
 
 virtual void GetDrawPage();
diff --git a/include/filter/msfilter/msoleexp.hxx 
b/include/filter/msfilter/msoleexp.hxx
index 6043bae832cd..dc7b17616516 100644
--- a/include/filter/msfilter/msoleexp.hxx
+++ b/include/filter/msfilter/msoleexp.hxx
@@ -34,7 +34,7 @@ namespace svt {
 class SotStorage;
 
 // for the CreateSdrOLEFromStorage we need the information, how we handle
-// convert able OLE-Objects - this ist stored in
+// convert able OLE-Objects - this is stored in
 #define OLE_STARMATH_2_MATHTYPE 0x0001
 #define OLE_STARWRITER_2_WINWORD0x0002
 #define OLE_STARCALC_2_EXCEL0x0004
diff --git a/include/formula/formulahelper.hxx 
b/include/formula/formulahelper.hxx
index 753ef8e8178e..8774bb332eb0 100644
--- a/include/formula/formulahelper.hxx
+++ b/include/formula/formulahelper.hxx
@@ -52,7 +52,7 @@ namespace formula
 
 boolGetNextFunc( const OUString& rFormula,
bool  bBack,
-   sal_Int32&rFStart, // Ein- 
und Ausgabe
+   sal_Int32&rFStart, // input 
and output
sal_Int32*pFEnd = nullptr,

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

2017-03-05 Thread Caolán McNamara 
 include/editeng/svxenum.hxx |   36 
 1 file changed, 32 insertions(+), 4 deletions(-)

New commits:
commit 5c783dc75f9f31b5393f0a921323583312a731ec
Author: Caolán McNamara 
Date:   Sun Mar 5 21:11:19 2017 +

ubsan: add in all the valid value for NumberingType to the SvxNumType enum

/include/editeng/numitem.hxx:69:67: runtime error: load of value 52, which 
is not a valid value for type ´SvxNumType´
#0 0x2b29cf86dc41 in SvxNumberType::SetNumberingType(SvxNumType) 
/include/editeng/numitem.hxx:69:67
#1 0x2b29d5448771 in 
SwXNumberingRules::SetPropertiesToNumFormat(SwNumFormat&, rtl::OUString&, 
rtl::OUString*, rtl::OUString*, rtl::OUString*, SwDoc*, SwDocShell*, 
com::sun::star::uno::Sequence const&) 
/sw/source/core/unocore/unosett.cxx:1851:25
#2 0x2b29d542f727 in 
SwXNumberingRules::SetNumberingRuleByIndex(SwNumRule&, 
com::sun::star::uno::Sequence const&, 
int) /sw/source/core/unocore/unosett.cxx:1517:5
#3 0x2b29d542b0e8 in SwXNumberingRules::replaceByIndex(int, 
com::sun::star::uno::Any const&) /sw/source/core/unocore/unosett.cxx:1180:9

make CppunitTest_sw_ooxmlexport CPPUNITTRACE="gdb --args"

Change-Id: I4bb11dbe29e286e937f177aa436213ae40152399

diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index 3f8e47c..670c360 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -149,7 +149,7 @@ enum class SvxSpellArea
 /**
  * these must match the values in css::style::NumberingType
  */
-enum SvxNumType
+enum SvxNumType : sal_Int16
 {
 SVX_NUM_CHARS_UPPER_LETTER= 
css::style::NumberingType::CHARS_UPPER_LETTER,// Counts from a-z, aa - az, 
ba - bz, ...
 SVX_NUM_CHARS_LOWER_LETTER= 
css::style::NumberingType::CHARS_LOWER_LETTER,
@@ -176,10 +176,38 @@ enum SvxNumType
 SVX_NUM_AIU_HALFWIDTH_JA  = 
css::style::NumberingType::AIU_HALFWIDTH_JA,
 SVX_NUM_IROHA_FULLWIDTH_JA= 
css::style::NumberingType::IROHA_FULLWIDTH_JA,
 SVX_NUM_IROHA_HALFWIDTH_JA= 
css::style::NumberingType::IROHA_HALFWIDTH_JA,
-SVX_NUM_HANGUL_SYLLABLE_KO= 
css::style::NumberingType::HANGUL_SYLLABLE_KO,
-SVX_NUM_HANGUL_JAMO_KO= css::style::NumberingType::HANGUL_JAMO_KO,
-SVX_NUM_NUMBER_HANGUL_KO  = 
css::style::NumberingType::NUMBER_HANGUL_KO,
 SVX_NUM_NUMBER_UPPER_KO   = css::style::NumberingType::NUMBER_UPPER_KO,
+SVX_NUM_NUMBER_HANGUL_KO  = 
css::style::NumberingType::NUMBER_HANGUL_KO,
+SVX_NUM_HANGUL_JAMO_KO= css::style::NumberingType::HANGUL_JAMO_KO,
+SVX_NUM_HANGUL_SYLLABLE_KO= 
css::style::NumberingType::HANGUL_SYLLABLE_KO,
+SVX_NUM_HANGUL_CIRCLED_JAMO_KO = 
css::style::NumberingType::HANGUL_CIRCLED_JAMO_KO,
+SVX_NUM_HANGUL_CIRCLED_SYLLABLE_KO = 
css::style::NumberingType::HANGUL_CIRCLED_SYLLABLE_KO,
+SVX_NUM_CHARS_ARABIC  = css::style::NumberingType::CHARS_ARABIC,
+SVX_NUM_CHARS_THAI= css::style::NumberingType::CHARS_THAI,
+SVX_NUM_CHARS_HEBREW  = css::style::NumberingType::CHARS_HEBREW,
+SVX_NUM_CHARS_NEPALI  = css::style::NumberingType::CHARS_NEPALI,
+SVX_NUM_CHARS_KHMER   = css::style::NumberingType::CHARS_KHMER,
+SVX_NUM_CHARS_LAO = css::style::NumberingType::CHARS_LAO,
+SVX_NUM_CHARS_TIBETAN = css::style::NumberingType::CHARS_TIBETAN,
+SVX_NUM_CHARS_CYRILLIC_UPPER_LETTER_BG = 
css::style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_BG,
+SVX_NUM_CHARS_CYRILLIC_LOWER_LETTER_BG = 
css::style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_BG,
+SVX_NUM_CHARS_CYRILLIC_UPPER_LETTER_N_BG = 
css::style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_BG,
+SVX_NUM_CHARS_CYRILLIC_LOWER_LETTER_N_BG = 
css::style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_BG,
+SVX_NUM_CHARS_CYRILLIC_UPPER_LETTER_RU = 
css::style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_RU,
+SVX_NUM_CHARS_CYRILLIC_LOWER_LETTER_RU = 
css::style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_RU,
+SVX_NUM_CHARS_CYRILLIC_UPPER_LETTER_N_RU = 
css::style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_RU,
+SVX_NUM_CHARS_CYRILLIC_LOWER_LETTER_N_RU = 
css::style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_RU,
+SVX_NUM_CHARS_PERSIAN = css::style::NumberingType::CHARS_PERSIAN,
+SVX_NUM_CHARS_MYANMAR = css::style::NumberingType::CHARS_MYANMAR,
+SVX_NUM_CHARS_CYRILLIC_UPPER_LETTER_SR = 
css::style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_SR,
+SVX_NUM_CHARS_CYRILLIC_LOWER_LETTER_SR = 
css::style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_SR,
+SVX_NUM_CHARS_CYRILLIC_UPPER_LETTER_N_SR = 
css::style::NumberingType::CHARS_CYRILLIC_UPPER_LETTER_N_SR,
+SVX_NUM_CHARS_CYRILLIC_LOWER_LETTER_N_SR = 
css::style::NumberingType::CHARS_CYRILLIC_LOWER_LETTER_N_SR,
+SVX_NUM_CHARS_GREEK_UPPER_LETTER = 
css::style::NumberingType::CHARS_GREEK_UPPER_LETTER,
+

[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svx sc/inc sc/source sd/source sfx2/source svx/source sw/source vcl/source

2017-02-19 Thread Julien Nabet 
 include/editeng/txtrange.hxx |4 ++--
 include/sfx2/chalign.hxx |2 +-
 include/svx/svdmrkv.hxx  |2 +-
 include/svx/unoprov.hxx  |2 +-
 sc/inc/datauno.hxx   |4 ++--
 sc/source/core/data/validat.cxx  |2 +-
 sc/source/core/tool/interpr4.cxx |2 +-
 sc/source/filter/inc/scflt.hxx   |   10 +-
 sc/source/ui/unoobj/cellsuno.cxx |2 +-
 sc/source/ui/view/gridwin.cxx|2 +-
 sd/source/ui/app/sddll.cxx   |2 +-
 sd/source/ui/func/fusel.cxx  |2 +-
 sd/source/ui/view/sdview3.cxx|2 +-
 sfx2/source/appl/workwin.cxx |4 ++--
 sfx2/source/dialog/templdlg.cxx  |2 +-
 svx/source/engine3d/scene3d.cxx  |2 +-
 svx/source/svdraw/svdpage.cxx|   12 ++--
 svx/source/unodraw/unoprov.cxx   |2 +-
 svx/source/unodraw/unoshap3.cxx  |2 +-
 sw/source/core/layout/frmtool.cxx|2 +-
 sw/source/uibase/app/swdll.cxx   |6 +++---
 sw/source/uibase/dochdl/swdtflvr.cxx |2 +-
 sw/source/uibase/ribbar/drawbase.cxx |2 +-
 sw/source/uibase/uiview/viewdraw.cxx |2 +-
 sw/source/uibase/wrtsh/wrtsh1.cxx|2 +-
 vcl/source/filter/sgvmain.hxx|2 +-
 26 files changed, 40 insertions(+), 40 deletions(-)

New commits:
commit 07f98f3fdcc34320736e8c75c2528866eae65f30
Author: Julien Nabet 
Date:   Sat Feb 18 23:42:01 2017 +0100

Typos: mainly translation remnants of Objekt instead of object

Change-Id: I84c488a4a0fa96f85158d34035a16aa5e10c7c21
Reviewed-on: https://gerrit.libreoffice.org/34418
Tested-by: Jenkins 
Reviewed-by: Fakabbir Amin (Aeimi) 
Reviewed-by: Julien Nabet 

diff --git a/include/editeng/txtrange.hxx b/include/editeng/txtrange.hxx
index 0e959e7..9611a26 100644
--- a/include/editeng/txtrange.hxx
+++ b/include/editeng/txtrange.hxx
@@ -53,8 +53,8 @@ class EDITENG_DLLPUBLIC TextRanger
 sal_uInt16 nLower;  // Distance Text-Contour
 sal_uInt32 nPointCount; // Number of polygon points
 bool   bSimple : 1; // Just outside edge
-bool   bInner  : 1; // TRUE: Objekt inline (EditEngine);
-// FALSE: Objekt flow (StarWriter);
+bool   bInner  : 1; // TRUE: Object inline (EditEngine);
+// FALSE: Object flow (StarWriter);
 bool   bVertical :1;// for vertical writing mode
 
 TextRanger( const TextRanger& ) = delete;
diff --git a/include/sfx2/chalign.hxx b/include/sfx2/chalign.hxx
index 5572f11..d63646e 100644
--- a/include/sfx2/chalign.hxx
+++ b/include/sfx2/chalign.hxx
@@ -35,7 +35,7 @@ enum class SfxChildAlignment
 FIRSTRIGHT,
 TOP,  // for example Hyperlink-Builder, SplitWindow
 BOTTOM,   // for example SplitWindow
-TOOLBOXTOP,   // for example Objekt bar
+TOOLBOXTOP,   // for example Object bar
 TOOLBOXBOTTOM,
 LOWESTTOP,// for example Calc bar
 HIGHESTBOTTOM,// for example Status bar
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index 4ceb311..d36663a 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -36,7 +36,7 @@ enum class SdrSearchOptions
 DEEP = 0x0001, /* recursive into group objects */
 ALSOONMASTER = 0x0002, /* MasterPages are also scanned */
 WHOLEPAGE= 0x0004, /* Not just the ObjList of PageView */
-TESTMARKABLE = 0x0008, /* just markable Objekte/Punkte/Handles/... */
+TESTMARKABLE = 0x0008, /* just markable objects/points/handles/... */
 TESTMACRO= 0x0010, /* Just objects with macro */
 TESTTEXTEDIT = 0x0020, /* Just TextEdit-enabled objects */
 WITHTEXT = 0x0040, /* Just objects with text */
diff --git a/include/svx/unoprov.hxx b/include/svx/unoprov.hxx
index 9ac270c..38a5930 100644
--- a/include/svx/unoprov.hxx
+++ b/include/svx/unoprov.hxx
@@ -57,7 +57,7 @@ public:
 #define SVXMAP_POLYPOLYGONBEZIER5
 #define SVXMAP_GRAPHICOBJECT6
 #define SVXMAP_3DSCENEOBJECT7
-#define SVXMAP_3DCUBEOBJEKT 8
+#define SVXMAP_3DCUBEOBJECT 8
 #define SVXMAP_3DSPHEREOBJECT   9
 #define SVXMAP_3DLATHEOBJECT10
 #define SVXMAP_3DEXTRUDEOBJECT  11
diff --git a/sc/inc/datauno.hxx b/sc/inc/datauno.hxx
index 52c2604..34b7da8 100644
--- a/sc/inc/datauno.hxx
+++ b/sc/inc/datauno.hxx
@@ -65,7 +65,7 @@ public:
 static css::sheet::GeneralFunction SubTotalToGeneral( ScSubTotalFunc 
eSubTotal );
 };
 
-//  ImportDescriptor is not available as Uno-Objekt any longer, only 
Property-Sequence
+//  ImportDescriptor is not available as Uno-object any longer, only 
Property-Sequence
 
 class ScImportDescriptor
 {
@@ -79,7 +79,7 @@ public:
 static long GetPropertyCount() { return 4; }
 };
 
-//  SortDescriptor is not available as Uno-Objekt any longer, only 
Property-Sequence
+//  SortDescriptor is not

[Libreoffice-commits] core.git: include/editeng include/sfx2 vcl/osx vcl/source vcl/unx

2017-02-12 Thread Tor Lillqvist 
 include/editeng/svxacorr.hxx   |2 +-
 include/sfx2/emojiview.hxx |2 +-
 vcl/osx/salframeview.mm|2 +-
 vcl/source/font/fontcharmap.cxx|4 ++--
 vcl/source/gdi/pdfwriter_impl.cxx  |2 +-
 vcl/source/outdev/font.cxx |4 ++--
 vcl/unx/generic/fontmanager/fontconfig.cxx |   18 +-
 7 files changed, 17 insertions(+), 17 deletions(-)

New commits:
commit 6d15d4a6f6fbc163001ec082d55404481e64bed1
Author: Tor Lillqvist 
Date:   Sun Feb 12 12:55:00 2017 +0200

Get rid of "unicodes" in lower-case, too

Instead, use "code points" (if you mean full 21-bit Unicode code
points), or "code units" (if you mean the 16-bit units that make up
UTF-16). Hopefully I got it right which one was meant in each case
here.

Change-Id: I8ee7a98996f1cebcfb95cd7d18a56570e48fa390

diff --git a/include/editeng/svxacorr.hxx b/include/editeng/svxacorr.hxx
index beecd96..23b85d4 100644
--- a/include/editeng/svxacorr.hxx
+++ b/include/editeng/svxacorr.hxx
@@ -73,7 +73,7 @@ const long ChgWordLstLoad   = 0x2000;   // Replacement 
list loaded
 const long CplSttLstLoad= 0x4000;   // Exception list for Capital 
letters Start loaded
 const long WrdSttLstLoad= 0x8000;   // Exception list for Word Start 
loaded
 
-// TODO: handle unicodes > U+ and check users of this class
+// TODO: handle code points > U+ and check users of this class
 
 // only a mapping class
 class EDITENG_DLLPUBLIC SvxAutoCorrDoc
diff --git a/include/sfx2/emojiview.hxx b/include/sfx2/emojiview.hxx
index adb8306..1b0d0ac 100644
--- a/include/sfx2/emojiview.hxx
+++ b/include/sfx2/emojiview.hxx
@@ -59,7 +59,7 @@ public:
 
 virtual ~EmojiView () override;
 
-// Fill view with emoji unicodes
+// Fill view with emojis
 void Populate ();
 
 void setInsertEmojiHdl (const Link );
diff --git a/vcl/osx/salframeview.mm b/vcl/osx/salframeview.mm
index 1b16485..15d5733 100644
--- a/vcl/osx/salframeview.mm
+++ b/vcl/osx/salframeview.mm
@@ -1550,7 +1550,7 @@ SAL_WNODEPRECATED_DECLARATIONS_POP
 }
 if( nKeyCode != 0 )
 {
-// don't send unicodes in the private use area
+// don't send code points in the private use area
 if( keyChar >= 0xf700 && keyChar < 0xf780 )
 keyChar = 0;
 BOOL bRet = [self sendKeyToFrameDirect: nKeyCode character: 
keyChar modifiers: mpFrame->mnLastModifierFlags];
diff --git a/vcl/source/font/fontcharmap.cxx b/vcl/source/font/fontcharmap.cxx
index fa0fb5b..f30c4e6 100644
--- a/vcl/source/font/fontcharmap.cxx
+++ b/vcl/source/font/fontcharmap.cxx
@@ -287,7 +287,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
 
 if( aConverter && aCvtContext )
 {
-// determine the set of supported unicodes from encoded ranges
+// determine the set of supported code points from encoded ranges
 std::set aSupportedCodePoints;
 
 static const int NINSIZE = 64;
@@ -327,7 +327,7 @@ bool ParseCMAP( const unsigned char* pCmap, int nLength, 
CmapResult& rResult )
 rtl_destroyTextToUnicodeConverter( aCvtContext );
 rtl_destroyTextToUnicodeConverter( aConverter );
 
-// convert the set of supported unicodes to ranges
+// convert the set of supported code points to ranges
 std::vector aSupportedRanges;
 
 std::set::const_iterator itChar = 
aSupportedCodePoints.begin();
diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index dce4752..13bd2fe 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -3097,7 +3097,7 @@ sal_Int32 PDFWriterImpl::createToUnicodeCMap( sal_uInt8* 
pEncoding,
 aContents.append( '<' );
 appendHex( (sal_Int8)pEncoding[n], aContents );
 aContents.append( "> <" );
-// TODO: handle unicodes>U+
+// TODO: handle code points>U+
 sal_Int32 nIndex = pEncToUnicodeIndex[n];
 for( sal_Int32 j = 0; j < pCodeUnitsPerGlyph[n]; j++ )
 {
diff --git a/vcl/source/outdev/font.cxx b/vcl/source/outdev/font.cxx
index cea5665..1c04f05 100644
--- a/vcl/source/outdev/font.cxx
+++ b/vcl/source/outdev/font.cxx
@@ -1377,7 +1377,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( 
SalLayout* pSalLayout, ImplLay
 rLayoutArgs.PrepareFallback();
 rLayoutArgs.mnFlags |= SalLayoutFlags::ForFallback;
 
-// get list of unicodes that need glyph fallback
+// get list of code units that need glyph fallback
 int nCharPos = -1;
 bool bRTL = false;
 OUStringBuffer aMissingCodeBuf;
@@ -1388,7 +1388,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( 
SalLayout* pSalLayout, ImplLay
 
 FontSelectPattern aFontSelData = mpFontInstance->maFontSelData;
 
-// try if fallback

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

2017-02-02 Thread Tor Lillqvist 
 include/editeng/paragraphdata.hxx |8 
 1 file changed, 8 deletions(-)

New commits:
commit f0ef10cff6e43c78525082183034ccf927ca4d2b
Author: Tor Lillqvist 
Date:   Thu Feb 2 12:48:48 2017 +0200

Bin meaningless and non-informative comments

Two translations from German that didn't really say anything useful,
and two just pointless ones.

Change-Id: Ic2963805fbf8a576d73132e1c03872e5fa76ff70

diff --git a/include/editeng/paragraphdata.hxx 
b/include/editeng/paragraphdata.hxx
index a804133..6ea49eb 100644
--- a/include/editeng/paragraphdata.hxx
+++ b/include/editeng/paragraphdata.hxx
@@ -23,12 +23,6 @@
 #include 
 #include 
 
-// Only for internal use, oder some kind like hPara for the few
-// functions where you need it outside ( eg. moving paragraphs... )
-
-// Unfortunately NOT only local (formerly in outliner.hxx), but also
-// used in outlobj.hxx. Moved to own header
-
 class ParagraphData
 {
 friend class Paragraph;
@@ -45,10 +39,8 @@ public:
 
 ParagraphData& operator=( const ParagraphData& );
 
-// compare operator
 bool operator==(const ParagraphData& rCandidate) const;
 
-// data read access
 sal_Int16 getDepth() const { return nDepth; }
 };
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-13 Thread Eike Rathke 
 include/editeng/svxenum.hxx |   51 ++--
 1 file changed, 26 insertions(+), 25 deletions(-)

New commits:
commit ca18b2981256ed8ae2aa1421a83db426e1afd5b0
Author: Eike Rathke 
Date:   Tue Dec 13 19:42:17 2016 +0100

if they must match then ensure they do

Change-Id: I2d2cb285d8a5cb2f61aa9b8bd9bec0716b1f4c7a

diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index 0ad9fd1..63b1193 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -19,6 +19,7 @@
 #ifndef INCLUDED_EDITENG_SVXENUM_HXX
 #define INCLUDED_EDITENG_SVXENUM_HXX
 
+#include 
 
 enum SvxCaseMap
 {
@@ -150,31 +151,31 @@ enum class SvxSpellArea
  */
 enum SvxExtNumType
 {
-SVX_NUM_CHARS_UPPER_LETTER, // Counts from a-z, aa - az, ba - bz, ...
-SVX_NUM_CHARS_LOWER_LETTER,
-SVX_NUM_ROMAN_UPPER,
-SVX_NUM_ROMAN_LOWER,
-SVX_NUM_ARABIC,
-SVX_NUM_NUMBER_NONE,
-SVX_NUM_CHAR_SPECIAL,   // Bullet
-SVX_NUM_PAGEDESC,   // Numbering from the page template
-SVX_NUM_BITMAP,
-SVX_NUM_CHARS_UPPER_LETTER_N, // Counts from  a-z, aa-zz, aaa-zzz
-SVX_NUM_CHARS_LOWER_LETTER_N,
-SVX_NUM_TRANSLITERATION,
-SVX_NUM_NATIVE_NUMBERING,
-SVX_NUM_FULL_WIDTH_ARABIC,
-SVX_NUM_CIRCLE_NUMBER,
-SVX_NUM_NUMBER_LOWER_ZH,
-SVX_NUM_NUMBER_UPPER_ZH,
-SVX_NUM_NUMBER_UPPER_ZH_TW,
-SVX_NUM_TIAN_GAN_ZH,
-SVX_NUM_DI_ZI_ZH,
-SVX_NUM_NUMBER_TRADITIONAL_JA,
-SVX_NUM_AIU_FULLWIDTH_JA,
-SVX_NUM_AIU_HALFWIDTH_JA,
-SVX_NUM_IROHA_FULLWIDTH_JA,
-SVX_NUM_IROHA_HALFWIDTH_JA
+SVX_NUM_CHARS_UPPER_LETTER= 
css::style::NumberingType::CHARS_UPPER_LETTER,// Counts from a-z, aa - az, 
ba - bz, ...
+SVX_NUM_CHARS_LOWER_LETTER= 
css::style::NumberingType::CHARS_LOWER_LETTER,
+SVX_NUM_ROMAN_UPPER   = css::style::NumberingType::ROMAN_UPPER,
+SVX_NUM_ROMAN_LOWER   = css::style::NumberingType::ROMAN_LOWER,
+SVX_NUM_ARABIC= css::style::NumberingType::ARABIC,
+SVX_NUM_NUMBER_NONE   = css::style::NumberingType::NUMBER_NONE,
+SVX_NUM_CHAR_SPECIAL  = css::style::NumberingType::CHAR_SPECIAL,   
   // Bullet
+SVX_NUM_PAGEDESC  = 
css::style::NumberingType::PAGE_DESCRIPTOR,   // Numbering from the page 
template
+SVX_NUM_BITMAP= css::style::NumberingType::BITMAP,
+SVX_NUM_CHARS_UPPER_LETTER_N  = 
css::style::NumberingType::CHARS_UPPER_LETTER_N,  // Counts from  a-z, aa-zz, 
aaa-zzz
+SVX_NUM_CHARS_LOWER_LETTER_N  = 
css::style::NumberingType::CHARS_LOWER_LETTER_N,
+SVX_NUM_TRANSLITERATION   = css::style::NumberingType::TRANSLITERATION,
+SVX_NUM_NATIVE_NUMBERING  = 
css::style::NumberingType::NATIVE_NUMBERING,
+SVX_NUM_FULL_WIDTH_ARABIC = 
css::style::NumberingType::FULLWIDTH_ARABIC,
+SVX_NUM_CIRCLE_NUMBER = css::style::NumberingType::CIRCLE_NUMBER,
+SVX_NUM_NUMBER_LOWER_ZH   = css::style::NumberingType::NUMBER_LOWER_ZH,
+SVX_NUM_NUMBER_UPPER_ZH   = css::style::NumberingType::NUMBER_UPPER_ZH,
+SVX_NUM_NUMBER_UPPER_ZH_TW= 
css::style::NumberingType::NUMBER_UPPER_ZH_TW,
+SVX_NUM_TIAN_GAN_ZH   = css::style::NumberingType::TIAN_GAN_ZH,
+SVX_NUM_DI_ZI_ZH  = css::style::NumberingType::DI_ZI_ZH,
+SVX_NUM_NUMBER_TRADITIONAL_JA = 
css::style::NumberingType::NUMBER_TRADITIONAL_JA,
+SVX_NUM_AIU_FULLWIDTH_JA  = 
css::style::NumberingType::AIU_FULLWIDTH_JA,
+SVX_NUM_AIU_HALFWIDTH_JA  = 
css::style::NumberingType::AIU_HALFWIDTH_JA,
+SVX_NUM_IROHA_FULLWIDTH_JA= 
css::style::NumberingType::IROHA_FULLWIDTH_JA,
+SVX_NUM_IROHA_HALFWIDTH_JA= 
css::style::NumberingType::IROHA_HALFWIDTH_JA
 };
 
 #endif
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: include/editeng include/sfx2 include/svl include/svx include/vcl sc/source sfx2/source vcl/source

2016-11-03 Thread Noel Grandin 
 include/editeng/numitem.hxx|2 +-
 include/sfx2/childwin.hxx  |1 -
 include/sfx2/navigat.hxx   |1 -
 include/sfx2/objsh.hxx |2 +-
 include/svl/itempool.hxx   |2 +-
 include/svx/svdmrkv.hxx|2 +-
 include/svx/svdobj.hxx |2 +-
 include/svx/svdotext.hxx   |2 +-
 include/vcl/syswin.hxx |2 --
 sc/source/ui/inc/fupoor.hxx|2 +-
 sfx2/source/appl/childwin.cxx  |4 
 sfx2/source/dialog/navigat.cxx |   10 --
 vcl/source/window/brdwin.cxx   |3 ---
 vcl/source/window/syswin.cxx   |8 
 14 files changed, 7 insertions(+), 36 deletions(-)

New commits:
commit 880bcf9ed8c54f53d9fb631b9e064a468a9d02da
Author: Noel Grandin 
Date:   Wed Nov 2 16:35:25 2016 +0200

loplugin:unnecessaryvirtual

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

diff --git a/include/editeng/numitem.hxx b/include/editeng/numitem.hxx
index e687246..5466ae8 100644
--- a/include/editeng/numitem.hxx
+++ b/include/editeng/numitem.hxx
@@ -181,7 +181,7 @@ public:
 virtual voidSetGraphicBrush( const SvxBrushItem* pBrushItem, const 
Size* pSize = nullptr, const sal_Int16* pOrient = nullptr);
 const SvxBrushItem* GetBrush() const {return pGraphicBrush;}
 voidSetGraphic( const OUString& rName );
-virtual sal_Int16   GetVertOrient() const;
+sal_Int16   GetVertOrient() const;
 voidSetGraphicSize(const Size& rSet) {aGraphicSize = rSet;}
 const Size& GetGraphicSize() const {return aGraphicSize;}
 
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx
index 8a77f2e..3068d00 100644
--- a/include/sfx2/childwin.hxx
+++ b/include/sfx2/childwin.hxx
@@ -137,7 +137,6 @@ public:
 
 FloatingWindow* GetFloatingWindow() const;
 
-virtual voidResizing( Size& rSize );
 static void RegisterChildWindowContext(SfxModule*, sal_uInt16, 
SfxChildWinContextFactory*);
 };
 
diff --git a/include/sfx2/navigat.hxx b/include/sfx2/navigat.hxx
index 749adbf..8ba2193 100644
--- a/include/sfx2/navigat.hxx
+++ b/include/sfx2/navigat.hxx
@@ -46,7 +46,6 @@ public:
 WinBits nBits );
 
 virtual voidResize() override;
-virtual voidResizing( Size& rSize ) override;
 virtual boolClose() override;
 };
 
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index 20ec6e3..fe72c66 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -433,7 +433,7 @@ public:
 boolIsSecurityOptOpenReadOnly() const;
 voidSetSecurityOptOpenReadOnly( bool bOpenReadOnly 
= true );
 
-virtual SizeGetFirstPageSize();
+SizeGetFirstPageSize();
 boolDoClose();
 virtual voidPrepareReload();
 std::shared_ptr GetPreviewMetaFile( bool bFullContent = false 
) const;
diff --git a/include/svl/itempool.hxx b/include/svl/itempool.hxx
index 624ef08..e15bf82 100644
--- a/include/svl/itempool.hxx
+++ b/include/svl/itempool.hxx
@@ -146,7 +146,7 @@ public:
 const OUString& GetName() const;
 
 virtual const SfxPoolItem&  Put( const SfxPoolItem&, sal_uInt16 nWhich 
= 0 );
-virtual voidRemove( const SfxPoolItem& );
+voidRemove( const SfxPoolItem& );
 const SfxPoolItem&  GetDefaultItem( sal_uInt16 nWhich ) const;
 
 const SfxPoolItem*  LoadItem( SvStream ,
diff --git a/include/svx/svdmrkv.hxx b/include/svx/svdmrkv.hxx
index bb187a8..2213699 100644
--- a/include/svx/svdmrkv.hxx
+++ b/include/svx/svdmrkv.hxx
@@ -182,7 +182,7 @@ public:
 
 virtual void ClearPageView() override;
 virtual void HideSdrPage() override;
-virtual bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
+bool IsObjMarkable(SdrObject* pObj, SdrPageView* pPV) const;
 
 // Returns sal_True if objects, points or glue points are selected by 
drawing a frame
 // (as long as the frame is drawn).
diff --git a/include/svx/svdobj.hxx b/include/svx/svdobj.hxx
index 266f289..4855868 100644
--- a/include/svx/svdobj.hxx
+++ b/include/svx/svdobj.hxx
@@ -636,7 +636,7 @@ public:
 void ImpSetAnchorPos(const Point& rPnt);
 virtual void NbcSetAnchorPos(const Point& rPnt);
 virtual void SetAnchorPos(const Point& rPnt);
-virtual const Point& GetAnchorPos() const;
+const Point& GetAnchorPos() const;
 
 /// Snap is not done on the BoundRect but if possible on logic coordinates
 /// (i.e. without considering stroke width, ...)
diff --git a/include/svx/svdotext.hxx b/include/svx/svdotext.hxx
index ec316e9..ee5a393 100644
--- a/include/svx/svdotext.hxx

[Libreoffice-commits] core.git: include/editeng include/sfx2

2016-10-10 Thread Caolán McNamara 
 include/editeng/edtdlg.hxx   |1 -
 include/editeng/itemtype.hxx |1 -
 include/sfx2/sfxdlg.hxx  |1 -
 include/sfx2/viewfac.hxx |1 -
 4 files changed, 4 deletions(-)

New commits:
commit a1c77e9d3afd27b4b5603cffc6f3aea0577987fc
Author: Caolán McNamara 
Date:   Mon Oct 10 08:54:18 2016 +0100

drop some unused forward declarations and includes

Change-Id: Ibf5b915798f1a9554d06c705d454cbfb998ea277

diff --git a/include/editeng/edtdlg.hxx b/include/editeng/edtdlg.hxx
index da9d347..ea0c5ec 100644
--- a/include/editeng/edtdlg.hxx
+++ b/include/editeng/edtdlg.hxx
@@ -34,7 +34,6 @@ namespace com { namespace sun { namespace star { namespace 
linguistic2
 } } } }
 
 namespace vcl { class Window; }
-class ResId;
 class SvxSpellWrapper;
 class Button;
 class CheckBox;
diff --git a/include/editeng/itemtype.hxx b/include/editeng/itemtype.hxx
index eea1b0a..873d5cd 100644
--- a/include/editeng/itemtype.hxx
+++ b/include/editeng/itemtype.hxx
@@ -24,7 +24,6 @@
 
 // forward ---
 #include 
-#include 
 #include 
 #include 
 #include 
diff --git a/include/sfx2/sfxdlg.hxx b/include/sfx2/sfxdlg.hxx
index 5469ea3..071e3f8 100644
--- a/include/sfx2/sfxdlg.hxx
+++ b/include/sfx2/sfxdlg.hxx
@@ -36,7 +36,6 @@ class SfxTabPage;
 class SfxViewFrame;
 class SfxBindings;
 class SfxItemSet;
-class ResId;
 namespace vcl { class Window; }
 namespace rtl {
class OUString;
diff --git a/include/sfx2/viewfac.hxx b/include/sfx2/viewfac.hxx
index 541b18f..2bff0da 100644
--- a/include/sfx2/viewfac.hxx
+++ b/include/sfx2/viewfac.hxx
@@ -22,7 +22,6 @@
 #include 
 #include 
 #include 
-#include 
 
 class SfxViewFrame;
 class SfxViewShell;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-09-29 Thread Jochen Nitschke 
 include/editeng/unotext.hxx|2 +-
 include/sfx2/DocumentMetadataAccess.hxx|4 ++--
 include/sfx2/Metadatable.hxx   |5 ++---
 include/sfx2/docstoragemodifylistener.hxx  |4 ++--
 include/sfx2/sfxstatuslistener.hxx |4 ++--
 include/sfx2/sidebar/Accessible.hxx|4 ++--
 include/sfx2/sidebar/SidebarController.hxx |4 ++--
 include/sfx2/sidebar/SidebarPanelBase.hxx  |4 ++--
 include/sfx2/sidebar/Theme.hxx |4 ++--
 include/sfx2/sidebar/UnoDeck.hxx   |5 ++---
 include/sfx2/sidebar/UnoDecks.hxx  |5 ++---
 include/sfx2/sidebar/UnoPanel.hxx  |5 ++---
 include/sfx2/sidebar/UnoPanels.hxx |5 ++---
 include/sfx2/sidebar/UnoSidebar.hxx|5 ++---
 include/sfx2/unoctitm.hxx  |6 +++---
 include/svl/itemprop.hxx   |6 +++---
 include/svl/style.hxx  |6 +++---
 svl/source/items/style.cxx |2 +-
 18 files changed, 37 insertions(+), 43 deletions(-)

New commits:
commit 2bebc1fc2e76f73d953ca1e1f64803fd4c42a62c
Author: Jochen Nitschke 
Date:   Wed Sep 28 21:53:59 2016 +0200

tdf#88206 replace cppu::WeakImplHelper* in sfx2 and svl

some fallout in include/editeng/unotext.hxx
which uses WeakAggImplHelper1 from implbase1.hxx

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

diff --git a/include/editeng/unotext.hxx b/include/editeng/unotext.hxx
index 20ee791..6bd0baa 100644
--- a/include/editeng/unotext.hxx
+++ b/include/editeng/unotext.hxx
@@ -44,7 +44,7 @@
 #include 
 #include 
 #include 
-#include 
+#include 
 #include 
 #include 
 #include 
diff --git a/include/sfx2/DocumentMetadataAccess.hxx 
b/include/sfx2/DocumentMetadataAccess.hxx
index 7af6e32..973808d 100644
--- a/include/sfx2/DocumentMetadataAccess.hxx
+++ b/include/sfx2/DocumentMetadataAccess.hxx
@@ -28,7 +28,7 @@
 #include 
 #include 
 
-#include 
+#include 
 
 #include 
 
@@ -69,7 +69,7 @@ createBaseURI(
 struct DocumentMetadataAccess_Impl;
 
 class SFX2_DLLPUBLIC DocumentMetadataAccess :
-public ::cppu::WeakImplHelper1< css::rdf::XDocumentMetadataAccess>
+public cppu::WeakImplHelper
 {
 DocumentMetadataAccess(const DocumentMetadataAccess&) = delete;
 DocumentMetadataAccess& operator=( const DocumentMetadataAccess& ) = 
delete;
diff --git a/include/sfx2/Metadatable.hxx b/include/sfx2/Metadatable.hxx
index 2d7bc54..b838c9f 100644
--- a/include/sfx2/Metadatable.hxx
+++ b/include/sfx2/Metadatable.hxx
@@ -23,7 +23,7 @@
 
 #include 
 
-#include 
+#include 
 #include 
 
 #include 
@@ -135,8 +135,7 @@ private:
Metadatable.
  */
 class SFX2_DLLPUBLIC MetadatableMixin :
-public ::cppu::WeakImplHelper1<
-css::rdf::XMetadatable>
+public cppu::WeakImplHelper
 {
 
 public:
diff --git a/include/sfx2/docstoragemodifylistener.hxx 
b/include/sfx2/docstoragemodifylistener.hxx
index 4733e2a..fa1a291 100644
--- a/include/sfx2/docstoragemodifylistener.hxx
+++ b/include/sfx2/docstoragemodifylistener.hxx
@@ -24,7 +24,7 @@
 
 #include 
 
-#include 
+#include 
 
 namespace comphelper { class SolarMutex; }
 
@@ -50,7 +50,7 @@ namespace sfx2
 
 //= DocumentStorageModifyListener
 
-typedef ::cppu::WeakImplHelper1 < css::util::XModifyListener > 
DocumentStorageModifyListener_Base;
+typedef cppu::WeakImplHelper 
DocumentStorageModifyListener_Base;
 
 class SFX2_DLLPUBLIC DocumentStorageModifyListener : public 
DocumentStorageModifyListener_Base
 {
diff --git a/include/sfx2/sfxstatuslistener.hxx 
b/include/sfx2/sfxstatuslistener.hxx
index ab9cb1e..c5a18e9 100644
--- a/include/sfx2/sfxstatuslistener.hxx
+++ b/include/sfx2/sfxstatuslistener.hxx
@@ -30,9 +30,9 @@
 #include 
 #include 
 
-#include 
+#include 
 
-class SFX2_DLLPUBLIC SfxStatusListener : public ::cppu::WeakImplHelper2<
+class SFX2_DLLPUBLIC SfxStatusListener : public cppu::WeakImplHelper<
   css::frame::XStatusListener,
   css::lang::XComponent>
 {
diff --git a/include/sfx2/sidebar/Accessible.hxx 
b/include/sfx2/sidebar/Accessible.hxx
index eaa3f52..cb1d729 100644
--- a/include/sfx2/sidebar/Accessible.hxx
+++ b/include/sfx2/sidebar/Accessible.hxx
@@ -22,12 +22,12 @@
 #include 
 #include 
 
-#include 
+#include 
 #include 
 
 namespace
 {
-typedef ::cppu::WeakComponentImplHelper1 <
+typedef cppu::WeakComponentImplHelper <
 css::accessibility::XAccessible
 > AccessibleInterfaceBase;
 }
diff --git a/include/sfx2/sidebar/SidebarController.hxx 
b/include/sfx2/sidebar/SidebarController.hxx
index c32e9c4..6b64fde 100644
--- a/include/sfx2/sidebar/SidebarController.hxx
+++ b/include/sfx2/sidebar/SidebarController.hxx
@@ -38,13 +38,13 @@
 #include 
 
 #include 
-#include

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

2016-09-16 Thread Stephan Bergmann 
 include/editeng/outliner.hxx |2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 1ba11723b89497f045cc10d548eb4228986af608
Author: Stephan Bergmann 
Date:   Fri Sep 16 15:23:09 2016 +0200

Missing include

Change-Id: Ia4b86b8a6c8cc5ae87284080a31f8ddf9d99455d

diff --git a/include/editeng/outliner.hxx b/include/editeng/outliner.hxx
index a0eef10..a9e8e3b 100644
--- a/include/editeng/outliner.hxx
+++ b/include/editeng/outliner.hxx
@@ -39,6 +39,8 @@
 #include 
 
 #include 
+
+#include 
 #include 
 
 class OutlinerEditEng;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-08-15 Thread Noel Grandin 
 include/editeng/svxenum.hxx|7 ---
 sw/inc/modcfg.hxx  |   13 ++---
 sw/inc/swmodule.hxx|6 +++---
 sw/source/core/doc/doccomp.cxx |   11 ++-
 sw/source/ui/config/optpage.cxx|   18 +-
 sw/source/uibase/app/swmodul1.cxx  |2 +-
 sw/source/uibase/config/modcfg.cxx |4 ++--
 7 files changed, 31 insertions(+), 30 deletions(-)

New commits:
commit ea2604180089ec749086f868a17ffef7cbcbbc47
Author: Noel Grandin 
Date:   Mon Aug 15 13:04:50 2016 +0200

convert SvxCompareMode to scoped enum

and move it to SW since it is only used there

Change-Id: I9cc7869564e24a8ce733f30ef453751a854cf7e0

diff --git a/include/editeng/svxenum.hxx b/include/editeng/svxenum.hxx
index d1a7978..9dd15ec 100644
--- a/include/editeng/svxenum.hxx
+++ b/include/editeng/svxenum.hxx
@@ -206,13 +206,6 @@ enum SvxExtNumType
 SVX_NUM_IROHA_HALFWIDTH_JA
 };
 
-enum SvxCompareMode
-{
-SVX_CMP_AUTO = 0,
-SVX_CMP_BY_WORD,
-SVX_CMP_BY_CHAR
-};
-
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index 543e6af..8cec996 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -88,11 +88,18 @@ public:
 voidSetModified(){ConfigItem::SetModified();}
 };
 
+enum class SwCompareMode
+{
+Auto = 0,
+ByWord,
+ByChar
+};
+
 class SwCompareConfig : public utl::ConfigItem
 {
 friend class SwModuleOptions;
 
-sal_uInt16  eCmpMode;   //Compare/CompareDocuments;
+SwCompareMode  eCmpMode;   //Compare/CompareDocuments;
 boolbUseRsid;   //Compare/Settings/Use RSID
 /// Compare/Settings/Store RSID
 boolm_bStoreRsid;
@@ -349,8 +356,8 @@ public:
 boolIsHideFieldTips() const {return bHideFieldTips;}
 voidSetHideFieldTips(bool bSet) {bHideFieldTips = bSet;}
 
-SvxCompareMode  GetCompareMode() const { return 
(SvxCompareMode)aCompareConfig.eCmpMode; }
-voidSetCompareMode( SvxCompareMode eMode ) { 
aCompareConfig.eCmpMode = eMode;
+SwCompareMode  GetCompareMode() const { return aCompareConfig.eCmpMode; }
+voidSetCompareMode( SwCompareMode eMode ) { 
aCompareConfig.eCmpMode = eMode;
  
aCompareConfig.SetModified(); }
 
 boolIsUseRsid() const { return aCompareConfig.bUseRsid; }
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index c749f9e..8ecbc46 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -18,6 +18,7 @@
  */
 #ifndef INCLUDED_SW_INC_SWMODULE_HXX
 #define INCLUDED_SW_INC_SWMODULE_HXX
+
 #include 
 #include 
 #include 
@@ -28,7 +29,6 @@
 #include 
 #include 
 #include 
-#include 
 
 class Color;
 class SfxItemSet;
@@ -51,7 +51,7 @@ namespace svtools{ class ColorConfig;}
 class SvtAccessibilityOptions;
 class SvtCTLOptions;
 class SvtUserOptions;
-
+enum class SwCompareMode;
 struct SwDBData;
 
 enum class SvViewOpt {
@@ -199,7 +199,7 @@ public:
 sal_uInt16  GetRedlineMarkPos();
 const Color&GetRedlineMarkColor();
 
-SvxCompareMode  GetCompareMode() const;
+SwCompareMode  GetCompareMode() const;
 boolIsUseRsid() const;
 boolIsIgnorePieces() const;
 sal_uInt16  GetPieceLen() const;
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index c92b733..5274aba 100644
--- a/sw/source/core/doc/doccomp.cxx
+++ b/sw/source/core/doc/doccomp.cxx
@@ -39,6 +39,7 @@
 #include 
 #include 
 #include 
+#include 
 
 #include 
 #include 
@@ -313,7 +314,7 @@ public:
 /// Options set in Tools->Options->Writer->Comparison
 struct CmpOptionsContainer
 {
-SvxCompareMode eCmpMode;
+SwCompareMode eCmpMode;
 int nIgnoreLen;
 bool bUseRsid;
 } CmpOptions;
@@ -1308,7 +1309,7 @@ bool SwCompareLine::ChangesInLine( const SwCompareLine& 
rLine,
 std::vector aLcsDst( nMinLen + 1 );
 std::vector aLcsSrc( nMinLen + 1 );
 
-if( CmpOptions.eCmpMode == SVX_CMP_BY_WORD )
+if( CmpOptions.eCmpMode == SwCompareMode::ByWord )
 {
 std::vector aTmpLcsDst( nMinLen + 1 );
 std::vector aTmpLcsSrc( nMinLen + 1 );
@@ -1814,17 +1815,17 @@ long SwDoc::CompareDoc( const SwDoc& rDoc )
 
 // Get comparison options
 CmpOptions.eCmpMode = SW_MOD()->GetCompareMode();
-if( CmpOptions.eCmpMode == SVX_CMP_AUTO )
+if( CmpOptions.eCmpMode == SwCompareMode::Auto )
 {
 if( getRsidRoot() == rDoc.getRsidRoot() )
 {
-CmpOptions.eCmpMode = SVX_CMP_BY_CHAR;
+CmpOptions.eCmpMode = SwCompareMode::ByChar;
 CmpOptions.bUseRsid = true;
 CmpOptions.nIgnoreLen = 2;
 }
 else
 {
-CmpOptions.eCmpMode = SVX_CMP_BY_WORD;
+CmpOptions.eCmpMode = SwCompareMode::ByWord;

[Libreoffice-commits] core.git: include/editeng sc/source sd/source svx/source sw/inc sw/source

2016-07-27 Thread Caolán McNamara 
 include/editeng/paragraphdata.hxx |2 +-
 sc/source/filter/excel/xiescher.cxx   |3 +--
 sd/source/ui/tools/PreviewRenderer.cxx|2 +-
 svx/source/svdraw/svdmrkv.cxx |6 +++---
 svx/source/unodraw/UnoGraphicExporter.cxx |2 +-
 svx/source/xoutdev/xtabdash.cxx   |2 +-
 sw/inc/swunohelper.hxx|2 +-
 sw/source/core/graphic/ndgrf.cxx  |2 +-
 8 files changed, 10 insertions(+), 11 deletions(-)

New commits:
commit 8bb1726007f641dff2aa17d2e79a089e09fd9770
Author: Caolán McNamara 
Date:   Wed Jul 27 12:48:32 2016 +0100

formally->formerly

Change-Id: I1d631f8dd09193c57b7b65e3202ed080ce15861b

diff --git a/include/editeng/paragraphdata.hxx 
b/include/editeng/paragraphdata.hxx
index d08bdaf..a804133 100644
--- a/include/editeng/paragraphdata.hxx
+++ b/include/editeng/paragraphdata.hxx
@@ -26,7 +26,7 @@
 // Only for internal use, oder some kind like hPara for the few
 // functions where you need it outside ( eg. moving paragraphs... )
 
-// Unfortunately NOT only local (formally in outliner.hxx), but also
+// Unfortunately NOT only local (formerly in outliner.hxx), but also
 // used in outlobj.hxx. Moved to own header
 
 class ParagraphData
diff --git a/sc/source/filter/excel/xiescher.cxx 
b/sc/source/filter/excel/xiescher.cxx
index 52a5ab5..30ccf35 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -3410,8 +3410,7 @@ SdrObjectPtr XclImpDffConverter::CreateSdrObject( const 
XclImpPictureObj& rPicOb
  Reference< XFormComponent >  xFComp;
  css::awt::Size aSz;  // not used in import
  ReadOCXCtlsStream( mxCtlsStrm, xFComp, 
rPicObj.GetCtlsStreamPos(),  rPicObj.GetCtlsStreamSize() );
- // recreate the method formally known as
- // ReadOCXExcelKludgeStream( )
+ // recreate the method formerly known as 
ReadOCXExcelKludgeStream()
  if ( xFComp.is() )
  {
  ScfPropertySet aPropSet( xFComp );
diff --git a/sd/source/ui/tools/PreviewRenderer.cxx 
b/sd/source/ui/tools/PreviewRenderer.cxx
index bfa61b6..7cc72e0 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -255,7 +255,7 @@ bool PreviewRenderer::Initialize (
 return false;
 
 // #i121224# No need to set SetApplicationBackgroundColor (which is the 
color
-// of the area 'behind' the page (formally called 'Wiese') since the page 
previews
+// of the area 'behind' the page (formerly called 'Wiese') since the page 
previews
 // produced exactly cover the page's area, so it would never be visible. 
What
 // needs to be set is the ApplicationDocumentColor which is derived from
 // svtools::DOCCOLOR normally
diff --git a/svx/source/svdraw/svdmrkv.cxx b/svx/source/svdraw/svdmrkv.cxx
index 2e495ff..3819f47 100644
--- a/svx/source/svdraw/svdmrkv.cxx
+++ b/svx/source/svdraw/svdmrkv.cxx
@@ -690,12 +690,12 @@ void SdrMarkView::SetMarkHandles()
 // Using a strict return statement is okay here; no handles means *no* 
handles.
 if(mpMarkedObj)
 {
-// formally #i33755#: If TextEdit is active the EditEngine will 
directly paint
+// formerly #i33755#: If TextEdit is active the EditEngine will 
directly paint
 // to the window, so suppress Overlay and handles completely; a 
text frame for
 // the active text edit will be painted by the repaint mechanism in
 // SdrObjEditView::ImpPaintOutlinerView in this case. This needs 
to be reworked
 // in the future
-// Also formally #122142#: Pretty much the same for 
SdrCaptionObj's in calc.
+// Also formerly #122142#: Pretty much the same for 
SdrCaptionObj's in calc.
 if(static_cast(this)->IsTextEdit())
 {
 const SdrTextObj* pSdrTextObj = dynamic_cast< const 
SdrTextObj* >(mpMarkedObj);
@@ -715,7 +715,7 @@ void SdrMarkView::SetMarkHandles()
 }
 }
 
-// formally #i118524#: if inplace activated OLE is selected, 
suppress handles
+// formerly #i118524#: if inplace activated OLE is selected, 
suppress handles
 const SdrOle2Obj* pSdrOle2Obj = dynamic_cast< const SdrOle2Obj* 
>(mpMarkedObj);
 
 if(pSdrOle2Obj && (pSdrOle2Obj->isInplaceActive() || 
pSdrOle2Obj->isUiActive()))
diff --git a/svx/source/unodraw/UnoGraphicExporter.cxx 
b/svx/source/unodraw/UnoGraphicExporter.cxx
index 8dd270a..3d734ad 100644
--- a/svx/source/unodraw/UnoGraphicExporter.cxx
+++ b/svx/source/unodraw/UnoGraphicExporter.cxx
@@ -745,7 +745,7 @@ bool GraphicExporter::GetGraphic( ExportSettings& 
rSettings, Graphic& aGraphic,
 pView->ShowSdrPage( pPage );
 
 // tdf#96922 completely

  1   2   >