[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.4' - sw/inc sw/sdi sw/source

[Tor Lillqvist (via logerrit)]

 sw/inc/cmdid.h                      |    3 ++-
 sw/sdi/_textsh.sdi                  |    6 ++++++
 sw/sdi/swriter.sdi                  |   17 +++++++++++++++++
 sw/source/uibase/shells/textsh1.cxx |   10 ++++++++++
 4 files changed, 35 insertions(+), 1 deletion(-)

New commits:
commit 4b706110693eb10e0ee381a1b6124840255e5f86
Author:     Tor Lillqvist <tml at collabora.com>
AuthorDate: Mon Feb 3 15:03:50 2020 +0200
Commit:     Tor Lillqvist <tml at collabora.com>
CommitDate: Mon May 18 08:45:53 2020 +0200

    tdf#128468: Add new UNO command "MoveTabstop"
    
    Work in progress. Implementation still incomplete.
    
    The stuff I added in the .sdi files is mostly copy-paste without any
    deeper understanding.
    
    Change-Id: Iad36c20e963c9df19645a04ca4a0d9bf81f3839a
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/87873
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Tor Lillqvist <tml at collabora.com>
    (cherry picked from commit 00db5444b2126dbf48a7ef65e702dd4b10d4f941)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/94223
    Tested-by: Tor Lillqvist <tml at collabora.com>

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index f382e820cf0b..e3666c9bfeb7 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -469,7 +469,8 @@
 #define FN_FORMAT_APPLY_DEFAULT             (FN_FORMAT2 + 157)
 #define FN_FORMAT_APPLY_TEXTBODY            (FN_FORMAT2 + 158)
 #define FN_REMOVE_DIRECT_CHAR_FORMATS       (FN_FORMAT2 + 159)
-//free (160)
+
+#define FN_MOVE_TABSTOP                     (FN_FORMAT2 + 160)
 
 // Region: Extras
 #define FN_LINE_NUMBERING_DLG       (FN_EXTRA + 2 )   /* */
diff --git a/sw/sdi/_textsh.sdi b/sw/sdi/_textsh.sdi
index 102699cbad19..945def69abaa 100644
--- a/sw/sdi/_textsh.sdi
+++ b/sw/sdi/_textsh.sdi
@@ -1574,6 +1574,12 @@ interface BaseText
         DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
     ]
 
+    FN_MOVE_TABSTOP
+    [
+        ExecMethod = Execute ;
+        DisableFlags="SfxDisableFlags::SwOnProtectedCursor";
+    ]
+
     SID_TRANSLITERATE_SENTENCE_CASE
     [
         ExecMethod = ExecTransliteration;
diff --git a/sw/sdi/swriter.sdi b/sw/sdi/swriter.sdi
index d063a0dd5441..b088189e6753 100644
--- a/sw/sdi/swriter.sdi
+++ b/sw/sdi/swriter.sdi
@@ -7934,3 +7934,20 @@ SfxUInt32Item TableColumWidth SID_ATTR_TABLE_COLUMN_WIDTH
     ToolBoxConfig = FALSE,
     GroupId = SfxGroupId::Table;
 ]
+
+SfxVoidItem MoveTabstop FN_MOVE_TABSTOP
+(SfxInt32Item Tabstop FN_PARAM_1, SfxInt32Item Amount FN_PARAM_2)
+[
+    AutoUpdate = FALSE,
+    FastCall = FALSE,
+    ReadOnlyDoc = TRUE,
+    Toggle = FALSE,
+    Container = FALSE,
+    RecordAbsolute = FALSE,
+    RecordPerSet;
+
+    AccelConfig = TRUE,
+    MenuConfig = TRUE,
+    ToolBoxConfig = TRUE,
+    GroupId = SfxGroupId::Format;
+]
diff --git a/sw/source/uibase/shells/textsh1.cxx b/sw/source/uibase/shells/textsh1.cxx
index bc7c8e7502fb..3735ca48af65 100644
--- a/sw/source/uibase/shells/textsh1.cxx
+++ b/sw/source/uibase/shells/textsh1.cxx
@@ -1576,6 +1576,16 @@ void SwTextShell::Execute(SfxRequest &rReq)
         rWrtSh.SetInsMode( bOldIns );
     }
     break;
+    case FN_MOVE_TABSTOP:
+    {
+        const SfxInt32Item* pIndex = rReq.GetArg<SfxInt32Item>(FN_PARAM_1);
+        const SfxInt32Item* pAmount = rReq.GetArg<SfxInt32Item>(FN_PARAM_2);
+        if (!pIndex || !pAmount)
+            break;
+        SAL_INFO("sw.ui", "MoveTabstop(" << pIndex->GetValue() << "," << pAmount->GetValue() << ")");
+        // To be implemented
+    }
+    break;
     default:
         OSL_ENSURE(false, "wrong dispatcher");
         return;