diff options
-rw-r--r-- | include/vcl/QueueInfo.hxx | 57 | ||||
-rw-r--r-- | include/vcl/print.hxx | 25 | ||||
-rw-r--r-- | svtools/source/dialogs/prnsetup.cxx | 1 | ||||
-rw-r--r-- | sw/source/ui/dbui/mmresultdialogs.cxx | 1 | ||||
-rw-r--r-- | vcl/Library_vcl.mk | 1 | ||||
-rw-r--r-- | vcl/headless/svpprn.cxx | 1 | ||||
-rw-r--r-- | vcl/osx/salinst.cxx | 1 | ||||
-rw-r--r-- | vcl/qt5/Qt5Instance_Print.cxx | 1 | ||||
-rw-r--r-- | vcl/source/app/svdata.cxx | 1 | ||||
-rw-r--r-- | vcl/source/app/svmain.cxx | 1 | ||||
-rw-r--r-- | vcl/source/gdi/print.cxx | 8 | ||||
-rw-r--r-- | vcl/source/printer/QueueInfo.cxx | 35 | ||||
-rw-r--r-- | vcl/source/window/printdlg.cxx | 1 | ||||
-rw-r--r-- | vcl/source/window/winproc.cxx | 1 | ||||
-rw-r--r-- | vcl/unx/generic/print/genprnpsp.cxx | 1 | ||||
-rw-r--r-- | vcl/win/gdi/salprn.cxx | 1 |
16 files changed, 106 insertions, 31 deletions
diff --git a/include/vcl/QueueInfo.hxx b/include/vcl/QueueInfo.hxx new file mode 100644 index 000000000000..dff5c448ce2d --- /dev/null +++ b/include/vcl/QueueInfo.hxx @@ -0,0 +1,57 @@ +/* -*- 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 INCLUDED_VCL_QUEUEINFO_HXX +#define INCLUDED_VCL_QUEUEINFO_HXX + +#include <config_options.h> + +#include <rtl/ustring.hxx> + +#include <vcl/dllapi.h> +#include <vcl/prntypes.hxx> + +class Printer; + +class UNLESS_MERGELIBS(VCL_DLLPUBLIC) QueueInfo +{ + friend class Printer; + +private: + OUString maPrinterName; + OUString maDriver; + OUString maLocation; + OUString maComment; + PrintQueueFlags mnStatus; + sal_uInt32 mnJobs; + +public: + QueueInfo(); + + const OUString& GetPrinterName() const; + const OUString& GetDriver() const; + const OUString& GetLocation() const; + const OUString& GetComment() const; + PrintQueueFlags GetStatus() const; + sal_uInt32 GetJobs() const; +}; + +#endif // INCLUDED_VCL_QUEUEINFO_HXX + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/print.hxx b/include/vcl/print.hxx index 8c91df7d8ec8..e0e63be2a108 100644 --- a/include/vcl/print.hxx +++ b/include/vcl/print.hxx @@ -41,6 +41,7 @@ class GDIMetaFile; class SalInfoPrinter; struct SalPrinterQueueInfo; +class QueueInfo; class SalPrinter; class VirtualDevice; enum class SalPrinterError; @@ -52,30 +53,6 @@ namespace vcl { namespace weld { class Window; } -class UNLESS_MERGELIBS(VCL_DLLPUBLIC) QueueInfo -{ - friend class Printer; - -private: - OUString maPrinterName; - OUString maDriver; - OUString maLocation; - OUString maComment; - PrintQueueFlags mnStatus; - sal_uInt32 mnJobs; - -public: - QueueInfo(); - - const OUString& GetPrinterName() const { return maPrinterName; } - const OUString& GetDriver() const { return maDriver; } - const OUString& GetLocation() const { return maLocation; } - const OUString& GetComment() const { return maComment; } - PrintQueueFlags GetStatus() const { return mnStatus; } - sal_uInt32 GetJobs() const { return mnJobs; } -}; - - enum class PrinterTransparencyMode { Auto = 0, diff --git a/svtools/source/dialogs/prnsetup.cxx b/svtools/source/dialogs/prnsetup.cxx index 03afe9eef0ad..1e55295b20b8 100644 --- a/svtools/source/dialogs/prnsetup.cxx +++ b/svtools/source/dialogs/prnsetup.cxx @@ -20,6 +20,7 @@ #include <svtools/prnsetup.hxx> #include <svtools/strings.hrc> #include <svtools/svtresid.hxx> +#include <vcl/QueueInfo.hxx> #include <vcl/svapp.hxx> #include <vcl/print.hxx> #include <vcl/event.hxx> diff --git a/sw/source/ui/dbui/mmresultdialogs.cxx b/sw/source/ui/dbui/mmresultdialogs.cxx index 8c812c0b4b8f..083b7633969e 100644 --- a/sw/source/ui/dbui/mmresultdialogs.cxx +++ b/sw/source/ui/dbui/mmresultdialogs.cxx @@ -32,6 +32,7 @@ #include <hintids.hxx> #include <swmodule.hxx> +#include <vcl/QueueInfo.hxx> #include <editeng/langitem.hxx> #include <o3tl/temporary.hxx> #include <svl/itemset.hxx> diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk index b294042fb90b..62c9b91a1604 100644 --- a/vcl/Library_vcl.mk +++ b/vcl/Library_vcl.mk @@ -117,6 +117,7 @@ endif $(eval $(call gb_Library_add_exception_objects,vcl,\ vcl/source/animate/Animation \ vcl/source/animate/AnimationBitmap \ + vcl/source/printer/QueueInfo \ vcl/source/window/errinf \ vcl/source/window/settings \ vcl/source/window/paint \ diff --git a/vcl/headless/svpprn.cxx b/vcl/headless/svpprn.cxx index aa8cd59de2d2..7ecb59f8c0b2 100644 --- a/vcl/headless/svpprn.cxx +++ b/vcl/headless/svpprn.cxx @@ -19,6 +19,7 @@ #include <vcl/svapp.hxx> #include <vcl/timer.hxx> +#include <vcl/QueueInfo.hxx> #include <printerinfomanager.hxx> #include <jobset.h> diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx index c1b11ebfaa58..91b22e9b77ec 100644 --- a/vcl/osx/salinst.cxx +++ b/vcl/osx/salinst.cxx @@ -37,6 +37,7 @@ #include <rtl/ustrbuf.hxx> #include <vclpluginapi.h> +#include <vcl/QueueInfo.hxx> #include <vcl/svapp.hxx> #include <vcl/window.hxx> #include <vcl/idle.hxx> diff --git a/vcl/qt5/Qt5Instance_Print.cxx b/vcl/qt5/Qt5Instance_Print.cxx index cab5757a31f4..3670eb67e4cd 100644 --- a/vcl/qt5/Qt5Instance_Print.cxx +++ b/vcl/qt5/Qt5Instance_Print.cxx @@ -22,6 +22,7 @@ #include <vcl/svapp.hxx> #include <vcl/timer.hxx> +#include <vcl/QueueInfo.hxx> #include <printerinfomanager.hxx> #include <jobset.h> diff --git a/vcl/source/app/svdata.cxx b/vcl/source/app/svdata.cxx index 05d53060b51e..16772724c782 100644 --- a/vcl/source/app/svdata.cxx +++ b/vcl/source/app/svdata.cxx @@ -26,6 +26,7 @@ #include <sal/log.hxx> #include <configsettings.hxx> +#include <vcl/QueueInfo.hxx> #include <vcl/dockwin.hxx> #include <vcl/menu.hxx> #include <vcl/print.hxx> diff --git a/vcl/source/app/svmain.cxx b/vcl/source/app/svmain.cxx index e571c2f269c5..05d8ef9c34a6 100644 --- a/vcl/source/app/svmain.cxx +++ b/vcl/source/app/svmain.cxx @@ -31,6 +31,7 @@ #include <comphelper/asyncnotification.hxx> #include <i18nlangtag/mslangid.hxx> #include <unotools/syslocaleoptions.hxx> +#include <vcl/QueueInfo.hxx> #include <vcl/svapp.hxx> #include <vcl/vclmain.hxx> #include <vcl/wrkwin.hxx> diff --git a/vcl/source/gdi/print.cxx b/vcl/source/gdi/print.cxx index 66ae9022faa8..6668d215d29b 100644 --- a/vcl/source/gdi/print.cxx +++ b/vcl/source/gdi/print.cxx @@ -23,6 +23,7 @@ #include <tools/helpers.hxx> #include <tools/debug.hxx> +#include <vcl/QueueInfo.hxx> #include <vcl/event.hxx> #include <vcl/virdev.hxx> #include <vcl/print.hxx> @@ -334,13 +335,6 @@ bool Printer::HasMirroredGraphics() const return false; } -// QueueInfo -QueueInfo::QueueInfo() -{ - mnStatus = PrintQueueFlags::NONE; - mnJobs = 0; -} - SalPrinterQueueInfo::SalPrinterQueueInfo() { mnStatus = PrintQueueFlags::NONE; diff --git a/vcl/source/printer/QueueInfo.cxx b/vcl/source/printer/QueueInfo.cxx new file mode 100644 index 000000000000..8ec787cbd1c5 --- /dev/null +++ b/vcl/source/printer/QueueInfo.cxx @@ -0,0 +1,35 @@ +/* -*- 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 . + */ + +#include <vcl/QueueInfo.hxx> + +QueueInfo::QueueInfo() +{ + mnStatus = PrintQueueFlags::NONE; + mnJobs = 0; +} + +const OUString& QueueInfo::GetPrinterName() const { return maPrinterName; } +const OUString& QueueInfo::GetDriver() const { return maDriver; } +const OUString& QueueInfo::GetLocation() const { return maLocation; } +const OUString& QueueInfo::GetComment() const { return maComment; } +PrintQueueFlags QueueInfo::GetStatus() const { return mnStatus; } +sal_uInt32 QueueInfo::GetJobs() const { return mnJobs; } + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx index ba86b136b413..28e4b689d276 100644 --- a/vcl/source/window/printdlg.cxx +++ b/vcl/source/window/printdlg.cxx @@ -22,6 +22,7 @@ #include <strings.hrc> #include <bitmaps.hlst> +#include <vcl/QueueInfo.hxx> #include <vcl/commandevent.hxx> #include <vcl/naturalsort.hxx> #include <vcl/print.hxx> diff --git a/vcl/source/window/winproc.cxx b/vcl/source/window/winproc.cxx index 57bba25eb16b..e50c7da96af5 100644 --- a/vcl/source/window/winproc.cxx +++ b/vcl/source/window/winproc.cxx @@ -27,6 +27,7 @@ #include <unotools/localedatawrapper.hxx> #include <comphelper/lok.hxx> +#include <vcl/QueueInfo.hxx> #include <vcl/timer.hxx> #include <vcl/event.hxx> #include <vcl/GestureEvent.hxx> diff --git a/vcl/unx/generic/print/genprnpsp.cxx b/vcl/unx/generic/print/genprnpsp.cxx index f88d8e18bbe2..788a196209fd 100644 --- a/vcl/unx/generic/print/genprnpsp.cxx +++ b/vcl/unx/generic/print/genprnpsp.cxx @@ -43,6 +43,7 @@ #include <vcl/gdimtf.hxx> #include <vcl/idle.hxx> #include <vcl/print.hxx> +#include <vcl/QueueInfo.hxx> #include <vcl/pdfwriter.hxx> #include <printerinfomanager.hxx> #include <vcl/svapp.hxx> diff --git a/vcl/win/gdi/salprn.cxx b/vcl/win/gdi/salprn.cxx index 98886c72a9dc..7947cd9a6406 100644 --- a/vcl/win/gdi/salprn.cxx +++ b/vcl/win/gdi/salprn.cxx @@ -32,6 +32,7 @@ #include <tools/urlobj.hxx> #include <vcl/weld.hxx> +#include <vcl/QueueInfo.hxx> #include <win/wincomp.hxx> #include <win/saldata.hxx> |