summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sw/source/filter/html/htmlform.cxx150
-rw-r--r--sw/source/filter/ww8/docxattributeoutput.cxx4
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx4
-rw-r--r--sw/source/ui/app/docsh.cxx12
-rw-r--r--sw/source/ui/config/mailconfigpage.cxx4
-rw-r--r--sw/source/ui/dbui/mailmergehelper.cxx6
-rw-r--r--sw/source/ui/docvw/SidebarWin.cxx4
-rw-r--r--sw/source/ui/uiview/viewling.cxx12
-rw-r--r--sw/source/ui/uno/dlelstnr.cxx6
-rw-r--r--sw/source/ui/vba/vbacheckbox.cxx10
10 files changed, 106 insertions, 106 deletions
diff --git a/sw/source/filter/html/htmlform.cxx b/sw/source/filter/html/htmlform.cxx
index 8cdb4bf44819..1b7e776a0811 100644
--- a/sw/source/filter/html/htmlform.cxx
+++ b/sw/source/filter/html/htmlform.cxx
@@ -633,25 +633,25 @@ static void lcl_html_setFixedFontProperty(
DEFAULTFONT_FLAGS_ONLYONE ) );
Any aTmp;
aTmp <<= OUString( aFixedFont.GetName() );
- rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontName")), aTmp );
+ rPropSet->setPropertyValue( OUString("FontName"), aTmp );
aTmp <<= OUString( aFixedFont.GetStyleName() );
- rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontStyleName")),
+ rPropSet->setPropertyValue( OUString("FontStyleName"),
aTmp );
aTmp <<= (sal_Int16) aFixedFont.GetFamily();
- rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontFamily")), aTmp );
+ rPropSet->setPropertyValue( OUString("FontFamily"), aTmp );
aTmp <<= (sal_Int16) aFixedFont.GetCharSet();
- rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontCharset")),
+ rPropSet->setPropertyValue( OUString("FontCharset"),
aTmp );
aTmp <<= (sal_Int16) aFixedFont.GetPitch();
- rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontPitch")), aTmp );
+ rPropSet->setPropertyValue( OUString("FontPitch"), aTmp );
float fVal(10.);
aTmp.setValue( &fVal, ::getCppuType(&fVal ));
- rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight")), aTmp );
+ rPropSet->setPropertyValue( OUString("FontHeight"), aTmp );
}
class SwHTMLFormPendingStackData_Impl: public SwPendingStackData
@@ -961,7 +961,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
uno::Reference< XInterface > xCreate =
rServiceFactory ->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.ControlShape")));
+ OUString("com.sun.star.drawing.ControlShape"));
if( !xCreate.is() )
return xShape;
@@ -1001,11 +1001,11 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
Any aAny2;
aAny2 <<= (sal_Int32)nLeftSpace;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("LeftMargin")), aAny2 );
+ OUString("LeftMargin"), aAny2 );
aAny2 <<= (sal_Int32)nRightSpace;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("RightMargin")), aAny2 );
+ OUString("RightMargin"), aAny2 );
}
// oberen/unteren Rand setzen
@@ -1032,16 +1032,16 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
uno::Any aAny2;
aAny2 <<= (sal_Int32)nUpperSpace;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("TopMargin")), aAny2 );
+ OUString("TopMargin"), aAny2 );
aAny2 <<= (sal_Int32)nLowerSpace;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("BottomMargin")), aAny2 );
+ OUString("BottomMargin"), aAny2 );
}
uno::Reference< beans::XPropertySetInfo > xPropSetInfo =
rFCompPropSet->getPropertySetInfo();
- OUString sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("BackgroundColor"));
+ OUString sPropName = OUString("BackgroundColor");
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_BACKGROUND, sal_True,
&pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1057,7 +1057,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("TextColor"));
+ sPropName = OUString("TextColor");
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_COLOR, sal_True,
&pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1067,7 +1067,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontHeight"));
+ sPropName = OUString("FontHeight");
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_FONTSIZE,
sal_True, &pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1082,31 +1082,31 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
&pItem ) )
{
const SvxFontItem *pFontItem = (SvxFontItem *)pItem;
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontName"));
+ sPropName = OUString("FontName");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp <<= OUString( pFontItem->GetFamilyName() );
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontStyleName"));
+ sPropName = OUString("FontStyleName");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp <<= OUString( pFontItem->GetStyleName() );
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontFamily"));
+ sPropName = OUString("FontFamily");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp <<= (sal_Int16)pFontItem->GetFamily() ;
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontCharset"));
+ sPropName = OUString("FontCharset");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp <<= (sal_Int16)pFontItem->GetCharSet() ;
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontPitch"));
+ sPropName = OUString("FontPitch");
if( xPropSetInfo->hasPropertyByName( sPropName ) )
{
aTmp <<= (sal_Int16)pFontItem->GetPitch() ;
@@ -1114,7 +1114,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
}
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontWeight"));
+ sPropName = OUString("FontWeight");
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_WEIGHT,
sal_True, &pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1125,7 +1125,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontSlant"));
+ sPropName = OUString("FontSlant");
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_POSTURE,
sal_True, &pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1134,7 +1134,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontUnderline"));
+ sPropName = OUString("FontUnderline");
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_UNDERLINE,
sal_True, &pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1143,7 +1143,7 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
rFCompPropSet->setPropertyValue( sPropName, aTmp );
}
- sPropName = OUString(RTL_CONSTASCII_USTRINGPARAM("FontStrikeout"));
+ sPropName = OUString("FontStrikeout");
if( SFX_ITEM_SET==rCSS1ItemSet.GetItemState( RES_CHRATR_CROSSEDOUT,
sal_True, &pItem ) &&
xPropSetInfo->hasPropertyByName( sPropName ) )
@@ -1231,18 +1231,18 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
}
aTmp <<= (sal_Int16)nVertOri ;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrient")), aTmp );
+ OUString("VertOrient"), aTmp );
}
aTmp <<= (sal_Int16)nAnchorType ;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorType")), aTmp );
+ OUString("AnchorType"), aTmp );
if( text::TextContentAnchorType_AT_PAGE == nAnchorType )
{
aTmp <<= (sal_Int16) 1 ;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("AnchorPageNo")), aTmp );
+ OUString("AnchorPageNo"), aTmp );
}
else
{
@@ -1255,30 +1255,30 @@ uno::Reference< drawing::XShape > SwHTMLParser::InsertControl(
aTmp.setValue( &xTxtRg,
::getCppuType((uno::Reference< text::XTextRange>*)0));
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("TextRange")), aTmp );
+ OUString("TextRange"), aTmp );
}
if( bSetPos )
{
aTmp <<= (sal_Int16)text::HoriOrientation::NONE;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrient")), aTmp );
+ OUString("HoriOrient"), aTmp );
aTmp <<= (sal_Int32)nXPos ;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("HoriOrientPosition")), aTmp );
+ OUString("HoriOrientPosition"), aTmp );
aTmp <<= (sal_Int16)text::VertOrientation::NONE;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrient")), aTmp );
+ OUString("VertOrient"), aTmp );
aTmp <<= (sal_Int32)nYPos ;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("VertOrientPosition")), aTmp );
+ OUString("VertOrientPosition"), aTmp );
}
if( bSetSurround )
{
aTmp <<= (sal_Int16)nSurround ;
xShapePropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("Surround")), aTmp );
+ OUString("Surround"), aTmp );
}
pFormImpl->GetShapes()->add(xShape);
@@ -1404,7 +1404,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
return;
uno::Reference< XInterface > xInt = rSrvcMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.Form")) );
+ OUString("com.sun.star.form.component.Form") );
if( !xInt.is() )
return;
@@ -1418,7 +1418,7 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
Any aTmp;
aTmp <<= OUString(sName);
- xFormPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp );
+ xFormPropSet->setPropertyValue( OUString("Name"), aTmp );
if( aAction.Len() )
{
@@ -1431,24 +1431,24 @@ void SwHTMLParser::NewForm( sal_Bool bAppend )
aAction = aURLObj.GetPartBeforeLastName();
}
aTmp <<= OUString(aAction);
- xFormPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TargetURL")),
+ xFormPropSet->setPropertyValue( OUString("TargetURL"),
aTmp );
FormSubmitMethod eMethod = (FormSubmitMethod)nMethod;
aTmp.setValue( &eMethod, ::getCppuType((const FormSubmitMethod*)0) );
- xFormPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitMethod")),
+ xFormPropSet->setPropertyValue( OUString("SubmitMethod"),
aTmp );
FormSubmitEncoding eEncType = (FormSubmitEncoding)nEncType;
aTmp.setValue( &eEncType, ::getCppuType((const FormSubmitEncoding*)0) );
xFormPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitEncoding")), aTmp );
+ OUString("SubmitEncoding"), aTmp );
if( sTarget.Len() )
{
aTmp <<= OUString(sTarget);
xFormPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("TargetFrame")), aTmp );
+ OUString("TargetFrame"), aTmp );
}
const uno::Reference< container::XIndexContainer > & rForms =
@@ -1700,7 +1700,7 @@ void SwHTMLParser::InsertInput()
return;
String sServiceName(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.")) );
+ OUString("com.sun.star.form.component.") );
sServiceName.AppendAscii( pType );
uno::Reference< XInterface > xInt =
rServiceFactory->createInstance( sServiceName );
@@ -1715,21 +1715,21 @@ void SwHTMLParser::InsertInput()
Any aTmp;
aTmp <<= OUString(sName);
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp );
+ xPropSet->setPropertyValue( OUString("Name"), aTmp );
if( HTML_IT_HIDDEN != eType )
{
if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX )
{
aTmp <<= (sal_Int16) (sal_Int16)nTabIndex ;
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")), aTmp );
+ xPropSet->setPropertyValue( OUString("TabIndex"), aTmp );
}
if( bDisabled )
{
sal_Bool bFalse = sal_False;
aTmp.setValue(&bFalse, ::getBooleanCppuType() );
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")), aTmp );
+ xPropSet->setPropertyValue( OUString("Enabled"), aTmp );
}
}
@@ -1745,11 +1745,11 @@ void SwHTMLParser::InsertInput()
case HTML_IT_RADIO:
{
if( !bValue )
- aTmp <<= OUString(RTL_CONSTASCII_USTRINGPARAM( OOO_STRING_SVTOOLS_HTML_on ));
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("RefValue")),
+ aTmp <<= OUString( OOO_STRING_SVTOOLS_HTML_on );
+ xPropSet->setPropertyValue( OUString("RefValue"),
aTmp );
aTmp <<= OUString();
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Label")),
+ xPropSet->setPropertyValue( OUString("Label"),
aTmp );
// Beim RadioButton darf die DefaultChecked-Property
// erst gesetzt werden, wenn das Control angelegt und ein
@@ -1759,7 +1759,7 @@ void SwHTMLParser::InsertInput()
{
aTmp <<= (sal_Int16) nChecked ;
xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")), aTmp );
+ OUString("DefaultState"), aTmp );
}
const SvxMacro* pMacro = aMacroTbl.Get( HTML_ET_ONCLICK );
@@ -1788,10 +1788,10 @@ void SwHTMLParser::InsertInput()
aTmp.setValue( &eButtonType,
::getCppuType((const FormButtonType*)0));
xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonType")), aTmp );
+ OUString("ButtonType"), aTmp );
aTmp <<= (sal_Int16) 0 ;
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Border")),
+ xPropSet->setPropertyValue( OUString("Border"),
aTmp );
}
break;
@@ -1820,13 +1820,13 @@ void SwHTMLParser::InsertInput()
;
}
aTmp <<= OUString(sText);
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Label")),
+ xPropSet->setPropertyValue( OUString("Label"),
aTmp );
aTmp.setValue( &eButtonType,
::getCppuType((const FormButtonType*)0));
xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ButtonType")), aTmp );
+ OUString("ButtonType"), aTmp );
bMinWidth = bMinHeight = sal_True;
bUseSize = sal_True;
@@ -1840,19 +1840,19 @@ void SwHTMLParser::InsertInput()
{
// Beim File-Control wird der VALUE aus Sicherheitsgruenden ignoriert.
xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultText")), aTmp );
+ OUString("DefaultText"), aTmp );
if( nMaxLen != 0 )
{
aTmp <<= (sal_Int16) nMaxLen ;
xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")), aTmp );
+ OUString("MaxTextLen"), aTmp );
}
}
if( HTML_IT_PASSWORD == eType )
{
aTmp <<= (sal_Int16)'*' ;
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("EchoChar")),
+ xPropSet->setPropertyValue( OUString("EchoChar"),
aTmp );
}
@@ -1865,7 +1865,7 @@ void SwHTMLParser::InsertInput()
break;
case HTML_IT_HIDDEN:
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("HiddenValue")),
+ xPropSet->setPropertyValue( OUString("HiddenValue"),
aTmp );
bHidden = sal_True;
break;
@@ -1946,7 +1946,7 @@ void SwHTMLParser::InsertInput()
if( HTML_IT_RADIO == eType )
{
aTmp <<= (sal_Int16) nChecked ;
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultState")), aTmp );
+ xPropSet->setPropertyValue( OUString("DefaultState"), aTmp );
}
if( HTML_IT_IMAGE == eType )
@@ -1955,7 +1955,7 @@ void SwHTMLParser::InsertInput()
// Download der Grafik erst dann am XModel anmelden kann,
// wenn das Control eingefuegt ist.
aTmp <<= OUString( URIHelper::SmartRel2Abs(INetURLObject(sBaseURL), sImgSrc, Link(), false));
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ImageURL")),
+ xPropSet->setPropertyValue( OUString("ImageURL"),
aTmp );
}
@@ -2103,7 +2103,7 @@ void SwHTMLParser::NewTextArea()
return;
}
uno::Reference< uno::XInterface > xInt = rSrvcMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.TextField")) );
+ OUString("com.sun.star.form.component.TextField") );
if( !xInt.is() )
{
FinishTextArea();
@@ -2117,24 +2117,24 @@ void SwHTMLParser::NewTextArea()
Any aTmp;
aTmp <<= OUString(sName);
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp );
+ xPropSet->setPropertyValue( OUString("Name"), aTmp );
sal_Bool bTrue = sal_True;
aTmp.setValue( &bTrue, ::getBooleanCppuType() );
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLine")),
+ xPropSet->setPropertyValue( OUString("MultiLine"),
aTmp );
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("VScroll")), aTmp );
+ xPropSet->setPropertyValue( OUString("VScroll"), aTmp );
if( HTML_WM_OFF == nWrap )
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("HScroll")),
+ xPropSet->setPropertyValue( OUString("HScroll"),
aTmp );
if( HTML_WM_HARD == nWrap )
xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("HardLineBreaks")), aTmp );
+ OUString("HardLineBreaks"), aTmp );
if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX )
{
aTmp <<= (sal_Int16)nTabIndex ;
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")),
+ xPropSet->setPropertyValue( OUString("TabIndex"),
aTmp );
}
@@ -2144,7 +2144,7 @@ void SwHTMLParser::NewTextArea()
{
sal_Bool bFalse = sal_False;
aTmp.setValue( &bFalse, ::getBooleanCppuType() );
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
+ xPropSet->setPropertyValue( OUString("Enabled"),
aTmp );
}
@@ -2212,7 +2212,7 @@ void SwHTMLParser::EndTextArea()
Any aTmp;
aTmp <<= OUString(pFormImpl->GetText());
- rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultText")),
+ rPropSet->setPropertyValue( OUString("DefaultText"),
aTmp );
pFormImpl->EraseText();
@@ -2381,7 +2381,7 @@ void SwHTMLParser::NewSelect()
return;
}
uno::Reference< uno::XInterface > xInt = rSrvcMgr->createInstance(
- OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.component.ListBox")) );
+ OUString("com.sun.star.form.component.ListBox") );
if( !xInt.is() )
{
FinishTextArea();
@@ -2395,12 +2395,12 @@ void SwHTMLParser::NewSelect()
Any aTmp;
aTmp <<= OUString(sName);
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Name")), aTmp );
+ xPropSet->setPropertyValue( OUString("Name"), aTmp );
if( nTabIndex >= TABINDEX_MIN && nTabIndex <= TABINDEX_MAX )
{
aTmp <<= (sal_Int16)nTabIndex ;
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")),
+ xPropSet->setPropertyValue( OUString("TabIndex"),
aTmp );
}
@@ -2408,7 +2408,7 @@ void SwHTMLParser::NewSelect()
{
sal_Bool bFalse = sal_False;
aTmp.setValue( &bFalse, ::getBooleanCppuType() );
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
+ xPropSet->setPropertyValue( OUString("Enabled"),
aTmp );
}
@@ -2418,7 +2418,7 @@ void SwHTMLParser::NewSelect()
{
sal_Bool bTrue = sal_True;
aTmp.setValue( &bTrue, ::getBooleanCppuType() );
- xPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("Dropdown")),
+ xPropSet->setPropertyValue( OUString("Dropdown"),
aTmp );
}
else
@@ -2431,7 +2431,7 @@ void SwHTMLParser::NewSelect()
sal_Bool bTrue = sal_True;
aTmp.setValue( &bTrue, ::getBooleanCppuType() );
xPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("MultiSelection")), aTmp );
+ OUString("MultiSelection"), aTmp );
}
aTextSz.Height() = nSelectEntryCnt;
bMinHeight = sal_False;
@@ -2524,15 +2524,15 @@ void SwHTMLParser::EndSelect()
Any aAny( &aList, ::getCppuType((uno::Sequence<OUString>*)0) );
rPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("StringItemList")), aAny );
+ OUString("StringItemList"), aAny );
aAny <<= ListSourceType_VALUELIST;
rPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("ListSourceType")), aAny );
+ OUString("ListSourceType"), aAny );
aAny.setValue( &aValueList, ::getCppuType((uno::Sequence<OUString>*)0) );
- rPropSet->setPropertyValue( OUString(RTL_CONSTASCII_USTRINGPARAM("ListSource")),
+ rPropSet->setPropertyValue( OUString("ListSource"),
aAny );
size_t nSelCnt = pFormImpl->GetSelectedList().size();
@@ -2553,7 +2553,7 @@ void SwHTMLParser::EndSelect()
::getCppuType((uno::Sequence<sal_Int16>*)0) );
rPropSet->setPropertyValue(
- OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultSelection")), aAny );
+ OUString("DefaultSelection"), aAny );
pFormImpl->EraseStringList();
pFormImpl->EraseValueList();
diff --git a/sw/source/filter/ww8/docxattributeoutput.cxx b/sw/source/filter/ww8/docxattributeoutput.cxx
index 6fa3ae13d133..0d94c307e061 100644
--- a/sw/source/filter/ww8/docxattributeoutput.cxx
+++ b/sw/source/filter/ww8/docxattributeoutput.cxx
@@ -767,8 +767,8 @@ void DocxAttributeOutput::CmdField_Impl( FieldInfos& rInfos )
|| rInfos.eType == ww::eDATE
|| rInfos.eType == ww::eTIME )
{
- sToken.SearchAndReplaceAll( String( RTL_CONSTASCII_USTRINGPARAM("NNNN") ), String( RTL_CONSTASCII_USTRINGPARAM("dddd") ) );
- sToken.SearchAndReplaceAll( String( RTL_CONSTASCII_USTRINGPARAM("NN") ), String( RTL_CONSTASCII_USTRINGPARAM("ddd") ) );
+ sToken.SearchAndReplaceAll( String( "NNNN" ), String( "dddd" ) );
+ sToken.SearchAndReplaceAll( String( "NN" ), String( "ddd" ) );
}
// Write the Field command
DoWriteCmd( sToken );
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 13384b788b13..988c3d0efece 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -791,7 +791,7 @@ bool AttributeOutputBase::AnalyzeURL( const String& rUrl, const String& /*rTarge
if ( bkmkName == sLink )
{
- sMark = String( RTL_CONSTASCII_USTRINGPARAM( "_toc" ) );
+ sMark = String( "_toc" );
sMark += String::CreateFromInt32( aIter->second );
}
}
@@ -1787,7 +1787,7 @@ void MSWordExportBase::OutputTextNode( const SwTxtNode& rNode )
if ( aAttrIter.RequiresImplicitBookmark() )
{
- String sBkmkName = String( RTL_CONSTASCII_USTRINGPARAM( "_toc" ) );
+ String sBkmkName = String( "_toc" );
sBkmkName += String::CreateFromInt32( rNode.GetIndex() );
AppendWordBookmark( sBkmkName );
}
diff --git a/sw/source/ui/app/docsh.cxx b/sw/source/ui/app/docsh.cxx
index c5f633d50508..b4e89352c961 100644
--- a/sw/source/ui/app/docsh.cxx
+++ b/sw/source/ui/app/docsh.cxx
@@ -275,7 +275,7 @@ sal_Bool SwDocShell::ConvertFrom( SfxMedium& rMedium )
SW_MOD()->SetEmbeddedLoadSave( sal_False );
- SetError( nErr, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nErr, ::rtl::OUString( OSL_LOG_PREFIX ) );
sal_Bool bOk = !IsError( nErr );
if ( bOk && !pDoc->IsInLoadAsynchron() )
@@ -371,7 +371,7 @@ sal_Bool SwDocShell::Save()
}
SW_MOD()->SetEmbeddedLoadSave( sal_False );
}
- SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) );
SfxViewFrame* pFrm = pWrtShell ? pWrtShell->GetView().GetViewFrame() : 0;
if( pFrm )
@@ -510,7 +510,7 @@ sal_Bool SwDocShell::SaveAs( SfxMedium& rMedium )
// Increase RSID
pDoc->setRsid( pDoc->getRsid() );
}
- SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nErr ? nErr : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) );
return !IsError( nErr );
}
@@ -597,7 +597,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
Sequence<rtl::OUString> aModNames = xLib->getElementNames();
if(aModNames.getLength())
{
- SetError(WARN_SWG_HTML_NO_MACROS, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError(WARN_SWG_HTML_NO_MACROS, ::rtl::OUString( OSL_LOG_PREFIX ) );
break;
}
}
@@ -669,7 +669,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
// TODO/MBA: testing
uno::Reference < beans::XPropertySet > xSet( rMedium.GetStorage(), uno::UNO_QUERY );
if ( xSet.is() )
- xSet->setPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MediaType")), uno::makeAny( ::rtl::OUString( SotExchange::GetFormatMimeType( nSaveClipId ) ) ) );
+ xSet->setPropertyValue( ::rtl::OUString("MediaType"), uno::makeAny( ::rtl::OUString( SotExchange::GetFormatMimeType( nSaveClipId ) ) ) );
}
catch (const uno::Exception&)
{
@@ -753,7 +753,7 @@ sal_Bool SwDocShell::ConvertTo( SfxMedium& rMedium )
}
SW_MOD()->SetEmbeddedLoadSave( sal_False );
- SetError( nErrno ? nErrno : nVBWarning, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) );
+ SetError( nErrno ? nErrno : nVBWarning, ::rtl::OUString( OSL_LOG_PREFIX ) );
if( !rMedium.IsStorage() )
rMedium.CloseOutStream();
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 648bf85b7d58..936fba1a7da5 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -374,7 +374,7 @@ void SwTestAccountSettingsDialog::Test()
new SwConnectionContext(
m_pParent->m_pConfigItem->GetInServerName(),
m_pParent->m_pConfigItem->GetInServerPort(),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Insecure")));
+ ::rtl::OUString("Insecure"));
xInMailService->connect(xConnectionContext, xAuthenticator);
}
if(m_bStop)
@@ -404,7 +404,7 @@ void SwTestAccountSettingsDialog::Test()
new SwConnectionContext(
m_pParent->m_aServerED.GetText(),
sal::static_int_cast< sal_Int16, sal_Int64 >(m_pParent->m_aPortNF.GetValue()),
- m_pParent->m_aSecureCB.IsChecked() ? OUString(RTL_CONSTASCII_USTRINGPARAM("Ssl")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Insecure")));
+ m_pParent->m_aSecureCB.IsChecked() ? OUString("Ssl") : OUString("Insecure"));
xMailService->connect(xConnectionContext, xAuthenticator);
bIsLoggedIn = xMailService->isConnected();
if( xInMailService.is() )
diff --git a/sw/source/ui/dbui/mailmergehelper.cxx b/sw/source/ui/dbui/mailmergehelper.cxx
index fe15c9ac4b53..227d79694390 100644
--- a/sw/source/ui/dbui/mailmergehelper.cxx
+++ b/sw/source/ui/dbui/mailmergehelper.cxx
@@ -141,7 +141,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
new SwConnectionContext(
rConfigItem.GetInServerName(),
rConfigItem.GetInServerPort(),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Insecure")));
+ ::rtl::OUString("Insecure"));
xInMailService->connect(xConnectionContext, xAuthenticator);
rxInMailService = xInMailService;
}
@@ -168,7 +168,7 @@ uno::Reference< mail::XSmtpService > ConnectToSmtpServer(
new SwConnectionContext(
rConfigItem.GetMailServer(),
rConfigItem.GetMailPort(),
- rConfigItem.IsSecureConnection() ? OUString(RTL_CONSTASCII_USTRINGPARAM("Ssl")) : OUString(RTL_CONSTASCII_USTRINGPARAM("Insecure")) );
+ rConfigItem.IsSecureConnection() ? OUString("Ssl") : OUString("Insecure") );
xSmtpServer->connect(xConnectionContext, xAuthenticator);
rxInMailService = uno::Reference< mail::XMailService >( xSmtpServer, uno::UNO_QUERY );
}
@@ -678,7 +678,7 @@ uno::Reference< uno::XComponentContext> getCurrentCmpCtx(
{
uno::Reference< beans::XPropertySet > xPropSet =
uno::Reference< beans::XPropertySet>(rSrvMgr, uno::UNO_QUERY);
- Any aAny = xPropSet->getPropertyValue( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultContext")));
+ Any aAny = xPropSet->getPropertyValue( ::rtl::OUString("DefaultContext"));
uno::Reference< uno::XComponentContext> rCmpCtx;
aAny >>= rCmpCtx;
return rCmpCtx;
diff --git a/sw/source/ui/docvw/SidebarWin.cxx b/sw/source/ui/docvw/SidebarWin.cxx
index e7c73d5b2c2d..fb9d0c9d85cf 100644
--- a/sw/source/ui/docvw/SidebarWin.cxx
+++ b/sw/source/ui/docvw/SidebarWin.cxx
@@ -399,7 +399,7 @@ void SwSidebarWin::CheckMetaText()
else if (sMeta.Len() > 22)
{
sMeta.Erase(20);
- sMeta = sMeta + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("..."));
+ sMeta = sMeta + rtl::OUString("...");
}
if ( mpMetadataAuthor->GetText() != sMeta )
{
@@ -426,7 +426,7 @@ void SwSidebarWin::CheckMetaText()
}
if (GetTime()!=0)
{
- sMeta = sMeta + rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ")) + rLocalData.getTime( GetTime(),false );
+ sMeta = sMeta + rtl::OUString(" ") + rLocalData.getTime( GetTime(),false );
}
if ( mpMetadataDate->GetText() != sMeta )
{
diff --git a/sw/source/ui/uiview/viewling.cxx b/sw/source/ui/uiview/viewling.cxx
index 273c6a06974f..5c94fcf272ca 100644
--- a/sw/source/ui/uiview/viewling.cxx
+++ b/sw/source/ui/uiview/viewling.cxx
@@ -130,7 +130,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
{
Reference< ui::dialogs::XExecutableDialog > xDialog(
xMCF->createInstanceWithContext(
- rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog"))
+ rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
, xContext), UNO_QUERY);
Reference< lang::XInitialization > xInit( xDialog, UNO_QUERY );
if( xInit.is() )
@@ -140,7 +140,7 @@ void SwView::ExecLingu(SfxRequest &rReq)
Sequence<Any> aSeq(1);
Any* pArray = aSeq.getArray();
PropertyValue aParam;
- aParam.Name = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParentWindow"));
+ aParam.Name = rtl::OUString("ParentWindow");
aParam.Value <<= makeAny(xDialogParentWindow);
pArray[0] <<= makeAny(aParam);
xInit->initialize( aSeq );
@@ -726,7 +726,7 @@ sal_Bool SwView::ExecSpellPopup(const Point& rPt)
Menu* pMenu = 0;
::rtl::OUString sMenuName = bUseGrammarContext ?
- OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/GrammarContextMenu")) : OUString(RTL_CONSTASCII_USTRINGPARAM("private:resource/SpellContextMenu"));
+ OUString("private:resource/GrammarContextMenu") : OUString("private:resource/SpellContextMenu");
if(TryContextMenuInterception( *pPopup, sMenuName, pMenu, aEvent ))
{
@@ -852,7 +852,7 @@ SwFieldDialog::SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ) :
{
const IFieldmark::parameter_map_t* const pParameters = fieldBM->GetParameters();
- rtl::OUString sListKey = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODF_FORMDROPDOWN_LISTENTRY ) );
+ rtl::OUString sListKey = rtl::OUString( ODF_FORMDROPDOWN_LISTENTRY );
IFieldmark::parameter_map_t::const_iterator pListEntries = pParameters->find( sListKey );
if(pListEntries != pParameters->end())
{
@@ -867,7 +867,7 @@ SwFieldDialog::SwFieldDialog( SwEditWin* parent, IFieldmark *fieldBM ) :
}
// Select the current one
- rtl::OUString sResultKey = rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ODF_FORMDROPDOWN_RESULT ) );
+ rtl::OUString sResultKey = rtl::OUString( ODF_FORMDROPDOWN_RESULT );
IFieldmark::parameter_map_t::const_iterator pResult = pParameters->find( sResultKey );
if ( pResult != pParameters->end() )
{
@@ -895,7 +895,7 @@ IMPL_LINK( SwFieldDialog, MyListBoxHandler, ListBox *, pBox )
sal_Int32 selection = pBox->GetSelectEntryPos();
if ( selection >= 0 )
{
- rtl::OUString sKey = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ODF_FORMDROPDOWN_RESULT ) );
+ rtl::OUString sKey = rtl::OUString( ODF_FORMDROPDOWN_RESULT );
(*pFieldmark->GetParameters())[ sKey ] = makeAny(selection);
pFieldmark->Invalidate();
SwView& rView = ( ( SwEditWin* )GetParent() )->GetView();
diff --git a/sw/source/ui/uno/dlelstnr.cxx b/sw/source/ui/uno/dlelstnr.cxx
index 5f5b9cf470af..e790d96847b1 100644
--- a/sw/source/ui/uno/dlelstnr.cxx
+++ b/sw/source/ui/uno/dlelstnr.cxx
@@ -61,20 +61,20 @@ SwLinguServiceEventListener::SwLinguServiceEventListener()
{
try
{
- OUString aSvcName( OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.frame.Desktop" )) );
+ OUString aSvcName( OUString( "com.sun.star.frame.Desktop" ) );
xDesktop = Reference< frame::XDesktop >(
xMgr->createInstance( aSvcName ), UNO_QUERY );
if (xDesktop.is())
xDesktop->addTerminateListener( this );
- aSvcName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.LinguServiceManager" ));
+ aSvcName = OUString( "com.sun.star.linguistic2.LinguServiceManager" );
xLngSvcMgr = Reference< XLinguServiceManager >( xMgr->createInstance( aSvcName ), UNO_QUERY );
if (xLngSvcMgr.is())
xLngSvcMgr->addLinguServiceManagerListener( (XLinguServiceEventListener *) this );
if (SvtLinguConfig().HasGrammarChecker())
{
- aSvcName = OUString(RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.linguistic2.ProofreadingIterator" ));
+ aSvcName = OUString( "com.sun.star.linguistic2.ProofreadingIterator" );
xGCIterator = Reference< XProofreadingIterator >( xMgr->createInstance( aSvcName ), UNO_QUERY );
Reference< XLinguServiceEventBroadcaster > xBC( xGCIterator, UNO_QUERY );
if (xBC.is())
diff --git a/sw/source/ui/vba/vbacheckbox.cxx b/sw/source/ui/vba/vbacheckbox.cxx
index bd4799ffdf90..e1cd381d52d2 100644
--- a/sw/source/ui/vba/vbacheckbox.cxx
+++ b/sw/source/ui/vba/vbacheckbox.cxx
@@ -43,7 +43,7 @@ SwVbaCheckBox::SwVbaCheckBox( const uno::Reference< ooo::vba::XHelperInterface >
if( !sType.equalsIgnoreAsciiCaseAscii( ECMA_FORMCHECKBOX ) )
{
throw uno::RuntimeException( rtl::OUString(
- RTL_CONSTASCII_USTRINGPARAM("It is not a CheckBox")), uno::Reference< uno::XInterface >() );
+ "It is not a CheckBox"), uno::Reference< uno::XInterface >() );
}
}
@@ -71,14 +71,14 @@ sal_Bool SAL_CALL SwVbaCheckBox::getValue() throw ( uno::RuntimeException )
void SAL_CALL SwVbaCheckBox::setValue( sal_Bool value ) throw ( uno::RuntimeException )
{
- rtl::OUString sValue = value ? rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("on")) : rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("off"));
- mxFormField->addParam( rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( ECMA_FORMCHECKBOX_CHECKED )), sValue, sal_True );
+ rtl::OUString sValue = value ? rtl::OUString("on") : rtl::OUString("off");
+ mxFormField->addParam( rtl::OUString( ECMA_FORMCHECKBOX_CHECKED ), sValue, sal_True );
}
rtl::OUString
SwVbaCheckBox::getServiceImplName()
{
- return rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SwVbaCheckBox"));
+ return rtl::OUString("SwVbaCheckBox");
}
uno::Sequence< rtl::OUString >
@@ -88,7 +88,7 @@ SwVbaCheckBox::getServiceNames()
if ( aServiceNames.getLength() == 0 )
{
aServiceNames.realloc( 1 );
- aServiceNames[ 0 ] = rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("ooo.vba.word.CheckBox" ) );
+ aServiceNames[ 0 ] = rtl::OUString( "ooo.vba.word.CheckBox" );
}
return aServiceNames;
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 23:09:17 +0000