[Libreoffice-commits] .: Branch 'libreoffice-3-5' - 2 commits - cui/source svtools/inc svtools/source

[Noel Power]

 cui/source/tabpages/border.src     |    2 +-
 svtools/inc/svtools/ctrlbox.hxx    |    4 ++++
 svtools/source/control/ctrlbox.cxx |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 2f23703cf6b2f1e5b28b5d5153e3f247ff3aa223
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 27 23:44:26 2012 +0100

    SvxBorderTabPage: the minimal border width is 1 twip
    
    Signed-off-by: Noel Power <noel.power at novell.com>

diff --git a/cui/source/tabpages/border.src b/cui/source/tabpages/border.src
index 8496f18..45b412d 100644
--- a/cui/source/tabpages/border.src
+++ b/cui/source/tabpages/border.src
@@ -116,7 +116,7 @@ TabPage RID_SVXPAGE_BORDER
         First = 25 ;
         Last = 900 ;
         Maximum = 900 ;
-        Minimum = 25 ;
+        Minimum = 5 ;
         DecimalDigits = 2 ;
         Unit = FUNIT_POINT ;
     };
commit 4362a5d2cebfcb0146fd61ba82147d2195485338
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jan 27 23:45:53 2012 +0100

    svtools: LineListBox: fix handling of "none" style
    
    This was erroneously mapped to SOLID, thus effectively preventing the
    removal of borders via the list box.
    
    Signed-off-by: Noel Power <noel.power at novell.com>

diff --git a/svtools/inc/svtools/ctrlbox.hxx b/svtools/inc/svtools/ctrlbox.hxx
index 3ab9e31..1174beb 100644
--- a/svtools/inc/svtools/ctrlbox.hxx
+++ b/svtools/inc/svtools/ctrlbox.hxx
@@ -48,9 +48,13 @@ typedef ::std::vector< ImplColorListData*    > ImpColorList;
 typedef ::std::vector< ImpLineListData*      > ImpLineList;
 typedef ::std::vector< ImplFontNameListData* > ImplFontList;
 
+// FIXME: STYLE_* duplicate values from editeng::SvxBorderStyle,
+// which in turn duplicates values from com::sun::star::table::BorderLineStyle:
+// this needs cleaning up on master
 #define STYLE_SOLID                ( ( sal_uInt16 ) 0 )
 #define STYLE_DOTTED               ( ( sal_uInt16 ) 1 )
 #define STYLE_DASHED               ( ( sal_uInt16 ) 2 )
+#define STYLE_NONE                 ( ( sal_uInt16 ) -1)
 
 #define CHANGE_LINE1               ( ( sal_uInt16 ) 1 )
 #define CHANGE_LINE2               ( ( sal_uInt16 ) 2 )
diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx
index cf7df79..6d8db08 100644
--- a/svtools/source/control/ctrlbox.cxx
+++ b/svtools/source/control/ctrlbox.cxx
@@ -879,7 +879,7 @@ long LineListBox::GetEntryDistance( sal_uInt16 nPos ) const
 sal_uInt16 LineListBox::GetEntryStyle( sal_uInt16 nPos ) const
 {
     ImpLineListData* pData = (nPos < pLineList->size()) ? (*pLineList)[ nPos ] : NULL;
-    return ( pData ) ? pData->GetStyle() : STYLE_SOLID;
+    return ( pData ) ? pData->GetStyle() : STYLE_NONE;
 }
 
 // -----------------------------------------------------------------------