accidental push of merge in progress, sigh

This reverts commit c61c5a240314f1899a2160a97e00e2108104e4bd.

14 files changed, 19 insertions, 314 deletions

diff --git a/svx/source/sidebar/area/AreaPropertyPanel.cxx b/svx/source/sidebar/area/AreaPropertyPanel.cxx
index fbdce4833c5f..c08963156c8f 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.cxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.cxx
@@ -21,7 +21,6 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include <AreaPropertyPanel.hxx>
 #include <AreaPropertyPanel.hrc>
 #include <svx/dialogs.hrc>
@@ -44,7 +43,6 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Layouter;
 using ::sfx2::sidebar::Theme;
 
 #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
@@ -121,41 +119,10 @@ AreaPropertyPanel::AreaPropertyPanel(
       mpTransparanceItem(),
       mxFrame(rxFrame),
       mpBindings(pBindings),
-      mbColorAvail(true),
-      maLayouter(*this)
+      mbColorAvail(true)
 {
     Initialize();
     FreeResource();
-
-    // Setup the grid layouter.
-    const sal_Int32 nMappedMboxWidth (Layouter::MapWidth(*this, MBOX_WIDTH));
-
-    maLayouter.GetCell(0,0).SetControl(*mpColorTextFT).SetGridWidth(3);
-    maLayouter.GetCell(1,0).SetControl(*mpLbFillType);
-    maLayouter.GetCell(1,2,0).SetControl(*mpToolBoxColorBackground).SetFixedWidth();
-    maLayouter.GetCell(1,2,1).SetControl(*mpLbFillAttr);
-
-    maLayouter.GetCell(2,0).SetControl(*mpTrspTextFT).SetGridWidth(3);
-    maLayouter.GetCell(3,0).SetControl(*mpLBTransType);
-    maLayouter.GetCell(3,2,0).SetControl(*mpMTRTransparent);
-    maLayouter.GetCell(3,2,1).SetControl(*mpBTNGradient);
-
-    maLayouter.GetColumn(0)
-        .SetWeight(1)
-        .SetLeftPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL))
-        .SetMinimumWidth(nMappedMboxWidth);
-    maLayouter.GetColumn(1)
-        .SetWeight(0)
-        .SetMinimumWidth(Layouter::MapWidth(*this, CONTROL_SPACING_HORIZONTAL));
-    maLayouter.GetColumn(2)
-        .SetWeight(1)
-        .SetMinimumWidth(nMappedMboxWidth)
-        .SetRightPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL));
-
-    // Make controls that display text handle short widths more
-    // graceful.
-    Layouter::PrepareForLayouting(*mpColorTextFT);
-    Layouter::PrepareForLayouting(*mpTrspTextFT);
 }
 
 
@@ -445,8 +412,6 @@ IMPL_LINK( AreaPropertyPanel, SelectFillTypeHdl, ListBox *, pToolBox )
                 mpLbFillType->Selected();
             }
         }
-
-        maLayouter.Layout();
     }
 
     return 0;
@@ -1132,8 +1097,6 @@ void AreaPropertyPanel::NotifyItemUpdate(
             break;
         }
     }
-
-    maLayouter.Layout();
 }
 
 
@@ -1464,16 +1427,6 @@ sal_Int32 AreaPropertyPanel::GetSelectedTransparencyTypeIndex (void) const
     return mpLBTransType->GetSelectEntryPos();
 }
 
-
-
-
-void AreaPropertyPanel::Resize (void)
-{
-    maLayouter.Layout();
-}
-
-
-
 } } // end of namespace svx::sidebar
 
 // eof
diff --git a/svx/source/sidebar/area/AreaPropertyPanel.hxx b/svx/source/sidebar/area/AreaPropertyPanel.hxx
index 55284a6f1b3d..caf005a8fd27 100644
--- a/svx/source/sidebar/area/AreaPropertyPanel.hxx
+++ b/svx/source/sidebar/area/AreaPropertyPanel.hxx
@@ -23,7 +23,6 @@
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
-#include <sfx2/sidebar/GridLayouter.hxx>
 #include <svx/xgrad.hxx>
 #include <svx/itemwin.hxx>
 #include <svx/xfillit0.hxx>
@@ -82,8 +81,6 @@ public:
     void SetGradient (const XGradient& rGradient);
     sal_Int32 GetSelectedTransparencyTypeIndex (void) const;
 
-    virtual void Resize (void);
-
 private:
     sal_uInt16                                          meLastXFS;
     Color                                               maLastColor;
@@ -155,8 +152,6 @@ private:
     /// bitfield
     bool                                                mbColorAvail : 1;
 
-    ::sfx2::sidebar::GridLayouter maLayouter;
-
     DECL_LINK(SelectFillTypeHdl, ListBox* );
     DECL_LINK(SelectFillAttrHdl, ListBox* );
     DECL_LINK(ChangeTrgrTypeHdl_Impl, void*);
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
index 25207dc029ae..04bdbf5d6add 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.cxx
@@ -18,7 +18,6 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include <GraphicPropertyPanel.hxx>
 #include <GraphicPropertyPanel.hrc>
 #include <svx/dialogs.hrc>
@@ -32,13 +31,12 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Layouter;
 using ::sfx2::sidebar::Theme;
 
 #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
 
 //////////////////////////////////////////////////////////////////////////////
-
+// namespace open
 
 namespace svx { namespace sidebar {
 
@@ -76,58 +74,10 @@ GraphicPropertyPanel::GraphicPropertyPanel(
     maImgBlue(this, SVX_RES(IMG_BLUE)),
     maImgGamma(this, SVX_RES(IMG_GAMMA)),
     mxFrame(rxFrame),
-    mpBindings(pBindings),
-    maLayouter(*this)
+    mpBindings(pBindings)
 {
     Initialize();
     FreeResource();
-
-    // Setup the grid layouter.
-    maLayouter.GetCell(0,0).SetControl(*mpFtBrightness).SetGridWidth(2);
-    maLayouter.GetCell(1,0).SetControl(*mpMtrBrightness).SetGridWidth(2);
-
-    maLayouter.GetCell(0,3).SetControl(*mpFtContrast).SetGridWidth(2);
-    maLayouter.GetCell(1,3).SetControl(*mpMtrContrast).SetGridWidth(2);
-
-    maLayouter.GetCell(2,0).SetControl(*mpFtColorMode).SetGridWidth(2);
-    maLayouter.GetCell(3,0).SetControl(*mpLBColorMode).SetGridWidth(2);
-
-    maLayouter.GetCell(2,3).SetControl(*mpFtTrans).SetGridWidth(2);
-    maLayouter.GetCell(3,3).SetControl(*mpMtrTrans).SetGridWidth(2);
-
-    maLayouter.GetCell(4,0).SetControl(maImgRed).SetFixedWidth();
-    maLayouter.GetCell(4,1).SetControl(*mpMtrRed);
-
-    maLayouter.GetCell(5,0).SetControl(maImgBlue).SetFixedWidth();
-    maLayouter.GetCell(5,1).SetControl(*mpMtrBlue);
-
-    maLayouter.GetCell(4,3).SetControl(maImgGreen).SetFixedWidth();
-    maLayouter.GetCell(4,4).SetControl(*mpMtrGreen);
-    maLayouter.GetCell(5,3).SetControl(maImgGamma).SetFixedWidth();
-    maLayouter.GetCell(5,4).SetControl(*mpMtrGamma);
-
-    maLayouter.GetColumn(0)
-        .SetWeight(0)
-        .SetLeftPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL));
-    maLayouter.GetColumn(1)
-        .SetWeight(1)
-        .SetMinimumWidth(Layouter::MapWidth(*this, MBOX_WIDTH - 10));
-    maLayouter.GetColumn(2)
-        .SetWeight(0)
-        .SetMinimumWidth(Layouter::MapWidth(*this, CONTROL_SPACING_HORIZONTAL));
-    maLayouter.GetColumn(3)
-        .SetWeight(0);
-    maLayouter.GetColumn(4)
-        .SetWeight(1)
-        .SetMinimumWidth(Layouter::MapWidth(*this, MBOX_WIDTH - 10))
-        .SetRightPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL));
-
-    // Make controls that display text handle short widths more
-    // graceful.
-    Layouter::PrepareForLayouting(*mpFtBrightness);
-    Layouter::PrepareForLayouting(*mpFtContrast);
-    Layouter::PrepareForLayouting(*mpFtColorMode);
-    Layouter::PrepareForLayouting(*mpFtTrans);
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -532,19 +482,17 @@ void GraphicPropertyPanel::NotifyItemUpdate(
 
 
 
+//////////////////////////////////////////////////////////////////////////////
+
 SfxBindings* GraphicPropertyPanel::GetBindings()
 {
     return mpBindings;
 }
 
-
-
-
-void GraphicPropertyPanel::Resize (void)
-{
-    maLayouter.Layout();
-}
-
-
+//////////////////////////////////////////////////////////////////////////////
+// namespace close
 
 }} // end of namespace ::svx::sidebar
