[Libreoffice-commits] core.git: Branch 'aoo/trunk' - sw/uiconfig

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Thu Sep 20 20:12:17 UTC 2018 

 sw/uiconfig/sglobal/toolbar/frameobjectbar.xml  |   14 +++++++-------
 sw/uiconfig/sglobal/toolbar/oleobjectbar.xml    |   12 ++++++------
 sw/uiconfig/sweb/toolbar/frameobjectbar.xml     |   14 +++++++-------
 sw/uiconfig/sweb/toolbar/oleobjectbar.xml       |   12 ++++++------
 sw/uiconfig/swform/toolbar/frameobjectbar.xml   |   14 +++++++-------
 sw/uiconfig/swform/toolbar/oleobjectbar.xml     |   12 ++++++------
 sw/uiconfig/swreport/toolbar/frameobjectbar.xml |   14 +++++++-------
 sw/uiconfig/swreport/toolbar/oleobjectbar.xml   |   12 ++++++------
 sw/uiconfig/swriter/toolbar/frameobjectbar.xml  |   14 +++++++-------
 sw/uiconfig/swriter/toolbar/oleobjectbar.xml    |   12 ++++++------
 sw/uiconfig/swxform/toolbar/frameobjectbar.xml  |   14 +++++++-------
 sw/uiconfig/swxform/toolbar/oleobjectbar.xml    |   12 ++++++------
 12 files changed, 78 insertions(+), 78 deletions(-)

New commits:
commit 3d0998c8fcea85da25b9c2fcff2b242159a255e4
Author:     Matthias Seidel <mseidel at apache.org>
AuthorDate: Thu Sep 20 19:40:02 2018 +0000
Commit:     Matthias Seidel <mseidel at apache.org>
CommitDate: Thu Sep 20 19:40:02 2018 +0000

    i113385 - Use correct UNO commands for object allignment (Frame and OLE toolbar)
    
    See IDs 10131-10136:
    https://wiki.openoffice.org/wiki/Framework/Article/OpenOffice.org_3.x_Commands#Global_commands

diff --git a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
index 8793afa3ba34..4779f6648cfe 100644
--- a/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/frameobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:style="radio" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
@@ -53,4 +53,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
  <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml
index 2cd0da480546..7b272713ff6b 100644
--- a/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/sglobal/toolbar/oleobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
diff --git a/sw/uiconfig/sweb/toolbar/frameobjectbar.xml b/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
index 8793afa3ba34..4779f6648cfe 100644
--- a/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/frameobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:style="radio" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
@@ -53,4 +53,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
  <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/sweb/toolbar/oleobjectbar.xml b/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
index 2cd0da480546..7b272713ff6b 100644
--- a/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/sweb/toolbar/oleobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
diff --git a/sw/uiconfig/swform/toolbar/frameobjectbar.xml b/sw/uiconfig/swform/toolbar/frameobjectbar.xml
index 8793afa3ba34..4779f6648cfe 100644
--- a/sw/uiconfig/swform/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/frameobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:style="radio" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
@@ -53,4 +53,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
  <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swform/toolbar/oleobjectbar.xml b/sw/uiconfig/swform/toolbar/oleobjectbar.xml
index 2cd0da480546..7b272713ff6b 100644
--- a/sw/uiconfig/swform/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swform/toolbar/oleobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
diff --git a/sw/uiconfig/swreport/toolbar/frameobjectbar.xml b/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
index 8793afa3ba34..4779f6648cfe 100644
--- a/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/frameobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:style="radio" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
@@ -53,4 +53,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
  <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swreport/toolbar/oleobjectbar.xml b/sw/uiconfig/swreport/toolbar/oleobjectbar.xml
index 2cd0da480546..7b272713ff6b 100644
--- a/sw/uiconfig/swreport/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swreport/toolbar/oleobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
diff --git a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
index 8793afa3ba34..4779f6648cfe 100644
--- a/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/frameobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:style="radio" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
@@ -53,4 +53,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
  <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
index 2cd0da480546..7b272713ff6b 100644
--- a/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swriter/toolbar/oleobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
diff --git a/sw/uiconfig/swxform/toolbar/frameobjectbar.xml b/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
index 8793afa3ba34..4779f6648cfe 100644
--- a/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/frameobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapRight" toolbar:style="radio" toolbar:visible="false"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter" toolbar:style="radio"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle" toolbar:style="radio"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown" toolbar:style="radio"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>
@@ -53,4 +53,4 @@
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:ChainFrames"/>
  <toolbar:toolbaritem xlink:href=".uno:UnhainFrames"/>
-</toolbar:toolbar>
\ No newline at end of file
+</toolbar:toolbar>
diff --git a/sw/uiconfig/swxform/toolbar/oleobjectbar.xml b/sw/uiconfig/swxform/toolbar/oleobjectbar.xml
index 2cd0da480546..7b272713ff6b 100644
--- a/sw/uiconfig/swxform/toolbar/oleobjectbar.xml
+++ b/sw/uiconfig/swxform/toolbar/oleobjectbar.xml
@@ -32,13 +32,13 @@
  <toolbar:toolbaritem xlink:href=".uno:WrapThrough"/>
  <toolbar:toolbaritem xlink:href=".uno:WrapIdeal" toolbar:visible="false"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignLeft"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignHorizontalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignRight"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignLeft"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignCenter"/>
+ <toolbar:toolbaritem xlink:href=".uno:ObjectAlignRight"/>
  <toolbar:toolbarseparator/>
- <toolbar:toolbaritem xlink:href=".uno:AlignTop"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignVerticalCenter"/>
- <toolbar:toolbaritem xlink:href=".uno:AlignBottom"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignUp"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignMiddle"/>
+ <toolbar:toolbaritem xlink:href=".uno:AlignDown"/>
  <toolbar:toolbarseparator/>
  <toolbar:toolbaritem xlink:href=".uno:SetBorderStyle"/>
  <toolbar:toolbaritem xlink:href=".uno:LineStyle"/>

More information about the Libreoffice-commits mailing list