[Libreoffice-commits] core.git: 2 commits - dbaccess/uiconfig sc/source

[Herbert Dürr]

 dbaccess/uiconfig/ui/tablesfilterpage.ui       |    5 ++++-
 sc/source/filter/xml/XMLStylesExportHelper.cxx |    2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

New commits:
commit 2cb1a05e867c17328ef24bd3489f3c18d80dfcf4
Author: Herbert Dürr <hdu at apache.org>
Date:   Tue Jan 21 13:56:09 2014 +0000

    get rid of an extraneous parentheses in "if((A==B))"
    
    (cherry picked from commit 275a1d7a011e79a7f9c44c51e947d2cb50197051)
    
    Conflicts:
    	basctl/source/dlged/dlged.cxx
    	dbaccess/source/ui/querydesign/JoinTableView.cxx
    	sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx
    	svtools/source/edit/syntaxhighlight.cxx
    	svx/source/unodraw/unoshape.cxx
    	sw/source/ui/app/appopt.cxx
    	vcl/osx/salinst.cxx
    
    Change-Id: If4ddf4ab23dbcfc4ba280948c73664b9794aecc7

diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index c3d862d..6a50503 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -320,7 +320,7 @@ void ScMyValidationsContainer::WriteMessage(ScXMLExport& rExport,
         bool bPrevCharWasSpace(true);
         while(i < sText.getLength())
         {
-            if ((sText[i] == '\n'))
+            if( sText[i] == '\n')
             {
                 SvXMLElementExport aElemP(rExport, XML_NAMESPACE_TEXT, XML_P, true, false);
                 rExport.GetTextParagraphExport()->exportText(sTemp.makeStringAndClear(), bPrevCharWasSpace);
commit 656babddbc862d0d2498c79f616db839577a80ae
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Jan 21 15:08:36 2014 +0000

    wrap long text in tables filter dialog
    
    Change-Id: I64f513969ff8eae48da4b55449439ea61b828645

diff --git a/dbaccess/uiconfig/ui/tablesfilterpage.ui b/dbaccess/uiconfig/ui/tablesfilterpage.ui
index 70ab9ee..cee902e 100644
--- a/dbaccess/uiconfig/ui/tablesfilterpage.ui
+++ b/dbaccess/uiconfig/ui/tablesfilterpage.ui
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.16.0 on Tue Jan 21 09:48:38 2014 -->
+<!-- Generated with glade 3.16.0 on Tue Jan 21 15:00:47 2014 -->
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkFrame" id="TablesFilterPage">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -31,6 +32,8 @@
                 <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">Mark the tables that should be visible for the applications.</property>
+                <property name="wrap">True</property>
+                <property name="max_width_chars">56</property>
               </object>
               <packing>
                 <property name="left_attach">0</property>