summaryrefslogtreecommitdiff
path: root/editeng
diff options
context:
space:
mode:
authorMatúš Kukan <matus.kukan@collabora.com>2014-06-23 11:37:47 +0200
committerAndras Timar <andras.timar@collabora.com>2014-06-30 05:24:40 +0000
commit379fe6f973a6c9869778d1018591308447e1c4e4 (patch)
treeadf5c4650bf0c319bde68be5e509bfbf0d8c605a /editeng
parentc6fe783c0ebec2ca95463605e7758e80c17d3f7e (diff)
bnc#882631: Do not hide top of the first row when editing text in table cells.
This can happen when proportional line spacing is less than 100% and "FontIndependentLineSpacing" is set, so just keep the height of the very first line in case of IsFixedCellHeight() too. Change-Id: Id231fc1f2373645e5420f877e8c2568ce8a1f099 (cherry picked from commit 9388c45c0263a0090f9cb4be9c42b93b5f7985d0) Reviewed-on: https://gerrit.libreoffice.org/9891 Reviewed-by: Andras Timar <andras.timar@collabora.com> Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'editeng')
-rw-r--r--editeng/source/editeng/impedit3.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/editeng/source/editeng/impedit3.cxx b/editeng/source/editeng/impedit3.cxx
index 57a05aaf3901..a2d92a65311f 100644
--- a/editeng/source/editeng/impedit3.cxx
+++ b/editeng/source/editeng/impedit3.cxx
@@ -1343,7 +1343,7 @@ sal_Bool ImpEditEngine::CreateLines( sal_Int32 nPara, sal_uInt32 nStartPosY )
}
else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
{
- if ( nPara || IsFixedCellHeight() || pLine->GetStartPortion() ) // Not the very first line
+ if ( nPara || pLine->GetStartPortion() ) // Not the very first line
{
// There are documents with PropLineSpace 0, why?
// (cmc: re above question :-) such documents can be seen by importing a .ppt
@@ -1673,7 +1673,7 @@ void ImpEditEngine::CreateAndInsertEmptyLine( ParaPortion* pParaPortion, sal_uIn
else if ( rLSItem.GetInterLineSpaceRule() == SVX_INTER_LINE_SPACE_PROP )
{
sal_Int32 nPara = GetParaPortions().GetPos( pParaPortion );
- if ( nPara || IsFixedCellHeight() || pTmpLine->GetStartPortion() ) // Not the very first line
+ if ( nPara || pTmpLine->GetStartPortion() ) // Not the very first line
{
// There are documents with PropLineSpace 0, why?
// (cmc: re above question :-) such documents can be seen by importing a .ppt