summaryrefslogtreecommitdiff
path: root/sw/source
diff options
context:
space:
mode:
authorSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-12-11 09:23:09 +0100
committerSamuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>2015-12-11 10:19:54 +0000
commitba659f71f482dd74a83aaa9710ea65fff27ac274 (patch)
treea678a31f1a7f0c673a8eda6616a975cb1d5cc8a2 /sw/source
parentda419ab6b28f0a20a62ea7fa13ab97a8ae946899 (diff)
tdf#96075 Frame alignment buttons not using correct tooltips
Tooltips change on state change, and they were taken from another source. Unify this to reuse the existing strings from the uno command. Change-Id: I8ff6fc43bc0469f15c9e930695d950f6d664bfdf Reviewed-on: https://gerrit.libreoffice.org/20629 Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> Tested-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Diffstat (limited to 'sw/source')
-rw-r--r--sw/source/ui/frmdlg/frmui.src19
-rw-r--r--sw/source/uibase/shells/frmsh.cxx26
2 files changed, 17 insertions, 28 deletions
diff --git a/sw/source/ui/frmdlg/frmui.src b/sw/source/ui/frmdlg/frmui.src
index c6d436a8baf3..ecbcc4e9279a 100644
--- a/sw/source/ui/frmdlg/frmui.src
+++ b/sw/source/ui/frmdlg/frmui.src
@@ -19,25 +19,6 @@
#include "frmui.hrc"
/*-----------------------------------------------------------------------
- Description: V-Align
- -----------------------------------------------------------------------*/
-String STR_TOP
-{
- Text [ en-US ] = "~Top" ;
-};
-String STR_BOTTOM
-{
- Text [ en-US ] = "~Bottom" ;
-};
-String STR_CENTER_VERT
-{
- Text [ en-US ] = "C~enter" ;
-};
-String STR_CENTER_HORI
-{
- Text [ en-US ] = "~Center" ;
-};
-/*-----------------------------------------------------------------------
Description: V-Rel
-----------------------------------------------------------------------*/
String STR_TOPPRT
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index adc98c129b39..17778e5a296e 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -43,6 +43,7 @@
#include <svx/hlnkitem.hxx>
#include <svx/svdview.hxx>
#include <vcl/msgbox.hxx>
+#include <vcl/commandinfoprovider.hxx>
#include <doc.hxx>
#include <drawdoc.hxx>
@@ -739,21 +740,25 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
rSet.DisableItem( nWhich );
else
{
- sal_uInt16 nId = 0;
+ // These slots need different labels depending on whether they are anchored in a character
+ // or on a paragraph/page etc.
+ OUString sNewLabel;
if (eFrameType & FrameTypeFlags::FLY_INCNT)
{
switch (nWhich)
{
case SID_OBJECT_ALIGN_UP :
case FN_FRAME_ALIGN_VERT_TOP:
- nId = STR_TOP_BASE; break;
+ sNewLabel = SW_RES(STR_TOP_BASE);
+ break;
case SID_OBJECT_ALIGN_MIDDLE :
case FN_FRAME_ALIGN_VERT_CENTER:
- nId = STR_CENTER_BASE; break;
+ sNewLabel = SW_RES(STR_CENTER_BASE);
+ break;
case SID_OBJECT_ALIGN_DOWN :
case FN_FRAME_ALIGN_VERT_BOTTOM:
if(!bHtmlMode)
- nId = STR_BOTTOM_BASE;
+ sNewLabel = SW_RES(STR_BOTTOM_BASE);
else
rSet.DisableItem( nWhich );
break;
@@ -782,17 +787,20 @@ void SwFrameShell::GetState(SfxItemSet& rSet)
{
case SID_OBJECT_ALIGN_UP :
case FN_FRAME_ALIGN_VERT_TOP:
- nId = STR_TOP; break;
+ sNewLabel = vcl::CommandInfoProvider::Instance().GetLabelForCommand(".uno:AlignTop", GetFrame()->GetFrame().GetFrameInterface());
+ break;
case SID_OBJECT_ALIGN_MIDDLE:
case FN_FRAME_ALIGN_VERT_CENTER:
- nId = STR_CENTER_VERT; break;
+ sNewLabel = vcl::CommandInfoProvider::Instance().GetLabelForCommand(".uno:AlignVerticalCenter", GetFrame()->GetFrame().GetFrameInterface());
+ break;
case SID_OBJECT_ALIGN_DOWN:
case FN_FRAME_ALIGN_VERT_BOTTOM:
- nId = STR_BOTTOM; break;
+ sNewLabel = vcl::CommandInfoProvider::Instance().GetLabelForCommand(".uno:AlignBottom", GetFrame()->GetFrame().GetFrameInterface());
+ break;
}
}
- if ( nId )
- rSet.Put( SfxStringItem( nWhich, SW_RES(nId) ));
+ if ( !sNewLabel.isEmpty() )
+ rSet.Put( SfxStringItem( nWhich, sNewLabel ));
}
break;
case SID_HYPERLINK_GETLINK: