diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-12-22 12:45:53 +0100 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-12-22 12:45:53 +0100 |
| commit | e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc (patch) | |
| tree | 373386268af66194acb407856bb65f541579a25b /sw/sdi | |
| parent | CWS swlayoutrefactoring: resync to m96, no conflict resolution (diff) | |
| download | core-e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc.tar.gz core-e22a1e2f5c5ed74c22849c9b5bb59dd8f47bffbc.zip | |
CWS swlayoutrefactoring: conflict resolution after resync to DEV300_m96
Diffstat (limited to 'sw/sdi')
| -rw-r--r-- | sw/sdi/_docsh.sdi | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/sw/sdi/_docsh.sdi b/sw/sdi/_docsh.sdi index 3660722c6d4b..ad37160a3c1f 100644 --- a/sw/sdi/_docsh.sdi +++ b/sw/sdi/_docsh.sdi @@ -121,25 +121,11 @@ 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 } |