diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-12-21 20:49:11 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-12-21 20:49:11 +0100 |
| commit | af69eeaeae90037f27e7a8a10fce1b4899d5b305 (patch) | |
| tree | e4e2496dbd6bd7afe45d9eb3482ce02f9c291310 /sw/sdi/_docsh.sdi | |
| parent | 09d6c9a395b8849e3e09c694282a1446b786bf80 (diff) | |
| parent | 42c3881914531e6d81d6fb05bdc7b308db98146c (diff) | |
CWS swlayoutrefactoring: resync to m96, no conflict resolution
Diffstat (limited to 'sw/sdi/_docsh.sdi')
| -rw-r--r-- | sw/sdi/_docsh.sdi | 19 |
1 files changed, 19 insertions, 0 deletions
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi index bc91e94064a7..3660722c6d4b 100644 --- a/sw/sdi/_docsh.sdi +++ b/sw/sdi/_docsh.sdi @@ -121,6 +121,25 @@ interface BaseTextDocument StateMethod = GetState ; ] +<<<<<<< local +======= + SID_BROWSER_MODE + [ + ExecMethod = Execute; + StateMethod = GetState; + ] + + FN_PRINT_LAYOUT + [ + ExecMethod = Execute; + StateMethod = GetState; + ] + SID_MAIL_PREPAREEXPORT + [ + ExecMethod = Execute ; + StateMethod = GetState; + ] +>>>>>>> other } |