[Libreoffice-commits] .: cui/uiconfig sw/uiconfig vcl/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Fri Oct 12 02:46:55 PDT 2012


 cui/uiconfig/ui/charnamepage.ui      |    8 ++++----
 sw/uiconfig/swriter/ui/sortdialog.ui |    2 +-
 vcl/source/window/builder.cxx        |    2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 0ac7f6120eab04a95185342e935c0bbca4d8cc43
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Oct 12 10:43:00 2012 +0100

    Resolves: fdo#55685 SvxLanguageBox is in svxcore not in svx
    
    Change-Id: I50f68674e057dd358357d611bbbbb3332d8cd00b

diff --git a/cui/uiconfig/ui/charnamepage.ui b/cui/uiconfig/ui/charnamepage.ui
index 05d2527..aebb93a 100644
--- a/cui/uiconfig/ui/charnamepage.ui
+++ b/cui/uiconfig/ui/charnamepage.ui
@@ -84,7 +84,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo:SvxLanguageBox" id="westlanglb-nocjk">
+                  <object class="svxcorelo:SvxLanguageBox" id="westlanglb-nocjk">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -285,7 +285,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo:SvxLanguageBox" id="westlanglb-cjk">
+                  <object class="svxcorelo:SvxLanguageBox" id="westlanglb-cjk">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -434,7 +434,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo:SvxLanguageBox" id="eastlanglb">
+                  <object class="svxcorelo:SvxLanguageBox" id="eastlanglb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
@@ -583,7 +583,7 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="svxlo:SvxLanguageBox" id="ctllanglb">
+                  <object class="svxcorelo:SvxLanguageBox" id="ctllanglb">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
diff --git a/sw/uiconfig/swriter/ui/sortdialog.ui b/sw/uiconfig/swriter/ui/sortdialog.ui
index bd0223e..4018d1e 100644
--- a/sw/uiconfig/swriter/ui/sortdialog.ui
+++ b/sw/uiconfig/swriter/ui/sortdialog.ui
@@ -697,7 +697,7 @@
                         <property name="can_focus">False</property>
                         <property name="left_padding">12</property>
                         <child>
-                          <object class="svxlo:SvxLanguageBox" id="langlb">
+                          <object class="svxcorelo:SvxLanguageBox" id="langlb">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
                           </object>
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index 75d2523..2938653 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -785,7 +785,7 @@ Window *VclBuilder::makeObject(Window *pParent, const OString &name, const OStri
                 pWindow = (*pFunction)(pParent, rMap);
         }
     }
-    SAL_WARN_IF(!pWindow, "vcl.layout", "problably need to implement " << name.getStr() << "or add a make" << name.getStr() << " function");
+    SAL_WARN_IF(!pWindow, "vcl.layout", "probably need to implement " << name.getStr() << " or add a make" << name.getStr() << " function");
     if (pWindow)
     {
         pWindow->SetHelpId(m_sHelpRoot + id);


More information about the Libreoffice-commits mailing list