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

2023-07-08 Thread Caolán McNamara (via logerrit) 
 svx/sdi/svx.sdi |8 
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit b1d93832e5f1d1a38d1a93f41753d15c134ca9f1
Author: Caolán McNamara 
AuthorDate: Fri Jul 7 21:01:30 2023 +0100
Commit: Caolán McNamara 
CommitDate: Sat Jul 8 10:35:51 2023 +0200

make SID_ATTR_TRANSFORM_POS_* and SID_ATTR_TRANSFORM_ROT_* SfxInt32Item too

to be consistent with findings from:

commit c64828a1cf55e9252e7acd236e3331f2635ae249 (origin/master, origin/HEAD)
Date:   Fri Jul 7 17:05:10 2023 +0100

ubsan: SID_ATTR_TRANSFORM_POS_X is SfxInt32Item not SfxUInt32Item

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 636c6b87923a..1bd70a35c084 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -11953,7 +11953,7 @@ XLineEndItem LineEnd SID_ATTR_LINE_END
 
 
 
-SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X
+SfxInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
@@ -11972,7 +11972,7 @@ SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X
 
 
 
-SfxUInt32Item TransformPosY SID_ATTR_TRANSFORM_POS_Y
+SfxInt32Item TransformPosY SID_ATTR_TRANSFORM_POS_Y
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
@@ -12048,7 +12048,7 @@ SdrAngleItem TransformRotationAngle 
SID_ATTR_TRANSFORM_ANGLE
 
 
 
-SfxUInt32Item TransformRotationX SID_ATTR_TRANSFORM_ROT_X
+SfxInt32Item TransformRotationX SID_ATTR_TRANSFORM_ROT_X
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
@@ -12067,7 +12067,7 @@ SfxUInt32Item TransformRotationX 
SID_ATTR_TRANSFORM_ROT_X
 
 
 
-SfxUInt32Item TransformRotationY SID_ATTR_TRANSFORM_ROT_Y
+SfxInt32Item TransformRotationY SID_ATTR_TRANSFORM_ROT_Y
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,

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

2023-07-07 Thread Caolán McNamara (via logerrit) 
 svx/sdi/svx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c64828a1cf55e9252e7acd236e3331f2635ae249
Author: Caolán McNamara 
AuthorDate: Fri Jul 7 17:05:10 2023 +0100
Commit: Caolán McNamara 
CommitDate: Fri Jul 7 21:22:37 2023 +0200

ubsan: SID_ATTR_TRANSFORM_POS_X is SfxInt32Item not SfxUInt32Item

in online, insert smiley face in to calc and drag it around the
spreadsheet

include/svl/itemset.hxx:162:20: runtime error: downcast of address 
0x603001c19b30 which does not point to an object of type 'const SfxInt32Item'
0x603001c19b30: note: object is of type 'SfxUInt32Item'
 00 00 00 00  68 3c 7a e8 56 7f 00 00  01 00 00 00 68 27 00 be  9e 2e 00 00 
be be be be  2b cd bc 9c
  ^~~
  vptr for 'SfxUInt32Item'
SUMMARY: UndefinedBehaviorSanitizer: undefined-behavior 
include/svl/itemset.hxx:162:20 in

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 96505b757c61..636c6b87923a 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8849,7 +8849,7 @@ SvxULSpaceItem TopBottomMargin SID_ATTR_ULSPACE
 
 
 SfxVoidItem TransformDialog SID_ATTR_TRANSFORM
-(SfxUInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X,SfxUInt32Item 
TransformPosY SID_ATTR_TRANSFORM_POS_Y,SfxUInt32Item TransformWidth 
SID_ATTR_TRANSFORM_WIDTH, SfxUInt32Item TransformHeight 
SID_ATTR_TRANSFORM_HEIGHT,SdrAngleItem TransformRotationDeltaAngle 
SID_ATTR_TRANSFORM_DELTA_ANGLE,SdrAngleItem TransformRotationAngle 
SID_ATTR_TRANSFORM_ANGLE,SfxUInt32Item TransformRotationX 
SID_ATTR_TRANSFORM_ROT_X,SfxUInt32Item TransformRotationY 
SID_ATTR_TRANSFORM_ROT_Y)
+(SfxInt32Item TransformPosX SID_ATTR_TRANSFORM_POS_X, SfxInt32Item 
TransformPosY SID_ATTR_TRANSFORM_POS_Y, SfxUInt32Item TransformWidth 
SID_ATTR_TRANSFORM_WIDTH, SfxUInt32Item TransformHeight 
SID_ATTR_TRANSFORM_HEIGHT, SdrAngleItem TransformRotationDeltaAngle 
SID_ATTR_TRANSFORM_DELTA_ANGLE, SdrAngleItem TransformRotationAngle 
SID_ATTR_TRANSFORM_ANGLE, SfxInt32Item TransformRotationX 
SID_ATTR_TRANSFORM_ROT_X, SfxInt32Item TransformRotationY 
SID_ATTR_TRANSFORM_ROT_Y)
 [
 AutoUpdate = FALSE,
 FastCall = TRUE,

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

2023-06-08 Thread Tomaž Vajngerl (via logerrit) 
 svx/sdi/svxitems.sdi |8 -
 svx/source/xoutdev/xattr.cxx |   64 ++-
 2 files changed, 65 insertions(+), 7 deletions(-)

New commits:
commit ac2838a9cd5577f92dbece130fa6fb8b8e26e6cd
Author: Tomaž Vajngerl 
AuthorDate: Thu Jun 8 15:17:38 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 8 11:13:28 2023 +0200

svx: add "Color" and "ComplexColorJSON" argument for XColorItem

This is needed now that the color picker expects this argument to
be present. Without the "ComplexColorJSON" argument, it is not
possible for the color picker to set any ComplexColor attributes,
which is needed for theme support.

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

diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index eabb753f647a..6e8773315d29 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -214,7 +214,13 @@ item String SvxPatternListItem;
 item String SfxLockBytesItem;
 item String SvxFontListItem;
 item String avmedia_MediaItem;
-item INT32  XColorItem;
+struct XColor
+{
+INT32  ColorMID_COLOR_RGB;
+String ComplexColorJSON MID_COMPLEX_COLOR_JSON;
+};
+item XColor XColorItem;
+
 item INT16  SdrPercentItem;
 item INT32  SdrMetricItem;
 
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index d3fd73f5fa04..3cb12c467b74 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -306,18 +306,70 @@ const Color& XColorItem::GetColorValue() const
 
 }
 
