pengjunjie/core
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/core.git synced 2026-02-10 18:05:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
Elena.Subbotina
2023-12-18 12:48:40 +03:00
parent 75845fd471
commit 9d0f8ec414
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
DesktopEditor/common/Directory.cpp
View File

@ -515,17 +515,26 @@ namespace NSDirectory
}
std::wstring GetFolderPath(const std::wstring& wsFolderPath)
{
int n1 = (int)wsFolderPath.rfind('\\');
if (n1 < 0)
{
n1 = (int)wsFolderPath.rfind('/');
if (n1 < 0)
{
return L"";
}
return wsFolderPath.substr(0, n1);
}
return wsFolderPath.substr(0, n1);
#ifdef _WIN32
std::wstring::size_type nPos1 = wsFolderPath.rfind('\\');
#else
std::wstring::size_type nPos1 = std::wstring::npos;
#endif
std::wstring::size_type nPos2 = wsFolderPath.rfind('/');
std::wstring::size_type nPos = std::wstring::npos;
if (nPos1 != std::wstring::npos)
{
nPos = nPos1;
if (nPos2 != std::wstring::npos && nPos2 > nPos)
nPos = nPos2;
}
else
nPos = nPos2;
if (nPos == std::wstring::npos)
return wsFolderPath;
return wsFolderPath.substr(0, nPos);
}
std::wstring CreateTempFileWithUniqueName (const std::wstring & strFolderPathRoot, std::wstring Prefix)
{