[Libreoffice-commits] .: filter/inc filter/source
David Tardon
dtardon at kemper.freedesktop.org
Fri Nov 19 23:17:58 PST 2010
filter/inc/filter/msfilter/msocximex.hxx | 62 ++++++------
filter/source/config/cache/basecontainer.cxx | 12 +-
filter/source/config/cache/configflush.cxx | 2
filter/source/config/cache/contenthandlerfactory.cxx | 4
filter/source/config/cache/filtercache.cxx | 30 ++---
filter/source/config/cache/filterfactory.cxx | 38 +++----
filter/source/config/cache/frameloaderfactory.cxx | 4
filter/source/config/cache/lateinitlistener.cxx | 2
filter/source/config/cache/registration.hxx | 2
filter/source/config/cache/typedetection.cxx | 10 -
filter/source/filtertracer/filtertracer.cxx | 2
filter/source/flash/swffilter.cxx | 2
filter/source/flash/swfuno.cxx | 4
filter/source/flash/swfwriter1.cxx | 2
filter/source/graphicfilter/icgm/actimpr.cxx | 92 +++++++++---------
filter/source/graphicfilter/icgm/cgm.cxx | 2
filter/source/msfilter/escherex.cxx | 4
filter/source/msfilter/eschesdo.cxx | 22 ++--
filter/source/msfilter/msdffimp.cxx | 12 +-
filter/source/msfilter/msfiltertracer.cxx | 42 ++++----
filter/source/msfilter/msocximex.cxx | 18 +--
filter/source/msfilter/msoleexp.cxx | 10 -
filter/source/msfilter/mstoolbar.cxx | 6 -
filter/source/msfilter/msvbahelper.cxx | 6 -
filter/source/msfilter/svdfppt.cxx | 10 -
filter/source/msfilter/svxmsbas.cxx | 4
filter/source/pdf/pdfexport.cxx | 14 +-
filter/source/pdf/pdfuno.cxx | 4
filter/source/placeware/tempfile.cxx | 2
filter/source/placeware/uno.cxx | 2
filter/source/svg/svgfilter.cxx | 26 ++---
filter/source/svg/svgreader.cxx | 4
filter/source/svg/svguno.cxx | 2
filter/source/svg/svgwriter.cxx | 8 -
filter/source/t602/filterenv.cxx | 4
filter/source/t602/t602filter.cxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 26 ++---
filter/source/xmlfilteradaptor/genericfilter.cxx | 2
filter/source/xmlfilterdetect/fdcomp.cxx | 2
filter/source/xmlfilterdetect/filterdetect.cxx | 14 +-
filter/source/xsltdialog/typedetectionexport.cxx | 22 ++--
filter/source/xsltdialog/typedetectionimport.cxx | 2
filter/source/xsltdialog/xmlfileview.cxx | 2
filter/source/xsltdialog/xmlfilterdialogcomponent.cxx | 4
filter/source/xsltdialog/xmlfilterjar.cxx | 8 -
filter/source/xsltdialog/xmlfiltersettingsdialog.cxx | 14 +-
filter/source/xsltdialog/xmlfiltertabdialog.cxx | 4
filter/source/xsltdialog/xmlfiltertabpagexslt.cxx | 2
filter/source/xsltdialog/xmlfiltertestdialog.cxx | 48 ++++-----
filter/source/xsltfilter/XSLTFilter.cxx | 40 +++----
50 files changed, 330 insertions(+), 334 deletions(-)
New commits:
commit 838018149848af434415d32baa9f88f5ce982d99
Author: Kevin Hunter <hunteke at earlham.edu>
Date: Fri Nov 19 11:18:37 2010 -0500
EasyHack: RTL conversion from createFromAscii
diff --git a/filter/inc/filter/msfilter/msocximex.hxx b/filter/inc/filter/msfilter/msocximex.hxx
index 4f08006..fce3551 100644
--- a/filter/inc/filter/msfilter/msocximex.hxx
+++ b/filter/inc/filter/msfilter/msocximex.hxx
@@ -424,7 +424,7 @@ public:
class OCX_TabStrip : public OCX_Control
{
public:
- OCX_TabStrip() : OCX_Control( rtl::OUString::createFromAscii("TabStrip")), nIdentifier(0), nFixedAreaLen(0), nNumTabs(0), bHasTabs(true) {}
+ OCX_TabStrip() : OCX_Control( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TabStrip" ))), nIdentifier(0), nFixedAreaLen(0), nNumTabs(0), bHasTabs(true) {}
virtual sal_Bool ReadFontData(SotStorageStream *pS);
virtual sal_Bool Read(SotStorageStream *pS);
@@ -440,9 +440,9 @@ public:
class OCX_Image : public OCX_Control
{
public:
- OCX_Image() : OCX_Control(rtl::OUString::createFromAscii("Image")), fEnabled(1), fBackStyle(0), bPictureTiling(false), bAutoSize(false) {
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.DatabaseImageControl");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlImageControlModel");
+ OCX_Image() : OCX_Control(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Image" ))), fEnabled(1), fBackStyle(0), bPictureTiling(false), bAutoSize(false) {
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.DatabaseImageControl" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlImageControlModel" ));
}
~OCX_Image() { }
@@ -693,9 +693,9 @@ private:
class OCX_CheckBox : public OCX_ModernControl
{
public:
- OCX_CheckBox() : OCX_ModernControl(rtl::OUString::createFromAscii("CheckBox")){
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CheckBox");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCheckBoxModel");
+ OCX_CheckBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CheckBox" ))){
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CheckBox" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlCheckBoxModel" ));
mnBackColor = 0x80000005L;
mnForeColor = 0x80000008L;
aFontData.SetHasAlign(TRUE);
@@ -718,11 +718,11 @@ public:
class OCX_OptionButton : public OCX_ModernControl
{
public:
- OCX_OptionButton() : OCX_ModernControl(rtl::OUString::createFromAscii("OptionButton"))
+ OCX_OptionButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OptionButton" )))
{
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton");
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
//msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlRadioButtonModel");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.RadioButton");
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.RadioButton" ));
mnBackColor = 0x80000005L;
mnForeColor = 0x80000008L;
aFontData.SetHasAlign(TRUE);
@@ -747,9 +747,9 @@ public:
class OCX_TextBox : public OCX_ModernControl
{
public:
- OCX_TextBox() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) {
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.TextField");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlEditModel");
+ OCX_TextBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEditModel" ));
mnBackColor = 0x80000005L;
mnForeColor = 0x80000008L;
nBorderColor = 0x80000006L;
@@ -774,7 +774,7 @@ public:
class OCX_FieldControl: public OCX_ModernControl
{
public:
- OCX_FieldControl() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) {
+ OCX_FieldControl() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
mnBackColor = 0x80000005L;
mnForeColor = 0x80000008L;
nBorderColor = 0x80000006L;
@@ -794,9 +794,9 @@ public:
class OCX_ToggleButton : public OCX_ModernControl
{
public:
- OCX_ToggleButton() : OCX_ModernControl(rtl::OUString::createFromAscii("ToggleButton")) {
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CommandButton");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel");
+ OCX_ToggleButton() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ToggleButton" ))) {
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ));
mnBackColor = 0x8000000F;
mnForeColor = 0x80000012;
@@ -821,9 +821,9 @@ public:
class OCX_ComboBox : public OCX_ModernControl
{
public:
- OCX_ComboBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ComboBox")){
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ComboBox");
+ OCX_ComboBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ComboBox" ))){
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ComboBox" ));
mnBackColor = 0x80000005;
mnForeColor = 0x80000008;
nBorderColor = 0x80000006;
@@ -846,10 +846,10 @@ public:
class OCX_ListBox : public OCX_ModernControl
{
public:
- OCX_ListBox() : OCX_ModernControl(rtl::OUString::createFromAscii("ListBox")){
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
+ OCX_ListBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ListBox" ))){
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
//msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlListBoxModel");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.form.component.ListBox");
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ListBox" ));
mnBackColor = 0x80000005;
mnForeColor = 0x80000008;
nBorderColor = 0x80000006;
@@ -879,8 +879,8 @@ public:
nAccelerator(0), nIcon(0), pCaption(0), nIconLen(0), pIcon(0), nPictureLen(0),
mbTakeFocus( true )
{
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.CommandButton");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlButtonModel");
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.CommandButton" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlButtonModel" ));
mnForeColor = 0x80000012L;
mnBackColor = 0x8000000FL;
}
@@ -986,15 +986,15 @@ public:
class OCX_Label : public OCX_Control
{
public:
- OCX_Label(OCX_Control* pParent = NULL ) : OCX_Control(rtl::OUString::createFromAscii("Label"), pParent ), fEnabled(1),
+ OCX_Label(OCX_Control* pParent = NULL ) : OCX_Control(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Label" )), pParent ), fEnabled(1),
fLocked(0),fBackStyle(1),fWordWrap(1),
fAutoSize(0),nCaptionLen(0),nVertPos(1),nHorzPos(7),nMousePointer(0),
nBorderColor(0x80000006),nBorderStyle(0),nSpecialEffect(0),
nPicture(0),nAccelerator(0),nIcon(0),pCaption(0),nIconLen(0),pIcon(0),
nPictureLen(0)
{
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.FixedText");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFixedTextModel");
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FixedText" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlFixedTextModel" ));
mnForeColor = 0x80000008;
mnBackColor = 0x80000005;
aFontData.SetHasAlign(TRUE);
@@ -1181,9 +1181,9 @@ public:
class HTML_TextBox : public OCX_ModernControl
{
public:
- HTML_TextBox() : OCX_ModernControl(rtl::OUString::createFromAscii("TextBox")) {
- msFormType = rtl::OUString::createFromAscii("com.sun.star.form.component.TextField");
- msDialogType = rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlEditModel");
+ HTML_TextBox() : OCX_ModernControl(rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextBox" ))) {
+ msFormType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.TextField" ));
+ msDialogType = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.awt.UnoControlEditModel" ));
mnBackColor = 0x80000005L;
mnForeColor = 0x80000008L;
nBorderColor = 0x80000006L;
diff --git a/filter/source/config/cache/basecontainer.cxx b/filter/source/config/cache/basecontainer.cxx
index c8787fe..83c3f57 100644
--- a/filter/source/config/cache/basecontainer.cxx
+++ b/filter/source/config/cache/basecontainer.cxx
@@ -156,7 +156,7 @@ void BaseContainer::impl_initFlushMode()
m_pFlushCache = m_rCache->clone();
if (!m_pFlushCache)
throw css::uno::RuntimeException(
- ::rtl::OUString::createFromAscii("Cant create write copy of internal used cache on demand."),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant create write copy of internal used cache on demand." )),
dynamic_cast< css::container::XNameAccess* >(this));
// <- SAFE
}
@@ -231,7 +231,7 @@ void SAL_CALL BaseContainer::insertByName(const ::rtl::OUString& sItem ,
{
if (!sItem.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("empty value not allowed as item name."),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "empty value not allowed as item name." )),
static_cast< css::container::XNameContainer* >(this),
1);
@@ -297,7 +297,7 @@ void SAL_CALL BaseContainer::replaceByName(const ::rtl::OUString& sItem ,
{
if (!sItem.getLength())
throw css::lang::IllegalArgumentException(
- ::rtl::OUString::createFromAscii("empty value not allowed as item name."),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "empty value not allowed as item name." )),
static_cast< css::container::XNameContainer* >(this),
1);
@@ -338,7 +338,7 @@ css::uno::Any SAL_CALL BaseContainer::getByName(const ::rtl::OUString& sItem)
{
if (!sItem.getLength())
throw css::container::NoSuchElementException(
- ::rtl::OUString::createFromAscii("An empty item cant be part of this cache!"),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "An empty item cant be part of this cache!" )),
css::uno::Reference< css::uno::XInterface >(static_cast< css::container::XNameAccess* >(this), css::uno::UNO_QUERY));
css::uno::Any aValue;
@@ -543,7 +543,7 @@ void SAL_CALL BaseContainer::flush()
if (!m_pFlushCache)
throw css::lang::WrappedTargetRuntimeException(
- ::rtl::OUString::createFromAscii("Cant guarantee cache consistency. Special flush container does not exists!"),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant guarantee cache consistency. Special flush container does not exists!" )),
dynamic_cast< css::container::XNameAccess* >(this),
css::uno::Any());
@@ -566,7 +566,7 @@ void SAL_CALL BaseContainer::flush()
// later again ...
throw css::lang::WrappedTargetRuntimeException(
- ::rtl::OUString::createFromAscii("Flush rejected by internal container."),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Flush rejected by internal container." )),
dynamic_cast< css::container::XNameAccess* >(this),
css::uno::makeAny(ex));
}
diff --git a/filter/source/config/cache/configflush.cxx b/filter/source/config/cache/configflush.cxx
index dc6d642..2289934 100644
--- a/filter/source/config/cache/configflush.cxx
+++ b/filter/source/config/cache/configflush.cxx
@@ -146,7 +146,7 @@ void SAL_CALL ConfigFlush::removeRefreshListener(const css::uno::Reference< css:
//-----------------------------------------------
::rtl::OUString ConfigFlush::impl_getImplementationName()
{
- static ::rtl::OUString IMPLNAME = ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.ConfigFlush");
+ static ::rtl::OUString IMPLNAME( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.ConfigFlush" ));
return IMPLNAME;
}
diff --git a/filter/source/config/cache/contenthandlerfactory.cxx b/filter/source/config/cache/contenthandlerfactory.cxx
index 5befb33..75046ba 100644
--- a/filter/source/config/cache/contenthandlerfactory.cxx
+++ b/filter/source/config/cache/contenthandlerfactory.cxx
@@ -176,7 +176,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailab
-----------------------------------------------*/
::rtl::OUString ContentHandlerFactory::impl_getImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.ContentHandlerFactory");
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.ContentHandlerFactory" ));
}
/*-----------------------------------------------
@@ -185,7 +185,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL ContentHandlerFactory::getAvailab
css::uno::Sequence< ::rtl::OUString > ContentHandlerFactory::impl_getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
- lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.ContentHandlerFactory");
+ lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.ContentHandlerFactory" ));
return lServiceNames;
}
diff --git a/filter/source/config/cache/filtercache.cxx b/filter/source/config/cache/filtercache.cxx
index 114df59..199cebc 100644
--- a/filter/source/config/cache/filtercache.cxx
+++ b/filter/source/config/cache/filtercache.cxx
@@ -77,7 +77,7 @@ namespace css = ::com::sun::star;
// Error message in case filter config seems to be corrupted.
// Note: Dont tell user something about "setup -repair"!
// Its no longer supported by using native installers ...
-static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG = ::rtl::OUString::createFromAscii("The filter configuration appears to be defective. Please install the office suite again.");
+static ::rtl::OUString MESSAGE_CORRUPTED_FILTERCONFIG( RTL_CONSTASCII_USTRINGPARAM( "The filter configuration appears to be defective. Please install the office suite again." ));
/*-----------------------------------------------
15.03.2004 08:59
@@ -717,7 +717,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
// special case. no exception - but not a valid item => set must be finalized or mandatory!
// Reject flush operation by throwing an exception. At least one item couldnt be flushed.
if (!xItem.is())
- throw css::uno::Exception(::rtl::OUString::createFromAscii("Cant add item. Set is finalized or mandatory!"),
+ throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant add item. Set is finalized or mandatory!" )),
css::uno::Reference< css::uno::XInterface >() );
CacheItemList::const_iterator pItem = rCache.find(sItem);
@@ -734,7 +734,7 @@ void FilterCache::impl_flushByList(const css::uno::Reference< css::container::XN
// special case. no exception - but not a valid item => it must be finalized or mandatory!
// Reject flush operation by throwing an exception. At least one item couldnt be flushed.
if (!xItem.is())
- throw css::uno::Exception(::rtl::OUString::createFromAscii("Cant change item. Its finalized or mandatory!"),
+ throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant change item. Its finalized or mandatory!" )),
css::uno::Reference< css::uno::XInterface >() );
CacheItemList::const_iterator pItem = rCache.find(sItem);
@@ -831,7 +831,7 @@ CacheItemList& FilterCache::impl_getItemList(EItemType eType) const
case E_CONTENTHANDLER : return m_lContentHandlers;
case E_DETECTSERVICE : return m_lDetectServices ;
- default : throw css::uno::Exception(::rtl::OUString::createFromAscii("unknown sub container requested."),
+ default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unknown sub container requested." )),
css::uno::Reference< css::uno::XInterface >() );
}
@@ -901,7 +901,7 @@ css::uno::Reference< css::uno::XInterface > FilterCache::impl_openConfig(EConfig
}
break;
- default : throw css::uno::Exception(::rtl::OUString::createFromAscii("These configuration node isnt supported here for open!"), 0);
+ default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "These configuration node isnt supported here for open!" )), 0);
}
{
@@ -1072,7 +1072,7 @@ void FilterCache::impl_validateAndOptimize()
throw css::document::CorruptedFilterConfigurationException(
MESSAGE_CORRUPTED_FILTERCONFIG,
css::uno::Reference< css::uno::XInterface >(),
- ::rtl::OUString::createFromAscii("The list of types or filters is empty."));
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "The list of types or filters is empty." )));
}
// Create a log for all detected problems, which
@@ -1372,7 +1372,7 @@ void FilterCache::impl_addItem2FlushList( EItemType eType,
pList = &m_lChangedDetectServices;
break;
- default : throw css::uno::Exception(::rtl::OUString::createFromAscii("unsupported item type"), 0);
+ default : throw css::uno::Exception(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "unsupported item type" )), 0);
}
OUStringList::const_iterator pItem = ::std::find(pList->begin(), pList->end(), sItem);
@@ -1666,8 +1666,8 @@ void FilterCache::impl_readPatchUINames(const css::uno::Reference< css::containe
CacheItem& rItem)
throw(css::uno::Exception)
{
- static ::rtl::OUString FORMATNAME_VAR = ::rtl::OUString::createFromAscii("%productname%" );
- static ::rtl::OUString FORMATVERSION_VAR = ::rtl::OUString::createFromAscii("%formatversion%");
+ static ::rtl::OUString FORMATNAME_VAR( RTL_CONSTASCII_USTRINGPARAM( "%productname%" ));
+ static ::rtl::OUString FORMATVERSION_VAR( RTL_CONSTASCII_USTRINGPARAM( "%formatversion%" ));
// SAFE -> ----------------------------------
::osl::ResettableMutexGuard aLock(m_aLock);
@@ -2348,8 +2348,8 @@ void FilterCache::impl_interpretDataVal4Filter(const ::rtl::OUString& sValue,
void FilterCache::impl_readOldFormat()
throw(css::uno::Exception)
{
- static ::rtl::OUString TYPES_SET = ::rtl::OUString::createFromAscii("Types" );
- static ::rtl::OUString FILTER_SET = ::rtl::OUString::createFromAscii("Filters");
+ static ::rtl::OUString TYPES_SET( RTL_CONSTASCII_USTRINGPARAM( "Types" ));
+ static ::rtl::OUString FILTER_SET( RTL_CONSTASCII_USTRINGPARAM( "Filters" ));
// Attention: Opening/Reading of this old configuration format has to be handled gracefully.
// Its optional and shouldnt disturb our normal work!
@@ -2403,7 +2403,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
xSet->getByName(sItem) >>= xItem;
if (!xItem.is())
throw css::uno::Exception(
- ::rtl::OUString::createFromAscii("Cant read old item."),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant read old item." )),
css::uno::Reference< css::uno::XInterface >());
CacheItem aItem;
@@ -2418,7 +2418,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
// Data
::rtl::OUString sData;
OUStringList lData;
- xItem->getByName(::rtl::OUString::createFromAscii("Data")) >>= sData;
+ xItem->getByName(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Data" ))) >>= sData;
lData = impl_tokenizeString(sData, (sal_Unicode)',');
if (
(!sData.getLength()) ||
@@ -2426,7 +2426,7 @@ CacheItem FilterCache::impl_readOldItem(const css::uno::Reference< css::containe
)
{
throw css::uno::Exception(
- ::rtl::OUString::createFromAscii("Cant read old item property DATA."),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Cant read old item property DATA." )),
css::uno::Reference< css::uno::XInterface >());
}
@@ -2522,7 +2522,7 @@ sal_Bool FilterCache::impl_isModuleInstalled(const ::rtl::OUString& sModule)
m_xModuleCfg = css::uno::Reference< css::container::XNameAccess >(
::comphelper::ConfigurationHelper::openConfig(
m_xSMGR,
- ::rtl::OUString::createFromAscii("org.openoffice.Setup/Office/Factories"),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "org.openoffice.Setup/Office/Factories" )),
::comphelper::ConfigurationHelper::E_READONLY),
css::uno::UNO_QUERY_THROW);
}
diff --git a/filter/source/config/cache/filterfactory.cxx b/filter/source/config/cache/filterfactory.cxx
index 697418e..245b879 100644
--- a/filter/source/config/cache/filterfactory.cxx
+++ b/filter/source/config/cache/filterfactory.cxx
@@ -84,17 +84,17 @@ namespace css = ::com::sun::star;
#define SEPERATOR_QUERYPARAM ((sal_Unicode)':')
#define SEPERATOR_QUERYPARAMVALUE ((sal_Unicode)'=')
-#define QUERYPARAM_IFLAGS ::rtl::OUString::createFromAscii("iflags")
-#define QUERYPARAM_EFLAGS ::rtl::OUString::createFromAscii("eflags")
-#define QUERYPARAM_SORT_PROP ::rtl::OUString::createFromAscii("sort_prop")
+#define QUERYPARAM_IFLAGS ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "iflags" ))
+#define QUERYPARAM_EFLAGS ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "eflags" ))
+#define QUERYPARAM_SORT_PROP ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sort_prop" ))
-#define QUERYPARAM_DESCENDING ::rtl::OUString::createFromAscii("descending")
-#define QUERYPARAM_USE_ORDER ::rtl::OUString::createFromAscii("use_order")
-#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString::createFromAscii("default_first")
-#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString::createFromAscii("case_sensitive")
+#define QUERYPARAM_DESCENDING ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "descending" ))
+#define QUERYPARAM_USE_ORDER ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "use_order" ))
+#define QUERYPARAM_DEFAULT_FIRST ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "default_first" ))
+#define QUERYPARAM_CASE_SENSITIVE ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "case_sensitive" ))
-#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString::createFromAscii("name")
-#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString::createFromAscii("uiname")
+#define QUERYPARAMVALUE_SORT_PROP_NAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "name" ))
+#define QUERYPARAMVALUE_SORT_PROP_UINAME ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "uiname" ))
/*-----------------------------------------------
09.07.2003 07:43
@@ -249,7 +249,7 @@ css::uno::Reference< css::container::XEnumeration > SAL_CALL FilterFactory::crea
// convert "_query_xxx:..." to "getByDocService=xxx:..."
::rtl::OUString sNewQuery(sQuery);
- sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString::createFromAscii("_query_"),0);
+ sal_Int32 pos = sNewQuery.indexOf(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "_query_" )),0);
if (pos != -1)
{
OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use new query format: 'matchByDocumentService=...'");
@@ -354,43 +354,43 @@ OUStringList FilterFactory::impl_queryMatchByDocumentService(const QueryTokenize
if (sDocumentService.equalsAscii("writer"))
{
OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.TextDocument");
+ sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" ));
}
else
if (sDocumentService.equalsAscii("web"))
{
OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.WebDocument");
+ sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.WebDocument" ));
}
else
if (sDocumentService.equalsAscii("global"))
{
OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.text.GlobalDocument");
+ sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.GlobalDocument" ));
}
else
if (sDocumentService.equalsAscii("calc"))
{
OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.sheet.SpreadsheetDocument");
+ sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" ));
}
else
if (sDocumentService.equalsAscii("draw"))
{
OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.drawing.DrawingDocument");
+ sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" ));
}
else
if (sDocumentService.equalsAscii("impress"))
{
OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.presentation.PresentationDocument");
+ sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" ));
}
else
if (sDocumentService.equalsAscii("math"))
{
OSL_ENSURE(sal_False, "DEPRECATED!\nPlease use right document service for filter query!");
- sDocumentService = ::rtl::OUString::createFromAscii("com.sun.star.formula.FormulaProperties");
+ sDocumentService = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" ));
}
#endif
@@ -699,7 +699,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
-----------------------------------------------*/
::rtl::OUString FilterFactory::impl_getImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.FilterFactory");
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FilterFactory" ));
}
/*-----------------------------------------------
@@ -708,7 +708,7 @@ OUStringList FilterFactory::impl_readSortedFilterListFromConfig(const ::rtl::OUS
css::uno::Sequence< ::rtl::OUString > FilterFactory::impl_getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
- lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.FilterFactory");
+ lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" ));
return lServiceNames;
}
diff --git a/filter/source/config/cache/frameloaderfactory.cxx b/filter/source/config/cache/frameloaderfactory.cxx
index 4c33b9f..03a6070 100644
--- a/filter/source/config/cache/frameloaderfactory.cxx
+++ b/filter/source/config/cache/frameloaderfactory.cxx
@@ -173,7 +173,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableS
-----------------------------------------------*/
::rtl::OUString FrameLoaderFactory::impl_getImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.FrameLoaderFactory");
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.FrameLoaderFactory" ));
}
/*-----------------------------------------------
@@ -182,7 +182,7 @@ css::uno::Sequence< ::rtl::OUString > SAL_CALL FrameLoaderFactory::getAvailableS
css::uno::Sequence< ::rtl::OUString > FrameLoaderFactory::impl_getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
- lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.frame.FrameLoaderFactory");
+ lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.FrameLoaderFactory" ));
return lServiceNames;
}
diff --git a/filter/source/config/cache/lateinitlistener.cxx b/filter/source/config/cache/lateinitlistener.cxx
index 6656742..ab56db5 100644
--- a/filter/source/config/cache/lateinitlistener.cxx
+++ b/filter/source/config/cache/lateinitlistener.cxx
@@ -60,7 +60,7 @@ LateInitListener::LateInitListener(const css::uno::Reference< css::lang::XMultiS
osl_incrementInterlockedCount( &m_refCount );
m_xBroadcaster = css::uno::Reference< css::document::XEventBroadcaster >(
- m_xSMGR->createInstance(::rtl::OUString::createFromAscii("com.sun.star.frame.GlobalEventBroadcaster")),
+ m_xSMGR->createInstance(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.GlobalEventBroadcaster" ))),
css::uno::UNO_QUERY_THROW);
m_xBroadcaster->addEventListener(static_cast< css::document::XEventListener* >(this));
diff --git a/filter/source/config/cache/registration.hxx b/filter/source/config/cache/registration.hxx
index 0a7e4c8..4f7bf20 100644
--- a/filter/source/config/cache/registration.hxx
+++ b/filter/source/config/cache/registration.hxx
@@ -67,7 +67,7 @@ namespace comphelper{
MyClass::st_getServNames())
b) _COMPHELPER_COMPONENTINFO( MyClass,
- ::rtl::OUString::createFromAscii("css.MyClass"),
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "css.MyClass" )),
lServiceNames)
@param CLASS
diff --git a/filter/source/config/cache/typedetection.cxx b/filter/source/config/cache/typedetection.cxx
index d93deff..826754c 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -140,7 +140,7 @@ TypeDetection::~TypeDetection()
::rtl::OUString sURL = stlDescriptor.getUnpackedValueOrDefault(::comphelper::MediaDescriptor::PROP_URL(), ::rtl::OUString());
#if OSL_DEBUG_LEVEL > 0
- if (stlDescriptor.find(::rtl::OUString::createFromAscii("FileName")) != stlDescriptor.end())
+ if (stlDescriptor.find(::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FileName" ))) != stlDescriptor.end())
OSL_ENSURE(sal_False, "Detect using of deprecated and already unsupported MediaDescriptor property \"FileName\"!");
#endif
@@ -266,7 +266,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip
)
)
{
- sRealType = ::rtl::OUString::createFromAscii("calc_Text_txt_csv_StarCalc");
+ sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "calc_Text_txt_csv_StarCalc" ));
}
else
if (
@@ -274,7 +274,7 @@ void TypeDetection::impl_checkResultsAndAddBestFilter(::comphelper::MediaDescrip
(sRealType.equalsAscii("calc_Text_txt_csv_StarCalc" ))
)
{
- sRealType = ::rtl::OUString::createFromAscii("writer_Text");
+ sRealType = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "writer_Text" ));
}
#endif // WORKAROUND_CSV_TXT_BUG_i60158
@@ -1230,7 +1230,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper
-----------------------------------------------*/
::rtl::OUString TypeDetection::impl_getImplementationName()
{
- return ::rtl::OUString::createFromAscii("com.sun.star.comp.filter.config.TypeDetection");
+ return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.filter.config.TypeDetection" ));
}
/*-----------------------------------------------
@@ -1239,7 +1239,7 @@ sal_Bool TypeDetection::impl_validateAndSetFilterOnDescriptor( ::comphelper
css::uno::Sequence< ::rtl::OUString > TypeDetection::impl_getSupportedServiceNames()
{
css::uno::Sequence< ::rtl::OUString > lServiceNames(1);
- lServiceNames[0] = ::rtl::OUString::createFromAscii("com.sun.star.document.TypeDetection");
+ lServiceNames[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" ));
return lServiceNames;
}
diff --git a/filter/source/filtertracer/filtertracer.cxx b/filter/source/filtertracer/filtertracer.cxx
index 1dfd23b..c7aca43 100644
--- a/filter/source/filtertracer/filtertracer.cxx
+++ b/filter/source/filtertracer/filtertracer.cxx
@@ -62,7 +62,7 @@ FilterTracer::FilterTracer( const REF( NMSP_LANG::XMultiServiceFactory )& rxMgr
mpStream ( NULL ),
mnLogLevel ( NMSP_LOGGING::LogLevel::ALL )
{
- REF( NMSP_UNO::XInterface ) xObj( rxMgr->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.util.TextSearch" ) ) );
+ REF( NMSP_UNO::XInterface ) xObj( rxMgr->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.TextSearch" )) ) );
mxTextSearch = REF( NMSP_UTIL::XTextSearch )( xObj, ::com::sun::star::uno::UNO_QUERY );
}
FilterTracer::~FilterTracer()
diff --git a/filter/source/flash/swffilter.cxx b/filter/source/flash/swffilter.cxx
index a65c6f4..0503f69 100644
--- a/filter/source/flash/swffilter.cxx
+++ b/filter/source/flash/swffilter.cxx
@@ -276,7 +276,7 @@ sal_Bool FlashExportFilter::ExportAsMultipleFiles(const Sequence< PropertyValue
if(!xDrawPages.is())
return sal_False;
- Reference< XDesktop > rDesktop( mxMSF->createInstance(OUString::createFromAscii("com.sun.star.frame.Desktop")), UNO_QUERY);
+ Reference< XDesktop > rDesktop( mxMSF->createInstance(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" ))), UNO_QUERY);
if (!rDesktop.is())
return sal_False;
diff --git a/filter/source/flash/swfuno.cxx b/filter/source/flash/swfuno.cxx
index ab6a856..765b26d 100644
--- a/filter/source/flash/swfuno.cxx
+++ b/filter/source/flash/swfuno.cxx
@@ -80,12 +80,12 @@ SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo(
{
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( FlashExportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
singlecomponent_writeInfo( xNewKey, FlashExportFilter_getSupportedServiceNames() );
xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( SWFDialog_getImplementationName() );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
singlecomponent_writeInfo( xNewKey, SWFDialog_getSupportedServiceNames() );
diff --git a/filter/source/flash/swfwriter1.cxx b/filter/source/flash/swfwriter1.cxx
index 1346873..808ec85 100644
--- a/filter/source/flash/swfwriter1.cxx
+++ b/filter/source/flash/swfwriter1.cxx
@@ -2121,7 +2121,7 @@ Reference < XBreakIterator > Writer::Impl_GetBreakIterator()
if ( !mxBreakIterator.is() )
{
Reference< XMultiServiceFactory > xMSF( ::comphelper::getProcessServiceFactory() );
- mxBreakIterator.set( xMSF->createInstance( OUString::createFromAscii( "com.sun.star.i18n.BreakIterator" ) ), UNO_QUERY );
+ mxBreakIterator.set( xMSF->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.i18n.BreakIterator" )) ), UNO_QUERY );
}
return mxBreakIterator;
}
diff --git a/filter/source/graphicfilter/icgm/actimpr.cxx b/filter/source/graphicfilter/icgm/actimpr.cxx
index cf905f8..98eff06 100644
--- a/filter/source/graphicfilter/icgm/actimpr.cxx
+++ b/filter/source/graphicfilter/icgm/actimpr.cxx
@@ -130,11 +130,11 @@ void CGMImpressOutAct::ImplSetOrientation( FloatPoint& rRefPoint, double& rOrien
{
uno::Any aAny;
aAny <<= (sal_Int32)rRefPoint.X;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointX"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotationPointX" )), aAny );
aAny <<= (sal_Int32)rRefPoint.Y;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointY"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotationPointY" )), aAny );
aAny <<= (sal_Int32)( rOrientation * 100.0 );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotateAngle"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" )), aAny );
}
// ---------------------------------------------------------------
@@ -162,10 +162,10 @@ void CGMImpressOutAct::ImplSetLineBundle()
fLineWidth = mpCGM->pElement->aLineBundle.nLineWidth;
aAny <<= (sal_Int32)nLineColor;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aAny );
aAny <<= (sal_Int32)fLineWidth;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aAny );
switch( eLineType )
{
@@ -186,12 +186,12 @@ void CGMImpressOutAct::ImplSetLineBundle()
break;
}
aAny <<= eLS;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStyle" )), aAny );
if ( eLS == drawing::LineStyle_DASH )
{
drawing::LineDash aLineDash( drawing::DashStyle_RECTRELATIVE, 1, 50, 3, 33, 100 );
aAny <<= aLineDash;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineDash"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineDash" )), aAny );
}
};
@@ -249,7 +249,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
nPatternIndex = mpCGM->pElement->aFillBundle.nFillPatternIndex;
aAny <<= (sal_Int32)nFillColor;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillColor"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillColor" )), aAny );
switch ( eFillStyle )
{
@@ -297,27 +297,27 @@ void CGMImpressOutAct::ImplSetFillBundle()
if ( eFS == drawing::FillStyle_GRADIENT )
{
aAny <<= *mpGradient;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillGradient"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillGradient" )), aAny );
}
aAny <<= eFS;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )), aAny );
eLS = drawing::LineStyle_NONE;
if ( eFillStyle == FIS_HOLLOW )
{
eLS = drawing::LineStyle_SOLID;
aAny <<= (sal_Int32)nFillColor;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aAny );
aAny <<= (sal_Int32)0;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aAny );
}
else if ( eEdgeType != ET_NONE )
{
aAny <<= (sal_Int32)nEdgeColor;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineColor"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineColor" )), aAny );
aAny <<= (sal_Int32)fEdgeWidth;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineWidth"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineWidth" )), aAny );
switch( eEdgeType )
{
@@ -346,7 +346,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
}
aAny <<= eLS;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("LineStyle"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStyle" )), aAny );
if ( eFS == drawing::FillStyle_HATCH )
{
@@ -375,7 +375,7 @@ void CGMImpressOutAct::ImplSetFillBundle()
aHatch.Angle = 15 * ( ( nHatchIndex & 0x1f ) - 5 );
}
aAny <<= aHatch;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillHatch"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillHatch" )), aAny );
}
};
@@ -412,7 +412,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty
nTextColor = mpCGM->pElement->aTextBundle.GetColor();
aAny <<= (sal_Int32)nTextColor;
- rProperty->setPropertyValue( rtl::OUString::createFromAscii("CharColor"), aAny );
+ rProperty->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColor" )), aAny );
sal_uInt32 nFontType = 0;
awt::FontDescriptor aFontDescriptor;
@@ -435,7 +435,7 @@ void CGMImpressOutAct::ImplSetTextBundle( const uno::Reference< beans::XProperty
aFontDescriptor.Underline = awt::FontUnderline::SINGLE;
}
aAny <<= aFontDescriptor;
- rProperty->setPropertyValue( rtl::OUString::createFromAscii("FontDescriptor"), aAny );
+ rProperty->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FontDescriptor" )), aAny );
};
// ---------------------------------------------------------------
@@ -485,7 +485,7 @@ void CGMImpressOutAct::EndGroup()
uno::Reference< drawing::XShapes > aXShapes;
// if ( maXServiceManagerSC->createInstance( L"stardiv.one.drawing.ShapeCollection" )->queryInterface( ::getCppuType((const Reference< drawing::XShapes >*)0), aXShapes ) )
- uno::Reference< drawing::XShape > aXShapeCollection( maXServiceManagerSC->createInstance( rtl::OUString::createFromAscii("com.sun.star.drawing.ShapeCollection") ), uno::UNO_QUERY );
+ uno::Reference< drawing::XShape > aXShapeCollection( maXServiceManagerSC->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ShapeCollection" )) ), uno::UNO_QUERY );
if ( aXShapeCollection.is() )
{
aXShapes = uno::Reference< drawing::XShapes >( aXShapeCollection, uno::UNO_QUERY );
@@ -523,7 +523,7 @@ void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect )
{
if ( mnGroupActCount != ( mpCGM->mnActCount - 1 ) ) // POWERPOINT HACK !!!
{
- if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.RectangleShape") ) )
+ if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.RectangleShape" )) ) )
{
awt::Size aSize( (long)(rFloatRect.Right - rFloatRect.Left ), (long)(rFloatRect.Bottom-rFloatRect.Top ) );
maXShape->setSize( aSize );
@@ -537,11 +537,11 @@ void CGMImpressOutAct::DrawRectangle( FloatRect& rFloatRect )
void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation )
{
- if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.EllipseShape") ) )
+ if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.EllipseShape" )) ) )
{
drawing::CircleKind eCircleKind = drawing::CircleKind_FULL;
uno::Any aAny( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleKind"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" )), aAny );
long nXSize = (long)( rSize.X * 2.0 ); // Merkwuerdigkes Verhalten bei einer awt::Size von 0
long nYSize = (long)( rSize.Y * 2.0 );
@@ -565,7 +565,7 @@ void CGMImpressOutAct::DrawEllipse( FloatPoint& rCenter, FloatPoint& rSize, doub
void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize, double& rOrientation,
sal_uInt32 nType, double& fStartAngle, double& fEndAngle )
{
- if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.EllipseShape") ) )
+ if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.EllipseShape" )) ) )
{
uno::Any aAny;
drawing::CircleKind eCircleKind;
@@ -604,11 +604,11 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize
else
{
aAny.setValue( &eCircleKind, ::getCppuType((const drawing::CircleKind*)0) );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleKind"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" )), aAny );
aAny <<= (sal_Int32)( (long)( fStartAngle * 100 ) );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleStartAngle"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleStartAngle" )), aAny );
aAny <<= (sal_Int32)( (long)( fEndAngle * 100 ) );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("CircleEndAngle"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleEndAngle" )), aAny );
}
maXShape->setPosition( awt::Point( (long)( rCenter.X - rSize.X ), (long)( rCenter.Y - rSize.Y ) ) );
if ( rOrientation != 0 )
@@ -627,7 +627,7 @@ void CGMImpressOutAct::DrawEllipticalArc( FloatPoint& rCenter, FloatPoint& rSize
ImplSetLineBundle();
drawing::FillStyle eFillStyle = drawing::FillStyle_NONE;
aAny.setValue( &eFillStyle, ::getCppuType((const drawing::FillStyle*)0) );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("FillStyle"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FillStyle" )), aAny );
}
}
}
@@ -655,7 +655,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc )
mpCGM->ImplMapX( fdx );
mpCGM->ImplMapY( fdy );
- if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.GraphicObjectShape") ) )
+ if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.GraphicObjectShape" )) ) )
{
maXShape->setSize( awt::Size( (long)fdx, (long)fdy ) );
maXShape->setPosition( awt::Point( (long)aOrigin.X, (long)aOrigin.Y ) );
@@ -668,7 +668,7 @@ void CGMImpressOutAct::DrawBitmap( CGMBitmapDescriptor* pBmpDesc )
uno::Reference< awt::XBitmap > xBitmap( VCLUnoHelper::CreateBitmap( BitmapEx( *( pBmpDesc->mpBitmap ) ) ) );
uno::Any aAny;
aAny <<= xBitmap;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("GraphicObjectFillBitmap"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GraphicObjectFillBitmap" )), aAny );
}
}
@@ -680,7 +680,7 @@ void CGMImpressOutAct::DrawPolygon( Polygon& rPoly )
{
sal_uInt16 nPoints = rPoly.GetSize();
- if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.PolyPolygonShape") ) )
+ if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.PolyPolygonShape" )) ) )
{
drawing::PointSequenceSequence aRetval;
@@ -701,7 +701,7 @@ void CGMImpressOutAct::DrawPolygon( Polygon& rPoly )
uno::Any aParam;
aParam <<= aRetval;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" )), aParam );
ImplSetFillBundle();
}
};
@@ -713,7 +713,7 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
{
sal_uInt16 nPoints = rPoly.GetSize();
- if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.PolyLineShape") ) )
+ if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.PolyLineShape" )) ) )
{
drawing::PointSequenceSequence aRetval;
@@ -734,7 +734,7 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
uno::Any aParam;
aParam <<= aRetval;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygon"), aParam );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygon" )), aParam );
ImplSetLineBundle();
}
};
@@ -744,7 +744,7 @@ void CGMImpressOutAct::DrawPolyLine( Polygon& rPoly )
void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
{
USHORT nPoints = rPolygon.GetSize();
- if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.OpenBezierShape") ) )
+ if ( ( nPoints > 1 ) && ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.OpenBezierShape" )) ) )
{
drawing::PolyPolygonBezierCoords aRetval;
@@ -769,7 +769,7 @@ void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
}
uno::Any aParam;
aParam <<= aRetval;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygonBezier"), aParam );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygonBezier" )), aParam );
ImplSetLineBundle();
}
};
@@ -779,7 +779,7 @@ void CGMImpressOutAct::DrawPolybezier( Polygon& rPolygon )
void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
{
sal_uInt32 nNumPolys = rPolyPolygon.Count();
- if ( nNumPolys && ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.ClosedBezierShape") ) )
+ if ( nNumPolys && ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.ClosedBezierShape" )) ) )
{
drawing::PolyPolygonBezierCoords aRetval;
@@ -814,7 +814,7 @@ void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
}
uno::Any aParam;
aParam <<= aRetval;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("PolyPolygonBezier"), aParam);
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PolyPolygonBezier" )), aParam);
ImplSetFillBundle();
}
};
@@ -823,7 +823,7 @@ void CGMImpressOutAct::DrawPolyPolygon( PolyPolygon& rPolyPolygon )
void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, char* pString, sal_uInt32 /*nSize*/, FinalFlag eFlag )
{
- if ( ImplCreateShape( rtl::OUString::createFromAscii("com.sun.star.drawing.TextShape") ) )
+ if ( ImplCreateShape( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.TextShape" )) ) )
{
uno::Any aAny;
long nWidth = rTextSize.Width;
@@ -876,17 +876,17 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
if ( nOrientation )
{
aAny <<= (sal_Int32)( aTextPos.X );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointX"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotationPointX" )), aAny );
aAny <<= (sal_Int32)( aTextPos.Y + nHeight );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotationPointY"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotationPointY" )), aAny );
aAny <<= (sal_Int32)( (sal_Int32)( nOrientation * 100 ) );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("RotateAngle"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" )), aAny );
}
if ( nWidth == -1 )
{
sal_Bool bTrue( sal_True );
aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0 ));
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextAutoGrowWidth"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowWidth" )), aAny );
drawing::TextAdjust eTextAdjust;
switch ( mpCGM->pElement->eTextAlignmentH )
@@ -904,13 +904,13 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
break;
}
aAny <<= eTextAdjust;
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextHorizontalAdjust"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextHorizontalAdjust" )), aAny );
}
if ( nHeight == -1 )
{
sal_Bool bTrue = sal_True;
aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0) );
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextAutoGrowHeight"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextAutoGrowHeight" )), aAny );
}
uno::Reference< text::XText > xText;
uno::Any aFirstQuery( maXShape->queryInterface( ::getCppuType((const uno::Reference< text::XText >*)0) ));
@@ -946,13 +946,13 @@ void CGMImpressOutAct::DrawText( awt::Point& rTextPos, awt::Size& rTextSize, cha
aAny <<= (sal_Int16)style::HorizontalAlignment_CENTER;
break;
}
- aCursorPropSet->setPropertyValue( rtl::OUString::createFromAscii("ParaAdjust"), aAny );
+ aCursorPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ParaAdjust" )), aAny );
}
if ( nWidth > 0 && nHeight > 0 ) // restricted text
{
sal_Bool bTrue = sal_True;
aAny.setValue( &bTrue, ::getCppuType((const sal_Bool*)0));
- maXPropSet->setPropertyValue( rtl::OUString::createFromAscii("TextFitToSize"), aAny );
+ maXPropSet->setPropertyValue( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "TextFitToSize" )), aAny );
}
aCursorText->setString( aStr );
aXTextCursor->gotoEnd( sal_True );
diff --git a/filter/source/graphicfilter/icgm/cgm.cxx b/filter/source/graphicfilter/icgm/cgm.cxx
index b51972d..e28bea9 100644
--- a/filter/source/graphicfilter/icgm/cgm.cxx
+++ b/filter/source/graphicfilter/icgm/cgm.cxx
@@ -882,7 +882,7 @@ extern "C" sal_uInt32 __LOADONCALLAPI ImportCGM( String& rFileName, uno::Referen
aXStatInd = *(uno::Reference< task::XStatusIndicator > *)pProgressBar;
bProgressBar = aXStatInd.is();
if ( bProgressBar )
- aXStatInd->start( rtl::OUString::createFromAscii("CGM Import"), nInSize );
+ aXStatInd->start( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CGM Import" )), nInSize );
#endif
while ( pCGM->IsValid() && ( pIn->Tell() < nInSize ) && !pCGM->IsFinished() )
diff --git a/filter/source/msfilter/escherex.cxx b/filter/source/msfilter/escherex.cxx
index cc561b8..1a33e3c 100644
--- a/filter/source/msfilter/escherex.cxx
+++ b/filter/source/msfilter/escherex.cxx
@@ -3011,7 +3011,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
if ( xText.is() )
aText = xText->getString();
if ( !aText.getLength() )
- aText = ::rtl::OUString::createFromAscii( "your text" ); // todo: moving into a resource
+ aText = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "your text" )); // todo: moving into a resource
AddOpt( DFF_Prop_gtextUNICODE, aText );
// FontWork Font
@@ -3020,7 +3020,7 @@ void EscherPropertyContainer::CreateCustomShapeProperties( const MSO_SPT eShapeT
uno::Any aAny = aXPropSet->getPropertyValue( sCharFontName );
aAny >>= aFontName;
if ( !aFontName.getLength() )
- aFontName = ::rtl::OUString::createFromAscii( "Arial Black" );
+ aFontName = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Arial Black" ));
AddOpt( DFF_Prop_gtextFont, aFontName );
sal_Int16 nCharScaleWidth = 100;
diff --git a/filter/source/msfilter/eschesdo.cxx b/filter/source/msfilter/eschesdo.cxx
index 435d080..3152aa3 100644
--- a/filter/source/msfilter/eschesdo.cxx
+++ b/filter/source/msfilter/eschesdo.cxx
@@ -216,9 +216,9 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
}
break;
}
- rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString::createFromAscii("RotateAngle") ));
+ rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" )) ));
- if( ( rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("IsFontwork") ) &&
+ if( ( rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "IsFontwork" )) ) &&
::cppu::any2bool( rObj.GetUsrAny() ) ) ||
rObj.GetType().EqualsAscii( "drawing.Measure" ) || rObj.GetType().EqualsAscii( "drawing.Caption" ) )
{
@@ -305,7 +305,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
{
mpEscherEx->OpenContainer( ESCHER_SpContainer );
sal_Int32 nRadius = (sal_Int32)rObj.ImplGetInt32PropertyValue(
- ::rtl::OUString::createFromAscii("CornerRadius"));
+ ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CornerRadius" )));
if( nRadius )
{
nRadius = ImplMapSize( Size( nRadius, 0 )).Width();
@@ -334,7 +334,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
{
CircleKind eCircleKind = CircleKind_FULL;
PolyStyle ePolyKind = PolyStyle();
- if ( rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("CircleKind") ) )
+ if ( rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleKind" )) ) )
{
eCircleKind = *( (CircleKind*)rObj.GetUsrAny().getValue() );
switch ( eCircleKind )
@@ -369,10 +369,10 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
else
{
INT32 nStartAngle, nEndAngle;
- if ( !rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("CircleStartAngle") ) )
+ if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleStartAngle" )) ) )
break;
nStartAngle = *( (INT32*)rObj.GetUsrAny().getValue() );
- if( !rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("CircleEndAngle") ) )
+ if( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "CircleEndAngle" )) ) )
break;
nEndAngle = *( (INT32*)rObj.GetUsrAny().getValue() );
@@ -704,7 +704,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
'D' == rObj.GetType().GetChar( 9 ) ) // drawing.3D
{
// SceneObject, CubeObject, SphereObject, LatheObject, ExtrudeObject, PolygonObject
- if ( !rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("Bitmap") ) )
+ if ( !rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Bitmap" )) ) )
break;
mpEscherEx->OpenContainer( ESCHER_SpContainer );
@@ -728,7 +728,7 @@ UINT32 ImplEESdrWriter::ImplWriteShape( ImplEESdrObject& rObj,
aPropOpt.CreateShadowProperties( rObj.mXPropSet );
if( USHRT_MAX != mpEscherEx->GetHellLayerId() &&
- rObj.ImplGetPropertyValue( ::rtl::OUString::createFromAscii("LayerID") ) &&
+ rObj.ImplGetPropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LayerID" )) ) &&
(*((UINT16*)rObj.GetUsrAny().getValue()) ) == mpEscherEx->GetHellLayerId() )
{
aPropOpt.AddOpt( ESCHER_Prop_fPrint, 0x200020 );
@@ -789,7 +789,7 @@ void ImplEESdrWriter::ImplWriteAdditionalText( ImplEESdrObject& rObj,
if ( !mpPicStrm )
mpPicStrm = mpEscherEx->QueryPictureStream();
EscherPropertyContainer aPropOpt( mpEscherEx->GetGraphicProvider(), mpPicStrm, aRect100thmm );
- rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString::createFromAscii("RotateAngle")));
+ rObj.SetAngle( rObj.ImplGetInt32PropertyValue( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "RotateAngle" ))));
INT32 nAngle = rObj.GetAngle();
if( rObj.GetType().EqualsAscii( "drawing.Line" ))
{
@@ -1186,8 +1186,8 @@ void ImplEESdrObject::Init( ImplEESdrWriter& rEx )
xub_StrLen nPos = mType.SearchAscii( "Shape" );
mType.Erase( nPos, 5 );
- static const OUString sPresStr(rtl::OUString::createFromAscii("IsPresentationObject"));
- static const OUString sEmptyPresStr(rtl::OUString::createFromAscii("IsEmptyPresentationObject"));
+ static const OUString sPresStr(RTL_CONSTASCII_USTRINGPARAM( "IsPresentationObject" ));
+ static const OUString sEmptyPresStr(RTL_CONSTASCII_USTRINGPARAM( "IsEmptyPresentationObject" ));
if( ImplGetPropertyValue( sPresStr ) )
mbPresObj = ::cppu::any2bool( mAny );
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index f6e1aba..71f9772 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -4854,8 +4854,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
if ( mbTracing )
mpTracer->AddAttribute( aObjData.nSpFlags & SP_FGROUP
- ? rtl::OUString::createFromAscii( "GroupShape" )
- : rtl::OUString::createFromAscii( "Shape" ),
+ ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GroupShape" ))
+ : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shape" )),
rtl::OUString::valueOf( (sal_Int32)aObjData.nShapeId ) );
aObjData.bOpt = maShapeRecords.SeekToContent( rSt, DFF_msofbtOPT, SEEK_FROM_CURRENT_AND_RESTART );
if ( aObjData.bOpt )
@@ -5422,8 +5422,8 @@ SdrObject* SvxMSDffManager::ImportShape( const DffRecordHeader& rHd, SvStream& r
if ( mbTracing )
mpTracer->RemoveAttribute( aObjData.nSpFlags & SP_FGROUP
- ? rtl::OUString::createFromAscii( "GroupShape" )
- : rtl::OUString::createFromAscii( "Shape" ) );
+ ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "GroupShape" ))
+ : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Shape" )) );
return pRet;
}
@@ -6184,7 +6184,7 @@ SvxMSDffManager::SvxMSDffManager(SvStream& rStCtrl_,
{
if ( mpTracer )
{
- uno::Any aAny( mpTracer->GetProperty( rtl::OUString::createFromAscii( "On" ) ) );
+ uno::Any aAny( mpTracer->GetProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )) ) );
aAny >>= mbTracing;
}
SetModel( pSdrModel_, nApplicationScale );
@@ -6236,7 +6236,7 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const String& rBaseURL, MS
{
if ( mpTracer )
{
- uno::Any aAny( mpTracer->GetProperty( rtl::OUString::createFromAscii( "On" ) ) );
+ uno::Any aAny( mpTracer->GetProperty( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )) ) );
aAny >>= mbTracing;
}
SetModel( NULL, 0 );
diff --git a/filter/source/msfilter/msfiltertracer.cxx b/filter/source/msfilter/msfiltertracer.cxx
index 93b8696..d2aea36 100644
--- a/filter/source/msfilter/msfiltertracer.cxx
+++ b/filter/source/msfilter/msfiltertracer.cxx
@@ -56,7 +56,7 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
mpStream( NULL ),
mbEnabled( sal_False ) // will be set to true in StartTracing()
{
- if ( mpCfgItem->ReadBool( rtl::OUString::createFromAscii( "On" ), sal_False ) )
+ if ( mpCfgItem->ReadBool( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )), sal_False ) )
{
uno::Reference< lang::XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() );
if ( xMgr.is() )
@@ -65,17 +65,17 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
parameter as default into the property sequence of the FilterConfigItem. It means we ensure that
the property is available by trying to read it (the return value of the method is ignored) */
::rtl::OUString aEmptyString;
- mpCfgItem->ReadInt32( rtl::OUString::createFromAscii( "LogLevel" ), util::logging::LogLevel::ALL );
- mpCfgItem->ReadString( rtl::OUString::createFromAscii( "ClassFilter" ), aEmptyString );
- mpCfgItem->ReadString( rtl::OUString::createFromAscii( "MethodFilter" ), aEmptyString );
- mpCfgItem->ReadString( rtl::OUString::createFromAscii( "MessageFilter" ), aEmptyString );
+ mpCfgItem->ReadInt32( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "LogLevel" )), util::logging::LogLevel::ALL );
+ mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassFilter" )), aEmptyString );
+ mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MethodFilter" )), aEmptyString );
+ mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "MessageFilter" )), aEmptyString );
util::SearchAlgorithms eSearchAlgorithm = (util::SearchAlgorithms)
- mpCfgItem->ReadInt32( rtl::OUString::createFromAscii( "SearchAlgorithm" ), util::SearchAlgorithms_ABSOLUTE );
+ mpCfgItem->ReadInt32( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "SearchAlgorithm" )), util::SearchAlgorithms_ABSOLUTE );
// creating the name of the log file
- rtl::OUString aPath( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "Path" ), aEmptyString ) );
- rtl::OUString aName( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "Name" ), aEmptyString ) );
- rtl::OUString aDocumentURL( mpCfgItem->ReadString( rtl::OUString::createFromAscii( "DocumentURL" ), aEmptyString ) );
+ rtl::OUString aPath( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Path" )), aEmptyString ) );
+ rtl::OUString aName( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Name" )), aEmptyString ) );
+ rtl::OUString aDocumentURL( mpCfgItem->ReadString( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentURL" )), aEmptyString ) );
INetURLObject aLogFile( aDocumentURL );
if ( aLogFile.GetMainURL( INetURLObject::NO_DECODE ).getLength() )
{
@@ -103,10 +103,10 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
}
}
if ( !aName.getLength() )
- aName = rtl::OUString::createFromAscii( "tracer" );
+ aName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "tracer" ));
aLogFile.insertName( aName );
}
- aLogFile.setExtension( rtl::OUString::createFromAscii( "log" ) );
+ aLogFile.setExtension( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "log" )) );
// creating the file stream
mpStream = ::utl::UcbStreamHelper::CreateStream( aLogFile.GetMainURL( INetURLObject::NO_DECODE ), STREAM_WRITE | STREAM_TRUNC | STREAM_SHARE_DENYNONE );
@@ -117,28 +117,28 @@ MSFilterTracer::MSFilterTracer( const ::rtl::OUString& rConfigPath, uno::Sequenc
uno::Reference< io::XOutputStream > xOutputStream( pHelper );
// instanciating the DocumentHandler, then setting the OutputStream
- mxHandler = uno::Reference< xml::sax::XDocumentHandler >( xMgr->createInstance( rtl::OUString::createFromAscii( "com.sun.star.xml.sax.Writer" ) ), uno::UNO_QUERY );
+ mxHandler = uno::Reference< xml::sax::XDocumentHandler >( xMgr->createInstance( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" )) ), uno::UNO_QUERY );
uno::Reference< io::XActiveDataSource > xDocSrc( mxHandler, uno::UNO_QUERY );
xDocSrc->setOutputStream( xOutputStream );
mxHandler->startDocument();
- mxHandler->ignorableWhitespace ( rtl::OUString::createFromAscii( " " ) );
+ mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) );
// writing the "DocumentHandler" property, so the FilterTracer component
// will use it for the output
uno::Any aAny;
aAny <<= xDocSrc;
- mpCfgItem->WriteAny( rtl::OUString::createFromAscii( "DocumentHandler" ), aAny );
+ mpCfgItem->WriteAny( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentHandler" )), aAny );
SvXMLAttributeList* pAttrList = new SvXMLAttributeList;
- pAttrList->AddAttribute( rtl::OUString::createFromAscii( "DocumentURL" ), aDocumentURL );
+ pAttrList->AddAttribute( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DocumentURL" )), aDocumentURL );
uno::Reference < xml::sax::XAttributeList > xAttributeList(pAttrList);
- mxHandler->startElement( rtl::OUString::createFromAscii( "Document" ), xAttributeList );
+ mxHandler->startElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Document" )), xAttributeList );
}
uno::Sequence< uno::Any > aArgument( 1 );
uno::Sequence< beans::PropertyValue > aPropValues( mpCfgItem->GetFilterData() );
aArgument[ 0 ] <<= aPropValues;
- mxFilterTracer = xMgr->createInstanceWithArguments( rtl::OUString::createFromAscii( "com.sun.star.util.FilterTracer" ), aArgument );
+ mxFilterTracer = xMgr->createInstanceWithArguments( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.util.FilterTracer" )), aArgument );
if ( mxFilterTracer.is() )
{
mxTextSearch = uno::Reference< util::XTextSearch >( mxFilterTracer, uno::UNO_QUERY );
@@ -159,9 +159,9 @@ MSFilterTracer::~MSFilterTracer()
mxFilterTracer = NULL;
if ( mxHandler.is() )
{
- mxHandler->ignorableWhitespace ( rtl::OUString::createFromAscii( " " ) );
- mxHandler->endElement( rtl::OUString::createFromAscii( "Document" ) );
- mxHandler->ignorableWhitespace ( rtl::OUString::createFromAscii( " " ) );
+ mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) );
+ mxHandler->endElement( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Document" )) );
+ mxHandler->ignorableWhitespace ( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( " " )) );
mxHandler->endDocument();
mxHandler = NULL;
}
@@ -172,7 +172,7 @@ MSFilterTracer::~MSFilterTracer()
void MSFilterTracer::StartTracing()
{
- mbEnabled = mpCfgItem->ReadBool( rtl::OUString::createFromAscii( "On" ), sal_False );
+ mbEnabled = mpCfgItem->ReadBool( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "On" )), sal_False );
}
void MSFilterTracer::EndTracing()
diff --git a/filter/source/msfilter/msocximex.cxx b/filter/source/msfilter/msocximex.cxx
index 1118363..d78dc81 100644
--- a/filter/source/msfilter/msocximex.cxx
+++ b/filter/source/msfilter/msocximex.cxx
@@ -352,14 +352,14 @@ uno::Reference< graphic::XGraphicObject> lcl_readGraphicObject( SotStorageStream
{
// use the GraphicProvider service to get the XGraphic
uno::Reference< graphic::XGraphicProvider > xGraphProvider(
- xServiceManager->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.graphic.GraphicProvider" ) ), uno::UNO_QUERY );
+ xServiceManager->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.graphic.GraphicProvider" )) ), uno::UNO_QUERY );
if( xGraphProvider.is() )
{
uno::Reference< io::XInputStream > xStream( new utl::OInputStreamWrapper( *pS ) );
if( xStream.is() )
{
uno::Sequence< beans::PropertyValue > aMediaProps( 1 );
- aMediaProps[0].Name = ::rtl::OUString::createFromAscii( "InputStream" );
+ aMediaProps[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "InputStream" ));
aMediaProps[0].Value <<= xStream;
uno::Reference< graphic::XGraphic > xGraphic = xGraphProvider->queryGraphic( aMediaProps );
if( xGraphic.is() )
@@ -567,8 +567,8 @@ void readArrayString( SotStorageStream *pS, std::vector< rtl::OUString >& sStrin
OUString createSubStreamName( const sal_uInt32& subStorageId )
{
- static OUString sI = OUString::createFromAscii("i");
- static OUString sZero = OUString::createFromAscii( "0" );
+ static OUString sI( RTL_CONSTASCII_USTRINGPARAM( "i" ));
+ static OUString sZero( RTL_CONSTASCII_USTRINGPARAM( "0" ));
OUStringBuffer buf( 6 );
buf.append( sI );
// for subStorage id < 10 stream name has leading '0'
@@ -2033,7 +2033,7 @@ sal_Bool OCX_OptionButton::Import(com::sun::star::uno::Reference<
sGroupName = sParentName.concat( C2U( ":" ) ).concat( sGroupName );
}
if ( sGroupName.getLength() == 0 )
- sGroupName = rtl::OUString::createFromAscii("DefaultGroup");
+ sGroupName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "DefaultGroup" ));
OSL_TRACE("RadioButton %s has groupname %s",
rtl::OUStringToOString( sName, RTL_TEXTENCODING_UTF8 ).getStr(), rtl::OUStringToOString( sGroupName, RTL_TEXTENCODING_UTF8 ).getStr() );
try
@@ -4317,7 +4317,7 @@ OCX_Control * SvxMSConvertOCXControls::OCX_Factory(
rControlModel,uno::UNO_QUERY);
uno::Any aTmp = xPropSet->getPropertyValue(
- OUString::createFromAscii("ClassId"));
+ OUString( RTL_CONSTASCII_USTRINGPARAM( "ClassId" )));
sal_Int16 nClassId = *(sal_Int16*) aTmp.getValue();
//Begin nasty hack
@@ -4337,8 +4337,7 @@ OCX_Control * SvxMSConvertOCXControls::OCX_Factory(
uno::Reference< lang::XServiceInfo > xInfo(rControlModel,
uno::UNO_QUERY);
if (xInfo->
- supportsService(OUString::createFromAscii(
- "com.sun.star.form.component.FormattedField")))
+ supportsService(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.FormattedField" ))))
{
rId.AppendAscii("8BD21D10-EC42-11CE-9e0d-00aa006002f3");
rName.AppendAscii("TextBox");
@@ -4350,8 +4349,7 @@ OCX_Control * SvxMSConvertOCXControls::OCX_Factory(
uno::Reference< lang::XServiceInfo > xInfo(rControlModel,
uno::UNO_QUERY);
if (xInfo->
- supportsService(OUString::createFromAscii(
- "com.sun.star.form.component.ImageControl")))
+ supportsService(OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.form.component.ImageControl" ))))
nClassId = form::FormComponentType::IMAGECONTROL;
}
//End nasty hack
diff --git a/filter/source/msfilter/msoleexp.cxx b/filter/source/msfilter/msoleexp.cxx
index d2e5195..92ba95d 100644
--- a/filter/source/msfilter/msoleexp.cxx
+++ b/filter/source/msfilter/msoleexp.cxx
@@ -214,7 +214,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
//TODO/LATER: a "StoreTo" method at embedded object would be nice
uno::Sequence < beans::PropertyValue > aSeq(2);
SvStream* pStream = new SvMemoryStream;
- aSeq[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+ aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ));
::uno::Reference < io::XOutputStream > xOut = new ::utl::OOutputStreamWrapper( *pStream );
aSeq[0].Value <<= xOut;
aSeq[1].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FilterName" ) );
@@ -222,7 +222,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
try
{
- xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
+ xStor->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aSeq );
}
catch( uno::Exception& ) {} // #TODO really handle exceptions - interactionalhandler etc. ?
@@ -319,11 +319,11 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
//TODO/LATER: is stream instead of outputstream a better choice?!
//TODO/LATER: a "StoreTo" method at embedded object would be nice
uno::Sequence < beans::PropertyValue > aSeq(1);
- aSeq[0].Name = ::rtl::OUString::createFromAscii( "OutputStream" );
+ aSeq[0].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "OutputStream" ));
::uno::Reference < io::XOutputStream > xOut = new ::utl::OOutputStreamWrapper( *xEmbStm );
aSeq[0].Value <<= xOut;
uno::Reference < frame::XStorable > xStor( rObj->getComponent(), uno::UNO_QUERY );
- xStor->storeToURL( ::rtl::OUString::createFromAscii( "private:stream" ), aSeq );
+ xStor->storeToURL( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "private:stream" )), aSeq );
}
catch( uno::Exception& )
{
@@ -348,7 +348,7 @@ void SvxMSExportOLEObjects::ExportOLEObject( svt::EmbeddedObjectRef& rObj, SvSto
if ( xPers.is() )
{
uno::Sequence < beans::PropertyValue > aEmptySeq;
- ::rtl::OUString aTempName(::rtl::OUString::createFromAscii("bla"));
+ ::rtl::OUString aTempName( RTL_CONSTASCII_USTRINGPARAM( "bla" ));
try
{
xPers->storeToEntry( xStor, aTempName, aEmptySeq, aEmptySeq );
diff --git a/filter/source/msfilter/mstoolbar.cxx b/filter/source/msfilter/mstoolbar.cxx
index 2e6d46d..81b73e5 100644
--- a/filter/source/msfilter/mstoolbar.cxx
+++ b/filter/source/msfilter/mstoolbar.cxx
@@ -108,8 +108,8 @@ uno::Any
CustomToolBarImportHelper::createCommandFromMacro( const rtl::OUString& sCmd )
{
//"vnd.sun.star.script:Standard.Module1.Main?language=Basic&location=document"
- static rtl::OUString scheme = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
- static rtl::OUString part2 = rtl::OUString::createFromAscii("?language=Basic&location=document");
+ static rtl::OUString scheme( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ));
+ static rtl::OUString part2( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" ));
// create script url
rtl::OUString scriptURL = scheme + sCmd + part2;
return uno::makeAny( scriptURL );
@@ -493,7 +493,7 @@ TBCGeneralInfo::ImportToolBarControlData( CustomToolBarImportHelper& helper, std
if ( aMacroInf.IsResolved() )
aProp.Value = helper.createCommandFromMacro( aMacroInf.ResolvedMacro() );
else
- aProp.Value <<= rtl::OUString::createFromAscii("UnResolvedMacro[").concat( extraInfo.getOnAction() ).concat( rtl::OUString::createFromAscii("]") );
+ aProp.Value <<= rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "UnResolvedMacro[" )).concat( extraInfo.getOnAction() ).concat( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "]" )) );
sControlData.push_back( aProp );
}
diff --git a/filter/source/msfilter/msvbahelper.cxx b/filter/source/msfilter/msvbahelper.cxx
index 8bf36dd..eb2b426 100644
--- a/filter/source/msfilter/msvbahelper.cxx
+++ b/filter/source/msfilter/msvbahelper.cxx
@@ -46,8 +46,8 @@ using namespace ::com::sun::star;
namespace ooo { namespace vba {
-const static rtl::OUString sUrlPart0 = rtl::OUString::createFromAscii( "vnd.sun.star.script:");
-const static rtl::OUString sUrlPart1 = rtl::OUString::createFromAscii( "?language=Basic&location=document");
+const static rtl::OUString sUrlPart0( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.script:" ));
+const static rtl::OUString sUrlPart1( RTL_CONSTASCII_USTRINGPARAM( "?language=Basic&location=document" ));
String makeMacroURL( const String& sMacroName )
{
@@ -122,7 +122,7 @@ SfxObjectShell* findShellForUrl( const rtl::OUString& sMacroURLOrPath )
bDocNameNoPathMatch = xModel->getURL().copy( lastSlashIndex + 1 ).equals( aURL );
if ( !bDocNameNoPathMatch )
{
- rtl::OUString aTmpName = rtl::OUString::createFromAscii("'") + xModel->getURL().copy( lastSlashIndex + 1 ) + rtl::OUString::createFromAscii("'");
+ rtl::OUString aTmpName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "'" )) + xModel->getURL().copy( lastSlashIndex + 1 ) + rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "'" ));
bDocNameNoPathMatch = aTmpName.equals( aURL );
}
}
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 5913a92..45cf1b2 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -2203,7 +2203,7 @@ sal_Bool SdrPowerPointImport::ReadFontCollection()
aFont.SetHeight( 100 );
if ( mbTracing && !pFont->bAvailable )
- mpTracer->Trace( rtl::OUString::createFromAscii( "sd1000" ), pFont->aName );
+ mpTracer->Trace( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "sd1000" )), pFont->aName );
#ifdef DBG_EXTRACTFONTMETRICS
@@ -2879,8 +2879,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
{
if ( mbTracing )
mpTracer->AddAttribute( eAktPageKind == PPT_SLIDEPAGE
- ? rtl::OUString::createFromAscii( "Page" )
- : rtl::OUString::createFromAscii( "NotesPage" ),
+ ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Page" ))
+ : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NotesPage" )),
rtl::OUString::valueOf( (sal_Int32)nAktPageNum + 1 ) );
rSlidePersist.pHeaderFooterEntry = new HeaderFooterEntry( pMasterPersist );
@@ -3073,8 +3073,8 @@ void SdrPowerPointImport::ImportPage( SdrPage* pRet, const PptSlidePersistEntry*
SolveSolver( *rSlidePersist.pSolverContainer );
if ( mbTracing )
mpTracer->RemoveAttribute( eAktPageKind == PPT_SLIDEPAGE
- ? rtl::OUString::createFromAscii( "Page" )
- : rtl::OUString::createFromAscii( "NotesPage" ) );
+ ? rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Page" ))
+ : rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "NotesPage" )) );
}
rStCtrl.Seek( nMerk );
}
diff --git a/filter/source/msfilter/svxmsbas.cxx b/filter/source/msfilter/svxmsbas.cxx
index 6cbf6a3..6dec7a4 100644
--- a/filter/source/msfilter/svxmsbas.cxx
+++ b/filter/source/msfilter/svxmsbas.cxx
@@ -135,7 +135,7 @@ bool SvxImportMSVBasic::ImportForms_Impl(const String& rStorageName,
// hacky test code to read referenced projects on linux
sal_Int32 nPos = (*it).lastIndexOf('\\');
sFileName = (*it).copy( nPos + 1 );
- sFileName = rtl::OUString::createFromAscii("~/Documents/") + sFileName;
+ sFileName = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "~/Documents/" )) + sFileName;
#endif
#endif
SotStorageRef rRoot = new SotStorage( sFileName, STREAM_STD_READWRITE, STORAGE_TRANSACTED );
@@ -518,7 +518,7 @@ BOOL SvxImportMSVBasic::ImportCode_Impl( VBA_Impl& aVBA, const std::vector< Stri
}
if (bAsComment)
{
- aSource += rtl::OUString::createFromAscii("\nEnd Sub");
+ aSource += rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "\nEnd Sub" ));
}
::rtl::OUString aModName( sModule );
aSource = modeTypeComment + aSource;
diff --git a/filter/source/pdf/pdfexport.cxx b/filter/source/pdf/pdfexport.cxx
index e687727..65abedc 100644
--- a/filter/source/pdf/pdfexport.cxx
+++ b/filter/source/pdf/pdfexport.cxx
@@ -332,7 +332,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
// find the related type name
OUString aTypeName;
Reference< container::XNameAccess > xFilterFactory(
- xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.FilterFactory" ) ),
+ xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.FilterFactory" )) ),
uno::UNO_QUERY );
Sequence< beans::PropertyValue > aFilterData;
@@ -345,7 +345,7 @@ static OUString getMimetypeForDocument( const Reference< XMultiServiceFactory >&
{
// find the mediatype
Reference< container::XNameAccess > xTypeDetection(
- xFactory->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.document.TypeDetection" ) ),
+ xFactory->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.document.TypeDetection" )) ),
UNO_QUERY );
Sequence< beans::PropertyValue > aTypeData;
@@ -393,15 +393,15 @@ sal_Bool PDFExport::Export( const OUString& rFile, const Sequence< PropertyValue
Reference< XServiceInfo > xInfo( mxSrcDoc, UNO_QUERY );
if ( xInfo.is() )
{
- if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.presentation.PresentationDocument" ) ) )
+ if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.presentation.PresentationDocument" )) ) )
aCreator.AppendAscii( "Impress" );
- else if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.drawing.DrawingDocument" ) ) )
+ else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.drawing.DrawingDocument" )) ) )
aCreator.AppendAscii( "Draw" );
- else if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.text.TextDocument" ) ) )
+ else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.text.TextDocument" )) ) )
aCreator.AppendAscii( "Writer" );
- else if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.sheet.SpreadsheetDocument" ) ) )
+ else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sheet.SpreadsheetDocument" )) ) )
aCreator.AppendAscii( "Calc" );
- else if ( xInfo->supportsService( rtl::OUString::createFromAscii( "com.sun.star.formula.FormulaProperties" ) ) )
+ else if ( xInfo->supportsService( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.formula.FormulaProperties" )) ) )
aCreator.AppendAscii( "Math" );
}
diff --git a/filter/source/pdf/pdfuno.cxx b/filter/source/pdf/pdfuno.cxx
index bfe7a1a..962a632 100644
--- a/filter/source/pdf/pdfuno.cxx
+++ b/filter/source/pdf/pdfuno.cxx
@@ -64,14 +64,14 @@ extern "C"
sal_Int32 nPos;
xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PDFFilter_getImplementationName() );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
const Sequence< OUString > & rSNL1 = PDFFilter_getSupportedServiceNames();
const OUString * pArray1 = rSNL1.getConstArray();
for ( nPos = rSNL1.getLength(); nPos--; )
xNewKey->createKey( pArray1[nPos] );
xNewKey = reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PDFDialog_getImplementationName() );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
const Sequence< OUString > & rSNL2 = PDFDialog_getSupportedServiceNames();
const OUString * pArray2 = rSNL2.getConstArray();
for ( nPos = rSNL2.getLength(); nPos--; )
diff --git a/filter/source/placeware/tempfile.cxx b/filter/source/placeware/tempfile.cxx
index 48758fd..5e16bb0 100644
--- a/filter/source/placeware/tempfile.cxx
+++ b/filter/source/placeware/tempfile.cxx
@@ -163,7 +163,7 @@ OUString TempFile::createTempFileURL()
if( aTmp.getStr()[ aTmp.getLength() - 1 ] != sal_Unicode( '/' ) )
aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( "/" ));
aTmp += OUString::valueOf( (sal_Int32) (unsigned) u, nRadix );
- aTmp += OUString::createFromAscii( ".tmp" );
+ aTmp += OUString( RTL_CONSTASCII_USTRINGPARAM( ".tmp" ));
osl::File aFile( aTmp );
osl::FileBase::RC err = aFile.open(osl_File_OpenFlag_Create);
diff --git a/filter/source/placeware/uno.cxx b/filter/source/placeware/uno.cxx
index 417da2a..8c8b920 100644
--- a/filter/source/placeware/uno.cxx
+++ b/filter/source/placeware/uno.cxx
@@ -69,7 +69,7 @@ sal_Bool SAL_CALL component_writeInfo(
{
Reference< XRegistryKey > xNewKey(
reinterpret_cast< XRegistryKey * >( pRegistryKey )->createKey( PlaceWareExportFilter_getImplementationName() ) );
- xNewKey = xNewKey->createKey( OUString::createFromAscii( "/UNO/SERVICES" ) );
+ xNewKey = xNewKey->createKey( OUString( RTL_CONSTASCII_USTRINGPARAM( "/UNO/SERVICES" )) );
const Sequence< OUString > & rSNL = PlaceWareExportFilter_getSupportedServiceNames();
const OUString * pArray = rSNL.getConstArray();
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index dd4347e..65ad2d2 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -2,7 +2,7 @@
/*************************************************************************
*
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
- *
+ *
* Copyright 2000, 2010 Oracle and/or its affiliates.
*
* OpenOffice.org - a multi-platform office productivity suite
@@ -74,7 +74,7 @@ SVGFilter::~SVGFilter()
// -----------------------------------------------------------------------------
-sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescriptor )
+sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescriptor )
throw (RuntimeException)
{
SolarMutexGuard aGuard;
@@ -90,24 +90,24 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
else
if( mxSrcDoc.is() )
{
- uno::Reference< frame::XDesktop > xDesktop( mxMSF->createInstance( ::rtl::OUString::createFromAscii( "com.sun.star.frame.Desktop" ) ),
+ uno::Reference< frame::XDesktop > xDesktop( mxMSF->createInstance( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) ),
uno::UNO_QUERY);
if( xDesktop.is() )
{
uno::Reference< frame::XFrame > xFrame( xDesktop->getCurrentFrame() );
-
+
if( xFrame.is() )
{
uno::Reference< frame::XController > xController( xFrame->getController() );
-
+
if( xController.is() )
{
uno::Reference< drawing::XDrawView > xDrawView( xController, uno::UNO_QUERY );
-
+
if( xDrawView.is() )
{
uno::Reference< drawing::XDrawPage > xDrawPage( xDrawView->getCurrentPage() );
-
+
if( xDrawPage.is() )
{
uno::Reference< beans::XPropertySet >( xDrawPage, uno::UNO_QUERY )->
@@ -117,18 +117,18 @@ sal_Bool SAL_CALL SVGFilter::filter( const Sequence< PropertyValue >& rDescripto
}
}
}
-
+
Sequence< PropertyValue > aNewDescritor( rDescriptor );
-
+
if( nCurrentPageNumber > 0 )
{
const sal_uInt32 nOldLength = rDescriptor.getLength();
-
+
aNewDescritor.realloc( nOldLength + 1 );
aNewDescritor[ nOldLength ].Name = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "PagePos" ) );
aNewDescritor[ nOldLength ].Value <<= static_cast< sal_Int16 >( nCurrentPageNumber - 1 );
}
-
+
bRet = implExport( aNewDescritor );
}
else
@@ -148,7 +148,7 @@ void SAL_CALL SVGFilter::cancel( ) throw (RuntimeException)
// -----------------------------------------------------------------------------
-void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc )
+void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc )
throw (IllegalArgumentException, RuntimeException)
{
mxSrcDoc = xDoc;
@@ -156,7 +156,7 @@ void SAL_CALL SVGFilter::setSourceDocument( const Reference< XComponent >& xDoc
// -----------------------------------------------------------------------------
-void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc )
+void SAL_CALL SVGFilter::setTargetDocument( const Reference< XComponent >& xDoc )
throw (::com::sun::star::lang::IllegalArgumentException, RuntimeException)
{
mxDstDoc = xDoc;
diff --git a/filter/source/svg/svgreader.cxx b/filter/source/svg/svgreader.cxx
index 60f7bf4..bd5f9f2 100644
--- a/filter/source/svg/svgreader.cxx
+++ b/filter/source/svg/svgreader.cxx
@@ -1813,7 +1813,7 @@ sal_Bool SVGReader::parseAndConvert()
{
uno::Reference<xml::dom::XDocumentBuilder> xDomBuilder(
m_xServiceFactory->createInstance(
- rtl::OUString::createFromAscii("com.sun.star.xml.dom.DocumentBuilder")), uno::UNO_QUERY_THROW );
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list