-bool XColorItem::QueryValue( css::uno::Any& rVal, sal_uInt8 /*nMemberId*/) 
const
+bool XColorItem::QueryValue( css::uno::Any& rVal, sal_uInt8 nMemberId) const
 {
-rVal <<= GetColorValue().GetRGBColor();
+nMemberId &= ~CONVERT_TWIPS;
+switch (nMemberId)
+{
+case MID_COMPLEX_COLOR:
+{
+auto xComplexColor = 
model::color::createXComplexColor(getComplexColor());
+rVal <<= xComplexColor;
+break;
+}
+case MID_COMPLEX_COLOR_JSON:
+{
+rVal <<= 
OStringToOUString(model::color::convertToJSON(getComplexColor()), 
RTL_TEXTENCODING_UTF8);
+break;
+}
+default:
+{
+rVal <<= GetColorValue().GetRGBColor();
+break;
+}
+}
 return true;
 }
 
-bool XColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 /*nMemberId*/)
+bool XColorItem::PutValue( const css::uno::Any& rVal, sal_uInt8 nMemberId)
 {
-Color nValue;
-rVal >>= nValue;
-SetColorValue( nValue );
+nMemberId &= ~CONVERT_TWIPS;
+switch (nMemberId)
+{
+case MID_COMPLEX_COLOR:
+{
+css::uno::Reference xComplexColor;
+if (!(rVal >>= xComplexColor))
+return false;
+setComplexColor(model::color::getFromXComplexColor(xComplexColor));
+}
+break;
+case MID_COMPLEX_COLOR_JSON:
+{
+OUString sComplexColorJson;
+if (!(rVal >>= sComplexColorJson))
+return false;
+
+if (sComplexColorJson.isEmpty())
+return false;
+
+OString aJSON = OUStringToOString(sComplexColorJson, 
RTL_TEXTENCODING_ASCII_US);
+model::ComplexColor aComplexColor;
+model::color::convertFromJSON(aJSON, aComplexColor);
+setComplexColor(aComplexColor);
+}
+break;
+default:
+{
+Color nValue;
+if(!(rVal >>= nValue ))
+return false;
+
+SetColorValue( nValue );
 
+}
+break;
+}
 return true;
 }

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

2023-06-07 Thread Tomaž Vajngerl (via logerrit) 
 svx/sdi/xoitems.sdi|   16 +++--
 svx/source/tbxctrls/PaletteManager.cxx |2 +
 svx/source/xoutdev/xattr.cxx   |   40 +
 3 files changed, 56 insertions(+), 2 deletions(-)

New commits:
commit 5a2c6f4df7149f8c1f543f120fe19bd66abfc189
Author: Tomaž Vajngerl 
AuthorDate: Thu Jun 8 01:36:27 2023 +0900
Commit: Tomaž Vajngerl 
CommitDate: Thu Jun 8 01:21:44 2023 +0200

tdf#155404 handle ComplexColor as JSON for XLineColor and XFillColor

This adds support for MID_COMPLEX_COLOR_JSON attribute for
XLineColorItem and XFillColorItem, which makes it possible to set
a theme colors from the UI also for fills and lines.

In addition this resolved the issue tdf#155404 which had the effect
that unsupported "Color" attribute for the UNO call resulted that
the dialog was opened. This is now not the case anymore as the
"Color" argument for XLineColorItem and XFillColorItem was added
in addition to "ComplexColorJSON" argument.

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

diff --git a/svx/sdi/xoitems.sdi b/svx/sdi/xoitems.sdi
index 015ead6e0d72..50db129a6434 100644
--- a/svx/sdi/xoitems.sdi
+++ b/svx/sdi/xoitems.sdi
@@ -24,7 +24,13 @@ struct XFillBitmap
 };
 item XFillBitmap XFillBitmapItem;
 
