diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-10-02 20:41:08 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-10-03 11:11:14 +0200 |
| commit | 81903d443116c643a9ff92d92c092812abc7f57d (patch) | |
| tree | 1d4d533ef9171c96b2ffa910810dceecd2ce700c /include/vcl | |
| parent | ee2e8d0c0670b4eeecd73b76d7f182fa003426ae (diff) | |
merge msgbox and stdtext
Change-Id: If95d78746eff3ae5343e7d4c6bb2433537ccb84d
Reviewed-on: https://gerrit.libreoffice.org/80099
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/msgbox.hxx | 40 | ||||
| -rw-r--r-- | include/vcl/stdtext.hxx | 15 |
2 files changed, 15 insertions, 40 deletions
diff --git a/include/vcl/msgbox.hxx b/include/vcl/msgbox.hxx deleted file mode 100644 index 042cef0a4010..000000000000 --- a/include/vcl/msgbox.hxx +++ /dev/null @@ -1,40 +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/. - * - * 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_VCL_MSGBOX_HXX -#define INCLUDED_VCL_MSGBOX_HXX - -#include <vcl/dllapi.h> -#include <vcl/image.hxx> - -VCL_DLLPUBLIC Image const & GetStandardInfoBoxImage(); -VCL_DLLPUBLIC OUString GetStandardInfoBoxText(); - -VCL_DLLPUBLIC Image const & GetStandardWarningBoxImage(); -VCL_DLLPUBLIC OUString GetStandardWarningBoxText(); - -VCL_DLLPUBLIC Image const & GetStandardErrorBoxImage(); -VCL_DLLPUBLIC OUString GetStandardErrorBoxText(); - -VCL_DLLPUBLIC Image const & GetStandardQueryBoxImage(); -VCL_DLLPUBLIC OUString GetStandardQueryBoxText(); - -#endif // INCLUDED_VCL_MSGBOX_HXX - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/include/vcl/stdtext.hxx b/include/vcl/stdtext.hxx index 5287fc746a26..c98e4c4c7779 100644 --- a/include/vcl/stdtext.hxx +++ b/include/vcl/stdtext.hxx @@ -24,11 +24,26 @@ #include <tools/wintypes.hxx> #include <vcl/dllapi.h> +class Image; namespace weld { class Widget; } void VCL_DLLPUBLIC ShowServiceNotAvailableError(weld::Widget* pParent, const OUString& rServiceName, bool bError); + OUString VCL_DLLPUBLIC GetStandardText(StandardButtonType eButton); +VCL_DLLPUBLIC Image const & GetStandardInfoBoxImage(); +VCL_DLLPUBLIC OUString GetStandardInfoBoxText(); + +VCL_DLLPUBLIC Image const & GetStandardWarningBoxImage(); +VCL_DLLPUBLIC OUString GetStandardWarningBoxText(); + +VCL_DLLPUBLIC Image const & GetStandardErrorBoxImage(); +VCL_DLLPUBLIC OUString GetStandardErrorBoxText(); + +VCL_DLLPUBLIC Image const & GetStandardQueryBoxImage(); +VCL_DLLPUBLIC OUString GetStandardQueryBoxText(); + + #endif // INCLUDED_VCL_STDTEXT_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |