mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vcl: split off QueueInfo to own files

Browse Source 
Change-Id: Ib2904066edd371229c5daa09b81b210e99853895
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/96251
Tested-by: Jenkins
Reviewed-by: Tomaž Vajngerl <quikee@gmail.com>
This commit is contained in:
Chris Sherlock 2020-05-29 18:47:17 +10:00 committed by Tomaž Vajngerl
parent e4e69bb675
commit 1a6b0f167d
16 changed files with 106 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
include/vcl/QueueInfo.hxx Normal file
View File

@ -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: */

25
include/vcl/print.hxx
View File

@ -41,6 +41,7 @@
class GDIMetaFile; class GDIMetaFile;
class SalInfoPrinter; class SalInfoPrinter;
struct SalPrinterQueueInfo; struct SalPrinterQueueInfo;
class QueueInfo;
class SalPrinter; class SalPrinter;
class VirtualDevice; class VirtualDevice;
enum class SalPrinterError; enum class SalPrinterError;
@ -52,30 +53,6 @@ namespace vcl {
namespace weld { class Window; } 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 enum class PrinterTransparencyMode
{ {
Auto = 0, Auto = 0,

1
svtools/source/dialogs/prnsetup.cxx
View File

@ -20,6 +20,7 @@
#include <svtools/prnsetup.hxx> #include <svtools/prnsetup.hxx>
#include <svtools/strings.hrc> #include <svtools/strings.hrc>
#include <svtools/svtresid.hxx> #include <svtools/svtresid.hxx>
#include <vcl/QueueInfo.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/print.hxx> #include <vcl/print.hxx>
#include <vcl/event.hxx> #include <vcl/event.hxx>

1
sw/source/ui/dbui/mmresultdialogs.cxx
View File

@ -32,6 +32,7 @@
#include <hintids.hxx> #include <hintids.hxx>
#include <swmodule.hxx> #include <swmodule.hxx>
#include <vcl/QueueInfo.hxx>
#include <editeng/langitem.hxx> #include <editeng/langitem.hxx>
#include <o3tl/temporary.hxx> #include <o3tl/temporary.hxx>
#include <svl/itemset.hxx> #include <svl/itemset.hxx>

1
vcl/Library_vcl.mk
View File

@ -117,6 +117,7 @@ endif
$(eval $(call gb_Library_add_exception_objects,vcl,\ $(eval $(call gb_Library_add_exception_objects,vcl,\
vcl/source/animate/Animation \ vcl/source/animate/Animation \
vcl/source/animate/AnimationBitmap \ vcl/source/animate/AnimationBitmap \
vcl/source/printer/QueueInfo \
vcl/source/window/errinf \ vcl/source/window/errinf \
vcl/source/window/settings \ vcl/source/window/settings \
vcl/source/window/paint \ vcl/source/window/paint \

1
vcl/headless/svpprn.cxx
View File

@ -19,6 +19,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <vcl/QueueInfo.hxx>
#include <printerinfomanager.hxx> #include <printerinfomanager.hxx>
#include <jobset.h> #include <jobset.h>

1
vcl/osx/salinst.cxx
View File

@ -37,6 +37,7 @@
#include <rtl/ustrbuf.hxx> #include <rtl/ustrbuf.hxx>
#include <vclpluginapi.h> #include <vclpluginapi.h>
#include <vcl/QueueInfo.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/window.hxx> #include <vcl/window.hxx>
#include <vcl/idle.hxx> #include <vcl/idle.hxx>

1
vcl/qt5/Qt5Instance_Print.cxx
View File

@ -22,6 +22,7 @@
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <vcl/QueueInfo.hxx>
#include <printerinfomanager.hxx> #include <printerinfomanager.hxx>
#include <jobset.h> #include <jobset.h>

1
vcl/source/app/svdata.cxx
View File

@ -26,6 +26,7 @@
#include <sal/log.hxx> #include <sal/log.hxx>
#include <configsettings.hxx> #include <configsettings.hxx>
#include <vcl/QueueInfo.hxx>
#include <vcl/dockwin.hxx> #include <vcl/dockwin.hxx>
#include <vcl/menu.hxx> #include <vcl/menu.hxx>
#include <vcl/print.hxx> #include <vcl/print.hxx>

1
vcl/source/app/svmain.cxx
View File

@ -31,6 +31,7 @@
#include <comphelper/asyncnotification.hxx> #include <comphelper/asyncnotification.hxx>
#include <i18nlangtag/mslangid.hxx> #include <i18nlangtag/mslangid.hxx>
#include <unotools/syslocaleoptions.hxx> #include <unotools/syslocaleoptions.hxx>
#include <vcl/QueueInfo.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>
#include <vcl/vclmain.hxx> #include <vcl/vclmain.hxx>
#include <vcl/wrkwin.hxx> #include <vcl/wrkwin.hxx>

8
vcl/source/gdi/print.cxx
View File

@ -23,6 +23,7 @@
#include <tools/helpers.hxx> #include <tools/helpers.hxx>
#include <tools/debug.hxx> #include <tools/debug.hxx>
#include <vcl/QueueInfo.hxx>
#include <vcl/event.hxx> #include <vcl/event.hxx>
#include <vcl/virdev.hxx> #include <vcl/virdev.hxx>
#include <vcl/print.hxx> #include <vcl/print.hxx>
@ -334,13 +335,6 @@ bool Printer::HasMirroredGraphics() const
return false; return false;
} }
// QueueInfo
QueueInfo::QueueInfo()
{
mnStatus = PrintQueueFlags::NONE;
mnJobs = 0;
}
SalPrinterQueueInfo::SalPrinterQueueInfo() SalPrinterQueueInfo::SalPrinterQueueInfo()
{ {
mnStatus = PrintQueueFlags::NONE; mnStatus = PrintQueueFlags::NONE;

35
vcl/source/printer/QueueInfo.cxx Normal file
View File

@ -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: */

1
vcl/source/window/printdlg.cxx
View File

@ -22,6 +22,7 @@
#include <strings.hrc> #include <strings.hrc>
#include <bitmaps.hlst> #include <bitmaps.hlst>
#include <vcl/QueueInfo.hxx>
#include <vcl/commandevent.hxx> #include <vcl/commandevent.hxx>
#include <vcl/naturalsort.hxx> #include <vcl/naturalsort.hxx>
#include <vcl/print.hxx> #include <vcl/print.hxx>

1
vcl/source/window/winproc.cxx
View File

@ -27,6 +27,7 @@
#include <unotools/localedatawrapper.hxx> #include <unotools/localedatawrapper.hxx>
#include <comphelper/lok.hxx> #include <comphelper/lok.hxx>
#include <vcl/QueueInfo.hxx>
#include <vcl/timer.hxx> #include <vcl/timer.hxx>
#include <vcl/event.hxx> #include <vcl/event.hxx>
#include <vcl/GestureEvent.hxx> #include <vcl/GestureEvent.hxx>

1
vcl/unx/generic/print/genprnpsp.cxx
View File

@ -43,6 +43,7 @@
#include <vcl/gdimtf.hxx> #include <vcl/gdimtf.hxx>
#include <vcl/idle.hxx> #include <vcl/idle.hxx>
#include <vcl/print.hxx> #include <vcl/print.hxx>
#include <vcl/QueueInfo.hxx>
#include <vcl/pdfwriter.hxx> #include <vcl/pdfwriter.hxx>
#include <printerinfomanager.hxx> #include <printerinfomanager.hxx>
#include <vcl/svapp.hxx> #include <vcl/svapp.hxx>

1
vcl/win/gdi/salprn.cxx
View File

@ -32,6 +32,7 @@
#include <tools/urlobj.hxx> #include <tools/urlobj.hxx>
#include <vcl/weld.hxx> #include <vcl/weld.hxx>
#include <vcl/QueueInfo.hxx>
#include <win/wincomp.hxx> #include <win/wincomp.hxx>
#include <win/saldata.hxx> #include <win/saldata.hxx>