[Libreoffice-commits] core.git: 6 commits - compilerplugins/clang connectivity/source cppuhelper/source cppu/source cpputools/source cui/source dbaccess/source dtrans/source editeng/source embeddedobj/source extensions/source filter/source formula/source fpicker/source framework/source i18npool/qa include/test include/uno io/source javaunohelper/source jvmfwk/source registry/source remotebridges/source reportdesign/source sal/osl sal/qa sal/rtl scripting/source sc/source sdext/source sfx2/source stoc/source svtools/source svx/source sw/source test/source testtools/source vcl/unx xmlreader/source xmlsecurity/source
Luboš Luňák
l.lunak at suse.cz
Mon May 6 07:52:27 PDT 2013
compilerplugins/clang/plugin.cxx | 30 +
compilerplugins/clang/plugin.hxx | 4
compilerplugins/clang/rtlconstasciimacro.cxx | 140 ++++++++
connectivity/source/commontools/dbtools.cxx | 4
connectivity/source/commontools/dbtools2.cxx | 6
connectivity/source/drivers/jdbc/InputStream.cxx | 2
connectivity/source/drivers/mork/MDatabaseMetaData.cxx | 2
connectivity/source/drivers/mork/MStatement.cxx | 2
cppu/source/threadpool/thread.cxx | 3
cppu/source/uno/cascade_mapping.cxx | 2
cppu/source/uno/lbenv.cxx | 2
cppu/source/uno/lbmap.cxx | 4
cppuhelper/source/component_context.cxx | 2
cppuhelper/source/macro_expander.cxx | 2
cppuhelper/source/propertysetmixin.cxx | 51 --
cppuhelper/source/tdmgr.cxx | 2
cppuhelper/source/unourl.cxx | 4
cpputools/source/unoexe/unoexe.cxx | 8
cui/source/dialogs/colorpicker.cxx | 4
cui/source/dialogs/cuigaldlg.cxx | 4
cui/source/options/optgdlg.cxx | 2
dbaccess/source/ui/misc/DExport.cxx | 4
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 2
dtrans/source/cnttype/mctfentry.cxx | 2
editeng/source/uno/unonrule.cxx | 22 -
embeddedobj/source/commonembedding/persistence.cxx | 18 -
embeddedobj/source/commonembedding/visobj.cxx | 2
embeddedobj/source/general/dummyobject.cxx | 16
embeddedobj/source/general/intercept.cxx | 6
embeddedobj/source/msole/olepersist.cxx | 18 -
embeddedobj/source/msole/olevisual.cxx | 4
extensions/source/bibliography/datman.cxx | 2
extensions/source/logging/csvformatter.cxx | 4
filter/source/msfilter/svdfppt.cxx | 2
filter/source/placeware/filter.cxx | 2
filter/source/svg/impsvgdialog.cxx | 12
filter/source/svg/svgdialog.cxx | 4
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 6
filter/source/xsltdialog/typedetectionimport.cxx | 26 -
filter/source/xsltdialog/xmlfilterjar.cxx | 12
formula/source/ui/dlg/formula.cxx | 2
fpicker/source/office/iodlg.cxx | 2
framework/source/layoutmanager/toolbarlayoutmanager.cxx | 2
framework/source/services/autorecovery.cxx | 2
i18npool/qa/cppunit/test_breakiterator.cxx | 2
include/test/util/xsearchable.hxx | 2
include/uno/current_context.hxx | 6
include/uno/environment.hxx | 2
include/uno/mapping.hxx | 8
io/source/stm/opipe.cxx | 4
javaunohelper/source/javaunohelper.cxx | 10
javaunohelper/source/vm.cxx | 3
jvmfwk/source/fwkbase.cxx | 24 -
registry/source/regimpl.cxx | 2
remotebridges/source/unourl_resolver/unourl_resolver.cxx | 4
reportdesign/source/core/api/ReportDefinition.cxx | 4
reportdesign/source/filter/xml/xmlCell.cxx | 6
reportdesign/source/filter/xml/xmlExport.cxx | 36 +-
reportdesign/source/filter/xml/xmlFixedContent.cxx | 6
reportdesign/source/filter/xml/xmlFormattedField.cxx | 4
reportdesign/source/filter/xml/xmlGroup.cxx | 6
reportdesign/source/filter/xml/xmlStyleImport.cxx | 8
reportdesign/source/ui/inspection/GeometryHandler.cxx | 14
reportdesign/source/ui/report/ReportController.cxx | 8
sal/osl/all/debugbase.cxx | 2
sal/qa/osl/file/osl_old_test_file.cxx | 6
sal/qa/rtl/doublelock/rtl_doublelocking.cxx | 4
sal/qa/rtl/uri/rtl_testuri.cxx | 6
sal/rtl/bootstrap.cxx | 8
sc/source/filter/excel/excimp8.cxx | 2
sc/source/filter/excel/expop2.cxx | 2
sc/source/filter/excel/xestream.cxx | 2
sc/source/filter/excel/xltools.cxx | 16
sc/source/filter/oox/workbookhelper.cxx | 2
sc/source/filter/xml/XMLCalculationSettingsContext.cxx | 18 -
sc/source/filter/xml/XMLChangeTrackingExportHelper.cxx | 2
sc/source/filter/xml/XMLChangeTrackingImportHelper.cxx | 2
sc/source/filter/xml/XMLCodeNameProvider.cxx | 4
sc/source/filter/xml/XMLExportDDELinks.cxx | 2
sc/source/filter/xml/XMLExportDatabaseRanges.cxx | 4
sc/source/filter/xml/XMLStylesExportHelper.cxx | 48 +-
sc/source/filter/xml/XMLTableMasterPageExport.cxx | 16
sc/source/filter/xml/XMLTableShapeImportHelper.cxx | 2
sc/source/filter/xml/xmlcoli.cxx | 2
sc/source/filter/xml/xmldrani.cxx | 8
sc/source/filter/xml/xmlexprt.cxx | 82 ++--
sc/source/filter/xml/xmlimprt.cxx | 20 -
sc/source/filter/xml/xmlrowi.cxx | 4
sc/source/filter/xml/xmlsorti.cxx | 18 -
sc/source/filter/xml/xmlstyle.cxx | 6
sc/source/filter/xml/xmlstyli.cxx | 10
sc/source/filter/xml/xmlwrap.cxx | 2
sc/source/ui/Accessibility/AccessibleCellBase.cxx | 4
sc/source/ui/Accessibility/AccessibleDocument.cxx | 4
sc/source/ui/app/inputhdl.cxx | 4
sc/source/ui/app/inputwin.cxx | 2
sc/source/ui/app/scmod2.cxx | 2
sc/source/ui/cctrl/checklistmenu.cxx | 2
sc/source/ui/dbgui/csvruler.cxx | 8
sc/source/ui/dbgui/foptmgr.cxx | 2
sc/source/ui/dbgui/pfiltdlg.cxx | 2
sc/source/ui/dbgui/scuiasciiopt.cxx | 36 +-
sc/source/ui/dbgui/tpsort.cxx | 2
sc/source/ui/docshell/dbdocimp.cxx | 8
sc/source/ui/docshell/docsh.cxx | 56 +--
sc/source/ui/docshell/docsh5.cxx | 2
sc/source/ui/docshell/docsh8.cxx | 32 -
sc/source/ui/formdlg/formula.cxx | 2
sc/source/ui/miscdlgs/acredlin.cxx | 2
sc/source/ui/miscdlgs/linkarea.cxx | 6
sc/source/ui/miscdlgs/solverutil.cxx | 4
sc/source/ui/namedlg/namedefdlg.cxx | 4
sc/source/ui/namedlg/namedlg.cxx | 2
sc/source/ui/namedlg/namemgrtable.cxx | 2
sc/source/ui/navipi/content.cxx | 2
sc/source/ui/undo/undoutil.cxx | 2
sc/source/ui/unoobj/afmtuno.cxx | 2
sc/source/ui/unoobj/appluno.cxx | 16
sc/source/ui/unoobj/cellsuno.cxx | 46 +-
sc/source/ui/unoobj/cellvaluebinding.cxx | 2
sc/source/ui/unoobj/confuno.cxx | 4
sc/source/ui/unoobj/cursuno.cxx | 4
sc/source/ui/unoobj/dapiuno.cxx | 26 -
sc/source/ui/unoobj/datauno.cxx | 32 -
sc/source/ui/unoobj/docuno.cxx | 14
sc/source/ui/unoobj/filtuno.cxx | 6
sc/source/ui/unoobj/funcuno.cxx | 6
sc/source/ui/unoobj/nameuno.cxx | 4
sc/source/ui/unoobj/srchuno.cxx | 4
sc/source/ui/unoobj/viewuno.cxx | 4
sc/source/ui/vba/vbaapplication.cxx | 4
sc/source/ui/vba/vbaassistant.cxx | 2
sc/source/ui/vba/vbaformat.cxx | 60 +--
sc/source/ui/vba/vbavalidation.cxx | 22 -
sc/source/ui/vba/vbawindow.cxx | 32 -
sc/source/ui/vba/vbaworkbooks.cxx | 2
sc/source/ui/vba/vbaworksheet.cxx | 4
sc/source/ui/vba/vbaworksheets.cxx | 2
sc/source/ui/view/dbfunc3.cxx | 2
sc/source/ui/view/viewdata.cxx | 78 ++--
scripting/source/inc/util/scriptingconstants.hxx | 18 -
sdext/source/minimizer/pppoptimizer.cxx | 2
sfx2/source/appl/imestatuswindow.cxx | 4
sfx2/source/appl/workwin.cxx | 10
sfx2/source/doc/doctemplateslocal.cxx | 8
sfx2/source/doc/zoomitem.cxx | 6
stoc/source/corereflection/crefl.cxx | 14
stoc/source/corereflection/criface.cxx | 3
stoc/source/implementationregistration/implreg.cxx | 38 +-
stoc/source/invocation/invocation.cxx | 8
stoc/source/invocation_adapterfactory/iafactory.cxx | 4
stoc/source/javaloader/javaloader.cxx | 10
stoc/source/javavm/javavm.cxx | 51 +-
stoc/source/loader/dllcomponentloader.cxx | 4
stoc/source/namingservice/namingservice.cxx | 6
stoc/source/registry_tdprovider/structtypedescription.cxx | 3
stoc/source/registry_tdprovider/tdprovider.cxx | 8
stoc/source/registry_tdprovider/tdservice.cxx | 18 -
stoc/source/security/access_controller.cxx | 2
stoc/source/security/file_policy.cxx | 2
stoc/source/simpleregistry/simpleregistry.cxx | 174 +++-------
stoc/source/typeconv/convert.cxx | 4
svtools/source/filter/SvFilterOptionsDialog.cxx | 2
svtools/source/misc/transfer.cxx | 18 -
svtools/source/uno/contextmenuhelper.cxx | 2
svtools/source/uno/unoevent.cxx | 14
svx/source/customshapes/EnhancedCustomShape2d.cxx | 4
svx/source/form/datanavi.cxx | 12
svx/source/form/fmpgeimp.cxx | 4
svx/source/items/viewlayoutitem.cxx | 4
svx/source/items/zoomslideritem.cxx | 8
svx/source/stbctrls/pszctrl.cxx | 6
svx/source/table/tablelayouter.cxx | 2
svx/source/table/tablertfexporter.cxx | 2
svx/source/tbxctrls/extrusioncontrols.cxx | 14
svx/source/tbxctrls/fontworkgallery.cxx | 6
svx/source/tbxctrls/tbxalign.cxx | 4
svx/source/tbxctrls/tbxdrctl.cxx | 2
svx/source/unodialogs/textconversiondlgs/chinese_dictionarydialog.cxx | 4
svx/source/unodraw/XPropertyTable.cxx | 2
svx/source/unodraw/unoprov.cxx | 2
svx/source/unodraw/unoshap2.cxx | 4
svx/source/xml/xmleohlp.cxx | 10
svx/source/xoutdev/xattrbmp.cxx | 4
sw/source/core/text/portxt.cxx | 4
sw/source/core/unocore/unobkm.cxx | 2
sw/source/core/unocore/unoidx.cxx | 4
sw/source/core/unocore/unoredline.cxx | 4
sw/source/core/unocore/unorefmk.cxx | 4
sw/source/filter/xml/XMLRedlineImportHelper.cxx | 6
sw/source/filter/xml/xmlexp.cxx | 6
sw/source/filter/xml/xmltexte.cxx | 6
sw/source/ui/app/docsh2.cxx | 2
sw/source/ui/app/docshini.cxx | 4
sw/source/ui/config/caption.cxx | 2
sw/source/ui/config/viewopt.cxx | 2
sw/source/ui/dbui/swdbtoolsclient.cxx | 2
sw/source/ui/uno/unoatxt.cxx | 4
sw/source/ui/uno/unotxdoc.cxx | 10
sw/source/ui/vba/vbarows.cxx | 2
test/source/container/xnamecontainer.cxx | 2
test/source/sheet/xnamedranges.cxx | 2
test/source/sheet/xspreadsheets2.cxx | 6
testtools/source/bridgetest/bridgetest.cxx | 14
testtools/source/bridgetest/cppobj.cxx | 6
vcl/unx/generic/dtrans/config.cxx | 4
vcl/unx/generic/printer/printerinfomanager.cxx | 2
vcl/unx/kde4/KDE4FilePicker.cxx | 2
xmlreader/source/xmlreader.cxx | 27 -
xmlsecurity/source/dialogs/digitalsignaturesdialog.cxx | 4
xmlsecurity/source/framework/buffernode.cxx | 2
xmlsecurity/source/framework/decryptorimpl.cxx | 4
xmlsecurity/source/framework/encryptionengine.cxx | 2
xmlsecurity/source/framework/encryptorimpl.cxx | 4
xmlsecurity/source/framework/saxeventkeeperimpl.cxx | 6
xmlsecurity/source/framework/signaturecreatorimpl.cxx | 4
xmlsecurity/source/framework/signatureengine.cxx | 2
xmlsecurity/source/framework/signatureverifierimpl.cxx | 4
xmlsecurity/source/xmlsec/nss/nssinitializer.cxx | 6
xmlsecurity/source/xmlsec/nss/seinitializer_nssimpl.cxx | 10
xmlsecurity/source/xmlsec/xmlelementwrapper_xmlsecimpl.cxx | 4
221 files changed, 1126 insertions(+), 1063 deletions(-)
New commits:
commit 9cb21a33421b8531dd25f76cc757f0d7f0fcc5ee
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Mon May 6 16:41:27 2013 +0200
check for double modifications in compiler plugins
A different way to do 1c0669af2f1f58e6431b5e489ac48a883e242ba7.
Sometimes one piece of code can be represented several times in the AST,
e.g. with default function arguments.
Change-Id: Ic7799fa0bd918a638bdc8ebef69e6aa91d355bdc
diff --git a/compilerplugins/clang/plugin.cxx b/compilerplugins/clang/plugin.cxx
index 85bd696..4df8bac 100644
--- a/compilerplugins/clang/plugin.cxx
+++ b/compilerplugins/clang/plugin.cxx
@@ -110,6 +110,9 @@ bool RewritePlugin::insertTextBefore( SourceLocation Loc, StringRef Str )
// given to this overload would not match afterwards.
bool RewritePlugin::removeText( SourceLocation Start, unsigned Length, RewriteOptions opts )
{
+ if( removals.find( Start ) != removals.end())
+ report( DiagnosticsEngine::Warning, "double code removal, possible plugin error", Start );
+ removals.insert( Start );
if( opts.RemoveWholeStatement )
{
SourceRange range( Start, Start.getLocWithOffset( Length - 1 ));
@@ -125,6 +128,9 @@ bool RewritePlugin::removeText( SourceLocation Start, unsigned Length, RewriteOp
bool RewritePlugin::removeText( SourceRange range, RewriteOptions opts )
{
+ if( removals.find( range.getBegin()) != removals.end())
+ report( DiagnosticsEngine::Warning, "double code removal, possible plugin error", range.getBegin());
+ removals.insert( range.getBegin());
if( opts.RemoveWholeStatement )
{
if( !adjustForWholeStatement( &range ))
@@ -166,6 +172,9 @@ bool RewritePlugin::adjustForWholeStatement( SourceRange* range )
bool RewritePlugin::replaceText( SourceLocation Start, unsigned OrigLength, StringRef NewStr )
{
+ if( OrigLength != 0 && removals.find( Start ) != removals.end())
+ report( DiagnosticsEngine::Warning, "double code replacement, possible plugin error", Start );
+ removals.insert( Start );
if( rewriter.ReplaceText( Start, OrigLength, NewStr ))
return reportEditFailure( Start );
return true;
@@ -173,6 +182,9 @@ bool RewritePlugin::replaceText( SourceLocation Start, unsigned OrigLength, Stri
bool RewritePlugin::replaceText( SourceRange range, StringRef NewStr )
{
+ if( removals.find( range.getBegin()) != removals.end())
+ report( DiagnosticsEngine::Warning, "double code replacement, possible plugin error", range.getBegin());
+ removals.insert( range.getBegin());
if( rewriter.ReplaceText( range, NewStr ))
return reportEditFailure( range.getBegin());
return true;
@@ -180,6 +192,9 @@ bool RewritePlugin::replaceText( SourceRange range, StringRef NewStr )
bool RewritePlugin::replaceText( SourceRange range, SourceRange replacementRange )
{
+ if( removals.find( range.getBegin()) != removals.end())
+ report( DiagnosticsEngine::Warning, "double code replacement, possible plugin error", range.getBegin());
+ removals.insert( range.getBegin());
if( rewriter.ReplaceText( range, replacementRange ))
return reportEditFailure( range.getBegin());
return true;
diff --git a/compilerplugins/clang/plugin.hxx b/compilerplugins/clang/plugin.hxx
index da33681..9c9ce7b 100644
--- a/compilerplugins/clang/plugin.hxx
+++ b/compilerplugins/clang/plugin.hxx
@@ -18,6 +18,7 @@
#include <clang/Basic/FileManager.h>
#include <clang/Basic/SourceManager.h>
#include <clang/Frontend/CompilerInstance.h>
+#include <set>
#if __clang_major__ < 3 || __clang_major__ == 3 && __clang_minor__ < 2
#include <clang/Rewrite/Rewriter.h>
@@ -114,6 +115,7 @@ class RewritePlugin
enum { isRewriter = true };
bool reportEditFailure( SourceLocation loc );
bool adjustForWholeStatement( SourceRange* range );
+ set< SourceLocation > removals;
};
/**
commit d870271c23b997c922ddf2672df8f69fd199eef7
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Mon May 6 16:33:16 2013 +0200
compiler plugin for RTL_CONSTASCII_USTRINGPARAM removal
Change-Id: Ibc487aa78d9eba3f936b4f4cc0298adfaef60d5c
diff --git a/compilerplugins/clang/rtlconstasciimacro.cxx b/compilerplugins/clang/rtlconstasciimacro.cxx
new file mode 100644
index 0000000..f1a9d02
--- /dev/null
+++ b/compilerplugins/clang/rtlconstasciimacro.cxx
@@ -0,0 +1,140 @@
+/*
+ * This file is part of the LibreOffice project.
+ *
+ * Based on LLVM/Clang.
+ *
+ * This file is distributed under the University of Illinois Open Source
+ * License. See LICENSE.TXT for details.
+ *
+ */
+
+/*
+This is a rewriter.
+
+Remove uses of the macro RTL_CONSTASCII_USTRINGPARAM. One run is for one
+specific use (see below), modify source to remove other uses.
+*/
+
+#include "plugin.hxx"
+
+#include <clang/Lex/Preprocessor.h>
+
+namespace loplugin
+{
+
+class RtlConstAsciiMacro
+ : public RecursiveASTVisitor< RtlConstAsciiMacro >
+ , public PPCallbacks
+ , public RewritePlugin
+ {
+ public:
+ explicit RtlConstAsciiMacro( CompilerInstance& compiler, Rewriter& rewriter );
+ virtual void run();
+ bool VisitCXXConstructExpr( CXXConstructExpr* expr );
+ bool VisitCXXTemporaryObjectExpr( CXXTemporaryObjectExpr* expr );
+ bool VisitStringLiteral( const StringLiteral* literal );
+ virtual void MacroExpands( const Token& macro, const MacroInfo* info, SourceRange range );
+ private:
+ map< SourceLocation, SourceLocation > expansions; // start location -> end location
+ bool searchingForString;
+ bool suitableString;
+ };
+
+RtlConstAsciiMacro::RtlConstAsciiMacro( CompilerInstance& compiler, Rewriter& rewriter )
+ : RewritePlugin( compiler, rewriter )
+ , searchingForString( false )
+ {
+ compiler.getPreprocessor().addPPCallbacks( this );
+ }
+
+void RtlConstAsciiMacro::run()
+ {
+ TraverseDecl( compiler.getASTContext().getTranslationUnitDecl());
+ }
+
+
+void RtlConstAsciiMacro::MacroExpands( const Token& macro, const MacroInfo*, SourceRange range )
+ {
+ if( macro.getIdentifierInfo()->getName() != "RTL_CONSTASCII_USTRINGPARAM" )
+ return;
+ expansions[ range.getBegin() ] = range.getEnd();
+ }
+
+/* Remove use with the following ctor:
+ OUString( const sal_Char * value, sal_Int32 length,
+ rtl_TextEncoding encoding,
+ sal_uInt32 convertFlags = OSTRING_TO_OUSTRING_CVTFLAGS )
+ This means searching for CXXConstructExpr.
+ For removal when used with functions it should check e.g. for CallExpr.
+*/
+bool RtlConstAsciiMacro::VisitCXXConstructExpr( CXXConstructExpr* expr )
+ {
+ if( ignoreLocation( expr ))
+ return true;
+ if( expr->getNumArgs() != 4 )
+ return true;
+ // The last argument should be the default one when the macro is used.
+ if( dyn_cast< CXXDefaultArgExpr >( expr->getArg( 3 )) == NULL )
+ return true;
+ if( expr->getConstructor()->getQualifiedNameAsString() != "rtl::OUString::OUString" )
+ return true;
+ const SourceManager& src = compiler.getSourceManager();
+ SourceLocation start = src.getExpansionLoc( expr->getArg( 0 )->getLocStart());
+ // Macro fills in the first 3 arguments, so they must all come from the same expansion.
+ if( start != src.getExpansionLoc( expr->getArg( 2 )->getLocEnd()))
+ return true;
+ if( expansions.find( start ) == expansions.end())
+ return true;
+ SourceLocation end = expansions[ start ];
+ // Remove the location, since sometimes the same code may be processed more than once
+ // (e.g. non-trivial default arguments).
+ expansions.erase( start );
+ // Check if the string argument to the macro is suitable.
+ searchingForString = true;
+ suitableString = false;
+ TraverseStmt( expr->getArg( 0 ));
+ searchingForString = false;
+ if( !suitableString )
+ return true;
+ // Seach for '(' (don't just remove a given length to handle possible whitespace).
+ const char* text = compiler.getSourceManager().getCharacterData( start );
+ const char* pos = text;
+ while( *pos != '(' )
+ ++pos;
+ ++pos;
+ if( text[ -1 ] == ' ' && *pos == ' ' )
+ ++pos; // do not leave two spaces
+ removeText( start, pos - text, RemoveLineIfEmpty );
+ const char* textend = compiler.getSourceManager().getCharacterData( end );
+ if( textend[ -1 ] == ' ' && textend[ 1 ] == ' ' )
+ removeText( end, 2, RemoveLineIfEmpty ); // Remove ') '.
+ else
+ removeText( end, 1, RemoveLineIfEmpty ); // Remove ')'.
+ return true;
+ }
+
+bool RtlConstAsciiMacro::VisitCXXTemporaryObjectExpr( CXXTemporaryObjectExpr* expr )
+ {
+ return VisitCXXConstructExpr( expr );
+ }
+
+bool RtlConstAsciiMacro::VisitStringLiteral( const StringLiteral* literal )
+ {
+ if( !searchingForString )
+ return true;
+ if( suitableString ) // two string literals?
+ {
+ report( DiagnosticsEngine::Warning, "cannot analyze RTL_CONSTASCII_USTRINGPARAM (plugin needs fixing)" )
+ << literal->getSourceRange();
+ return true;
+ }
+ if( !literal->isAscii()) // ignore
+ return true;
+ if( !literal->containsNonAsciiOrNull())
+ suitableString = true;
+ return true;
+ }
+
+static Plugin::Registration< RtlConstAsciiMacro > X( "rtlconstasciimacro" );
+
+} // namespace
commit e2e2cc61144cb22227eebfadff0ea24b51ccfbd0
Author: Luboš Luňák <l.lunak at suse.cz>
Date: Mon May 6 16:32:22 2013 +0200
remove usage of RTL_CONSTASCII_USTRINGPARAM
Mechanical removal of usage together with OUString ctor, done
by compiler plugin.
Change-Id: I554227f76df0dac620b1b46fca32516f78b462c5
diff --git a/connectivity/source/commontools/dbtools.cxx b/connectivity/source/commontools/dbtools.cxx
index f362bff..c80fb1f 100644
--- a/connectivity/source/commontools/dbtools.cxx
+++ b/connectivity/source/commontools/dbtools.cxx
@@ -1030,9 +1030,9 @@ try
{
OSL_UNUSED( e );
#ifdef DBG_UTIL
- OUString sMessage(RTL_CONSTASCII_USTRINGPARAM("TransferFormComponentProperties : could not transfer the value for property \""));
+ OUString sMessage("TransferFormComponentProperties : could not transfer the value for property \"");
sMessage += pResult->Name;
- sMessage += OUString(RTL_CONSTASCII_USTRINGPARAM("\""));
+ sMessage += OUString("\"");
OSL_FAIL(OUStringToOString(sMessage, RTL_TEXTENCODING_ASCII_US).getStr());
#endif
}
diff --git a/connectivity/source/commontools/dbtools2.cxx b/connectivity/source/commontools/dbtools2.cxx
index df243d3..23b4f53 100644
--- a/connectivity/source/commontools/dbtools2.cxx
+++ b/connectivity/source/commontools/dbtools2.cxx
@@ -241,7 +241,7 @@ namespace
}
if ( nColCount )
- sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
+ sSql = sSql.replaceAt(sSql.getLength()-1,1,OUString(")"));
return sSql;
}
}
@@ -364,9 +364,9 @@ OUString createSqlCreateTableStatement( const Reference< XPropertySet >& descri
else
{
if ( aSql.lastIndexOf(',') == (aSql.getLength()-1) )
- aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(")"));
else
- aSql += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+ aSql += OUString(")");
}
return aSql;
}
diff --git a/connectivity/source/drivers/jdbc/InputStream.cxx b/connectivity/source/drivers/jdbc/InputStream.cxx
index c274d51..f72cbb7 100644
--- a/connectivity/source/drivers/jdbc/InputStream.cxx
+++ b/connectivity/source/drivers/jdbc/InputStream.cxx
@@ -72,7 +72,7 @@ void SAL_CALL java_io_InputStream::closeInput( ) throw(::com::sun::star::io::No
sal_Int32 SAL_CALL java_io_InputStream::readBytes( ::com::sun::star::uno::Sequence< sal_Int8 >& aData, sal_Int32 nBytesToRead ) throw(::com::sun::star::io::NotConnectedException, ::com::sun::star::io::BufferSizeExceededException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException)
{
if (nBytesToRead < 0)
- throw ::com::sun::star::io::BufferSizeExceededException( OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ), *this );
+ throw ::com::sun::star::io::BufferSizeExceededException( OUString( OSL_LOG_PREFIX ), *this );
jint out(0);
SDBThreadAttach t; OSL_ENSURE(t.pEnv,"Java Enviroment geloescht worden!");
diff --git a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
index cbac0a0..fa30285 100644
--- a/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
+++ b/connectivity/source/drivers/mork/MDatabaseMetaData.cxx
@@ -290,7 +290,7 @@ OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, Runt
OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( )
{
// normally this is "
- return OUString( RTL_CONSTASCII_USTRINGPARAM("\""));
+ return OUString( "\"");
}
// -------------------------------------------------------------------------
OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException)
diff --git a/connectivity/source/drivers/mork/MStatement.cxx b/connectivity/source/drivers/mork/MStatement.cxx
index 04aeb22..6ccaf5c 100644
--- a/connectivity/source/drivers/mork/MStatement.cxx
+++ b/connectivity/source/drivers/mork/MStatement.cxx
@@ -258,7 +258,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql
else if(!bAdjusted) //Our sql parser does not support a statement like "create table foo"
// So we append ("E-mail" varchar) to the last of it to make it work
{
- return parseSql(sql + OUString( RTL_CONSTASCII_USTRINGPARAM("(""E-mail"" caracter)")),sal_True);
+ return parseSql(sql + OUString( "(""E-mail"" caracter)"),sal_True);
}
getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this );
diff --git a/cppu/source/threadpool/thread.cxx b/cppu/source/threadpool/thread.cxx
index f0dc4d6..85076b0 100644
--- a/cppu/source/threadpool/thread.cxx
+++ b/cppu/source/threadpool/thread.cxx
@@ -55,9 +55,8 @@ namespace cppu_threadpool {
{
throw css::lang::DisposedException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"cppu_threadpool::ORequestThread created after"
- " cppu_threadpool::ThreadAdmin has been disposed")),
+ " cppu_threadpool::ThreadAdmin has been disposed"),
css::uno::Reference< css::uno::XInterface >());
}
m_lst.push_back( p );
diff --git a/cppu/source/uno/cascade_mapping.cxx b/cppu/source/uno/cascade_mapping.cxx
index 5e53ea8..bc954c6 100644
--- a/cppu/source/uno/cascade_mapping.cxx
+++ b/cppu/source/uno/cascade_mapping.cxx
@@ -224,7 +224,7 @@ void getCascadeMapping(uno_Mapping ** ppMapping,
if (pAddPurpose && pAddPurpose->length)
return;
- rtl::OUString uno_envType(RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO));
+ rtl::OUString uno_envType(UNO_LB_UNO);
rtl::OUString from_envType = cppu::EnvDcp::getTypeName(pFrom->pTypeName);
rtl::OUString to_envType = cppu::EnvDcp::getTypeName(pTo->pTypeName);
diff --git a/cppu/source/uno/lbenv.cxx b/cppu/source/uno/lbenv.cxx
index 2337318..27a1027 100644
--- a/cppu/source/uno/lbenv.cxx
+++ b/cppu/source/uno/lbenv.cxx
@@ -1075,7 +1075,7 @@ static bool loadEnv(OUString const & cLibStem,
if (!hMod)
return false;
- OUString aSymbolName(RTL_CONSTASCII_USTRINGPARAM(UNO_INIT_ENVIRONMENT));
+ OUString aSymbolName(UNO_INIT_ENVIRONMENT);
uno_initEnvironmentFunc fpInit = (uno_initEnvironmentFunc)
::osl_getFunctionSymbol( hMod, aSymbolName.pData );
diff --git a/cppu/source/uno/lbmap.cxx b/cppu/source/uno/lbmap.cxx
index f699cee..65d4776 100644
--- a/cppu/source/uno/lbmap.cxx
+++ b/cppu/source/uno/lbmap.cxx
@@ -430,7 +430,7 @@ static Mapping loadExternalMapping(
if (hModule)
{
- OUString aSymbolName( RTL_CONSTASCII_USTRINGPARAM(UNO_EXT_GETMAPPING) );
+ OUString aSymbolName( UNO_EXT_GETMAPPING );
uno_ext_getMappingFunc fpGetMapFunc =
(uno_ext_getMappingFunc)::osl_getFunctionSymbol(
hModule, aSymbolName.pData );
@@ -507,7 +507,7 @@ static Mapping getMediateMapping(
// backwards: from dest to source of mapping chain
// connect to uno
- OUString aUnoEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) );
+ OUString aUnoEnvTypeName( UNO_LB_UNO );
if (rTo.getTypeName() == aUnoEnvTypeName) // to is uno
{
aUno = rTo;
diff --git a/cppuhelper/source/component_context.cxx b/cppuhelper/source/component_context.cxx
index b95d50e..7d41778 100644
--- a/cppuhelper/source/component_context.cxx
+++ b/cppuhelper/source/component_context.cxx
@@ -860,7 +860,7 @@ Reference< XComponentContext > SAL_CALL createComponentContext(
SAL_THROW(())
{
uno::Environment curr_env(Environment::getCurrent());
- uno::Environment source_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))));
+ uno::Environment source_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV)));
uno::Mapping curr2source(curr_env, source_env);
uno::Mapping source2curr(source_env, curr_env);
diff --git a/cppuhelper/source/macro_expander.cxx b/cppuhelper/source/macro_expander.cxx
index 3553d18..72ff90a 100644
--- a/cppuhelper/source/macro_expander.cxx
+++ b/cppuhelper/source/macro_expander.cxx
@@ -197,7 +197,7 @@ Reference< lang::XSingleComponentFactory > create_bootstrap_macro_expander_facto
s_get_service_names() ));
uno::Environment curr_env(Environment::getCurrent());
- uno::Environment target_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))));
+ uno::Environment target_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV)));
uno::Mapping target2curr(target_env, curr_env);
diff --git a/cppuhelper/source/propertysetmixin.cxx b/cppuhelper/source/propertysetmixin.cxx
index 12a3752..f1d7c52 100644
--- a/cppuhelper/source/propertysetmixin.cxx
+++ b/cppuhelper/source/propertysetmixin.cxx
@@ -485,18 +485,16 @@ PropertySetMixinImpl::Impl::Impl(
css::uno::Reference< css::container::XHierarchicalNameAccess >(
m_context->getValueByName(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"/singletons/com.sun.star.reflection."
- "theTypeDescriptionManager"))),
+ "theTypeDescriptionManager")),
css::uno::UNO_QUERY_THROW)->getByHierarchicalName(
m_type.getTypeName()),
css::uno::UNO_QUERY_THROW);
} catch (css::container::NoSuchElementException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected"
- " com.sun.star.container.NoSuchElementException: "))
+ " com.sun.star.container.NoSuchElementException: ")
+ e.Message),
css::uno::Reference< css::uno::XInterface >());
}
@@ -541,9 +539,8 @@ void PropertySetMixinImpl::Impl::setProperty(
{
throw css::lang::IllegalArgumentException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"flagging as ambiguous/defaulted non-ambiguous/defaulted"
- " property "))
+ " property ")
+ name),
object, illegalArgumentPosition);
}
@@ -576,9 +573,8 @@ void PropertySetMixinImpl::Impl::setProperty(
} else {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected"
- " com.sun.star.lang.IllegalArgumentException: "))
+ " com.sun.star.lang.IllegalArgumentException: ")
+ e.Message),
object);
}
@@ -690,10 +686,9 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
{
throw css::uno::RuntimeException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected type of"
" com.sun.star.beans.Ambiguous IsAmbiguous"
- " member")),
+ " member"),
object);
}
value = css::uno::Reference< css::reflection::XIdlField2 >(
@@ -703,9 +698,8 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected com.sun.star.lang."
- "IllegalArgumentException: "))
+ "IllegalArgumentException: ")
+ e.Message),
object);
}
@@ -727,10 +721,9 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
{
throw css::uno::RuntimeException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected type of"
" com.sun.star.beans.Defaulted IsDefaulted"
- " member")),
+ " member"),
object);
}
value = css::uno::Reference< css::reflection::XIdlField2 >(
@@ -740,9 +733,8 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected com.sun.star.lang."
- "IllegalArgumentException: "))
+ "IllegalArgumentException: ")
+ e.Message),
object);
}
@@ -764,9 +756,8 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
{
throw css::uno::RuntimeException(
rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected type of com.sun.star.beans.Optional"
- " IsPresent member")),
+ " IsPresent member"),
object);
}
if (!present) {
@@ -780,9 +771,8 @@ css::uno::Any PropertySetMixinImpl::Impl::getProperty(
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected com.sun.star.lang."
- "IllegalArgumentException: "))
+ "IllegalArgumentException: ")
+ e.Message),
object);
}
@@ -825,9 +815,8 @@ PropertySetMixinImpl::Impl::getReflection(rtl::OUString const & typeName) const
} catch (css::uno::Exception & e) {
throw css::uno::DeploymentException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"component context fails to supply service"
- " com.sun.star.reflection.CoreReflection: "))
+ " com.sun.star.reflection.CoreReflection: ")
+ e.Message),
m_context);
}
@@ -870,17 +859,15 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected"
- " com.sun.star.lang.IllegalArgumentException: "))
+ " com.sun.star.lang.IllegalArgumentException: ")
+ e.Message),
object);
} catch (css::lang::IllegalAccessException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected"
- " com.sun.star.lang.IllegalAccessException: "))
+ " com.sun.star.lang.IllegalAccessException: ")
+ e.Message),
object);
}
@@ -909,17 +896,15 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected"
- " com.sun.star.lang.IllegalArgumentException: "))
+ " com.sun.star.lang.IllegalArgumentException: ")
+ e.Message),
object);
} catch (css::lang::IllegalAccessException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected"
- " com.sun.star.lang.IllegalAccessException: "))
+ " com.sun.star.lang.IllegalAccessException: ")
+ e.Message),
object);
}
@@ -951,17 +936,15 @@ css::uno::Any PropertySetMixinImpl::Impl::wrapValue(
} catch (css::lang::IllegalArgumentException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected"
- " com.sun.star.lang.IllegalArgumentException: "))
+ " com.sun.star.lang.IllegalArgumentException: ")
+ e.Message),
object);
} catch (css::lang::IllegalAccessException & e) {
throw css::uno::RuntimeException(
(rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"unexpected"
- " com.sun.star.lang.IllegalAccessException: "))
+ " com.sun.star.lang.IllegalAccessException: ")
+ e.Message),
object);
}
diff --git a/cppuhelper/source/tdmgr.cxx b/cppuhelper/source/tdmgr.cxx
index e230c15..f838adf 100644
--- a/cppuhelper/source/tdmgr.cxx
+++ b/cppuhelper/source/tdmgr.cxx
@@ -748,7 +748,7 @@ sal_Bool SAL_CALL installTypeDescriptionManager(
SAL_THROW(())
{
uno::Environment curr_env(Environment::getCurrent());
- uno::Environment target_env(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV))));
+ uno::Environment target_env(rtl::OUString(CPPU_STRINGIFY(CPPU_ENV)));
uno::Mapping curr2target(curr_env, target_env);
diff --git a/cppuhelper/source/unourl.cxx b/cppuhelper/source/unourl.cxx
index 7179256..3e7f557 100644
--- a/cppuhelper/source/unourl.cxx
+++ b/cppuhelper/source/unourl.cxx
@@ -216,8 +216,8 @@ inline UnoUrl::Impl * UnoUrl::Impl::create(rtl::OUString const & rUrl)
{
if (!rUrl.matchIgnoreAsciiCaseAsciiL(RTL_CONSTASCII_STRINGPARAM("uno:"), 0))
throw rtl::MalformedUriException(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(
- "UNO URL does not start with \"uno:\"")));
+ rtl::OUString(
+ "UNO URL does not start with \"uno:\""));
sal_Int32 i = RTL_CONSTASCII_LENGTH("uno:");
sal_Int32 j = rUrl.indexOf(';', i);
if (j < 0)
diff --git a/cpputools/source/unoexe/unoexe.cxx b/cpputools/source/unoexe/unoexe.cxx
index 7343aae..1a6d9a7 100644
--- a/cpputools/source/unoexe/unoexe.cxx
+++ b/cpputools/source/unoexe/unoexe.cxx
@@ -535,9 +535,9 @@ SAL_IMPLEMENT_MAIN()
if (! aUnoUrl.endsWithIgnoreAsciiCaseAsciiL(
RTL_CONSTASCII_STRINGPARAM(";uno.ComponentContext") ))
throw RuntimeException(
- OUString( RTL_CONSTASCII_USTRINGPARAM(
+ OUString(
"expected UNO-URL with instance name "
- "uno.ComponentContext!") ),
+ "uno.ComponentContext!" ),
Reference<XInterface>() );
if (bSingleInstance)
throw RuntimeException(
@@ -621,7 +621,7 @@ SAL_IMPLEMENT_MAIN()
{
Reference< XComponent > xComp( xBridge, UNO_QUERY );
if (! xComp.is())
- throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("bridge factory does not export interface \"com.sun.star.lang.XComponent\"!" ) ), Reference< XInterface >() );
+ throw RuntimeException( OUString( "bridge factory does not export interface \"com.sun.star.lang.XComponent\"!" ), Reference< XInterface >() );
ODisposingListener::waitFor( xComp );
xComp->dispose();
// explicitly dispose the remote bridge so that it joins
@@ -650,7 +650,7 @@ SAL_IMPLEMENT_MAIN()
Reference< XComponent > xComp( xInstance, UNO_QUERY );
if (xComp.is())
xComp->dispose();
- throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM("component does not export interface interface \"com.sun.star.lang.XMain\"!" ) ), Reference< XInterface >() );
+ throw RuntimeException( OUString( "component does not export interface interface \"com.sun.star.lang.XMain\"!" ), Reference< XInterface >() );
}
}
}
diff --git a/cui/source/dialogs/colorpicker.cxx b/cui/source/dialogs/colorpicker.cxx
index c0f0831..46d3053 100644
--- a/cui/source/dialogs/colorpicker.cxx
+++ b/cui/source/dialogs/colorpicker.cxx
@@ -1533,8 +1533,8 @@ Sequence< OUString > SAL_CALL ColorPicker_getSupportedServiceNames() throw( Runt
ColorPicker::ColorPicker( Reference< XComponentContext > const & xContext )
: ColorPickerBase( m_aMutex )
, mxContext( xContext )
-, msColorKey( RTL_CONSTASCII_USTRINGPARAM( "Color" ) )
-, msModeKey( RTL_CONSTASCII_USTRINGPARAM( "Mode" ) )
+, msColorKey( "Color" )
+, msModeKey( "Mode" )
, mnColor( 0 )
, mnMode( 0 )
{
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index ce65810..f333f10 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -824,9 +824,9 @@ SfxTabPage* TPGalleryThemeProperties::Create( Window* pParent, const SfxItemSet&
OUString TPGalleryThemeProperties::addExtension( const OUString& _rDisplayText, const OUString& _rExtension )
{
- OUString sAllFilter( RTL_CONSTASCII_USTRINGPARAM( "(*.*)" ) );
+ OUString sAllFilter( "(*.*)" );
OUString sOpenBracket( " (" );
- OUString sCloseBracket( RTL_CONSTASCII_USTRINGPARAM( ")" ) );
+ OUString sCloseBracket( ")" );
OUString sRet = _rDisplayText;
if ( sRet.indexOf( sAllFilter ) == -1 )
diff --git a/cui/source/options/optgdlg.cxx b/cui/source/options/optgdlg.cxx
index e1ab16c..86e6f48 100644
--- a/cui/source/options/optgdlg.cxx
+++ b/cui/source/options/optgdlg.cxx
@@ -634,7 +634,7 @@ OfaViewTabPage::OfaViewTabPage(Window* pParent, const SfxItemSet& rSet)
aAutoStr += m_pIconStyleLB->GetEntry( aIconStyleItemId[nAutoStyle] );
m_pIconStyleLB->RemoveEntry( 0 );
- m_pIconStyleLB->InsertEntry( aAutoStr += OUString(RTL_CONSTASCII_USTRINGPARAM(")") ), 0 );
+ m_pIconStyleLB->InsertEntry( aAutoStr += OUString(")" ), 0 );
// separate auto and other icon themes
m_pIconStyleLB->SetSeparatorPos( 0 );
}
diff --git a/dbaccess/source/ui/misc/DExport.cxx b/dbaccess/source/ui/misc/DExport.cxx
index 5c8ea9e..fb0558e 100644
--- a/dbaccess/source/ui/misc/DExport.cxx
+++ b/dbaccess/source/ui/misc/DExport.cxx
@@ -882,8 +882,8 @@ Reference< XPreparedStatement > ODatabaseExport::createPreparedStatment( const R
}
}
- aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
- aValues = aValues.replaceAt(aValues.getLength()-1,1,OUString(RTL_CONSTASCII_USTRINGPARAM(")")));
+ aSql = aSql.replaceAt(aSql.getLength()-1,1,OUString(")"));
+ aValues = aValues.replaceAt(aValues.getLength()-1,1,OUString(")"));
aSql += aValues;
// now create,fill and execute the prepared statement
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index d8007ac..a07b18e 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -2932,7 +2932,7 @@ OUString OQueryDesignView::getStatement()
{
OUString aTmp("( ");
aTmp += aJoinCrit;
- aTmp += OUString(RTL_CONSTASCII_USTRINGPARAM(" )"));
+ aTmp += OUString(" )");
if(aCriteriaListStr.getLength())
{
aTmp += C_AND;
diff --git a/dtrans/source/cnttype/mctfentry.cxx b/dtrans/source/cnttype/mctfentry.cxx
index 096a942..a8e68ae 100644
--- a/dtrans/source/cnttype/mctfentry.cxx
+++ b/dtrans/source/cnttype/mctfentry.cxx
@@ -77,7 +77,7 @@ SAL_DLLPUBLIC_EXPORT void* SAL_CALL mcnttype_component_getFactory( const sal_Cha
if ( pSrvManager && ( 0 == rtl_str_compare( pImplName, MIMECONTENTTYPEFACTORY_IMPL_NAME ) ) )
{
Sequence< OUString > aSNS( 1 );
- aSNS.getArray( )[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( MIMECONTENTTYPEFACTORY_SERVICE_NAME ) );
+ aSNS.getArray( )[0] = OUString( MIMECONTENTTYPEFACTORY_SERVICE_NAME );
Reference< XSingleServiceFactory > xFactory ( createSingleFactory(
reinterpret_cast< XMultiServiceFactory* > ( pSrvManager ),
diff --git a/editeng/source/uno/unonrule.cxx b/editeng/source/uno/unonrule.cxx
index cce9583..0aeb0db 100644
--- a/editeng/source/uno/unonrule.cxx
+++ b/editeng/source/uno/unonrule.cxx
@@ -185,25 +185,25 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
Any aVal;
{
aVal <<= rFmt.GetNumberingType();
- beans::PropertyValue aAlignProp( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_NUMBERINGTYPE)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ beans::PropertyValue aAlignProp( OUString(UNO_NAME_NRULE_NUMBERINGTYPE), -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aAlignProp;
}
{
SvxAdjust eAdj = rFmt.GetNumAdjust();
aVal <<= ConvertUnoAdjust(eAdj);
- pArray[nIdx++] = beans::PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_ADJUST)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_ADJUST), -1, aVal, beans::PropertyState_DIRECT_VALUE);
}
{
aVal <<= OUString(rFmt.GetPrefix());
- beans::PropertyValue aPrefixProp( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_PREFIX)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ beans::PropertyValue aPrefixProp( OUString(UNO_NAME_NRULE_PREFIX), -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aPrefixProp;
}
{
aVal <<= OUString(rFmt.GetSuffix());
- beans::PropertyValue aSuffixProp( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_SUFFIX)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ beans::PropertyValue aSuffixProp( OUString(UNO_NAME_NRULE_SUFFIX), -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = aSuffixProp;
}
@@ -220,7 +220,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
awt::FontDescriptor aDesc;
SvxUnoFontDescriptor::ConvertFromFont( *rFmt.GetBulletFont(), aDesc );
aVal.setValue(&aDesc, ::getCppuType((const awt::FontDescriptor*)0));
- pArray[nIdx++] = beans::PropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_BULLET_FONT)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue( OUString(UNO_NAME_NRULE_BULLET_FONT), -1, aVal, beans::PropertyState_DIRECT_VALUE);
}
{
@@ -228,7 +228,7 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
if(pBrush && pBrush->GetGraphicObject())
{
const GraphicObject* pGrafObj = pBrush->GetGraphicObject();
- OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX));
+ OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX);
aURL += OStringToOUString(pGrafObj->GetUniqueID(),
RTL_TEXTENCODING_ASCII_US);
@@ -247,21 +247,21 @@ Sequence<beans::PropertyValue> SvxUnoNumberingRules::getNumberingRuleByIndex( sa
}
aVal <<= (sal_Int16)rFmt.GetStart();
- pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_START_WITH)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_START_WITH), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal <<= (sal_Int32)rFmt.GetAbsLSpace();
- pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_LEFT_MARGIN)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_LEFT_MARGIN), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal <<= (sal_Int32)rFmt.GetFirstLineOffset();
- pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_FIRST_LINE_OFFSET)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_FIRST_LINE_OFFSET), -1, aVal, beans::PropertyState_DIRECT_VALUE);
pArray[nIdx++] = beans::PropertyValue(OUString("SymbolTextDistance"), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal <<= (sal_Int32)rFmt.GetBulletColor().GetColor();
- pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_BULLET_COLOR)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_BULLET_COLOR), -1, aVal, beans::PropertyState_DIRECT_VALUE);
aVal <<= (sal_Int16)rFmt.GetBulletRelSize();
- pArray[nIdx++] = beans::PropertyValue(OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_NRULE_BULLET_RELSIZE)), -1, aVal, beans::PropertyState_DIRECT_VALUE);
+ pArray[nIdx++] = beans::PropertyValue(OUString(UNO_NAME_NRULE_BULLET_RELSIZE), -1, aVal, beans::PropertyState_DIRECT_VALUE);
DBG_ASSERT( nIdx <= nProps, "FixMe: overflow in Array!!! [CL]" );
Sequence< beans::PropertyValue> aSeq(pArray, nIdx);
diff --git a/embeddedobj/source/commonembedding/persistence.cxx b/embeddedobj/source/commonembedding/persistence.cxx
index 8e9cb80..cc99b3b 100644
--- a/embeddedobj/source/commonembedding/persistence.cxx
+++ b/embeddedobj/source/commonembedding/persistence.cxx
@@ -957,7 +957,7 @@ void SAL_CALL OCommonEmbeddedObject::setPersistentEntry(
}
else
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1146,7 +1146,7 @@ void SAL_CALL OCommonEmbeddedObject::storeToEntry( const uno::Reference< embed::
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// for now support of this interface is required to allow breaking of links and converting them to normal embedded
@@ -1274,7 +1274,7 @@ void SAL_CALL OCommonEmbeddedObject::storeAsEntry( const uno::Reference< embed::
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// for now support of this interface is required to allow breaking of links and converting them to normal embedded
@@ -1482,7 +1482,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::hasEntry()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_xObjectStorage.is() )
@@ -1509,7 +1509,7 @@ OUString SAL_CALL OCommonEmbeddedObject::getEntryName()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_aEntryName;
@@ -1541,7 +1541,7 @@ void SAL_CALL OCommonEmbeddedObject::storeOwn()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_bReadOnly )
@@ -1621,7 +1621,7 @@ sal_Bool SAL_CALL OCommonEmbeddedObject::isReadonly()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_bReadOnly;
@@ -1661,7 +1661,7 @@ void SAL_CALL OCommonEmbeddedObject::reload(
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_bIsLink )
@@ -1798,7 +1798,7 @@ void SAL_CALL OCommonEmbeddedObject::breakLink( const uno::Reference< embed::XSt
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
uno::Reference< container::XNameAccess > xNameAccess( xStorage, uno::UNO_QUERY );
diff --git a/embeddedobj/source/commonembedding/visobj.cxx b/embeddedobj/source/commonembedding/visobj.cxx
index a3826de..38c89fd 100644
--- a/embeddedobj/source/commonembedding/visobj.cxx
+++ b/embeddedobj/source/commonembedding/visobj.cxx
@@ -205,7 +205,7 @@ embed::VisualRepresentation SAL_CALL OCommonEmbeddedObject::getPreferredVisualRe
throw uno::RuntimeException();
datatransfer::DataFlavor aDataFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" )),
+ OUString( "application/x-openoffice-gdimetafile;windows_formatname=\"GDIMetaFile\"" ),
OUString( "GDIMetaFile" ),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
diff --git a/embeddedobj/source/general/dummyobject.cxx b/embeddedobj/source/general/dummyobject.cxx
index 12fb318..94679bb 100644
--- a/embeddedobj/source/general/dummyobject.cxx
+++ b/embeddedobj/source/general/dummyobject.cxx
@@ -333,7 +333,7 @@ void SAL_CALL ODummyEmbeddedObject::setPersistentEntry(
saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) );
else
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -375,7 +375,7 @@ void SAL_CALL ODummyEmbeddedObject::storeToEntry( const uno::Reference< embed::X
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
m_xParentStorage->copyElementTo( m_aEntryName, xStorage, sEntName );
@@ -397,7 +397,7 @@ void SAL_CALL ODummyEmbeddedObject::storeAsEntry( const uno::Reference< embed::X
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
PostEvent_Impl( OUString( "OnSaveAs" ) );
@@ -453,7 +453,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::hasEntry()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( !m_aEntryName.isEmpty() )
@@ -472,7 +472,7 @@ OUString SAL_CALL ODummyEmbeddedObject::getEntryName()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_aEntryName;
@@ -490,7 +490,7 @@ void SAL_CALL ODummyEmbeddedObject::storeOwn()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// the object can not be activated or changed
@@ -507,7 +507,7 @@ sal_Bool SAL_CALL ODummyEmbeddedObject::isReadonly()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// this object can not be changed
@@ -529,7 +529,7 @@ void SAL_CALL ODummyEmbeddedObject::reload(
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// nothing to reload
diff --git a/embeddedobj/source/general/intercept.cxx b/embeddedobj/source/general/intercept.cxx
index 7848b8e..1f16056 100644
--- a/embeddedobj/source/general/intercept.cxx
+++ b/embeddedobj/source/general/intercept.cxx
@@ -197,7 +197,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = OUString("Update");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
- aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($1) ")) + m_pDocHolder->GetTitle() );
+ aStateEvent.State <<= (OUString( "($1) ") + m_pDocHolder->GetTitle() );
Control->statusChanged(aStateEvent);
{
@@ -221,7 +221,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = OUString("Close and Return");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
- aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($2) ")) + m_pDocHolder->GetTitle() );
+ aStateEvent.State <<= (OUString( "($2) ") + m_pDocHolder->GetTitle() );
Control->statusChanged(aStateEvent);
@@ -243,7 +243,7 @@ Interceptor::addStatusListener(
aStateEvent.FeatureDescriptor = OUString("SaveCopyTo");
aStateEvent.IsEnabled = sal_True;
aStateEvent.Requery = sal_False;
- aStateEvent.State <<= (OUString( RTL_CONSTASCII_USTRINGPARAM("($3)")));
+ aStateEvent.State <<= (OUString( "($3)"));
Control->statusChanged(aStateEvent);
{
diff --git a/embeddedobj/source/msole/olepersist.cxx b/embeddedobj/source/msole/olepersist.cxx
index cd83249..7b683ce 100644
--- a/embeddedobj/source/msole/olepersist.cxx
+++ b/embeddedobj/source/msole/olepersist.cxx
@@ -1088,7 +1088,7 @@ void OleEmbeddedObject::StoreToLocation_Impl(
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
OSL_ENSURE( m_xParentStorage.is() && m_xObjectStream.is(), "The object has no valid persistence!\n" );
@@ -1347,7 +1347,7 @@ void SAL_CALL OleEmbeddedObject::setPersistentEntry(
saveCompleted( ( m_xParentStorage != xStorage || !m_aEntryName.equals( sEntName ) ) );
else
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
}
@@ -1679,7 +1679,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::hasEntry()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_xObjectStream.is() )
@@ -1715,7 +1715,7 @@ OUString SAL_CALL OleEmbeddedObject::getEntryName()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_aEntryName;
@@ -1760,7 +1760,7 @@ void SAL_CALL OleEmbeddedObject::storeOwn()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( m_bReadOnly )
@@ -1869,7 +1869,7 @@ sal_Bool SAL_CALL OleEmbeddedObject::isReadonly()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
return m_bReadOnly;
@@ -1910,7 +1910,7 @@ void SAL_CALL OleEmbeddedObject::reload(
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
// TODO:
@@ -1966,7 +1966,7 @@ void SAL_CALL OleEmbeddedObject::breakLink( const uno::Reference< embed::XStorag
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
@@ -2081,7 +2081,7 @@ OUString SAL_CALL OleEmbeddedObject::getLinkURL()
if ( m_bWaitSaveCompleted )
throw embed::WrongStateException(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "The object waits for saveCompleted() call!\n" )),
+ OUString( "The object waits for saveCompleted() call!\n" ),
uno::Reference< uno::XInterface >( static_cast< ::cppu::OWeakObject* >(this) ) );
if ( !m_bIsLink )
diff --git a/embeddedobj/source/msole/olevisual.cxx b/embeddedobj/source/msole/olevisual.cxx
index c09634f..d09d2aa 100644
--- a/embeddedobj/source/msole/olevisual.cxx
+++ b/embeddedobj/source/msole/olevisual.cxx
@@ -54,7 +54,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
{
// it's a bitmap
aVisualRepr.Flavor = datatransfer::DataFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" )),
+ OUString( "application/x-openoffice-bitmap;windows_formatname=\"Bitmap\"" ),
OUString( "Bitmap" ),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
}
@@ -62,7 +62,7 @@ embed::VisualRepresentation OleEmbeddedObject::GetVisualRepresentationInNativeFo
{
// it's a metafile
aVisualRepr.Flavor = datatransfer::DataFlavor(
- OUString(RTL_CONSTASCII_USTRINGPARAM( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" )),
+ OUString( "application/x-openoffice-wmf;windows_formatname=\"Image WMF\"" ),
OUString( "Windows Metafile" ),
::getCppuType( (const uno::Sequence< sal_Int8 >*) NULL ) );
}
diff --git a/extensions/source/bibliography/datman.cxx b/extensions/source/bibliography/datman.cxx
index b22a7d1..f4cfa2b 100644
--- a/extensions/source/bibliography/datman.cxx
+++ b/extensions/source/bibliography/datman.cxx
@@ -1316,7 +1316,7 @@ Reference< awt::XControlModel > BibDataManager::createGridModel(const OUString&
Reference< XPropertySetInfo > xPropInfo = xPropSet->getPropertySetInfo();
if (xPropInfo->hasPropertyByName(uProp))
{
- OUString sId(RTL_CONSTASCII_USTRINGPARAM( INET_HID_SCHEME ));
+ OUString sId( INET_HID_SCHEME );
sId += OUString::createFromAscii( HID_BIB_DB_GRIDCTRL );
xPropSet->setPropertyValue( uProp, makeAny( sId ) );
}
diff --git a/extensions/source/logging/csvformatter.cxx b/extensions/source/logging/csvformatter.cxx
index 7bf5188..16d2810 100644
--- a/extensions/source/logging/csvformatter.cxx
+++ b/extensions/source/logging/csvformatter.cxx
@@ -105,13 +105,13 @@ namespace logging
//= private helpers
namespace
{
- const sal_Unicode quote_char = OUString(RTL_CONSTASCII_USTRINGPARAM("\"")).toChar();
+ const sal_Unicode quote_char = OUString("\"").toChar();
const sal_Unicode comma_char = OUString(",").toChar();
const OUString dos_newline = OUString("\r\n");
inline bool needsQuoting(const OUString& str)
{
- static const OUString quote_trigger_chars = OUString( RTL_CONSTASCII_USTRINGPARAM("\",\n\r"));
+ static const OUString quote_trigger_chars = OUString( "\",\n\r");
sal_Int32 len = str.getLength();
for(sal_Int32 i=0; i<len; i++)
if(quote_trigger_chars.indexOf(str[i])!=-1)
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx
index 8354791..ae2f36f 100644
--- a/filter/source/msfilter/svdfppt.cxx
+++ b/filter/source/msfilter/svdfppt.cxx
@@ -7368,7 +7368,7 @@ void ApplyCellAttributes( const SdrObject* pObj, Reference< XCell >& xCell )
eFS = com::sun::star::drawing::FillStyle_BITMAP;
const XFillBitmapItem aXFillBitmapItem((const XFillBitmapItem&)pObj->GetMergedItem( XATTR_FILLBITMAP ));
- OUString aURL( RTL_CONSTASCII_USTRINGPARAM(UNO_NAME_GRAPHOBJ_URLPREFIX));
+ OUString aURL( UNO_NAME_GRAPHOBJ_URLPREFIX);
aURL += OStringToOUString(
aXFillBitmapItem.GetGraphicObject().GetUniqueID(),
RTL_TEXTENCODING_ASCII_US);
diff --git a/filter/source/placeware/filter.cxx b/filter/source/placeware/filter.cxx
index 52c48c2..20f7f86 100644
--- a/filter/source/placeware/filter.cxx
+++ b/filter/source/placeware/filter.cxx
@@ -164,7 +164,7 @@ Sequence< OUString > SAL_CALL PlaceWareExportFilter_getSupportedServiceNames( )
{
Sequence < OUString > aRet(1);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME ) );
+ pArray[0] = OUString ( SERVICE_NAME );
return aRet;
}
#undef SERVICE_NAME
diff --git a/filter/source/svg/impsvgdialog.cxx b/filter/source/svg/impsvgdialog.cxx
index 01e3648..fc9c2c7 100644
--- a/filter/source/svg/impsvgdialog.cxx
+++ b/filter/source/svg/impsvgdialog.cxx
@@ -66,9 +66,9 @@ ImpSVGDialog::ImpSVGDialog( Window* pParent/*, ResMgr& rResMgr*/, Sequence< Prop
maCBUseNativeDecoration.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 41 ) ),
Size( implMap( *this, 142 ), implMap( *this, 10 ) ) );
- maCBTinyProfile.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), sal_False ) );
- maCBEmbedFonts.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), sal_True ) );
- maCBUseNativeDecoration.Check( maConfigItem.ReadBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), sal_True ) );
+ maCBTinyProfile.Check( maConfigItem.ReadBool( OUString( SVG_PROP_TINYPROFILE ), sal_False ) );
+ maCBEmbedFonts.Check( maConfigItem.ReadBool( OUString( SVG_PROP_EMBEDFONTS ), sal_True ) );
+ maCBUseNativeDecoration.Check( maConfigItem.ReadBool( OUString( SVG_PROP_NATIVEDECORATION ), sal_True ) );
maBTOK.SetPosSizePixel( Point( implMap( *this, 12 ), implMap( *this, 57 ) ),
Size( implMap( *this, 50 ), implMap( *this, 14 ) ) );
@@ -101,9 +101,9 @@ ImpSVGDialog::~ImpSVGDialog()
Sequence< PropertyValue > ImpSVGDialog::GetFilterData()
{
- maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_TINYPROFILE ) ), maCBTinyProfile.IsChecked() );
- maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_EMBEDFONTS ) ), maCBEmbedFonts.IsChecked() );
- maConfigItem.WriteBool( OUString( RTL_CONSTASCII_USTRINGPARAM( SVG_PROP_NATIVEDECORATION ) ), maCBUseNativeDecoration.IsChecked() );
+ maConfigItem.WriteBool( OUString( SVG_PROP_TINYPROFILE ), maCBTinyProfile.IsChecked() );
+ maConfigItem.WriteBool( OUString( SVG_PROP_EMBEDFONTS ), maCBEmbedFonts.IsChecked() );
+ maConfigItem.WriteBool( OUString( SVG_PROP_NATIVEDECORATION ), maCBUseNativeDecoration.IsChecked() );
return( maConfigItem.GetFilterData() );
}
diff --git a/filter/source/svg/svgdialog.cxx b/filter/source/svg/svgdialog.cxx
index b400c15..5456385 100644
--- a/filter/source/svg/svgdialog.cxx
+++ b/filter/source/svg/svgdialog.cxx
@@ -49,7 +49,7 @@ using namespace ::com::sun::star::document;
OUString SVGDialog_getImplementationName ()
throw (RuntimeException)
{
- return OUString ( RTL_CONSTASCII_USTRINGPARAM ( SVG_DIALOG_IMPLEMENTATION_NAME ) );
+ return OUString ( SVG_DIALOG_IMPLEMENTATION_NAME );
}
// -----------------------------------------------------------------------------
@@ -69,7 +69,7 @@ Sequence< OUString > SAL_CALL SVGDialog_getSupportedServiceNames()
{
Sequence< OUString > aRet( 1 );
- aRet.getArray()[ 0 ] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SVG_DIALOG_SERVICE_NAME ) );
+ aRet.getArray()[ 0 ] = OUString ( SVG_DIALOG_SERVICE_NAME );
return aRet;
}
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index a11fcff..c0b017c 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -162,7 +162,7 @@ sal_Bool SAL_CALL XmlFilterAdaptor::importImpl( const Sequence< ::com::sun::star
{
Reference< XConfigManager >xCfgMgr ( mxMSF->createInstance(
OUString( "com.sun.star.config.SpecialConfigManager" ) ), UNO_QUERY );
- OUString PathString(xCfgMgr->substituteVariables(OUString(RTL_CONSTASCII_USTRINGPARAM("$(progurl)"))));
+ OUString PathString(xCfgMgr->substituteVariables(OUString("$(progurl)")));
PathString = PathString.concat(OUString( "/" ));
msTemplateName=PathString.concat(msTemplateName);
}
@@ -388,8 +388,8 @@ Sequence< OUString > SAL_CALL XmlFilterAdaptor_getSupportedServiceNames( )
{
Sequence < OUString > aRet(2);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME1 ) );
- pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( SERVICE_NAME2 ) );
+ pArray[0] = OUString ( SERVICE_NAME1 );
+ pArray[1] = OUString ( SERVICE_NAME2 );
return aRet;
}
#undef SERVICE_NAME1
diff --git a/filter/source/xsltdialog/typedetectionimport.cxx b/filter/source/xsltdialog/typedetectionimport.cxx
index c9127d5..12cc401 100644
--- a/filter/source/xsltdialog/typedetectionimport.cxx
+++ b/filter/source/xsltdialog/typedetectionimport.cxx
@@ -37,19 +37,19 @@ using namespace std;
TypeDetectionImporter::TypeDetectionImporter( Reference< XMultiServiceFactory >& xMSF )
: mxMSF(xMSF),
- sRootNode( RTL_CONSTASCII_USTRINGPARAM( "oor:component-data" ) ),
- sNode( RTL_CONSTASCII_USTRINGPARAM( "node" ) ),
- sName( RTL_CONSTASCII_USTRINGPARAM( "oor:name" ) ),
- sProp( RTL_CONSTASCII_USTRINGPARAM( "prop" ) ),
- sValue( RTL_CONSTASCII_USTRINGPARAM( "value" ) ),
- sUIName( RTL_CONSTASCII_USTRINGPARAM( "UIName" ) ),
- sData( RTL_CONSTASCII_USTRINGPARAM( "Data" ) ),
- sFilters( RTL_CONSTASCII_USTRINGPARAM( "Filters" ) ),
- sTypes( RTL_CONSTASCII_USTRINGPARAM( "Types" ) ),
- sFilterAdaptorService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.comp.Writer.XmlFilterAdaptor" ) ),
- sXSLTFilterService( RTL_CONSTASCII_USTRINGPARAM ( "com.sun.star.documentconversion.XSLTFilter" ) ),
- sCdataAttribute( RTL_CONSTASCII_USTRINGPARAM( "CDATA" ) ),
- sWhiteSpace( RTL_CONSTASCII_USTRINGPARAM( " " ) )
+ sRootNode( "oor:component-data" ),
+ sNode( "node" ),
+ sName( "oor:name" ),
+ sProp( "prop" ),
+ sValue( "value" ),
+ sUIName( "UIName" ),
+ sData( "Data" ),
+ sFilters( "Filters" ),
+ sTypes( "Types" ),
+ sFilterAdaptorService( "com.sun.star.comp.Writer.XmlFilterAdaptor" ),
+ sXSLTFilterService( "com.sun.star.documentconversion.XSLTFilter" ),
+ sCdataAttribute( "CDATA" ),
+ sWhiteSpace( " " )
{
}
diff --git a/filter/source/xsltdialog/xmlfilterjar.cxx b/filter/source/xsltdialog/xmlfilterjar.cxx
index 9d2eee0..12241c7 100644
--- a/filter/source/xsltdialog/xmlfilterjar.cxx
+++ b/filter/source/xsltdialog/xmlfilterjar.cxx
@@ -62,12 +62,12 @@ using ::rtl::Uri;
XMLFilterJarHelper::XMLFilterJarHelper( Reference< XMultiServiceFactory >& xMSF )
: mxMSF( xMSF ),
- sVndSunStarPackage( RTL_CONSTASCII_USTRINGPARAM( "vnd.sun.star.Package:" ) ),
- sXSLTPath( RTL_CONSTASCII_USTRINGPARAM( "$(user)/xslt/" ) ),
- sTemplatePath( RTL_CONSTASCII_USTRINGPARAM( "$(user)/template/") ),
- sSpecialConfigManager( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.config.SpecialConfigManager" ) ),
- sPump( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.io.Pump" ) ),
- sProgPath( RTL_CONSTASCII_USTRINGPARAM( "$(prog)/" ) )
+ sVndSunStarPackage( "vnd.sun.star.Package:" ),
+ sXSLTPath( "$(user)/xslt/" ),
+ sTemplatePath( "$(user)/template/" ),
+ sSpecialConfigManager( "com.sun.star.config.SpecialConfigManager" ),
+ sPump( "com.sun.star.io.Pump" ),
+ sProgPath( "$(prog)/" )
{
try
{
diff --git a/formula/source/ui/dlg/formula.cxx b/formula/source/ui/dlg/formula.cxx
index 6f98e56..51bb4e4 100644
--- a/formula/source/ui/dlg/formula.cxx
+++ b/formula/source/ui/dlg/formula.cxx
@@ -435,7 +435,7 @@ uno::Reference< sheet::XFormulaOpCodeMapper > FormulaDlg_Impl::GetFormulaOpCodeM
uno::Sequence< OUString > aArgs(3);
aArgs[TOKEN_OPEN] = OUString("(");
- aArgs[TOKEN_CLOSE] = OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+ aArgs[TOKEN_CLOSE] = OUString(")");
aArgs[TOKEN_SEP] = OUString(";");
m_aSeparatorsOpCodes = m_xOpCodeMapper->getMappings(aArgs,sheet::FormulaLanguage::ODFF);
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index a4eaec8..6787f8d 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -2176,7 +2176,7 @@ short SvtFileDialog::PrepareExecute()
// if applicable set respectively create filter for all files
if ( !bHasAll )
{
- SvtFileDialogFilter_Impl* pAllFilter = implAddFilter( aAll, OUString(RTL_CONSTASCII_USTRINGPARAM(FILEDIALOG_FILTER_ALL)) );
+ SvtFileDialogFilter_Impl* pAllFilter = implAddFilter( aAll, OUString(FILEDIALOG_FILTER_ALL) );
_pImp->InsertFilterListEntry( pAllFilter );
_pImp->SetCurFilter( pAllFilter, aAll );
}
diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
index 421a413..93ca444 100644
--- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx
+++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx
@@ -70,7 +70,7 @@ ToolbarLayoutManager::ToolbarLayoutManager(
m_aFullAddonTbxPrefix( "private:resource/toolbar/addon_" ),
m_aCustomTbxPrefix( "custom_" ),
m_aCustomizeCmd( "ConfigureDialog" ),
- m_aToolbarTypeString( RTL_CONSTASCII_USTRINGPARAM( UIRESOURCETYPE_TOOLBAR ))
+ m_aToolbarTypeString( UIRESOURCETYPE_TOOLBAR )
{
// initialize rectangles to zero values
setZeroRectangle( m_aDockingAreaOffsets );
diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx
index 507d916..9541000 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -337,7 +337,7 @@ void CacheLockGuard::unlock()
{
OSL_FAIL("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)");
throw css::uno::RuntimeException(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)")),
+ OUString("Wrong using of member m_nDocCacheLock detected. A ref counted value shouldn't reach values <0 .-)"),
m_xOwner);
}
aWriteLock.unlock();
diff --git a/i18npool/qa/cppunit/test_breakiterator.cxx b/i18npool/qa/cppunit/test_breakiterator.cxx
index 869df60..b3ec68f 100644
--- a/i18npool/qa/cppunit/test_breakiterator.cxx
+++ b/i18npool/qa/cppunit/test_breakiterator.cxx
@@ -76,7 +76,7 @@ void TestBreakIterator::testLineBreaking()
//See https://bugs.freedesktop.org/show_bug.cgi?id=31271
{
- OUString aTest(RTL_CONSTASCII_USTRINGPARAM("(some text here)"));
+ OUString aTest("(some text here)");
aLocale.Language = OUString("en");
aLocale.Country = OUString("US");
diff --git a/include/test/util/xsearchable.hxx b/include/test/util/xsearchable.hxx
index c7dfc21..4c83dc8 100644
--- a/include/test/util/xsearchable.hxx
+++ b/include/test/util/xsearchable.hxx
@@ -15,7 +15,7 @@ class OOO_DLLPUBLIC_TEST XSearchable
{
public:
XSearchable(const OUString& rString, sal_Int32 nCount) : maSearchString(rString), mnCount(nCount) {}
- XSearchable() : maSearchString(RTL_CONSTASCII_USTRINGPARAM("SearchString")), mnCount(1) {}
+ XSearchable() : maSearchString("SearchString"), mnCount(1) {}
virtual ~XSearchable();
void testFindFirst();
diff --git a/include/uno/current_context.hxx b/include/uno/current_context.hxx
index 5812db7..dbade9c 100644
--- a/include/uno/current_context.hxx
+++ b/include/uno/current_context.hxx
@@ -44,7 +44,7 @@ inline Reference< XCurrentContext > SAL_CALL getCurrentContext()
SAL_THROW(())
{
Reference< XCurrentContext > xRet;
- ::rtl::OUString aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
+ ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
::uno_getCurrentContext( (void **)&xRet, aEnvTypeName.pData, 0 );
return xRet;
}
@@ -57,7 +57,7 @@ inline bool SAL_CALL setCurrentContext(
Reference< XCurrentContext > const & xContext )
SAL_THROW(())
{
- ::rtl::OUString aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) );
+ ::rtl::OUString aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME );
return (::uno_setCurrentContext( xContext.get(), aEnvTypeName.pData, 0 ) != sal_False);
}
@@ -97,7 +97,7 @@ public:
//__________________________________________________________________________________________________
inline ContextLayer::ContextLayer( Reference< XCurrentContext > const & xNewContext )
SAL_THROW(())
- : m_aEnvTypeName( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) )
+ : m_aEnvTypeName( CPPU_CURRENT_LANGUAGE_BINDING_NAME )
{
::uno_getCurrentContext( (void **)&m_xPreviousContext, m_aEnvTypeName.pData, 0 );
::uno_setCurrentContext( xNewContext.get(), m_aEnvTypeName.pData, 0 );
diff --git a/include/uno/environment.hxx b/include/uno/environment.hxx
index 5fd8633..272a069 100644
--- a/include/uno/environment.hxx
+++ b/include/uno/environment.hxx
@@ -55,7 +55,7 @@ public:
respectively to current C++ Environment.
@since UDK 3.2.7
*/
- inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(CPPU_STRINGIFY(CPPU_ENV)))) SAL_THROW(());
+ inline static Environment getCurrent(rtl::OUString const & typeName = rtl::OUString(CPPU_STRINGIFY(CPPU_ENV))) SAL_THROW(());
/// @cond INTERNAL
// these are here to force memory de/allocation to sal lib.
diff --git a/include/uno/mapping.hxx b/include/uno/mapping.hxx
index 13a0428..f4340b5 100644
--- a/include/uno/mapping.hxx
+++ b/include/uno/mapping.hxx
@@ -305,8 +305,8 @@ template< class C >
inline sal_Bool mapToCpp( Reference< C > * ppRet, uno_Interface * pUnoI ) SAL_THROW(())
{
Mapping aMapping(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ) );
+ ::rtl::OUString( UNO_LB_UNO ),
+ ::rtl::OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ) );
OSL_ASSERT( aMapping.is() );
aMapping.mapInterface(
(void **)ppRet, pUnoI, ::cppu::getTypeFavourUnsigned( ppRet ) );
@@ -328,8 +328,8 @@ template< class C >
inline sal_Bool mapToUno( uno_Interface ** ppRet, const Reference< C > & x ) SAL_THROW(())
{
Mapping aMapping(
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(CPPU_CURRENT_LANGUAGE_BINDING_NAME) ),
- ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM(UNO_LB_UNO) ) );
+ ::rtl::OUString( CPPU_CURRENT_LANGUAGE_BINDING_NAME ),
+ ::rtl::OUString( UNO_LB_UNO ) );
OSL_ASSERT( aMapping.is() );
aMapping.mapInterface(
(void **)ppRet, x.get(), ::cppu::getTypeFavourUnsigned( &x ) );
diff --git a/io/source/stm/opipe.cxx b/io/source/stm/opipe.cxx
index 36ad704..e1dc805 100644
--- a/io/source/stm/opipe.cxx
+++ b/io/source/stm/opipe.cxx
@@ -453,13 +453,13 @@ Reference < XInterface > SAL_CALL OPipeImpl_CreateInstance(
OUString OPipeImpl_getImplementationName()
{
- return OUString( RTL_CONSTASCII_USTRINGPARAM ( IMPLEMENTATION_NAME ) );
+ return OUString( IMPLEMENTATION_NAME );
}
Sequence<OUString> OPipeImpl_getSupportedServiceNames(void)
{
Sequence<OUString> aRet(1);
- aRet.getArray()[0] = OUString( RTL_CONSTASCII_USTRINGPARAM( SERVICE_NAME ));
+ aRet.getArray()[0] = OUString( SERVICE_NAME );
return aRet;
}
}
diff --git a/javaunohelper/source/javaunohelper.cxx b/javaunohelper/source/javaunohelper.cxx
index e430236..0ba0b5f 100644
--- a/javaunohelper/source/javaunohelper.cxx
+++ b/javaunohelper/source/javaunohelper.cxx
@@ -68,7 +68,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
if (lib)
{
// ========================= LATEST VERSION =========================
- OUString aGetEnvName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETENV) );
+ OUString aGetEnvName( COMPONENT_GETENV );
oslGenericFunction pSym =
osl_getFunctionSymbol( lib, aGetEnvName.pData );
if (pSym)
@@ -91,7 +91,7 @@ jboolean Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1writeInfo(
uno_getEnvironment(
(uno_Environment **)&java_env, java_env_name.pData, vm_access.get() );
- OUString aWriteInfoName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_WRITEINFO) );
+ OUString aWriteInfoName( COMPONENT_WRITEINFO );
pSym = osl_getFunctionSymbol( lib, aWriteInfoName.pData );
if (pSym)
{
@@ -151,7 +151,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
OUString aLibName( pJLibName );
pJEnv->ReleaseStringChars( jLibName, pJLibName);
- aLibName += OUString( RTL_CONSTASCII_USTRINGPARAM(SAL_DLLEXTENSION) );
+ aLibName += OUString( SAL_DLLEXTENSION );
jobject joSLL_cpp = 0;
@@ -160,7 +160,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
if (lib)
{
// ========================= LATEST VERSION =========================
- OUString aGetEnvName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETENV) );
+ OUString aGetEnvName( COMPONENT_GETENV );
oslGenericFunction pSym =
osl_getFunctionSymbol( lib, aGetEnvName.pData );
if (pSym)
@@ -184,7 +184,7 @@ jobject Java_com_sun_star_comp_helper_SharedLibraryLoader_component_1getFactory(
uno_getEnvironment(
(uno_Environment **)&java_env, java_env_name.pData, vm_access.get() );
- OUString aGetFactoryName( RTL_CONSTASCII_USTRINGPARAM(COMPONENT_GETFACTORY) );
+ OUString aGetFactoryName( COMPONENT_GETFACTORY );
pSym = osl_getFunctionSymbol( lib, aGetFactoryName.pData );
if (pSym)
{
diff --git a/javaunohelper/source/vm.cxx b/javaunohelper/source/vm.cxx
index 6b518f3..5118874 100644
--- a/javaunohelper/source/vm.cxx
+++ b/javaunohelper/source/vm.cxx
@@ -109,9 +109,8 @@ namespace javaunohelper {
} catch ( ::jvmaccess::UnoVirtualMachine::CreationException & ) {
throw css::uno::RuntimeException(
OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"jmvaccess::UnoVirtualMachine::CreationException"
- " occurred" ) ),
+ " occurred" ),
css::uno::Reference< css::uno::XInterface >() );
}
}
diff --git a/jvmfwk/source/fwkbase.cxx b/jvmfwk/source/fwkbase.cxx
index a9b38ff..1619788 100644
--- a/jvmfwk/source/fwkbase.cxx
+++ b/jvmfwk/source/fwkbase.cxx
@@ -323,7 +323,7 @@ OUString VendorSettings::getPluginLibrary(const OUString& sVendor)
for (sal_Int32 i = 1; ; i++)
{
OUString sName =
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_PARAMETER)) +
+ OUString(UNO_JAVA_JFW_PARAMETER) +
OUString::valueOf(i);
OUString sValue;
if (Bootstrap::get()->getFrom(sName, sValue) == sal_True)
@@ -358,7 +358,7 @@ OString BootParams::getClasspath()
OString sClassPath;
OUString sCP;
if (Bootstrap::get()->getFrom(
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH)),
+ OUString(UNO_JAVA_JFW_CLASSPATH),
sCP) == sal_True)
{
sClassPath = OUStringToOString(
@@ -371,7 +371,7 @@ OString BootParams::getClasspath()
OUString sEnvCP;
if (Bootstrap::get()->getFrom(
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH)),
+ OUString(UNO_JAVA_JFW_ENV_CLASSPATH),
sEnvCP) == sal_True)
{
char * pCp = getenv("CLASSPATH");
@@ -393,7 +393,7 @@ OUString BootParams::getVendorSettings()
{
OUString sVendor;
OUString sName(
- RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_VENDOR_SETTINGS));
+ UNO_JAVA_JFW_VENDOR_SETTINGS);
if (Bootstrap::get()->getFrom(sName ,sVendor) == sal_True)
{
//check the value of the bootstrap variable
@@ -433,9 +433,9 @@ OUString BootParams::getJREHome()
OUString sJRE;
OUString sEnvJRE;
sal_Bool bJRE = Bootstrap::get()->getFrom(
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_JREHOME)) ,sJRE);
+ OUString(UNO_JAVA_JFW_JREHOME) ,sJRE);
sal_Bool bEnvJRE = Bootstrap::get()->getFrom(
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_JREHOME)) ,sEnvJRE);
+ OUString(UNO_JAVA_JFW_ENV_JREHOME) ,sEnvJRE);
if (bJRE == sal_True && bEnvJRE == sal_True)
{
@@ -496,7 +496,7 @@ OUString BootParams::getClasspathUrls()
{
OUString sParams;
Bootstrap::get()->getFrom(
- OUString(RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH_URLS)),
+ OUString(UNO_JAVA_JFW_CLASSPATH_URLS),
sParams);
#if OSL_DEBUG_LEVEL >=2
OString sValue = OUStringToOString(sParams, osl_getThreadTextEncoding());
@@ -518,23 +518,23 @@ JFW_MODE getMode()
OUString sValue;
const rtl::Bootstrap * aBoot = Bootstrap::get();
OUString sJREHome(
- RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_JREHOME));
+ UNO_JAVA_JFW_JREHOME);
if (aBoot->getFrom(sJREHome, sValue) == sal_False)
{
OUString sEnvJRE(
- RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_JREHOME));
+ UNO_JAVA_JFW_ENV_JREHOME);
if (aBoot->getFrom(sEnvJRE, sValue) == sal_False)
{
OUString sClasspath(
- RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_CLASSPATH));
+ UNO_JAVA_JFW_CLASSPATH);
if (aBoot->getFrom(sClasspath, sValue) == sal_False)
{
OUString sEnvClasspath(
- RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_ENV_CLASSPATH));
+ UNO_JAVA_JFW_ENV_CLASSPATH);
if (aBoot->getFrom(sEnvClasspath, sValue) == sal_False)
{
OUString sParams = OUString(
- RTL_CONSTASCII_USTRINGPARAM(UNO_JAVA_JFW_PARAMETER)) +
+ UNO_JAVA_JFW_PARAMETER) +
OUString::valueOf((sal_Int32)1);
if (aBoot->getFrom(sParams, sValue) == sal_False)
{
diff --git a/registry/source/regimpl.cxx b/registry/source/regimpl.cxx
index 30249d4..c87191f 100644
--- a/registry/source/regimpl.cxx
+++ b/registry/source/regimpl.cxx
@@ -427,7 +427,7 @@ ORegistry::ORegistry()
: m_refCount(1)
, m_readOnly(sal_False)
, m_isOpen(sal_False)
- , ROOT( RTL_CONSTASCII_USTRINGPARAM("/") )
+ , ROOT( "/" )
{
}
diff --git a/remotebridges/source/unourl_resolver/unourl_resolver.cxx b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
index 87421f0..334991a 100644
--- a/remotebridges/source/unourl_resolver/unourl_resolver.cxx
+++ b/remotebridges/source/unourl_resolver/unourl_resolver.cxx
@@ -51,13 +51,13 @@ namespace unourl_resolver
Sequence< OUString > resolver_getSupportedServiceNames()
{
Sequence< OUString > seqNames(1);
- seqNames.getArray()[0] = OUString(RTL_CONSTASCII_USTRINGPARAM(SERVICENAME));
+ seqNames.getArray()[0] = OUString(SERVICENAME);
return seqNames;
}
OUString resolver_getImplementationName()
{
- return OUString(RTL_CONSTASCII_USTRINGPARAM(IMPLNAME));
+ return OUString(IMPLNAME);
}
//==================================================================================================
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index 85940c1..e715ed5 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -1799,7 +1799,7 @@ void SAL_CALL OReportDefinition::load( const uno::Sequence< beans::PropertyValue
aStorageSource <<= sURL;
else
throw lang::IllegalArgumentException(
- OUString( RTL_CONSTASCII_USTRINGPARAM( "No input source (URL or InputStream) found." ) ),
+ OUString( "No input source (URL or InputStream) found." ),
// TODO: resource
*this,
1
@@ -2112,7 +2112,7 @@ void SAL_CALL OReportDefinition::setMimeType( const OUString& _mimetype ) throw
uno::Sequence< OUString > aList = getAvailableMimeTypes();
const OUString* pEnd = aList.getConstArray()+aList.getLength();
if ( ::std::find(aList.getConstArray(),pEnd,_mimetype) == pEnd )
- throwIllegallArgumentException(OUString(RTL_CONSTASCII_USTRINGPARAM("getAvailableMimeTypes()"))
+ throwIllegallArgumentException(OUString("getAvailableMimeTypes()")
,*this
,1
,m_aProps->m_xContext);
diff --git a/reportdesign/source/filter/xml/xmlCell.cxx b/reportdesign/source/filter/xml/xmlCell.cxx
index 57ac5aa..6a7ad00 100644
--- a/reportdesign/source/filter/xml/xmlCell.cxx
+++ b/reportdesign/source/filter/xml/xmlCell.cxx
@@ -120,10 +120,10 @@ SvXMLImportContext* OXMLCell::CreateChildContext(
}
break;
case XML_TOK_PAGE_NUMBER:
- m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()"));
+ m_sText += s_sStringConcat + OUString(" PageNumber()");
break;
case XML_TOK_PAGE_COUNT:
- m_sText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()"));
+ m_sText += s_sStringConcat + OUString(" PageCount()");
break;
case XML_TOK_FORMATTED_TEXT:
{
@@ -258,7 +258,7 @@ void OXMLCell::Characters( const OUString& rChars )
{
if ( !rChars.isEmpty() )
{
- static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static const OUString s_Quote("\"");
if ( !m_sText.isEmpty() )
{
static const OUString s_sStringConcat(" & ");
diff --git a/reportdesign/source/filter/xml/xmlExport.cxx b/reportdesign/source/filter/xml/xmlExport.cxx
index 713611f..60a93cb 100644
--- a/reportdesign/source/filter/xml/xmlExport.cxx
+++ b/reportdesign/source/filter/xml/xmlExport.cxx
@@ -293,14 +293,14 @@ ORptExport::ORptExport(const Reference< XComponentContext >& _rxContext,sal_uInt
GetAutoStylePool()->AddFamily( XML_STYLE_FAMILY_TEXT_PARAGRAPH, sFamily,
m_xParaPropMapper, aPrefix );
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME)),
- m_xCellStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX)));
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME)),
- m_xColumnStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX)));
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME)),
- m_xRowStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX)));
- GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME)),
- m_xTableStylesExportPropertySetMapper, OUString(RTL_CONSTASCII_USTRINGPARAM(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX)));
+ GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_CELL, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME),
+ m_xCellStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_CELL_STYLES_PREFIX));
+ GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_COLUMN, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME),
+ m_xColumnStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_PREFIX));
+ GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_ROW, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME),
+ m_xRowStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_ROW_STYLES_PREFIX));
+ GetAutoStylePool()->AddFamily(XML_STYLE_FAMILY_TABLE_TABLE, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME),
+ m_xTableStylesExportPropertySetMapper, OUString(XML_STYLE_FAMILY_TABLE_TABLE_STYLES_PREFIX));
}
// -----------------------------------------------------------------------------
Reference< XInterface > ORptExport::create(Reference< XComponentContext > const & xContext)
@@ -1027,8 +1027,8 @@ OUString ORptExport::convertFormula(const OUString& _sFormula)
bool ORptExport::exportFormula(enum ::xmloff::token::XMLTokenEnum eName,const OUString& _sFormula)
{
const OUString sFieldData = convertFormula(_sFormula);
- static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
- static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
+ static const OUString s_sPageNumber("PageNumber()");
+ static const OUString s_sPageCount("PageCount()");
sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber);
sal_Int32 nPageCountIndex = sFieldData.indexOf(s_sPageCount);
bool bRet = nPageNumberIndex != -1 || nPageCountIndex != -1;
@@ -1086,20 +1086,20 @@ sal_Bool ORptExport::exportGroup(const Reference<XReportDefinition>& _xReportDef
OUString sExpression = sField;
if ( !sExpression.isEmpty() )
{
- static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\""));
+ static OUString s_sQuote("\"\"");
sal_Int32 nIndex = sExpression.indexOf('"');
while ( nIndex > -1 )
{
sExpression = sExpression.replaceAt(nIndex,1,s_sQuote);
nIndex = sExpression.indexOf('"',nIndex+2);
}
- OUString sFormula(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\""));
+ OUString sFormula("rpt:HASCHANGED(\"");
TGroupFunctionMap::iterator aGroupFind = m_aGroupFunctionMap.find(xGroup);
if ( aGroupFind != m_aGroupFunctionMap.end() )
sExpression = aGroupFind->second->getName();
sFormula += sExpression;
- sFormula += OUString(RTL_CONSTASCII_USTRINGPARAM("\")"));
+ sFormula += OUString("\")");
sExpression = sFormula;
}
AddAttribute(XML_NAMESPACE_REPORT, XML_SORT_EXPRESSION, sField);
@@ -1425,8 +1425,8 @@ void ORptExport::exportParagraph(const Reference< XReportControlModel >& _xRepor
if ( Reference<XFormattedField>(_xReportElement,uno::UNO_QUERY).is() )
{
OUString sFieldData = _xReportElement->getDataField();
- static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("PageNumber()"));
- static const OUString s_sPageCount(RTL_CONSTASCII_USTRINGPARAM("PageCount()"));
+ static const OUString s_sPageNumber("PageNumber()");
+ static const OUString s_sPageCount("PageCount()");
static const OUString s_sReportPrefix("rpt:");
sFieldData = sFieldData.copy(s_sReportPrefix.getLength(),sFieldData.getLength() - s_sReportPrefix.getLength());
sal_Int32 nPageNumberIndex = sFieldData.indexOf(s_sPageNumber);
@@ -1543,7 +1543,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
break;
case report::GroupOn::QUARTAL:
sFunction = OUString("INT((MONTH");
- sPostfix = OUString(RTL_CONSTASCII_USTRINGPARAM("-1)/3)+1"));
+ sPostfix = OUString("-1)/3)+1");
sFunctionName = OUString("QUARTAL_") + sExpression;
break;
case report::GroupOn::MONTH:
@@ -1573,7 +1573,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
sExpression = sCountName;
// The reference to sCountName in the formula of sFunctionName refers to the *old* value
// so we need to expand the the formula of sCountName
- sPrefix = OUString(RTL_CONSTASCII_USTRINGPARAM(" + 1) / ")) + OUString::valueOf(xGroup->getGroupInterval());
+ sPrefix = OUString(" + 1) / ") + OUString::valueOf(xGroup->getGroupInterval());
sFunctionName = sFunction + OUString("_") + sExpression;
sFunction = sFunction + OUString("(");
sInitialFormula = OUString("rpt:0");
@@ -1600,7 +1600,7 @@ void ORptExport::exportGroupsExpressionAsFunction(const Reference< XGroups>& _xG
if ( !sPrefix.isEmpty() )
sFunction += sPrefix;
- sFunction += OUString(RTL_CONSTASCII_USTRINGPARAM(")"));
+ sFunction += OUString(")");
if ( !sPostfix.isEmpty() )
sFunction += sPostfix;
xFunction->setFormula(sFunction);
diff --git a/reportdesign/source/filter/xml/xmlFixedContent.cxx b/reportdesign/source/filter/xml/xmlFixedContent.cxx
index 2a89840..ba3bab9 100644
--- a/reportdesign/source/filter/xml/xmlFixedContent.cxx
+++ b/reportdesign/source/filter/xml/xmlFixedContent.cxx
@@ -167,11 +167,11 @@ SvXMLImportContext* OXMLFixedContent::_CreateChildContext(
0x0020, sal_True );
break;
case XML_TOK_PAGE_NUMBER:
- m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageNumber()"));
+ m_sPageText += s_sStringConcat + OUString(" PageNumber()");
m_bFormattedField = true;
break;
case XML_TOK_PAGE_COUNT:
- m_sPageText += s_sStringConcat + OUString(RTL_CONSTASCII_USTRINGPARAM(" PageCount()"));
+ m_sPageText += s_sStringConcat + OUString(" PageCount()");
m_bFormattedField = true;
break;
default:
@@ -215,7 +215,7 @@ void OXMLFixedContent::Characters( const OUString& rChars )
m_sLabel += rChars;
if ( !rChars.isEmpty() )
{
- static const OUString s_Quote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static const OUString s_Quote("\"");
if ( !m_sPageText.isEmpty() )
{
static const OUString s_sStringConcat(" & ");
diff --git a/reportdesign/source/filter/xml/xmlFormattedField.cxx b/reportdesign/source/filter/xml/xmlFormattedField.cxx
index 7e074d0..31c262f 100644
--- a/reportdesign/source/filter/xml/xmlFormattedField.cxx
+++ b/reportdesign/source/filter/xml/xmlFormattedField.cxx
@@ -66,7 +66,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
break;
case XML_TOK_SELECT_PAGE:
{
- static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageNumber()"));
+ static const OUString s_sPageNumber("rpt:PageNumber()");
_xComponent->setDataField(s_sPageNumber);
}
break;
@@ -76,7 +76,7 @@ OXMLFormattedField::OXMLFormattedField( ORptFilter& rImport,
}
if ( _bPageCount )
{
- static const OUString s_sPageNumber(RTL_CONSTASCII_USTRINGPARAM("rpt:PageCount()"));
+ static const OUString s_sPageNumber("rpt:PageCount()");
_xComponent->setDataField(s_sPageNumber);
}
}
diff --git a/reportdesign/source/filter/xml/xmlGroup.cxx b/reportdesign/source/filter/xml/xmlGroup.cxx
index 9a52195..6fc2f92 100644
--- a/reportdesign/source/filter/xml/xmlGroup.cxx
+++ b/reportdesign/source/filter/xml/xmlGroup.cxx
@@ -94,15 +94,15 @@ OXMLGroup::OXMLGroup( ORptFilter& _rImport
if ( nLen )
{
- const static OUString s_sChanged(RTL_CONSTASCII_USTRINGPARAM("rpt:HASCHANGED(\""));
+ const static OUString s_sChanged("rpt:HASCHANGED(\"");
sal_Int32 nPos = sValue.indexOf(s_sChanged);
if ( nPos == -1 )
nPos = 5;
else
{
nPos = s_sChanged.getLength();
- static OUString s_sQuote(RTL_CONSTASCII_USTRINGPARAM("\"\""));
- static OUString s_sSingleQuote(RTL_CONSTASCII_USTRINGPARAM("\""));
+ static OUString s_sQuote("\"\"");
+ static OUString s_sSingleQuote("\"");
sal_Int32 nIndex = sValue.indexOf(s_sQuote,nPos);
while ( nIndex > -1 )
{
diff --git a/reportdesign/source/filter/xml/xmlStyleImport.cxx b/reportdesign/source/filter/xml/xmlStyleImport.cxx
index 1898e50..4b80bcf 100644
--- a/reportdesign/source/filter/xml/xmlStyleImport.cxx
+++ b/reportdesign/source/filter/xml/xmlStyleImport.cxx
@@ -167,10 +167,10 @@ OReportStylesContext::OReportStylesContext( ORptFilter& rImport,
const Reference< XAttributeList > & xAttrList,
const sal_Bool bTempAutoStyles ) :
SvXMLStylesContext( rImport, nPrfx, rLName, xAttrList ),
- m_sTableStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME ))),
- m_sColumnStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME ))),
- m_sRowStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME ))),
- m_sCellStyleFamilyName( OUString(RTL_CONSTASCII_USTRINGPARAM( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME ))),
+ m_sTableStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_TABLE_STYLES_NAME )),
+ m_sColumnStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_COLUMN_STYLES_NAME )),
+ m_sRowStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_ROW_STYLES_NAME )),
+ m_sCellStyleFamilyName( OUString( XML_STYLE_FAMILY_TABLE_CELL_STYLES_NAME )),
m_rImport(rImport),
m_nNumberFormatIndex(-1),
bAutoStyles(bTempAutoStyles)
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index b469499..ece222b 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -1875,7 +1875,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference<
xub_StrLen end = sFormula.Len();
if ( aTextSearch.SearchFrwrd(sFormula,&start,&end) && start == 0 && end == sFormula.Len()) // default function found
{
- aSearchOptions.searchString = OUString(RTL_CONSTASCII_USTRINGPARAM("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"));
+ aSearchOptions.searchString = OUString("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]");
utl::TextSearch aDataSearch(aSearchOptions);
aDataSearch.SearchFrwrd(sFormula,&start,&end );
++start;
@@ -1902,7 +1902,7 @@ void GeometryHandler::loadDefaultFunctions()
m_aCounterFunction.m_bDeepTraversing = sal_False;
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list