Commits

Anonymous committed baaf8f7

accfixes2: Fixed merge conflicts

  • Participants
  • Parent commits 64feb95

Comments (0)

Files changed (1)

File svtools/inc/svtools/table/tablerenderer.hxx

 
             There are two flags specifying whether the to-be-painted area is part of the column
             and/or row header area.
-            <ul><li>If both are <sal_True/>, the intersection of both areas is to be painted.</li>
-                <li>If ->_bIsColHeaderArea is <sal_True/> and ->_bIsRowHeaderArea is <sal_False/>,
+            <ul><li>If both are <TRUE/>, the intersection of both areas is to be painted.</li>
+                <li>If ->_bIsColHeaderArea is <TRUE/> and ->_bIsRowHeaderArea is <sal_False/>,
                     then ->_rArea denotes the column header area <em>excluding</em> the
                     intersection between row and column header area.</li>
                 <li>Equivalently for ->_bIsColHeaderArea being <sal_False/> and ->_bIsRowHeaderArea
-                    being <sal_True/></li>
+                    being <TRUE/></li>
             </ul>
             Note that it's not possible for both ->_bIsColHeaderArea and ->_bIsRowHeaderArea
             to be <sal_False/> at the same time.
             @param _rArea
                 the area to paint into
             @param _bIsColHeaderArea
-                <sal_True/> if and only if ->_rArea is part of the column header area.
+                <TRUE/> if and only if ->_rArea is part of the column header area.
             @param _bIsRowHeaderArea
-                <sal_True/> if and only if ->_rArea is part of the row header area.
+                <TRUE/> if and only if ->_rArea is part of the row header area.
             @param _rStyle
                 the style to be used for drawing
         */
             @param _nCol
                 the index of the column to paint
             @param _bActive
-                <sal_True/> if and only if the column whose column is to be painted
+                <TRUE/> if and only if the column whose column is to be painted
                 contains the active cell.
             @param _bSelected
-                <sal_True/> if and only if the column whose column is to be painted
+                <TRUE/> if and only if the column whose column is to be painted
                 is selected currently.
             @param _rDevice
                 denotes the device to paint onto
                 cell-independent content of this row.
 
             @param _bActive
-                <sal_True/> if and only if the row to be painted contains the
+                <TRUE/> if and only if the row to be painted contains the
                 currently active cell.
             @param _bSelected
-                <sal_True/> if and only if the row to be prepared is
+                <TRUE/> if and only if the row to be prepared is
                 selected currently.
             @param _rDevice
                 denotes the device to paint onto
             ->PrepareRow.
 
             @param _bActive
-                <sal_True/> if and only if the row to be painted contains the
+                <TRUE/> if and only if the row to be painted contains the
                 currently active cell.
                 <br/>
                 Note that this flag is equal to the respective flag in the
                 previous ->PrepareRow call, it's passed here for convinience
                 only.
             @param _bSelected
-                <sal_True/> if and only if the row whose header cell is to be
+                <TRUE/> if and only if the row whose header cell is to be
                 painted is selected currently.
                 <br/>
                 Note that this flag is equal to the respective flag in the
             ->PrepareRow.
 
             @param _bSelected
-                <sal_True/> if and only if the cell to be painted is
+                <TRUE/> if and only if the cell to be painted is
                 selected currently. This is the case if either
                 the row or the column of the cell is currently selected.
                 <br/>
                 previous ->PrepareRow call, it's passed here for convinience
                 only.
             @param _bActive
-                <sal_True/> if the cell is currently active.
+                <TRUE/> if the cell is currently active.
                 <br/>
                 Note that this flag is equal to the respective flag in the
                 previous ->PrepareRow call, it's passed here for convinience
                             OutputDevice& _rDevice, const Rectangle& _rArea,
 			                const StyleSettings& _rStyle ) = 0;
         
-	/** paints a certain cell
-
-            The row to be painted is denoted by the most recent call to
-            ->PrepareRow.
-
-            @param _bSelected
-                <sal_True/> if and only if the cell to be painted is
-                selected currently. This is the case if either
-                the row or the column of the cell is currently selected.
-                <br/>
-                Note that this flag is equal to the respective flag in the
-                previous ->PrepareRow call, it's passed here for convinience
-                only.
-            @param _bActive
-                <sal_True/> if the cell is currently active.
-                <br/>
-                Note that this flag is equal to the respective flag in the
-                previous ->PrepareRow call, it's passed here for convinience
-                only.
-            @param _rDevice
-                denotes the device to paint onto
-            @param _rArea
-                the are into which the cell should be painted
-            @param _rStyle
-                the style to be used for drawing
-			@param _rText
-				the content of the cell
-        */
-        virtual void    PaintCellString( ColPos _nColumn,
-                            bool _bActive, bool _bSelected,
-                            OutputDevice& _rDevice, const Rectangle& _rArea,
-			    const StyleSettings& _rStyle, rtl::OUString& _rText ) = 0;
-
         /** draws a cell cursor in the given rectangle
 
             The cell cursor is used to indicate the active/current cell