[Libreoffice-commits] core.git: basctl/source connectivity/source cui/source dbaccess/source extensions/source filter/source forms/source framework/source include/filter sc/inc sc/source sd/source sfx

2021-10-14 Thread Noel Grandin (via logerrit) 
 basctl/source/basicide/basobj2.cxx |   14 +++--
 connectivity/source/drivers/file/FStatement.cxx|5 
 cui/source/customize/SvxNotebookbarConfigPage.cxx  |9 +---
 cui/source/dialogs/cuigaldlg.cxx   |7 --
 dbaccess/source/core/api/TableDeco.cxx |7 +-
 extensions/source/propctrlr/formcomponenthandler.cxx   |6 +
 filter/source/msfilter/escherex.cxx|9 +---
 forms/source/component/ComboBox.cxx|3 --
 forms/source/xforms/binding.cxx|3 --
 framework/source/accelerators/acceleratorconfiguration.cxx |8 +--
 include/filter/msfilter/escherex.hxx   |2 -
 sc/inc/rangelst.hxx|2 +
 sc/source/core/data/column3.cxx|   10 ++---
 sc/source/core/data/documen5.cxx   |4 ---
 sc/source/core/data/dpdimsave.cxx  |4 ---
 sc/source/filter/oox/sheetdatabuffer.cxx   |3 --
 sc/source/ui/unoobj/cellsuno.cxx   |3 --
 sc/source/ui/view/drawvie4.cxx |3 --
 sd/source/filter/pdf/sdpdffilter.cxx   |   10 +
 sfx2/source/dialog/filedlghelper.cxx   |   10 -
 slideshow/source/engine/slide/slideimpl.cxx|3 --
 starmath/source/utility.cxx|3 --
 svx/source/dialog/imapdlg.cxx  |   10 ++---
 svx/source/dialog/imapwnd.cxx  |5 
 sw/source/core/docnode/ndtbl1.cxx  |3 --
 sw/source/filter/ww8/rtfstringbuffer.cxx   |3 --
 tools/source/memtools/multisel.cxx |6 +
 ucb/source/ucp/file/filtask.cxx|4 +--
 vcl/unx/generic/fontmanager/fontmanager.cxx|5 
 xmloff/source/text/txtparae.cxx|6 +
 30 files changed, 51 insertions(+), 119 deletions(-)

New commits:
commit 1f9468fc29874eae5100317282ab8b395904406d
Author: Noel Grandin 
AuthorDate: Thu Oct 14 14:57:54 2021 +0200
Commit: Noel Grandin 
CommitDate: Thu Oct 14 21:28:40 2021 +0200

use std::vector::insert instead of push_back

because it will pre-allocate space and often is optimised to memcpy

Change-Id: I03ed7915f2762d3d27e378638052a47a28bbf096
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123588
Tested-by: Jenkins
Reviewed-by: Noel Grandin 

diff --git a/basctl/source/basicide/basobj2.cxx 
b/basctl/source/basicide/basobj2.cxx
index 9748b24ccd2f..f14535cbd3f1 100644
--- a/basctl/source/basicide/basobj2.cxx
+++ b/basctl/source/basicide/basobj2.cxx
@@ -100,21 +100,15 @@ Sequence< OUString > GetMergedLibraryNames( const 
Reference< script::XLibraryCon
 std::vector aLibList;
 if ( xModLibContainer.is() )
 {
-Sequence< OUString > aModLibNames = 
xModLibContainer->getElementNames();
-sal_Int32 nModLibCount = aModLibNames.getLength();
-const OUString* pModLibNames = aModLibNames.getConstArray();
-for ( sal_Int32 i = 0 ; i < nModLibCount ; i++ )
-aLibList.push_back( pModLibNames[ i ] );
+const Sequence< OUString > aModLibNames = 
xModLibContainer->getElementNames();
+aLibList.insert( aLibList.end(), aModLibNames.begin(), 
aModLibNames.end() );
 }
 
 // create a list of dialog library names
 if ( xDlgLibContainer.is() )
 {
-Sequence< OUString > aDlgLibNames = 
xDlgLibContainer->getElementNames();
-sal_Int32 nDlgLibCount = aDlgLibNames.getLength();
-const OUString* pDlgLibNames = aDlgLibNames.getConstArray();
-for ( sal_Int32 i = 0 ; i < nDlgLibCount ; i++ )
-aLibList.push_back( pDlgLibNames[ i ] );
+const Sequence< OUString > aDlgLibNames = 
xDlgLibContainer->getElementNames();
+aLibList.insert( aLibList.end(), aDlgLibNames.begin(), 
aDlgLibNames.end() );
 }
 
 // sort list
diff --git a/connectivity/source/drivers/file/FStatement.cxx 
b/connectivity/source/drivers/file/FStatement.cxx
index 1fde6881de12..e0ea8bc59aef 100644
--- a/connectivity/source/drivers/file/FStatement.cxx
+++ b/connectivity/source/drivers/file/FStatement.cxx
@@ -499,10 +499,7 @@ void OStatement_Base::GetAssignValues()
 if (pOptColumnCommalist->count() == 0)
 {
 const Sequence< OUString>& aNames = m_xColNames->getElementNames();
-const OUString* pBegin = aNames.getConstArray();
-const OUString* pEnd = pBegin + aNames.getLength();
-for (; pBegin != pEnd; ++pBegin)
-aColumnNameList.push_back(*pBegin);
+aColumnNameList.insert(aColumnNameList.end(),

[Libreoffice-commits] core.git: basctl/source connectivity/source cui/source dbaccess/source drawinglayer/source editeng/source extensions/source forms/source fpicker/source reportdesign/source sfx2/s

2019-12-26 Thread Noel Grandin (via logerrit) 
 basctl/source/accessibility/accessibledialogcontrolshape.cxx |3 
 connectivity/source/commontools/conncleanup.cxx  |   13 ++--
 connectivity/source/commontools/dbtools.cxx  |2 
 connectivity/source/commontools/dbtools2.cxx |2 
 connectivity/source/commontools/predicateinput.cxx   |5 -
 connectivity/source/drivers/hsqldb/HDriver.cxx   |6 -
 connectivity/source/sdbcx/VIndex.cxx |3 
 cui/source/options/optpath.cxx   |2 
 dbaccess/source/core/api/query.cxx   |2 
 dbaccess/source/core/dataaccess/definitioncontainer.cxx  |4 -
 dbaccess/source/core/dataaccess/documentdefinition.cxx   |8 +-
 dbaccess/source/core/misc/ContainerMediator.cxx  |2 
 dbaccess/source/ui/dlg/DbAdminImpl.cxx   |2 
 drawinglayer/source/processor2d/vclmetafileprocessor2d.cxx   |5 -
 editeng/source/misc/hangulhanja.cxx  |7 +-
 extensions/source/abpilot/datasourcehandling.cxx |2 
 extensions/source/bibliography/formcontrolcontainer.cxx  |3 
 extensions/source/bibliography/framectr.cxx  |3 
 extensions/source/dbpilots/commonpagesdbp.cxx|5 -
 extensions/source/dbpilots/controlwizard.cxx |   15 ++--
 extensions/source/propctrlr/cellbindinghandler.cxx   |5 -
 extensions/source/propctrlr/cellbindinghelper.cxx|   10 +--
 extensions/source/propctrlr/editpropertyhandler.cxx  |5 -
 extensions/source/propctrlr/eformshelper.cxx |   34 +--
 extensions/source/propctrlr/eformspropertyhandler.cxx|6 -
 extensions/source/propctrlr/fontdialog.cxx   |2 
 extensions/source/propctrlr/formcomponenthandler.cxx |   27 ++--
 extensions/source/propctrlr/formlinkdialog.cxx   |   13 ++--
 extensions/source/propctrlr/genericpropertyhandler.cxx   |9 +-
 extensions/source/propctrlr/handlerhelper.cxx|2 
 extensions/source/propctrlr/listselectiondlg.cxx |5 -
 extensions/source/propctrlr/propcontroller.cxx   |6 -
 extensions/source/propctrlr/pushbuttonnavigation.cxx |   14 ++--
 extensions/source/propctrlr/submissionhandler.cxx|7 +-
 extensions/source/propctrlr/taborder.cxx |5 -
 extensions/source/propctrlr/unourl.cxx   |3 
 extensions/source/propctrlr/xsddatatypes.cxx |   13 ++--
 extensions/source/propctrlr/xsdvalidationhelper.cxx  |   16 ++---
 extensions/source/update/check/updatehdl.cxx |3 
 forms/source/component/Date.cxx  |3 
 forms/source/component/FormComponent.cxx |   18 +
 forms/source/component/refvaluecomponent.cxx |2 
 forms/source/richtext/featuredispatcher.cxx  |3 
 forms/source/richtext/richtextmodel.cxx  |3 
 forms/source/runtime/formoperations.cxx  |6 -
 fpicker/source/office/iodlg.cxx  |5 -
 reportdesign/source/core/api/ReportDefinition.cxx|2 
 reportdesign/source/core/sdr/UndoActions.cxx |6 -
 reportdesign/source/ui/inspection/GeometryHandler.cxx|4 -
 reportdesign/source/ui/misc/RptUndo.cxx  |5 -
 reportdesign/source/ui/misc/UITools.cxx  |2 
 sfx2/source/control/thumbnailviewacc.cxx |3 
 sfx2/source/dialog/filedlghelper.cxx |8 +-
 sfx2/source/doc/objstor.cxx  |2 
 svtools/source/brwbox/brwimpl.hxx|3 
 svtools/source/control/valueacc.cxx  |3 
 svtools/source/misc/imageresourceaccess.cxx  |3 
 svtools/source/misc/templatefoldercache.cxx  |3 
 svx/source/accessibility/AccessibleControlShape.cxx  |5 -
 svx/source/dialog/weldeditview.cxx   |3 
 svx/source/fmcomp/fmgridcl.cxx   |4 -
 svx/source/fmcomp/gridcell.cxx   |9 --
 svx/source/form/fmcontrolbordermanager.cxx   |7 +-
 svx/source/form/fmcontrollayout.cxx  |2 
 svx/source/form/fmdocumentclassification.cxx |2 
 svx/source/form/fmobjfac.cxx |3 
 svx/source/form/fmpgeimp.cxx |2 
 svx/source/form/fmshimp.cxx  |2 
 svx/source/form/fmtextcontrolfeature.cxx |7 +-
 svx/source/form/fmtools.cxx  |3

[Libreoffice-commits] core.git: basctl/source connectivity/source

2017-11-13 Thread Johnny_M 
 basctl/source/basicide/baside2b.cxx  |2 +-
 connectivity/source/drivers/dbase/DTable.cxx |4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 97b5b99d715733dde6c0e8ed59b3f16236a7fff1
Author: Johnny_M 
Date:   Sat Nov 11 15:10:18 2017 +0100

Translate German debug strings

Change-Id: If4da1df3f7889d2b579fcde4fec5ac3c82026555
Reviewed-on: https://gerrit.libreoffice.org/44627
Tested-by: Jenkins 
Reviewed-by: Jens Carl 

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 34b3c62126af..a48c70a43446 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1015,7 +1015,7 @@ void EditorWindow::CreateEditEngine()
 pBindings->Invalidate(SID_BASICIDE_STAT_TITLE);
 }
 
-DBG_ASSERT(rModulWindow.GetBreakPointWindow().GetCurYOffset() == 0, 
"CreateEditEngine: Brechpunkte verschoben?");
+DBG_ASSERT(rModulWindow.GetBreakPointWindow().GetCurYOffset() == 0, 
"CreateEditEngine: breakpoints moved?");
 
 // set readonly mode for readonly libraries
 ScriptDocument aDocument(rModulWindow.GetDocument());
diff --git a/connectivity/source/drivers/dbase/DTable.cxx 
b/connectivity/source/drivers/dbase/DTable.cxx
index 10372b44a13c..116c47b56d60 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2586,7 +2586,7 @@ bool ODbaseTable::seekRow(IResultSetHelper::Movement 
eCursorPosition, sal_Int32
 {
 std::size_t nEntryLen = m_aHeader.recordLength;
 
-OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige 
Record-Position");
+OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: invalid record 
position");
 std::size_t nPos = m_aHeader.headerLength + 
(std::size_t)(m_nFilePos-1) * nEntryLen;
 
 m_pFileStream->Seek(nPos);
@@ -2728,7 +2728,7 @@ bool ODbaseTable::AllocBuffer()
 
 bool ODbaseTable::WriteBuffer()
 {
-OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: ungueltige 
Record-Position");
+OSL_ENSURE(m_nFilePos >= 1,"SdbDBFCursor::FileFetchRow: invalid record 
position");
 
 // position on desired record:
 std::size_t nPos = m_aHeader.headerLength + (long)(m_nFilePos-1) * 
m_aHeader.recordLength;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: basctl/source connectivity/source dbaccess/source forms/source include/rtl oox/source sal/qa sc/source sw/source

2017-01-05 Thread Stephan Bergmann 
 basctl/source/basicide/baside2b.cxx   |4 ++--
 connectivity/source/commontools/filtermanager.cxx |4 ++--
 dbaccess/source/core/inc/composertools.hxx|2 +-
 forms/source/xforms/model_ui.cxx  |2 +-
 include/rtl/strbuf.hxx|2 +-
 include/rtl/ustrbuf.hxx   |2 +-
 oox/source/export/vmlexport.cxx   |2 +-
 sal/qa/OStringBuffer/rtl_OStringBuffer.cxx|2 +-
 sc/source/filter/html/htmlpars.cxx|2 +-
 sw/source/filter/ww8/rtfsdrexport.cxx |2 +-
 10 files changed, 12 insertions(+), 12 deletions(-)

New commits:
commit c03d803a723e3325b210346126115457e914f605
Author: Stephan Bergmann 
Date:   Thu Jan 5 13:52:17 2017 +0100

Replace side-effect--only uses of makeStringAndClear() with setLength(0)

Change-Id: Iaf8011f1bd6a10b324653899b7f51458f7d0b68a

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index a8c6d9f..0468e12 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -2736,7 +2736,7 @@ void CodeCompleteListBox::KeyInput( const KeyEvent& 
rKeyEvt )
 
 if( !aTabInsertedStr.isEmpty() && aTabInsertedStr != 
aFuncBuffer.toString() )
 {
-aFuncBuffer.makeStringAndClear();
+aFuncBuffer.setLength(0);
 aFuncBuffer = aFuncBuffer.append(aTabInsertedStr);
 }
 aFuncBuffer = 
aFuncBuffer.remove(aFuncBuffer.getLength()-1, 1);
@@ -2799,7 +2799,7 @@ void CodeCompleteWindow::InsertEntry( const OUString& 
aStr )
 void CodeCompleteWindow::ClearListBox()
 {
 pListBox->Clear();
-pListBox->aFuncBuffer.makeStringAndClear();
+pListBox->aFuncBuffer.setLength(0);
 }
 
 void CodeCompleteWindow::SetTextSelection( const TextSelection& aSel )
diff --git a/connectivity/source/commontools/filtermanager.cxx 
b/connectivity/source/commontools/filtermanager.cxx
index 6296e2c..63fe39c 100644
--- a/connectivity/source/commontools/filtermanager.cxx
+++ b/connectivity/source/commontools/filtermanager.cxx
@@ -130,13 +130,13 @@ namespace dbtools
 else if (!m_aLinkFilterComponent.isEmpty())
 o_singleComponent = m_aLinkFilterComponent;
 else
-o_singleComponent.makeStringAndClear();
+o_singleComponent.setLength(0);
 return true;
 }
 else
 {
 if (m_aLinkFilterComponent.isEmpty())
-o_singleComponent.makeStringAndClear();
+o_singleComponent.setLength(0);
 else
 o_singleComponent = m_aLinkFilterComponent;
 return true;
diff --git a/dbaccess/source/core/inc/composertools.hxx 
b/dbaccess/source/core/inc/composertools.hxx
index 9b1a4de..b118783 100644
--- a/dbaccess/source/core/inc/composertools.hxx
+++ b/dbaccess/source/core/inc/composertools.hxx
@@ -53,7 +53,7 @@ namespace dbaccess
 #ifdef DBG_UTIL
 m_bUsed = false;
 #endif
-m_aBuffer.makeStringAndClear();
+m_aBuffer.setLength(0);
 }
 
 public:
diff --git a/forms/source/xforms/model_ui.cxx b/forms/source/xforms/model_ui.cxx
index f8f5784c..5b75be5 100644
--- a/forms/source/xforms/model_ui.cxx
+++ b/forms/source/xforms/model_ui.cxx
@@ -242,7 +242,7 @@ OUString Model::getDefaultBindingExpressionForNode(
 // unknown type? fail!
 OSL_FAIL( "unknown node type!" );
 xCurrent.set( nullptr );
-aBuffer.makeStringAndClear();
+aBuffer.setLength(0);
 // we'll remove the slash below
 aBuffer.insert( 0, '/' );
 break;
diff --git a/include/rtl/strbuf.hxx b/include/rtl/strbuf.hxx
index 90bf41b..8c9148b 100644
--- a/include/rtl/strbuf.hxx
+++ b/include/rtl/strbuf.hxx
@@ -301,7 +301,7 @@ public:
 
 @return the string previously contained in the buffer.
  */
-OString makeStringAndClear()
+SAL_WARN_UNUSED_RESULT OString makeStringAndClear()
 {
 OString aRet( pData );
 rtl_string_new();
diff --git a/include/rtl/ustrbuf.hxx b/include/rtl/ustrbuf.hxx
index 7a9448d..4665d20 100644
--- a/include/rtl/ustrbuf.hxx
+++ b/include/rtl/ustrbuf.hxx
@@ -336,7 +336,7 @@ public:
 
 @return the string previously contained in the buffer.
  */
-OUString makeStringAndClear()
+SAL_WARN_UNUSED_RESULT OUString makeStringAndClear()
 {
 return OUString(
   rtl_uStringBuffer_makeStringAndClear( ,  ),
diff --git a/oox/source/export/vmlexport.cxx b/oox/source/export/vmlexport.cxx
index 11035f2..c284b55 100644
--- a/oox/source/export/vmlexport.cxx
+++ b/oox/source/export/vmlexport.cxx
@@ -101,7 +101,7 @@ void VMLExport::OpenContainer( sal_uInt16 nEscherContainer, 
int

[Libreoffice-commits] core.git: basctl/source connectivity/source cppuhelper/source cui/source dbaccess/source desktop/source editeng/source idlc/source l10ntools/source sc/source sd/source sfx2/sourc

2013-10-23 Thread Noel Grandin 
 basctl/source/basicide/baside2b.cxx   |2 -
 connectivity/source/commontools/dbtools2.cxx  |2 -
 cppuhelper/source/bootstrap.cxx   |2 -
 cppuhelper/source/paths.cxx   |4 --
 cui/source/dialogs/SpellDialog.cxx|4 +-
 dbaccess/source/ui/querydesign/SelectionBrowseBox.cxx |2 -
 desktop/source/deployment/manager/dp_manager.cxx  |2 -
 desktop/source/deployment/registry/dp_backend.cxx |2 -
 editeng/source/outliner/outliner.cxx  |2 -
 idlc/source/idlcmain.cxx  |4 +-
 l10ntools/source/export.cxx   |2 -
 l10ntools/source/lngmerge.cxx |   10 +-
 sc/source/core/data/dputil.cxx|6 ---
 sc/source/core/tool/interpr1.cxx  |4 +-
 sc/source/ui/app/inputhdl.cxx |7 +---
 sc/source/ui/docshell/docfunc.cxx |2 -
 sc/source/ui/docshell/docsh.cxx   |2 -
 sc/source/ui/docshell/impex.cxx   |5 +--
 sd/source/filter/html/htmlex.cxx  |4 +-
 sfx2/source/appl/shutdownicon.cxx |2 -
 starmath/source/node.cxx  |4 +-
 svl/qa/unit/test_URIHelper.cxx|2 -
 svl/source/passwordcontainer/passwordcontainer.cxx|8 ++--
 svl/source/passwordcontainer/syscreds.cxx |4 +-
 svtools/source/control/inettbc.cxx|   22 ++---
 svtools/source/svhtml/htmlsupp.cxx|6 +--
 svtools/source/svhtml/parhtml.cxx |   11 ++
 svx/source/form/formcontroller.cxx|4 +-
 svx/source/sidebar/nbdtmg.cxx |4 +-
 svx/source/tbxctrls/fillctrl.cxx  |   30 +-
 svx/source/tbxctrls/itemwin.cxx   |   10 +++---
 sw/source/filter/html/htmlfldw.cxx|9 ++---
 sw/source/filter/ww8/ww8par5.cxx  |6 +--
 sw/source/ui/dbui/createaddresslistdialog.cxx |5 +--
 sw/source/ui/dbui/mmaddressblockpage.cxx  |2 -
 sw/source/ui/lingu/olmenu.cxx |4 +-
 ucb/source/ucp/cmis/cmis_content.cxx  |4 +-
 ucb/source/ucp/file/filglob.cxx   |6 +--
 ucb/source/ucp/ftp/ftpurl.cxx |2 -
 unotools/source/config/bootstrap.cxx  |4 +-
 unotools/source/ucbhelper/tempfile.cxx|   13 +++
 vcl/generic/fontmanager/helper.cxx|2 -
 vcl/source/control/field.cxx  |2 -
 vcl/source/filter/FilterConfigItem.cxx|2 -
 vcl/source/filter/sgvtext.cxx |2 -
 writerfilter/source/dmapper/DomainMapper_Impl.cxx |2 -
 xmloff/source/text/txtfldi.cxx|4 +-
 47 files changed, 111 insertions(+), 133 deletions(-)

New commits:
commit 7a06928bcf638e1eeedebc9d53c306a1b852cc9b
Author: Noel Grandin n...@peralex.com
Date:   Mon Oct 21 10:21:01 2013 +0200

convert code to use OUString::endsWith

Convert places that call
   aStr[aStr.getLength()-1] == 'x'
to use the shorter form
   aStr.endsWith(x)

Change-Id: I1b3a19c0e89b8989cdbeed440f95fc76f9a4b6b6

diff --git a/basctl/source/basicide/baside2b.cxx 
b/basctl/source/basicide/baside2b.cxx
index 5e23916..485d696 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -727,7 +727,7 @@ void EditorWindow::HandleAutoCloseDoubleQuotes()
 if( aPortions.empty() )
 return;
 
-if( aLine.getLength()  0  aLine[aLine.getLength()-1] != ''  
(aPortions.back().tokenType != TT_STRING) )
+if( aLine.getLength()  0  !aLine.endsWith(\)  
(aPortions.back().tokenType != TT_STRING) )
 {
 GetEditView()-InsertText(OUString(\));
 //leave the cursor on it's place: inside the two double quotes
diff --git a/connectivity/source/commontools/dbtools2.cxx 
b/connectivity/source/commontools/dbtools2.cxx
index 233d249..2dcb23d 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -263,7 +263,7 @@ namespace
 }
 
 if ( nColCount )
-sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString()));
+sSql = sSql.replaceAt(sSql.getLength()-1, 1, ));
 return sSql;
 }
 }
diff --git a/cppuhelper/source/bootstrap.cxx b/cppuhelper/source/bootstrap.cxx
index 81d3420..6522f72 100644
--- a/cppuhelper/source/bootstrap.cxx
+++ b/cppuhelper/source/bootstrap.cxx
@@ -111,7 +111,7 @@ Reference XComponentContext  SAL_CALL bootstrap()
 throw BootstrapException(
 cannot convert soffice installation path to

[Libreoffice-commits] core.git: basctl/source connectivity/source cui/source

2013-03-22 Thread Ricardo Montania 
 basctl/source/basicide/baside2.cxx   |4 ++--
 connectivity/source/drivers/dbase/DIndex.cxx |7 +++
 connectivity/source/drivers/dbase/DTable.cxx |4 ++--
 cui/source/dialogs/hyphen.cxx|8 
 cui/source/dialogs/postdlg.cxx   |   16 
 cui/source/options/optdict.cxx   |6 +++---
 6 files changed, 22 insertions(+), 23 deletions(-)

New commits:
commit 9c281fda84bea4407bb8265d1e125fc6e429064d
Author: Ricardo Montania rica...@linuxafundo.com.br
Date:   Fri Mar 22 13:52:16 2013 -0300

String::AppendAscii cleanup

Change-Id: I3c1ff291488b7747e143982aa7ea95169175c2c2
Reviewed-on: https://gerrit.libreoffice.org/2914
Reviewed-by: Fridrich Strba fridr...@documentfoundation.org
Tested-by: Fridrich Strba fridr...@documentfoundation.org

diff --git a/basctl/source/basicide/baside2.cxx 
b/basctl/source/basicide/baside2.cxx
index 72d594d..f8962c5 100644
--- a/basctl/source/basicide/baside2.cxx
+++ b/basctl/source/basicide/baside2.cxx
@@ -1339,7 +1339,7 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor()
 ScriptDocument aDocument( GetDocument() );
 String aLibName( GetLibName() );
 LibraryLocation eLocation = aDocument.getLibraryLocation( aLibName );
-String aModName( GetName() );
+OUString aModName( GetName() );
 String aLibSubName;
 if( xBasic.Is()  aDocument.isInVBAMode()  XModule().Is() )
 {
@@ -1355,7 +1355,7 @@ EntryDescriptor ModulWindow::CreateEntryDescriptor()
 ModuleInfoHelper::getObjectName( xLib, aModName, sObjName 
);
 if( !sObjName.isEmpty() )
 {
-aModName.AppendAscii( 
().Append(sObjName).AppendAscii());
+aModName +=  ( + sObjName + );
 }
 }
 break;
diff --git a/connectivity/source/drivers/dbase/DIndex.cxx 
b/connectivity/source/drivers/dbase/DIndex.cxx
index 0cb4630..1e70a5c 100644
--- a/connectivity/source/drivers/dbase/DIndex.cxx
+++ b/connectivity/source/drivers/dbase/DIndex.cxx
@@ -509,16 +509,15 @@ sal_Bool ODbaseIndex::CreateImpl()
 aName = getString(xCol-getFastPropertyValue(PROPERTY_ID_NAME));
 
 const String 
aQuote(m_pTable-getConnection()-getMetaData()-getIdentifierQuoteString());
-String aStatement;
-aStatement.AssignAscii(SELECT );
+OUString aStatement( SELECT  );
 aStatement += aQuote;
 aStatement += aName;
 aStatement += aQuote;
-aStatement.AppendAscii( FROM );
+aStatement +=  FROM ;
 aStatement += aQuote;
 aStatement += m_pTable-getName().getStr();
 aStatement += aQuote;
-aStatement.AppendAscii( ORDER BY );
+aStatement +=  ORDER BY ;
 aStatement += aQuote;
 aStatement += aName;
 aStatement += aQuote;
diff --git a/connectivity/source/drivers/dbase/DTable.cxx 
b/connectivity/source/drivers/dbase/DTable.cxx
index ee2d7df..386d802 100644
--- a/connectivity/source/drivers/dbase/DTable.cxx
+++ b/connectivity/source/drivers/dbase/DTable.cxx
@@ -2318,8 +2318,8 @@ namespace
 aURL.SetURL(aName);
 
 aURL.setExtension( _sExtension );
-String sNewName(newName);
-sNewName.AppendAscii(.);
+OUString sNewName(newName);
+sNewName += .;
 sNewName += _sExtension;
 
 try
diff --git a/cui/source/dialogs/hyphen.cxx b/cui/source/dialogs/hyphen.cxx
index 82bef8d..26326647 100644
--- a/cui/source/dialogs/hyphen.cxx
+++ b/cui/source/dialogs/hyphen.cxx
@@ -521,10 +521,10 @@ SvxHyphenWordDialog::~SvxHyphenWordDialog()
 void SvxHyphenWordDialog::SetWindowTitle( LanguageType nLang )
 {
 String aLangStr( SvtLanguageTable::GetLanguageString( nLang ) );
-String aTmp( aLabel );
-aTmp.AppendAscii( RTL_CONSTASCII_STRINGPARAM(  ( ) );
-aTmp.Append( aLangStr );
-aTmp.Append( sal_Unicode( ')' ) );
+OUString aTmp( aLabel );
+aTmp +=  (;
+aTmp += aLangStr;
+aTmp += );
 SetText( aTmp );
 }
 
diff --git a/cui/source/dialogs/postdlg.cxx b/cui/source/dialogs/postdlg.cxx
index cec8c01..4e2465e 100644
--- a/cui/source/dialogs/postdlg.cxx
+++ b/cui/source/dialogs/postdlg.cxx
@@ -134,8 +134,8 @@ SvxPostItDialog::~SvxPostItDialog()
 
 void SvxPostItDialog::ShowLastAuthor(const String rAuthor, const String 
rDate)
 {
-String sTxt( rAuthor );
-sTxt.AppendAscii( RTL_CONSTASCII_STRINGPARAM( ,  ) );
+OUString sTxt( rAuthor );
+sTxt += , ;
 sTxt += rDate;
 m_pLastEditFT-SetText( sTxt );
 }
@@ -187,23 +187,23 @@ IMPL_LINK_NOARG(SvxPostItDialog, Stamp)
 Time aTime( Time::SYSTEM );
 String aTmp( SvtUserOptions().GetID() );
 const LocaleDataWrapper rLocaleWrapper( 
Application::GetSettings().GetLocaleDataWrapper() );
-String aStr( m_pEditED-GetText() );
-aStr.AppendAscii( RTL_CONSTASCII_STRINGPARAM( \n  ) );
+OUString aStr( m_pEditED-GetText() );
+