diff options
| author | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
|---|---|---|
| committer | Mathias Bauer <mba@openoffice.org> | 2010-10-28 23:02:10 +0200 |
| commit | 91f418099eccc7e1d15d7fcd9ebaea75cb69a716 (patch) | |
| tree | 53dcb7e3db56ac4644ae21097c8250ca617bb9bd /sc/source/ui/view/prevwsh.cxx | |
| parent | c939a66ccb5bfe0c84992a6fab09aa7df46e76cd (diff) | |
| parent | 5cb1bf1e0b4ad3d395c84bb24eb87c1a95954f8d (diff) | |
CWS gnumake: resync to m91; conflicts unresolved
Diffstat (limited to 'sc/source/ui/view/prevwsh.cxx')
| -rw-r--r-- | sc/source/ui/view/prevwsh.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx index aedb512bcdaf..bd5d59718873 100644 --- a/sc/source/ui/view/prevwsh.cxx +++ b/sc/source/ui/view/prevwsh.cxx @@ -108,7 +108,11 @@ SFX_IMPL_INTERFACE( ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL) ) SFX_POPUPMENU_REGISTRATION(ScResId(RID_POPUP_PREVIEW)); } +<<<<<<< local SFX_IMPL_VIEWFACTORY( ScPreviewShell ) +======= +SFX_IMPL_NAMED_VIEWFACTORY( ScPreviewShell, "PrintPreview" ) +>>>>>>> other { SFX_VIEW_REGISTRATION(ScDocShell); } |