+
+//////////////////////////////////////////////////////////////////////////////
+// eof
diff --git a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
index bca9b9cdddb6..d5e0c093c9c8 100644
--- a/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
+++ b/svx/source/sidebar/graphic/GraphicPropertyPanel.hxx
@@ -21,7 +21,6 @@
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
-#include <sfx2/sidebar/GridLayouter.hxx>
 #include <vcl/fixed.hxx>
 #include <boost/scoped_ptr.hpp>
 
@@ -54,8 +53,6 @@ public:
 
     SfxBindings* GetBindings();
 
-    virtual void Resize (void);
-
 private:
     //ui controls
     ::boost::scoped_ptr< FixedText >                    mpFtBrightness;
@@ -97,7 +94,6 @@ private:
 
     cssu::Reference<css::frame::XFrame>                 mxFrame;
     SfxBindings*                                        mpBindings;
-    ::sfx2::sidebar::GridLayouter maLayouter;
 
     DECL_LINK( ModifyBrightnessHdl, void * );
     DECL_LINK( ModifyContrastHdl, void * );
diff --git a/svx/source/sidebar/line/LinePropertyPanel.cxx b/svx/source/sidebar/line/LinePropertyPanel.cxx
index 4b2b85218c00..1330f4636fb9 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.cxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.cxx
@@ -18,7 +18,6 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include <LinePropertyPanel.hxx>
 #include <LinePropertyPanel.hrc>
 #include <svx/dialogs.hrc>
@@ -56,10 +55,8 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Layouter;
 using ::sfx2::sidebar::Theme;
 
-
 #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
 
 namespace {
@@ -204,58 +201,10 @@ LinePropertyPanel::LinePropertyPanel(
     mxFrame(rxFrame),
     mpBindings(pBindings),
     mbColorAvailable(true),
-    mbWidthValuable(true),
-    maLayouter(*this)
+    mbWidthValuable(true)
 {
     Initialize();
     FreeResource();
-
-    // Setup the grid layouter.
-    const sal_Int32 nMappedToolBoxWidth (Layouter::MapWidth(*this, TOOLBOX_WIDTH));
-
-    maLayouter.GetCell(0,0).SetControl(*mpFTWidth);
-    maLayouter.GetCell(1,0).SetControl(*mpTBWidthBackground).SetFixedWidth();
-
-    maLayouter.GetCell(0,2).SetControl(*mpFTColor);
-    maLayouter.GetCell(1,2).SetControl(*mpTBColorBackground).SetFixedWidth();
-
-    maLayouter.GetCell(2,0).SetControl(*mpFTStyle);
-    maLayouter.GetCell(3,0).SetControl(*mpLBStyle);
-
-    maLayouter.GetCell(2,2).SetControl(*mpFTTrancparency);
-    maLayouter.GetCell(3,2).SetControl(*mpMFTransparent);
-
-    maLayouter.GetCell(4,0).SetControl(*mpFTArrow).SetGridWidth(3);
-    maLayouter.GetCell(5,0).SetControl(*mpLBStart);
-    maLayouter.GetCell(5,2).SetControl(*mpLBEnd);
-
-    maLayouter.GetCell(6,0).SetControl(*mpFTEdgeStyle);
-    maLayouter.GetCell(7,0).SetControl(*mpLBEdgeStyle);
-
-    maLayouter.GetCell(6,2).SetControl(*mpFTCapStyle);
-    maLayouter.GetCell(7,2).SetControl(*mpLBCapStyle);
-
-    maLayouter.GetColumn(0)
-        .SetWeight(1)
-        .SetLeftPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL))
-        .SetMinimumWidth(nMappedToolBoxWidth);
-    maLayouter.GetColumn(1)
-        .SetWeight(0)
-        .SetMinimumWidth(Layouter::MapWidth(*this, CONTROL_SPACING_HORIZONTAL));
-    maLayouter.GetColumn(2)
-        .SetWeight(1)
-        .SetRightPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL))
-        .SetMinimumWidth(nMappedToolBoxWidth);
-
-    // Make controls that display text handle short widths more
-    // graceful.
-    Layouter::PrepareForLayouting(*mpFTWidth);
-    Layouter::PrepareForLayouting(*mpFTColor);
-    Layouter::PrepareForLayouting(*mpFTStyle);
-    Layouter::PrepareForLayouting(*mpFTTrancparency);
-    Layouter::PrepareForLayouting(*mpFTArrow);
-    Layouter::PrepareForLayouting(*mpFTEdgeStyle);
-    Layouter::PrepareForLayouting(*mpFTCapStyle);
 }
 
 
