eca5ea9f79
Because some stuff wants to multiple-inherit from VclAbstractDialog and OutputDevice-subclasses, and we'd prefer to keep all the lifetime management through a single smart pointer class (VclPtr) The change in msgbox.cxx and window.cxx is to workaround a bug in VS2013 to do with virtual inheritance and delegating constructors. Change-Id: I178e8983b7d20a7d2790aa283be838dca5d14773 Reviewed-on: https://gerrit.libreoffice.org/29140 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk> Tested-by: Noel Grandin <noel.grandin@collabora.co.uk>
50 lines
1.6 KiB
C++
50 lines
1.6 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_CUI_SOURCE_INC_NEWTABLEDLG_HXX
|
|
#define INCLUDED_CUI_SOURCE_INC_NEWTABLEDLG_HXX
|
|
|
|
#include <vcl/fixed.hxx>
|
|
#include <vcl/field.hxx>
|
|
#include <vcl/button.hxx>
|
|
|
|
#include <svx/stddlg.hxx>
|
|
#include <svx/svxdlg.hxx>
|
|
|
|
class SvxNewTableDialog : public SvxAbstractNewTableDialog
|
|
{
|
|
private:
|
|
VclPtr<ModalDialog> m_pDialog;
|
|
VclPtr<NumericField> mpNumColumns;
|
|
VclPtr<NumericField> mpNumRows;
|
|
|
|
public:
|
|
SvxNewTableDialog();
|
|
virtual ~SvxNewTableDialog() override;
|
|
virtual void dispose() override;
|
|
|
|
virtual short Execute() override;
|
|
|
|
virtual sal_Int32 getRows() const override;
|
|
virtual sal_Int32 getColumns() const override;
|
|
};
|
|
|
|
#endif // INCLUDED_CUI_SOURCE_INC_NEWTABLEDLG_HXX
|
|
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|