diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-01-23 16:44:16 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-01-24 07:54:53 +0100 |
| commit | f8aca037896ce7085f0be0ab524b524bae57d38c (patch) | |
| tree | d09978610e18fa8f30f4080bb8b248d3cf6d8fe6 | |
| parent | e8efbffc83e926c2af0a92cc2c2d3d29cfaa7478 (diff) | |
USHRT_MAX -> SAL_MAX_UINT16
...presumably forgotten when changing SwEditShell::InsertDDETable parameters
from USHORT to sal_uInt16 in 7f33ed417b2e29e5470724ea76967f64699a2662
"removetooltypes01: #i112600# Remove tools types from sw"
Change-Id: I28ad46bdfb6c95a7d2e0bcbf2ef8eef29217baa5
Reviewed-on: https://gerrit.libreoffice.org/48436
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
| -rw-r--r-- | sw/source/uibase/dochdl/swdtflvr.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx b/sw/source/uibase/dochdl/swdtflvr.cxx index ad4c27719948..8157dfd71f81 100644 --- a/sw/source/uibase/dochdl/swdtflvr.cxx +++ b/sw/source/uibase/dochdl/swdtflvr.cxx @@ -2148,7 +2148,7 @@ bool SwTransferable::PasteDDE( TransferableDataHelper& rData, 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 (nRows > SAL_MAX_UINT16 || nCols > SAL_MAX_UINT16) { if( bMsg ) ScopedVclPtrInstance<MessageDialog>(nullptr, SwResId(STR_TABLE_TOO_LARGE), VclMessageType::Info)->Execute(); |