@@ -992,14 +941,6 @@ void LinePropertyPanel::EndLineWidthPopupMode (void)
 
 
 
-void LinePropertyPanel::Resize (void)
-{
-    maLayouter.Layout();
-}
-
-
-
-
 void LinePropertyPanel::SetWidthIcon(int n)
 {
     if(n==0)
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hrc b/svx/source/sidebar/line/LinePropertyPanel.hrc
index 1d0812143d02..13c446e4372b 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hrc
+++ b/svx/source/sidebar/line/LinePropertyPanel.hrc
@@ -21,10 +21,6 @@
 #define CUSTOM_W    74
 #define CUSTOM_H    POPUPPANEL_MARGIN_LARGE * 2 +  TEXT_HEIGHT + 12 +  TEXT_CONTROL_SPACING_VERTICAL
 
-#define TOOLBOX_WIDTH       50
-#define TOOLBOX_HEIGHT      14
-#define LISTBOX_HEIGHT      99
-
 #define FT_COLOR            1
 #define TB_COLOR            2
 #define FT_WIDTH            3
diff --git a/svx/source/sidebar/line/LinePropertyPanel.hxx b/svx/source/sidebar/line/LinePropertyPanel.hxx
index 31f43c7583d6..b2f97bd1c067 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.hxx
+++ b/svx/source/sidebar/line/LinePropertyPanel.hxx
@@ -22,7 +22,6 @@
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
-#include <sfx2/sidebar/GridLayouter.hxx>
 #include <vcl/fixed.hxx>
 #include <vcl/field.hxx>
 #include <boost/scoped_ptr.hpp>
@@ -88,8 +87,6 @@ public:
 
     void EndLineWidthPopupMode (void);
 
-    virtual void Resize (void);
-
 private:
     //ui controls
     ::boost::scoped_ptr< FixedText >                        mpFTWidth;
@@ -153,8 +150,6 @@ private:
     bool                mbColorAvailable : 1;
     bool                mbWidthValuable : 1;
 
-    ::sfx2::sidebar::GridLayouter maLayouter;
-
     void SetupIcons(void);
     void Initialize();
     void FillLineEndList();
diff --git a/svx/source/sidebar/line/LinePropertyPanel.src b/svx/source/sidebar/line/LinePropertyPanel.src
index 075c0c62cb02..e90495877675 100644
--- a/svx/source/sidebar/line/LinePropertyPanel.src
+++ b/svx/source/sidebar/line/LinePropertyPanel.src
@@ -20,6 +20,10 @@
 #include <svx/dialogs.hrc>
 #include "helpid.hrc"
 
+#define TOOLBOX_WIDTH       50
+#define TOOLBOX_HEIGHT      14
+#define LISTBOX_HEIGHT      99
+
 Control RID_SIDEBAR_LINE_PANEL
 {
     OutputSize = TRUE;
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
index 4bf82278efc1..83e2a609a9ba 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.cxx
@@ -29,7 +29,6 @@
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include <sfx2/sidebar/Tools.hxx>
 #include <svx/sidebar/PopupContainer.hxx>
 #include <sfx2/dispatch.hxx>
@@ -46,10 +45,8 @@
 #include <sfx2/objsh.hxx>
 #include <svtools/unitconv.hxx>
 #include <boost/bind.hpp>
-
 using namespace css;
 using namespace cssu;
-using namespace ::sfx2::sidebar;
 using ::sfx2::sidebar::Theme;
 using ::sfx2::sidebar::ControlFactory;
 
@@ -247,28 +244,6 @@ void ParaPropertyPanel::ReSize(bool /* bSize */)
         mxSidebar->requestLayout();
 }
 
-
-
-
-void ParaPropertyPanel::Resize (void)
-{
-    switch (maContext.GetCombinedContext_DI())
-    {
-        case CombinedEnumContext(Application_Calc, Context_DrawText):
-        case CombinedEnumContext(Application_WriterVariants, Context_DrawText):
-        case CombinedEnumContext(Application_WriterVariants, Context_Annotation):
-            ReSize(false);
-            break;
-
-        default:
-            ReSize(true);
-            break;
-    }
-}
-
-
-
-
 void ParaPropertyPanel::EndSpacingPopupMode (void)
 {
     maLineSpacePopup.Hide();
@@ -1538,8 +1513,7 @@ ParaPropertyPanel::ParaPropertyPanel(Window* pParent,
       maBulletsPopup(this, ::boost::bind(&ParaPropertyPanel::CreateBulletsPopupControl, this, _1)),
       maNumberingPopup(this, ::boost::bind(&ParaPropertyPanel::CreateNumberingPopupControl, this, _1)),
       maBGColorPopup(this, ::boost::bind(&ParaPropertyPanel::CreateBGColorPopupControl, this, _1)),
-      mxSidebar(rxSidebar),
-      maLayouter(*this)
+      mxSidebar(rxSidebar)
 {
     //Alignment
     get(mpAlignToolBox, "horizontalalignment");
diff --git a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
index 559d93ab5f77..054485046037 100644
--- a/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
+++ b/svx/source/sidebar/paragraph/ParaPropertyPanel.hxx
@@ -21,7 +21,6 @@
 #include <vcl/ctrl.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
-#include <sfx2/sidebar/GridLayouter.hxx>
 #include <editeng/lspcitem.hxx>
 #include <svtools/ctrlbox.hxx>
 #include <svx/sidebar/PanelLayout.hxx>
@@ -186,7 +185,7 @@ private:
     ParaNumberingPopup maNumberingPopup;
     ColorPopup maBGColorPopup;
     cssu::Reference<css::ui::XSidebar> mxSidebar;
-    ::sfx2::sidebar::GridLayouter maLayouter;
+
 
     ParaPropertyPanel (
         Window* pParent,
@@ -224,8 +223,6 @@ private:
     void initial();
     void ReSize(bool bSize);
 
-    // Inherited from vcl Window.
-    virtual void Resize (void);
 
     PopupControl* CreateLineSpacingControl (PopupContainer* pParent);
     PopupControl* CreateBulletsPopupControl (PopupContainer* pParent);
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index c4a0dc1ec339..20879f1b3d0e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -18,7 +18,6 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/ControlFactory.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include "PosSizePropertyPanel.hxx"
 #include "PosSizePropertyPanel.hrc"
 #include <svx/sidebar/SidebarDialControl.hxx>
@@ -41,7 +40,6 @@
 
 using namespace css;
 using namespace cssu;
-using ::sfx2::sidebar::Layouter;
 using ::sfx2::sidebar::Theme;
 
 #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
@@ -118,8 +116,7 @@ PosSizePropertyPanel::PosSizePropertyPanel(
     mbAutoHeight(false),
     mbAdjustEnabled(false),
     mbIsFlip(false),
-    mxSidebar(rxSidebar),
-    maLayouter(*this)
+    mxSidebar(rxSidebar)
 {
     Initialize();
     FreeResource();
@@ -128,47 +125,6 @@ PosSizePropertyPanel::PosSizePropertyPanel(
     mpBindings->Update( SID_ATTR_TRANSFORM_HEIGHT );
     mpBindings->Update( SID_ATTR_TRANSFORM_PROTECT_SIZE );
     mpBindings->Update( SID_ATTR_METRIC );
-
-    // Setup the grid layouter.
-    const sal_Int32 nMappedMboxWidth (Layouter::MapWidth(*this, MBOX_WIDTH));
-
-    maLayouter.GetCell(0,0).SetControl(*mpFtPosX);
-    maLayouter.GetCell(1,0).SetControl(*mpMtrPosX);
-
-    maLayouter.GetCell(0,2).SetControl(*mpFtPosY);
-    maLayouter.GetCell(1,2).SetControl(*mpMtrPosY);
-
-    maLayouter.GetCell(2,0).SetControl(*mpFtWidth);
-    maLayouter.GetCell(3,0).SetControl(*mpMtrWidth);
-
-    maLayouter.GetCell(2,2).SetControl(*mpFtHeight);
-    maLayouter.GetCell(3,2).SetControl(*mpMtrHeight);
-
-    maLayouter.GetCell(4,0).SetControl(*mpCbxScale).SetGridWidth(3);
-    maLayouter.GetCell(5,0).SetControl(*mpFtAngle).SetGridWidth(3);
-
-
-    maLayouter.GetColumn(0)
-        .SetWeight(1)
-        .SetLeftPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL))
-        .SetMinimumWidth(nMappedMboxWidth);
-    maLayouter.GetColumn(1)
-        .SetWeight(0)
-        .SetMinimumWidth(Layouter::MapWidth(*this, CONTROL_SPACING_HORIZONTAL));
-    maLayouter.GetColumn(2)
-        .SetWeight(1)
-        .SetRightPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL))
-        .SetMinimumWidth(nMappedMboxWidth);
-
-    // Make controls that display text handle short widths more
-    // graceful.
-    Layouter::PrepareForLayouting(*mpFtPosX);
-    Layouter::PrepareForLayouting(*mpFtPosY);
-    Layouter::PrepareForLayouting(*mpFtWidth);
-    Layouter::PrepareForLayouting(*mpFtHeight);
-    Layouter::PrepareForLayouting(*mpCbxScale);
-    Layouter::PrepareForLayouting(*mpFtAngle);
-
 }
 
 
@@ -222,15 +178,6 @@ namespace
 
 
 
-
-void PosSizePropertyPanel::Resize (void)
-{
-    maLayouter.Layout();
-}
-
-
-
-
 void PosSizePropertyPanel::Initialize()
 {
     mpFtPosX->SetBackground(Wallpaper());
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index cb030752eef2..29d9289542cb 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -22,7 +22,6 @@
 #include <sfx2/sidebar/SidebarPanelBase.hxx>
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
-#include <sfx2/sidebar/GridLayouter.hxx>
 #include <boost/scoped_ptr.hpp>
 #include <svx/rectenum.hxx>
 #include <svl/poolitem.hxx>
@@ -68,8 +67,6 @@ public:
     SfxBindings* GetBindings();
     void ShowMenu (void);
 
-    virtual void Resize (void);
-
 private:
     //Position
     ::boost::scoped_ptr< FixedText >        mpFtPosX;
@@ -150,7 +147,6 @@ private:
     bool                                    mbIsFlip : 1;
 
     cssu::Reference<css::ui::XSidebar> mxSidebar;
-    ::sfx2::sidebar::GridLayouter maLayouter;
 
     DECL_LINK( ChangePosXHdl, void * );
     DECL_LINK( ChangePosYHdl, void * );
diff --git a/svx/source/sidebar/text/TextPropertyPanel.cxx b/svx/source/sidebar/text/TextPropertyPanel.cxx
index 3b36f9009c71..68382b14acd9 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.cxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.cxx
@@ -40,7 +40,6 @@
 #include <sfx2/sidebar/ResourceDefinitions.hrc>
 #include <sfx2/sidebar/ControlFactory.hxx>
 #include <sfx2/sidebar/ControllerFactory.hxx>
-#include <sfx2/sidebar/Layouter.hxx>
 #include <sfx2/sidebar/Theme.hxx>
 #include <sfx2/sidebar/SidebarToolBox.hxx>
 #include "sfx2/imagemgr.hxx"
@@ -61,10 +60,8 @@
 
 using namespace css;
 using namespace cssu;
-using namespace ::sfx2::sidebar;
 using ::sfx2::sidebar::Theme;
 using ::sfx2::sidebar::ControlFactory;
-using ::sfx2::sidebar::Layouter;
 
 const char UNO_BACKCOLOR[] = ".uno:BackColor";
 const char UNO_BOLD[] = ".uno:Bold";
@@ -82,9 +79,6 @@ const char UNO_UNDERLINE[] = ".uno:Underline";
 
 #define A2S(pString) (::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(pString)))
 
-
-
-
 namespace svx { namespace sidebar {
 
 #undef HAS_IA2
@@ -159,8 +153,7 @@ TextPropertyPanel::TextPropertyPanel ( Window* pParent, const cssu::Reference<cs
         maCharSpacePopup(this, ::boost::bind(&TextPropertyPanel::CreateCharacterSpacingControl, this, _1)),
         maUnderlinePopup(this, ::boost::bind(&TextPropertyPanel::CreateUnderlinePopupControl, this, _1)),
         maContext(),
-        mpBindings(pBindings),
-        maLayouter(*this)
+        mpBindings(pBindings)
 {
     get(mpFontNameBox, "font");
     get(mpFontSizeBox, "fontsize");
@@ -173,23 +166,6 @@ TextPropertyPanel::TextPropertyPanel ( Window* pParent, const cssu::Reference<cs
     Initialize();
 
     UpdateFontColorToolbox(rContext);
-
-    // Setup the grid layouter.
-    maLayouter.GetCell(0,0).SetControl(*mpFontNameBox).SetMinimumWidth(Layouter::MapWidth(*this,FONTNAME_WIDTH));
-    maLayouter.GetCell(0,2).SetControl(maFontSizeBox).SetFixedWidth();
-
-    maLayouter.GetCell(1,0).SetControl(*mpToolBoxFontBackground).SetFixedWidth();
-    maLayouter.GetCell(1,2).SetControl(*mpToolBoxIncDecBackground).SetFixedWidth();
-
-    maLayouter.GetColumn(0)
-        .SetWeight(1)
-        .SetLeftPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL));
-    maLayouter.GetColumn(1)
-        .SetWeight(0)
-        .SetMinimumWidth(Layouter::MapWidth(*this, CONTROL_SPACING_HORIZONTAL));
-    maLayouter.GetColumn(2)
-        .SetWeight(0)
-        .SetRightPadding(Layouter::MapWidth(*this,SECTIONPAGE_MARGIN_HORIZONTAL));
 }
 
 
@@ -1115,14 +1091,6 @@ void TextPropertyPanel::NotifyItemUpdate (
 
 
 
-void TextPropertyPanel::Resize (void)
-{
-    maLayouter.Layout();
-}
-
-
-
-
 void TextPropertyPanel::UpdateItem (const sal_uInt16 nSlotId)
 {
     switch (nSlotId)
diff --git a/svx/source/sidebar/text/TextPropertyPanel.hxx b/svx/source/sidebar/text/TextPropertyPanel.hxx
index 92d0b4e3a408..342b9a970c5b 100644
--- a/svx/source/sidebar/text/TextPropertyPanel.hxx
+++ b/svx/source/sidebar/text/TextPropertyPanel.hxx
@@ -23,7 +23,6 @@
 #include <sfx2/sidebar/ControllerItem.hxx>
 #include <sfx2/sidebar/IContextChangeReceiver.hxx>
 #include <sfx2/sidebar/EnumContext.hxx>
-#include <sfx2/sidebar/GridLayouter.hxx>
 
 #include <svtools/ctrlbox.hxx>
 #include <svx/tbxcolorupdate.hxx>
@@ -83,9 +82,6 @@ public:
         const SfxPoolItem* pState,
         const bool bIsEnabled);
 
-    // Inherited from vcl Window.
-    virtual void Resize (void);
-
 private:
     //ui controls
     SvxSBFontNameBox* mpFontNameBox;
@@ -135,7 +131,6 @@ private:
 
     ::sfx2::sidebar::EnumContext maContext;
     SfxBindings* mpBindings;
-    ::sfx2::sidebar::GridLayouter maLayouter;
 
     TextPropertyPanel (
         Window* pParent,