-item INT32  XFillColorItem; // XColorItem
+struct XFillColor
+{
+INT32 Color MID_COLOR_RGB;
+String ComplexColorJSON MID_COMPLEX_COLOR_JSON;
+};
+
+item XFillColor XFillColorItem; // XColorItem
 
 enum SvxGradientStyle
 {
@@ -84,7 +90,13 @@ item SvxFillStyle XFillStyleItem;
 
 //item String XLineAttrSetItem; SfxSetItem!
 
-item INT32  XLineColorItem;
+struct XLineColor
+{
+INT32  Color MID_COLOR_RGB;
+String ComplexColorJSON MID_COMPLEX_COLOR_JSON;
+};
+
+item XLineColor XLineColorItem;
 
 enum SvxDashStyle
 {
diff --git a/svx/source/tbxctrls/PaletteManager.cxx 
b/svx/source/tbxctrls/PaletteManager.cxx
index b56248825600..141938d145d7 100644
--- a/svx/source/tbxctrls/PaletteManager.cxx
+++ b/svx/source/tbxctrls/PaletteManager.cxx
@@ -427,6 +427,8 @@ void PaletteManager::DispatchColorCommand(const OUString& 
aCommand, const NamedC
 comphelper::makePropertyValue(aObj.GetURLPath()+ ".Color", 
sal_Int32(rColor.m_aColor)),
 };
 
+printf ("Sending: %s\n", aObj.GetURLPath().toUtf8().getStr());
+
 if (rColor.m_nThemeIndex != -1)
 {
 model::ComplexColor aComplexColor;
diff --git a/svx/source/xoutdev/xattr.cxx b/svx/source/xoutdev/xattr.cxx
index 4860373836a8..d3fd73f5fa04 100644
--- a/svx/source/xoutdev/xattr.cxx
+++ b/svx/source/xoutdev/xattr.cxx
@@ -37,6 +37,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -1002,6 +1003,11 @@ bool XLineColorItem::QueryValue( css::uno::Any& rVal, 
sal_uInt8 nMemberId) const
 rVal <<= xComplexColor;
 break;
 }
+case MID_COMPLEX_COLOR_JSON:
+{
+rVal <<= 
OStringToOUString(model::color::convertToJSON(getComplexColor()), 
RTL_TEXTENCODING_UTF8);
+break;
+}
 default:
 {
 rVal <<= GetColorValue().GetRGBColor();
@@ -1024,6 +1030,20 @@ bool XLineColorItem::PutValue( const css::uno::Any& 
rVal, sal_uInt8 nMemberId)
 setComplexColor(model::color::getFromXComplexColor(xComplexColor));
 }
 break;
+case MID_COMPLEX_COLOR_JSON:
+{
+OUString sComplexColorJson;
+if (!(rVal >>= sComplexColorJson))
+return false;
+
+if (sComplexColorJson.isEmpty())
+return false;
+model::ComplexColor aComplexColor;
+OString aJSON = OUStringToOString(sComplexColorJson, 
RTL_TEXTENCODING_ASCII_US);
+model::color::convertFromJSON(aJSON, aComplexColor);
+setComplexColor(aComplexColor);
+}
+break;
 default:
 {
 sal_Int32 nValue;
@@ -1985,6 +2005,11 @@ bool XFillColorItem::QueryValue( css::uno::Any& rVal, 
sal_uInt8 nMemberId ) cons
 rVal <<= xComplexColor;
 break;
 }
+case MID_COMPLEX_COLOR_JSON:
+{
+rVal <<= 
OStringToOUString(model::color::convertToJSON(getComplexColor()), 
RTL_TEXTENCODING_UTF8);
+break;
+}
 default:
 {
 rVal <<= GetColorValue().GetRGBColor();
@@ -2034,6 +2059,21 @@ bool XFillColorItem::PutValue( const css::uno::Any& 
rVal, sal_uInt8 nMemberId )
 setComplexColor(model::color::getFromXComplexColor(xComplexColor));
 }
 break;
+case MID_COMPLEX_COLOR_JSON:
+{
+OUString sComplexColorJson;
+if (!(rVal >>= sComplexColorJson))
+return false;
+
+if (sComplexColorJson.isEmpty())
+

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

2023-05-03 Thread Justin Luth (via logerrit) 
 svx/sdi/svxitems.sdi |1 +
 1 file changed, 1 insertion(+)

New commits:
commit 2f474d5690d0c9850ef82efa26f2f82580c09a8d
Author: Justin Luth 
AuthorDate: Wed May 3 16:40:58 2023 -0400
Commit: Justin Luth 
CommitDate: Wed May 3 23:45:23 2023 +0200

tdf#127322 svx: add back MID_GRAPHIC_URL to SvxBrush

This fixes the problem where gallery images
could not be set as page or paragraph backgrounds.

This URL attribute was removed in LO 6.1 with
author  Tomaž Vajngerl on 2018-03-09 09:41:44 +0100
commit c7ff07b2dab639b901c80f1f62efee4dd3ad549b
remove MID_GRAPHIC_URL and related mappings, implementation

Most of this was restored shortly thereafter with
author  Tomaž Vajngerl on 2018-05-07 16:30:35 +0200
commit  7a8ed362eb163ac15a000ba1cfc74b58315800a1 (patch)
[API CHANGE] revert and deprecate *BackGraphicURL add *BackGraphic

However, this piece wasn't restored.

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

diff --git a/svx/sdi/svxitems.sdi b/svx/sdi/svxitems.sdi
index a26c02c46ebb..f21f977384c7 100644
--- a/svx/sdi/svxitems.sdi
+++ b/svx/sdi/svxitems.sdi
@@ -239,6 +239,7 @@ struct SvxBrush
 {
 BOOLTransparent MID_GRAPHIC_TRANSPARENT;
 INT32   BackColor   MID_BACK_COLOR;
+String  URL MID_GRAPHIC_URL;
 String  Filtername  MID_GRAPHIC_FILTER;
 INT16   PositionMID_GRAPHIC_POSITION;
 };

[Libreoffice-commits] core.git: svx/sdi sw/sdi

2023-01-18 Thread Justin Luth (via logerrit) 
 svx/sdi/svx.sdi|   13 +
 sw/sdi/swriter.sdi |2 ++
 2 files changed, 15 insertions(+)

New commits:
commit ec6d1156b70b0abeb60d2c481392e538328eabac
Author: Justin Luth 
AuthorDate: Mon Jan 16 13:17:42 2023 -0500
Commit: Miklos Vajna 
CommitDate: Wed Jan 18 14:13:52 2023 +

document svx.sdi with link to SDI slot config details

UI stuff is a total black box,
so most of the config is just copy/pasted from a similar function,
with nothing to indicate what any of it means or does.

Miklos pointed me to this documentation,
so I've dumped it here so that there are a few breadcrumbs
pointing to the specs for what this stuff means.

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 6710fdf145a7..d86ce1df20f4 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -15,6 +15,19 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
+/*
+ * See 
https://wiki.openoffice.org/wiki/Framework/Article/Implementation_of_the_Dispatch_API_In_SFX2#Slot_definitions
+ * for details on what these mean, and what values to use.
+ * Likely many of the existing ones are not defined correctly.
+ *
+ * Items defined here tend to be used throughout the office suite.
+ * Other locations for application-specific slots can exist too.
+ *  - sw/sdi/swriter.sdis
+ *  - sc/sdi/scalc.sdi
+ *  - sd/sdi/sdraw.sdi
+ */
+
 SfxInt32Item AbsoluteRecord SID_FM_RECORD_ABSOLUTE
 (SfxInt32Item Position FN_PARAM_1)
 [
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index 49f181d9b377..8b0f7b2364a7 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -16,6 +16,8 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
+// See svx/sdi/svx.sdi for hints on how to define these
+
 SfxVoidItem CreateSWDrawView SID_CREATE_SW_DRAWVIEW
 ()
 [

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

2022-11-04 Thread Henry Castro (via logerrit) 
 svx/sdi/svx.sdi |2 +-
 sw/source/uibase/app/docsh2.cxx |   11 +--
 2 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit fb8d94e77f16e0f9d3af42d64756bd771de9d17c
Author: Henry Castro 
AuthorDate: Tue Oct 18 17:02:41 2022 -0400
Commit: Miklos Vajna 
CommitDate: Fri Nov 4 08:33:18 2022 +0100

sw: add FN_PARA_1 to MAILPREPAREEXPORT slot

Reuse the code to use the functionality without
the UpdateFields calls, otherwise it will reset
the data source on the first record and export
to pdf will have wrong data.

Signed-off-by: Henry Castro 
Change-Id: Iec3b44b91c06861cb22d0a7a7234bee6f6f817a4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/141519
Tested-by: Jenkins
Reviewed-by: Miklos Vajna 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c53fefd67d39..0be42759ae94 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -11770,7 +11770,7 @@ SfxVoidItem InsertRowsAfter SID_TABLE_INSERT_ROW_AFTER
 ]
 
 SfxBoolItem PrepareMailExport SID_MAIL_PREPAREEXPORT
-()
+(SfxBoolItem On FN_PARAM_1)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/sw/source/uibase/app/docsh2.cxx b/sw/source/uibase/app/docsh2.cxx
index a5e79881e342..99eaf2249423 100644
--- a/sw/source/uibase/app/docsh2.cxx
+++ b/sw/source/uibase/app/docsh2.cxx
@@ -881,11 +881,18 @@ void SwDocShell::Execute(SfxRequest& rReq)
 
 case SID_MAIL_PREPAREEXPORT:
 {
+const SfxPoolItem* pNoUpdate;
+
 //pWrtShell is not set in page preview
 if (m_pWrtShell)
 m_pWrtShell->StartAllAction();
-m_xDoc->getIDocumentFieldsAccess().UpdateFields( false );
-m_xDoc->getIDocumentLinksAdministration().EmbedAllLinks();
+
+if (!pArgs || (pArgs && !pArgs->HasItem(FN_PARAM_1, )))
+{
+m_xDoc->getIDocumentFieldsAccess().UpdateFields( false );
+m_xDoc->getIDocumentLinksAdministration().EmbedAllLinks();
+}
+
 m_IsRemovedInvisibleContent
 = 
officecfg::Office::Security::HiddenContent::RemoveHiddenContent::get();
 if (m_IsRemovedInvisibleContent)

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

2020-05-14 Thread Caolán McNamara (via logerrit) 
 svx/sdi/svx.sdi |4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit ab51ab4a76a1c9af51e86d1c18e192f504b0faf7
Author: Caolán McNamara 
AuthorDate: Thu May 14 12:46:30 2020 +0100
Commit: Caolán McNamara 
CommitDate: Thu May 14 20:11:15 2020 +0200

document these are used by online

cause there's no use of them in core so their existance was confusing

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 9fdca1087273..543e643714e4 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -2648,6 +2648,7 @@ XFillColorItem FillPageColor SID_ATTR_PAGE_COLOR
 GroupId = SfxGroupId::Format;
 ]
 
+// FillGradientJSON is used by online: i.e. 
loleaflet/src/control/Control.JSDialogBuilder.js
 XFillGradientItem FillGradient SID_ATTR_FILL_GRADIENT
 (SfxStringItem FillGradientJSON SID_FILL_GRADIENT_JSON)
 [
@@ -2666,6 +2667,7 @@ XFillGradientItem FillGradient SID_ATTR_FILL_GRADIENT
 GroupId = SfxGroupId::Format;
 ]
 
+// FillPageGradientJSON is used by online: i.e. 
loleaflet/src/control/Control.JSDialogBuilder.js
 XFillGradientItem FillPageGradient SID_ATTR_PAGE_GRADIENT
 (SfxStringItem FillPageGradientJSON SID_FILL_GRADIENT_JSON)
 [
@@ -5631,7 +5633,7 @@ SvxLineItem LineStyle SID_FRAME_LINESTYLE
 GroupId = SfxGroupId::Frame;
 ]
 
-
+// SID_ATTR_LINE_WIDTH_ARG is used by online: i.e. 
loleaflet/src/control/Control.JSDialogBuilder.js
 XLineWidthItem LineWidth SID_ATTR_LINE_WIDTH
 (SvxDoubleItem Width SID_ATTR_LINE_WIDTH_ARG, XLineWidthItem LineWidth 
SID_ATTR_LINE_WIDTH)
 [
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2020-01-06 Thread Mike Kaganski (via logerrit) 
 svx/sdi/svx.sdi  |4 ++--
 sw/sdi/swriter.sdi   |6 +++---
 sw/uiconfig/sglobal/menubar/menubar.xml  |2 +-
 sw/uiconfig/sglobal/toolbar/numobjectbar.xml |2 +-
 sw/uiconfig/sweb/menubar/menubar.xml |2 +-
 sw/uiconfig/sweb/toolbar/numobjectbar.xml|2 +-
 sw/uiconfig/swform/menubar/menubar.xml   |2 +-
 sw/uiconfig/swform/toolbar/numobjectbar.xml  |2 +-
 sw/uiconfig/swreport/menubar/menubar.xml |2 +-
 sw/uiconfig/swreport/toolbar/numobjectbar.xml|2 +-
 sw/uiconfig/swriter/menubar/menubar.xml  |2 +-
 sw/uiconfig/swriter/toolbar/numobjectbar.xml |2 +-
 sw/uiconfig/swriter/ui/notebookbar.ui|2 +-
 sw/uiconfig/swriter/ui/notebookbar_compact.ui|2 +-
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_compact.ui |2 +-
 sw/uiconfig/swriter/ui/notebookbar_groupedbar_full.ui|6 +++---
 sw/uiconfig/swxform/menubar/menubar.xml  |2 +-
 sw/uiconfig/swxform/toolbar/numobjectbar.xml |2 +-
 18 files changed, 23 insertions(+), 23 deletions(-)

New commits:
commit d1133d71a6109d1999121fd6a91573d12dc4852b
Author: Mike Kaganski 
AuthorDate: Sun Jan 5 20:48:16 2020 +0300
Commit: Mike Kaganski 
CommitDate: Mon Jan 6 16:34:08 2020 +0100

tdf#129549: hide .uno:BulletsAndNumberingDialog from customization UI

... and replace its uses with universal .uno:OutlineBullet

Change-Id: Ia6bc1c5ca23440af333ffeed9fcd2c8dd47a6af4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86245
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 
Reviewed-by: Mike Kaganski 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index c2ceb08f7c0c..2567e08906b0 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5905,8 +5905,8 @@ SfxVoidItem OutlineBullet SID_OUTLINE_BULLET
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = FALSE,
-MenuConfig = FALSE,
+AccelConfig = TRUE,
+MenuConfig = TRUE,
 ToolBoxConfig = TRUE,
 GroupId = SfxGroupId::Format;
 ]
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index d063a0dd5441..489b6b698336 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -461,9 +461,9 @@ SfxVoidItem BulletsAndNumberingDialog FN_NUMBER_BULLETS
 RecordPerSet;
 Asynchron;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Enumeration;
 ]
 
diff --git a/sw/uiconfig/sglobal/menubar/menubar.xml 
b/sw/uiconfig/sglobal/menubar/menubar.xml
index e74fcb8f60ec..268b30cf68b8 100644
--- a/sw/uiconfig/sglobal/menubar/menubar.xml
+++ b/sw/uiconfig/sglobal/menubar/menubar.xml
@@ -440,7 +440,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/sw/uiconfig/sglobal/toolbar/numobjectbar.xml 
b/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
index 14a05ef6f62a..9fcd5ed70c74 100644
--- a/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/numobjectbar.xml
@@ -39,5 +39,5 @@
  
  
  
- 
+ 
 
diff --git a/sw/uiconfig/sweb/menubar/menubar.xml 
b/sw/uiconfig/sweb/menubar/menubar.xml
index 9c0ac3e88a3a..8f773df0c8c2 100644
--- a/sw/uiconfig/sweb/menubar/menubar.xml
+++ b/sw/uiconfig/sweb/menubar/menubar.xml
@@ -313,7 +313,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/sw/uiconfig/sweb/toolbar/numobjectbar.xml 
b/sw/uiconfig/sweb/toolbar/numobjectbar.xml
index 14a05ef6f62a..9fcd5ed70c74 100644
--- a/sw/uiconfig/sweb/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/numobjectbar.xml
@@ -39,5 +39,5 @@
  
  
  
- 
+ 
 
diff --git a/sw/uiconfig/swform/menubar/menubar.xml 
b/sw/uiconfig/swform/menubar/menubar.xml
index 973cfd9ade65..aaea61d9b1da 100644
--- a/sw/uiconfig/swform/menubar/menubar.xml
+++ b/sw/uiconfig/swform/menubar/menubar.xml
@@ -392,7 +392,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/sw/uiconfig/swform/toolbar/numobjectbar.xml 
b/sw/uiconfig/swform/toolbar/numobjectbar.xml
index 14a05ef6f62a..9fcd5ed70c74 100644
--- a/sw/uiconfig/swform/toolbar/numobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/numobjectbar.xml
@@ -39,5 +39,5 @@
  
  
  
- 
+ 
 
diff --git a/sw/uiconfig/swreport/menubar/menubar.xml 
b/sw/uiconfig/swreport/menubar/menubar.xml
index a81e5dd14d42..d2c1c629182a 100644
--- a/sw/uiconfig/swreport/menubar/menubar.xml
+++ b/sw/uiconfig/swreport/menubar/menubar.xml
@@ -378,7 +378,7 @@
   
   
   
-  
+  
   
   
   
diff --git a/sw/uiconfig/swreport/toolbar/numobjectbar.xml 
b/sw/uiconfig/swreport/toolbar/numobjectbar.xml
index d7adb625dc18..87aa2432dadf 100644
--- a/sw/uiconfig/swreport/toolbar/numobjectbar.xml
+++

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

2019-10-31 Thread Szymon Kłos (via logerrit) 
 svx/sdi/svx.sdi |2 +-
 sw/source/uibase/shells/drawdlg.cxx |   23 +++
 2 files changed, 20 insertions(+), 5 deletions(-)

New commits:
commit b7eeb8b03035dd0be715fa90bcbd8b151bc99871
Author: Szymon Kłos 
AuthorDate: Thu Oct 31 11:49:22 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Oct 31 14:27:03 2019 +0100

jsdialogs: .uno:XFillColor with string argument

Change-Id: I7f078fc66cecacccd4473495f96e4e2dbfd89d14
Reviewed-on: https://gerrit.libreoffice.org/81832
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index e51ca7732961..f3d5bd97af72 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -2611,7 +2611,7 @@ XFillBitmapItem FillPageBitmap SID_ATTR_PAGE_BITMAP
 ]
 
 XFillColorItem FillColor SID_ATTR_FILL_COLOR
-
+(SfxStringItem Color SID_ATTR_COLOR_STR, XFillColorItem FillColor 
SID_ATTR_FILL_COLOR)
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
diff --git a/sw/source/uibase/shells/drawdlg.cxx 
b/sw/source/uibase/shells/drawdlg.cxx
index 2c5a923e5983..a16ac67c016b 100644
--- a/sw/source/uibase/shells/drawdlg.cxx
+++ b/sw/source/uibase/shells/drawdlg.cxx
@@ -36,6 +36,7 @@
 #include 
 #include 
 #include 
+#include 
 
 void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
 {
@@ -204,7 +205,7 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
 
 namespace
 {
-void lcl_convertStringArguments(std::unique_ptr& pArgs)
+void lcl_convertStringArguments(sal_uInt16 nSlot, 
std::unique_ptr& pArgs)
 {
 Color aColor;
 OUString sColor;
@@ -219,8 +220,22 @@ namespace
 else
 aColor = Color(sColor.toInt32(16));
 
-XLineColorItem aLineColorItem(OUString(), aColor);
-pArgs->Put(aLineColorItem);
+switch (nSlot)
+{
+case SID_ATTR_LINE_COLOR:
+{
+XLineColorItem aLineColorItem(OUString(), aColor);
+pArgs->Put(aLineColorItem);
+break;
+}
+
+case SID_ATTR_FILL_COLOR:
+{
+XFillColorItem aFillColorItem(OUString(), aColor);
+pArgs->Put(aFillColorItem);
+break;
+}
+}
 }
 }
 }
@@ -240,7 +255,7 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest const & rReq)
 if(pView->AreObjectsMarked())
 {
 std::unique_ptr pNewArgs = pArgs->Clone();
-lcl_convertStringArguments(pNewArgs);
+lcl_convertStringArguments(rReq.GetSlot(), pNewArgs);
 pView->SetAttrToMarked(*pNewArgs, false);
 }
 else
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2019-10-31 Thread Szymon Kłos (via logerrit) 
 svx/sdi/svx.sdi |2 +-
 sw/source/uibase/shells/drawdlg.cxx |   31 ++-
 2 files changed, 31 insertions(+), 2 deletions(-)

New commits:
commit 51f6b20a0c8c3b2830547e4400cf4c513e9d9c00
Author: Szymon Kłos 
AuthorDate: Thu Oct 31 07:45:40 2019 +0100
Commit: Szymon Kłos 
CommitDate: Thu Oct 31 11:00:44 2019 +0100

jsdialogs: .uno:XLineColor with string argument

Change-Id: Ic06aaef076d101d90bf76461e2b3a97580ad311f
Reviewed-on: https://gerrit.libreoffice.org/81821
Tested-by: Jenkins
Reviewed-by: Szymon Kłos 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index acbee171bc2d..e51ca7732961 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -8860,7 +8860,7 @@ SvxWordLineModeItem WordMode SID_ATTR_CHAR_WORDLINEMODE
 
 
 XLineColorItem XLineColor SID_ATTR_LINE_COLOR
-
+(SfxStringItem Color SID_ATTR_COLOR_STR, XLineColorItem XLineColor 
SID_ATTR_LINE_COLOR)
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
diff --git a/sw/source/uibase/shells/drawdlg.cxx 
b/sw/source/uibase/shells/drawdlg.cxx
index 6229cbd173d3..2c5a923e5983 100644
--- a/sw/source/uibase/shells/drawdlg.cxx
+++ b/sw/source/uibase/shells/drawdlg.cxx
@@ -34,6 +34,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
 {
@@ -200,6 +202,29 @@ void SwDrawShell::ExecDrawDlg(SfxRequest& rReq)
 pDoc->SetChanged();
 }
 
+namespace
+{
+void lcl_convertStringArguments(std::unique_ptr& pArgs)
+{
+Color aColor;
+OUString sColor;
+const SfxPoolItem* pColorStringItem = nullptr;
+
+if (SfxItemState::SET == pArgs->GetItemState(SID_ATTR_COLOR_STR, 
false, ))
+{
+sColor = static_cast(pColorStringItem)->GetValue();
+
+if (sColor == "transparent")
+aColor = COL_TRANSPARENT;
+else
+aColor = Color(sColor.toInt32(16));
+
+XLineColorItem aLineColorItem(OUString(), aColor);
+pArgs->Put(aLineColorItem);
+}
+}
+}
+
 void SwDrawShell::ExecDrawAttrArgs(SfxRequest const & rReq)
 {
 SwWrtShell* pSh   = ();
@@ -213,7 +238,11 @@ void SwDrawShell::ExecDrawAttrArgs(SfxRequest const & rReq)
 if (pArgs)
 {
 if(pView->AreObjectsMarked())
-pView->SetAttrToMarked(*rReq.GetArgs(), false);
+{
+std::unique_ptr pNewArgs = pArgs->Clone();
+lcl_convertStringArguments(pNewArgs);
+pView->SetAttrToMarked(*pNewArgs, false);
+}
 else
 pView->SetDefaultAttr(*rReq.GetArgs(), false);
 }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-12 Thread Xisco Fauli 
 svx/sdi/svx.sdi |   10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

New commits:
commit cdd373e593557984dcd90c94bbb9b053655c1b83
Author: Xisco Fauli 
Date:   Sun Jul 8 15:51:38 2018 +0200

tdf#101778: Disable crop and rotate in read-only mode

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 5fcf5d7585b4..d9be1425c8f4 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4261,7 +4261,7 @@ SfxVoidItem RotateLeft SID_ROTATE_GRAPHIC_LEFT
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
@@ -4277,7 +4277,7 @@ SfxVoidItem Rotate180 SID_ROTATE_GRAPHIC_180
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
@@ -4293,7 +4293,7 @@ SfxVoidItem RotateRight SID_ROTATE_GRAPHIC_RIGHT
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
@@ -4310,7 +4310,7 @@ SfxVoidItem RotateReset SID_ROTATE_GRAPHIC_RESET
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
@@ -4327,7 +4327,7 @@ SfxBoolItem Crop SID_OBJECT_CROP
 [
 AutoUpdate = TRUE,
 FastCall = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2018-07-04 Thread Xisco Fauli 
 svx/sdi/svx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 0c3f7154f4d2919f7d28a5db9578fc308f2c0d02
Author: Xisco Fauli 
Date:   Tue Jul 3 16:34:49 2018 +0200

tdf#118506: Disable orientation page in read only

Change-Id: I30994b95e65ddd70df7872f5cc41c339bf906f19
Reviewed-on: https://gerrit.libreoffice.org/56875
Tested-by: Jenkins
Reviewed-by: Maxim Monastirsky 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index b42f0c2e7c11..5fcf5d7585b4 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6214,7 +6214,7 @@ SvxPageItem Orientation SID_ATTR_PAGE_ORIENTATION
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-10 Thread Caolán McNamara 
 svx/sdi/svx.sdi  |2 +-
 svx/source/tbxctrls/bulletsnumbering.cxx |3 ++-
 sw/source/uibase/shells/txtnum.cxx   |8 +++-
 3 files changed, 10 insertions(+), 3 deletions(-)

New commits:
commit 31b26130d90d4746cbb126fd9b6c1cb3487f644f
Author: Caolán McNamara 
Date:   Thu Nov 9 16:11:25 2017 +

tdf#113647 bullet dialog has wrong modal parent

Change-Id: Ia2e6171a1aeb3b8ad679a547a63ccaeac20481df
Reviewed-on: https://gerrit.libreoffice.org/44554
Tested-by: Jenkins 
Reviewed-by: Noel Grandin 
Reviewed-by: Caolán McNamara 
Tested-by: Caolán McNamara 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 3d684944a963..4737b1333dfe 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -5880,7 +5880,7 @@ SvxOrphansItem Orphan SID_ATTR_PARA_ORPHANS
 
 
 SfxVoidItem OutlineBullet SID_OUTLINE_BULLET
-(SfxStringItem Page FN_PARAM_1)
+(SfxStringItem Page FN_PARAM_1,SfxStringItem ParentWindow FN_PARAM_2)
 [
 AutoUpdate = FALSE,
 FastCall = FALSE,
diff --git a/svx/source/tbxctrls/bulletsnumbering.cxx 
b/svx/source/tbxctrls/bulletsnumbering.cxx
index 07f48303600f..42714fae2bbb 100644
--- a/svx/source/tbxctrls/bulletsnumbering.cxx
+++ b/svx/source/tbxctrls/bulletsnumbering.cxx
@@ -180,7 +180,8 @@ void NumberingPopup::VSSelectHdl(void const * pControl)
 }
 else if ( getSelectedEntryId() == 1 )
 {
-auto aArgs( comphelper::InitPropertySequence( { { "Page", 
css::uno::makeAny( OUString("customize") ) } } ) );
+auto aArgs( comphelper::InitPropertySequence( { { "Page", 
css::uno::makeAny( OUString("customize") ) },
+{ "ParentWindow", 
css::uno::makeAny( OUString::number(reinterpret_cast(GetParent())) 
) } } ) );
 mrController.dispatchCommand( ".uno:OutlineBullet", aArgs );
 }
 }
diff --git a/sw/source/uibase/shells/txtnum.cxx 
b/sw/source/uibase/shells/txtnum.cxx
index 2e3d4cbfc142..9fd26cfe69a0 100644
--- a/sw/source/uibase/shells/txtnum.cxx
+++ b/sw/source/uibase/shells/txtnum.cxx
@@ -183,8 +183,14 @@ void SwTextShell::ExecEnterNum(SfxRequest )
 pDocSh->PutItem(SfxUInt16Item(SID_HTML_MODE, ::GetHtmlMode(pDocSh)));
 
 SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
+
+vcl::Window *pParent = GetView().GetWindow();
+const SfxStringItem* pParentItem = 
rReq.GetArg(FN_PARAM_2);
+if (pParentItem)
+pParent = 
reinterpret_cast(pParentItem->GetValue().toUInt64());
+
 assert(pFact && "Dialog creation failed!");
-ScopedVclPtr 
pDlg(pFact->CreateSvxNumBulletTabDialog(GetView().GetWindow(), , 
GetShell()));
+ScopedVclPtr 
pDlg(pFact->CreateSvxNumBulletTabDialog(pParent, , GetShell()));
 assert(pDlg && "Dialog creation failed!");
 const SfxStringItem* pPageItem = 
rReq.GetArg(FN_PARAM_1);
 if ( pPageItem )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-11-07 Thread Muhammet Kara 
 svx/sdi/svx.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit d6214b8e9b3f9956c91d7b88e1985cb56112ea37
Author: Muhammet Kara 
Date:   Tue Nov 7 13:16:45 2017 +0300

tdf#108916: uno:LanguageStatus shouldn't appear in the customize dialog

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index acd7f4c91f6b..3d684944a963 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -11187,9 +11187,9 @@ SfxStringListItem LanguageStatus SID_LANGUAGE_STATUS
 RecordAbsolute = FALSE,
 RecordPerSet;
 
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = SfxGroupId::Format;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-09-25 Thread Yousuf Philips 
 svx/sdi/svx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d8f4d0f043cbdbc44ee49e34f4495310cdbb7bd5
Author: Yousuf Philips 
Date:   Mon Jul 24 16:32:38 2017 +0400

Enable addition of page size group control to toolbars

Change-Id: Ibcc8b7f91b3d5bfd9ea9834ef25a91fc8847e531
Reviewed-on: https://gerrit.libreoffice.org/40367
Reviewed-by: Yousuf Philips 
Tested-by: Yousuf Philips 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index e0f3e4d378b0..0bc0412023bf 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6131,7 +6131,7 @@ SvxSizeItem AttributePageSize SID_ATTR_PAGE_SIZE
 
 AccelConfig = FALSE,
 MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
+ToolBoxConfig = TRUE,
 GroupId = SfxGroupId::Format;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2017-04-04 Thread Samuel Mehrbrodt 
 svx/sdi/svx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit d9064ecf03b28a0b5015ccac20c2d0fa5bb66767
Author: Samuel Mehrbrodt 
Date:   Tue Apr 4 13:33:16 2017 +

Fix group for .uno:EditAnnotation

Change-Id: I3a62e37d866235728abf6b4ad3a5338222d02088
Reviewed-on: https://gerrit.libreoffice.org/36081
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 998f16a52005..5cd64b4fb6e6 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4484,7 +4484,7 @@ SfxVoidItem EditAnnotation SID_EDIT_POSTIT
 AccelConfig = TRUE,
 MenuConfig = TRUE,
 ToolBoxConfig = TRUE,
-GroupId = GID_INSERT;
+GroupId = GID_EDIT;
 ]
 
 SfxBoolItem ShowAnnotations SID_SHOW_POSTIT
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-12-01 Thread Muhammet Kara 
 svx/sdi/svx.sdi   |2 +-
 sw/uiconfig/swriter/toolbar/textobjectbar.xml |2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 83b7e1f424a3fb0963b064e77d973e5f655fac1a
Author: Muhammet Kara 
Date:   Thu Dec 1 13:39:16 2016 +0300

Add toolbar button for page orientation

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 2e8b2f6..99a8bc0 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -6242,7 +6242,7 @@ SvxPageItem Orientation SID_ATTR_PAGE_ORIENTATION
 
 AccelConfig = FALSE,
 MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
+ToolBoxConfig = TRUE,
 GroupId = GID_FORMAT;
 ]
 
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index 43e80fd..70619e3 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -76,6 +76,8 @@
  
  
  
