Kaydet (Commit) b409edf2 authored tarafından Matteo Casalin's avatar Matteo Casalin

Reduce OUString operations

Change-Id: I92f3af3cf9b0b5d7bc7b903403b1b93e0b432366
Reviewed-on: https://gerrit.libreoffice.org/66218
Tested-by: Jenkins
Reviewed-by: 's avatarMatteo Casalin <matteo.casalin@yahoo.com>
üst 29b322eb
...@@ -902,19 +902,17 @@ void OQueryController::onLoadedMenu(const Reference< css::frame::XLayoutManager ...@@ -902,19 +902,17 @@ void OQueryController::onLoadedMenu(const Reference< css::frame::XLayoutManager
OUString OQueryController::getPrivateTitle( ) const OUString OQueryController::getPrivateTitle( ) const
{ {
OUString sName = m_sName; if ( m_sName.isEmpty() )
if ( sName.isEmpty() )
{ {
if ( !editingCommand() ) if ( !editingCommand() )
{ {
SolarMutexGuard aSolarGuard; SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() ); ::osl::MutexGuard aGuard( getMutex() );
OUString aDefaultName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE); OUString aDefaultName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE);
sName = aDefaultName.getToken(0,' '); return aDefaultName.getToken(0, ' ') + OUString::number(getCurrentStartNumber());
sName += OUString::number(getCurrentStartNumber());
} }
} }
return sName; return m_sName;
} }
void OQueryController::setQueryComposer() void OQueryController::setQueryComposer()
...@@ -1205,8 +1203,7 @@ bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElements, b ...@@ -1205,8 +1203,7 @@ bool OQueryController::askForNewName(const Reference<XNameAccess>& _xElements, b
else else
{ {
OUString sName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE); OUString sName = DBA_RES(editingView() ? STR_VIEW_TITLE : STR_QRY_TITLE);
aDefaultName = sName.getToken(0,' '); aDefaultName = ::dbtools::createUniqueName(_xElements, sName.getToken(0, ' '));
aDefaultName = ::dbtools::createUniqueName(_xElements,aDefaultName);
} }
DynamicTableOrQueryNameCheck aNameChecker( getConnection(), CommandType::QUERY ); DynamicTableOrQueryNameCheck aNameChecker( getConnection(), CommandType::QUERY );
......
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