Whitespace (and other) cleanup.

Change-Id: I6af10899a3e22c45b973439fd8c8ec6c8faac904

4 files changed, 16 insertions, 40 deletions

diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
index 36ba1e17163b..7eb29ab5efb1 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.cxx
@@ -47,8 +47,11 @@
 #define DO_NOT_CUSTOM          false
 #define USE_CUSTOM             true
 
-namespace svx { namespace sidebar {
+#define LSP_POS_GLOBAL_VALUE   "Line_Spacing_Pos"
+#define LSP_LV_GLOBAL_VALUE    "Line_Spacing_Lv"
+#define BEGIN_VALUE            28
 
+using namespace svx::sidebar;
 
 ParaLineSpacingControl::ParaLineSpacingControl(vcl::Window* pParent, svx::sidebar::ParaPropertyPanel& rPanel)
     : PopupControl( pParent,SVX_RES(RID_POPUPPANEL_PARAPAGE_LINESPACING))
@@ -778,6 +781,4 @@ void ParaLineSpacingControl::ExecuteLineSpacing( bool aIsCustom, sal_uInt16 aEnt
     maLineSpacing.SetNoSelection();
 }
 
-}} // end of namespace sidebar
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
index 5f86353a2179..1115298ef322 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingControl.hxx
@@ -30,12 +30,8 @@
 #include <editeng/lspcitem.hxx>
 #include <sfx2/sidebar/EnumContext.hxx>
 
-
 namespace svx { namespace sidebar {
 
-#define LSP_POS_GLOBAL_VALUE   "Line_Spacing_Pos"
-#define LSP_LV_GLOBAL_VALUE    "Line_Spacing_Lv"
-#define BEGIN_VALUE            28
 class ParaLineSpacingControl:public svx::sidebar::PopupControl
 {
 public:
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
index 6a989484d502..e5cae1c859b0 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx
@@ -16,6 +16,7 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
+
 #include "ParaLineSpacingPopup.hxx"
 #include "ParaLineSpacingControl.hxx"
 #include <boost/bind.hpp>
@@ -23,37 +24,29 @@
 
 namespace svx { namespace sidebar {
 
-ParaLineSpacingPopup::ParaLineSpacingPopup (
-    vcl::Window* pParent,
-    const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator)
+ParaLineSpacingPopup::ParaLineSpacingPopup(vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator)
     : Popup(
         pParent,
         rControlCreator,
-        OUString( "Paragraph Line Spacing"))
+        OUString("Paragraph Line Spacing"))
 {
     SetPopupModeEndHandler(::boost::bind(&ParaLineSpacingPopup::PopupModeEndCallback, this));
 }
 
-
-
-
-ParaLineSpacingPopup::~ParaLineSpacingPopup (void)
+ParaLineSpacingPopup::~ParaLineSpacingPopup()
 {
 }
 
-
-
-
-void ParaLineSpacingPopup::Rearrange (SfxItemState currSPState,FieldUnit currMetricUnit,SvxLineSpacingItem* currSPItem,const ::sfx2::sidebar::EnumContext currentContext)
+void ParaLineSpacingPopup::Rearrange(SfxItemState currSPState,FieldUnit currMetricUnit,SvxLineSpacingItem* currSPItem,const ::sfx2::sidebar::EnumContext currentContext)
 {
     ProvideContainerAndControl();
 
     ParaLineSpacingControl* pControl = dynamic_cast<ParaLineSpacingControl*>(mpControl.get());
     if (pControl != NULL)
-        pControl->Rearrange(currSPState,currMetricUnit, currSPItem,currentContext);
+        pControl->Rearrange(currSPState, currMetricUnit, currSPItem,currentContext);
 }
 
-void ParaLineSpacingPopup::PopupModeEndCallback (void)
+void ParaLineSpacingPopup::PopupModeEndCallback()
 {
     ProvideContainerAndControl();
     ParaLineSpacingControl* pControl = dynamic_cast<ParaLineSpacingControl*>(mpControl.get());
@@ -61,20 +54,8 @@ void ParaLineSpacingPopup::PopupModeEndCallback (void)
         return;
 
     pControl->PopupModeEndCallback();
-
-    /*if( pControl->GetLastCustomState() == SPACING_CLOSE_BY_CUS_EDIT)
-    {
-        SvtViewOptions aWinOpt( E_WINDOW, SIDEBAR_SPACING_GLOBAL_VALUE );
-        ::com::sun::star::uno::Sequence < ::com::sun::star::beans::NamedValue > aSeq(1);
-        aSeq[0].Name = "Spacing";
-        aSeq[0].Value <<= ::rtl::OUString( String::CreateFromInt32( pControl->GetLastCustomValue() ));
-        aWinOpt.SetUserData( aSeq );
-
-    }*/
 }
 
-
-} } // end of namespace svx::sidebar
-
+} }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
index 060181d0abb9..c331f73bf1f7 100644
--- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
+++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.hxx
@@ -33,14 +33,12 @@ class ParaLineSpacingPopup
     : public Popup
 {
 public :
-    ParaLineSpacingPopup (
-        vcl::Window* pParent,
-        const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
-    virtual ~ParaLineSpacingPopup (void);
+    ParaLineSpacingPopup(vcl::Window* pParent, const ::boost::function<PopupControl*(PopupContainer*)>& rControlCreator);
+    virtual ~ParaLineSpacingPopup();
 
-    void Rearrange (SfxItemState currSPState,FieldUnit currMetricUnit,SvxLineSpacingItem* currSPItem ,const ::sfx2::sidebar::EnumContext currentContext);
+    void Rearrange(SfxItemState currSPState, FieldUnit currMetricUnit, SvxLineSpacingItem* currSPItem, const ::sfx2::sidebar::EnumContext currentContext);
 private:
-    void PopupModeEndCallback (void);
+    void PopupModeEndCallback();
 };
 
 } } // end of namespace svx::sidebar