* @sa CMergeDoc::OpenDocs()
* @sa CMergeDoc::TrySaveAs()
*/
-bool CMainFrame::DoFileNew(UINT nID, int nPanes, const String strDesc[],
+bool CMainFrame::DoFileNew(UINT nID, int nPanes,
+ const fileopenflags_t dwFlags[], const String strDesc[],
const PrediffingInfo *infoPrediffer /*= nullptr*/,
const OpenFileParams *pOpenParams)
{
// Load emptyfile descriptors and open empty docs
// Use default codepage
- fileopenflags_t dwFlags[3] = {0, 0, 0};
FileLocation fileloc[3];
String strDesc2[3];
if (nPanes == 2)
const String& sReportFile = _T(""),
const PackingInfo* infoUnpacker = nullptr, const PrediffingInfo * infoPrediffer = nullptr,
const OpenFileParams *pOpenParams = nullptr);
- bool DoFileNew(UINT nID, int nPanes, const String strDesc[] = nullptr,
+ bool DoFileNew(UINT nID, int nPanes,
+ const fileopenflags_t dwFlags[] = nullptr, const String strDesc[] = nullptr,
const PrediffingInfo * infoPrediffer = nullptr,
const OpenFileParams *pOpenParams = nullptr);
bool DoOpenConflict(const String& conflictFile, const String strDesc[] = nullptr, bool checked = false);
{
if (cmdInfo.m_bNewCompare)
{
- bCompared = pMainFrame->DoFileNew(nID, 2, strDesc, infoPrediffer.get(), pOpenParams.get());
+ fileopenflags_t dwFlags[3] = {cmdInfo.m_dwLeftFlags, cmdInfo.m_dwRightFlags, FFILEOPEN_NONE};
+ bCompared = pMainFrame->DoFileNew(nID, 2, dwFlags, strDesc, infoPrediffer.get(), pOpenParams.get());
}
else if (cmdInfo.m_bClipboardCompare)
{