diff options
| -rw-r--r-- | include/toolkit/awt/vclxprinter.hxx | 7 | ||||
| -rw-r--r-- | offapi/UnoApi_offapi.mk | 1 | ||||
| -rw-r--r-- | offapi/com/sun/star/awt/XPrinterServer2.idl | 49 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxprinter.cxx | 7 |
4 files changed, 60 insertions, 4 deletions
diff --git a/include/toolkit/awt/vclxprinter.hxx b/include/toolkit/awt/vclxprinter.hxx index 5478e9daf75e..85c8b1b32cf8 100644 --- a/include/toolkit/awt/vclxprinter.hxx +++ b/include/toolkit/awt/vclxprinter.hxx @@ -23,7 +23,7 @@ #include <com/sun/star/awt/XPrinterPropertySet.hpp> #include <com/sun/star/awt/XPrinter.hpp> -#include <com/sun/star/awt/XPrinterServer.hpp> +#include <com/sun/star/awt/XPrinterServer2.hpp> #include <com/sun/star/awt/XInfoPrinter.hpp> #include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XTypeProvider.hpp> @@ -174,14 +174,15 @@ public: // class VCLXPrinterServer -typedef ::cppu::WeakImplHelper < css::awt::XPrinterServer, +typedef ::cppu::WeakImplHelper < css::awt::XPrinterServer2, css::lang::XServiceInfo > VCLXPrinterServer_Base; class VCLXPrinterServer : public VCLXPrinterServer_Base { public: - // css::awt::XPrinterServer + // css::awt::XPrinterServer2 css::uno::Sequence< OUString > SAL_CALL getPrinterNames( ) override; + OUString SAL_CALL getDefaultPrinterName() override; css::uno::Reference< css::awt::XPrinter > SAL_CALL createPrinter( const OUString& printerName ) override; css::uno::Reference< css::awt::XInfoPrinter > SAL_CALL createInfoPrinter( const OUString& printerName ) override; diff --git a/offapi/UnoApi_offapi.mk b/offapi/UnoApi_offapi.mk index f95f390777d2..43096d6b1b19 100644 --- a/offapi/UnoApi_offapi.mk +++ b/offapi/UnoApi_offapi.mk @@ -1854,6 +1854,7 @@ $(eval $(call gb_UnoApi_add_idlfiles,offapi,com/sun/star/awt,\ XPrinter \ XPrinterPropertySet \ XPrinterServer \ + XPrinterServer2 \ XProgressBar \ XProgressMonitor \ XRadioButton \ diff --git a/offapi/com/sun/star/awt/XPrinterServer2.idl b/offapi/com/sun/star/awt/XPrinterServer2.idl new file mode 100644 index 000000000000..8ceb54fcfa50 --- /dev/null +++ b/offapi/com/sun/star/awt/XPrinterServer2.idl @@ -0,0 +1,49 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ +#ifndef __com_sun_star_awt_XPrinterServer2_idl__ +#define __com_sun_star_awt_XPrinterServer2_idl__ + +#include <com/sun/star/awt/XPrinterServer.idl> + + module com { module sun { module star { module awt { + +/** + extends printer server interface + + @since LibreOffice 6.3 +*/ + +interface XPrinterServer2: ::com::sun::star::awt::XPrinterServer +{ + + /** returns the current default printer name + + @returns + current default printer name + */ + string getDefaultPrinterName(); + +}; + + +}; }; }; }; + +#endif + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/toolkit/source/awt/vclxprinter.cxx b/toolkit/source/awt/vclxprinter.cxx index 9f982059e362..5f6de6d38b2b 100644 --- a/toolkit/source/awt/vclxprinter.cxx +++ b/toolkit/source/awt/vclxprinter.cxx @@ -328,7 +328,7 @@ css::uno::Reference< css::awt::XDevice > VCLXInfoPrinter::createDevice( ) // class VCLXPrinterServer // ---------------------------------------------------- -// css::awt::XPrinterServer +// css::awt::XPrinterServer2 css::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames( ) { const std::vector<OUString>& rQueues = Printer::GetPrinterQueues(); @@ -341,6 +341,11 @@ css::uno::Sequence< OUString > VCLXPrinterServer::getPrinterNames( ) return aNames; } +OUString VCLXPrinterServer::getDefaultPrinterName() +{ + return Printer::GetDefaultPrinterName(); +} + css::uno::Reference< css::awt::XPrinter > VCLXPrinterServer::createPrinter( const OUString& rPrinterName ) { css::uno::Reference< css::awt::XPrinter > xP; |