diff options
Diffstat (limited to 'sw')
-rw-r--r-- | sw/Library_sw.mk | 1 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageColumnControl.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageColumnControl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageMarginControl.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageMarginControl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageOrientationControl.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PagePropertyPanel.cxx | 63 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PagePropertyPanel.hxx | 63 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageSizeControl.cxx | 3 | ||||
-rw-r--r-- | sw/source/uibase/sidebar/PageSizeControl.hxx | 2 |
10 files changed, 3 insertions, 139 deletions
diff --git a/sw/Library_sw.mk b/sw/Library_sw.mk index 59cadd91cb10..811c8c629ef6 100644 --- a/sw/Library_sw.mk +++ b/sw/Library_sw.mk @@ -682,7 +682,6 @@ $(eval $(call gb_Library_add_exception_objects,sw,\ sw/source/uibase/sidebar/PageSizePopup \ sw/source/uibase/sidebar/PageColumnControl \ sw/source/uibase/sidebar/PageColumnPopup \ - sw/source/uibase/sidebar/PagePropertyPanel \ sw/source/uibase/sidebar/PageFormatPanel \ sw/source/uibase/sidebar/PageHeaderPanel \ sw/source/uibase/sidebar/PageFooterPanel \ diff --git a/sw/source/uibase/sidebar/PageColumnControl.cxx b/sw/source/uibase/sidebar/PageColumnControl.cxx index 4aea45b41b33..3d6a384b7508 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.cxx +++ b/sw/source/uibase/sidebar/PageColumnControl.cxx @@ -18,7 +18,6 @@ */ #include "PageColumnControl.hxx" -#include "PagePropertyPanel.hxx" #include <cmdid.h> #include <swtypes.hxx> diff --git a/sw/source/uibase/sidebar/PageColumnControl.hxx b/sw/source/uibase/sidebar/PageColumnControl.hxx index cb16460a6b3c..e7a1285874cd 100644 --- a/sw/source/uibase/sidebar/PageColumnControl.hxx +++ b/sw/source/uibase/sidebar/PageColumnControl.hxx @@ -28,8 +28,6 @@ namespace sw { namespace sidebar { -class PagePropertyPanel; - class PageColumnControl : public SfxPopupWindow { public: diff --git a/sw/source/uibase/sidebar/PageMarginControl.cxx b/sw/source/uibase/sidebar/PageMarginControl.cxx index 897ef69cd18d..90d7e67642cd 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.cxx +++ b/sw/source/uibase/sidebar/PageMarginControl.cxx @@ -22,11 +22,12 @@ #include <cstdlib> #include "PageMarginControl.hxx" -#include "PagePropertyPanel.hxx" #include "PropertyPanel.hrc" +#include <editeng/sizeitem.hxx> #include <sfx2/dispatch.hxx> #include <svx/svxids.hrc> +#include <svx/pageitem.hxx> #include <svl/itempool.hxx> #include <svl/intitem.hxx> diff --git a/sw/source/uibase/sidebar/PageMarginControl.hxx b/sw/source/uibase/sidebar/PageMarginControl.hxx index fd82641c204c..050495db0706 100644 --- a/sw/source/uibase/sidebar/PageMarginControl.hxx +++ b/sw/source/uibase/sidebar/PageMarginControl.hxx @@ -41,8 +41,6 @@ static const long MINBODY = 284; //0.5 cm in twips namespace sw { namespace sidebar { -class PagePropertyPanel; - class PageMarginControl : public SfxPopupWindow { public: diff --git a/sw/source/uibase/sidebar/PageOrientationControl.hxx b/sw/source/uibase/sidebar/PageOrientationControl.hxx index cc9c1b3fc539..e05806fd9031 100644 --- a/sw/source/uibase/sidebar/PageOrientationControl.hxx +++ b/sw/source/uibase/sidebar/PageOrientationControl.hxx @@ -30,8 +30,6 @@ class Button; namespace sw { namespace sidebar { -class PagePropertyPanel; - class PageOrientationControl : public SfxPopupWindow { public: diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.cxx b/sw/source/uibase/sidebar/PagePropertyPanel.cxx deleted file mode 100644 index 7a3db1de00a0..000000000000 --- a/sw/source/uibase/sidebar/PagePropertyPanel.cxx +++ /dev/null @@ -1,63 +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 . - */ - -#include <sal/config.h> - -#include <cstdlib> - -#include "PagePropertyPanel.hxx" - -#include <swtypes.hxx> -#include <cmdid.h> - -#include <svl/intitem.hxx> -#include <editeng/sizeitem.hxx> -#include <editeng/paperinf.hxx> -#include <svx/svxids.hrc> -#include <svx/dlgutil.hxx> -#include <svx/rulritem.hxx> - -#include <sfx2/sidebar/ControlFactory.hxx> -#include <sfx2/dispatch.hxx> -#include <sfx2/bindings.hxx> -#include <sfx2/viewsh.hxx> -#include <sfx2/objsh.hxx> - -#include <com/sun/star/frame/XController.hpp> -#include <com/sun/star/frame/XModel.hpp> - -namespace sw { namespace sidebar { - -PagePropertyPanel::PagePropertyPanel( - vcl::Window* pParent, - const css::uno::Reference< css::frame::XFrame>& rxFrame, - SfxBindings* ) - : PanelLayout(pParent, "PagePropertyPanel", "modules/swriter/ui/sidebarpage.ui", rxFrame) -{ -} - -PagePropertyPanel::~PagePropertyPanel() -{ - disposeOnce(); -} - - -} } // end of namespace ::sw::sidebar - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/sidebar/PagePropertyPanel.hxx b/sw/source/uibase/sidebar/PagePropertyPanel.hxx deleted file mode 100644 index 450d353700c9..000000000000 --- a/sw/source/uibase/sidebar/PagePropertyPanel.hxx +++ /dev/null @@ -1,63 +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_SW_SOURCE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX -#define INCLUDED_SW_SOURCE_UIBASE_SIDEBAR_PAGEPROPERTYPANEL_HXX - -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/document/XUndoManager.hpp> - -#include <svx/sidebar/PanelLayout.hxx> - -#include <sfx2/sidebar/ControllerItem.hxx> - -#include <i18nutil/paper.hxx> - -#include <svx/pageitem.hxx> -#include <svx/rulritem.hxx> -#include <editeng/sizeitem.hxx> - -#include <vcl/ctrl.hxx> -#include <vcl/fixed.hxx> -#include <vcl/button.hxx> -#include <vcl/toolbox.hxx> -#include <vcl/lstbox.hxx> -#include <vcl/field.hxx> -#include <svl/intitem.hxx> - -#include <memory> - -namespace sw { namespace sidebar { - - class PagePropertyPanel : public PanelLayout - { - public: - - PagePropertyPanel( - vcl::Window* pParent, - const css::uno::Reference< css::frame::XFrame>& rxFrame, - SfxBindings* pBindings ); - private: - virtual ~PagePropertyPanel() override; - }; - -} } // end of namespace ::sw::sidebar - -#endif - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx index cd6acf721600..52f3e55d6f54 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.cxx +++ b/sw/source/uibase/sidebar/PageSizeControl.cxx @@ -18,12 +18,11 @@ */ #include "PageSizeControl.hxx" -#include "PagePropertyPanel.hxx" #include <cmdid.h> #include <swtypes.hxx> #include <svx/svxids.hrc> - +#include <svx/pageitem.hxx> #include <svx/sidebar/ValueSetWithTextControl.hxx> #include <rtl/character.hxx> diff --git a/sw/source/uibase/sidebar/PageSizeControl.hxx b/sw/source/uibase/sidebar/PageSizeControl.hxx index 0d3321a17f97..c5247dd18795 100644 --- a/sw/source/uibase/sidebar/PageSizeControl.hxx +++ b/sw/source/uibase/sidebar/PageSizeControl.hxx @@ -38,8 +38,6 @@ class ValueSet; namespace sw { namespace sidebar { -class PagePropertyPanel; - class PageSizeControl : public SfxPopupWindow { public: |