aaf6ce108e
Create two Calc views, set the first view language to English, second
view language to German. Type in the English view, double-click on a
chart in the German view. The sidebar in the German view will have
English strings in it. This doesn't happen if there is no typing right
after the chart activation in the English view.
What happens is that the sidebar update is async, and
sfx2::sidebar::SidebarController::notifyContextChangeEvent() gets
called, which registers an aync event when it calls
AsynchronousCall::RequestCall(). Then later this job gets scheduled, but
possibly by that time the active view is the English one, leading to
English strings when chart::ColumnChartDialogController::getName() calls
SchResId(), which works from the language of the current view.
Fix the problem similar to what commit
fb7b0b9447 (cool#7492 sfx2 lok: just set
language/locale on async binding update, 2024-01-09), did: set the
language/locale from the current view before executing the async job and
restore the old value once we're done.
Extract the now duplicated code to a new SfxLokLanguageGuard, so in case
more places have a problem with incorrect l10n, then it's meant to be a
one-liner to fix further places.
Change-Id: I52724a24d93fb753175a3b9b99bc33178519d981
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161920
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins
69 lines
2.6 KiB
C++
69 lines
2.6 KiB
C++
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4; fill-column: 100 -*- */
|
|
/*
|
|
* 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/.
|
|
*/
|
|
|
|
#pragma once
|
|
|
|
#include <sal/config.h>
|
|
#include <test/testdllapi.hxx>
|
|
#include <LibreOfficeKit/LibreOfficeKitTypes.h>
|
|
#include <sfx2/lokcallback.hxx>
|
|
#include <vcl/idle.hxx>
|
|
|
|
#include <vector>
|
|
|
|
class SfxChildWindow;
|
|
|
|
/**
|
|
A helper to convert SfxLokCallbackInterface to a LIbreOfficeKitCallback for tests.
|
|
|
|
It reimplements the specialized callbacks and converts them to the generic type/payload
|
|
callback.
|
|
*/
|
|
class OOO_DLLPUBLIC_TEST TestLokCallbackWrapper final : public SfxLokCallbackInterface, public Idle
|
|
{
|
|
public:
|
|
TestLokCallbackWrapper(LibreOfficeKitCallback callback, void* data);
|
|
/// Discard all possibly still held events.
|
|
void clear();
|
|
/// Set the view id of the associated SfxViewShell.
|
|
void setLOKViewId(int viewId) { m_viewId = viewId; }
|
|
virtual void libreOfficeKitViewCallback(int nType, const rtl::OString& pPayload) override;
|
|
virtual void libreOfficeKitViewCallbackWithViewId(int nType, const rtl::OString& pPayload,
|
|
int nViewId) override;
|
|
virtual void libreOfficeKitViewInvalidateTilesCallback(const tools::Rectangle* pRect, int nPart,
|
|
int nMode) override;
|
|
virtual void libreOfficeKitViewUpdatedCallback(int nType) override;
|
|
virtual void libreOfficeKitViewUpdatedCallbackPerViewId(int nType, int nViewId,
|
|
int nSourceViewId) override;
|
|
virtual void libreOfficeKitViewAddPendingInvalidateTiles() override;
|
|
virtual void dumpState(rtl::OStringBuffer&) override{};
|
|
|
|
virtual void Invoke() override;
|
|
|
|
static SfxChildWindow* InitializeSidebar();
|
|
|
|
private:
|
|
void callCallback(int nType, const char* pPayload, int nViewId);
|
|
void startTimer();
|
|
void flushLOKData();
|
|
void discardUpdatedTypes(int nType, int nViewId);
|
|
LibreOfficeKitCallback m_callback;
|
|
void* m_data;
|
|
int m_viewId = -1; // the associated SfxViewShell
|
|
std::vector<int> m_updatedTypes; // value is type
|
|
struct PerViewIdData
|
|
{
|
|
int type;
|
|
int viewId;
|
|
int sourceViewId;
|
|
};
|
|
std::vector<PerViewIdData> m_updatedTypesPerViewId;
|
|
};
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|