From fac4bed44bb22d4ccdab1dd08fac597b39ea2ba4 Mon Sep 17 00:00:00 2001
From: Caolán McNamara <caolanm@redhat.com>
Date: Thu, 27 Sep 2012 15:06:29 +0100
Subject: fix up merge

Change-Id: I1ce7e72c2c0d1a2cf56df66197510e6870c18047
---
 sw/source/ui/cctrl/actctrl.cxx          | 2 +-
 sw/source/ui/dialog/wordcountdialog.cxx | 2 +-
 sw/source/ui/misc/srtdlg.cxx            | 2 +-
 vcl/source/window/layout.cxx            | 8 --------
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index 34f9d5d7f072..18c2ac42fa1e 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/ui/cctrl/actctrl.cxx
@@ -67,7 +67,7 @@ NoSpaceEdit::NoSpaceEdit( Window* pParent, const ResId& rResId)
 
 NoSpaceEdit::NoSpaceEdit(Window* pParent)
     : Edit(pParent),
-    sForbiddenChars(String::CreateFromAscii(" "))
+    sForbiddenChars(rtl::OUString(" "))
 {
 }
 
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 98703d60debb..c8778c905089 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -125,7 +125,7 @@ void SwWordCountFloatDlg::UpdateCounts()
 
 void SwWordCountFloatDlg::SetCounts(const SwDocStat &rCurrCnt, const SwDocStat &rDocStat)
 {
-    aDlg.SetValues(rCurrCnt, rDocStat);
+    SetValues(rCurrCnt, rDocStat);
 }
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/ui/misc/srtdlg.cxx b/sw/source/ui/misc/srtdlg.cxx
index 8e8c9fb4ecac..419dbc29081e 100644
--- a/sw/source/ui/misc/srtdlg.cxx
+++ b/sw/source/ui/misc/srtdlg.cxx
@@ -233,7 +233,7 @@ SwSortDlg::SwSortDlg(Window* pParent, SwWrtShell &rShell)
     if(!m_pDelimTabRB->IsChecked())
     {
         m_pDelimEdt->SetText(rtl::OUString(cDeli));
-        m_pDelimEdt->Check(sal_True);
+        m_pDelimFreeRB->Check(sal_True);
         DelimHdl(m_pDelimFreeRB);
     }
     else
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index b125c2dab2af..c6761c04e063 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -128,10 +128,6 @@ Size VclBox::calculateRequisition() const
 
 void VclBox::setAllocation(const Size &rAllocation)
 {
-    //SetBackground( Color(0x00, 0xFF, 0x00) );
-
-    rtl::OString sExpand(RTL_CONSTASCII_STRINGPARAM("expand"));
-
     sal_uInt16 nVisibleChildren = 0, nExpandChildren = 0;
     for (Window *pChild = GetWindow(WINDOW_FIRSTCHILD); pChild; pChild = pChild->GetWindow(WINDOW_NEXT))
     {
@@ -160,10 +156,6 @@ void VclBox::setAllocation(const Size &rAllocation)
         nExtraSpace = (getPrimaryDimension(rAllocation) - getPrimaryDimension(aRequisition)) / nExpandChildren;
     }
 
-    rtl::OString sPadding(RTL_CONSTASCII_STRINGPARAM("padding"));
-    rtl::OString sPackType(RTL_CONSTASCII_STRINGPARAM("pack-type"));
-    rtl::OString sFill(RTL_CONSTASCII_STRINGPARAM("fill"));
-
     for (sal_Int32 ePackType = VCL_PACK_START; ePackType <= VCL_PACK_END; ++ePackType)
     {
         Point aPos(0, 0);
-- 
cgit