diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/dllapi.h | 2 | ||||
| -rw-r--r-- | include/vcl/print.hxx | 78 |
2 files changed, 40 insertions, 40 deletions
diff --git a/include/vcl/dllapi.h b/include/vcl/dllapi.h index b85e2ab87ce5..805d1cb00908 100644 --- a/include/vcl/dllapi.h +++ b/include/vcl/dllapi.h @@ -36,7 +36,7 @@ #define UITEST_DLLPUBLIC SAL_DLLPUBLIC_IMPORT #endif -#if defined UNX && ! defined MACOS +#if (defined UNX && ! defined MACOS) || defined _WIN32 #define VCL_PLUGIN_PUBLIC VCL_DLLPUBLIC #else #define VCL_PLUGIN_PUBLIC SAL_DLLPRIVATE diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 85b9bd471786..d5f4f6d86635 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -203,28 +203,28 @@ private: bool mbInPrintPage; bool mbNewJobSetup; - SAL_DLLPRIVATE void ImplInitData(); - SAL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); - SAL_DLLPRIVATE void ImplInitDisplay(); - SAL_DLLPRIVATE static SalPrinterQueueInfo* + VCL_DLLPRIVATE void ImplInitData(); + VCL_DLLPRIVATE void ImplInit( SalPrinterQueueInfo* pInfo ); + VCL_DLLPRIVATE void ImplInitDisplay(); + VCL_DLLPRIVATE static SalPrinterQueueInfo* ImplGetQueueInfo( const OUString& rPrinterName, const OUString* pDriver ); - SAL_DLLPRIVATE void ImplUpdatePageData(); - SAL_DLLPRIVATE void ImplUpdateFontList(); - SAL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest ); + VCL_DLLPRIVATE void ImplUpdatePageData(); + VCL_DLLPRIVATE void ImplUpdateFontList(); + VCL_DLLPRIVATE void ImplFindPaperFormatForUserSize( JobSetup&, bool bMatchNearest ); - SAL_DLLPRIVATE bool StartJob( const OUString& rJobName, std::shared_ptr<vcl::PrinterController> const & ); + VCL_DLLPRIVATE bool StartJob( const OUString& rJobName, std::shared_ptr<vcl::PrinterController> const & ); - static SAL_DLLPRIVATE ErrCode + static VCL_DLLPRIVATE ErrCode ImplSalPrinterErrorCodeToVCL( SalPrinterError nError ); private: - SAL_DLLPRIVATE void EndJob(); + VCL_DLLPRIVATE void EndJob(); Printer( const Printer& rPrinter ) = delete; Printer& operator =( const Printer& rPrinter ) = delete; public: - SAL_DLLPRIVATE void ImplStartPage(); - SAL_DLLPRIVATE void ImplEndPage(); + VCL_DLLPRIVATE void ImplStartPage(); + VCL_DLLPRIVATE void ImplEndPage(); protected: virtual bool AcquireGraphics() const override; @@ -300,7 +300,7 @@ public: should the need arise to set the printer options outside vcl, also a method would have to be devised to not override these again internally */ - SAL_DLLPRIVATE void SetPrinterOptions( const PrinterOptions& rOptions ); + VCL_DLLPRIVATE void SetPrinterOptions( const PrinterOptions& rOptions ); const PrinterOptions& GetPrinterOptions() const { return( *mpPrinterOptions ); } bool SetOrientation( Orientation eOrient ); @@ -378,7 +378,7 @@ public: not exported, not usable outside vcl */ - static void SAL_DLLPRIVATE ImplPrintJob( const std::shared_ptr<vcl::PrinterController>& i_pController, + static void VCL_DLLPRIVATE ImplPrintJob( const std::shared_ptr<vcl::PrinterController>& i_pController, const JobSetup& i_rInitSetup ); }; @@ -529,36 +529,36 @@ public: // don't use outside vcl. Some of these are exported for // the benefit of vcl's plugins. // Still: DO NOT USE OUTSIDE VCL - VCL_PLUGIN_PUBLIC int getFilteredPageCount(); - SAL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf, + int getFilteredPageCount(); + VCL_DLLPRIVATE PageSize getPageFile( int i_inUnfilteredPage, GDIMetaFile& rMtf, bool i_bMayUseCache = false ); - VCL_PLUGIN_PUBLIC PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, + PageSize getFilteredPageFile( int i_nFilteredPage, GDIMetaFile& o_rMtf, bool i_bMayUseCache = false ); - VCL_PLUGIN_PUBLIC void printFilteredPage( int i_nPage ); - SAL_DLLPRIVATE void setPrinter( const VclPtr<Printer>& ); - VCL_PLUGIN_PUBLIC void createProgressDialog(); - VCL_PLUGIN_PUBLIC bool isProgressCanceled() const; - SAL_DLLPRIVATE void setMultipage( const MultiPageSetup& ); - SAL_DLLPRIVATE const MultiPageSetup& + void printFilteredPage( int i_nPage ); + VCL_DLLPRIVATE void setPrinter( const VclPtr<Printer>& ); + void createProgressDialog(); + bool isProgressCanceled() const; + VCL_DLLPRIVATE void setMultipage( const MultiPageSetup& ); + VCL_DLLPRIVATE const MultiPageSetup& getMultipage() const; - VCL_PLUGIN_PUBLIC void setLastPage( bool i_bLastPage ); - SAL_DLLPRIVATE void setReversePrint( bool i_bReverse ); - SAL_DLLPRIVATE bool getReversePrint() const; - SAL_DLLPRIVATE void setPapersizeFromSetup( bool i_bPapersizeFromSetup ); - SAL_DLLPRIVATE bool getPapersizeFromSetup() const; - VCL_PLUGIN_PUBLIC void setPrinterModified( bool i_bPapersizeFromSetup ); - VCL_PLUGIN_PUBLIC bool getPrinterModified() const; - SAL_DLLPRIVATE void pushPropertiesToPrinter(); - SAL_DLLPRIVATE void resetPaperToLastConfigured(); - VCL_PLUGIN_PUBLIC void setJobState( css::view::PrintableState ); - SAL_DLLPRIVATE void setupPrinter( weld::Window* i_pDlgParent ); - - SAL_DLLPRIVATE int getPageCountProtected() const; - SAL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue > + void setLastPage( bool i_bLastPage ); + VCL_DLLPRIVATE void setReversePrint( bool i_bReverse ); + VCL_DLLPRIVATE bool getReversePrint() const; + VCL_DLLPRIVATE void setPapersizeFromSetup( bool i_bPapersizeFromSetup ); + VCL_DLLPRIVATE bool getPapersizeFromSetup() const; + void setPrinterModified( bool i_bPapersizeFromSetup ); + bool getPrinterModified() const; + VCL_DLLPRIVATE void pushPropertiesToPrinter(); + VCL_DLLPRIVATE void resetPaperToLastConfigured(); + void setJobState( css::view::PrintableState ); + VCL_DLLPRIVATE void setupPrinter( weld::Window* i_pDlgParent ); + + VCL_DLLPRIVATE int getPageCountProtected() const; + VCL_DLLPRIVATE css::uno::Sequence< css::beans::PropertyValue > getPageParametersProtected( int i_nPage ) const; - SAL_DLLPRIVATE DrawModeFlags removeTransparencies( GDIMetaFile const & i_rIn, GDIMetaFile& o_rOut ); - SAL_DLLPRIVATE void resetPrinterOptions( bool i_bFileOutput ); + VCL_DLLPRIVATE DrawModeFlags removeTransparencies( GDIMetaFile const & i_rIn, GDIMetaFile& o_rOut ); + VCL_DLLPRIVATE void resetPrinterOptions( bool i_bFileOutput ); }; class VCL_DLLPUBLIC PrinterOptionsHelper |