[Libreoffice-commits] core.git: 2 commits - extensions/source include/svtools include/tools include/vcl rsc/source svtools/source tools/source uui/source vcl/source
Caolán McNamara
caolanm at redhat.com
Wed Aug 20 08:36:32 PDT 2014
extensions/source/bibliography/bibcont.cxx | 5 -----
extensions/source/bibliography/bibshortcuthandler.hxx | 8 ++------
include/svtools/wizardmachine.hxx | 1 -
include/tools/rcid.h | 2 --
include/vcl/tabpage.hxx | 2 --
rsc/source/parser/rscinit.cxx | 9 ---------
svtools/source/dialogs/wizardmachine.cxx | 18 ------------------
tools/source/rc/resmgr.cxx | 2 --
uui/source/ids.hrc | 4 ----
vcl/source/window/tabpage.cxx | 12 ------------
10 files changed, 2 insertions(+), 61 deletions(-)
New commits:
commit afa5d63e2adccefd5cabfe2e0f6f78ce217a294d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 20 14:15:19 2014 +0100
TabPages are no longer loaded from resource files
Change-Id: I009e0f388cfe1861cef89d2148a02380dd47c1ff
diff --git a/extensions/source/bibliography/bibcont.cxx b/extensions/source/bibliography/bibcont.cxx
index d4460e7..346478b 100644
--- a/extensions/source/bibliography/bibcont.cxx
+++ b/extensions/source/bibliography/bibcont.cxx
@@ -60,11 +60,6 @@ BibSplitWindow::~BibSplitWindow()
{
}
-
-BibTabPage::BibTabPage( Window* pParent, const ResId& rResId ) : TabPage( pParent, rResId ), BibShortCutHandler( this )
-{
-}
-
BibTabPage::BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription ) :
TabPage( pParent, rID, rUIXMLDescription ), BibShortCutHandler( this )
{
diff --git a/extensions/source/bibliography/bibshortcuthandler.hxx b/extensions/source/bibliography/bibshortcuthandler.hxx
index 9b862bc..6eb4231 100644
--- a/extensions/source/bibliography/bibshortcuthandler.hxx
+++ b/extensions/source/bibliography/bibshortcuthandler.hxx
@@ -52,7 +52,6 @@ inline Window* BibShortCutHandler::GetWindow( void )
return pBaseClass;
}
-
class BibWindow : public Window, public BibShortCutHandler
{
public:
@@ -60,7 +59,6 @@ public:
virtual ~BibWindow();
};
-
class BibSplitWindow : public SplitWindow, public BibShortCutHandler
{
public:
@@ -68,13 +66,11 @@ public:
virtual ~BibSplitWindow();
};
-
class BibTabPage : public TabPage, public BibShortCutHandler
{
public:
- BibTabPage( Window* pParent, const ResId& rResId );
- BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
- virtual ~BibTabPage();
+ BibTabPage( Window* pParent, const OString& rID, const OUString& rUIXMLDescription );
+ virtual ~BibTabPage();
};
#endif
diff --git a/include/svtools/wizardmachine.hxx b/include/svtools/wizardmachine.hxx
index 5d780a8..9618af1 100644
--- a/include/svtools/wizardmachine.hxx
+++ b/include/svtools/wizardmachine.hxx
@@ -98,7 +98,6 @@ namespace svt
if the OWizardPage is used in an OWizardMachine, this parameter
must be the OWizardMachine (which is derived from Window)
*/
- OWizardPage(Window* _pParent, const ResId& _rResId);
OWizardPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription);
virtual ~OWizardPage();
diff --git a/include/tools/rcid.h b/include/tools/rcid.h
index 47244ea..f1edf65 100644
--- a/include/tools/rcid.h
+++ b/include/tools/rcid.h
@@ -98,8 +98,6 @@
#define RSC_TOOLBOX (RSC_NOTYPE + 0x71)
#define RSC_DOCKINGWINDOW (RSC_NOTYPE + 0x72)
-#define RSC_TABPAGE (RSC_NOTYPE + 0x74)
-
#define RSC_STRINGARRAY (RSC_NOTYPE + 0x79)
// (RSC_NOTYPE + 0x200) - (RSC_NOTYPE + 0x300) reserved for Sfx
diff --git a/include/vcl/tabpage.hxx b/include/vcl/tabpage.hxx
index 88a1ead..86f9946 100644
--- a/include/vcl/tabpage.hxx
+++ b/include/vcl/tabpage.hxx
@@ -42,8 +42,6 @@ public:
explicit TabPage( Window* pParent, WinBits nStyle = 0 );
explicit TabPage( Window *pParent, const OString& rID, const OUString& rUIXMLDescription );
- explicit TabPage( Window* pParent, const ResId& rResId );
-
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/rsc/source/parser/rscinit.cxx b/rsc/source/parser/rscinit.cxx
index 70415bc..5859588 100644
--- a/rsc/source/parser/rscinit.cxx
+++ b/rsc/source/parser/rscinit.cxx
@@ -112,7 +112,6 @@ void RscTypCont::Init()
RscTop * pClassToolBoxItem;
RscTop * pClassToolBox;
RscTop * pClassFloatingWindow;
- RscTop * pClassTabPage;
RscTop * pClassFixedLine;
RscTop * pClassSfxStyleFamilyItem;
RscTop * pClassSfxTemplateDialog;
@@ -588,14 +587,6 @@ void RscTypCont::Init()
pRoot->Insert( pClassFloatingWindow );
// Klasse anlegen
- nId = pHS->getID( "TabPage" );
- pClassTabPage =
- new RscClass( nId, RSC_TABPAGE, pClassWindow );
- pClassTabPage->SetCallPar( *pWinPar1, *pWinPar2, *pWinParType );
- aNmTb.Put( nId, CLASSNAME, pClassTabPage );
- pRoot->Insert( pClassTabPage );
-
- // Klasse anlegen
nId = pHS->getID( "FixedLine" );
pClassFixedLine =
new RscClass( nId, RSC_FIXEDLINE, pClassControl );
diff --git a/svtools/source/dialogs/wizardmachine.cxx b/svtools/source/dialogs/wizardmachine.cxx
index 56bc3ee..88f6145 100644
--- a/svtools/source/dialogs/wizardmachine.cxx
+++ b/svtools/source/dialogs/wizardmachine.cxx
@@ -40,15 +40,6 @@ namespace svt
}
};
-
- //= OWizardPage
-
- OWizardPage::OWizardPage( Window* _pParent, const ResId& _rResId )
- :TabPage( _pParent, _rResId )
- ,m_pImpl( new WizardPageImplData )
- {
- }
-
OWizardPage::OWizardPage(Window *pParent, const OString& rID,
const OUString& rUIXMLDescription)
: TabPage(pParent, rID, rUIXMLDescription)
@@ -56,25 +47,21 @@ namespace svt
{
}
-
OWizardPage::~OWizardPage()
{
delete m_pImpl;
}
-
void OWizardPage::initializePage()
{
}
-
void OWizardPage::ActivatePage()
{
TabPage::ActivatePage();
updateDialogTravelUI();
}
-
void OWizardPage::updateDialogTravelUI()
{
OWizardMachine* pWizardMachine = dynamic_cast< OWizardMachine* >( GetParent() );
@@ -82,21 +69,16 @@ namespace svt
pWizardMachine->updateTravelUI();
}
-
bool OWizardPage::canAdvance() const
{
return true;
}
-
bool OWizardPage::commitPage( WizardTypes::CommitPageReason )
{
return true;
}
-
- //= WizardMachineImplData
-
struct WizardMachineImplData : public WizardTypes
{
OUString sTitleBase; // the base for the title
diff --git a/tools/source/rc/resmgr.cxx b/tools/source/rc/resmgr.cxx
index e31071a..13f8423 100644
--- a/tools/source/rc/resmgr.cxx
+++ b/tools/source/rc/resmgr.cxx
@@ -1462,7 +1462,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_WORKWIN: aHID.append( "WorkWindow" ); break;
case RSC_FLOATINGWINDOW: aHID.append( "FloatingWindow" ); break;
case RSC_MODALDIALOG: aHID.append( "ModalDialog" ); break;
- case RSC_TABPAGE: aHID.append( "TabPage" ); break;
default: return OString();
}
}
@@ -1475,7 +1474,6 @@ OString ResMgr::GetAutoHelpId()
case RSC_WORKWIN:
case RSC_FLOATINGWINDOW:
case RSC_MODALDIALOG:
- case RSC_TABPAGE:
// intentionally no breaks!
// auto help ids for controls
switch( pRC->pResource->GetRT() ) {
diff --git a/vcl/source/window/tabpage.cxx b/vcl/source/window/tabpage.cxx
index f69258e..b643831 100644
--- a/vcl/source/window/tabpage.cxx
+++ b/vcl/source/window/tabpage.cxx
@@ -75,18 +75,6 @@ TabPage::TabPage( Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle );
}
-TabPage::TabPage( Window* pParent, const ResId& rResId ) :
- Window( WINDOW_TABPAGE )
-{
- rResId.SetRT( RSC_TABPAGE );
- WinBits nStyle = ImplInitRes( rResId );
- ImplInit( pParent, nStyle );
- ImplLoadRes(rResId);
-
- if ( !(nStyle & WB_HIDE) )
- Show();
-}
-
TabPage::TabPage(Window *pParent, const OString& rID, const OUString& rUIXMLDescription)
: Window(WINDOW_TABPAGE)
{
commit cbd717a384e83b54cc7f3e6785504667dcede980
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Aug 20 14:09:12 2014 +0100
drop unused helpids
Change-Id: I30fa6b7a894adca8718669def290a931d816cef5
diff --git a/uui/source/ids.hrc b/uui/source/ids.hrc
index ce1fe5f..9ff94d8 100644
--- a/uui/source/ids.hrc
+++ b/uui/source/ids.hrc
@@ -150,10 +150,6 @@
#define ERRCODE_UUI_SSLWARN_INVALID_1 (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 1)
#define TITLE_UUI_SSLWARN_INVALID (ERRCODE_AREA_UUI_UNKNOWNAUTH + SSLWARN_TYPE_INVALID + 3)
-#define HID_DLG_FILTER_SELECT "UUI_HID_DLG_FILTER_SELECT"
-
-#define HID_DLG_SIMPLE_NAME_CLASH "UUI_HID_DLG_SIMPLE_NAME_CLASH"
-
#endif // UUI_IDS_HRC
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list