Resolve several thousand lines of conflicts. Conflicts: accessibility/source/extended/accessiblelistbox.cxx accessibility/source/standard/vclxaccessiblecombobox.cxx accessibility/source/standard/vclxaccessibledropdowncombobox.cxx accessibility/source/standard/vclxaccessibledropdownlistbox.cxx accessibility/source/standard/vclxaccessiblelistbox.cxx accessibility/source/standard/vclxaccessibletextfield.cxx basctl/source/basicide/basidesh.cxx cui/source/inc/chardlg.hxx cui/source/tabpages/tpbitmap.cxx dbaccess/source/ui/dlg/UserAdmin.cxx dbaccess/source/ui/querydesign/ConnectionLineAccess.cxx extensions/source/propctrlr/propertyeditor.hxx extensions/source/scanner/sanedlg.cxx filter/source/pdf/impdialog.cxx include/sfx2/mgetempl.hxx include/sfx2/sidebar/SidebarToolBox.hxx include/sfx2/viewsh.hxx include/svtools/brwbox.hxx include/svtools/filectrl.hxx include/svtools/scrwin.hxx include/svx/dlgctrl.hxx include/svx/sidebar/Popup.hxx include/svx/sidebar/PopupContainer.hxx include/svx/sidebar/PopupControl.hxx include/svx/sidebar/SidebarDialControl.hxx include/svx/sidebar/ValueSetWithTextControl.hxx sc/source/ui/condformat/condformatdlgentry.cxx sc/source/ui/navipi/navipi.cxx sc/source/ui/sidebar/CellBorderStyleControl.hxx sd/source/ui/animations/CustomAnimationDialog.cxx sd/source/ui/inc/DrawViewShell.hxx sd/source/ui/inc/Ruler.hxx sd/source/ui/inc/SlideSorter.hxx sd/source/ui/inc/ViewTabBar.hxx sd/source/ui/inc/Window.hxx sd/source/ui/inc/morphdlg.hxx sd/source/ui/inc/sdpreslt.hxx sd/source/ui/sidebar/CurrentMasterPagesSelector.hxx sd/source/ui/sidebar/LayoutMenu.hxx sd/source/ui/sidebar/MasterPagesSelector.hxx sd/source/ui/sidebar/NavigatorWrapper.hxx sd/source/ui/sidebar/PanelBase.hxx sd/source/ui/sidebar/RecentMasterPagesSelector.cxx sd/source/ui/sidebar/RecentMasterPagesSelector.hxx sd/source/ui/slideshow/showwindow.hxx sd/source/ui/slidesorter/view/SlsInsertAnimator.cxx sd/source/ui/slidesorter/view/SlsLayeredDevice.hxx sd/source/ui/view/ViewShellBase.cxx sd/source/ui/view/drviewsa.cxx sfx2/source/appl/fileobj.hxx sfx2/source/appl/opengrf.cxx sfx2/source/control/thumbnailviewacc.hxx sfx2/source/dialog/securitypage.cxx sfx2/source/dialog/templdlg.cxx sfx2/source/doc/docinsert.cxx sfx2/source/doc/guisaveas.cxx sfx2/source/inc/alienwarn.hxx sfx2/source/sidebar/Deck.cxx sfx2/source/sidebar/Deck.hxx sfx2/source/sidebar/DeckTitleBar.cxx sfx2/source/sidebar/DeckTitleBar.hxx sfx2/source/sidebar/MenuButton.cxx sfx2/source/sidebar/MenuButton.hxx sfx2/source/sidebar/Panel.cxx sfx2/source/sidebar/Panel.hxx sfx2/source/sidebar/PanelTitleBar.hxx sfx2/source/sidebar/SidebarDockingWindow.hxx sfx2/source/sidebar/SidebarToolBox.cxx sfx2/source/sidebar/TabBar.hxx sfx2/source/sidebar/TabItem.cxx sfx2/source/sidebar/TabItem.hxx sfx2/source/sidebar/TitleBar.hxx sfx2/source/toolbox/imgmgr.cxx starmath/inc/edit.hxx starmath/inc/smmod.hxx starmath/qa/cppunit/test_starmath.cxx starmath/source/edit.cxx starmath/source/smmod.cxx svtools/source/brwbox/brwbox1.cxx svtools/source/brwbox/datwin.hxx svtools/source/contnr/fileview.cxx svtools/source/contnr/simptabl.cxx svtools/source/control/filectrl.cxx svtools/source/control/valueimp.hxx svx/inc/GalleryControl.hxx svx/source/dialog/dlgctrl.cxx svx/source/dialog/swframeexample.cxx svx/source/fmcomp/fmgridif.cxx svx/source/gallery2/GalleryControl.cxx svx/source/sidebar/EmptyPanel.hxx svx/source/sidebar/area/AreaPropertyPanel.hxx svx/source/sidebar/area/AreaTransparencyGradientControl.hxx svx/source/sidebar/graphic/GraphicPropertyPanel.hxx svx/source/sidebar/insert/InsertPropertyPanel.cxx svx/source/sidebar/insert/InsertPropertyPanel.hxx svx/source/sidebar/line/LinePropertyPanel.hxx svx/source/sidebar/line/LineWidthControl.cxx svx/source/sidebar/line/LineWidthControl.hxx svx/source/sidebar/line/LineWidthValueSet.hxx svx/source/sidebar/paragraph/ParaPropertyPanel.hxx svx/source/sidebar/possize/SidebarDialControl.cxx svx/source/sidebar/text/TextCharacterSpacingPopup.hxx svx/source/sidebar/text/TextPropertyPanel.hxx svx/source/sidebar/tools/PopupContainer.cxx svx/source/sidebar/tools/PopupControl.cxx svx/source/sidebar/tools/ValueSetWithTextControl.cxx svx/source/svdraw/svdfmtf.hxx svx/source/svdraw/svdibrow.cxx svx/source/tbxctrls/colrctrl.cxx svx/source/tbxctrls/tbcontrl.cxx sw/source/ui/dbui/mmaddressblockpage.cxx sw/source/ui/dialog/uiregionsw.cxx sw/source/ui/index/cnttab.cxx sw/source/uibase/inc/drpcps.hxx sw/source/uibase/sidebar/PageColumnControl.hxx sw/source/uibase/sidebar/PageMarginControl.hxx sw/source/uibase/sidebar/PageOrientationControl.hxx sw/source/uibase/sidebar/PagePropertyPanel.hxx sw/source/uibase/sidebar/PageSizeControl.hxx sw/source/uibase/uiview/view2.cxx sw/source/uibase/utlui/navipi.cxx vcl/inc/svdata.hxx vcl/source/control/combobox.cxx vcl/source/control/lstbox.cxx vcl/source/window/dockwin.cxx vcl/source/window/winproc.cxx Change-Id: I056cf3026ff17d65cca0b6e6588bda4a88fa8d95
116 lines
4.3 KiB
C++
116 lines
4.3 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_DATAEDITOR_HXX
|
|
#define INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATAEDITOR_HXX
|
|
|
|
#include <boost/scoped_ptr.hpp>
|
|
#include <svl/lstner.hxx>
|
|
#include <svtools/stdctrl.hxx>
|
|
#include <vcl/toolbox.hxx>
|
|
#include <comphelper/stl_types.hxx>
|
|
#include <vcl/dialog.hxx>
|
|
#include <com/sun/star/uno/XComponentContext.hpp>
|
|
|
|
namespace com { namespace sun { namespace star {
|
|
namespace chart2 {
|
|
class XChartDocument;
|
|
}
|
|
}}}
|
|
|
|
namespace chart
|
|
{
|
|
|
|
class DataBrowser;
|
|
|
|
class DataEditor : public ModalDialog
|
|
{
|
|
public:
|
|
DataEditor( vcl::Window* pParent,
|
|
const ::com::sun::star::uno::Reference<
|
|
::com::sun::star::chart2::XChartDocument > & xChartDoc,
|
|
const ::com::sun::star::uno::Reference<
|
|
::com::sun::star::uno::XComponentContext > & xContext );
|
|
virtual ~DataEditor();
|
|
virtual void dispose() SAL_OVERRIDE;
|
|
|
|
// Dialog
|
|
virtual bool Close() SAL_OVERRIDE;
|
|
|
|
void SetReadOnly( bool bReadOnly );
|
|
bool ApplyChangesToModel();
|
|
|
|
private:
|
|
sal_uInt16 TBI_DATA_INSERT_ROW;
|
|
sal_uInt16 TBI_DATA_INSERT_COL;
|
|
sal_uInt16 TBI_DATA_INSERT_TEXT_COL;
|
|
sal_uInt16 TBI_DATA_DELETE_ROW;
|
|
sal_uInt16 TBI_DATA_DELETE_COL;
|
|
sal_uInt16 TBI_DATA_SWAP_COL;
|
|
sal_uInt16 TBI_DATA_SWAP_ROW;
|
|
|
|
bool m_bReadOnly;
|
|
VclPtr<DataBrowser> m_xBrwData;
|
|
VclPtr<ToolBox> m_pTbxData;
|
|
::com::sun::star::uno::Reference<
|
|
::com::sun::star::chart2::XChartDocument > m_xChartDoc;
|
|
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
|
|
m_xContext;
|
|
|
|
/// handles actions of the toolbox
|
|
DECL_LINK( ToolboxHdl, void* );
|
|
/// is called, if the cursor of the table has moved
|
|
DECL_LINK( BrowserCursorMovedHdl, void*);
|
|
/// this is called if MiscOptions change, esp. High-Contrast mode
|
|
DECL_LINK( MiscHdl, void* );
|
|
/// is called when the contents of the edit cell changes
|
|
DECL_LINK( CellModified, void* );
|
|
/// is called when the width of any column in the edit browsebox has changed
|
|
DECL_LINK( BrowserColumnResized, void* );
|
|
/// is called when the browser view was scrolled, @todo: only call on horizontal scroll
|
|
DECL_LINK( BrowserContentScrolled, void* );
|
|
|
|
void UpdateData();
|
|
/// moved and resizes the series name control etc. to fit the dimensions of the edit browsebox
|
|
// void ImplAdjustHeaderControls( bool bRefreshFromModel );
|
|
|
|
/** notifySystemWindow adds or remove the given window pToRegister at the Systemwindow found when search pWindow.
|
|
@param pWindow
|
|
The window which is used to search for the SystemWindow.
|
|
@param pToRegister
|
|
The window which should be added or removed on the TaskPaneList.
|
|
@param rMemFunc
|
|
The member function which should be called at the SystemWindow when found.
|
|
Possible values are:
|
|
::comphelper::mem_fun(&TaskPaneList::AddWindow)
|
|
::comphelper::mem_fun(&TaskPaneList::RemoveWindow)
|
|
|
|
@note this code is taken from dbaccess/source/ui/inc/UITools.hxx
|
|
*/
|
|
static void notifySystemWindow(vcl::Window* pWindow,
|
|
vcl::Window* pToRegister,
|
|
const ::comphelper::mem_fun1_t<TaskPaneList, vcl::Window*>& rMemFunc);
|
|
};
|
|
|
|
} // namespace chart
|
|
|
|
#endif // INCLUDED_CHART2_SOURCE_CONTROLLER_INC_DLG_DATAEDITOR_HXX
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|