+ 
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-07-11 Thread Samuel Mehrbrodt 
 svx/sdi/svx.sdi |   12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f76a151bd5d1712396414387f29cf4c281144213
Author: Samuel Mehrbrodt 
Date:   Mon Jul 11 13:08:31 2016 +

Remove these from the customization dialog

Looks like copy, no need for these to be here (have no label also)

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 916ecc4..38082be 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -2749,9 +2749,9 @@ XFillColorItem FillPageColor SID_ATTR_PAGE_COLOR
 
 
 /* config: */
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = GID_FORMAT;
 ]
 
@@ -2860,9 +2860,9 @@ XFillStyleItem FillPageStyle SID_ATTR_PAGE_FILLSTYLE
 RecordPerSet;
 
 /* config: */
-AccelConfig = TRUE,
-MenuConfig = TRUE,
-ToolBoxConfig = TRUE,
+AccelConfig = FALSE,
+MenuConfig = FALSE,
+ToolBoxConfig = FALSE,
 GroupId = GID_FORMAT;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-04-29 Thread Samuel Mehrbrodt 
 svx/sdi/svx.sdi   |2 +-
 sw/uiconfig/swriter/toolbar/textobjectbar.xml |1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 371f4f7171820e02ec59bf36f2758f13ef397850
Author: Samuel Mehrbrodt 
Date:   Fri Apr 29 10:48:15 2016 +0200

