diff options
| author | obo <obo@openoffice.org> | 2011-03-16 13:45:30 +0100 |
|---|---|---|
| committer | obo <obo@openoffice.org> | 2011-03-16 13:45:30 +0100 |
| commit | f6c764706cd411d3353666da91b334a899a12154 (patch) | |
| tree | 3b9395427184c0a706e21f94ecb82a6966deaba6 /sw/inc | |
| parent | 5b2cda248a43fa7ed094271b5f553ff6e13d45aa (diff) | |
masterfix DEV300: #i10000# build breaker in sw
Notes
Notes:
split repo tag: writer_ooo/DEV300_m103
Diffstat (limited to 'sw/inc')
| -rw-r--r-- | sw/inc/editsh.hxx | 9 | ||||
| -rw-r--r-- | sw/inc/viewsh.hxx | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx index d75839f5736c..43992dc7b359 100644 --- a/sw/inc/editsh.hxx +++ b/sw/inc/editsh.hxx @@ -564,7 +564,7 @@ public: sal_Bool HasOtherCnt() const; // gibt es Rahmen, Fussnoten, ... /* Anwenden der ViewOptions mit Start-/EndAction */ - inline void ApplyViewOptions( const SwViewOption &rOpt ); + virtual void ApplyViewOptions( const SwViewOption &rOpt ); // Text innerhalb der Selektion erfragen // Returnwert liefert sal_False, wenn der selektierte Bereich @@ -940,13 +940,6 @@ private: const SwEditShell &operator=(const SwEditShell &); }; -inline void SwEditShell::ApplyViewOptions( const SwViewOption &rOpt ) -{ - SwCrsrShell::StartAction(); - ViewShell::ApplyViewOptions( rOpt ); - SwEditShell::EndAction(); -} - inline const sfx2::LinkManager& SwEditShell::GetLinkManager() const { return ((SwEditShell*)this)->GetLinkManager(); } diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 647a8f7f2048..2daf85092b40 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -439,7 +439,7 @@ public: void LayoutIdle(); inline const SwViewOption *GetViewOptions() const { return pOpt; } - void ApplyViewOptions( const SwViewOption &rOpt ); + virtual void ApplyViewOptions( const SwViewOption &rOpt ); void SetUIOptions( const SwViewOption &rOpt ); void SetReadonlyOption(sal_Bool bSet); // Readonly-Bit d. ViewOptions setzen void SetPDFExportOption(sal_Bool bSet); // set/reset PDF export mode |