[Libreoffice-commits] core.git: 2 commits - include/svx include/tools include/vcl rsc/inc rsc/source sc/source sfx2/source svx/source sw/source sw/uiconfig toolkit/source tools/source unusedcode.easy vcl/source
Caolán McNamara
caolanm at redhat.com
Tue Aug 27 01:59:21 PDT 2013
include/svx/nbdtmg.hxx | 2 --
include/svx/nbdtmgfact.hxx | 14 +++-----------
include/tools/rc.h | 3 ---
include/tools/rcid.h | 2 +-
include/vcl/button.hxx | 1 -
rsc/inc/rscdb.hxx | 1 -
rsc/source/parser/rscicpx.cxx | 19 -------------------
rsc/source/parser/rscinit.cxx | 6 ------
sc/source/ui/cctrl/checklistmenu.cxx | 6 ------
sc/source/ui/inc/checklistmenu.hxx | 1 -
sfx2/source/sidebar/SidebarController.cxx | 19 -------------------
sfx2/source/sidebar/SidebarController.hxx | 1 -
svx/source/sidebar/nbdtmg.cxx | 26 --------------------------
svx/source/sidebar/nbdtmgfact.cxx | 13 +++++--------
sw/source/ui/fldui/fldpage.cxx | 16 ----------------
sw/source/ui/fldui/fldpage.hxx | 4 ----
sw/source/ui/inc/condedit.hxx | 1 -
sw/source/ui/inc/numfmtlb.hxx | 4 ----
sw/source/ui/utlui/condedit.cxx | 8 --------
sw/source/ui/utlui/numfmtlb.cxx | 16 ----------------
sw/uiconfig/swriter/ui/paradialog.ui | 24 ++++++++++++------------
toolkit/source/awt/vclxtoolkit.cxx | 5 -----
toolkit/source/helper/unowrapper.cxx | 1 -
tools/source/rc/resmgr.cxx | 1 -
unusedcode.easy | 7 ++++---
vcl/source/app/dbggui.cxx | 9 +--------
vcl/source/control/button.cxx | 14 --------------
vcl/source/window/window.cxx | 1 -
28 files changed, 26 insertions(+), 199 deletions(-)
New commits:
commit 7c542bf0daf49f6c733d3f0af0f6e4dee6928479
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 27 09:31:02 2013 +0100
rearrange paragraph tabs back to classic order
if the intent was to intentionally reorder them then also keep the paragraph
style dialog tabs in the same order as well
Change-Id: I4bd69d49099b7921b021739482d0c72b07639882
diff --git a/sw/uiconfig/swriter/ui/paradialog.ui b/sw/uiconfig/swriter/ui/paradialog.ui
index 8cc68b7..6c4baf7 100644
--- a/sw/uiconfig/swriter/ui/paradialog.ui
+++ b/sw/uiconfig/swriter/ui/paradialog.ui
@@ -104,10 +104,11 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="labelTP_PARA_ASIAN">
+ <object class="GtkLabel" id="labelTP_PARA_ALIGN">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Asian Typography</property>
+ <property name="xalign">0.4699999988079071</property>
+ <property name="label" translatable="yes">Alignment</property>
</object>
<packing>
<property name="position">1</property>
@@ -118,10 +119,11 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="labelTP_NUMPARA">
+ <object class="GtkLabel" id="labelTP_PARA_EXT">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Outline & Numbering</property>
+ <property name="xalign">0.46000000834465027</property>
+ <property name="label" translatable="yes">Text Flow</property>
</object>
<packing>
<property name="position">2</property>
@@ -132,10 +134,10 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="labelTP_TABULATOR">
+ <object class="GtkLabel" id="labelTP_PARA_ASIAN">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="label" translatable="yes">Tabs</property>
+ <property name="label" translatable="yes">Asian Typography</property>
</object>
<packing>
<property name="position">3</property>
@@ -146,11 +148,10 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="labelTP_PARA_ALIGN">
+ <object class="GtkLabel" id="labelTP_NUMPARA">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.4699999988079071</property>
- <property name="label" translatable="yes">Alignment</property>
+ <property name="label" translatable="yes">Outline & Numbering</property>
</object>
<packing>
<property name="position">4</property>
@@ -161,11 +162,10 @@
<placeholder/>
</child>
<child type="tab">
- <object class="GtkLabel" id="labelTP_PARA_EXT">
+ <object class="GtkLabel" id="labelTP_TABULATOR">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="xalign">0.46000000834465027</property>
- <property name="label" translatable="yes">Text Flow</property>
+ <property name="label" translatable="yes">Tabs</property>
</object>
<packing>
<property name="position">5</property>
commit f00cd93a66a6cf236114e810b1470e562315b777
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 27 09:16:59 2013 +0100
callcatcher: update unused code, esp unused Resource based ctor
e.g. no ImageRadioButton is now loaded from any res/rsc file, so
that ctor and associated code paths can be stripped out
Change-Id: Ic4cf19d45adb7c734f150e0b89eef193157a74a7
diff --git a/include/svx/nbdtmg.hxx b/include/svx/nbdtmg.hxx
index ae3e6c3..b98fa59 100644
--- a/include/svx/nbdtmg.hxx
+++ b/include/svx/nbdtmg.hxx
@@ -310,7 +310,6 @@ class SVX_DLLPUBLIC MixBulletsTypeMgr: public NBOTypeMgrBase
static MixBulletsTypeMgr* _instance;
public:
MixBulletsTypeMgr(const NBOType aType);
- MixBulletsTypeMgr(const NBOType aType,const SfxItemSet* pArg);
MixBulletsTypeMgr(const MixBulletsTypeMgr& aTypeMgr);
virtual ~MixBulletsTypeMgr() {}
virtual void Init();
@@ -340,7 +339,6 @@ class SVX_DLLPUBLIC NumberingTypeMgr: public NBOTypeMgrBase
static NumberingTypeMgr* _instance;
public:
NumberingTypeMgr(const NBOType aType);
- NumberingTypeMgr(const NBOType aType,const SfxItemSet* pArg);
NumberingTypeMgr(const NumberingTypeMgr& aTypeMgr);
virtual ~NumberingTypeMgr() {}
virtual void Init();
diff --git a/include/svx/nbdtmgfact.hxx b/include/svx/nbdtmgfact.hxx
index 76638d9..0e2f8b8 100644
--- a/include/svx/nbdtmgfact.hxx
+++ b/include/svx/nbdtmgfact.hxx
@@ -17,17 +17,9 @@
*/
#ifndef _NBDTMGFACT_HXX
#define _NBDTMGFACT_HXX
-#ifndef _NBDTMG_HXX
#include "nbdtmg.hxx"
-#endif
-namespace svx { namespace sidebar {
-class SVX_DLLPUBLIC NBOutlineTypeMgrFact
-{
-public:
- static NBOTypeMgrBase* CreateInstance(const NBOType aType);
- NBOutlineTypeMgrFact();
- virtual ~NBOutlineTypeMgrFact() {}
-};
-}}
+namespace svx { namespace sidebar { namespace NBOutlineTypeMgrFact {
+ SVX_DLLPUBLIC NBOTypeMgrBase* CreateInstance(const NBOType aType);
+}}}
#endif
diff --git a/include/tools/rc.h b/include/tools/rc.h
index 5bcd4cb..b8e42cb 100644
--- a/include/tools/rc.h
+++ b/include/tools/rc.h
@@ -186,9 +186,6 @@ typedef short RSWND_STYLE;
#define RSC_IMAGEBUTTON_SYMBOL 0x02
#define RSC_IMAGEBUTTON_STATE 0x04
-// For "ImageRadioButtons":
-#define RSC_IMAGERADIOBUTTON_IMAGE 0x01
-
// For "Image":
#define RSC_IMAGE_IMAGEBITMAP 0x01
#define RSC_IMAGE_MASKBITMAP 0x02
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index d257639..9c90f91 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -71,7 +71,7 @@
#define RSC_MOREBUTTON (RSC_NOTYPE + 0x4c)
#define RSC_SPINBUTTON (RSC_NOTYPE + 0x4d)
#define RSC_RADIOBUTTON (RSC_NOTYPE + 0x4e)
-#define RSC_IMAGERADIOBUTTON (RSC_NOTYPE + 0x4f)
+
#define RSC_CHECKBOX (RSC_NOTYPE + 0x50)
#define RSC_TRISTATEBOX (RSC_NOTYPE + 0x51)
#define RSC_EDIT (RSC_NOTYPE + 0x52)
diff --git a/include/vcl/button.hxx b/include/vcl/button.hxx
index b33f8fe..cb6f7e8 100644
--- a/include/vcl/button.hxx
+++ b/include/vcl/button.hxx
@@ -540,7 +540,6 @@ class VCL_DLLPUBLIC ImageRadioButton : public RadioButton
public:
explicit ImageRadioButton( Window* pParent, WinBits nStyle = 0 );
- explicit ImageRadioButton( Window* pParent, const ResId& );
virtual ~ImageRadioButton();
};
diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx
index b8bc6b5..545f328 100644
--- a/rsc/inc/rscdb.hxx
+++ b/rsc/inc/rscdb.hxx
@@ -191,7 +191,6 @@ class RscTypCont
RscTop * InitClassFixedBitmap( RscTop * pSuper, RscTop * pClassBitmap );
RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage );
RscTop * InitClassRadioButton( RscTop * pSuper );
- RscTop * InitClassImageRadioButton( RscTop * pSuper, RscTop * pClassImage );
RscTop * InitClassKeyCode( RscTop * pSuper, RscEnum * pKey );
RscTop * InitClassAccelItem( RscTop * pSuper, RscTop * pKeyCode );
RscTop * InitClassAccel( RscTop * pSuper, RscTop * pClassAccelItem );
diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx
index 9a54719..c808488 100644
--- a/rsc/source/parser/rscicpx.cxx
+++ b/rsc/source/parser/rscicpx.cxx
@@ -811,25 +811,6 @@ RscTop * RscTypCont::InitClassRadioButton( RscTop * pSuper )
return pClassRadioButton;
}
-RscTop * RscTypCont::InitClassImageRadioButton( RscTop * pSuper, RscTop * pClassImage )
-{
- Atom nId;
- RscTop * pClassImageRadioButton;
-
- // Klasse anlegen
- nId = pHS->getID( "ImageRadioButton" );
- pClassImageRadioButton = new RscClass( nId, RSC_IMAGERADIOBUTTON, pSuper );
- pClassImageRadioButton->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassImageRadioButton );
-
- // Variablen anlegen
- INS_WINBIT(pClassImageRadioButton,TopImage)
- nId = aNmTb.Put( "RadioButtonImage", VARNAME );
- pClassImageRadioButton->SetVariable( nId, pClassImage, 0, 0, RSC_IMAGERADIOBUTTON_IMAGE );
-
- return pClassImageRadioButton;
-}
-
RscTop * RscTypCont::InitClassKeyCode( RscTop * pSuper, RscEnum * pKey )
{
Atom nId;
diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 80a95db..015a882 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -83,7 +83,6 @@ void RscTypCont::Init()
RscTop * pClassCancelButton;
RscTop * pClassHelpButton;
RscTop * pClassRadioButton;
- RscTop * pClassImageRadioButton;
RscTop * pClassImageButton;
RscTop * pClassTriStateBox;
RscTop * pClassEdit;
@@ -446,11 +445,6 @@ void RscTypCont::Init()
pClassRadioButton = InitClassRadioButton( pClassButton );
pRoot->Insert( pClassRadioButton );
- nId = pHS->getID( "ImageRadioButton" );
- pClassImageRadioButton = InitClassImageRadioButton( pClassRadioButton,
- pClassImage );
- pRoot->Insert( pClassImageRadioButton );
-
pClassTriStateBox = InitClassTriStateBox( pClassControl, pTriState );
pRoot->Insert( pClassTriStateBox );
diff --git a/sc/source/ui/cctrl/checklistmenu.cxx b/sc/source/ui/cctrl/checklistmenu.cxx
index d3aab5d..a0e3393a 100644
--- a/sc/source/ui/cctrl/checklistmenu.cxx
+++ b/sc/source/ui/cctrl/checklistmenu.cxx
@@ -1342,12 +1342,6 @@ ScCheckListBox::ScCheckListBox( Window* pParent, WinBits nWinStyle )
Init();
}
-ScCheckListBox::ScCheckListBox( Window* pParent, const ResId& rResId )
- : SvTreeListBox( pParent, rResId ), mpCheckButton( NULL )
-{
- Init();
-}
-
SvTreeListEntry* ScCheckListBox::FindEntry( SvTreeListEntry* pParent, const OUString& sNode )
{
sal_uInt16 nRootPos = 0;
diff --git a/sc/source/ui/inc/checklistmenu.hxx b/sc/source/ui/inc/checklistmenu.hxx
index 694d693..f324482 100644
--- a/sc/source/ui/inc/checklistmenu.hxx
+++ b/sc/source/ui/inc/checklistmenu.hxx
@@ -196,7 +196,6 @@ class ScCheckListBox : public SvTreeListBox
public:
ScCheckListBox( Window* pParent, WinBits nWinStyle = 0 );
- ScCheckListBox( Window* pParent, const ResId& rResId );
~ScCheckListBox() { delete mpCheckButton; }
void Init();
void CheckEntry( OUString& sName, SvTreeListEntry* pParent, sal_Bool bCheck = sal_True );
diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx
index a3337ea..fc2aa53 100644
--- a/sfx2/source/sidebar/SidebarController.cxx
+++ b/sfx2/source/sidebar/SidebarController.cxx
@@ -807,25 +807,6 @@ void SidebarController::ShowPopupMenu (
-void SidebarController::ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) const
-{
- try
- {
- const util::URL aURL (Tools::GetURL(rsMenuCommand));
- Reference<frame::XDispatch> xDispatch (Tools::GetDispatch(mxFrame, aURL));
- if (xDispatch.is())
- xDispatch->dispatch(aURL, Sequence<beans::PropertyValue>());
- }
- catch(Exception& rException)
- {
- OSL_TRACE("caught exception: %s",
- OUStringToOString(rException.Message, RTL_TEXTENCODING_ASCII_US).getStr());
- }
-}
-
-
-
-
::boost::shared_ptr<PopupMenu> SidebarController::CreatePopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rMenuData) const
{
diff --git a/sfx2/source/sidebar/SidebarController.hxx b/sfx2/source/sidebar/SidebarController.hxx
index c6ed4de..44fb76c 100644
--- a/sfx2/source/sidebar/SidebarController.hxx
+++ b/sfx2/source/sidebar/SidebarController.hxx
@@ -190,7 +190,6 @@ private:
void ShowPopupMenu (
const Rectangle& rButtonBox,
const ::std::vector<TabBar::DeckMenuData>& rMenuData) const;
- void ShowDetailMenu (const ::rtl::OUString& rsMenuCommand) const;
::boost::shared_ptr<PopupMenu> CreatePopupMenu (
const ::std::vector<TabBar::DeckMenuData>& rMenuData) const;
DECL_LINK(OnMenuItemSelected, Menu*);
diff --git a/svx/source/sidebar/nbdtmg.cxx b/svx/source/sidebar/nbdtmg.cxx
index 679aaca..f0d5ffe 100644
--- a/svx/source/sidebar/nbdtmg.cxx
+++ b/svx/source/sidebar/nbdtmg.cxx
@@ -819,19 +819,6 @@ MixBulletsTypeMgr::MixBulletsTypeMgr(const NBOType aType):
ImplLoad(OUString("standard.sya"));
}
-MixBulletsTypeMgr::MixBulletsTypeMgr(const NBOType aType,const SfxItemSet* pArg):
- NBOTypeMgrBase(aType,pArg)
-{
- Init();
- for(sal_Int32 nItem = 0; nItem < DEFAULT_BULLET_TYPES; nItem++ )
- {
- pDefaultActualBullets[nItem] = pActualBullets[nItem];
- }
- //Initial the first time to store the default value. Then do it again for customized value
- Init();
- ImplLoad(OUString("standard.sya"));
-}
-
MixBulletsTypeMgr::MixBulletsTypeMgr(const MixBulletsTypeMgr& aTypeMgr):
NBOTypeMgrBase(aTypeMgr)
{
@@ -1359,19 +1346,6 @@ NumberingTypeMgr::NumberingTypeMgr(const NBOType aType):
ImplLoad(OUString("standard.syb"));
}
-NumberingTypeMgr::NumberingTypeMgr(const NBOType aType,const SfxItemSet* pArg):
- NBOTypeMgrBase(aType,pArg),
- //pNumSettingsArr( new NumSettingsArr_Impl ),
- pNumberSettingsArr (new NumberSettingsArr_Impl)
-{
- Init();
- pDefaultNumberSettingsArr = pNumberSettingsArr;
- pNumberSettingsArr = new NumberSettingsArr_Impl;
- //Initial the first time to store the default value. Then do it again for customized value
- Init();
- ImplLoad(OUString("standard.syb"));
-}
-
NumberingTypeMgr::NumberingTypeMgr(const NumberingTypeMgr& aTypeMgr):
NBOTypeMgrBase(aTypeMgr),
//pNumSettingsArr( new NumSettingsArr_Impl ),
diff --git a/svx/source/sidebar/nbdtmgfact.cxx b/svx/source/sidebar/nbdtmgfact.cxx
index 7280d7e..4b03aa8 100644
--- a/svx/source/sidebar/nbdtmgfact.cxx
+++ b/svx/source/sidebar/nbdtmgfact.cxx
@@ -15,15 +15,12 @@
* except in compliance with the License. You may obtain a copy of
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef _NBDTMGFACT_HXX
+
#include <svx/nbdtmgfact.hxx>
-#endif
-namespace svx { namespace sidebar {
-NBOutlineTypeMgrFact::NBOutlineTypeMgrFact()
-{
-}
-NBOTypeMgrBase* NBOutlineTypeMgrFact::CreateInstance(const NBOType aType)
+namespace svx { namespace sidebar { namespace NBOutlineTypeMgrFact {
+
+NBOTypeMgrBase* CreateInstance(const NBOType aType)
{
//NBOTypeMgrBase* pRet= 0;
if ( aType == eNBOType::BULLETS )
@@ -44,5 +41,5 @@ NBOTypeMgrBase* NBOutlineTypeMgrFact::CreateInstance(const NBOType aType)
}
return NULL;
}
-}}
+}}}
diff --git a/sw/source/ui/fldui/fldpage.cxx b/sw/source/ui/fldui/fldpage.cxx
index 0096bc5..ffbd022 100644
--- a/sw/source/ui/fldui/fldpage.cxx
+++ b/sw/source/ui/fldui/fldpage.cxx
@@ -41,22 +41,6 @@
using namespace ::com::sun::star;
-SwFldPage::SwFldPage( Window *pParent, const ResId &rId,
- const SfxItemSet &rAttrSet )
- :SfxTabPage (pParent, rId, rAttrSet),
- m_pCurFld (0),
- m_pWrtShell (0),
- m_nTypeSel (LISTBOX_ENTRY_NOTFOUND),
- m_nSelectionSel (LISTBOX_ENTRY_NOTFOUND),
- m_bFldEdit (false),
- m_bInsert (sal_True),
- m_bFldDlgHtmlMode (sal_False),
- m_bRefresh (sal_False),
- m_bFirstHTMLInit (sal_True)
-{
-
-}
-
SwFldPage::SwFldPage(Window *pParent, const OString& rID,
const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet)
: SfxTabPage(pParent, rID, rUIXMLDescription, rAttrSet)
diff --git a/sw/source/ui/fldui/fldpage.hxx b/sw/source/ui/fldui/fldpage.hxx
index 83c86bd..4593ed8 100644
--- a/sw/source/ui/fldui/fldpage.hxx
+++ b/sw/source/ui/fldui/fldpage.hxx
@@ -77,10 +77,6 @@ protected:
using SfxTabPage::ActivatePage;
public:
- SwFldPage( Window *pParent,
- const ResId &rId,
- const SfxItemSet &rAttrSet );
-
SwFldPage(Window *pParent, const OString& rID,
const OUString& rUIXMLDescription, const SfxItemSet &rAttrSet);
diff --git a/sw/source/ui/inc/condedit.hxx b/sw/source/ui/inc/condedit.hxx
index b55c48b..fce123a 100644
--- a/sw/source/ui/inc/condedit.hxx
+++ b/sw/source/ui/inc/condedit.hxx
@@ -31,7 +31,6 @@ class SW_DLLPUBLIC ConditionEdit : public Edit, public DropTargetHelper
SW_DLLPRIVATE virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
public:
- ConditionEdit(Window* pParent, const ResId& rResId);
ConditionEdit(Window* pParent, WinBits nStyle);
void ShowBrackets(bool bShow)
diff --git a/sw/source/ui/inc/numfmtlb.hxx b/sw/source/ui/inc/numfmtlb.hxx
index 28cfd6e..2dd2de9 100644
--- a/sw/source/ui/inc/numfmtlb.hxx
+++ b/sw/source/ui/inc/numfmtlb.hxx
@@ -47,10 +47,6 @@ class SW_DLLPUBLIC NumFormatListBox : public ListBox
public:
NumFormatListBox(Window* pWin, WinBits nStyle);
- NumFormatListBox( Window* pWin, const ResId& rResId,
- short nFormatType = NUMBERFORMAT_NUMBER, sal_uLong nDefFmt = 0,
- sal_Bool bUsrFmts = sal_True );
-
NumFormatListBox( Window* pWin, SwView* pView, const ResId& rResId,
short nFormatType = NUMBERFORMAT_NUMBER, sal_uLong nDefFmt = 0,
sal_Bool bUsrFmts = sal_True );
diff --git a/sw/source/ui/utlui/condedit.cxx b/sw/source/ui/utlui/condedit.cxx
index dc088bb..e8f2b87 100644
--- a/sw/source/ui/utlui/condedit.cxx
+++ b/sw/source/ui/utlui/condedit.cxx
@@ -27,14 +27,6 @@
using namespace ::svx;
using namespace ::com::sun::star::uno;
-ConditionEdit::ConditionEdit(Window* pParent, const ResId& rResId)
- : Edit(pParent, rResId)
- , DropTargetHelper(this)
- , bBrackets(true)
- , bEnableDrop(true)
-{
-}
-
ConditionEdit::ConditionEdit(Window* pParent, WinBits nStyle)
: Edit(pParent, nStyle)
, DropTargetHelper(this)
diff --git a/sw/source/ui/utlui/numfmtlb.cxx b/sw/source/ui/utlui/numfmtlb.cxx
index f3e8de2..b09ead6 100644
--- a/sw/source/ui/utlui/numfmtlb.cxx
+++ b/sw/source/ui/utlui/numfmtlb.cxx
@@ -54,22 +54,6 @@ using namespace ::com::sun::star::lang;
* nDefFmt: Select this format and possibly insert it
*/
-NumFormatListBox::NumFormatListBox( Window* pWin, const ResId& rResId,
- short nFormatType, sal_uLong nDefFmt,
- sal_Bool bUsrFmts ) :
- ListBox ( pWin, rResId ),
- nCurrFormatType (-1),
- nStdEntry (0),
- bOneArea (sal_False),
- nDefFormat (nDefFmt),
- pVw (0),
- pOwnFormatter (0),
- bShowLanguageControl(sal_False),
- bUseAutomaticLanguage(sal_True)
-{
- Init(nFormatType, bUsrFmts);
-}
-
NumFormatListBox::NumFormatListBox(Window* pWin, WinBits nStyle) :
ListBox ( pWin, nStyle ),
nCurrFormatType (-1),
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index 662906e..5ba91b9 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -282,7 +282,6 @@ static ComponentInfo aComponentInfos [] =
{ "frame", WINDOW_GROUPBOX },
{ "helpbutton", WINDOW_HELPBUTTON },
{ "imagebutton", WINDOW_IMAGEBUTTON },
- { "imageradiobutton", WINDOW_IMAGERADIOBUTTON },
{ "infobox", WINDOW_INFOBOX },
{ "listbox", WINDOW_LISTBOX },
{ "longcurrencybox", WINDOW_LONGCURRENCYBOX },
@@ -754,10 +753,6 @@ Window* VCLXToolkit::ImplCreateWindow( VCLXWindow** ppNewComp,
pNewWindow = new ImageButton( pParent, nWinBits );
*ppNewComp = new VCLXButton;
break;
- case WINDOW_IMAGERADIOBUTTON:
- pNewWindow = new ImageRadioButton( pParent, nWinBits );
- *ppNewComp = new VCLXButton;
- break;
case WINDOW_INFOBOX:
pNewWindow = new InfoBox( pParent, String() );
*ppNewComp = new VCLXMessageBox;
diff --git a/toolkit/source/helper/unowrapper.cxx b/toolkit/source/helper/unowrapper.cxx
index d138da4..c317e6f 100644
--- a/toolkit/source/helper/unowrapper.cxx
+++ b/toolkit/source/helper/unowrapper.cxx
@@ -42,7 +42,6 @@ using namespace ::com::sun::star;
{
switch ( pWindow->GetType() )
{
- case WINDOW_IMAGERADIOBUTTON:
case WINDOW_IMAGEBUTTON:
case WINDOW_SPINBUTTON:
case WINDOW_MENUBUTTON:
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index cc28f7d..b5b86a0 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1680,7 +1680,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_CURRENCYFIELD: aHID.append( "CurrencyField" ); break;
case RSC_DATEFIELD: aHID.append( "DateField" ); break;
case RSC_TIMEFIELD: aHID.append( "TimeField" ); break;
- case RSC_IMAGERADIOBUTTON: aHID.append( "ImageRadioButton" ); break;
case RSC_NUMERICBOX: aHID.append( "NumericBox" ); break;
case RSC_METRICBOX: aHID.append( "MetricBox" ); break;
case RSC_CURRENCYBOX: aHID.append( "CurrencyBox" ); break;
diff --git a/unusedcode.easy b/unusedcode.easy
index 1469ac1..fcf2686 100644
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -60,6 +60,7 @@ ScFormulaCell::GetValueAlways()
ScFormulaCell::HasColRowName() const
ScFormulaCell::IsSharedInvariant() const
ScGlobal::GetStandardFormat(double, SvNumberFormatter&, unsigned long, short)
+ScMyNotEmptyCellsIterator::GetCell() const
ScRangeData::SetMaxCol(short)
ScRangeData::SetMaxRow(int)
ScRangeStringConverter::GetRangeListFromString(com::sun::star::uno::Sequence<com::sun::star::table::CellRangeAddress>&, rtl::OUString const&, ScDocument const*, formula::FormulaGrammar::AddressConvention, unsigned short, unsigned short)
@@ -76,6 +77,7 @@ SmFontPickList::Contains(Font const&) const
StatusBar::CopyItems(StatusBar const&)
StatusBar::HideItems()
StatusBar::ShowItems()
+String::AllocBuffer(unsigned short)
SvFileStream::GetFileHandle() const
SvdProgressInfo::ReportError()
SvpSalInstance::PostEvent(SalFrame const*, void*, unsigned short)
@@ -149,12 +151,14 @@ drawinglayer::attribute::Sdr3DLightAttribute::isDefault() const
drawinglayer::attribute::Sdr3DObjectAttribute::isDefault() const
drawinglayer::attribute::SdrFillGraphicAttribute::getLogSize() const
drawinglayer::geometry::ViewInformation2D::isDefault() const
+editeng::SectionAttribute::SectionAttribute()
formula::DoubleVectorRefToken::GetArrayLength() const
formula::FormulaDlg::CheckMatrix()
formula::FormulaDlg::isUserMatrix() const
framework::MenuBarManager::getComponentContext()
framework::MenuManager::getContext()
jfw_plugin::VendorBase::createInstance()
+oox::core::Decrypt::aes128cbc(std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&, std::__debug::vector<unsigned char, std::allocator<unsigned char> >&)
oox::core::FilterBaseImpl::finalizeFilter()
oox::drawingml::TextListStyle::dump() const
oox::xls::BiffDrawingObjectBase::BiffDrawingObjectBase(oox::xls::WorksheetHelper const&)
@@ -196,7 +200,6 @@ sfx2::sidebar::FocusManager::IsAnyButtonFocused() const
sfx2::sidebar::FocusManager::IsAnyPanelFocused() const
sfx2::sidebar::Paint::Set(sfx2::sidebar::Paint const&)
sfx2::sidebar::Panel::PrintWindowTree()
-sfx2::sidebar::SidebarController::ShowDetailMenu(rtl::OUString const&) const
sfx2::sidebar::SidebarDockingWindow::GetChildWindow()
std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >::_Rb_tree(std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace)::TemplateId>, std::_Select1st<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> >, std::less<rtl::OUString>, std::allocator<std::pair<rtl::OUString const, (anonymous namespace)::TemplateId> > >&&)
std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&)
@@ -208,8 +211,6 @@ svx::sidebar::BulletsTypeMgr::BulletsTypeMgr(unsigned short, SfxItemSet const*)
svx::sidebar::GraphyicBulletsTypeMgr::GraphyicBulletsTypeMgr(unsigned short, SfxItemSet const*)
svx::sidebar::LinePropertyPanel::LinkStubImplPopupModeEndHdl(void*, void*)
svx::sidebar::LineWidthControl::GetValueSet()
-svx::sidebar::MixBulletsTypeMgr::MixBulletsTypeMgr(unsigned short, SfxItemSet const*)
-svx::sidebar::NBOutlineTypeMgrFact::NBOutlineTypeMgrFact()
svx::sidebar::NumberingTypeMgr::GetNumCount() const
svx::sidebar::NumberingTypeMgr::GetNumSettingByIndex(unsigned short) const
svx::sidebar::NumberingTypeMgr::NumberingTypeMgr(unsigned short, SfxItemSet const*)
diff --git a/vcl/source/app/dbggui.cxx b/vcl/source/app/dbggui.cxx
index a882bb7..6833a95 100644
--- a/vcl/source/app/dbggui.cxx
+++ b/vcl/source/app/dbggui.cxx
@@ -1271,7 +1271,6 @@ void DbgDialogTest( Window* pWindow )
}
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
- (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) ||
(pChild->GetType() == WINDOW_CHECKBOX) ||
(pChild->GetType() == WINDOW_TRISTATEBOX) ||
(pChild->GetType() == WINDOW_PUSHBUTTON) )
@@ -1281,8 +1280,6 @@ void DbgDialogTest( Window* pWindow )
const char* pClass;
if ( pChild->GetType() == WINDOW_RADIOBUTTON )
pClass = "RadioButton";
- else if ( pChild->GetType() == WINDOW_IMAGERADIOBUTTON )
- pClass = "ImageRadioButton";
else if ( pChild->GetType() == WINDOW_CHECKBOX )
pClass = "CheckBox";
else if ( pChild->GetType() == WINDOW_TRISTATEBOX )
@@ -1302,7 +1299,6 @@ void DbgDialogTest( Window* pWindow )
switch( pChild->GetType() )
{
case WINDOW_RADIOBUTTON:
- case WINDOW_IMAGERADIOBUTTON:
aWidth = ((RadioButton*)pChild)->CalcMinimumSize(0).Width();
break;
case WINDOW_CHECKBOX:
@@ -1405,7 +1401,6 @@ void DbgDialogTest( Window* pWindow )
" WB_IGNORETAB"));
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
- (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) ||
(pChild->GetType() == WINDOW_CHECKBOX) ||
(pChild->GetType() == WINDOW_TRISTATEBOX) ||
(pChild->GetType() == WINDOW_FIXEDTEXT) )
@@ -1484,7 +1479,6 @@ void DbgDialogTest( Window* pWindow )
}
if ( (pChild->GetType() == WINDOW_RADIOBUTTON) ||
- (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) ||
(pChild->GetType() == WINDOW_CHECKBOX) ||
(pChild->GetType() == WINDOW_TRISTATEBOX) ||
(pChild->GetType() == WINDOW_PUSHBUTTON) ||
@@ -1516,8 +1510,7 @@ void DbgDialogTest( Window* pWindow )
Rectangle aChildRect( aNewPos, pChild->GetSizePixel() );
if ( cAccel || (pChild->GetStyle() & WB_TABSTOP) ||
- (pChild->GetType() == WINDOW_RADIOBUTTON) ||
- (pChild->GetType() == WINDOW_IMAGERADIOBUTTON) )
+ (pChild->GetType() == WINDOW_RADIOBUTTON) )
{
if ( (aNewPos.X() <= aTabPos.X()) && (aNewPos.Y() <= aTabPos.Y()) )
{
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index fb2e982..32d70f3 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -4090,20 +4090,6 @@ ImageRadioButton::ImageRadioButton( Window* pParent, WinBits nStyle ) :
// -----------------------------------------------------------------------
-ImageRadioButton::ImageRadioButton( Window* pParent, const ResId& rResId ) :
- RadioButton( pParent, rResId.SetRT( RSC_IMAGERADIOBUTTON ) )
-{
- sal_uLong nObjMask = ReadLongRes();
-
- if ( RSC_IMAGERADIOBUTTON_IMAGE & nObjMask )
- {
- SetModeRadioImage( Image( ResId( (RSHEADER_TYPE*)GetClassRes(), *rResId.GetResMgr() ) ) );
- IncrementRes( GetObjSizeRes( (RSHEADER_TYPE*)GetClassRes() ) );
- }
-}
-
-// -----------------------------------------------------------------------
-
ImageRadioButton::~ImageRadioButton()
{
}
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index df1456d..669e0eb 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -8824,7 +8824,6 @@ sal_uInt16 Window::getDefaultAccessibleRole() const
case WINDOW_COLORDIALOG: nRole = accessibility::AccessibleRole::COLOR_CHOOSER; break;
case WINDOW_FONTDIALOG: nRole = accessibility::AccessibleRole::FONT_CHOOSER; break;
- case WINDOW_IMAGERADIOBUTTON:
case WINDOW_RADIOBUTTON: nRole = accessibility::AccessibleRole::RADIO_BUTTON; break;
case WINDOW_TRISTATEBOX:
case WINDOW_CHECKBOX: nRole = accessibility::AccessibleRole::CHECK_BOX; break;
More information about the Libreoffice-commits
mailing list