From d50f4fd4e9dde2eaadbf1aa9c6e32565cdf7b0b9 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 2 Feb 2004 17:17:56 +0000 Subject: INTEGRATION: CWS swobjpos02 (1.1.2); FILE ADDED 2003/11/18 10:57:59 od 1.1.2.3: #110978# - further adjustments for isolated object positioning algorithms 2003/10/09 15:02:22 od 1.1.2.2: #110978# - further adjustments of isolated positioning algorithm 2003/10/02 09:39:56 od 1.1.2.1: #110978# - new class for separated positioning algorithm --- sw/source/core/inc/anchoredobjectposition.hxx | 747 ++++++++++++++++++++++++++ 1 file changed, 747 insertions(+) create mode 100644 sw/source/core/inc/anchoredobjectposition.hxx (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx new file mode 100644 index 000000000000..e55bd2b39d15 --- /dev/null +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -0,0 +1,747 @@ + /************************************************************************* + * + * $RCSfile: anchoredobjectposition.hxx,v $ + * + * $Revision: 1.2 $ + * + * last change: $Author: hr $ $Date: 2004-02-02 18:17:56 $ + * + * The Contents of this file are made available subject to the terms of + * either of the following licenses + * + * - GNU Lesser General Public License Version 2.1 + * - Sun Industry Standards Source License Version 1.1 + * + * Sun Microsystems Inc., October, 2000 + * + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2000 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + * + * + * Sun Industry Standards Source License Version 1.1 + * ================================================= + * The contents of this file are subject to the Sun Industry Standards + * Source License Version 1.1 (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.openoffice.org/license.html. + * + * Software provided under this License is provided on an "AS IS" basis, + * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, + * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, + * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. + * See the License for the specific provisions governing your rights and + * obligations concerning the Software. + * + * The Initial Developer of the Original Code is: Sun Microsystems, Inc. + * + * Copyright: 2000 by Sun Microsystems, Inc. + * + * All Rights Reserved. + * + * Contributor(s): _______________________________________ + * + * + ************************************************************************/ +#ifndef _ANCHOREDOBJECTPOSITION_HXX +#define _ANCHOREDOBJECTPOSITION_HXX + +#ifndef _SWTYPES_HXX +#include +#endif +#ifndef _SWRECT_HXX +#include +#endif +#ifndef _SAL_TYPES_H_ +#include +#endif +#ifndef _SOLAR_H +#include +#endif +#ifndef _ORNTENUM_HXX +#include +#endif + +class SdrObject; +class SwContact; +class SwFrm; +class SwTxtFrm; +class SwLayoutFrm; +class SwFlyFrm; +class SwFlyInCntFrm; +class SwFlyLayFrm; +class SwFlyAtCntFrm; +class SwFrmFmt; +class SwFmtVertOrient; +class SwFmtHoriOrient; +class SvxLRSpaceItem; +class SvxULSpaceItem; + +namespace objectpositioning +{ + enum SwObjPosType { AS_CHAR, TO_CNTNT, TO_LAYOUT }; + + // flags for positioning algorithm of as-character-anchored objects + typedef sal_uInt8 AsCharFlags; + #define AS_CHAR_NOFLAG 0 + #define AS_CHAR_QUICK 1 + #define AS_CHAR_ULSPACE 2 + #define AS_CHAR_INIT 4 + #define AS_CHAR_ROTATE 8 + #define AS_CHAR_REVERSE 16 + #define AS_CHAR_BIDI 32 + + class SwAnchoredObjectPosition + { + private: + // object position type + SwObjPosType mTypeOfObjPos; + + // object to be positioned + SdrObject& mrDrawObj; + + // information about object + // does the object represents a fly frame + bool mbIsObjFly; + // frame the object belongs to; NULL, if ! + SwFrm* mpFrmOfObj; + // frame the object is anchored at + SwFrm* mpAnchorFrm; + // contact object + SwContact* mpContact; + + // calculated data for object position type AS_CHAR + Point maAnchorPos; + SwTwips mnRelPos; + SwRect maObjBoundRect; + + // calculated data for object position type TO_LAYOUT + Point maRelPos; + + // calculated data for object position type TO_CNTNT + const SwFrm* mpVertPosOrientFrm; + + // data for calculation of position for object position type TO_CNTNT + bool mbAnchorToChar; + SwRect* mpToCharRect; + + /** determine information about object + + OD 30.07.2003 #110978# + member , , and + are set + + @author OD + */ + void _GetInfoAboutObj(); + + // ********************************************************************* + // helper methods for object position type AS_CHAR + // ********************************************************************* + /** determine the relative position to base line for object position type AS_CHAR + + OD 29.07.2003 #110978# + Note about output parameter <_onLineAlignment> - + value gives feedback for the line formatting. + 0 - no feedback; 1|2|3 - proposed formatting of characters + at top|at center|at bottom of line. + + @author OD + + @param _ObjBoundHeight + height including corresponding spacing of the object, for which + the Y-position has to be calculated. + + @param _rVert + given vertical positioning and alignment + + @param _nLineAscent + line ascent given by the character in the line. parameter needed + for an alignment relative to the character height + + @param _nLineDescent + line descent given by the character in the line. parameter needed + for an alignment relative to the character height + + @param _nLineAscentInclObjs + line ascent given by the character and the other objects in the + line. parameter needed for an alignment relative to the line height + + @param _nLineDescentInclObjs + line descent given by the character and the other objects in the + line. parameter needed for an alignment relative to the line height + + @param _onLineAlignment + output parameter - for alignment relative to the line height. + following values are set: + 0 - no line alignment, 1 - at top, 2 - at center, 3 - at bottom + + @return relative position to the base line + */ + SwTwips _GetRelPosToBase( const SwTwips _nObjBoundHeight, + const SwFmtVertOrient& _rVert, + const SwTwips _nLineAscent, + const SwTwips _nLineDescent, + const SwTwips _nLineAscentInclObjs, + const SwTwips _nLineDescentInclObjs, + sal_uInt8& _onLineAlignment ); + + // ********************************************************************* + // helper methods for object position type TO_LAYOUT + // ********************************************************************* + /** calculated relative position for object position type TO_LAYOUT + + @author OD + */ + void _CalcPositionForToLayout(); + + // ********************************************************************* + // helper methods for object position type TO_CNTNT + // ********************************************************************* + /** calculated relative position for object position type TO_CNTNT + + @author OD + */ + void _CalcPositionForToCntnt(); + + // ********************************************************************* + /** adjust calculated vertical in order to keep object inside + 'page' alignment layout frame. + + @author OD + */ + SwTwips _AdjustVertRelPos( const SwFrm& _rPageAlignLayFrm, + const SwFrm& _rVertOrientFrm, + const SwTwips _nProposedRelPosY ) const; + + // ********************************************************************* + /** determine frame for horizontal position for object position type TO_CNTNT + + OD 04.08.2003 + if the given proposed frame is a content frame, the proposed + frame is returned. + otherwise (given proposed frame is a layout frame), + the lower content frames of the proposed frame are checked and + the nearest by vertical position is returned. if none + lower content frame is found, the proposed frame is returned. + + @author OD + + @param _pProposedFrm + input parameter - proposed frame for horizontal position + + @return constant reference to object, at which the + horizontal position is determined. + */ + const SwFrm& _GetHoriVirtualAnchor( const SwFrm& _pProposedFrm ) const; + + // ********************************************************************* + /** calculate relative horizontal position for object type position TO_CNTNT + + OD 11.08.2003 #110978# + + @author OD + + @param _rHoriOrientFrm + input parameter - frame the horizontal position of the object + is oriented at. + + @param _pToCharOrientFrm + input parameter - if object is to-character anchored (mbAnchorToChar), + this is the frame the position is oriented at. + + @param _rHoriOrient + input parameter - horizontal positioning and alignment, for which + the relative position is calculated. + + @param _bFollowTextFlow + input parameter - boolean indicating, if object has to follow + the text flow. + + @param _rLRSpacing + input parameter - left and right spacing of the object to the text + + @param _rULSpacing + input parameter - upper and lower spacing of the object to the text + + @param _bObjWrapThrough + input parameter - boolean indicating, if object has wrap mode + 'wrap through'. + + @param _nRelPosY + input parameter - relative vertical position + + @return relative horizontal position in SwTwips + */ + SwTwips _CalcRelPosX( const SwFrm& _rHoriOrientFrm, + const SwFrm* _pToCharOrientFrm, + const SwFmtHoriOrient& _rHoriOrient, + const bool _bFollowTextFlow, + const SvxLRSpaceItem& _rLRSpacing, + const SvxULSpaceItem& _rULSpacing, + const bool _bObjWrapThrough, + const SwTwips _nRelPosY + ) const; + + // ********************************************************************* + /** determine layout frame for positioning aligned at 'page' areas + for object position type TO_CNTNT + + OD 22.09.2003 + If an object is aligned to a 'page area' - REL_PG_FRAME, + REL_PG_PRTAREA, REL_PG_LEFT and REL_PG_RIGHT -, the layout frame, + which determines the alignment area has to be determined. + If an object doesn't follow the text flow, + this is the cell frame, if object is anchored inside a cell or + it's the fly frame, if object is anchored inside a fly frame; + otherwise it's the page frame + + @author OD + + @param _rOrientFrm + input parameter - frame, at which the vertical respectively + horizontal positioning is oriented. + Starting point for the search of the layout frame + + @param _b + @return reference to the layout frame, which determines the + 'page area' the object will be positioned in. + */ +// const SwLayoutFrm& _GetPageAlignmentLayoutFrm( const SwFrm& _rOrientFrm, +// const bool _bFollowTextFlow ) const; + + // ********************************************************************* + /** determine alignment values for horizontal position for object + position type TO_CNTNT and TO_LAYOUT + + OD 04.08.2003 + + @author OD + + @param _rHoriOrientFrm + input parameter - frame the horizontal position of the object + is oriented at. + + @param _rPageAlignLayFrm + input paramter - layout frame, which determines the 'page area' + the object has to be horizontal positioned in. + + @param _pToCharOrientFrm + input parameter - if object is to-character anchored (mbAnchorToChar), + this is the frame the position is oriented at. + + @param _eRelOrient + input parameter - horizontal relative alignment, for which + the relative position is calculated. + + @param _bToggleLeftRight + input parameter - boolean indicating, if left/right alignments + have to be toggled. + + @param _bObjWrapThrough + input parameter - boolean indicating, if object has wrap mode + 'wrap through'. + important note: value is only relevant, if _rHoriOrientFrm is + a text frame. + + @param _orAlignAreaWidth + output parameter - width in SwTwips of the area the horizontal + position is aligned to. + + @param _orAlignAreaOffset + output parameter - offset in SwTwips of the area the horizontal + position is aligned to. offset is given to the 'left' of the + anchor position. + + @param _obAlignedRelToPage + output parameter - boolean indicating, that object is aligned + to 'page area'. + */ + void _GetHoriAlignmentValues( const SwFrm& _rHoriOrientFrm, + const SwFrm& _rPageAlignLayFrm, + const SwFrm* _pToCharOrientFrm, + const SwRelationOrient _eRelOrient, + const bool _bObjWrapThrough, + SwTwips& _orAlignAreaWidth, + SwTwips& _orAlignAreaOffset, + bool& _obAlignedRelToPage ) const; + + // ********************************************************************* + /** toggle given horizontal orientation and relative alignment + + @author OD + + @param _bToggleLeftRight + input parameter - boolean indicating, if horizontal orientation + and relative alignment has to be toggled. + + @param _ioeHoriOrient + input/output parameter - horizontal orientation, that is toggled, + if needed. + + @param _iopeRelOrient + optional input/output parameter (default value NULL) + - if set, relative alignment, that is toggled, if needed. + */ + void _ToggleHoriOrientAndAlign( const bool _bToggleLeftRight, + SwHoriOrient& _ioeHoriOrient, + SwRelationOrient* _iopeRelOrient = 0L + ) const; + + // ********************************************************************* + /** adjust calculated horizontal in order to keep object inside + 'page' alignment layout frame for object type position TO_CNTNT + + @author OD + + @param _rPageAlignLayFrm + input paramter - layout frame, which determines the 'page area' + the object has to be horizontal positioned in. + + @param _nProposedRelPosX + input parameter - proposed relative horizontal position, which + will be adjusted. + + @return adjusted relative horizontal position in SwTwips. + */ + SwTwips _AdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, + const SwTwips _nProposedRelPosX ) const; + + // ********************************************************************* + /** adjust calculated horizontal position in order to draw object + aside other objects with same positioning + + @author OD + + @param _rHoriOrientFrm + input parameter - frame the horizontal position of the object + is oriented at. + + @param _nProposedRelPosX + input parameter - proposed relative horizontal position, which + will be adjusted. + + @param _nRelPosY + input parameter - relative vertical position + + @param _eHoriOrient + input parameter - horizontal position of object + + @param _eRelOrient + inpt parameter - alignment of object + + @param _rLRSpacing + input parameter - left and right spacing of the object to the text + + @param _rULSpacing + input parameter - upper and lower spacing of the object to the text + + @param _bEvenPage + input parameter - boolean indicating, if object is on an even page. + + @return adjusted relative horizontal position in SwTwips + */ + SwTwips _AdjustHoriRelPosForDrawAside( const SwFrm& _rHoriOrientFrm, + const SwTwips _nProposedRelPosX, + const SwTwips _nRelPosY, + const SwHoriOrient _eHoriOrient, + const SwRelationOrient _eRelOrient, + const SvxLRSpaceItem& _rLRSpacing, + const SvxULSpaceItem& _rULSpacing, + const bool _bEvenPage + ) const; + + // ********************************************************************* + /** detemine, if object has to draw aside given fly frame + + OD 11.08.2003 #110978# + method used by <_AdjustHoriRelPosForDrawAside(..)> + + @author OD + + @param _pFly + input parameter - fly frame the draw aside check is done for. + + @param _rObjRect + input parameter - proposed object rectangle + + @param _pObjContext + input parameter - context of the object + + @param _nObjIndex + input parameter - index of the anchor frame of the object + + @param _bEvenPage + input parameter - boolean indicating, if object is on an even page. + + @param _eHoriOrient + input parameter - horizontal position of object + + @param _eRelOrient + inpt parameter - alignment of object + + @return boolean indicating, if object has to be drawn aside + given fly frame. + */ + bool _DrawAsideFly( const SwFlyFrm* _pFly, + const SwRect& _rObjRect, + const SwFrm* _pObjContext, + const ULONG _nObjIndex, + const bool _bEvenPage, + const SwHoriOrient _eHoriOrient, + const SwRelationOrient _eRelOrient + ) const; + + // ********************************************************************* + /** determine, if object has to draw aside another object + + OD 04.08.2003 + the different alignments of the objects determines, if one has + to draw aside another one. Thus, the given alignment are checked + against each other, which one has to be drawn aside the other one. + depending on parameter _bLeft check is done for left or right + positioning. + method used by <_DrawAsideFly(..)> + + @author OD + + @param _eRelOrient1 + input parameter - alignment 1 + + @param _eRelOrient2 + input parameter - alignment 2 + + @param _bLeft + input parameter - boolean indicating, if check is done for left + or for right positioning. + + @return boolean indicating, if an object with an alignment + <_eRelOrient1> has to be drawn aside an object with an + alignment <_eRelOrient2> + */ + bool _Minor( SwRelationOrient _eRelOrient1, + SwRelationOrient _eRelOrient2, + bool _bLeft ) const; + + // ********************************************************************* + void _GetVertAlignmentValues( const SwFrm& _rVertOrientFrm, + const SwFrm& _rPageAlignLayFrm, + const SwRelationOrient _eRelOrient, + SwTwips& _orAlignAreaHeight, + SwTwips& _orAlignAreaOffset ) const; + + // ********************************************************************* + SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm, + const SwFrm& _rPageAlignLayFrm, + const SwVertOrient _eVertOrient, + const SwRelationOrient _eRelOrient, + const SwTwips _nVertPos, + const SvxLRSpaceItem& _rLRSpacing, + const SvxULSpaceItem& _rULSpacing ) const; + + // ********************************************************************* + public: + SwAnchoredObjectPosition( SwObjPosType _TypeOfObjPos, + SdrObject& _rDrawObj ); + ~SwAnchoredObjectPosition(); + + SwObjPosType GetObjPosType() const; + + // accessors for object and its corresponding data/information + // basic accessors + SdrObject& GetObject() const; + bool IsObjFly() const; + SwFrm* GetFrmOfObj() const; + SwFrm& GetAnchorFrm() const; + SwContact* GetContact() const; + SwFrmFmt* GetFrmFmt() const; + // accessors for object position type AS_CHAR and TO_CNTNT + SwTxtFrm& GetAnchorTxtFrm() const; + // accessors for object position type AS_CHAR + SwFlyInCntFrm* GetFlyInCntFrmOfObj() const; + // accessors for object position type TO_LAYOUT + SwFlyLayFrm* GetFlyLayFrmOfObj() const; + // accessors for object position type TO_CNTNT + SwFlyAtCntFrm* GetFlyAtCntFrmOfObj() const; + + // ********************************************************************* + // methods for object position type AS_CHAR + // ********************************************************************* + /** calculate position for object position type AS_CHAR + + OD 30.07.2003 #110978# + members , and are calculated. + calculated position is set at the given object. + + @param _rAnchorFrm + paragraph frame the given object is anchored at. + + @param _rProposedAnchorPos + proposed anchor position; starting point for the calculation + of the anchor position + + @param _nFlags + flags that influences the calculation of the anchor position + AS_CHAR_QUICK : quick formatting - calculated position not set at object + AS_CHAR_ULSPACE : consider upper/lower spacing - adjustment of anchor position + AS_CHAR_INIT : initial calculation + AS_CHAR_ROTATE : object is rotated by 90 degrees + AS_CHAR_REVERSE : object is reversed (rotated by 270 degrees) + AS_CHAR_BIDI : object belongs to a BIDI-multi-portion + + @param _nLineAscent, _nLineDescent, _nLineAscentInclObjs, + _nLineDescentInclObjs - needed line values for the different + alignments. + + @param _onLineAlignment + output parameter - for alignment relative to the line height. + gives feedback for the line formatting. + + @author OD + */ + void CalcPosition( const Point& _rProposedAnchorPos, + const AsCharFlags _nFlags, + const SwTwips _nLineAscent, + const SwTwips _nLineDescent, + const SwTwips _nLineAscentInclObjs, + const SwTwips _nLineDescentInclObjs, + sal_uInt8& _onLineAlignment ); + + /** calculated anchored position for object position type AS_CHAR + + @author OD + */ + Point GetAnchorPos() const; + + /** calculated relative position to base line for object position type AS_CHAR + + @author OD + */ + SwTwips GetRelPosY() const; + + /** determined object rectangle including spacing for object position type AS_CHAR + + @author OD + */ + SwRect GetObjBoundRectInclSpacing() const; + + // ********************************************************************* + // methods for object position type TO_LAYOUT and TO_CNTNT + // ********************************************************************* + /** calculate position for object position type TO_LAYOUT and TO_CNTNT + + OD 30.07.2003 #110978# + + @author OD + */ + void CalcPosition(); + + /** calculated relative position for object position type TO_LAYOUT + + @author OD + */ + Point GetRelPos() const; + + /** frame vertical position is oriented at for object position type TO_CNTNT + + OD 06.10.2003 #110978# + + @author OD + */ + const SwFrm& GetVertPosOrientFrm() const; + + // ********************************************************************* + /** determine environment layout frame for possible vertical object + positions respectively for alignments to 'page areas' + for object position type TO_CNTNT + + this is, if object has to follow the text flow: + - cell frame, if anchored inside a cell + - fly frame, if anchored inside a fly frame + - header/footer frame, if anchored inside page header/footer + - footnote frame, if anchored inside footnote + otherwise it's the document body frame + + this is, if object hasn't to follow the text flow: + - page frame. + - Exception: If environment layout frame is used for page alignment, + it's the cell frame, if anchored inside a cell. + + @author OD + + @param _rVertOrientFrm + input parameter - frame, at which the vertical position is + oriented at (typically it's the anchor frame). + starting point for the search of the layout frame. + + @param _bFollowTextFlow + input parameter - indicates, if object has to follow the text + flow or not. + + @param _bForPageAlignment + input parameter - indicates, if the environment layout frame + for the page alignments has to be determined or not. + + @return reference to the layout frame, which determines the + the vertical environment the object has to be positioned in. + */ + static const SwLayoutFrm& GetVertEnvironmentLayoutFrm( const SwFrm& _rVertOrientFrm, + const bool _bFollowTextFlow, + const bool _bForPageAlignment ); + + // ********************************************************************* + /** determine environment layout frame for possible horizontal object + positions respectively for alignment to 'page areas' + for object position type TO_CNTNT + + OD 08.09.2003 + this is, if object has to follow the text flow: + - cell frame, if anchored inside a cell + - fly frame, if anchored inside a fly frame + otherwise it's the page frame + + this is, if object hasn't to follow the text flow: + - page frame. + - Exception: If environment layout frame is used for page alignment, + it's the cell frame, if anchored inside a cell. + + @author OD + + @param _rHoriOrientFrm + input parameter - frame, at which the horizontal position is + oriented at (typically it's the anchor frame). + starting point for the search of the layout frame. + + @param _bFollowTextFlow + input parameter - indicates, if object has to follow the text + flow or not. + + @param _bForPageAlignment + input parameter - indicates, if the environment layout frame + for the page alignments has to be determined or not. + + @return reference to the layout frame, which determines the + the horizontal environment the object has to be positioned in. + */ + static const SwLayoutFrm& GetHoriEnvironmentLayoutFrm( const SwFrm& _rHoriOrientFrm, + const bool _bFollowTextFlow, + const bool _bForPageAlignment ); + }; +}; + +#endif -- cgit v1.2.3 From 7e73cdb26d3f780bfdcb926bf1540b517316c01b Mon Sep 17 00:00:00 2001 From: Oliver Düsterhoff Date: Thu, 11 Mar 2004 12:05:04 +0000 Subject: merge changes of swobjpos03 to head --- sw/source/core/inc/anchoredobjectposition.hxx | 513 +++++--------------------- 1 file changed, 90 insertions(+), 423 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index e55bd2b39d15..97dd2c286384 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -2,9 +2,9 @@ * * $RCSfile: anchoredobjectposition.hxx,v $ * - * $Revision: 1.2 $ + * $Revision: 1.3 $ * - * last change: $Author: hr $ $Date: 2004-02-02 18:17:56 $ + * last change: $Author: od $ $Date: 2004-03-11 13:05:04 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -64,196 +64,106 @@ #ifndef _SWTYPES_HXX #include #endif -#ifndef _SWRECT_HXX -#include -#endif -#ifndef _SAL_TYPES_H_ -#include -#endif -#ifndef _SOLAR_H -#include -#endif #ifndef _ORNTENUM_HXX #include #endif class SdrObject; -class SwContact; class SwFrm; -class SwTxtFrm; -class SwLayoutFrm; class SwFlyFrm; -class SwFlyInCntFrm; -class SwFlyLayFrm; -class SwFlyAtCntFrm; +class SwContact; class SwFrmFmt; -class SwFmtVertOrient; -class SwFmtHoriOrient; +class SwRect; class SvxLRSpaceItem; class SvxULSpaceItem; +class SwFmtHoriOrient; namespace objectpositioning { - enum SwObjPosType { AS_CHAR, TO_CNTNT, TO_LAYOUT }; - - // flags for positioning algorithm of as-character-anchored objects - typedef sal_uInt8 AsCharFlags; - #define AS_CHAR_NOFLAG 0 - #define AS_CHAR_QUICK 1 - #define AS_CHAR_ULSPACE 2 - #define AS_CHAR_INIT 4 - #define AS_CHAR_ROTATE 8 - #define AS_CHAR_REVERSE 16 - #define AS_CHAR_BIDI 32 + class SwEnvironmentOfAnchoredObject; class SwAnchoredObjectPosition { private: - // object position type - SwObjPosType mTypeOfObjPos; - // object to be positioned SdrObject& mrDrawObj; - // information about object - // does the object represents a fly frame + // information about object + // does the object represents a Writer fly frame bool mbIsObjFly; // frame the object belongs to; NULL, if ! - SwFrm* mpFrmOfObj; + SwFrm* mpFrmOfObj; // frame the object is anchored at - SwFrm* mpAnchorFrm; + SwFrm* mpAnchorFrm; // contact object SwContact* mpContact; - - // calculated data for object position type AS_CHAR - Point maAnchorPos; - SwTwips mnRelPos; - SwRect maObjBoundRect; - - // calculated data for object position type TO_LAYOUT - Point maRelPos; - - // calculated data for object position type TO_CNTNT - const SwFrm* mpVertPosOrientFrm; - - // data for calculation of position for object position type TO_CNTNT - bool mbAnchorToChar; - SwRect* mpToCharRect; + // frame format + const SwFrmFmt* mpFrmFmt; /** determine information about object OD 30.07.2003 #110978# - member , , and - are set + member , , , + and are set @author OD */ void _GetInfoAboutObj(); - // ********************************************************************* - // helper methods for object position type AS_CHAR - // ********************************************************************* - /** determine the relative position to base line for object position type AS_CHAR - - OD 29.07.2003 #110978# - Note about output parameter <_onLineAlignment> - - value gives feedback for the line formatting. - 0 - no feedback; 1|2|3 - proposed formatting of characters - at top|at center|at bottom of line. - - @author OD - - @param _ObjBoundHeight - height including corresponding spacing of the object, for which - the Y-position has to be calculated. - - @param _rVert - given vertical positioning and alignment - - @param _nLineAscent - line ascent given by the character in the line. parameter needed - for an alignment relative to the character height - - @param _nLineDescent - line descent given by the character in the line. parameter needed - for an alignment relative to the character height - - @param _nLineAscentInclObjs - line ascent given by the character and the other objects in the - line. parameter needed for an alignment relative to the line height - - @param _nLineDescentInclObjs - line descent given by the character and the other objects in the - line. parameter needed for an alignment relative to the line height + protected: + SwAnchoredObjectPosition( SdrObject& _rDrawObj ); + ~SwAnchoredObjectPosition(); - @param _onLineAlignment - output parameter - for alignment relative to the line height. - following values are set: - 0 - no line alignment, 1 - at top, 2 - at center, 3 - at bottom + // accessors for object and its corresponding data/information + SdrObject& GetObject() const; + bool IsObjFly() const; + SwFrm* GetFrmOfObj() const; + SwFrm& GetAnchorFrm() const; + SwContact& GetContact() const; + const SwFrmFmt& GetFrmFmt() const; - @return relative position to the base line - */ - SwTwips _GetRelPosToBase( const SwTwips _nObjBoundHeight, - const SwFmtVertOrient& _rVert, - const SwTwips _nLineAscent, - const SwTwips _nLineDescent, - const SwTwips _nLineAscentInclObjs, - const SwTwips _nLineDescentInclObjs, - sal_uInt8& _onLineAlignment ); + // virtual methods providing data for to character anchored objects. + virtual bool IsAnchoredToChar() const; + virtual const SwFrm* ToCharOrientFrm() const; + virtual const SwRect* ToCharRect() const; + // OD 12.11.2003 #i22341# + virtual SwTwips ToCharTopOfLine() const; // ********************************************************************* - // helper methods for object position type TO_LAYOUT - // ********************************************************************* - /** calculated relative position for object position type TO_LAYOUT - - @author OD - */ - void _CalcPositionForToLayout(); + void _GetVertAlignmentValues( const SwFrm& _rVertOrientFrm, + const SwFrm& _rPageAlignLayFrm, + const SwRelationOrient _eRelOrient, + SwTwips& _orAlignAreaHeight, + SwTwips& _orAlignAreaOffset ) const; // ********************************************************************* - // helper methods for object position type TO_CNTNT - // ********************************************************************* - /** calculated relative position for object position type TO_CNTNT - - @author OD - */ - void _CalcPositionForToCntnt(); + SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm, + const SwFrm& _rPageAlignLayFrm, + const SwVertOrient _eVertOrient, + const SwRelationOrient _eRelOrient, + const SwTwips _nVertPos, + const SvxLRSpaceItem& _rLRSpacing, + const SvxULSpaceItem& _rULSpacing ) const; // ********************************************************************* /** adjust calculated vertical in order to keep object inside 'page' alignment layout frame. - @author OD - */ - SwTwips _AdjustVertRelPos( const SwFrm& _rPageAlignLayFrm, - const SwFrm& _rVertOrientFrm, - const SwTwips _nProposedRelPosY ) const; - - // ********************************************************************* - /** determine frame for horizontal position for object position type TO_CNTNT + @param _rPageAlignLayFrm + input paramter - layout frame, which determines the 'page area' + the object has to be vertical positioned in. - OD 04.08.2003 - if the given proposed frame is a content frame, the proposed - frame is returned. - otherwise (given proposed frame is a layout frame), - the lower content frames of the proposed frame are checked and - the nearest by vertical position is returned. if none - lower content frame is found, the proposed frame is returned. + @param _nProposedRelPosY + input parameter - proposed relative vertical position, which + will be adjusted. @author OD - - @param _pProposedFrm - input parameter - proposed frame for horizontal position - - @return constant reference to object, at which the - horizontal position is determined. */ - const SwFrm& _GetHoriVirtualAnchor( const SwFrm& _pProposedFrm ) const; + SwTwips _AdjustVertRelPos( const SwFrm& _rPageAlignLayFrm, + const SwTwips _nProposedRelPosY ) const; // ********************************************************************* - /** calculate relative horizontal position for object type position TO_CNTNT - - OD 11.08.2003 #110978# + /** calculate relative horizontal position @author OD @@ -261,18 +171,14 @@ namespace objectpositioning input parameter - frame the horizontal position of the object is oriented at. - @param _pToCharOrientFrm - input parameter - if object is to-character anchored (mbAnchorToChar), - this is the frame the position is oriented at. + @param _rEnvOfObj + input parameter - object instance to retrieve environment + information about the object @param _rHoriOrient input parameter - horizontal positioning and alignment, for which the relative position is calculated. - @param _bFollowTextFlow - input parameter - boolean indicating, if object has to follow - the text flow. - @param _rLRSpacing input parameter - left and right spacing of the object to the text @@ -289,9 +195,8 @@ namespace objectpositioning @return relative horizontal position in SwTwips */ SwTwips _CalcRelPosX( const SwFrm& _rHoriOrientFrm, - const SwFrm* _pToCharOrientFrm, + const SwEnvironmentOfAnchoredObject& _rEnvOfObj, const SwFmtHoriOrient& _rHoriOrient, - const bool _bFollowTextFlow, const SvxLRSpaceItem& _rLRSpacing, const SvxULSpaceItem& _rULSpacing, const bool _bObjWrapThrough, @@ -299,37 +204,48 @@ namespace objectpositioning ) const; // ********************************************************************* - /** determine layout frame for positioning aligned at 'page' areas - for object position type TO_CNTNT - - OD 22.09.2003 - If an object is aligned to a 'page area' - REL_PG_FRAME, - REL_PG_PRTAREA, REL_PG_LEFT and REL_PG_RIGHT -, the layout frame, - which determines the alignment area has to be determined. - If an object doesn't follow the text flow, - this is the cell frame, if object is anchored inside a cell or - it's the fly frame, if object is anchored inside a fly frame; - otherwise it's the page frame + /** adjust calculated horizontal in order to keep object inside + 'page' alignment layout frame for object type position TO_CNTNT @author OD - @param _rOrientFrm - input parameter - frame, at which the vertical respectively - horizontal positioning is oriented. - Starting point for the search of the layout frame + @param _rPageAlignLayFrm + input paramter - layout frame, which determines the 'page area' + the object has to be horizontal positioned in. + + @param _nProposedRelPosX + input parameter - proposed relative horizontal position, which + will be adjusted. - @param _b - @return reference to the layout frame, which determines the - 'page area' the object will be positioned in. + @return adjusted relative horizontal position in SwTwips. */ -// const SwLayoutFrm& _GetPageAlignmentLayoutFrm( const SwFrm& _rOrientFrm, -// const bool _bFollowTextFlow ) const; + SwTwips _AdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, + const SwTwips _nProposedRelPosX ) const; // ********************************************************************* - /** determine alignment values for horizontal position for object - position type TO_CNTNT and TO_LAYOUT + /** toggle given horizontal orientation and relative alignment + + @author OD + + @param _bToggleLeftRight + input parameter - boolean indicating, if horizontal orientation + and relative alignment has to be toggled. + + @param _ioeHoriOrient + input/output parameter - horizontal orientation, that is toggled, + if needed. + + @param _iopeRelOrient + optional input/output parameter (default value NULL) + - if set, relative alignment, that is toggled, if needed. + */ + void _ToggleHoriOrientAndAlign( const bool _bToggleLeftRight, + SwHoriOrient& _ioeHoriOrient, + SwRelationOrient& _iopeRelOrient + ) const; - OD 04.08.2003 + // ********************************************************************* + /** determine alignment values for horizontal position of object @author OD @@ -341,10 +257,6 @@ namespace objectpositioning input paramter - layout frame, which determines the 'page area' the object has to be horizontal positioned in. - @param _pToCharOrientFrm - input parameter - if object is to-character anchored (mbAnchorToChar), - this is the frame the position is oriented at. - @param _eRelOrient input parameter - horizontal relative alignment, for which the relative position is calculated. @@ -374,54 +286,12 @@ namespace objectpositioning */ void _GetHoriAlignmentValues( const SwFrm& _rHoriOrientFrm, const SwFrm& _rPageAlignLayFrm, - const SwFrm* _pToCharOrientFrm, const SwRelationOrient _eRelOrient, const bool _bObjWrapThrough, SwTwips& _orAlignAreaWidth, SwTwips& _orAlignAreaOffset, bool& _obAlignedRelToPage ) const; - // ********************************************************************* - /** toggle given horizontal orientation and relative alignment - - @author OD - - @param _bToggleLeftRight - input parameter - boolean indicating, if horizontal orientation - and relative alignment has to be toggled. - - @param _ioeHoriOrient - input/output parameter - horizontal orientation, that is toggled, - if needed. - - @param _iopeRelOrient - optional input/output parameter (default value NULL) - - if set, relative alignment, that is toggled, if needed. - */ - void _ToggleHoriOrientAndAlign( const bool _bToggleLeftRight, - SwHoriOrient& _ioeHoriOrient, - SwRelationOrient* _iopeRelOrient = 0L - ) const; - - // ********************************************************************* - /** adjust calculated horizontal in order to keep object inside - 'page' alignment layout frame for object type position TO_CNTNT - - @author OD - - @param _rPageAlignLayFrm - input paramter - layout frame, which determines the 'page area' - the object has to be horizontal positioned in. - - @param _nProposedRelPosX - input parameter - proposed relative horizontal position, which - will be adjusted. - - @return adjusted relative horizontal position in SwTwips. - */ - SwTwips _AdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, - const SwTwips _nProposedRelPosX ) const; - // ********************************************************************* /** adjust calculated horizontal position in order to draw object aside other objects with same positioning @@ -469,7 +339,6 @@ namespace objectpositioning // ********************************************************************* /** detemine, if object has to draw aside given fly frame - OD 11.08.2003 #110978# method used by <_AdjustHoriRelPosForDrawAside(..)> @author OD @@ -510,7 +379,6 @@ namespace objectpositioning // ********************************************************************* /** determine, if object has to draw aside another object - OD 04.08.2003 the different alignments of the objects determines, if one has to draw aside another one. Thus, the given alignment are checked against each other, which one has to be drawn aside the other one. @@ -538,209 +406,8 @@ namespace objectpositioning SwRelationOrient _eRelOrient2, bool _bLeft ) const; - // ********************************************************************* - void _GetVertAlignmentValues( const SwFrm& _rVertOrientFrm, - const SwFrm& _rPageAlignLayFrm, - const SwRelationOrient _eRelOrient, - SwTwips& _orAlignAreaHeight, - SwTwips& _orAlignAreaOffset ) const; - - // ********************************************************************* - SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm, - const SwFrm& _rPageAlignLayFrm, - const SwVertOrient _eVertOrient, - const SwRelationOrient _eRelOrient, - const SwTwips _nVertPos, - const SvxLRSpaceItem& _rLRSpacing, - const SvxULSpaceItem& _rULSpacing ) const; - - // ********************************************************************* public: - SwAnchoredObjectPosition( SwObjPosType _TypeOfObjPos, - SdrObject& _rDrawObj ); - ~SwAnchoredObjectPosition(); - - SwObjPosType GetObjPosType() const; - - // accessors for object and its corresponding data/information - // basic accessors - SdrObject& GetObject() const; - bool IsObjFly() const; - SwFrm* GetFrmOfObj() const; - SwFrm& GetAnchorFrm() const; - SwContact* GetContact() const; - SwFrmFmt* GetFrmFmt() const; - // accessors for object position type AS_CHAR and TO_CNTNT - SwTxtFrm& GetAnchorTxtFrm() const; - // accessors for object position type AS_CHAR - SwFlyInCntFrm* GetFlyInCntFrmOfObj() const; - // accessors for object position type TO_LAYOUT - SwFlyLayFrm* GetFlyLayFrmOfObj() const; - // accessors for object position type TO_CNTNT - SwFlyAtCntFrm* GetFlyAtCntFrmOfObj() const; - - // ********************************************************************* - // methods for object position type AS_CHAR - // ********************************************************************* - /** calculate position for object position type AS_CHAR - - OD 30.07.2003 #110978# - members , and are calculated. - calculated position is set at the given object. - - @param _rAnchorFrm - paragraph frame the given object is anchored at. - - @param _rProposedAnchorPos - proposed anchor position; starting point for the calculation - of the anchor position - - @param _nFlags - flags that influences the calculation of the anchor position - AS_CHAR_QUICK : quick formatting - calculated position not set at object - AS_CHAR_ULSPACE : consider upper/lower spacing - adjustment of anchor position - AS_CHAR_INIT : initial calculation - AS_CHAR_ROTATE : object is rotated by 90 degrees - AS_CHAR_REVERSE : object is reversed (rotated by 270 degrees) - AS_CHAR_BIDI : object belongs to a BIDI-multi-portion - - @param _nLineAscent, _nLineDescent, _nLineAscentInclObjs, - _nLineDescentInclObjs - needed line values for the different - alignments. - - @param _onLineAlignment - output parameter - for alignment relative to the line height. - gives feedback for the line formatting. - - @author OD - */ - void CalcPosition( const Point& _rProposedAnchorPos, - const AsCharFlags _nFlags, - const SwTwips _nLineAscent, - const SwTwips _nLineDescent, - const SwTwips _nLineAscentInclObjs, - const SwTwips _nLineDescentInclObjs, - sal_uInt8& _onLineAlignment ); - - /** calculated anchored position for object position type AS_CHAR - - @author OD - */ - Point GetAnchorPos() const; - - /** calculated relative position to base line for object position type AS_CHAR - - @author OD - */ - SwTwips GetRelPosY() const; - - /** determined object rectangle including spacing for object position type AS_CHAR - - @author OD - */ - SwRect GetObjBoundRectInclSpacing() const; - - // ********************************************************************* - // methods for object position type TO_LAYOUT and TO_CNTNT - // ********************************************************************* - /** calculate position for object position type TO_LAYOUT and TO_CNTNT - - OD 30.07.2003 #110978# - - @author OD - */ - void CalcPosition(); - - /** calculated relative position for object position type TO_LAYOUT - - @author OD - */ - Point GetRelPos() const; - - /** frame vertical position is oriented at for object position type TO_CNTNT - - OD 06.10.2003 #110978# - - @author OD - */ - const SwFrm& GetVertPosOrientFrm() const; - - // ********************************************************************* - /** determine environment layout frame for possible vertical object - positions respectively for alignments to 'page areas' - for object position type TO_CNTNT - - this is, if object has to follow the text flow: - - cell frame, if anchored inside a cell - - fly frame, if anchored inside a fly frame - - header/footer frame, if anchored inside page header/footer - - footnote frame, if anchored inside footnote - otherwise it's the document body frame - - this is, if object hasn't to follow the text flow: - - page frame. - - Exception: If environment layout frame is used for page alignment, - it's the cell frame, if anchored inside a cell. - - @author OD - - @param _rVertOrientFrm - input parameter - frame, at which the vertical position is - oriented at (typically it's the anchor frame). - starting point for the search of the layout frame. - - @param _bFollowTextFlow - input parameter - indicates, if object has to follow the text - flow or not. - - @param _bForPageAlignment - input parameter - indicates, if the environment layout frame - for the page alignments has to be determined or not. - - @return reference to the layout frame, which determines the - the vertical environment the object has to be positioned in. - */ - static const SwLayoutFrm& GetVertEnvironmentLayoutFrm( const SwFrm& _rVertOrientFrm, - const bool _bFollowTextFlow, - const bool _bForPageAlignment ); - - // ********************************************************************* - /** determine environment layout frame for possible horizontal object - positions respectively for alignment to 'page areas' - for object position type TO_CNTNT - - OD 08.09.2003 - this is, if object has to follow the text flow: - - cell frame, if anchored inside a cell - - fly frame, if anchored inside a fly frame - otherwise it's the page frame - - this is, if object hasn't to follow the text flow: - - page frame. - - Exception: If environment layout frame is used for page alignment, - it's the cell frame, if anchored inside a cell. - - @author OD - - @param _rHoriOrientFrm - input parameter - frame, at which the horizontal position is - oriented at (typically it's the anchor frame). - starting point for the search of the layout frame. - - @param _bFollowTextFlow - input parameter - indicates, if object has to follow the text - flow or not. - - @param _bForPageAlignment - input parameter - indicates, if the environment layout frame - for the page alignments has to be determined or not. - - @return reference to the layout frame, which determines the - the horizontal environment the object has to be positioned in. - */ - static const SwLayoutFrm& GetHoriEnvironmentLayoutFrm( const SwFrm& _rHoriOrientFrm, - const bool _bFollowTextFlow, - const bool _bForPageAlignment ); + virtual void CalcPosition() = 0; }; }; -- cgit v1.2.3 From 97702553e3af434526dbe1be4d88dbb29da4d252 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Wed, 31 Mar 2004 14:07:02 +0000 Subject: INTEGRATION: CWS swobjpos05 (1.3.14); FILE MERGED 2004/03/18 13:13:15 od 1.3.14.1: #i11860# class - new method <_GetTopForObjPos(..)> --- sw/source/core/inc/anchoredobjectposition.hxx | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 97dd2c286384..58da2cd52b46 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -2,9 +2,9 @@ * * $RCSfile: anchoredobjectposition.hxx,v $ * - * $Revision: 1.3 $ + * $Revision: 1.4 $ * - * last change: $Author: od $ $Date: 2004-03-11 13:05:04 $ + * last change: $Author: rt $ $Date: 2004-03-31 15:07:02 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -67,6 +67,10 @@ #ifndef _ORNTENUM_HXX #include #endif +// OD 2004-03-16 #i11860# +#ifndef _FRAME_HXX +#include +#endif class SdrObject; class SwFrm; @@ -129,6 +133,18 @@ namespace objectpositioning // OD 12.11.2003 #i22341# virtual SwTwips ToCharTopOfLine() const; + // ********************************************************************* + /** helper method to determine top of a frame for the vertical + object positioning + + OD 2004-03-11 #i11860# + + @author OD + */ + SwTwips _GetTopForObjPos( const SwFrm& _rFrm, + const SwRectFn& _fnRect, + const bool _bVert ) const; + // ********************************************************************* void _GetVertAlignmentValues( const SwFrm& _rVertOrientFrm, const SwFrm& _rPageAlignLayFrm, -- cgit v1.2.3 From b8144f5cac095cdd8599d217d798dd9e02b82845 Mon Sep 17 00:00:00 2001 From: Hans-Joachim Lankenau Date: Mon, 28 Jun 2004 12:35:30 +0000 Subject: INTEGRATION: CWS swdrawpositioning (1.3.6); FILE MERGED 2004/06/17 10:21:32 od 1.3.6.3: #i26791# - further adjustments for the unification of the positioning of Writer fly frames and drawing objects. 2004/04/08 09:18:23 od 1.3.6.2: RESYNC: (1.3-1.4); FILE MERGED 2004/04/07 11:59:17 od 1.3.6.1: #i26791# - adjustments for the unification of the positioning of Writer fly frames and drawing objects --- sw/source/core/inc/anchoredobjectposition.hxx | 40 +++++++++++++++++---------- 1 file changed, 26 insertions(+), 14 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 58da2cd52b46..05800a153cc6 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -2,9 +2,9 @@ * * $RCSfile: anchoredobjectposition.hxx,v $ * - * $Revision: 1.4 $ + * $Revision: 1.5 $ * - * last change: $Author: rt $ $Date: 2004-03-31 15:07:02 $ + * last change: $Author: hjs $ $Date: 2004-06-28 13:35:30 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -81,6 +81,8 @@ class SwRect; class SvxLRSpaceItem; class SvxULSpaceItem; class SwFmtHoriOrient; +// OD 2004-03-23 #i26701# +class SwAnchoredObject; namespace objectpositioning { @@ -90,24 +92,24 @@ namespace objectpositioning { private: // object to be positioned - SdrObject& mrDrawObj; + SdrObject& mrDrawObj; // information about object // does the object represents a Writer fly frame - bool mbIsObjFly; - // frame the object belongs to; NULL, if ! - SwFrm* mpFrmOfObj; + bool mbIsObjFly; + // OD 2004-03-23 #i26791# - anchored object the object belongs to; + SwAnchoredObject* mpAnchoredObj; // frame the object is anchored at SwFrm* mpAnchorFrm; // contact object - SwContact* mpContact; + SwContact* mpContact; // frame format const SwFrmFmt* mpFrmFmt; /** determine information about object OD 30.07.2003 #110978# - member , , , + member , , , and are set @author OD @@ -120,11 +122,11 @@ namespace objectpositioning // accessors for object and its corresponding data/information SdrObject& GetObject() const; - bool IsObjFly() const; - SwFrm* GetFrmOfObj() const; - SwFrm& GetAnchorFrm() const; + bool IsObjFly() const; + SwAnchoredObject& GetAnchoredObj() const; + SwFrm& GetAnchorFrm() const; SwContact& GetContact() const; - const SwFrmFmt& GetFrmFmt() const; + const SwFrmFmt& GetFrmFmt() const; // virtual methods providing data for to character anchored objects. virtual bool IsAnchoredToChar() const; @@ -153,13 +155,15 @@ namespace objectpositioning SwTwips& _orAlignAreaOffset ) const; // ********************************************************************* + // --> OD 2004-06-17 #i26791# - add output parameter <_roVertOffsetToFrmAnchorPos> SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm, const SwFrm& _rPageAlignLayFrm, const SwVertOrient _eVertOrient, const SwRelationOrient _eRelOrient, const SwTwips _nVertPos, const SvxLRSpaceItem& _rLRSpacing, - const SvxULSpaceItem& _rULSpacing ) const; + const SvxULSpaceItem& _rULSpacing, + SwTwips& _roVertOffsetToFrmAnchorPos ) const; // ********************************************************************* /** adjust calculated vertical in order to keep object inside @@ -181,6 +185,9 @@ namespace objectpositioning // ********************************************************************* /** calculate relative horizontal position + --> OD 2004-06-17 #i26791# - add output parameter + <_roHoriOffsetToFrmAnchorPos> + @author OD @param _rHoriOrientFrm @@ -208,6 +215,10 @@ namespace objectpositioning @param _nRelPosY input parameter - relative vertical position + @param _roHoriOffsetToFrmAnchorPos + output parameter - 'horizontal' offset to frame anchor position + according to the alignment + @return relative horizontal position in SwTwips */ SwTwips _CalcRelPosX( const SwFrm& _rHoriOrientFrm, @@ -216,7 +227,8 @@ namespace objectpositioning const SvxLRSpaceItem& _rLRSpacing, const SvxULSpaceItem& _rULSpacing, const bool _bObjWrapThrough, - const SwTwips _nRelPosY + const SwTwips _nRelPosY, + SwTwips& _roHoriOffsetToFrmAnchorPos ) const; // ********************************************************************* -- cgit v1.2.3 From f5efdabb9353504fb651f7efe57c032016083893 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Mon, 2 Aug 2004 12:06:14 +0000 Subject: INTEGRATION: CWS swqbugfixes04 (1.5.20); FILE MERGED 2004/07/22 10:19:51 od 1.5.20.1: #i31805# - add 3rd parameter <_bCheckBottom> --- sw/source/core/inc/anchoredobjectposition.hxx | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 05800a153cc6..f618c69ef7b0 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -2,9 +2,9 @@ * * $RCSfile: anchoredobjectposition.hxx,v $ * - * $Revision: 1.5 $ + * $Revision: 1.6 $ * - * last change: $Author: hjs $ $Date: 2004-06-28 13:35:30 $ + * last change: $Author: hr $ $Date: 2004-08-02 13:06:14 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,6 +169,8 @@ namespace objectpositioning /** adjust calculated vertical in order to keep object inside 'page' alignment layout frame. + OD 2004-07-22 #i31805# - add 3rd parameter <_bCheckBottom> + @param _rPageAlignLayFrm input paramter - layout frame, which determines the 'page area' the object has to be vertical positioned in. @@ -177,10 +179,16 @@ namespace objectpositioning input parameter - proposed relative vertical position, which will be adjusted. + @param _bCheckBottom + input parameter - boolean indicating, if bottom of anchored + object has to be checked and thus, (if needed) the proposed + relative position has to be adjusted. default value + @author OD */ SwTwips _AdjustVertRelPos( const SwFrm& _rPageAlignLayFrm, - const SwTwips _nProposedRelPosY ) const; + const SwTwips _nProposedRelPosY, + const bool _bCheckBottom = true ) const; // ********************************************************************* /** calculate relative horizontal position -- cgit v1.2.3 From fba35b98d5b6e7b14b4977d50dca04fca760d5d7 Mon Sep 17 00:00:00 2001 From: Kurt Zenker Date: Mon, 2 Aug 2004 13:46:10 +0000 Subject: INTEGRATION: CWS swobjpos04 (1.4.56); FILE MERGED 2004/06/30 14:58:55 od 1.4.56.1: #i28701# - merge changes of cws swdrawpositioning - further adjustments for the new object positioning --- sw/source/core/inc/anchoredobjectposition.hxx | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index f618c69ef7b0..ea34284bc0d5 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -2,9 +2,9 @@ * * $RCSfile: anchoredobjectposition.hxx,v $ * - * $Revision: 1.6 $ + * $Revision: 1.7 $ * - * last change: $Author: hr $ $Date: 2004-08-02 13:06:14 $ + * last change: $Author: kz $ $Date: 2004-08-02 14:46:10 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -171,8 +171,16 @@ namespace objectpositioning OD 2004-07-22 #i31805# - add 3rd parameter <_bCheckBottom> + @param _nTopOfAnch + input parameter - 'vertical' position, at which the relative + position of the object is calculated from. + + @param _bVert + input parameter - boolean, indicating, if object is in vertical + layout. + @param _rPageAlignLayFrm - input paramter - layout frame, which determines the 'page area' + input parameter - layout frame, which determines the 'page area' the object has to be vertical positioned in. @param _nProposedRelPosY @@ -186,7 +194,9 @@ namespace objectpositioning @author OD */ - SwTwips _AdjustVertRelPos( const SwFrm& _rPageAlignLayFrm, + SwTwips _AdjustVertRelPos( const SwTwips _nTopOfAnch, + const bool _bVert, + const SwFrm& _rPageAlignLayFrm, const SwTwips _nProposedRelPosY, const bool _bCheckBottom = true ) const; -- cgit v1.2.3 From bab609abbf662fc4aa0981316ac5eda4e54e384c Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Tue, 16 Nov 2004 14:41:06 +0000 Subject: INTEGRATION: CWS swqbugfixes09 (1.7.108); FILE MERGED 2004/10/18 06:17:44 od 1.7.108.1: #i26945# --- sw/source/core/inc/anchoredobjectposition.hxx | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index ea34284bc0d5..642b93f73f41 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -2,9 +2,9 @@ * * $RCSfile: anchoredobjectposition.hxx,v $ * - * $Revision: 1.7 $ + * $Revision: 1.8 $ * - * last change: $Author: kz $ $Date: 2004-08-02 14:46:10 $ + * last change: $Author: obo $ $Date: 2004-11-16 15:41:06 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -169,7 +169,8 @@ namespace objectpositioning /** adjust calculated vertical in order to keep object inside 'page' alignment layout frame. - OD 2004-07-22 #i31805# - add 3rd parameter <_bCheckBottom> + OD 2004-07-22 #i31805# - add parameter <_bCheckBottom> + OD 2004-10-08 #i26945# - add parameter <_bFollowTextFlow> @param _nTopOfAnch input parameter - 'vertical' position, at which the relative @@ -187,6 +188,10 @@ namespace objectpositioning input parameter - proposed relative vertical position, which will be adjusted. + @param _bFollowTextFlow + input parameter - value of attribute 'Follow text flow' of the + anchored object. + @param _bCheckBottom input parameter - boolean indicating, if bottom of anchored object has to be checked and thus, (if needed) the proposed @@ -198,6 +203,7 @@ namespace objectpositioning const bool _bVert, const SwFrm& _rPageAlignLayFrm, const SwTwips _nProposedRelPosY, + const bool _bFollowTextFlow, const bool _bCheckBottom = true ) const; // ********************************************************************* -- cgit v1.2.3 From 106d881f0c5741a4217f9f0582020b432c61a1f2 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Fri, 9 Sep 2005 02:42:00 +0000 Subject: INTEGRATION: CWS ooo19126 (1.8.460); FILE MERGED 2005/09/05 13:39:52 rt 1.8.460.1: #i54170# Change license header: remove SISSL --- sw/source/core/inc/anchoredobjectposition.hxx | 68 +++++++++------------------ 1 file changed, 21 insertions(+), 47 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 642b93f73f41..d70374861327 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -1,61 +1,35 @@ /************************************************************************* * - * $RCSfile: anchoredobjectposition.hxx,v $ - * - * $Revision: 1.8 $ - * - * last change: $Author: obo $ $Date: 2004-11-16 15:41:06 $ - * - * The Contents of this file are made available subject to the terms of - * either of the following licenses - * - * - GNU Lesser General Public License Version 2.1 - * - Sun Industry Standards Source License Version 1.1 + * OpenOffice.org - a multi-platform office productivity suite * - * Sun Microsystems Inc., October, 2000 - * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2000 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA - * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * $RCSfile: anchoredobjectposition.hxx,v $ * + * $Revision: 1.9 $ * - * Sun Industry Standards Source License Version 1.1 - * ================================================= - * The contents of this file are subject to the Sun Industry Standards - * Source License Version 1.1 (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.openoffice.org/license.html. + * last change: $Author: rt $ $Date: 2005-09-09 03:42:00 $ * - * Software provided under this License is provided on an "AS IS" basis, - * WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, - * WITHOUT LIMITATION, WARRANTIES THAT THE SOFTWARE IS FREE OF DEFECTS, - * MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE, OR NON-INFRINGING. - * See the License for the specific provisions governing your rights and - * obligations concerning the Software. + * The Contents of this file are made available subject to + * the terms of GNU Lesser General Public License Version 2.1. * - * The Initial Developer of the Original Code is: Sun Microsystems, Inc. * - * Copyright: 2000 by Sun Microsystems, Inc. + * GNU Lesser General Public License Version 2.1 + * ============================================= + * Copyright 2005 by Sun Microsystems, Inc. + * 901 San Antonio Road, Palo Alto, CA 94303, USA * - * All Rights Reserved. + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License version 2.1, as published by the Free Software Foundation. * - * Contributor(s): _______________________________________ + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA * ************************************************************************/ #ifndef _ANCHOREDOBJECTPOSITION_HXX -- cgit v1.2.3 From 375e2cad515f5415773f8f78291f91f6ed27dcb4 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Wed, 22 Mar 2006 11:23:44 +0000 Subject: INTEGRATION: CWS swdrawobjpos203 (1.9.256); FILE MERGED 2006/03/20 08:27:47 od 1.9.256.1: #i62875# class - new members and - made methods <_AdjustVertRelPos(..)> and <_AdjustHoriRelPos(..)>; intrinsic implementation moved to private methods <_ImplAdjustVertRelPos(..)> and <_ImplAdjustHoriRelPos(..)> --- sw/source/core/inc/anchoredobjectposition.hxx | 95 ++++++++++++++++++++++----- 1 file changed, 79 insertions(+), 16 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index d70374861327..828c97a36a11 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -4,9 +4,9 @@ * * $RCSfile: anchoredobjectposition.hxx,v $ * - * $Revision: 1.9 $ + * $Revision: 1.10 $ * - * last change: $Author: rt $ $Date: 2005-09-09 03:42:00 $ + * last change: $Author: obo $ $Date: 2006-03-22 12:23:44 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -79,6 +79,13 @@ namespace objectpositioning SwContact* mpContact; // frame format const SwFrmFmt* mpFrmFmt; + // --> OD 2006-03-15 #i62875# + bool mbFollowTextFlow; + // <-- + // --> OD 2006-03-15 #i62875# + // for compatibility option + bool mbDoNotCaptureAnchoredObj; + // <-- /** determine information about object @@ -90,17 +97,52 @@ namespace objectpositioning */ void _GetInfoAboutObj(); + // --> OD 2006-03-15 #i62875# + SwTwips _ImplAdjustVertRelPos( const SwTwips _nTopOfAnch, + const bool _bVert, + const SwFrm& _rPageAlignLayFrm, + const SwTwips _nProposedRelPosY, + const bool _bFollowTextFlow, + const bool _bCheckBottom = true ) const; + SwTwips _ImplAdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, + const SwTwips _nProposedRelPosX ) const; + // <-- + protected: SwAnchoredObjectPosition( SdrObject& _rDrawObj ); ~SwAnchoredObjectPosition(); // accessors for object and its corresponding data/information - SdrObject& GetObject() const; - bool IsObjFly() const; - SwAnchoredObject& GetAnchoredObj() const; - SwFrm& GetAnchorFrm() const; - SwContact& GetContact() const; - const SwFrmFmt& GetFrmFmt() const; + inline SdrObject& GetObject() const + { + return mrDrawObj; + } + inline bool IsObjFly() const + { + return mbIsObjFly; + } + inline SwAnchoredObject& GetAnchoredObj() const + { + return *mpAnchoredObj; + } + inline SwFrm& GetAnchorFrm() const + { + return *mpAnchorFrm; + } + inline SwContact& GetContact() const + { + return *mpContact; + } + inline const SwFrmFmt& GetFrmFmt() const + { + return *mpFrmFmt; + } + // --> OD 2006-03-15 #i62875# + inline const bool DoesObjFollowsTextFlow() const + { + return mbFollowTextFlow; + } + // <-- // virtual methods providing data for to character anchored objects. virtual bool IsAnchoredToChar() const; @@ -145,6 +187,9 @@ namespace objectpositioning OD 2004-07-22 #i31805# - add parameter <_bCheckBottom> OD 2004-10-08 #i26945# - add parameter <_bFollowTextFlow> + OD 2006-03-15 #i62875# - made inline, intrinsic actions moved + to private method <_ImplAdjustVertRelPos>, which is only + called, if not set. @param _nTopOfAnch input parameter - 'vertical' position, at which the relative @@ -173,12 +218,21 @@ namespace objectpositioning @author OD */ - SwTwips _AdjustVertRelPos( const SwTwips _nTopOfAnch, - const bool _bVert, - const SwFrm& _rPageAlignLayFrm, - const SwTwips _nProposedRelPosY, - const bool _bFollowTextFlow, - const bool _bCheckBottom = true ) const; + inline SwTwips _AdjustVertRelPos( const SwTwips _nTopOfAnch, + const bool _bVert, + const SwFrm& _rPageAlignLayFrm, + const SwTwips _nProposedRelPosY, + const bool _bFollowTextFlow, + const bool _bCheckBottom = true ) const + { + return !mbDoNotCaptureAnchoredObj + ? _ImplAdjustVertRelPos( _nTopOfAnch, _bVert, + _rPageAlignLayFrm, + _nProposedRelPosY, + _bFollowTextFlow, + _bCheckBottom ) + : _nProposedRelPosY; + } // ********************************************************************* /** calculate relative horizontal position @@ -233,6 +287,10 @@ namespace objectpositioning /** adjust calculated horizontal in order to keep object inside 'page' alignment layout frame for object type position TO_CNTNT + OD 2006-03-15 #i62875# - made inline, intrinsic actions moved + to private method <_ImplAdjustHoriRelPos>, which is only + called, if not set. + @author OD @param _rPageAlignLayFrm @@ -245,8 +303,13 @@ namespace objectpositioning @return adjusted relative horizontal position in SwTwips. */ - SwTwips _AdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, - const SwTwips _nProposedRelPosX ) const; + inline SwTwips _AdjustHoriRelPos( const SwFrm& _rPageAlignLayFrm, + const SwTwips _nProposedRelPosX ) const + { + return !mbDoNotCaptureAnchoredObj + ? _ImplAdjustHoriRelPos( _rPageAlignLayFrm, _nProposedRelPosX ) + : _nProposedRelPosX; + } // ********************************************************************* /** toggle given horizontal orientation and relative alignment -- cgit v1.2.3 From 64d6c25ed3b38ca72e2dc827e5092c255f371506 Mon Sep 17 00:00:00 2001 From: Jens-Heiner Rechtien Date: Thu, 27 Sep 2007 07:53:22 +0000 Subject: INTEGRATION: CWS swwarnings (1.10.470); FILE MERGED 2007/04/03 12:59:55 tl 1.10.470.3: #i69287# warning-free code 2007/03/05 12:45:26 tl 1.10.470.2: #i69287# warning-free code 2007/02/22 15:06:32 tl 1.10.470.1: #i69287# warning-free code --- sw/source/core/inc/anchoredobjectposition.hxx | 37 ++++++++++++--------------- 1 file changed, 17 insertions(+), 20 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 828c97a36a11..1ebcf79163af 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -4,9 +4,9 @@ * * $RCSfile: anchoredobjectposition.hxx,v $ * - * $Revision: 1.10 $ + * $Revision: 1.11 $ * - * last change: $Author: obo $ $Date: 2006-03-22 12:23:44 $ + * last change: $Author: hr $ $Date: 2007-09-27 08:53:22 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -38,9 +38,6 @@ #ifndef _SWTYPES_HXX #include #endif -#ifndef _ORNTENUM_HXX -#include -#endif // OD 2004-03-16 #i11860# #ifndef _FRAME_HXX #include @@ -110,7 +107,7 @@ namespace objectpositioning protected: SwAnchoredObjectPosition( SdrObject& _rDrawObj ); - ~SwAnchoredObjectPosition(); + virtual ~SwAnchoredObjectPosition(); // accessors for object and its corresponding data/information inline SdrObject& GetObject() const @@ -166,7 +163,7 @@ namespace objectpositioning // ********************************************************************* void _GetVertAlignmentValues( const SwFrm& _rVertOrientFrm, const SwFrm& _rPageAlignLayFrm, - const SwRelationOrient _eRelOrient, + const sal_Int16 _eRelOrient, SwTwips& _orAlignAreaHeight, SwTwips& _orAlignAreaOffset ) const; @@ -174,8 +171,8 @@ namespace objectpositioning // --> OD 2004-06-17 #i26791# - add output parameter <_roVertOffsetToFrmAnchorPos> SwTwips _GetVertRelPos( const SwFrm& _rVertOrientFrm, const SwFrm& _rPageAlignLayFrm, - const SwVertOrient _eVertOrient, - const SwRelationOrient _eRelOrient, + const sal_Int16 _eVertOrient, + const sal_Int16 _eRelOrient, const SwTwips _nVertPos, const SvxLRSpaceItem& _rLRSpacing, const SvxULSpaceItem& _rULSpacing, @@ -328,9 +325,9 @@ namespace objectpositioning optional input/output parameter (default value NULL) - if set, relative alignment, that is toggled, if needed. */ - void _ToggleHoriOrientAndAlign( const bool _bToggleLeftRight, - SwHoriOrient& _ioeHoriOrient, - SwRelationOrient& _iopeRelOrient + void _ToggleHoriOrientAndAlign( const bool _bToggleLeftRight, + sal_Int16& _ioeHoriOrient, + sal_Int16& _iopeRelOrient ) const; // ********************************************************************* @@ -375,7 +372,7 @@ namespace objectpositioning */ void _GetHoriAlignmentValues( const SwFrm& _rHoriOrientFrm, const SwFrm& _rPageAlignLayFrm, - const SwRelationOrient _eRelOrient, + const sal_Int16 _eRelOrient, const bool _bObjWrapThrough, SwTwips& _orAlignAreaWidth, SwTwips& _orAlignAreaOffset, @@ -418,8 +415,8 @@ namespace objectpositioning SwTwips _AdjustHoriRelPosForDrawAside( const SwFrm& _rHoriOrientFrm, const SwTwips _nProposedRelPosX, const SwTwips _nRelPosY, - const SwHoriOrient _eHoriOrient, - const SwRelationOrient _eRelOrient, + const sal_Int16 _eHoriOrient, + const sal_Int16 _eRelOrient, const SvxLRSpaceItem& _rLRSpacing, const SvxULSpaceItem& _rULSpacing, const bool _bEvenPage @@ -461,8 +458,8 @@ namespace objectpositioning const SwFrm* _pObjContext, const ULONG _nObjIndex, const bool _bEvenPage, - const SwHoriOrient _eHoriOrient, - const SwRelationOrient _eRelOrient + const sal_Int16 _eHoriOrient, + const sal_Int16 _eRelOrient ) const; // ********************************************************************* @@ -491,13 +488,13 @@ namespace objectpositioning <_eRelOrient1> has to be drawn aside an object with an alignment <_eRelOrient2> */ - bool _Minor( SwRelationOrient _eRelOrient1, - SwRelationOrient _eRelOrient2, + bool _Minor( sal_Int16 _eRelOrient1, + sal_Int16 _eRelOrient2, bool _bLeft ) const; public: virtual void CalcPosition() = 0; }; -}; +} // namespace objectpositioning #endif -- cgit v1.2.3 From b32e334b92b5edab0dc91378db151369976bf207 Mon Sep 17 00:00:00 2001 From: Rüdiger Timm Date: Thu, 10 Apr 2008 13:07:46 +0000 Subject: INTEGRATION: CWS changefileheader (1.11.242); FILE MERGED 2008/04/01 12:54:08 thb 1.11.242.2: #i85898# Stripping all external header guards 2008/03/31 16:54:12 rt 1.11.242.1: #i87441# Change license header to LPGL v3. --- sw/source/core/inc/anchoredobjectposition.hxx | 45 +++++++++++---------------- 1 file changed, 18 insertions(+), 27 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index 1ebcf79163af..c33e1ad0d64b 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -1,47 +1,38 @@ /************************************************************************* * - * OpenOffice.org - a multi-platform office productivity suite + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. * - * $RCSfile: anchoredobjectposition.hxx,v $ + * Copyright 2008 by Sun Microsystems, Inc. * - * $Revision: 1.11 $ + * OpenOffice.org - a multi-platform office productivity suite * - * last change: $Author: hr $ $Date: 2007-09-27 08:53:22 $ + * $RCSfile: anchoredobjectposition.hxx,v $ + * $Revision: 1.12 $ * - * The Contents of this file are made available subject to - * the terms of GNU Lesser General Public License Version 2.1. + * This file is part of OpenOffice.org. * + * OpenOffice.org is free software: you can redistribute it and/or modify + * it under the terms of the GNU Lesser General Public License version 3 + * only, as published by the Free Software Foundation. * - * GNU Lesser General Public License Version 2.1 - * ============================================= - * Copyright 2005 by Sun Microsystems, Inc. - * 901 San Antonio Road, Palo Alto, CA 94303, USA + * OpenOffice.org is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Lesser General Public License version 3 for more details + * (a copy is included in the LICENSE file that accompanied this code). * - * This library is free software; you can redistribute it and/or - * modify it under the terms of the GNU Lesser General Public - * License version 2.1, as published by the Free Software Foundation. - * - * This library is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this library; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * You should have received a copy of the GNU Lesser General Public License + * version 3 along with OpenOffice.org. If not, see + * + * for a copy of the LGPLv3 License. * ************************************************************************/ #ifndef _ANCHOREDOBJECTPOSITION_HXX #define _ANCHOREDOBJECTPOSITION_HXX -#ifndef _SWTYPES_HXX #include -#endif // OD 2004-03-16 #i11860# -#ifndef _FRAME_HXX #include -#endif class SdrObject; class SwFrm; -- cgit v1.2.3 From 56a1f3affcd18957442313e271e3c0ebef565d84 Mon Sep 17 00:00:00 2001 From: Oliver Bolte Date: Fri, 10 Oct 2008 13:02:43 +0000 Subject: CWS-TOOLING: integrate CWS cmcfixes49 --- sw/inc/EnhancedPDFExportHelper.hxx | 14 +++-- sw/inc/anchoreddrawobject.hxx | 8 +-- sw/inc/anchoredobject.hxx | 8 +-- sw/inc/dcontact.hxx | 4 +- sw/inc/doc.hxx | 2 +- sw/inc/fesh.hxx | 4 +- sw/inc/fmtcol.hxx | 4 +- sw/inc/fmtflcnt.hxx | 4 +- sw/inc/fmtfordr.hxx | 4 +- sw/inc/format.hxx | 6 +- sw/inc/frmfmt.hxx | 6 +- sw/inc/ndnotxt.hxx | 10 +-- sw/inc/node.hxx | 8 +-- sw/inc/numrule.hxx | 10 +-- sw/inc/pagepreviewlayout.hxx | 2 +- sw/inc/section.hxx | 4 +- sw/inc/txtinet.hxx | 6 +- sw/inc/viewsh.hxx | 4 +- sw/source/core/attr/format.cxx | 6 +- sw/source/core/doc/number.cxx | 20 +++--- sw/source/core/docnode/ndnotxt.cxx | 4 +- sw/source/core/draw/dcontact.cxx | 4 +- sw/source/core/fields/macrofld.cxx | 6 +- sw/source/core/frmedt/feshview.cxx | 4 +- sw/source/core/inc/anchoredobjectposition.hxx | 4 +- sw/source/core/inc/flyfrm.hxx | 10 +-- sw/source/core/inc/objectformatter.hxx | 6 +- sw/source/core/inc/pagefrm.hxx | 4 +- sw/source/core/inc/txtfrm.hxx | 4 +- sw/source/core/inc/viewimp.hxx | 4 +- sw/source/core/layout/anchoreddrawobject.cxx | 8 +-- sw/source/core/layout/anchoredobject.cxx | 4 +- sw/source/core/layout/atrfrm.cxx | 6 +- sw/source/core/layout/fly.cxx | 6 +- sw/source/core/layout/paintfrm.cxx | 8 +-- sw/source/core/text/frmcrsr.cxx | 14 ++--- sw/source/core/text/frmpaint.cxx | 4 +- sw/source/core/text/inftxt.cxx | 2 +- sw/source/core/text/inftxt.hxx | 10 +-- sw/source/core/text/itratr.hxx | 2 +- sw/source/core/text/itrform2.hxx | 10 +-- sw/source/core/text/porfld.hxx | 4 +- sw/source/core/text/porfly.hxx | 10 +-- sw/source/core/text/porlin.hxx | 90 +++++++++++++-------------- sw/source/core/text/portxt.hxx | 2 +- sw/source/core/text/widorp.cxx | 4 +- sw/source/core/text/widorp.hxx | 16 ++--- sw/source/core/txtnode/fntcap.cxx | 4 +- sw/source/core/view/pagepreviewlayout.cxx | 4 +- sw/source/core/view/vnew.cxx | 4 +- sw/source/filter/html/svxcss1.cxx | 4 +- sw/source/filter/html/swhtml.cxx | 4 +- sw/source/filter/html/swhtml.hxx | 4 +- sw/source/filter/ww8/ww8par2.cxx | 2 +- sw/source/filter/ww8/ww8par2.hxx | 2 +- sw/source/filter/ww8/ww8scan.cxx | 2 +- sw/source/ui/fldui/fldfunc.cxx | 4 +- sw/source/ui/fldui/fldref.cxx | 4 +- sw/source/ui/fldui/fldref.hxx | 4 +- sw/source/ui/inc/fldmgr.hxx | 6 +- 60 files changed, 219 insertions(+), 213 deletions(-) (limited to 'sw/source/core/inc/anchoredobjectposition.hxx') diff --git a/sw/inc/EnhancedPDFExportHelper.hxx b/sw/inc/EnhancedPDFExportHelper.hxx index 94e125fac32e..fb4251ffec0c 100644 --- a/sw/inc/EnhancedPDFExportHelper.hxx +++ b/sw/inc/EnhancedPDFExportHelper.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: EnhancedPDFExportHelper.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.174.1 $ * * This file is part of OpenOffice.org. * @@ -40,13 +40,19 @@ #include #include -class vcl::PDFExtOutDevData; +namespace vcl +{ + class PDFExtOutDevData; +} class OutputDevice; class SwFrm; class SwLinePortion; class SwTxtPainter; class SwEditShell; -class rtl::OUString; +namespace rtl +{ + class OUString; +} class MultiSelection; class SwTxtNode; class SwNumRule; @@ -247,7 +253,7 @@ class SwEnhancedPDFExportHelper static NumListBodyIdMap& GetNumListBodyIdMap() {return aNumListBodyIdMap; } static FrmTagIdMap& GetFrmTagIdMap() { return aFrmTagIdMap; } - static const LanguageType GetDefaultLanguage() {return eLanguageDefault; } + static LanguageType GetDefaultLanguage() {return eLanguageDefault; } }; #endif diff --git a/sw/inc/anchoreddrawobject.hxx b/sw/inc/anchoreddrawobject.hxx index 0328c9d246d6..bb95a8abf7b6 100644 --- a/sw/inc/anchoreddrawobject.hxx +++ b/sw/inc/anchoreddrawobject.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anchoreddrawobject.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.214.1 $ * * This file is part of OpenOffice.org. * @@ -136,8 +136,8 @@ class SwAnchoredDrawObject : public SwAnchoredObject virtual void RegisterAtCorrectPage(); // --> OD 2006-08-10 #i68520# - virtual const bool _SetObjTop( const SwTwips _nTop); - virtual const bool _SetObjLeft( const SwTwips _nLeft); + virtual bool _SetObjTop( const SwTwips _nTop); + virtual bool _SetObjLeft( const SwTwips _nLeft); // <-- // --> OD 2006-10-05 #i70122# @@ -216,7 +216,7 @@ class SwAnchoredDrawObject : public SwAnchoredObject virtual void UpdateLayoutDir(); // <-- // --> OD 2006-03-17 #i62875# - const bool IsOutsidePage() const; + bool IsOutsidePage() const; // <-- // new Loop control diff --git a/sw/inc/anchoredobject.hxx b/sw/inc/anchoredobject.hxx index 395237429413..3cbd93d75104 100644 --- a/sw/inc/anchoredobject.hxx +++ b/sw/inc/anchoredobject.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anchoredobject.hxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.214.1 $ * * This file is part of OpenOffice.org. * @@ -237,8 +237,8 @@ class SwAnchoredObject void SetTmpConsiderWrapInfluenceOfOtherObjs( const bool bTmpConsiderWrapInfluence ); // --> OD 2006-08-10 #i68520# - virtual const bool _SetObjTop( const SwTwips _nTop) = 0; - virtual const bool _SetObjLeft( const SwTwips _nLeft) = 0; + virtual bool _SetObjTop( const SwTwips _nTop) = 0; + virtual bool _SetObjLeft( const SwTwips _nLeft) = 0; // <-- // --> OD 2006-10-05 #i70122# @@ -349,7 +349,7 @@ class SwAnchoredObject void ResetLastCharRectHeight(); // accessor to member - const SwTwips GetLastTopOfLine() const; + SwTwips GetLastTopOfLine() const; // OD 2004-05-18 #i28701# - follow-up of #i22341# void AddLastTopOfLineY( SwTwips _nDiff ); diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx index 9d33932f0440..8c5e55eec11c 100644 --- a/sw/inc/dcontact.hxx +++ b/sw/inc/dcontact.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dcontact.hxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.26.210.2 $ * * This file is part of OpenOffice.org. * @@ -149,7 +149,7 @@ public: { return (const SwFrmFmt*)GetRegisteredIn(); } // OD 05.09.2003 #112039# - accessor for member - const bool IsInDTOR() const; + bool IsInDTOR() const; /** method to move drawing object to corresponding visible layer diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index 37a01e0e9bf8..3181e2ae95e8 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -2078,7 +2078,7 @@ public: // <-- #i31958# access methods for XForms model(s) // --> OD 2006-03-21 #b6375613# - inline const bool ApplyWorkaroundForB6375613() const + inline bool ApplyWorkaroundForB6375613() const { return mbApplyWorkaroundForB6375613; } diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index f4572a024eb5..8697ee2833d1 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fesh.hxx,v $ - * $Revision: 1.63 $ + * $Revision: 1.63.212.1 $ * * This file is part of OpenOffice.org. * @@ -758,7 +758,7 @@ public: @returns boolean, indicating, if the horizontal text direction of the page, the selected drawing object is on, is right-to-left. */ - const bool IsShapeDefaultHoriTextDirR2L() const; + bool IsShapeDefaultHoriTextDirR2L() const; void ParkCursorInTab(); diff --git a/sw/inc/fmtcol.hxx b/sw/inc/fmtcol.hxx index 59de6a923912..4b8de2d8bd9b 100644 --- a/sw/inc/fmtcol.hxx +++ b/sw/inc/fmtcol.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmtcol.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.144.1 $ * * This file is part of OpenOffice.org. * @@ -111,7 +111,7 @@ public: BOOL IsAtDocNodeSet() const; // --> OD 2006-11-22 #i71574# - inline const bool AssignedToListLevelOfOutlineStyle() const + inline bool AssignedToListLevelOfOutlineStyle() const { return ( /*0 <= GetOutlineLevel() &&*/ GetOutlineLevel() < MAXLEVEL ); } diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx index 6b77508334c7..c018e8c31c14 100644 --- a/sw/inc/fmtflcnt.hxx +++ b/sw/inc/fmtflcnt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmtflcnt.hxx,v $ - * $Revision: 1.6 $ + * $Revision: 1.6.214.1 $ * * This file is part of OpenOffice.org. * @@ -60,7 +60,7 @@ public: SwTxtFlyCnt *GetTxtFlyCnt() { return pTxtAttr; } // OD 27.06.2003 #108784# - const bool Sw3ioExportAllowed() const; + bool Sw3ioExportAllowed() const; }; #endif diff --git a/sw/inc/fmtfordr.hxx b/sw/inc/fmtfordr.hxx index ed262e7702cb..93107807d1cd 100644 --- a/sw/inc/fmtfordr.hxx +++ b/sw/inc/fmtfordr.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fmtfordr.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.214.1 $ * * This file is part of OpenOffice.org. * @@ -56,7 +56,7 @@ public: virtual SfxPoolItem* Clone( SfxItemPool *pPool = 0 ) const; virtual USHORT GetValueCount() const; - const SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } + SwFillOrder GetFillOrder() const { return SwFillOrder(GetValue()); } }; inline SwFmtFillOrder &SwFmtFillOrder::operator=( const SwFmtFillOrder &rCpy ) diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx index 03f9211c1bd4..b68e48042151 100644 --- a/sw/inc/format.hxx +++ b/sw/inc/format.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: format.hxx,v $ - * $Revision: 1.32 $ + * $Revision: 1.32.144.1 $ * * This file is part of OpenOffice.org. * @@ -318,7 +318,7 @@ public: @return false, default implementation */ - virtual const sal_Bool IsBackgroundTransparent() const; + virtual sal_Bool IsBackgroundTransparent() const; /** SwFmt::IsShadowTransparent - for feature #99657# @@ -331,7 +331,7 @@ public: @return false, default implementation */ - virtual const sal_Bool IsShadowTransparent() const; + virtual sal_Bool IsShadowTransparent() const; }; // --------------- inline Implementierungen ------------------------ diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx index f38e5fc89d3b..07c29b780faf 100644 --- a/sw/inc/frmfmt.hxx +++ b/sw/inc/frmfmt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: frmfmt.hxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.214.1 $ * * This file is part of OpenOffice.org. * @@ -187,7 +187,7 @@ public: @return true, if background color is transparent, but not "no fill" or a existing background graphic is transparent. */ - virtual const sal_Bool IsBackgroundTransparent() const; + virtual sal_Bool IsBackgroundTransparent() const; /** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898# @@ -200,7 +200,7 @@ public: @return true, if background brush is "inherited" from parent/grandparent */ - const sal_Bool IsBackgroundBrushInherited() const; + sal_Bool IsBackgroundBrushInherited() const; DECL_FIXEDMEMPOOL_NEWDEL(SwFlyFrmFmt) }; diff --git a/sw/inc/ndnotxt.hxx b/sw/inc/ndnotxt.hxx index 34860dc8f01a..5d7cab19f4b2 100644 --- a/sw/inc/ndnotxt.hxx +++ b/sw/inc/ndnotxt.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ndnotxt.hxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.212.1 $ * * This file is part of OpenOffice.org. * @@ -82,12 +82,12 @@ public: void SetContour( const PolyPolygon *pPoly, BOOL bAutomatic = FALSE ); const PolyPolygon *HasContour() const; - const BOOL _HasContour() const { return pContour!=0; }; + BOOL _HasContour() const { return pContour!=0; }; void GetContour( PolyPolygon &rPoly ) const; void CreateContour(); void SetAutomaticContour( BOOL bSet ) { bAutomaticContour = bSet; } - const BOOL HasAutomaticContour() const { return bAutomaticContour; } + BOOL HasAutomaticContour() const { return bAutomaticContour; } // set either a MM100 or pixel contour void SetContourAPI( const PolyPolygon *pPoly ); @@ -96,9 +96,9 @@ public: BOOL GetContourAPI( PolyPolygon &rPoly ) const; void SetPixelContour( BOOL bSet ) { bPixelContour = bSet; } - const BOOL IsPixelContour() const; + BOOL IsPixelContour() const; - const BOOL IsContourMapModeValid() const { return bContourMapModeValid; } + BOOL IsContourMapModeValid() const { return bContourMapModeValid; } //Besorgt die Graphic, mit SwapIn fuer GrfNode, per GetData fuer OLE. Graphic GetGraphic() const; diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx index 433219c407d5..fc15c370db3e 100644 --- a/sw/inc/node.hxx +++ b/sw/inc/node.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: node.hxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.144.1 $ * * This file is part of OpenOffice.org. * @@ -128,13 +128,13 @@ public: inline const SwEndNode* EndOfSectionNode() const; inline SwEndNode* EndOfSectionNode(); - inline const BYTE GetAutoFmtLvl() const { return nAFmtNumLvl; } + inline BYTE GetAutoFmtLvl() const { return nAFmtNumLvl; } inline void SetAutoFmtLvl( BYTE nVal ) { nAFmtNumLvl = nVal; } - inline const BOOL IsSetNumLSpace() const { return bSetNumLSpace; } + inline BOOL IsSetNumLSpace() const { return bSetNumLSpace; } inline void SetNumLSpace( BOOL bFlag ) { bSetNumLSpace = bFlag; } - inline const BOOL IsIgnoreDontExpand() const { return bIgnoreDontExpand; } + inline BOOL IsIgnoreDontExpand() const { return bIgnoreDontExpand; } inline void SetIgnoreDontExpand( BOOL bNew ) { bIgnoreDontExpand = bNew; } BYTE GetNodeType() const { return nNodeType; } diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx index 77bac245aa81..8715cba74ae5 100644 --- a/sw/inc/numrule.hxx +++ b/sw/inc/numrule.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: numrule.hxx,v $ - * $Revision: 1.39 $ + * $Revision: 1.39.78.1 $ * * This file is part of OpenOffice.org. * @@ -341,7 +341,7 @@ namespace numfunc @author OD */ - const bool IsDefBulletFontUserDefined(); + bool IsDefBulletFontUserDefined(); /** retrieve font used for the default bullet list characters @@ -353,7 +353,7 @@ namespace numfunc @author OD */ - const sal_Unicode GetBulletChar( BYTE nLevel ); + sal_Unicode GetBulletChar( BYTE nLevel ); /** configuration, if at first position of the first list item the -key increased the indent of the complete list or only demotes this list item. @@ -364,14 +364,14 @@ namespace numfunc @author OD */ - const sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem(); + sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem(); /** OD 2008-06-06 #i89178# @author OD */ - const SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode(); + SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode(); } #endif // _NUMRULE_HXX diff --git a/sw/inc/pagepreviewlayout.hxx b/sw/inc/pagepreviewlayout.hxx index f31a31132b40..589e2850b1ab 100644 --- a/sw/inc/pagepreviewlayout.hxx +++ b/sw/inc/pagepreviewlayout.hxx @@ -219,7 +219,7 @@ private: @author OD */ - const void _PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const; + void _PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const; public: /** constructor of diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx index 9bc35e711079..eb6c0361cced 100644 --- a/sw/inc/section.hxx +++ b/sw/inc/section.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: section.hxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.214.1 $ * * This file is part of OpenOffice.org. * @@ -128,7 +128,7 @@ public: const String& GetName() const { return sSectionNm; } void SetName( const String& rName ) { sSectionNm = rName; } - const SectionType GetType() const { return eType; } + SectionType GetType() const { return eType; } void SetType( SectionType eNew ) { eType = eNew; } SwSectionFmt* GetFmt() { return (SwSectionFmt*)pRegisteredIn; } diff --git a/sw/inc/txtinet.hxx b/sw/inc/txtinet.hxx index 43ee11b40fdf..ac404ad5ac12 100644 --- a/sw/inc/txtinet.hxx +++ b/sw/inc/txtinet.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: txtinet.hxx,v $ - * $Revision: 1.7 $ + * $Revision: 1.7.214.1 $ * * This file is part of OpenOffice.org. * @@ -65,10 +65,10 @@ public: const SwCharFmt* GetCharFmt() const { return ((SwTxtINetFmt*)this)->GetCharFmt(); } - const BOOL IsVisited() const { return bVisited; } + BOOL IsVisited() const { return bVisited; } void SetVisited( BOOL bNew ) { bVisited = bNew; } - const BOOL IsValidVis() const { return bValidVis; } + BOOL IsValidVis() const { return bValidVis; } void SetValidVis( BOOL bNew ) { bValidVis = bNew; } BOOL IsProtect() const; diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 26446c7d759a..318490a5113e 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewsh.hxx,v $ - * $Revision: 1.65 $ + * $Revision: 1.64.210.2 $ * * This file is part of OpenOffice.org. * @@ -493,7 +493,7 @@ public: sal_Bool IsPaintLocked() const { return nLockPaint != 0; } // Abfragen/Erzeugen DrawView + PageView - const sal_Bool HasDrawView() const; + sal_Bool HasDrawView() const; void MakeDrawView(); //DrawView darf u.U. am UI benutzt werden. diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx index e9a221fdcb2c..be8f95594c62 100644 --- a/sw/source/core/attr/format.cxx +++ b/sw/source/core/attr/format.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: format.cxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.146.1 $ * * This file is part of OpenOffice.org. * @@ -662,7 +662,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet ) @return false, default implementation */ -const sal_Bool SwFmt::IsBackgroundTransparent() const +sal_Bool SwFmt::IsBackgroundTransparent() const { return sal_False; } @@ -678,7 +678,7 @@ const sal_Bool SwFmt::IsBackgroundTransparent() const @return false, default implementation */ -const sal_Bool SwFmt::IsShadowTransparent() const +sal_Bool SwFmt::IsShadowTransparent() const { return sal_False; } diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx index 5012e079f5d2..16ec5c453469 100644 --- a/sw/source/core/doc/number.cxx +++ b/sw/source/core/doc/number.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: number.cxx,v $ - * $Revision: 1.53 $ + * $Revision: 1.53.76.1 $ * * This file is part of OpenOffice.org. * @@ -1240,7 +1240,7 @@ namespace numfunc return msFontname; } // --> OD 2008-06-02 #i63395# - inline const bool IsFontnameUserDefined() const + inline bool IsFontnameUserDefined() const { return mbUserDefinedFontname; } @@ -1249,15 +1249,15 @@ namespace numfunc { return *mpFont; } - inline const short GetFontWeight() const + inline short GetFontWeight() const { return static_cast(meFontWeight); } - inline const short GetFontItalic() const + inline short GetFontItalic() const { return static_cast(meFontItalic); } - inline const sal_Unicode GetChar( BYTE p_nListLevel ) const + inline sal_Unicode GetChar( BYTE p_nListLevel ) const { if ( p_nListLevel > MAXLEVEL ) { @@ -1476,7 +1476,7 @@ namespace numfunc } // --> OD 2008-06-02 #i63395# - const bool IsDefBulletFontUserDefined() + bool IsDefBulletFontUserDefined() { return SwDefBulletConfig::getInstance()->IsFontnameUserDefined(); } @@ -1487,7 +1487,7 @@ namespace numfunc return SwDefBulletConfig::getInstance()->GetFont(); } - const sal_Unicode GetBulletChar( BYTE nLevel ) + sal_Unicode GetBulletChar( BYTE nLevel ) { return SwDefBulletConfig::getInstance()->GetChar( nLevel ); } @@ -1514,7 +1514,7 @@ namespace numfunc return mpInstance; } - inline const sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const + inline sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem() const { return mbChangeIndentOnTabAtFirstPosOfFirstListItem; } @@ -1618,13 +1618,13 @@ namespace numfunc LoadConfig(); } - const sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem() + sal_Bool ChangeIndentOnTabAtFirstPosOfFirstListItem() { return SwNumberingUIBehaviorConfig::getInstance()->ChangeIndentOnTabAtFirstPosOfFirstListItem(); } // --> OD 2008-06-06 #i89178# - const SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode() + SvxNumberFormat::SvxNumPositionAndSpaceMode GetDefaultPositionAndSpaceMode() { SvxNumberFormat::SvxNumPositionAndSpaceMode ePosAndSpaceMode; SvtSaveOptions aSaveOptions; diff --git a/sw/source/core/docnode/ndnotxt.cxx b/sw/source/core/docnode/ndnotxt.cxx index 2d39d584bf08..fe15b7fabbfa 100644 --- a/sw/source/core/docnode/ndnotxt.cxx +++ b/sw/source/core/docnode/ndnotxt.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ndnotxt.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.214.1 $ * * This file is part of OpenOffice.org. * @@ -217,7 +217,7 @@ BOOL SwNoTxtNode::GetContourAPI( PolyPolygon &rContour ) const return TRUE; } -const BOOL SwNoTxtNode::IsPixelContour() const +BOOL SwNoTxtNode::IsPixelContour() const { BOOL bRet; if( bContourMapModeValid ) diff --git a/sw/source/core/draw/dcontact.cxx b/sw/source/core/draw/dcontact.cxx index b8a726a603ad..32598db202ae 100644 --- a/sw/source/core/draw/dcontact.cxx +++ b/sw/source/core/draw/dcontact.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: dcontact.cxx,v $ - * $Revision: 1.62 $ + * $Revision: 1.61.210.2 $ * * This file is part of OpenOffice.org. * @@ -212,7 +212,7 @@ SwContact::~SwContact() } // OD 05.09.2003 #112039# - accessor for member -const bool SwContact::IsInDTOR() const +bool SwContact::IsInDTOR() const { return mbInDTOR; } diff --git a/sw/source/core/fields/macrofld.cxx b/sw/source/core/fields/macrofld.cxx index 0fd419c648d9..9c5b57bab6d1 100644 --- a/sw/source/core/fields/macrofld.cxx +++ b/sw/source/core/fields/macrofld.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: macrofld.cxx,v $ - * $Revision: 1.13 $ + * $Revision: 1.13.214.1 $ * * This file is part of OpenOffice.org. * @@ -107,7 +107,7 @@ String SwMacroField::GetLibName() const USHORT nPos = aMacro.Len(); for (USHORT i = 0; i < 3 && nPos > 0; i++) - while (aMacro.GetChar(--nPos) != '.' && nPos > 0); + while (aMacro.GetChar(--nPos) != '.' && nPos > 0) ; return aMacro.Copy(0, nPos ); } @@ -129,7 +129,7 @@ String SwMacroField::GetMacroName() const USHORT nPos = aMacro.Len(); for (USHORT i = 0; i < 3 && nPos > 0; i++) - while (aMacro.GetChar(--nPos) != '.' && nPos > 0); + while (aMacro.GetChar(--nPos) != '.' && nPos > 0) ; return aMacro.Copy( ++nPos ); } diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx index 63093e79e9c4..f6539c26d16c 100644 --- a/sw/source/core/frmedt/feshview.cxx +++ b/sw/source/core/frmedt/feshview.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: feshview.cxx,v $ - * $Revision: 1.62 $ + * $Revision: 1.61.136.2 $ * * This file is part of OpenOffice.org. * @@ -3121,7 +3121,7 @@ const Color SwFEShell::GetShapeBackgrd() const @returns boolean, indicating, if the horizontal text direction of the page, the selected drawing object is on, is right-to-left. */ -const bool SwFEShell::IsShapeDefaultHoriTextDirR2L() const +bool SwFEShell::IsShapeDefaultHoriTextDirR2L() const { bool bRet = false; diff --git a/sw/source/core/inc/anchoredobjectposition.hxx b/sw/source/core/inc/anchoredobjectposition.hxx index c33e1ad0d64b..87adedcf6c0d 100644 --- a/sw/source/core/inc/anchoredobjectposition.hxx +++ b/sw/source/core/inc/anchoredobjectposition.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anchoredobjectposition.hxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.214.1 $ * * This file is part of OpenOffice.org. * @@ -126,7 +126,7 @@ namespace objectpositioning return *mpFrmFmt; } // --> OD 2006-03-15 #i62875# - inline const bool DoesObjFollowsTextFlow() const + inline bool DoesObjFollowsTextFlow() const { return mbFollowTextFlow; } diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index c3a9356e4cfa..dc8975f3fd47 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: flyfrm.hxx,v $ - * $Revision: 1.24 $ + * $Revision: 1.24.212.1 $ * * This file is part of OpenOffice.org. * @@ -146,8 +146,8 @@ protected: virtual void RegisterAtCorrectPage(); // --> OD 2006-08-10 #i68520# - virtual const bool _SetObjTop( const SwTwips _nTop ); - virtual const bool _SetObjLeft( const SwTwips _nLeft ); + virtual bool _SetObjTop( const SwTwips _nTop ); + virtual bool _SetObjLeft( const SwTwips _nLeft ); // <-- // --> OD 2006-10-05 #i70122# @@ -245,7 +245,7 @@ public: @return true, if background color is transparent or a existing background graphic is transparent. */ - const sal_Bool IsBackgroundTransparent() const; + sal_Bool IsBackgroundTransparent() const; /** SwFlyFrm::IsShadowTransparent - for feature #99657# @@ -257,7 +257,7 @@ public: @return true, if shadow color is transparent. */ - const sal_Bool IsShadowTransparent() const; + sal_Bool IsShadowTransparent() const; // OD 2004-01-19 #110582# void Chain( SwFrm* _pAnchor ); diff --git a/sw/source/core/inc/objectformatter.hxx b/sw/source/core/inc/objectformatter.hxx index 53fff1777885..4c802f646b9a 100644 --- a/sw/source/core/inc/objectformatter.hxx +++ b/sw/source/core/inc/objectformatter.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: objectformatter.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.214.1 $ * * This file is part of OpenOffice.org. * @@ -110,7 +110,7 @@ class SwObjectFormatter return mrPageFrm; } - inline const bool ConsiderWrapOnObjPos() const + inline bool ConsiderWrapOnObjPos() const { return mbConsiderWrapOnObjPos; } @@ -130,7 +130,7 @@ class SwObjectFormatter mbFormatOnlyAsCharAnchored = true; } - inline const bool FormatOnlyAsCharAnchored() const + inline bool FormatOnlyAsCharAnchored() const { return mbFormatOnlyAsCharAnchored; } diff --git a/sw/source/core/inc/pagefrm.hxx b/sw/source/core/inc/pagefrm.hxx index c35fbaf1bfc5..e992fb0fdf28 100644 --- a/sw/source/core/inc/pagefrm.hxx +++ b/sw/source/core/inc/pagefrm.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: pagefrm.hxx,v $ - * $Revision: 1.25 $ + * $Revision: 1.25.144.1 $ * * This file is part of OpenOffice.org. * @@ -275,7 +275,7 @@ public: void SetFtnPage( BOOL b ) { bFtnPage = b; } void SetEndNotePage( BOOL b ) { bEndNotePage = b; } - inline const USHORT GetPhyPageNum() const { return nPhyPageNum;} + inline USHORT GetPhyPageNum() const { return nPhyPageNum;} inline void SetPhyPageNum( USHORT nNum ) { nPhyPageNum = nNum;} inline void DecrPhyPageNum() { --nPhyPageNum; } inline void IncrPhyPageNum() { ++nPhyPageNum; } diff --git a/sw/source/core/inc/txtfrm.hxx b/sw/source/core/inc/txtfrm.hxx index 5e1470d79f0a..4e7293d9b6d8 100644 --- a/sw/source/core/inc/txtfrm.hxx +++ b/sw/source/core/inc/txtfrm.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: txtfrm.hxx,v $ - * $Revision: 1.56 $ + * $Revision: 1.56.212.1 $ * * This file is part of OpenOffice.org. * @@ -590,7 +590,7 @@ public: inline void SwitchRTLtoLTR( Point& rPoint ) const { SwitchLTRtoRTL( rPoint ); }; // OD 14.03.2003 #i11760# - access to new member - inline const bool FollowFormatAllowed() const + inline bool FollowFormatAllowed() const { return mbFollowFormatAllowed; } diff --git a/sw/source/core/inc/viewimp.hxx b/sw/source/core/inc/viewimp.hxx index 6f225018f4c6..476990022ff2 100644 --- a/sw/source/core/inc/viewimp.hxx +++ b/sw/source/core/inc/viewimp.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: viewimp.hxx,v $ - * $Revision: 1.36 $ + * $Revision: 1.36.214.1 $ * * This file is part of OpenOffice.org. * @@ -244,7 +244,7 @@ public: BOOL IsPaintInScroll() const { return bPaintInScroll; } // neues Interface fuer StarView Drawing - inline const BOOL HasDrawView() const { return 0 != pDrawView; } + inline BOOL HasDrawView() const { return 0 != pDrawView; } SwDrawView* GetDrawView() { return pDrawView; } const SwDrawView* GetDrawView() const { return pDrawView; } SdrPageView*GetPageView() { return pSdrPageView; } diff --git a/sw/source/core/layout/anchoreddrawobject.cxx b/sw/source/core/layout/anchoreddrawobject.cxx index c9681f73b07b..0976dcbefdc0 100644 --- a/sw/source/core/layout/anchoreddrawobject.cxx +++ b/sw/source/core/layout/anchoreddrawobject.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anchoreddrawobject.cxx,v $ - * $Revision: 1.26 $ + * $Revision: 1.26.144.1 $ * * This file is part of OpenOffice.org. * @@ -273,7 +273,7 @@ void SwAnchoredDrawObject::UpdateLayoutDir() // <-- // --> OD 2006-03-17 #i62875# -const bool SwAnchoredDrawObject::IsOutsidePage() const +bool SwAnchoredDrawObject::IsOutsidePage() const { bool bOutsidePage( false ); @@ -712,14 +712,14 @@ const SwRect SwAnchoredDrawObject::GetObjBoundRect() const // <-- // --> OD 2006-08-10 #i68520# -const bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop ) +bool SwAnchoredDrawObject::_SetObjTop( const SwTwips _nTop ) { SwTwips nDiff = _nTop - GetObjRect().Top(); DrawObj()->Move( Size( 0, nDiff ) ); return nDiff != 0; } -const bool SwAnchoredDrawObject::_SetObjLeft( const SwTwips _nLeft ) +bool SwAnchoredDrawObject::_SetObjLeft( const SwTwips _nLeft ) { SwTwips nDiff = _nLeft - GetObjRect().Left(); DrawObj()->Move( Size( nDiff, 0 ) ); diff --git a/sw/source/core/layout/anchoredobject.cxx b/sw/source/core/layout/anchoredobject.cxx index a99256f7673d..62048fbca378 100644 --- a/sw/source/core/layout/anchoredobject.cxx +++ b/sw/source/core/layout/anchoredobject.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: anchoredobject.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.27.212.1 $ * * This file is part of OpenOffice.org. * @@ -276,7 +276,7 @@ void SwAnchoredObject::SetVertPosOrientFrm( const SwLayoutFrm& _rVertPosOrientFr // ============================================================================= // accessors for member // ============================================================================= -const SwTwips SwAnchoredObject::GetLastTopOfLine() const +SwTwips SwAnchoredObject::GetLastTopOfLine() const { return mnLastTopOfLine; } diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx index 1c3572acf948..9d433846f0ad 100644 --- a/sw/source/core/layout/atrfrm.cxx +++ b/sw/source/core/layout/atrfrm.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: atrfrm.cxx,v $ - * $Revision: 1.72 $ + * $Revision: 1.72.144.1 $ * * This file is part of OpenOffice.org. * @@ -2885,7 +2885,7 @@ sal_Bool SwFlyFrmFmt::GetInfo( SfxPoolItem& rInfo ) const @return true, if background color is transparent, but not "no fill" or the transparency of a existing background graphic is set. */ -const sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const +sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const { sal_Bool bReturn = sal_False; @@ -2925,7 +2925,7 @@ const sal_Bool SwFlyFrmFmt::IsBackgroundTransparent() const @return true, if background brush is "inherited" from parent/grandparent */ -const sal_Bool SwFlyFrmFmt::IsBackgroundBrushInherited() const +sal_Bool SwFlyFrmFmt::IsBackgroundBrushInherited() const { sal_Bool bReturn = sal_False; diff --git a/sw/source/core/layout/fly.cxx b/sw/source/core/layout/fly.cxx index 852809b03478..808a5e4257e4 100644 --- a/sw/source/core/layout/fly.cxx +++ b/sw/source/core/layout/fly.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fly.cxx,v $ - * $Revision: 1.92 $ + * $Revision: 1.92.110.1 $ * * This file is part of OpenOffice.org. * @@ -2769,7 +2769,7 @@ const SwRect SwFlyFrm::GetObjBoundRect() const // <-- // --> OD 2006-08-10 #i68520# -const bool SwFlyFrm::_SetObjTop( const SwTwips _nTop ) +bool SwFlyFrm::_SetObjTop( const SwTwips _nTop ) { const bool bChanged( Frm().Pos().Y() != _nTop ); @@ -2777,7 +2777,7 @@ const bool SwFlyFrm::_SetObjTop( const SwTwips _nTop ) return bChanged; } -const bool SwFlyFrm::_SetObjLeft( const SwTwips _nLeft ) +bool SwFlyFrm::_SetObjLeft( const SwTwips _nLeft ) { const bool bChanged( Frm().Pos().X() != _nLeft ); diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 102288288394..5bf6d8d8c83c 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: paintfrm.cxx,v $ - * $Revision: 1.121 $ + * $Revision: 1.121.110.1 $ * * This file is part of OpenOffice.org. * @@ -197,7 +197,7 @@ public: void LockLines( BOOL bLock ); /// OD 13.08.2002 - correct type of function - const USHORT Free() const { return nFree; } + USHORT Free() const { return nFree; } }; class SwSubsRects : public SwLineRects @@ -3295,7 +3295,7 @@ void SwLayoutFrm::Paint( const SwRect& rRect ) const @return true, if background is transparent drawn. */ -const sal_Bool SwFlyFrm::IsBackgroundTransparent() const +sal_Bool SwFlyFrm::IsBackgroundTransparent() const { sal_Bool bBackgroundTransparent = GetFmt()->IsBackgroundTransparent(); if ( !bBackgroundTransparent && @@ -3347,7 +3347,7 @@ const sal_Bool SwFlyFrm::IsBackgroundTransparent() const @return true, if shadow color is transparent. */ -const sal_Bool SwFlyFrm::IsShadowTransparent() const +sal_Bool SwFlyFrm::IsShadowTransparent() const { return GetFmt()->IsShadowTransparent(); }; diff --git a/sw/source/core/text/frmcrsr.cxx b/sw/source/core/text/frmcrsr.cxx index 6c21e5759106..e4844762f39d 100644 --- a/sw/source/core/text/frmcrsr.cxx +++ b/sw/source/core/text/frmcrsr.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: frmcrsr.cxx,v $ - * $Revision: 1.44 $ + * $Revision: 1.44.212.1 $ * * This file is part of OpenOffice.org. * @@ -558,12 +558,12 @@ struct SwFillData const Point& rPt ) : aFrm( rR ), pCMS( pC ), pPos( pP ), rPoint( rPt ), nLineWidth( 0 ), bFirstLine( sal_True ), bInner( sal_False ), bColumn( sal_False ), bEmpty( sal_True ){} - const SwFillMode Mode() const { return pCMS->pFill->eMode; } - const long X() const { return rPoint.X(); } - const long Y() const { return rPoint.Y(); } - const long Left() const { return aFrm.Left(); } - const long Right() const { return aFrm.Right(); } - const long Bottom() const { return aFrm.Bottom(); } + SwFillMode Mode() const { return pCMS->pFill->eMode; } + long X() const { return rPoint.X(); } + long Y() const { return rPoint.Y(); } + long Left() const { return aFrm.Left(); } + long Right() const { return aFrm.Right(); } + long Bottom() const { return aFrm.Bottom(); } SwRect& Frm() { return aFrm; } SwFillCrsrPos &Fill() const { return *pCMS->pFill; } void SetTab( MSHORT nNew ) { pCMS->pFill->nTabCnt = nNew; } diff --git a/sw/source/core/text/frmpaint.cxx b/sw/source/core/text/frmpaint.cxx index 02ef38ffc826..5a88599c6e35 100644 --- a/sw/source/core/text/frmpaint.cxx +++ b/sw/source/core/text/frmpaint.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: frmpaint.cxx,v $ - * $Revision: 1.60 $ + * $Revision: 1.60.68.1 $ * * This file is part of OpenOffice.org. * @@ -78,7 +78,7 @@ namespace numfunc { extern const String& GetDefBulletFontname(); - extern const bool IsDefBulletFontUserDefined(); + extern bool IsDefBulletFontUserDefined(); } // <-- diff --git a/sw/source/core/text/inftxt.cxx b/sw/source/core/text/inftxt.cxx index 0f5162c6d425..2e10a40a1b66 100644 --- a/sw/source/core/text/inftxt.cxx +++ b/sw/source/core/text/inftxt.cxx @@ -110,7 +110,7 @@ using namespace ::com::sun::star::beans; namespace numfunc { extern const String& GetDefBulletFontname(); - extern const bool IsDefBulletFontUserDefined(); + extern bool IsDefBulletFontUserDefined(); } // <-- diff --git a/sw/source/core/text/inftxt.hxx b/sw/source/core/text/inftxt.hxx index 9d29ae3285ca..395fcd15e48a 100644 --- a/sw/source/core/text/inftxt.hxx +++ b/sw/source/core/text/inftxt.hxx @@ -291,7 +291,7 @@ public: inline const SwViewOption &GetOpt() const { return *pOpt; } inline const XubString &GetTxt() const { return *pTxt; } - inline const xub_Unicode GetChar( const xub_StrLen nPos ) const + inline xub_Unicode GetChar( const xub_StrLen nPos ) const { return pTxt->GetChar( nPos ); } inline KSHORT GetTxtHeight() const; @@ -370,13 +370,13 @@ public: // // Feature: Kana Compression // - inline const MSHORT GetKanaIdx() const { return nKanaIdx; } + inline MSHORT GetKanaIdx() const { return nKanaIdx; } inline void ResetKanaIdx(){ nKanaIdx = 0; } inline void SetKanaIdx( MSHORT nNew ) { nKanaIdx = nNew; } inline void IncKanaIdx() { ++nKanaIdx; } inline void SetKanaComp( SvUShorts *pNew ){ pKanaComp = pNew; } inline SvUShorts* GetpKanaComp() const { return pKanaComp; } - inline const USHORT GetKanaComp() const + inline USHORT GetKanaComp() const { return ( pKanaComp && nKanaIdx < pKanaComp->Count() ) ? (*pKanaComp)[nKanaIdx] : 0; } @@ -493,12 +493,12 @@ public: // // STUFF FOR JUSTIFIED ALIGNMENT // - inline const MSHORT GetSpaceIdx() const { return nSpaceIdx; } + inline MSHORT GetSpaceIdx() const { return nSpaceIdx; } inline void ResetSpaceIdx(){nSpaceIdx = 0; } inline void SetSpaceIdx( MSHORT nNew ) { nSpaceIdx = nNew; } inline void IncSpaceIdx() { ++nSpaceIdx; } inline void RemoveFirstSpaceAdd() { pSpaceAdd->erase( pSpaceAdd->begin() ); } - inline const long GetSpaceAdd() const + inline long GetSpaceAdd() const { return ( pSpaceAdd && nSpaceIdx < pSpaceAdd->size() ) ? (*pSpaceAdd)[nSpaceIdx] : 0; } diff --git a/sw/source/core/text/itratr.hxx b/sw/source/core/text/itratr.hxx index 69837629d2db..18b2fec04609 100644 --- a/sw/source/core/text/itratr.hxx +++ b/sw/source/core/text/itratr.hxx @@ -121,7 +121,7 @@ public: inline SwFont *GetFnt() { return pFnt; } inline const SwFont *GetFnt() const { return pFnt; } - inline const BYTE GetPropFont() const { return nPropFont; } + inline BYTE GetPropFont() const { return nPropFont; } inline void SetPropFont( const BYTE nNew ) { nPropFont = nNew; } inline SwAttrHandler& GetAttrHandler() { return aAttrHandler; } diff --git a/sw/source/core/text/itrform2.hxx b/sw/source/core/text/itrform2.hxx index 0425b71718f3..f1bb7e05c099 100644 --- a/sw/source/core/text/itrform2.hxx +++ b/sw/source/core/text/itrform2.hxx @@ -183,19 +183,19 @@ public: inline SwMultiPortion *GetMulti() const { return pMulti; } - inline const sal_Bool IsOnceMore() const { return bOnceMore; } + inline sal_Bool IsOnceMore() const { return bOnceMore; } inline void SetOnceMore( sal_Bool bNew ) { bOnceMore = bNew; } - inline const sal_Bool HasChanges() const { return bChanges; } + inline sal_Bool HasChanges() const { return bChanges; } inline void SetChanges() { bChanges = sal_True; } - inline const sal_Bool HasTruncLines() const { return bTruncLines; } + inline sal_Bool HasTruncLines() const { return bTruncLines; } inline void SetTruncLines( sal_Bool bNew ) { bTruncLines = bNew; } - inline const sal_Bool IsUnclipped() const { return bUnclipped; } + inline sal_Bool IsUnclipped() const { return bUnclipped; } inline void SetUnclipped( sal_Bool bNew ) { bUnclipped = bNew; } - inline const sal_Bool IsFlyInCntBase() const { return bFlyInCntBase; } + inline sal_Bool IsFlyInCntBase() const { return bFlyInCntBase; } inline void SetFlyInCntBase( sal_Bool bNew = sal_True ){ bFlyInCntBase = bNew; } inline SwTxtFormatInfo &GetInfo() diff --git a/sw/source/core/text/porfld.hxx b/sw/source/core/text/porfld.hxx index 3c4b7bd7acb2..1786691ff5bc 100644 --- a/sw/source/core/text/porfld.hxx +++ b/sw/source/core/text/porfld.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: porfld.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.100.1 $ * * This file is part of OpenOffice.org. * @@ -70,7 +70,7 @@ public: void TakeNextOffset( const SwFldPortion* pFld ); void CheckScript( const SwTxtSizeInfo &rInf ); - inline const sal_Bool HasFont() const { return 0 != pFnt; } + inline sal_Bool HasFont() const { return 0 != pFnt; } // --> OD 2008-06-05 #i89179# - made public inline const SwFont *GetFont() const { return pFnt; } // <-- diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx index 535a1db1b6b4..7c98144b05b6 100644 --- a/sw/source/core/text/porfly.hxx +++ b/sw/source/core/text/porfly.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: porfly.hxx,v $ - * $Revision: 1.14 $ + * $Revision: 1.14.214.1 $ * * This file is part of OpenOffice.org. * @@ -49,7 +49,7 @@ class SwFlyPortion : public SwFixPortion public: inline SwFlyPortion( const SwRect &rFlyRect ) : SwFixPortion(rFlyRect), nBlankWidth( 0 ) { SetWhichPor( POR_FLY ); } - inline const KSHORT GetBlankWidth( ) const { return nBlankWidth; } + inline KSHORT GetBlankWidth( ) const { return nBlankWidth; } inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; } virtual void Paint( const SwTxtPaintInfo &rInf ) const; virtual sal_Bool Format( SwTxtFormatInfo &rInf ); @@ -87,9 +87,9 @@ public: inline SwDrawContact *GetDrawContact() { return (SwDrawContact*)pContact; } inline const SwDrawContact* GetDrawContact() const { return (SwDrawContact*)pContact; } - inline const sal_Bool IsDraw() const { return bDraw; } - inline const sal_Bool IsMax() const { return bMax; } - inline const sal_uInt8 GetAlign() const { return nAlign; } + inline sal_Bool IsDraw() const { return bDraw; } + inline sal_Bool IsMax() const { return bMax; } + inline sal_uInt8 GetAlign() const { return nAlign; } inline void SetAlign( sal_uInt8 nNew ) { nAlign = nNew; } inline void SetMax( sal_Bool bNew ) { bMax = bNew; } // OD 29.07.2003 #110978# - use new datatype for parameter diff --git a/sw/source/core/text/porlin.hxx b/sw/source/core/text/porlin.hxx index 83f167d9160a..7777e5968969 100644 --- a/sw/source/core/text/porlin.hxx +++ b/sw/source/core/text/porlin.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: porlin.hxx,v $ - * $Revision: 1.17 $ + * $Revision: 1.17.214.1 $ * * This file is part of OpenOffice.org. * @@ -91,7 +91,7 @@ public: inline SwLinePortion *GetPortion() const { return( pPortion ); } inline SwLinePortion &operator=(const SwLinePortion &rPortion); inline sal_Bool operator==( const SwLinePortion &rPortion ) const; - inline const xub_StrLen GetLen() const { return nLineLength; } + inline xub_StrLen GetLen() const { return nLineLength; } inline void SetLen( const xub_StrLen nLen ) { nLineLength = nLen; } inline void SetPortion( SwLinePortion *pNew ){ pPortion = pNew; } inline KSHORT &GetAscent() { return nAscent; } @@ -114,56 +114,56 @@ public: virtual SwLinePortion *Compress(); inline void SetWhichPor( const MSHORT nNew ) { nWhichPor = nNew; } - inline const MSHORT GetWhichPor( ) const { return nWhichPor; } + inline MSHORT GetWhichPor( ) const { return nWhichPor; } // Gruppenabfragen: - inline const sal_Bool InTxtGrp( ) const { return nWhichPor & PORGRP_TXT ? sal_True : sal_False; } - inline const sal_Bool InGlueGrp( ) const { return nWhichPor & PORGRP_GLUE ? sal_True : sal_False;} - inline const sal_Bool InTabGrp( ) const { return nWhichPor & PORGRP_TAB ? sal_True : sal_False; } - inline const sal_Bool InHyphGrp( ) const { return nWhichPor & PORGRP_HYPH ? sal_True : sal_False;} - inline const sal_Bool InNumberGrp( )const { return nWhichPor & PORGRP_NUMBER ? sal_True : sal_False;} - inline const sal_Bool InFixGrp( ) const { return nWhichPor & PORGRP_FIX ? sal_True : sal_False; } - inline const sal_Bool InFldGrp( ) const { return nWhichPor & PORGRP_FLD ? sal_True : sal_False; } - inline const sal_Bool InToxRefGrp( ) const { return nWhichPor & PORGRP_TOXREF ? sal_True : sal_False; } - inline const sal_Bool InToxRefOrFldGrp( ) const { return nWhichPor & + inline sal_Bool InTxtGrp( ) const { return nWhichPor & PORGRP_TXT ? sal_True : sal_False; } + inline sal_Bool InGlueGrp( ) const { return nWhichPor & PORGRP_GLUE ? sal_True : sal_False;} + inline sal_Bool InTabGrp( ) const { return nWhichPor & PORGRP_TAB ? sal_True : sal_False; } + inline sal_Bool InHyphGrp( ) const { return nWhichPor & PORGRP_HYPH ? sal_True : sal_False;} + inline sal_Bool InNumberGrp( )const { return nWhichPor & PORGRP_NUMBER ? sal_True : sal_False;} + inline sal_Bool InFixGrp( ) const { return nWhichPor & PORGRP_FIX ? sal_True : sal_False; } + inline sal_Bool InFldGrp( ) const { return nWhichPor & PORGRP_FLD ? sal_True : sal_False; } + inline sal_Bool InToxRefGrp( ) const { return nWhichPor & PORGRP_TOXREF ? sal_True : sal_False; } + inline sal_Bool InToxRefOrFldGrp( ) const { return nWhichPor & ( PORGRP_FLD | PORGRP_TOXREF ) ? sal_True : sal_False; } - inline const sal_Bool InExpGrp( ) const { return nWhichPor & PORGRP_EXP ? sal_True : sal_False; } - inline const sal_Bool InTabnLftGrp( ) const + inline sal_Bool InExpGrp( ) const { return nWhichPor & PORGRP_EXP ? sal_True : sal_False; } + inline sal_Bool InTabnLftGrp( ) const { return nWhichPor & PORGRP_TABNOTLFT ? sal_True : sal_False; } - inline const sal_Bool InFixMargGrp( )const + inline sal_Bool InFixMargGrp( )const { return nWhichPor & PORGRP_FIXMARG ? sal_True : sal_False; } - inline const sal_Bool InSpaceGrp( )const + inline sal_Bool InSpaceGrp( )const { return InTxtGrp() || IsMultiPortion(); } // Individuelle Abfragen: - inline const sal_Bool IsGrfNumPortion( )const{ return nWhichPor == POR_GRFNUM; } - inline const sal_Bool IsFlyCntPortion( )const{ return nWhichPor == POR_FLYCNT; } - inline const sal_Bool IsBlankPortion( ) const{ return nWhichPor == POR_BLANK; } - inline const sal_Bool IsBreakPortion( ) const{ return nWhichPor == POR_BRK; } - inline const sal_Bool IsErgoSumPortion()const{ return nWhichPor == POR_ERGOSUM;} - inline const sal_Bool IsQuoVadisPortion()const{ return nWhichPor==POR_QUOVADIS;} - inline const sal_Bool IsTabCntPortion( )const{ return nWhichPor==POR_TABCENTER;} - inline const sal_Bool IsTabDecimalPortion() const { return nWhichPor == POR_TABDECIMAL;} - inline const sal_Bool IsTabLeftPortion()const{ return nWhichPor == POR_TABLEFT;} - inline const sal_Bool IsFtnNumPortion( )const{ return nWhichPor == POR_FTNNUM; } - inline const sal_Bool IsFtnPortion( ) const{ return nWhichPor == POR_FTN; } - inline const sal_Bool IsTmpEndPortion( )const{ return nWhichPor == POR_TMPEND; } - inline const sal_Bool IsDropPortion( ) const{ return nWhichPor == POR_DROP; } - inline const sal_Bool IsLayPortion( ) const{ return nWhichPor == POR_LAY; } - inline const sal_Bool IsParaPortion( ) const{ return nWhichPor == POR_PARA; } - inline const sal_Bool IsMarginPortion( )const{ return nWhichPor == POR_MARGIN; } - inline const sal_Bool IsFlyPortion( ) const{ return nWhichPor == POR_FLY; } - inline const sal_Bool IsHolePortion( ) const{ return nWhichPor == POR_HOLE; } - inline const sal_Bool IsSoftHyphPortion()const{ return nWhichPor==POR_SOFTHYPH;} - inline const sal_Bool IsPostItsPortion()const{ return nWhichPor == POR_POSTITS;} - inline const sal_Bool IsCombinedPortion()const{ return nWhichPor==POR_COMBINED;} - inline const sal_Bool IsTextPortion( ) const{ return nWhichPor == POR_TXT; } - inline const sal_Bool IsURLPortion( ) const{ return nWhichPor == POR_URL; } - inline const sal_Bool IsHangingPortion( ) const{ return nWhichPor == POR_HNG; } - inline const sal_Bool IsKernPortion( ) const{ return nWhichPor == POR_KERN; } - inline const sal_Bool IsArrowPortion( ) const{ return nWhichPor == POR_ARROW; } - inline const sal_Bool IsMultiPortion( ) const{ return nWhichPor == POR_MULTI; } - inline const sal_Bool IsNumberPortion( ) const{ return nWhichPor == POR_NUMBER; } // #i23726# - inline const sal_Bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; } + inline sal_Bool IsGrfNumPortion( )const{ return nWhichPor == POR_GRFNUM; } + inline sal_Bool IsFlyCntPortion( )const{ return nWhichPor == POR_FLYCNT; } + inline sal_Bool IsBlankPortion( ) const{ return nWhichPor == POR_BLANK; } + inline sal_Bool IsBreakPortion( ) const{ return nWhichPor == POR_BRK; } + inline sal_Bool IsErgoSumPortion()const{ return nWhichPor == POR_ERGOSUM;} + inline sal_Bool IsQuoVadisPortion()const{ return nWhichPor==POR_QUOVADIS;} + inline sal_Bool IsTabCntPortion( )const{ return nWhichPor==POR_TABCENTER;} + inline sal_Bool IsTabDecimalPortion() const { return nWhichPor == POR_TABDECIMAL;} + inline sal_Bool IsTabLeftPortion()const{ return nWhichPor == POR_TABLEFT;} + inline sal_Bool IsFtnNumPortion( )const{ return nWhichPor == POR_FTNNUM; } + inline sal_Bool IsFtnPortion( ) const{ return nWhichPor == POR_FTN; } + inline sal_Bool IsTmpEndPortion( )const{ return nWhichPor == POR_TMPEND; } + inline sal_Bool IsDropPortion( ) const{ return nWhichPor == POR_DROP; } + inline sal_Bool IsLayPortion( ) const{ return nWhichPor == POR_LAY; } + inline sal_Bool IsParaPortion( ) const{ return nWhichPor == POR_PARA; } + inline sal_Bool IsMarginPortion( )const{ return nWhichPor == POR_MARGIN; } + inline sal_Bool IsFlyPortion( ) const{ return nWhichPor == POR_FLY; } + inline sal_Bool IsHolePortion( ) const{ return nWhichPor == POR_HOLE; } + inline sal_Bool IsSoftHyphPortion()const{ return nWhichPor==POR_SOFTHYPH;} + inline sal_Bool IsPostItsPortion()const{ return nWhichPor == POR_POSTITS;} + inline sal_Bool IsCombinedPortion()const{ return nWhichPor==POR_COMBINED;} + inline sal_Bool IsTextPortion( ) const{ return nWhichPor == POR_TXT; } + inline sal_Bool IsURLPortion( ) const{ return nWhichPor == POR_URL; } + inline sal_Bool IsHangingPortion( ) const{ return nWhichPor == POR_HNG; } + inline sal_Bool IsKernPortion( ) const{ return nWhichPor == POR_KERN; } + inline sal_Bool IsArrowPortion( ) const{ return nWhichPor == POR_ARROW; } + inline sal_Bool IsMultiPortion( ) const{ return nWhichPor == POR_MULTI; } + inline sal_Bool IsNumberPortion( ) const{ return nWhichPor == POR_NUMBER; } // #i23726# + inline sal_Bool IsControlCharPortion() const { return nWhichPor == POR_CONTROLCHAR; } // Positionierung SwLinePortion *FindPrevPortion( const SwLinePortion *pRoot ); diff --git a/sw/source/core/text/portxt.hxx b/sw/source/core/text/portxt.hxx index c1735784fda8..bbb682aa5faf 100644 --- a/sw/source/core/text/portxt.hxx +++ b/sw/source/core/text/portxt.hxx @@ -82,7 +82,7 @@ class SwHolePortion : public SwLinePortion KSHORT nBlankWidth; public: SwHolePortion( const SwTxtPortion &rPor ); - inline const KSHORT GetBlankWidth( ) const { return nBlankWidth; } + inline KSHORT GetBlankWidth( ) const { return nBlankWidth; } inline void SetBlankWidth( const KSHORT nNew ) { nBlankWidth = nNew; } virtual SwLinePortion *Compress(); virtual sal_Bool Format( SwTxtFormatInfo &rInf ); diff --git a/sw/source/core/text/widorp.cxx b/sw/source/core/text/widorp.cxx index 6dd19f636ab3..9479d332c0d1 100644 --- a/sw/source/core/text/widorp.cxx +++ b/sw/source/core/text/widorp.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: widorp.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.214.1 $ * * This file is part of OpenOffice.org. * @@ -127,7 +127,7 @@ SwTxtFrmBreak::SwTxtFrmBreak( SwTxtFrm *pNewFrm, const SwTwips nRst ) * naechste Seite rutscht. */ -const sal_Bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const +sal_Bool SwTxtFrmBreak::IsInside( SwTxtMargin &rLine ) const { sal_Bool bFit = sal_False; diff --git a/sw/source/core/text/widorp.hxx b/sw/source/core/text/widorp.hxx index 802008792776..3607c5e31eda 100644 --- a/sw/source/core/text/widorp.hxx +++ b/sw/source/core/text/widorp.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: widorp.hxx,v $ - * $Revision: 1.8 $ + * $Revision: 1.8.214.1 $ * * This file is part of OpenOffice.org. * @@ -47,15 +47,15 @@ public: SwTxtFrmBreak( SwTxtFrm *pFrm, const SwTwips nRst = 0 ); sal_Bool IsBreakNow( SwTxtMargin &rLine ); - const sal_Bool IsBroken() const { return bBreak; } - const sal_Bool IsKeepAlways() const { return bKeep; } - void Keep() { bKeep = sal_True; } - void Break() { bKeep = sal_False; bBreak = sal_True; } + sal_Bool IsBroken() const { return bBreak; } + sal_Bool IsKeepAlways() const { return bKeep; } + void Keep() { bKeep = sal_True; } + void Break() { bKeep = sal_False; bBreak = sal_True; } inline sal_Bool GetKeep() const { return bKeep; } inline void SetKeep( const sal_Bool bNew ) { bKeep = bNew; } - const sal_Bool IsInside( SwTxtMargin &rLine ) const; + sal_Bool IsInside( SwTxtMargin &rLine ) const; // Um Sonderfaelle mit Ftn behandeln zu koennen. // Mit SetRstHeight wird dem SwTxtFrmBreak die Resthoehe eingestellt, @@ -78,9 +78,9 @@ public: WidowsAndOrphans( SwTxtFrm *pFrm, const SwTwips nRst = 0, sal_Bool bCheckKeep = sal_True ); sal_Bool FindWidows( SwTxtFrm *pFrm, SwTxtMargin &rLine ); - const MSHORT GetWidowsLines() const + MSHORT GetWidowsLines() const { return nWidLines; } - const MSHORT GetOrphansLines() const + MSHORT GetOrphansLines() const { return nOrphLines; } void ClrOrphLines(){ nOrphLines = 0; } diff --git a/sw/source/core/txtnode/fntcap.cxx b/sw/source/core/txtnode/fntcap.cxx index f4cf48a1edc9..b611299957f7 100644 --- a/sw/source/core/txtnode/fntcap.cxx +++ b/sw/source/core/txtnode/fntcap.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fntcap.cxx,v $ - * $Revision: 1.27 $ + * $Revision: 1.27.214.1 $ * * This file is part of OpenOffice.org. * @@ -215,7 +215,7 @@ public: { } virtual void Init( SwFntObj *pUpperFont, SwFntObj *pLowerFont ); virtual void Do(); - const xub_StrLen GetBreak() const { return nBreak; } + xub_StrLen GetBreak() const { return nBreak; } }; void SwDoGetCapitalBreak::Init( SwFntObj *, SwFntObj * ) diff --git a/sw/source/core/view/pagepreviewlayout.cxx b/sw/source/core/view/pagepreviewlayout.cxx index 00fe3b1674d7..b6a092550369 100644 --- a/sw/source/core/view/pagepreviewlayout.cxx +++ b/sw/source/core/view/pagepreviewlayout.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: pagepreviewlayout.cxx,v $ - * $Revision: 1.15 $ + * $Revision: 1.15.214.1 $ * * This file is part of OpenOffice.org. * @@ -1274,7 +1274,7 @@ void SwPagePreviewLayout::Repaint( const Rectangle _aInvalidCoreRect ) const @author OD */ -const void SwPagePreviewLayout::_PaintSelectMarkAtPage( +void SwPagePreviewLayout::_PaintSelectMarkAtPage( const PrevwPage* _aSelectedPrevwPage ) const { OutputDevice* pOutputDev = mrParentViewShell.GetOut(); diff --git a/sw/source/core/view/vnew.cxx b/sw/source/core/view/vnew.cxx index ddc3b06afe92..a270c6f78492 100644 --- a/sw/source/core/view/vnew.cxx +++ b/sw/source/core/view/vnew.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: vnew.cxx,v $ - * $Revision: 1.32 $ + * $Revision: 1.31.210.2 $ * * This file is part of OpenOffice.org. * @@ -390,7 +390,7 @@ ViewShell::~ViewShell() delete pAccOptions; } -const BOOL ViewShell::HasDrawView() const +BOOL ViewShell::HasDrawView() const { return Imp()->HasDrawView(); } diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index f5e8c92bdf2b..e5cbf801a2d4 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: svxcss1.cxx,v $ - * $Revision: 1.20 $ + * $Revision: 1.20.214.1 $ * * This file is part of OpenOffice.org. * @@ -3068,7 +3068,7 @@ static void ParseCSS1_page_break_inside( const CSS1Expression *pExpr, SvxCSS1PropertyInfo& /*rPropInfo*/, const SvxCSS1Parser& /*rParser*/ ) { - SvxCSS1PageBreak eBreak; + SvxCSS1PageBreak eBreak(SVX_CSS1_PBREAK_NONE); ParseCSS1_page_break_xxx( pExpr, eBreak ); BOOL bSetSplit = FALSE, bSplit = TRUE; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index dde41c1da9bb..de9c989fb154 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: swhtml.cxx,v $ - * $Revision: 1.51 $ + * $Revision: 1.51.98.1 $ * * This file is part of OpenOffice.org. * @@ -4964,7 +4964,7 @@ USHORT SwHTMLParser::ToTwips( USHORT nPixel ) const return nPixel; } -const SwTwips SwHTMLParser::GetCurrentBrowseWidth() +SwTwips SwHTMLParser::GetCurrentBrowseWidth() { SwTwips nWidth = SwHTMLTableLayout::GetBrowseWidth( *pDoc ); if( nWidth ) diff --git a/sw/source/filter/html/swhtml.hxx b/sw/source/filter/html/swhtml.hxx index 69f205b91fa8..0ece396670d4 100644 --- a/sw/source/filter/html/swhtml.hxx +++ b/sw/source/filter/html/swhtml.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: swhtml.hxx,v $ - * $Revision: 1.18 $ + * $Revision: 1.18.100.1 $ * * This file is part of OpenOffice.org. * @@ -566,7 +566,7 @@ class SwHTMLParser : public SfxHTMLParser, public SwClient const SwFmtColl *GetCurrFmtColl() const; - const SwTwips GetCurrentBrowseWidth() /* const */; + SwTwips GetCurrentBrowseWidth(); SwHTMLNumRuleInfo& GetNumInfo() { return *pNumRuleInfo; } // --> OD 2008-04-02 #refactorlists# diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 60299f3d844c..409c0bb63254 100644 --- a/sw/source/filter/ww8/ww8par2.cxx +++ b/sw/source/filter/ww8/ww8par2.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ww8par2.cxx,v $ - * $Revision: 1.146 $ + * $Revision: 1.145.76.2 $ * * This file is part of OpenOffice.org. * diff --git a/sw/source/filter/ww8/ww8par2.hxx b/sw/source/filter/ww8/ww8par2.hxx index a2c12d9589ba..1d26e384a61c 100644 --- a/sw/source/filter/ww8/ww8par2.hxx +++ b/sw/source/filter/ww8/ww8par2.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: ww8par2.hxx,v $ - * $Revision: 1.48 $ + * $Revision: 1.47.214.1 $ * * This file is part of OpenOffice.org. * diff --git a/sw/source/filter/ww8/ww8scan.cxx b/sw/source/filter/ww8/ww8scan.cxx index b69fbf388ff9..fac1f62da8ed 100644 --- a/sw/source/filter/ww8/ww8scan.cxx +++ b/sw/source/filter/ww8/ww8scan.cxx @@ -3271,7 +3271,7 @@ void WW8PLCFx_Cp_FKP::GetSprms(WW8PLCFxDesc* p) character is at the FKP FC minus 1. */ WW8_CP nCpStart, nCpEnd; - void* pData=0; + void* pData=NULL; pPieceIter->Get(nCpStart, nCpEnd, pData); WW8_FC nLimitFC = SVBT32ToUInt32( ((WW8_PCD*)pData)->fc ); diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx index 52c1d9f21c36..1531df836622 100644 --- a/sw/source/ui/fldui/fldfunc.cxx +++ b/sw/source/ui/fldui/fldfunc.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fldfunc.cxx,v $ - * $Revision: 1.22 $ + * $Revision: 1.22.214.1 $ * * This file is part of OpenOffice.org. * @@ -578,7 +578,7 @@ IMPL_LINK( SwFldFuncPage, MacroHdl, Button *, pBtn ) Application::SetDefDialogParent( pBtn ); String sMacro(TurnMacroString(aNameED.GetText())); - while (sMacro.SearchAndReplace('.', ';') != STRING_NOTFOUND); + while (sMacro.SearchAndReplace('.', ';') != STRING_NOTFOUND) ; if (GetFldMgr().ChooseMacro(sMacro)) UpdateSubType(); diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 8046da2a6ad3..5f3c1bc4fd72 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fldref.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.214.1 $ * * This file is part of OpenOffice.org. * @@ -179,7 +179,7 @@ const SwTxtNode* SwFldRefPage::GetSavedSelectedTxtNode() const return mpSavedSelectedTxtNode; } -const sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const +sal_uInt16 SwFldRefPage::GetSavedSelectedPos() const { return mnSavedSelectedPos; } diff --git a/sw/source/ui/fldui/fldref.hxx b/sw/source/ui/fldui/fldref.hxx index de327a48010d..81db5669c2f7 100644 --- a/sw/source/ui/fldui/fldref.hxx +++ b/sw/source/ui/fldui/fldref.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fldref.hxx,v $ - * $Revision: 1.4 $ + * $Revision: 1.4.214.1 $ * * This file is part of OpenOffice.org. * @@ -93,7 +93,7 @@ class SwFldRefPage : public SwFldPage // --> OD 2007-12-05 #i83479# void SaveSelectedTxtNode(); const SwTxtNode* GetSavedSelectedTxtNode() const; - const sal_uInt16 GetSavedSelectedPos() const; + sal_uInt16 GetSavedSelectedPos() const; // <-- protected: diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx index 3e44156a80ac..e174ef56ffcf 100644 --- a/sw/source/ui/inc/fldmgr.hxx +++ b/sw/source/ui/inc/fldmgr.hxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: fldmgr.hxx,v $ - * $Revision: 1.16 $ + * $Revision: 1.16.214.1 $ * * This file is part of OpenOffice.org. * @@ -154,7 +154,7 @@ public: inline const String& GetCurFldPar1() const; inline const String& GetCurFldPar2() const; - inline const ULONG GetCurFldFmt() const; + inline ULONG GetCurFldFmt() const; // Ein Feld ermitteln SwField* GetCurFld(); @@ -229,7 +229,7 @@ inline const String& SwFldMgr::GetCurFldPar1() const inline const String& SwFldMgr::GetCurFldPar2() const { return aCurPar2; } -inline const ULONG SwFldMgr::GetCurFldFmt() const +inline ULONG SwFldMgr::GetCurFldFmt() const { return nCurFmt; } -- cgit v1.2.3