targeted string re-work
Change-Id: I2bc945813d433a32dd7102a539105a3247e72d2c
This commit is contained in:
@@ -1497,7 +1497,7 @@ namespace svxform
|
||||
aNewName = aBaseName;
|
||||
if( i>0 )
|
||||
{
|
||||
aNewName += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
|
||||
aNewName += ::rtl::OUString(" ");
|
||||
aNewName += ::rtl::OUString::valueOf(i).getStr();
|
||||
}
|
||||
|
||||
|
@@ -63,14 +63,14 @@ namespace svxform
|
||||
Sequence< ::rtl::OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames()
|
||||
{
|
||||
::comphelper::StringSequence aSupported( 1 );
|
||||
aSupported.getArray()[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xforms.ui.dialogs.AddCondition" ) );
|
||||
aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" );
|
||||
return aSupported;
|
||||
}
|
||||
|
||||
//--------------------------------------------------------------------
|
||||
::rtl::OUString SAL_CALL OAddConditionDialog_GetImplementationName()
|
||||
{
|
||||
return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("org.openoffice.comp.svx.OAddConditionDialog"));
|
||||
return ::rtl::OUString("org.openoffice.comp.svx.OAddConditionDialog");
|
||||
}
|
||||
|
||||
//====================================================================
|
||||
@@ -81,7 +81,7 @@ namespace svxform
|
||||
:OAddConditionDialogBase( _rxORB )
|
||||
{
|
||||
registerProperty(
|
||||
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Binding" ) ),
|
||||
::rtl::OUString( "Binding" ),
|
||||
PROPERTY_ID_BINDING,
|
||||
PropertyAttribute::TRANSIENT,
|
||||
&m_xBinding,
|
||||
@@ -89,7 +89,7 @@ namespace svxform
|
||||
);
|
||||
|
||||
registerProperty(
|
||||
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FacetName" ) ),
|
||||
::rtl::OUString( "FacetName" ),
|
||||
PROPERTY_ID_FACET_NAME,
|
||||
PropertyAttribute::TRANSIENT,
|
||||
&m_sFacetName,
|
||||
@@ -97,7 +97,7 @@ namespace svxform
|
||||
);
|
||||
|
||||
registerProperty(
|
||||
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ConditionValue" ) ),
|
||||
::rtl::OUString( "ConditionValue" ),
|
||||
PROPERTY_ID_CONDITION_VALUE,
|
||||
PropertyAttribute::TRANSIENT,
|
||||
&m_sConditionValue,
|
||||
@@ -105,7 +105,7 @@ namespace svxform
|
||||
);
|
||||
|
||||
registerProperty(
|
||||
::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "FormModel" ) ),
|
||||
::rtl::OUString( "FormModel" ),
|
||||
PROPERTY_ID_FORM_MODEL,
|
||||
PropertyAttribute::TRANSIENT,
|
||||
&m_xWorkModel,
|
||||
|
@@ -428,16 +428,16 @@ void SvxStyleBox_Impl::Select()
|
||||
|
||||
Sequence< PropertyValue > aArgs( 2 );
|
||||
aArgs[0].Value = makeAny( OUString( aSelEntry ) );
|
||||
aArgs[1].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Family"));
|
||||
aArgs[1].Name = OUString("Family");
|
||||
aArgs[1].Value = makeAny( sal_Int16( eStyleFamily ));
|
||||
if( bCreateNew )
|
||||
{
|
||||
aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Param"));
|
||||
aArgs[0].Name = OUString("Param");
|
||||
SfxToolBoxControl::Dispatch( m_xDispatchProvider, String::CreateFromAscii(".uno:StyleNewByExample"), aArgs);
|
||||
}
|
||||
else
|
||||
{
|
||||
aArgs[0].Name = OUString(RTL_CONSTASCII_USTRINGPARAM("Template"));
|
||||
aArgs[0].Name = OUString("Template");
|
||||
SfxToolBoxControl::Dispatch( m_xDispatchProvider, m_aCommand, aArgs );
|
||||
}
|
||||
}
|
||||
@@ -785,7 +785,7 @@ void SvxFontNameBox_Impl::Select()
|
||||
|
||||
Any a;
|
||||
Sequence< PropertyValue > aArgs( 1 );
|
||||
aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharFontName" ));
|
||||
aArgs[0].Name = OUString( "CharFontName" );
|
||||
aFontItem.QueryValue( a );
|
||||
aArgs[0].Value = a;
|
||||
|
||||
@@ -795,7 +795,7 @@ void SvxFontNameBox_Impl::Select()
|
||||
ReleaseFocus_Impl();
|
||||
|
||||
SfxToolBoxControl::Dispatch( m_xDispatchProvider,
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharFontName" )),
|
||||
OUString( ".uno:CharFontName" ),
|
||||
aArgs );
|
||||
}
|
||||
else
|
||||
@@ -854,7 +854,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
|
||||
Reference< XDispatchProvider > aDisp( GetFrame()->getController(), UNO_QUERY );
|
||||
SfxQueryStatus aQueryStatus( aDisp,
|
||||
SID_ATTR_AUTO_COLOR_INVALID,
|
||||
rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:AutoColorInvalid" )));
|
||||
rtl::OUString( ".uno:AutoColorInvalid" ));
|
||||
SfxItemState eState = aQueryStatus.QueryState( pDummy );
|
||||
if( (SFX_ITEM_DEFAULT > eState) || ( SID_EXTRUSION_3D_COLOR == theSlotId ) )
|
||||
{
|
||||
@@ -908,7 +908,7 @@ SvxColorWindow_Impl::SvxColorWindow_Impl( const OUString& rCommand,
|
||||
SetText( rWndTitle );
|
||||
aColorSet.Show();
|
||||
|
||||
AddStatusListener( rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:ColorTableState" )));
|
||||
AddStatusListener( rtl::OUString( ".uno:ColorTableState" ));
|
||||
}
|
||||
|
||||
SvxColorWindow_Impl::~SvxColorWindow_Impl()
|
||||
@@ -1233,10 +1233,10 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
|
||||
|
||||
Any a;
|
||||
Sequence< PropertyValue > aArgs( 2 );
|
||||
aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "OuterBorder" ));
|
||||
aArgs[0].Name = OUString( "OuterBorder" );
|
||||
aBorderOuter.QueryValue( a );
|
||||
aArgs[0].Value = a;
|
||||
aArgs[1].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "InnerBorder" ));
|
||||
aArgs[1].Name = OUString( "InnerBorder" );
|
||||
aBorderInner.QueryValue( a );
|
||||
aArgs[1].Value = a;
|
||||
|
||||
@@ -1246,7 +1246,7 @@ IMPL_LINK_NOARG(SvxFrameWindow_Impl, SelectHdl)
|
||||
aFrameSet.SetNoSelection();
|
||||
|
||||
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ),
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:SetBorderStyle" )),
|
||||
OUString( ".uno:SetBorderStyle" ),
|
||||
aArgs );
|
||||
return 0;
|
||||
}
|
||||
@@ -1331,7 +1331,7 @@ SvxLineWindow_Impl::SvxLineWindow_Impl( sal_uInt16 nId, const Reference< XFrame
|
||||
try
|
||||
{
|
||||
Reference< lang::XServiceInfo > xServices( rFrame->getController()->getModel(), UNO_QUERY_THROW );
|
||||
m_bIsWriter = xServices->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument")));
|
||||
m_bIsWriter = xServices->supportsService(::rtl::OUString("com.sun.star.text.TextDocument"));
|
||||
}
|
||||
catch(const uno::Exception& )
|
||||
{
|
||||
@@ -1405,12 +1405,12 @@ IMPL_LINK_NOARG(SvxLineWindow_Impl, SelectHdl)
|
||||
|
||||
Any a;
|
||||
Sequence< PropertyValue > aArgs( 1 );
|
||||
aArgs[0].Name = OUString( RTL_CONSTASCII_USTRINGPARAM( "LineStyle" ));
|
||||
aArgs[0].Name = OUString( "LineStyle" );
|
||||
aLineItem.QueryValue( a, m_bIsWriter ? CONVERT_TWIPS : 0 );
|
||||
aArgs[0].Value = a;
|
||||
|
||||
SfxToolBoxControl::Dispatch( Reference< XDispatchProvider >( GetFrame()->getController(), UNO_QUERY ),
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:LineStyle" )),
|
||||
OUString( ".uno:LineStyle" ),
|
||||
aArgs );
|
||||
return 0;
|
||||
}
|
||||
@@ -1535,11 +1535,11 @@ struct SvxStyleToolBoxControl::Impl
|
||||
{
|
||||
Reference< style::XStyleFamiliesSupplier > xStylesSupplier( xModel, UNO_QUERY_THROW );
|
||||
Reference< lang::XServiceInfo > xServices( xModel, UNO_QUERY_THROW );
|
||||
bSpecModeWriter = xServices->supportsService(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.text.TextDocument")));
|
||||
bSpecModeWriter = xServices->supportsService(::rtl::OUString("com.sun.star.text.TextDocument"));
|
||||
if(bSpecModeWriter)
|
||||
{
|
||||
Reference<container::XNameAccess> xParaStyles;
|
||||
xStylesSupplier->getStyleFamilies()->getByName(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ParagraphStyles"))) >>=
|
||||
xStylesSupplier->getStyleFamilies()->getByName(::rtl::OUString("ParagraphStyles")) >>=
|
||||
xParaStyles;
|
||||
static const sal_Char* aWriterStyles[] =
|
||||
{
|
||||
@@ -1556,7 +1556,7 @@ struct SvxStyleToolBoxControl::Impl
|
||||
Reference< beans::XPropertySet > xStyle;
|
||||
xParaStyles->getByName( rtl::OUString::createFromAscii( aWriterStyles[nStyle] )) >>= xStyle;
|
||||
::rtl::OUString sName;
|
||||
xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName"))) >>= sName;
|
||||
xStyle->getPropertyValue(::rtl::OUString("DisplayName")) >>= sName;
|
||||
if( !sName.isEmpty() )
|
||||
aDefaultStyles.push_back(sName);
|
||||
}
|
||||
@@ -1567,7 +1567,7 @@ struct SvxStyleToolBoxControl::Impl
|
||||
}
|
||||
else if( 0 != (
|
||||
bSpecModeCalc = xServices->supportsService(::rtl::OUString(
|
||||
RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sheet.SpreadsheetDocument")))))
|
||||
"com.sun.star.sheet.SpreadsheetDocument"))))
|
||||
{
|
||||
static const sal_Char* aCalcStyles[] =
|
||||
{
|
||||
@@ -1578,7 +1578,7 @@ struct SvxStyleToolBoxControl::Impl
|
||||
};
|
||||
Reference<container::XNameAccess> xCellStyles;
|
||||
xStylesSupplier->getStyleFamilies()->getByName(
|
||||
::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("CellStyles"))) >>=
|
||||
::rtl::OUString("CellStyles")) >>=
|
||||
xCellStyles;
|
||||
for( sal_uInt32 nStyle = 0; nStyle < sizeof( aCalcStyles ) / sizeof( sal_Char*); ++nStyle )
|
||||
{
|
||||
@@ -1589,7 +1589,7 @@ struct SvxStyleToolBoxControl::Impl
|
||||
{
|
||||
Reference< beans::XPropertySet > xStyle( xCellStyles->getByName( sStyleName), UNO_QUERY_THROW );
|
||||
::rtl::OUString sName;
|
||||
xStyle->getPropertyValue(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DisplayName"))) >>= sName;
|
||||
xStyle->getPropertyValue(::rtl::OUString("DisplayName")) >>= sName;
|
||||
if( !sName.isEmpty() )
|
||||
aDefaultStyles.push_back(sName);
|
||||
}
|
||||
@@ -2004,7 +2004,7 @@ Window* SvxStyleToolBoxControl::CreateItemWindow( Window *pParent )
|
||||
{
|
||||
SvxStyleBox_Impl* pBox = new SvxStyleBox_Impl( pParent,
|
||||
SID_STYLE_APPLY,
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:StyleApply" )),
|
||||
OUString( ".uno:StyleApply" ),
|
||||
SFX_STYLE_FAMILY_PARA,
|
||||
Reference< XDispatchProvider >( m_xFrame->getController(), UNO_QUERY ),
|
||||
m_xFrame,
|
||||
@@ -2117,7 +2117,7 @@ SfxPopupWindow* SvxFontColorToolBoxControl::CreatePopupWindow()
|
||||
{
|
||||
SvxColorWindow_Impl* pColorWin =
|
||||
new SvxColorWindow_Impl(
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Color" )),
|
||||
OUString( ".uno:Color" ),
|
||||
SID_ATTR_CHAR_COLOR,
|
||||
m_xFrame,
|
||||
SVX_RESSTR( RID_SVXITEMS_EXTRAS_CHARCOLOR ),
|
||||
@@ -2193,7 +2193,7 @@ SfxPopupWindow* SvxColorToolBoxControl::CreatePopupWindow()
|
||||
sal_uInt16 nResId = GetSlotId() == SID_BACKGROUND_COLOR ?
|
||||
RID_SVXSTR_BACKGROUND : RID_SVXSTR_COLOR;
|
||||
SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl(
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BackgroundColor" )),
|
||||
OUString( ".uno:BackgroundColor" ),
|
||||
SID_BACKGROUND_COLOR,
|
||||
m_xFrame,
|
||||
SVX_RESSTR(nResId),
|
||||
@@ -2257,13 +2257,13 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
|
||||
switch( nSlotId )
|
||||
{
|
||||
case SID_ATTR_CHAR_COLOR:
|
||||
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Color" )));
|
||||
addStatusListener( OUString( ".uno:Color" ));
|
||||
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
|
||||
mLastColor = COL_RED;
|
||||
break;
|
||||
|
||||
case SID_ATTR_CHAR_COLOR2:
|
||||
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharColorExt" )));
|
||||
addStatusListener( OUString( ".uno:CharColorExt" ));
|
||||
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
|
||||
mLastColor = COL_RED;
|
||||
break;
|
||||
@@ -2271,13 +2271,13 @@ SvxColorExtToolBoxControl::SvxColorExtToolBoxControl(
|
||||
case SID_BACKGROUND_COLOR:
|
||||
case SID_ATTR_CHAR_COLOR_BACKGROUND:
|
||||
default:
|
||||
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" )));
|
||||
addStatusListener( OUString( ".uno:CharBackgroundExt" ));
|
||||
nMode = TBX_UPDATER_MODE_CHAR_COLOR_NEW;
|
||||
mLastColor = COL_YELLOW;
|
||||
break;
|
||||
|
||||
case SID_FRAME_LINECOLOR:
|
||||
addStatusListener( OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FrameLineColor" )));
|
||||
addStatusListener( OUString( ".uno:FrameLineColor" ));
|
||||
nMode = 0;
|
||||
mLastColor = COL_BLUE;
|
||||
break;
|
||||
@@ -2394,29 +2394,29 @@ void SvxColorExtToolBoxControl::Select( sal_Bool )
|
||||
{
|
||||
case SID_ATTR_CHAR_COLOR2 :
|
||||
bNoArgs = sal_True;
|
||||
aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharColorExt" ));
|
||||
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharColorExt" ));
|
||||
aCommand = OUString( ".uno:CharColorExt" );
|
||||
aParamName = OUString( "CharColorExt" );
|
||||
break;
|
||||
|
||||
case SID_ATTR_CHAR_COLOR :
|
||||
aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:Color" ));
|
||||
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "Color" ));
|
||||
aCommand = OUString( ".uno:Color" );
|
||||
aParamName = OUString( "Color" );
|
||||
break;
|
||||
|
||||
case SID_BACKGROUND_COLOR :
|
||||
aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:BackgroundColor" ));
|
||||
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "BackgroundColor" ));
|
||||
aCommand = OUString( ".uno:BackgroundColor" );
|
||||
aParamName = OUString( "BackgroundColor" );
|
||||
break;
|
||||
|
||||
case SID_ATTR_CHAR_COLOR_BACKGROUND :
|
||||
bNoArgs = sal_True;
|
||||
aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:CharBackgroundExt" ));
|
||||
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "CharBackgroundExt" ));
|
||||
aCommand = OUString( ".uno:CharBackgroundExt" );
|
||||
aParamName = OUString( "CharBackgroundExt" );
|
||||
break;
|
||||
|
||||
case SID_FRAME_LINECOLOR :
|
||||
aCommand = OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FrameLineColor" ));
|
||||
aParamName = OUString( RTL_CONSTASCII_USTRINGPARAM( "FrameLineColor" ));
|
||||
aCommand = OUString( ".uno:FrameLineColor" );
|
||||
aParamName = OUString( "FrameLineColor" );
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -2563,7 +2563,7 @@ SfxPopupWindowType SvxFrameLineColorToolBoxControl::GetPopupWindowType() const
|
||||
SfxPopupWindow* SvxFrameLineColorToolBoxControl::CreatePopupWindow()
|
||||
{
|
||||
SvxColorWindow_Impl* pColorWin = new SvxColorWindow_Impl(
|
||||
OUString( RTL_CONSTASCII_USTRINGPARAM( ".uno:FrameLineColor" )),
|
||||
OUString( ".uno:FrameLineColor" ),
|
||||
SID_FRAME_LINECOLOR,
|
||||
m_xFrame,
|
||||
SVX_RESSTR(RID_SVXSTR_FRAME_COLOR),
|
||||
|
@@ -49,8 +49,8 @@ namespace textconversiondlgs
|
||||
//.............................................................................
|
||||
using namespace ::com::sun::star;
|
||||
|
||||
#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.linguistic2.ChineseTranslationDialog"))
|
||||
#define SERVICE_NAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.linguistic2.ChineseTranslationDialog"))
|
||||
#define SERVICE_IMPLEMENTATION_NAME ::rtl::OUString("com.sun.star.comp.linguistic2.ChineseTranslationDialog")
|
||||
#define SERVICE_NAME ::rtl::OUString("com.sun.star.linguistic2.ChineseTranslationDialog")
|
||||
|
||||
#define C2U(cChar) rtl::OUString::createFromAscii(cChar)
|
||||
|
||||
|
@@ -85,7 +85,7 @@ sal_Bool SvxDrawingLayerExport( SdrModel* pModel, const uno::Reference<io::XOutp
|
||||
|
||||
if( bDocRet )
|
||||
{
|
||||
uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.xml.sax.Writer" ) ) ) );
|
||||
uno::Reference< uno::XInterface > xWriter( xServiceFactory->createInstance( OUString( "com.sun.star.xml.sax.Writer" ) ) );
|
||||
if( !xWriter.is() )
|
||||
{
|
||||
OSL_FAIL( "com.sun.star.xml.sax.Writer service missing" );
|
||||
@@ -226,7 +226,7 @@ sal_Bool SvxDrawingLayerImport( SdrModel* pModel, const uno::Reference<io::XInpu
|
||||
aParserInput.aInputStream = xInputStream;
|
||||
|
||||
// get parser
|
||||
Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ), UNO_QUERY );
|
||||
Reference< xml::sax::XParser > xParser( xServiceFactory->createInstance( OUString("com.sun.star.xml.sax.Parser") ), UNO_QUERY );
|
||||
DBG_ASSERT( xParser.is(), "Can't create parser" );
|
||||
|
||||
// prepare filter arguments
|
||||
|
@@ -119,7 +119,7 @@ ElementConfigType ConfigHandler::parseType( const OUString& sType ) throw (SAXEx
|
||||
}
|
||||
else
|
||||
{
|
||||
OUString aMessage( RTL_CONSTASCII_USTRINGPARAM( "unknown type: " ) );
|
||||
OUString aMessage( "unknown type: " );
|
||||
aMessage += sType;
|
||||
errorThrow( aMessage );
|
||||
}
|
||||
@@ -132,7 +132,7 @@ void ConfigHandler::addElement( ElementConfigPtr& rElementConfig ) throw ( SAXEx
|
||||
ElementConfigContainer* pParent = dynamic_cast< ElementConfigContainer* >( maElementStack.top().get() );
|
||||
|
||||
if( !pParent )
|
||||
errorThrow( OUString( RTL_CONSTASCII_USTRINGPARAM( "illegal parent for element" ) ) );
|
||||
errorThrow( OUString( "illegal parent for element" ) );
|
||||
|
||||
|
||||
pParent->addElementConfig( rElementConfig );
|
||||
@@ -150,7 +150,7 @@ OUString ConfigHandler::getAttribute( const Reference< XAttributeList > & xAttri
|
||||
return xAttribs->getValueByIndex( i );
|
||||
}
|
||||
|
||||
OUString aMessage( RTL_CONSTASCII_USTRINGPARAM( "missing required attribute: ") );
|
||||
OUString aMessage( "missing required attribute: " );
|
||||
aMessage += aName;
|
||||
errorThrow( aMessage );
|
||||
|
||||
@@ -201,7 +201,7 @@ void SAL_CALL ConfigHandler::startElement(const OUString& aName, const Reference
|
||||
|
||||
if( !pElement.get() )
|
||||
{
|
||||
OUString aMessage( OUString( RTL_CONSTASCII_USTRINGPARAM("unknown config element: ")) );
|
||||
OUString aMessage( OUString( "unknown config element: ") );
|
||||
aMessage += aName;
|
||||
errorThrow( aMessage );
|
||||
}
|
||||
@@ -246,7 +246,7 @@ sal_Int32 toInt( const OUString& rText )
|
||||
ElementConfigPtr ConfigHandler::importAtomConfig( const Reference< XAttributeList > & xAttribs, bool bIsContainer ) throw (SAXException)
|
||||
{
|
||||
if( !maElementStack.empty() )
|
||||
errorThrow( OUString( RTL_CONSTASCII_USTRINGPARAM("atom elements must be root" ) ) );
|
||||
errorThrow( OUString( "atom elements must be root" ) );
|
||||
|
||||
ElementConfigPtr aPtr( new AtomConfig( getAttribute(xAttribs,"name"), bIsContainer ) );
|
||||
gAtomConfigMap[ (UINT16)toInt(getAttribute(xAttribs,"id"))] = aPtr;
|
||||
@@ -325,7 +325,7 @@ void load_config( const OUString& rPath )
|
||||
// get parser
|
||||
Reference< XParser > xParser(
|
||||
comphelper::getProcessServiceFactory()->createInstance(
|
||||
OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.xml.sax.Parser")) ),
|
||||
OUString("com.sun.star.xml.sax.Parser") ),
|
||||
UNO_QUERY_THROW );
|
||||
|
||||
// get filter
|
||||
@@ -357,7 +357,7 @@ rtl::OUString ElementConfig::format( SvStream& rStream, sal_Size& nLength ) cons
|
||||
if( maName.getLength() )
|
||||
{
|
||||
aRet += maName;
|
||||
aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " = " ) );
|
||||
aRet += OUString( " = " );
|
||||
}
|
||||
|
||||
switch( mnType )
|
||||
@@ -399,10 +399,10 @@ rtl::OUString ElementConfig::dump_hex( SvStream& rStream, sal_Size& nLength )
|
||||
if( (nRow == 16) || (nLength==0) )
|
||||
{
|
||||
while( aHex.getLength() < (16*3) )
|
||||
aHex += OUString( RTL_CONSTASCII_USTRINGPARAM(" ") );
|
||||
aHex += OUString( " " );
|
||||
aOut += aHex;
|
||||
aOut += aAscii;
|
||||
aOut += OUString( RTL_CONSTASCII_USTRINGPARAM( "\n\r" ) );
|
||||
aOut += OUString( "\n\r" );
|
||||
aHex = aEmpty;
|
||||
aAscii = aEmpty;
|
||||
nRow = 0;
|
||||
@@ -488,7 +488,7 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng
|
||||
{
|
||||
aRet += (*aIter++)->format( rStream, nLength );
|
||||
if( (aIter != aEnd) || (nLength != 0) )
|
||||
aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( "\n\r" ) );
|
||||
aRet += OUString( "\n\r" );
|
||||
}
|
||||
|
||||
if( nLength )
|
||||
@@ -498,7 +498,7 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng
|
||||
{
|
||||
aRet = getName();
|
||||
if( aRet.getLength() )
|
||||
aRet += OUString( RTL_CONSTASCII_USTRINGPARAM( " = " ) );
|
||||
aRet += OUString( " = " );
|
||||
|
||||
OUString aValue;
|
||||
switch( getType() )
|
||||
@@ -530,7 +530,7 @@ rtl::OUString ElementConfigContainer::format( SvStream& rStream, sal_Size& nLeng
|
||||
}
|
||||
else
|
||||
{
|
||||
aValue = OUString( RTL_CONSTASCII_USTRINGPARAM("<empty!?>") );
|
||||
aValue = OUString( "<empty!?>" );
|
||||
}
|
||||
|
||||
aRet += aValue;
|
||||
|
Reference in New Issue
Block a user