[Libreoffice-commits] core.git: Branch 'feature/sidebar' - include/svx officecfg/registry sc/sdi sd/sdi sd/source svx/sdi svx/source sw/inc sw/sdi sw/source
Oliver-Rainer Wittmann
orw at apache.org
Mon May 6 12:51:02 PDT 2013
include/svx/svxids.hrc | 2
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu | 15
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu | 81 ++++
officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu | 2
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu | 10
sc/sdi/scalc.sdi | 14
sd/sdi/drtxtob.sdi | 8
sd/source/ui/view/drtxtob1.cxx | 2
svx/sdi/svx.sdi | 172 ++--------
svx/source/sidebar/paragraph/ParaPropertyPanel.cxx | 32 -
svx/source/sidebar/paragraph/ParaPropertyPanel.hxx | 2
sw/inc/cmdid.h | 7
sw/sdi/_frmsh.sdi | 2
sw/sdi/_grfsh.sdi | 2
sw/sdi/swriter.sdi | 41 --
sw/source/ui/shells/frmsh.cxx | 4
sw/source/ui/shells/grfsh.cxx | 4
17 files changed, 174 insertions(+), 226 deletions(-)
New commits:
commit 00338d8d8bbe3bee3c5f4a1024ee8a254ffa60a0
Author: Oliver-Rainer Wittmann <orw at apache.org>
Date: Wed Apr 17 11:50:36 2013 +0000
Resolves: #i122025# UNO commands introduced with sidebar
apply labels and disable their UI customization
(cherry picked from commit 339494cf948e22dcb089c0d921dfb396d9233cb8)
Conflicts:
officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
svx/inc/svx/svxids.hrc
svx/sdi/svx.sdi
sw/sdi/swriter.sdi
Change-Id: Ie95fb2fde14afe67c80e0037f4252e788f5ec1fb
Related: #i122025# followup - remove usage of removed Slot
(cherry picked from commit 0bef7cb68127ab4ff81cc80bc3f7274adf87f5ac)
Change-Id: I0cf4d8c4c93d5754e4e46d4d1edc43529849b3bf
diff --git a/include/svx/svxids.hrc b/include/svx/svxids.hrc
index 0820a3e..27afc367 100644
--- a/include/svx/svxids.hrc
+++ b/include/svx/svxids.hrc
@@ -949,8 +949,6 @@
#define SID_CELL_FORMAT_BORDER (SID_SVX_START+1132)
#define SID_CHAR_DLG_EFFECT (SID_SVX_START+1133)
-#define SID_ATTR_PARA_LEFT (SID_SVX_START+1134)
-#define SID_ATTR_PARA_RIGHT (SID_SVX_START+1135)
#define FN_SVX_SET_NUMBER (SID_SVX_START+1136)
#define FN_SVX_SET_BULLET (SID_SVX_START+1137)
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
index ac04495..12a1263 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/CalcCommands.xcu
@@ -16,6 +16,11 @@
<value xml:lang="en-US">Flip Vertically</value>
</prop>
</node>
+ <node oor:name=".uno:NumberFormatType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Number Format Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:ObjectMirrorHorizontal" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Flip Object Horizontally</value>
@@ -729,6 +734,11 @@
<value xml:lang="en-US">~Formula Bar</value>
</prop>
</node>
+ <node oor:name=".uno:ViewGridLines" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">View Grid lines</value>
+ </prop>
+ </node>
<node oor:name=".uno:ViewRowColumnHeaders" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">C~olumn & Row Headers</value>
@@ -1618,6 +1628,11 @@
<value xml:lang="en-US">~Filter</value>
</prop>
</node>
+ <node oor:name=".uno:SCDialogBorder" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Cell Borders</value>
+ </prop>
+ </node>
<node oor:name=".uno:SendTo" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Sen~d</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
index ac2a5dd..c51b593 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/GenericCommands.xcu
@@ -1611,6 +1611,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:TransAngle" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rotation Angle</value>
+ </prop>
+ </node>
<node oor:name=".uno:TransformDialog" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Position and Si~ze...</value>
@@ -2547,6 +2552,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:LineCap" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Line Cap Style</value>
+ </prop>
+ </node>
<node oor:name=".uno:LineDash" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Dash/Dot</value>
@@ -2560,6 +2570,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:LineTransparence" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Line Transparency</value>
+ </prop>
+ </node>
<node oor:name=".uno:LineWidth" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Width</value>
@@ -2879,6 +2894,11 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:LineJoint" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Line Corner Style</value>
+ </prop>
+ </node>
<node oor:name=".uno:LineStyle" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Line Style</value>
@@ -3286,14 +3306,6 @@
<value>9</value>
</prop>
</node>
- <node oor:name=".uno:FontDialog" oor:op="replace">
- <prop oor:name="Label" oor:type="xs:string">
- <value xml:lang="en-US">C~haracter...</value>
- </prop>
- <prop oor:name="Properties" oor:type="xs:int">
- <value>1</value>
- </prop>
- </node>
<node oor:name=".uno:DistributeSelection" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Distribution...</value>
@@ -3392,6 +3404,16 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:TransRotX" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rotation Pivot Point X</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:TransRotY" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Rotation Pivot Point Y</value>
+ </prop>
+ </node>
<node oor:name=".uno:TwainSelect" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">~Select Source...</value>
@@ -3842,6 +3864,16 @@
<value xml:lang="en-US">Merge Documen~t...</value>
</prop>
</node>
+ <node oor:name=".uno:SvxFlipHorizontal" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Flip Horizontally</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:SvxFlipVertical" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Flip Vertically</value>
+ </prop>
+ </node>
<node oor:name=".uno:SwEditOptions" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Text Document Options</value>
@@ -4662,11 +4694,21 @@
<value xml:lang="en-US">Current Context</value>
</prop>
</node>
+ <node oor:name=".uno:CurrentNumListType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Current Numbering List Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:CurrentTime" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Current Time</value>
</prop>
</node>
+ <node oor:name=".uno:CurrentBulletListType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Current Bullet List Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:CurrentDate" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Current Date</value>
@@ -4786,6 +4828,16 @@
<value>1</value>
</prop>
</node>
+ <node oor:name=".uno:FillFloatTransparence" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Gradient Fill Transparency</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:FillTransparence" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Fill Transparency</value>
+ </prop>
+ </node>
<node oor:name=".uno:FilterCrit" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Standard Filter...</value>
@@ -5259,6 +5311,19 @@
<value xml:lang="en-US">Scan</value>
</prop>
</node>
+ <node oor:name=".uno:FontDialog" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Character...</value>
+ </prop>
+ <prop oor:name="Properties" oor:type="xs:int">
+ <value>1</value>
+ </prop>
+ </node>
+ <node oor:name=".uno:FontDialogEff" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Character Font Effects...</value>
+ </prop>
+ </node>
<node oor:name=".uno:FormatMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">F~ormat</value>
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
index f6ba255..3187e52 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/Sidebar.xcu
@@ -807,7 +807,7 @@
<value>PropertyDeck</value>
</prop>
<prop oor:name="DefaultMenuCommand">
- <value>.uno:ObjectWrapDialog</value>
+ <value>.uno:TextWrap</value>
</prop>
<prop oor:name="ContextList">
<value oor:separator=";">
diff --git a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
index 29c886b..6c7b9f0 100644
--- a/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/UI/WriterCommands.xcu
@@ -1466,6 +1466,11 @@
<value xml:lang="en-US">Backspace</value>
</prop>
</node>
+ <node oor:name=".uno:SwPageColumnType" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Column Type</value>
+ </prop>
+ </node>
<node oor:name=".uno:GotoPrevInputField" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">To Previous Input Field</value>
@@ -2287,6 +2292,11 @@
<value xml:lang="en-US">AutoCorr~ect</value>
</prop>
</node>
+ <node oor:name=".uno:PageSettingDialog" oor:op="replace">
+ <prop oor:name="Label" oor:type="xs:string">
+ <value xml:lang="en-US">Page Settings - Paper format</value>
+ </prop>
+ </node>
<node oor:name=".uno:SelectionModeMenu" oor:op="replace">
<prop oor:name="Label" oor:type="xs:string">
<value xml:lang="en-US">Selection Mode</value>
diff --git a/sc/sdi/scalc.sdi b/sc/sdi/scalc.sdi
index 7328e86..8945ecb 100644
--- a/sc/sdi/scalc.sdi
+++ b/sc/sdi/scalc.sdi
@@ -8489,7 +8489,7 @@ SfxVoidItem ExportAsGraphic SID_EXPORT_AS_GRAPHIC
]
//--------------------------------------------------------------------------
-SfxBoolItem ViewOption SID_SCGRIDSHOW
+SfxBoolItem ViewGridLines SID_SCGRIDSHOW
[
AutoUpdate = TRUE,
Cachable = Cachable,
@@ -8506,15 +8506,15 @@ SfxBoolItem ViewOption SID_SCGRIDSHOW
Readonly = FALSE,
/* config */
- AccelConfig = FALSE, //TRUE
+ AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE, //FALSE
- GroupId = GID_DATA;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_VIEW;
]
//--------------------------------------------------------------------------
-SfxUInt16Item NumberType SID_NUMBER_TYPE_FORMAT
+SfxUInt16Item NumberFormatType SID_NUMBER_TYPE_FORMAT
[
/* flags: */
AutoUpdate = FALSE,
@@ -8535,6 +8535,6 @@ SfxUInt16Item NumberType SID_NUMBER_TYPE_FORMAT
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
diff --git a/sd/sdi/drtxtob.sdi b/sd/sdi/drtxtob.sdi
index 9941d63..cc466e1 100644
--- a/sd/sdi/drtxtob.sdi
+++ b/sd/sdi/drtxtob.sdi
@@ -184,14 +184,6 @@ shell TextObjectBar
ExecMethod = Execute ;
StateMethod = GetAttrState;
]
- SID_ATTR_PARA_RIGHT
- [
- ExecMethod = Execute ;
- ]
- SID_ATTR_PARA_LEFT
- [
- ExecMethod = Execute ;
- ]
SID_OUTLINE_LEFT // ole : no, status : ?
[
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index c87b0ee..48ab691 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -228,7 +228,6 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_OUTLINE_LEFT:
- case SID_ATTR_PARA_LEFT:
{
if (pOLV)
{
@@ -244,7 +243,6 @@ void TextObjectBar::Execute( SfxRequest &rReq )
break;
case SID_OUTLINE_RIGHT:
- case SID_ATTR_PARA_RIGHT:
{
if (pOLV)
{
diff --git a/svx/sdi/svx.sdi b/svx/sdi/svx.sdi
index 9098cfe..1a99d65 100644
--- a/svx/sdi/svx.sdi
+++ b/svx/sdi/svx.sdi
@@ -3948,10 +3948,10 @@ SfxVoidItem FontDialog SID_CHAR_DLG
Asynchron;
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -4411,55 +4411,6 @@ XFormTextStyleItem FontWorkTextStyle SID_FORMTEXT_STYLE
GroupId = GID_SPECIAL;
]
-SvxLRSpaceItem ParaOutlineLeft SID_ATTR_PARA_LEFT
-
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
-]
-
-//--------------------------------------------------------------------------
-SvxLRSpaceItem ParaOutlineRight SID_ATTR_PARA_RIGHT
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = TRUE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- /* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
-]
-
//--------------------------------------------------------------------------
SfxVoidItem FormatArea SID_ATTRIBUTES_AREA
()
@@ -6570,7 +6521,7 @@ SfxVoidItem DefaultNumbering FN_NUM_NUMBERING_ON
GroupId = GID_ENUMERATION;
]
-SfxBoolItem CurrentBulNumRule FN_BUL_NUM_RULE_INDEX
+SfxBoolItem CurrentBulletListType FN_BUL_NUM_RULE_INDEX
(SfxUInt16Item On FN_PARAM_1)
[
/* flags: */
@@ -6592,13 +6543,13 @@ SfxBoolItem CurrentBulNumRule FN_BUL_NUM_RULE_INDEX
SlotType = SfxBoolItem
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_ENUMERATION;
]
-SfxBoolItem CurrentNumNumRule FN_NUM_NUM_RULE_INDEX
+SfxBoolItem CurrentNumListType FN_NUM_NUM_RULE_INDEX
(SfxUInt16Item On FN_PARAM_1)
[
/* flags: */
@@ -6620,10 +6571,10 @@ SfxBoolItem CurrentNumNumRule FN_NUM_NUM_RULE_INDEX
SlotType = SfxBoolItem
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_ENUMERATION;
]
@@ -15637,10 +15588,10 @@ SfxUInt16Item FillTransparence SID_ATTR_FILL_TRANSPARENCE
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15691,10 +15642,10 @@ SfxUInt16Item LineTransparence SID_ATTR_LINE_TRANSPARENCE
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15721,10 +15672,10 @@ XLineJointItem LineJoint SID_ATTR_LINE_JOINT
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15748,10 +15699,10 @@ XLineCapItem LineCap SID_ATTR_LINE_CAP
Readonly = FALSE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15935,10 +15886,10 @@ SfxUInt32Item TransAngle SID_ATTR_TRANSFORM_ANGLE
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15960,10 +15911,10 @@ SfxUInt32Item TransRotX SID_ATTR_TRANSFORM_ROT_X
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -15985,10 +15936,10 @@ SfxUInt32Item TransRotY SID_ATTR_TRANSFORM_ROT_Y
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -16010,10 +15961,10 @@ SfxBoolItem ProtectPos SID_ATTR_TRANSFORM_PROTECT_POS
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -16035,43 +15986,16 @@ SfxBoolItem ProtectSize SID_ATTR_TRANSFORM_PROTECT_SIZE
Readonly = FALSE,
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_FORMAT;
-]
-
-//--------------------------------------------------------------------------
-
-SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
-[
- /* flags: */
- AutoUpdate = TRUE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = FALSE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerSet;
- Synchron;
-
- Readonly = FALSE,
-
- /* config: */
AccelConfig = FALSE,
MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
-SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
+SfxVoidItem SvxFlipHorizontal SID_FLIP_HORIZONTAL
[
/* flags: */
AutoUpdate = TRUE,
@@ -16089,11 +16013,11 @@ SfxBoolItem SvxAutoWidth SID_ATTR_TRANSFORM_AUTOWIDTH
Readonly = FALSE,
/* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
+ ToolBoxConfig = TRUE
+ GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
@@ -16116,11 +16040,11 @@ SfxVoidItem SvxFlipVertical SID_FLIP_VERTICAL
Readonly = FALSE,
/* config: */
- AccelConfig = FALSE,
- MenuConfig = FALSE,
+ AccelConfig = TRUE,
+ MenuConfig = TRUE,
StatusBarConfig = FALSE,
ToolBoxConfig = TRUE,
- GroupId = GID_EDIT;
+ GroupId = GID_FORMAT;
]
//--------------------------------------------------------------------------
@@ -16247,10 +16171,10 @@ SfxVoidItem SCDialogBorder SID_CELL_FORMAT_BORDER
Asynchron;
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index b68c7fd..36ce007 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -923,37 +923,12 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
{
case BT_TBX_INDENT_PROMOTE:
{
- SvxLRSpaceItem aMargin( SID_ATTR_PARA_RIGHT );
-
- maTxtLeft += INDENT_STEP;
- sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
- aMargin.SetTxtLeft( (const long)nVal );
- aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
-
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_RIGHT, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_RIGHT, SFX_CALLMODE_RECORD );
}
break;
case BT_TBX_INDENT_DEMOTE:
{
- if((maTxtLeft - INDENT_STEP) < 0)
- maTxtLeft = DEFAULT_VALUE;
- else
- maTxtLeft -= INDENT_STEP;
-
- SvxLRSpaceItem aMargin( SID_ATTR_PARA_LEFT );
-
- sal_Int64 nVal = OutputDevice::LogicToLogic( maTxtLeft, (MapUnit)(SFX_MAPUNIT_TWIP), MAP_100TH_MM );
- nVal = OutputDevice::LogicToLogic( (long)nVal, MAP_100TH_MM, (MapUnit)m_eLRSpaceUnit );
-
- aMargin.SetTxtLeft( (const long)nVal );
- aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
- aMargin.SetTxtFirstLineOfst( (const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ) );
-
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LEFT, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->Execute( SID_OUTLINE_LEFT, SFX_CALLMODE_RECORD );
}
break;
case SD_HANGING_INDENT:
@@ -963,8 +938,7 @@ IMPL_LINK(ParaPropertyPanel, ClickProDemote_Hdl_Impl, ToolBox *, pControl)
aMargin.SetRight( (const long)GetCoreValue( *maRightIndent.get(), m_eLRSpaceUnit ) );
aMargin.SetTxtFirstLineOfst( ((const short)GetCoreValue( *maFLineIndent.get(), m_eLRSpaceUnit ))*(-1) );
- GetBindings()->GetDispatcher()->Execute(
- SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
+ GetBindings()->GetDispatcher()->Execute( SID_ATTR_PARA_LRSPACE, SFX_CALLMODE_RECORD, &aMargin, 0L);
}
break;
}
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 16db5db..4d240ee 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -80,9 +80,7 @@ public:
void ShowMenu (void);
sal_uInt16 GetBulletTypeIndex(){ return mnBulletTypeIndex; }
- void SetBulletTypeIndex(sal_uInt16 nInd){ mnBulletTypeIndex = nInd; }
sal_uInt16 GetNumTypeIndex(){ return mnNumTypeIndex; }
- void SetNumTypeIndex(sal_uInt16 nInd){ mnNumTypeIndex = nInd; }
FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState );
void EndSpacingPopupMode (void);
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 08bb1d7..33d245e 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -899,10 +899,9 @@ included in c-context files, so c++ style stuff will cause problems.
#define FN_UNO_TITLE (FN_FRAME + 19)
#define FN_UNO_DESCRIPTION (FN_FRAME + 20)
-#define FN_PROPERTY_WRAP_DLG (FN_SIDEBAR + 0)
-#define SID_ATTR_PAGE_COLUMN (FN_SIDEBAR + 1)
-#define SID_ATTR_PAGE_ULSPACE (FN_SIDEBAR + 2)
-#define SID_ATTR_PAGE_LRSPACE (FN_SIDEBAR + 3)
+#define SID_ATTR_PAGE_COLUMN (FN_SIDEBAR + 0)
+#define SID_ATTR_PAGE_ULSPACE (FN_SIDEBAR + 1)
+#define SID_ATTR_PAGE_LRSPACE (FN_SIDEBAR + 2)
//Member IDs for Fill / SetVariable of items
#define MID_STYLE 0xe0
diff --git a/sw/sdi/_frmsh.sdi b/sw/sdi/_frmsh.sdi
index 31cb86d..808e204 100644
--- a/sw/sdi/_frmsh.sdi
+++ b/sw/sdi/_frmsh.sdi
@@ -184,7 +184,7 @@ interface BaseTextFrame
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_PROPERTY_WRAP_DLG // status(final|play)
+ FN_DRAW_WRAP_DLG // status(final|play)
[
ExecMethod = Execute ;
StateMethod = GetState ;
diff --git a/sw/sdi/_grfsh.sdi b/sw/sdi/_grfsh.sdi
index ada69c6..3a12e11 100644
--- a/sw/sdi/_grfsh.sdi
+++ b/sw/sdi/_grfsh.sdi
@@ -53,7 +53,7 @@ interface BaseTextGraphic
StateMethod = GetAttrState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
- FN_PROPERTY_WRAP_DLG // status(final|play)
+ FN_DRAW_WRAP_DLG // status(final|play)
[
ExecMethod = Execute ;
StateMethod = GetAttrState ;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index c9e027e..10f29fd 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -3373,31 +3373,6 @@ SfxVoidItem GraphicDialog FN_FORMAT_GRAFIC_DLG
]
//--------------------------------------------------------------------------
-SfxVoidItem ObjectWrapDialog FN_PROPERTY_WRAP_DLG
-()
-[
- /* flags: */
- AutoUpdate = FALSE,
- Cachable = Cachable,
- FastCall = FALSE,
- HasCoreId = FALSE,
- HasDialog = TRUE,
- ReadOnlyDoc = FALSE,
- Toggle = FALSE,
- Container = FALSE,
- RecordAbsolute = FALSE,
- RecordPerItem;
- Asynchron;
-
- /* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_GRAPHIC;
-]
-
-//--------------------------------------------------------------------------
SfxVoidItem Grow FN_GROW_FONT_SIZE
()
[
@@ -6253,10 +6228,10 @@ SfxVoidItem PageSettingDialog FN_FORMAT_PAGE_SETTING_DLG
Asynchron;
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
+ ToolBoxConfig = FALSE,
GroupId = GID_FORMAT;
]
@@ -10380,7 +10355,7 @@ SfxVoidItem OpenFromWriter FN_OPEN_FILE
GroupId = GID_APPLICATION;
]
-SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN
+SfxInt16Item SwPageColumnType SID_ATTR_PAGE_COLUMN
[
/* flags: */
@@ -10399,11 +10374,11 @@ SfxInt16Item SwPageColumn SID_ATTR_PAGE_COLUMN
Readonly = TRUE,
/* config: */
- AccelConfig = TRUE,
- MenuConfig = TRUE,
+ AccelConfig = FALSE,
+ MenuConfig = FALSE,
StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_VIEW;
+ ToolBoxConfig = FALSE,
+ GroupId = GID_FORMAT;
]
SvxLongULSpaceItem SwPageULMargin SID_ATTR_PAGE_ULSPACE
diff --git a/sw/source/ui/shells/frmsh.cxx b/sw/source/ui/shells/frmsh.cxx
index 4422916..0755f0e 100644
--- a/sw/source/ui/shells/frmsh.cxx
+++ b/sw/source/ui/shells/frmsh.cxx
@@ -399,7 +399,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
break;
case FN_FORMAT_FRAME_DLG:
- case FN_PROPERTY_WRAP_DLG:
+ case FN_DRAW_WRAP_DLG:
{
const int nSel = rSh.GetSelectionType();
if (nSel & nsSelectionType::SEL_GRF)
@@ -483,7 +483,7 @@ void SwFrameShell::Execute(SfxRequest &rReq)
nDefPage);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
- if ( nSlot == FN_PROPERTY_WRAP_DLG )
+ if ( nSlot == FN_DRAW_WRAP_DLG )
{
pDlg->SetCurPageId(TP_FRM_WRAP);
}
diff --git a/sw/source/ui/shells/grfsh.cxx b/sw/source/ui/shells/grfsh.cxx
index b7568ea..0614923 100644
--- a/sw/source/ui/shells/grfsh.cxx
+++ b/sw/source/ui/shells/grfsh.cxx
@@ -180,7 +180,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
break;
case SID_INSERT_GRAPHIC:
case FN_FORMAT_GRAFIC_DLG:
- case FN_PROPERTY_WRAP_DLG:
+ case FN_DRAW_WRAP_DLG:
{
SwFlyFrmAttrMgr aMgr( sal_False, &rSh, rSh.IsFrmSelected() ?
FRMMGR_TYPE_NONE : FRMMGR_TYPE_GRF);
@@ -296,7 +296,7 @@ void SwGrfShell::Execute(SfxRequest &rReq)
aSet, sal_False, DLG_FRM_GRF);
OSL_ENSURE(pDlg, "Dialogdiet fail!");
- if (nSlot == FN_PROPERTY_WRAP_DLG)
+ if (nSlot == FN_DRAW_WRAP_DLG)
pDlg->SetCurPageId(TP_FRM_WRAP);
if( pDlg->Execute() )
More information about the Libreoffice-commits
mailing list