dbaccess/source/ui/control/FieldDescControl.cxx | 49 ------------ dbaccess/source/ui/control/marktree.cxx | 7 - dbaccess/source/ui/dlg/ConnectionHelper.cxx | 21 ----- dbaccess/source/ui/dlg/ConnectionHelper.hxx | 1 dbaccess/source/ui/dlg/adminpages.cxx | 17 ---- dbaccess/source/ui/dlg/adminpages.hxx | 4 - dbaccess/source/ui/dlg/generalpage.cxx | 4 - dbaccess/source/ui/dlg/generalpage.hxx | 3 dbaccess/source/ui/inc/FieldDescControl.hxx | 1 dbaccess/source/ui/inc/WTabPage.hxx | 1 dbaccess/source/ui/inc/marktree.hxx | 1 dbaccess/source/ui/misc/WColumnSelect.cxx | 7 - extensions/source/propctrlr/formlinkdialog.cxx | 3 extensions/source/propctrlr/formresid.hrc | 1 include/svtools/roadmapwizard.hxx | 5 - include/svtools/simptabl.hxx | 1 include/svtools/stdctrl.hxx | 5 - include/svtools/svmedit.hxx | 1 include/svtools/svtabbx.hxx | 1 include/svx/stddlg.hxx | 1 include/tools/rcid.h | 6 - include/vcl/dialog.hxx | 7 - include/vcl/group.hxx | 1 include/vcl/lstbox.hxx | 1 include/vcl/prgsbar.hxx | 1 include/vcl/scrbar.hxx | 1 rsc/inc/rscdb.hxx | 2 rsc/source/parser/rscicpx.cxx | 85 ---------------------- rsc/source/parser/rscinit.cxx | 22 ----- svtools/source/contnr/simptabl.cxx | 9 -- svtools/source/contnr/svtabbx.cxx | 10 -- svtools/source/control/stdctrl.cxx | 10 -- svtools/source/dialogs/roadmapwizard.cxx | 8 -- svtools/source/edit/svmedit.cxx | 4 - svx/source/dialog/stddlg.cxx | 11 -- sw/source/uibase/inc/glosbib.hxx | 5 - tools/source/rc/resmgr.cxx | 3 unusedcode.easy | 14 +++ vcl/source/control/group.cxx | 12 --- vcl/source/control/lstbox.cxx | 13 --- vcl/source/control/prgsbar.cxx | 6 - vcl/source/control/scrbar.cxx | 12 --- vcl/source/window/dialog.cxx | 15 --- xmlsecurity/inc/xmlsecurity/certificateviewer.hxx | 1 xmlsecurity/source/dialogs/certificateviewer.cxx | 6 - xmlsecurity/source/dialogs/resourcemanager.cxx | 22 ----- xmlsecurity/source/dialogs/resourcemanager.hxx | 2 47 files changed, 17 insertions(+), 406 deletions(-)
New commits: commit 8c9f48cdd0fef6ae09e5654709924fd3f0a62f27 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Aug 11 09:04:49 2014 +0100 m_pFT_HeaderText now unused Change-Id: Ibfce3f5ffcdaa60e7b243ed43631ca133c3917ed diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 60e919d..2673f57 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -63,7 +63,6 @@ namespace dbaui ,m_abEnableRoadmap(false) ,m_pAdminDialog(NULL) ,m_pItemSetHelper(NULL) - ,m_pFT_HeaderText(NULL) { SetExchangeSupport(true); @@ -74,18 +73,11 @@ namespace dbaui ,m_abEnableRoadmap(false) ,m_pAdminDialog(NULL) ,m_pItemSetHelper(NULL) - ,m_pFT_HeaderText(NULL) { SetExchangeSupport(true); } - OGenericAdministrationPage::~OGenericAdministrationPage() - { - DELETEZ(m_pFT_HeaderText); - - } - int OGenericAdministrationPage::DeactivatePage(SfxItemSet* _pSet) { if (_pSet) diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index aa4200f..c56733c 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -98,15 +98,12 @@ namespace dbaui protected: IDatabaseSettingsDialog* m_pAdminDialog; IItemSetHelper* m_pItemSetHelper; - FixedText* m_pFT_HeaderText; ::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); - virtual ~OGenericAdministrationPage(); - /// set a handler which gets called every time something on the page has been modified void SetModifiedHandler(const Link& _rHandler) { m_aModifiedHandler = _rHandler; } commit 93ea1a09e0d31506538615dfb35425951fb54e68 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Aug 11 09:03:45 2014 +0100 don't need to reference these widgets anymore Change-Id: I19ce9b2c002f8f5102a2d0bd06d08a1abfa63bda diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx index 704c503..110dcba 100644 --- a/dbaccess/source/ui/dlg/generalpage.cxx +++ b/dbaccess/source/ui/dlg/generalpage.cxx @@ -485,8 +485,6 @@ namespace dbaui // OGeneralPageWizard OGeneralPageWizard::OGeneralPageWizard( Window* pParent, const SfxItemSet& _rItems ) :OGeneralPage( pParent, "dbaccess/ui/generalpagewizard.ui", _rItems ) - ,m_pFT_HeaderText ( NULL ) - ,m_pFT_HelpText ( NULL ) ,m_pRB_CreateDatabase ( NULL ) ,m_pRB_OpenExistingDatabase ( NULL ) ,m_pRB_ConnectDatabase ( NULL ) @@ -498,8 +496,6 @@ namespace dbaui ,m_eOriginalCreationMode ( eCreateNew ) ,m_bInitEmbeddedDBList ( true ) { - get( m_pFT_HeaderText, "headerText" ); - get( m_pFT_HelpText, "helpText" ); get( m_pRB_CreateDatabase, "createDatabase" ); get( m_pRB_OpenExistingDatabase, "openExistingDatabase" ); get( m_pRB_ConnectDatabase, "connectDatabase" ); diff --git a/dbaccess/source/ui/dlg/generalpage.hxx b/dbaccess/source/ui/dlg/generalpage.hxx index 9060a3b..8fe77e1 100644 --- a/dbaccess/source/ui/dlg/generalpage.hxx +++ b/dbaccess/source/ui/dlg/generalpage.hxx @@ -133,9 +133,6 @@ namespace dbaui private: // dialog controls - FixedText* m_pFT_HeaderText; - FixedText* m_pFT_HelpText; - RadioButton* m_pRB_CreateDatabase; RadioButton* m_pRB_OpenExistingDatabase; RadioButton* m_pRB_ConnectDatabase; commit 8d7eba47906454d9494861511894969c2547e072 Author: Caolán McNamara <caol...@redhat.com> Date: Mon Aug 11 08:58:18 2014 +0100 these are global strings now Change-Id: I0ca622afcf5dd4a5cc62d9bfd31974d800c659d1 diff --git a/extensions/source/propctrlr/formlinkdialog.cxx b/extensions/source/propctrlr/formlinkdialog.cxx index 76d9ad5..6a79a3d 100644 --- a/extensions/source/propctrlr/formlinkdialog.cxx +++ b/extensions/source/propctrlr/formlinkdialog.cxx @@ -276,7 +276,6 @@ namespace pcr { if ( m_sDetailLabel.isEmpty() ) { - ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG ); m_sDetailLabel = PcrRes(STR_DETAIL_FORM).toString(); } sDetailType = m_sDetailLabel; @@ -289,7 +288,6 @@ namespace pcr { if ( m_sMasterLabel.isEmpty() ) { - ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG ); m_sMasterLabel = PcrRes(STR_MASTER_FORM).toString(); } sMasterType = m_sMasterLabel; @@ -431,7 +429,6 @@ namespace pcr { OUString sErrorMessage; { - ::svt::OLocalResourceAccess aStringAccess( PcrRes( RID_DLG_FORMLINKS ), RSC_MODALDIALOG ); sErrorMessage = PcrRes(STR_ERROR_RETRIEVING_COLUMNS).toString(); sErrorMessage = sErrorMessage.replaceFirst("#", sCommand); } diff --git a/extensions/source/propctrlr/formresid.hrc b/extensions/source/propctrlr/formresid.hrc index c9447f8..3396a83 100644 --- a/extensions/source/propctrlr/formresid.hrc +++ b/extensions/source/propctrlr/formresid.hrc @@ -277,7 +277,6 @@ // - dialogs #define RID_DLG_TABORDER ( RID_PROPCONTROLLER_START + 1 ) -#define RID_DLG_FORMLINKS ( RID_PROPCONTROLLER_START + 2 ) #define RID_DLG_SELECTION ( RID_PROPCONTROLLER_START + 3 ) // - ImageLists commit 933bcfd2feafa82afc480161471cfeb29c6a0b7a Author: Caolán McNamara <caol...@redhat.com> Date: Mon Aug 11 08:56:54 2014 +0100 various ids not loaded from .res anymore Change-Id: Id2fab3e4b7a8feed3107e66d02cdf2a278ae9ef7 diff --git a/include/tools/rcid.h b/include/tools/rcid.h index ab66fd1..9a71f31 100644 --- a/include/tools/rcid.h +++ b/include/tools/rcid.h @@ -58,7 +58,7 @@ #define RSC_FLOATINGWINDOW (RSC_NOTYPE + 0x39) #define RSC_DIALOG (RSC_NOTYPE + 0x3a) -#define RSC_MODELESSDIALOG (RSC_NOTYPE + 0x3b) + #define RSC_MODALDIALOG (RSC_NOTYPE + 0x3c) #define RSC_CONTROL (RSC_NOTYPE + 0x44) #define RSC_BUTTON (RSC_NOTYPE + 0x45) @@ -78,13 +78,11 @@ #define RSC_MULTILINEEDIT (RSC_NOTYPE + 0x53) #define RSC_COMBOBOX (RSC_NOTYPE + 0x54) #define RSC_LISTBOX (RSC_NOTYPE + 0x55) -#define RSC_MULTILISTBOX (RSC_NOTYPE + 0x56) + #define RSC_TEXT (RSC_NOTYPE + 0x57) #define RSC_FIXEDLINE (RSC_NOTYPE + 0x58) #define RSC_FIXEDIMAGE (RSC_NOTYPE + 0x5a) -#define RSC_GROUPBOX (RSC_NOTYPE + 0x5c) -#define RSC_SCROLLBAR (RSC_NOTYPE + 0x5d) #define RSC_SPLITTER (RSC_NOTYPE + 0x5f) #define RSC_SPLITWINDOW (RSC_NOTYPE + 0x60) diff --git a/rsc/inc/rscdb.hxx b/rsc/inc/rscdb.hxx index 6468708..1393d1c 100644 --- a/rsc/inc/rscdb.hxx +++ b/rsc/inc/rscdb.hxx @@ -173,7 +173,6 @@ class RscTypCont RscTop * InitClassSystemWindow( RscTop * pSuper ); RscTop * InitClassWorkWindow( RscTop * pSuper ); RscTop * InitClassModalDialog( RscTop * pSuper ); - RscTop * InitClassModelessDialog( RscTop * pSuper ); RscTop * InitClassControl( RscTop * pSuper ); RscTop * InitClassCheckBox( RscTop * pSuper ); RscTop * InitClassPushButton( RscTop * pSuper ); @@ -185,7 +184,6 @@ class RscTypCont RscTop * InitClassMultiLineEdit( RscTop * pSuper ); RscTop * InitClassScrollBar( RscTop * pSuper ); RscTop * InitClassListBox( RscTop * pSuper, RscArray * pStrLst ); - RscTop * InitClassMultiListBox( RscTop * pSuper ); RscTop * InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ); RscTop * InitClassFixedText( RscTop * pSuper ); RscTop * InitClassFixedImage( RscTop * pSuper, RscTop * pClassImage ); diff --git a/rsc/source/parser/rscicpx.cxx b/rsc/source/parser/rscicpx.cxx index 067047b..e75ca84 100644 --- a/rsc/source/parser/rscicpx.cxx +++ b/rsc/source/parser/rscicpx.cxx @@ -373,20 +373,6 @@ RscTop * RscTypCont::InitClassModalDialog( RscTop * pSuper ) return pClassDialog; } -RscTop * RscTypCont::InitClassModelessDialog( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassDialog; - - // Klasse anlegen - nId = pHS->getID( "ModelessDialog" ); - pClassDialog = new RscClass( nId, RSC_MODELESSDIALOG, pSuper ); - pClassDialog->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassDialog ); - - return pClassDialog; -} - RscTop * RscTypCont::InitClassControl( RscTop * pSuper ) { Atom nId; @@ -596,61 +582,6 @@ RscTop * RscTypCont::InitClassMultiLineEdit( RscTop * pSuper ) return pClassMultiLineEdit; } -RscTop * RscTypCont::InitClassScrollBar( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassScrollBar; - - // Klasse anlegen - nId = pHS->getID( "ScrollBar" ); - pClassScrollBar = new RscClass( nId, RSC_SCROLLBAR, pSuper ); - pClassScrollBar->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassScrollBar ); - - // Variablen anlegen - nId = aNmTb.Put( "MinPos", VARNAME ); - pClassScrollBar->SetVariable( nId, &aShort ); - { - RSCINST aDfltI; - - aDfltI = aShort.Create( NULL, RSCINST(), false ); - aDfltI.pClass->SetNumber( aDfltI, 100 ); -// aDfltI.pClass->MakeDefault( aDfltI ); - - nId = aNmTb.Put( "MaxPos", VARNAME ); - pClassScrollBar->SetVariable( nId, &aShort, &aDfltI ); - } - nId = aNmTb.Put( "ThumbPos", VARNAME ); - pClassScrollBar->SetVariable( nId, &aShort ); - { - RSCINST aDfltI; - - aDfltI = aShort.Create( NULL, RSCINST(), false ); - aDfltI.pClass->SetNumber( aDfltI, 1 ); -// aDfltI.pClass->MakeDefault( aDfltI ); - - nId = aNmTb.Put( "PageSize", VARNAME); - pClassScrollBar->SetVariable( nId, &aShort, &aDfltI ); - } - { - RSCINST aDfltI; - - aDfltI = aShort.Create( NULL, RSCINST(), false ); - aDfltI.pClass->SetNumber( aDfltI, 1 ); -// aDfltI.pClass->MakeDefault( aDfltI ); - nId = aNmTb.Put( "LineSize", VARNAME ); - pClassScrollBar->SetVariable( nId, &aShort, &aDfltI ); - } - nId = aNmTb.Put( "VisibleSize", VARNAME ); - pClassScrollBar->SetVariable( nId, &aShort ); - - INS_WINBIT( pClassScrollBar, HScroll ); - INS_WINBIT( pClassScrollBar, VScroll ); - INS_WINBIT( pClassScrollBar, Drag ) - - return pClassScrollBar; -} - RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) { Atom nId; @@ -683,22 +614,6 @@ RscTop * RscTypCont::InitClassListBox( RscTop * pSuper, RscArray * pStrLst ) return pClassListBox; } -RscTop * RscTypCont::InitClassMultiListBox( RscTop * pSuper ) -{ - Atom nId; - RscTop * pClassMultiListBox; - - // Klasse anlegen - nId = pHS->getID( "MultiListBox" ); - pClassMultiListBox = new RscClass( nId, RSC_MULTILISTBOX, pSuper ); - pClassMultiListBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassMultiListBox ); - - INS_WINBIT(pClassMultiListBox,SimpleMode) - - return pClassMultiListBox; -} - RscTop * RscTypCont::InitClassComboBox( RscTop * pSuper, RscArray * pStrLst ) { Atom nId; diff --git a/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx index 0ff5e24..d45450d 100644 --- a/rsc/source/parser/rscinit.cxx +++ b/rsc/source/parser/rscinit.cxx @@ -73,7 +73,6 @@ void RscTypCont::Init() RscTop * pClassWorkWindow; RscTop * pClassDialog; RscTop * pClassModalDialog; - RscTop * pClassModelessDialog; RscTop * pClassControl; RscTop * pClassButton; RscTop * pClassCheckBox; @@ -86,13 +85,10 @@ void RscTypCont::Init() RscTop * pClassTriStateBox; RscTop * pClassEdit; RscTop * pClassMultiLineEdit; - RscTop * pClassScrollBar; RscTop * pClassListBox; - RscTop * pClassMultiListBox; RscTop * pClassComboBox; RscTop * pClassFixedText; RscTop * pClassFixedImage; - RscTop * pClassGroupBox; RscTop * pClassKeyCode; RscTop * pLangClassKeyCode; RscTop * pClassAccelItem; @@ -378,10 +374,6 @@ void RscTypCont::Init() // Klasse anlegen pClassModalDialog = InitClassModalDialog( pClassDialog ); pRoot->Insert( pClassModalDialog ); - - // Klasse anlegen - pClassModelessDialog = InitClassModelessDialog( pClassDialog ); - pRoot->Insert( pClassModelessDialog ); } { pClassControl = InitClassControl( pClassWindow ); @@ -441,18 +433,11 @@ void RscTypCont::Init() pClassMultiLineEdit = InitClassMultiLineEdit( pClassEdit ); pRoot->Insert( pClassMultiLineEdit ); - - pClassScrollBar = InitClassScrollBar( pClassControl ); - pRoot->Insert( pClassScrollBar ); - } { pClassListBox = InitClassListBox( pClassControl, pLangStringLongTupelList ); pRoot->Insert( pClassListBox ); - pClassMultiListBox = InitClassMultiListBox( pClassListBox); - pRoot->Insert( pClassMultiListBox ); - pClassComboBox = InitClassComboBox( pClassEdit, pLangStringList ); pRoot->Insert( pClassComboBox ); @@ -462,13 +447,6 @@ void RscTypCont::Init() pClassFixedImage = InitClassFixedImage( pClassControl, pClassImage ); pRoot->Insert( pClassFixedImage ); - // Klasse anlegen - nId = pHS->getID( "GroupBox" ); - pClassGroupBox = new RscClass( nId, RSC_GROUPBOX, pClassControl ); - pClassGroupBox->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType ); - aNmTb.Put( nId, CLASSNAME, pClassGroupBox ); - pRoot->Insert( pClassGroupBox ); - pClassKeyCode = InitClassKeyCode( pClassMgr, pKey ); pRoot->Insert( pClassKeyCode ); { diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx index f38098f..be86db1 100644 --- a/tools/source/rc/resmgr.cxx +++ b/tools/source/rc/resmgr.cxx @@ -1460,7 +1460,6 @@ OString ResMgr::GetAutoHelpId() switch( pRC->pResource->GetRT() ) { case RSC_DOCKINGWINDOW: aHID.append( "DockingWindow" ); break; case RSC_WORKWIN: aHID.append( "WorkWindow" ); break; - case RSC_MODELESSDIALOG: aHID.append( "ModelessDialog" ); break; case RSC_FLOATINGWINDOW: aHID.append( "FloatingWindow" ); break; case RSC_MODALDIALOG: aHID.append( "ModalDialog" ); break; case RSC_TABPAGE: aHID.append( "TabPage" ); break; @@ -1474,7 +1473,6 @@ OString ResMgr::GetAutoHelpId() switch( pRC1->pResource->GetRT() ) { case RSC_DOCKINGWINDOW: case RSC_WORKWIN: - case RSC_MODELESSDIALOG: case RSC_FLOATINGWINDOW: case RSC_MODALDIALOG: case RSC_TABPAGE: @@ -1487,7 +1485,6 @@ OString ResMgr::GetAutoHelpId() case RSC_TRISTATEBOX: aHID.append( "TriStateBox" ); break; case RSC_EDIT: aHID.append( "Edit" ); break; case RSC_MULTILINEEDIT: aHID.append( "MultiLineEdit" ); break; - case RSC_MULTILISTBOX: aHID.append( "MultiListBox" ); break; case RSC_LISTBOX: aHID.append( "ListBox" ); break; case RSC_COMBOBOX: aHID.append( "ComboBox" ); break; case RSC_PUSHBUTTON: aHID.append( "PushButton" ); break; commit e1683c2d13a744344ee6a7b06917f65c11d8b35b Author: Caolán McNamara <caol...@redhat.com> Date: Mon Aug 11 08:44:33 2014 +0100 callcatcher: update unused code lots of ResID stuff going away now Change-Id: Iad8524e201cd3072db71da9e5ee1c244ed337967 diff --git a/dbaccess/source/ui/control/FieldDescControl.cxx b/dbaccess/source/ui/control/FieldDescControl.cxx index b473fe3..44bf027 100644 --- a/dbaccess/source/ui/control/FieldDescControl.cxx +++ b/dbaccess/source/ui/control/FieldDescControl.cxx @@ -93,55 +93,6 @@ namespace } // class OFieldDescControl - - -OFieldDescControl::OFieldDescControl( Window* pParent, const ResId& rResId, OTableDesignHelpBar* pHelpBar) - :TabPage( pParent, rResId ) - ,pHelp( pHelpBar ) - ,pLastFocusWindow(NULL) - ,m_pActFocusWindow(NULL) - ,pDefaultText(NULL) - ,pRequiredText(NULL) - ,pAutoIncrementText(NULL) - ,pTextLenText(NULL) - ,pNumTypeText(NULL) - ,pLengthText(NULL) - ,pScaleText(NULL) - ,pFormatText(NULL) - ,pBoolDefaultText(NULL) - ,m_pColumnNameText(NULL) - ,m_pTypeText(NULL) - ,m_pAutoIncrementValueText(NULL) - ,pRequired(NULL) - ,pNumType(NULL) - ,pAutoIncrement(NULL) - ,pDefault(NULL) - ,pTextLen(NULL) - ,pLength(NULL) - ,pScale(NULL) - ,pFormatSample(NULL) - ,pBoolDefault(NULL) - ,m_pColumnName(NULL) - ,m_pType(NULL) - ,m_pAutoIncrementValue(NULL) - ,pFormat(NULL) - ,m_pVertScroll( NULL ) - ,m_pHorzScroll( NULL ) - ,m_pPreviousType() - ,m_nPos(-1) - ,aYes(ModuleRes(STR_VALUE_YES)) - ,aNo(ModuleRes(STR_VALUE_NO)) - ,m_nOldVThumb( 0 ) - ,m_nOldHThumb( 0 ) - ,m_nWidth(50) - ,m_bAdded(false) - ,m_bRightAligned(false) - ,pActFieldDescr(NULL) -{ - - Contruct(); -} - OFieldDescControl::OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar ) :TabPage( pParent, WB_3DLOOK | WB_DIALOGCONTROL ) ,pHelp( pHelpBar ) diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index b012cba..b6a7a59 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -35,13 +35,6 @@ OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, WinBits nWinStyle ) InitButtonData(); } -OMarkableTreeListBox::OMarkableTreeListBox( Window* pParent, const ResId& rResId) - : DBTreeListBox(pParent, rResId) -{ - - InitButtonData(); -} - OMarkableTreeListBox::~OMarkableTreeListBox() { delete m_pCheckButton; diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.cxx b/dbaccess/source/ui/dlg/ConnectionHelper.cxx index 44c9f75..ce5803a 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.cxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.cxx @@ -88,27 +88,6 @@ namespace dbaui using namespace ::dbtools; using namespace ::svt; - - OConnectionHelper::OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs) - : OGenericAdministrationPage(pParent, _rId, _rCoreAttrs) - , m_bUserGrabFocus(false) - , m_pFT_Connection(new FixedText(this, ResId(FT_AUTOBROWSEURL, *_rId.GetResMgr()))) - , m_pConnectionURL(new OConnectionURLEdit(this, ResId(ET_AUTOBROWSEURL, *_rId.GetResMgr()))) - , m_pPB_Connection(new PushButton(this, ResId(PB_AUTOBROWSEURL, *_rId.GetResMgr()))) - , m_pPB_CreateDB(new PushButton(this, ResId(PB_CREATEDB, *_rId.GetResMgr()))) - , m_pCollection(NULL) - , m_bDelete(true) - { - // extract the datasource type collection from the item set - DbuTypeCollectionItem* pCollectionItem = PTR_CAST(DbuTypeCollectionItem, _rCoreAttrs.GetItem(DSID_TYPECOLLECTION)); - if (pCollectionItem) - m_pCollection = pCollectionItem->getCollection(); - m_pPB_Connection->SetClickHdl(LINK(this, OConnectionHelper, OnBrowseConnections)); - m_pPB_CreateDB->SetClickHdl(LINK(this, OConnectionHelper, OnCreateDatabase)); - OSL_ENSURE(m_pCollection, "OConnectionHelper::OConnectionHelper : really need a DSN type collection !"); - m_pConnectionURL->SetTypeCollection(m_pCollection); - } - OConnectionHelper::OConnectionHelper( Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs) : OGenericAdministrationPage(pParent, _rId, _rUIXMLDescription, _rCoreAttrs) , m_bUserGrabFocus(false) diff --git a/dbaccess/source/ui/dlg/ConnectionHelper.hxx b/dbaccess/source/ui/dlg/ConnectionHelper.hxx index 95a222f..78aa62d 100644 --- a/dbaccess/source/ui/dlg/ConnectionHelper.hxx +++ b/dbaccess/source/ui/dlg/ConnectionHelper.hxx @@ -40,7 +40,6 @@ namespace dbaui bool m_bUserGrabFocus : 1; public: - OConnectionHelper( Window* pParent, const ResId& _rId, const SfxItemSet& _rCoreAttrs); OConnectionHelper( Window* pParent, const OString& _rId, const OUString& _rUIXMLDescription, const SfxItemSet& _rCoreAttrs); virtual ~OConnectionHelper(); FixedText *m_pFT_Connection; diff --git a/dbaccess/source/ui/dlg/adminpages.cxx b/dbaccess/source/ui/dlg/adminpages.cxx index 331ac2f..60e919d 100644 --- a/dbaccess/source/ui/dlg/adminpages.cxx +++ b/dbaccess/source/ui/dlg/adminpages.cxx @@ -278,15 +278,6 @@ namespace dbaui return 0L; } - void OGenericAdministrationPage::SetHeaderText( sal_uInt16 _nFTResId, sal_uInt16 _StringResId) - { - delete(m_pFT_HeaderText); - m_pFT_HeaderText = new FixedText(this, ModuleRes(_nFTResId)); - OUString sHeaderText = ModuleRes(_StringResId); - m_pFT_HeaderText->SetText(sHeaderText); - SetControlFontWeight(m_pFT_HeaderText); - } - // LayoutHelper void LayoutHelper::positionBelow( const Control& _rReference, Control& _rControl, const ControlRelation _eRelation, const long _nIndentAppFont ) diff --git a/dbaccess/source/ui/dlg/adminpages.hxx b/dbaccess/source/ui/dlg/adminpages.hxx index 846c028..aa4200f 100644 --- a/dbaccess/source/ui/dlg/adminpages.hxx +++ b/dbaccess/source/ui/dlg/adminpages.hxx @@ -233,7 +233,6 @@ namespace dbaui protected: // used to set the right Pane header of a wizard to bold void SetControlFontWeight(Window* _pWindow, FontWeight _eWeight = WEIGHT_BOLD); - void SetHeaderText( sal_uInt16 _nFTResId, sal_uInt16 _StringResId); /** 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/FieldDescControl.hxx b/dbaccess/source/ui/inc/FieldDescControl.hxx index 308947b..01bb059 100644 --- a/dbaccess/source/ui/inc/FieldDescControl.hxx +++ b/dbaccess/source/ui/inc/FieldDescControl.hxx @@ -174,7 +174,6 @@ namespace dbaui public: OFieldDescControl( Window* pParent, OTableDesignHelpBar* pHelpBar); - OFieldDescControl( Window* pParent, const ResId& rResId, OTableDesignHelpBar* pHelpBar); virtual ~OFieldDescControl(); void DisplayData(OFieldDescription* pFieldDescr ); diff --git a/dbaccess/source/ui/inc/WTabPage.hxx b/dbaccess/source/ui/inc/WTabPage.hxx index daa4b71..83398f7 100644 --- a/dbaccess/source/ui/inc/WTabPage.hxx +++ b/dbaccess/source/ui/inc/WTabPage.hxx @@ -32,7 +32,6 @@ namespace dbaui OCopyTableWizard* m_pParent; bool m_bFirstTime; // Page wird das erste mal gerufen ; should be set in the reset methode - OWizardPage( Window* pParent, const ResId& rResId ); OWizardPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription ); public: diff --git a/dbaccess/source/ui/inc/marktree.hxx b/dbaccess/source/ui/inc/marktree.hxx index 77fb811..cd86e1a 100644 --- a/dbaccess/source/ui/inc/marktree.hxx +++ b/dbaccess/source/ui/inc/marktree.hxx @@ -39,7 +39,6 @@ class OMarkableTreeListBox : public DBTreeListBox public: OMarkableTreeListBox( Window* pParent, WinBits nWinStyle=0 ); - OMarkableTreeListBox( Window* pParent, const ResId& rResId ); virtual ~OMarkableTreeListBox(); virtual void KeyInput( const KeyEvent& rKEvt ) SAL_OVERRIDE; diff --git a/dbaccess/source/ui/misc/WColumnSelect.cxx b/dbaccess/source/ui/misc/WColumnSelect.cxx index 0f9ce1c..62cce567 100644 --- a/dbaccess/source/ui/misc/WColumnSelect.cxx +++ b/dbaccess/source/ui/misc/WColumnSelect.cxx @@ -43,13 +43,6 @@ namespace CopyTableOperation = ::com::sun::star::sdb::application::CopyTableOper OUString OWizColumnSelect::GetTitle() const { return ModuleRes(STR_WIZ_COLUMN_SELECT_TITEL); } -OWizardPage::OWizardPage( Window* pParent, const ResId& rResId ) - : TabPage(pParent,rResId) - ,m_pParent(static_cast<OCopyTableWizard*>(pParent)) - ,m_bFirstTime(true) -{ -} - OWizardPage::OWizardPage(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) : TabPage(pParent, rID, rUIXMLDescription) ,m_pParent(static_cast<OCopyTableWizard*>(pParent)) diff --git a/include/svtools/roadmapwizard.hxx b/include/svtools/roadmapwizard.hxx index 8dfd111..b1145b2 100644 --- a/include/svtools/roadmapwizard.hxx +++ b/include/svtools/roadmapwizard.hxx @@ -69,11 +69,6 @@ namespace svt public: RoadmapWizard( Window* _pParent, - const ResId& _rRes, - sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP - ); - RoadmapWizard( - Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags = WZB_NEXT | WZB_PREVIOUS | WZB_FINISH | WZB_CANCEL | WZB_HELP ); diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx index 4a0d107..53fc594 100644 --- a/include/svtools/simptabl.hxx +++ b/include/svtools/simptabl.hxx @@ -34,7 +34,6 @@ protected: virtual bool PreNotify( NotifyEvent& rNEvt ) SAL_OVERRIDE; public: - SvSimpleTableContainer( Window* pParent, const ResId& rResId ); SvSimpleTableContainer( Window* pParent, WinBits nBits = WB_BORDER ); void SetTable(SvSimpleTable* pTable); diff --git a/include/svtools/stdctrl.hxx b/include/svtools/stdctrl.hxx index 5664381..271b5d3 100644 --- a/include/svtools/stdctrl.hxx +++ b/include/svtools/stdctrl.hxx @@ -25,14 +25,9 @@ #include <vcl/edit.hxx> #include <vcl/fixed.hxx> - -// - FixedInfo - - - class SVT_DLLPUBLIC FixedInfo : public FixedText { public: - FixedInfo( Window* pParent, WinBits nWinStyle = WB_LEFT ); FixedInfo( Window* pParent, const ResId& rResId ); }; diff --git a/include/svtools/svmedit.hxx b/include/svtools/svmedit.hxx index 7d84c2e..0970e38 100644 --- a/include/svtools/svmedit.hxx +++ b/include/svtools/svmedit.hxx @@ -32,7 +32,6 @@ class SVT_DLLPUBLIC MultiLineEdit : public VclMultiLineEdit { public: MultiLineEdit( Window* pParent, WinBits nWinStyle = WB_LEFT | WB_BORDER ); - MultiLineEdit( Window* pParent, const ResId& rResId ); virtual ::com::sun::star::uno::Reference< ::com::sun::star::awt::XWindowPeer > GetComponentInterface(sal_Bool bCreate = sal_True) SAL_OVERRIDE; diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index fca0de9..8ade2a0 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -64,7 +64,6 @@ protected: public: SvTabListBox( Window* pParent, WinBits = WB_BORDER ); - SvTabListBox( Window* pParent, const ResId& ); virtual ~SvTabListBox(); void SetTabs( long* pTabs, MapUnit = MAP_APPFONT ); sal_uInt16 TabCount() const { return (sal_uInt16)nTabCount; } diff --git a/include/svx/stddlg.hxx b/include/svx/stddlg.hxx index 8a53be5..44ef824 100644 --- a/include/svx/stddlg.hxx +++ b/include/svx/stddlg.hxx @@ -27,7 +27,6 @@ class SVX_DLLPUBLIC SvxStandardDialog: public SfxModalDialog { public: - SvxStandardDialog( Window* pParent, const ResId& rResId ); SvxStandardDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); virtual ~SvxStandardDialog(); diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx index 27c79e1..2b653f8 100644 --- a/include/vcl/dialog.hxx +++ b/include/vcl/dialog.hxx @@ -144,10 +144,7 @@ public: void GrabFocusToFirstControl(); }; - // - ModelessDialog - - - class VCL_DLLPUBLIC ModelessDialog : public Dialog { // Copy assignment is forbidden and not implemented. @@ -155,14 +152,10 @@ class VCL_DLLPUBLIC ModelessDialog : public Dialog SAL_DLLPRIVATE ModelessDialog & operator= (const ModelessDialog &); public: - explicit ModelessDialog( Window* pParent, const ResId& rResId ); explicit ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ); }; - // - ModalDialog - - - class VCL_DLLPUBLIC ModalDialog : public Dialog { public: diff --git a/include/vcl/group.hxx b/include/vcl/group.hxx index 7e5e11c..a8956de 100644 --- a/include/vcl/group.hxx +++ b/include/vcl/group.hxx @@ -47,7 +47,6 @@ private: public: explicit GroupBox( Window* pParent, WinBits nStyle = 0 ); - explicit GroupBox( Window* pParent, const ResId& ); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; virtual void Draw( OutputDevice* pDev, const Point& rPos, const Size& rSize, sal_uLong nFlags ) SAL_OVERRIDE; diff --git a/include/vcl/lstbox.hxx b/include/vcl/lstbox.hxx index f8b76b1..e0dbf93 100644 --- a/include/vcl/lstbox.hxx +++ b/include/vcl/lstbox.hxx @@ -254,7 +254,6 @@ private: public: explicit MultiListBox( Window* pParent, WinBits nStyle = 0 ); - explicit MultiListBox( Window* pParent, const ResId& rResId ); }; diff --git a/include/vcl/prgsbar.hxx b/include/vcl/prgsbar.hxx index c000698..943dd54 100644 --- a/include/vcl/prgsbar.hxx +++ b/include/vcl/prgsbar.hxx @@ -72,7 +72,6 @@ private: public: ProgressBar( Window* pParent, WinBits nWinBits = WB_STDPROGRESSBAR ); - ProgressBar( Window* pParent, const ResId& rResId ); virtual ~ProgressBar(); virtual void Paint( const Rectangle& rRect ) SAL_OVERRIDE; diff --git a/include/vcl/scrbar.hxx b/include/vcl/scrbar.hxx index c1e5564..c285c133 100644 --- a/include/vcl/scrbar.hxx +++ b/include/vcl/scrbar.hxx @@ -91,7 +91,6 @@ private: public: explicit ScrollBar( Window* pParent, WinBits nStyle = WB_VERT ); - explicit ScrollBar( Window* pParent, const ResId& ); virtual ~ScrollBar(); virtual void MouseButtonDown( const MouseEvent& rMEvt ) SAL_OVERRIDE; diff --git a/svtools/source/contnr/simptabl.cxx b/svtools/source/contnr/simptabl.cxx index dcb87ad..62e275c 100644 --- a/svtools/source/contnr/simptabl.cxx +++ b/svtools/source/contnr/simptabl.cxx @@ -26,15 +26,6 @@ #include <vcl/svapp.hxx> #include <vcl/settings.hxx> -// SvSimpleTableContainer ------------------------------------------------------ - -SvSimpleTableContainer::SvSimpleTableContainer(Window* pParent, const ResId& rResId) - : Control(pParent, rResId) - , m_pTable(NULL) -{ - SetBorderStyle(WINDOW_BORDER_NOBORDER); -} - SvSimpleTableContainer::SvSimpleTableContainer(Window* pParent, WinBits nBits) : Control(pParent, nBits) , m_pTable(NULL) diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 80fd9c0..558be20 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -108,16 +108,6 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSvTabListBox(Window *pParen return new SvTabListBox(pParent, nWinStyle); } -SvTabListBox::SvTabListBox( Window* pParent, const ResId& rResId ) - : SvTreeListBox( pParent, rResId ) -{ - pTabList = 0; - nTabCount = 0; - pViewParent = 0; - SvTabListBox::Resize(); - SetHighlightRange(); -} - SvTabListBox::~SvTabListBox() { // delete array diff --git a/svtools/source/control/stdctrl.cxx b/svtools/source/control/stdctrl.cxx index 74141c8..bc117dc 100644 --- a/svtools/source/control/stdctrl.cxx +++ b/svtools/source/control/stdctrl.cxx @@ -17,18 +17,8 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ - #include <svtools/stdctrl.hxx> - - -FixedInfo::FixedInfo( Window* pParent, WinBits nWinStyle ) : - FixedText( pParent, nWinStyle | WB_INFO ) -{ -} - - - FixedInfo::FixedInfo( Window* pParent, const ResId& rResId ) : FixedText( pParent, rResId ) { diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index b6cf0c4..ba3a718 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -165,14 +165,6 @@ namespace svt } #endif - RoadmapWizard::RoadmapWizard( Window* _pParent, const ResId& _rRes, sal_uInt32 _nButtonFlags ) - :OWizardMachine( _pParent, _rRes, _nButtonFlags ) - ,m_pImpl( new RoadmapWizardImpl ) - { - impl_construct(); - } - - RoadmapWizard::RoadmapWizard( Window* _pParent, const WinBits i_nStyle, sal_uInt32 _nButtonFlags ) :OWizardMachine( _pParent, i_nStyle, _nButtonFlags ) ,m_pImpl( new RoadmapWizardImpl ) diff --git a/svtools/source/edit/svmedit.cxx b/svtools/source/edit/svmedit.cxx index 2d21401..8ea2f0a 100644 --- a/svtools/source/edit/svmedit.cxx +++ b/svtools/source/edit/svmedit.cxx @@ -25,10 +25,6 @@ MultiLineEdit::MultiLineEdit( Window* pParent, WinBits nWinStyle ) : VclMultiLineEdit( pParent,nWinStyle ) { } -MultiLineEdit::MultiLineEdit( Window* pParent, const ResId& rResId ) - : VclMultiLineEdit( pParent,rResId ) -{ -} // virtual css::uno::Reference< css::awt::XWindowPeer > diff --git a/svx/source/dialog/stddlg.cxx b/svx/source/dialog/stddlg.cxx index f850b44..3ea9673 100644 --- a/svx/source/dialog/stddlg.cxx +++ b/svx/source/dialog/stddlg.cxx @@ -35,24 +35,13 @@ short SvxStandardDialog::Execute() return nRet; } - - -SvxStandardDialog::SvxStandardDialog( Window *pParent, const ResId &rResId ) - : SfxModalDialog( pParent, rResId ) -{ -} - SvxStandardDialog::SvxStandardDialog(Window *pParent, const OString& rID, const OUString& rUIXMLDescription ) : SfxModalDialog(pParent, rID, rUIXMLDescription) { } - - SvxStandardDialog::~SvxStandardDialog() { } - - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sw/source/uibase/inc/glosbib.hxx b/sw/source/uibase/inc/glosbib.hxx index e744c6b..fc339c1 100644 --- a/sw/source/uibase/inc/glosbib.hxx +++ b/sw/source/uibase/inc/glosbib.hxx @@ -60,11 +60,6 @@ struct GlosBibUserData class SwGlossaryGroupTLB : public SvTabListBox { public: - SwGlossaryGroupTLB(Window* pParent, const ResId& rResId) - : SvTabListBox(pParent, rResId) - { - } - SwGlossaryGroupTLB(Window* pParent) : SvTabListBox(pParent, WB_BORDER|WB_HSCROLL|WB_CLIPCHILDREN|WB_SORT) { diff --git a/unusedcode.easy b/unusedcode.easy index 5da63ae..dc8ae96 100644 --- a/unusedcode.easy +++ b/unusedcode.easy @@ -1,6 +1,7 @@ (anonymous namespace)::flagToString(unsigned short) BigInt::BigInt(unsigned int) CalcUnoApiTest::CalcUnoApiTest(rtl::OUString const&) +DocxSdrExport::isParagraphSdtOpen() GDriveDocument::GDriveDocument(GDriveSession*) GDriveFolder::GDriveFolder(GDriveSession*) GDriveProperty::GDriveProperty() @@ -29,6 +30,7 @@ ScRawToken::Delete() ScTabView::DrawMarkRect(Rectangle const&) ScTable::AttachFormulaCells(sc::StartListeningContext&, short, int, short, int) ScTable::DetachFormulaCells(sc::EndListeningContext&, short, int, short, int) +ScTable::MarkSubTotalCells(sc::ColumnSpanSet&, short, int, short, int, bool) const ScVbaFormat<ooo::vba::excel::XStyle>::getAddIndent() ScVbaFormat<ooo::vba::excel::XStyle>::setAddIndent(com::sun::star::uno::Any const&) SfxAppMenuControl_Impl::RegisterControl(unsigned short, SfxModule*) @@ -46,6 +48,7 @@ SvxFontListBox::GetSelectEntry() const SvxOpenGLObject::getRenderer() SvxOpenGLObject::setRenderer(IOpenGLRenderer*) 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> >) Test::testCopyPasteSkipEmptyConditionalFormatting() Test::testPerf() @@ -165,6 +168,8 @@ apitest::XSpreadsheets2::testImportOverExistingNamedRange() apitest::XSpreadsheets2::testImportString() apitest::XSpreadsheets2::testImportValue() apitest::XSpreadsheets2::testImportedSheetNameAndIndex() +apitest::XStyleLoader::testLoadStylesFromDocument() +apitest::XStyleLoader::testLoadStylesFromURL() apitest::XText::testInsertRemoveTextContent() apitest::XTextContent::testAttach() apitest::XTextContent::testGetAnchor() @@ -174,8 +179,11 @@ calc::OCellListSource::checkConsistency_static(void const*) calc::OCellValueBinding::checkConsistency_static(void const*) 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::Bar::Bar(chart::opengl3D::OpenGL3DRenderer*, glm::detail::tmat4x4<float> const&, unsigned int, unsigned int) +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 @@ -183,6 +191,7 @@ comphelper::detail::ConfigurationWrapper::setLocalizedPropertyValue(boost::share connectivity::firebird::release(int&, cppu::OBroadcastHelperVar<cppu::OMultiTypeInterfaceContainerHelper, com::sun::star::uno::Type>&, com::sun::star::uno::Reference<com::sun::star::uno::XInterface>&, com::sun::star::lang::XComponent*) connectivity::sdbcx::OGroup::OGroup(bool) connectivity::sdbcx::OGroup::OGroup(rtl::OUString const&, bool) +dbaccess::ORowSetCacheIterator::getMutex() const oglcanvas::CanvasHelper::flush() const oglcanvas::TextLayout::draw(com::sun::star::rendering::ViewState const&, com::sun::star::rendering::RenderState const&, com::sun::star::uno::Reference<com::sun::star::rendering::XGraphicDevice> const&) const oox::drawingml::TextListStyle::dump() const @@ -201,9 +210,12 @@ std::_Rb_tree<rtl::OUString, std::pair<rtl::OUString const, (anonymous namespace std::__cxx1998::vector<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread>, std::allocator<rtl::Reference<oox::xls::(anonymous namespace)::WorkerThread> > >::reserve(unsigned long) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr<formula::FormulaTokenArray>&) std::auto_ptr<formula::FormulaTokenArray>::auto_ptr(std::auto_ptr_ref<formula::FormulaTokenArray>) +svgio::svgreader::SvgDocument::removeSvgStyleAttributesFromMapper(rtl::OUString const&) svl::GridPrinter::clear() svl::GridPrinter::resize(unsigned long, unsigned long) svt::CheckInvariants(void const*) svt::table::TableControl_Impl::impl_checkInvariants() const svt::table::UnoControlTableModel::checkInvariants() const vcl::MapChar(vcl::_TrueTypeFont*, unsigned short, bool) +writerfilter::dmapper::StyleSheetTable::GetStyleIdFromIndex(unsigned int) +writerfilter::ooxml::OOXMLBooleanValue::OOXMLBooleanValue(char const*) diff --git a/vcl/source/control/group.cxx b/vcl/source/control/group.cxx index 97142fb..320cade 100644 --- a/vcl/source/control/group.cxx +++ b/vcl/source/control/group.cxx @@ -92,18 +92,6 @@ GroupBox::GroupBox( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -GroupBox::GroupBox( Window* pParent, const ResId& rResId ) : - Control( WINDOW_GROUPBOX ) -{ - rResId.SetRT( RSC_GROUPBOX ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - void GroupBox::ImplDraw( OutputDevice* pDev, sal_uLong nDrawFlags, const Point& rPos, const Size& rSize, bool bLayout ) { diff --git a/vcl/source/control/lstbox.cxx b/vcl/source/control/lstbox.cxx index cdb7119..d6c6764 100644 --- a/vcl/source/control/lstbox.cxx +++ b/vcl/source/control/lstbox.cxx @@ -1496,17 +1496,4 @@ MultiListBox::MultiListBox( Window* pParent, WinBits nStyle ) : EnableMultiSelection( true ); } -MultiListBox::MultiListBox( Window* pParent, const ResId& rResId ) : - ListBox( WINDOW_MULTILISTBOX ) -{ - rResId.SetRT( RSC_MULTILISTBOX ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE ) ) - Show(); - EnableMultiSelection( true ); -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/source/control/prgsbar.cxx b/vcl/source/control/prgsbar.cxx index 8bbaafc..4634300 100644 --- a/vcl/source/control/prgsbar.cxx +++ b/vcl/source/control/prgsbar.cxx @@ -56,12 +56,6 @@ ProgressBar::ProgressBar( Window* pParent, WinBits nWinStyle ) : ImplInit(); } -ProgressBar::ProgressBar( Window* pParent, const ResId& rResId ) : - Window( pParent, rResId ) -{ - ImplInit(); -} - ProgressBar::~ProgressBar() { } diff --git a/vcl/source/control/scrbar.cxx b/vcl/source/control/scrbar.cxx index dc72130..f7a87b3 100644 --- a/vcl/source/control/scrbar.cxx +++ b/vcl/source/control/scrbar.cxx @@ -123,18 +123,6 @@ ScrollBar::ScrollBar( Window* pParent, WinBits nStyle ) : ImplInit( pParent, nStyle ); } -ScrollBar::ScrollBar( Window* pParent, const ResId& rResId ) : - Control( WINDOW_SCROLLBAR ) -{ - rResId.SetRT( RSC_SCROLLBAR ); - WinBits nStyle = ImplInitRes( rResId ); - ImplInit( pParent, nStyle ); - ImplLoadRes( rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - ScrollBar::~ScrollBar() { delete mpData; diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx index ef315da..a686c78 100644 --- a/vcl/source/window/dialog.cxx +++ b/vcl/source/window/dialog.cxx @@ -1280,19 +1280,8 @@ VclBuilderContainer::~VclBuilderContainer() delete m_pUIBuilder; } -ModelessDialog::ModelessDialog( Window* pParent, const ResId& rResId ) : - Dialog( WINDOW_MODELESSDIALOG ) -{ - rResId.SetRT( RSC_MODELESSDIALOG ); - - WinBits nStyle = init( pParent, rResId ); - - if ( !(nStyle & WB_HIDE) ) - Show(); -} - -ModelessDialog::ModelessDialog( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) : - Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODELESSDIALOG) +ModelessDialog::ModelessDialog(Window* pParent, const OString& rID, const OUString& rUIXMLDescription) + : Dialog(pParent, rID, rUIXMLDescription, WINDOW_MODELESSDIALOG) { } diff --git a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx index 650adc5..eaf2fa9 100644 --- a/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx +++ b/xmlsecurity/inc/xmlsecurity/certificateviewer.hxx @@ -66,7 +66,6 @@ class CertificateViewerTP : public TabPage protected: CertificateViewer* mpDlg; public: - CertificateViewerTP( Window* _pParent, const ResId& _rResId, CertificateViewer* _pDlg ); CertificateViewerTP( Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, CertificateViewer* _pDlg ); void SetTabDlg( CertificateViewer* _pTabDlg ) diff --git a/xmlsecurity/source/dialogs/certificateviewer.cxx b/xmlsecurity/source/dialogs/certificateviewer.cxx index 762bc17..b704530 100644 --- a/xmlsecurity/source/dialogs/certificateviewer.cxx +++ b/xmlsecurity/source/dialogs/certificateviewer.cxx @@ -66,12 +66,6 @@ CertificateViewer::~CertificateViewer() delete mpTabCtrl->GetTabPage(mnPathId); } -CertificateViewerTP::CertificateViewerTP( Window* _pParent, const ResId& _rResId, CertificateViewer* _pDlg ) - :TabPage ( _pParent, _rResId ) - ,mpDlg ( _pDlg ) -{ -} - CertificateViewerTP::CertificateViewerTP( Window* _pParent, const OString& rID, const OUString& rUIXMLDescription, CertificateViewer* _pDlg ) : TabPage(_pParent, rID, rUIXMLDescription) diff --git a/xmlsecurity/source/dialogs/resourcemanager.cxx b/xmlsecurity/source/dialogs/resourcemanager.cxx index d6d707b..7a6498a 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.cxx +++ b/xmlsecurity/source/dialogs/resourcemanager.cxx @@ -356,28 +356,6 @@ vector< pair< OUString, OUString> > parseDN(const OUString& rRawString) _rCtrl.SetSizePixel( aSize ); return nWidth; } - - void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset ) - { - Point aPos( _rImage.GetPosPixel() ); - Size aSize( _rImage.GetSizePixel() ); - long n = aPos.X(); - n += aSize.Width(); - n += _nXOffset; - aPos.X() = n; - n = aPos.Y(); - n += aSize.Height() / 2; // y-position is in the middle of the image - n -= _rCtrl.GetSizePixel().Height() / 2; // center Control - aPos.Y() = n; - _rCtrl.SetPosPixel( aPos ); - } - - void AlignAfterImage( const FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset ) - { - AlignAfterImage( _rImage, static_cast< Control& >( _rFI ), _nXOffset ); - ShrinkToFitWidth( _rFI ); - } } - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/xmlsecurity/source/dialogs/resourcemanager.hxx b/xmlsecurity/source/dialogs/resourcemanager.hxx index aca0557..3010f2a 100644 --- a/xmlsecurity/source/dialogs/resourcemanager.hxx +++ b/xmlsecurity/source/dialogs/resourcemanager.hxx @@ -50,8 +50,6 @@ namespace XmlSec 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 - void AlignAfterImage( const FixedImage& _rImage, Control& _rCtrl, long _nXOffset = 0 ); - void AlignAfterImage( const FixedImage& _rImage, FixedInfo& _rFI, long _nXOffset = 0 ); } #define XMLSEC_RES(id) ResId(id,*XmlSec::GetResMgr())
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits