You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by or...@apache.org on 2013/04/09 14:53:43 UTC
svn commit: r1466007 - in /openoffice/branches/sidebar/main:
officecfg/registry/data/org/openoffice/Office/ sw/inc/ sw/sdi/
sw/source/ui/app/ sw/source/ui/shells/ sw/source/ui/uiview/
sw/uiconfig/sglobal/toolbar/ sw/uiconfig/sweb/toolbar/ sw/uiconfig/s...
Author: orw
Date: Tue Apr 9 12:53:42 2013
New Revision: 1466007
URL: http://svn.apache.org/r1466007
Log:
#121420# - resolve duplicate Slot on same UNO commands in Writer by removing the Writer in favor of the global one.
Modified:
openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu
openoffice/branches/sidebar/main/sw/inc/cmdid.h
openoffice/branches/sidebar/main/sw/inc/swcommands.h
openoffice/branches/sidebar/main/sw/sdi/_tabsh.sdi
openoffice/branches/sidebar/main/sw/sdi/swriter.sdi
openoffice/branches/sidebar/main/sw/source/ui/app/mn.src
openoffice/branches/sidebar/main/sw/source/ui/shells/tabsh.cxx
openoffice/branches/sidebar/main/sw/source/ui/uiview/view2.cxx
openoffice/branches/sidebar/main/sw/source/ui/uiview/viewstat.cxx
openoffice/branches/sidebar/main/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
openoffice/branches/sidebar/main/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
openoffice/branches/sidebar/main/sw/uiconfig/swform/toolbar/tableobjectbar.xml
openoffice/branches/sidebar/main/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
openoffice/branches/sidebar/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
openoffice/branches/sidebar/main/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
Modified: openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu (original)
+++ openoffice/branches/sidebar/main/officecfg/registry/data/org/openoffice/Office/Views.xcu Tue Apr 9 12:53:42 2013
@@ -29,7 +29,9 @@
<value>false</value>
</prop>
</node>
- <node oor:name="10414" oor:op="replace">
+
+ <!-- show Sidebar child window by default - oor:name == SID_SIDEBAR -->
+ <node oor:name="10336" oor:op="replace">
<prop oor:name="Visible" oor:type="xs:boolean">
<value>true</value>
</prop>
Modified: openoffice/branches/sidebar/main/sw/inc/cmdid.h
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/inc/cmdid.h?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/inc/cmdid.h (original)
+++ openoffice/branches/sidebar/main/sw/inc/cmdid.h Tue Apr 9 12:53:42 2013
@@ -639,10 +639,9 @@ Achtung: Ab sofort sind in diesem File k
#define FN_FRAME_WRAP_CONTOUR (FN_FORMAT + 184) /* Rahmen Kunturumlauf */
-#define FN_TABLE_VERT_NONE (FN_FORMAT + 185) /* vertikale Ausrichtung in Tabellenzellen */
-#define FN_TABLE_VERT_CENTER (FN_FORMAT + 186) /* -"- */
-#define FN_TABLE_VERT_BOTTOM (FN_FORMAT + 187) /* -"- */
-#define FN_TABLE_SET_VERT_ALIGN (FN_FORMAT + 188) /* -"- */
+// +185..+187 removed in favor of corresponding globally available slot
+
+#define FN_TABLE_SET_VERT_ALIGN (FN_FORMAT + 188) /* vertical alignment in Writer table cells */
#define FN_TABLE_MODE_FIX (FN_FORMAT + 189) /* Tabellenmodus */
#define FN_TABLE_MODE_FIX_PROP (FN_FORMAT + 190) /* -"- */
#define FN_TABLE_MODE_VARIABLE (FN_FORMAT + 191) /* -"- */
Modified: openoffice/branches/sidebar/main/sw/inc/swcommands.h
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/inc/swcommands.h?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/inc/swcommands.h (original)
+++ openoffice/branches/sidebar/main/sw/inc/swcommands.h Tue Apr 9 12:53:42 2013
@@ -50,9 +50,9 @@
#define CMD_FN_NUMBER_BULLETS ".uno:BulletsAndNumberingDialog"
#define CMD_FN_CALC_TABLE ".uno:Calc"
#define CMD_FN_CALCULATE ".uno:CalculateSel"
-#define CMD_FN_TABLE_VERT_BOTTOM ".uno:SwCellVertBottom"
-#define CMD_FN_TABLE_VERT_CENTER ".uno:SwCellVertCenter"
-#define CMD_FN_TABLE_VERT_NONE ".uno:SwCellVertTop"
+#define CMD_SID_TABLE_VERT_BOTTOM ".uno:CellVertBottom"
+#define CMD_SID_TABLE_VERT_CENTER ".uno:CellVertCenter"
+#define CMD_SID_TABLE_VERT_NONE ".uno:CellVertTop"
#define CMD_FN_FRAME_CHAIN ".uno:ChainFrames"
#define CMD_FN_CHANGE_DBFIELD ".uno:ChangeDatabaseField"
#define CMD_FN_NUMBERING_OUTLINE_DLG ".uno:ChapterNumberingDialog"
Modified: openoffice/branches/sidebar/main/sw/sdi/_tabsh.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/_tabsh.sdi?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/_tabsh.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/_tabsh.sdi Tue Apr 9 12:53:42 2013
@@ -63,26 +63,6 @@ interface BaseTextTable
]
- FN_TABLE_VERT_NONE
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
-
- FN_TABLE_VERT_CENTER
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
-
- FN_TABLE_VERT_BOTTOM
- [
- ExecMethod = Execute ;
- StateMethod = GetState ;
- DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
- ]
SID_TABLE_VERT_NONE
[
ExecMethod = Execute ;
@@ -103,6 +83,7 @@ interface BaseTextTable
StateMethod = GetState ;
DisableFlags="SW_DISABLE_ON_PROTECTED_CURSOR";
]
+
FN_TABLE_SET_COL_WIDTH // status( final|play )
[
ExecMethod = Execute ;
Modified: openoffice/branches/sidebar/main/sw/sdi/swriter.sdi
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/sdi/swriter.sdi?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/sdi/swriter.sdi (original)
+++ openoffice/branches/sidebar/main/sw/sdi/swriter.sdi Tue Apr 9 12:53:42 2013
@@ -729,87 +729,6 @@ SfxVoidItem CalculateSel FN_CALCULATE
]
//--------------------------------------------------------------------------
-SfxBoolItem SwCellVertBottom FN_TABLE_VERT_BOTTOM
-
-[
- /* 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 = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TABLE;
-]
-
-//--------------------------------------------------------------------------
-SfxBoolItem SwCellVertCenter FN_TABLE_VERT_CENTER
-
-[
- /* 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 = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TABLE;
-]
-
-//--------------------------------------------------------------------------
-SfxBoolItem SwCellVertTop FN_TABLE_VERT_NONE
-
-[
- /* 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 = TRUE,
- MenuConfig = TRUE,
- StatusBarConfig = FALSE,
- ToolBoxConfig = TRUE,
- GroupId = GID_TABLE;
-]
-
-//--------------------------------------------------------------------------
SfxBoolItem ChainFrames FN_FRAME_CHAIN
[
Modified: openoffice/branches/sidebar/main/sw/source/ui/app/mn.src
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/app/mn.src?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/app/mn.src (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/app/mn.src Tue Apr 9 12:53:42 2013
@@ -430,20 +430,20 @@ location: <project>/uiconfig/[swriter|sw
SEPARATOR ; \
MenuItem\
{\
- Identifier = FN_TABLE_VERT_NONE ; \
- HelpId = CMD_FN_TABLE_VERT_NONE ; \
+ Identifier = SID_TABLE_VERT_NONE ; \
+ HelpId = CMD_SID_TABLE_VERT_NONE ; \
Text [ en-US ] = "~Top" ; \
};\
MenuItem\
{\
- Identifier = FN_TABLE_VERT_CENTER ; \
- HelpId = CMD_FN_TABLE_VERT_CENTER ; \
+ Identifier = SID_TABLE_VERT_CENTER ; \
+ HelpId = CMD_SID_TABLE_VERT_CENTER ; \
Text [ en-US ] = "C~enter" ; \
};\
MenuItem\
{\
- Identifier = FN_TABLE_VERT_BOTTOM ; \
- HelpId = CMD_FN_TABLE_VERT_BOTTOM ; \
+ Identifier = SID_TABLE_VERT_BOTTOM ; \
+ HelpId = CMD_SID_TABLE_VERT_BOTTOM ; \
Text [ en-US ] = "~Bottom" ; \
};\
SEPARATOR ; \
Modified: openoffice/branches/sidebar/main/sw/source/ui/shells/tabsh.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/shells/tabsh.cxx?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/shells/tabsh.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/shells/tabsh.cxx Tue Apr 9 12:53:42 2013
@@ -1179,18 +1179,6 @@ void SwTableShell::Execute(SfxRequest &r
aMgr.ColWidthDlg(GetView().GetWindow());
}
break;
- case FN_TABLE_VERT_NONE:
- case FN_TABLE_VERT_CENTER:
- case FN_TABLE_VERT_BOTTOM:
- {
- sal_uInt16 nAlign = nSlot == FN_TABLE_VERT_NONE ?
- text::VertOrientation::NONE :
- nSlot == FN_TABLE_VERT_CENTER ?
- text::VertOrientation::CENTER : text::VertOrientation::BOTTOM;
- rSh.SetBoxAlign(nAlign);
- bCallDone = sal_True;
- }
- break;
case SID_TABLE_VERT_NONE:
case SID_TABLE_VERT_CENTER:
case SID_TABLE_VERT_BOTTOM:
@@ -1335,28 +1323,18 @@ void SwTableShell::GetState(SfxItemSet &
case RES_UL_SPACE:
rSet.Put(pFmt->GetULSpace());
break;
- case FN_TABLE_VERT_NONE:
- case FN_TABLE_VERT_CENTER:
- case FN_TABLE_VERT_BOTTOM:
- {
- sal_uInt16 nAlign = rSh.GetBoxAlign();
- sal_Bool bSet = (nSlot == FN_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE) ||
- (nSlot == FN_TABLE_VERT_CENTER && nAlign == text::VertOrientation::CENTER) ||
- (nSlot == FN_TABLE_VERT_BOTTOM && nAlign == text::VertOrientation::BOTTOM);
- rSet.Put(SfxBoolItem(nSlot, bSet));
- }
- break;
- case SID_TABLE_VERT_NONE:
- case SID_TABLE_VERT_CENTER:
- case SID_TABLE_VERT_BOTTOM:
- {
- sal_uInt16 nAlign = rSh.GetBoxAlign();
- sal_Bool bSet = nSlot == SID_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE||
+
+ case SID_TABLE_VERT_NONE:
+ case SID_TABLE_VERT_CENTER:
+ case SID_TABLE_VERT_BOTTOM:
+ {
+ sal_uInt16 nAlign = rSh.GetBoxAlign();
+ sal_Bool bSet = nSlot == SID_TABLE_VERT_NONE && nAlign == text::VertOrientation::NONE||
nSlot == SID_TABLE_VERT_CENTER && nAlign == text::VertOrientation::CENTER ||
nSlot == SID_TABLE_VERT_BOTTOM && nAlign == text::VertOrientation::BOTTOM;
- rSet.Put(SfxBoolItem(nSlot, bSet));
- }
- break;
+ rSet.Put(SfxBoolItem(nSlot, bSet));
+ }
+ break;
case FN_TABLE_MODE_FIX :
case FN_TABLE_MODE_FIX_PROP :
Modified: openoffice/branches/sidebar/main/sw/source/ui/uiview/view2.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/uiview/view2.cxx?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/uiview/view2.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/uiview/view2.cxx Tue Apr 9 12:53:42 2013
@@ -1093,9 +1093,9 @@ void __EXPORT SwView::Execute(SfxRequest
case SID_ALIGN_ANY_HCENTER : nAlias = SID_ATTR_PARA_ADJUST_CENTER; break;
case SID_ALIGN_ANY_RIGHT : nAlias = SID_ATTR_PARA_ADJUST_RIGHT; break;
case SID_ALIGN_ANY_JUSTIFIED: nAlias = SID_ATTR_PARA_ADJUST_BLOCK; break;
- case SID_ALIGN_ANY_TOP : nAlias = FN_TABLE_VERT_NONE; break;
- case SID_ALIGN_ANY_VCENTER : nAlias = FN_TABLE_VERT_CENTER; break;
- case SID_ALIGN_ANY_BOTTOM : nAlias = FN_TABLE_VERT_BOTTOM; break;
+ case SID_ALIGN_ANY_TOP : nAlias = SID_TABLE_VERT_NONE; break;
+ case SID_ALIGN_ANY_VCENTER : nAlias = SID_TABLE_VERT_CENTER; break;
+ case SID_ALIGN_ANY_BOTTOM : nAlias = SID_TABLE_VERT_BOTTOM; break;
}
}
else
Modified: openoffice/branches/sidebar/main/sw/source/ui/uiview/viewstat.cxx
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/source/ui/uiview/viewstat.cxx?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/source/ui/uiview/viewstat.cxx (original)
+++ openoffice/branches/sidebar/main/sw/source/ui/uiview/viewstat.cxx Tue Apr 9 12:53:42 2013
@@ -389,9 +389,9 @@ void SwView::GetState(SfxItemSet &rSet)
case SID_ALIGN_ANY_HCENTER : nAlias = SID_ATTR_PARA_ADJUST_CENTER; break;
case SID_ALIGN_ANY_RIGHT : nAlias = SID_ATTR_PARA_ADJUST_RIGHT; break;
case SID_ALIGN_ANY_JUSTIFIED: nAlias = SID_ATTR_PARA_ADJUST_BLOCK; break;
- case SID_ALIGN_ANY_TOP : nAlias = FN_TABLE_VERT_NONE; break;
- case SID_ALIGN_ANY_VCENTER : nAlias = FN_TABLE_VERT_CENTER; break;
- case SID_ALIGN_ANY_BOTTOM : nAlias = FN_TABLE_VERT_BOTTOM; break;
+ case SID_ALIGN_ANY_TOP : nAlias = SID_TABLE_VERT_NONE; break;
+ case SID_ALIGN_ANY_VCENTER : nAlias = SID_TABLE_VERT_CENTER; break;
+ case SID_ALIGN_ANY_BOTTOM : nAlias = SID_TABLE_VERT_BOTTOM; break;
}
}
else if(nSelectionType & (nsSelectionType::SEL_DRW))
Modified: openoffice/branches/sidebar/main/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml (original)
+++ openoffice/branches/sidebar/main/sw/uiconfig/sglobal/toolbar/tableobjectbar.xml Tue Apr 9 12:53:42 2013
@@ -35,9 +35,9 @@
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
<toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
Modified: openoffice/branches/sidebar/main/sw/uiconfig/sweb/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/uiconfig/sweb/toolbar/tableobjectbar.xml?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/uiconfig/sweb/toolbar/tableobjectbar.xml (original)
+++ openoffice/branches/sidebar/main/sw/uiconfig/sweb/toolbar/tableobjectbar.xml Tue Apr 9 12:53:42 2013
@@ -35,9 +35,9 @@
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
<toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
Modified: openoffice/branches/sidebar/main/sw/uiconfig/swform/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/uiconfig/swform/toolbar/tableobjectbar.xml?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/uiconfig/swform/toolbar/tableobjectbar.xml (original)
+++ openoffice/branches/sidebar/main/sw/uiconfig/swform/toolbar/tableobjectbar.xml Tue Apr 9 12:53:42 2013
@@ -35,9 +35,9 @@
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
<toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
Modified: openoffice/branches/sidebar/main/sw/uiconfig/swreport/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/uiconfig/swreport/toolbar/tableobjectbar.xml?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/uiconfig/swreport/toolbar/tableobjectbar.xml (original)
+++ openoffice/branches/sidebar/main/sw/uiconfig/swreport/toolbar/tableobjectbar.xml Tue Apr 9 12:53:42 2013
@@ -35,9 +35,9 @@
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
<toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
Modified: openoffice/branches/sidebar/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml (original)
+++ openoffice/branches/sidebar/main/sw/uiconfig/swriter/toolbar/tableobjectbar.xml Tue Apr 9 12:53:42 2013
@@ -35,9 +35,9 @@
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
<toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>
Modified: openoffice/branches/sidebar/main/sw/uiconfig/swxform/toolbar/tableobjectbar.xml
URL: http://svn.apache.org/viewvc/openoffice/branches/sidebar/main/sw/uiconfig/swxform/toolbar/tableobjectbar.xml?rev=1466007&r1=1466006&r2=1466007&view=diff
==============================================================================
--- openoffice/branches/sidebar/main/sw/uiconfig/swxform/toolbar/tableobjectbar.xml (original)
+++ openoffice/branches/sidebar/main/sw/uiconfig/swxform/toolbar/tableobjectbar.xml Tue Apr 9 12:53:42 2013
@@ -35,9 +35,9 @@
<toolbar:toolbaritem xlink:href=".uno:SplitCell"/>
<toolbar:toolbaritem xlink:href=".uno:OptimizeTable" toolbar:style="dropdown"/>
<toolbar:toolbarbreak/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:SwCellVertBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertTop" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:CellVertBottom" toolbar:style="radio"/>
<toolbar:toolbarseparator/>
<toolbar:toolbaritem xlink:href=".uno:InsertRows"/>
<toolbar:toolbaritem xlink:href=".uno:InsertColumns"/>