[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - sw/inc sw/source
Caolán McNamara
caolanm at redhat.com
Wed Jun 14 14:12:21 UTC 2017
sw/inc/comcore.hrc | 49 +++++++++++++++++++----------------
sw/source/core/undo/undo.src | 20 ++++++++++++++
sw/source/uibase/docvw/docvw.hrc | 51 ++++++++++++++++++++-----------------
sw/source/uibase/docvw/docvw.src | 20 ++++++++++++++
sw/source/uibase/docvw/edtwin2.cxx | 5 +++
5 files changed, 100 insertions(+), 45 deletions(-)
New commits:
commit b0964a089bc6e6bd7183a5fe181a2b88bebe1244
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Jun 10 21:03:46 2017 +0100
various extensions to REDLINE_ sequence not reflected in related resources
i.e.
commit e52f14efaa53b496599b51fb064a933183731fca
Author: Adam Co <rattles2013 at gmail.com>
Date: Sun Dec 8 17:14:14 2013 +0200
Export redline 'paragraph formatting changes' back to DOCX
const RedlineType_t REDLINE_FMTCOLL = 0x4;// Style has been altered (Autoformat!).
+ const RedlineType_t REDLINE_PARAGRAPH_FORMAT = 0x5;// Paragraph attributes have been changed
commit d688069023959ab97d14eb1dbfd5bf6ad3c1b160
Author: Adam Co <rattles2013 at gmail.com>
Date: Mon Feb 3 17:44:22 2014 +0200
Add support for 'Table Row Redlines' in SW core
const RedlineType_t REDLINE_PARAGRAPH_FORMAT = 0x5;// Paragraph attributes have been changed.
+ const RedlineType_t REDLINE_TABLE_ROW_INSERT = 0x6;// Table row has been inserted.
+ const RedlineType_t REDLINE_TABLE_ROW_DELETE = 0x7;// Table row has been deleted.
commit 06a887ca92f35b4e44dfc638a9a444fc636bc9d0
Author: Adam Co <rattles2013 at gmail.com>
Date: Wed Feb 5 13:37:45 2014 +0200
Add support for 'Table Cell Redlines' in SW core
const RedlineType_t REDLINE_TABLE_ROW_DELETE = 0x7;// Table row has been deleted.
+ const RedlineType_t REDLINE_TABLE_CELL_INSERT = 0x8;// Table cell has been inserted.
+ const RedlineType_t REDLINE_TABLE_CELL_DELETE = 0x9;// Table cell has been deleted.
all extend the REDLINE_* ranges, and SwRedlineData::GetDescr just adds GetType() of a value
in that range to the STR_UNDO_REDLINE_INSERT baseline which just maps the new values to
arbitrary unrelated strings
Change-Id: I44d5050ef012ac44346a7164b89a2773fb33d4dc
Reviewed-on: https://gerrit.libreoffice.org/38643
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
diff --git a/sw/inc/comcore.hrc b/sw/inc/comcore.hrc
index 679020a5b198..c858f5cdfc20 100644
--- a/sw/inc/comcore.hrc
+++ b/sw/inc/comcore.hrc
@@ -42,29 +42,34 @@
#define STR_UNDO_REDLINE_FORMAT (RC_COMCORE_BEGIN + 21)
#define STR_UNDO_REDLINE_TABLE (RC_COMCORE_BEGIN + 22)
#define STR_UNDO_REDLINE_FMTCOLL (RC_COMCORE_BEGIN + 23)
-#define STR_START_QUOTE (RC_COMCORE_BEGIN + 25)
-#define STR_END_QUOTE (RC_COMCORE_BEGIN + 26)
-#define STR_LDOTS (RC_COMCORE_BEGIN + 27)
-#define STR_YIELDS (RC_COMCORE_BEGIN + 28)
-#define STR_PARAGRAPHS (RC_COMCORE_BEGIN + 29)
-#define STR_MULTISEL (RC_COMCORE_BEGIN + 30)
-#define STR_N_REDLINES (RC_COMCORE_BEGIN + 32)
-#define STR_FIELD (RC_COMCORE_BEGIN + 33)
+#define STR_UNDO_REDLINE_PARAGRAPH_FORMAT (RC_COMCORE_BEGIN + 24)
+#define STR_UNDO_REDLINE_TABLE_ROW_INSERT (RC_COMCORE_BEGIN + 25)
+#define STR_UNDO_REDLINE_TABLE_ROW_DELETE (RC_COMCORE_BEGIN + 26)
+#define STR_UNDO_REDLINE_TABLE_CELL_INSERT (RC_COMCORE_BEGIN + 27)
+#define STR_UNDO_REDLINE_TABLE_CELL_DELETE (RC_COMCORE_BEGIN + 28)
+#define STR_START_QUOTE (RC_COMCORE_BEGIN + 29)
+#define STR_END_QUOTE (RC_COMCORE_BEGIN + 30)
+#define STR_LDOTS (RC_COMCORE_BEGIN + 31)
+#define STR_YIELDS (RC_COMCORE_BEGIN + 32)
+#define STR_PARAGRAPHS (RC_COMCORE_BEGIN + 33)
+#define STR_MULTISEL (RC_COMCORE_BEGIN + 34)
+#define STR_N_REDLINES (RC_COMCORE_BEGIN + 35)
+#define STR_FIELD (RC_COMCORE_BEGIN + 36)
-#define STR_FRAME (RC_COMCORE_BEGIN + 34)
-#define STR_OLE (RC_COMCORE_BEGIN + 35)
-#define STR_MATH_FORMULA (RC_COMCORE_BEGIN + 36)
-#define STR_CHART (RC_COMCORE_BEGIN + 37)
-#define STR_NOTE (RC_COMCORE_BEGIN + 38)
-#define STR_REFERENCE (RC_COMCORE_BEGIN + 39)
-#define STR_SCRIPT (RC_COMCORE_BEGIN + 40)
-#define STR_AUTHORITY_ENTRY (RC_COMCORE_BEGIN + 41)
-#define STR_SPECIALCHAR (RC_COMCORE_BEGIN + 42)
-#define STR_FOOTNOTE (RC_COMCORE_BEGIN + 43)
-#define STR_GRAPHIC (RC_COMCORE_BEGIN + 44)
-#define STR_DRAWING_OBJECTS (RC_COMCORE_BEGIN + 45)
-#define STR_TABLE_NAME (RC_COMCORE_BEGIN + 46)
-#define STR_PARAGRAPH_UNDO (RC_COMCORE_BEGIN + 47)
+#define STR_FRAME (RC_COMCORE_BEGIN + 37)
+#define STR_OLE (RC_COMCORE_BEGIN + 38)
+#define STR_MATH_FORMULA (RC_COMCORE_BEGIN + 39)
+#define STR_CHART (RC_COMCORE_BEGIN + 40)
+#define STR_NOTE (RC_COMCORE_BEGIN + 41)
+#define STR_REFERENCE (RC_COMCORE_BEGIN + 42)
+#define STR_SCRIPT (RC_COMCORE_BEGIN + 43)
+#define STR_AUTHORITY_ENTRY (RC_COMCORE_BEGIN + 44)
+#define STR_SPECIALCHAR (RC_COMCORE_BEGIN + 45)
+#define STR_FOOTNOTE (RC_COMCORE_BEGIN + 46)
+#define STR_GRAPHIC (RC_COMCORE_BEGIN + 47)
+#define STR_DRAWING_OBJECTS (RC_COMCORE_BEGIN + 48)
+#define STR_TABLE_NAME (RC_COMCORE_BEGIN + 49)
+#define STR_PARAGRAPH_UNDO (RC_COMCORE_BEGIN + 50)
// defines for the Autoformat Redline Comments
#define STR_AUTOFMTREDL_DEL_EMPTY_PARA 0
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index 34680f86bfb3..7c63b86af15f 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -482,6 +482,26 @@ String STR_UNDO_REDLINE_FMTCOLL
{
Text [ en-US ] = "Style changed";
};
+String STR_UNDO_REDLINE_PARAGRAPH_FORMAT
+{
+ Text [ en-US ] = "Paragraph formatting changed";
+};
+String STR_UNDO_REDLINE_TABLE_ROW_INSERT
+{
+ Text [ en-US ] = "Insert Row";
+};
+String STR_UNDO_REDLINE_TABLE_ROW_DELETE
+{
+ Text [ en-US ] = "Delete Row";
+};
+String STR_UNDO_REDLINE_TABLE_CELL_INSERT
+{
+ Text [ en-US ] = "Insert Cell";
+};
+String STR_UNDO_REDLINE_TABLE_CELL_DELETE
+{
+ Text [ en-US ] = "Delete Cell";
+};
String STR_N_REDLINES
{
Text [ en-US ] = "$1 changes";
diff --git a/sw/source/uibase/docvw/docvw.hrc b/sw/source/uibase/docvw/docvw.hrc
index 799efce72c69..f98e300356fa 100644
--- a/sw/source/uibase/docvw/docvw.hrc
+++ b/sw/source/uibase/docvw/docvw.hrc
@@ -27,29 +27,34 @@
#define STR_REDLINE_FORMAT (RC_DOCVW_BEGIN + 11)
#define STR_REDLINE_TABLE (RC_DOCVW_BEGIN + 12)
#define STR_REDLINE_FMTCOLL (RC_DOCVW_BEGIN + 13)
-#define STR_ENDNOTE (RC_DOCVW_BEGIN + 14)
-#define STR_FTNNOTE (RC_DOCVW_BEGIN + 15)
-
-#define STR_TABLE_COL_ADJUST (RC_DOCVW_BEGIN + 16)
-#define STR_TABLE_ROW_ADJUST (RC_DOCVW_BEGIN + 17)
-#define STR_TABLE_SELECT_ALL (RC_DOCVW_BEGIN + 18)
-#define STR_TABLE_SELECT_ROW (RC_DOCVW_BEGIN + 19)
-#define STR_TABLE_SELECT_COL (RC_DOCVW_BEGIN + 20)
-
-#define STR_SMARTTAG_CLICK (RC_DOCVW_BEGIN + 21)
-
-#define STR_HEADER_TITLE (RC_DOCVW_BEGIN + 22)
-#define STR_FOOTER_TITLE (RC_DOCVW_BEGIN + 23)
-#define STR_DELETE_HEADER (RC_DOCVW_BEGIN + 24)
-#define STR_FORMAT_HEADER (RC_DOCVW_BEGIN + 25)
-#define STR_DELETE_FOOTER (RC_DOCVW_BEGIN + 26)
-#define STR_FORMAT_FOOTER (RC_DOCVW_BEGIN + 27)
-#define STR_FIRST_HEADER_TITLE (RC_DOCVW_BEGIN + 28)
-#define STR_LEFT_HEADER_TITLE (RC_DOCVW_BEGIN + 29)
-#define STR_RIGHT_HEADER_TITLE (RC_DOCVW_BEGIN + 30)
-#define STR_FIRST_FOOTER_TITLE (RC_DOCVW_BEGIN + 31)
-#define STR_LEFT_FOOTER_TITLE (RC_DOCVW_BEGIN + 32)
-#define STR_RIGHT_FOOTER_TITLE (RC_DOCVW_BEGIN + 33)
+#define STR_REDLINE_PARAGRAPH_FORMAT (RC_DOCVW_BEGIN + 14)
+#define STR_REDLINE_TABLE_ROW_INSERT (RC_DOCVW_BEGIN + 15)
+#define STR_REDLINE_TABLE_ROW_DELETE (RC_DOCVW_BEGIN + 16)
+#define STR_REDLINE_TABLE_CELL_INSERT (RC_DOCVW_BEGIN + 17)
+#define STR_REDLINE_TABLE_CELL_DELETE (RC_DOCVW_BEGIN + 18)
+#define STR_ENDNOTE (RC_DOCVW_BEGIN + 19)
+#define STR_FTNNOTE (RC_DOCVW_BEGIN + 20)
+
+#define STR_TABLE_COL_ADJUST (RC_DOCVW_BEGIN + 21)
+#define STR_TABLE_ROW_ADJUST (RC_DOCVW_BEGIN + 22)
+#define STR_TABLE_SELECT_ALL (RC_DOCVW_BEGIN + 23)
+#define STR_TABLE_SELECT_ROW (RC_DOCVW_BEGIN + 24)
+#define STR_TABLE_SELECT_COL (RC_DOCVW_BEGIN + 25)
+
+#define STR_SMARTTAG_CLICK (RC_DOCVW_BEGIN + 26)
+
+#define STR_HEADER_TITLE (RC_DOCVW_BEGIN + 27)
+#define STR_FOOTER_TITLE (RC_DOCVW_BEGIN + 28)
+#define STR_DELETE_HEADER (RC_DOCVW_BEGIN + 29)
+#define STR_FORMAT_HEADER (RC_DOCVW_BEGIN + 30)
+#define STR_DELETE_FOOTER (RC_DOCVW_BEGIN + 31)
+#define STR_FORMAT_FOOTER (RC_DOCVW_BEGIN + 32)
+#define STR_FIRST_HEADER_TITLE (RC_DOCVW_BEGIN + 33)
+#define STR_LEFT_HEADER_TITLE (RC_DOCVW_BEGIN + 34)
+#define STR_RIGHT_HEADER_TITLE (RC_DOCVW_BEGIN + 35)
+#define STR_FIRST_FOOTER_TITLE (RC_DOCVW_BEGIN + 36)
+#define STR_LEFT_FOOTER_TITLE (RC_DOCVW_BEGIN + 37)
+#define STR_RIGHT_FOOTER_TITLE (RC_DOCVW_BEGIN + 38)
#define DOCVW_ACT_END STR_RIGHT_FOOTER_TITLE
diff --git a/sw/source/uibase/docvw/docvw.src b/sw/source/uibase/docvw/docvw.src
index 22e47e6a8709..75f8738ac6c3 100644
--- a/sw/source/uibase/docvw/docvw.src
+++ b/sw/source/uibase/docvw/docvw.src
@@ -41,6 +41,26 @@ String STR_REDLINE_FMTCOLL
{
Text [ en-US ] = "Applied Paragraph Styles";
};
+String STR_REDLINE_PARAGRAPH_FORMAT
+{
+ Text [ en-US ] = "Paragraph formatting changed";
+};
+String STR_REDLINE_TABLE_ROW_INSERT
+{
+ Text [ en-US ] = "Row Inserted";
+};
+String STR_REDLINE_TABLE_ROW_DELETE
+{
+ Text [ en-US ] = "Row Deleted";
+};
+String STR_REDLINE_TABLE_CELL_INSERT
+{
+ Text [ en-US ] = "Cell Inserted";
+};
+String STR_REDLINE_TABLE_CELL_DELETE
+{
+ Text [ en-US ] = "Cell Deleted";
+};
String STR_ENDNOTE
{
Text [ en-US ] = "Endnote: " ;
diff --git a/sw/source/uibase/docvw/edtwin2.cxx b/sw/source/uibase/docvw/edtwin2.cxx
index 1a5e1dd0243b..04152ea8efce 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -75,6 +75,11 @@ static OUString lcl_GetRedlineHelp( const SwRangeRedline& rRedl, bool bBalloon )
case nsRedlineType_t::REDLINE_FORMAT: nResId = STR_REDLINE_FORMAT; break;
case nsRedlineType_t::REDLINE_TABLE: nResId = STR_REDLINE_TABLE; break;
case nsRedlineType_t::REDLINE_FMTCOLL: nResId = STR_REDLINE_FMTCOLL; break;
+ case nsRedlineType_t::REDLINE_PARAGRAPH_FORMAT: nResId = STR_REDLINE_PARAGRAPH_FORMAT; break;
+ case nsRedlineType_t::REDLINE_TABLE_ROW_INSERT: nResId = STR_REDLINE_TABLE_ROW_INSERT; break;
+ case nsRedlineType_t::REDLINE_TABLE_ROW_DELETE: nResId = STR_REDLINE_TABLE_ROW_DELETE; break;
+ case nsRedlineType_t::REDLINE_TABLE_CELL_INSERT: nResId = STR_REDLINE_TABLE_CELL_INSERT; break;
+ case nsRedlineType_t::REDLINE_TABLE_CELL_DELETE: nResId = STR_REDLINE_TABLE_CELL_DELETE; break;
}
OUStringBuffer sBuf;
More information about the Libreoffice-commits
mailing list