diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-12-21 20:49:11 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-12-21 20:49:11 +0100 |
| commit | af69eeaeae90037f27e7a8a10fce1b4899d5b305 (patch) | |
| tree | e4e2496dbd6bd7afe45d9eb3482ce02f9c291310 /sw/source/core/doc/notxtfrm.cxx | |
| parent | 09d6c9a395b8849e3e09c694282a1446b786bf80 (diff) | |
| parent | 42c3881914531e6d81d6fb05bdc7b308db98146c (diff) | |
CWS swlayoutrefactoring: resync to m96, no conflict resolution
Diffstat (limited to 'sw/source/core/doc/notxtfrm.cxx')
| -rw-r--r-- | sw/source/core/doc/notxtfrm.cxx | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sw/source/core/doc/notxtfrm.cxx b/sw/source/core/doc/notxtfrm.cxx index 5f5e71e16a0d..7c70418191c5 100644 --- a/sw/source/core/doc/notxtfrm.cxx +++ b/sw/source/core/doc/notxtfrm.cxx @@ -71,9 +71,7 @@ #include <poolfmt.hxx> #include <mdiexp.hxx> #include <swwait.hxx> -#ifndef _COMCORE_HRC #include <comcore.hrc> -#endif #include <accessibilityoptions.hxx> #include <com/sun/star/embed/EmbedMisc.hpp> #include <com/sun/star/embed/EmbedStates.hpp> @@ -266,7 +264,7 @@ void lcl_ClearArea( const SwFrm &rFrm, |* *************************************************************************/ -void SwNoTxtFrm::Paint( const SwRect &rRect, const SwPrtOptions * /*pPrintData*/ ) const +void SwNoTxtFrm::Paint(SwRect const& rRect, SwPrintData const*const) const { if ( Frm().IsEmpty() ) return; |