desktop/source/lib/init.cxx | 3 +++ libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx | 17 +++++------------ sfx2/source/control/unoctitm.cxx | 5 ++++- 3 files changed, 12 insertions(+), 13 deletions(-)
New commits: commit a27e09079596eeae81cced01eaeabf94d6675085 Author: Pranav Kant <pran...@collabora.co.uk> Date: Sat Jan 21 01:03:34 2017 +0530 lok: Listen for state change events for cell alignment commands We used to use HorizontalAlignment uno command for cell alignment both in online and gtktiledviewer. To make things simpler, lets use separate cell alignment uno commands for spreadsheets like we have in writer and impres. Change-Id: I2a959d1892f6b02db7a9ce51d55309216e4b3c6c Reviewed-on: https://gerrit.libreoffice.org/33444 Reviewed-by: pranavk <pran...@collabora.co.uk> Tested-by: pranavk <pran...@collabora.co.uk> diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx index 3df7b2e..3aef796 100644 --- a/desktop/source/lib/init.cxx +++ b/desktop/source/lib/init.cxx @@ -1344,6 +1344,9 @@ static void doc_iniUnoCommands () OUString sUnoCommands[] = { + OUString(".uno:AlignLeft"), + OUString(".uno:AlignHorizontalCenter"), + OUString(".uno:AlignRight"), OUString(".uno:BackColor"), OUString(".uno:BackgroundColor"), OUString(".uno:Bold"), diff --git a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx index 3c774c1..b53789b 100644 --- a/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx +++ b/libreofficekit/qa/gtktiledviewer/gtktiledviewer.cxx @@ -374,18 +374,11 @@ gboolean TiledRowColumnBar::docConfigureEvent(GtkWidget* pDocView, GdkEventConfi gtk_widget_queue_draw(rWindow.m_pColumnBar->m_pDrawingArea); gtk_widget_show(rWindow.m_pFormulabarEntry); - // Change horizontal alignment uno commands for spreadsheet - const std::string argsPrefix = - "{" - "\"HorizontalAlignment\":{" - "\"type\":\"unsigned short\", " - "\"value\":\""; - const std::string argsSuffix = "\"}}"; - - lcl_registerToolItem(rWindow, rWindow.m_pLeftpara, ".uno:HorizontalAlignment", argsPrefix + std::to_string(1) + argsSuffix); - lcl_registerToolItem(rWindow, rWindow.m_pCenterpara, ".uno:HorizontalAlignment", argsPrefix + std::to_string(2) + argsSuffix); - lcl_registerToolItem(rWindow, rWindow.m_pRightpara, ".uno:HorizontalAlignment", argsPrefix + std::to_string(3) + argsSuffix); - lcl_registerToolItem(rWindow, rWindow.m_pJustifypara, ".uno:HorizontalAlignment", argsPrefix + std::to_string(4) + argsSuffix); + // Change cell alignment uno commands for spreadsheet + lcl_registerToolItem(rWindow, rWindow.m_pLeftpara, ".uno:AlignLeft"); + lcl_registerToolItem(rWindow, rWindow.m_pCenterpara, ".uno:AlignHorizontalCenter"); + lcl_registerToolItem(rWindow, rWindow.m_pRightpara, ".uno:AlignRight"); + gtk_widget_hide(GTK_WIDGET(rWindow.m_pJustifypara)); } return TRUE; diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 03f7637..33d5314 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -996,7 +996,10 @@ static void InterceptLOKStateChangeEvent(const SfxViewFrame* pViewFrame, const c aEvent.FeatureURL.Path == "Underline" || aEvent.FeatureURL.Path == "ModifiedStatus" || aEvent.FeatureURL.Path == "TrackChanges" || - aEvent.FeatureURL.Path == "AcceptTrackedChange") + aEvent.FeatureURL.Path == "AcceptTrackedChange" || + aEvent.FeatureURL.Path == "AlignLeft" || + aEvent.FeatureURL.Path == "AlignHorizontalCenter" || + aEvent.FeatureURL.Path == "AlignRight") { bool bTemp = false; aEvent.State >>= bTemp; _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits