From cd43959e10a7d3120b3b5059b44ad6b62c54bd3e Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Mon, 21 Nov 2016 22:06:30 +0100 Subject: Postfix rather than prefix locale to directory name as this is what vnd.libreoffice.image:// expects for localized images Change-Id: I454ff86b86e11248f47ab65f682fb57e52d0f7e5 Reviewed-on: https://gerrit.libreoffice.org/31057 Reviewed-by: Katarina Behrens Tested-by: Katarina Behrens --- test/source/screenshot_test.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/source/screenshot_test.cxx b/test/source/screenshot_test.cxx index dcd0befda337..28788d0548a9 100644 --- a/test/source/screenshot_test.cxx +++ b/test/source/screenshot_test.cxx @@ -68,7 +68,8 @@ void ScreenshotTest::implSaveScreenshot(const Bitmap& rScreenshot, const OString { OUString aDirname, aBasename; splitHelpId(rScreenshotId, aDirname, aBasename); - aDirname = m_aScreenshotDirectory + maCurrentLanguage + "/" + aDirname; + aDirname = m_aScreenshotDirectory + "/" + aDirname + + ( (maCurrentLanguage == "en-US") ? OUString() : "/" + maCurrentLanguage ); osl::FileBase::RC err = osl::Directory::createPath(m_directories.getURLFromWorkdir(OUStringToOString(aDirname,RTL_TEXTENCODING_UTF8).getStr())); CPPUNIT_ASSERT_MESSAGE(OUStringToOString("Failed to create " + aDirname, RTL_TEXTENCODING_UTF8).getStr(), -- cgit