diff options
| author | Christian Lippka <christian.lippka@sun.com> | 2010-06-14 18:49:32 +0200 |
|---|---|---|
| committer | Christian Lippka <christian.lippka@sun.com> | 2010-06-14 18:49:32 +0200 |
| commit | defcfcf416a0d25c104e8f492e14049814db51e2 (patch) | |
| tree | 9ab15168771fa958b32a58b4656041343b9b7732 /sd/source/ui/inc/framework/ViewShellWrapper.hxx | |
| parent | f3b2db1efb379596f0269e439a35b5575b616b2c (diff) | |
| parent | f7a274b959bef49abf7f3ff45137d03c041f4a6d (diff) | |
cws impress190: rebase m82
Diffstat (limited to 'sd/source/ui/inc/framework/ViewShellWrapper.hxx')
| -rwxr-xr-x | sd/source/ui/inc/framework/ViewShellWrapper.hxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sd/source/ui/inc/framework/ViewShellWrapper.hxx b/sd/source/ui/inc/framework/ViewShellWrapper.hxx index 12483f462d5e..96e59d484270 100755 --- a/sd/source/ui/inc/framework/ViewShellWrapper.hxx +++ b/sd/source/ui/inc/framework/ViewShellWrapper.hxx @@ -89,6 +89,10 @@ 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) |