accidental push of merge in progress, sigh

This reverts commit c61c5a240314f1899a2160a97e00e2108104e4bd.

6 files changed, 9 insertions, 55 deletions

diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
index 99ecfb4e0bc7..d20a9060d77a 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.cxx
@@ -19,7 +19,6 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include <AlignmentPropertyPanel.hxx>
 #include <editeng/justifyitem.hxx>
 #include <svx/dialmgr.hxx>
@@ -34,7 +33,6 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Layouter;
 using ::sfx2::sidebar::ControlFactory;
 
 const char UNO_ALIGNBLOCK[]            = ".uno:AlignBlock";
@@ -88,13 +86,6 @@ AlignmentPropertyPanel::AlignmentPropertyPanel(
 
     mpFTLeftIndent->SetBackground(Wallpaper());
     mpFtRotate->SetBackground(Wallpaper());
-
-    Layouter::PrepareForLayouting(*mpFTLeftIndent);
-    Layouter::PrepareForLayouting(*mpFtRotate);
-    Layouter::PrepareForLayouting(*mpCBXWrapText);
-    Layouter::PrepareForLayouting(*mpCBXMergeCell);
-    Layouter::PrepareForLayouting(*mpCbStacked);
-
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -620,17 +611,10 @@ void AlignmentPropertyPanel::UpdateVerAlign()
     }
 }
 
-
-
-
-void AlignmentPropertyPanel::Resize (void)
-{
-    const sal_Int32 nRight (GetSizePixel().Width() - Layouter::MapWidth(*this, TB_BORDER));
-    Layouter::SetRight(*mpFtRotate, nRight);
-    Layouter::SetRight(*mpCBXWrapText, nRight);
-    Layouter::SetRight(*mpCBXMergeCell, nRight);
-    Layouter::SetRight(*mpCbStacked, nRight);
-}
-
+//////////////////////////////////////////////////////////////////////////////
+// namespace close
 
 }} // end of namespace ::sc::sidebar
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
index 4a90a87e2a98..476633e4cff9 100644
--- a/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/AlignmentPropertyPanel.hxx
@@ -58,8 +58,6 @@ public:
 
     SfxBindings* GetBindings();
 
-    virtual void Resize (void);
-
 private:
     //ui controls
     ToolBox*                                    mpTBHorizontal;
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index fcf526424bfe..332b72d884c4 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -19,7 +19,6 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include <CellAppearancePropertyPanel.hxx>
 #include <CellAppearancePropertyPanel.hrc>
 #include "sc.hrc"
@@ -45,8 +44,6 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Layouter;
-
 
 const char UNO_BACKGROUNDCOLOR[] = ".uno:BackgroundColor";
 const char UNO_SETBORDERSTYLE[] = ".uno:SetBorderStyle";
@@ -832,18 +829,8 @@ void CellAppearancePropertyPanel::UpdateControlState()
     }
 }
 
-
-
-
-void CellAppearancePropertyPanel::Resize (void)
-{
-    const sal_Int32 nRight (GetSizePixel().Width() - Layouter::MapWidth(*this, TB_BORDER));
-    Layouter::SetRight(*mpFTFillColor, nRight);
-    Layouter::SetRight(*mpFTCellBorder, nRight);
-    Layouter::SetRight(*mpCBXShowGrid, nRight);
-}
-
-
+//////////////////////////////////////////////////////////////////////////////
+// namespace close
 
 }} // end of namespace ::sc::sidebar
 
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
index a8dabba2bb2d..5791ba7ec7b9 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.hxx
@@ -66,8 +66,6 @@ public:
 
     SfxBindings* GetBindings();
 
-    virtual void Resize (void);
-
 private:
     //ui controls
 
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
index de9c728442aa..7e9983ad8fec 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.cxx
@@ -18,7 +18,6 @@
 
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/Theme.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <NumberFormatPropertyPanel.hxx>
 #include "sc.hrc"
@@ -35,7 +34,6 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Layouter;
 using ::sfx2::sidebar::Theme;
 
 const char UNO_NUMERICFIELD[]         = ".uno:NumericField";
@@ -353,17 +351,8 @@ SfxBindings* NumberFormatPropertyPanel::GetBindings()
     return mpBindings;
 }
 
-
-
-
-void NumberFormatPropertyPanel::Resize (void)
-{
-    const sal_Int32 nRight (GetSizePixel().Width() - Layouter::MapWidth(*this, TB_BORDER));
-    Layouter::SetRight(*mpFtCategory, nRight);
-    Layouter::SetRight(*mpFtLeadZeroes, nRight);
-    Layouter::SetRight(*mpBtnNegRed, nRight);
-    Layouter::SetRight(*mpBtnThousand, nRight);
-}
+//////////////////////////////////////////////////////////////////////////////
+// namespace close
 
 }} // end of namespace ::sc::sidebar
 
diff --git a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
index 01bc074ae14b..6bc898f462b9 100644
--- a/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
+++ b/sc/source/ui/sidebar/NumberFormatPropertyPanel.hxx
@@ -55,8 +55,6 @@ public:
 
     SfxBindings* GetBindings();
 
-    virtual void Resize (void);
-
 private:
     //ui controls
     ListBox*                                mpLbCategory;