tdf#97504 Add toolbar button for character spacing

Change-Id: Ib1def4e692e063c1ff49fff48a8f20bc25ba8106
Reviewed-on: https://gerrit.libreoffice.org/24489
Reviewed-by: Samuel Mehrbrodt 
Tested-by: Samuel Mehrbrodt 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 69c25eb..89df1ff 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7760,7 +7760,7 @@ SvxKerningItem Spacing SID_ATTR_CHAR_KERNING
 
 AccelConfig = FALSE,
 MenuConfig = FALSE,
-ToolBoxConfig = FALSE,
+ToolBoxConfig = TRUE,
 GroupId = GID_FORMAT;
 ]
 
diff --git a/sw/uiconfig/swriter/toolbar/textobjectbar.xml 
b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
index d4957fc..8a8a58b 100644
--- a/sw/uiconfig/swriter/toolbar/textobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/textobjectbar.xml
@@ -65,6 +65,7 @@
  
  
  
+ 
  
  
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2016-01-15 Thread Oliver Specht 
 svx/sdi/svx.sdi |4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 4d094e2aa42f696f893b3de7677b9ec26a2431a4
Author: Oliver Specht 
Date:   Fri Jan 15 16:37:44 2016 +0100

tdf#48593: disable increase/decrease indent in read-only documents

