Anonymous avatar Anonymous committed 41d760a

masterfix: #i10000# remove conflict marks

Comments (0)

Files changed (2)

sd/source/ui/inc/PaneDockingWindow.hxx

     virtual ~PaneDockingWindow (void);
 
 	virtual void StateChanged( StateChangedType nType );
-<<<<<<< local
-=======
-	virtual void DataChanged( const DataChangedEvent& rDCEvt );
+	
+    virtual void DataChanged( const DataChangedEvent& rDCEvt );
 
     /** Initializing the title tool box either creates a new title tool box
         or clears all items from an existing one.  A closer is added as only
         last invocation the size of the docking window has changed.
     */
     void Layout (void);
->>>>>>> other
 };
 
 } // end of namespace ::sd

sd/source/ui/inc/framework/ViewShellWrapper.hxx

     */
     ::boost::shared_ptr<ViewShell> GetViewShell (void);
 
-<<<<<<< local
-=======
-
->>>>>>> other
     // XUnoTunnel
 
     virtual sal_Int64 SAL_CALL getSomething (const com::sun::star::uno::Sequence<sal_Int8>& rId)
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.