91dd2db17b
The issue of 362d4f0cd4 "Explicitly mark
overriding destructors as 'virtual'" appears to no longer be a problem with
MSVC 2013.
(The little change in the rewriting code of compilerplugins/clang/override.cxx
was necessary to prevent an endless loop when adding "override" to
OOO_DLLPUBLIC_CHARTTOOLS virtual ~CloseableLifeTimeManager();
in chart2/source/inc/LifeTime.hxx, getting stuck in the leading
OOO_DLLPUBLIC_CHARTTOOLS macro. Can't remember what that
isAtEndOfImmediateMacroExpansion thing was originally necessary for, anyway.)
Change-Id: I534c634504d7216b9bb632c2775c04eaf27e927e
77 lines
2.4 KiB
C++
77 lines
2.4 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_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTAXIS_GRID_HXX
|
|
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_INSERTAXIS_GRID_HXX
|
|
|
|
#include <vcl/dialog.hxx>
|
|
#include <vcl/fixed.hxx>
|
|
#include <vcl/button.hxx>
|
|
#include <com/sun/star/uno/Sequence.hxx>
|
|
|
|
namespace chart
|
|
{
|
|
|
|
struct InsertAxisOrGridDialogData
|
|
{
|
|
css::uno::Sequence< sal_Bool > aPossibilityList;
|
|
css::uno::Sequence< sal_Bool > aExistenceList;
|
|
|
|
InsertAxisOrGridDialogData();
|
|
};
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* insert Axis dialog (also base for grid dialog)
|
|
|*
|
|
\************************************************************************/
|
|
class SchAxisDlg : public ModalDialog
|
|
{
|
|
protected:
|
|
VclPtr<CheckBox> m_pCbPrimaryX;
|
|
VclPtr<CheckBox> m_pCbPrimaryY;
|
|
VclPtr<CheckBox> m_pCbPrimaryZ;
|
|
VclPtr<CheckBox> m_pCbSecondaryX;
|
|
VclPtr<CheckBox> m_pCbSecondaryY;
|
|
VclPtr<CheckBox> m_pCbSecondaryZ;
|
|
|
|
public:
|
|
SchAxisDlg(vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput, bool bAxisDlg=true);
|
|
virtual ~SchAxisDlg() override;
|
|
virtual void dispose() override;
|
|
|
|
void getResult( InsertAxisOrGridDialogData& rOutput );
|
|
};
|
|
|
|
/*************************************************************************
|
|
|*
|
|
|* Grid dialog
|
|
|*
|
|
\************************************************************************/
|
|
class SchGridDlg : public SchAxisDlg
|
|
{
|
|
public:
|
|
SchGridDlg( vcl::Window* pParent, const InsertAxisOrGridDialogData& rInput );
|
|
};
|
|
|
|
} //namespace chart
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|