[Libreoffice-commits] .: 2 commits - svx/inc svx/source

[Muthu Subramanian]

 svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx |    3 -
 svx/inc/svx/tbcontrl.hxx                           |   39 ---------------------
 svx/source/sdr/attribute/sdrfilltextattribute.cxx  |    7 ---
 svx/source/tbxctrls/tbcontrl.cxx                   |    1 
 4 files changed, 50 deletions(-)

New commits:
commit 11f5d3db58dcce64a964d1e4d26eb81e2bb709f1
Author: Winfried Donkers <W.Donkers at dci-electronics.nl>
Date:   Thu Apr 5 14:34:22 2012 +0530

    Unused code removal.

diff --git a/svx/inc/svx/tbcontrl.hxx b/svx/inc/svx/tbcontrl.hxx
index 7cc2479..fcf3e5d 100644
--- a/svx/inc/svx/tbcontrl.hxx
+++ b/svx/inc/svx/tbcontrl.hxx
@@ -48,14 +48,6 @@
         Additional information
         from DocShell:   SvxFontListItem (SID_ATTR_CHAR_FONTLIST)
 
-        SvxFontHeightToolBoxControl
-        ---------------------------
-        Item type:      SvxFontHeightItem
-        Execute-Id:     SID_ATTR_CHAR_FONTHEIGHT
-                        -> SvxFontHeightItem
-        Additional information
-        from DocShell:   SvxFontListItem (SID_ATTR_CHAR_FONTLIST)
-
         SvxFontColorToolBoxControl
         --------------------------
         Item type:      SvxFontColorItem
@@ -173,7 +165,6 @@
 class SvxLineItem;
 class SvxBoxInfoItem;
 class SvxFontItem;
-class SvxFontHeightItem;
 class SfxStyleControllerItem_Impl;
 class SfxStyleSheetBasePool;
 class SfxTemplateItem;
@@ -256,35 +247,6 @@ public:
 
 
 //========================================================================
-// class SvxFontHeightToolBoxControl -------------------------------------
-//========================================================================
-
-/*
-class SvxFontSizeItem;
-class SvxFontItem;
-class SvxFontSizeBox_Impl;
-
-class SVX_DLLPUBLIC SvxFontHeightToolBoxControl : public SfxToolBoxControl
-{
-    SvxFontSizeBox_Impl* pBox;                          // ItemWindow f"ur quick-access
-    ::com::sun::star::awt::FontDescriptor aCurrentFont; // Kopie des aktuellen Fonts
-
-public:
-    SFX_DECL_TOOLBOX_CONTROL();
-    SvxFontHeightToolBoxControl( sal_uInt16 nSlotId, sal_uInt16 nId, ToolBox& rTbx );
-    ~SvxFontHeightToolBoxControl();
-
-    // new controller API
-    // XStatusListener
-    virtual void SAL_CALL statusChanged( const ::com::sun::star::frame::FeatureStateEvent& Event )
-        throw ( ::com::sun::star::uno::RuntimeException );
-
-    virtual Window*     CreateItemWindow( Window *pParent );
-};
-*/
-
-
-//========================================================================
 // class SvxFontColorToolBoxControl --------------------------------------
 //========================================================================
 
@@ -334,7 +296,6 @@ public:
     virtual SfxPopupWindowType  GetPopupWindowType() const;
     virtual SfxPopupWindow*     CreatePopupWindow();
     virtual void                Select( sal_Bool bMod1 = sal_False );
-
 };
 
 
diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx
index f9f25a8..b504d68 100644
--- a/svx/source/tbxctrls/tbcontrl.cxx
+++ b/svx/source/tbxctrls/tbcontrl.cxx
@@ -68,7 +68,6 @@
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/frame/status/ItemStatus.hpp>
-#include <com/sun/star/frame/status/FontHeight.hpp>
 
 #include <svx/dialogs.hrc>
 #include <svx/svxitems.hrc>
commit 62f5df61ff89269e177dd2b8a9d939f49cdbea2d
Author: Santiago Martinez <smvarela at gmail.com>
Date:   Thu Apr 5 14:33:20 2012 +0530

    Unused code removal.

diff --git a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
index 30fad2d..3dfeea9 100644
--- a/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
+++ b/svx/inc/svx/sdr/attribute/sdrfilltextattribute.hxx
@@ -56,9 +56,6 @@ namespace drawinglayer
             SdrFillTextAttribute(const SdrFillTextAttribute& rCandidate);
             SdrFillTextAttribute& operator=(const SdrFillTextAttribute& rCandidate);
 
-            // checks if the incarnation is default constructed
-            bool isDefault() const;
-
             // compare operator
             bool operator==(const SdrFillTextAttribute& rCandidate) const;
 
diff --git a/svx/source/sdr/attribute/sdrfilltextattribute.cxx b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
index 3ab55bd..f36cf7f 100644
--- a/svx/source/sdr/attribute/sdrfilltextattribute.cxx
+++ b/svx/source/sdr/attribute/sdrfilltextattribute.cxx
@@ -68,13 +68,6 @@ namespace drawinglayer
             return *this;
         }
 
-        bool SdrFillTextAttribute::isDefault() const
-        {
-            return(getFill().isDefault()
-                && getFillFloatTransGradient().isDefault()
-                && getText().isDefault());
-        }
-
         bool SdrFillTextAttribute::operator==(const SdrFillTextAttribute& rCandidate) const
         {
             return(getFill() == rCandidate.getFill()