From 2d2f137008a6f2599acd43f59f8b169075fa6f11 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Tue, 16 Jun 2009 10:00:34 +0000 Subject: #i101242# build problems fixed; XUNoTunnel added to SwXTextView --- sw/source/ui/inc/unotxvw.hxx | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index 4db18720cf87..794371499186 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -72,6 +72,7 @@ class SwXTextView : public ::com::sun::star::view::XViewSettingsSupplier, public ::com::sun::star::beans::XPropertySet, public ::com::sun::star::datatransfer::XTransferableSupplier, + public ::com::sun::star::lang::XUnoTunnel, public SfxBaseController { SelectionChangeListenerArr aSelChangedListeners; @@ -152,6 +153,11 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException); + // XUnoTunnel + virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); + + static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); + void NotifySelChanged(); void NotifyDBChanged(); -- cgit From e7200b2b026e535228b1fa27d4ab450b8125f2fd Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Tue, 28 Jul 2009 09:43:30 +0000 Subject: #i101242# fixed crashwhen printing the page preview with new print UI --- sw/source/ui/inc/unotxvw.hxx | 6 ------ 1 file changed, 6 deletions(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index 794371499186..4db18720cf87 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -72,7 +72,6 @@ class SwXTextView : public ::com::sun::star::view::XViewSettingsSupplier, public ::com::sun::star::beans::XPropertySet, public ::com::sun::star::datatransfer::XTransferableSupplier, - public ::com::sun::star::lang::XUnoTunnel, public SfxBaseController { SelectionChangeListenerArr aSelChangedListeners; @@ -153,11 +152,6 @@ public: virtual ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable > SAL_CALL getTransferable( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL insertTransferable( const ::com::sun::star::uno::Reference< ::com::sun::star::datatransfer::XTransferable >& xTrans ) throw (::com::sun::star::datatransfer::UnsupportedFlavorException, ::com::sun::star::uno::RuntimeException); - // XUnoTunnel - virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException); - - static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId(); - void NotifySelChanged(); void NotifyDBChanged(); -- cgit From a6e4f39c82a75fb2684d3563b9c2a7af3518d2bc Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Fri, 14 Aug 2009 13:56:56 +0000 Subject: #i101242# new print UI --- sw/source/ui/inc/view.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 7ddfc2775299..0fb458573a61 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -88,7 +88,7 @@ class SwPrtOptions; class SwTransferable; class SwMailMergeConfigItem; class SwTxtNode; // #i23726# -struct SwPrintData; +class SwPrintData; class SwFormatClipboard; struct SwConversionArgs; class Graphic; -- cgit From bc18988ff86ca83d850fba993a669ff6b8253b5a Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Thu, 27 Aug 2009 12:29:52 +0000 Subject: #101242# SwRenderData introduced; minor name changes --- sw/source/ui/inc/cfgitems.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/cfgitems.hxx b/sw/source/ui/inc/cfgitems.hxx index 620d3ac52b23..bb301283a005 100644 --- a/sw/source/ui/inc/cfgitems.hxx +++ b/sw/source/ui/inc/cfgitems.hxx @@ -155,15 +155,15 @@ public: BOOL IsPrintProspect() const { return bPrintProspect; } - BOOL IsPrintProspect_RTL() const { return bPrintProspect_RTL; } + BOOL IsPrintProspectRTL() const { return bPrintProspectRTL; } void SetPrintProspect(BOOL bFlag ){ bPrintProspect = bFlag; } - void SetPrintProspect_RTL(BOOL bFlag ){ bPrintProspect_RTL = bFlag; } + void SetPrintProspectRTL(BOOL bFlag ){ bPrintProspectRTL = bFlag; } BOOL IsPrintGraphic () const { return bPrintGraphic; } BOOL IsPrintTable () const { return bPrintTable; } BOOL IsPrintDraw () const { return bPrintDraw; } BOOL IsPrintControl () const { return bPrintControl; } - BOOL IsPrintLeftPage () const { return bPrintLeftPage; } - BOOL IsPrintRightPage() const { return bPrintRightPage; } + BOOL IsPrintLeftPage () const { return bPrintLeftPages; } + BOOL IsPrintRightPage() const { return bPrintRightPages; } BOOL IsPrintReverse () const { return bPrintReverse; } BOOL IsPaperFromSetup() const { return bPaperFromSetup; } BOOL IsPrintEmptyPages() const { return bPrintEmptyPages; } -- cgit From 0d2b77c567c563b19ae4ed32a31d927282860129 Mon Sep 17 00:00:00 2001 From: Oliver Specht Date: Tue, 1 Sep 2009 07:59:10 +0000 Subject: #i101242# DoPrint removed --- sw/source/ui/inc/view.hxx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 0fb458573a61..92788e714c4f 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -424,8 +424,6 @@ public: virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false); - virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, - BOOL bSilent, BOOL bIsAPI ); ShellModes GetShellMode(); com::sun::star::view::XSelectionSupplier* GetUNOObject(); @@ -691,4 +689,4 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, BOOL bPreview); -#endif +#endif \ No newline at end of file -- cgit From 8b9588e75bd53b64fa3d1cd0a006a14e74578f96 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Tue, 1 Sep 2009 15:16:12 +0000 Subject: #i101242# applying view options and formatting doc now only done in getRendererCount --- sw/source/ui/inc/view.hxx | 4 ---- 1 file changed, 4 deletions(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index 92788e714c4f..d122df20c408 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -630,10 +630,6 @@ public: //apply Accessiblity options void ApplyAccessiblityOptions(SvtAccessibilityOptions& rAccessibilityOptions); - // get print options (SwPrtOptions) - static void MakeOptions( PrintDialog* pDlg, SwPrtOptions& rOpts, - BOOL* pPrtProspect, BOOL* pPrtProspect_RTL, BOOL bWeb, SfxPrinter* pPrt, SwPrintData* pData ); - SwView(SfxViewFrame* pFrame, SfxViewShell*); ~SwView(); -- cgit From 65756e786d115472d3607724456888d325608a95 Mon Sep 17 00:00:00 2001 From: Philipp Lohmann Date: Tue, 1 Sep 2009 16:31:53 +0000 Subject: remove warnings --- sw/source/ui/inc/view.hxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/view.hxx b/sw/source/ui/inc/view.hxx index d122df20c408..b181c85fa5ae 100644 --- a/sw/source/ui/inc/view.hxx +++ b/sw/source/ui/inc/view.hxx @@ -685,4 +685,5 @@ SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions, BOOL bPreview); -#endif \ No newline at end of file +#endif + -- cgit From 4c0bd776257fb1ad287e34b4e1bcf4bb6cd2f822 Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Thu, 3 Sep 2009 15:12:37 +0000 Subject: #i101242# printing from HTML source view --- sw/source/ui/inc/srcview.hxx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx index 996aab82b446..d66096d4418b 100644 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -32,6 +32,8 @@ #include #include +#include + #include "srcedtw.hxx" #include "shellid.hxx" @@ -92,11 +94,11 @@ public: void Load(SwDocShell* pDocShell); - virtual USHORT SetPrinter( SfxPrinter* pNew, - USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); - virtual ErrCode DoPrint( SfxPrinter *pPrinter, PrintDialog *pPrintDialog, BOOL bSilent, BOOL bIsAPI ); + virtual USHORT SetPrinter( SfxPrinter* pNew, USHORT nDiff = SFX_PRINTER_ALL, bool bIsAPI=false ); virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); + sal_Int32 PrintSource( OutputDevice *pOutDev, sal_Int32 nPage, bool bCalcNumPagesOnly ); + void SourceSaved() {bSourceSaved = TRUE;} BOOL HasSourceSaved() const {return bSourceSaved;} -- cgit From 4f2690960ace7b79ef45b07f3fb81a208d97636a Mon Sep 17 00:00:00 2001 From: Thomas Lange Date: Fri, 4 Sep 2009 14:41:56 +0000 Subject: #i101242# clean-up --- sw/source/ui/inc/pview.hxx | 2 -- 1 file changed, 2 deletions(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/pview.hxx b/sw/source/ui/inc/pview.hxx index bcb96a26cb3d..9fe9e61e2d6f 100644 --- a/sw/source/ui/inc/pview.hxx +++ b/sw/source/ui/inc/pview.hxx @@ -222,8 +222,6 @@ class SW_DLLPUBLIC SwPagePreView: public SfxViewShell SW_DLLPRIVATE int ChgPage( int eMvMode, int bUpdateScrollbar = TRUE ); - SW_DLLPRIVATE virtual USHORT Print( SfxProgress &rProgress, BOOL bIsAPI, - PrintDialog *pPrintDialog = 0 ); SW_DLLPRIVATE virtual SfxPrinter* GetPrinter( BOOL bCreate = FALSE ); SW_DLLPRIVATE virtual USHORT SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=false ); SW_DLLPRIVATE virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, -- cgit From 0eb60a412f3ba46dd33915a3aaadd01d31717b8b Mon Sep 17 00:00:00 2001 From: Frank Schönheit Date: Fri, 23 Oct 2009 09:46:03 +0200 Subject: step 0 of an UNOization of the css.form.(X)FormController implementation: move the API to css.form.runtime, so we can later add new API chunks without breaking compatibility of the existing API in css.form --- sw/source/ui/inc/unotxvw.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/unotxvw.hxx b/sw/source/ui/inc/unotxvw.hxx index 4db18720cf87..5900eeb42638 100644 --- a/sw/source/ui/inc/unotxvw.hxx +++ b/sw/source/ui/inc/unotxvw.hxx @@ -109,7 +109,7 @@ public: virtual void SAL_CALL removeSelectionChangeListener(const ::com::sun::star::uno::Reference< ::com::sun::star::view::XSelectionChangeListener > & xListener) throw( ::com::sun::star::uno::RuntimeException ); // XFormLayerAccess - virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::form::runtime::XFormController > SAL_CALL getFormController( const ::com::sun::star::uno::Reference< ::com::sun::star::form::XForm >& Form ) throw (::com::sun::star::uno::RuntimeException); virtual ::sal_Bool SAL_CALL isFormDesignMode( ) throw (::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setFormDesignMode( ::sal_Bool DesignMode ) throw (::com::sun::star::uno::RuntimeException); -- cgit From 34b5a53a562ac9bb3387e1e5603cd04165a268ae Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Tue, 8 Dec 2009 13:00:42 +0100 Subject: #i105728#, #i105730#, #i105727# intelli UI thingies --- sw/source/ui/inc/srcview.hxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) mode change 100644 => 100755 sw/source/ui/inc/srcview.hxx (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/srcview.hxx b/sw/source/ui/inc/srcview.hxx old mode 100644 new mode 100755 index d66096d4418b..687015759243 --- a/sw/source/ui/inc/srcview.hxx +++ b/sw/source/ui/inc/srcview.hxx @@ -28,7 +28,7 @@ * ************************************************************************/ #ifndef _SRCVIEW_HXX -#define _SRCIEW_HXX +#define _SRCVIEW_HXX #include #include -- cgit From af1e3ee0d10c10d6f30d8700ddc677a86dbf82c3 Mon Sep 17 00:00:00 2001 From: "Thomas Lange [tl]" Date: Thu, 10 Dec 2009 11:14:28 +0100 Subject: #i106914# apply configuration settings in UI --- sw/source/ui/inc/optpage.hxx | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sw/source/ui/inc') diff --git a/sw/source/ui/inc/optpage.hxx b/sw/source/ui/inc/optpage.hxx index 592c581f4aa3..b2fe407964c4 100644 --- a/sw/source/ui/inc/optpage.hxx +++ b/sw/source/ui/inc/optpage.hxx @@ -119,8 +119,8 @@ class SwAddPrinterTabPage : public SfxTabPage { FixedLine aFL1; CheckBox aGrfCB; - CheckBox aTabCB; - CheckBox aDrawCB; +// CheckBox aTabCB; +// CheckBox aDrawCB; CheckBox aCtrlFldCB; CheckBox aBackgroundCB; CheckBox aBlackFontCB; @@ -132,7 +132,7 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aFL2; CheckBox aLeftPageCB; CheckBox aRightPageCB; - CheckBox aReverseCB; +// CheckBox aReverseCB; CheckBox aProspectCB; CheckBox aProspectCB_RTL; @@ -145,7 +145,7 @@ class SwAddPrinterTabPage : public SfxTabPage FixedLine aFL3; FixedLine aFL4; CheckBox aPrintEmptyPagesCB; - CheckBox aSingleJobsCB; +// CheckBox aSingleJobsCB; CheckBox aPaperFromSetupCB; FixedText aFaxFT; ListBox aFaxLB; -- cgit