[Libreoffice-commits] core.git: Branch 'aoo/trunk' - 3 commits - autodoc/source offapi/com sw/source

[Kay Schenk]

 autodoc/source/display/idl/hfi_hierarchy.cxx         |    6 +++---
 offapi/com/sun/star/awt/UnoControlFixedTextModel.idl |    7 +++++++
 sw/source/core/doc/poolfmt.cxx                       |    3 +--
 3 files changed, 11 insertions(+), 5 deletions(-)

New commits:
commit 92ff48eb981610cb1565cd5472a6714feb7f68a6
Author: Kay Schenk <kschenk at apache.org>
Date:   Sun Feb 14 21:45:01 2016 +0000

    #i126658# Add description about NoLabel property on css.awt.UnoControlFixedTextModel
    
    Patch by: hanya

diff --git a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
index 9bc7a99..a6cbd30 100644
--- a/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
+++ b/offapi/com/sun/star/awt/UnoControlFixedTextModel.idl
@@ -169,6 +169,13 @@ published service UnoControlFixedTextModel
      */
     [optional, property] com::sun::star::style::VerticalAlignment VerticalAlign;
 
+    //-------------------------------------------------------------------------
+
+    /** supresses automatic accelerator assignment on this control.
+
+        @since OpenOffice 2.4
+     */
+    [optional, property] boolean NoLabel;
 };
 
 //=============================================================================
commit 257406d5794770d8c07c263b7d043fda944da07a
Author: Kay Schenk <kschenk at apache.org>
Date:   Sun Feb 14 21:38:20 2016 +0000

    #i126652#  [Autodoc] Numeric character reference should ends with a semicolon
    
    Patch by: hanya

diff --git a/autodoc/source/display/idl/hfi_hierarchy.cxx b/autodoc/source/display/idl/hfi_hierarchy.cxx
index 206e126..119084b 100644
--- a/autodoc/source/display/idl/hfi_hierarchy.cxx
+++ b/autodoc/source/display/idl/hfi_hierarchy.cxx
@@ -163,16 +163,16 @@ Write_Bases( csi::xml::Element &            o_out,
         for (uintt i = 0; i < io_setColumns.size(); ++i)
         {
             if (io_setColumns[i] == 1)
-                o_out << new csi::xml::XmlCode("&#x2503");
+                o_out << new csi::xml::XmlCode("&#x2503;");
             else
                 o_out << "  ";
             o_out << " ";
         }
 
         if (bThereComesMore)
-            o_out << new csi::xml::XmlCode("&#x2523");
+            o_out << new csi::xml::XmlCode("&#x2523;");
         else
-            o_out << new csi::xml::XmlCode("&#x2517");
+            o_out << new csi::xml::XmlCode("&#x2517;");
         o_out << " ";
 
         HF_IdlTypeText
commit 334f028219a004408695d6c099a543d5555c1f07
Author: Kay Schenk <kschenk at apache.org>
Date:   Sun Feb 14 21:07:39 2016 +0000

    #i126635# Possible null pointer reference
    
    patch by: orcmid

diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 4467076..40d5de1 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -300,8 +300,7 @@ void lcl_SetNumBul( SwDoc* pDoc, SwTxtFmtColl* pColl,
     rSet.Put( aLR );
     rSet.Put( aUL );
 
-    if( !pColl )
-        pColl->SetNextTxtFmtColl( *pDoc->GetTxtCollFromPool( nNxt ));
+    pColl->SetNextTxtFmtColl( *pDoc->GetTxtCollFromPool( nNxt ));
 }