summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorThomas Arnhold <thomas@arnhold.org>2013-03-19 01:30:44 +0100
committerThomas Arnhold <thomas@arnhold.org>2013-03-19 01:30:44 +0100
commit506e1efab370626dae5e3122b6876f5a1e0b1029 (patch)
treec4e72abc875b1e1ea5d6f9b156368a9fe1313571 /sw
parent3991eaf5569c7039ea20000e70aac775b7899432 (diff)
trailing whitespaces
Change-Id: I3d0e2015e4c9f0ea6118fd92892022607fe4bde6
Diffstat (limited to 'sw')
-rw-r--r--sw/source/core/docnode/node.cxx2
-rw-r--r--sw/source/core/text/txtfly.hxx6
2 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 83c889b5c58d..e126cde1d193 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -1835,7 +1835,7 @@ void SwCntntNode::ChkCondColl()
{
if( IsTxtNode() && ((SwTxtNode*)this)->GetNumRule())
{
- // Is at which Level in a list?
+ // Is at which Level in a list?
aTmp.SetCondition( PARA_IN_LIST,
((SwTxtNode*)this)->GetActualListLevel() );
pCColl = ((SwConditionTxtFmtColl*)GetFmtColl())->
diff --git a/sw/source/core/text/txtfly.hxx b/sw/source/core/text/txtfly.hxx
index 4d7cdde7f98b..4c1398f78b95 100644
--- a/sw/source/core/text/txtfly.hxx
+++ b/sw/source/core/text/txtfly.hxx
@@ -103,15 +103,15 @@ public:
is: they are converted to frame- and window-local coordinates.
If multiple frames with wrap attributes are located on the same line, we get
the following settings for the text flow:
-
+
L/R P L R N
P -P-P- -P-L -P R- -P N
L -L P- -L L -L R- -L N
R R-P- R-L R R- R N
N N P- N L N R- N N
-
+
(P=parallel, L=left, R=right, N=no wrap)
-
+
We can describe the behaviour as follows:
Every frame can push away text, with the restriction that it only has influence
until the next frame.