diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-12-22 12:45:53 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-12-22 12:45:53 +0100 |
| commit | e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc (patch) | |
| tree | 373386268af66194acb407856bb65f541579a25b /sw/inc/unotxdoc.hxx | |
| parent | CWS swlayoutrefactoring: resync to m96, no conflict resolution (diff) | |
| download | core-e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc.tar.gz core-e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc.zip | |
CWS swlayoutrefactoring: conflict resolution after resync to DEV300_m96
Diffstat (limited to 'sw/inc/unotxdoc.hxx')
| -rw-r--r-- | sw/inc/unotxdoc.hxx | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx index 1da33a545874..df3d700e67d6 100644 --- a/sw/inc/unotxdoc.hxx +++ b/sw/inc/unotxdoc.hxx @@ -129,13 +129,7 @@ class SfxViewFrame; class SwPrintUIOptions; class SwPrintData; class SwRenderData; -<<<<<<< local -class SwPrtOptions; class ViewShell; -======= -class SwWrtShell; ->>>>>>> other - typedef UnoActionContext* UnoActionContextPtr; SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4) @@ -609,17 +603,8 @@ class SwViewOptionAdjust_Impl public: SwViewOptionAdjust_Impl( ViewShell& rSh, const SwViewOption &rViewOptions ); ~SwViewOptionAdjust_Impl(); -<<<<<<< local - - void AdjustViewOptions( const SwPrtOptions *pPrtOptions ); - + void AdjustViewOptions( SwPrintData const* const pPrtOptions ); bool checkShell( const ViewShell& rCompare ) const -======= - - void AdjustViewOptions( SwPrintData const*const pPrtOptions ); - - bool checkShell( const SwWrtShell& rCompare ) const ->>>>>>> other { return &rCompare == &m_rShell; } }; |