35e471bb4d
...for LIBO_INTERNAL_ONLY. These had been missed by
1b43cceaea "Make many OUString functions take
std::u16string_view parameters" because they did not match the multi-overload
pattern that was addressed there, but they nevertheless benefit from being
changed just as well (witness e.g. the various resulting changes from copy() to
subView()).
This showed a conversion from OStringChar to std::string_view to be missing
(while the corresponding conversion form OUStringChar to std::u16string_view was
already present).
The improvement to loplugin:stringadd became necessary to fix
> [CPT] compilerplugins/clang/test/stringadd.cxx
> error: 'error' diagnostics expected but not seen:
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 43 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:42): simplify by merging with the preceding assignment [loplugin:stringadd]
> File ~/lo/core/compilerplugins/clang/test/stringadd.cxx Line 61 (directive at ~/lo/core/compilerplugins/clang/test/stringadd.cxx:60): simplify by merging with the preceding assignment [loplugin:stringadd]
> 2 errors generated.
Change-Id: Ie40de0616a66e60e289c1af0ca60aed6f9ecc279
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/107602
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
140 lines
4.2 KiB
C++
140 lines
4.2 KiB
C++
/* -*- 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 <sal/config.h>
|
|
|
|
#include <string_view>
|
|
|
|
#include <Qt5Instance.hxx>
|
|
#include <Qt5Printer.hxx>
|
|
|
|
#include <vcl/svapp.hxx>
|
|
#include <vcl/timer.hxx>
|
|
#include <vcl/QueueInfo.hxx>
|
|
#include <printerinfomanager.hxx>
|
|
|
|
#include <jobset.h>
|
|
#include <print.h>
|
|
#include <salptype.hxx>
|
|
#include <saldatabasic.hxx>
|
|
|
|
#include <unx/genpspgraphics.h>
|
|
|
|
using namespace psp;
|
|
|
|
/*
|
|
* static helpers
|
|
*/
|
|
|
|
static OUString getPdfDir(const PrinterInfo& rInfo)
|
|
{
|
|
OUString aDir;
|
|
sal_Int32 nIndex = 0;
|
|
while (nIndex != -1)
|
|
{
|
|
OUString aToken(rInfo.m_aFeatures.getToken(0, ',', nIndex));
|
|
if (aToken.startsWith("pdf="))
|
|
{
|
|
sal_Int32 nPos = 0;
|
|
aDir = aToken.getToken(1, '=', nPos);
|
|
if (aDir.isEmpty())
|
|
if (auto const env = getenv("HOME"))
|
|
{
|
|
aDir = OStringToOUString(std::string_view(env), osl_getThreadTextEncoding());
|
|
}
|
|
break;
|
|
}
|
|
}
|
|
return aDir;
|
|
}
|
|
|
|
SalInfoPrinter* Qt5Instance::CreateInfoPrinter(SalPrinterQueueInfo* pQueueInfo,
|
|
ImplJobSetup* pJobSetup)
|
|
{
|
|
// create and initialize SalInfoPrinter
|
|
PspSalInfoPrinter* pPrinter = new PspSalInfoPrinter;
|
|
configurePspInfoPrinter(pPrinter, pQueueInfo, pJobSetup);
|
|
|
|
return pPrinter;
|
|
}
|
|
|
|
void Qt5Instance::DestroyInfoPrinter(SalInfoPrinter* pPrinter) { delete pPrinter; }
|
|
|
|
std::unique_ptr<SalPrinter> Qt5Instance::CreatePrinter(SalInfoPrinter* pInfoPrinter)
|
|
{
|
|
// create and initialize SalPrinter
|
|
Qt5Printer* pPrinter = new Qt5Printer(pInfoPrinter);
|
|
pPrinter->m_aJobData = static_cast<PspSalInfoPrinter*>(pInfoPrinter)->m_aJobData;
|
|
|
|
return std::unique_ptr<SalPrinter>(pPrinter);
|
|
}
|
|
|
|
void Qt5Instance::GetPrinterQueueInfo(ImplPrnQueueList* pList)
|
|
{
|
|
PrinterInfoManager& rManager(PrinterInfoManager::get());
|
|
static const char* pNoSyncDetection = getenv("SAL_DISABLE_SYNCHRONOUS_PRINTER_DETECTION");
|
|
if (!pNoSyncDetection || !*pNoSyncDetection)
|
|
{
|
|
// #i62663# synchronize possible asynchronouse printer detection now
|
|
rManager.checkPrintersChanged(true);
|
|
}
|
|
::std::vector<OUString> aPrinters;
|
|
rManager.listPrinters(aPrinters);
|
|
|
|
for (const auto& rPrinter : aPrinters)
|
|
{
|
|
const PrinterInfo& rInfo(rManager.getPrinterInfo(rPrinter));
|
|
// create new entry
|
|
std::unique_ptr<SalPrinterQueueInfo> pInfo(new SalPrinterQueueInfo);
|
|
pInfo->maPrinterName = rPrinter;
|
|
pInfo->maDriver = rInfo.m_aDriverName;
|
|
pInfo->maLocation = rInfo.m_aLocation;
|
|
pInfo->maComment = rInfo.m_aComment;
|
|
|
|
sal_Int32 nIndex = 0;
|
|
while (nIndex != -1)
|
|
{
|
|
OUString aToken(rInfo.m_aFeatures.getToken(0, ',', nIndex));
|
|
if (aToken.startsWith("pdf="))
|
|
{
|
|
pInfo->maLocation = getPdfDir(rInfo);
|
|
break;
|
|
}
|
|
}
|
|
|
|
pList->Add(std::move(pInfo));
|
|
}
|
|
}
|
|
|
|
void Qt5Instance::GetPrinterQueueState(SalPrinterQueueInfo*) {}
|
|
|
|
OUString Qt5Instance::GetDefaultPrinter()
|
|
{
|
|
PrinterInfoManager& rManager(PrinterInfoManager::get());
|
|
return rManager.getDefaultPrinter();
|
|
}
|
|
|
|
void Qt5Instance::PostPrintersChanged() {}
|
|
|
|
std::unique_ptr<GenPspGraphics> Qt5Instance::CreatePrintGraphics()
|
|
{
|
|
return std::make_unique<GenPspGraphics>();
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|