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
155 lines
4.9 KiB
C++
155 lines
4.9 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_SVX_HDFT_HXX
|
|
#define INCLUDED_SVX_HDFT_HXX
|
|
|
|
#include <sfx2/tabdlg.hxx>
|
|
|
|
#include <vcl/fixed.hxx>
|
|
#include <vcl/field.hxx>
|
|
#include <vcl/group.hxx>
|
|
#include <vcl/layout.hxx>
|
|
|
|
#include <svx/pagectrl.hxx>
|
|
#include <svx/svxdllapi.h>
|
|
|
|
namespace svx
|
|
{
|
|
SVX_DLLPUBLIC bool ShowBorderBackgroundDlg( vcl::Window* pParent, SfxItemSet* pBBSet,
|
|
bool bEnableBackgroundSelector );
|
|
}
|
|
|
|
// class SvxHFPage ------------------------------------------------------
|
|
|
|
class SVX_DLLPUBLIC SvxHFPage : public SfxTabPage
|
|
{
|
|
using TabPage::ActivatePage;
|
|
using TabPage::DeactivatePage;
|
|
|
|
private:
|
|
//UUUU
|
|
void EnableDrawingLayerFillStyles(bool bNew) { mbEnableDrawingLayerFillStyles = bNew; }
|
|
|
|
public:
|
|
|
|
virtual bool FillItemSet( SfxItemSet* rOutSet ) SAL_OVERRIDE;
|
|
virtual void Reset( const SfxItemSet* rSet ) SAL_OVERRIDE;
|
|
|
|
virtual ~SvxHFPage();
|
|
virtual void dispose() SAL_OVERRIDE;
|
|
|
|
void DisableDeleteQueryBox() { mbDisableQueryBox = true; }
|
|
void EnableBackgroundSelector(bool bNew) { mbEnableBackgroundSelector = bNew; }
|
|
|
|
//UUUU
|
|
virtual void PageCreated(const SfxAllItemSet&) SAL_OVERRIDE;
|
|
|
|
void EnableDynamicSpacing();
|
|
|
|
protected:
|
|
static const sal_uInt16 pRanges[];
|
|
|
|
virtual void ActivatePage( const SfxItemSet& rSet ) SAL_OVERRIDE;
|
|
virtual sfxpg DeactivatePage( SfxItemSet* pSet = 0 ) SAL_OVERRIDE;
|
|
|
|
SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 nSetId );
|
|
|
|
VclPtr<FixedText> m_pPageLbl;
|
|
VclPtr<CheckBox> m_pTurnOnBox;
|
|
VclPtr<CheckBox> m_pCntSharedBox;
|
|
VclPtr<CheckBox> m_pCntSharedFirstBox;
|
|
VclPtr<FixedText> m_pLMLbl;
|
|
VclPtr<MetricField> m_pLMEdit;
|
|
VclPtr<FixedText> m_pRMLbl;
|
|
VclPtr<MetricField> m_pRMEdit;
|
|
VclPtr<FixedText> m_pDistFT;
|
|
VclPtr<MetricField> m_pDistEdit;
|
|
VclPtr<CheckBox> m_pDynSpacingCB;
|
|
VclPtr<FixedText> m_pHeightFT;
|
|
VclPtr<MetricField> m_pHeightEdit;
|
|
VclPtr<CheckBox> m_pHeightDynBtn;
|
|
VclPtr<SvxPageWindow> m_pBspWin;
|
|
VclPtr<PushButton> m_pBackgroundBtn;
|
|
|
|
sal_uInt16 nId;
|
|
SfxItemSet* pBBSet;
|
|
/// bitfield
|
|
bool mbDisableQueryBox : 1;
|
|
bool mbEnableBackgroundSelector : 1;
|
|
bool mbEnableDrawingLayerFillStyles : 1;
|
|
|
|
void InitHandler();
|
|
DECL_LINK( TurnOnHdl, CheckBox*);
|
|
DECL_LINK(DistModify, void *);
|
|
DECL_LINK(HeightModify, void *);
|
|
DECL_LINK(BorderModify, void *);
|
|
DECL_LINK(BackgroundHdl, void *);
|
|
|
|
void UpdateExample();
|
|
DECL_LINK(RangeHdl, void *);
|
|
|
|
private:
|
|
SVX_DLLPRIVATE void ResetBackground_Impl( const SfxItemSet& rSet );
|
|
};
|
|
|
|
// class SvxHeaderPage ---------------------------------------------------
|
|
|
|
class SVX_DLLPUBLIC SvxHeaderPage : public SvxHFPage
|
|
{
|
|
public:
|
|
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
|
|
// returns the Which values to the range
|
|
static const sal_uInt16* GetRanges() { return pRanges; }
|
|
SVX_DLLPRIVATE SvxHeaderPage( vcl::Window* pParent, const SfxItemSet& rSet );
|
|
};
|
|
|
|
// class SvxFooterPage ---------------------------------------------------
|
|
|
|
class SVX_DLLPUBLIC SvxFooterPage : public SvxHFPage
|
|
{
|
|
public:
|
|
static VclPtr<SfxTabPage> Create( vcl::Window* pParent, const SfxItemSet* rSet );
|
|
static const sal_uInt16* GetRanges() { return pRanges; }
|
|
SVX_DLLPRIVATE SvxFooterPage( vcl::Window* pParent, const SfxItemSet& rSet );
|
|
};
|
|
|
|
class SVX_DLLPUBLIC DeleteHeaderDialog : public MessageDialog
|
|
{
|
|
public:
|
|
DeleteHeaderDialog(vcl::Window *pParent)
|
|
: MessageDialog(pParent, "DeleteHeaderDialog",
|
|
"svx/ui/deleteheaderdialog.ui")
|
|
{
|
|
}
|
|
};
|
|
|
|
class SVX_DLLPUBLIC DeleteFooterDialog : public MessageDialog
|
|
{
|
|
public:
|
|
DeleteFooterDialog(vcl::Window *pParent)
|
|
: MessageDialog(pParent, "DeleteFooterDialog",
|
|
"svx/ui/deletefooterdialog.ui")
|
|
{
|
|
}
|
|
};
|
|
|
|
#endif
|
|
|
|
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
|