diff options
| author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:24:11 +0200 |
|---|---|---|
| committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-08-23 15:24:11 +0200 |
| commit | 7a9916abd9ead998e6b0b6442bea67827411f4b7 (patch) | |
| tree | 51da9b48384426b750242e2cd1d26034f2d26cfd /sw/source/core/text/porfly.hxx | |
| parent | ef599bd8ed7aba0240e0d7a4c3f9b744044d34b4 (diff) | |
recreated tag libreoffice-3.3.0.4 which had these commits:
commit a459007bd5e462d85981eaa32e3b970555bcdea6 (tag: refs/tags/libreoffice-3.3.0.4, refs/remotes/origin/libreoffice-3-3-0)
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 18 19:01:22 2011 +0100
Version 3.3.0.4, tag libreoffice-3.3.0.4 (3.3-rc4)
commit dce61127f79a7a991ff32208b72e931d2353e1cd
Author: Kohei Yoshida <kyoshida@novell.com>
Date: Fri Jan 14 11:54:40 2011 -0500
Remove pesky on-line registration menu entry. (fdo#33112)
sw/uiconfig/swform/menubar/menubar.xml | 1 -
sw/uiconfig/swreport/menubar/menubar.xml | 1 -
sw/uiconfig/swxform/menubar/menubar.xml | 1 -
3 files changed, 0 insertions(+), 3 deletions(-)
commit a9c85da2fa4919e2520a6db08d3836e00a2b3fa9
Author: Caolán McNamara <caolanm@redhat.com>
Date: Fri Jan 14 11:44:23 2011 +0000
Resolves: fdo#32633 use standard Edit button width of 50
(cherry picked from commit a3c9ea96b2deee09060fae80d673e262b27872bb)
sw/source/ui/misc/titlepage.src | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
commit a79b457b9123b253bdadcb7c7602b8186b30d701
Author: Caolán McNamara <caolanm@redhat.com>
Date: Tue Jan 11 20:33:41 2011 +0000
fix this to build
sw/source/core/crsr/pam.cxx | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
commit fec902aecf9b4f5cee9d0fa18e502a136bd52595
Author: Cédric Bosdonnat <cedricbosdo@openoffice.org>
Date: Tue Jan 11 20:18:26 2011 +0100
n#657135: Enhanced fields fixes (key inputs, and 0-length fields import)
sw/source/core/crsr/bookmrk.cxx | 2 +-
sw/source/core/crsr/pam.cxx | 5 +++--
sw/source/filter/ww8/wrtw8nds.cxx | 6 +++---
sw/source/filter/ww8/ww8scan.hxx | 2 +-
sw/source/ui/docvw/edtwin.cxx | 19 ++++++++++++++++---
5 files changed, 24 insertions(+), 10 deletions(-)
commit 8f92e60e028df8c0bd32aa3a04f7105d8446bf4a
Author: Petr Mladek <pmladek@suse.cz>
Date: Tue Jan 11 22:59:38 2011 +0100
Branch libreoffice-3-3-0
This is 'libreoffice-3-3-0' - the stable branch for the 3.3.0 release.
Only very safe changes, reviewed by three people are allowed.
If you want to commit more complicated fix for the next 3.3.x release,
please use the 'libreoffice-3-3' branch.
If you want to build something cool, unstable, and risky, use master.
Notes
split repo tag: writer_libreoffice-3.3.0.4
Diffstat (limited to 'sw/source/core/text/porfly.hxx')
| -rw-r--r-- | sw/source/core/text/porfly.hxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index ed2a7d5d8e65..e2c258d2d58f 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -38,14 +38,14 @@ class SwTxtFrm; struct SwCrsrMoveState; /************************************************************************* - * class SwFlyPortion + * class SwFlyPortion *************************************************************************/ class SwFlyPortion : public SwFixPortion { KSHORT nBlankWidth; public: - inline SwFlyPortion( const SwRect &rFlyRect ) + inline SwFlyPortion( const SwRect &rFlyRect ) : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); } inline KSHORT GetBlankWidth( ) const { return nBlankWidth; } inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; } @@ -55,13 +55,13 @@ public: }; /************************************************************************* - * class SwFlyCntPortion + * class SwFlyCntPortion *************************************************************************/ class SwFlyCntPortion : public SwLinePortion { void *pContact; // bDraw ? DrawContact : FlyInCntFrm - Point aRef; // Relativ zu diesem Point wird die AbsPos berechnet. + Point aRef; // Relativ zu diesem Point wird die AbsPos berechnet. sal_Bool bDraw : 1; // DrawContact? sal_Bool bMax : 1; // Zeilenausrichtung und Hoehe == Zeilenhoehe sal_uInt8 nAlign : 3; // Zeilenausrichtung? Nein, oben, mitte, unten |