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

drop ui-previewer

Browse Source 
the need for this is gone now the transition from src to ui
is completed. I certainly don't use this anymore.

Change-Id: I5bf9c8bc4f00152977091f466c2e808b824acb44
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/126925
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
This commit is contained in:
Caolán McNamara
2021-12-16 15:31:07 +00:00
parent ede7be0c3c
commit c26ce14c2b
6 changed files with 1 additions and 161 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Repository.mk
View File

@@ -72,7 +72,6 @@ $(eval $(call gb_Helper_register_executables,NONE, \
svpclient ) \
$(if $(filter LINUX %BSD SOLARIS,$(OS)), tilebench) \
$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)),icontest) \
$(if $(DISABLE_GUI),,ui-previewer) \
vcldemo \
tiledrendering \
mtfdemo \

2
bin/check-elf-dynamic-objects
View File

@@ -152,7 +152,7 @@ local file="$1"
${kf5allowlist}"
fi
;;
*/libdesktop_detectorlo.so|*/ui-previewer|*/oosplash|*/gengal.bin)
*/libdesktop_detectorlo.so|*/oosplash|*/gengal.bin)
allowlist="${allowlist} ${x11allowlist}"
;;
*/libvclplug_genlo.so|*/libchartcorelo.so|*/libavmediaogl.so|*/libOGLTranslo.so|*/liboglcanvaslo.so)

38
vcl/Executable_ui-previewer.mk
View File

@@ -1,38 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
#
# 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/.
#
$(eval $(call gb_Executable_Executable,ui-previewer))
$(eval $(call gb_Executable_use_api,ui-previewer,\
offapi \
udkapi \
))
$(eval $(call gb_Executable_use_libraries,ui-previewer,\
comphelper \
cppu \
cppuhelper \
sal \
tl \
ucbhelper \
))
$(eval $(call gb_Executable_use_vclmain,ui-previewer))
$(eval $(call gb_Executable_add_exception_objects,ui-previewer,\
vcl/source/uipreviewer/previewer \
))
$(eval $(call gb_Executable_add_defs,ui-previewer,\
-DVCL_INTERNALS \
))
$(eval $(call gb_Executable_add_default_nativeres,ui-previewer))
# vim: set noet sw=4 ts=4:

2
vcl/Module_vcl.mk
View File

@@ -32,8 +32,6 @@ $(eval $(call gb_Module_add_targets,vcl,\
$(if $(filter DESKTOP,$(BUILD_TYPE)), \
StaticLibrary_vclmain \
$(if $(DISABLE_GUI),, \
$(if $(ENABLE_MACOSX_SANDBOX),, \
Executable_ui-previewer) \
$(if $(filter LINUX MACOSX SOLARIS WNT %BSD,$(OS)), \
Executable_vcldemo \
Executable_icontest \

116
vcl/source/uipreviewer/previewer.cxx
View File

@@ -1,116 +0,0 @@
/* -*- 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/.
*/
#include <com/sun/star/lang/XComponent.hpp>
#include <com/sun/star/lang/XMultiComponentFactory.hpp>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/ucb/UniversalContentBroker.hpp>
#include <comphelper/processfactory.hxx>
#include <cppuhelper/bootstrap.hxx>
#include <osl/file.hxx>
#include <vcl/builder.hxx>
#include <vcl/toolkit/dialog.hxx>
#include <vcl/help.hxx>
#include <vcl/svapp.hxx>
#include <vcl/vclmain.hxx>
namespace {
class UIPreviewApp : public Application
{
public:
virtual void Init() override;
virtual int Main() override;
};
}
using namespace com::sun::star;
void UIPreviewApp::Init()
{
uno::Reference<uno::XComponentContext> xContext =
cppu::defaultBootstrap_InitialComponentContext();
uno::Reference<lang::XMultiComponentFactory> xFactory =
xContext->getServiceManager();
uno::Reference<lang::XMultiServiceFactory> xSFactory(xFactory, uno::UNO_QUERY_THROW);
comphelper::setProcessServiceFactory(xSFactory);
// Create UCB (for backwards compatibility, in case some code still uses
// plain createInstance w/o args directly to obtain an instance):
::ucb::UniversalContentBroker::create(
comphelper::getProcessComponentContext() );
}
int UIPreviewApp::Main()
{
std::vector<OUString> uifiles;
for (sal_uInt16 i = 0; i < GetCommandLineParamCount(); ++i)
{
OUString aFileUrl;
osl::File::getFileURLFromSystemPath(GetCommandLineParam(i), aFileUrl);
uifiles.push_back(aFileUrl);
}
if (uifiles.empty())
{
fprintf(stderr, "Usage: ui-previewer file.ui\n");
return EXIT_FAILURE;
}
// turn on tooltips
Help::EnableQuickHelp();
int nRet = EXIT_SUCCESS;
try
{
VclPtrInstance<Dialog> pDialog(nullptr, WB_STDDIALOG | WB_SIZEABLE, Dialog::InitFlag::NoParent);
{
VclBuilder aBuilder(pDialog, OUString(), uifiles[0]);
vcl::Window *pRoot = aBuilder.get_widget_root();
Dialog *pRealDialog = dynamic_cast<Dialog*>(pRoot);
if (!pRealDialog)
pRealDialog = pDialog;
pRealDialog->SetText("LibreOffice ui-previewer");
pRealDialog->SetStyle(pDialog->GetStyle()|WB_CLOSEABLE);
/*
Force a new StateChangedType::InitShow for the edge case where pRoot
is not a dialog or contents of a dialog, but instead a visible floating window
which may have had initshow already done before it was given children
*/
pRoot->Hide();
pRoot->Show();
pRealDialog->Execute();
}
pDialog.disposeAndClear();
}
catch (const uno::Exception &e)
{
fprintf(stderr, "fatal error: %s\n", OUStringToOString(e.Message, osl_getThreadTextEncoding()).getStr());
nRet = EXIT_FAILURE;
}
catch (const std::exception &e)
{
fprintf(stderr, "fatal error: %s\n", e.what());
nRet = EXIT_FAILURE;
}
return nRet;
}
void vclmain::createApplication()
{
static UIPreviewApp aApp;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */

3
wasm-qt/README.md
View File

@@ -5,9 +5,6 @@ This module provides support for emscripten cross build
## Status
$ make
$ emrun --serve_after_close instdir/program/ui-previewer.html
The `ui-previewer` "binary" will "crash" with memory alignment problems.
You can run the WASM mandelbrot Qt example, if you copy its HTML
and the qtloader.js from the Qt's example folder after build with: