[Libreoffice-commits] core.git: cui/source padmin/source unusedcode.easy

Caolán McNamara caolanm at redhat.com
Fri Mar 7 12:20:58 PST 2014


 cui/source/customize/macropg.cxx    |   23 ----------------------
 cui/source/inc/headertablistbox.hxx |    1 
 cui/source/inc/macropg.hxx          |    1 
 padmin/source/adddlg.cxx            |   37 ------------------------------------
 padmin/source/adddlg.hxx            |    1 
 unusedcode.easy                     |    1 
 6 files changed, 1 insertion(+), 63 deletions(-)

New commits:
commit a6c3f7d23481da43204b1ea55b94ef218091ca21
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 7 20:19:45 2014 +0000

    callcatcher: update unused code
    
    Change-Id: Ic8952696fc0e3d78b8183ee7f5c90e37590c7dec

diff --git a/cui/source/customize/macropg.cxx b/cui/source/customize/macropg.cxx
index 00e0851..dee735f 100644
--- a/cui/source/customize/macropg.cxx
+++ b/cui/source/customize/macropg.cxx
@@ -129,17 +129,6 @@ bool MacroEventListBox::Notify( NotifyEvent& rNEvt )
     return nRet;
 }
 
-MacroEventListBox::MacroEventListBox( Window* pParent, const ResId& rId )
-    : Control( pParent, rId )
-    , maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
-    , maListBox( this, WB_HSCROLL | WB_CLIPCHILDREN | WB_TABSTOP )
-{
-    maListBox.SetHelpId( HID_MACRO_HEADERTABLISTBOX );
-
-    // enable the cell focus to show visible focus
-    maListBox.EnableCellFocus();
-}
-
 MacroEventListBox::MacroEventListBox( Window* pParent, WinBits nStyle )
     : Control( pParent, nStyle )
     , maHeaderBar( this, WB_BUTTONSTYLE | WB_BOTTOMBORDER )
@@ -223,18 +212,6 @@ void _SvxMacroTabPage::EnableButtons()
     }
 }
 
-_SvxMacroTabPage::_SvxMacroTabPage( Window* pParent, const ResId& rResId, const SfxItemSet& rAttrSet )
-    : SfxTabPage( pParent, rResId, rAttrSet ),
-    m_xAppEvents(0),
-    m_xDocEvents(0),
-    bReadOnly(false),
-    bDocModified(false),
-    bAppEvents(false),
-    bInitialized(false)
-{
-    mpImpl = new _SvxMacroTabPage_Impl( rAttrSet );
-}
-
 _SvxMacroTabPage::_SvxMacroTabPage(Window* pParent, const OString& rID,
     const OUString& rUIXMLDescription, const SfxItemSet& rAttrSet)
     : SfxTabPage( pParent, rID, rUIXMLDescription, rAttrSet ),
diff --git a/cui/source/inc/headertablistbox.hxx b/cui/source/inc/headertablistbox.hxx
index fd8ff3e..4b2c6e3 100644
--- a/cui/source/inc/headertablistbox.hxx
+++ b/cui/source/inc/headertablistbox.hxx
@@ -33,7 +33,6 @@ protected:
     DECL_LINK( HeaderEndDrag_Impl, HeaderBar* );
     virtual bool                Notify( NotifyEvent& rNEvt );
 public:
-    MacroEventListBox( Window* pParent, const ResId& rId );
     MacroEventListBox( Window* pParent, WinBits nStyle );
 
     virtual void Resize();
diff --git a/cui/source/inc/macropg.hxx b/cui/source/inc/macropg.hxx
index 3f4be4d..e5ab8cd 100644
--- a/cui/source/inc/macropg.hxx
+++ b/cui/source/inc/macropg.hxx
@@ -72,7 +72,6 @@ protected:
     bool bReadOnly, bDocModified, bAppEvents, bInitialized;
     EventDisplayNames aDisplayNames;
 
-    _SvxMacroTabPage( Window* pParent, const ResId& rId, const SfxItemSet& rItemSet );
     _SvxMacroTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const SfxItemSet& rItemSet );
 
     void                        EnableButtons();
diff --git a/padmin/source/adddlg.cxx b/padmin/source/adddlg.cxx
index 30fc8a2..8374c19 100644
--- a/padmin/source/adddlg.cxx
+++ b/padmin/source/adddlg.cxx
@@ -846,41 +846,4 @@ OUString AddPrinterDialog::uniquePrinterName( const OUString& rBase )
     return aResult;
 }
 
-OUString AddPrinterDialog::getOldPrinterLocation()
-{
-    static const char* pHome = getenv( "HOME" );
-    OString aFileName;
-
-    rtl_TextEncoding aEncoding = osl_getThreadTextEncoding();
-    if( pHome )
-    {
-        aFileName = OStringBuffer().append(pHome).
-            append("/.Xpdefaults").makeStringAndClear();
-        if (access(aFileName.getStr(), F_OK))
-        {
-            aFileName = OStringBuffer().append(pHome).
-                append("/.sversionrc").makeStringAndClear();
-            Config aSVer(OStringToOUString(aFileName, aEncoding));
-            aSVer.SetGroup( "Versions" );
-            aFileName = aSVer.ReadKey( "StarOffice 5.2" );
-            if (!aFileName.isEmpty())
-                aFileName = aFileName + OString("/share/xp3/Xpdefaults");
-            else if(
-                    (aFileName = aSVer.ReadKey( "StarOffice 5.1" ) ).getLength()
-                    ||
-                    (aFileName = aSVer.ReadKey( "StarOffice 5.0" ) ).getLength()
-                    ||
-                    (aFileName = aSVer.ReadKey( "StarOffice 4.0" ) ).getLength()
-                    )
-            {
-                aFileName = aFileName + OString("/xp3/Xpdefaults");
-            }
-            if (!aFileName.isEmpty() && access(aFileName.getStr(), F_OK))
-                aFileName = OString();
-        }
-    }
-
-    return !aFileName.isEmpty() ? OStringToOUString(aFileName, aEncoding) : OUString();
-}
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/padmin/source/adddlg.hxx b/padmin/source/adddlg.hxx
index 129dbb5..a8f3c1d 100644
--- a/padmin/source/adddlg.hxx
+++ b/padmin/source/adddlg.hxx
@@ -226,7 +226,6 @@ public:
     ~AddPrinterDialog();
 
     static OUString uniquePrinterName( const OUString& rString );
-    static OUString getOldPrinterLocation();
 
     void enableNext( bool bEnable ) { m_aNextPB.Enable( bEnable ); }
 };
diff --git a/unusedcode.easy b/unusedcode.easy
index 2e3550e..e7dbded 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -200,3 +200,4 @@ std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::Formu
 std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>)
 std::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long)
 vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool)
+writerfilter::ooxml::OOXMLUniversalMeasureValue::OOXMLUniversalMeasureValue(unsigned int)


More information about the Libreoffice-commits mailing list