diff options
| author | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2011-02-09 15:55:27 +0100 |
| commit | 749c27fafbe1e57b7ba25f759272c02de20469e0 (patch) | |
| tree | d6bc9b5fe3a595ee6e0edd5ef07b042bd61992f0 /sw/source/core/inc/UndoAttribute.hxx | |
| parent | 53b8f0865ff2e59cb71eaf4c1bdbc829238fde6f (diff) | |
CWS swlayoutrefactoring: fix merge conflicts
Diffstat (limited to 'sw/source/core/inc/UndoAttribute.hxx')
| -rw-r--r-- | sw/source/core/inc/UndoAttribute.hxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/core/inc/UndoAttribute.hxx b/sw/source/core/inc/UndoAttribute.hxx index 84423605b5d0..849603e2b534 100644 --- a/sw/source/core/inc/UndoAttribute.hxx +++ b/sw/source/core/inc/UndoAttribute.hxx @@ -192,7 +192,7 @@ class SwUndoFmtAttrHelper : public SwClient public: SwUndoFmtAttrHelper( SwFmt& rFmt, bool bSaveDrawPt = true ); - virtual void Modify( SfxPoolItem*, SfxPoolItem* ); + virtual void Modify( const SfxPoolItem*, const SfxPoolItem* ); SwUndoFmtAttr* GetUndo() const { return m_pUndo.get(); } // release the undo object (so it is not deleted here), and return it |