[Libreoffice-commits] core.git: 2 commits - dbaccess/source include/sfx2 include/svtools include/vcl sfx2/source svtools/source vcl/source xmlsecurity/source
Caolán McNamara
caolanm at redhat.com
Tue Aug 12 01:02:35 PDT 2014
dbaccess/source/ui/control/curledit.cxx | 8 ------
dbaccess/source/ui/control/dbtreelistbox.cxx | 10 --------
dbaccess/source/ui/dlg/adminpages.cxx | 7 -----
dbaccess/source/ui/dlg/adminpages.hxx | 3 --
dbaccess/source/ui/dlg/dlgattr.cxx | 3 +-
dbaccess/source/ui/inc/curledit.hxx | 1
dbaccess/source/ui/inc/dbtreelistbox.hxx | 3 --
include/sfx2/basedlgs.hxx | 1
include/svtools/wizardmachine.hxx | 3 --
include/vcl/scrbar.hxx | 1
include/vcl/vclmedit.hxx | 6 +----
sfx2/source/dialog/basedlgs.cxx | 22 ------------------
svtools/source/dialogs/wizardmachine.cxx | 18 ---------------
vcl/source/control/scrbar.cxx | 18 ---------------
vcl/source/edit/vclmedit.cxx | 30 -------------------------
xmlsecurity/source/dialogs/resourcemanager.cxx | 10 --------
xmlsecurity/source/dialogs/resourcemanager.hxx | 2 -
17 files changed, 4 insertions(+), 142 deletions(-)
New commits:
commit e2d2fa4f0663cf990c0595f8827ff9123c88d41a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 12 09:01:28 2014 +0100
Resolves: fdo#82413 crash in format->column
Change-Id: I3af776c14ec0f224884488fdc99ee26ebbba7cb8
diff --git a/dbaccess/source/ui/dlg/dlgattr.cxx b/dbaccess/source/ui/dlg/dlgattr.cxx
index 0a83ba3..8af7569 100644
--- a/dbaccess/source/ui/dlg/dlgattr.cxx
+++ b/dbaccess/source/ui/dlg/dlgattr.cxx
@@ -39,13 +39,14 @@ SbaSbAttrDlg::SbaSbAttrDlg(Window* pParent, const SfxItemSet* pCellAttrs,
: SfxTabDialog(pParent, "FieldDialog", "dbaccess/ui/fielddialog.ui", pCellAttrs)
, m_nNumberFormatId(0)
{
-
pNumberInfoItem = new SvxNumberInfoItem( pFormatter, 0 );
if (bRow)
SetText(get<FixedText>("alttitle")->GetText());
if (bHasFormat)
m_nNumberFormatId = AddTabPage("format", RID_SVXPAGE_NUMBERFORMAT);
+ else
+ RemoveTabPage("format");
AddTabPage("alignment", RID_SVXPAGE_ALIGNMENT);
}
commit d24df3fc66614eda59d38f6ab409be73f8a20dad
Author: Caolán McNamara <caolanm at redhat.com>
Date: Tue Aug 12 08:36:15 2014 +0100
callcatcher: another round of ResId removals
Change-Id: Ia3acdb3501b7735820258cb090e731f5814bc07f
diff --git a/dbaccess/source/ui/control/curledit.cxx b/dbaccess/source/ui/control/curledit.cxx
index 3a24c58..3c856db 100644
--- a/dbaccess/source/ui/control/curledit.cxx
+++ b/dbaccess/source/ui/control/curledit.cxx
@@ -24,14 +24,6 @@
namespace dbaui
{
-// OConnectionURLEdit
-OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, const ResId& _rResId,bool _bShowPrefix)
- :Edit(_pParent, _rResId)
- ,m_pTypeCollection(NULL)
- ,m_pForcedPrefix(NULL)
- ,m_bShowPrefix(_bShowPrefix)
-{
-}
OConnectionURLEdit::OConnectionURLEdit(Window* _pParent, WinBits _nBits,bool _bShowPrefix)
:Edit(_pParent, _nBits)
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index bd23fa9..cdc185f 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -64,16 +64,6 @@ DBTreeListBox::DBTreeListBox( Window* pParent, WinBits nWinStyle ,bool _bHandleE
init();
}
-DBTreeListBox::DBTreeListBox( Window* pParent, const ResId& rResId,bool _bHandleEnterKey)
- :SvTreeListBox(pParent,rResId)
- ,m_pDragedEntry(NULL)
- ,m_pActionListener(NULL)
- ,m_pContextMenuProvider( NULL )
- ,m_bHandleEnterKey(_bHandleEnterKey)
-{
- init();
-}
-
void DBTreeListBox::init()
{
sal_uInt16 nSize = SPACEBETWEENENTRIES;
diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx
index 2673f57..640db09 100644
--- a/dbaccess/source/ui/dlg/adminpages.cxx
+++ b/dbaccess/source/ui/dlg/adminpages.cxx
@@ -221,13 +221,6 @@ namespace dbaui
}
}
- void OGenericAdministrationPage::SetControlFontWeight(Window* _pWindow, FontWeight _eWeight)
- {
- Font aFont = _pWindow->GetControlFont();
- aFont.SetWeight( _eWeight );
- _pWindow->SetControlFont( aFont );
- }
-
IMPL_LINK(OGenericAdministrationPage, OnTestConnectionClickHdl, PushButton*, /*_pButton*/)
{
OSL_ENSURE(m_pAdminDialog,"No Admin dialog set! ->GPF");
diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx
index c56733c..88a8784 100644
--- a/dbaccess/source/ui/dlg/adminpages.hxx
+++ b/dbaccess/source/ui/dlg/adminpages.hxx
@@ -228,9 +228,6 @@ namespace dbaui
static void fillString(SfxItemSet& _rSet,Edit* _pEdit,sal_uInt16 _nID, bool& _bChangedSomething);
protected:
- // used to set the right Pane header of a wizard to bold
- void SetControlFontWeight(Window* _pWindow, FontWeight _eWeight = WEIGHT_BOLD);
-
/** This link be used for controls where the tabpage does not need to take any special action when the control
is modified. The implementation just calls callModifiedHdl.
*/
diff --git a/dbaccess/source/ui/inc/curledit.hxx b/dbaccess/source/ui/inc/curledit.hxx
index 9ff64d8..4a1238d 100644
--- a/dbaccess/source/ui/inc/curledit.hxx
+++ b/dbaccess/source/ui/inc/curledit.hxx
@@ -41,7 +41,6 @@ class OConnectionURLEdit : public Edit
bool m_bShowPrefix; // when <TRUE> the prefix will be visible, otherwise not
public:
- OConnectionURLEdit(Window* pParent, const ResId& rResId,bool _bShowPrefix = false);
OConnectionURLEdit(Window* pParent, WinBits _nBits,bool _bShowPrefix = false);
virtual ~OConnectionURLEdit();
diff --git a/dbaccess/source/ui/inc/dbtreelistbox.hxx b/dbaccess/source/ui/inc/dbtreelistbox.hxx
index 259d033..ce9ad84 100644
--- a/dbaccess/source/ui/inc/dbtreelistbox.hxx
+++ b/dbaccess/source/ui/inc/dbtreelistbox.hxx
@@ -83,9 +83,6 @@ namespace dbaui
DBTreeListBox( Window* pParent
,WinBits nWinStyle=0
,bool _bHandleEnterKey = false);
- DBTreeListBox( Window* pParent
- ,const ResId& rResId
- ,bool _bHandleEnterKey = false);
virtual ~DBTreeListBox();
void setControlActionListener( IControlActionListener* _pListener ) { m_pActionListener = _pListener; }
diff --git a/include/sfx2/basedlgs.hxx b/include/sfx2/basedlgs.hxx
index f718f22..6d46b7a 100644
--- a/include/sfx2/basedlgs.hxx
+++ b/include/sfx2/basedlgs.hxx
@@ -68,7 +68,6 @@ private:
SAL_DLLPRIVATE void init();
protected:
- SfxModalDialog(Window *pParent, const ResId& );
SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
OUString& GetExtraData() { return aExtraData; }
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index 0170b2e..5d780a8 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -171,11 +171,8 @@ namespace svt
public:
/** ctor
- The ctor does not call FreeResource, this is the resposibility of the derived class.
-
For the button flags, use any combination of the WZB_* flags.
*/
- OWizardMachine(Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags );
OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags );
OWizardMachine(Window* _pParent, sal_uInt32 _nButtonFlags );
virtual ~OWizardMachine();
diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx
index c285c133..febefc0 100644
--- a/include/vcl/scrbar.hxx
+++ b/include/vcl/scrbar.hxx
@@ -72,7 +72,6 @@ private:
using Window::ImplInit;
SAL_DLLPRIVATE void ImplInit( Window* pParent, WinBits nStyle );
SAL_DLLPRIVATE void ImplInitStyle( WinBits nStyle );
- SAL_DLLPRIVATE void ImplLoadRes( const ResId& rResId );
SAL_DLLPRIVATE void ImplUpdateRects( bool bUpdate = true );
SAL_DLLPRIVATE long ImplCalcThumbPos( long nPixPos );
SAL_DLLPRIVATE long ImplCalcThumbPosPix( long nPos );
diff --git a/include/vcl/vclmedit.hxx b/include/vcl/vclmedit.hxx
index 6e292a4..29cb6fb 100644
--- a/include/vcl/vclmedit.hxx
+++ b/include/vcl/vclmedit.hxx
@@ -58,10 +58,8 @@ protected:
ScrollBar* GetVScrollBar() const;
public:
- VclMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
- VclMultiLineEdit( Window* pParent, const ResId& rResId );
- virtual ~VclMultiLineEdit();
-
+ VclMultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER );
+ virtual ~VclMultiLineEdit();
void SelectionChanged();
void CaretChanged();
diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx
index a22f5fb..b3cce37 100644
--- a/sfx2/source/dialog/basedlgs.cxx
+++ b/sfx2/source/dialog/basedlgs.cxx
@@ -146,31 +146,11 @@ void SfxModalDialog::GetDialogData_Impl()
}
}
-
-
void SfxModalDialog::init()
{
GetDialogData_Impl();
}
-
-
-SfxModalDialog::SfxModalDialog(Window* pParent, const ResId &rResId )
-
-/* [Description]
-
- Constructor of the general base class for modal Dialoge;
- ResId is used as ID in ini-file. The saved position from there is set.
-*/
-
-: ModalDialog(pParent, rResId),
- nUniqId(rResId.GetId()),
- pInputSet(0),
- pOutputSet(0)
-{
- init();
-}
-
SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription )
: ModalDialog(pParent, rID, rUIXMLDescription),
nUniqId(0), //todo: remove this member when the ResId using ctor is removed
@@ -180,8 +160,6 @@ SfxModalDialog::SfxModalDialog(Window *pParent, const OString& rID, const OUStri
init();
}
-
-
SfxModalDialog::~SfxModalDialog()
/* [Description]
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index f7bd865..56bc3ee 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -118,23 +118,6 @@ namespace svt
}
};
-
- //= OWizardMachine
-
-
- OWizardMachine::OWizardMachine(Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags )
- :WizardDialog( _pParent, _rRes )
- ,m_pFinish(NULL)
- ,m_pCancel(NULL)
- ,m_pNextPage(NULL)
- ,m_pPrevPage(NULL)
- ,m_pHelp(NULL)
- ,m_pImpl( new WizardMachineImplData )
- {
- implConstruct( _nButtonFlags );
- }
-
-
OWizardMachine::OWizardMachine(Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags )
:WizardDialog( _pParent, i_nStyle )
,m_pFinish(NULL)
@@ -147,7 +130,6 @@ namespace svt
implConstruct( _nButtonFlags );
}
-
OWizardMachine::OWizardMachine(Window* _pParent, sal_uInt32 _nButtonFlags )
:WizardDialog( _pParent, "WizardDialog", "svt/ui/wizarddialog.ui" )
,m_pFinish(NULL)
diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx
index f7a87b3..4351d6ff 100644
--- a/vcl/source/control/scrbar.cxx
+++ b/vcl/source/control/scrbar.cxx
@@ -128,24 +128,6 @@ ScrollBar::~ScrollBar()
delete mpData;
}
-void ScrollBar::ImplLoadRes( const ResId& rResId )
-{
- Control::ImplLoadRes( rResId );
-
- sal_Int16 nMin = ReadShortRes();
- sal_Int16 nMax = ReadShortRes();
- sal_Int16 nThumbPos = ReadShortRes();
- sal_Int16 nPage = ReadShortRes();
- sal_Int16 nStep = ReadShortRes();
- sal_Int16 nVisibleSize = ReadShortRes();
-
- SetRange( Range( nMin, nMax ) );
- SetLineSize( nStep );
- SetPageSize( nPage );
- SetVisibleSize( nVisibleSize );
- SetThumbPos( nThumbPos );
-}
-
void ScrollBar::ImplUpdateRects( bool bUpdate )
{
sal_uInt16 nOldStateFlags = mnStateFlags;
diff --git a/vcl/source/edit/vclmedit.cxx b/vcl/source/edit/vclmedit.cxx
index 5ce5b0f..c26016f 100644
--- a/vcl/source/edit/vclmedit.cxx
+++ b/vcl/source/edit/vclmedit.cxx
@@ -938,36 +938,6 @@ VclMultiLineEdit::VclMultiLineEdit( Window* pParent, WinBits nWinStyle )
SetStyle( ImplInitStyle( nWinStyle ) );
}
-VclMultiLineEdit::VclMultiLineEdit( Window* pParent, const ResId& rResId )
- : Edit( pParent, rResId.SetRT( RSC_MULTILINEEDIT ) )
-{
- SetType( WINDOW_MULTILINEEDIT );
- WinBits nWinStyle = rResId.GetWinBits();
- pImpVclMEdit = new ImpVclMEdit( this, nWinStyle );
- ImplInitSettings( true, true, true );
- pUpdateDataTimer = 0;
-
- sal_Int32 nMaxLen = Edit::GetMaxTextLen();
- if ( nMaxLen )
- SetMaxTextLen( nMaxLen );
-
- SetText( Edit::GetText() );
-
- if ( IsVisible() )
- pImpVclMEdit->Resize();
-
- SetCompoundControl( true );
- SetStyle( ImplInitStyle( nWinStyle ) );
-
- // Base Edit ctor could call Show already, but that would cause problems
- // with accessibility, as Show might (indirectly) trigger a call to virtual
- // GetComponentInterface, which is the Edit's base version instead of the
- // VclMultiLineEdit's version while in the base Edit ctor:
- if ((GetStyle() & WB_HIDE) == 0)
- Show();
-
-}
-
VclMultiLineEdit::~VclMultiLineEdit()
{
{
diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx
index 7a6498a..6dc5703 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.cxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.cxx
@@ -346,16 +346,6 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString)
return aStr.makeStringAndClear();
}
-
- long ShrinkToFitWidth( Control& _rCtrl, long _nOffs )
- {
- long nWidth = _rCtrl.GetTextWidth( _rCtrl.GetText() );
- Size aSize( _rCtrl.GetSizePixel() );
- nWidth += _nOffs;
- aSize.Width() = nWidth;
- _rCtrl.SetSizePixel( aSize );
- return nWidth;
- }
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx
index 3010f2a..5d7cebc 100644
--- a/xmlsecurity/source/dialogs/resourcemanager.hxx
+++ b/xmlsecurity/source/dialogs/resourcemanager.hxx
@@ -48,8 +48,6 @@ namespace XmlSec
OUString GetContentPart( const OUString& _rRawString );
OUString GetHexString( const ::com::sun::star::uno::Sequence< sal_Int8 >& _rSeq, const char* _pSep = ":", sal_uInt16 _nLineBreak = 0xFFFF );
-
- long ShrinkToFitWidth( Control& _rCtrl, long _nOffs = 0 ); // return = new width
}
#define XMLSEC_RES(id) ResId(id,*XmlSec::GetResMgr())
More information about the Libreoffice-commits
mailing list