Kaydet (Commit) f1097c86 authored tarafından Michael Stahl's avatar Michael Stahl

vcl: valgrind - initialize Dialog::mnInitFlag

The assignment in the 3rd ctor is actually executed after the use from
loadUI().

(regression from 39078c24)

Change-Id: I34b3d7fb9d6c4637d15c7865e6034f2c9d968b99
üst 83d8ccfb
...@@ -451,6 +451,7 @@ void Dialog::ImplInitSettings() ...@@ -451,6 +451,7 @@ void Dialog::ImplInitSettings()
Dialog::Dialog( WindowType nType ) Dialog::Dialog( WindowType nType )
: SystemWindow( nType ) : SystemWindow( nType )
, mnInitFlag(InitFlag::Default)
{ {
ImplInitDialogData(); ImplInitDialogData();
} }
...@@ -495,6 +496,7 @@ void Dialog::doDeferredInit(WinBits nBits) ...@@ -495,6 +496,7 @@ void Dialog::doDeferredInit(WinBits nBits)
Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription) Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription)
: SystemWindow(WINDOW_DIALOG) : SystemWindow(WINDOW_DIALOG)
, mnInitFlag(InitFlag::Default)
{ {
ImplInitDialogData(); ImplInitDialogData();
loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription); loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription);
...@@ -502,14 +504,15 @@ Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXML ...@@ -502,14 +504,15 @@ Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXML
Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag) Dialog::Dialog(vcl::Window* pParent, const OUString& rID, const OUString& rUIXMLDescription, WindowType nType, InitFlag eFlag)
: SystemWindow(nType) : SystemWindow(nType)
, mnInitFlag(eFlag)
{ {
ImplInitDialogData(); ImplInitDialogData();
loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription); loadUI(pParent, OUStringToOString(rID, RTL_TEXTENCODING_UTF8), rUIXMLDescription);
mnInitFlag = eFlag;
} }
Dialog::Dialog(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag) Dialog::Dialog(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag)
: SystemWindow(WINDOW_DIALOG) : SystemWindow(WINDOW_DIALOG)
, mnInitFlag(eFlag)
{ {
ImplInitDialogData(); ImplInitDialogData();
ImplInit( pParent, nStyle, eFlag ); ImplInit( pParent, nStyle, eFlag );
......
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