[Libreoffice-commits] .: 12 commits - avmedia/source basebmp/test basegfx/source basegfx/test connectivity/source io/test registry/test registry/tools registry/workben sal/osl sal/qa sal/workben sccomp/source sc/source sfx2/source slideshow/source slideshow/test stoc/source stoc/test svl/source unoxml/test writerfilter/source xmloff/source
Norbert Thiebaud
nthiebaud at kemper.freedesktop.org
Sat Jun 2 14:48:49 PDT 2012
avmedia/source/framework/soundhandler.cxx | 4
avmedia/source/gstreamer/gstuno.cxx | 4
avmedia/source/quicktime/quicktimeuno.mm | 4
avmedia/source/viewer/mediawindow.cxx | 6
avmedia/source/win/winuno.cxx | 4
basebmp/test/bmpdemo.cxx | 12
basebmp/test/bmpmasktest.cxx | 5
basebmp/test/polytest.cxx | 29
basegfx/source/tools/canvastools.cxx | 4
basegfx/test/basegfx2d.cxx | 16
connectivity/source/commontools/dbexception.cxx | 2
io/test/stm/datatest.cxx | 153 ++---
io/test/stm/marktest.cxx | 22
io/test/stm/pumptest.cxx | 14
io/test/testcomponent.cxx | 12
registry/test/testmerge.cxx | 226 +++----
registry/test/testregcpp.cxx | 438 +++++++--------
registry/tools/checksingleton.cxx | 2
registry/workben/regspeed.cxx | 20
registry/workben/regtest.cxx | 64 +-
sal/osl/w32/path_helper.cxx | 4
sal/qa/osl/module/osl_Module.cxx | 14
sal/qa/osl/pipe/osl_Pipe.cxx | 6
sal/qa/osl/socket/osl_AcceptorSocket.cxx | 10
sal/qa/osl/socket/osl_ConnectorSocket.cxx | 18
sal/qa/osl/socket/osl_DatagramSocket.cxx | 16
sal/qa/osl/socket/osl_Socket.cxx | 30 -
sal/qa/osl/socket/osl_Socket2.cxx | 58 -
sal/qa/osl/socket/osl_SocketAddr.cxx | 112 +--
sal/qa/osl/socket/osl_StreamSocket.cxx | 28
sal/qa/osl/socket/sockethelper.cxx | 6
sal/qa/rtl/bootstrap/bootstrap_process.cxx | 14
sal/qa/rtl/locale/rtl_locale.cxx | 14
sal/qa/rtl/logfile/rtl_logfile.cxx | 12
sal/qa/rtl/oustring/rtl_OUString2.cxx | 100 +--
sal/qa/rtl/oustring/rtl_ustr.cxx | 182 +++---
sal/qa/rtl/process/rtl_Process.cxx | 14
sal/qa/rtl/uri/rtl_Uri.cxx | 4
sal/qa/rtl_strings/rtl_old_testowstring.cxx | 98 +--
sal/qa/rtl_strings/rtl_old_teststrbuf.cxx | 40 -
sal/qa/testHelperFunctions/testHelperFunctions.cxx | 2
sal/qa/testHelperFunctions/testHelperFunctions2.cxx | 2
sal/workben/getlocaleinfotest.cxx | 4
sal/workben/testfile.cxx | 30 -
sc/source/filter/xml/XMLTableHeaderFooterContext.cxx | 8
sc/source/ui/unoobj/addruno.cxx | 6
sc/source/ui/unoobj/styleuno.cxx | 22
sccomp/source/solver/solver.cxx | 6
sfx2/source/appl/fileobj.cxx | 4
sfx2/source/bastyp/fltfnc.cxx | 18
sfx2/source/bastyp/frmhtmlw.cxx | 20
sfx2/source/config/evntconf.cxx | 20
sfx2/source/dialog/filedlghelper.cxx | 36 -
sfx2/source/dialog/filtergrouping.cxx | 12
sfx2/source/notify/eventsupplier.cxx | 20
slideshow/source/engine/rehearsetimingsactivity.cxx | 4
slideshow/source/engine/shapes/shapeimporter.cxx | 12
slideshow/source/engine/shapes/viewappletshape.cxx | 6
slideshow/source/engine/shapes/viewmediashape.cxx | 19
slideshow/source/engine/slideshowimpl.cxx | 24
slideshow/source/engine/wakeupevent.cxx | 2
slideshow/source/inc/interruptabledelayevent.hxx | 2
slideshow/test/demoshow.cxx | 10
stoc/source/defaultregistry/defaultregistry.cxx | 20
stoc/test/excomp/excomp.cxx | 22
stoc/test/excomp/excomp1.cxx | 10
stoc/test/excomp/excomp2.cxx | 10
stoc/test/registry_tdprovider/testregistrytdprovider.cxx | 309 +++-------
stoc/test/tdmanager/testtdmanager.cxx | 73 --
stoc/test/testcorefl.cxx | 137 ++--
stoc/test/testsmgr.cxx | 2
svl/source/items/srchitem.cxx | 28
unoxml/test/domtest.cxx | 8
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 6
xmloff/source/forms/elementimport.cxx | 14
xmloff/source/forms/eventexport.cxx | 4
xmloff/source/meta/xmlversion.cxx | 18
xmloff/source/style/xmlbahdl.cxx | 10
xmloff/source/style/xmlnumfe.cxx | 2
xmloff/source/style/xmlnumi.cxx | 87 +-
xmloff/source/text/XMLAutoTextEventExport.cxx | 12
xmloff/source/text/XMLTextMarkImportContext.cxx | 14
xmloff/source/text/txtfldi.cxx | 214 +++----
xmloff/source/text/txtimp.cxx | 98 +--
xmloff/source/text/txtlists.cxx | 5
xmloff/source/text/txtparae.cxx | 234 ++++----
xmloff/source/text/txtparai.cxx | 70 +-
xmloff/source/text/txtvfldi.cxx | 76 +-
xmloff/source/transform/EventOASISTContext.cxx | 10
xmloff/source/transform/StyleOASISTContext.cxx | 2
xmloff/source/transform/StyleOOoTContext.cxx | 2
xmloff/source/transform/TransformerBase.cxx | 18
92 files changed, 1715 insertions(+), 1910 deletions(-)
New commits:
commit c2966ec9595a7a8b4da8fdd56b27d7e8482881ca
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:42:29 2012 -0500
targeted string re-work
Change-Id: I17bec612eb6d50acc4bf8ac8ea4299fd2380afb5
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
index 0f6b6fd..88a29d1 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx
@@ -2310,8 +2310,7 @@ void DomainMapper_Impl::handleAuthor
break;
}
}
- ::rtl::OUString sServiceName(RTL_CONSTASCII_USTRINGPARAM
- ("com.sun.star.text.TextField."));
+ ::rtl::OUString sServiceName("com.sun.star.text.TextField.");
bool bIsCustomField = false;
if(sFieldServiceName.isEmpty())
{
@@ -2465,8 +2464,7 @@ void DomainMapper_Impl::handleToc
xTOC.set(
m_xTextFactory->createInstance
( bTableOfFigures ?
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM
- ("com.sun.star.text.IllustrationsIndex"))
+ ::rtl::OUString("com.sun.star.text.IllustrationsIndex")
: sTOCServiceName),
uno::UNO_QUERY_THROW);
if (xTOC.is())
commit 69337306016f3421d93967573c9fffffa6e5947f
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:38:11 2012 -0500
targeted string re-work
Change-Id: Ia1ab054537ac379f08ecd1950ca686d08be35d03
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 56562a9..521c304 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -70,7 +70,7 @@ public:
ActivitySharedPtr const& rActivity,
ActivitiesQueue & rActivityQueue ) :
#if OSL_DEBUG_LEVEL > 1
- Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WakeupEvent"))),
+ Event(::rtl::OUString("WakeupEvent")),
#endif
maTimer(pTimeBase),
mnNextTime(0.0),
@@ -175,7 +175,7 @@ RehearseTimingsActivity::RehearseTimingsActivity( const SlideShowContext& rConte
Rectangle rect;
const FontMetric metric( blackHole.GetFontMetric() );
blackHole.GetTextBoundRect(
- rect, String(RTL_CONSTASCII_USTRINGPARAM("XX:XX:XX")) );
+ rect, String("XX:XX:XX") );
maSpriteSizePixel.setX( rect.getWidth() * 12 / 10 );
maSpriteSizePixel.setY( metric.GetLineHeight() * 11 / 10 );
mnYOffset = (metric.GetAscent() + (metric.GetLineHeight() / 20));
diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx
index d90fa8e..0db069c 100644
--- a/slideshow/source/engine/shapes/shapeimporter.cxx
+++ b/slideshow/source/engine/shapes/shapeimporter.cxx
@@ -87,7 +87,7 @@ bool importShapeGraphic(
}
rtl::OUString const aVndUrl(
- RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.GraphicObject:" ) );
+ "vnd.sun.star.GraphicObject:" );
sal_Int32 nIndex( aURL.indexOf( aVndUrl ) );
if(nIndex != -1)
@@ -303,9 +303,7 @@ ShapeSharedPtr ShapeImporter::createShape(
// (Netscape)Plugin shape. This is a special object
return createAppletShape( xCurrShape,
mnAscendingPrio,
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.sfx2.PluginObject" )),
+ ::rtl::OUString( "com.sun.star.comp.sfx2.PluginObject" ),
aPropertyValues,
SAL_N_ELEMENTS(aPropertyValues),
mrContext );
@@ -325,9 +323,7 @@ ShapeSharedPtr ShapeImporter::createShape(
// (Java)Applet shape. This is a special object
return createAppletShape( xCurrShape,
mnAscendingPrio,
- ::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.comp.sfx2.AppletObject" )),
+ ::rtl::OUString( "com.sun.star.comp.sfx2.AppletObject" ),
aPropertyValues,
SAL_N_ELEMENTS(aPropertyValues),
mrContext );
@@ -460,7 +456,7 @@ bool ShapeImporter::isSkip(
rtl::OUString layerName;
uno::Reference<beans::XPropertySet> xPropLayerSet(
xLayer, uno::UNO_QUERY );
- const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))) );
+ const uno::Any& a(xPropLayerSet->getPropertyValue(rtl::OUString("Name")) );
bool const bRet = (a >>= layerName);
if(bRet)
{
diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx
index 7afd55d..36588d9 100644
--- a/slideshow/source/engine/shapes/viewappletshape.cxx
+++ b/slideshow/source/engine/shapes/viewappletshape.cxx
@@ -148,7 +148,7 @@ namespace slideshow
uno::Reference< awt::XWindow2 > xParentWindow(
xPropSet->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))),
+ ::rtl::OUString("Window" )),
uno::UNO_QUERY_THROW );
uno::Reference<lang::XMultiComponentFactory> xFactory(
@@ -161,7 +161,7 @@ namespace slideshow
uno::Reference< awt::XToolkit > xToolkit(
xFactory->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.Toolkit" )),
+ ::rtl::OUString("com.sun.star.awt.Toolkit" ),
mxComponentContext ),
uno::UNO_QUERY_THROW );
@@ -185,7 +185,7 @@ namespace slideshow
mxFrame.set(
xFactory->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Frame" )),
+ ::rtl::OUString("com.sun.star.frame.Frame" ),
mxComponentContext ),
uno::UNO_QUERY_THROW );
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx
index b1a93c2..16a824a 100644
--- a/slideshow/source/engine/shapes/viewmediashape.cxx
+++ b/slideshow/source/engine/shapes/viewmediashape.cxx
@@ -223,7 +223,7 @@ namespace slideshow
if( xPropSet.is() &&
getPropertyValue( xParentWindow,
xPropSet,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Window" ))) )
+ ::rtl::OUString("Window" )) )
{
const awt::Rectangle aRect( xParentWindow->getPosSize() );
@@ -289,15 +289,13 @@ namespace slideshow
if (xPropSet.is())
{
if ((xPropSet->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "PrivateTempFileURL"))) >>= aURL)
+ ::rtl::OUString( "PrivateTempFileURL")) >>= aURL)
&& !aURL.isEmpty())
{
implInitializeMediaPlayer( aURL );
}
else if (xPropSet->getPropertyValue(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "MediaURL"))) >>= aURL)
+ ::rtl::OUString( "MediaURL")) >>= aURL)
{
implInitializeMediaPlayer( aURL );
}
@@ -359,19 +357,19 @@ namespace slideshow
sal_Bool bLoop( false );
getPropertyValue( bLoop,
rxProps,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Loop" )));
+ ::rtl::OUString( "Loop" ));
mxPlayer->setPlaybackLoop( bLoop );
sal_Bool bMute( false );
getPropertyValue( bMute,
rxProps,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Mute" )));
+ ::rtl::OUString( "Mute" ));
mxPlayer->setMute( bMute || !mbIsSoundEnabled);
sal_Int16 nVolumeDB(0);
getPropertyValue( nVolumeDB,
rxProps,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VolumeDB" )));
+ ::rtl::OUString( "VolumeDB" ));
mxPlayer->setVolumeDB( nVolumeDB );
if( mxPlayerWindow.is() )
@@ -379,7 +377,7 @@ namespace slideshow
media::ZoomLevel eZoom(media::ZoomLevel_FIT_TO_WINDOW);
getPropertyValue( eZoom,
rxProps,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Zoom" )));
+ ::rtl::OUString( "Zoom" ));
mxPlayerWindow->setZoomLevel( eZoom );
}
}
@@ -407,8 +405,7 @@ namespace slideshow
catch( const uno::Exception& )
{
throw lang::NoSupportException(
- rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(
- "No video support for ") ) + rMediaURL,
+ rtl::OUString( "No video support for " ) + rMediaURL,
uno::Reference<uno::XInterface>() );
}
}
diff --git a/slideshow/source/engine/slideshowimpl.cxx b/slideshow/source/engine/slideshowimpl.cxx
index eed2da2..238cee2 100644
--- a/slideshow/source/engine/slideshowimpl.cxx
+++ b/slideshow/source/engine/slideshowimpl.cxx
@@ -623,7 +623,7 @@ SlideShowImpl::SlideShowImpl(
// #i82460# try to retrieve special transition factory
mxOptionalTransitionFactory.set(
xFactory->createInstanceWithContext(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.TransitionFactory" )),
+ ::rtl::OUString("com.sun.star.presentation.TransitionFactory" ),
mxComponentContext ),
uno::UNO_QUERY );
}
@@ -1455,17 +1455,17 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
uno::Reference< beans::XPropertySet > xLayerPropSet(xDrawnInSlideshow, uno::UNO_QUERY);
//Layer Name which enables to catch annotations
- rtl::OUString layerName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DrawnInSlideshow"));
+ rtl::OUString layerName = rtl::OUString("DrawnInSlideshow");
uno::Any aPropLayer;
aPropLayer <<= layerName;
- xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aPropLayer);
+ xLayerPropSet->setPropertyValue(rtl::OUString("Name"), aPropLayer);
aPropLayer <<= true;
- xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsVisible")), aPropLayer);
+ xLayerPropSet->setPropertyValue(rtl::OUString("IsVisible"), aPropLayer);
aPropLayer <<= false;
- xLayerPropSet->setPropertyValue(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IsLocked")), aPropLayer);
+ xLayerPropSet->setPropertyValue(rtl::OUString("IsLocked"), aPropLayer);
PolygonMap::iterator aIter=maPolygons.begin();
@@ -1497,7 +1497,7 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
{
//create the PolyLineShape
uno::Reference< uno::XInterface > polyshape(xDocFactory->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.PolyLineShape")) ) );
+ rtl::OUString("com.sun.star.drawing.PolyLineShape") ) );
uno::Reference< drawing::XShape > rPolyShape(polyshape, uno::UNO_QUERY);
//Add the shape to the slide
@@ -1527,27 +1527,27 @@ void SlideShowImpl::registerUserPaintPolygons( const uno::Reference< lang::XMult
//Give the built PointSequenceSequence.
uno::Any aParam;
aParam <<= aRetval;
- aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PolyPolygon")), aParam );
+ aXPropSet->setPropertyValue( rtl::OUString("PolyPolygon"), aParam );
//LineStyle : SOLID by default
uno::Any aAny;
drawing::LineStyle eLS;
eLS = drawing::LineStyle_SOLID;
aAny <<= eLS;
- aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineStyle")), aAny );
+ aXPropSet->setPropertyValue( rtl::OUString("LineStyle"), aAny );
//LineColor
sal_uInt32 nLineColor;
nLineColor = pPolyPoly->getRGBALineColor();
//Transform polygon color from RRGGBBAA to AARRGGBB
aAny <<= RGBAColor2UnoColor(nLineColor);
- aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineColor")), aAny );
+ aXPropSet->setPropertyValue( rtl::OUString("LineColor"), aAny );
//LineWidth
double fLineWidth;
fLineWidth = pPolyPoly->getStrokeWidth();
aAny <<= (sal_Int32)fLineWidth;
- aXPropSet->setPropertyValue( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LineWidth")), aAny );
+ aXPropSet->setPropertyValue( rtl::OUString("LineWidth"), aAny );
// make polygons special
xLayerManager->attachShapeToLayer(rPolyShape, xDrawnInSlideshow);
@@ -2172,7 +2172,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
!getPropertyValue( nChange,
xPropSet,
::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Change"))) )
+ "Change")) )
{
OSL_TRACE(
"queryAutomaticSlideTransition(): "
@@ -2185,7 +2185,7 @@ void queryAutomaticSlideTransition( uno::Reference<drawing::XDrawPage> const& xD
!getPropertyValue( nAutomaticNextSlideTimeout,
xPropSet,
::rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("Duration"))) )
+ "Duration")) )
{
OSL_TRACE(
"queryAutomaticSlideTransition(): "
diff --git a/slideshow/source/engine/wakeupevent.cxx b/slideshow/source/engine/wakeupevent.cxx
index 3234863..af53db4 100644
--- a/slideshow/source/engine/wakeupevent.cxx
+++ b/slideshow/source/engine/wakeupevent.cxx
@@ -42,7 +42,7 @@ namespace slideshow
boost::shared_ptr<canvas::tools::ElapsedTime> const & pTimeBase,
ActivitiesQueue& rActivityQueue ) :
#if OSL_DEBUG_LEVEL > 1
- Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WakeupEvent"))),
+ Event(::rtl::OUString("WakeupEvent")),
#endif
maTimer(pTimeBase),
mnNextTime(0.0),
diff --git a/slideshow/source/inc/interruptabledelayevent.hxx b/slideshow/source/inc/interruptabledelayevent.hxx
index 089d98e..0034911 100644
--- a/slideshow/source/inc/interruptabledelayevent.hxx
+++ b/slideshow/source/inc/interruptabledelayevent.hxx
@@ -48,7 +48,7 @@ namespace slideshow
DelayFacade( const EventSharedPtr& rEvent,
double nTimeout ) :
#if OSL_DEBUG_LEVEL > 1
- Event(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DelayFacade"))),
+ Event(::rtl::OUString("DelayFacade")),
#endif
mpEvent( rEvent ),
mnTimeout( nTimeout )
diff --git a/slideshow/test/demoshow.cxx b/slideshow/test/demoshow.cxx
index a9322fd..d31f590 100644
--- a/slideshow/test/demoshow.cxx
+++ b/slideshow/test/demoshow.cxx
@@ -422,7 +422,7 @@ DemoWindow::DemoWindow() :
maUpdateTimer(),
mbSlideDisplayed( false )
{
- SetText( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "Slideshow Demo" )) );
+ SetText( rtl::OUString("Slideshow Demo" ) );
SetSizePixel( Size( 640, 480 ) );
EnablePaint( true );
@@ -447,7 +447,7 @@ void DemoWindow::init()
uno::UNO_QUERY_THROW );
uno::Reference< uno::XInterface > xInt( xFactory->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.presentation.SlideShow")) ));
+ ::rtl::OUString("com.sun.star.presentation.SlideShow") ));
mxShow.set( xInt,
uno::UNO_QUERY_THROW );
@@ -466,7 +466,7 @@ void DemoWindow::init()
uno::Reference< animations::XAnimationNode >(),
uno::Sequence< beans::PropertyValue >() );
mxShow->setProperty( beans::PropertyValue(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RehearseTimings")),
+ rtl::OUString("RehearseTimings"),
0,
uno::makeAny( sal_True ),
beans::PropertyState_DIRECT_VALUE ));
@@ -561,8 +561,8 @@ void DemoApp::Main()
// Create UCB.
uno::Sequence< uno::Any > aArgs( 2 );
- aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
- aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+ aArgs[ 0 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY1_LOCAL );
+ aArgs[ 1 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY2_OFFICE );
::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
DemoWindow pWindow;
commit 166ab674606cca5829c7b7ab3e58b25e3ce838fe
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:33:55 2012 -0500
targeted string re-work
Change-Id: Iece38bedf1f2380f8ecf3c6aef1e92688ed026db
diff --git a/avmedia/source/framework/soundhandler.cxx b/avmedia/source/framework/soundhandler.cxx
index 4c8a502..14f17bb 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -159,7 +159,7 @@ css::uno::Sequence< css::uno::Type > SAL_CALL SoundHandler::getTypes() throw( cs
}
#define DECLARE_ASCII( SASCIIVALUE ) \
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SASCIIVALUE ) )
+ ::rtl::OUString( SASCIIVALUE )
#define IMPLEMENTATIONNAME_SOUNDHANDLER DECLARE_ASCII("com.sun.star.comp.framework.SoundHandler")
#define SERVICENAME_CONTENTHANDLER DECLARE_ASCII("com.sun.star.frame.ContentHandler")
@@ -423,7 +423,7 @@ void SAL_CALL SoundHandler::dispatch( const css::util::URL&
// I think we can the following ones:
// a) look for given extension of url to map our type decision HARD CODED!!!
// b) return preferred type every time... it's easy :-)
- sTypeName = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("wav_Wave_Audio_File"));
+ sTypeName = ::rtl::OUString("wav_Wave_Audio_File");
aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
aDescriptor >> lDescriptor;
}
diff --git a/avmedia/source/gstreamer/gstuno.cxx b/avmedia/source/gstreamer/gstuno.cxx
index 4bd4f9f..8095353 100644
--- a/avmedia/source/gstreamer/gstuno.cxx
+++ b/avmedia/source/gstreamer/gstuno.cxx
@@ -46,11 +46,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_C
if( rtl_str_compare( pImplName, "com.sun.star.comp.media.Manager_GStreamer" ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_GStreamer" )) );
+ const ::rtl::OUString aServiceName( ::rtl::OUString("com.sun.star.media.Manager_GStreamer" ) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.media.Manager_GStreamer" )),
+ ::rtl::OUString("com.sun.star.comp.media.Manager_GStreamer" ),
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
diff --git a/avmedia/source/quicktime/quicktimeuno.mm b/avmedia/source/quicktime/quicktimeuno.mm
index 0a927d6..e7f739b 100644
--- a/avmedia/source/quicktime/quicktimeuno.mm
+++ b/avmedia/source/quicktime/quicktimeuno.mm
@@ -47,11 +47,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_C
if( rtl_str_compare( pImplName, AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_SERVICENAME )) );
+ const ::rtl::OUString aServiceName( ::rtl::OUString(AVMEDIA_QUICKTIME_MANAGER_SERVICENAME ) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME )),
+ ::rtl::OUString(AVMEDIA_QUICKTIME_MANAGER_IMPLEMENTATIONNAME ),
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
diff --git a/avmedia/source/viewer/mediawindow.cxx b/avmedia/source/viewer/mediawindow.cxx
index 7861d0d..e6887d7 100644
--- a/avmedia/source/viewer/mediawindow.cxx
+++ b/avmedia/source/viewer/mediawindow.cxx
@@ -252,9 +252,9 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
::sfx2::FileDialogHelper aDlg( (o_pbLink)
? ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW
: ui::dialogs::TemplateDescription::FILEOPEN_SIMPLE, 0 );
- static const ::rtl::OUString aWildcard( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+ static const ::rtl::OUString aWildcard( "*." );
FilterNameVector aFilters;
- const ::rtl::OUString aSeparator( RTL_CONSTASCII_USTRINGPARAM( ";" ) );
+ const ::rtl::OUString aSeparator( ";" );
::rtl::OUString aAllTypes;
aDlg.SetTitle( AVMEDIA_RESID( (o_pbLink)
@@ -294,7 +294,7 @@ bool MediaWindow::executeMediaURLDialog(Window* /* pParent */,
}
// add filter for all types
- aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), String( RTL_CONSTASCII_USTRINGPARAM( "*.*" ) ) );
+ aDlg.AddFilter( AVMEDIA_RESID( AVMEDIA_STR_ALL_FILES ), String( "*.*" ) );
uno::Reference<ui::dialogs::XFilePicker> const xFP(aDlg.GetFilePicker());
uno::Reference<ui::dialogs::XFilePickerControlAccess> const xCtrlAcc(xFP,
diff --git a/avmedia/source/win/winuno.cxx b/avmedia/source/win/winuno.cxx
index d59e287..c3d66c5 100644
--- a/avmedia/source/win/winuno.cxx
+++ b/avmedia/source/win/winuno.cxx
@@ -47,11 +47,11 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( const sal_C
if( rtl_str_compare( pImplName, "com.sun.star.comp.avmedia.Manager_DirectX" ) == 0 )
{
- const ::rtl::OUString aServiceName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.media.Manager_DirectX" )) );
+ const ::rtl::OUString aServiceName( ::rtl::OUString("com.sun.star.media.Manager_DirectX" ) );
xFactory = uno::Reference< lang::XSingleServiceFactory >( ::cppu::createSingleFactory(
reinterpret_cast< lang::XMultiServiceFactory* >( pServiceManager ),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.avmedia.Manager_DirectX" )),
+ ::rtl::OUString("com.sun.star.comp.avmedia.Manager_DirectX" ),
create_MediaPlayer, uno::Sequence< ::rtl::OUString >( &aServiceName, 1 ) ) );
}
commit 542aa80d4583ecd0aaec2111236ae418b780deb0
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:30:37 2012 -0500
targeted string re-work
Change-Id: I16c4e5c6662b2342a7e48011de8a7d55e5682688
diff --git a/svl/source/items/srchitem.cxx b/svl/source/items/srchitem.cxx
index 7141185..0fee7ac 100644
--- a/svl/source/items/srchitem.cxx
+++ b/svl/source/items/srchitem.cxx
@@ -110,7 +110,7 @@ static Sequence< ::rtl::OUString > lcl_GetNotifyNames()
SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
SfxPoolItem( nId ),
- ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
+ ConfigItem( ::rtl::OUString(CFG_ROOT_NODE ) ),
aSearchOpt ( SearchAlgorithms_ABSOLUTE,
SearchFlags::LEV_RELAXED,
@@ -198,7 +198,7 @@ SvxSearchItem::SvxSearchItem( const sal_uInt16 nId ) :
SvxSearchItem::SvxSearchItem( const SvxSearchItem& rItem ) :
SfxPoolItem ( rItem ),
- ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( CFG_ROOT_NODE )) ),
+ ConfigItem( ::rtl::OUString(CFG_ROOT_NODE ) ),
aSearchOpt ( rItem.aSearchOpt ),
eFamily ( rItem.eFamily ),
@@ -373,29 +373,29 @@ bool SvxSearchItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMembe
case 0 :
{
Sequence< PropertyValue > aSeq( SRCH_PARAMS );
- aSeq[0].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_OPTIONS ) );
+ aSeq[0].Name = rtl::OUString( SRCH_PARA_OPTIONS );
aSeq[0].Value <<= aSearchOpt;
- aSeq[1].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_FAMILY ));
+ aSeq[1].Name = rtl::OUString( SRCH_PARA_FAMILY );
aSeq[1].Value <<= sal_Int16( eFamily );
- aSeq[2].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_COMMAND ));
+ aSeq[2].Name = rtl::OUString( SRCH_PARA_COMMAND );
aSeq[2].Value <<= nCommand;
- aSeq[3].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_CELLTYPE ));
+ aSeq[3].Name = rtl::OUString( SRCH_PARA_CELLTYPE );
aSeq[3].Value <<= nCellType;
- aSeq[4].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_APPFLAG ));
+ aSeq[4].Name = rtl::OUString( SRCH_PARA_APPFLAG );
aSeq[4].Value <<= nAppFlag;
- aSeq[5].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ROWDIR ));
+ aSeq[5].Name = rtl::OUString( SRCH_PARA_ROWDIR );
aSeq[5].Value <<= bRowDirection;
- aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ALLTABLES ));
+ aSeq[6].Name = rtl::OUString( SRCH_PARA_ALLTABLES );
aSeq[6].Value <<= bAllTables;
- aSeq[6].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_SEARCHFILTERED ));
+ aSeq[6].Name = rtl::OUString( SRCH_PARA_SEARCHFILTERED );
aSeq[6].Value <<= bSearchFiltered;
- aSeq[7].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_BACKWARD ));
+ aSeq[7].Name = rtl::OUString( SRCH_PARA_BACKWARD );
aSeq[7].Value <<= bBackward;
- aSeq[8].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_PATTERN ));
+ aSeq[8].Name = rtl::OUString( SRCH_PARA_PATTERN );
aSeq[8].Value <<= bPattern;
- aSeq[9].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_CONTENT ));
+ aSeq[9].Name = rtl::OUString( SRCH_PARA_CONTENT );
aSeq[9].Value <<= bContent;
- aSeq[10].Name = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( SRCH_PARA_ASIANOPT ));
+ aSeq[10].Name = rtl::OUString( SRCH_PARA_ASIANOPT );
aSeq[10].Value <<= bAsianOptions;
rVal <<= aSeq;
}
commit 133340ff51e4e62409c6243f7445cdee7b24e228
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:25:57 2012 -0500
targeted string re-work
Change-Id: If3717bae537653de0bc7a0e6c62a4203a9b93f8d
diff --git a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
index 7e0647f..e848619 100644
--- a/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
+++ b/sc/source/filter/xml/XMLTableHeaderFooterContext.cxx
@@ -55,10 +55,10 @@ XMLTableHeaderFooterContext::XMLTableHeaderFooterContext( SvXMLImport& rImport,
bool bFooter, bool bLft ) :
SvXMLImportContext( rImport, nPrfx, rLName ),
xPropSet( rPageStylePropSet ),
- sOn( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_FTRON)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRON)) ),
- sShareContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_FTRSHARED)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_HDRSHARED)) ),
- sContent( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTFTRCON)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_RIGHTHDRCON)) ),
- sContentLeft( bFooter ? OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTFTRCONT)) : OUString(RTL_CONSTASCII_USTRINGPARAM(SC_UNO_PAGE_LEFTHDRCONT)) ),
+ sOn( bFooter ? OUString(SC_UNO_PAGE_FTRON) : OUString(SC_UNO_PAGE_HDRON) ),
+ sShareContent( bFooter ? OUString(SC_UNO_PAGE_FTRSHARED) : OUString(SC_UNO_PAGE_HDRSHARED) ),
+ sContent( bFooter ? OUString(SC_UNO_PAGE_RIGHTFTRCON) : OUString(SC_UNO_PAGE_RIGHTHDRCON) ),
+ sContentLeft( bFooter ? OUString(SC_UNO_PAGE_LEFTFTRCONT) : OUString(SC_UNO_PAGE_LEFTHDRCONT) ),
bDisplay( true ),
bInsertContent( true ),
bLeft( bLft ),
diff --git a/sc/source/ui/unoobj/addruno.cxx b/sc/source/ui/unoobj/addruno.cxx
index 63c7ff2..e312fdd 100644
--- a/sc/source/ui/unoobj/addruno.cxx
+++ b/sc/source/ui/unoobj/addruno.cxx
@@ -304,7 +304,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScAddressConversionObj )
rtl::OUString SAL_CALL ScAddressConversionObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScAddressConversionObj" ));
+ return rtl::OUString("ScAddressConversionObj" );
}
sal_Bool SAL_CALL ScAddressConversionObj::supportsService( const rtl::OUString& rServiceName )
@@ -320,8 +320,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScAddressConversionObj::getSupportedServic
{
uno::Sequence<rtl::OUString> aRet(1);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = bIsRange ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SERVICENAME_RANGEADDRESS))
- : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SC_SERVICENAME_CELLADDRESS));
+ pArray[0] = bIsRange ? rtl::OUString(SC_SERVICENAME_RANGEADDRESS)
+ : rtl::OUString(SC_SERVICENAME_CELLADDRESS);
return aRet;
}
diff --git a/sc/source/ui/unoobj/styleuno.cxx b/sc/source/ui/unoobj/styleuno.cxx
index aa173a7..6800d99 100644
--- a/sc/source/ui/unoobj/styleuno.cxx
+++ b/sc/source/ui/unoobj/styleuno.cxx
@@ -672,8 +672,8 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleFamiliesObj::getElementNames()
SolarMutexGuard aGuard;
uno::Sequence<rtl::OUString> aNames(SC_STYLE_FAMILY_COUNT);
rtl::OUString* pNames = aNames.getArray();
- pNames[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_FAMILYNAME_CELL ));
- pNames[1] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_FAMILYNAME_PAGE ));
+ pNames[0] = rtl::OUString(SC_FAMILYNAME_CELL );
+ pNames[1] = rtl::OUString(SC_FAMILYNAME_PAGE );
return aNames;
}
@@ -735,13 +735,13 @@ uno::Sequence<beans::PropertyValue> SAL_CALL ScStyleFamiliesObj::getStyleLoaderO
uno::Sequence<beans::PropertyValue> aSequence(3);
beans::PropertyValue* pArray = aSequence.getArray();
- pArray[0].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_OVERWSTL ));
+ pArray[0].Name = rtl::OUString(SC_UNONAME_OVERWSTL );
ScUnoHelpFunctions::SetBoolInAny( pArray[0].Value, true );
- pArray[1].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_LOADCELL ));
+ pArray[1].Name = rtl::OUString(SC_UNONAME_LOADCELL );
ScUnoHelpFunctions::SetBoolInAny( pArray[1].Value, true );
- pArray[2].Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_UNONAME_LOADPAGE ));
+ pArray[2].Name = rtl::OUString(SC_UNONAME_LOADPAGE );
ScUnoHelpFunctions::SetBoolInAny( pArray[2].Value, true );
return aSequence;
@@ -1061,7 +1061,7 @@ uno::Any SAL_CALL ScStyleFamilyObj::getPropertyValue( const ::rtl::OUString& sPr
}
else
{
- throw beans::UnknownPropertyException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("unknown property: ") ) + sPropertyName, static_cast<OWeakObject *>(this) );
+ throw beans::UnknownPropertyException( ::rtl::OUString( "unknown property: " ) + sPropertyName, static_cast<OWeakObject *>(this) );
}
return aRet;
@@ -2048,7 +2048,7 @@ uno::Any SAL_CALL ScStyleObj::getPropertyValue( const rtl::OUString& aPropertyNa
sal_uInt8 nValue = ((const SvxPaperBinItem&)pItemSet->Get(nWhich)).GetValue();
rtl::OUString aName;
if ( nValue == PAPERBIN_PRINTER_SETTINGS )
- aName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SC_PAPERBIN_DEFAULTNAME ));
+ aName = rtl::OUString(SC_PAPERBIN_DEFAULTNAME );
else
{
Printer* pPrinter = pDocShell->GetPrinter();
@@ -2115,7 +2115,7 @@ SC_IMPL_DUMMY_PROPERTY_LISTENER( ScStyleObj )
rtl::OUString SAL_CALL ScStyleObj::getImplementationName() throw(uno::RuntimeException)
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "ScStyleObj" ));
+ return rtl::OUString("ScStyleObj" );
}
sal_Bool SAL_CALL ScStyleObj::supportsService( const rtl::OUString& rServiceName )
@@ -2133,9 +2133,9 @@ uno::Sequence<rtl::OUString> SAL_CALL ScStyleObj::getSupportedServiceNames()
sal_Bool bPage = ( eFamily == SFX_STYLE_FAMILY_PAGE );
uno::Sequence<rtl::OUString> aRet(2);
rtl::OUString* pArray = aRet.getArray();
- pArray[0] = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SCSTYLE_SERVICE ));
- pArray[1] = bPage ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCPAGESTYLE_SERVICE))
- : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SCCELLSTYLE_SERVICE));
+ pArray[0] = rtl::OUString(SCSTYLE_SERVICE );
+ pArray[1] = bPage ? rtl::OUString(SCPAGESTYLE_SERVICE)
+ : rtl::OUString(SCCELLSTYLE_SERVICE);
return aRet;
}
diff --git a/sccomp/source/solver/solver.cxx b/sccomp/source/solver/solver.cxx
index 1ed8df0..b04f1a1 100644
--- a/sccomp/source/solver/solver.cxx
+++ b/sccomp/source/solver/solver.cxx
@@ -58,7 +58,7 @@ using namespace com::sun::star;
using ::rtl::OUString;
-#define C2U(constAsciiStr) (::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( constAsciiStr ) ))
+#define C2U(constAsciiStr) (::rtl::OUString( constAsciiStr ))
#define STR_NONNEGATIVE "NonNegative"
#define STR_INTEGER "Integer"
@@ -559,13 +559,13 @@ void SAL_CALL SolverComponent::solve() throw(uno::RuntimeException)
uno::Sequence< OUString > SolverComponent_getSupportedServiceNames()
{
uno::Sequence< OUString > aServiceNames( 1 );
- aServiceNames[ 0 ] = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.Solver" ));
+ aServiceNames[ 0 ] = OUString("com.sun.star.sheet.Solver" );
return aServiceNames;
}
OUString SolverComponent_getImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.Calc.Solver" ));
+ return OUString("com.sun.star.comp.Calc.Solver" );
}
OUString SAL_CALL SolverComponent::getImplementationName() throw(uno::RuntimeException)
commit befcf7910f8fe55b4f208a778aefb3faa11b505e
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:23:41 2012 -0500
targeted string re-work
Change-Id: I103e7171a5a523c388af14ec453299990c99c8c1
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index d0fe61e..ae648c1 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -402,7 +402,7 @@ String impl_getFilter( const String& _rURL )
{
css::uno::Reference< ::com::sun::star::document::XTypeDetection > xTypeDetection(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection")) ),
+ ::rtl::OUString("com.sun.star.document.TypeDetection") ),
css::uno::UNO_QUERY );
if ( xTypeDetection.is() )
{
@@ -419,7 +419,7 @@ String impl_getFilter( const String& _rURL )
{
::comphelper::SequenceAsHashMap lTypeProps( xTypeCont->getByName( sType ) );
sFilter = lTypeProps.getUnpackedValueOrDefault(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter")), ::rtl::OUString() );
+ ::rtl::OUString("PreferredFilter"), ::rtl::OUString() );
}
}
}
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 3bb6497..fbb253e 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -386,7 +386,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterIgnoringContent(
SfxFilterFlags nMust,
SfxFilterFlags nDont ) const
{
- Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), UNO_QUERY );
+ Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), UNO_QUERY );
::rtl::OUString sTypeName;
try
{
@@ -421,7 +421,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
const SfxFilter* pOldFilter = *ppFilter;
// no detection service -> nothing to do !
- Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.TypeDetection"))), UNO_QUERY );
+ Reference< XTypeDetection > xDetection( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.document.TypeDetection")), UNO_QUERY );
if (!xDetection.is())
return ERRCODE_ABORT;
@@ -467,7 +467,7 @@ sal_uInt32 SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
// The DocumentService property is only a preselection, and all preselections are considered as optional!
// This "wrong" type will be sorted out now because we match only allowed filters to the detected type
::com::sun::star::uno::Sequence< ::com::sun::star::beans::NamedValue > lQuery(1);
- lQuery[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ lQuery[0].Name = ::rtl::OUString("Name");
lQuery[0].Value <<= sTypeName;
const SfxFilter* pFilter = GetFilterForProps(lQuery, nMust, nDont);
@@ -610,7 +610,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
::rtl::OUString aValue;
// try to get the preferred filter (works without loading all filters!)
- if ( (aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("PreferredFilter"))] >>= aValue) && !aValue.isEmpty() )
+ if ( (aProps[::rtl::OUString("PreferredFilter")] >>= aValue) && !aValue.isEmpty() )
{
const SfxFilter* pFilter = SfxFilter::GetFilterByName( aValue );
if ( !pFilter || (pFilter->GetFilterFlags() & nMust) != nMust || (pFilter->GetFilterFlags() & nDont ) )
@@ -625,7 +625,7 @@ const SfxFilter* SfxFilterMatcher::GetFilterForProps( const com::sun::star::uno:
{
// preferred filter belongs to another document type; now we must search the filter
m_rImpl.InitForIterating();
- aProps[::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"))] >>= aValue;
+ aProps[::rtl::OUString("Name")] >>= aValue;
pFilter = GetFilter4EA( aValue, nMust, nDont );
if ( pFilter )
return pFilter;
@@ -658,7 +658,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Mime( const ::rtl::OUString& rMedia
}
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType"));
+ aSeq[0].Name = ::rtl::OUString("MediaType");
aSeq[0].Value <<= rMediaType;
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -687,7 +687,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4EA( const String& rType,SfxFilterFl
}
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name"));
+ aSeq[0].Name = ::rtl::OUString("Name");
aSeq[0].Value <<= ::rtl::OUString( rType );
return GetFilterForProps( aSeq, nMust, nDont );
}
@@ -726,7 +726,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4Extension( const String& rExt, SfxF
sExt.Erase(0,1);
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Extensions"));
+ aSeq[0].Name = ::rtl::OUString("Extensions");
::com::sun::star::uno::Sequence < ::rtl::OUString > aExts(1);
aExts[0] = sExt;
aSeq[0].Value <<= aExts;
@@ -740,7 +740,7 @@ const SfxFilter* SfxFilterMatcher::GetFilter4ClipBoardId( sal_uInt32 nId, SfxFil
com::sun::star::uno::Sequence < com::sun::star::beans::NamedValue > aSeq(1);
::rtl::OUString aName = SotExchange::GetFormatName( nId );
- aSeq[0].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ClipboardFormat"));
+ aSeq[0].Name = ::rtl::OUString("ClipboardFormat");
aSeq[0].Value <<= aName;
return GetFilterForProps( aSeq, nMust, nDont );
}
diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx
index 300eac3..bcb60da 100644
--- a/sfx2/source/bastyp/frmhtmlw.cxx
+++ b/sfx2/source/bastyp/frmhtmlw.cxx
@@ -147,7 +147,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
// Who we are
String sGenerator( SfxResId( STR_HTML_GENERATOR ) );
- ::rtl::OUString os( RTL_CONSTASCII_USTRINGPARAM("$_OS") );
+ ::rtl::OUString os( "$_OS" );
::rtl::Bootstrap::expandMacros(os);
sGenerator.SearchAndReplaceAscii( "%1", os );
OutMeta( rStrm, pIndent, OOO_STRING_SVTOOLS_HTML_META_generator, sGenerator, sal_False, eDestEnc, pNonConvertableChars );
@@ -227,7 +227,7 @@ void SfxFrameHTMLWriter::Out_DocInfo( SvStream& rStrm, const String& rBaseURL,
uno::Reference < script::XTypeConverter > xConverter(
::comphelper::getProcessServiceFactory()->createInstance(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.script.Converter"))),
+ ::rtl::OUString("com.sun.star.script.Converter")),
uno::UNO_QUERY_THROW );
uno::Reference<beans::XPropertySet> xUserDefinedProps(
i_xDocProps->getUserDefinedProperties(), uno::UNO_QUERY_THROW);
@@ -267,7 +267,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
{
rtl::OStringBuffer sOut;
::rtl::OUString aStr;
- uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameURL")) );
+ uno::Any aAny = xSet->getPropertyValue( ::rtl::OUString("FrameURL") );
if ( (aAny >>= aStr) && !aStr.isEmpty() )
{
String aURL = INetURLObject( aStr ).GetMainURL( INetURLObject::DECODE_TO_IURI );
@@ -283,7 +283,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
}
}
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameName")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameName") );
if ( (aAny >>= aStr) && !aStr.isEmpty() )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_name)
@@ -294,13 +294,13 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
}
sal_Int32 nVal = SIZE_NOT_SET;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginWidth")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginWidth") );
if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginwidth)
.append('=').append(nVal);
}
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameMarginHeight")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameMarginHeight") );
if ( (aAny >>= nVal) && nVal != SIZE_NOT_SET )
{
sOut.append(' ').append(OOO_STRING_SVTOOLS_HTML_O_marginheight)
@@ -308,10 +308,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
}
sal_Bool bVal = sal_True;
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoScroll")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoScroll") );
if ( (aAny >>= bVal) && !bVal )
{
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsScrollingMode")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsScrollingMode") );
if ( aAny >>= bVal )
{
const sal_Char *pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
@@ -321,10 +321,10 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor(
}
// frame border (MS+Netscape-Extension)
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsAutoBorder")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsAutoBorder") );
if ( (aAny >>= bVal) && !bVal )
{
- aAny = xSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("FrameIsBorder")) );
+ aAny = xSet->getPropertyValue( ::rtl::OUString("FrameIsBorder") );
if ( aAny >>= bVal )
{
const char* pStr = bVal ? sHTML_SC_yes : sHTML_SC_no;
diff --git a/sfx2/source/config/evntconf.cxx b/sfx2/source/config/evntconf.cxx
index 4f693a1..fd2e6fe 100644
--- a/sfx2/source/config/evntconf.cxx
+++ b/sfx2/source/config/evntconf.cxx
@@ -169,17 +169,17 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
uno::Sequence < beans::PropertyValue > aProperties(3);
beans::PropertyValue *pValues = aProperties.getArray();
- ::rtl::OUString aType(RTL_CONSTASCII_USTRINGPARAM( STAR_BASIC ));
+ ::rtl::OUString aType(STAR_BASIC );
::rtl::OUString aLib = pMacro->GetLibName();
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+ pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE );
pValues[ 0 ].Value <<= aType;
- pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_LIBRARY ));
+ pValues[ 1 ].Name = ::rtl::OUString(PROP_LIBRARY );
pValues[ 1 ].Value <<= aLib;
- pValues[ 2 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
+ pValues[ 2 ].Name = ::rtl::OUString(PROP_MACRO_NAME );
pValues[ 2 ].Value <<= aMacro;
aEventData <<= aProperties;
@@ -192,10 +192,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
::rtl::OUString aLib = pMacro->GetLibName();
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
+ pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE );
pValues[ 0 ].Value <<= aLib;
- pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_SCRIPT ));
+ pValues[ 1 ].Name = ::rtl::OUString(PROP_SCRIPT );
pValues[ 1 ].Value <<= aMacro;
aEventData <<= aProperties;
@@ -207,10 +207,10 @@ uno::Any CreateEventData_Impl( const SvxMacro *pMacro )
::rtl::OUString aMacro = pMacro->GetMacName();
- pValues[ 0 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_EVENT_TYPE ));
- pValues[ 0 ].Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(SVX_MACRO_LANGUAGE_JAVASCRIPT));
+ pValues[ 0 ].Name = ::rtl::OUString(PROP_EVENT_TYPE );
+ pValues[ 0 ].Value <<= ::rtl::OUString(SVX_MACRO_LANGUAGE_JAVASCRIPT);
- pValues[ 1 ].Name = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( PROP_MACRO_NAME ));
+ pValues[ 1 ].Name = ::rtl::OUString(PROP_MACRO_NAME );
pValues[ 1 ].Value <<= aMacro;
aEventData <<= aProperties;
@@ -241,7 +241,7 @@ void PropagateEvent_Impl( SfxObjectShell *pDoc, rtl::OUString aEventName, const
{
xSupplier = uno::Reference < document::XEventsSupplier >
( ::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.frame.GlobalEventBroadcaster"))), uno::UNO_QUERY );
+ rtl::OUString("com.sun.star.frame.GlobalEventBroadcaster")), uno::UNO_QUERY );
}
if ( xSupplier.is() )
diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx
index 0fcc340..fe35177 100644
--- a/sfx2/source/dialog/filedlghelper.cxx
+++ b/sfx2/source/dialog/filedlghelper.cxx
@@ -124,7 +124,7 @@ using namespace ::cppu;
#define IODLG_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Save"))
#define IMPGRF_CONFIGNAME String(DEFINE_CONST_UNICODE("FilePicker_Graph"))
-#define USERITEM_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( "UserItem" ))
+#define USERITEM_NAME ::rtl::OUString("UserItem" )
//-----------------------------------------------------------------------------
@@ -133,9 +133,9 @@ namespace sfx2
const OUString* GetLastFilterConfigId( FileDialogHelper::Context _eContext )
{
- static const OUString aSD_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SdExportLastFilter" ) );
- static const OUString aSI_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SiExportLastFilter" ) );
- static const OUString aSW_EXPORT_IDENTIFIER( RTL_CONSTASCII_USTRINGPARAM( "SwExportLastFilter" ) );
+ static const OUString aSD_EXPORT_IDENTIFIER( "SdExportLastFilter" );
+ static const OUString aSI_EXPORT_IDENTIFIER( "SiExportLastFilter" );
+ static const OUString aSW_EXPORT_IDENTIFIER( "SwExportLastFilter" );
const OUString* pRet = NULL;
@@ -491,7 +491,7 @@ void FileDialogHelper_Impl::updateExportButton()
uno::Reference < XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY );
if ( xCtrlAccess.is() )
{
- OUString sEllipses( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+ OUString sEllipses( "..." );
OUString sOldLabel( xCtrlAccess->getLabel( CommonFilePickerElementIds::PUSHBUTTON_OK ) );
// initialize button label; we need the label with the mnemonic char
@@ -507,7 +507,7 @@ void FileDialogHelper_Impl::updateExportButton()
OUString sLabel = maButtonLabel;
// filter with options -> append ellipses on export button label
if ( CheckFilterOptionsCapability( getCurentSfxFilter() ) )
- sLabel += OUString( RTL_CONSTASCII_USTRINGPARAM( "..." ) );
+ sLabel += OUString( "..." );
if ( sOldLabel != sLabel )
{
@@ -1072,26 +1072,26 @@ FileDialogHelper_Impl::FileDialogHelper_Impl(
else
{
aInitArguments[0] <<= NamedValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TemplateDescription" ) ),
+ ::rtl::OUString( "TemplateDescription" ),
makeAny( nTemplateDescription )
);
::rtl::OUString sStandardDirTemp = ::rtl::OUString( sStandardDir );
aInitArguments[1] <<= NamedValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "StandardDir" ) ),
+ ::rtl::OUString( "StandardDir" ),
makeAny( sStandardDirTemp )
);
aInitArguments[2] <<= NamedValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "BlackList" ) ),
+ ::rtl::OUString( "BlackList" ),
makeAny( rBlackList )
);
if ( mpPreferredParentWindow )
aInitArguments[3] <<= NamedValue(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParentWindow" ) ),
+ ::rtl::OUString( "ParentWindow" ),
makeAny( VCLUnoHelper::GetInterface( mpPreferredParentWindow ) )
);
}
@@ -1208,7 +1208,7 @@ void FileDialogHelper_Impl::setControlHelpIds( const sal_Int16* _pControlId, con
// forward these ids to the file picker
try
{
- const ::rtl::OUString sHelpIdPrefix( RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ) );
+ const ::rtl::OUString sHelpIdPrefix( INET_HID_SCHEME );
// the ids for the single controls
uno::Reference< XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY );
if ( xControlAccess.is() )
@@ -1799,7 +1799,7 @@ void FileDialogHelper_Impl::addFilters( const String& rFactory,
uno::Reference< XMultiServiceFactory > xSMGR = ::comphelper::getProcessServiceFactory();
uno::Reference< XContainerQuery > xFilterCont(
- xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.document.FilterFactory"))),
+ xSMGR->createInstance(::rtl::OUString("com.sun.star.document.FilterFactory")),
UNO_QUERY);
if ( ! xFilterCont.is() )
return;
@@ -2328,9 +2328,9 @@ FileDialogHelper::FileDialogHelper(
if ( aExtName.indexOf( (sal_Unicode)'*' ) != 0 )
{
if ( !aExtName.isEmpty() && aExtName.indexOf( (sal_Unicode)'.' ) != 0 )
- aWildcard = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*." ) );
+ aWildcard = ::rtl::OUString( "*." );
else
- aWildcard = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) );
+ aWildcard = ::rtl::OUString( "*" );
}
aWildcard += aExtName;
@@ -2695,7 +2695,7 @@ ErrCode FileOpenDialog_Impl( sal_Int16 nDialogType,
ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, SfxItemSet* pSet)
{
- uno::Reference < ::com::sun::star::task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.uui.UUIInteractionHandler"))), UNO_QUERY );
+ uno::Reference < ::com::sun::star::task::XInteractionHandler > xInteractionHandler( ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.comp.uui.UUIInteractionHandler")), UNO_QUERY );
if( xInteractionHandler.is() )
{
// TODO: need a save way to distinguish MS filters from other filters
@@ -2723,8 +2723,8 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, Sf
if ( aEncryptionKey.getLength() )
{
::comphelper::SequenceAsHashMap aHashData;
- aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97EncryptionKey" ) ) ] <<= aEncryptionKey;
- aHashData[ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "STD97UniqueID" ) ) ] <<= aUniqueID;
+ aHashData[ ::rtl::OUString( "STD97EncryptionKey" ) ] <<= aEncryptionKey;
+ aHashData[ ::rtl::OUString( "STD97UniqueID" ) ] <<= aUniqueID;
pSet->Put( SfxUnoAnyItem( SID_ENCRYPTIONDATA, uno::makeAny( aHashData.getAsConstNamedValueList() ) ) );
}
@@ -2743,7 +2743,7 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, rtl::OUString& aURL, Sf
if ( bMSType )
{
// the empty password has 0 as Hash
- sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ) ).equals( pCurrentFilter->GetServiceName() ) );
+ sal_Int32 nHash = SfxMedium::CreatePasswordToModifyHash( pPasswordRequest->getPasswordToModify(), ::rtl::OUString( "com.sun.star.text.TextDocument" ).equals( pCurrentFilter->GetServiceName() ) );
if ( nHash )
pSet->Put( SfxUnoAnyItem( SID_MODIFYPASSWORDINFO, uno::makeAny( nHash ) ) );
}
diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx
index e91c512..770149f 100644
--- a/sfx2/source/dialog/filtergrouping.cxx
+++ b/sfx2/source/dialog/filtergrouping.cxx
@@ -162,8 +162,8 @@ namespace sfx2
void lcl_ReadFilterClass( const OConfigurationNode& _rClassesNode, const ::rtl::OUString& _rLogicalClassName,
FilterClass& /* [out] */ _rClass )
{
- static const ::rtl::OUString sDisplaNameNodeName( RTL_CONSTASCII_USTRINGPARAM( "DisplayName" ) );
- static const ::rtl::OUString sSubFiltersNodeName( RTL_CONSTASCII_USTRINGPARAM( "Filters" ) );
+ static const ::rtl::OUString sDisplaNameNodeName( "DisplayName" );
+ static const ::rtl::OUString sSubFiltersNodeName( "Filters" );
// the description node for the current class
OConfigurationNode aClassDesc = _rClassesNode.openNode( _rLogicalClassName );
@@ -885,7 +885,7 @@ namespace sfx2
{
::comphelper::SequenceAsHashMap lFilterProps (xFilterList->nextElement());
::rtl::OUString sFilterName = lFilterProps.getUnpackedValueOrDefault(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Name")),
+ ::rtl::OUString("Name"),
::rtl::OUString());
if (!sFilterName.isEmpty())
m_lFilters.push_back(sFilterName);
@@ -1187,9 +1187,9 @@ namespace sfx2
const ::rtl::OUString& _rExtension,
sal_Bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl )
{
- static ::rtl::OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) );
- static ::rtl::OUString sOpenBracket( RTL_CONSTASCII_USTRINGPARAM( " (" ) );
- static ::rtl::OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
+ static ::rtl::OUString sAllFilter( "(*.*)" );
+ static ::rtl::OUString sOpenBracket( " (" );
+ static ::rtl::OUString sCloseBracket( ")" );
::rtl::OUString sRet = _rDisplayText;
if ( sRet.indexOf( sAllFilter ) == -1 )
diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx
index 645f3d3..039f03d 100644
--- a/sfx2/source/notify/eventsupplier.cxx
+++ b/sfx2/source/notify/eventsupplier.cxx
@@ -242,8 +242,8 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
::com::sun::star::uno::Reference
< ::com::sun::star::util::XURLTransformer > xTrans(
::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.util.URLTransformer" )) ),
+ rtl::OUString(
+ "com.sun.star.util.URLTransformer" ) ),
UNO_QUERY );
::com::sun::star::util::URL aURL;
@@ -264,8 +264,8 @@ static void Execute( ANY& aEventData, const css::document::DocumentEvent& aTrigg
xProv = ::com::sun::star::uno::Reference
< ::com::sun::star::frame::XDispatchProvider > (
::comphelper::getProcessServiceFactory()->createInstance(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "com.sun.star.frame.Desktop" )) ),
+ rtl::OUString(
+ "com.sun.star.frame.Desktop" ) ),
UNO_QUERY );
}
@@ -484,13 +484,13 @@ void SfxEvents_Impl::NormalizeMacro( const ::comphelper::NamedValueCollection& i
}
else if ( !aMacroName.isEmpty() )
{
- aScript = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_PRFIX ) );
+ aScript = rtl::OUString( MACRO_PRFIX );
if ( aLibrary.compareTo( SFX_APP()->GetName() ) != 0 && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("StarDesktop")) && !aLibrary.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("application")) )
aScript += String('.');
aScript += String('/');
aScript += aMacroName;
- aScript += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( MACRO_POSTFIX ) );
+ aScript += rtl::OUString( MACRO_POSTFIX );
}
else
// wrong properties
@@ -549,7 +549,7 @@ css::uno::Any SAL_CALL ModelCollectionEnumeration::nextElement()
::osl::ResettableMutexGuard aLock(m_aLock);
if (m_pEnumerationIt == m_lModels.end())
throw css::container::NoSuchElementException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("End of model enumeration reached.")),
+ ::rtl::OUString("End of model enumeration reached."),
static_cast< css::container::XEnumeration* >(this));
css::uno::Reference< css::frame::XModel > xModel(*m_pEnumerationIt, UNO_QUERY);
++m_pEnumerationIt;
@@ -575,7 +575,7 @@ SfxGlobalEvents_Impl::SfxGlobalEvents_Impl( const com::sun::star::uno::Reference
pImp = new GlobalEventConfig();
m_xEvents = pImp;
m_xJobExecutorListener = css::uno::Reference< css::document::XEventListener >(
- xSMGR->createInstance(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.task.JobExecutor"))),
+ xSMGR->createInstance(::rtl::OUString("com.sun.star.task.JobExecutor")),
UNO_QUERY);
m_refCount--;
}
@@ -698,7 +698,7 @@ void SAL_CALL SfxGlobalEvents_Impl::insert( const css::uno::Any& aElement )
aElement >>= xDoc;
if (!xDoc.is())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant locate at least the model parameter.")),
+ ::rtl::OUString("Cant locate at least the model parameter."),
static_cast< css::container::XSet* >(this),
0);
@@ -735,7 +735,7 @@ void SAL_CALL SfxGlobalEvents_Impl::remove( const css::uno::Any& aElement )
aElement >>= xDoc;
if (!xDoc.is())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Cant locate at least the model parameter.")),
+ ::rtl::OUString("Cant locate at least the model parameter."),
static_cast< css::container::XSet* >(this),
0);
commit a6be4aff9ff165a3f6ed4fed8c19c26e4f952a58
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:20:23 2012 -0500
targeted string re-work
Change-Id: I2e05baeb2c7f42e6f37613fe648fc19a8d0ac730
diff --git a/basebmp/test/bmpdemo.cxx b/basebmp/test/bmpdemo.cxx
index 02b392a..2ac3064 100644
--- a/basebmp/test/bmpdemo.cxx
+++ b/basebmp/test/bmpdemo.cxx
@@ -970,7 +970,7 @@ class TestWindow : public Dialog
public:
TestWindow() : Dialog( (Window *) NULL )
{
- SetText( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "VIGRA test" )) );
+ SetText( rtl::OUString( "VIGRA test" ) );
SetSizePixel( Size( 1024, 1024 ) );
EnablePaint( true );
Show();
@@ -1074,9 +1074,9 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m0 0 h7 v7 h-7 z" )) );
+ ::rtl::OUString( "m0 0 h7 v7 h-7 z" ) );
basegfx::tools::importFromSvgD( aPoly,
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "m2 2 h3 v3 h-3 z" )) );
+ ::rtl::OUString( "m2 2 h3 v3 h-3 z" ) );
pDevice->fillPolyPolygon(
aPoly,
@@ -1095,7 +1095,7 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
pMask->drawLine( aPt111, aPt222, aCol333, basebmp::DrawMode_PAINT );
- ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" ));
+ ::rtl::OUString aSvg( "m 0 0 h5 l5 5 v5 h-5 l-5-5 z" );
basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, aSvg );
pMask->clear(basebmp::Color(0xFFFFFFFF));
@@ -1233,8 +1233,8 @@ void TestApp::Main()
// Create UCB.
uno::Sequence< uno::Any > aArgs( 2 );
- aArgs[ 0 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY1_LOCAL ));
- aArgs[ 1 ] <<= rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( UCB_CONFIGURATION_KEY2_OFFICE ));
+ aArgs[ 0 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY1_LOCAL );
+ aArgs[ 1 ] <<= rtl::OUString(UCB_CONFIGURATION_KEY2_OFFICE );
::ucbhelper::ContentBroker::initialize( xFactory, aArgs );
TestWindow pWindow;
diff --git a/basebmp/test/bmpmasktest.cxx b/basebmp/test/bmpmasktest.cxx
index e44aaed..e1e8872 100644
--- a/basebmp/test/bmpmasktest.cxx
+++ b/basebmp/test/bmpmasktest.cxx
@@ -121,7 +121,7 @@ public:
true,
Format::THIRTYTWO_BIT_TC_MASK );
- ::rtl::OUString aSvg( RTL_CONSTASCII_USTRINGPARAM( "m 0 0h5v10h5v-5h-10z" ));
+ ::rtl::OUString aSvg( "m 0 0h5v10h5v-5h-10z" );
basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly, aSvg );
@@ -136,8 +136,7 @@ public:
aColWhite,
DrawMode_PAINT );
- aSvg = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "m 0 0 h6 v10 h-6z" ));
+ aSvg = ::rtl::OUString( "m 0 0 h6 v10 h-6z" );
aPoly.clear();
basegfx::tools::importFromSvgD( aPoly, aSvg );
diff --git a/basebmp/test/polytest.cxx b/basebmp/test/polytest.cxx
index 6348500..0c6b6d4 100644
--- a/basebmp/test/polytest.cxx
+++ b/basebmp/test/polytest.cxx
@@ -68,8 +68,7 @@ private:
basegfx::tools::importFromSvgD(
aPoly,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M2 2 l7 7 z" )) );
+ rtl::OUString( "M2 2 l7 7 z" ) );
rDevice->fillPolyPolygon(
aPoly,
aCol,
@@ -83,8 +82,7 @@ private:
aPoly.clear();
basegfx::tools::importFromSvgD(
aPoly,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M7 2 l-6 6 z" )) );
+ rtl::OUString( "M7 2 l-6 6 z" ) );
rDevice->fillPolyPolygon(
aPoly,
aCol,
@@ -102,8 +100,7 @@ private:
basegfx::tools::importFromSvgD(
aPoly,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M2 2 h1 l7 7 h-1 z" )) );
+ rtl::OUString( "M2 2 h1 l7 7 h-1 z" ) );
rDevice->fillPolyPolygon(
aPoly,
aCol,
@@ -117,8 +114,7 @@ private:
aPoly.clear();
basegfx::tools::importFromSvgD(
aPoly,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M7 2 h-1 l-6 6 h1 z" )) );
+ rtl::OUString( "M7 2 h-1 l-6 6 h1 z" ) );
rDevice->fillPolyPolygon(
aPoly,
aCol,
@@ -132,8 +128,7 @@ private:
aPoly.clear();
basegfx::tools::importFromSvgD(
aPoly,
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M0 0 l7 7 h-1 l-5-7 z" )) );
+ rtl::OUString( "M0 0 l7 7 h-1 l-5-7 z" ) );
rDevice->fillPolyPolygon(
aPoly,
aCol,
@@ -150,8 +145,7 @@ private:
basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) );
+ ::rtl::OUString( "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
rDevice->fillPolyPolygon(
aPoly,
@@ -169,8 +163,7 @@ private:
basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" )) );
+ ::rtl::OUString( "M0 0 h7 v7 h-7 z M2 2 v3 h3 v-3 z" ) );
basegfx::B2DHomMatrix aMat;
aMat.translate(-3,-3);
aMat.rotate( 1.7 );
@@ -270,8 +263,7 @@ private:
// *all* of the four two-pixel lines in that polygon do *not*
// generate a single pixel, due to the rasterization effect.
basegfx::tools::importFromSvgD( aPoly,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M2 3 l1 -1 M4 2 l1 1 M2 8 l1 1 M5 8 l-1 1 M2 5 h4 M3 0 v10" )) );
+ ::rtl::OUString( "M2 3 l1 -1 M4 2 l1 1 M2 8 l1 1 M5 8 l-1 1 M2 5 h4 M3 0 v10" ) );
BitmapDeviceSharedPtr pClippedDevice=(
subsetBitmapDevice( rDevice,
basegfx::B2IBox(3,3,5,9) ));
@@ -294,12 +286,11 @@ private:
basegfx::B2DPolyPolygon aPoly;
basegfx::tools::importFromSvgD( aPoly,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "M0 0 v2 l10 2 v-2 z"
+ ::rtl::OUString( "M0 0 v2 l10 2 v-2 z"
"M10 6 v-2 l-10 2 v2 z"
"M1 0 h1 v10 h-1 z"
"M4 0 h1 v10 h-1 z"
- "M8 0 h1 v10 h-1 z" )) );
+ "M8 0 h1 v10 h-1 z" ) );
rDevice->fillPolyPolygon(
aPoly,
aCol,
commit 1e34e009ff7bb12d9f7c5713bfed013c0abe3ac3
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:18:19 2012 -0500
targeted string re-work
Change-Id: Iaccecb3f54faa157181c45050e395b828784bc00
diff --git a/unoxml/test/domtest.cxx b/unoxml/test/domtest.cxx
index 789c984..a3fae60 100644
--- a/unoxml/test/domtest.cxx
+++ b/unoxml/test/domtest.cxx
@@ -339,14 +339,10 @@ struct SerializerTest : public CppUnit::TestFixture
maRegisteredNamespaces.realloc(2);
maRegisteredNamespaces[0] = beans::make_Pair(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "urn:oasis:names:tc:opendocument:xmlns:office:1.0") ),
+ rtl::OUString( "urn:oasis:names:tc:opendocument:xmlns:office:1.0" ),
xml::sax::FastToken::NAMESPACE);
maRegisteredNamespaces[1] = beans::make_Pair(
- rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
- "http://www.w3.org/1999/xlink") ),
+ rtl::OUString( "http://www.w3.org/1999/xlink" ),
2*xml::sax::FastToken::NAMESPACE);
}
commit acb7bd175abe6c7f793cc673feaab46c90b9a260
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date: Sat Jun 2 16:12:08 2012 -0500
targeted string re-work
Change-Id: I145731d9f28faf0065f5960f2c5a32f27d8c8620
diff --git a/io/test/stm/datatest.cxx b/io/test/stm/datatest.cxx
index 7a54cd2..06b4c54 100644
--- a/io/test/stm/datatest.cxx
+++ b/io/test/stm/datatest.cxx
@@ -120,7 +120,7 @@ void ODataStreamTest::testInvariant(
throw ( IllegalArgumentException,
RuntimeException)
{
- if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ) {
+ if( OUString("com.sun.star.io.DataInputStream") == TestName ) {
Reference < XConnectable > connect( TestObject , UNO_QUERY );
Reference < XActiveDataSink > active( TestObject , UNO_QUERY );
Reference < XInputStream > input( TestObject , UNO_QUERY );
@@ -133,7 +133,7 @@ void ODataStreamTest::testInvariant(
}
- else if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ) {
+ else if( OUString("com.sun.star.io.DataInputStream") == TestName ) {
Reference < XConnectable > connect( TestObject , UNO_QUERY );
Reference < XActiveDataSource > active( TestObject , UNO_QUERY );
Reference < XOutputStream > output( TestObject , UNO_QUERY );
@@ -151,7 +151,7 @@ void ODataStreamTest::testInvariant(
if( info.is() )
{
ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" );
- ERROR_ASSERT( ! info->supportsService( OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" );
+ ERROR_ASSERT( ! info->supportsService( OUString("bla bluzb") ) , "XServiceInfo test failed" );
}
}
@@ -164,8 +164,8 @@ sal_Int32 ODataStreamTest::test(
throw ( IllegalArgumentException,
RuntimeException)
{
- if( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) == TestName ||
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream")) == TestName ) {
+ if( OUString("com.sun.star.io.DataInputStream") == TestName ||
+ OUString("com.sun.star.io.DataOutputStream") == TestName ) {
try
{
@@ -181,21 +181,21 @@ sal_Int32 ODataStreamTest::test(
Reference < XInterface > x = m_rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe" )));
+ OUString( "com.sun.star.io.Pipe" ));
Reference < XInputStream > rPipeInput( x , UNO_QUERY );
Reference < XOutputStream > rPipeOutput( x , UNO_QUERY );
if( ! rSink.is() ) {
x = m_rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream")) );
+ OUString( "com.sun.star.io.DataInputStream") );
rInput = Reference < XDataInputStream > ( x , UNO_QUERY);
rSink = Reference< XActiveDataSink > ( x , UNO_QUERY );
}
else if ( !rSource.is() )
{
x = m_rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataOutputStream") ) );
+ OUString( "com.sun.star.io.DataOutputStream" ) );
rOutput = Reference< XDataOutputStream > ( x , UNO_QUERY );
rSource = Reference< XActiveDataSource > ( x, UNO_QUERY );
}
@@ -290,8 +290,8 @@ void ODataStreamTest::testSimple( const Reference < XDataInputStream > &rInput
rOutput->writeHyper( 0x123456789abcdefLL );
ERROR_ASSERT( rInput->readHyper() == 0x123456789abcdefLL , "int64 read/write mismatch" );
- rOutput->writeUTF( OUString(RTL_CONSTASCII_USTRINGPARAM("Live long and prosper !")) );
- ERROR_ASSERT( rInput->readUTF() == OUString(RTL_CONSTASCII_USTRINGPARAM("Live long and prosper !")) ,
+ rOutput->writeUTF( OUString("Live long and prosper !") );
+ ERROR_ASSERT( rInput->readUTF() == OUString("Live long and prosper !") ,
"UTF read/write mismatch" );
Sequence<sal_Unicode> wc(0x10001);
@@ -365,10 +365,10 @@ Sequence<OUString> ODataStreamTest_getSupportedServiceNames( int i) throw ()
OUString ODataStreamTest_getServiceName( int i) throw ()
{
if( 1 == i ) {
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.DataInputStream" ));
+ return OUString( "test.com.sun.star.io.DataInputStream" );
}
else {
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.DataOutputStream" ));
+ return OUString( "test.com.sun.star.io.DataOutputStream" );
}
}
@@ -376,11 +376,10 @@ OUString ODataStreamTest_getImplementationName( int i) throw ()
{
if( 1 == i ) {
return OUString(
- RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.DataInputStream") );
+ "test.com.sun.star.comp.extensions.stm.DataInputStream" );
}
else {
- return OUString( RTL_CONSTASCII_USTRINGPARAM(
- "test.com.sun.star.comp.extensions.stm.DataOutputStream" ) );
+ return OUString( "test.com.sun.star.comp.extensions.stm.DataOutputStream" );
}
}
@@ -394,7 +393,7 @@ public:
m_b( sal_True ),
m_byte( 42 ),
m_c( 429 ),
- m_s( OUString( RTL_CONSTASCII_USTRINGPARAM( "foo" ) ) )
+ m_s( OUString( "foo" ) )
{}
MyPersistObject( const OUString & sServiceName ) : m_sServiceName( sServiceName )
{}
@@ -639,12 +638,12 @@ Sequence<OUString> OMyPersistObject_getSupportedServiceNames( ) throw ()
OUString OMyPersistObject_getServiceName( ) throw ()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest" ));
+ return OUString( "test.com.sun.star.io.PersistTest" );
}
OUString OMyPersistObject_getImplementationName( ) throw ()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM( "test.com.sun.star.io.PersistTest" ) );
+ return OUString( "test.com.sun.star.io.PersistTest" );
}
class OObjectStreamTest :
@@ -680,7 +679,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName,
throw ( IllegalArgumentException, RuntimeException)
{
- if( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.ObjectInputStream" ) )
+ if( OUString( "com.sun.star.io.ObjectInputStream" )
== TestName )
{
ODataStreamTest::testInvariant( TestName , TestObject );
@@ -689,7 +688,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName,
ERROR_ASSERT( dataInput.is() , "XObjectInputStream cannot be queried" );
ERROR_ASSERT( markable.is() , "XMarkableStream cannot be queried" );
}
- else if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectOutputStream") )
+ else if( OUString( "com.sun.star.io.ObjectOutputStream" )
== TestName )
{
ODataStreamTest::testInvariant( TestName , TestObject );
@@ -704,7 +703,7 @@ void OObjectStreamTest::testInvariant( const OUString& TestName,
if( info.is() )
{
ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" );
- ERROR_ASSERT( ! info->supportsService( OUString(RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" );
+ ERROR_ASSERT( ! info->supportsService( OUString("bla bluzb") ) , "XServiceInfo test failed" );
}
}
@@ -726,7 +725,7 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName,
else if( DATASTREAM_TEST_MAX_HANDLE >= hTestHandle ) {
sal_Int32 hOldHandle = hTestHandle;
hTestHandle = ODataStreamTest::test(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.DataInputStream" )),
+ OUString( "com.sun.star.io.DataInputStream" ),
TestObject , hTestHandle );
if( hTestHandle == -1 ){
hTestHandle = hOldHandle;
@@ -742,19 +741,19 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName,
Reference < XInterface > x = m_rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe" )) );
+ OUString( "com.sun.star.io.Pipe" ) );
Reference <XInputStream > rPipeInput( x , UNO_QUERY );
Reference <XOutputStream > rPipeOutput( x , UNO_QUERY );
x = m_rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream") ) );
+ OUString( "com.sun.star.io.MarkableInputStream" ) );
Reference <XInputStream > markableInput( x , UNO_QUERY );
Reference <XActiveDataSink> markableSink( x , UNO_QUERY );
x = m_rFactory->createInstance( OUString(
- RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableOutputStream" ) ) );
+ "com.sun.star.io.MarkableOutputStream" ) );
Reference <XOutputStream > markableOutput( x , UNO_QUERY );
Reference <XActiveDataSource > markableSource( x , UNO_QUERY );
@@ -768,13 +767,13 @@ sal_Int32 OObjectStreamTest::test( const OUString& TestName,
if( ! rSink.is() ) {
x = m_rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectInputStream") ));
+ OUString( "com.sun.star.io.ObjectInputStream" ));
rInput = Reference < XObjectInputStream > ( x , UNO_QUERY );
rSink = Reference < XActiveDataSink > ( x , UNO_QUERY );
}
else if ( !rSource.is() ) {
x = m_rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.ObjectOutputStream" )));
+ OUString( "com.sun.star.io.ObjectOutputStream" ));
rOutput = Reference <XObjectOutputStream > ( x , UNO_QUERY );
rSource = Reference <XActiveDataSource>( x, UNO_QUERY );
}
@@ -822,57 +821,57 @@ sal_Bool compareMyPropertySet( Reference< XPropertySet > &r1 , Reference < XProp
{
sal_Bool b = sal_True;
- if( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ).getValueType() == getCppuVoidType() ||
- r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ).getValueType() == getCppuVoidType() ) {
+ if( r1->getPropertyValue( OUString("long") ).getValueType() == getCppuVoidType() ||
+ r2->getPropertyValue( OUString("long") ).getValueType() == getCppuVoidType() ) {
// one of the objects is not the correct propertyset !
fprintf( stderr, "compareMyPropertySet: 1\n" );
return sal_False;
}
- b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ) ==
- r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("long")) ) );
+ b = b && ( r1->getPropertyValue( OUString("long") ) ==
+ r2->getPropertyValue( OUString("long") ) );
if( ! b ) fprintf( stderr, "compareMyPropertySet: 2\n" );
- b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) ==
- r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) );
+ b = b && ( r1->getPropertyValue( OUString("float") ) ==
+ r2->getPropertyValue( OUString("float") ) );
if( ! b ){
float f1(0.0);
float f2(0.0);
- r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) >>= f1;
- r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("float")) ) >>= f2;
+ r1->getPropertyValue( OUString("float") ) >>= f1;
+ r2->getPropertyValue( OUString("float") ) >>= f2;
fprintf( stderr, "compareMyPropertySet: %f %f 3\n",f1,f2 );
}
- b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("double")) ) ==
- r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("double" ))) );
+ b = b && ( r1->getPropertyValue( OUString("double") ) ==
+ r2->getPropertyValue( OUString("double" )) );
if( ! b ) fprintf( stderr, "compareMyPropertySet: 4\n" );
sal_Bool b1(sal_False), b2(sal_False);
- Any a =r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) );
+ Any a =r1->getPropertyValue( OUString("bool") );
a >>= b1;
- a = r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) );
+ a = r2->getPropertyValue( OUString("bool") );
a >>= b2;
b = b && ( (b1 && b2) || b1 == b2 );
if( ! b ) fprintf( stderr, "compareMyPropertySet: 5\n" );
-// b = b && r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ) ==
-// r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("bool")) ) );
+// b = b && r1->getPropertyValue( OUString("bool") ) ==
+// r2->getPropertyValue( OUString("bool") ) );
- b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("byte")) ) ==
- r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("byte")) ) );
+ b = b && ( r1->getPropertyValue( OUString("byte") ) ==
+ r2->getPropertyValue( OUString("byte") ) );
if( ! b ) fprintf( stderr, "compareMyPropertySet: 6\n" );
- b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("char")) ) ==
- r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("char")) ) );
+ b = b && ( r1->getPropertyValue( OUString("char") ) ==
+ r2->getPropertyValue( OUString("char") ) );
if( ! b ) fprintf( stderr, "compareMyPropertySet: 7\n" );
- b = b && ( r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("string")) ) ==
- r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("string")) ));
+ b = b && ( r1->getPropertyValue( OUString("string") ) ==
+ r2->getPropertyValue( OUString("string") ));
if( ! b ) fprintf( stderr, "compareMyPropertySet: 8\n" );
- Any o1 = r1->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) );
- Any o2 = r2->getPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) );
+ Any o1 = r1->getPropertyValue( OUString("object") );
+ Any o2 = r2->getPropertyValue( OUString("object") );
if( o1.getValueType() == getCppuType( (Reference<XPersistObject>*)0 ) ) {
@@ -916,7 +915,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream >
// reading the data behind the object !
{
Reference < XInterface > x = * new MyPersistObject(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla blubs")) );
+ OUString( "bla blubs") );
Reference< XPersistObject > persistRef( x , UNO_QUERY );
ERROR_ASSERT( persistRef.is() , "couldn't instantiate PersistTest object" );
@@ -942,7 +941,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream >
{
Reference < XInterface > x = m_rFactory->createInstance(
- OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest")));
+ OUString( "test.com.sun.star.io.PersistTest"));
Reference< XPersistObject > persistRef( x , UNO_QUERY );
ERROR_ASSERT( persistRef.is() , "couldn't instantiate PersistTest object" );
@@ -953,34 +952,34 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream >
Any any;
sal_Int32 i = 0x83482;
any <<= i;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("long")) , any );
+ rProp->setPropertyValue( OUString( "long") , any );
float f = (float)42.23;
any <<= f;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("float")) , any );
+ rProp->setPropertyValue( OUString( "float") , any );
double d = 233.321412;
any <<= d;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("double")) , any );
+ rProp->setPropertyValue( OUString( "double") , any );
sal_Bool b = sal_True;
any.setValue( &b , getCppuBooleanType() );
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("bool")) , any );
+ rProp->setPropertyValue( OUString( "bool") , any );
sal_Int8 by = 120;
any <<= by;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("byte")) , any );
+ rProp->setPropertyValue( OUString( "byte") , any );
sal_Unicode c = 'h';
any.setValue( &c , getCppuCharType() );
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("char")) , any );
+ rProp->setPropertyValue( OUString( "char") , any );
- OUString str( RTL_CONSTASCII_USTRINGPARAM( "hi du !" ) );
+ OUString str( "hi du !" );
any <<= str;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("string")) , any );
+ rProp->setPropertyValue( OUString( "string") , any );
any <<= persistRef;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("object")) , any );
+ rProp->setPropertyValue( OUString( "object") , any );
// do read and write
rOut->writeObject( persistRef );
@@ -991,8 +990,8 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream >
ERROR_ASSERT( compareMyPropertySet( rProp , rPropRead ) , "objects has not been read properly !" );
// destroy selfreferences
- rProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")), Any() );
- rPropRead->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")), Any() );
+ rProp->setPropertyValue( OUString("object"), Any() );
+ rPropRead->setPropertyValue( OUString("object"), Any() );
}
{
@@ -1003,7 +1002,7 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream >
// buffering and marks work correctly
for( int i = 0 ; i < 2000 ; i ++ ) {
- Reference < XInterface > x = m_rFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest")));
+ Reference < XInterface > x = m_rFactory->createInstance(OUString("test.com.sun.star.io.PersistTest"));
Reference< XPersistObject > persistRef( x , UNO_QUERY );
Reference < XPropertySet > rProp( persistRef , UNO_QUERY );
@@ -1012,39 +1011,39 @@ void OObjectStreamTest::testObject( const Reference< XObjectOutputStream >
Any any;
sal_Int32 i = 0x83482;
any <<= i;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("long")) , any );
+ rProp->setPropertyValue( OUString( "long") , any );
float f = 42.23;
any <<= f;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("float")) , any );
+ rProp->setPropertyValue( OUString( "float") , any );
double d = 233.321412;
any <<= d;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("double")) , any );
+ rProp->setPropertyValue( OUString( "double") , any );
sal_Bool b = sal_True;
any.setValue( &b , getCppuBooleanType() );
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("bool")) , any );
+ rProp->setPropertyValue( OUString( "bool") , any );
sal_Int8 by = 120;
any <<= by;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("byte")) , any );
+ rProp->setPropertyValue( OUString( "byte") , any );
sal_Unicode c = 'h';
any.setValue( &c , getCppuCharType() );
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("char")) , any );
+ rProp->setPropertyValue( OUString( "char") , any );
- OUString str( RTL_CONSTASCII_USTRINGPARAM( "hi du !" ) );
+ OUString str( "hi du !" );
any <<= str;
- rProp->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM("string")) , any );
+ rProp->setPropertyValue( OUString( "string") , any );
- x = m_rFactory->createInstance(OUString(RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.PersistTest")));
+ x = m_rFactory->createInstance(OUString("test.com.sun.star.io.PersistTest"));
Reference <XPersistObject > persist2ndRef( x , UNO_QUERY );
// Note : persist2ndRef contains coincident values, but also coincident values must be
// saved properly !
any <<= persist2ndRef;
- rProp->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("object")) , any );
+ rProp->setPropertyValue( OUString("object") , any );
// simply test, if markable operations and object operations do not interfere
sal_Int32 nMark = markableOut->createMark();
@@ -1090,20 +1089,20 @@ Sequence<OUString> OObjectStreamTest_getSupportedServiceNames( int i) throw ()
OUString OObjectStreamTest_getServiceName( int i) throw ()
{
if( 1 == i ) {
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.ObjectInputStream" ));
+ return OUString( "test.com.sun.star.io.ObjectInputStream" );
}
else {
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.ObjectOutputStream"));
+ return OUString( "test.com.sun.star.io.ObjectOutputStream");
}
}
OUString OObjectStreamTest_getImplementationName( int i) throw ()
{
if( 1 == i ) {
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.ObjectInputStream" ));
+ return OUString( "test.com.sun.star.comp.extensions.stm.ObjectInputStream" );
}
else {
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.comp.extensions.stm.ObjectOutputStream"));
+ return OUString( "test.com.sun.star.comp.extensions.stm.ObjectOutputStream");
}
}
diff --git a/io/test/stm/marktest.cxx b/io/test/stm/marktest.cxx
index d0d9976..ef0aace 100644
--- a/io/test/stm/marktest.cxx
+++ b/io/test/stm/marktest.cxx
@@ -119,7 +119,7 @@ void OMarkableOutputStreamTest::testInvariant( const OUString& TestName,
{
ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" );
ERROR_ASSERT( ! info->supportsService(
- OUString( RTL_CONSTASCII_USTRINGPARAM("bla bluzb")) ) , "XServiceInfo test failed" );
+ OUString( "bla bluzb") ) , "XServiceInfo test failed" );
}
}
@@ -130,7 +130,7 @@ sal_Int32 OMarkableOutputStreamTest::test(
sal_Int32 hTestHandle)
throw ( IllegalArgumentException, RuntimeException)
{
- if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableOutputStream") )
+ if( OUString( "com.sun.star.io.MarkableOutputStream" )
== TestName ) {
try
{
@@ -140,7 +140,7 @@ sal_Int32 OMarkableOutputStreamTest::test(
}
else
{
- Reference < XInterface > x = m_rFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.Pipe")));
+ Reference < XInterface > x = m_rFactory->createInstance( OUString("com.sun.star.io.Pipe"));
Reference< XOutputStream > rPipeOutput( x , UNO_QUERY );
Reference < XInputStream > rPipeInput( x , UNO_QUERY );
@@ -395,12 +395,12 @@ Sequence<OUString> OMarkableOutputStreamTest_getSupportedServiceNames(void) thro
OUString OMarkableOutputStreamTest_getServiceName() throw ()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.star.io.MarkableOutputStream"));
+ return OUString( "test.com.sun.star.io.MarkableOutputStream");
}
OUString OMarkableOutputStreamTest_getImplementationName() throw ()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM("test.com.sun.starextensions.stm.MarkableOutputStream"));
+ return OUString( "test.com.sun.starextensions.stm.MarkableOutputStream");
}
@@ -474,7 +474,7 @@ void OMarkableInputStreamTest::testInvariant(
const OUString& TestName, const Reference < XInterface >& TestObject )
throw ( IllegalArgumentException, RuntimeException)
{
- if( OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.io.MarkableInputStream"))
+ if( OUString( "com.sun.star.io.MarkableInputStream")
== TestName ) {
Reference <XServiceInfo > info( TestObject, UNO_QUERY );
ERROR_ASSERT( info.is() , "XServiceInfo not supported !" );
@@ -483,7 +483,7 @@ void OMarkableInputStreamTest::testInvariant(
ERROR_ASSERT( info->supportsService( TestName ), "XServiceInfo test failed" );
ERROR_ASSERT(
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list