[Libreoffice-commits] core.git: sw/source

[Fridrich Å trba]

 sw/source/ui/config/optload.cxx         |    2 +-
 sw/source/ui/dialog/wordcountdialog.cxx |    2 +-
 sw/source/ui/misc/bookmark.cxx          |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit aabcdab969825c16a3edd2431f5b41eec17afdf4
Author: Fridrich Å trba <fridrich.strba at bluewin.ch>
Date:   Thu Mar 7 15:52:21 2013 +0100

    Fix sw build
    
    Change-Id: I28d0a471df67b9b61ba3878f38ae5c3584a80f28

diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index a9d2f17..66a48ff 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -689,7 +689,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl)
         else
             aCategoryBox.SetText( sNone );
         if (pOpt->GetCategory().Len() &&
-            aCategoryBox.GetEntryPos(pOpt->GetCategory()) == COMBOBOX_ENTRY_NOTFOUND)
+            aCategoryBox.GetEntryPos(OUString(pOpt->GetCategory())) == COMBOBOX_ENTRY_NOTFOUND)
             aCategoryBox.InsertEntry(pOpt->GetCategory());
         if (aCategoryBox.GetText().isEmpty())
         {
diff --git a/sw/source/ui/dialog/wordcountdialog.cxx b/sw/source/ui/dialog/wordcountdialog.cxx
index 66b64fa..5347dd6 100644
--- a/sw/source/ui/dialog/wordcountdialog.cxx
+++ b/sw/source/ui/dialog/wordcountdialog.cxx
@@ -20,7 +20,7 @@
 #include <swtypes.hxx>
 #include <wordcountdialog.hxx>
 #include <docstat.hxx>
-#include <dialog.hrc>
+#include <dialog.hxx>
 #include <cmdid.h>
 #include <swmodule.hxx>
 #include <wview.hxx>
diff --git a/sw/source/ui/misc/bookmark.cxx b/sw/source/ui/misc/bookmark.cxx
index 5d40a8b..05ccf29 100644
--- a/sw/source/ui/misc/bookmark.cxx
+++ b/sw/source/ui/misc/bookmark.cxx
@@ -176,7 +176,7 @@ sal_uInt16 BookmarkCombo::GetSelEntryPos(sal_uInt16 nPos) const
 
     for (; nPos < nCnt; nPos++)
     {
-        String sEntry(comphelper::string::strip(GetText().getToken(nPos, cSep), ' '));
+        OUString sEntry(comphelper::string::strip(GetText().getToken(nPos, cSep), ' '));
         if (GetEntryPos(sEntry) != COMBOBOX_ENTRY_NOTFOUND)
             return nPos;
     }
@@ -211,7 +211,7 @@ sal_uInt16 BookmarkCombo::GetSelectEntryPos( sal_uInt16 nSelIndex ) const
         if (nSelIndex == nCnt)
         {
             sal_Unicode cSep = GetMultiSelectionSeparator();
-            String sEntry(comphelper::string::strip(GetText().getToken(nPos, cSep), ' '));
+            OUString sEntry(comphelper::string::strip(GetText().getToken(nPos, cSep), ' '));
             return GetEntryPos(sEntry);
         }
         nPos = GetNextSelEntryPos(nPos);