Skip to content

C
core
Kaydet (Commit) 34a1250e authored tarafından Andrew Rist's avatar Andrew Rist Kaydeden (comit) Caolán McNamara
Dosyalara gözat
Seçenekler

Related: #i117765# css.awt.PrinterServer implementation unusable in Basic 

from  cws/fs35a by Frank Schoenheit [fs]

(cherry picked from commit e9bfcd09)

Conflicts:
	toolkit/inc/toolkit/awt/vclxprinter.hxx
	toolkit/source/awt/vclxprinter.cxx

Change-Id: I96b08d00c7e483891d3c24c90fa52764949add0b

Fix line endings

(cherry picked from commit f4f2c318)

Conflicts:
	toolkit/inc/toolkit/awt/vclxprinter.hxx
	toolkit/source/awt/vclxprinter.cxx

Change-Id: I88acd74eec39410844030d3cba489e1fe62a91b3
üst 813e8bc2
Hide whitespace changes
Inline Side-by-side
Showing with 67 additions and 142 deletions
include/toolkit/awt/vclxprinter.hxx
Dosyayı görüntüle @ 34a1250e
...@@ -25,16 +25,14 @@ ...@@ -25,16 +25,14 @@
#include <com/sun/star/awt/XPrinter.hpp> #include <com/sun/star/awt/XPrinter.hpp>
#include <com/sun/star/awt/XPrinterServer.hpp> #include <com/sun/star/awt/XPrinterServer.hpp>
#include <com/sun/star/awt/XInfoPrinter.hpp> #include <com/sun/star/awt/XInfoPrinter.hpp>
#include <com/sun/star/lang/XServiceInfo.hpp>
#include <com/sun/star/lang/XTypeProvider.hpp> #include <com/sun/star/lang/XTypeProvider.hpp>
#include <cppuhelper/implbase2.hxx>
#include <cppuhelper/weak.hxx> #include <cppuhelper/weak.hxx>
#include <osl/mutex.hxx> #include <osl/mutex.hxx>
#include <toolkit/helper/macros.hxx>
#include <toolkit/helper/mutexandbroadcasthelper.hxx> #include <toolkit/helper/mutexandbroadcasthelper.hxx>
#include <toolkit/helper/servicenames.hxx>
#include <cppuhelper/propshlp.hxx> #include <cppuhelper/propshlp.hxx>
#include <cppuhelper/implbase1.hxx>
#include <comphelper/uno3.hxx>
#include "vcl/oldprintadaptor.hxx" #include "vcl/oldprintadaptor.hxx"
...@@ -51,10 +49,11 @@ ...@@ -51,10 +49,11 @@
// class VCLXPrinterPropertySet // class VCLXPrinterPropertySet
// ---------------------------------------------------- // ----------------------------------------------------
class VCLXPrinterPropertySet : public ::com::sun::star::awt::XPrinterPropertySet, typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XPrinterPropertySet
public ::com::sun::star::lang::XTypeProvider, > VCLXPrinterPropertySet_Base;
public MutexAndBroadcastHelper, class VCLXPrinterPropertySet :public VCLXPrinterPropertySet_Base
public ::cppu::OPropertySetHelper ,public MutexAndBroadcastHelper
,public ::cppu::OPropertySetHelper
{ {
protected: protected:
boost::shared_ptr<Printer> mpPrinter; boost::shared_ptr<Printer> mpPrinter;
...@@ -70,20 +69,19 @@ public: ...@@ -70,20 +69,19 @@ public:
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > GetDevice(); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > GetDevice();
// ::com::sun::star::uno::XInterface // ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException); DECLARE_XINTERFACE();
// ::com::sun::star::lang::XTypeProvider // ::com::sun::star::lang::XTypeProvider
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException); DECLARE_XTYPEPROVIDER();
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::beans::XPropertySet // ::com::sun::star::beans::XPropertySet
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); } void SAL_CALL setPropertyValue( const ::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::setPropertyValue( rPropertyName, aValue ); }
::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return OPropertySetHelper::getPropertyValue( rPropertyName ); } ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return OPropertySetHelper::getPropertyValue( rPropertyName ); }
void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); } void SAL_CALL addPropertyChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::addPropertyChangeListener( rPropertyName, rxListener ); }
void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); } void SAL_CALL removePropertyChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::removePropertyChangeListener( rPropertyName, rxListener ); }
void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); } void SAL_CALL addVetoableChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::addVetoableChangeListener( rPropertyName, rxListener ); }
void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); } void SAL_CALL removeVetoableChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { OPropertySetHelper::removeVetoableChangeListener( rPropertyName, rxListener ); }
// ::cppu::OPropertySetHelper // ::cppu::OPropertySetHelper
::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper(); ::cppu::IPropertyArrayHelper& SAL_CALL getInfoHelper();
...@@ -94,8 +92,8 @@ public: ...@@ -94,8 +92,8 @@ public:
// ::com::sun::star::awt::XPrinterPropertySet // ::com::sun::star::awt::XPrinterPropertySet
void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); void SAL_CALL selectForm( const ::OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
}; };
...@@ -104,9 +102,10 @@ public: ...@@ -104,9 +102,10 @@ public:
// class VCLXPrinter // class VCLXPrinter
// ---------------------------------------------------- // ----------------------------------------------------
class VCLXPrinter: public ::com::sun::star::awt::XPrinter, typedef ::cppu::ImplInheritanceHelper1 < VCLXPrinterPropertySet
public VCLXPrinterPropertySet, , ::com::sun::star::awt::XPrinter
public ::cppu::OWeakObject > VCLXPrinter_Base;
class VCLXPrinter: public VCLXPrinter_Base
{ {
boost::shared_ptr<vcl::OldStylePrintAdaptor> mpListener; boost::shared_ptr<vcl::OldStylePrintAdaptor> mpListener;
JobSetup maInitJobSetup; JobSetup maInitJobSetup;
...@@ -114,34 +113,24 @@ public: ...@@ -114,34 +113,24 @@ public:
VCLXPrinter( const OUString& rPrinterName ); VCLXPrinter( const OUString& rPrinterName );
~VCLXPrinter(); ~VCLXPrinter();
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
void SAL_CALL release() throw() { OWeakObject::release(); }
// ::com::sun::star::lang::XTypeProvider
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::beans::XPropertySet // ::com::sun::star::beans::XPropertySet
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertySetInfo(); } ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertySetInfo(); }
void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } void SAL_CALL setPropertyValue( const ::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); }
::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); }
void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } void SAL_CALL addPropertyChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); }
void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } void SAL_CALL removePropertyChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); }
void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } void SAL_CALL addVetoableChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); }
void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } void SAL_CALL removeVetoableChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); }
// ::com::sun::star::awt::XPrinterPropertySet // ::com::sun::star::awt::XPrinterPropertySet
void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); }
::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getFormDescriptions(); } ::com::sun::star::uno::Sequence< ::OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getFormDescriptions(); }
void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::selectForm( aFormDescription ); } void SAL_CALL selectForm( const ::OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::selectForm( aFormDescription ); }
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getBinarySetup(); } ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getBinarySetup(); }
void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setBinarySetup( data ); } void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setBinarySetup( data ); }
// ::com::sun::star::awt::XPrinter // ::com::sun::star::awt::XPrinter
sal_Bool SAL_CALL start( const OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException); sal_Bool SAL_CALL start( const ::OUString& nJobName, sal_Int16 nCopies, sal_Bool nCollate ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
void SAL_CALL end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException); void SAL_CALL end( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException);
void SAL_CALL terminate( ) throw(::com::sun::star::uno::RuntimeException); void SAL_CALL terminate( ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > SAL_CALL startPage( ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::uno::RuntimeException);
...@@ -152,37 +141,28 @@ public: ...@@ -152,37 +141,28 @@ public:
// class VCLXInfoPrinter // class VCLXInfoPrinter
// ---------------------------------------------------- // ----------------------------------------------------
class VCLXInfoPrinter: public ::com::sun::star::awt::XInfoPrinter, typedef ::cppu::ImplInheritanceHelper1 < VCLXPrinterPropertySet
public VCLXPrinterPropertySet, , ::com::sun::star::awt::XInfoPrinter
public ::cppu::OWeakObject > VCLXInfoPrinter_Base;
class VCLXInfoPrinter: public VCLXInfoPrinter_Base
{ {
public: public:
VCLXInfoPrinter( const OUString& rPrinterName ); VCLXInfoPrinter( const OUString& rPrinterName );
~VCLXInfoPrinter(); ~VCLXInfoPrinter();
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException);
void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
void SAL_CALL release() throw() { OWeakObject::release(); }
// ::com::sun::star::lang::XTypeProvider
::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes() throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId() throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::beans::XPropertySet // ::com::sun::star::beans::XPropertySet
::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertySetInfo(); } ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertySetInfo(); }
void SAL_CALL setPropertyValue( const OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); } void SAL_CALL setPropertyValue( const ::OUString& rPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setPropertyValue( rPropertyName, aValue ); }
::com::sun::star::uno::Any SAL_CALL getPropertyValue( const OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); } ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::OUString& rPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getPropertyValue( rPropertyName ); }
void SAL_CALL addPropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); } void SAL_CALL addPropertyChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addPropertyChangeListener( rPropertyName, rxListener ); }
void SAL_CALL removePropertyChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); } void SAL_CALL removePropertyChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removePropertyChangeListener( rPropertyName, rxListener ); }
void SAL_CALL addVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); } void SAL_CALL addVetoableChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::addVetoableChangeListener( rPropertyName, rxListener ); }
void SAL_CALL removeVetoableChangeListener( const OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); } void SAL_CALL removeVetoableChangeListener( const ::OUString& rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& rxListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::removeVetoableChangeListener( rPropertyName, rxListener ); }
// ::com::sun::star::awt::XPrinterPropertySet // ::com::sun::star::awt::XPrinterPropertySet
void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); } void SAL_CALL setHorizontal( sal_Bool bHorizontal ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setHorizontal( bHorizontal ); }
::com::sun::star::uno::Sequence< OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getFormDescriptions(); } ::com::sun::star::uno::Sequence< ::OUString > SAL_CALL getFormDescriptions( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getFormDescriptions(); }
void SAL_CALL selectForm( const OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::selectForm( aFormDescription ); } void SAL_CALL selectForm( const ::OUString& aFormDescription ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::selectForm( aFormDescription ); }
::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getBinarySetup(); } ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getBinarySetup( ) throw(::com::sun::star::uno::RuntimeException) { return VCLXPrinterPropertySet::getBinarySetup(); }
void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setBinarySetup( data ); } void SAL_CALL setBinarySetup( const ::com::sun::star::uno::Sequence< sal_Int8 >& data ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) { VCLXPrinterPropertySet::setBinarySetup( data ); }
...@@ -194,16 +174,15 @@ public: ...@@ -194,16 +174,15 @@ public:
// class VCLXPrinterServer // class VCLXPrinterServer
// ---------------------------------------------------- // ----------------------------------------------------
class VCLXPrinterServer : public ::cppu::WeakImplHelper2<com::sun::star::awt::XPrinterServer, typedef ::cppu::WeakImplHelper1 < ::com::sun::star::awt::XPrinterServer
com::sun::star::lang::XServiceInfo> > VCLXPrinterServer_Base;
class VCLXPrinterServer : public VCLXPrinterServer_Base
{ {
public: public:
// ::com::sun::star::awt::XPrinterServer // ::com::sun::star::awt::XPrinterServer
::com::sun::star::uno::Sequence< OUString > SAL_CALL getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Sequence< ::OUString > SAL_CALL getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter > SAL_CALL createPrinter( const ::OUString& printerName ) throw(::com::sun::star::uno::RuntimeException);
::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) throw(::com::sun::star::uno::RuntimeException); ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const ::OUString& printerName ) throw(::com::sun::star::uno::RuntimeException);
DECLIMPL_SERVICEINFO(VCLXPrinterServer, szServiceName2_PrinterServer);
}; };
#endif // _TOOLKIT_AWT_VCLXPRINTER_HXX_ #endif // _TOOLKIT_AWT_VCLXPRINTER_HXX_
......
toolkit/source/awt/vclxprinter.cxx
Dosyayı görüntüle @ 34a1250e
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
#include <toolkit/awt/vclxdevice.hxx> #include <toolkit/awt/vclxdevice.hxx>
#define BINARYSETUPMARKER 0x23864691 #define BINARYSETUPMARKER 0x23864691
#define PROPERTY_Orientation 0 #define PROPERTY_Orientation 0
#define PROPERTY_Horizontal 1 #define PROPERTY_Horizontal 1
...@@ -60,29 +60,12 @@ ...@@ -60,29 +60,12 @@
return pProperties; return pProperties;
} }
// ---------------------------------------------------- // ----------------------------------------------------
// class VCLXPrinterPropertySet // class VCLXPrinterPropertySet
// ---------------------------------------------------- // ----------------------------------------------------
// ::com::sun::star::uno::XInterface IMPLEMENT_FORWARD_XINTERFACE2( VCLXPrinterPropertySet, VCLXPrinterPropertySet_Base, OPropertySetHelper )
::com::sun::star::uno::Any VCLXPrinterPropertySet::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException) IMPLEMENT_FORWARD_XTYPEPROVIDER2( VCLXPrinterPropertySet, VCLXPrinterPropertySet_Base, ::cppu::OPropertySetHelper )
{
::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
(static_cast< ::com::sun::star::beans::XMultiPropertySet* >(this)),
(static_cast< ::com::sun::star::beans::XFastPropertySet* >(this)),
(static_cast< ::com::sun::star::beans::XPropertySet* >((::cppu::OPropertySetHelper*) this) ),
(static_cast< ::com::sun::star::awt::XPrinterPropertySet* >(this)),
(static_cast< ::com::sun::star::lang::XTypeProvider* >(this)) );
return (aRet.hasValue() ? aRet : OPropertySetHelper::queryInterface( rType ));
}
// ::com::sun::star::lang::XTypeProvider
IMPL_XTYPEPROVIDER_START( VCLXPrinterPropertySet )
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XMultiPropertySet>* ) NULL ),
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XFastPropertySet>* ) NULL ),
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>* ) NULL ),
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinterPropertySet>* ) NULL )
IMPL_XTYPEPROVIDER_END
VCLXPrinterPropertySet::VCLXPrinterPropertySet( const OUString& rPrinterName ) VCLXPrinterPropertySet::VCLXPrinterPropertySet( const OUString& rPrinterName )
: OPropertySetHelper( BrdcstHelper ) : OPropertySetHelper( BrdcstHelper )
...@@ -227,7 +210,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com:: ...@@ -227,7 +210,7 @@ void VCLXPrinterPropertySet::setHorizontal( sal_Bool bHorizontal ) throw(::com::
::osl::MutexGuard aGuard( Mutex ); ::osl::MutexGuard aGuard( Mutex );
sal_uInt16 nPaperBinCount = GetPrinter()->GetPaperBinCount(); sal_uInt16 nPaperBinCount = GetPrinter()->GetPaperBinCount();
::com::sun::star::uno::Sequence< OUString > aDescriptions( nPaperBinCount ); ::com::sun::star::uno::Sequence< OUString > aDescriptions( nPaperBinCount );
for ( sal_uInt16 n = 0; n < nPaperBinCount; n++ ) for ( sal_uInt16 n = 0; n < nPaperBinCount; n++ )
{ {
// Format: <DisplayFormName;FormNameId;DisplayPaperBinName;PaperBinNameId;DisplayPaperName;PaperNameId> // Format: <DisplayFormName;FormNameId;DisplayPaperBinName;PaperBinNameId;DisplayPaperName;PaperNameId>
...@@ -279,11 +262,11 @@ void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequen ...@@ -279,11 +262,11 @@ void VCLXPrinterPropertySet::setBinarySetup( const ::com::sun::star::uno::Sequen
} }
// ---------------------------------------------------- // ----------------------------------------------------
// class VCLXPrinter // class VCLXPrinter
// ---------------------------------------------------- // ----------------------------------------------------
VCLXPrinter::VCLXPrinter( const OUString& rPrinterName ) VCLXPrinter::VCLXPrinter( const OUString& rPrinterName )
: VCLXPrinterPropertySet( rPrinterName ) : VCLXPrinter_Base( rPrinterName )
{ {
} }
...@@ -291,24 +274,6 @@ VCLXPrinter::~VCLXPrinter() ...@@ -291,24 +274,6 @@ VCLXPrinter::~VCLXPrinter()
{ {
} }
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXPrinter::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
{
::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
(static_cast< ::com::sun::star::awt::XPrinter* >(this)) );
if ( !aRet.hasValue() )
aRet = VCLXPrinterPropertySet::queryInterface( rType );
return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
}
// ::com::sun::star::lang::XTypeProvider
IMPL_XTYPEPROVIDER_START( VCLXPrinter )
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XPrinter>* ) NULL ),
VCLXPrinterPropertySet::getTypes()
IMPL_XTYPEPROVIDER_END
sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException) sal_Bool VCLXPrinter::start( const OUString& /*rJobName*/, sal_Int16 /*nCopies*/, sal_Bool /*bCollate*/ ) throw(::com::sun::star::awt::PrinterException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException)
{ {
::osl::MutexGuard aGuard( Mutex ); ::osl::MutexGuard aGuard( Mutex );
...@@ -363,12 +328,12 @@ void VCLXPrinter::endPage( ) throw(::com::sun::star::awt::PrinterException, ::c ...@@ -363,12 +328,12 @@ void VCLXPrinter::endPage( ) throw(::com::sun::star::awt::PrinterException, ::c
} }
// ---------------------------------------------------- // ----------------------------------------------------
// class VCLXInfoPrinter // class VCLXInfoPrinter
// ---------------------------------------------------- // ----------------------------------------------------
VCLXInfoPrinter::VCLXInfoPrinter( const OUString& rPrinterName ) VCLXInfoPrinter::VCLXInfoPrinter( const OUString& rPrinterName )
: VCLXPrinterPropertySet( rPrinterName ) : VCLXInfoPrinter_Base( rPrinterName )
{ {
} }
...@@ -376,24 +341,6 @@ VCLXInfoPrinter::~VCLXInfoPrinter() ...@@ -376,24 +341,6 @@ VCLXInfoPrinter::~VCLXInfoPrinter()
{ {
} }
// ::com::sun::star::uno::XInterface
::com::sun::star::uno::Any VCLXInfoPrinter::queryInterface( const ::com::sun::star::uno::Type & rType ) throw(::com::sun::star::uno::RuntimeException)
{
::com::sun::star::uno::Any aRet = ::cppu::queryInterface( rType,
(static_cast< ::com::sun::star::awt::XInfoPrinter* >(this)) );
if ( !aRet.hasValue() )
aRet = VCLXPrinterPropertySet::queryInterface( rType );
return (aRet.hasValue() ? aRet : OWeakObject::queryInterface( rType ));
}
// ::com::sun::star::lang::XTypeProvider
IMPL_XTYPEPROVIDER_START( VCLXInfoPrinter )
getCppuType( ( ::com::sun::star::uno::Reference< ::com::sun::star::awt::XInfoPrinter>* ) NULL ),
VCLXPrinterPropertySet::getTypes()
IMPL_XTYPEPROVIDER_END
// ::com::sun::star::awt::XInfoPrinter // ::com::sun::star::awt::XInfoPrinter
::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXInfoPrinter::createDevice( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Reference< ::com::sun::star::awt::XDevice > VCLXInfoPrinter::createDevice( ) throw(::com::sun::star::uno::RuntimeException)
{ {
...@@ -402,9 +349,9 @@ IMPL_XTYPEPROVIDER_END ...@@ -402,9 +349,9 @@ IMPL_XTYPEPROVIDER_END
return GetDevice(); return GetDevice();
} }
// ---------------------------------------------------- // ----------------------------------------------------
// class VCLXPrinterServer // class VCLXPrinterServer
// ---------------------------------------------------- // ----------------------------------------------------
// ::com::sun::star::awt::XPrinterServer // ::com::sun::star::awt::XPrinterServer
::com::sun::star::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException) ::com::sun::star::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames( ) throw(::com::sun::star::uno::RuntimeException)
...@@ -412,7 +359,7 @@ IMPL_XTYPEPROVIDER_END ...@@ -412,7 +359,7 @@ IMPL_XTYPEPROVIDER_END
const std::vector<OUString>& rQueues = Printer::GetPrinterQueues(); const std::vector<OUString>& rQueues = Printer::GetPrinterQueues();
sal_uInt32 nPrinters = rQueues.size(); sal_uInt32 nPrinters = rQueues.size();
::com::sun::star::uno::Sequence< OUString > aNames( nPrinters ); ::com::sun::star::uno::Sequence< OUString > aNames( nPrinters );
for ( sal_uInt32 n = 0; n < nPrinters; n++ ) for ( sal_uInt32 n = 0; n < nPrinters; n++ )
aNames.getArray()[n] = rQueues[n]; aNames.getArray()[n] = rQueues[n];
...@@ -434,5 +381,4 @@ IMPL_XTYPEPROVIDER_END ...@@ -434,5 +381,4 @@ IMPL_XTYPEPROVIDER_END
} }
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment