diff options
| -rwxr-xr-x | sd/source/ui/inc/PaneDockingWindow.hxx | 4 | ||||
| -rwxr-xr-x | sd/source/ui/inc/framework/ViewShellWrapper.hxx | 4 |
2 files changed, 1 insertions, 7 deletions
diff --git a/sd/source/ui/inc/PaneDockingWindow.hxx b/sd/source/ui/inc/PaneDockingWindow.hxx index fdae7280d439..a335c327de79 100755 --- a/sd/source/ui/inc/PaneDockingWindow.hxx +++ b/sd/source/ui/inc/PaneDockingWindow.hxx @@ -65,8 +65,7 @@ public: virtual ~PaneDockingWindow (void); virtual void StateChanged( StateChangedType nType ); -<<<<<<< local -======= + virtual void DataChanged( const DataChangedEvent& rDCEvt ); /** Initializing the title tool box either creates a new title tool box @@ -126,7 +125,6 @@ private: last invocation the size of the docking window has changed. */ void Layout (void); ->>>>>>> other }; } // end of namespace ::sd diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 96e59d484270..12483f462d5e 100755 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -89,10 +89,6 @@ public: */ ::boost::shared_ptr<ViewShell> GetViewShell (void); -<<<<<<< local -======= - ->>>>>>> other // XUnoTunnel virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId) |