diff options
| author | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-04 10:38:39 +0100 |
|---|---|---|
| committer | Frank Schoenheit [fs] <frank.schoenheit@sun.com> | 2010-02-04 10:38:39 +0100 |
| commit | 6eb33fca796f7c016c690f0fa8ab4d536e986dc4 (patch) | |
| tree | 4673f05d0677fa88b4921f42052782da4d07e510 /sfx2/source/view/viewimp.hxx | |
| parent | af66a011a47f673a9a0ee2c6a0b27e23b11b6ebf (diff) | |
| parent | 3c550e9f7bdd8c9f1f75f4148f516ddc94290f92 (diff) | |
autorecovery: commit resolved merge (after rebase to m71)
Diffstat (limited to 'sfx2/source/view/viewimp.hxx')
| -rw-r--r-- | sfx2/source/view/viewimp.hxx | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sfx2/source/view/viewimp.hxx b/sfx2/source/view/viewimp.hxx index 77c6f259734a..61e8075d7033 100644 --- a/sfx2/source/view/viewimp.hxx +++ b/sfx2/source/view/viewimp.hxx @@ -58,6 +58,7 @@ typedef SfxShell* SfxShellPtr_Impl; SV_DECL_PTRARR( SfxShellArr_Impl, SfxShellPtr_Impl, 4, 4 ) // struct SfxViewShell_Impl ---------------------------------------------- +#if 0 class SfxAsyncPrintExec_Impl : public SfxListener { SfxViewShell* pView; @@ -72,6 +73,7 @@ public: void AddRequest( SfxRequest& rReq ); }; +#endif class SfxClipboardChangeListener; @@ -96,7 +98,7 @@ struct SfxViewShell_Impl USHORT nFamily; SfxBaseController* pController; ::svt::AcceleratorExecute* pAccExec; - SfxAsyncPrintExec_Impl* pPrinterCommandQueue; +// SfxAsyncPrintExec_Impl* pPrinterCommandQueue; com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aPrintOpts; ::rtl::Reference< SfxClipboardChangeListener > xClipboardListener; |