e6dfaf9f44
...from which an OUString can cheaply be instantiated. This is the OUString
equivalent of 4b9e440c51 "Turn OStringLiteral into
a consteval'ed, static-refcound rtl_String". Most remarks about that commit
apply here too (this commit is just substantially bigger and a bit more
complicated because there were so much more uses of OUStringLiteral than of
OStringLiteral):
The one downside is that OUStringLiteral now needs to be a template abstracting
over the string length. But any uses for which that is a problem (e.g., as the
element type of a container that would no longer be homogeneous, or in the
signature of a function that shall not be turned into a template for one reason
or another) can be replaced with std::u16string_view, without loss of efficiency
compared to the original OUStringLiteral, and without loss of expressivity.
The new OUStringLiteral ctor code would probably not be very efficient if it
were ever executed at runtime, but it is intended to be only executed at compile
time. Where available, C++20 "consteval" is used to statically ensure that.
The intended use of the new OUStringLiteral is in all cases where an
object that shall itself not be an OUString (e.g., because it shall be a
global static variable for which the OUString ctor/dtor would be detrimental at
library load/unload) must be converted to an OUString instance in at least one
place. Other string literal abstractions could use std::u16string_view (or just
plain char16_t const[N]), but interestingly OUStringLiteral might be more
efficient than constexpr std::u16string_view even for such cases, as it should
not need any relocations at library load time. For now, no existing uses of
OUStringLiteral have been changed to some other abstraction (unless technically
necessary as discussed above), and no additional places that would benefit from
OUStringLiteral have been changed to use it.
Global constexpr OUStringLiteral variables defined in an included file would be
somewhat suboptimal, as each translation unit that uses them would create its
own, unshared instance. The envisioned solution is to turn them into static
data members of some class (and there may be a loplugin coming to find and fix
affected places). Another approach that has been taken here in a few cases
where such variables were only used in one .cxx anyway is to move their
definitions from the .hxx into that one .cxx (in turn causing some files to
become empty and get removed completely)---which also silenced some GCC
-Werror=unused-variable if a variable from a .hxx was not used in some .cxx
including it.
To keep individual commits reasonably manageable, some consumers of
OUStringLiteral in rtl/ustrbuf.hxx and rtl/ustring.hxx are left in a somewhat
odd state for now, where they don't take advantage of OUStringLiteral's
equivalence to rtl_uString, but just keep extracting its contents and copy it
elsewhere. In follow-up commits, those consumers should be changed
appropriately, making them treat OUStringLiteral like an rtl_uString or
dropping the OUStringLiteral overload in favor of an existing (and cheap to use
now) OUString overload, etc.
In a similar vein, comparison operators between OUString and std::u16string_view
have been added to the existing plethora of comparison operator overloads. It
would be nice to eventually consolidate them, esp. with the overloads taking
OUStringLiteral and/or char16_t const[N] string literals, but that appears
tricky to get right without introducing new ambiguities. Also, a handful of
places across the code base use comparisons between OUString and OUStringNumber,
which are now ambiguous (converting the OUStringNumber to either OUString or
std::u16string_view). For simplicity, those few places have manually been fixed
for now by adding explicit conversion to std::u16string_view.
Also some compilerplugins code needed to be adapted, and some of the
compilerplugins/test cases have become irrelevant (and have been removed), as
the tested code would no longer compile in the first place.
sal/qa/rtl/strings/test_oustring_concat.cxx documents a workaround for GCC bug
<https://gcc.gnu.org/bugzilla/show_bug.cgi?id=96878> "Failed class template
argument deduction in unevaluated, parenthesized context". That place, as well
as uses of OUStringLiteral in extensions/source/abpilot/fieldmappingimpl.cxx and
i18npool/source/localedata/localedata.cxx, which have been replaced with
OUString::Concat (and which is arguably a better choice, anyway), also caused
failures with at least Clang 5.0.2 (but would not have caused failures with at
least recent Clang 12 trunk, so appear to be bugs in Clang that have meanwhile
been fixed).
Change-Id: I34174462a28f2000cfeb2d219ffd533a767920b8
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102222
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
117 lines
4.8 KiB
C++
117 lines
4.8 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 .
|
|
*/
|
|
|
|
#ifndef INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEFACTORY_HXX
|
|
#define INCLUDED_SDEXT_SOURCE_PRESENTER_PRESENTERPANEFACTORY_HXX
|
|
|
|
#include <cppuhelper/compbase.hxx>
|
|
#include <cppuhelper/basemutex.hxx>
|
|
#include <com/sun/star/frame/XController.hpp>
|
|
#include <com/sun/star/drawing/framework/XConfigurationController.hpp>
|
|
#include <com/sun/star/drawing/framework/XPane.hpp>
|
|
#include <com/sun/star/drawing/framework/XResourceFactory.hpp>
|
|
#include <com/sun/star/uno/XComponentContext.hpp>
|
|
#include <rtl/ref.hxx>
|
|
#include <map>
|
|
#include <memory>
|
|
|
|
namespace sdext::presenter {
|
|
|
|
class PresenterController;
|
|
|
|
typedef ::cppu::WeakComponentImplHelper <
|
|
css::drawing::framework::XResourceFactory
|
|
> PresenterPaneFactoryInterfaceBase;
|
|
|
|
/** The PresenterPaneFactory provides a fixed set of panes.
|
|
|
|
In order to make the presenter screen more easily extendable in the
|
|
future the set of supported panes could be made extendable on demand.
|
|
*/
|
|
class PresenterPaneFactory
|
|
: public ::cppu::BaseMutex,
|
|
public PresenterPaneFactoryInterfaceBase
|
|
{
|
|
public:
|
|
static constexpr OUStringLiteral msCurrentSlidePreviewPaneURL
|
|
= u"private:resource/pane/Presenter/Pane1";
|
|
static constexpr OUStringLiteral msNextSlidePreviewPaneURL
|
|
= u"private:resource/pane/Presenter/Pane2";
|
|
static constexpr OUStringLiteral msNotesPaneURL = u"private:resource/pane/Presenter/Pane3";
|
|
static constexpr OUStringLiteral msToolBarPaneURL = u"private:resource/pane/Presenter/Pane4";
|
|
static constexpr OUStringLiteral msSlideSorterPaneURL
|
|
= u"private:resource/pane/Presenter/Pane5";
|
|
|
|
/** Create a new instance of this class and register it as resource
|
|
factory in the drawing framework of the given controller.
|
|
This registration keeps it alive. When the drawing framework is
|
|
shut down and releases its reference to the factory then the factory
|
|
is destroyed.
|
|
*/
|
|
static css::uno::Reference<css::drawing::framework::XResourceFactory> Create (
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
|
|
const css::uno::Reference<css::frame::XController>& rxController,
|
|
const ::rtl::Reference<PresenterController>& rpPresenterController);
|
|
virtual ~PresenterPaneFactory() override;
|
|
|
|
virtual void SAL_CALL disposing() override;
|
|
|
|
// XResourceFactory
|
|
|
|
virtual css::uno::Reference<css::drawing::framework::XResource>
|
|
SAL_CALL createResource (
|
|
const css::uno::Reference<
|
|
css::drawing::framework::XResourceId>& rxPaneId) override;
|
|
|
|
virtual void SAL_CALL
|
|
releaseResource (
|
|
const css::uno::Reference<css::drawing::framework::XResource>&
|
|
rxPane) override;
|
|
|
|
private:
|
|
css::uno::WeakReference<css::uno::XComponentContext> mxComponentContextWeak;
|
|
css::uno::WeakReference<css::drawing::framework::XConfigurationController>
|
|
mxConfigurationControllerWeak;
|
|
::rtl::Reference<PresenterController> mpPresenterController;
|
|
typedef ::std::map<OUString, css::uno::Reference<css::drawing::framework::XResource> >
|
|
ResourceContainer;
|
|
std::unique_ptr<ResourceContainer> mpResourceCache;
|
|
|
|
PresenterPaneFactory (
|
|
const css::uno::Reference<css::uno::XComponentContext>& rxContext,
|
|
const ::rtl::Reference<PresenterController>& rpPresenterController);
|
|
|
|
void Register (const css::uno::Reference<css::frame::XController>& rxController);
|
|
|
|
css::uno::Reference<css::drawing::framework::XResource> CreatePane (
|
|
const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId);
|
|
css::uno::Reference<css::drawing::framework::XResource> CreatePane (
|
|
const css::uno::Reference<css::drawing::framework::XResourceId>& rxPaneId,
|
|
const css::uno::Reference<css::drawing::framework::XPane>& rxParentPane,
|
|
const bool bIsSpritePane);
|
|
|
|
/// @throws css::lang::DisposedException
|
|
void ThrowIfDisposed() const;
|
|
};
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|