Kaydet (Commit) c1448b42 authored tarafından Caolán McNamara's avatar Caolán McNamara

no raw Window is loaded from .src anymore

Change-Id: I81e4bb23f4a819f59115cdf58afe19097b4ce68f
üst 141a7aa1
...@@ -45,7 +45,6 @@ private: ...@@ -45,7 +45,6 @@ private:
SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont); SVX_DLLPRIVATE static void SetFontLang(const SfxItemSet& rSet, sal_uInt16 nSlot, SvxFont& rFont);
public: public:
SvxFontPrevWindow(vcl::Window* pParent, const ResId& rId);
SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle); SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle);
virtual ~SvxFontPrevWindow() override; virtual ~SvxFontPrevWindow() override;
virtual void dispose() override; virtual void dispose() override;
......
...@@ -790,7 +790,6 @@ public: ...@@ -790,7 +790,6 @@ public:
// Single argument ctors shall be explicit. // Single argument ctors shall be explicit.
explicit Window( vcl::Window* pParent, WinBits nStyle = 0 ); explicit Window( vcl::Window* pParent, WinBits nStyle = 0 );
Window( vcl::Window* pParent, const ResId& rResId );
virtual ~Window() override; virtual ~Window() override;
::OutputDevice const* GetOutDev() const; ::OutputDevice const* GetOutDev() const;
......
...@@ -503,14 +503,6 @@ void SvxFontPrevWindow::Init() ...@@ -503,14 +503,6 @@ void SvxFontPrevWindow::Init()
SetBorderStyle(WindowBorderStyle::MONO); SetBorderStyle(WindowBorderStyle::MONO);
} }
SvxFontPrevWindow::SvxFontPrevWindow(vcl::Window* pParent, const ResId& rId)
: Window(pParent, rId)
, mbResetForeground(true)
, mbResetBackground(true)
{
Init();
}
SvxFontPrevWindow::SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle) SvxFontPrevWindow::SvxFontPrevWindow(vcl::Window* pParent, WinBits nStyle)
: Window(pParent, nStyle) : Window(pParent, nStyle)
, mbResetForeground(true) , mbResetForeground(true)
......
...@@ -98,18 +98,6 @@ Window::Window( vcl::Window* pParent, WinBits nStyle ) : ...@@ -98,18 +98,6 @@ Window::Window( vcl::Window* pParent, WinBits nStyle ) :
ImplInit( pParent, nStyle, nullptr ); ImplInit( pParent, nStyle, nullptr );
} }
Window::Window( vcl::Window* pParent, const ResId& rResId ) :
Window(WINDOW_WINDOW)
{
rResId.SetRT( RSC_WINDOW );
WinBits nStyle = ImplInitRes( rResId );
ImplInit( pParent, nStyle, nullptr );
ImplLoadRes();
if ( !(nStyle & WB_HIDE) )
Show();
}
#if OSL_DEBUG_LEVEL > 0 #if OSL_DEBUG_LEVEL > 0
namespace namespace
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment