[Libreoffice-commits] core.git: sc/source
sc/source/ui/dataprovider/datatransformation.cxx | 13 +++--
1 file changed, 3 insertions(+), 10 deletions(-)
New commits:
commit 3522572e5a050ba15b88616c2b7aad88e7e1b53e
Author: DarkByt31
AuthorDate: Wed Mar 4 18:43:35 2020 +0530
Commit: Markus Mohrhard
CommitDate: Sat Mar 7 14:26:42 2020 +0100
ReplaceNullTransformation::Transform fix nEndRow
Change-Id: Ib041694e8de2113f11b3ef1b8553334e0d9e1c37
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89969
Reviewed-by: Markus Mohrhard
Tested-by: Jenkins
diff --git a/sc/source/ui/dataprovider/datatransformation.cxx
b/sc/source/ui/dataprovider/datatransformation.cxx
index 0d5cc107ef33..cce23e1c1505 100644
--- a/sc/source/ui/dataprovider/datatransformation.cxx
+++ b/sc/source/ui/dataprovider/datatransformation.cxx
@@ -32,11 +32,9 @@ DataTransformation::~DataTransformation()
SCROW DataTransformation::getLastRow(const ScDocument& rDoc, SCCOL nCol)
{
-SCROW nStartRow = 0;
SCROW nEndRow = MAXROW;
-rDoc.ShrinkToDataArea(0, nCol, nStartRow, nCol, nEndRow);
-return nEndRow;
+return rDoc.GetLastDataRow(0, nCol, nCol, nEndRow);
}
ColumnRemoveTransformation::ColumnRemoveTransformation(const std::set&
rColumns):
@@ -673,15 +671,10 @@ void ReplaceNullTransformation::Transform(ScDocument&
rDoc) const
if (mnCol.empty())
return;
-SCROW nEndRow = 0;
-for(auto& rCol : mnCol)
-{
-nEndRow = getLastRow(rDoc, rCol);
-}
-
for(auto& rCol : mnCol)
{
-for (SCROW nRow = 0; nRow < nEndRow; ++nRow)
+SCROW nEndRow = getLastRow(rDoc, rCol);
+for (SCROW nRow = 0; nRow <= nEndRow; ++nRow)
{
CellType eType;
rDoc.GetCellType(rCol, nRow, 0, eType);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: kit/ChildSession.cpp kit/Kit.cpp test/UnitPrefork.cpp
kit/ChildSession.cpp | 17 +++--
kit/Kit.cpp | 22 ++
test/UnitPrefork.cpp |7 ---
3 files changed, 29 insertions(+), 17 deletions(-)
New commits:
commit ef90709ad1cb6c8cbb649425d0f0c539bbd5f83f
Author: DarkByt31
AuthorDate: Sun Sep 15 07:34:06 2019 +0530
Commit: Michael Meeks
CommitDate: Sat Sep 28 12:51:18 2019 +0200
tdf#107038 Poco::Timestamp replacement with std::chrono
Change-Id: I55ba23fb104a90c882bc2af068b835e30877bc1e
Reviewed-on: https://gerrit.libreoffice.org/78925
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/kit/ChildSession.cpp b/kit/ChildSession.cpp
index b201e4d34..1f4ea15a5 100644
--- a/kit/ChildSession.cpp
+++ b/kit/ChildSession.cpp
@@ -46,7 +46,6 @@
using Poco::JSON::Object;
using Poco::JSON::Parser;
using Poco::StringTokenizer;
-using Poco::Timestamp;
using Poco::URI;
using namespace LOOLProtocol;
@@ -662,7 +661,7 @@ bool ChildSession::sendFontRendering(const char*
/*buffer*/, int /*length*/, con
output.resize(response.size());
std::memcpy(output.data(), response.data(), response.size());
-Timestamp timestamp;
+const auto start = std::chrono::system_clock::now();
// renderFont use a default font size (25) when width and height are 0
int width = 0, height = 0;
unsigned char* ptrFont = nullptr;
@@ -671,7 +670,9 @@ bool ChildSession::sendFontRendering(const char*
/*buffer*/, int /*length*/, con
ptrFont = getLOKitDocument()->renderFont(decodedFont.c_str(),
decodedChar.c_str(), , );
-LOG_TRC("renderFont [" << font << "] rendered in " <<
(timestamp.elapsed()/1000.) << "ms");
+const auto duration = std::chrono::system_clock::now() - start;
+const auto elapsed =
std::chrono::duration_cast(duration).count();
+LOG_TRC("renderFont [" << font << "] rendered in " << elapsed << "ms");
if (!ptrFont)
{
@@ -1457,14 +1458,18 @@ bool ChildSession::renderWindow(const char* /*buffer*/,
int /*length*/, const st
std::vector pixmap(pixmapDataSize);
int width = bufferWidth, height = bufferHeight;
std::string response;
-Timestamp timestamp;
+const auto start = std::chrono::system_clock::now();
getLOKitDocument()->paintWindow(winId, pixmap.data(), startX, startY,
width, height, dpiScale);
const double area = width * height;
+
+const auto duration = std::chrono::system_clock::now() - start;
+const auto elapsed =
std::chrono::duration_cast(duration).count();
+const double totalTime = elapsed/1000.;
LOG_TRC("paintWindow for " << winId << " returned " << width << "X" <<
height
<< "@(" << startX << "," << startY << ")"
<< " with dpi scale: " << dpiScale
-<< " and rendered in " << (timestamp.elapsed()/1000.)
-<< "ms (" << area / (timestamp.elapsed()) << " MP/s).");
+<< " and rendered in " << totalTime
+<< "ms (" << area / elapsed << " MP/s).");
response = "windowpaint: id=" + tokens[1] +
" width=" + std::to_string(width) + " height=" +
std::to_string(height);
diff --git a/kit/Kit.cpp b/kit/Kit.cpp
index b2a4a8b23..0dd75ff7b 100644
--- a/kit/Kit.cpp
+++ b/kit/Kit.cpp
@@ -97,7 +97,6 @@ using Poco::JSON::Object;
using Poco::JSON::Parser;
using Poco::StringTokenizer;
using Poco::Thread;
-using Poco::Timestamp;
using Poco::URI;
using Poco::Util::Application;
@@ -1119,17 +1118,19 @@ public:
// Render the whole area
const double area = pixmapWidth * pixmapHeight;
-Timestamp timestamp;
+auto start = std::chrono::system_clock::now();
LOG_TRC("Calling paintPartTile(" << (void*)pixmap.data() << ")");
_loKitDocument->paintPartTile(pixmap.data(),
tileCombined.getPart(),
pixmapWidth, pixmapHeight,
renderArea.getLeft(),
renderArea.getTop(),
renderArea.getWidth(),
renderArea.getHeight());
-Timestamp::TimeDiff elapsed = timestamp.elapsed();
+auto duration = std::chrono::system_clock::now() - start;
+auto elapsed =
std::chrono::duration_cast(duration).count();
+double totalTime = elapsed/1000.;
LOG_DBG("paintTile (combined) at (" << renderArea.getLeft() << ", " <<
renderArea.getTop() << "), (" <<
renderArea.getWidth() << ", " << renderArea.getHeight() << ")
" <<
-" rendered in " << (elapsed/1000.) << " ms (" << area /
elapsed << " MP/s).");
+" rendered in " << totalTime << " ms (" << area / elapsed << "
MP/s).");
const auto mode =
static_cast(_loKitDocument->getTileMode());
std::vector output;
@@ -1267,10 +1268,12 @@ public:
_pngCache.balanceCache();
-elapsed = timestamp.elapsed();
+duration = std::chrono::system_clock::now() - start;
+
[Libreoffice-commits] online.git: common/Util.cpp common/Util.hpp test/UnitWOPITemplate.cpp test/WhiteBoxTests.cpp test/WopiTestServer.hpp
common/Util.cpp | 10 ++
common/Util.hpp |3 +++
test/UnitWOPITemplate.cpp |6 +++---
test/WhiteBoxTests.cpp|6 ++
test/WopiTestServer.hpp | 20 +---
5 files changed, 31 insertions(+), 14 deletions(-)
New commits:
commit dd014e7029628dd95d2026bcb4fe4a66d75785aa
Author: DarkByt31
AuthorDate: Fri Sep 27 22:26:16 2019 +0530
Commit: Michael Meeks
CommitDate: Sat Sep 28 12:26:32 2019 +0200
tdf#107038 Poco::Timestamp replacement with std::chrono
Util added getHttpTime
WhiteBoxTests added test for getHttpTime
Change-Id: Ifb6a3fb2dc9b059b925e7b881362b72759a8b56b
Reviewed-on: https://gerrit.libreoffice.org/79754
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/common/Util.cpp b/common/Util.cpp
index 4433fe6d2..4fc35f370 100644
--- a/common/Util.cpp
+++ b/common/Util.cpp
@@ -784,6 +784,16 @@ namespace Util
return time_now;
}
+std::string getHttpTime(std::chrono::system_clock::time_point time)
+{
+char http_time[64];
+std::time_t time_c = std::chrono::system_clock::to_time_t(time);
+std::tm time_tm = *std::gmtime(_c);
+strftime(http_time, sizeof(http_time), "%a, %d %b %Y %T", _tm);
+
+return http_time;
+}
+
size_t findInVector(const std::vector& tokens, const char *cstring)
{
assert(cstring);
diff --git a/common/Util.hpp b/common/Util.hpp
index c1f799941..6c97eceb1 100644
--- a/common/Util.hpp
+++ b/common/Util.hpp
@@ -926,6 +926,9 @@ int main(int argc, char**argv)
Return current time in HTTP format.
std::string getHttpTimeNow();
+ Return time in HTTP format.
+std::string getHttpTime(std::chrono::system_clock::time_point time);
+
Return timestamp of file
std::chrono::system_clock::time_point getFileTimestamp(std::string
str_path);
diff --git a/test/UnitWOPITemplate.cpp b/test/UnitWOPITemplate.cpp
index 9416ea3cc..d133178ec 100644
--- a/test/UnitWOPITemplate.cpp
+++ b/test/UnitWOPITemplate.cpp
@@ -54,7 +54,7 @@ public:
fileInfo->set("UserFriendlyName", "test");
fileInfo->set("UserCanWrite", "true");
fileInfo->set("PostMessageOrigin", "localhost");
-fileInfo->set("LastModifiedTime",
Poco::DateTimeFormatter::format(Poco::DateTime(getFileLastModifiedTime()),
Poco::DateTimeFormat::ISO8601_FRAC_FORMAT));
+fileInfo->set("LastModifiedTime",
Util::getIso8601FracformatTime(getFileLastModifiedTime()));
fileInfo->set("EnableOwnerTermination", "true");
std::ostringstream jsonStream;
@@ -65,7 +65,7 @@ public:
std::ostringstream oss;
oss << "HTTP/1.1 200 OK\r\n"
-<< "Last-Modified: " <<
Poco::DateTimeFormatter::format(getFileLastModifiedTime(),
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "Last-Modified: " <<
Util::getHttpTime(getFileLastModifiedTime()) << "\r\n"
<< "User-Agent: " << WOPI_AGENT_STRING << "\r\n"
<< "Content-Length: " << responseString.size() << "\r\n"
<< "Content-Type: " << mimeType << "\r\n"
@@ -113,7 +113,7 @@ public:
oss << "HTTP/1.1 200 OK\r\n"
<< "User-Agent: " << WOPI_AGENT_STRING << "\r\n"
<< "\r\n"
-<< "{\"LastModifiedTime\": \"" <<
Poco::DateTimeFormatter::format(getFileLastModifiedTime(),
Poco::DateTimeFormat::ISO8601_FRAC_FORMAT) << "\" }";
+<< "{\"LastModifiedTime\": \"" <<
Util::getHttpTime(getFileLastModifiedTime()) << "\" }";
socket->send(oss.str());
socket->shutdown();
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index e3a6d52a8..6bb74f677 100644
--- a/test/WhiteBoxTests.cpp
+++ b/test/WhiteBoxTests.cpp
@@ -762,6 +762,12 @@ void WhiteBoxTests::testTime()
oss.str(std::string());
oss << t.time_since_epoch().count();
CPPUNIT_ASSERT_EQUAL(first, oss.str());
+
+t = std::chrono::system_clock::time_point();
+CPPUNIT_ASSERT_EQUAL(std::string("Thu, 01 Jan 1970 00:00:00"),
Util::getHttpTime(t));
+
+t =
std::chrono::system_clock::time_point(std::chrono::nanoseconds(1569592993495336798));
+CPPUNIT_ASSERT_EQUAL(std::string("Fri, 27 Sep 2019 14:03:13"),
Util::getHttpTime(t));
}
CPPUNIT_TEST_SUITE_REGISTRATION(WhiteBoxTests);
diff --git a/test/WopiTestServer.hpp b/test/WopiTestServer.hpp
index bdeecd96d..0845ba1a9 100644
--- a/test/WopiTestServer.hpp
+++ b/test/WopiTestServer.hpp
@@ -41,7 +41,7 @@ private:
std::string _fileContent;
/// Last modified time of the file
-Poco::Timestamp _fileLastModifiedTime;
+std::chrono::system_clock::time_point _fileLastModifiedTime;
protected:
const std::string& getWopiSrc() const { return _wopiSrc; }
@@ -54,10 +54,10 @@ protected:
void setFileContent(const std::string& fileContent)
{
_fileContent
[Libreoffice-commits] online.git: net/Socket.cpp tools/WebSocketDump.cpp wsd/LOOLWSD.cpp wsd/TraceFile.hpp
net/Socket.cpp |2 +-
tools/WebSocketDump.cpp |2 +-
wsd/LOOLWSD.cpp |4 ++--
wsd/TraceFile.hpp |6 --
4 files changed, 8 insertions(+), 6 deletions(-)
New commits:
commit 8aea22a32b28728033c4f06a79f93e63b1322151
Author: DarkByt31
AuthorDate: Fri Sep 6 15:26:30 2019 +0530
Commit: Michael Meeks
CommitDate: Fri Sep 6 13:25:41 2019 +0200
tdf#107038 Poco::Timestamp replacement with std::chrono
Replaced Poco::DateTimeFormatter with Util::getHttpTimeNow
Change-Id: I1a8591a434140270929406386218d08c71a888cc
Reviewed-on: https://gerrit.libreoffice.org/78700
Reviewed-by: Michael Meeks
Tested-by: Michael Meeks
diff --git a/net/Socket.cpp b/net/Socket.cpp
index cb5043414..f5661c3dd 100644
--- a/net/Socket.cpp
+++ b/net/Socket.cpp
@@ -415,7 +415,7 @@ void StreamSocket::dumpState(std::ostream& os)
void StreamSocket::send(Poco::Net::HTTPResponse& response)
{
response.set("User-Agent", HTTP_AGENT_STRING);
-response.set("Date", Poco::DateTimeFormatter::format(Poco::Timestamp(),
Poco::DateTimeFormat::HTTP_FORMAT));
+response.set("Date", Util::getHttpTimeNow());
std::ostringstream oss;
response.write(oss);
diff --git a/tools/WebSocketDump.cpp b/tools/WebSocketDump.cpp
index 39212b7e0..e7fe14800 100644
--- a/tools/WebSocketDump.cpp
+++ b/tools/WebSocketDump.cpp
@@ -161,7 +161,7 @@ private:
// Bad request.
std::ostringstream oss;
oss << "HTTP/1.1 400\r\n"
-<< "Date: " <<
Poco::DateTimeFormatter::format(Poco::Timestamp(),
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "Date: " << Util::getHttpTimeNow() << "\r\n"
<< "User-Agent: LOOLWSD WOPI Agent\r\n"
<< "Content-Length: 0\r\n"
<< "\r\n";
diff --git a/wsd/LOOLWSD.cpp b/wsd/LOOLWSD.cpp
index 5a1dbce41..f84a73238 100644
--- a/wsd/LOOLWSD.cpp
+++ b/wsd/LOOLWSD.cpp
@@ -2438,7 +2438,7 @@ private:
// Bad request.
std::ostringstream oss;
oss << "HTTP/1.1 400\r\n"
-<< "Date: " <<
Poco::DateTimeFormatter::format(Poco::Timestamp(),
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "Date: " << Util::getHttpTimeNow() << "\r\n"
<< "User-Agent: LOOLWSD WOPI Agent\r\n"
<< "Content-Length: 0\r\n"
<< "\r\n"
@@ -2740,7 +2740,7 @@ private:
LOG_ERR("Download file [" << filePathAnonym << "] not found.");
std::ostringstream oss;
oss << "HTTP/1.1 404 Not Found\r\n"
-<< "Date: " <<
Poco::DateTimeFormatter::format(Poco::Timestamp(),
Poco::DateTimeFormat::HTTP_FORMAT) << "\r\n"
+<< "Date: " << Util::getHttpTimeNow() << "\r\n"
<< "User-Agent: " << HTTP_AGENT_STRING << "\r\n"
<< "Content-Length: 0\r\n"
<< "\r\n";
diff --git a/wsd/TraceFile.hpp b/wsd/TraceFile.hpp
index 5f3ac7202..82f5a75ce 100644
--- a/wsd/TraceFile.hpp
+++ b/wsd/TraceFile.hpp
@@ -91,7 +91,8 @@ public:
const bool compress,
const bool takeSnapshot,
const std::vector& filters) :
-_epochStart(Poco::Timestamp().epochMicroseconds()),
+
_epochStart(std::chrono::duration_cast(std::chrono::system_clock::now()
+
.time_since_epoch()).count()),
_recordOutgoing(recordOugoing),
_compress(compress),
_takeSnapshot(takeSnapshot),
@@ -258,7 +259,8 @@ private:
{
Util::assertIsLocked(_mutex);
-const Poco::Int64 usec = Poco::Timestamp().epochMicroseconds() -
_epochStart;
+const Poco::Int64 usec =
std::chrono::duration_cast(std::chrono
+
::system_clock::now().time_since_epoch()).count() - _epochStart;
if (_compress)
{
_deflater.write(, 1);
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] online.git: test/WhiteBoxTests.cpp
test/WhiteBoxTests.cpp |4
1 file changed, 4 insertions(+)
New commits:
commit d24071e91bbfbc8ef3cd5eedc1d1179db6a5a1a0
Author: DarkByt31
AuthorDate: Wed Sep 4 22:04:36 2019 +0530
Commit: Michael Meeks
CommitDate: Wed Sep 4 22:09:50 2019 +0100
WhiteBoxTests: testTime corrections
Change-Id: Ia73a69396ba12921370fa12b57c249593c36e3d8
diff --git a/test/WhiteBoxTests.cpp b/test/WhiteBoxTests.cpp
index 35c6faf5b..e3a6d52a8 100644
--- a/test/WhiteBoxTests.cpp
+++ b/test/WhiteBoxTests.cpp
@@ -40,6 +40,7 @@ class WhiteBoxTests : public CPPUNIT_NS::TestFixture
CPPUNIT_TEST(testAuthorization);
CPPUNIT_TEST(testJson);
CPPUNIT_TEST(testAnonymization);
+CPPUNIT_TEST(testTime);
CPPUNIT_TEST_SUITE_END();
@@ -746,16 +747,19 @@ void WhiteBoxTests::testTime()
oss << t.time_since_epoch().count();
CPPUNIT_ASSERT_EQUAL(std::string("1567444337874777000"), oss.str());
+oss.str(std::string());
t = Util::iso8601ToTimestamp("1970-01-01T00:00:00.00Z",
"LastModifiedTime");
oss << t.time_since_epoch().count();
CPPUNIT_ASSERT_EQUAL(std::string("0"), oss.str());
+oss.str(std::string());
t = std::chrono::system_clock::now();
uint64_t t_in_micros = (t.time_since_epoch().count() / 1000) * 1000;
oss << t_in_micros;
std::string first = oss.str();
std::string s = Util::getIso8601FracformatTime(t);
t = Util::iso8601ToTimestamp(s, "LastModifiedTime");
+oss.str(std::string());
oss << t.time_since_epoch().count();
CPPUNIT_ASSERT_EQUAL(first, oss.str());
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] core.git: dbaccess/inc filter/source svx/uiconfig wizards/com wizards/source
dbaccess/inc/strings.hrc|2 +-
filter/source/svg/presentation_engine.js|6 +++---
svx/uiconfig/ui/docrecoverysavedialog.ui|2 +-
wizards/com/sun/star/wizards/common/strings.hrc |4 ++--
wizards/source/resources/resources_en_US.properties |2 +-
5 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 6673724ab346f09eb8d403064c56ddca44c89090
Author: DarkByt31
AuthorDate: Mon Apr 22 15:10:05 2019 +0530
Commit: Mike Kaganski
CommitDate: Wed Apr 24 10:30:37 2019 +0200
tdf#124197 Improve "Unexpected error" user-visible error message wording
Change-Id: I11c2ac4855a5fec2d26255ec3ab14ffe50e0fbbe
Reviewed-on: https://gerrit.libreoffice.org/71066
Tested-by: Jenkins
Reviewed-by: Mike Kaganski
diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index 1ee472919014..62d7f209c5fe 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -338,7 +338,7 @@
#define STR_RSC_CHARSETSNC_("STR_RSC_CHARSETS",
"System")
#define STR_ERROR_DURING_CREATION
NC_("STR_ERROR_DURING_CREATION", "Error during creation")
-#define STR_UNEXPECTED_ERROR
NC_("STR_UNEXPECTED_ERROR", "An unexpected error occurred. The operation could
not be performed.")
+#define STR_UNEXPECTED_ERROR
NC_("STR_UNEXPECTED_ERROR", "An error occurred. The operation could not be
performed.")
#define STR_COULDNOTOPEN_LINKEDDOC
NC_("STR_COULDNOTOPEN_LINKEDDOC", "The document \"$file$\" could not be
opened.")
#define STR_MISSING_TABLES_XDROP
NC_("STR_MISSING_TABLES_XDROP", "The table cannot be deleted because the
database connection does not support this.")
#define STR_BUTTON_TEXT_ALL NC_("STR_BUTTON_TEXT_ALL",
"~All")
diff --git a/filter/source/svg/presentation_engine.js
b/filter/source/svg/presentation_engine.js
index 186a278cfacd..87f4dc162b0e 100644
--- a/filter/source/svg/presentation_engine.js
+++ b/filter/source/svg/presentation_engine.js
@@ -6489,9 +6489,9 @@ function init()
}
}
-function presentationEngineStop()
+function presentationEngineStop(message)
{
-alert( 'We are sorry! An unexpected error occurred.\nThe presentation
engine will be stopped' );
+alert( message + '\nThe presentation engine will be stopped' );
document.onkeydown = null;
document.onkeypress = null;
document.onclick = null;
@@ -6502,7 +6502,7 @@ function assert( condition, message )
{
if (!condition)
{
-presentationEngineStop();
+presentationEngineStop( message );
if (typeof console == 'object')
// eslint-disable-next-line no-console
console.trace();
diff --git a/svx/uiconfig/ui/docrecoverysavedialog.ui
b/svx/uiconfig/ui/docrecoverysavedialog.ui
index 3025ac4ef406..6e19568a747d 100644
--- a/svx/uiconfig/ui/docrecoverysavedialog.ui
+++ b/svx/uiconfig/ui/docrecoverysavedialog.ui
@@ -73,7 +73,7 @@
True
False
-Due to an unexpected error, %PRODUCTNAME
crashed. All the files you were working on will now be saved. The next time
%PRODUCTNAME is launched, your files will be recovered automatically.
+Due to an error, %PRODUCTNAME crashed.
All the files you were working on will now be saved. The next time %PRODUCTNAME
is launched, your files will be recovered automatically.
True
70
70
diff --git a/wizards/com/sun/star/wizards/common/strings.hrc
b/wizards/com/sun/star/wizards/common/strings.hrc
index 9ae4c315c781..5949fae37ea1 100644
--- a/wizards/com/sun/star/wizards/common/strings.hrc
+++ b/wizards/com/sun/star/wizards/common/strings.hrc
@@ -261,7 +261,7 @@ RID_AGENDAWIZARDDIALOG_START_39 =
NC_("RID_AGENDAWIZARDDIALOG_START_39", "
RID_AGENDAWIZARDDIALOG_START_40 = NC_("RID_AGENDAWIZARDDIALOG_START_40",
"Page design:")
RID_AGENDAWIZARDDIALOG_START_41 = NC_("RID_AGENDAWIZARDDIALOG_START_41",
"myAgendaTemplate.stw")
RID_AGENDAWIZARDDIALOG_START_42 = NC_("RID_AGENDAWIZARDDIALOG_START_42",
"My Agenda Template")
-RID_AGENDAWIZARDDIALOG_START_43 = NC_("RID_AGENDAWIZARDDIALOG_START_43",
"An unexpected error occurred while saving the agenda template.")
+RID_AGENDAWIZARDDIALOG_START_43 = NC_("RID_AGENDAWIZARDDIALOG_START_43",
"An error occurred while saving the agenda template.")
RID_AGENDAWIZARDDIALOG_START_44 = NC_("RID_AGENDAWIZARDDIALOG_START_44",
"Name")
RID_AGENDAWIZARDDIALOG_START_45 = NC_("RID_AGENDAWIZARDDIALOG_START_45",
"Date")
RID_AGENDAWIZARDDIALOG_START_46 = NC_("RID_AGENDAWIZARDDIALOG_START_46",
"Time")
@@ -273,7 +273,7 @@ RID_AGENDAWIZARDDIALOG_START_52 =
NC_("RID_AGENDAWIZARDDIALOG_START_52", "
RID_AGENDAWIZARDDIALOG_START_53 =
