summaryrefslogtreecommitdiff
path: root/sc/source/filter
diff options
context:
space:
mode:
Diffstat (limited to 'sc/source/filter')
-rw-r--r--sc/source/filter/excel/xestream.cxx2
-rw-r--r--sc/source/filter/excel/xltoolbar.cxx2
-rw-r--r--sc/source/filter/html/htmlpars.cxx4
-rw-r--r--sc/source/filter/lotus/lotread.cxx2
-rw-r--r--sc/source/filter/xml/XMLCodeNameProvider.cxx4
-rw-r--r--sc/source/filter/xml/XMLStylesExportHelper.cxx2
-rw-r--r--sc/source/filter/xml/XMLTableShapeResizer.cxx2
-rw-r--r--sc/source/filter/xml/xmlcvali.cxx2
-rw-r--r--sc/source/filter/xml/xmlexprt.cxx6
-rw-r--r--sc/source/filter/xml/xmlimprt.cxx8
-rw-r--r--sc/source/filter/xml/xmlstyle.cxx4
-rw-r--r--sc/source/filter/xml/xmlwrap.cxx20
12 files changed, 29 insertions, 29 deletions
diff --git a/sc/source/filter/excel/xestream.cxx b/sc/source/filter/excel/xestream.cxx
index c031418f6e92..0198db842c4f 100644
--- a/sc/source/filter/excel/xestream.cxx
+++ b/sc/source/filter/excel/xestream.cxx
@@ -1168,7 +1168,7 @@ OUString XclExpXmlStream::implGetImplementationName() const
Sequence< OUString > SAL_CALL XlsxExport_getSupportedServiceNames() throw()
{
- const OUString aServiceName( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.ExportFilter" ) );
+ const OUString aServiceName( "com.sun.star.document.ExportFilter" );
const Sequence< OUString > aSeq( &aServiceName, 1 );
return aSeq;
}
diff --git a/sc/source/filter/excel/xltoolbar.cxx b/sc/source/filter/excel/xltoolbar.cxx
index 0c2f9c10b28a..fd02260ae039 100644
--- a/sc/source/filter/excel/xltoolbar.cxx
+++ b/sc/source/filter/excel/xltoolbar.cxx
@@ -167,7 +167,7 @@ bool ScCTB::ImportMenuTB( ScCTBWrapper& rWrapper, const css::uno::Reference< css
bool ScCTB::ImportCustomToolBar( ScCTBWrapper& rWrapper, CustomToolBarImportHelper& helper )
{
- static rtl::OUString sToolbarPrefix( RTL_CONSTASCII_USTRINGPARAM( "private:resource/toolbar/custom_" ) );
+ static rtl::OUString sToolbarPrefix( "private:resource/toolbar/custom_" );
bool bRes = false;
try
{
diff --git a/sc/source/filter/html/htmlpars.cxx b/sc/source/filter/html/htmlpars.cxx
index 7982f1d378e5..83ea5bfd9cb4 100644
--- a/sc/source/filter/html/htmlpars.cxx
+++ b/sc/source/filter/html/htmlpars.cxx
@@ -2232,9 +2232,9 @@ void ScHTMLTable::DataOn( const ImportInfo& rInfo )
{
// Pick up the number format associated with this class (if
// any).
- rtl::OUString aElem(RTL_CONSTASCII_USTRINGPARAM("td"));
+ rtl::OUString aElem("td");
rtl::OUString aClass = itr->GetString();
- rtl::OUString aProp(RTL_CONSTASCII_USTRINGPARAM("mso-number-format"));
+ rtl::OUString aProp("mso-number-format");
const ScHTMLStyles& rStyles = mpParser->GetStyles();
const rtl::OUString& rVal = rStyles.getPropertyValue(aElem, aClass, aProp);
rtl::OUString aNumFmt = decodeNumberFormat(rVal);
diff --git a/sc/source/filter/lotus/lotread.cxx b/sc/source/filter/lotus/lotread.cxx
index 4e20ab3f3fe4..4f07cf772766 100644
--- a/sc/source/filter/lotus/lotread.cxx
+++ b/sc/source/filter/lotus/lotread.cxx
@@ -200,7 +200,7 @@ FltError ImportLotus::Read()
SCTAB nCnt;
rtl::OUString aTabName;
rtl::OUString aBaseName;
- rtl::OUString aRef( RTL_CONSTASCII_USTRINGPARAM( "temp" ) );
+ rtl::OUString aRef( "temp" );
if( nTabs != 0 )
{
if( nTabs > 1 )
diff --git a/sc/source/filter/xml/XMLCodeNameProvider.cxx b/sc/source/filter/xml/XMLCodeNameProvider.cxx
index 2864b0ffeb36..790e2f6251e0 100644
--- a/sc/source/filter/xml/XMLCodeNameProvider.cxx
+++ b/sc/source/filter/xml/XMLCodeNameProvider.cxx
@@ -30,7 +30,7 @@ sal_Bool XMLCodeNameProvider::_getCodeName( const uno::Any& aAny, String& rCodeN
if( !(aAny >>= aProps) )
return false;
- OUString sCodeNameProp( RTL_CONSTASCII_USTRINGPARAM("CodeName") );
+ OUString sCodeNameProp("CodeName");
sal_Int32 nPropCount = aProps.getLength();
for( sal_Int32 i=0; i<nPropCount; i++ )
{
@@ -165,7 +165,7 @@ uno::Type SAL_CALL XMLCodeNameProvider::getElementType( )
void XMLCodeNameProvider::set( const uno::Reference< container::XNameAccess>& xNameAccess, ScDocument *pDoc )
{
uno::Any aAny;
- OUString sDocName( RTL_CONSTASCII_USTRINGPARAM("*doc*") );
+ OUString sDocName("*doc*");
String sCodeName;
if( xNameAccess->hasByName( sDocName ) )
{
diff --git a/sc/source/filter/xml/XMLStylesExportHelper.cxx b/sc/source/filter/xml/XMLStylesExportHelper.cxx
index 3ee937109f72..c8a1e084a80f 100644
--- a/sc/source/filter/xml/XMLStylesExportHelper.cxx
+++ b/sc/source/filter/xml/XMLStylesExportHelper.cxx
@@ -163,7 +163,7 @@ bool ScMyValidationsContainer::AddValidation(const uno::Any& aTempAny,
{
sal_Int32 nNameIndex(nCount + 1);
rtl::OUString sCount(rtl::OUString::valueOf(nNameIndex));
- rtl::OUString sPrefix(RTL_CONSTASCII_USTRINGPARAM("val"));
+ rtl::OUString sPrefix("val");
aValidation.sName += sPrefix;
aValidation.sName += sCount;
aValidationVec.push_back(aValidation);
diff --git a/sc/source/filter/xml/XMLTableShapeResizer.cxx b/sc/source/filter/xml/XMLTableShapeResizer.cxx
index 89c80bf6454f..33e0203dfecd 100644
--- a/sc/source/filter/xml/XMLTableShapeResizer.cxx
+++ b/sc/source/filter/xml/XMLTableShapeResizer.cxx
@@ -123,7 +123,7 @@ void ScMyOLEFixer::FixupOLEs()
{
if (!aShapes.empty() && rImport.GetModel().is())
{
- rtl::OUString sPersistName (RTL_CONSTASCII_USTRINGPARAM("PersistName"));
+ rtl::OUString sPersistName ("PersistName");
ScMyToFixupOLEs::iterator aItr(aShapes.begin());
ScMyToFixupOLEs::iterator aEndItr(aShapes.end());
ScDocument* pDoc(rImport.GetDocument());
diff --git a/sc/source/filter/xml/xmlcvali.cxx b/sc/source/filter/xml/xmlcvali.cxx
index 091b66fd3d5c..3a0697b61e66 100644
--- a/sc/source/filter/xml/xmlcvali.cxx
+++ b/sc/source/filter/xml/xmlcvali.cxx
@@ -418,7 +418,7 @@ void ScXMLContentValidationContext::EndElement()
// #i36650# event-listeners element moved up one level
if (xEventContext.Is())
{
- rtl::OUString sOnError(RTL_CONSTASCII_USTRINGPARAM("OnError"));
+ rtl::OUString sOnError("OnError");
XMLEventsImportContext* pEvents =
(XMLEventsImportContext*)&xEventContext;
uno::Sequence<beans::PropertyValue> aValues;
diff --git a/sc/source/filter/xml/xmlexprt.cxx b/sc/source/filter/xml/xmlexprt.cxx
index 1d55a64526e9..3fd048b87040 100644
--- a/sc/source/filter/xml/xmlexprt.cxx
+++ b/sc/source/filter/xml/xmlexprt.cxx
@@ -3006,9 +3006,9 @@ void ScXMLExport::ExportShape(const uno::Reference < drawing::XShape >& xShape,
{
uno::Reference < beans::XPropertySet > xShapeProps ( xShape, uno::UNO_QUERY );
bool bIsChart( false );
- rtl::OUString sPropCLSID (RTL_CONSTASCII_USTRINGPARAM("CLSID"));
- rtl::OUString sPropModel (RTL_CONSTASCII_USTRINGPARAM("Model"));
- rtl::OUString sPersistName (RTL_CONSTASCII_USTRINGPARAM("PersistName"));
+ rtl::OUString sPropCLSID ("CLSID");
+ rtl::OUString sPropModel ("Model");
+ rtl::OUString sPersistName ("PersistName");
if (xShapeProps.is())
{
sal_Int32 nZOrder = 0;
diff --git a/sc/source/filter/xml/xmlimprt.cxx b/sc/source/filter/xml/xmlimprt.cxx
index c57810805c9f..14c022daf5b0 100644
--- a/sc/source/filter/xml/xmlimprt.cxx
+++ b/sc/source/filter/xml/xmlimprt.cxx
@@ -2528,9 +2528,9 @@ void ScXMLImport::SetConfigurationSettings(const uno::Sequence<beans::PropertyVa
if (xMultiServiceFactory.is())
{
sal_Int32 nCount(aConfigProps.getLength());
- rtl::OUString sCTName(RTL_CONSTASCII_USTRINGPARAM("TrackedChangesProtectionKey"));
- rtl::OUString sVBName(RTL_CONSTASCII_USTRINGPARAM("VBACompatibilityMode"));
- rtl::OUString sSCName(RTL_CONSTASCII_USTRINGPARAM("ScriptConfiguration"));
+ rtl::OUString sCTName("TrackedChangesProtectionKey");
+ rtl::OUString sVBName("VBACompatibilityMode");
+ rtl::OUString sSCName("ScriptConfiguration");
for (sal_Int32 i = nCount - 1; i >= 0; --i)
{
if (aConfigProps[i].Name == sCTName)
@@ -2613,7 +2613,7 @@ sal_Int32 ScXMLImport::SetCurrencySymbol(const sal_Int32 nKey, const rtl::OUStri
}
catch ( const util::MalformedNumberFormatException& rException )
{
- rtl::OUString sErrorMessage(RTL_CONSTASCII_USTRINGPARAM("Fehler im Formatstring "));
+ rtl::OUString sErrorMessage("Fehler im Formatstring ");
sErrorMessage += sFormatString;
sErrorMessage += rtl::OUString(" an Position ");
sErrorMessage += rtl::OUString::valueOf(rException.CheckPos);
diff --git a/sc/source/filter/xml/xmlstyle.cxx b/sc/source/filter/xml/xmlstyle.cxx
index a0904fe90c1d..486f0b2911c0 100644
--- a/sc/source/filter/xml/xmlstyle.cxx
+++ b/sc/source/filter/xml/xmlstyle.cxx
@@ -714,7 +714,7 @@ void ScXMLAutoStylePoolP::exportStyleContent(
{
if (aOperator == sheet::ConditionOperator_FORMULA)
{
- rtl::OUString sCondition(RTL_CONSTASCII_USTRINGPARAM("is-true-formula("));
+ rtl::OUString sCondition("is-true-formula(");
sCondition += xSheetCondition->getFormula1();
sCondition += rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
rScXMLExport.AddAttribute(XML_NAMESPACE_STYLE, XML_CONDITION, sCondition);
@@ -812,7 +812,7 @@ void ScXMLStyleExport::exportStyleAttributes(
if (xPropSet.is())
{
uno::Reference< beans::XPropertySetInfo > xPropSetInfo(xPropSet->getPropertySetInfo());
- rtl::OUString sNumberFormat(RTL_CONSTASCII_USTRINGPARAM("NumberFormat"));
+ rtl::OUString sNumberFormat("NumberFormat");
if( xPropSetInfo->hasPropertyByName( sNumberFormat ) )
{
uno::Reference< beans::XPropertyState > xPropState( xPropSet, uno::UNO_QUERY );
diff --git a/sc/source/filter/xml/xmlwrap.cxx b/sc/source/filter/xml/xmlwrap.cxx
index 2aca9fda70d4..02d88a38f128 100644
--- a/sc/source/filter/xml/xmlwrap.cxx
+++ b/sc/source/filter/xml/xmlwrap.cxx
@@ -163,7 +163,7 @@ sal_uInt32 ScXMLImportWrapper::ImportFromComponent(uno::Reference<lang::XMultiSe
OSL_ENSURE( xInfoSet.is(), "missing property set" );
if( xInfoSet.is() )
{
- rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") );
+ rtl::OUString sPropName("StreamName");
xInfoSet->setPropertyValue( sPropName, uno::makeAny( sStream ) );
}
@@ -374,7 +374,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
if( xParentSet.is() )
{
uno::Reference< beans::XPropertySetInfo > xPropSetInfo( xParentSet->getPropertySetInfo() );
- OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) );
+ OUString sPropName("BuildId" );
if( xPropSetInfo.is() && xPropSetInfo->hasPropertyByName(sPropName) )
{
xInfoSet->setPropertyValue( sPropName, xParentSet->getPropertyValue(sPropName) );
@@ -395,7 +395,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
// Set base URI
OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" );
::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL() : ::rtl::OUString();
- rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") );
+ rtl::OUString sPropName("BaseURI");
xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) );
// TODO/LATER: do not do it for embedded links
@@ -602,7 +602,7 @@ sal_Bool ScXMLImportWrapper::Import(sal_Bool bStylesOnly, ErrCode& nError)
if( xModelSet.is() )
{
uno::Reference< beans::XPropertySetInfo > xModelSetInfo( xModelSet->getPropertySetInfo() );
- OUString sBuildPropName( RTL_CONSTASCII_USTRINGPARAM("BuildId" ) );
+ OUString sBuildPropName("BuildId" );
if( xModelSetInfo.is() && xModelSetInfo->hasPropertyByName(sBuildPropName) )
{
xModelSet->setPropertyValue( sBuildPropName, xInfoSet->getPropertyValue(sBuildPropName) );
@@ -683,7 +683,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
if (xSet.is())
{
xSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(sMediaType));
- OUString aUseCommonPassPropName( RTL_CONSTASCII_USTRINGPARAM("UseCommonStoragePasswordEncryption") );
+ OUString aUseCommonPassPropName("UseCommonStoragePasswordEncryption");
// advise storage impl to use common encryption
xSet->setPropertyValue( aUseCommonPassPropName, uno::makeAny(sal_True) );
@@ -699,7 +699,7 @@ sal_Bool ScXMLImportWrapper::ExportToComponent(uno::Reference<lang::XMultiServic
OSL_ENSURE( xInfoSet.is(), "missing property set" );
if( xInfoSet.is() )
{
- rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("StreamName") );
+ rtl::OUString sPropName("StreamName");
xInfoSet->setPropertyValue( sPropName, uno::makeAny( sName ) );
}
@@ -788,7 +788,7 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
xStorage = pMedium->GetOutputStorage();
OUString sFileName;
- OUString sTextMediaType(RTL_CONSTASCII_USTRINGPARAM("text/xml"));
+ OUString sTextMediaType("text/xml");
if (pMedium)
sFileName = pMedium->GetName();
SfxObjectShell* pObjSh = rDoc.GetDocumentShell();
@@ -830,18 +830,18 @@ sal_Bool ScXMLImportWrapper::Export(sal_Bool bStylesOnly)
sal_Bool bUsePrettyPrinting(aSaveOpt.IsPrettyPrinting());
xInfoSet->setPropertyValue("UsePrettyPrinting", uno::makeAny(bUsePrettyPrinting));
- const OUString sTargetStorage( RTL_CONSTASCII_USTRINGPARAM("TargetStorage") );
+ const OUString sTargetStorage("TargetStorage");
xInfoSet->setPropertyValue( sTargetStorage, uno::Any( xStorage ) );
OSL_ENSURE( pMedium, "There is no medium to get MediaDescriptor from!\n" );
::rtl::OUString aBaseURL = pMedium ? pMedium->GetBaseURL( true ) : ::rtl::OUString();
- rtl::OUString sPropName( RTL_CONSTASCII_USTRINGPARAM("BaseURI") );
+ rtl::OUString sPropName("BaseURI");
xInfoSet->setPropertyValue( sPropName, uno::makeAny( aBaseURL ) );
// TODO/LATER: do not do it for embedded links
if( SFX_CREATE_MODE_EMBEDDED == pObjSh->GetCreateMode() )
{
- OUString aName(RTL_CONSTASCII_USTRINGPARAM("dummyObjectName"));
+ OUString aName("dummyObjectName");
if ( pMedium && pMedium->GetItemSet() )
{
const SfxStringItem* pDocHierarchItem = static_cast<const SfxStringItem*>(
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-28 06:57:35 +0000