Chris Sherlock
fced837029
We need to call on framework's shutdown to cleanup after ourselves
properly. This has only become apparent after commit 6e35794ca where we
assert if we try to dispose to process's component context before we
shutdown the app properly.
During this we also noticed that we got a warning:
warn:i18nlangtag:1855739:1855739:i18nlangtag/source/isolang/mslangid.cxx:105: MsLangId::getConfiguredSystemLanguage() - not configured yet
So I have fixed this by configuring the system language at init.
Change-Id: I3cb73b1dad84f1097696c15e5c845d97fa58befa
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/127796
Tested-by: Jenkins
Reviewed-by: Hossein <hossein@libreoffice.org>
87 lines
2.2 KiB
C++
87 lines
2.2 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/.
|
|
*/
|
|
|
|
#include <framework/desktop.hxx>
|
|
#include <cppuhelper/bootstrap.hxx>
|
|
#include <comphelper/processfactory.hxx>
|
|
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
|
|
#include <com/sun/star/uno/XComponentContext.hpp>
|
|
#include <i18nlangtag/languagetag.hxx>
|
|
#include <i18nlangtag/mslangid.hxx>
|
|
#include <o3tl/deleter.hxx>
|
|
|
|
#include <vcl/svapp.hxx>
|
|
#include <vcl/wrkwin.hxx>
|
|
|
|
namespace
|
|
{
|
|
class TheWindow : public WorkWindow
|
|
{
|
|
public:
|
|
TheWindow()
|
|
: WorkWindow(nullptr, WB_APP | WB_STDWORK)
|
|
{
|
|
}
|
|
virtual void Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect);
|
|
};
|
|
|
|
class TheApplication : public Application
|
|
{
|
|
public:
|
|
virtual int Main();
|
|
|
|
private:
|
|
VclPtr<TheWindow> mpWin;
|
|
};
|
|
}
|
|
|
|
void TheWindow::Paint(vcl::RenderContext& rRenderContext, const tools::Rectangle& rRect)
|
|
{
|
|
rRenderContext.DrawText(Point(rRect.GetWidth() / 2, rRect.getHeight() / 2),
|
|
OUString(u"VCL module in LibreOffice"));
|
|
}
|
|
|
|
int TheApplication::Main()
|
|
{
|
|
mpWin = VclPtr<TheWindow>::Create();
|
|
mpWin->SetText(u"VCL");
|
|
mpWin->Show();
|
|
Execute();
|
|
mpWin.disposeAndClear();
|
|
return 0;
|
|
}
|
|
|
|
static int main_impl()
|
|
{
|
|
auto xContext = cppu::defaultBootstrap_InitialComponentContext();
|
|
css::uno::Reference<css::lang::XMultiServiceFactory> xServiceManager(
|
|
xContext->getServiceManager(), css::uno::UNO_QUERY);
|
|
comphelper::setProcessServiceFactory(xServiceManager);
|
|
LanguageTag::setConfiguredSystemLanguage(MsLangId::getSystemLanguage());
|
|
|
|
TheApplication aApp;
|
|
InitVCL();
|
|
int ret = aApp.Main();
|
|
framework::getDesktop(::comphelper::getProcessComponentContext())->terminate();
|
|
DeInitVCL();
|
|
|
|
comphelper::setProcessServiceFactory(nullptr);
|
|
|
|
return ret;
|
|
}
|
|
|
|
int main()
|
|
{
|
|
int ret;
|
|
suppress_fun_call_w_exception(ret = main_impl());
|
|
return ret;
|
|
}
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
|