sw/source/ui/dochdl/dochdl.src | 2 +-
sw/source/uibase/dochdl/swdtflvr.cxx | 1 +
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 40dbc52755a905b4437d861360d3b8069d5b53b1
Author: Caolán McNamara <caol...@redhat.com>
Date: Wed Jun 17 10:48:47 2015 +0100
error message for 0 cells or 0 rows is misleading
Change-Id: I0c8a360a264fe960303431877856b5f2f2d731fc
diff --git a/sw/source/ui/dochdl/dochdl.src b/sw/source/ui/dochdl/dochdl.src
index e303d5a..e2de366 100644
--- a/sw/source/ui/dochdl/dochdl.src
+++ b/sw/source/ui/dochdl/dochdl.src
@@ -27,7 +27,7 @@ String STR_NOGLOS
String STR_NO_TABLE
{
- Text [ en-US ] = "A table cannot be inserted into another table. However,
you can paste the data into the document when the cursor is not in a table.";
+ Text [ en-US ] = "A table with no rows or no cells cannot be inserted";
};
String STR_TABLE_TOO_LARGE
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 2cf4786..ab5b2b9 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -2168,6 +2168,7 @@ bool SwTransferable::_PasteDDE( TransferableDataHelper&
rData,
sTmp = sTmp.getToken( 0, '\n' );
sal_Int32 nCols = comphelper::string::getTokenCount(sTmp,
'\t');
+ // don't try to insert tables that are too large for writer
if (nRows > USHRT_MAX || nCols > USHRT_MAX)
{
if( bMsg )
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
