summaryrefslogtreecommitdiff
path: root/sw/source/ui
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui')
-rw-r--r--sw/source/ui/app/docsh2.cxx2
-rw-r--r--sw/source/ui/app/docshini.cxx4
-rw-r--r--sw/source/ui/config/caption.cxx2
-rw-r--r--sw/source/ui/config/viewopt.cxx2
-rw-r--r--sw/source/ui/dbui/swdbtoolsclient.cxx2
-rw-r--r--sw/source/ui/uno/unoatxt.cxx4
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx10
-rw-r--r--sw/source/ui/vba/vbarows.cxx2
8 files changed, 13 insertions, 15 deletions
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index df07c221ab6c..6ccf91da693f 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -842,7 +842,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
bMerge = 0 != (nFlags&SFX_MERGE_STYLES);
aOpt.SetMerge( !bMerge );
- SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ));
+ SetError( LoadStylesFromFile( aFileName, aOpt, sal_False ), OUString( OSL_LOG_PREFIX ));
if ( !GetError() )
rReq.Done();
}
diff --git a/sw/source/ui/app/docshini.cxx b/sw/source/ui/app/docshini.cxx
index fba0504f1a09..9cf486cf4129 100644
--- a/sw/source/ui/app/docshini.cxx
+++ b/sw/source/ui/app/docshini.cxx
@@ -569,7 +569,7 @@ sal_Bool SwDocShell::Load( SfxMedium& rMedium )
UpdateFontList();
InitDraw();
- SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nErr, OUString( OSL_LOG_PREFIX ) );
bRet = !IsError( nErr );
if ( bRet && !pDoc->IsInLoadAsynchron() &&
@@ -620,7 +620,7 @@ sal_Bool SwDocShell::LoadFrom( SfxMedium& rMedium )
OSL_FAIL("Code removed!");
}
- SetError( nErr, OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nErr, OUString( OSL_LOG_PREFIX ) );
bRet = !IsError( nErr );
} while( false );
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index 951e791228d5..a87f40e89e4d 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -27,7 +27,7 @@ InsCaptionOpt::InsCaptionOpt(const SwCapObjType eType, const SvGlobalName* pOleI
bUseCaption(sal_False),
eObjType(eType),
nNumType(SVX_NUM_ARABIC),
- sNumberSeparator(RTL_CONSTASCII_USTRINGPARAM((". "))),
+ sNumberSeparator((". ")),
nPos(1),
nLevel(0),
sSeparator( OUString(": ") ),
diff --git a/sw/source/ui/config/viewopt.cxx b/sw/source/ui/config/viewopt.cxx
index 0356031a2a06..09bb78e3834f 100644
--- a/sw/source/ui/config/viewopt.cxx
+++ b/sw/source/ui/config/viewopt.cxx
@@ -150,7 +150,7 @@ void SwViewOption::PaintPostIts( OutputDevice *pOut, const SwRect &rRect, sal_Bo
}
SwViewOption::SwViewOption() :
- sSymbolFont( RTL_CONSTASCII_USTRINGPARAM( "symbol" ) ),
+ sSymbolFont( "symbol" ),
aRetoucheColor( COL_TRANSPARENT ),
mnViewLayoutColumns( 0 ),
nPagePrevRow( 1 ),
diff --git a/sw/source/ui/dbui/swdbtoolsclient.cxx b/sw/source/ui/dbui/swdbtoolsclient.cxx
index 14cce3b67a91..f1db23bdb482 100644
--- a/sw/source/ui/dbui/swdbtoolsclient.cxx
+++ b/sw/source/ui/dbui/swdbtoolsclient.cxx
@@ -104,7 +104,7 @@ void SwDbtoolsClient::registerClient()
OSL_ENSURE(NULL == getDbToolsClientFactoryFunction(), "SwDbtoolsClient::registerClient: inconsistence: already have a factory function!");
#ifndef DISABLE_DYNLOADING
- const OUString sModuleName(RTL_CONSTASCII_USTRINGPARAM(SVLIBRARY("dbtools")));
+ const OUString sModuleName(SVLIBRARY("dbtools"));
// load the dbtools library
getDbToolsClientModule() = osl_loadModuleRelative(
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 301e84da7232..d495848fd42a 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -1028,8 +1028,8 @@ const struct SvEventDescription aAutotextEvents[] =
SwAutoTextEventDescriptor::SwAutoTextEventDescriptor(
SwXAutoTextEntry& rAutoText ) :
SvBaseEventDescriptor(aAutotextEvents),
- sSwAutoTextEventDescriptor(RTL_CONSTASCII_USTRINGPARAM(
- "SwAutoTextEventDescriptor")),
+ sSwAutoTextEventDescriptor(
+ "SwAutoTextEventDescriptor"),
rAutoTextEntry(rAutoText)
{
}
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index d49436b31823..1d502ca092ed 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -1798,15 +1798,15 @@ Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( Runt
Sequence< OUString > aRet (3);
OUString* pArray = aRet.getArray();
- pArray[0] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.document.OfficeDocument" ) ) );
- pArray[1] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.GenericTextDocument" ) ) );
+ pArray[0] = OUString ( ( "com.sun.star.document.OfficeDocument" ) );
+ pArray[1] = OUString ( ( "com.sun.star.text.GenericTextDocument" ) );
if (bTextDoc)
- pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.TextDocument" ) ) );
+ pArray[2] = OUString ( ( "com.sun.star.text.TextDocument" ) );
else if (bWebDoc)
- pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.WebDocument" ) ) );
+ pArray[2] = OUString ( ( "com.sun.star.text.WebDocument" ) );
else if (bGlobalDoc)
- pArray[2] = OUString ( RTL_CONSTASCII_USTRINGPARAM ( ( "com.sun.star.text.GlobalDocument" ) ) );
+ pArray[2] = OUString ( ( "com.sun.star.text.GlobalDocument" ) );
return aRet;
}
diff --git a/sw/source/ui/vba/vbarows.cxx b/sw/source/ui/vba/vbarows.cxx
index 1d6140f75ab7..3dfc5d88c447 100644
--- a/sw/source/ui/vba/vbarows.cxx
+++ b/sw/source/ui/vba/vbarows.cxx
@@ -261,9 +261,7 @@ void SwVbaRows::setIndentWithAdjustNone( sal_Int32 indent ) throw (uno::RuntimeE
{
throw uno::RuntimeException(
OUString(
- RTL_CONSTASCII_USTRINGPARAM(
"Pb with width, in SwVbaRows::setIndentWithAdjustProportional (nNewWidth <= 0) || (nWidth <= 0)"
- )
),
uno::Reference< uno::XInterface >()
);
generated by cgit (git 2.34.1) at 2024-08-22 13:01:09 +0000