More cleanup

Change-Id: I1f900029cb6a0fb389617c153dd187cf63ed2c7b

4 files changed, 2 insertions, 77 deletions

diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 404a04e5eecc..2867a5ce43fc 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -17,8 +17,7 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 #include "ParaPropertyPanel.hxx"
-#include "ParaPropertyPanel.hrc"
-
+#include <svx/dialogs.hrc>
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/Tools.hxx>
 #include <sfx2/dispatch.hxx>
@@ -191,10 +190,6 @@ void ParaPropertyPanel::HandleContextChange (
     }
 }
 
-
-
-
-
 void ParaPropertyPanel::DataChanged (const DataChangedEvent& rEvent)
 {
     (void)rEvent;
@@ -512,9 +507,6 @@ void ParaPropertyPanel::NotifyItemUpdate(
     }
 }
 
-
-
-
 void ParaPropertyPanel::StateChangedIndentImpl( sal_uInt16 /*nSID*/, SfxItemState eState, const SfxPoolItem* pState )
 {
     switch (maContext.GetCombinedContext_DI())
@@ -766,7 +758,6 @@ void ParaPropertyPanel::StateChangeIncDecImpl( sal_uInt16 nSID, SfxItemState eSt
     }
 }
 
-
 FieldUnit ParaPropertyPanel::GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState )
 {
     FieldUnit eUnit = FUNIT_NONE;
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc b/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
deleted file mode 100644
index 35f59f9ddf48..000000000000
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hrc
+++ /dev/null
@@ -1,60 +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 "svx/dialogs.hrc"
-
-//============================== line space popup page ==============================
-
-#define LB_LINE_SPACING                    1
-#define ED_SBINDE_LINEDISTPERCENT          2
-#define ED_SBINDE_LINEDISTPOINT            3
-
-//============================== Help ID ==============================
-
-#define HID_POPUP_LS_LB_LINE_SPACING            "HID_POPUP_LS_LB_LINE_SPACING"
-#define HID_POPUP_LS_ED_SBINDE_LINEDISTPERCENT  "HID_POPUP_LS_ED_SBINDE_LINEDISTPERCENT"
-#define HID_POPUP_LS_ED_SBINDE_LINEDISTPOINT     "HID_POPUP_LS_ED_SBINDE_LINEDISTPOINT"
-
-//============================== Property ==============================
-#define _FIXED_TEXT_HEIGHT          9
-#define _FIXED_TEXT_WIDTH           40
-#define CONTROL_HEIGHT              15
-#define LISTBOX_HEIGHT              80
-#define VS_SPACING_WIDTH            78
-
-//==============================Line Spacing popup page=======================
-
-#define POPUP_PAGE_HEIGHT    POP_BORDER_Y + BD_HEIGHT + POPUPPANEL_MARGIN_NB + OFFSET_Y
-#define POP_FT_CUSTOM_X      POPUPPANEL_MARGIN_NB + OFFSET_X
-#define POP_FT_CUSTOM_Y      POPUPPANEL_MARGIN_SMALL * 2 + 17 * 5
-#define POP_BORDER_X         POPUPPANEL_MARGIN_NB + OFFSET_X + 1
-#define POP_BORDER_Y         POPUPPANEL_MARGIN_SMALL * 3 + 17 * 5 + TEXT_HEIGHT
-#define BD_WIDTH             VS_SPACING_WIDTH - 6
-#define BD_HEIGHT            TEXT_HEIGHT*2 + CONTROL_HEIGHT*2 + CONTROL_SPACING_VERTICAL*3 + TEXT_CONTROL_SPACING_VERTICAL*2 - 4
-
-#define FT_1_X               POP_BORDER_X + POPUPPANEL_MARGIN_LARGE
-#define FT_1_Y               POP_BORDER_Y + CONTROL_SPACING_VERTICAL
-#define EDIT_1_X             FT_1_X
-#define EDIT_1_Y             FT_1_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
-#define FT_2_X               FT_1_X
-#define FT_2_Y               EDIT_1_Y + CONTROL_HEIGHT + CONTROL_SPACING_VERTICAL - 3
-#define EDIT_2_X             FT_1_X
-#define EDIT_2_Y             FT_2_Y + TEXT_HEIGHT + TEXT_CONTROL_SPACING_VERTICAL
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index ac5a70a40751..6017b9d30eb7 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -117,7 +117,6 @@ private:
     SfxBindings* mpBindings;
     css::uno::Reference<css::ui::XSidebar> mxSidebar;
 
-
     ParaPropertyPanel (
         vcl::Window* pParent,
         const css::uno::Reference<css::frame::XFrame>& rxFrame,
@@ -139,9 +138,6 @@ private:
 
     void initial();
     void ReSize(bool bSize);
-
-    DECL_LINK(ClickLineSPDropDownHdl_Impl, ToolBox*);
-
     void InitToolBoxIndent();
     void InitToolBoxSpacing();
 };
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.src b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
index 93cf18ca6a46..324a166bea34 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.src
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.src
@@ -16,11 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#include "ParaPropertyPanel.hrc"
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include "helpid.hrc"
-
-#define MASKCOLOR   MaskColor = Color { Red = 0xFFFF ; Green = 0x0000 ; Blue = 0xFFFF ; };
+#include <svx/dialogs.hrc>
 
 Image IMG_SPACE3
 {