[Libreoffice-commits] .: 4 commits - cui/source oox/source svtools/source writerfilter/qa writerfilter/source writerfilter/unocomponent
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 2 13:06:49 PDT 2012
cui/source/customize/cfg.cxx | 177 ++++-----
cui/source/options/treeopt.cxx | 31 -
oox/source/core/xmlfilterbase.cxx | 4
oox/source/ppt/pptshape.cxx | 26 -
svtools/source/filter/FilterConfigCache.cxx | 32 -
svtools/source/graphic/descriptor.cxx | 6
svtools/source/misc/svtaccessiblefactory.cxx | 6
svtools/source/uno/addrtempuno.cxx | 6
svtools/source/uno/genericunodialog.cxx | 12
writerfilter/qa/cppunittests/odiapi/testProperty.cxx | 16
writerfilter/source/dmapper/ConversionHelper.cxx | 14
writerfilter/source/dmapper/DomainMapper.cxx | 20 -
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 188 +++++-----
writerfilter/source/dmapper/GraphicImport.cxx | 12
writerfilter/source/dmapper/NumberingManager.cxx | 6
writerfilter/source/dmapper/SettingsTable.cxx | 2
writerfilter/source/dmapper/StyleSheetTable.cxx | 6
writerfilter/source/filter/WriterFilterDetection.cxx | 8
writerfilter/source/ooxml/OOXMLStreamImpl.cxx | 36 -
writerfilter/unocomponent/debugservices/doctok/DocTokAnalyzeService.cxx | 12
writerfilter/unocomponent/debugservices/doctok/DocTokTestService.cxx | 10
writerfilter/unocomponent/debugservices/ooxml/OOXMLAnalyzeService.cxx | 13
writerfilter/unocomponent/debugservices/ooxml/OOXMLTestService.cxx | 8
writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx | 26 -
writerfilter/unocomponent/debugservices/rtftok/XMLScanner.cxx | 16
25 files changed, 339 insertions(+), 354 deletions(-)
New commits:
commit d5d29accb75b2ce66aef9fa4089a255c05b1a459
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 14:55:58 2012 -0500
targeted string re-work
Change-Id: I910a508722a309d7916377a7e2df2093070809ad
diff --git a/oox/source/core/xmlfilterbase.cxx b/oox/source/core/xmlfilterbase.cxx
index 04957cf..583170b 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -248,7 +248,7 @@ void XmlFilterBase::importDocumentProperties() throw()
Reference< XStorage > xDocumentStorage (
::comphelper::OStorageHelper::GetStorageOfFormatFromInputStream( OFOPXML_STORAGE_FORMAT_STRING, xInputStream ) );
Reference< XInterface > xTemp = xContext->getServiceManager()->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.OOXMLDocumentPropertiesImporter")),
+ ::rtl::OUString("com.sun.star.document.OOXMLDocumentPropertiesImporter"),
xContext);
Reference< XOOXMLDocumentPropertiesImporter > xImporter( xTemp, UNO_QUERY );
Reference< XDocumentPropertiesSupplier > xPropSupplier( xModel, UNO_QUERY);
@@ -368,7 +368,7 @@ Reference<XDocument> XmlFilterBase::importFragment( const ::rtl::OUString& aFrag
lcl_getComponentContext(getServiceFactory());
Reference<XDocumentBuilder> xDomBuilder(
xContext->getServiceManager()->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.dom.DocumentBuilder" )),
+ ::rtl::OUString("com.sun.star.xml.dom.DocumentBuilder" ),
xContext),
UNO_QUERY_THROW );
diff --git a/oox/source/ppt/pptshape.cxx b/oox/source/ppt/pptshape.cxx
index 3b66253..2f2e330 100644
--- a/oox/source/ppt/pptshape.cxx
+++ b/oox/source/ppt/pptshape.cxx
@@ -142,14 +142,14 @@ void PPTShape::addShape(
if ( sServiceName != "com.sun.star.drawing.GraphicObjectShape" &&
sServiceName != "com.sun.star.drawing.OLE2Shape" )
{
- const rtl::OUString sOutlinerShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.OutlinerShape" ) );
+ const rtl::OUString sOutlinerShapeService( "com.sun.star.presentation.OutlinerShape" );
OSL_TRACE("has master: %p", rSlidePersist.getMasterPersist().get());
switch( mnSubType )
{
case XML_ctrTitle :
case XML_title :
{
- const rtl::OUString sTitleShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.TitleTextShape" ) );
+ const rtl::OUString sTitleShapeService( "com.sun.star.presentation.TitleTextShape" );
sServiceName = sTitleShapeService;
aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle();
}
@@ -159,7 +159,7 @@ void PPTShape::addShape(
if ( ( meShapeLocation == Master ) || ( meShapeLocation == Layout ) )
sServiceName = rtl::OUString();
else {
- const rtl::OUString sTitleShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.SubtitleShape" ) );
+ const rtl::OUString sTitleShapeService( "com.sun.star.presentation.SubtitleShape" );
sServiceName = sTitleShapeService;
aMasterTextListStyle = rSlidePersist.getMasterPersist().get() ? rSlidePersist.getMasterPersist()->getTitleTextStyle() : rSlidePersist.getTitleTextStyle();
}
@@ -173,7 +173,7 @@ void PPTShape::addShape(
break;
case XML_body :
{
- const rtl::OUString sNotesShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.NotesShape" ) );
+ const rtl::OUString sNotesShapeService( "com.sun.star.presentation.NotesShape" );
if ( rSlidePersist.isNotesPage() )
{
sServiceName = sNotesShapeService;
@@ -188,35 +188,35 @@ void PPTShape::addShape(
break;
case XML_dt :
{
- const rtl::OUString sDateTimeShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.DateTimeShape" ) );
+ const rtl::OUString sDateTimeShapeService( "com.sun.star.presentation.DateTimeShape" );
sServiceName = sDateTimeShapeService;
bClearText = sal_True;
}
break;
case XML_hdr :
{
- const rtl::OUString sHeaderShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.HeaderShape" ) );
+ const rtl::OUString sHeaderShapeService( "com.sun.star.presentation.HeaderShape" );
sServiceName = sHeaderShapeService;
bClearText = sal_True;
}
break;
case XML_ftr :
{
- const rtl::OUString sFooterShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.FooterShape" ) );
+ const rtl::OUString sFooterShapeService( "com.sun.star.presentation.FooterShape" );
sServiceName = sFooterShapeService;
bClearText = sal_True;
}
break;
case XML_sldNum :
{
- const rtl::OUString sSlideNumberShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.SlideNumberShape" ) );
+ const rtl::OUString sSlideNumberShapeService( "com.sun.star.presentation.SlideNumberShape" );
sServiceName = sSlideNumberShapeService;
bClearText = sal_True;
}
break;
case XML_sldImg :
{
- const rtl::OUString sPageShapeService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PageShape" ) );
+ const rtl::OUString sPageShapeService( "com.sun.star.presentation.PageShape" );
sServiceName = sPageShapeService;
}
break;
@@ -224,7 +224,7 @@ void PPTShape::addShape(
if ( meShapeLocation == Layout )
sServiceName = sOutlinerShapeService;
else {
- const rtl::OUString sChartService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.ChartShape" ) );
+ const rtl::OUString sChartService( "com.sun.star.presentation.ChartShape" );
sServiceName = sChartService;
}
break;
@@ -232,7 +232,7 @@ void PPTShape::addShape(
if ( meShapeLocation == Layout )
sServiceName = sOutlinerShapeService;
else {
- const rtl::OUString sTableService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.TableShape" ) );
+ const rtl::OUString sTableService( "com.sun.star.presentation.TableShape" );
sServiceName = sTableService;
}
break;
@@ -240,7 +240,7 @@ void PPTShape::addShape(
if ( meShapeLocation == Layout )
sServiceName = sOutlinerShapeService;
else {
- const rtl::OUString sGraphicObjectService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.GraphicObjectShape" ) );
+ const rtl::OUString sGraphicObjectService( "com.sun.star.presentation.GraphicObjectShape" );
sServiceName = sGraphicObjectService;
}
break;
@@ -248,7 +248,7 @@ void PPTShape::addShape(
if ( meShapeLocation == Layout )
sServiceName = sOutlinerShapeService;
else {
- const rtl::OUString sMediaService( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.MediaShape" ) );
+ const rtl::OUString sMediaService( "com.sun.star.presentation.MediaShape" );
sServiceName = sMediaService;
}
break;
diff --git a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
index dc8d519..46f807d 100644
--- a/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
+++ b/writerfilter/qa/cppunittests/odiapi/testProperty.cxx
@@ -52,7 +52,7 @@ OString getTempFileName(const OUString& fileName)
OUString ousTmpUrl;
FileBase::getTempDirURL(ousTmpUrl);
if (!ousTmpUrl.endsWithIgnoreAsciiCaseAsciiL("/", 1))
- ousTmpUrl += OUString(RTL_CONSTASCII_USTRINGPARAM("/"));
+ ousTmpUrl += OUString("/");
ousTmpUrl += fileName;
OUString sysTmpPath;
@@ -276,12 +276,12 @@ public:
pool->insert(ps4);
- OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_int.dot")));
+ OString tmpFileName = getTempFileName(OUString("testPropertyPool_int.dot"));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
pool->dump(&fl);
- OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropertyPool_ext.dot")));
+ OString tmpFileName2 = getTempFileName(OUString("testPropertyPool_ext.dot"));
printf("Pool dump: %s\n", tmpFileName2.getStr());
ExternalViewLoggerImpl evl(tmpFileName2.getStr());
pool->dump(&evl);
@@ -376,12 +376,12 @@ public:
CPPUNIT_ASSERT_MESSAGE("paraProps == failed failed", paraProps == paragraphProps);
- OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_int.dot")));
+ OString tmpFileName = getTempFileName(OUString("testComplexParaProps_int.dot"));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
pool->dump(&fl);
- OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testComplexParaProps_ext.dot")));
+ OString tmpFileName2 = getTempFileName(OUString("testComplexParaProps_ext.dot"));
printf("Pool dump: %s\n", tmpFileName2.getStr());
ExternalViewLoggerImpl evl(tmpFileName2.getStr());
pool->dump(&evl);
@@ -508,21 +508,21 @@ public:
pb2->insert(createStringProperty(NS_style::LN_font_face, "Roman"));
PropertyPoolHandle_Pointer_t ph2 = pool->insert(pb2);
- OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_1.dot")));
+ OString tmpFileName = getTempFileName(OUString("testPropPoolGarbageColl_1.dot"));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
pool->dump(&fl);
}
- OString tmpFileName = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_2.dot")));
+ OString tmpFileName = getTempFileName(OUString("testPropPoolGarbageColl_2.dot"));
printf("Pool dump: %s\n", tmpFileName.getStr());
FileLoggerImpl fl(tmpFileName.getStr());
pool->dump(&fl);
pool->garbageCollection();
- OString tmpFileName2 = getTempFileName(OUString(RTL_CONSTASCII_USTRINGPARAM("testPropPoolGarbageColl_after.dot")));
+ OString tmpFileName2 = getTempFileName(OUString("testPropPoolGarbageColl_after.dot"));
printf("Pool dump: %s\n", tmpFileName2.getStr());
FileLoggerImpl fl2(tmpFileName2.getStr());
pool->dump(&fl2);
diff --git a/writerfilter/source/dmapper/ConversionHelper.cxx b/writerfilter/source/dmapper/ConversionHelper.cxx
index 14978fd..cc6a88a 100644
--- a/writerfilter/source/dmapper/ConversionHelper.cxx
+++ b/writerfilter/source/dmapper/ConversionHelper.cxx
@@ -296,7 +296,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
//todo: this cannot be the right way to replace a part of the string!
aNewFormat[nI] = 'Y';
aNewFormat[nI + 1] = 'Y';
- aNewFormat.insert(nI + 2, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("YY")));
+ aNewFormat.insert(nI + 2, ::rtl::OUString("YY"));
nLen+=2;
nI+=3;
}
@@ -309,7 +309,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
//todo: this cannot be the right way to replace a part of the string!
aNewFormat[nI] = 'y';
aNewFormat[nI + 1] = 'y';
- aNewFormat.insert(nI + 2, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("yy")));
+ aNewFormat.insert(nI + 2, ::rtl::OUString("yy"));
nLen+=2;
nI+=3;
}
@@ -320,7 +320,7 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
// MM We have to escape '/' in case it's used as a char
//todo: this cannot be the right way to replace a part of the string!
aNewFormat[nI] = '\\';
- aNewFormat.insert(nI + 1, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")));
+ aNewFormat.insert(nI + 1, ::rtl::OUString("/"));
nI++;
nLen++;
}
@@ -333,18 +333,18 @@ bool lcl_IsNotAM(::rtl::OUString& rFmt, sal_Int32 nPos)
if (bForceJapanese)
{
- rLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ja"));
- rLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("JP"));
+ rLocale.Language = ::rtl::OUString("ja");
+ rLocale.Country = ::rtl::OUString("JP");
}
if (bForceNatNum)
{
- aNewFormat.insert( 0, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[NatNum1][$-411]")));
+ aNewFormat.insert( 0, ::rtl::OUString("[NatNum1][$-411]"));
}
if (bHijri)
{
- aNewFormat.insert( 0, ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("[~hijri]")));
+ aNewFormat.insert( 0, ::rtl::OUString("[~hijri]"));
}
return aNewFormat.makeStringAndClear();
diff --git a/writerfilter/source/dmapper/DomainMapper.cxx b/writerfilter/source/dmapper/DomainMapper.cxx
index b597ddf..5c45373 100644
--- a/writerfilter/source/dmapper/DomainMapper.cxx
+++ b/writerfilter/source/dmapper/DomainMapper.cxx
@@ -122,7 +122,7 @@ LoggedStream(dmapper_logger, "DomainMapper"),
(comphelper::OStorageHelper::GetStorageOfFormatFromInputStream(OFOPXML_STORAGE_FORMAT_STRING, xInputStream));
uno::Reference< uno::XInterface > xTemp = xContext->getServiceManager()->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.OOXMLDocumentPropertiesImporter")),
+ ::rtl::OUString("com.sun.star.document.OOXMLDocumentPropertiesImporter"),
xContext);
uno::Reference< document::XOOXMLDocumentPropertiesImporter > xImporter( xTemp, uno::UNO_QUERY_THROW );
@@ -3210,7 +3210,7 @@ void DomainMapper::lcl_startParagraphGroup()
{
m_pImpl->getTableManager().startParagraphGroup();
m_pImpl->PushProperties(CONTEXT_PARAGRAPH);
- static ::rtl::OUString sDefault(RTL_CONSTASCII_USTRINGPARAM("Standard") );
+ static ::rtl::OUString sDefault("Standard" );
if (m_pImpl->GetTopContext())
{
if (!m_pImpl->IsInShape())
@@ -3666,23 +3666,23 @@ rtl::OUString DomainMapper::getBracketStringFromEnum(const sal_Int32 nIntValue,
{
case 1:
if (bIsPrefix)
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "(" ));
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ")" ));
+ return rtl::OUString( "(" );
+ return rtl::OUString( ")" );
case 2:
if (bIsPrefix)
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "[" ));
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "]" ));
+ return rtl::OUString( "[" );
+ return rtl::OUString( "]" );
case 3:
if (bIsPrefix)
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "<" ));
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( ">" ));
+ return rtl::OUString( "<" );
+ return rtl::OUString( ">" );
case 4:
if (bIsPrefix)
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "{" ));
- return rtl::OUString( RTL_CONSTASCII_USTRINGPARAM ( "}" ));
+ return rtl::OUString( "{" );
+ return rtl::OUString( "}" );
case 0:
default:
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 5aa51ef..0f6b6fd 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -110,10 +110,10 @@ sal_Bool lcl_IsUsingEnhancedFields( const uno::Reference< lang::XMultiServiceFac
bool bResult(sal_False);
try
{
- rtl::OUString writerConfig = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Office.Common"));
+ rtl::OUString writerConfig = rtl::OUString( "org.openoffice.Office.Common");
uno::Reference< uno::XInterface > xCfgAccess = ::comphelper::ConfigurationHelper::openConfig( rFac, writerConfig, ::comphelper::ConfigurationHelper::E_READONLY );
- ::comphelper::ConfigurationHelper::readRelativeKey( xCfgAccess, rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Filter/Microsoft/Import" ) ), rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ImportWWFieldsAsEnhancedFields" ) ) ) >>= bResult;
+ ::comphelper::ConfigurationHelper::readRelativeKey( xCfgAccess, rtl::OUString( "Filter/Microsoft/Import" ), rtl::OUString( "ImportWWFieldsAsEnhancedFields" ) ) >>= bResult;
}
catch( uno::Exception& )
@@ -128,19 +128,19 @@ void lcl_handleDropdownField( const uno::Reference< beans::XPropertySet >& rxFie
if ( rxFieldProps.is() )
{
if ( !pFFDataHandler->getName().isEmpty() )
- rxFieldProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Name") ), uno::makeAny( pFFDataHandler->getName() ) );
+ rxFieldProps->setPropertyValue( rtl::OUString( "Name" ), uno::makeAny( pFFDataHandler->getName() ) );
const FFDataHandler::DropDownEntries_t& rEntries = pFFDataHandler->getDropDownEntries();
uno::Sequence< rtl::OUString > sItems( rEntries.size() );
::std::copy( rEntries.begin(), rEntries.end(), ::comphelper::stl_begin(sItems));
if ( sItems.getLength() )
- rxFieldProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Items") ), uno::makeAny( sItems ) );
+ rxFieldProps->setPropertyValue( rtl::OUString( "Items" ), uno::makeAny( sItems ) );
sal_Int32 nResult = pFFDataHandler->getDropDownResult().toInt32();
if ( nResult )
- rxFieldProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SelectedItem") ), uno::makeAny( sItems[ nResult ] ) );
+ rxFieldProps->setPropertyValue( rtl::OUString( "SelectedItem" ), uno::makeAny( sItems[ nResult ] ) );
if ( !pFFDataHandler->getHelpText().isEmpty() )
- rxFieldProps->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("Help") ), uno::makeAny( pFFDataHandler->getHelpText() ) );
+ rxFieldProps->setPropertyValue( rtl::OUString( "Help" ), uno::makeAny( pFFDataHandler->getHelpText() ) );
}
}
@@ -240,7 +240,7 @@ uno::Reference< container::XNameContainer > DomainMapper_Impl::GetPageStyles(
{
uno::Reference< style::XStyleFamiliesSupplier > xSupplier( m_xTextDocument, uno::UNO_QUERY );
if (xSupplier.is())
- xSupplier->getStyleFamilies()->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PageStyles"))) >>= m_xPageStyles;
+ xSupplier->getStyleFamilies()->getByName(::rtl::OUString("PageStyles")) >>= m_xPageStyles;
}
return m_xPageStyles;
}
@@ -261,7 +261,7 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::GetDocumentSettings()
if( !m_xDocumentSettings.is() && m_xTextFactory.is())
{
m_xDocumentSettings = uno::Reference< beans::XPropertySet >(
- m_xTextFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.Settings"))), uno::UNO_QUERY );
+ m_xTextFactory->createInstance(::rtl::OUString("com.sun.star.document.Settings")), uno::UNO_QUERY );
}
return m_xDocumentSettings;
}
@@ -1136,7 +1136,7 @@ void DomainMapper_Impl::appendTextContent(
void DomainMapper_Impl::appendOLE( const ::rtl::OUString& rStreamName, OLEHandlerPtr pOLEHandler )
{
- static const rtl::OUString sEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject"));
+ static const rtl::OUString sEmbeddedService("com.sun.star.text.TextEmbeddedObject");
try
{
uno::Reference< text::XTextContent > xOLE( m_xTextFactory->createInstance(sEmbeddedService), uno::UNO_QUERY_THROW );
@@ -1183,7 +1183,7 @@ void DomainMapper_Impl::appendStarMath( const Value& val )
val.getAny() >>= formula;
if( formula.is() )
{
- static const rtl::OUString sEmbeddedService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextEmbeddedObject"));
+ static const rtl::OUString sEmbeddedService("com.sun.star.text.TextEmbeddedObject");
try
{
uno::Reference< text::XTextContent > xStarMath( m_xTextFactory->createInstance(sEmbeddedService), uno::UNO_QUERY_THROW );
@@ -1232,7 +1232,7 @@ uno::Reference< beans::XPropertySet > DomainMapper_Impl::appendTextSectionAfter(
xCursor->gotoEnd( true );
//the paragraph after this new section is already inserted
xCursor->goLeft(1, true);
- static const rtl::OUString sSectionService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextSection"));
+ static const rtl::OUString sSectionService("com.sun.star.text.TextSection");
uno::Reference< text::XTextContent > xSection( m_xTextFactory->createInstance(sSectionService), uno::UNO_QUERY_THROW );
xSection->attach( uno::Reference< text::XTextRange >( xCursor, uno::UNO_QUERY_THROW) );
xRet = uno::Reference< beans::XPropertySet > (xSection, uno::UNO_QUERY );
@@ -1343,7 +1343,7 @@ void DomainMapper_Impl::PushFootOrEndnote( bool bIsFootnote )
if (GetTextFactory().is())
xFootnoteText.set( GetTextFactory()->createInstance(
bIsFootnote ?
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Footnote") ) : ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Endnote") )),
+ ::rtl::OUString( "com.sun.star.text.Footnote" ) : ::rtl::OUString( "com.sun.star.text.Endnote" )),
uno::UNO_QUERY_THROW );
uno::Reference< text::XFootnote > xFootnote( xFootnoteText, uno::UNO_QUERY_THROW );
pTopContext->SetFootnote( xFootnote );
@@ -1465,10 +1465,10 @@ void DomainMapper_Impl::PushAnnotation()
if (!GetTextFactory().is())
return;
m_xAnnotationField = uno::Reference< beans::XPropertySet >( GetTextFactory()->createInstance(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextField.Annotation") ) ),
+ ::rtl::OUString( "com.sun.star.text.TextField.Annotation" ) ),
uno::UNO_QUERY_THROW );
uno::Reference< text::XText > xAnnotationText;
- m_xAnnotationField->getPropertyValue(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextRange"))) >>= xAnnotationText;
+ m_xAnnotationField->getPropertyValue(::rtl::OUString( "TextRange")) >>= xAnnotationText;
m_aTextAppendStack.push(uno::Reference< text::XTextAppend >( xAnnotationText, uno::UNO_QUERY_THROW ));
}
catch( uno::Exception& )
@@ -1516,7 +1516,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
dmapper_logger->unoPropertySet(xProps);
#endif
uno::Reference< lang::XServiceInfo > xSInfo( xShape, uno::UNO_QUERY_THROW );
- bool bIsGraphic = xSInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicObjectShape" ) ) );
+ bool bIsGraphic = xSInfo->supportsService( rtl::OUString( "com.sun.star.drawing.GraphicObjectShape" ) );
// If there are position properties, the shape should not be inserted "as character".
sal_Int32 nHoriPosition = 0, nVertPosition = 0;
@@ -1533,7 +1533,7 @@ void DomainMapper_Impl::PushShapeContext( const uno::Reference< drawing::XShape
xProps->setPropertyValue(
rPropNameSupplier.GetName( PROP_OPAQUE ),
uno::makeAny( true ) );
- if (xSInfo->supportsService(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextFrame"))))
+ if (xSInfo->supportsService(rtl::OUString("com.sun.star.text.TextFrame")))
{
uno::Reference<text::XTextContent> xTextContent(xShape, uno::UNO_QUERY_THROW);
uno::Reference<text::XTextRange> xTextRange(xTextAppend->createTextCursorByRange(xTextAppend->getEnd()), uno::UNO_QUERY_THROW);
@@ -1739,7 +1739,7 @@ extract a parameter (with or without quotes) between the command and the followi
}
else
{
- nEndIndex = rCommand.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" \\")), nStartIndex);
+ nEndIndex = rCommand.indexOf( ::rtl::OUString(" \\"), nStartIndex);
}
::rtl::OUString sRet;
if( nEndIndex > nStartIndex + 1 )
@@ -1834,10 +1834,10 @@ void DomainMapper_Impl::SetNumberFormat( const ::rtl::OUString& rCommand,
{
OUString sFormatString = lcl_ParseFormat( rCommand );
// find \h - hijri/luna calendar todo: what about saka/era calendar?
- bool bHijri = 0 < rCommand.indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\h ")));
+ bool bHijri = 0 < rCommand.indexOf( ::rtl::OUString("\\h "));
lang::Locale aUSLocale;
- aUSLocale.Language = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("en"));
- aUSLocale.Country = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("US"));
+ aUSLocale.Language = ::rtl::OUString("en");
+ aUSLocale.Country = ::rtl::OUString("US");
//determine current locale - todo: is it necessary to initialize this locale?
lang::Locale aCurrentLocale = aUSLocale;
@@ -2047,67 +2047,67 @@ if(!bFilled)
{
static const FieldConversion aFields[] =
{
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ADDRESSBLOCK")), "", "", FIELD_ADDRESSBLOCK },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ADVANCE")), "", "", FIELD_ADVANCE },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ASK")), "SetExpression", "SetExpression", FIELD_ASK },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUM")), "SetExpression", "SetExpression", FIELD_AUTONUM },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUMLGL")), "SetExpression", "SetExpression", FIELD_AUTONUMLGL },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTONUMOUT")), "SetExpression", "SetExpression", FIELD_AUTONUMOUT },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AUTHOR")), "DocInfo.CreateAuthor", "", FIELD_AUTHOR },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DATE")), "DateTime", "", FIELD_DATE },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("COMMENTS")), "DocInfo.Description", "", FIELD_COMMENTS },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CREATEDATE")), "DocInfo.CreateDateTime", "", FIELD_CREATEDATE },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOCPROPERTY")), "", "", FIELD_DOCPROPERTY },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DOCVARIABLE")), "User", "", FIELD_DOCVARIABLE },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("EDITTIME")), "DocInfo.EditTime", "", FIELD_EDITTIME },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FILLIN")), "Input", "", FIELD_FILLIN },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FILENAME")), "FileName", "", FIELD_FILENAME },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FILESIZE")), "", "", FIELD_FILESIZE },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FORMULA")), "", "", FIELD_FORMULA },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FORMCHECKBOX")), "", "", FIELD_FORMCHECKBOX},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FORMDROPDOWN")), "DropDown", "", FIELD_FORMDROPDOWN},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FORMTEXT")), "Input", "", FIELD_FORMTEXT},
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GOTOBUTTON")), "", "", FIELD_GOTOBUTTON },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HYPERLINK")), "", "", FIELD_HYPERLINK },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IF")), "ConditionalText", "", FIELD_IF },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INFO")), "","", FIELD_INFO },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("INCLUDEPICTURE")), "", "", FIELD_INCLUDEPICTURE},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("KEYWORDS")), "DocInfo.KeyWords", "", FIELD_KEYWORDS },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LASTSAVEDBY")), "DocInfo.ChangeAuthor", "", FIELD_LASTSAVEDBY },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MACROBUTTON")), "Macro", "", FIELD_MACROBUTTON },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MERGEFIELD")), "Database", "Database", FIELD_MERGEFIELD},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MERGEREC")), "DatabaseNumberOfSet", "", FIELD_MERGEREC },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MERGESEQ")), "", "", FIELD_MERGESEQ },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NEXT")), "DatabaseNextSet", "", FIELD_NEXT },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NEXTIF")), "DatabaseNextSet", "", FIELD_NEXTIF },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PAGE")), "PageNumber", "", FIELD_PAGE },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PAGEREF")), "GetReference", "", FIELD_PAGEREF },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REF")), "GetReference", "", FIELD_REF },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("REVNUM")), "DocInfo.Revision", "", FIELD_REVNUM },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SAVEDATE")), "DocInfo.Change", "", FIELD_SAVEDATE },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SECTION")), "", "", FIELD_SECTION },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SECTIONPAGES")), "", "", FIELD_SECTIONPAGES },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SEQ")), "SetExpression", "SetExpression", FIELD_SEQ },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SET")), "","", FIELD_SET },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SKIPIF")),"", "", FIELD_SKIPIF },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("STYLEREF")),"", "", FIELD_STYLEREF },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SUBJECT")), "DocInfo.Subject", "", FIELD_SUBJECT },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SYMBOL")),"", "", FIELD_SYMBOL },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TEMPLATE")), "TemplateName", "", FIELD_TEMPLATE},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TIME")), "DateTime", "", FIELD_TIME },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TITLE")), "DocInfo.Title", "", FIELD_TITLE },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERINITIALS")), "Author", "", FIELD_USERINITIALS },
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERADDRESS")), "", "", FIELD_USERADDRESS },
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("USERNAME")), "Author", "", FIELD_USERNAME },
-
-
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TOC")), "com.sun.star.text.ContentIndex", "", FIELD_TOC},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TC")), "com.sun.star.text.ContentIndexMark", "", FIELD_TC},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMCHARS")), "CharacterCount", "", FIELD_NUMCHARS},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMWORDS")), "WordCount", "", FIELD_NUMWORDS},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("NUMPAGES")), "PageCount", "", FIELD_NUMPAGES},
-
-// {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("")), "", "", FIELD_},
+// {::rtl::OUString("ADDRESSBLOCK"), "", "", FIELD_ADDRESSBLOCK },
+// {::rtl::OUString("ADVANCE"), "", "", FIELD_ADVANCE },
+ {::rtl::OUString("ASK"), "SetExpression", "SetExpression", FIELD_ASK },
+ {::rtl::OUString("AUTONUM"), "SetExpression", "SetExpression", FIELD_AUTONUM },
+ {::rtl::OUString("AUTONUMLGL"), "SetExpression", "SetExpression", FIELD_AUTONUMLGL },
+ {::rtl::OUString("AUTONUMOUT"), "SetExpression", "SetExpression", FIELD_AUTONUMOUT },
+ {::rtl::OUString("AUTHOR"), "DocInfo.CreateAuthor", "", FIELD_AUTHOR },
+ {::rtl::OUString("DATE"), "DateTime", "", FIELD_DATE },
+ {::rtl::OUString("COMMENTS"), "DocInfo.Description", "", FIELD_COMMENTS },
+ {::rtl::OUString("CREATEDATE"), "DocInfo.CreateDateTime", "", FIELD_CREATEDATE },
+ {::rtl::OUString("DOCPROPERTY"), "", "", FIELD_DOCPROPERTY },
+ {::rtl::OUString("DOCVARIABLE"), "User", "", FIELD_DOCVARIABLE },
+ {::rtl::OUString("EDITTIME"), "DocInfo.EditTime", "", FIELD_EDITTIME },
+ {::rtl::OUString("FILLIN"), "Input", "", FIELD_FILLIN },
+ {::rtl::OUString("FILENAME"), "FileName", "", FIELD_FILENAME },
+// {::rtl::OUString("FILESIZE"), "", "", FIELD_FILESIZE },
+// {::rtl::OUString("FORMULA"), "", "", FIELD_FORMULA },
+ {::rtl::OUString("FORMCHECKBOX"), "", "", FIELD_FORMCHECKBOX},
+ {::rtl::OUString("FORMDROPDOWN"), "DropDown", "", FIELD_FORMDROPDOWN},
+ {::rtl::OUString("FORMTEXT"), "Input", "", FIELD_FORMTEXT},
+// {::rtl::OUString("GOTOBUTTON"), "", "", FIELD_GOTOBUTTON },
+ {::rtl::OUString("HYPERLINK"), "", "", FIELD_HYPERLINK },
+ {::rtl::OUString("IF"), "ConditionalText", "", FIELD_IF },
+// {::rtl::OUString("INFO"), "","", FIELD_INFO },
+// {::rtl::OUString("INCLUDEPICTURE"), "", "", FIELD_INCLUDEPICTURE},
+ {::rtl::OUString("KEYWORDS"), "DocInfo.KeyWords", "", FIELD_KEYWORDS },
+ {::rtl::OUString("LASTSAVEDBY"), "DocInfo.ChangeAuthor", "", FIELD_LASTSAVEDBY },
+ {::rtl::OUString("MACROBUTTON"), "Macro", "", FIELD_MACROBUTTON },
+ {::rtl::OUString("MERGEFIELD"), "Database", "Database", FIELD_MERGEFIELD},
+ {::rtl::OUString("MERGEREC"), "DatabaseNumberOfSet", "", FIELD_MERGEREC },
+// {::rtl::OUString("MERGESEQ"), "", "", FIELD_MERGESEQ },
+ {::rtl::OUString("NEXT"), "DatabaseNextSet", "", FIELD_NEXT },
+ {::rtl::OUString("NEXTIF"), "DatabaseNextSet", "", FIELD_NEXTIF },
+ {::rtl::OUString("PAGE"), "PageNumber", "", FIELD_PAGE },
+ {::rtl::OUString("PAGEREF"), "GetReference", "", FIELD_PAGEREF },
+ {::rtl::OUString("REF"), "GetReference", "", FIELD_REF },
+ {::rtl::OUString("REVNUM"), "DocInfo.Revision", "", FIELD_REVNUM },
+ {::rtl::OUString("SAVEDATE"), "DocInfo.Change", "", FIELD_SAVEDATE },
+// {::rtl::OUString("SECTION"), "", "", FIELD_SECTION },
+// {::rtl::OUString("SECTIONPAGES"), "", "", FIELD_SECTIONPAGES },
+ {::rtl::OUString("SEQ"), "SetExpression", "SetExpression", FIELD_SEQ },
+// {::rtl::OUString("SET"), "","", FIELD_SET },
+// {::rtl::OUString("SKIPIF"),"", "", FIELD_SKIPIF },
+// {::rtl::OUString("STYLEREF"),"", "", FIELD_STYLEREF },
+ {::rtl::OUString("SUBJECT"), "DocInfo.Subject", "", FIELD_SUBJECT },
+// {::rtl::OUString("SYMBOL"),"", "", FIELD_SYMBOL },
+ {::rtl::OUString("TEMPLATE"), "TemplateName", "", FIELD_TEMPLATE},
+ {::rtl::OUString("TIME"), "DateTime", "", FIELD_TIME },
+ {::rtl::OUString("TITLE"), "DocInfo.Title", "", FIELD_TITLE },
+ {::rtl::OUString("USERINITIALS"), "Author", "", FIELD_USERINITIALS },
+// {::rtl::OUString("USERADDRESS"), "", "", FIELD_USERADDRESS },
+ {::rtl::OUString("USERNAME"), "Author", "", FIELD_USERNAME },
+
+
+ {::rtl::OUString("TOC"), "com.sun.star.text.ContentIndex", "", FIELD_TOC},
+ {::rtl::OUString("TC"), "com.sun.star.text.ContentIndexMark", "", FIELD_TC},
+ {::rtl::OUString("NUMCHARS"), "CharacterCount", "", FIELD_NUMCHARS},
+ {::rtl::OUString("NUMWORDS"), "WordCount", "", FIELD_NUMWORDS},
+ {::rtl::OUString("NUMPAGES"), "PageCount", "", FIELD_NUMPAGES},
+
+// {::rtl::OUString(""), "", "", FIELD_},
};
size_t nConversions = SAL_N_ELEMENTS(aFields);
@@ -2134,9 +2134,9 @@ const FieldConversionMap_t & lcl_GetEnhancedFieldConversion()
{
static const FieldConversion aEnhancedFields[] =
{
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FORMCHECKBOX")), "FormFieldmark", "", FIELD_FORMCHECKBOX},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FORMDROPDOWN")), "FormFieldmark", "", FIELD_FORMDROPDOWN},
- {::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FORMTEXT")), "Fieldmark", "", FIELD_FORMTEXT},
+ {::rtl::OUString("FORMCHECKBOX"), "FormFieldmark", "", FIELD_FORMCHECKBOX},
+ {::rtl::OUString("FORMDROPDOWN"), "FormFieldmark", "", FIELD_FORMDROPDOWN},
+ {::rtl::OUString("FORMTEXT"), "Fieldmark", "", FIELD_FORMTEXT},
};
size_t nConversions = SAL_N_ELEMENTS(aEnhancedFields);
@@ -2204,7 +2204,7 @@ void DomainMapper_Impl::handleAutoNum
uno::Reference< beans::XPropertySet > xMaster =
FindOrCreateFieldMaster
("com.sun.star.text.FieldMaster.SetExpression",
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AutoNr") ));
+ rtl::OUString("AutoNr" ));
xMaster->setPropertyValue( rPropNameSupplier.GetName(PROP_SUB_TYPE),
uno::makeAny(text::SetVariableType::SEQUENCE));
@@ -2317,7 +2317,7 @@ void DomainMapper_Impl::handleAuthor
{
//create a custom property field
sServiceName +=
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DocInfo.Custom"));
+ ::rtl::OUString("DocInfo.Custom");
bIsCustomField = true;
}
else
@@ -2636,7 +2636,7 @@ void DomainMapper_Impl::CloseFieldCommand()
if( bCreateField || bCreateEnhancedField )
{
//add the service prefix
- OUString sServiceName(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text."));
+ OUString sServiceName("com.sun.star.text.");
if ( bCreateEnhancedField )
{
FieldConversionMap_t aEnhancedFieldConversionMap = lcl_GetEnhancedFieldConversion();
@@ -2646,7 +2646,7 @@ void DomainMapper_Impl::CloseFieldCommand()
}
else
{
- sServiceName += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TextField."));
+ sServiceName += rtl::OUString( "TextField.");
sServiceName += ::rtl::OUString::createFromAscii(aIt->second.cFieldServiceName );
}
@@ -2743,7 +2743,7 @@ void DomainMapper_Impl::CloseFieldCommand()
break;
case FIELD_FILENAME:
{
- sal_Int32 nNumberingTypeIndex = pContext->GetCommand().indexOf( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\p")));
+ sal_Int32 nNumberingTypeIndex = pContext->GetCommand().indexOf( ::rtl::OUString("\\p"));
if (xFieldProperties.is())
xFieldProperties->setPropertyValue(
rPropNameSupplier.GetName(PROP_FILE_FORMAT),
@@ -2872,7 +2872,7 @@ void DomainMapper_Impl::CloseFieldCommand()
FindOrCreateFieldMaster( "com.sun.star.text.FieldMaster.Database", sParam );
// xFieldProperties->setPropertyValue(
- // ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FieldCode")),
+ // ::rtl::OUString("FieldCode"),
// uno::makeAny( pContext->GetCommand().copy( nIndex + 1 )));
uno::Reference< text::XDependentTextField > xDependentField( xFieldInterface, uno::UNO_QUERY_THROW );
xDependentField->attachTextFieldMaster( xMaster );
@@ -3249,7 +3249,7 @@ void DomainMapper_Impl::AddBookmark( const ::rtl::OUString& rBookmarkName, const
{
if( aBookmarkIter != m_aBookmarkMap.end() )
{
- static const rtl::OUString sBookmarkService(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Bookmark"));
+ static const rtl::OUString sBookmarkService("com.sun.star.text.Bookmark");
if (m_xTextFactory.is())
{
uno::Reference< text::XTextContent > xBookmark( m_xTextFactory->createInstance( sBookmarkService ), uno::UNO_QUERY_THROW );
@@ -3490,7 +3490,7 @@ void DomainMapper_Impl::SetCurrentRedlineAuthor( rtl::OUString sAuthor )
pCurrent->m_sAuthor = sAuthor;
}
else
- m_xAnnotationField->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Author")),
+ m_xAnnotationField->setPropertyValue(rtl::OUString("Author"),
uno::makeAny(sAuthor));
}
@@ -3503,7 +3503,7 @@ void DomainMapper_Impl::SetCurrentRedlineDate( rtl::OUString sDate )
pCurrent->m_sDate = sDate;
}
else
- m_xAnnotationField->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DateTimeValue")),
+ m_xAnnotationField->setPropertyValue(rtl::OUString("DateTimeValue"),
uno::makeAny(lcl_DateStringToDateTime(sDate)));
}
@@ -3549,7 +3549,7 @@ void DomainMapper_Impl::ApplySettingsTable()
try
{
uno::Reference< beans::XPropertySet > xTextDefaults(
- m_xTextFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Defaults"))), uno::UNO_QUERY_THROW );
+ m_xTextFactory->createInstance(::rtl::OUString("com.sun.star.text.Defaults")), uno::UNO_QUERY_THROW );
sal_Int32 nDefTab = m_pSettingsTable->GetDefaultTabStop();
xTextDefaults->setPropertyValue( PropertyNameSupplier::GetPropertyNameSupplier().GetName( PROP_TAB_STOP_DISTANCE ), uno::makeAny(nDefTab) );
if (m_pSettingsTable->GetLinkStyles())
diff --git a/writerfilter/source/dmapper/GraphicImport.cxx b/writerfilter/source/dmapper/GraphicImport.cxx
index 5429bbc..afab11e 100644
--- a/writerfilter/source/dmapper/GraphicImport.cxx
+++ b/writerfilter/source/dmapper/GraphicImport.cxx
@@ -895,10 +895,10 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
( xShape, uno::UNO_QUERY_THROW );
rtl::OUString sUrl;
- xShapeProps->getPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("GraphicURL")) ) >>= sUrl;
+ xShapeProps->getPropertyValue( rtl::OUString("GraphicURL") ) >>= sUrl;
::com::sun::star::beans::PropertyValues aMediaProperties( 1 );
- aMediaProperties[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("URL"));
+ aMediaProperties[0].Name = rtl::OUString("URL");
aMediaProperties[0].Value <<= sUrl;
m_xGraphicObject = createGraphicObject( aMediaProperties );
@@ -911,9 +911,9 @@ void GraphicImport::lcl_attribute(Id nName, Value & val)
uno::Reference< beans::XPropertySet > xGraphProps( m_xGraphicObject,
uno::UNO_QUERY );
awt::Size aSize = xShape->getSize( );
- xGraphProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Height")),
+ xGraphProps->setPropertyValue( rtl::OUString("Height"),
uno::makeAny( aSize.Height ) );
- xGraphProps->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Width")),
+ xGraphProps->setPropertyValue( rtl::OUString("Width"),
uno::makeAny( aSize.Width ) );
}
}
@@ -1283,7 +1283,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
{
uno::Reference< graphic::XGraphicProvider > xGraphicProvider(
m_xComponentContext->getServiceManager()->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.graphic.GraphicProvider")),
+ ::rtl::OUString("com.sun.star.graphic.GraphicProvider"),
m_xComponentContext),
uno::UNO_QUERY_THROW );
@@ -1294,7 +1294,7 @@ uno::Reference< text::XTextContent > GraphicImport::createGraphicObject( const b
PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
uno::Reference< beans::XPropertySet > xGraphicObjectProperties(
- m_xTextFactory->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextGraphicObject"))),
+ m_xTextFactory->createInstance(::rtl::OUString("com.sun.star.text.TextGraphicObject")),
uno::UNO_QUERY_THROW);
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_GRAPHIC), uno::makeAny( xGraphic ));
xGraphicObjectProperties->setPropertyValue(rPropNameSupplier.GetName(PROP_ANCHOR_TYPE),
diff --git a/writerfilter/source/dmapper/NumberingManager.cxx b/writerfilter/source/dmapper/NumberingManager.cxx
index 68a3251..7691410 100644
--- a/writerfilter/source/dmapper/NumberingManager.cxx
+++ b/writerfilter/source/dmapper/NumberingManager.cxx
@@ -460,7 +460,7 @@ ListDef::~ListDef( )
OUString ListDef::GetStyleName( sal_Int32 nId )
{
- OUString sStyleName( RTL_CONSTASCII_USTRINGPARAM("WWNum") );
+ OUString sStyleName( "WWNum" );
sStyleName += OUString::valueOf( nId );
return sStyleName;
@@ -497,7 +497,7 @@ uno::Reference< container::XNameContainer > lcl_getUnoNumberingStyles(
try
{
uno::Reference< style::XStyleFamiliesSupplier > xFamilies( xFactory, uno::UNO_QUERY_THROW );
- uno::Any oFamily = xFamilies->getStyleFamilies( )->getByName( OUString(RTL_CONSTASCII_USTRINGPARAM("NumberingStyles")) );
+ uno::Any oFamily = xFamilies->getStyleFamilies( )->getByName( OUString("NumberingStyles") );
oFamily >>= xStyles;
}
@@ -522,7 +522,7 @@ void ListDef::CreateNumberingRules( DomainMapper& rDMapper,
// Create the numbering style
uno::Reference< beans::XPropertySet > xStyle (
xFactory->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.style.NumberingStyle"))),
+ OUString("com.sun.star.style.NumberingStyle")),
uno::UNO_QUERY_THROW );
rtl::OUString sStyleName = GetStyleName( GetId( ) );
diff --git a/writerfilter/source/dmapper/SettingsTable.cxx b/writerfilter/source/dmapper/SettingsTable.cxx
index 1012d7b..ab89c6a 100644
--- a/writerfilter/source/dmapper/SettingsTable.cxx
+++ b/writerfilter/source/dmapper/SettingsTable.cxx
@@ -236,7 +236,7 @@ void SettingsTable::ApplyProperties( uno::Reference< text::XTextDocument > xDoc
// Record changes value
if (xDocProps.is())
- xDocProps->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RecordChanges")), uno::makeAny( m_pImpl->m_bRecordChanges ) );
+ xDocProps->setPropertyValue( ::rtl::OUString("RecordChanges"), uno::makeAny( m_pImpl->m_bRecordChanges ) );
}
diff --git a/writerfilter/source/dmapper/StyleSheetTable.cxx b/writerfilter/source/dmapper/StyleSheetTable.cxx
index cdfecdb..55efe7f 100644
--- a/writerfilter/source/dmapper/StyleSheetTable.cxx
+++ b/writerfilter/source/dmapper/StyleSheetTable.cxx
@@ -866,7 +866,7 @@ void StyleSheetTable::ApplyStyleSheets( FontTablePtr rFontTable )
( *aNextStyleIt )->sStyleName == pEntry->sNextStyleIdentifier)
{
beans::PropertyValue aNew;
- aNew.Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FollowStyle"));
+ aNew.Name = ::rtl::OUString("FollowStyle");
aNew.Value = uno::makeAny(ConvertStyleName( ( *aNextStyleIt )->sStyleIdentifierD ));
aSortedPropVals.Insert( aNew );
break;
@@ -1179,7 +1179,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties)
if(!m_pImpl->m_xTextDefaults.is())
{
m_pImpl->m_xTextDefaults = uno::Reference< beans::XPropertySet>(
- m_pImpl->m_rDMapper.GetTextFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.Defaults"))),
+ m_pImpl->m_rDMapper.GetTextFactory()->createInstance(::rtl::OUString("com.sun.star.text.Defaults")),
uno::UNO_QUERY_THROW );
}
PropertyNameSupplier& rPropNameSupplier = PropertyNameSupplier::GetPropertyNameSupplier();
@@ -1230,7 +1230,7 @@ void StyleSheetTable::applyDefaults(bool bParaProperties)
uno::Reference< style::XStyleFamiliesSupplier > xStylesSupplier( m_pImpl->m_xTextDocument, uno::UNO_QUERY_THROW );
uno::Reference< container::XNameAccess > xStyleFamilies = xStylesSupplier->getStyleFamilies();
uno::Reference<container::XNameContainer> xCharStyles;
- xStyleFamilies->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CharacterStyles"))) >>= xCharStyles;
+ xStyleFamilies->getByName(::rtl::OUString("CharacterStyles")) >>= xCharStyles;
//search for all character styles with the name sListLabel + <index>
sal_Int32 nStyleFound = 0;
uno::Sequence< ::rtl::OUString > aStyleNames = xCharStyles->getElementNames();
diff --git a/writerfilter/source/filter/WriterFilterDetection.cxx b/writerfilter/source/filter/WriterFilterDetection.cxx
index 8475dab..73a66e9 100644
--- a/writerfilter/source/filter/WriterFilterDetection.cxx
+++ b/writerfilter/source/filter/WriterFilterDetection.cxx
@@ -53,7 +53,7 @@ WriterFilterDetection::~WriterFilterDetection()
OUString WriterFilterDetection_getImplementationName () throw (uno::RuntimeException)
{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.WriterFilterDetector" ) );
+ return OUString ( "com.sun.star.comp.Writer.WriterFilterDetector" );
}
#define SERVICE_NAME1 "com.sun.star.document.ExtendedTypeDetection"
@@ -93,10 +93,10 @@ OUString WriterFilterDetection::detect( uno::Sequence< beans::PropertyValue >& r
{
SotStorageRef xStg = new SotStorage( pStream, sal_False );
- bool bTable2 = xStg->IsContained( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("1Table")));
+ bool bTable2 = xStg->IsContained( rtl::OUString("1Table"));
SotStorageStreamRef xRef =
- xStg->OpenSotStream(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WordDocument")),
+ xStg->OpenSotStream(rtl::OUString("WordDocument"),
STREAM_STD_READ | STREAM_NOCREATE );
@@ -156,7 +156,7 @@ uno::Sequence< OUString > WriterFilterDetection_getSupportedServiceNames( ) thr
{
uno::Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
+ pArray[0] = OUString ( SERVICE_NAME1 );
return aRet;
}
#undef SERVICE_NAME1
diff --git a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
index e96ab69..e2a5c78 100644
--- a/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
+++ b/writerfilter/source/ooxml/OOXMLStreamImpl.cxx
@@ -105,23 +105,23 @@ bool OOXMLStreamImpl::lcl_getTarget(uno::Reference<embed::XRelationshipAccess>
// use '/' to representent the root of the zip package ( and provide a 'file' scheme to
// keep the XUriReference implementation happy )
// add mspath to represent the 'source' of this stream
- uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("file:///" ) ) + msPath );
-
- static rtl::OUString sType(RTL_CONSTASCII_USTRINGPARAM("Type"));
- static rtl::OUString sId(RTL_CONSTASCII_USTRINGPARAM("Id"));
- static rtl::OUString sDocumentType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument"));
- static rtl::OUString sStylesType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles"));
- static rtl::OUString sNumberingType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering"));
- static rtl::OUString sFonttableType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable"));
- static rtl::OUString sFootnotesType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes"));
- static rtl::OUString sEndnotesType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes"));
- static rtl::OUString sCommentsType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments"));
- static rtl::OUString sThemeType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme"));
- static rtl::OUString sSettingsType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings"));
- static rtl::OUString sTarget(RTL_CONSTASCII_USTRINGPARAM("Target"));
- static rtl::OUString sTargetMode(RTL_CONSTASCII_USTRINGPARAM("TargetMode"));
- static rtl::OUString sExternal(RTL_CONSTASCII_USTRINGPARAM("External"));
- static rtl::OUString sVBAProjectType(RTL_CONSTASCII_USTRINGPARAM("http://schemas.microsoft.com/office/2006/relationships/vbaProject"));
+ uno::Reference< com::sun::star::uri::XUriReference > xBase = xFac->parse( rtl::OUString( "file:///" ) + msPath );
+
+ static rtl::OUString sType("Type");
+ static rtl::OUString sId("Id");
+ static rtl::OUString sDocumentType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/officeDocument");
+ static rtl::OUString sStylesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/styles");
+ static rtl::OUString sNumberingType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/numbering");
+ static rtl::OUString sFonttableType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/fontTable");
+ static rtl::OUString sFootnotesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/footnotes");
+ static rtl::OUString sEndnotesType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/endnotes");
+ static rtl::OUString sCommentsType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/comments");
+ static rtl::OUString sThemeType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/theme");
+ static rtl::OUString sSettingsType("http://schemas.openxmlformats.org/officeDocument/2006/relationships/settings");
+ static rtl::OUString sTarget("Target");
+ static rtl::OUString sTargetMode("TargetMode");
+ static rtl::OUString sExternal("External");
+ static rtl::OUString sVBAProjectType("http://schemas.microsoft.com/office/2006/relationships/vbaProject");
rtl::OUString sStreamType;
@@ -280,7 +280,7 @@ uno::Reference<xml::sax::XParser> OOXMLStreamImpl::getParser()
uno::Reference<xml::sax::XParser> xParser
(xFactory->createInstanceWithContext
- ( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")),
+ ( rtl::OUString("com.sun.star.xml.sax.Parser"),
mxContext ),
uno::UNO_QUERY );
diff --git a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
index 8f3e73e..9b2569a 100644
--- a/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
+++ b/writerfilter/unocomponent/debugservices/rtftok/ScannerTestService.cxx
@@ -134,7 +134,7 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
aArgs0[0] <<= myStream;
uno::Reference< container::XNameContainer > xNameContainer(
xServiceFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
+ ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"),
aArgs0 ),
uno::UNO_QUERY_THROW );
try {
@@ -151,7 +151,7 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement(
rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW);
- xContentStreamPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.oleobject"))));
+ xContentStreamPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.sun.star.oleobject")));
uno::Reference<io::XOutputStream> myOutStream=xContentStream->getOutputStream();
uno::Sequence< ::sal_Int8 > seq1(binLen);
unsigned char *data1=binBufferStr;
@@ -176,21 +176,21 @@ class MyRtfScannerHandler : public writerfilter::rtftok::RTFScannerHandler
uno::Reference< io::XStream > xContentStream = xStorage->openStreamElement(
rtl::OUString::createFromAscii(buf), embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE );
uno::Reference<beans::XPropertySet> xContentStreamPropSet(xContentStream, uno::UNO_QUERY_THROW);
- xContentStreamPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.sun.star.oleobject"))));
+ xContentStreamPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.sun.star.oleobject")));
printf("CONTENT STREAM OK\n");
uno::Sequence< uno::Any > aArgs1( 1 );
aArgs1[0] <<= xContentStream;
uno::Reference< container::XNameContainer > xNameContainer2(
xServiceFactory->createInstanceWithArguments(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.OLESimpleStorage")),
+ ::rtl::OUString("com.sun.star.embed.OLESimpleStorage"),
aArgs1 ),
uno::UNO_QUERY_THROW );
printf("OLE STORAGE OK\n");
uno::Any anyStream;
anyStream <<= myInStream;
- xNameContainer2->insertByName(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\1Ole10Native")), anyStream);
+ xNameContainer2->insertByName(rtl::OUString("\1Ole10Native"), anyStream);
printf("INSERT OK\n");
uno::Reference<embed::XTransactedObject> xTransact(xNameContainer2, uno::UNO_QUERY);
@@ -282,7 +282,7 @@ public:
bytesTotal=xSeekable->getLength();
if (xStatusIndicator.is() && xSeekable.is())
{
- xStatusIndicator->start(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Converting")), 100);
+ xStatusIndicator->start(::rtl::OUString("Converting"), 100);
}
}
@@ -334,8 +334,8 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
printf("TEST\n");
uno::Sequence<uno::Any> aUcbInitSequence(2);
- aUcbInitSequence[0] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Local"));
- aUcbInitSequence[1] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office"));
+ aUcbInitSequence[0] <<= rtl::OUString("Local");
+ aUcbInitSequence[1] <<= rtl::OUString("Office");
uno::Reference<lang::XMultiServiceFactory> xServiceFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW);
printf("A\n");
uno::Reference<lang::XMultiComponentFactory> xFactory(xContext->getServiceManager(), uno::UNO_QUERY_THROW );
@@ -347,7 +347,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
uno::Reference<com::sun::star::ucb::XSimpleFileAccess> xFileAccess(
xFactory->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.ucb.SimpleFileAccess")),
+ ::rtl::OUString("com.sun.star.ucb.SimpleFileAccess"),
xContext), uno::UNO_QUERY_THROW );
rtl_uString *dir=NULL;
@@ -357,7 +357,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
rtl_uString_release(dir);
uno::Reference <lang::XSingleServiceFactory> xStorageFactory(
- xServiceFactory->createInstance (rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.embed.StorageFactory"))), uno::UNO_QUERY_THROW);
+ xServiceFactory->createInstance (rtl::OUString("com.sun.star.embed.StorageFactory")), uno::UNO_QUERY_THROW);
rtl::OUString outFileUrl;
{
@@ -372,7 +372,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
aArgs2[1] <<= embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE;
uno::Reference<embed::XStorage> xStorage(xStorageFactory->createInstanceWithArguments(aArgs2), uno::UNO_QUERY_THROW);
uno::Reference<beans::XPropertySet> xPropSet(xStorage, uno::UNO_QUERY_THROW);
- xPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("application/vnd.oasis.opendocument.text"))));
+ xPropSet->setPropertyValue(rtl::OUString("MediaType"), uno::makeAny(rtl::OUString("application/vnd.oasis.opendocument.text")));
uno::Reference<io::XInputStream> xInputStream = xFileAccess->openFileRead(absFileUrl);
uno::Reference< task::XStatusIndicator > xStatusIndicator;
@@ -403,7 +403,7 @@ sal_Int32 SAL_CALL ScannerTestService::run( const uno::Sequence< rtl::OUString >
::rtl::OUString ScannerTestService_getImplementationName ()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( ScannerTestService::IMPLEMENTATION_NAME ));
+ return rtl::OUString(ScannerTestService::IMPLEMENTATION_NAME );
}
sal_Bool SAL_CALL ScannerTestService_supportsService( const ::rtl::OUString& ServiceName )
@@ -414,7 +414,7 @@ uno::Sequence< rtl::OUString > SAL_CALL ScannerTestService_getSupportedServiceNa
{
uno::Sequence < rtl::OUString > aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM ( ScannerTestService::SERVICE_NAME ));
+ pArray[0] = rtl::OUString(ScannerTestService::SERVICE_NAME );
return aRet;
}
commit 397fd0189a810d6b04ad9831a12fa232aeeae474
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 14:42:22 2012 -0500
targeted string re-work
Change-Id: Ifa58823b593a545c66ef78ebe13e576127e60dc9
diff --git a/svtools/source/filter/FilterConfigCache.cxx b/svtools/source/filter/FilterConfigCache.cxx
index 7a52d8a..da5b879 100644
--- a/svtools/source/filter/FilterConfigCache.cxx
+++ b/svtools/source/filter/FilterConfigCache.cxx
@@ -93,7 +93,7 @@ sal_Bool FilterConfigCache::FilterConfigCacheEntry::CreateFilterName( const OUSt
if ( sFilterName.EqualsIgnoreCaseAscii( *pPtr ) )
bIsPixelFormat = sal_True;
}
- rtl::OUString sTemp(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("?")));
+ rtl::OUString sTemp(SVLIBRARY("?"));
sal_Int32 nIndex = sTemp.indexOf(static_cast<sal_Unicode>('?'));
sFilterName = sTemp.replaceAt(nIndex, 1, sFilterName);
}
@@ -127,8 +127,8 @@ String FilterConfigCache::FilterConfigCacheEntry::GetShortName()
Reference< XInterface > openConfig(const char* sPackage)
throw(RuntimeException)
{
- static OUString TYPEPKG( RTL_CONSTASCII_USTRINGPARAM( "types" ) );
- static OUString FILTERPKG( RTL_CONSTASCII_USTRINGPARAM( "filters" ) );
+ static OUString TYPEPKG( "types" );
+ static OUString FILTERPKG( "filters" );
Reference< XMultiServiceFactory > xSMGR(
comphelper::getProcessServiceFactory() );
@@ -137,7 +137,7 @@ Reference< XInterface > openConfig(const char* sPackage)
{
// get access to config API (not to file!)
Reference< XMultiServiceFactory > xConfigProvider( xSMGR->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationProvider" ))), UNO_QUERY);
+ OUString( "com.sun.star.configuration.ConfigurationProvider" )), UNO_QUERY);
if (xConfigProvider.is())
{
@@ -145,16 +145,16 @@ Reference< XInterface > openConfig(const char* sPackage)
PropertyValue aParam ;
// define cfg path for open
- aParam.Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "nodepath" ));
+ aParam.Name = OUString( "nodepath" );
if (TYPEPKG.equalsIgnoreAsciiCaseAscii(sPackage))
- aParam.Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.TypeDetection.Types/Types" ));
+ aParam.Value <<= OUString( "/org.openoffice.TypeDetection.Types/Types" );
if (FILTERPKG.equalsIgnoreAsciiCaseAscii(sPackage))
- aParam.Value <<= OUString( RTL_CONSTASCII_USTRINGPARAM( "/org.openoffice.TypeDetection.GraphicFilter/Filters" ));
+ aParam.Value <<= OUString( "/org.openoffice.TypeDetection.GraphicFilter/Filters" );
lParams[0] = makeAny(aParam);
// get access to file
xCfg = xConfigProvider->createInstanceWithArguments(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.configuration.ConfigurationAccess" )), lParams);
+ OUString( "com.sun.star.configuration.ConfigurationAccess" ), lParams);
}
}
catch(const RuntimeException&)
@@ -167,14 +167,14 @@ Reference< XInterface > openConfig(const char* sPackage)
void FilterConfigCache::ImplInit()
{
- static OUString STYPE ( RTL_CONSTASCII_USTRINGPARAM( "Type" ) );
- static OUString SUINAME ( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) );
- static OUString SUICOMPONENT ( RTL_CONSTASCII_USTRINGPARAM( "UIComponent" ) );
- static OUString SFLAGS ( RTL_CONSTASCII_USTRINGPARAM( "Flags" ) );
- static OUString SMEDIATYPE ( RTL_CONSTASCII_USTRINGPARAM( "MediaType" ) );
- static OUString SEXTENSIONS ( RTL_CONSTASCII_USTRINGPARAM( "Extensions" ) );
- static OUString SFORMATNAME ( RTL_CONSTASCII_USTRINGPARAM( "FormatName" ) );
- static OUString SREALFILTERNAME ( RTL_CONSTASCII_USTRINGPARAM( "RealFilterName" ) );
+ static OUString STYPE ( "Type" );
+ static OUString SUINAME ( "UIName" );
+ static OUString SUICOMPONENT ( "UIComponent" );
+ static OUString SFLAGS ( "Flags" );
+ static OUString SMEDIATYPE ( "MediaType" );
+ static OUString SEXTENSIONS ( "Extensions" );
+ static OUString SFORMATNAME ( "FormatName" );
+ static OUString SREALFILTERNAME ( "RealFilterName" );
// get access to config
Reference< XNameAccess > xTypeAccess ( openConfig("types" ), UNO_QUERY );
diff --git a/svtools/source/graphic/descriptor.cxx b/svtools/source/graphic/descriptor.cxx
index 378162d..e5ee32d 100644
--- a/svtools/source/graphic/descriptor.cxx
+++ b/svtools/source/graphic/descriptor.cxx
@@ -185,7 +185,7 @@ void GraphicDescriptor::implCreate( SvStream& rIStm, const ::rtl::OUString* pURL
::rtl::OUString GraphicDescriptor::getImplementationName_Static()
throw()
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.graphic.GraphicDescriptor" ) );
+ return ::rtl::OUString( "com.sun.star.comp.graphic.GraphicDescriptor" );
}
// ------------------------------------------------------------------------------
@@ -195,7 +195,7 @@ uno::Sequence< ::rtl::OUString > GraphicDescriptor::getSupportedServiceNames_Sta
{
uno::Sequence< ::rtl::OUString > aSeq( 1 );
- aSeq.getArray()[ 0 ] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicDescriptor" ) );
+ aSeq.getArray()[ 0 ] = ::rtl::OUString( "com.sun.star.graphic.GraphicDescriptor" );
return aSeq;
}
@@ -395,7 +395,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
}
if( aMimeType.isEmpty() && ( mpGraphic->GetType() != GRAPHIC_NONE ) )
- aMimeType = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( MIMETYPE_VCLGRAPHIC ));
+ aMimeType = ::rtl::OUString(MIMETYPE_VCLGRAPHIC );
}
else
aMimeType = maMimeType;
diff --git a/svtools/source/misc/svtaccessiblefactory.cxx b/svtools/source/misc/svtaccessiblefactory.cxx
index 2981754..ca15bf5 100644
--- a/svtools/source/misc/svtaccessiblefactory.cxx
+++ b/svtools/source/misc/svtaccessiblefactory.cxx
@@ -282,13 +282,11 @@ namespace svt
// load the library implementing the factory
if ( !s_pFactory.get() )
{
- const ::rtl::OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(
- SVLIBRARY( "acc" )
- ));
+ const ::rtl::OUString sModuleName( SVLIBRARY( "acc" ));
s_hAccessibleImplementationModule = osl_loadModuleRelative( &thisModule, sModuleName.pData, 0 );
if ( s_hAccessibleImplementationModule != NULL )
{
- const ::rtl::OUString sFactoryCreationFunc( RTL_CONSTASCII_USTRINGPARAM( "getSvtAccessibilityComponentFactory" ));
+ const ::rtl::OUString sFactoryCreationFunc( "getSvtAccessibilityComponentFactory" );
s_pAccessibleFactoryFunc = (GetSvtAccessibilityComponentFactory)
osl_getFunctionSymbol( s_hAccessibleImplementationModule, sFactoryCreationFunc.pData );
diff --git a/svtools/source/uno/addrtempuno.cxx b/svtools/source/uno/addrtempuno.cxx
index 3cb151f..84a2e58 100644
--- a/svtools/source/uno/addrtempuno.cxx
+++ b/svtools/source/uno/addrtempuno.cxx
@@ -111,7 +111,7 @@ namespace svt
OAddressBookSourceDialogUno::OAddressBookSourceDialogUno(const Reference< XMultiServiceFactory >& _rxORB)
:OGenericUnoDialog(_rxORB)
{
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_ALIASES)), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY,
+ registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_ALIASES), UNODIALOG_PROPERTY_ID_ALIASES, PropertyAttribute::READONLY,
&m_aAliases, getCppuType(&m_aAliases));
}
@@ -137,7 +137,7 @@ namespace svt
//-------------------------------------------------------------------------
::rtl::OUString OAddressBookSourceDialogUno::getImplementationName_Static() throw(RuntimeException)
{
- return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" ));
+ return ::rtl::OUString( "com.sun.star.comp.svtools.OAddressBookSourceDialogUno" );
}
//-------------------------------------------------------------------------
@@ -150,7 +150,7 @@ namespace svt
::comphelper::StringSequence OAddressBookSourceDialogUno::getSupportedServiceNames_Static() throw(RuntimeException)
{
::comphelper::StringSequence aSupported(1);
- aSupported.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.ui.AddressBookSourceDialog" ));
+ aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.ui.AddressBookSourceDialog" );
return aSupported;
}
diff --git a/svtools/source/uno/genericunodialog.cxx b/svtools/source/uno/genericunodialog.cxx
index 2a05225..c4f8d90 100644
--- a/svtools/source/uno/genericunodialog.cxx
+++ b/svtools/source/uno/genericunodialog.cxx
@@ -65,9 +65,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XMultiServiceFactory >& _r
,m_bNeedInitialization( false )
,m_aContext( _rxORB )
{
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
&m_sTitle, getCppuType(&m_sTitle));
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_PARENT)), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
&m_xParent, getCppuType(&m_xParent));
}
@@ -82,9 +82,9 @@ OGenericUnoDialog::OGenericUnoDialog(const Reference< XComponentContext >& _rxCo
,m_bNeedInitialization( false )
,m_aContext(_rxContext)
{
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_TITLE), UNODIALOG_PROPERTY_ID_TITLE, PropertyAttribute::TRANSIENT,
&m_sTitle, getCppuType(&m_sTitle));
- registerProperty(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_PARENT)), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
+ registerProperty(::rtl::OUString(UNODIALOG_PROPERTY_PARENT), UNODIALOG_PROPERTY_ID_PARENT, PropertyAttribute::TRANSIENT,
&m_xParent, getCppuType(&m_xParent));
}
@@ -180,7 +180,7 @@ void SAL_CALL OGenericUnoDialog::setTitle( const ::rtl::OUString& _rTitle ) thro
try
{
- setPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(UNODIALOG_PROPERTY_TITLE)), makeAny(_rTitle));
+ setPropertyValue(::rtl::OUString(UNODIALOG_PROPERTY_TITLE), makeAny(_rTitle));
}
catch(RuntimeException&)
{
@@ -242,7 +242,7 @@ sal_Int16 SAL_CALL OGenericUnoDialog::execute( ) throw(RuntimeException)
if (m_bExecuting)
throw RuntimeException(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "already executing the dialog (recursive call)" ) ),
+ ::rtl::OUString( "already executing the dialog (recursive call)" ),
*this
);
commit d760c4427a2f14002a809c9121c7df89e19b31fb
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 14:36:09 2012 -0500
targeted string re-work
Change-Id: Iaa2b9518d7f24960749a83508a2122364a2b05e9
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index 4c5fa1c..f161636 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -211,7 +211,7 @@ OUString replaceSaveInName(
const OUString& rSaveInName )
{
OUString name;
- OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%SAVE IN SELECTION%" ));
+ OUString placeholder("%SAVE IN SELECTION%" );
sal_Int32 pos = rMessage.indexOf( placeholder );
@@ -251,10 +251,10 @@ generateCustomName(
{
// find and replace the %n placeholder in the prefix string
OUString name;
- OUString placeholder(RTL_CONSTASCII_USTRINGPARAM( "%n" ));
+ OUString placeholder("%n" );
sal_Int32 pos = prefix.indexOf(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "%n" )) );
+ OUString("%n" ) );
if ( pos != -1 )
{
@@ -301,8 +301,8 @@ OUString
generateCustomURL(
SvxEntries* entries )
{
- OUString url = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL ));
- url += OUString(RTL_CONSTASCII_USTRINGPARAM( CUSTOM_TOOLBAR_STR ));
+ OUString url = OUString(ITEM_TOOLBAR_URL );
+ url += OUString(CUSTOM_TOOLBAR_STR );
// use a random number to minimize possible clash with existing custom toolbars
url += OUString::valueOf( sal_Int64( generateRandomValue() ), 16 );
@@ -336,7 +336,7 @@ generateCustomMenuURL(
SvxEntries* entries,
sal_Int32 suffix = 1 )
{
- OUString url(RTL_CONSTASCII_USTRINGPARAM( CUSTOM_MENU_STR ));
+ OUString url(CUSTOM_MENU_STR );
url += OUString::valueOf( suffix );
// now check is there is an already existing entry with this url
@@ -415,29 +415,29 @@ OUString GetModuleName( const OUString& aModuleId )
{
if ( aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.TextDocument" ) ) ||
aModuleId.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.text.GlobalDocument" ) ) )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer"));
+ return OUString("Writer");
else if ( aModuleId == "com.sun.star.text.WebDocument" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Writer/Web"));
+ return OUString("Writer/Web");
else if ( aModuleId == "com.sun.star.drawing.DrawingDocument" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Draw"));
+ return OUString("Draw");
else if ( aModuleId == "com.sun.star.presentation.PresentationDocument" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Impress"));
+ return OUString("Impress");
else if ( aModuleId == "com.sun.star.sheet.SpreadsheetDocument" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Calc"));
+ return OUString("Calc");
else if ( aModuleId == "com.sun.star.script.BasicIDE" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Basic"));
+ return OUString("Basic");
else if ( aModuleId == "com.sun.star.formula.FormulaProperties" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Math"));
+ return OUString("Math");
else if ( aModuleId == "com.sun.star.sdb.RelationDesign" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Relation Design"));
+ return OUString("Relation Design");
else if ( aModuleId == "com.sun.star.sdb.QueryDesign" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Query Design"));
+ return OUString("Query Design");
else if ( aModuleId == "com.sun.star.sdb.TableDesign" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Table Design"));
+ return OUString("Table Design");
else if ( aModuleId == "com.sun.star.sdb.DataSourceBrowser" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Data Source Browser" ));
+ return OUString("Data Source Browser" );
else if ( aModuleId == "com.sun.star.sdb.DatabaseDocument" )
- return OUString(RTL_CONSTASCII_USTRINGPARAM("Database" ));
+ return OUString("Database" );
return ::rtl::OUString();
}
@@ -586,16 +586,16 @@ ConvertSvxConfigEntry(
const SvxConfigEntry* pEntry )
{
static const OUString aDescriptorCommandURL (
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ) );
+ ITEM_DESCRIPTOR_COMMANDURL );
static const OUString aDescriptorType(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) );
+ ITEM_DESCRIPTOR_TYPE );
static const OUString aDescriptorLabel(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) );
+ ITEM_DESCRIPTOR_LABEL );
static const OUString aDescriptorContainer(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) );
+ ITEM_DESCRIPTOR_CONTAINER );
uno::Sequence< beans::PropertyValue > aPropSeq( 3 );
@@ -664,19 +664,19 @@ ConvertToolbarEntry(
const SvxConfigEntry* pEntry )
{
static const OUString aDescriptorCommandURL (
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_COMMANDURL ) );
+ ITEM_DESCRIPTOR_COMMANDURL );
static const OUString aDescriptorType(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) );
+ ITEM_DESCRIPTOR_TYPE );
static const OUString aDescriptorLabel(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_LABEL ) );
+ ITEM_DESCRIPTOR_LABEL );
static const OUString aDescriptorContainer(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) );
+ ITEM_DESCRIPTOR_CONTAINER );
static const OUString aIsVisible(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_ISVISIBLE ) );
+ ITEM_DESCRIPTOR_ISVISIBLE );
uno::Sequence< beans::PropertyValue > aPropSeq( 4 );
@@ -764,9 +764,9 @@ SfxTabPage *CreateSvxEventConfigPage( Window *pParent, const SfxItemSet& rSet )
sal_Bool impl_showKeyConfigTabPage( const css::uno::Reference< css::frame::XFrame >& xFrame )
{
- static ::rtl::OUString SERVICENAME_MODULEMANAGER (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.ModuleManager") );
- static ::rtl::OUString SERVICENAME_DESKTOP (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.Desktop" ) );
- static ::rtl::OUString MODULEID_STARTMODULE (RTL_CONSTASCII_USTRINGPARAM ("com.sun.star.frame.StartModule" ) );
+ static ::rtl::OUString SERVICENAME_MODULEMANAGER ("com.sun.star.frame.ModuleManager" );
+ static ::rtl::OUString SERVICENAME_DESKTOP ("com.sun.star.frame.Desktop" );
+ static ::rtl::OUString MODULEID_STARTMODULE ("com.sun.star.frame.StartModule" );
try
{
@@ -819,7 +819,7 @@ SvxConfigDialog::SvxConfigDialog(
{
OUString text = ((const SfxStringItem*)pItem)->GetValue();
- if (text.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(ITEM_TOOLBAR_URL))) == 0)
+ if (text.indexOf(OUString(ITEM_TOOLBAR_URL)) == 0)
{
SetCurPageId( RID_SVXPAGE_TOOLBARS );
}
@@ -892,12 +892,11 @@ SaveInData::SaveInData(
::comphelper::getProcessServiceFactory(), uno::UNO_QUERY );
xProps->getPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "DefaultContext" )))
+ OUString("DefaultContext" ))
>>= m_xComponentContext;
m_aSeparatorSeq.realloc( 1 );
- m_aSeparatorSeq[0].Name = OUString(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_TYPE ) );
+ m_aSeparatorSeq[0].Name = OUString( ITEM_DESCRIPTOR_TYPE );
m_aSeparatorSeq[0].Value <<= css::ui::ItemType::SEPARATOR_LINE;
if ( bDocConfig )
@@ -913,8 +912,7 @@ SaveInData::SaveInData(
uno::Reference< container::XNameAccess > xNameAccess(
m_xServiceManager->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.UICommandDescription" ) ) ),
+ OUString( "com.sun.star.frame.UICommandDescription" ) ),
uno::UNO_QUERY );
if ( xNameAccess.is() )
@@ -1047,14 +1045,14 @@ MenuSaveInData::MenuSaveInData(
:
SaveInData( cfgmgr, xParentCfgMgr, aModuleId, isDocConfig ),
m_aMenuResourceURL(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_MENUBAR_URL ) ),
+ ITEM_MENUBAR_URL ),
m_aDescriptorContainer(
- RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) ),
+ ITEM_DESCRIPTOR_CONTAINER ),
pRootEntry( 0 )
{
try
{
- OUString url( RTL_CONSTASCII_USTRINGPARAM( ITEM_MENUBAR_URL ) );
+ OUString url( ITEM_MENUBAR_URL );
m_xMenuSettings = GetConfigManager()->getSettings( url, sal_False );
}
catch ( container::NoSuchElementException& )
@@ -1086,7 +1084,7 @@ MenuSaveInData::GetEntries()
if ( pRootEntry == NULL )
{
pRootEntry = new SvxConfigEntry(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MainMenus")),
+ rtl::OUString("MainMenus"),
rtl::OUString(), sal_True);
if ( m_xMenuSettings.is() )
@@ -1186,8 +1184,7 @@ bool MenuSaveInData::LoadSubMenus(
if ( !subMenuTitle.isEmpty() )
{
- subMenuTitle += OUString(
- RTL_CONSTASCII_USTRINGPARAM(aMenuSeparatorStr));
+ subMenuTitle += OUString( aMenuSeparatorStr);
}
else
{
@@ -1673,13 +1670,12 @@ void SvxConfigPage::Reset( const SfxItemSet& )
// replace %MODULENAME in the label with the correct module name
uno::Reference< css::frame::XModuleManager > xModuleManager(
xServiceManager->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.ModuleManager" ) ) ),
+ OUString( "com.sun.star.frame.ModuleManager" ) ),
uno::UNO_QUERY_THROW );
OUString aModuleName = GetUIModuleName( aModuleId, xModuleManager );
OUString title = aTopLevelSeparator.GetText();
- OUString aSearchString(RTL_CONSTASCII_USTRINGPARAM( "%MODULENAME" ));
+ OUString aSearchString("%MODULENAME" );
sal_Int32 index = title.indexOf( aSearchString );
if ( index != -1 )
@@ -1691,8 +1687,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
uno::Reference< css::ui::XModuleUIConfigurationManagerSupplier >
xModuleCfgSupplier( xServiceManager->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" ))),
+ OUString( "com.sun.star.ui.ModuleUIConfigurationManagerSupplier" )),
uno::UNO_QUERY );
// Set up data for module specific menus
@@ -1716,7 +1711,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
{
nPos = aSaveInListBox.InsertEntry(
utl::ConfigManager::getProductName() +
- OUString( RTL_CONSTASCII_USTRINGPARAM( " " ) ) + aModuleName );
+ OUString( " " ) + aModuleName );
aSaveInListBox.SetEntryData( nPos, pModuleData );
}
@@ -1800,8 +1795,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
{
uno::Reference< frame::XFramesSupplier > xFramesSupplier(
xServiceManager->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.Desktop" ) ) ),
+ OUString( "com.sun.star.frame.Desktop" ) ),
uno::UNO_QUERY_THROW );
uno::Reference< frame::XFrames > xFrames =
@@ -1900,8 +1894,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
uno::Reference< frame::XFramesSupplier > xFramesSupplier(
xServiceManager->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.Desktop" ) ) ),
+ OUString( "com.sun.star.frame.Desktop" ) ),
uno::UNO_QUERY_THROW );
if ( !_inout_rxFrame.is() )
@@ -1924,8 +1917,7 @@ void SvxConfigPage::Reset( const SfxItemSet& )
uno::Reference< css::frame::XModuleManager > xModuleManager(
xServiceManager->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.ModuleManager" ) ) ),
+ OUString( "com.sun.star.frame.ModuleManager" ) ),
uno::UNO_QUERY_THROW );
try
@@ -2050,7 +2042,7 @@ void SvxConfigPage::AddSubMenusToUI(
if ( pEntryData->IsPopup() )
{
OUString subMenuTitle( rBaseTitle );
- subMenuTitle += OUString(RTL_CONSTASCII_USTRINGPARAM(aMenuSeparatorStr));
+ subMenuTitle += OUString(aMenuSeparatorStr);
subMenuTitle += stripHotKey( pEntryData->GetName() );
sal_uInt16 nPos = aTopLevelListBox.InsertEntry( subMenuTitle );
@@ -2200,7 +2192,7 @@ SvLBoxEntry* SvxConfigPage::InsertEntryIntoUI(
if (pNewEntryData->IsSeparator())
{
pNewEntry = aContentsListBox->InsertEntry(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(aSeparatorStr)),
+ rtl::OUString(aSeparatorStr),
0, sal_False, nPos, pNewEntryData);
}
else
@@ -3149,8 +3141,8 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
// default toolbar to select is standardbar unless a different one
// has been passed in
- m_aURLToSelect = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL ));
- m_aURLToSelect += OUString(RTL_CONSTASCII_USTRINGPARAM( "standardbar" ));
+ m_aURLToSelect = OUString(ITEM_TOOLBAR_URL );
+ m_aURLToSelect += OUString("standardbar" );
const SfxPoolItem* pItem =
rSet.GetItem( rSet.GetPool()->GetWhich( SID_CONFIG ) );
@@ -3158,7 +3150,7 @@ SvxToolbarConfigPage::SvxToolbarConfigPage(
if ( pItem )
{
OUString text = ((const SfxStringItem*)pItem)->GetValue();
- if (text.indexOf(OUString(RTL_CONSTASCII_USTRINGPARAM(ITEM_TOOLBAR_URL))) == 0)
+ if (text.indexOf(OUString(ITEM_TOOLBAR_URL)) == 0)
{
m_aURLToSelect = text.copy( 0 );
}
@@ -3700,8 +3692,8 @@ void SvxToolbarConfigPage::Init()
}
// in future select the default toolbar: Standard
- m_aURLToSelect = OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_TOOLBAR_URL ));
- m_aURLToSelect += OUString(RTL_CONSTASCII_USTRINGPARAM( "standardbar" ));
+ m_aURLToSelect = OUString(ITEM_TOOLBAR_URL );
+ m_aURLToSelect += OUString("standardbar" );
}
aTopLevelListBox.SelectEntryPos(nPos, sal_True);
@@ -3726,15 +3718,14 @@ ToolbarSaveInData::ToolbarSaveInData(
SaveInData ( xCfgMgr, xParentCfgMgr, aModuleId, docConfig ),
pRootEntry ( NULL ),
- m_aDescriptorContainer ( RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_CONTAINER ) )
+ m_aDescriptorContainer ( ITEM_DESCRIPTOR_CONTAINER )
{
// Initialize the m_xPersistentWindowState variable which is used
// to get the default properties of system toolbars such as name
uno::Reference< container::XNameAccess > xPWSS(
m_xServiceManager->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.ui.WindowStateConfiguration" ) ) ),
+ OUString( "com.sun.star.ui.WindowStateConfiguration" ) ),
uno::UNO_QUERY );
if ( xPWSS.is() )
@@ -3763,7 +3754,7 @@ void ToolbarSaveInData::SetSystemStyle(
if ( xPropSet.is() )
{
uno::Any a = xPropSet->getPropertyValue(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "LayoutManager" ) ) );
+ OUString( "LayoutManager" ) );
a >>= xLayoutManager;
}
@@ -3806,7 +3797,7 @@ void ToolbarSaveInData::SetSystemStyle(
const OUString& rResourceURL,
sal_Int32 nStyle )
{
- if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
+ if ( rResourceURL.indexOf( OUString("private" ) ) == 0 &&
m_xPersistentWindowState.is() &&
m_xPersistentWindowState->hasByName( rResourceURL ) )
{
@@ -3845,7 +3836,7 @@ sal_Int32 ToolbarSaveInData::GetSystemStyle( const OUString& rResourceURL )
{
sal_Int32 result = 0;
- if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
+ if ( rResourceURL.indexOf( OUString("private" ) ) == 0 &&
m_xPersistentWindowState.is() &&
m_xPersistentWindowState->hasByName( rResourceURL ) )
{
@@ -3879,7 +3870,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
{
OUString result;
- if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( "private" )) ) == 0 &&
+ if ( rResourceURL.indexOf( OUString("private" ) ) == 0 &&
m_xPersistentWindowState.is() &&
m_xPersistentWindowState->hasByName( rResourceURL ) )
{
@@ -3905,7 +3896,7 @@ OUString ToolbarSaveInData::GetSystemUIName( const OUString& rResourceURL )
}
}
- if ( rResourceURL.indexOf( OUString(RTL_CONSTASCII_USTRINGPARAM( ".uno" )) ) == 0 &&
+ if ( rResourceURL.indexOf( OUString(".uno" ) ) == 0 &&
m_xCommandToLabelMap.is() &&
m_xCommandToLabelMap->hasByName( rResourceURL ) )
{
@@ -3953,7 +3944,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
{
pRootEntry = new SvxConfigEntry(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MainToolbars")),
+ rtl::OUString("MainToolbars"),
rtl::OUString(), sal_True);
uno::Sequence< uno::Sequence < beans::PropertyValue > > info =
@@ -4007,7 +3998,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
// insert into boost::unordered_map to filter duplicates from the parent
aToolbarInfo.insert( ToolbarInfo::value_type( systemname, true ));
- OUString custom(RTL_CONSTASCII_USTRINGPARAM(CUSTOM_TOOLBAR_STR));
+ OUString custom(CUSTOM_TOOLBAR_STR);
if ( systemname.indexOf( custom ) == 0 )
{
pEntry->SetUserDefined( sal_True );
@@ -4059,7 +4050,7 @@ SvxEntries* ToolbarSaveInData::GetEntries()
}
// custom toolbars of the parent are not visible in the document layer
- OUString custom(RTL_CONSTASCII_USTRINGPARAM(CUSTOM_TOOLBAR_STR));
+ OUString custom(CUSTOM_TOOLBAR_STR);
if ( systemname.indexOf( custom ) == 0 )
continue;
@@ -4278,7 +4269,7 @@ void ToolbarSaveInData::ApplyToolbar( SvxConfigEntry* pToolbar )
if ( pToolbar->IsUserDefined() )
{
xProps->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM( ITEM_DESCRIPTOR_UINAME )),
+ OUString(ITEM_DESCRIPTOR_UINAME ),
uno::makeAny( OUString( pToolbar->GetName() ) ) );
}
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list