Change-Id: If181fa36d1be6ccbff51f482fdaf92034ee5d876
Reviewed-on: https://gerrit.libreoffice.org/21492
Tested-by: Jenkins 
Reviewed-by: Oliver Specht 

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index e62333e..2c7fae3 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -13822,7 +13822,7 @@ SfxVoidItem IncrementIndent SID_INC_INDENT
 FastCall = FALSE,
 HasCoreId = FALSE,
 HasDialog = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
@@ -13850,7 +13850,7 @@ SfxVoidItem DecrementIndent SID_DEC_INDENT
 FastCall = FALSE,
 HasCoreId = FALSE,
 HasDialog = FALSE,
-ReadOnlyDoc = TRUE,
+ReadOnlyDoc = FALSE,
 Toggle = FALSE,
 Container = FALSE,
 RecordAbsolute = FALSE,
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2015-10-06 Thread Yousuf Philips 
 svx/sdi/svx.sdi |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 051667ec91a3fa4175fc8ae59529ac02b95e0683
Author: Yousuf Philips 
Date:   Tue Oct 6 12:42:07 2015 +0400

tdf#94477 Make Format > Character accessible for customization

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

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 91a7662..b5e87ad 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -4002,10 +4002,10 @@ SfxVoidItem FontDialog SID_CHAR_DLG
 Asynchron;
 
 /* config: */
-AccelConfig = FALSE,
-MenuConfig = FALSE,
+AccelConfig = TRUE,
+MenuConfig = TRUE,
 StatusBarConfig = FALSE,
-ToolBoxConfig = FALSE,
+ToolBoxConfig = TRUE,
 GroupId = GID_FORMAT;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

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

2014-11-06 Thread Maxim Monastirsky 
 svx/sdi/svx.sdi |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit c838ce2f2fd7bfe168f610f5a6de426ba48aa68d
Author: Maxim Monastirsky momonas...@gmail.com
Date:   Thu Nov 6 10:48:31 2014 +0200

Show line spacing in the customization dialog

Change-Id: I26140cd173de6e11321da814c6b935d84b91ffbf

diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 1a50327..47d5c14 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -7472,7 +7472,7 @@ SvxLineSpacingItem LineSpacing SID_ATTR_PARA_LINESPACE
 AccelConfig = FALSE,
 MenuConfig = FALSE,
 StatusBarConfig = FALSE,
-ToolBoxConfig = FALSE,
+ToolBoxConfig = TRUE,
 GroupId = GID_FORMAT;
 ]
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits