[Libreoffice-commits] core.git: basic/source cui/source dbaccess/source sfx2/source ucb/source xmloff/source
Thomas Arnhold
thomas at arnhold.org
Thu Mar 7 19:53:14 PST 2013
basic/source/classes/sbunoobj.cxx | 4 +-
basic/source/runtime/dllmgr-x64.cxx | 2 -
basic/source/runtime/dllmgr-x86.cxx | 2 -
basic/source/uno/namecont.cxx | 3 --
cui/source/customize/cfg.cxx | 4 +-
cui/source/options/optgdlg.cxx | 2 -
cui/source/tabpages/grfpage.cxx | 2 -
dbaccess/source/core/api/KeySet.cxx | 4 --
dbaccess/source/core/api/tablecontainer.cxx | 4 +-
dbaccess/source/filter/xml/dbloader2.cxx | 6 +---
sfx2/source/appl/shutdownicon.cxx | 12 ++++----
sfx2/source/appl/shutdowniconw32.cxx | 4 +-
sfx2/source/dialog/filedlghelper.cxx | 2 -
sfx2/source/dialog/mailmodel.cxx | 2 -
ucb/source/core/ucbstore.cxx | 40 ++++++++++++++--------------
xmloff/source/draw/xexptran.cxx | 24 ++++++++--------
xmloff/source/script/xmlscripti.cxx | 2 -
17 files changed, 57 insertions(+), 62 deletions(-)
New commits:
commit 8035a3af260729ee47a1d805811e17d06d035e3d
Author: Thomas Arnhold <thomas at arnhold.org>
Date: Fri Mar 8 04:51:28 2013 +0100
some further OUString cleanup
Change-Id: I13eb94092e29ececc9fbf494074acde5f893b605
diff --git a/basic/source/classes/sbunoobj.cxx b/basic/source/classes/sbunoobj.cxx
index 55b5689..703b280 100644
--- a/basic/source/classes/sbunoobj.cxx
+++ b/basic/source/classes/sbunoobj.cxx
@@ -1670,7 +1670,7 @@ OUString getDbgObjectName( SbUnoObject* pUnoObj )
{
OUString aName = getDbgObjectNameImpl( pUnoObj );
if( aName.isEmpty() )
- aName += OUString("Unknown");
+ aName += "Unknown";
OUStringBuffer aRet;
if( aName.getLength() > 20 )
@@ -5146,7 +5146,7 @@ OUString SbUnoStructRefObject::getDbgObjectName()
OUString aName = GetClassName();
if( aName.isEmpty() )
{
- aName += OUString("Unknown");
+ aName += "Unknown";
}
OUStringBuffer aRet;
if( aName.getLength() > 20 )
diff --git a/basic/source/runtime/dllmgr-x64.cxx b/basic/source/runtime/dllmgr-x64.cxx
index b1caceb..b3f257f 100644
--- a/basic/source/runtime/dllmgr-x64.cxx
+++ b/basic/source/runtime/dllmgr-x64.cxx
@@ -700,7 +700,7 @@ SbError Dll::getProc(OUString const & name, ProcData * proc) {
OUString fullDllName(OUString const & name) {
OUString full(name);
if (full.indexOf('.') == -1) {
- full += OUString(".DLL");
+ full += ".DLL";
}
return full;
}
diff --git a/basic/source/runtime/dllmgr-x86.cxx b/basic/source/runtime/dllmgr-x86.cxx
index 777a18e..ffce759 100644
--- a/basic/source/runtime/dllmgr-x86.cxx
+++ b/basic/source/runtime/dllmgr-x86.cxx
@@ -657,7 +657,7 @@ SbError Dll::getProc(OUString const & name, ProcData * proc) {
OUString fullDllName(OUString const & name) {
OUString full(name);
if (full.indexOf('.') == -1) {
- full += OUString(".DLL");
+ full += ".DLL";
}
return full;
}
diff --git a/basic/source/uno/namecont.cxx b/basic/source/uno/namecont.cxx
index 67bba96..d0c7d14 100644
--- a/basic/source/uno/namecont.cxx
+++ b/basic/source/uno/namecont.cxx
@@ -1291,8 +1291,7 @@ void SfxLibraryContainer::implScanExtensions( void )
{
aIndexFileURL += "/";
}
- aIndexFileURL += maInfoFileName;
- aIndexFileURL += OUString(".xlb");
+ aIndexFileURL += maInfoFileName + ".xlb";
// Create link
const bool bReadOnly = false;
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 05a28f8..0392d1f 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -3111,7 +3111,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
// default toolbar to select is standardbar unless a different one
// has been passed in
m_aURLToSelect = OUString(ITEM_TOOLBAR_URL );
- m_aURLToSelect += OUString("standardbar" );
+ m_aURLToSelect += "standardbar";
const SfxPoolItem* pItem =
rSet.GetItem( rSet.GetPool()->GetWhich( SID_CONFIG ) );
@@ -3662,7 +3662,7 @@ void SvxToolbarConfigPage::Init()
// in future select the default toolbar: Standard
m_aURLToSelect = OUString(ITEM_TOOLBAR_URL );
- m_aURLToSelect += OUString("standardbar" );
+ m_aURLToSelect += "standardbar";
}
aTopLevelListBox.SelectEntryPos(nPos, sal_True);
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index f6d7934..86cdb0d 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -625,7 +625,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
{
::rtl::OUString aAutoStr( m_pIconStyleLB->GetEntry( 0 ) );
- aAutoStr += OUString(" (" );
+ aAutoStr += " (";
// prefer the icon style set by the desktop native widgets modules
sal_uLong nAutoStyle = aStyleSettings.GetPreferredSymbolsStyle();
diff --git a/cui/source/tabpages/grfpage.cxx b/cui/source/tabpages/grfpage.cxx
index 8e4a46c..fdf5e77 100644
--- a/cui/source/tabpages/grfpage.cxx
+++ b/cui/source/tabpages/grfpage.cxx
@@ -675,7 +675,7 @@ void SvxGrfCropPage::GraphicHasChanged( sal_Bool bFound )
((float)aOrigSize.Width()/TWIP_TO_INCH)+0.5));
sal_Int32 ay = sal_Int32(floor((float)aOrigPixelSize.Height() /
((float)aOrigSize.Height()/TWIP_TO_INCH)+0.5));
- sTemp += OUString(" ");
+ sTemp += " ";
sTemp += CUI_RESSTR( STR_PPI );
OUString sPPI = OUString::valueOf(ax);
if (abs(ax - ay) > 1) {
diff --git a/dbaccess/source/core/api/KeySet.cxx b/dbaccess/source/core/api/KeySet.cxx
index f252dc8..4df0230 100644
--- a/dbaccess/source/core/api/KeySet.cxx
+++ b/dbaccess/source/core/api/KeySet.cxx
@@ -867,9 +867,7 @@ void OKeySet::executeInsert( const ORowSetRow& _rInsertRow,const OUString& i_sSQ
if(!sMaxStmt.isEmpty())
{
sMaxStmt = sMaxStmt.replaceAt(sMaxStmt.getLength()-1,1,OUString(" "));
- OUString sStmt = OUString("SELECT ");
- sStmt += sMaxStmt;
- sStmt += OUString("FROM ");
+ OUString sStmt = "SELECT " + sMaxStmt + "FROM ";
OUString sCatalog,sSchema,sTable;
::dbtools::qualifiedNameComponents(m_xConnection->getMetaData(),m_sUpdateTableName,sCatalog,sSchema,sTable,::dbtools::eInDataManipulation);
sStmt += ::dbtools::composeTableNameForSelect( m_xConnection, sCatalog, sSchema, sTable );
diff --git a/dbaccess/source/core/api/tablecontainer.cxx b/dbaccess/source/core/api/tablecontainer.cxx
index 5c44d0e..9fab58d 100644
--- a/dbaccess/source/core/api/tablecontainer.cxx
+++ b/dbaccess/source/core/api/tablecontainer.cxx
@@ -393,9 +393,9 @@ void OTableContainer::dropObject(sal_Int32 _nPos,const OUString _sElementName)
OUString aSql("DROP ");
if ( bIsView ) // here we have a view
- aSql += OUString("VIEW ");
+ aSql += "VIEW ";
else
- aSql += OUString("TABLE ");
+ aSql += "TABLE ";
aSql += sComposedName;
Reference<XConnection> xCon = m_xConnection;
OSL_ENSURE(xCon.is(),"Connection is null!");
diff --git a/dbaccess/source/filter/xml/dbloader2.cxx b/dbaccess/source/filter/xml/dbloader2.cxx
index be6a5a4..12df6d7 100644
--- a/dbaccess/source/filter/xml/dbloader2.cxx
+++ b/dbaccess/source/filter/xml/dbloader2.cxx
@@ -624,11 +624,9 @@ extern "C" void SAL_CALL writeDBLoaderInfo2(void* pRegistryKey)
OUString aImpl("/");
aImpl += ::dbaxml::DBContentLoader::getImplementationName_Static();
- OUString aImpltwo = aImpl;
- aImpltwo += OUString("/UNO/Loader");
+ OUString aImpltwo = aImpl + "/UNO/Loader";
Reference< XRegistryKey> xNewKey = xKey->createKey( aImpltwo );
- aImpltwo = aImpl;
- aImpltwo += OUString("/Loader");
+ aImpltwo = aImpl + "/Loader";
Reference< XRegistryKey > xLoaderKey = xKey->createKey( aImpltwo );
xNewKey = xLoaderKey->createKey( OUString("Pattern") );
xNewKey->setAsciiValue( OUString("private:factory/sdatabase") );
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index 868b396..c6df67a 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -524,7 +524,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
{
OUString aBaseDirURL = sFiles[0];
if ( !aBaseDirURL.isEmpty() && aBaseDirURL[aBaseDirURL.getLength()-1] != '/' )
- aBaseDirURL += OUString("/");
+ aBaseDirURL += "/";
int iFiles;
for ( iFiles = 1; iFiles < nFiles; iFiles++ )
@@ -786,9 +786,9 @@ static OUString getAutostartDir( bool bCreate = false )
OUString aHomeURL;
osl::Security().getHomeDir( aHomeURL );
::osl::File::getSystemPathFromFileURL( aHomeURL, aShortcut );
- aShortcut += OUString( "/.config" );
+ aShortcut += "/.config";
}
- aShortcut += OUString( "/autostart" );
+ aShortcut += "/autostart";
if (bCreate)
{
OUString aShortcutUrl;
@@ -813,14 +813,14 @@ rtl::OUString ShutdownIcon::getShortcutName()
aShortcutName = SFX2_RESSTR(STR_QUICKSTART_LNKNAME);
}
#ifdef WNT
- aShortcutName += OUString( ".lnk" );
+ aShortcutName += ".lnk";
OUString aShortcut(GetAutostartFolderNameW32());
- aShortcut += OUString( "\\" );
+ aShortcut += "\\";
aShortcut += aShortcutName;
#else // UNX
OUString aShortcut = getAutostartDir();
- aShortcut += OUString( "/qstart.desktop" );
+ aShortcut += "/qstart.desktop";
#endif // UNX
return aShortcut;
#endif // ENABLE_QUICKSTART_APPLET
diff --git a/sfx2/source/appl/shutdowniconw32.cxx b/sfx2/source/appl/shutdowniconw32.cxx
index dbef7e1..3220bb5 100644
--- a/sfx2/source/appl/shutdowniconw32.cxx
+++ b/sfx2/source/appl/shutdowniconw32.cxx
@@ -829,7 +829,7 @@ bool ShutdownIcon::IsQuickstarterInstalled()
aOfficepath = aOfficepath.copy(0, i);
OUString quickstartExe(aOfficepath);
- quickstartExe += OUString( "\\quickstart.exe" );
+ quickstartExe += "\\quickstart.exe";
return FileExistsW( reinterpret_cast<LPCWSTR>(quickstartExe.getStr()) );
}
@@ -845,7 +845,7 @@ void ShutdownIcon::EnableAutostartW32( const rtl::OUString &aShortcut )
aOfficepath = aOfficepath.copy(0, i);
OUString quickstartExe(aOfficepath);
- quickstartExe += OUString( "\\quickstart.exe" );
+ quickstartExe += "\\quickstart.exe";
CreateShortcut( quickstartExe, aOfficepath, aShortcut, OUString(), OUString() );
}
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 8245d08..164bc7e 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -497,7 +497,7 @@ void FileDialogHelper_Impl::updateExportButton()
OUString sLabel = maButtonLabel;
// filter with options -> append ellipses on export button label
if ( CheckFilterOptionsCapability( getCurentSfxFilter() ) )
- sLabel += OUString( "..." );
+ sLabel += "...";
if ( sOldLabel != sLabel )
{
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index 8522a2e..f56b4bc 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -868,7 +868,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css:
OUString baseName( maAttachedDocuments[0].copy( maAttachedDocuments[0].lastIndexOf( '/' ) + 1 ) );
OUString subject( baseName );
if ( maAttachedDocuments.size() > 1 )
- subject += OUString(", ...");
+ subject += ", ...";
xSimpleMailMessage->setSubject( subject );
}
xSimpleMailMessage->setAttachement( aAttachmentSeq );
diff --git a/ucb/source/core/ucbstore.cxx b/ucb/source/core/ucbstore.cxx
index f717faf..4e7b9ef 100644
--- a/ucb/source/core/ucbstore.cxx
+++ b/ucb/source/core/ucbstore.cxx
@@ -812,7 +812,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
{
OUString aOldValuesKey
= makeHierarchalNameSegment( rOldKey );
- aOldValuesKey += OUString("/Values");
+ aOldValuesKey += "/Values";
Reference< XNameAccess > xOldNameAccess;
xRootHierNameAccess->getByHierarchicalName(
@@ -833,7 +833,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
{
OUString aNewValuesKey
= makeHierarchalNameSegment( rNewKey );
- aNewValuesKey += OUString("/Values");
+ aNewValuesKey += "/Values";
Reference< XSingleServiceFactory > xNewFac;
xRootHierNameAccess->getByHierarchicalName(
@@ -855,7 +855,7 @@ void PropertySetRegistry::renamePropertySet( const OUString& rOldKey,
return;
}
- aOldValuesKey += OUString("/");
+ aOldValuesKey += "/";
OUString aHandleKey("/Handle");
OUString aValueKey("/Value");
@@ -1429,7 +1429,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( getFullKey() );
- aFullPropName += OUString("/");
+ aFullPropName += "/";
aFullPropName += makeHierarchalNameSegment( aPropertyName );
// Does property exist?
@@ -1448,7 +1448,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
{
// Obtain old value
OUString aValueName = aFullPropName;
- aValueName += OUString("/Value");
+ aValueName += "/Value";
Any aOldValue
= xRootHierNameAccess->getByHierarchicalName(
aValueName );
@@ -1479,7 +1479,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValue(
{
// Obtain handle
aValueName = aFullPropName;
- aValueName += OUString("/Handle");
+ aValueName += "/Handle";
sal_Int32 nHandle = -1;
xRootHierNameAccess->getByHierarchicalName( aValueName )
>>= nHandle;
@@ -1535,9 +1535,9 @@ Any SAL_CALL PersistentPropertySet::getPropertyValue(
if ( xNameAccess.is() )
{
OUString aFullPropName( getFullKey() );
- aFullPropName += OUString("/");
+ aFullPropName += "/";
aFullPropName += makeHierarchalNameSegment( PropertyName );
- aFullPropName += OUString("/Value");
+ aFullPropName += "/Value";
try
{
return xNameAccess->getByHierarchicalName( aFullPropName );
@@ -1694,7 +1694,7 @@ void SAL_CALL PersistentPropertySet::addProperty(
{
aFullValuesName = getFullKey();
OUString aFullPropName = aFullValuesName;
- aFullPropName += OUString("/");
+ aFullPropName += "/";
aFullPropName += makeHierarchalNameSegment( Name );
if ( xRootHierNameAccess->hasByHierarchicalName( aFullPropName ) )
@@ -1845,7 +1845,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
{
aFullValuesName = getFullKey();
aFullPropName = aFullValuesName;
- aFullPropName += OUString("/");
+ aFullPropName += "/";
aFullPropName += makeHierarchalNameSegment( Name );
// Property in set?
@@ -1856,7 +1856,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
try
{
OUString aFullAttrName = aFullPropName;
- aFullAttrName += OUString("/Attributes");
+ aFullAttrName += "/Attributes";
sal_Int32 nAttribs = 0;
if ( xRootHierNameAccess->getByHierarchicalName( aFullAttrName )
@@ -1914,7 +1914,7 @@ void SAL_CALL PersistentPropertySet::removeProperty( const OUString& Name )
{
OUString aFullHandleName = aFullPropName;
aFullHandleName
- += OUString("/Handle");
+ += "/Handle";
if ( ! ( xRootHierNameAccess->getByHierarchicalName(
aFullHandleName ) >>= nHandle ) )
@@ -2166,7 +2166,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
Events aEvents;
OUString aFullPropNamePrefix( getFullKey() );
- aFullPropNamePrefix += OUString("/");
+ aFullPropNamePrefix += "/";
// Iterate over given property value sequence.
for ( sal_Int32 n = 0; n < nCount; ++n )
@@ -2198,7 +2198,7 @@ void SAL_CALL PersistentPropertySet::setPropertyValues(
// Save old value
OUString aValueName = aFullPropName;
- aValueName += OUString("/Value");
+ aValueName += "/Value";
Any aOldValue
= xRootHierNameAccess->getByHierarchicalName(
aValueName );
@@ -2341,7 +2341,7 @@ const OUString& PersistentPropertySet::getFullKey()
m_pImpl->m_aFullKey
= makeHierarchalNameSegment( m_pImpl->m_aKey );
m_pImpl->m_aFullKey
- += OUString( "/Values" );
+ += "/Values";
}
}
@@ -2564,7 +2564,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( m_pOwner->getFullKey() );
- aFullPropName += OUString("/");
+ aFullPropName += "/";
aFullPropName += makeHierarchalNameSegment( aName );
// Does property exist?
@@ -2577,7 +2577,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain handle.
OUString aKey = aFullPropName;
- aKey += OUString("/Handle");
+ aKey += "/Handle";
if ( !( xRootHierNameAccess->getByHierarchicalName( aKey )
>>= aProp.Handle ) )
@@ -2589,7 +2589,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain Value and extract type.
aKey = aFullPropName;
- aKey += OUString("/Value");
+ aKey += "/Value";
Any aValue = xRootHierNameAccess->getByHierarchicalName( aKey );
if ( !aValue.hasValue() )
@@ -2603,7 +2603,7 @@ Property SAL_CALL PropertySetInfo_Impl::getPropertyByName(
// Obtain Attributes.
aKey = aFullPropName;
- aKey += OUString("/Attributes");
+ aKey += "/Attributes";
sal_Int32 nAttribs = 0;
if ( xRootHierNameAccess->getByHierarchicalName( aKey )
@@ -2648,7 +2648,7 @@ sal_Bool SAL_CALL PropertySetInfo_Impl::hasPropertyByName(
if ( xRootHierNameAccess.is() )
{
OUString aFullPropName( m_pOwner->getFullKey() );
- aFullPropName += OUString("/");
+ aFullPropName += "/";
aFullPropName += makeHierarchalNameSegment( Name );
return xRootHierNameAccess->hasByHierarchicalName( aFullPropName );
diff --git a/xmloff/source/draw/xexptran.cxx b/xmloff/source/draw/xexptran.cxx
index ed64821..9d30a46 100644
--- a/xmloff/source/draw/xexptran.cxx
+++ b/xmloff/source/draw/xexptran.cxx
@@ -410,14 +410,14 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
{
case IMP_SDXMLEXP_TRANSOBJ2D_ROTATE :
{
- aNewString += OUString( "rotate (" );
+ aNewString += "rotate (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DRotate*)pObj)->mfRotate);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SCALE :
{
- aNewString += OUString( "scale (" );
+ aNewString += "scale (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getX());
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DScale*)pObj)->maScale.getY());
@@ -426,7 +426,7 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ2D_TRANSLATE :
{
- aNewString += OUString( "translate (" );
+ aNewString += "translate (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getX(), true);
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DTranslate*)pObj)->maTranslate.getY(), true);
@@ -435,21 +435,21 @@ const OUString& SdXMLImExTransform2D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWX :
{
- aNewString += OUString( "skewX (" );
+ aNewString += "skewX (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewX*)pObj)->mfSkewX);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_SKEWY :
{
- aNewString += OUString( "skewY (" );
+ aNewString += "skewY (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DSkewY*)pObj)->mfSkewY);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ2D_MATRIX :
{
- aNewString += OUString( "matrix (" );
+ aNewString += "matrix (";
// a
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj2DMatrix*)pObj)->maMatrix.get(0, 0));
@@ -849,28 +849,28 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
{
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_X :
{
- aNewString += OUString( "rotatex (" );
+ aNewString += "rotatex (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateX*)pObj)->mfRotateX);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Y :
{
- aNewString += OUString( "rotatey (" );
+ aNewString += "rotatey (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateY*)pObj)->mfRotateY);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_ROTATE_Z :
{
- aNewString += OUString( "rotatez (" );
+ aNewString += "rotatez (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DRotateZ*)pObj)->mfRotateZ);
aNewString += aClosingBrace;
break;
}
case IMP_SDXMLEXP_TRANSOBJ3D_SCALE :
{
- aNewString += OUString( "scale (" );
+ aNewString += "scale (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getX());
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DScale*)pObj)->maScale.getY());
@@ -881,7 +881,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ3D_TRANSLATE :
{
- aNewString += OUString( "translate (" );
+ aNewString += "translate (";
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getX(), true);
aNewString += aEmptySpace;
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DTranslate*)pObj)->maTranslate.getY(), true);
@@ -892,7 +892,7 @@ const OUString& SdXMLImExTransform3D::GetExportString(const SvXMLUnitConverter&
}
case IMP_SDXMLEXP_TRANSOBJ3D_MATRIX :
{
- aNewString += OUString( "matrix (" );
+ aNewString += "matrix (";
// a
Imp_PutDoubleChar(aNewString, rConv, ((ImpSdXMLExpTransObj3DMatrix*)pObj)->maMatrix.get(0, 0));
diff --git a/xmloff/source/script/xmlscripti.cxx b/xmloff/source/script/xmlscripti.cxx
index 2e86608..6269493 100644
--- a/xmloff/source/script/xmlscripti.cxx
+++ b/xmloff/source/script/xmlscripti.cxx
@@ -91,7 +91,7 @@ SvXMLImportContext* XMLScriptChildContext::CreateChildContext(
if ( m_xDocumentScripts.is() )
{ // document supports embedding scripts/macros
OUString aBasic( GetImport().GetNamespaceMap().GetPrefixByKey( XML_NAMESPACE_OOO ) );
- aBasic += OUString( ":Basic" );
+ aBasic += ":Basic";
if ( m_aLanguage == aBasic && nPrefix == XML_NAMESPACE_OOO && IsXMLToken( rLocalName, XML_LIBRARIES ) )
pContext = new XMLBasicImportContext( GetImport(), nPrefix, rLocalName, m_xModel );
More information about the Libreoffice-commits
mailing list