69d873e1c4
... to better match Word's formatting. The bugdoc has a special case where a right-aligned tab is positioned at the right margin exactly, which causes the bFull condition in SwTabPortion::PreFormat() to be true. An obvious change to replace rInf.Width() - rInf.X() with rInf.GetLineWidth() in the condition makes no difference because m_pLastTab was already reset previously; instead, pass in the last tab from Format(), which indicates that the right edge position of the previous text portion was found via that tab. Additionally, change the condition that checks for TabOverMargin to also allow equal positions, i.e., exactly at the end of the paragraph. Change-Id: I5d3b1c13eca0bffa640745d7c5f4113699f79cad Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168823 Tested-by: Jenkins Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
111 lines
3.9 KiB
C++
111 lines
3.9 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
|
|
/*
|
|
* This file is part of the LibreOffice project.
|
|
*
|
|
* This Source Code Form is subject to the terms of the Mozilla Public
|
|
* License, v. 2.0. If a copy of the MPL was not distributed with this
|
|
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
|
|
*
|
|
* This file incorporates work covered by the following license notice:
|
|
*
|
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
|
* contributor license agreements. See the NOTICE file distributed
|
|
* with this work for additional information regarding copyright
|
|
* ownership. The ASF licenses this file to you under the Apache
|
|
* License, Version 2.0 (the "License"); you may not use this file
|
|
* except in compliance with the License. You may obtain a copy of
|
|
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
|
|
*/
|
|
#pragma once
|
|
|
|
#include "porglue.hxx"
|
|
|
|
class SwTabPortion : public SwFixPortion
|
|
{
|
|
const SwTwips m_nTabPos;
|
|
const sal_Unicode m_cFill;
|
|
const bool m_bAutoTabStop;
|
|
|
|
// Format() branches either into PreFormat() or PostFormat()
|
|
bool PreFormat(SwTextFormatInfo &rInf, SwTabPortion const*);
|
|
public:
|
|
SwTabPortion(const SwTwips nTabPos, const sal_Unicode cFill, const bool bAutoTab = true);
|
|
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
|
|
virtual bool Format( SwTextFormatInfo &rInf ) override;
|
|
virtual void FormatEOL( SwTextFormatInfo &rInf ) override;
|
|
bool PostFormat( SwTextFormatInfo &rInf );
|
|
bool IsFilled() const { return 0 != m_cFill; }
|
|
SwTwips GetTabPos() const { return m_nTabPos; }
|
|
|
|
// Accessibility: pass information about this portion to the PortionHandler
|
|
virtual void HandlePortion( SwPortionHandler& rPH ) const override;
|
|
};
|
|
|
|
class SwTabLeftPortion : public SwTabPortion
|
|
{
|
|
public:
|
|
SwTabLeftPortion(const SwTwips nTabPosVal, const sal_Unicode cFillChar, bool bAutoTab)
|
|
: SwTabPortion( nTabPosVal, cFillChar, bAutoTab )
|
|
{ SetWhichPor( PortionType::TabLeft ); }
|
|
};
|
|
|
|
class SwTabRightPortion : public SwTabPortion
|
|
{
|
|
public:
|
|
SwTabRightPortion(const SwTwips nTabPosVal, const sal_Unicode cFillChar)
|
|
: SwTabPortion( nTabPosVal, cFillChar )
|
|
{ SetWhichPor( PortionType::TabRight ); }
|
|
};
|
|
|
|
class SwTabCenterPortion : public SwTabPortion
|
|
{
|
|
public:
|
|
SwTabCenterPortion(const SwTwips nTabPosVal, const sal_Unicode cFillChar)
|
|
: SwTabPortion( nTabPosVal, cFillChar )
|
|
{ SetWhichPor( PortionType::TabCenter ); }
|
|
};
|
|
|
|
class SwTabDecimalPortion : public SwTabPortion
|
|
{
|
|
const sal_Unicode mcTab;
|
|
|
|
/*
|
|
* During text formatting, we already store the width of the portions
|
|
* following the tab stop up to the decimal position. This value is
|
|
* evaluated during pLastTab->FormatEOL. FME 2006-01-06 #127428#.
|
|
*/
|
|
SwTwips mnWidthOfPortionsUpTpDecimalPosition;
|
|
|
|
public:
|
|
SwTabDecimalPortion(const SwTwips nTabPosVal, const sal_Unicode cTab,
|
|
const sal_Unicode cFillChar )
|
|
: SwTabPortion( nTabPosVal, cFillChar ),
|
|
mcTab(cTab),
|
|
mnWidthOfPortionsUpTpDecimalPosition( std::numeric_limits<SwTwips>::max() )
|
|
{ SetWhichPor( PortionType::TabDecimal ); }
|
|
|
|
sal_Unicode GetTabDecimal() const { return mcTab; }
|
|
|
|
void SetWidthOfPortionsUpToDecimalPosition(SwTwips nNew)
|
|
{
|
|
mnWidthOfPortionsUpTpDecimalPosition = nNew;
|
|
}
|
|
SwTwips GetWidthOfPortionsUpToDecimalPosition() const
|
|
{
|
|
return mnWidthOfPortionsUpTpDecimalPosition;
|
|
}
|
|
};
|
|
|
|
class SwAutoTabDecimalPortion : public SwTabDecimalPortion
|
|
{
|
|
public:
|
|
SwAutoTabDecimalPortion(const SwTwips nTabPosVal, const sal_Unicode cTab,
|
|
const sal_Unicode cFillChar )
|
|
: SwTabDecimalPortion( nTabPosVal, cTab, cFillChar )
|
|
{
|
|
SetLen(TextFrameIndex(0));
|
|
}
|
|
virtual void Paint( const SwTextPaintInfo &rInf ) const override;
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|