[Libreoffice-commits] core.git: 2 commits - framework/source vcl/source

[Caolán McNamara]

 framework/source/fwe/classes/addonsoptions.cxx |   28 -------------------------
 vcl/source/window/window2.cxx                  |    2 -
 2 files changed, 1 insertion(+), 29 deletions(-)

New commits:
commit 902ed18886e321e80a95250fee423f6e871ceb28
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 31 09:20:02 2014 +0100

    use toBool
    
    Change-Id: I334570bac6f0ab8fbd606610f0dcd812041c72b1

diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index acab1b8..73fe674 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1865,7 +1865,7 @@ bool Window::set_font_attribute(const OString &rKey, const OString &rValue)
             aFont.SetItalic(ITALIC_NORMAL);
         SetControlFont(aFont);
     }
-    else if (rKey == "underline" && rValue == "True")
+    else if (rKey == "underline" && toBool(rValue) == true)
     {
         Font aFont(GetControlFont());
         aFont.SetUnderline(UNDERLINE_SINGLE);
commit e6ff457de6f99c7c51e8dfe4295f4be7fbbc94a0
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Mar 31 09:17:13 2014 +0100

    callcatcher: update unused code
    
    Change-Id: I9d8601eb66a460702530e013bf573c6482c49c0b

diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 05b296b..2387e57 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -351,7 +351,6 @@ class AddonsOptions_Impl : public ConfigItem
         void                 SubstituteVariables( OUString& aURL );
 
         bool                 ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu );
-        void                 InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq );
         OUString          GeneratePrefixURL();
 
         Sequence< OUString > GetPropertyNamesMenuItem( const OUString& aPropertyRootNode ) const;
@@ -874,34 +873,7 @@ bool AddonsOptions_Impl::ReadToolBarItemSet( const OUString& rToolBarItemSetNode
     return ( (sal_uInt32)rAddonOfficeToolBarSeq.getLength() > nToolBarItemCount );
 }
 
-
-//  private method
-
-void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq )
-{
-    Sequence< PropertyValue >   aToolBarItem( PROPERTYCOUNT_TOOLBARITEM );
-
-    aToolBarItem[ OFFSET_TOOLBARITEM_URL                ].Name = m_aPropNames[ INDEX_URL            ];
-    aToolBarItem[ OFFSET_TOOLBARITEM_TITLE              ].Name = m_aPropNames[ INDEX_TITLE          ];
-    aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER    ].Name = m_aPropNames[ INDEX_IMAGEIDENTIFIER];
-    aToolBarItem[ OFFSET_TOOLBARITEM_TARGET             ].Name = m_aPropNames[ INDEX_TARGET         ];
-    aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT            ].Name = m_aPropNames[ INDEX_CONTEXT        ];
-
-    aToolBarItem[ OFFSET_TOOLBARITEM_URL                ].Value <<= SEPARATOR_URL;
-    aToolBarItem[ OFFSET_TOOLBARITEM_TITLE              ].Value <<= m_aEmpty;
-    aToolBarItem[ OFFSET_TOOLBARITEM_TARGET             ].Value <<= m_aEmpty;
-    aToolBarItem[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER    ].Value <<= m_aEmpty;
-    aToolBarItem[ OFFSET_TOOLBARITEM_CONTEXT            ].Value <<= m_aEmpty;
-
-    sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength();
-    rAddonOfficeToolBarSeq.realloc( nToolBarItemCount+1 );
-    rAddonOfficeToolBarSeq[nToolBarItemCount] = aToolBarItem;
-}
-
-
-
 //  private method
-
 void AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
 {
     // Read the user-defined Images set and fill image manager