[Libreoffice-commits] core.git: dbaccess/source extensions/source include/vcl unusedcode.easy vcl/source
Caolán McNamara
caolanm at redhat.com
Sat Aug 16 03:44:17 PDT 2014
dbaccess/source/ui/control/charsetlistbox.cxx | 16 ---------------
dbaccess/source/ui/dlg/adminpages.cxx | 11 ----------
dbaccess/source/ui/dlg/adminpages.hxx | 1
dbaccess/source/ui/inc/charsetlistbox.hxx | 1
extensions/source/dbpilots/commonpagesdbp.cxx | 15 --------------
extensions/source/dbpilots/commonpagesdbp.hxx | 1
include/vcl/menubtn.hxx | 2 -
include/vcl/tabctrl.hxx | 2 -
unusedcode.easy | 6 ++---
vcl/source/control/menubtn.cxx | 27 --------------------------
vcl/source/control/tabctrl.cxx | 25 ------------------------
11 files changed, 4 insertions(+), 103 deletions(-)
New commits:
commit 7c1e12af8794db56a5dd9eeaea7067e6eff6584d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Sat Aug 16 10:39:54 2014 +0100
callcatcher: update unused code
res ctor fallout continues at pace
Change-Id: Ic431c678919a6521ce94719cbf06b87ebf922a0c
diff --git a/dbaccess/source/ui/control/charsetlistbox.cxx b/dbaccess/source/ui/control/charsetlistbox.cxx
index 371f372..7327a58 100644
--- a/dbaccess/source/ui/control/charsetlistbox.cxx
+++ b/dbaccess/source/ui/control/charsetlistbox.cxx
@@ -25,22 +25,8 @@
namespace dbaui
{
- // CharSetListBox
- CharSetListBox::CharSetListBox( Window* _pParent, const ResId& _rResId )
- :ListBox( _pParent, _rResId )
- {
- SetDropDownLineCount( 20 );
-
- OCharsetDisplay::const_iterator charSet = m_aCharSets.begin();
- while ( charSet != m_aCharSets.end() )
- {
- InsertEntry( (*charSet).getDisplayName() );
- ++charSet;
- }
- }
-
CharSetListBox::CharSetListBox( Window* _pParent, WinBits _nBits = WB_DROPDOWN )
- :ListBox( _pParent, _nBits )
+ : ListBox( _pParent, _nBits )
{
SetDropDownLineCount( 20 );
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 292b73a..1b23afb 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -56,17 +56,6 @@ namespace dbaui
{
}
- // OGenericAdministrationPage
- OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet)
- :SfxTabPage(_pParent, _rId, _rAttrSet)
- ,m_abEnableRoadmap(false)
- ,m_pAdminDialog(NULL)
- ,m_pItemSetHelper(NULL)
- {
-
- SetExchangeSupport(true);
- }
-
OGenericAdministrationPage::OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet)
:SfxTabPage(_pParent, _rId, _rUIXMLDescription, &_rAttrSet)
,m_abEnableRoadmap(false)
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index 88a8784..bf6ec61 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -102,7 +102,6 @@ namespace dbaui
::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >
m_xORB;
public:
- OGenericAdministrationPage(Window* _pParent, const ResId& _rId, const SfxItemSet& _rAttrSet);
OGenericAdministrationPage(Window* _pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rAttrSet);
/// set a handler which gets called every time something on the page has been modified
void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; }
diff --git a/dbaccess/source/ui/inc/charsetlistbox.hxx b/dbaccess/source/ui/inc/charsetlistbox.hxx
index 5a0df9d..990c9df 100644
--- a/dbaccess/source/ui/inc/charsetlistbox.hxx
+++ b/dbaccess/source/ui/inc/charsetlistbox.hxx
@@ -33,7 +33,6 @@ namespace dbaui
class CharSetListBox : public ListBox
{
public:
- CharSetListBox( Window* _pParent, const ResId& _rResId );
CharSetListBox( Window* _pParent, WinBits _nBits );
virtual ~CharSetListBox();
diff --git a/extensions/source/dbpilots/commonpagesdbp.cxx b/extensions/source/dbpilots/commonpagesdbp.cxx
index 25090d8..fdd481c 100644
--- a/extensions/source/dbpilots/commonpagesdbp.cxx
+++ b/extensions/source/dbpilots/commonpagesdbp.cxx
@@ -375,19 +375,6 @@ namespace dbp
}
}
-
- //= OMaybeListSelectionPage
-
-
- OMaybeListSelectionPage::OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId )
- :OControlWizardPage(_pParent, _rId)
- ,m_pYes(NULL)
- ,m_pNo(NULL)
- ,m_pList(NULL)
- {
- }
-
-
OMaybeListSelectionPage::OMaybeListSelectionPage( OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription )
:OControlWizardPage(_pParent, _rID, _rUIXMLDescription)
,m_pYes(NULL)
@@ -396,7 +383,6 @@ namespace dbp
{
}
-
void OMaybeListSelectionPage::announceControls(RadioButton& _rYesButton, RadioButton& _rNoButton, ListBox& _rSelection)
{
m_pYes = &_rYesButton;
@@ -408,7 +394,6 @@ namespace dbp
implEnableWindows();
}
-
IMPL_LINK( OMaybeListSelectionPage, OnRadioSelected, RadioButton*, /*NOTINTERESTEDIN*/ )
{
implEnableWindows();
diff --git a/extensions/source/dbpilots/commonpagesdbp.hxx b/extensions/source/dbpilots/commonpagesdbp.hxx
index d8da418..8d9d9c8 100644
--- a/extensions/source/dbpilots/commonpagesdbp.hxx
+++ b/extensions/source/dbpilots/commonpagesdbp.hxx
@@ -79,7 +79,6 @@ namespace dbp
ListBox* m_pList;
public:
- OMaybeListSelectionPage( OControlWizard* _pParent, const ResId& _rId );
OMaybeListSelectionPage( OControlWizard* _pParent, const OString& _rID, const OUString& _rUIXMLDescription );
protected:
diff --git a/include/vcl/menubtn.hxx b/include/vcl/menubtn.hxx
index f62c3cb..22ca309 100644
--- a/include/vcl/menubtn.hxx
+++ b/include/vcl/menubtn.hxx
@@ -55,11 +55,9 @@ private:
protected:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
public:
explicit MenuButton( Window* pParent, WinBits nStyle = 0 );
- explicit MenuButton( Window* pParent, const ResId& );
virtual ~MenuButton();
virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE;
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 6f92853..4531c09 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -109,8 +109,6 @@ public:
void SetItemsOffset( const Point& rOffs );
Point GetItemsOffset() const;
- void InsertPage( const ResId& rResId,
- sal_uInt16 nPos = TAB_APPEND );
void InsertPage( sal_uInt16 nPageId, const OUString& rText,
sal_uInt16 nPos = TAB_APPEND );
void RemovePage( sal_uInt16 nPageId );
diff --git a/unusedcode.easy b/unusedcode.easy
index dc8ae96..b2ac9e8 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -47,6 +47,9 @@ SvtListener::IsListening(SvtBroadcaster&) const
SvxFontListBox::GetSelectEntry() const
SvxOpenGLObject::getRenderer()
SvxOpenGLObject::setRenderer(IOpenGLRenderer*)
+SwDoc::GetDocumentFieldsMAnager() const
+SwDoc::GetDocumentStateManager()
+SwDoc::GetDocumentStateManager() const
SwLayHelper::CheckPageFlyCache(SwPageFrm*&, SwFlyFrm*)
SwTxtPaintInfo::DrawSpecial(SwLinePortion const&, unsigned short, Color const&) const
SwUpdateAttr::SwUpdateAttr(int, int, unsigned short, std::__debug::vector<unsigned short, std::allocator<unsigned short> >)
@@ -181,9 +184,6 @@ canvas::createSurfaceProxyManager(boost::shared_ptr<canvas::IRenderModule> const
chart::ChartTypeUnoDlg::Create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
chart::InternalData::isDefaultData()
chart::ShapeToolbarController::create(com::sun::star::uno::Reference<com::sun::star::uno::XComponentContext> const&)
-chart::opengl3D::OpenGL3DRenderer::SetScroll()
-chart::opengl3D::OpenGL3DRenderer::SetScrollDistance(float)
-chart::opengl3D::OpenGL3DRenderer::SetScrollSpeed(float)
comphelper::OAccessibleImplementationAccess::setStateBit(short, bool)
comphelper::detail::ConfigurationWrapper::getGroupReadWrite(boost::shared_ptr<comphelper::ConfigurationChanges> const&, rtl::OUString const&) const
comphelper::detail::ConfigurationWrapper::getLocalizedPropertyValue(rtl::OUString const&) const
diff --git a/vcl/source/control/menubtn.cxx b/vcl/source/control/menubtn.cxx
index 7f263b6..8e11b38 100644
--- a/vcl/source/control/menubtn.cxx
+++ b/vcl/source/control/menubtn.cxx
@@ -80,33 +80,6 @@ MenuButton::MenuButton( Window* pParent, WinBits nWinBits )
ImplInit( pParent, nWinBits );
}
-MenuButton::MenuButton( Window* pParent, const ResId& rResId )
- : PushButton( WINDOW_MENUBUTTON )
-{
- ImplInitMenuButtonData();
- rResId.SetRT( RSC_MENUBUTTON );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes( rResId );
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
-void MenuButton::ImplLoadRes( const ResId& rResId )
-{
- Control::ImplLoadRes( rResId );
-
- sal_uLong nObjMask = ReadLongRes();
-
- if ( RSCMENUBUTTON_MENU & nObjMask )
- {
- mpOwnMenu = new PopupMenu( ResId( (RSHEADER_TYPE*)GetClassRes(), *rResId.GetResMgr() ) );
- SetPopupMenu( mpOwnMenu );
- IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) );
- }
-}
-
MenuButton::~MenuButton()
{
delete mpMenuTimer;
diff --git a/vcl/source/control/tabctrl.cxx b/vcl/source/control/tabctrl.cxx
index 09af363..dd0c5c9 100644
--- a/vcl/source/control/tabctrl.cxx
+++ b/vcl/source/control/tabctrl.cxx
@@ -1614,31 +1614,6 @@ Size TabControl::GetTabPageSizePixel() const
return aRect.GetSize();
}
-void TabControl::InsertPage( const ResId& rResId, sal_uInt16 nPos )
-{
- GetRes( rResId.SetRT( RSC_TABCONTROLITEM ) );
-
- sal_uLong nObjMask = ReadLongRes();
- sal_uInt16 nItemId = 1;
-
- // ID
- if ( nObjMask & RSC_TABCONTROLITEM_ID )
- nItemId = sal::static_int_cast<sal_uInt16>(ReadLongRes());
-
- // Text
- OUString aTmpStr;
- if( nObjMask & RSC_TABCONTROLITEM_TEXT )
- aTmpStr = ReadStringRes();
- InsertPage( nItemId, aTmpStr, nPos );
-
- // PageResID
- if ( nObjMask & RSC_TABCONTROLITEM_PAGERESID )
- {
- //skip unused TabPageResId value
- ReadLongRes();
- }
-}
-
void TabControl::InsertPage( sal_uInt16 nPageId, const OUString& rText,
sal_uInt16 nPos )
{
More information about the Libreoffice-commits
mailing list