summaryrefslogtreecommitdiff
path: root/svx/source/form
diff options
context:
space:
mode:
Diffstat (limited to 'svx/source/form')
-rw-r--r--svx/source/form/ParseContext.cxx12
-rw-r--r--svx/source/form/dataaccessdescriptor.cxx26
-rw-r--r--svx/source/form/databaselocationinput.cxx20
-rw-r--r--svx/source/form/datanavi.cxx144
-rw-r--r--svx/source/form/dbtoolsclient.cxx20
-rw-r--r--svx/source/form/filtnav.cxx42
-rw-r--r--svx/source/form/fmPropBrw.cxx34
-rw-r--r--svx/source/form/fmcontrolbordermanager.cxx2
-rw-r--r--svx/source/form/fmcontrollayout.cxx44
-rw-r--r--svx/source/form/fmdmod.cxx14
-rw-r--r--svx/source/form/fmdocumentclassification.cxx10
-rw-r--r--svx/source/form/fmdpage.cxx4
-rw-r--r--svx/source/form/fmexch.cxx6
-rw-r--r--svx/source/form/fmexpl.cxx6
-rw-r--r--svx/source/form/fmobj.cxx14
-rw-r--r--svx/source/form/fmobjfac.cxx6
-rw-r--r--svx/source/form/fmpgeimp.cxx34
-rw-r--r--svx/source/form/fmscriptingenv.cxx28
-rw-r--r--svx/source/form/fmservs.cxx14
-rw-r--r--svx/source/form/fmshell.cxx6
-rw-r--r--svx/source/form/fmshimp.cxx112
-rw-r--r--svx/source/form/fmsrccfg.cxx18
-rw-r--r--svx/source/form/fmsrcimp.cxx62
-rw-r--r--svx/source/form/fmtextcontrolshell.cxx62
-rw-r--r--svx/source/form/fmtools.cxx6
-rw-r--r--svx/source/form/fmundo.cxx26
-rw-r--r--svx/source/form/fmview.cxx2
-rw-r--r--svx/source/form/fmvwimp.cxx42
-rw-r--r--svx/source/form/formcontrolfactory.cxx40
-rw-r--r--svx/source/form/formcontroller.cxx146
-rw-r--r--svx/source/form/formcontrolling.cxx12
-rw-r--r--svx/source/form/formdispatchinterceptor.cxx2
-rw-r--r--svx/source/form/formfeaturedispatcher.cxx2
-rw-r--r--svx/source/form/formtoolbars.cxx10
-rw-r--r--svx/source/form/legacyformcontroller.cxx24
-rw-r--r--svx/source/form/navigatortree.cxx22
-rw-r--r--svx/source/form/navigatortreemodel.cxx12
-rw-r--r--svx/source/form/sdbdatacolumn.cxx16
-rw-r--r--svx/source/form/tabwin.cxx16
-rw-r--r--svx/source/form/tbxform.cxx10
-rw-r--r--svx/source/form/xfm_addcondition.cxx22
41 files changed, 575 insertions, 575 deletions
diff --git a/svx/source/form/ParseContext.cxx b/svx/source/form/ParseContext.cxx
index db849212bdb4..49017c41acef 100644
--- a/svx/source/form/ParseContext.cxx
+++ b/svx/source/form/ParseContext.cxx
@@ -59,7 +59,7 @@ OSystemParseContext::~OSystemParseContext()
}
//-----------------------------------------------------------------------------
-::rtl::OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
+OUString OSystemParseContext::getErrorMessage(ErrorCode _eCode) const
{
String aMsg;
SolarMutexGuard aGuard;
@@ -83,7 +83,7 @@ OSystemParseContext::~OSystemParseContext()
}
//-----------------------------------------------------------------------------
-::rtl::OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const
+OString OSystemParseContext::getIntlKeywordAscii(InternationalKeyCode _eKey) const
{
size_t nIndex = 0;
switch ( _eKey )
@@ -119,14 +119,14 @@ OSystemParseContext::~OSystemParseContext()
OSL_ENSURE( nIndex < m_aLocalizedKeywords.size(), "OSystemParseContext::getIntlKeywordAscii: invalid index!" );
- rtl::OString sKeyword;
+ OString sKeyword;
if ( nIndex < m_aLocalizedKeywords.size() )
- sKeyword = rtl::OUStringToOString(m_aLocalizedKeywords[nIndex], RTL_TEXTENCODING_UTF8);
+ sKeyword = OUStringToOString(m_aLocalizedKeywords[nIndex], RTL_TEXTENCODING_UTF8);
return sKeyword;
}
// -----------------------------------------------------------------------------
-IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::rtl::OString& rToken) const
+IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const OString& rToken) const
{
static IParseContext::InternationalKeyCode Intl_TokenID[] =
{
@@ -142,7 +142,7 @@ IParseContext::InternationalKeyCode OSystemParseContext::getIntlKeyCode(const ::
sal_uInt32 nCount = sizeof Intl_TokenID / sizeof Intl_TokenID[0];
for (sal_uInt32 i = 0; i < nCount; i++)
{
- ::rtl::OString aKey = getIntlKeywordAscii(Intl_TokenID[i]);
+ OString aKey = getIntlKeywordAscii(Intl_TokenID[i]);
if (rToken.equalsIgnoreAsciiCase(aKey))
return Intl_TokenID[i];
}
diff --git a/svx/source/form/dataaccessdescriptor.cxx b/svx/source/form/dataaccessdescriptor.cxx
index cc0148df4122..d9cd76a98d0b 100644
--- a/svx/source/form/dataaccessdescriptor.cxx
+++ b/svx/source/form/dataaccessdescriptor.cxx
@@ -55,7 +55,7 @@ namespace svx
Sequence< PropertyValue > m_aAsSequence;
Reference< XPropertySet > m_xAsSet;
- typedef ::std::map< ::rtl::OUString, PropertyMapEntry* > MapString2PropertyEntry;
+ typedef ::std::map< OUString, PropertyMapEntry* > MapString2PropertyEntry;
public:
ODADescriptorImpl();
@@ -193,16 +193,16 @@ namespace svx
{ CONST_CHAR("ActiveConnection"), daConnection, &::getCppuType( static_cast< Reference< XConnection >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
{ CONST_CHAR("BookmarkSelection"), daBookmarkSelection, &::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 },
{ CONST_CHAR("Column"), daColumnObject, &::getCppuType( static_cast< Reference< XPropertySet >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
- { CONST_CHAR("ColumnName"), daColumnName, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
- { CONST_CHAR("Command"), daCommand, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { CONST_CHAR("ColumnName"), daColumnName, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { CONST_CHAR("Command"), daCommand, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
{ CONST_CHAR("CommandType"), daCommandType, &::getCppuType( static_cast< sal_Int32* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
{ CONST_CHAR("Component"), daComponent, &::getCppuType( static_cast< Reference< XContent >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
- { CONST_CHAR("ConnectionResource"), daConnectionResource, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { CONST_CHAR("ConnectionResource"), daConnectionResource, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
{ CONST_CHAR("Cursor"), daCursor, &::getCppuType( static_cast< Reference< XResultSet>* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
- { CONST_CHAR("DataSourceName"), daDataSource, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
- { CONST_CHAR("DatabaseLocation"), daDatabaseLocation, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { CONST_CHAR("DataSourceName"), daDataSource, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { CONST_CHAR("DatabaseLocation"), daDatabaseLocation, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
{ CONST_CHAR("EscapeProcessing"), daEscapeProcessing, &::getBooleanCppuType( ), PropertyAttribute::TRANSIENT, 0 },
- { CONST_CHAR("Filter"), daFilter, &::getCppuType( static_cast< ::rtl::OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
+ { CONST_CHAR("Filter"), daFilter, &::getCppuType( static_cast< OUString* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
{ CONST_CHAR("Selection"), daSelection, &::getCppuType( static_cast< Sequence< Any >* >(NULL) ), PropertyAttribute::TRANSIENT, 0 },
{ NULL, 0, 0, NULL, 0, 0 }
};
@@ -210,7 +210,7 @@ namespace svx
PropertyMapEntry* pEntry = s_aDesriptorProperties;
while ( pEntry->mpName )
{
- s_aProperties[ ::rtl::OUString::createFromAscii( pEntry->mpName ) ] = pEntry;
+ s_aProperties[ OUString::createFromAscii( pEntry->mpName ) ] = pEntry;
++pEntry;
}
}
@@ -244,7 +244,7 @@ namespace svx
// build the property value
PropertyValue aReturn;
- aReturn.Name = ::rtl::OUString( pProperty->mpName, pProperty->mnNameLen, RTL_TEXTENCODING_ASCII_US );
+ aReturn.Name = OUString( pProperty->mpName, pProperty->mnNameLen, RTL_TEXTENCODING_ASCII_US );
aReturn.Handle = pProperty->mnHandle;
aReturn.Value = _rPos->second;
aReturn.State = PropertyState_DIRECT_VALUE;
@@ -387,9 +387,9 @@ namespace svx
}
//--------------------------------------------------------------------
- ::rtl::OUString ODataAccessDescriptor::getDataSource() const
+ OUString ODataAccessDescriptor::getDataSource() const
{
- ::rtl::OUString sDataSourceName;
+ OUString sDataSourceName;
if ( has(daDataSource) )
(*this)[daDataSource] >>= sDataSourceName;
else if ( has(daDatabaseLocation) )
@@ -397,7 +397,7 @@ namespace svx
return sDataSourceName;
}
//--------------------------------------------------------------------
- void ODataAccessDescriptor::setDataSource(const ::rtl::OUString& _sDataSourceNameOrLocation)
+ void ODataAccessDescriptor::setDataSource(const OUString& _sDataSourceNameOrLocation)
{
if ( !_sDataSourceNameOrLocation.isEmpty() )
{
@@ -405,7 +405,7 @@ namespace svx
(*this)[ (( aURL.GetProtocol() == INET_PROT_FILE ) ? daDatabaseLocation : daDataSource)] <<= _sDataSourceNameOrLocation;
}
else
- (*this)[ daDataSource ] <<= ::rtl::OUString();
+ (*this)[ daDataSource ] <<= OUString();
}
//........................................................................
diff --git a/svx/source/form/databaselocationinput.cxx b/svx/source/form/databaselocationinput.cxx
index 36b1a7abdc05..1fb0127e80a0 100644
--- a/svx/source/form/databaselocationinput.cxx
+++ b/svx/source/form/databaselocationinput.cxx
@@ -79,8 +79,8 @@ namespace svx
const ::comphelper::ComponentContext m_aContext;
::svt::OFileURLControl& m_rLocationInput;
PushButton& m_rBrowseButton;
- Sequence< ::rtl::OUString > m_aFilterExtensions;
- ::rtl::OUString m_sFilterUIName;
+ Sequence< OUString > m_aFilterExtensions;
+ OUString m_sFilterUIName;
bool m_bNeedExistenceCheck;
};
@@ -97,8 +97,8 @@ namespace svx
impl_initFilterProperties_nothrow();
// forward the allowed extensions to the input control
- ::rtl::OUStringBuffer aExtensionList;
- for ( const ::rtl::OUString* pExtension = m_aFilterExtensions.getConstArray();
+ OUStringBuffer aExtensionList;
+ for ( const OUString* pExtension = m_aFilterExtensions.getConstArray();
pExtension != m_aFilterExtensions.getConstArray() + m_aFilterExtensions.getLength();
++pExtension
)
@@ -122,7 +122,7 @@ namespace svx
//--------------------------------------------------------------------
bool DatabaseLocationInputController_Impl::prepareCommit()
{
- ::rtl::OUString sURL( impl_getCurrentURL() );
+ OUString sURL( impl_getCurrentURL() );
if ( sURL.isEmpty() )
return false;
@@ -162,9 +162,9 @@ namespace svx
::utl::OConfigurationTreeRoot aConfig(
::utl::OConfigurationTreeRoot::createWithComponentContext(
m_aContext.getUNOContext(),
- ::rtl::OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" )
+ OUString( "/org.openoffice.Setup/Office/Factories/com.sun.star.sdb.OfficeDatabaseDocument" )
) );
- ::rtl::OUString sDatabaseFilter;
+ OUString sDatabaseFilter;
OSL_VERIFY( aConfig.getNodeValue( "ooSetupFactoryActualFilter" ) >>= sDatabaseFilter );
// get the type this filter is responsible for
@@ -172,7 +172,7 @@ namespace svx
m_aContext.createComponent( "com.sun.star.document.FilterFactory" ),
UNO_QUERY_THROW );
::comphelper::NamedValueCollection aFilterProperties( xFilterFactory->getByName( sDatabaseFilter ) );
- ::rtl::OUString sDocumentType = aFilterProperties.getOrDefault( "Type", ::rtl::OUString() );
+ OUString sDocumentType = aFilterProperties.getOrDefault( "Type", OUString() );
// get the extension(s) for this type
Reference< XNameAccess > xTypeDetection(
@@ -194,7 +194,7 @@ namespace svx
if ( m_aFilterExtensions.getLength() == 0 )
{
m_aFilterExtensions.realloc(1);
- m_aFilterExtensions[0] = ::rtl::OUString( "*.odb" );
+ m_aFilterExtensions[0] = OUString( "*.odb" );
}
}
@@ -240,7 +240,7 @@ namespace svx
);
aFileDlg.SetDisplayDirectory( impl_getCurrentURL() );
- aFileDlg.AddFilter( m_sFilterUIName, ::rtl::OUStringBuffer().appendAscii( "*." ).append( m_aFilterExtensions[0] ).makeStringAndClear() );
+ aFileDlg.AddFilter( m_sFilterUIName, OUStringBuffer().appendAscii( "*." ).append( m_aFilterExtensions[0] ).makeStringAndClear() );
aFileDlg.SetCurrentFilter( m_sFilterUIName );
if ( aFileDlg.Execute() == ERRCODE_NONE )
diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx
index c48dbbf42615..82e46e711212 100644
--- a/svx/source/form/datanavi.cxx
+++ b/svx/source/form/datanavi.cxx
@@ -383,7 +383,7 @@ namespace svxform
aExpImg = aCollImg = _rImgLst.GetImage( IID_OTHER );
}
- ::rtl::OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails );
+ OUString sName = m_xUIHelper->getNodeDisplayName( xChild, bShowDetails );
if ( !sName.isEmpty() )
{
ItemNode* pNode = new ItemNode( xChild );
@@ -400,7 +400,7 @@ namespace svxform
{
Reference< css::xml::dom::XNode > xAttr = xMap->item(j);
pNode = new ItemNode( xAttr );
- ::rtl::OUString sAttrName =
+ OUString sAttrName =
m_xUIHelper->getNodeDisplayName( xAttr, bShowDetails );
m_aItemList.InsertEntry(
sAttrName, aExpImg, aCollImg,
@@ -686,7 +686,7 @@ namespace svxform
try
{
String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
- ::rtl::OUString sTemp;
+ OUString sTemp;
pNode->m_xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp;
sNewName += String( sTemp );
sNewName += sDelim;
@@ -755,7 +755,7 @@ namespace svxform
const ImageList& rImageList = m_pNaviWin->GetItemImageList();
sal_uInt16 nImageID = ( _bIsElement ) ? IID_ELEMENT : IID_ATTRIBUTE;
Image aImage = rImageList.GetImage( nImageID );
- ::rtl::OUString sName;
+ OUString sName;
try
{
sName = m_xUIHelper->getNodeDisplayName(
@@ -814,13 +814,13 @@ namespace svxform
class lcl_ReplaceString : public lcl_ResourceString
{
- rtl::OUString m_sDoc_UI;
- rtl::OUString m_sInstance_UI;
- rtl::OUString m_sNone_UI;
+ OUString m_sDoc_UI;
+ OUString m_sInstance_UI;
+ OUString m_sNone_UI;
- rtl::OUString m_sDoc_API;
- rtl::OUString m_sInstance_API;
- rtl::OUString m_sNone_API;
+ OUString m_sDoc_API;
+ OUString m_sInstance_API;
+ OUString m_sNone_API;
lcl_ReplaceString() :
lcl_ResourceString(),
@@ -862,7 +862,7 @@ namespace svxform
/** convert submission replace string from API value to UI value.
Use 'none' as default. */
- rtl::OUString toUI( const rtl::OUString& rStr ) const
+ OUString toUI( const OUString& rStr ) const
{
if( rStr == m_sDoc_API )
return m_sDoc_UI;
@@ -874,7 +874,7 @@ namespace svxform
/** convert submission replace string from UI to API.
Use 'none' as default. */
- rtl::OUString toAPI( const rtl::OUString& rStr ) const
+ OUString toAPI( const OUString& rStr ) const
{
if( rStr == m_sDoc_UI )
return m_sDoc_API;
@@ -887,13 +887,13 @@ namespace svxform
class lcl_MethodString : public lcl_ResourceString
{
- rtl::OUString m_sPost_UI;
- rtl::OUString m_sPut_UI;
- rtl::OUString m_sGet_UI;
+ OUString m_sPost_UI;
+ OUString m_sPut_UI;
+ OUString m_sGet_UI;
- rtl::OUString m_sPost_API;
- rtl::OUString m_sPut_API;
- rtl::OUString m_sGet_API;
+ OUString m_sPost_API;
+ OUString m_sPut_API;
+ OUString m_sGet_API;
lcl_MethodString() :
lcl_ResourceString(),
@@ -932,7 +932,7 @@ namespace svxform
}
/** convert from API to UI; put is default. */
- rtl::OUString toUI( const rtl::OUString& rStr ) const
+ OUString toUI( const OUString& rStr ) const
{
if( rStr == m_sGet_API )
return m_sGet_UI;
@@ -943,7 +943,7 @@ namespace svxform
}
/** convert from UI to API; put is default */
- rtl::OUString toAPI( const rtl::OUString& rStr ) const
+ OUString toAPI( const OUString& rStr ) const
{
if( rStr == m_sGet_UI )
return m_sGet_API;
@@ -962,7 +962,7 @@ namespace svxform
Image aImage = rImageList.GetImage( IID_ELEMENT );
ItemNode* pNode = new ItemNode( _rEntry );
- rtl::OUString sTemp;
+ OUString sTemp;
if ( DGTSubmission == m_eGroup )
{
@@ -1007,7 +1007,7 @@ namespace svxform
try
{
String sDelim( RTL_CONSTASCII_USTRINGPARAM( ": " ) );
- ::rtl::OUString sName;
+ OUString sName;
_rEntry->getPropertyValue( PN_BINDING_ID ) >>= sTemp;
sName += String( sTemp );
sName += sDelim;
@@ -1029,7 +1029,7 @@ namespace svxform
void XFormsPage::EditEntry( const Reference< XPropertySet >& _rEntry )
{
SvTreeListEntry* pEntry = NULL;
- rtl::OUString sTemp;
+ OUString sTemp;
if ( DGTSubmission == m_eGroup )
{
@@ -1319,7 +1319,7 @@ namespace svxform
if ( aAny >>= xPropSet )
{
String sEntry;
- rtl::OUString sTemp;
+ OUString sTemp;
xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp;
sEntry += String( sTemp );
sEntry += sDelim;
@@ -1360,10 +1360,10 @@ namespace svxform
const Sequence< PropertyValue >& _xPropSeq, const ImageList& _rImgLst )
{
String sRet;
- rtl::OUString sTemp;
- rtl::OUString sInstModel = PN_INSTANCE_MODEL;
- rtl::OUString sInstName = PN_INSTANCE_ID;
- rtl::OUString sInstURL = PN_INSTANCE_URL;
+ OUString sTemp;
+ OUString sInstModel = PN_INSTANCE_MODEL;
+ OUString sInstName = PN_INSTANCE_ID;
+ OUString sInstURL = PN_INSTANCE_URL;
const PropertyValue* pProps = _xPropSeq.getConstArray();
const PropertyValue* pPropsEnd = pProps + _xPropSeq.getLength();
for ( ; pProps != pPropsEnd; ++pProps )
@@ -1382,7 +1382,7 @@ namespace svxform
#if OSL_DEBUG_LEVEL > 0
css::xml::dom::NodeType eNodeType = xRoot->getNodeType(); (void)eNodeType;
#endif
- ::rtl::OUString sNodeName =
+ OUString sNodeName =
m_xUIHelper->getNodeDisplayName( xRoot, m_pNaviWin->IsShowDetails() );
if ( sNodeName.isEmpty() )
sNodeName = xRoot->getNodeName();
@@ -1631,7 +1631,7 @@ namespace svxform
bool bIsDocModified = false;
Reference< css::xforms::XFormsUIHelper1 > xUIHelper;
sal_uInt16 nSelectedPos = m_aModelsBox.GetSelectEntryPos();
- ::rtl::OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) );
+ OUString sSelectedModel( m_aModelsBox.GetEntry( nSelectedPos ) );
Reference< css::xforms::XModel > xModel;
try
{
@@ -1683,7 +1683,7 @@ namespace svxform
Reference< XPropertySet > xModelProps( xNewModel, UNO_QUERY_THROW );
xModelProps->setPropertyValue(
- ::rtl::OUString( "ExternalData" ),
+ OUString( "ExternalData" ),
makeAny( sal_Bool( !bDocumentData ) ) );
sal_uInt16 nNewPos = m_aModelsBox.InsertEntry( sNewName );
@@ -1713,7 +1713,7 @@ namespace svxform
Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW );
sal_Bool bExternalData = sal_False;
OSL_VERIFY( xModelProps->getPropertyValue(
- ::rtl::OUString( "ExternalData" ) ) >>= bExternalData );
+ OUString( "ExternalData" ) ) >>= bExternalData );
bDocumentData = ( bExternalData == sal_False );
}
catch( const Exception& )
@@ -1733,7 +1733,7 @@ namespace svxform
Reference< XNameContainer > xXForms( xFormsSupp->getXForms(), UNO_SET_THROW );
Reference< XPropertySet > xModelProps( xXForms->getByName( sSelectedModel ), UNO_QUERY_THROW );
xModelProps->setPropertyValue(
- ::rtl::OUString( "ExternalData" ),
+ OUString( "ExternalData" ),
makeAny( sal_Bool( !bDocumentData ) ) );
bIsDocModified = true;
}
@@ -1804,8 +1804,8 @@ namespace svxform
if ( aDlg.Execute() == RET_OK )
{
sal_uInt16 nInst = GetNewPageId();
- ::rtl::OUString sName = aDlg.GetName();
- ::rtl::OUString sURL = aDlg.GetURL();
+ OUString sName = aDlg.GetName();
+ OUString sURL = aDlg.GetURL();
bool bLinkOnce = aDlg.IsLinkInstance();
try
{
@@ -1841,7 +1841,7 @@ namespace svxform
if ( aDlg.Execute() == RET_OK )
{
String sNewName = aDlg.GetName();
- ::rtl::OUString sURL = aDlg.GetURL();
+ OUString sURL = aDlg.GetURL();
bool bLinkOnce = aDlg.IsLinkInstance();
try
{
@@ -2061,9 +2061,9 @@ namespace svxform
if ( xContainer.is() )
{
m_xDataContainer = xContainer;
- Sequence< ::rtl::OUString > aNameList = m_xDataContainer->getElementNames();
+ Sequence< OUString > aNameList = m_xDataContainer->getElementNames();
sal_Int32 i, nCount = aNameList.getLength();
- ::rtl::OUString* pNames = aNameList.getArray();
+ OUString* pNames = aNameList.getArray();
for ( i = 0; i < nCount; ++i )
{
Any aAny = m_xDataContainer->getByName( pNames[i] );
@@ -2089,7 +2089,7 @@ namespace svxform
// -----------------------------------------------------------------------
void DataNavigatorWindow::SetPageModel()
{
- rtl::OUString sModel( m_aModelsBox.GetSelectEntry() );
+ OUString sModel( m_aModelsBox.GetSelectEntry() );
try
{
Any aAny = m_xDataContainer->getByName( sModel );
@@ -2122,7 +2122,7 @@ namespace svxform
// -----------------------------------------------------------------------
void DataNavigatorWindow::InitPages()
{
- rtl::OUString sModel( m_aModelsBox.GetSelectEntry() );
+ OUString sModel( m_aModelsBox.GetSelectEntry() );
try
{
Any aAny = m_xDataContainer->getByName( sModel );
@@ -2197,8 +2197,8 @@ namespace svxform
// -----------------------------------------------------------------------
void DataNavigatorWindow::CreateInstancePage( const Sequence< PropertyValue >& _xPropSeq )
{
- rtl::OUString sInstName;
- rtl::OUString sID( PN_INSTANCE_ID );
+ OUString sInstName;
+ OUString sID( PN_INSTANCE_ID );
const PropertyValue* pProps = _xPropSeq.getConstArray();
const PropertyValue* pPropsEnd = pProps + _xPropSeq.getLength();
for ( ; pProps != pPropsEnd; ++pProps )
@@ -2214,7 +2214,7 @@ namespace svxform
if ( sInstName.isEmpty() )
{
SAL_WARN( "svx.form", "DataNavigatorWindow::CreateInstancePage(): instance without name" );
- String sTemp = rtl::OUString("untitled");
+ String sTemp = OUString("untitled");
sTemp += OUString::number( nPageId );
sInstName = sTemp;
}
@@ -2555,7 +2555,7 @@ namespace svxform
if ( pBox && m_xTempBinding.is() )
{
- ::rtl::OUString sTemp, sPropName;
+ OUString sTemp, sPropName;
if ( &m_aRequiredCB == pBox )
sPropName = PN_REQUIRED_EXPR;
else if ( &m_aRelevantCB == pBox )
@@ -2571,7 +2571,7 @@ namespace svxform
if ( bIsChecked && sTemp.isEmpty() )
sTemp = TRUE_VALUE;
else if ( !bIsChecked && !sTemp.isEmpty() )
- sTemp = ::rtl::OUString();
+ sTemp = OUString();
m_xTempBinding->setPropertyValue( sPropName, makeAny( sTemp ) );
}
@@ -2581,7 +2581,7 @@ namespace svxform
//------------------------------------------------------------------------
IMPL_LINK( AddDataItemDialog, ConditionHdl, PushButton *, pBtn )
{
- ::rtl::OUString sTemp, sPropName;
+ OUString sTemp, sPropName;
if ( &m_aDefaultBtn == pBtn )
sPropName = PN_BINDING_EXPR;
else if ( &m_aRequiredBtn == pBtn )
@@ -2617,7 +2617,7 @@ namespace svxform
{
m_xTempBinding->setPropertyValue(
- sPropName, makeAny( ::rtl::OUString( sNewCondition ) ) );
+ sPropName, makeAny( OUString( sNewCondition ) ) );
}
}
return 0;
@@ -2637,7 +2637,7 @@ namespace svxform
Reference< XPropertySetInfo > xFromInfo = xFrom->getPropertySetInfo();
for ( sal_Int32 i = 0; i < nProperties; ++i )
{
- const ::rtl::OUString& rName = pProperties[i].Name;
+ const OUString& rName = pProperties[i].Name;
// if both set have the property, copy the value
// (catch and ignore exceptions, if any)
@@ -2662,7 +2662,7 @@ namespace svxform
{
bool bIsHandleBinding = ( DITBinding == m_eItemType );
bool bIsHandleText = ( DITText == m_eItemType );
- ::rtl::OUString sNewName( m_aNameED.GetText() );
+ OUString sNewName( m_aNameED.GetText() );
if ( ( !bIsHandleBinding && !bIsHandleText && !m_xUIHelper->isValidXMLName( sNewName ) ) ||
( bIsHandleBinding && sNewName.isEmpty() ) )
@@ -2676,7 +2676,7 @@ namespace svxform
return 0;
}
- ::rtl::OUString sDataType( m_aDataTypeLB.GetSelectEntry() );
+ OUString sDataType( m_aDataTypeLB.GetSelectEntry() );
m_xTempBinding->setPropertyValue( PN_BINDING_TYPE, makeAny( sDataType ) );
if ( bIsHandleBinding )
@@ -2685,7 +2685,7 @@ namespace svxform
copyPropSet( m_xTempBinding, m_pItemNode->m_xPropSet );
try
{
- ::rtl::OUString sValue = m_aNameED.GetText();
+ OUString sValue = m_aNameED.GetText();
m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_ID, makeAny( sValue ) );
sValue = m_aDefaultED.GetText();
m_pItemNode->m_xPropSet->setPropertyValue( PN_BINDING_EXPR, makeAny( sValue ) );
@@ -2792,7 +2792,7 @@ namespace svxform
if ( m_eItemType != DITText )
{
- ::rtl::OUString sName( m_xUIHelper->getNodeName( m_pItemNode->m_xNode ) );
+ OUString sName( m_xUIHelper->getNodeName( m_pItemNode->m_xNode ) );
m_aNameED.SetText( sName );
}
m_aDefaultED.SetText( m_pItemNode->m_xNode->getNodeValue() );
@@ -2820,7 +2820,7 @@ namespace svxform
SAL_WARN( "svx.form", "AddDataItemDialog::InitFromNode(): exception caught" );
}
}
- rtl::OUString sTemp;
+ OUString sTemp;
try
{
Reference< XPropertySetInfo > xInfo = m_pItemNode->m_xPropSet->getPropertySetInfo();
@@ -2853,7 +2853,7 @@ namespace svxform
if ( m_xTempBinding.is() )
{
- ::rtl::OUString sTemp;
+ OUString sTemp;
try
{
if ( ( m_xTempBinding->getPropertyValue( PN_REQUIRED_EXPR ) >>= sTemp )
@@ -2928,16 +2928,16 @@ namespace svxform
xModel->getDataTypeRepository();
if ( xDataTypes.is() )
{
- Sequence< ::rtl::OUString > aNameList = xDataTypes->getElementNames();
+ Sequence< OUString > aNameList = xDataTypes->getElementNames();
sal_Int32 i, nCount = aNameList.getLength();
- ::rtl::OUString* pNames = aNameList.getArray();
+ OUString* pNames = aNameList.getArray();
for ( i = 0; i < nCount; ++i )
m_aDataTypeLB.InsertEntry( pNames[i] );
}
if ( m_xTempBinding.is() )
{
- rtl::OUString sTemp;
+ OUString sTemp;
if ( m_xTempBinding->getPropertyValue( PN_BINDING_TYPE ) >>= sTemp )
{
sal_uInt16 nPos = m_aDataTypeLB.GetEntryPos( String( sTemp ) );
@@ -2988,7 +2988,7 @@ namespace svxform
//========================================================================
AddConditionDialog::AddConditionDialog(
- Window* pParent, const ::rtl::OUString& _rPropertyName,
+ Window* pParent, const OUString& _rPropertyName,
const Reference< XPropertySet >& _rPropSet ) :
ModalDialog( pParent, SVX_RES( RID_SVXDLG_ADD_CONDITION ) ),
@@ -3022,7 +3022,7 @@ namespace svxform
{
try
{
- rtl::OUString sTemp;
+ OUString sTemp;
if ( ( m_xBinding->getPropertyValue( m_sPropertyName ) >>= sTemp )
&& !sTemp.isEmpty() )
{
@@ -3085,7 +3085,7 @@ namespace svxform
try
{
if ( m_xBinding.is() )
- m_xBinding->setPropertyValue( m_sPropertyName, makeAny( ::rtl::OUString( m_aConditionED.GetText() ) ) );
+ m_xBinding->setPropertyValue( m_sPropertyName, makeAny( OUString( m_aConditionED.GetText() ) ) );
}
catch( const Exception& )
{
@@ -3220,7 +3220,7 @@ namespace svxform
{
SvTreeListEntry* pEntry = m_aNamespacesList.FirstSelected();
DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" );
- ::rtl::OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) );
+ OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) );
m_aRemovedList.push_back( sPrefix );
m_aNamespacesList.GetModel()->Remove( pEntry );
}
@@ -3247,8 +3247,8 @@ namespace svxform
for( i = 0; i < nEntryCount; ++i )
{
SvTreeListEntry* pEntry = m_aNamespacesList.GetEntry(i);
- ::rtl::OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) );
- ::rtl::OUString sURL( m_aNamespacesList.GetEntryText( pEntry, 1 ) );
+ OUString sPrefix( m_aNamespacesList.GetEntryText( pEntry, 0 ) );
+ OUString sURL( m_aNamespacesList.GetEntryText( pEntry, 1 ) );
if ( m_rNamespaces->hasByName( sPrefix ) )
m_rNamespaces->replaceByName( sPrefix, makeAny( sURL ) );
@@ -3270,13 +3270,13 @@ namespace svxform
{
try
{
- Sequence< ::rtl::OUString > aAllNames = m_rNamespaces->getElementNames();
- const ::rtl::OUString* pAllNames = aAllNames.getConstArray();
- const ::rtl::OUString* pAllNamesEnd = pAllNames + aAllNames.getLength();
+ Sequence< OUString > aAllNames = m_rNamespaces->getElementNames();
+ const OUString* pAllNames = aAllNames.getConstArray();
+ const OUString* pAllNamesEnd = pAllNames + aAllNames.getLength();
for ( ; pAllNames != pAllNamesEnd; ++pAllNames )
{
- ::rtl::OUString sURL;
- ::rtl::OUString sPrefix = *pAllNames;
+ OUString sURL;
+ OUString sPrefix = *pAllNames;
if ( m_rNamespaces->hasByName( sPrefix ) )
{
Any aAny = m_rNamespaces->getByName( sPrefix );
@@ -3422,7 +3422,7 @@ namespace svxform
//------------------------------------------------------------------------
IMPL_LINK_NOARG(AddSubmissionDialog, OKHdl)
{
- rtl::OUString sName(m_aNameED.GetText());
+ OUString sName(m_aNameED.GetText());
if(sName.isEmpty()) {
ErrorBox aErrorBox(this,SVX_RES(RID_ERR_EMPTY_SUBMISSIONNAME));
@@ -3454,7 +3454,7 @@ namespace svxform
if ( m_xSubmission.is() )
{
- rtl::OUString sTemp = m_aNameED.GetText();
+ OUString sTemp = m_aNameED.GetText();
try
{
m_xSubmission->setPropertyValue( PN_SUBMISSION_ID, makeAny( sTemp ) );
@@ -3510,7 +3510,7 @@ namespace svxform
if ( aAny >>= xPropSet )
{
String sEntry;
- rtl::OUString sTemp;
+ OUString sTemp;
xPropSet->getPropertyValue( PN_BINDING_ID ) >>= sTemp;
sEntry += String( sTemp );
sEntry += sDelim;
@@ -3553,7 +3553,7 @@ namespace svxform
if ( m_pItemNode && m_pItemNode->m_xPropSet.is() )
{
m_xSubmission = m_pItemNode->m_xPropSet;
- rtl::OUString sTemp;
+ OUString sTemp;
try
{
m_xSubmission->getPropertyValue( PN_SUBMISSION_ID ) >>= sTemp;
diff --git a/svx/source/form/dbtoolsclient.cxx b/svx/source/form/dbtoolsclient.cxx
index aab897135bb1..e28da50ab4b3 100644
--- a/svx/source/form/dbtoolsclient.cxx
+++ b/svx/source/form/dbtoolsclient.cxx
@@ -116,7 +116,7 @@ namespace svxform
OSL_ENSURE(NULL == s_pFactoryCreationFunc, "ODbtoolsClient::registerClient: inconsistence: already have a factory function!");
#ifndef DISABLE_DYNLOADING
- const ::rtl::OUString sModuleName( SVLIBRARY( "dbtools" )
+ const OUString sModuleName( SVLIBRARY( "dbtools" )
);
// load the dbtools library
@@ -126,7 +126,7 @@ namespace svxform
if (NULL != s_hDbtoolsModule)
{
// get the symbol for the method creating the factory
- const ::rtl::OUString sFactoryCreationFunc( "createDataAccessToolsFactory" );
+ const OUString sFactoryCreationFunc( "createDataAccessToolsFactory" );
// reinterpret_cast<createDataAccessToolsFactoryFunction>
s_pFactoryCreationFunc = (createDataAccessToolsFactoryFunction)(
osl_getFunctionSymbol(s_hDbtoolsModule, sFactoryCreationFunc.pData));
@@ -198,8 +198,8 @@ namespace svxform
}
//--------------------------------------------------------------------
- Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const ::rtl::OUString& _rDataSourceName,
- const ::rtl::OUString& _rUser, const ::rtl::OUString& _rPwd, const Reference<XComponentContext>& _rxContext) const
+ Reference< XConnection> OStaticDataAccessTools::getConnection_withFeedback(const OUString& _rDataSourceName,
+ const OUString& _rUser, const OUString& _rPwd, const Reference<XComponentContext>& _rxContext) const
SAL_THROW ( (SQLException) )
{
Reference< XConnection > xReturn;
@@ -237,25 +237,25 @@ namespace svxform
}
//--------------------------------------------------------------------
- ::rtl::OUString OStaticDataAccessTools::quoteName(const ::rtl::OUString& _rQuote, const ::rtl::OUString& _rName) const
+ OUString OStaticDataAccessTools::quoteName(const OUString& _rQuote, const OUString& _rName) const
{
- ::rtl::OUString sReturn;
+ OUString sReturn;
if ( ensureLoaded() )
sReturn = m_xDataAccessTools->quoteName(_rQuote, _rName);
return sReturn;
}
// ------------------------------------------------
- ::rtl::OUString OStaticDataAccessTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const
+ OUString OStaticDataAccessTools::composeTableNameForSelect( const Reference< XConnection >& _rxConnection, const Reference< XPropertySet>& _xTable ) const
{
- ::rtl::OUString sReturn;
+ OUString sReturn;
if ( ensureLoaded() )
sReturn = m_xDataAccessTools->composeTableNameForSelect( _rxConnection, _xTable );
return sReturn;
}
//----------------------------------------------------------------
- Reference< XDataSource > OStaticDataAccessTools::getDataSource( const ::rtl::OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const
+ Reference< XDataSource > OStaticDataAccessTools::getDataSource( const OUString& _rsRegisteredName, const Reference< XComponentContext>& _rxContext ) const
{
Reference< XDataSource > xReturn;
if ( ensureLoaded() )
@@ -283,7 +283,7 @@ namespace svxform
//----------------------------------------------------------------
Reference< XNameAccess > OStaticDataAccessTools::getFieldsByCommandDescriptor( const Reference< XConnection >& _rxConnection,
- const sal_Int32 _nCommandType, const ::rtl::OUString& _rCommand,
+ const sal_Int32 _nCommandType, const OUString& _rCommand,
Reference< XComponent >& _rxKeepFieldsAlive, ::dbtools::SQLExceptionInfo* _pErrorInfo ) SAL_THROW( ( ) )
{
Reference< XNameAccess > aFields;
diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx
index 2a2b0eb3fb10..3e36b09792cd 100644
--- a/svx/source/form/filtnav.cxx
+++ b/svx/source/form/filtnav.cxx
@@ -124,7 +124,7 @@ sal_uInt32 OFilterItemExchange::getFormatId()
static sal_uInt32 s_nFormat = (sal_uInt32)-1;
if ((sal_uInt32)-1 == s_nFormat)
{
- s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\""));
+ s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"form.FilterControlExchange\""));
DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OFilterExchangeHelper::getFormatId: bad exchange id!");
}
return s_nFormat;
@@ -204,8 +204,8 @@ TYPEINIT1(FmFilterItem, FmFilterData);
//------------------------------------------------------------------------
FmFilterItem::FmFilterItem( const Reference< XMultiServiceFactory >& _rxFactory,
FmFilterItems* pParent,
- const ::rtl::OUString& aFieldName,
- const ::rtl::OUString& aText,
+ const OUString& aFieldName,
+ const OUString& aText,
const sal_Int32 _nComponentIndex )
:FmFilterData(_rxFactory,pParent, aText)
,m_aFieldName(aFieldName)
@@ -321,7 +321,7 @@ public:
void setText(sal_Int32 nPos,
const FmFilterItem* pFilterItem,
- const ::rtl::OUString& rText);
+ const OUString& rText);
};
//------------------------------------------------------------------------
@@ -364,7 +364,7 @@ void FmFilterAdapter::AddOrRemoveListener( const Reference< XIndexAccess >& _rxC
//------------------------------------------------------------------------
void FmFilterAdapter::setText(sal_Int32 nRowPos,
const FmFilterItem* pFilterItem,
- const ::rtl::OUString& rText)
+ const OUString& rText)
{
FmFormItem* pFormItem = PTR_CAST( FmFormItem, pFilterItem->GetParent()->GetParent() );
@@ -389,9 +389,9 @@ void SAL_CALL FmFilterAdapter::disposing(const EventObject& /*e*/) throw( Runtim
//------------------------------------------------------------------------
namespace
{
- ::rtl::OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl )
+ OUString lcl_getLabelName_nothrow( const Reference< XControl >& _rxControl )
{
- ::rtl::OUString sLabelName;
+ OUString sLabelName;
try
{
Reference< XControl > xControl( _rxControl, UNO_SET_THROW );
@@ -463,7 +463,7 @@ void FmFilterAdapter::predicateExpressionChanged( const FilterEvent& _Event ) th
else
{
// searching the component by field name
- ::rtl::OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( _Event.FilterComponent ) ) );
+ OUString aFieldName( lcl_getLabelName_nothrow( xFilterController->getFilterComponent( _Event.FilterComponent ) ) );
pFilterItem = new FmFilterItem( m_pModel->getORB(), pFilter, aFieldName, _Event.PredicateExpression, _Event.FilterComponent );
m_pModel->Insert(pFilter->GetChildren().end(), pFilterItem);
@@ -542,7 +542,7 @@ void SAL_CALL FmFilterAdapter::disjunctiveTermAdded( const FilterEvent& _Event )
TYPEINIT1(FmFilterModel, FmParentData);
//------------------------------------------------------------------------
FmFilterModel::FmFilterModel(const Reference< XMultiServiceFactory >& _rxFactory)
- :FmParentData(_rxFactory,NULL, ::rtl::OUString())
+ :FmParentData(_rxFactory,NULL, OUString())
,OSQLParserClient(comphelper::getComponentContext(_rxFactory))
,m_xORB(_rxFactory)
,m_pAdapter(NULL)
@@ -626,7 +626,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
Reference< XFormController > xController( xControllers->getByIndex(i), UNO_QUERY_THROW );
Reference< XPropertySet > xFormProperties( xController->getModel(), UNO_QUERY_THROW );
- ::rtl::OUString aName;
+ OUString aName;
OSL_VERIFY( xFormProperties->getPropertyValue( FM_PROP_NAME ) >>= aName );
// Insert a new item for the form
@@ -638,8 +638,8 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
// insert the existing filters for the form
String aTitle( SVX_RES( RID_STR_FILTER_FILTER_FOR ) );
- Sequence< Sequence< ::rtl::OUString > > aExpressions = xFilterController->getPredicateExpressions();
- for ( const Sequence< ::rtl::OUString >* pConjunctionTerm = aExpressions.getConstArray();
+ Sequence< Sequence< OUString > > aExpressions = xFilterController->getPredicateExpressions();
+ for ( const Sequence< OUString >* pConjunctionTerm = aExpressions.getConstArray();
pConjunctionTerm != aExpressions.getConstArray() + aExpressions.getLength();
++pConjunctionTerm
)
@@ -648,8 +648,8 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
FmFilterItems* pFilterItems = new FmFilterItems( m_xORB, pFormItem, aTitle );
Insert( pFormItem->GetChildren().end(), pFilterItems );
- const Sequence< ::rtl::OUString >& rDisjunction( *pConjunctionTerm );
- for ( const ::rtl::OUString* pDisjunctiveTerm = rDisjunction.getConstArray();
+ const Sequence< OUString >& rDisjunction( *pConjunctionTerm );
+ for ( const OUString* pDisjunctiveTerm = rDisjunction.getConstArray();
pDisjunctiveTerm != rDisjunction.getConstArray() + rDisjunction.getLength();
++pDisjunctiveTerm
)
@@ -662,7 +662,7 @@ void FmFilterModel::Update(const Reference< XIndexAccess > & xControllers, FmPar
// determine the display name of the control
const Reference< XControl > xFilterControl( xFilterController->getFilterComponent( nComponentIndex ) );
- const ::rtl::OUString sDisplayName( lcl_getLabelName_nothrow( xFilterControl ) );
+ const OUString sDisplayName( lcl_getLabelName_nothrow( xFilterControl ) );
// insert a new entry
FmFilterItem* pANDCondition = new FmFilterItem( m_xORB, pFilterItems, sDisplayName, *pDisjunctiveTerm, nComponentIndex );
@@ -823,7 +823,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
{
::std::vector< FmFilterData* >::iterator removePos = rChildren.end() - 1;
FmFilterItem* pFilterItem = PTR_CAST( FmFilterItem, *removePos );
- m_pAdapter->setText( nPos, pFilterItem, ::rtl::OUString() );
+ m_pAdapter->setText( nPos, pFilterItem, OUString() );
Remove( removePos );
}
}
@@ -853,7 +853,7 @@ void FmFilterModel::Remove(FmFilterData* pData)
sal_Int32 nParentPos = j - rParentParentItems.begin();
// EmptyText removes the filter
- m_pAdapter->setText(nParentPos, pFilterItem, ::rtl::OUString());
+ m_pAdapter->setText(nParentPos, pFilterItem, OUString());
Remove( i );
}
}
@@ -896,13 +896,13 @@ sal_Bool FmFilterModel::ValidateText(FmFilterItem* pItem, OUString& rText, OUStr
Reference< XPropertySet > xField( lcl_getBoundField_nothrow( xFilterController->getFilterComponent( pItem->GetComponentIndex() ) ), UNO_SET_THROW );
// parse the given text as filter predicate
- ::rtl::OUString aErr, aTxt( rText );
+ OUString aErr, aTxt( rText );
::rtl::Reference< ISQLParseNode > xParseNode = predicateTree( aErr, aTxt, xFormatter, xField );
rErrorMsg = aErr;
rText = aTxt;
if ( xParseNode.is() )
{
- ::rtl::OUString aPreparedText;
+ OUString aPreparedText;
Locale aAppLocale = Application::GetSettings().GetUILanguageTag().getLocale();
xParseNode->parseNodeToPredicateStr(
aPreparedText, xConnection, xFormatter, xField, aAppLocale, '.', getParseContext() );
@@ -925,7 +925,7 @@ void FmFilterModel::Append(FmFilterItems* pItems, FmFilterItem* pFilterItem)
}
//------------------------------------------------------------------------
-void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const ::rtl::OUString& rText)
+void FmFilterModel::SetTextForItem(FmFilterItem* pItem, const OUString& rText)
{
::std::vector<FmFilterData*>& rItems = pItem->GetParent()->GetParent()->GetChildren();
::std::vector<FmFilterData*>::iterator i = ::std::find(rItems.begin(), rItems.end(), pItem->GetParent());
@@ -1217,7 +1217,7 @@ sal_Bool FmFilterNavigator::EditingEntry( SvTreeListEntry* pEntry, Selection& rS
}
//------------------------------------------------------------------------
-sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText )
+sal_Bool FmFilterNavigator::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
{
DBG_ASSERT(pEntry == m_pEditingCurrently, "FmFilterNavigator::EditedEntry: suspicious entry!");
m_pEditingCurrently = NULL;
diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx
index 2832b4047d30..c18e01056a25 100644
--- a/svx/source/form/fmPropBrw.cxx
+++ b/svx/source/form/fmPropBrw.cxx
@@ -106,7 +106,7 @@ using namespace ::com::sun::star::beans;
using namespace ::com::sun::star::container;
using namespace ::svxform;
-::rtl::OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
+OUString GetUIHeadlineName(sal_Int16 nClassId, const Any& aUnoObj)
{
sal_uInt16 nClassNameResourceId = 0;
@@ -182,7 +182,7 @@ using namespace ::svxform;
nClassNameResourceId = RID_STR_CONTROL; break;
}
- return ::rtl::OUString( String( SVX_RES( nClassNameResourceId ) ) );
+ return OUString( String( SVX_RES( nClassNameResourceId ) ) );
}
//========================================================================
@@ -208,7 +208,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding
try
{
// create a frame wrapper for myself
- m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(::rtl::OUString("com.sun.star.frame.Frame") ), UNO_QUERY);
+ m_xMeAsFrame = Reference< XFrame >(m_xORB->createInstance(OUString("com.sun.star.frame.Frame") ), UNO_QUERY);
if (m_xMeAsFrame.is())
{
// create an intermediate window, which is to be the container window of the frame
@@ -221,7 +221,7 @@ FmPropBrw::FmPropBrw( const Reference< XMultiServiceFactory >& _xORB, SfxBinding
m_xFrameContainerWindow = VCLUnoHelper::GetInterface ( pContainerWindow );
m_xMeAsFrame->initialize( m_xFrameContainerWindow );
- m_xMeAsFrame->setName(::rtl::OUString("form property browser") );
+ m_xMeAsFrame->setName(OUString("form property browser") );
if ( _pBindings->GetDispatcher() )
{
::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier >
@@ -282,10 +282,10 @@ FmPropBrw::~FmPropBrw()
Reference<XNameContainer> xName(m_xInspectorContext,uno::UNO_QUERY);
if ( xName.is() )
{
- const ::rtl::OUString pProps[] = { ::rtl::OUString( "ContextDocument" )
- , ::rtl::OUString( "DialogParentWindow" )
- , ::rtl::OUString( "ControlContext" )
- , ::rtl::OUString( "ControlShapeAccess" ) };
+ const OUString pProps[] = { OUString( "ContextDocument" )
+ , OUString( "DialogParentWindow" )
+ , OUString( "ControlContext" )
+ , OUString( "ControlShapeAccess" ) };
for ( size_t i = 0; i < sizeof(pProps)/sizeof(pProps[0]); ++i )
xName->removeByName( pProps[i] );
}
@@ -298,9 +298,9 @@ FmPropBrw::~FmPropBrw()
}
//-----------------------------------------------------------------------
-::rtl::OUString FmPropBrw::getCurrentPage() const
+OUString FmPropBrw::getCurrentPage() const
{
- ::rtl::OUString sCurrentPage;
+ OUString sCurrentPage;
try
{
if ( m_xBrowserController.is() )
@@ -512,8 +512,8 @@ namespace
{
static bool lcl_shouldEnableHelpSection( const Reference< XComponentContext >& _rxContext )
{
- const ::rtl::OUString sConfigName( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" );
- const ::rtl::OUString sPropertyName( "DirectHelp" );
+ const OUString sConfigName( "/org.openoffice.Office.Common/Forms/PropertyBrowser/" );
+ const OUString sPropertyName( "DirectHelp" );
::utl::OConfigurationTreeRoot aConfiguration(
::utl::OConfigurationTreeRoot::createWithComponentContext( _rxContext, sConfigName ) );
@@ -564,10 +564,10 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
// a ComponentContext for the
::cppu::ContextEntry_Init aHandlerContextInfo[] =
{
- ::cppu::ContextEntry_Init( ::rtl::OUString( "ContextDocument" ), makeAny( xDocument ) ),
- ::cppu::ContextEntry_Init( ::rtl::OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ),
- ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlContext" ), makeAny( xControlContext ) ),
- ::cppu::ContextEntry_Init( ::rtl::OUString( "ControlShapeAccess" ), makeAny( xControlMap ) )
+ ::cppu::ContextEntry_Init( OUString( "ContextDocument" ), makeAny( xDocument ) ),
+ ::cppu::ContextEntry_Init( OUString( "DialogParentWindow" ), makeAny( xParentWindow ) ),
+ ::cppu::ContextEntry_Init( OUString( "ControlContext" ), makeAny( xControlContext ) ),
+ ::cppu::ContextEntry_Init( OUString( "ControlShapeAccess" ), makeAny( xControlMap ) )
};
m_xInspectorContext.set(
::cppu::createComponentContext( aHandlerContextInfo, sizeof( aHandlerContextInfo ) / sizeof( aHandlerContextInfo[0] ),
@@ -589,7 +589,7 @@ void FmPropBrw::impl_createPropertyBrowser_throw( FmFormShell* _pFormShell )
if ( !m_xBrowserController.is() )
{
- ::rtl::OUString sServiceName( "com.sun.star.inspection.ObjectInspector" );
+ OUString sServiceName( "com.sun.star.inspection.ObjectInspector" );
ShowServiceNotAvailableError( GetParent(), sServiceName, sal_True );
}
else
diff --git a/svx/source/form/fmcontrolbordermanager.cxx b/svx/source/form/fmcontrolbordermanager.cxx
index aaaaf3adb1d0..df4a49bbeaaf 100644
--- a/svx/source/form/fmcontrolbordermanager.cxx
+++ b/svx/source/form/fmcontrolbordermanager.cxx
@@ -414,7 +414,7 @@ namespace svxform
// update the explanation for invalidity (this is always done, even if the validity did not change)
Reference< XValidator > xValidator = _rxValidatable->getValidator();
OSL_ENSURE( xValidator.is(), "ControlBorderManager::validityChanged: invalid, but no validator?" );
- ::rtl::OUString sExplainInvalidity = xValidator.is() ? xValidator->explainInvalid( _rxValidatable->getCurrentValue() ) : ::rtl::OUString();
+ OUString sExplainInvalidity = xValidator.is() ? xValidator->explainInvalid( _rxValidatable->getCurrentValue() ) : OUString();
xPeer->setProperty( FM_PROP_HELPTEXT, makeAny( sExplainInvalidity ) );
}
catch( const Exception& )
diff --git a/svx/source/form/fmcontrollayout.cxx b/svx/source/form/fmcontrollayout.cxx
index a630f5b580b7..87a69ac93420 100644
--- a/svx/source/form/fmcontrollayout.cxx
+++ b/svx/source/form/fmcontrollayout.cxx
@@ -91,30 +91,30 @@ namespace svxform
}
//....................................................................
- static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, ::rtl::OUString& _rFamilyName, ::rtl::OUString& _rStyleName ) SAL_THROW(( Exception ))
+ static bool lcl_getDocumentDefaultStyleAndFamily( const Reference< XInterface >& _rxDocument, OUString& _rFamilyName, OUString& _rStyleName ) SAL_THROW(( Exception ))
{
bool bSuccess = true;
Reference< XServiceInfo > xDocumentSI( _rxDocument, UNO_QUERY );
if ( xDocumentSI.is() )
{
- if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.TextDocument" ) )
- || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.text.WebDocument" ) )
+ if ( xDocumentSI->supportsService( OUString( "com.sun.star.text.TextDocument" ) )
+ || xDocumentSI->supportsService( OUString( "com.sun.star.text.WebDocument" ) )
)
{
- _rFamilyName = ::rtl::OUString( "ParagraphStyles" );
- _rStyleName = ::rtl::OUString( "Standard" );
+ _rFamilyName = OUString( "ParagraphStyles" );
+ _rStyleName = OUString( "Standard" );
}
- else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) )
+ else if ( xDocumentSI->supportsService( OUString( "com.sun.star.sheet.SpreadsheetDocument" ) ) )
{
- _rFamilyName = ::rtl::OUString( "CellStyles" );
- _rStyleName = ::rtl::OUString( "Default" );
+ _rFamilyName = OUString( "CellStyles" );
+ _rStyleName = OUString( "Default" );
}
- else if ( xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.drawing.DrawingDocument" ) )
- || xDocumentSI->supportsService( ::rtl::OUString( "com.sun.star.presentation.PresentationDocument" ) )
+ else if ( xDocumentSI->supportsService( OUString( "com.sun.star.drawing.DrawingDocument" ) )
+ || xDocumentSI->supportsService( OUString( "com.sun.star.presentation.PresentationDocument" ) )
)
{
- _rFamilyName = ::rtl::OUString( "graphics" );
- _rStyleName = ::rtl::OUString( "standard" );
+ _rFamilyName = OUString( "graphics" );
+ _rStyleName = OUString( "standard" );
}
else
bSuccess = false;
@@ -154,7 +154,7 @@ namespace svxform
break;
}
- ::rtl::OUString sCharLocalePropertyName = ::rtl::OUString::createFromAscii( pCharLocalePropertyName );
+ OUString sCharLocalePropertyName = OUString::createFromAscii( pCharLocalePropertyName );
Locale aDocumentCharLocale;
if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) )
{
@@ -163,7 +163,7 @@ namespace svxform
// fall back to CharLocale property at the style
if ( aDocumentCharLocale.Language.isEmpty() )
{
- sCharLocalePropertyName = ::rtl::OUString( "CharLocale" );
+ sCharLocalePropertyName = OUString( "CharLocale" );
if ( xStylePSI->hasPropertyByName( sCharLocalePropertyName ) )
{
OSL_VERIFY( xStyle->getPropertyValue( sCharLocalePropertyName ) >>= aDocumentCharLocale );
@@ -179,7 +179,7 @@ namespace svxform
Font aFont = OutputDevice::GetDefaultFont( DEFAULTFONT_SANS, LanguageTag( aDocumentCharLocale ).getLanguageType(), DEFAULTFONT_FLAGS_ONLYONE );
FontDescriptor aFontDesc = VCLUnoHelper::CreateFontDescriptor( aFont );
_rxModel->setPropertyValue(
- ::rtl::OUString( "FontDescriptor" ),
+ OUString( "FontDescriptor" ),
makeAny( aFontDesc )
);
}
@@ -201,9 +201,9 @@ namespace svxform
Reference< XNameAccess > xStyleFamilies( xSuppStyleFamilies->getStyleFamilies(), UNO_SET_THROW );
// the names of the family, and the style - depends on the document type we live in
- ::rtl::OUString sFamilyName, sStyleName;
+ OUString sFamilyName, sStyleName;
if ( !lcl_getDocumentDefaultStyleAndFamily( xSuppStyleFamilies.get(), sFamilyName, sStyleName ) )
- throw RuntimeException( ::rtl::OUString( "unknown document type!" ), NULL );
+ throw RuntimeException( OUString( "unknown document type!" ), NULL );
// the concrete style
Reference< XNameAccess > xStyleFamily( xStyleFamilies->getByName( sFamilyName ), UNO_QUERY_THROW );
@@ -231,10 +231,10 @@ namespace svxform
// let's see what the configuration says about the visual effect
OConfigurationNode aConfig = getLayoutSettings( _eDocType );
- Any aVisualEffect = aConfig.getNodeValue( ::rtl::OUString( "VisualEffect" ) );
+ Any aVisualEffect = aConfig.getNodeValue( OUString( "VisualEffect" ) );
if ( aVisualEffect.hasValue() )
{
- ::rtl::OUString sVisualEffect;
+ OUString sVisualEffect;
OSL_VERIFY( aVisualEffect >>= sVisualEffect );
sal_Int16 nVisualEffect = VisualEffect::NONE;
@@ -282,7 +282,7 @@ namespace svxform
//--------------------------------------------------------------------
::utl::OConfigurationNode ControlLayouter::getLayoutSettings( DocumentType _eDocType )
{
- ::rtl::OUString sConfigName = ::rtl::OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" );
+ OUString sConfigName = OUString( "/org.openoffice.Office.Common/Forms/ControlLayout/" );
sConfigName += DocumentClassification::getModuleIdentifierForDocumentType( _eDocType );
return OConfigurationTreeRoot::createWithComponentContext(
::comphelper::getProcessComponentContext(), // TODO
@@ -293,7 +293,7 @@ namespace svxform
bool ControlLayouter::useDynamicBorderColor( DocumentType _eDocType )
{
OConfigurationNode aConfig = getLayoutSettings( _eDocType );
- Any aDynamicBorderColor = aConfig.getNodeValue( ::rtl::OUString( "DynamicBorderColors" ) );
+ Any aDynamicBorderColor = aConfig.getNodeValue( OUString( "DynamicBorderColors" ) );
bool bDynamicBorderColor = false;
OSL_VERIFY( aDynamicBorderColor >>= bDynamicBorderColor );
return bDynamicBorderColor;
@@ -305,7 +305,7 @@ namespace svxform
if ( _eDocType == eUnknownDocumentType )
return false;
OConfigurationNode aConfig = getLayoutSettings( _eDocType );
- Any aUseRefDevice = aConfig.getNodeValue( ::rtl::OUString( "UseDocumentTextMetrics" ) );
+ Any aUseRefDevice = aConfig.getNodeValue( OUString( "UseDocumentTextMetrics" ) );
bool bUseRefDevice = false;
OSL_VERIFY( aUseRefDevice >>= bUseRefDevice );
return bUseRefDevice;
diff --git a/svx/source/form/fmdmod.cxx b/svx/source/form/fmdmod.cxx
index ba26c79908aa..4fa6fd8455e9 100644
--- a/svx/source/form/fmdmod.cxx
+++ b/svx/source/form/fmdmod.cxx
@@ -28,7 +28,7 @@
using namespace ::svxform;
//-----------------------------------------------------------------------------
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const ::rtl::OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstance(const OUString& ServiceSpecifier) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
{
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xRet;
if ( ServiceSpecifier.indexOf( "com.sun.star.form.component." ) == 0 )
@@ -46,15 +46,15 @@ using namespace ::svxform;
}
//-----------------------------------------------------------------------------
-::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstanceWithArguments(const ::rtl::OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
+::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL SvxFmMSFactory::createInstanceWithArguments(const OUString& ServiceSpecifier, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments) throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException )
{
return SvxUnoDrawMSFactory::createInstanceWithArguments(ServiceSpecifier, Arguments );
}
//-----------------------------------------------------------------------------
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmMSFactory::getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
{
- static const ::rtl::OUString aSvxComponentServiceNameList[] =
+ static const OUString aSvxComponentServiceNameList[] =
{
FM_SUN_COMPONENT_TEXTFIELD,
FM_SUN_COMPONENT_FORM,
@@ -79,12 +79,12 @@ using namespace ::svxform;
static const sal_uInt16 nSvxComponentServiceNameListCount = sizeof(aSvxComponentServiceNameList) / sizeof ( aSvxComponentServiceNameList[0] );
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aSeq( nSvxComponentServiceNameListCount );
- ::rtl::OUString* pStrings = aSeq.getArray();
+ ::com::sun::star::uno::Sequence< OUString > aSeq( nSvxComponentServiceNameListCount );
+ OUString* pStrings = aSeq.getArray();
for( sal_uInt16 nIdx = 0; nIdx < nSvxComponentServiceNameListCount; nIdx++ )
pStrings[nIdx] = aSvxComponentServiceNameList[nIdx];
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() );
+ ::com::sun::star::uno::Sequence< OUString > aParentSeq( SvxUnoDrawMSFactory::getAvailableServiceNames() );
return concatServiceNames( aParentSeq, aSeq );
}
diff --git a/svx/source/form/fmdocumentclassification.cxx b/svx/source/form/fmdocumentclassification.cxx
index 13ccf0d0a043..35a6f7bba458 100644
--- a/svx/source/form/fmdocumentclassification.cxx
+++ b/svx/source/form/fmdocumentclassification.cxx
@@ -131,7 +131,7 @@ namespace svxform
const ModuleInfo* pModuleInfo = lcl_getModuleInfo();
while ( pModuleInfo->pAsciiModuleOrServiceName )
{
- if ( xSI->supportsService( ::rtl::OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ) ) )
+ if ( xSI->supportsService( OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName ) ) )
return pModuleInfo->eType;
++pModuleInfo;
}
@@ -168,7 +168,7 @@ namespace svxform
}
//--------------------------------------------------------------------
- DocumentType DocumentClassification::getDocumentTypeForModuleIdentifier( const ::rtl::OUString& _rModuleIdentifier )
+ DocumentType DocumentClassification::getDocumentTypeForModuleIdentifier( const OUString& _rModuleIdentifier )
{
const ModuleInfo* pModuleInfo = lcl_getModuleInfo();
while ( pModuleInfo->pAsciiModuleOrServiceName )
@@ -181,16 +181,16 @@ namespace svxform
}
//--------------------------------------------------------------------
- ::rtl::OUString DocumentClassification::getModuleIdentifierForDocumentType( DocumentType _eType )
+ OUString DocumentClassification::getModuleIdentifierForDocumentType( DocumentType _eType )
{
const ModuleInfo* pModuleInfo = lcl_getModuleInfo();
while ( pModuleInfo->pAsciiModuleOrServiceName )
{
if ( pModuleInfo->eType == _eType )
- return ::rtl::OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName );
+ return OUString::createFromAscii( pModuleInfo->pAsciiModuleOrServiceName );
++pModuleInfo;
}
- return ::rtl::OUString();
+ return OUString();
}
//........................................................................
diff --git a/svx/source/form/fmdpage.cxx b/svx/source/form/fmdpage.cxx
index 531d2d3b6a96..5d239f5b6042 100644
--- a/svx/source/form/fmdpage.cxx
+++ b/svx/source/form/fmdpage.cxx
@@ -83,7 +83,7 @@ Any SAL_CALL SvxFmDrawPage::queryAggregation( const ::com::sun::star::uno::Type&
SdrObject *SvxFmDrawPage::_CreateSdrObject( const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > & xDescr ) throw ()
{
- ::rtl::OUString aShapeType( xDescr->getShapeType() );
+ OUString aShapeType( xDescr->getShapeType() );
if ( aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ShapeControl" ) ) // compatibility
|| aShapeType.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM( "com.sun.star.drawing.ControlShape" ) )
@@ -128,7 +128,7 @@ sal_Bool SAL_CALL SvxFmDrawPage::hasForms(void) throw( ::com::sun::star::uno::Ru
}
// ::com::sun::star::lang::XServiceInfo
-::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
+::com::sun::star::uno::Sequence< OUString > SAL_CALL SvxFmDrawPage::getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException )
{
return SvxDrawPage::getSupportedServiceNames();
}
diff --git a/svx/source/form/fmexch.cxx b/svx/source/form/fmexch.cxx
index f4f387995313..c137183caf2f 100644
--- a/svx/source/form/fmexch.cxx
+++ b/svx/source/form/fmexch.cxx
@@ -334,7 +334,7 @@ namespace svxform
static sal_uInt32 s_nFormat = (sal_uInt32)-1;
if ((sal_uInt32)-1 == s_nFormat)
{
- s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\""));
+ s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.ControlPathExchange\""));
DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getControlPathFormatId: bad exchange id!");
}
return s_nFormat;
@@ -346,7 +346,7 @@ namespace svxform
static sal_uInt32 s_nFormat = (sal_uInt32)-1;
if ((sal_uInt32)-1 == s_nFormat)
{
- s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\""));
+ s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.HiddenControlModelsExchange\""));
DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getHiddenControlModelsFormatId: bad exchange id!");
}
return s_nFormat;
@@ -358,7 +358,7 @@ namespace svxform
static sal_uInt32 s_nFormat = (sal_uInt32)-1;
if ((sal_uInt32)-1 == s_nFormat)
{
- s_nFormat = SotExchange::RegisterFormatName(rtl::OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\""));
+ s_nFormat = SotExchange::RegisterFormatName(OUString("application/x-openoffice;windows_formatname=\"svxform.FieldNameExchange\""));
DBG_ASSERT((sal_uInt32)-1 != s_nFormat, "OControlExchange::getFieldExchangeFormatId: bad exchange id!");
}
return s_nFormat;
diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx
index b2979cc36fbe..26b8b906e2ee 100644
--- a/svx/source/form/fmexpl.cxx
+++ b/svx/source/form/fmexpl.cxx
@@ -137,7 +137,7 @@ FmNavRemovedHint::~FmNavRemovedHint()
TYPEINIT1( FmNavNameChangedHint, SfxHint );
DBG_NAME(FmNavNameChangedHint);
//------------------------------------------------------------------------
-FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const ::rtl::OUString& rNewName )
+FmNavNameChangedHint::FmNavNameChangedHint( FmEntryData* pData, const OUString& rNewName )
:pEntryData( pData )
,aNewName( rNewName )
{
@@ -351,12 +351,12 @@ FmFormData::FmFormData(
Reference< XPropertySet > xSet(m_xForm, UNO_QUERY);
if (xSet.is())
{
- ::rtl::OUString aEntryName(::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME )));
+ OUString aEntryName(::comphelper::getString(xSet->getPropertyValue( FM_PROP_NAME )));
SetText(aEntryName);
}
}
else
- SetText( ::rtl::OUString() );
+ SetText( OUString() );
}
//------------------------------------------------------------------------
diff --git a/svx/source/form/fmobj.cxx b/svx/source/form/fmobj.cxx
index fad3aa96fe14..5f0641a9910d 100644
--- a/svx/source/form/fmobj.cxx
+++ b/svx/source/form/fmobj.cxx
@@ -58,7 +58,7 @@ using namespace ::svxform;
TYPEINIT1(FmFormObj, SdrUnoObj);
DBG_NAME(FmFormObj);
//------------------------------------------------------------------
-FmFormObj::FmFormObj(const ::rtl::OUString& rModelName)
+FmFormObj::FmFormObj(const OUString& rModelName)
:SdrUnoObj ( rModelName )
,m_nPos ( -1 )
,m_pLastKnownRefDevice ( NULL )
@@ -133,7 +133,7 @@ void FmFormObj::impl_checkRefDevice_nothrow( bool _force )
Reference< XPropertySet > xModelProps( GetUnoControlModel(), UNO_QUERY_THROW );
Reference< XPropertySetInfo > xPropertyInfo( xModelProps->getPropertySetInfo(), UNO_SET_THROW );
- static const ::rtl::OUString sRefDevicePropName( "ReferenceDevice" );
+ static const OUString sRefDevicePropName( "ReferenceDevice" );
if ( xPropertyInfo->hasPropertyByName( sRefDevicePropName ) )
{
VCLXDevice* pUnoRefDevice = new VCLXDevice;
@@ -359,7 +359,7 @@ void FmFormObj::clonedFrom(const FmFormObj* _pSource)
Reference< XInterface > xSourceContainer = xSourceAsChild->getParent();
m_xEnvironmentHistory = Reference< XIndexContainer >(
- ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString("com.sun.star.form.Forms") ),
+ ::comphelper::getProcessServiceFactory()->createInstance(OUString("com.sun.star.form.Forms") ),
UNO_QUERY);
DBG_ASSERT(m_xEnvironmentHistory.is(), "FmFormObj::clonedFrom : could not create a forms collection !");
@@ -418,7 +418,7 @@ FmFormObj& FmFormObj::operator= (const FmFormObj& rObj)
//------------------------------------------------------------------
namespace
{
- rtl::OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement)
+ OUString lcl_getFormComponentAccessPath(const Reference< XInterface >& _xElement, Reference< XInterface >& _rTopLevelElement)
{
Reference< ::com::sun::star::form::XFormComponent> xChild(_xElement, UNO_QUERY);
Reference< ::com::sun::star::container::XIndexAccess> xParent;
@@ -457,7 +457,7 @@ namespace
Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface > & _rSourceContainer, const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexContainer > _rTopLevelDestContainer)
{
Reference< XInterface > xTopLevelSouce;
- rtl::OUString sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce);
+ OUString sAccessPath = lcl_getFormComponentAccessPath(_rSourceContainer, xTopLevelSouce);
if (!xTopLevelSouce.is())
// something went wrong, maybe _rSourceContainer isn't part of a valid forms hierarchy
return Reference< XInterface > ();
@@ -469,7 +469,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface >
sal_Int32 nTokIndex = 0;
do
{
- rtl::OUString aToken = sAccessPath.getToken( 0, '\\', nTokIndex );
+ OUString aToken = sAccessPath.getToken( 0, '\\', nTokIndex );
sal_uInt16 nIndex = (sal_uInt16)aToken.toInt32();
// get the DSS of the source form (we have to find an aquivalent for)
@@ -564,7 +564,7 @@ Reference< XInterface > FmFormObj::ensureModelEnv(const Reference< XInterface >
{
// create and insert (into the destination) a copy of the form
xCurrentDestForm.set(
- ::comphelper::getProcessServiceFactory()->createInstance(::rtl::OUString( "com.sun.star.form.component.DataForm" ) ),
+ ::comphelper::getProcessServiceFactory()->createInstance(OUString( "com.sun.star.form.component.DataForm" ) ),
UNO_QUERY_THROW );
::comphelper::copyProperties( xCurrentSourceForm, xCurrentDestForm );
diff --git a/svx/source/form/fmobjfac.cxx b/svx/source/form/fmobjfac.cxx
index 1ea085758c55..39be34a73722 100644
--- a/svx/source/form/fmobjfac.cxx
+++ b/svx/source/form/fmobjfac.cxx
@@ -108,7 +108,7 @@ FmFormObjFactory::~FmFormObjFactory()
\************************************************************************/
namespace
{
- void lcl_initProperty( FmFormObj* _pObject, const ::rtl::OUString& _rPropName, const Any& _rValue )
+ void lcl_initProperty( FmFormObj* _pObject, const OUString& _rPropName, const Any& _rValue )
{
try
{
@@ -127,9 +127,9 @@ IMPL_LINK(FmFormObjFactory, MakeObject, SdrObjFactory*, pObjFactory)
{
if (pObjFactory->nInventor == FmFormInventor)
{
- ::rtl::OUString sServiceSpecifier;
+ OUString sServiceSpecifier;
- typedef ::std::vector< ::std::pair< ::rtl::OUString, Any > > PropertyValueArray;
+ typedef ::std::vector< ::std::pair< OUString, Any > > PropertyValueArray;
PropertyValueArray aInitialProperties;
switch ( pObjFactory->nIdentifier )
diff --git a/svx/source/form/fmpgeimp.cxx b/svx/source/form/fmpgeimp.cxx
index e144bdbec5f3..8fd082ea217b 100644
--- a/svx/source/form/fmpgeimp.cxx
+++ b/svx/source/form/fmpgeimp.cxx
@@ -114,7 +114,7 @@ namespace
size_t lhsCount = m_aComponentInfo.childCount( _components.first );
size_t rhsCount = m_aComponentInfo.childCount( _components.second );
if ( lhsCount != rhsCount )
- throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (1)!" ) ), NULL );
+ throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (1)!" ) ), NULL );
return lhsCount;
}
@@ -144,7 +144,7 @@ namespace
Reference< XControlModel > lhsControlModel( _component.first, UNO_QUERY );
Reference< XControlModel > rhsControlModel( _component.second, UNO_QUERY );
if ( lhsControlModel.is() != rhsControlModel.is() )
- throw RuntimeException( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (2)!" ) ), NULL );
+ throw RuntimeException( OUString( RTL_CONSTASCII_USTRINGPARAM( "Found inconsistent form component hierarchies (2)!" ) ), NULL );
if ( lhsControlModel.is() )
m_rControlModelMap[ lhsControlModel ] = rhsControlModel;
@@ -328,7 +328,7 @@ const Reference< XNameContainer >& FmFormPageImpl::getForms( bool _bForceCreate
{
m_bAttemptedFormCreation = true;
- const ::rtl::OUString sFormsCollectionServiceName("com.sun.star.form.Forms");
+ const OUString sFormsCollectionServiceName("com.sun.star.form.Forms");
m_xForms = Reference< XNameContainer > (
::comphelper::getProcessServiceFactory()->createInstance( sFormsCollectionServiceName ),
UNO_QUERY
@@ -404,7 +404,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
if ( xForms->hasElements() )
{
// suche die Standardform
- ::rtl::OUString sStandardFormname = String( SVX_RES( RID_STR_STDFORMNAME ) );
+ OUString sStandardFormname = String( SVX_RES( RID_STR_STDFORMNAME ) );
try
{
@@ -436,7 +436,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
{
XubString aStr(SVX_RES(RID_STR_FORM));
XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
- aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr);
+ aUndoStr.SearchAndReplace(OUString('#'), aStr);
pModel->BegUndo(aUndoStr);
}
@@ -449,7 +449,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
xFormProps->setPropertyValue( FM_PROP_COMMANDTYPE, makeAny( sal_Int32( CommandType::TABLE ) ) );
// and the "Standard" name
- ::rtl::OUString sName = String( SVX_RES( RID_STR_STDFORMNAME ) );
+ OUString sName = String( SVX_RES( RID_STR_STDFORMNAME ) );
xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) );
Reference< XIndexContainer > xContainer( xForms, UNO_QUERY );
@@ -480,7 +480,7 @@ Reference< XForm > FmFormPageImpl::getDefaultForm()
//------------------------------------------------------------------------------
Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormComponentHierarchy(
const Reference< XFormComponent > & rContent, const Reference< XDataSource > & rDatabase,
- const ::rtl::OUString& rDBTitle, const ::rtl::OUString& rCursorSource, sal_Int32 nCommandType )
+ const OUString& rDBTitle, const OUString& rCursorSource, sal_Int32 nCommandType )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::findPlaceInFormComponentHierarchy" );
// if the control already is child of a form, don't do anything
@@ -520,7 +520,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo
{
XubString aStr(SVX_RES(RID_STR_FORM));
XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
- aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr);
+ aUndoStr.SearchAndReplace(OUString('#'), aStr);
pModel->BegUndo(aUndoStr);
}
@@ -545,8 +545,8 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo
Reference< ::com::sun::star::container::XNameAccess > xNamedSet( getForms(), UNO_QUERY );
const bool bTableOrQuery = ( CommandType::TABLE == nCommandType ) || ( CommandType::QUERY == nCommandType );
- ::rtl::OUString sName = FormControlFactory::getUniqueName( xNamedSet,
- bTableOrQuery ? rCursorSource : ::rtl::OUString( String( SVX_RES( RID_STR_STDFORMNAME ) ) ) );
+ OUString sName = FormControlFactory::getUniqueName( xNamedSet,
+ bTableOrQuery ? rCursorSource : OUString( String( SVX_RES( RID_STR_STDFORMNAME ) ) ) );
xFormProps->setPropertyValue( FM_PROP_NAME, makeAny( sName ) );
@@ -575,7 +575,7 @@ Reference< ::com::sun::star::form::XForm > FmFormPageImpl::findPlaceInFormCompo
//------------------------------------------------------------------------------
Reference< XForm > FmFormPageImpl::findFormForDataSource(
const Reference< XForm > & rForm, const Reference< XDataSource > & _rxDatabase,
- const ::rtl::OUString& _rCursorSource, sal_Int32 nCommandType)
+ const OUString& _rCursorSource, sal_Int32 nCommandType)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmFormPageImpl::findFormForDataSource" );
Reference< XForm > xResultForm;
@@ -585,8 +585,8 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
return xResultForm;
OSL_ENSURE(_rxDatabase.is(), "FmFormPageImpl::findFormForDataSource: invalid data source!");
- ::rtl::OUString sLookupName; // the name of the data source we're looking for
- ::rtl::OUString sFormDataSourceName; // the name of the data source the current connection in the form is based on
+ OUString sLookupName; // the name of the data source we're looking for
+ OUString sFormDataSourceName; // the name of the data source the current connection in the form is based on
try
{
Reference< XPropertySet > xDSProps(_rxDatabase, UNO_QUERY);
@@ -627,7 +627,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
if (sLookupName == sFormDataSourceName)
{
// jetzt noch ueberpruefen ob CursorSource und Type uebereinstimmen
- ::rtl::OUString aCursorSource = ::comphelper::getString(xFormProps->getPropertyValue(FM_PROP_COMMAND));
+ OUString aCursorSource = ::comphelper::getString(xFormProps->getPropertyValue(FM_PROP_COMMAND));
sal_Int32 nType = ::comphelper::getINT32(xFormProps->getPropertyValue(FM_PROP_COMMANDTYPE));
if (aCursorSource.isEmpty() || ((nType == nCommandType) && (aCursorSource == _rCursorSource))) // found the form
{
@@ -656,7 +656,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
}
//------------------------------------------------------------------------------
-::rtl::OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls)
+OUString FmFormPageImpl::setUniqueName(const Reference< XFormComponent > & xFormComponent, const Reference< XForm > & xControls)
{
#if OSL_DEBUG_LEVEL > 0
try
@@ -669,7 +669,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
DBG_UNHANDLED_EXCEPTION();
}
#endif
- ::rtl::OUString sName;
+ OUString sName;
Reference< ::com::sun::star::beans::XPropertySet > xSet(xFormComponent, UNO_QUERY);
if (xSet.is())
{
@@ -682,7 +682,7 @@ Reference< XForm > FmFormPageImpl::findFormForDataSource(
sal_Int16 nClassId( FormComponentType::CONTROL );
xSet->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId;
- ::rtl::OUString sDefaultName = FormControlFactory::getDefaultUniqueName_ByComponentType(
+ OUString sDefaultName = FormControlFactory::getDefaultUniqueName_ByComponentType(
Reference< XNameAccess >( xControls, UNO_QUERY ), xSet );
// bei Radiobuttons, die einen Namen haben, diesen nicht ueberschreiben!
diff --git a/svx/source/form/fmscriptingenv.cxx b/svx/source/form/fmscriptingenv.cxx
index 574afae82813..bbb7610fc15e 100644
--- a/svx/source/form/fmscriptingenv.cxx
+++ b/svx/source/form/fmscriptingenv.cxx
@@ -107,7 +107,7 @@ namespace svxform
@return
<TRUE/> if and only if the method is declared <code>oneway</code>, i.e. can be called asynchronously
*/
- bool impl_allowAsynchronousCall_nothrow( const ::rtl::OUString& _rListenerType, const ::rtl::OUString& _rMethodName ) const;
+ bool impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const;
/** determines whether the instance is already disposed
*/
@@ -189,7 +189,7 @@ namespace svxform
}
//--------------------------------------------------------------------
- bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const ::rtl::OUString& _rListenerType, const ::rtl::OUString& _rMethodName ) const
+ bool FormScriptListener::impl_allowAsynchronousCall_nothrow( const OUString& _rListenerType, const OUString& _rMethodName ) const
{
bool bAllowAsynchronousCall = false;
try
@@ -197,8 +197,8 @@ namespace svxform
::comphelper::ComponentContext aContext( ::comphelper::getProcessServiceFactory() );
Reference< XHierarchicalNameAccess > xTypeDescriptions( aContext.getSingleton( "com.sun.star.reflection.theTypeDescriptionManager" ), UNO_QUERY_THROW );
- ::rtl::OUString sMethodDescription( _rListenerType );
- sMethodDescription += ::rtl::OUString( "::" );
+ OUString sMethodDescription( _rListenerType );
+ sMethodDescription += OUString( "::" );
sMethodDescription += _rMethodName;
Reference< XInterfaceMethodTypeDescription > xMethod( xTypeDescriptions->getByHierarchicalName( sMethodDescription ), UNO_QUERY_THROW );
@@ -224,7 +224,7 @@ namespace svxform
void SAL_CALL FormScriptListener::firing( const ScriptEvent& _rEvent ) throw (RuntimeException)
{
::osl::ClearableMutexGuard aGuard( m_aMutex );
- static const ::rtl::OUString vbaInterOp("VBAInterop");
+ static const OUString vbaInterOp("VBAInterop");
if ( _rEvent.ScriptType.equals(vbaInterOp) )
return; // not handled here
@@ -385,10 +385,10 @@ namespace svxform
class NewStyleUNOScript : public IScript
{
SfxObjectShell& m_rObjectShell;
- const ::rtl::OUString m_sScriptCode;
+ const OUString m_sScriptCode;
public:
- NewStyleUNOScript( SfxObjectShell& _rObjectShell, const ::rtl::OUString& _rScriptCode )
+ NewStyleUNOScript( SfxObjectShell& _rObjectShell, const OUString& _rScriptCode )
:m_rObjectShell( _rObjectShell )
,m_sScriptCode( _rScriptCode )
{
@@ -411,7 +411,7 @@ namespace svxform
{
Reference< XControl > xControl( aEvent.Source, UNO_QUERY_THROW );
Reference< XPropertySet > xProps( xControl->getModel(), UNO_QUERY_THROW );
- aCaller = xProps->getPropertyValue( rtl::OUString("Name") );
+ aCaller = xProps->getPropertyValue( OUString("Name") );
}
catch( Exception& ) {}
}
@@ -446,8 +446,8 @@ namespace svxform
}
else
{
- ::rtl::OUString sScriptCode = _rEvent.ScriptCode;
- ::rtl::OUString sMacroLocation;
+ OUString sScriptCode = _rEvent.ScriptCode;
+ OUString sMacroLocation;
// is there a location in the script name ("application" or "document")?
sal_Int32 nPrefixLen = sScriptCode.indexOf( ':' );
@@ -469,19 +469,19 @@ namespace svxform
{
// legacy format: use the app-wide Basic, if it has a respective method, otherwise fall back to the doc's Basic
if ( SFX_APP()->GetBasicManager()->HasMacro( sScriptCode ) )
- sMacroLocation = ::rtl::OUString( "application" );
+ sMacroLocation = OUString( "application" );
else
- sMacroLocation = ::rtl::OUString( "document" );
+ sMacroLocation = OUString( "document" );
}
- ::rtl::OUStringBuffer aScriptURI;
+ OUStringBuffer aScriptURI;
aScriptURI.appendAscii( "vnd.sun.star.script:" );
aScriptURI.append( sScriptCode );
aScriptURI.appendAscii( "?language=Basic" );
aScriptURI.appendAscii( "&location=" );
aScriptURI.append( sMacroLocation );
- const ::rtl::OUString sScriptURI( aScriptURI.makeStringAndClear() );
+ const OUString sScriptURI( aScriptURI.makeStringAndClear() );
pScript.reset( new NewStyleUNOScript( *xObjectShell, sScriptURI ) );
}
diff --git a/svx/source/form/fmservs.cxx b/svx/source/form/fmservs.cxx
index dac2e255754e..14834685e6a3 100644
--- a/svx/source/form/fmservs.cxx
+++ b/svx/source/form/fmservs.cxx
@@ -29,8 +29,8 @@
#define REGISTER_SERVICE(ImplName, ServiceName) \
sString = (ServiceName); \
xSingleFactory = ::cppu::createSingleFactory(xServiceFactory, \
- ::rtl::OUString(), ImplName##_NewInstance_Impl, \
- ::com::sun::star::uno::Sequence< ::rtl::OUString>(&sString, 1)); \
+ OUString(), ImplName##_NewInstance_Impl, \
+ ::com::sun::star::uno::Sequence< OUString>(&sString, 1)); \
if (xSingleFactory.is()) \
xSet->insert(::com::sun::star::uno::makeAny(xSingleFactory));
@@ -47,8 +47,8 @@ namespace svxform
#define DECL_SELFAWARE_SERVICE( ClassName ) \
::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL ClassName##_Create( \
const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& ); \
- ::rtl::OUString SAL_CALL ClassName##_GetImplementationName(); \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ClassName##_GetSupportedServiceNames(); \
+ OUString SAL_CALL ClassName##_GetImplementationName(); \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL ClassName##_GetSupportedServiceNames(); \
#define REGISTER_SELFAWARE_SERVICE( ClassName ) \
@@ -72,15 +72,15 @@ namespace svxform
if (!xSet.is())
return;
- ::com::sun::star::uno::Sequence< ::rtl::OUString> aServices;
+ ::com::sun::star::uno::Sequence< OUString> aServices;
::com::sun::star::uno::Reference< ::com::sun::star::lang::XSingleServiceFactory > xSingleFactory;
- ::rtl::OUString sString;
+ OUString sString;
// ------------------------------------------------------------------------
// FormController
REGISTER_SERVICE( FormController, OUString( "com.sun.star.form.runtime.FormController" ) );
- REGISTER_SERVICE( LegacyFormController, ::rtl::OUString( "com.sun.star.form.FormController" ) );
+ REGISTER_SERVICE( LegacyFormController, OUString( "com.sun.star.form.FormController" ) );
// ------------------------------------------------------------------------
// FormController
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index ca72d6757eaf..273aca1f58c1 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -223,7 +223,7 @@ FmFormShell::FmFormShell( SfxViewShell* _pParent, FmFormView* pView )
{
m_pImpl->acquire();
SetPool( &SFX_APP()->GetPool() );
- SetName( rtl::OUString("Form") );
+ SetName( OUString("Form") );
SetView(m_pFormView);
}
@@ -773,7 +773,7 @@ void FmFormShell::Execute(SfxRequest &rReq)
}
if ( nRecord != -1 )
- rController->execute( nSlot, ::rtl::OUString( "Position" ), makeAny( (sal_Int32)nRecord ) );
+ rController->execute( nSlot, OUString( "Position" ), makeAny( (sal_Int32)nRecord ) );
rReq.Done();
} break;
@@ -1138,7 +1138,7 @@ void FmFormShell::GetFormState(SfxItemSet &rSet, sal_uInt16 nWhich)
}
else if ( SID_FM_RECORD_TOTAL == nWhich )
{
- ::rtl::OUString sTotalCount;
+ OUString sTotalCount;
aState.State >>= sTotalCount;
rSet.Put( SfxStringItem( nWhich, sTotalCount ) );
}
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx
index 1685ace8d980..bed1a3190605 100644
--- a/svx/source/form/fmshimp.cxx
+++ b/svx/source/form/fmshimp.cxx
@@ -410,7 +410,7 @@ namespace
const Type* pCurrentListeners = pCurrentArray->getConstArray();
for (j=0; j<pCurrentArray->getLength(); ++j, ++pCurrentListeners)
{
- rtl::OUString aListener = (*pCurrentListeners).getTypeName();
+ OUString aListener = (*pCurrentListeners).getTypeName();
sal_Int32 nTokens = comphelper::string::getTokenCount(aListener, '.');
if (nTokens)
aListener = comphelper::string::getToken(aListener, nTokens - 1, '.');
@@ -420,9 +420,9 @@ namespace
continue;
// now check the methods
- Sequence< ::rtl::OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners);
+ Sequence< OUString> aMethodsNames = ::comphelper::getEventMethodsForType(*pCurrentListeners);
- const ::rtl::OUString* pMethodsNames = aMethodsNames.getConstArray();
+ const OUString* pMethodsNames = aMethodsNames.getConstArray();
for (k=0; k<aMethodsNames.getLength(); ++k, ++pMethodsNames)
{
if ((*pMethodsNames).compareTo(pCurrent->EventMethod) != COMPARE_EQUAL)
@@ -447,7 +447,7 @@ namespace
}
//------------------------------------------------------------------------------
- ::rtl::OUString getServiceNameByControlType(sal_Int16 nType)
+ OUString getServiceNameByControlType(sal_Int16 nType)
{
switch (nType)
{
@@ -474,7 +474,7 @@ namespace
case OBJ_FM_SPINBUTTON : return FM_SUN_COMPONENT_SPINBUTTON;
case OBJ_FM_NAVIGATIONBAR : return FM_SUN_COMPONENT_NAVIGATIONBAR;
}
- return ::rtl::OUString();
+ return OUString();
}
}
@@ -483,7 +483,7 @@ namespace
// check if the control has one of the interfaces we can use for searching
// *_pCurrentText will be filled with the current text of the control (as used when searching this control)
sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>& _rxControl,
- ::rtl::OUString* _pCurrentText )
+ OUString* _pCurrentText )
{
if ( !_rxControl.is() )
return sal_False;
@@ -511,9 +511,9 @@ sal_Bool IsSearchableControl( const ::com::sun::star::uno::Reference< ::com::sun
{
switch ( (::TriState)xCheckBox->getState() )
{
- case STATE_NOCHECK: *_pCurrentText = ::rtl::OUString("0" ); break;
- case STATE_CHECK: *_pCurrentText = ::rtl::OUString("1" ); break;
- default: *_pCurrentText = ::rtl::OUString(); break;
+ case STATE_NOCHECK: *_pCurrentText = OUString("0" ); break;
+ case STATE_CHECK: *_pCurrentText = OUString("1" ); break;
+ default: *_pCurrentText = OUString(); break;
}
}
return sal_True;
@@ -639,7 +639,7 @@ DBG_NAME(FmXFormShell);
//------------------------------------------------------------------------
FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
:FmXFormShell_BASE(m_aMutex)
- ,FmXFormShell_CFGBASE(::rtl::OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE)
+ ,FmXFormShell_CFGBASE(OUString("Office.Common/Misc"), CONFIG_MODE_DELAYED_UPDATE)
,m_eNavigate( NavigationBarMode_NONE )
,m_nInvalidationEvent( 0 )
,m_nActivationEvent( 0 )
@@ -676,8 +676,8 @@ FmXFormShell::FmXFormShell( FmFormShell& _rShell, SfxViewFrame* _pViewFrame )
// cache the current configuration settings we're interested in
implAdjustConfigCache();
// and register for changes on this settings
- Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString("FormControlPilotsEnabled");
+ Sequence< OUString > aNames(1);
+ aNames[0] = OUString("FormControlPilotsEnabled");
EnableNotification(aNames);
}
@@ -1165,7 +1165,7 @@ bool FmXFormShell::executeControlConversionSlot( const Reference< XFormComponent
if ( !pFormObject )
return false;
- ::rtl::OUString sNewName( getServiceNameByControlType( nObjectTypes[ lookupSlot ] ) );
+ OUString sNewName( getServiceNameByControlType( nObjectTypes[ lookupSlot ] ) );
Reference< XControlModel> xNewModel( ::comphelper::getProcessServiceFactory()->createInstance( sNewName ), UNO_QUERY );
if (!xNewModel.is())
return false;
@@ -1473,11 +1473,11 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >
{
Sequence< Any > aDialogArgs( 3 );
aDialogArgs[0] <<= NamedValue(
- ::rtl::OUString( "TabbingModel" ),
+ OUString( "TabbingModel" ),
makeAny( _rxForForm )
);
aDialogArgs[1] <<= NamedValue(
- ::rtl::OUString( "ControlContext" ),
+ OUString( "ControlContext" ),
makeAny( getControlContainerForView() )
);
@@ -1485,13 +1485,13 @@ void FmXFormShell::ExecuteTabOrderDialog( const Reference< XTabControllerModel >
if ( m_pShell->GetViewShell() && m_pShell->GetViewShell()->GetViewFrame() )
xParentWindow = VCLUnoHelper::GetInterface ( &m_pShell->GetViewShell()->GetViewFrame()->GetWindow() );
aDialogArgs[2] <<= NamedValue(
- ::rtl::OUString( "ParentWindow" ),
+ OUString( "ParentWindow" ),
makeAny( xParentWindow )
);
Reference< dialogs::XExecutableDialog > xDialog(
::comphelper::getProcessServiceFactory()->createInstanceWithArguments(
- ::rtl::OUString( "com.sun.star.form.ui.TabOrderDialog" ),
+ OUString( "com.sun.star.form.ui.TabOrderDialog" ),
aDialogArgs
),
UNO_QUERY
@@ -1517,7 +1517,7 @@ void FmXFormShell::ExecuteSearch()
FmFormArray aEmpty;
m_aSearchForms.swap( aEmpty );
::std::vector< OUString > aContextNames;
- impl_collectFormSearchContexts_nothrow( m_pShell->GetCurPage()->GetForms(), ::rtl::OUString(), m_aSearchForms, aContextNames );
+ impl_collectFormSearchContexts_nothrow( m_pShell->GetCurPage()->GetForms(), OUString(), m_aSearchForms, aContextNames );
OSL_POSTCOND( m_aSearchForms.size() == aContextNames.size(),
"FmXFormShell::ExecuteSearch: nonsense!" );
if ( m_aSearchForms.size() != aContextNames.size() )
@@ -1618,7 +1618,7 @@ void FmXFormShell::ExecuteSearch()
Reference< XIndexAccess> xColControls(xGridPeer, UNO_QUERY);
Reference< XInterface> xCurControl;
xColControls->getByIndex(nViewCol) >>= xCurControl;
- ::rtl::OUString sInitialText;
+ OUString sInitialText;
if (IsSearchableControl(xCurControl, &sInitialText))
strInitialText = sInitialText.getStr();
}
@@ -1679,7 +1679,7 @@ sal_Bool FmXFormShell::GetY2KState(sal_uInt16& n)
{
try
{
- Any aVal( xSet->getPropertyValue(::rtl::OUString("TwoDigitDateStart")) );
+ Any aVal( xSet->getPropertyValue(OUString("TwoDigitDateStart")) );
aVal >>= n;
return sal_True;
}
@@ -1712,7 +1712,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
{
Any aVal;
aVal <<= n;
- xSet->setPropertyValue(::rtl::OUString("TwoDigitDateStart"), aVal);
+ xSet->setPropertyValue(OUString("TwoDigitDateStart"), aVal);
}
catch(Exception&)
{
@@ -1753,7 +1753,7 @@ void FmXFormShell::SetY2KState(sal_uInt16 n)
{
Any aVal;
aVal <<= n;
- xSet->setPropertyValue(::rtl::OUString("TwoDigitDateStart"), aVal);
+ xSet->setPropertyValue(OUString("TwoDigitDateStart"), aVal);
}
catch(Exception&)
{
@@ -2159,7 +2159,7 @@ void FmXFormShell::startListening()
// TODO: this is strange - shouldn't this depend on a isLoaded instead of
// a "has command value"? Finally, the command value only means that it was
// intended to be loaded, not that it actually *is* loaded
- ::rtl::OUString aSource = ::comphelper::getString(xActiveFormSet->getPropertyValue(FM_PROP_COMMAND));
+ OUString aSource = ::comphelper::getString(xActiveFormSet->getPropertyValue(FM_PROP_COMMAND));
if (!aSource.isEmpty())
{
m_bDatabaseBar = sal_True;
@@ -2421,7 +2421,7 @@ IMPL_LINK(FmXFormShell, OnSearchContextRequest, FmSearchContext*, pfmscContextIn
FmFormPage* pCurrentPage = m_pShell->GetCurPage();
DBG_ASSERT(pCurrentPage!=NULL, "FmXFormShell::OnSearchContextRequest : no page !");
// Search all SdrControls of this page...
- ::rtl::OUString sControlSource, aName;
+ OUString sControlSource, aName;
SdrObjListIter aPageIter( *pCurrentPage );
while ( aPageIter.IsMore() )
@@ -2949,7 +2949,7 @@ Reference< XControl> FmXFormShell::impl_getControl( const Reference< XControlMod
//------------------------------------------------------------------------------
void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInterface>& _rxStartingPoint,
- const ::rtl::OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames )
+ const OUString& _rCurrentLevelPrefix, FmFormArray& _out_rForms, ::std::vector< OUString >& _out_rNames )
{
try
{
@@ -2961,8 +2961,8 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt
if ( nCount == 0 )
return;
- ::rtl::OUString sCurrentFormName;
- ::rtl::OUStringBuffer aNextLevelPrefix;
+ OUString sCurrentFormName;
+ OUStringBuffer aNextLevelPrefix;
for ( sal_Int32 i=0; i<nCount; ++i )
{
// is the current child a form?
@@ -2974,7 +2974,7 @@ void FmXFormShell::impl_collectFormSearchContexts_nothrow( const Reference< XInt
sCurrentFormName = xNamed->getName();
// the name of the current form
- ::rtl::OUStringBuffer sCompleteCurrentName( sCurrentFormName );
+ OUStringBuffer sCompleteCurrentName( sCurrentFormName );
if ( !_rCurrentLevelPrefix.isEmpty() )
{
sCompleteCurrentName.appendAscii( " (" );
@@ -3032,7 +3032,7 @@ void FmXFormShell::startFiltering()
{
Reference< XModeSelector> xModeSelector(*j, UNO_QUERY);
if (xModeSelector.is())
- xModeSelector->setMode( ::rtl::OUString( "FilterMode" ) );
+ xModeSelector->setMode( OUString( "FilterMode" ) );
}
}
@@ -3102,7 +3102,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
if ( pAdapter.is() )
{
const ::std::vector< Reference< runtime::XFormController > >& rControllerList = pAdapter->GetList();
- ::std::vector < ::rtl::OUString > aOriginalFilters;
+ ::std::vector < OUString > aOriginalFilters;
::std::vector < sal_Bool > aOriginalApplyFlags;
if (bSave)
@@ -3125,7 +3125,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
if (aOriginalFilters.size() == aOriginalApplyFlags.size())
// the first getPropertyValue failed -> use two dummies
- aOriginalFilters.push_back( ::rtl::OUString() );
+ aOriginalFilters.push_back( OUString() );
aOriginalApplyFlags.push_back( sal_False );
}
}
@@ -3138,7 +3138,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
Reference< XModeSelector> xModeSelector(*j, UNO_QUERY);
if (xModeSelector.is())
- xModeSelector->setMode( ::rtl::OUString( "DataMode" ) );
+ xModeSelector->setMode( OUString( "DataMode" ) );
}
if (bSave) // execute the filter
{
@@ -3162,7 +3162,7 @@ void FmXFormShell::stopFiltering(sal_Bool bSave)
if (!isRowSetAlive(xFormSet))
{ // something went wrong -> restore the original state
- ::rtl::OUString sOriginalFilter = aOriginalFilters[ j - rControllers.begin() ];
+ OUString sOriginalFilter = aOriginalFilters[ j - rControllers.begin() ];
sal_Bool bOriginalApplyFlag = aOriginalApplyFlags[ j - rControllers.begin() ];
try
{
@@ -3194,7 +3194,7 @@ void FmXFormShell::CreateExternalView()
// the frame the external view is displayed in
sal_Bool bAlreadyExistent = m_xExternalViewController.is();
Reference< ::com::sun::star::frame::XFrame> xExternalViewFrame;
- ::rtl::OUString sFrameName("_beamer");
+ OUString sFrameName("_beamer");
sal_Int32 nSearchFlags = ::com::sun::star::frame::FrameSearchFlag::CHILDREN | ::com::sun::star::frame::FrameSearchFlag::CREATE;
Reference< runtime::XFormController > xCurrentNavController( getNavController());
@@ -3278,7 +3278,7 @@ void FmXFormShell::CreateExternalView()
URL aClearURL;
aClearURL.Complete = FMURL_GRIDVIEW_CLEARVIEW;
- Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, ::rtl::OUString(), 0));
+ Reference< ::com::sun::star::frame::XDispatch> xClear( xCommLink->queryDispatch(aClearURL, OUString(), 0));
if (xClear.is())
xClear->dispatch(aClearURL, Sequence< PropertyValue>());
}
@@ -3295,10 +3295,10 @@ void FmXFormShell::CreateExternalView()
// collect the dispatchers we will need
URL aAddColumnURL;
aAddColumnURL.Complete = FMURL_GRIDVIEW_ADDCOLUMN;
- Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, ::rtl::OUString(), 0));
+ Reference< ::com::sun::star::frame::XDispatch> xAddColumnDispatch( xCommLink->queryDispatch(aAddColumnURL, OUString(), 0));
URL aAttachURL;
aAttachURL.Complete = FMURL_GRIDVIEW_ATTACHTOFORM;
- Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, ::rtl::OUString(), 0));
+ Reference< ::com::sun::star::frame::XDispatch> xAttachDispatch( xCommLink->queryDispatch(aAttachURL, OUString(), 0));
if (xAddColumnDispatch.is() && xAttachDispatch.is())
{
@@ -3309,7 +3309,7 @@ void FmXFormShell::CreateExternalView()
sal_Int16 nAddedColumns = 0;
// for radio buttons we need some special structures
- typedef std::map< OUString, Sequence< ::rtl::OUString> > MapUString2UstringSeq;
+ typedef std::map< OUString, Sequence< OUString> > MapUString2UstringSeq;
typedef std::map< OUString, OUString > FmMapUString2UString;
typedef std::map< OUString, sal_Int16 > FmMapUString2Int16;
@@ -3321,7 +3321,7 @@ void FmXFormShell::CreateExternalView()
FmXBoundFormFieldIterator aModelIterator(xCurrentNavController->getModel());
Reference< XPropertySet> xCurrentModelSet;
Any aCurrentBoundField;
- ::rtl::OUString sColumnType,aGroupName,sControlSource;
+ OUString sColumnType,aGroupName,sControlSource;
Sequence< Property> aProps;
Reference< XPropertySet> xCurrentBoundField;
while ((xCurrentModelSet = Reference< XPropertySet>(aModelIterator.Next(), UNO_QUERY)).is())
@@ -3340,13 +3340,13 @@ void FmXFormShell::CreateExternalView()
aGroupName = getLabelName(xCurrentModelSet);
// add the reference value of the radio button to the list source sequence
- Sequence< ::rtl::OUString>& aThisGroupLabels = aRadioListSources[aGroupName];
+ Sequence< OUString>& aThisGroupLabels = aRadioListSources[aGroupName];
sal_Int32 nNewSizeL = aThisGroupLabels.getLength() + 1;
aThisGroupLabels.realloc(nNewSizeL);
aThisGroupLabels.getArray()[nNewSizeL - 1] = ::comphelper::getString(xCurrentModelSet->getPropertyValue(FM_PROP_REFVALUE));
// add the label to the value list sequence
- Sequence< ::rtl::OUString>& aThisGroupControlSources = aRadioValueLists[aGroupName];
+ Sequence< OUString>& aThisGroupControlSources = aRadioValueLists[aGroupName];
sal_Int32 nNewSizeC = aThisGroupControlSources.getLength() + 1;
aThisGroupControlSources.realloc(nNewSizeC);
aThisGroupControlSources.getArray()[nNewSizeC - 1] = ::comphelper::getString(xCurrentModelSet->getPropertyValue(FM_PROP_LABEL));
@@ -3462,7 +3462,7 @@ void FmXFormShell::CreateExternalView()
aColumnProps.realloc(pColumnProps - aColumnProps.getArray());
// columns props are a dispatch argument
- pDispatchArgs->Name = ::rtl::OUString("ColumnProperties"); // TODO : fmurl.*
+ pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.*
pDispatchArgs->Value = makeAny(aColumnProps);
++pDispatchArgs;
DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3532,9 +3532,9 @@ void FmXFormShell::CreateExternalView()
// column type : listbox
pDispatchArgs->Name = FMARG_ADDCOL_COLUMNTYPE;
- ::rtl::OUString fColName = FM_COL_LISTBOX;
+ OUString fColName = FM_COL_LISTBOX;
pDispatchArgs->Value <<= fColName;
-// pDispatchArgs->Value <<= (::rtl::OUString)FM_COL_LISTBOX;
+// pDispatchArgs->Value <<= (OUString)FM_COL_LISTBOX;
++pDispatchArgs;
// column position
@@ -3549,7 +3549,7 @@ void FmXFormShell::CreateExternalView()
++pDispatchArgs;
// the
- pDispatchArgs->Name = ::rtl::OUString("ColumnProperties"); // TODO : fmurl.*
+ pDispatchArgs->Name = OUString("ColumnProperties"); // TODO : fmurl.*
pDispatchArgs->Value = makeAny(aListBoxDescription);
++pDispatchArgs;
DBG_ASSERT(nDispatchArgs == (pDispatchArgs - aDispatchArgs.getConstArray()),
@@ -3599,21 +3599,21 @@ void FmXFormShell::CreateExternalView()
void FmXFormShell::implAdjustConfigCache()
{
// get (cache) the wizard usage flag
- Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString("FormControlPilotsEnabled");
+ Sequence< OUString > aNames(1);
+ aNames[0] = OUString("FormControlPilotsEnabled");
Sequence< Any > aFlags = GetProperties(aNames);
if (1 == aFlags.getLength())
m_bUseWizards = ::cppu::any2bool(aFlags[0]);
}
//------------------------------------------------------------------------
-void FmXFormShell::Notify( const com::sun::star::uno::Sequence< rtl::OUString >& _rPropertyNames)
+void FmXFormShell::Notify( const com::sun::star::uno::Sequence< OUString >& _rPropertyNames)
{
if ( impl_checkDisposed() )
return;
- const ::rtl::OUString* pSearch = _rPropertyNames.getConstArray();
- const ::rtl::OUString* pSearchTil = pSearch + _rPropertyNames.getLength();
+ const OUString* pSearch = _rPropertyNames.getConstArray();
+ const OUString* pSearchTil = pSearch + _rPropertyNames.getLength();
for (;pSearch < pSearchTil; ++pSearch)
if (0 == pSearch->compareToAscii("FormControlPilotsEnabled"))
{
@@ -3631,8 +3631,8 @@ void FmXFormShell::SetWizardUsing(sal_Bool _bUseThem)
{
m_bUseWizards = _bUseThem;
- Sequence< ::rtl::OUString > aNames(1);
- aNames[0] = ::rtl::OUString("FormControlPilotsEnabled");
+ Sequence< OUString > aNames(1);
+ aNames[0] = OUString("FormControlPilotsEnabled");
Sequence< Any > aValues(1);
aValues[0] = ::cppu::bool2any(m_bUseWizards);
PutProperties(aNames, aValues);
@@ -3795,8 +3795,8 @@ void FmXFormShell::smartControlReset( const Reference< XIndexAccess >& _rxModels
return;
}
- static const ::rtl::OUString sClassIdPropertyName = FM_PROP_CLASSID;
- static const ::rtl::OUString sBoundFieldPropertyName = FM_PROP_BOUNDFIELD;
+ static const OUString sClassIdPropertyName = FM_PROP_CLASSID;
+ static const OUString sBoundFieldPropertyName = FM_PROP_BOUNDFIELD;
sal_Int32 nCount = _rxModels->getCount();
Reference< XPropertySet > xCurrent;
Reference< XPropertySetInfo > xCurrentInfo;
@@ -3876,7 +3876,7 @@ namespace
if ( xConn.is() )
return sal_True;
- ::rtl::OUString sPropertyValue;
+ OUString sPropertyValue;
OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DATASOURCE ) >>= sPropertyValue );
if ( !sPropertyValue.isEmpty() )
return sal_True;
@@ -4076,7 +4076,7 @@ sal_Bool SearchableControlIterator::ShouldHandleElement(const Reference< XInterf
Any aClassId( xProperties->getPropertyValue(FM_PROP_CLASSID) );
if (::comphelper::getINT16(aClassId) == FormComponentType::GRIDCONTROL)
{
- m_sCurrentValue = ::rtl::OUString();
+ m_sCurrentValue = OUString();
return sal_True;
}
}
diff --git a/svx/source/form/fmsrccfg.cxx b/svx/source/form/fmsrccfg.cxx
index effb1bd4336b..32f58ced4229 100644
--- a/svx/source/form/fmsrccfg.cxx
+++ b/svx/source/form/fmsrccfg.cxx
@@ -112,7 +112,7 @@ namespace svxform
return s_aSearchPositionMap;
}
- static sal_Int16 lcl_implMapAsciiValue( const ::rtl::OUString& _rAsciiValue, const Ascii2Int16* _pMap )
+ static sal_Int16 lcl_implMapAsciiValue( const OUString& _rAsciiValue, const Ascii2Int16* _pMap )
{
// search the map for the given ascii value
const Ascii2Int16* pSearch = _pMap;
@@ -125,9 +125,9 @@ namespace svxform
}
OSL_FAIL(
- ( ::rtl::OString( "lcl_implMapAsciiValue: could not convert the ascii value " )
- += ::rtl::OString( _rAsciiValue.getStr(), _rAsciiValue.getLength(), RTL_TEXTENCODING_ASCII_US )
- += ::rtl::OString( " !" )
+ ( OString( "lcl_implMapAsciiValue: could not convert the ascii value " )
+ += OString( _rAsciiValue.getStr(), _rAsciiValue.getLength(), RTL_TEXTENCODING_ASCII_US )
+ += OString( " !" )
).getStr()
);
return -1;
@@ -146,9 +146,9 @@ namespace svxform
}
OSL_FAIL(
- ( ::rtl::OString( "lcl_implMapIntValue: could not convert the integer value " )
- += ::rtl::OString::valueOf( (sal_Int32)_nValue )
- += ::rtl::OString( " !" )
+ ( OString( "lcl_implMapIntValue: could not convert the integer value " )
+ += OString::valueOf( (sal_Int32)_nValue )
+ += OString( " !" )
).getStr()
);
static const sal_Char* s_pDummy = "";
@@ -248,10 +248,10 @@ namespace svxform
void FmSearchConfigItem::implTranslateToConfig( )
{
// the search-for string
- m_sSearchForType = ::rtl::OUString::createFromAscii( lcl_implMapIntValue( nSearchForType, lcl_getSearchForTypeValueMap() ) );
+ m_sSearchForType = OUString::createFromAscii( lcl_implMapIntValue( nSearchForType, lcl_getSearchForTypeValueMap() ) );
// the search position
- m_sSearchPosition = ::rtl::OUString::createFromAscii( lcl_implMapIntValue( nPosition, lcl_getSearchPositionValueMap() ) );
+ m_sSearchPosition = OUString::createFromAscii( lcl_implMapIntValue( nPosition, lcl_getSearchPositionValueMap() ) );
// the transliteration flags
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index bdd0d75528d9..2e393f0fdc08 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -169,7 +169,7 @@ SimpleTextWrapper::SimpleTextWrapper(const Reference< ::com::sun::star::awt::XTe
}
//------------------------------------------------------------------------
-::rtl::OUString SimpleTextWrapper::getCurrentText() const
+OUString SimpleTextWrapper::getCurrentText() const
{
return m_xText->getText();
}
@@ -183,7 +183,7 @@ ListBoxWrapper::ListBoxWrapper(const Reference< ::com::sun::star::awt::XListBox
}
//------------------------------------------------------------------------
-::rtl::OUString ListBoxWrapper::getCurrentText() const
+OUString ListBoxWrapper::getCurrentText() const
{
return m_xBox->getSelectedItem();
}
@@ -197,15 +197,15 @@ CheckBoxWrapper::CheckBoxWrapper(const Reference< ::com::sun::star::awt::XCheckB
}
//------------------------------------------------------------------------
-::rtl::OUString CheckBoxWrapper::getCurrentText() const
+OUString CheckBoxWrapper::getCurrentText() const
{
switch ((TriState)m_xBox->getState())
{
- case STATE_NOCHECK: return rtl::OUString("0");
- case STATE_CHECK: return rtl::OUString("1");
+ case STATE_NOCHECK: return OUString("0");
+ case STATE_CHECK: return OUString("1");
default: break;
}
- return rtl::OUString();
+ return OUString();
}
//========================================================================
@@ -239,9 +239,9 @@ sal_Bool FmSearchEngine::MoveCursor()
catch(::com::sun::star::sdbc::SQLException const& e)
{
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM(
"FmSearchEngine::MoveCursor : catched a DatabaseException ("));
- sDebugMessage.append(rtl::OUStringToOString(e.SQLState, RTL_TEXTENCODING_ASCII_US));
+ sDebugMessage.append(OUStringToOString(e.SQLState, RTL_TEXTENCODING_ASCII_US));
sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !"));
OSL_FAIL(sDebugMessage.getStr());
#else
@@ -252,9 +252,9 @@ sal_Bool FmSearchEngine::MoveCursor()
catch(Exception const& e)
{
#if OSL_DEBUG_LEVEL > 0
- rtl::OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM(
+ OStringBuffer sDebugMessage(RTL_CONSTASCII_STRINGPARAM(
"FmSearchEngine::MoveCursor : catched an Exception ("));
- sDebugMessage.append(rtl::OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US));
+ sDebugMessage.append(OUStringToOString(e.Message, RTL_TEXTENCODING_ASCII_US));
sDebugMessage.append(RTL_CONSTASCII_STRINGPARAM(") !"));
OSL_FAIL(sDebugMessage.getStr());
#else
@@ -331,15 +331,15 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::
}
//------------------------------------------------------------------------
-::rtl::OUString FmSearchEngine::FormatField(const FieldInfo& rField)
+OUString FmSearchEngine::FormatField(const FieldInfo& rField)
{
DBG_ASSERT(!m_bUsingTextComponents, "FmSearchEngine::FormatField : im UsingTextComponents-Mode bitte FormatField(sal_Int32) benutzen !");
if (!m_xFormatter.is())
- return ::rtl::OUString();
+ return OUString();
// sonst werden Datumsflder zum Beispiel zu irgendeinem Default-Wert formatiert
- ::rtl::OUString sReturn;
+ OUString sReturn;
try
{
if (rField.bDoubleHandling)
@@ -350,7 +350,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::
}
else
{
- ::rtl::OUString sValue = rField.xContents->getString();
+ OUString sValue = rField.xContents->getString();
if (!rField.xContents->wasNull())
sReturn = m_xFormatter->formatString(rField.nFormatKey, sValue);
}
@@ -364,7 +364,7 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< ::com::sun::star::
}
//------------------------------------------------------------------------
-::rtl::OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
+OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
{
if (m_bUsingTextComponents)
{
@@ -465,7 +465,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchSpecial(sal_Bool _bSearchFor
}
//------------------------------------------------------------------------
-FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos,
+FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const OUString& strExpression, sal_Int32& nFieldPos,
FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
{
// die Startposition merken
@@ -493,7 +493,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri
}
// der aktuell zu vergleichende Inhalt
- ::rtl::OUString sCurrentCheck;
+ OUString sCurrentCheck;
if (m_bFormatter)
sCurrentCheck = FormatField(nFieldPos);
else
@@ -543,7 +543,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchWildcard(const ::rtl::OUStri
}
//------------------------------------------------------------------------
-FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::OUString& strExpression, sal_Int32& nFieldPos,
+FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const OUString& strExpression, sal_Int32& nFieldPos,
FieldCollectionIterator& iterFieldLoop, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd)
{
DBG_ASSERT(m_bLevenshtein || m_bRegular,
@@ -595,7 +595,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O
}
// der aktuell zu vergleichende Inhalt
- ::rtl::OUString sCurrentCheck;
+ OUString sCurrentCheck;
if (m_bFormatter)
sCurrentCheck = FormatField(nFieldPos);
else
@@ -671,7 +671,7 @@ FmSearchEngine::SEARCH_RESULT FmSearchEngine::SearchRegularApprox(const ::rtl::O
DBG_NAME(FmSearchEngine);
//------------------------------------------------------------------------
FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
- const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields,
+ const Reference< XResultSet > & xCursor, const OUString& sVisibleFields,
const Reference< XNumberFormatsSupplier > & xFormatSupplier, FMSEARCH_MODE eMode)
:m_xSearchCursor(xCursor)
@@ -710,7 +710,7 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
//------------------------------------------------------------------------
FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
- const Reference< XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields,
+ const Reference< XResultSet > & xCursor, const OUString& sVisibleFields,
const InterfaceArray& arrFields, FMSEARCH_MODE eMode)
:m_xSearchCursor(xCursor)
,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() )
@@ -826,7 +826,7 @@ void FmSearchEngine::fillControlTexts(const InterfaceArray& arrFields)
}
//------------------------------------------------------------------------
-void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
+void FmSearchEngine::Init(const OUString& sVisibleFields)
{
// analyze the fields
// additionally, create the mapping: because the list of used columns can be shorter than the list
@@ -871,12 +871,12 @@ void FmSearchEngine::Init(const ::rtl::OUString& sVisibleFields)
Reference< ::com::sun::star::sdbcx::XColumnsSupplier > xSupplyCols(IFACECAST(m_xSearchCursor), UNO_QUERY);
DBG_ASSERT(xSupplyCols.is(), "FmSearchEngine::Init : invalid cursor (no columns supplier) !");
Reference< ::com::sun::star::container::XNameAccess > xAllFieldNames = xSupplyCols->getColumns();
- Sequence< ::rtl::OUString > seqFieldNames = xAllFieldNames->getElementNames();
- ::rtl::OUString* pFieldNames = seqFieldNames.getArray();
+ Sequence< OUString > seqFieldNames = xAllFieldNames->getElementNames();
+ OUString* pFieldNames = seqFieldNames.getArray();
- ::rtl::OUString sCurrentField;
- ::rtl::OUString sVis(sVisibleFields.getStr());
+ OUString sCurrentField;
+ OUString sVis(sVisibleFields.getStr());
sal_Int32 nIndex = 0;
do
{
@@ -978,13 +978,13 @@ void FmSearchEngine::SearchNextImpl()
DBG_ASSERT(m_xSearchCursor.is(), "FmSearchEngine::SearchNextImpl : habe ungueltigen Iterator !");
// die Parameter der Suche
- ::rtl::OUString strSearchExpression(m_strSearchExpression); // brauche ich non-const
+ OUString strSearchExpression(m_strSearchExpression); // brauche ich non-const
if (!GetCaseSensitive())
// norm the string
strSearchExpression = m_aCharacterClassficator.lowercase(strSearchExpression);
if (!m_bRegular && !m_bLevenshtein)
- { // 'normale' Suche fuehre ich auf jeden Fall ueber WildCards durch, muss aber vorher je nach Modus den ::rtl::OUString anpassen
+ { // 'normale' Suche fuehre ich auf jeden Fall ueber WildCards durch, muss aber vorher je nach Modus den OUString anpassen
if (!m_bWildcard)
{ // da natuerlich in allen anderen Faellen auch * und ? im Suchstring erlaubt sind, aber nicht als WildCards zaehlen
@@ -1144,7 +1144,7 @@ void FmSearchEngine::CancelSearch()
}
//------------------------------------------------------------------------
-sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const ::rtl::OUString& sVisibleFields, const InterfaceArray& arrFields,
+sal_Bool FmSearchEngine::SwitchToContext(const Reference< ::com::sun::star::sdbc::XResultSet > & xCursor, const OUString& sVisibleFields, const InterfaceArray& arrFields,
sal_Int32 nFieldIndex)
{
DBG_ASSERT(!m_bSearchingCurrently, "FmSearchEngine::SwitchToContext : please do not call while I'm searching !");
@@ -1188,7 +1188,7 @@ void FmSearchEngine::ImplStartNextSearch()
}
//------------------------------------------------------------------------
-void FmSearchEngine::SearchNext(const ::rtl::OUString& strExpression)
+void FmSearchEngine::SearchNext(const OUString& strExpression)
{
m_strSearchExpression = strExpression;
m_eSearchForType = SEARCHFOR_STRING;
@@ -1203,7 +1203,7 @@ void FmSearchEngine::SearchNextSpecial(sal_Bool _bSearchForNull)
}
//------------------------------------------------------------------------
-void FmSearchEngine::StartOver(const ::rtl::OUString& strExpression)
+void FmSearchEngine::StartOver(const OUString& strExpression)
{
try
{
diff --git a/svx/source/form/fmtextcontrolshell.cxx b/svx/source/form/fmtextcontrolshell.cxx
index be8046f2498a..3e7f1aa2f8db 100644
--- a/svx/source/form/fmtextcontrolshell.cxx
+++ b/svx/source/form/fmtextcontrolshell.cxx
@@ -430,9 +430,9 @@ namespace svx
}
//....................................................................
- ::rtl::OUString lcl_getUnoSlotName( SfxApplication&, SfxSlotId _nSlotId )
+ OUString lcl_getUnoSlotName( SfxApplication&, SfxSlotId _nSlotId )
{
- ::rtl::OUString sSlotUnoName;
+ OUString sSlotUnoName;
SfxSlotPool& rSlotPool = SfxSlotPool::GetSlotPool( NULL );
const SfxSlot* pSlot = rSlotPool.GetSlot( _nSlotId );
@@ -456,15 +456,15 @@ namespace svx
if ( pAsciiUnoName )
{
- sSlotUnoName = ::rtl::OUString( ".uno:" );
- sSlotUnoName += ::rtl::OUString::createFromAscii( pAsciiUnoName );
+ sSlotUnoName = OUString( ".uno:" );
+ sSlotUnoName += OUString::createFromAscii( pAsciiUnoName );
}
#if OSL_DEBUG_LEVEL > 0
else
{
- ::rtl::OString sMessage( "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name!\n" );
+ OString sMessage( "lcl_getUnoSlotName: invalid slot id, or invalid slot, or no UNO name!\n" );
sMessage += "(slot id: ";
- sMessage += ::rtl::OString::valueOf( (sal_Int32)_nSlotId );
+ sMessage += OString::valueOf( (sal_Int32)_nSlotId );
sMessage += ")";
OSL_FAIL( sMessage.getStr() );
}
@@ -534,7 +534,7 @@ namespace svx
Reference< XPropertySetInfo > xPSI;
if ( xModelProps.is() )
xPSI = xModelProps->getPropertySetInfo();
- ::rtl::OUString sRichTextPropertyName = ::rtl::OUString( "RichText" );
+ OUString sRichTextPropertyName = OUString( "RichText" );
if ( xPSI.is() && xPSI->hasPropertyByName( sRichTextPropertyName ) )
{
OSL_VERIFY( xModelProps->getPropertyValue( sRichTextPropertyName ) >>= bIsRichText );
@@ -593,13 +593,13 @@ namespace svx
{
SfxSlotId nSlotId( aFeature->first );
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OUString sUnoSlotName;
+ OUString sUnoSlotName;
if ( SFX_APP() )
sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotId );
else
- sUnoSlotName = ::rtl::OUString( "<unknown>" );
- ::rtl::OString sUnoSlotNameAscii( "\"" );
- sUnoSlotNameAscii += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US );
+ sUnoSlotName = OUString( "<unknown>" );
+ OString sUnoSlotNameAscii( "\"" );
+ sUnoSlotNameAscii += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US );
sUnoSlotNameAscii += "\"";
#endif
@@ -632,7 +632,7 @@ namespace svx
{
#if OSL_DEBUG_LEVEL > 0
bool bFeatureIsEnabled = aFeature->second->isFeatureEnabled();
- ::rtl::OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " );
+ OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " );
sMessage += sUnoSlotNameAscii;
if ( !bFeatureIsEnabled )
sMessage += " (disabled)";
@@ -644,7 +644,7 @@ namespace svx
#if OSL_DEBUG_LEVEL > 0
else
{
- ::rtl::OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " );
+ OString sMessage( "FmTextControlShell::transferFeatureStatesToItemSet: found a feature state for " );
sMessage += sUnoSlotNameAscii;
sMessage += ", but could not translate it into an item!";
OSL_TRACE( "%s", sMessage.getStr() );
@@ -732,7 +732,7 @@ namespace svx
if ( pBoolItem )
{
aArgs.realloc( 1 );
- aArgs[ 0 ].Name = ::rtl::OUString( "Enable" );
+ aArgs[ 0 ].Name = OUString( "Enable" );
aArgs[ 0 ].Value <<= (sal_Bool)pBoolItem->GetValue();
}
}
@@ -743,14 +743,14 @@ namespace svx
#if OSL_DEBUG_LEVEL > 0
else
{
- ::rtl::OString sError( "FmTextControShell::executeAttributeDialog: Could not handle the following item:" );
- sError += "\n SlotID: "; sError += ::rtl::OString::valueOf( (sal_Int32)nSlotForItemSet );
- sError += "\n WhichID: "; sError += ::rtl::OString::valueOf( (sal_Int32)nWhich );
+ OString sError( "FmTextControShell::executeAttributeDialog: Could not handle the following item:" );
+ sError += "\n SlotID: "; sError += OString::valueOf( (sal_Int32)nSlotForItemSet );
+ sError += "\n WhichID: "; sError += OString::valueOf( (sal_Int32)nWhich );
sError += "\n UNO name: ";
- ::rtl::OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet );
+ OUString sUnoSlotName = lcl_getUnoSlotName( *SFX_APP(), nSlotForItemSet );
if ( !sUnoSlotName.isEmpty() )
- sError += ::rtl::OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US );
+ sError += OString( sUnoSlotName.getStr(), sUnoSlotName.getLength(), RTL_TEXTENCODING_ASCII_US );
else
sError += "unknown (no SfxSlot)";
OSL_FAIL( sError.getStr() );
@@ -798,18 +798,18 @@ namespace svx
case SID_COPY:
case SID_CUT:
{
- ::rtl::OUString sSelectedText( m_xActiveTextComponent->getSelectedText() );
+ OUString sSelectedText( m_xActiveTextComponent->getSelectedText() );
::svt::OStringTransfer::CopyString( sSelectedText, lcl_getWindow( m_xActiveControl ) );
if ( SID_CUT == _nSlot )
{
awt::Selection aSelection( m_xActiveTextComponent->getSelection() );
- m_xActiveTextComponent->insertText( aSelection, ::rtl::OUString() );
+ m_xActiveTextComponent->insertText( aSelection, OUString() );
}
}
break;
case SID_PASTE:
{
- ::rtl::OUString sClipboardContent;
+ OUString sClipboardContent;
OSL_VERIFY( ::svt::OStringTransfer::PasteString( sClipboardContent, lcl_getWindow( m_xActiveControl ) ) );
awt::Selection aSelection( m_xActiveTextComponent->getSelection() );
m_xActiveTextComponent->insertText( aSelection, sClipboardContent );
@@ -1065,8 +1065,8 @@ namespace svx
void FmTextControlShell::formActivated( const Reference< XFormController >& _rxController )
{
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sTrace( "FmTextControlShell::formActivated: 0x" );
- sTrace += ::rtl::OString::valueOf( (sal_IntPtr)_rxController.get(), 16 );
+ OString sTrace( "FmTextControlShell::formActivated: 0x" );
+ sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
@@ -1093,8 +1093,8 @@ namespace svx
void FmTextControlShell::formDeactivated( const Reference< XFormController >& _rxController )
{
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sTrace( "FmTextControlShell::formDeactivated: 0x" );
- sTrace += ::rtl::OString::valueOf( (sal_IntPtr)_rxController.get(), 16 );
+ OString sTrace( "FmTextControlShell::formDeactivated: 0x" );
+ sTrace += OString::valueOf( (sal_IntPtr)_rxController.get(), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
(void)_rxController;
@@ -1324,7 +1324,7 @@ namespace svx
URL aFeatureURL;
aFeatureURL.Complete = lcl_getUnoSlotName( *_pApplication, _nSlot );
impl_parseURL_nothrow( aFeatureURL );
- Reference< XDispatch > xDispatcher = _rxProvider->queryDispatch( aFeatureURL, ::rtl::OUString(), 0xFF );
+ Reference< XDispatch > xDispatcher = _rxProvider->queryDispatch( aFeatureURL, OUString(), 0xFF );
if ( xDispatcher.is() )
return new FmTextControlFeature( xDispatcher, aFeatureURL, _nSlot, this );
return NULL;
@@ -1345,8 +1345,8 @@ namespace svx
Reference< XControl > xControl( _rEvent.Source, UNO_QUERY );
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sTrace( "FmTextControlShell::focusGained: 0x" );
- sTrace += ::rtl::OString::valueOf( (sal_IntPtr)xControl.get(), 16 );
+ OString sTrace( "FmTextControlShell::focusGained: 0x" );
+ sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
@@ -1361,8 +1361,8 @@ namespace svx
Reference< XControl > xControl( _rEvent.Source, UNO_QUERY );
#if OSL_DEBUG_LEVEL > 0
- ::rtl::OString sTrace( "FmTextControlShell::focusLost: 0x" );
- sTrace += ::rtl::OString::valueOf( (sal_IntPtr)xControl.get(), 16 );
+ OString sTrace( "FmTextControlShell::focusLost: 0x" );
+ sTrace += OString::valueOf( (sal_IntPtr)xControl.get(), 16 );
OSL_TRACE( "%s", sTrace.getStr() );
#endif
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 1a5df90fc9dc..ddeb875695ac 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -204,11 +204,11 @@ sal_Int32 getElementPos(const Reference< ::com::sun::star::container::XIndexAcce
}
//------------------------------------------------------------------
-::rtl::OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel)
+OUString getLabelName(const Reference< ::com::sun::star::beans::XPropertySet>& xControlModel)
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "fmtools::getLabelName" );
if (!xControlModel.is())
- return ::rtl::OUString();
+ return OUString();
if (::comphelper::hasProperty(FM_PROP_CONTROLLABEL, xControlModel))
{
@@ -371,7 +371,7 @@ sal_Int16 getControlTypeByObject(const Reference< ::com::sun::star::lang::XServi
if (!xPersistence.is())
return OBJ_FM_CONTROL;
- ::rtl::OUString sPersistentServiceName = xPersistence->getServiceName();
+ OUString sPersistentServiceName = xPersistence->getServiceName();
if (sPersistentServiceName.equals(FM_COMPONENT_EDIT)) // 5.0-Name
{
// may be a simple edit field or a formatted field, dependent of the supported services
diff --git a/svx/source/form/fmundo.cxx b/svx/source/form/fmundo.cxx
index 1177dae34fe3..d176abdf4978 100644
--- a/svx/source/form/fmundo.cxx
+++ b/svx/source/form/fmundo.cxx
@@ -121,7 +121,7 @@ private:
// SfxObjectShellRef is good here since the model controls the lifetime of the shell
SfxObjectShellRef const xObjectShell = m_rModel.GetObjectShell();
ENSURE_OR_THROW( xObjectShell.Is(), "no object shell!" );
- xListenerProps->setPropertyValue( ::rtl::OUString( "Model" ), makeAny( xObjectShell->GetModel() ) );
+ xListenerProps->setPropertyValue( OUString( "Model" ), makeAny( xObjectShell->GetModel() ) );
m_vbaListener = xScriptListener;
}
@@ -552,11 +552,11 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
return;
// if it's a "default value" property of a control model, set the according "value" property
- static ::rtl::OUString pDefaultValueProperties[] = {
+ static OUString pDefaultValueProperties[] = {
OUString(FM_PROP_DEFAULT_TEXT), OUString(FM_PROP_DEFAULTCHECKED), OUString(FM_PROP_DEFAULT_DATE), OUString(FM_PROP_DEFAULT_TIME),
OUString(FM_PROP_DEFAULT_VALUE), OUString(FM_PROP_DEFAULT_SELECT_SEQ), OUString(FM_PROP_EFFECTIVE_DEFAULT)
};
- const ::rtl::OUString aValueProperties[] = {
+ const OUString aValueProperties[] = {
OUString(FM_PROP_TEXT), OUString(FM_PROP_STATE), OUString(FM_PROP_DATE), OUString(FM_PROP_TIME),
OUString(FM_PROP_VALUE), OUString(FM_PROP_SELECT_SEQ), OUString(FM_PROP_EFFECTIVE_VALUE)
};
@@ -643,7 +643,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
if (::comphelper::hasProperty(FM_PROP_CONTROLSOURCEPROPERTY, xSet))
{
Any aControlSourceProperty = xSet->getPropertyValue(FM_PROP_CONTROLSOURCEPROPERTY);
- ::rtl::OUString sControlSourceProperty;
+ OUString sControlSourceProperty;
aControlSourceProperty >>= sControlSourceProperty;
aNewEntry.bIsValueProperty = (sControlSourceProperty.equals(evt.PropertyName));
@@ -691,7 +691,7 @@ void SAL_CALL FmXUndoEnvironment::propertyChange(const PropertyChangeEvent& evt)
// TODO: we should cache all those things, else this might be too expensive.
// However, this requires we're notified of changes in the value binding
- static const ::rtl::OUString s_sExternalData( "ExternalData" );
+ static const OUString s_sExternalData( "ExternalData" );
if ( xBindingPropsPSI.is() && xBindingPropsPSI->hasPropertyByName( s_sExternalData ) )
{
sal_Bool bExternalData = sal_True;
@@ -841,9 +841,9 @@ void FmXUndoEnvironment::TogglePropertyListening(const Reference< XInterface > &
if (xSet.is())
{
if (!bReadOnly)
- xSet->addPropertyChangeListener( ::rtl::OUString(), this );
+ xSet->addPropertyChangeListener( OUString(), this );
else
- xSet->removePropertyChangeListener( ::rtl::OUString(), this );
+ xSet->removePropertyChangeListener( OUString(), this );
}
}
@@ -920,9 +920,9 @@ void FmXUndoEnvironment::switchListening( const Reference< XInterface >& _rxObje
if ( xProps.is() )
{
if ( _bStartListening )
- xProps->addPropertyChangeListener( ::rtl::OUString(), this );
+ xProps->addPropertyChangeListener( OUString(), this );
else
- xProps->removePropertyChangeListener( ::rtl::OUString(), this );
+ xProps->removePropertyChangeListener( OUString(), this );
}
}
@@ -1044,12 +1044,12 @@ void FmUndoPropertyAction::Redo()
}
//------------------------------------------------------------------------------
-rtl::OUString FmUndoPropertyAction::GetComment() const
+OUString FmUndoPropertyAction::GetComment() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoPropertyAction::GetComment" );
String aStr(static_STR_UNDO_PROPERTY);
- aStr.SearchAndReplace( rtl::OUString('#'), aPropertyName );
+ aStr.SearchAndReplace( OUString('#'), aPropertyName );
return aStr;
}
@@ -1287,7 +1287,7 @@ void FmUndoModelReplaceAction::Undo()
Reference< XPropertySet > xCurrentAsSet( xCurrentModel, UNO_QUERY );
DBG_ASSERT( ::comphelper::hasProperty(FM_PROP_NAME, xCurrentAsSet ), "FmUndoModelReplaceAction::Undo : one of the models is invalid !");
- ::rtl::OUString sName;
+ OUString sName;
xCurrentAsSet->getPropertyValue( FM_PROP_NAME ) >>= sName;
xCurrentsParent->replaceByName( sName, makeAny( xComponent ) );
@@ -1304,7 +1304,7 @@ void FmUndoModelReplaceAction::Undo()
}
//------------------------------------------------------------------------------
-rtl::OUString FmUndoModelReplaceAction::GetComment() const
+OUString FmUndoModelReplaceAction::GetComment() const
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "FmUndoModelReplaceAction::GetComment" );
return SVX_RESSTR(RID_STR_UNDO_MODEL_REPLACE);
diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx
index 24bb95852a42..b18745e2f634 100644
--- a/svx/source/form/fmview.cxx
+++ b/svx/source/form/fmview.cxx
@@ -590,7 +590,7 @@ FmFormObj* FmFormView::getMarkedGrid() const
// -----------------------------------------------------------------------------
void FmFormView::createControlLabelPair( OutputDevice* _pOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
- sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
+ sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl )
{
FmXFormView::createControlLabelPair(
diff --git a/svx/source/form/fmvwimp.cxx b/svx/source/form/fmvwimp.cxx
index eaaa886bce45..3dc99ea74da4 100644
--- a/svx/source/form/fmvwimp.cxx
+++ b/svx/source/form/fmvwimp.cxx
@@ -723,7 +723,7 @@ IMPL_LINK(FmXFormView, OnActivate, void*, /*EMPTYTAG*/)
continue;
}
- const ::rtl::OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) );
+ const OUString aSource = ::comphelper::getString( xFormSet->getPropertyValue( FM_PROP_COMMAND ) );
if ( !aSource.isEmpty() )
{
FmXFormShell* pShImpl = m_pView->GetFormShell()->GetImpl();
@@ -1078,7 +1078,7 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
if ( !xWizard.is() )
{
- ShowServiceNotAvailableError( NULL, rtl::OUString::createFromAscii(pWizardAsciiName), sal_True );
+ ShowServiceNotAvailableError( NULL, OUString::createFromAscii(pWizardAsciiName), sal_True );
}
else
{
@@ -1102,8 +1102,8 @@ IMPL_LINK( FmXFormView, OnStartControlWizard, void*, /**/ )
namespace
{
void lcl_insertIntoFormComponentHierarchy_throw( const FmFormView& _rView, const SdrUnoObj& _rSdrObj,
- const Reference< XDataSource >& _rxDataSource = NULL, const ::rtl::OUString& _rDataSourceName = ::rtl::OUString(),
- const ::rtl::OUString& _rCommand = ::rtl::OUString(), const sal_Int32 _nCommandType = -1 )
+ const Reference< XDataSource >& _rxDataSource = NULL, const OUString& _rDataSourceName = OUString(),
+ const OUString& _rCommand = OUString(), const sal_Int32 _nCommandType = -1 )
{
FmFormPage& rPage = static_cast< FmFormPage& >( *_rView.GetSdrPageView()->GetPage() );
@@ -1126,11 +1126,11 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
if ( !m_pView->IsDesignMode() )
return NULL;
- ::rtl::OUString sCommand, sFieldName;
+ OUString sCommand, sFieldName;
sal_Int32 nCommandType = CommandType::COMMAND;
SharedConnection xConnection;
- ::rtl::OUString sDataSource = _rColumnDescriptor.getDataSource();
+ OUString sDataSource = _rColumnDescriptor.getDataSource();
_rColumnDescriptor[ daCommand ] >>= sCommand;
_rColumnDescriptor[ daColumnName ] >>= sFieldName;
_rColumnDescriptor[ daCommandType ] >>= nCommandType;
@@ -1169,8 +1169,8 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
if ( !xConnection.is() )
xConnection.reset( OStaticDataAccessTools().getConnection_withFeedback(
sDataSource,
- ::rtl::OUString(),
- ::rtl::OUString(),
+ OUString(),
+ OUString(),
m_aContext.getUNOContext()
) );
}
@@ -1214,7 +1214,7 @@ SdrObject* FmXFormView::implCreateFieldControl( const ::svx::ODataAccessDescript
Reference< XNumberFormatsSupplier > xSupplier( aDBATools.getNumberFormats( xConnection, sal_False ), UNO_SET_THROW );
Reference< XNumberFormats > xNumberFormats( xSupplier->getNumberFormats(), UNO_SET_THROW );
- ::rtl::OUString sLabelPostfix;
+ OUString sLabelPostfix;
////////////////////////////////////////////////////////////////
// nur fuer Textgroesse
@@ -1367,7 +1367,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
{
// determine the table/query field which we should create a control for
Reference< XNumberFormats > xNumberFormats;
- ::rtl::OUString sLabelPostfix = _rDesc.szName;
+ OUString sLabelPostfix = _rDesc.szName;
////////////////////////////////////////////////////////////////
// nur fuer Textgroesse
@@ -1401,11 +1401,11 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
//////////////////////////////////////////////////////////////////////
// The service name decides which control should be created
sal_uInt16 nOBJID = OBJ_FM_EDIT;
- if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_SUN_COMPONENT_NUMERICFIELD))
+ if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_NUMERICFIELD))
nOBJID = OBJ_FM_NUMERICFIELD;
- if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_SUN_COMPONENT_CHECKBOX))
+ if(OUString(_rDesc.szServiceName).equals((OUString)FM_SUN_COMPONENT_CHECKBOX))
nOBJID = OBJ_FM_CHECKBOX;
- if(::rtl::OUString(_rDesc.szServiceName).equals((::rtl::OUString)FM_COMPONENT_COMMANDBUTTON))
+ if(OUString(_rDesc.szServiceName).equals((OUString)FM_COMPONENT_COMMANDBUTTON))
nOBJID = OBJ_FM_BUTTON;
typedef ::com::sun::star::form::submission::XSubmission XSubmission_t;
@@ -1462,7 +1462,7 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
// set the button label
Reference< XPropertySet > xControlSet(pControl->GetUnoControlModel(), UNO_QUERY);
- xControlSet->setPropertyValue(FM_PROP_LABEL, makeAny(::rtl::OUString(_rDesc.szName)));
+ xControlSet->setPropertyValue(FM_PROP_LABEL, makeAny(OUString(_rDesc.szName)));
// connect the submission with the submission supplier (aka the button)
xControlSet->setPropertyValue( FM_PROP_BUTTON_TYPE,
@@ -1486,10 +1486,10 @@ SdrObject* FmXFormView::implCreateXFormsControl( const ::svx::OXFormsDescriptor
//------------------------------------------------------------------------
bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM,
const Reference< XPropertySet >& _rxField, const Reference< XNumberFormats >& _rxNumberFormats,
- sal_uInt16 _nControlObjectID, const ::rtl::OUString& _rFieldPostfix,
+ sal_uInt16 _nControlObjectID, const OUString& _rFieldPostfix,
SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl,
- const Reference< XDataSource >& _rxDataSource, const ::rtl::OUString& _rDataSourceName,
- const ::rtl::OUString& _rCommand, const sal_Int32 _nCommandType )
+ const Reference< XDataSource >& _rxDataSource, const OUString& _rDataSourceName,
+ const OUString& _rCommand, const sal_Int32 _nCommandType )
{
if ( !createControlLabelPair( m_aContext, _rOutDev, _nXOffsetMM, _nYOffsetMM,
_rxField, _rxNumberFormats, _nControlObjectID, _rFieldPostfix, FmFormInventor, OBJ_FM_FIXEDTEXT,
@@ -1515,11 +1515,11 @@ bool FmXFormView::createControlLabelPair( OutputDevice& _rOutDev, sal_Int32 _nXO
bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext& _rContext,
OutputDevice& _rOutDev, sal_Int32 _nXOffsetMM, sal_Int32 _nYOffsetMM, const Reference< XPropertySet >& _rxField,
const Reference< XNumberFormats >& _rxNumberFormats, sal_uInt16 _nControlObjectID,
- const ::rtl::OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
+ const OUString& _rFieldPostfix, sal_uInt32 _nInventor, sal_uInt16 _nLabelObjectID,
SdrPage* _pLabelPage, SdrPage* _pControlPage, SdrModel* _pModel, SdrUnoObj*& _rpLabel, SdrUnoObj*& _rpControl)
{
sal_Int32 nDataType = 0;
- ::rtl::OUString sFieldName;
+ OUString sFieldName;
Any aFieldName;
if ( _rxField.is() )
{
@@ -1567,7 +1567,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
xLabelModel.set( pLabel->GetUnoControlModel(), UNO_QUERY );
if ( xLabelModel.is() )
{
- ::rtl::OUString sLabel;
+ OUString sLabel;
if ( _rxField.is() && _rxField->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
_rxField->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
if ( sLabel.isEmpty() )
@@ -1576,7 +1576,7 @@ bool FmXFormView::createControlLabelPair( const ::comphelper::ComponentContext&
xLabelModel->setPropertyValue( FM_PROP_LABEL, makeAny( sLabel + _rFieldPostfix ) );
String sObjectLabel( SVX_RES( RID_STR_OBJECT_LABEL ) );
sObjectLabel.SearchAndReplaceAllAscii( "#object#", sFieldName );
- xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( ::rtl::OUString( sObjectLabel ) ) );
+ xLabelModel->setPropertyValue( FM_PROP_NAME, makeAny( OUString( sObjectLabel ) ) );
}
pLabel->SetLogicRect( ::Rectangle(
diff --git a/svx/source/form/formcontrolfactory.cxx b/svx/source/form/formcontrolfactory.cxx
index 3992a40aaa78..5197304149c6 100644
--- a/svx/source/form/formcontrolfactory.cxx
+++ b/svx/source/form/formcontrolfactory.cxx
@@ -142,12 +142,12 @@ namespace svxform
namespace
{
//....................................................................
- static ::rtl::OUString lcl_getUniqueLabel_nothrow( const Reference< XPropertySet >& _rxControlModel, const ::rtl::OUString& _rBaseLabel )
+ static OUString lcl_getUniqueLabel_nothrow( const Reference< XPropertySet >& _rxControlModel, const OUString& _rBaseLabel )
{
- ::rtl::OUString sLabel( _rBaseLabel );
+ OUString sLabel( _rBaseLabel );
try
{
- typedef ::std::set< ::rtl::OUString > StringBag;
+ typedef ::std::set< OUString > StringBag;
StringBag aUsedLabels;
Reference< XFormComponent > xFormComponent( _rxControlModel, UNO_QUERY_THROW );
@@ -163,7 +163,7 @@ namespace svxform
if ( !xPSI->hasPropertyByName( FM_PROP_LABEL ) )
continue;
- ::rtl::OUString sElementLabel;
+ OUString sElementLabel;
OSL_VERIFY( xElement->getPropertyValue( FM_PROP_LABEL ) >>= sElementLabel );
aUsedLabels.insert( sElementLabel );
}
@@ -172,7 +172,7 @@ namespace svxform
sal_Int32 i=2;
while ( aUsedLabels.find( sLabel ) != aUsedLabels.end() )
{
- ::rtl::OUStringBuffer aBuffer( _rBaseLabel );
+ OUStringBuffer aBuffer( _rBaseLabel );
aBuffer.appendAscii( " " );
aBuffer.append( (sal_Int32)i++ );
sLabel = aBuffer.makeStringAndClear();
@@ -208,14 +208,14 @@ namespace svxform
OSL_ENSURE( xForm.is(), "lcl_getDataSourceIndirectProperties: could not determine the form!" );
if ( !xForm.is() )
return aInfo;
- ::rtl::OUString sDataSourceName;
+ OUString sDataSourceName;
xForm->getPropertyValue( FM_PROP_DATASOURCE ) >>= sDataSourceName;
Reference< XPropertySet > xDsProperties;
if ( !sDataSourceName.isEmpty() )
xDsProperties = xDsProperties.query( OStaticDataAccessTools().getDataSource( sDataSourceName, _rContext.getUNOContext() ) );
if ( xDsProperties.is() )
- xDsProperties->getPropertyValue( ::rtl::OUString( "Info" ) ) >>= aInfo;
+ xDsProperties->getPropertyValue( OUString( "Info" ) ) >>= aInfo;
}
catch( const Exception& )
{
@@ -366,11 +366,11 @@ namespace svxform
Reference< XPropertySetInfo > xSourcePropInfo( xStyle->getPropertySetInfo(), UNO_SET_THROW );
Reference< XPropertySetInfo > xDestPropInfo( _rxModel->getPropertySetInfo(), UNO_SET_THROW );
- ::rtl::OUString sPropertyName;
+ OUString sPropertyName;
const sal_Char** pCharacterProperty = aCharacterAndParagraphProperties;
while ( *pCharacterProperty )
{
- sPropertyName = ::rtl::OUString::createFromAscii( *pCharacterProperty );
+ sPropertyName = OUString::createFromAscii( *pCharacterProperty );
if ( xSourcePropInfo->hasPropertyByName( sPropertyName ) && xDestPropInfo->hasPropertyByName( sPropertyName ) )
_rxModel->setPropertyValue( sPropertyName, xStyle->getPropertyValue( sPropertyName ) );
@@ -404,7 +404,7 @@ namespace svxform
switch ( nClassId )
{
case FormComponentType::SCROLLBAR:
- _rxControlModel->setPropertyValue( ::rtl::OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) );
+ _rxControlModel->setPropertyValue( OUString( "LiveScroll" ), makeAny( (sal_Bool)sal_True ) );
// NO break!
case FormComponentType::SPINBUTTON:
{
@@ -444,7 +444,7 @@ namespace svxform
case FormComponentType::CHECKBOX:
case FormComponentType::FIXEDTEXT:
{
- ::rtl::OUString sVertAlignPropertyName( "VerticalAlign" );
+ OUString sVertAlignPropertyName( "VerticalAlign" );
if ( xPSI->hasPropertyByName( sVertAlignPropertyName ) )
_rxControlModel->setPropertyValue( sVertAlignPropertyName, makeAny( VerticalAlignment_MIDDLE ) );
}
@@ -453,7 +453,7 @@ namespace svxform
case FormComponentType::IMAGEBUTTON:
case FormComponentType::IMAGECONTROL:
{
- const ::rtl::OUString sScaleModeProperty( "ScaleMode" );
+ const OUString sScaleModeProperty( "ScaleMode" );
if ( xPSI->hasPropertyByName( sScaleModeProperty ) )
_rxControlModel->setPropertyValue( sScaleModeProperty, makeAny( ImageScaleMode::Isotropic ) );
}
@@ -463,11 +463,11 @@ namespace svxform
// initial default label for the control
if ( xPSI->hasPropertyByName( FM_PROP_LABEL ) )
{
- ::rtl::OUString sExistingLabel;
+ OUString sExistingLabel;
OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_LABEL ) >>= sExistingLabel );
if ( sExistingLabel.isEmpty() )
{
- ::rtl::OUString sInitialLabel;
+ OUString sInitialLabel;
OSL_VERIFY( _rxControlModel->getPropertyValue( FM_PROP_NAME ) >>= sInitialLabel );
sal_uInt16 nTitleResId = 0;
@@ -648,7 +648,7 @@ namespace svxform
}
//------------------------------------------------------------------------------
- ::rtl::OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject )
+ OUString FormControlFactory::getDefaultName( sal_Int16 _nClassId, const Reference< XServiceInfo >& _rxObject )
{
sal_uInt16 nResId(0);
@@ -689,24 +689,24 @@ namespace svxform
}
//------------------------------------------------------------------------------
- ::rtl::OUString FormControlFactory::getDefaultUniqueName_ByComponentType( const Reference< XNameAccess >& _rxContainer,
+ OUString FormControlFactory::getDefaultUniqueName_ByComponentType( const Reference< XNameAccess >& _rxContainer,
const Reference< XPropertySet >& _rxObject )
{
sal_Int16 nClassId = FormComponentType::CONTROL;
OSL_VERIFY( _rxObject->getPropertyValue( FM_PROP_CLASSID ) >>= nClassId );
- ::rtl::OUString sBaseName = getDefaultName( nClassId, Reference< XServiceInfo >( _rxObject, UNO_QUERY ) );
+ OUString sBaseName = getDefaultName( nClassId, Reference< XServiceInfo >( _rxObject, UNO_QUERY ) );
return getUniqueName( _rxContainer, sBaseName );
}
//------------------------------------------------------------------------------
- ::rtl::OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const ::rtl::OUString& _rBaseName )
+ OUString FormControlFactory::getUniqueName( const Reference< XNameAccess >& _rxContainer, const OUString& _rBaseName )
{
sal_Int32 n = 0;
- ::rtl::OUString sName;
+ OUString sName;
do
{
- ::rtl::OUStringBuffer aBuf( _rBaseName );
+ OUStringBuffer aBuf( _rBaseName );
aBuf.appendAscii( " " );
aBuf.append( ++n );
sName = aBuf.makeStringAndClear();
diff --git a/svx/source/form/formcontroller.cxx b/svx/source/form/formcontroller.cxx
index 4a5d8a06b435..c9fab0b9761c 100644
--- a/svx/source/form/formcontroller.cxx
+++ b/svx/source/form/formcontroller.cxx
@@ -217,7 +217,7 @@ struct ColumnInfo
sal_Int32 nNullable;
sal_Bool bAutoIncrement;
sal_Bool bReadOnly;
- ::rtl::OUString sName;
+ OUString sName;
// information about the control(s) bound to this column
@@ -455,7 +455,7 @@ void SAL_CALL OParameterContinuation::setParameters( const Sequence< PropertyVal
//==================================================================
struct FmFieldInfo
{
- rtl::OUString aFieldName;
+ OUString aFieldName;
Reference< XPropertySet > xField;
Reference< XTextComponent > xText;
@@ -478,11 +478,11 @@ public:
{
}
- virtual ::rtl::OUString GetComponentServiceName() {return ::rtl::OUString("Edit");}
+ virtual OUString GetComponentServiceName() {return OUString("Edit");}
virtual void SAL_CALL createPeer( const Reference< XToolkit > & rxToolkit, const Reference< XWindowPeer > & rParentPeer ) throw( RuntimeException );
protected:
- virtual void ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal );
+ virtual void ImplSetPeerProperty( const OUString& rPropName, const Any& rVal );
};
//------------------------------------------------------------------------------
@@ -493,13 +493,13 @@ void FmXAutoControl::createPeer( const Reference< XToolkit > & rxToolkit, const
Reference< XTextComponent > xText(getPeer() , UNO_QUERY);
if (xText.is())
{
- xText->setText(::rtl::OUString(String(SVX_RES(RID_STR_AUTOFIELD))));
+ xText->setText(OUString(String(SVX_RES(RID_STR_AUTOFIELD))));
xText->setEditable(sal_False);
}
}
//------------------------------------------------------------------------------
-void FmXAutoControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const Any& rVal )
+void FmXAutoControl::ImplSetPeerProperty( const OUString& rPropName, const Any& rVal )
{
// these properties are ignored
if (rPropName == FM_PROP_TEXT)
@@ -563,7 +563,7 @@ FormController::FormController(const Reference< XMultiServiceFactory > & _rxORB
,m_aFilterListeners(m_aMutex)
,m_pControlBorderManager( new ::svxform::ControlBorderManager )
,m_xFormOperations()
- ,m_aMode( ::rtl::OUString( "DataMode" ) )
+ ,m_aMode( OUString( "DataMode" ) )
,m_aLoadEvent( LINK( this, FormController, OnLoad ) )
,m_aToggleEvent( LINK( this, FormController, OnToggleAutoFields ) )
,m_aActivationEvent( LINK( this, FormController, OnActivated ) )
@@ -688,10 +688,10 @@ Sequence< Type > SAL_CALL FormController::getTypes( ) throw(RuntimeException)
// XServiceInfo
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& ServiceName) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::supportsService(const OUString& ServiceName) throw( RuntimeException )
{
- Sequence< ::rtl::OUString> aSNL(getSupportedServiceNames());
- const ::rtl::OUString * pArray = aSNL.getConstArray();
+ Sequence< OUString> aSNL(getSupportedServiceNames());
+ const OUString * pArray = aSNL.getConstArray();
for( sal_Int32 i = 0; i < aSNL.getLength(); i++ )
if( pArray[i] == ServiceName )
return sal_True;
@@ -699,21 +699,21 @@ sal_Bool SAL_CALL FormController::supportsService(const ::rtl::OUString& Service
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException )
+OUString SAL_CALL FormController::getImplementationName() throw( RuntimeException )
{
- return ::rtl::OUString("org.openoffice.comp.svx.FormController");
+ return OUString("org.openoffice.comp.svx.FormController");
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException )
+Sequence< OUString> SAL_CALL FormController::getSupportedServiceNames(void) throw( RuntimeException )
{
// service names which are supported only, but cannot be used to created an
// instance at a service factory
- Sequence< ::rtl::OUString > aNonCreatableServiceNames( 1 );
- aNonCreatableServiceNames[ 0 ] = ::rtl::OUString( "com.sun.star.form.FormControllerDispatcher" );
+ Sequence< OUString > aNonCreatableServiceNames( 1 );
+ aNonCreatableServiceNames[ 0 ] = OUString( "com.sun.star.form.FormControllerDispatcher" );
// services which can be used to created an instance at a service factory
- Sequence< ::rtl::OUString > aCreatableServiceNames( getSupportedServiceNames_Static() );
+ Sequence< OUString > aCreatableServiceNames( getSupportedServiceNames_Static() );
return ::comphelper::concatSequences( aCreatableServiceNames, aNonCreatableServiceNames );
}
@@ -732,14 +732,14 @@ void SAL_CALL FormController::resetted(const EventObject& rEvent) throw( Runtime
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString> FormController::getSupportedServiceNames_Static(void)
+Sequence< OUString> FormController::getSupportedServiceNames_Static(void)
{
- static Sequence< ::rtl::OUString> aServices;
+ static Sequence< OUString> aServices;
if (!aServices.getLength())
{
aServices.realloc(2);
aServices.getArray()[0] = OUString( "com.sun.star.form.runtime.FormController" );
- aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController");
+ aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController");
}
return aServices;
}
@@ -751,7 +751,7 @@ namespace
{
void operator()( const Reference< XTextComponent >& _rxText )
{
- _rxText->setText( ::rtl::OUString() );
+ _rxText->setText( OUString() );
}
};
@@ -826,7 +826,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
{
case FM_ATTR_FILTER:
{
- ::rtl::OUStringBuffer aFilter;
+ OUStringBuffer aFilter;
OStaticDataAccessTools aStaticTools;
Reference<XConnection> xConnection(aStaticTools.getRowSetConnection(Reference< XRowSet>(m_xModelAsIndex, UNO_QUERY)));
if (xConnection.is())
@@ -849,7 +849,7 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
if ( rRow.empty() )
continue;
- ::rtl::OUStringBuffer aRowFilter;
+ OUStringBuffer aRowFilter;
for ( FmFilterRow::const_iterator condition = rRow.begin(); condition != rRow.end(); ++condition )
{
// get the field of the controls map
@@ -857,9 +857,9 @@ void FormController::getFastPropertyValue( Any& rValue, sal_Int32 nHandle ) cons
Reference< XPropertySet > xModelProps( xControl->getModel(), UNO_QUERY_THROW );
Reference< XPropertySet > xField( xModelProps->getPropertyValue( FM_PROP_BOUNDFIELD ), UNO_QUERY_THROW );
- ::rtl::OUString sFilterValue( condition->second );
+ OUString sFilterValue( condition->second );
- ::rtl::OUString sErrorMsg, sCriteria;
+ OUString sErrorMsg, sCriteria;
const ::rtl::Reference< ISQLParseNode > xParseNode =
predicateTree( sErrorMsg, sFilterValue, xFormatter, xField );
OSL_ENSURE( xParseNode.is(), "FormController::getFastPropertyValue: could not parse the field value predicate!" );
@@ -923,7 +923,7 @@ void FormController::fillProperties(
_rProps.realloc(2);
sal_Int32 nPos = 0;
Property* pDesc = _rProps.getArray();
- DECL_PROP1(FILTER, rtl::OUString, READONLY);
+ DECL_PROP1(FILTER, OUString, READONLY);
DECL_PROP1(FORM_OPERATIONS, Reference< XFormOperations >, READONLY);
}
@@ -965,13 +965,13 @@ void SAL_CALL FormController::removeFilterControllerListener( const Reference< X
}
//------------------------------------------------------------------------------
-void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const ::rtl::OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException )
+void SAL_CALL FormController::setPredicateExpression( ::sal_Int32 _Component, ::sal_Int32 _Term, const OUString& _PredicateExpression ) throw( RuntimeException, IndexOutOfBoundsException )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) || ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) )
- throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+ throw IndexOutOfBoundsException( OUString(), *this );
Reference< XTextComponent > xText( m_aFilterComponents[ _Component ] );
xText->setText( _PredicateExpression );
@@ -990,18 +990,18 @@ Reference< XControl > FormController::getFilterComponent( ::sal_Int32 _Component
impl_checkDisposed_throw();
if ( ( _Component < 0 ) || ( _Component >= getFilterComponents() ) )
- throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+ throw IndexOutOfBoundsException( OUString(), *this );
return Reference< XControl >( m_aFilterComponents[ _Component ], UNO_QUERY );
}
//------------------------------------------------------------------------------
-Sequence< Sequence< ::rtl::OUString > > FormController::getPredicateExpressions() throw( RuntimeException )
+Sequence< Sequence< OUString > > FormController::getPredicateExpressions() throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- Sequence< Sequence< ::rtl::OUString > > aExpressions( m_aFilterRows.size() );
+ Sequence< Sequence< OUString > > aExpressions( m_aFilterRows.size() );
sal_Int32 termIndex = 0;
for ( FmFilterRows::const_iterator row = m_aFilterRows.begin();
row != m_aFilterRows.end();
@@ -1010,7 +1010,7 @@ Sequence< Sequence< ::rtl::OUString > > FormController::getPredicateExpressions(
{
const FmFilterRow& rRow( *row );
- Sequence< ::rtl::OUString > aConjunction( m_aFilterComponents.size() );
+ Sequence< OUString > aConjunction( m_aFilterComponents.size() );
sal_Int32 componentIndex = 0;
for ( FilterComponents::const_iterator comp = m_aFilterComponents.begin();
comp != m_aFilterComponents.end();
@@ -1036,7 +1036,7 @@ void SAL_CALL FormController::removeDisjunctiveTerm( ::sal_Int32 _Term ) throw (
impl_checkDisposed_throw();
if ( ( _Term < 0 ) || ( _Term >= getDisjunctiveTerms() ) )
- throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+ throw IndexOutOfBoundsException( OUString(), *this );
// if the to-be-deleted row is our current row, we need to shift
if ( _Term == m_nCurrentFilterPosition )
@@ -1096,7 +1096,7 @@ void SAL_CALL FormController::setActiveTerm( ::sal_Int32 _ActiveTerm ) throw (In
impl_checkDisposed_throw();
if ( ( _ActiveTerm < 0 ) || ( _ActiveTerm >= getDisjunctiveTerms() ) )
- throw IndexOutOfBoundsException( ::rtl::OUString(), *this );
+ throw IndexOutOfBoundsException( OUString(), *this );
if ( _ActiveTerm == getActiveTerm() )
return;
@@ -1466,7 +1466,7 @@ void FormController::toggleAutoFields(sal_Bool bAutoFields)
&& ::comphelper::getBOOL( xField->getPropertyValue(FM_PROP_AUTOINCREMENT ) )
)
{
- ::rtl::OUString sServiceName;
+ OUString sServiceName;
OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DEFAULTCONTROL ) >>= sServiceName );
Reference< XControl > xNewControl( m_aContext.createComponent( sServiceName ), UNO_QUERY );
replaceControl( xControl, xNewControl );
@@ -1504,7 +1504,7 @@ void SAL_CALL FormController::textChanged(const TextEvent& e) throw( RuntimeExce
return;
Reference< XTextComponent > xText(e.Source,UNO_QUERY);
- ::rtl::OUString aText = xText->getText();
+ OUString aText = xText->getText();
if ( m_aFilterRows.empty() )
appendEmptyDisjunctiveTerm();
@@ -1601,7 +1601,7 @@ void FormController::modified( const EventObject& _rEvent ) throw( RuntimeExcept
void FormController::impl_checkDisposed_throw() const
{
if ( impl_isDisposed_nofail() )
- throw DisposedException( ::rtl::OUString(), *const_cast< FormController* >( this ) );
+ throw DisposedException( OUString(), *const_cast< FormController* >( this ) );
}
//------------------------------------------------------------------------------
@@ -3030,17 +3030,17 @@ void SAL_CALL FormController::addChildController( const Reference< XFormControll
impl_checkDisposed_throw();
if ( !_ChildController.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+ throw IllegalArgumentException( OUString(), *this, 1 );
// TODO: (localized) error message
// the parent of our (to-be-)child must be our own model
Reference< XFormComponent > xFormOfChild( _ChildController->getModel(), UNO_QUERY );
if ( !xFormOfChild.is() )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+ throw IllegalArgumentException( OUString(), *this, 1 );
// TODO: (localized) error message
if ( xFormOfChild->getParent() != m_xModelAsIndex )
- throw IllegalArgumentException( ::rtl::OUString(), *this, 1 );
+ throw IllegalArgumentException( OUString(), *this, 1 );
// TODO: (localized) error message
m_aChildren.push_back( _ChildController );
@@ -3106,12 +3106,12 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
{
Reference< XMultiServiceFactory > xFactory( xConnection, UNO_QUERY_THROW );
m_xComposer.set(
- xFactory->createInstance( ::rtl::OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
+ xFactory->createInstance( OUString( "com.sun.star.sdb.SingleSelectQueryComposer" ) ),
UNO_QUERY_THROW );
Reference< XPropertySet > xSet( xForm, UNO_QUERY );
- ::rtl::OUString sStatement = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_ACTIVECOMMAND ) );
- ::rtl::OUString sFilter = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_FILTER ) );
+ OUString sStatement = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_ACTIVECOMMAND ) );
+ OUString sFilter = ::comphelper::getString( xSet->getPropertyValue( FM_PROP_FILTER ) );
m_xComposer->setElementaryQuery( sStatement );
m_xComposer->setFilter( sFilter );
}
@@ -3178,7 +3178,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
try
{
Reference< XPropertySet > xSet;
- ::rtl::OUString aRealName;
+ OUString aRealName;
// first look with the given name
if (xQueryColumns->hasByName(pRefValues[j].Name))
@@ -3186,7 +3186,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
xQueryColumns->getByName(pRefValues[j].Name) >>= xSet;
// get the RealName
- xSet->getPropertyValue(::rtl::OUString("RealName")) >>= aRealName;
+ xSet->getPropertyValue(OUString("RealName")) >>= aRealName;
// compare the condition field name and the RealName
if (aCompare(aRealName, pRefValues[j].Name))
@@ -3199,7 +3199,7 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
for (sal_Int32 n = 0, nCount = xColumnsByIndex->getCount(); n < nCount; n++)
{
xColumnsByIndex->getByIndex(n) >>= xSet;
- xSet->getPropertyValue(::rtl::OUString("RealName")) >>= aRealName;
+ xSet->getPropertyValue(OUString("RealName")) >>= aRealName;
if (aCompare(aRealName, pRefValues[j].Name))
{
// get the column by its alias
@@ -3226,22 +3226,22 @@ void FormController::setFilter(::std::vector<FmFieldInfo>& rFieldInfos)
// do we already have the control ?
if (aRow.find((*iter).xText) != aRow.end())
{
- ::rtl::OUString aCompText = aRow[(*iter).xText];
- aCompText += ::rtl::OUString(" ");
- ::rtl::OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND);
- aCompText += ::rtl::OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US);
- aCompText += ::rtl::OUString(" ");
+ OUString aCompText = aRow[(*iter).xText];
+ aCompText += OUString(" ");
+ OString aVal = m_xParser->getContext().getIntlKeywordAscii(OParseContext::KEY_AND);
+ aCompText += OUString(aVal.getStr(),aVal.getLength(),RTL_TEXTENCODING_ASCII_US);
+ aCompText += OUString(" ");
aCompText += ::comphelper::getString(pRefValues[j].Value);
aRow[(*iter).xText] = aCompText;
}
else
{
- ::rtl::OUString sPredicate,sErrorMsg;
+ OUString sPredicate,sErrorMsg;
pRefValues[j].Value >>= sPredicate;
::rtl::Reference< ISQLParseNode > xParseNode = predicateTree(sErrorMsg, sPredicate, xFormatter, xField);
if ( xParseNode.is() )
{
- ::rtl::OUString sCriteria;
+ OUString sCriteria;
xParseNode->parseNodeToPredicateStr( sCriteria
,xConnection
,xFormatter
@@ -3320,7 +3320,7 @@ void FormController::startFiltering()
Reference< XModeSelector > xSelector(xControl, UNO_QUERY);
if (xSelector.is())
{
- xSelector->setMode( ::rtl::OUString( "FilterMode" ) );
+ xSelector->setMode( OUString( "FilterMode" ) );
// listening for new controls of the selector
Reference< XContainer > xContainer(xSelector, UNO_QUERY);
@@ -3446,7 +3446,7 @@ void FormController::stopFiltering()
Reference< XModeSelector > xSelector(xControl, UNO_QUERY);
if (xSelector.is())
{
- xSelector->setMode( ::rtl::OUString( "DataMode" ) );
+ xSelector->setMode( OUString( "DataMode" ) );
// listening for new controls of the selector
Reference< XContainer > xContainer(xSelector, UNO_QUERY);
@@ -3468,7 +3468,7 @@ void FormController::stopFiltering()
&& ::comphelper::getBOOL( xField->getPropertyValue( FM_PROP_SEARCHABLE ) )
)
{
- ::rtl::OUString sServiceName;
+ OUString sServiceName;
OSL_VERIFY( xSet->getPropertyValue( FM_PROP_DEFAULTCONTROL ) >>= sServiceName );
Reference< XControl > xNewControl( m_aContext.createComponent( sServiceName ), UNO_QUERY );
replaceControl( xControl, xNewControl );
@@ -3498,7 +3498,7 @@ void FormController::stopFiltering()
// XModeSelector
//------------------------------------------------------------------------------
-void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportException, RuntimeException )
+void FormController::setMode(const OUString& Mode) throw( NoSupportException, RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
@@ -3526,7 +3526,7 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExcept
}
//------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL FormController::getMode(void) throw( RuntimeException )
+OUString SAL_CALL FormController::getMode(void) throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
@@ -3535,30 +3535,30 @@ void FormController::setMode(const ::rtl::OUString& Mode) throw( NoSupportExcept
}
//------------------------------------------------------------------------------
-Sequence< ::rtl::OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException )
+Sequence< OUString > SAL_CALL FormController::getSupportedModes(void) throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- static Sequence< ::rtl::OUString > aModes;
+ static Sequence< OUString > aModes;
if (!aModes.getLength())
{
aModes.realloc(2);
- ::rtl::OUString* pModes = aModes.getArray();
- pModes[0] = ::rtl::OUString( "DataMode" );
- pModes[1] = ::rtl::OUString( "FilterMode" );
+ OUString* pModes = aModes.getArray();
+ pModes[0] = OUString( "DataMode" );
+ pModes[1] = OUString( "FilterMode" );
}
return aModes;
}
//------------------------------------------------------------------------------
-sal_Bool SAL_CALL FormController::supportsMode(const ::rtl::OUString& Mode) throw( RuntimeException )
+sal_Bool SAL_CALL FormController::supportsMode(const OUString& Mode) throw( RuntimeException )
{
::osl::MutexGuard aGuard( m_aMutex );
impl_checkDisposed_throw();
- Sequence< ::rtl::OUString > aModes(getSupportedModes());
- const ::rtl::OUString* pModes = aModes.getConstArray();
+ Sequence< OUString > aModes(getSupportedModes());
+ const OUString* pModes = aModes.getConstArray();
for (sal_Int32 i = aModes.getLength(); i > 0; )
{
if (pModes[--i] == Mode)
@@ -3585,7 +3585,7 @@ Window* FormController::getDialogParentWindow()
return pParentWindow;
}
//------------------------------------------------------------------------------
-bool FormController::checkFormComponentValidity( ::rtl::OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(())
+bool FormController::checkFormComponentValidity( OUString& /* [out] */ _rFirstInvalidityExplanation, Reference< XControlModel >& /* [out] */ _rxFirstInvalidModel ) SAL_THROW(())
{
try
{
@@ -3676,7 +3676,7 @@ namespace
{
try
{
- static ::rtl::OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields" );
+ static OUString s_sFormsCheckRequiredFields( "FormsCheckRequiredFields" );
// first, check whether the form has a property telling us the answer
// this allows people to use the XPropertyContainer interface of a form to control
@@ -3698,7 +3698,7 @@ namespace
return sal_True;
Reference< XPropertySet > xDataSourceSettings(
- xDataSource->getPropertyValue( ::rtl::OUString( "Settings" ) ),
+ xDataSource->getPropertyValue( OUString( "Settings" ) ),
UNO_QUERY_THROW );
sal_Bool bShouldValidate = true;
@@ -3739,7 +3739,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
return bValid;
// if some of the control models are bound to validators, check them
- ::rtl::OUString sInvalidityExplanation;
+ OUString sInvalidityExplanation;
Reference< XControlModel > xInvalidModel;
if ( !checkFormComponentValidity( sInvalidityExplanation, xInvalidModel ) )
{
@@ -3783,7 +3783,7 @@ sal_Bool SAL_CALL FormController::approveRowChange(const RowChangeEvent& _rEvent
continue;
String sMessage( SVX_RES( RID_ERR_FIELDREQUIRED ) );
- sMessage.SearchAndReplace( rtl::OUString('#'), rColInfo.sName );
+ sMessage.SearchAndReplace( OUString('#'), rColInfo.sName );
// the control to focus
Reference< XControl > xControl( rColInfo.xFirstControlWithInputRequired );
@@ -3986,7 +3986,7 @@ sal_Bool SAL_CALL FormController::approveParameter(const DatabaseParameterEvent&
if (xParam.is())
{
#ifdef DBG_UTIL
- ::rtl::OUString sName;
+ OUString sName;
xParam->getPropertyValue(FM_PROP_NAME) >>= sName;
DBG_ASSERT(sName.equals(pFinalValues->Name), "FormController::approveParameter: suspicious value names!");
#endif
@@ -4046,7 +4046,7 @@ sal_Bool SAL_CALL FormController::confirmDelete(const RowChangeEvent& aEvent) th
if ( nLength > 1 )
{
sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORDS );
- sTitle.SearchAndReplace( rtl::OUString('#'), rtl::OUString::valueOf(nLength) );
+ sTitle.SearchAndReplace( OUString('#'), OUString::valueOf(nLength) );
}
else
sTitle = SVX_RESSTR( RID_STR_DELETECONFIRM_RECORD );
@@ -4123,7 +4123,7 @@ void SAL_CALL FormController::invalidateAllFeatures( ) throw (RuntimeException)
//------------------------------------------------------------------------------
Reference< XDispatch >
FormController::interceptedQueryDispatch( const URL& aURL,
- const ::rtl::OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/)
+ const OUString& /*aTargetFrameName*/, sal_Int32 /*nSearchFlags*/)
throw( RuntimeException )
{
OSL_ENSURE( !impl_isDisposed_nofail(), "FormController: already disposed!" );
diff --git a/svx/source/form/formcontrolling.cxx b/svx/source/form/formcontrolling.cxx
index 24aed5fa8f04..b86a38100f5e 100644
--- a/svx/source/form/formcontrolling.cxx
+++ b/svx/source/form/formcontrolling.cxx
@@ -71,7 +71,7 @@ namespace svx
{
struct FeatureDescription
{
- ::rtl::OUString sURL; // the URL
+ OUString sURL; // the URL
sal_Int32 nSlotId; // the SFX-compatible slot ID
sal_Int16 nFormFeature; // the css.form.runtime.FormFeature ID
};
@@ -122,8 +122,8 @@ namespace svx
//................................................................
struct MatchFeatureDescriptionByURL : public ::std::unary_function< FeatureDescription, bool >
{
- const ::rtl::OUString& m_rURL;
- MatchFeatureDescriptionByURL( const ::rtl::OUString& _rURL ) :m_rURL( _rURL ) { }
+ const OUString& m_rURL;
+ MatchFeatureDescriptionByURL( const OUString& _rURL ) :m_rURL( _rURL ) { }
bool operator()( const FeatureDescription& _compare )
{
@@ -166,7 +166,7 @@ namespace svx
}
//--------------------------------------------------------------------
- sal_Int32 FeatureSlotTranslation::getControllerFeatureSlotIdForURL( const ::rtl::OUString& _rMainURL )
+ sal_Int32 FeatureSlotTranslation::getControllerFeatureSlotIdForURL( const OUString& _rMainURL )
{
const FeatureDescriptions& rDescriptions( getFeatureDescriptions() );
FeatureDescriptions::const_iterator pos = ::std::find_if( rDescriptions.begin(), rDescriptions.end(), MatchFeatureDescriptionByURL( _rMainURL ) );
@@ -325,7 +325,7 @@ namespace svx
}
//--------------------------------------------------------------------
- void FormControllerHelper::execute( sal_Int32 _nSlotId, const ::rtl::OUString& _rParamName, const Any& _rParamValue ) const
+ void FormControllerHelper::execute( sal_Int32 _nSlotId, const OUString& _rParamName, const Any& _rParamValue ) const
{
Sequence< NamedValue > aArguments(1);
aArguments[0].Name = _rParamName;
@@ -507,7 +507,7 @@ namespace svx
bool bEscapeProcessing( false );
OSL_VERIFY( xCursorProperties->getPropertyValue( FM_PROP_ESCAPE_PROCESSING ) >>= bEscapeProcessing );
- ::rtl::OUString sActiveCommand;
+ OUString sActiveCommand;
OSL_VERIFY( xCursorProperties->getPropertyValue( FM_PROP_ACTIVECOMMAND ) >>= sActiveCommand );
bool bInsertOnlyForm( false );
diff --git a/svx/source/form/formdispatchinterceptor.cxx b/svx/source/form/formdispatchinterceptor.cxx
index d7ac47dab289..cfde37763c31 100644
--- a/svx/source/form/formdispatchinterceptor.cxx
+++ b/svx/source/form/formdispatchinterceptor.cxx
@@ -90,7 +90,7 @@ namespace svxform
}
//------------------------------------------------------------------------------
- Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const ::rtl::OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException)
+ Reference< XDispatch > SAL_CALL DispatchInterceptionMultiplexer::queryDispatch( const URL& aURL, const OUString& aTargetFrameName, sal_Int32 nSearchFlags ) throw(RuntimeException)
{
::osl::MutexGuard aGuard( *m_pMutex );
Reference< XDispatch> xResult;
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index 186f1a6f0be0..e15235269925 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -205,7 +205,7 @@ namespace svx
void OSingleFeatureDispatcher::checkAlive() const SAL_THROW((DisposedException))
{
if ( m_bDisposed )
- throw DisposedException( ::rtl::OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) );
+ throw DisposedException( OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) );
}
//........................................................................
diff --git a/svx/source/form/formtoolbars.cxx b/svx/source/form/formtoolbars.cxx
index 3c08fa690100..e978c9e59933 100644
--- a/svx/source/form/formtoolbars.cxx
+++ b/svx/source/form/formtoolbars.cxx
@@ -41,7 +41,7 @@ namespace svxform
// the layout manager
Reference< XPropertySet > xFrameProps( _rxFrame, UNO_QUERY );
if ( xFrameProps.is() )
- xFrameProps->getPropertyValue( ::rtl::OUString( "LayoutManager" ) ) >>= m_xLayouter;
+ xFrameProps->getPropertyValue( OUString( "LayoutManager" ) ) >>= m_xLayouter;
}
//--------------------------------------------------------------------
@@ -53,7 +53,7 @@ namespace svxform
OSL_ENSURE( xManager. is(), "FormToolboxes::toggleToolbox: couldn't obtain the layout manager!" );
if ( xManager. is() )
{
- ::rtl::OUString sToolboxResource( getToolboxResourceName( _nSlotId ) );
+ OUString sToolboxResource( getToolboxResourceName( _nSlotId ) );
if ( xManager->isElementVisible( sToolboxResource ) )
{
xManager->hideElement( sToolboxResource );
@@ -80,7 +80,7 @@ namespace svxform
}
//--------------------------------------------------------------------
- ::rtl::OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const
+ OUString FormToolboxes::getToolboxResourceName( sal_uInt16 _nSlotId ) const
{
OSL_ENSURE( ( _nSlotId == SID_FM_MORE_CONTROLS ) || ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS ) || ( _nSlotId == SID_FM_CONFIG ),
"FormToolboxes::getToolboxResourceName: unsupported slot!" );
@@ -91,8 +91,8 @@ namespace svxform
else if ( _nSlotId == SID_FM_FORM_DESIGN_TOOLS )
pToolBarName = "formdesign";
- ::rtl::OUString aToolBarResStr( "private:resource/toolbar/" );
- aToolBarResStr += ::rtl::OUString::createFromAscii( pToolBarName );
+ OUString aToolBarResStr( "private:resource/toolbar/" );
+ aToolBarResStr += OUString::createFromAscii( pToolBarName );
return aToolBarResStr;
}
diff --git a/svx/source/form/legacyformcontroller.cxx b/svx/source/form/legacyformcontroller.cxx
index 90386864cae7..ac6279ea72b3 100644
--- a/svx/source/form/legacyformcontroller.cxx
+++ b/svx/source/form/legacyformcontroller.cxx
@@ -97,9 +97,9 @@ namespace svxform
virtual void SAL_CALL activateLast( ) throw (RuntimeException);
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (RuntimeException);
- virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (RuntimeException);
- virtual Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException);
+ virtual OUString SAL_CALL getImplementationName( ) throw (RuntimeException);
+ virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (RuntimeException);
+ virtual Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (RuntimeException);
private:
const Reference< form::runtime::XFormController > m_xDelegator;
@@ -178,16 +178,16 @@ namespace svxform
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException)
+ OUString SAL_CALL LegacyFormController::getImplementationName( ) throw (RuntimeException)
{
- return ::rtl::OUString( "org.openoffice.comp.svx.LegacyFormController" );
+ return OUString( "org.openoffice.comp.svx.LegacyFormController" );
}
//--------------------------------------------------------------------
- ::sal_Bool SAL_CALL LegacyFormController::supportsService( const ::rtl::OUString& _serviceName ) throw (RuntimeException)
+ ::sal_Bool SAL_CALL LegacyFormController::supportsService( const OUString& _serviceName ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aServices( getSupportedServiceNames() );
- const ::rtl::OUString* pServices = aServices.getConstArray();
+ Sequence< OUString > aServices( getSupportedServiceNames() );
+ const OUString* pServices = aServices.getConstArray();
for ( sal_Int32 i = 0; i < aServices.getLength(); ++i, ++pServices )
if( pServices->equals( _serviceName ) )
return sal_True;
@@ -195,11 +195,11 @@ namespace svxform
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL LegacyFormController::getSupportedServiceNames( ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aServices(2);
- aServices.getArray()[0] = ::rtl::OUString( "com.sun.star.form.FormController" );
- aServices.getArray()[1] = ::rtl::OUString("com.sun.star.awt.control.TabController");
+ Sequence< OUString > aServices(2);
+ aServices.getArray()[0] = OUString( "com.sun.star.form.FormController" );
+ aServices.getArray()[1] = OUString("com.sun.star.awt.control.TabController");
return aServices;
}
diff --git a/svx/source/form/navigatortree.cxx b/svx/source/form/navigatortree.cxx
index 10a3e0ad793d..248428d5805b 100644
--- a/svx/source/form/navigatortree.cxx
+++ b/svx/source/form/navigatortree.cxx
@@ -466,7 +466,7 @@ namespace svxform
pFormModel->BegUndo(aUndoStr);
// dieser Slot war guletig bei (genau) einem selektierten Formular
- rtl::OUString fControlName = FM_COMPONENT_HIDDEN;
+ OUString fControlName = FM_COMPONENT_HIDDEN;
NewControl( fControlName, *m_arrCurrentSelection.begin() );
pFormModel->EndUndo();
@@ -1001,7 +1001,7 @@ namespace svxform
for (sal_Int32 i=0; i<nCount; ++i)
{
// neues Control anlegen
- rtl::OUString fControlName = FM_COMPONENT_HIDDEN;
+ OUString fControlName = FM_COMPONENT_HIDDEN;
FmControlData* pNewControlData = NewControl( fControlName, _pTargetEntry, sal_False);
Reference< XPropertySet > xNewPropSet( pNewControlData->GetPropertySet() );
@@ -1019,7 +1019,7 @@ namespace svxform
Property* pAllCurrentProps = seqAllCurrentProps.getArray();
for (sal_Int32 j=0; j<seqAllCurrentProps.getLength(); ++j)
{
- ::rtl::OUString sCurrentProp = pAllCurrentProps[j].Name;
+ OUString sCurrentProp = pAllCurrentProps[j].Name;
if (((pAllCurrentProps[j].Attributes & PropertyAttribute::READONLY) == 0) && (sCurrentProp != FM_PROP_NAME))
{ // (read-only attribs werden natuerlich nicht gesetzt, dito der Name, den hat das NewControl schon eindeutig
// festgelegt)
@@ -1372,7 +1372,7 @@ namespace svxform
//////////////////////////////////////////////////////////////////////
// Namen setzen
- ::rtl::OUString aName = GenerateName(pNewFormData);
+ OUString aName = GenerateName(pNewFormData);
pNewFormData->SetText(aName);
Reference< XPropertySet > xPropertySet(xNewForm, UNO_QUERY);
@@ -1414,7 +1414,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- FmControlData* NavigatorTree::NewControl( const ::rtl::OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName )
+ FmControlData* NavigatorTree::NewControl( const OUString& rServiceName, SvTreeListEntry* pParentEntry, sal_Bool bEditName )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::NewControl" );
//////////////////////////////////////////////////////////////////////
@@ -1441,7 +1441,7 @@ namespace svxform
SdrPageView* pPageView = pFormView->GetSdrPageView();
FmFormPage* pPage = (FmFormPage*)pPageView->GetPage();
- ::rtl::OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm );
+ OUString sName = pPage->GetImpl().setUniqueName( xNewComponent, xParentForm );
pNewFormControlData->SetText( sName );
@@ -1463,11 +1463,11 @@ namespace svxform
}
//------------------------------------------------------------------------
- ::rtl::OUString NavigatorTree::GenerateName( FmEntryData* pEntryData )
+ OUString NavigatorTree::GenerateName( FmEntryData* pEntryData )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::GenerateName" );
const sal_uInt16 nMaxCount = 99;
- ::rtl::OUString aNewName;
+ OUString aNewName;
//////////////////////////////////////////////////////////////////////
// BasisNamen erzeugen
@@ -1486,8 +1486,8 @@ namespace svxform
aNewName = aBaseName;
if( i>0 )
{
- aNewName += ::rtl::OUString(" ");
- aNewName += ::rtl::OUString::valueOf(i).getStr();
+ aNewName += OUString(" ");
+ aNewName += OUString::valueOf(i).getStr();
}
if( GetNavModel()->FindData(aNewName, pFormParentData,sal_False) == NULL )
@@ -1498,7 +1498,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText )
+ sal_Bool NavigatorTree::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTree::EditedEntry" );
if (EditingCanceled())
diff --git a/svx/source/form/navigatortreemodel.cxx b/svx/source/form/navigatortreemodel.cxx
index 75ce4f9be5c6..4187473ef9b3 100644
--- a/svx/source/form/navigatortreemodel.cxx
+++ b/svx/source/form/navigatortreemodel.cxx
@@ -92,7 +92,7 @@ namespace svxform
if( pEntryData )
{
- ::rtl::OUString aNewName = ::comphelper::getString(evt.NewValue);
+ OUString aNewName = ::comphelper::getString(evt.NewValue);
pEntryData->SetText( aNewName );
FmNavNameChangedHint aNameChangedHint( pEntryData, aNewName );
m_pNavModel->Broadcast( aNameChangedHint );
@@ -307,7 +307,7 @@ namespace svxform
if( bUndo )
{
XubString aUndoStr(SVX_RES(RID_STR_UNDO_CONTAINER_INSERT));
- aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr);
+ aUndoStr.SearchAndReplace(OUString('#'), aStr);
m_pFormModel->BegUndo(aUndoStr);
}
@@ -406,7 +406,7 @@ namespace svxform
if( bUndo )
{
XubString aUndoStr(SVX_RESSTR(RID_STR_UNDO_CONTAINER_REMOVE));
- aUndoStr.SearchAndReplace(rtl::OUString('#'), aStr);
+ aUndoStr.SearchAndReplace(OUString('#'), aStr);
m_pFormModel->BegUndo(aUndoStr);
}
}
@@ -689,7 +689,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- FmEntryData* NavigatorTreeModel::FindData( const ::rtl::OUString& rText, FmFormData* pParentData, sal_Bool bRecurs )
+ FmEntryData* NavigatorTreeModel::FindData( const OUString& rText, FmFormData* pParentData, sal_Bool bRecurs )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::FindData" );
FmEntryDataList* pDataList;
@@ -698,7 +698,7 @@ namespace svxform
else
pDataList = pParentData->GetChildList();
- ::rtl::OUString aEntryText;
+ OUString aEntryText;
FmEntryData* pEntryData;
FmEntryData* pChildData;
@@ -948,7 +948,7 @@ namespace svxform
}
//------------------------------------------------------------------------
- sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const ::rtl::OUString& rNewText )
+ sal_Bool NavigatorTreeModel::Rename( FmEntryData* pEntryData, const OUString& rNewText )
{
RTL_LOGFILE_CONTEXT_AUTHOR( aLogger, "svx", "Ocke.Janssen@sun.com", "NavigatorTreeModel::Rename" );
//////////////////////////////////////////////////////////////////////
diff --git a/svx/source/form/sdbdatacolumn.cxx b/svx/source/form/sdbdatacolumn.cxx
index fe40442292d5..6db70cd93e95 100644
--- a/svx/source/form/sdbdatacolumn.cxx
+++ b/svx/source/form/sdbdatacolumn.cxx
@@ -55,32 +55,32 @@ namespace svxform
return m_xPropertySet->getPropertySetInfo();
}
- void DataColumn::setPropertyValue(const ::rtl::OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
+ void DataColumn::setPropertyValue(const OUString& aPropertyName, const Any& aValue) throw( UnknownPropertyException, PropertyVetoException, IllegalArgumentException, WrappedTargetException, RuntimeException )
{
m_xPropertySet->setPropertyValue(aPropertyName, aValue);
}
- Any DataColumn::getPropertyValue(const ::rtl::OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+ Any DataColumn::getPropertyValue(const OUString& PropertyName) const throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
return m_xPropertySet->getPropertyValue(PropertyName);
}
- void DataColumn::addPropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+ void DataColumn::addPropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& xListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
m_xPropertySet->addPropertyChangeListener(aPropertyName, xListener);
}
- void DataColumn::removePropertyChangeListener(const ::rtl::OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+ void DataColumn::removePropertyChangeListener(const OUString& aPropertyName, const Reference< XPropertyChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
m_xPropertySet->removePropertyChangeListener(aPropertyName, aListener);
}
- void DataColumn::addVetoableChangeListener(const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+ void DataColumn::addVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
m_xPropertySet->addVetoableChangeListener(PropertyName, aListener);
}
- void DataColumn::removeVetoableChangeListener(const ::rtl::OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
+ void DataColumn::removeVetoableChangeListener(const OUString& PropertyName, const Reference< XVetoableChangeListener>& aListener) throw( UnknownPropertyException, WrappedTargetException, RuntimeException )
{
m_xPropertySet->removeVetoableChangeListener(PropertyName, aListener);
}
@@ -91,7 +91,7 @@ namespace svxform
return m_xColumn->wasNull();
}
- ::rtl::OUString DataColumn::getString() throw( SQLException, RuntimeException )
+ OUString DataColumn::getString() throw( SQLException, RuntimeException )
{
return m_xColumn->getString();
}
@@ -227,7 +227,7 @@ namespace svxform
m_xColumnUpdate->updateDouble(x);
}
- void DataColumn::updateString(const ::rtl::OUString& x) throw( SQLException, RuntimeException )
+ void DataColumn::updateString(const OUString& x) throw( SQLException, RuntimeException )
{
m_xColumnUpdate->updateString(x);
}
diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx
index a7d96f60ef0f..a7af1eca6015 100644
--- a/svx/source/form/tabwin.cxx
+++ b/svx/source/form/tabwin.cxx
@@ -75,16 +75,16 @@ using namespace ::svx;
struct ColumnInfo
{
- ::rtl::OUString sColumnName;
- ::rtl::OUString sLabel;
+ OUString sColumnName;
+ OUString sLabel;
bool bColumn;
- ColumnInfo(const ::rtl::OUString& i_sColumnName,const ::rtl::OUString& i_sLabel)
+ ColumnInfo(const OUString& i_sColumnName,const OUString& i_sLabel)
: sColumnName(i_sColumnName)
, sLabel(i_sLabel)
, bColumn(true)
{
}
- ColumnInfo(const ::rtl::OUString& i_sColumnName)
+ ColumnInfo(const OUString& i_sColumnName)
: sColumnName(i_sColumnName)
, bColumn(false)
{
@@ -93,13 +93,13 @@ struct ColumnInfo
static void lcl_addToList( SvTreeListBox& _rListBox, const uno::Reference< container::XNameAccess>& i_xColumns )
{
- uno::Sequence< ::rtl::OUString > aEntries = i_xColumns->getElementNames();
- const ::rtl::OUString* pEntries = aEntries.getConstArray();
+ uno::Sequence< OUString > aEntries = i_xColumns->getElementNames();
+ const OUString* pEntries = aEntries.getConstArray();
sal_Int32 nEntries = aEntries.getLength();
for ( sal_Int32 i = 0; i < nEntries; ++i, ++pEntries )
{
uno::Reference< beans::XPropertySet> xColumn(i_xColumns->getByName(*pEntries),UNO_QUERY_THROW);
- ::rtl::OUString sLabel;
+ OUString sLabel;
if ( xColumn->getPropertySetInfo()->hasPropertyByName(FM_PROP_LABEL) )
xColumn->getPropertyValue(FM_PROP_LABEL) >>= sLabel;
if ( !sLabel.isEmpty() )
@@ -254,7 +254,7 @@ sal_Bool FmFieldWin::createSelectionControls( )
aDescr[ daCommand ] <<= GetObjectName();
aDescr[ daCommandType ] <<= GetObjectType();
ColumnInfo* pInfo = static_cast<ColumnInfo*>(pSelected->GetUserData());
- aDescr[ daColumnName ] <<= pInfo->sColumnName;//::rtl::OUString( pListBox->GetEntryText( pSelected) );
+ aDescr[ daColumnName ] <<= pInfo->sColumnName;//OUString( pListBox->GetEntryText( pSelected) );
// transfer this to the SFX world
SfxUnoAnyItem aDescriptorItem( SID_FM_DATACCESS_DESCRIPTOR, makeAny( aDescr.createPropertyValueSequence() ) );
diff --git a/svx/source/form/tbxform.cxx b/svx/source/form/tbxform.cxx
index 7a6dcd4fd59c..8819e8067781 100644
--- a/svx/source/form/tbxform.cxx
+++ b/svx/source/form/tbxform.cxx
@@ -85,10 +85,10 @@ void SvxFmAbsRecWin::FirePosition( sal_Bool _bForce )
Any a;
Sequence< PropertyValue > aArgs( 1 );
- aArgs[0].Name = rtl::OUString( "Position" );
+ aArgs[0].Name = OUString( "Position" );
aPositionParam.QueryValue( a );
aArgs[0].Value = a;
- m_pController->Dispatch( rtl::OUString( ".uno:AbsoluteRecord" ),
+ m_pController->Dispatch( OUString( ".uno:AbsoluteRecord" ),
aArgs );
m_pController->updateStatus();
@@ -191,8 +191,8 @@ void SvxFmTbxCtlConfig::StateChanged(sal_uInt16 nSID, SfxItemState eState, const
case SID_FM_SCROLLBAR:
case SID_FM_SPINBUTTON:
{ // set a new image, matching to this slot
- rtl::OUString aSlotURL( "slot:" );
- aSlotURL += rtl::OUString::valueOf( sal_Int32( nSlot ));
+ OUString aSlotURL( "slot:" );
+ aSlotURL += OUString::valueOf( sal_Int32( nSlot ));
Image aImage = GetImage( m_xFrame, aSlotURL, hasBigImages() );
GetToolBox().SetItemImage( GetId(), aImage );
nLastSlot = nSlot;
@@ -238,7 +238,7 @@ void SvxFmTbxCtlConfig::Select( sal_uInt16 /*nModifier*/ )
if ( SlotToCommands[n].nSlotId > 0 )
{
Sequence< PropertyValue > aArgs;
- Dispatch( rtl::OUString::createFromAscii( SlotToCommands[n].pCommand ),
+ Dispatch( OUString::createFromAscii( SlotToCommands[n].pCommand ),
aArgs );
}
}
diff --git a/svx/source/form/xfm_addcondition.cxx b/svx/source/form/xfm_addcondition.cxx
index ec085745639a..c16e67ed5d14 100644
--- a/svx/source/form/xfm_addcondition.cxx
+++ b/svx/source/form/xfm_addcondition.cxx
@@ -50,17 +50,17 @@ namespace svxform
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames()
+ Sequence< OUString > SAL_CALL OAddConditionDialog_GetSupportedServiceNames()
{
::comphelper::StringSequence aSupported( 1 );
- aSupported.getArray()[0] = ::rtl::OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" );
+ aSupported.getArray()[0] = OUString( "com.sun.star.xforms.ui.dialogs.AddCondition" );
return aSupported;
}
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OAddConditionDialog_GetImplementationName()
+ OUString SAL_CALL OAddConditionDialog_GetImplementationName()
{
- return ::rtl::OUString("org.openoffice.comp.svx.OAddConditionDialog");
+ return OUString("org.openoffice.comp.svx.OAddConditionDialog");
}
//====================================================================
@@ -71,7 +71,7 @@ namespace svxform
:OAddConditionDialogBase( _rxORB )
{
registerProperty(
- ::rtl::OUString( "Binding" ),
+ OUString( "Binding" ),
PROPERTY_ID_BINDING,
PropertyAttribute::TRANSIENT,
&m_xBinding,
@@ -79,7 +79,7 @@ namespace svxform
);
registerProperty(
- ::rtl::OUString( "FacetName" ),
+ OUString( "FacetName" ),
PROPERTY_ID_FACET_NAME,
PropertyAttribute::TRANSIENT,
&m_sFacetName,
@@ -87,7 +87,7 @@ namespace svxform
);
registerProperty(
- ::rtl::OUString( "ConditionValue" ),
+ OUString( "ConditionValue" ),
PROPERTY_ID_CONDITION_VALUE,
PropertyAttribute::TRANSIENT,
&m_sConditionValue,
@@ -95,7 +95,7 @@ namespace svxform
);
registerProperty(
- ::rtl::OUString( "FormModel" ),
+ OUString( "FormModel" ),
PROPERTY_ID_FORM_MODEL,
PropertyAttribute::TRANSIENT,
&m_xWorkModel,
@@ -126,13 +126,13 @@ namespace svxform
}
//-------------------------------------------------------------------------
- ::rtl::OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException)
+ OUString SAL_CALL OAddConditionDialog::getImplementationName() throw(RuntimeException)
{
return OAddConditionDialog_GetImplementationName();
}
//-------------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException)
+ Sequence< OUString > SAL_CALL OAddConditionDialog::getSupportedServiceNames() throw(RuntimeException)
{
return OAddConditionDialog_GetSupportedServiceNames();
}
@@ -161,7 +161,7 @@ namespace svxform
Dialog* OAddConditionDialog::createDialog(Window* _pParent)
{
if ( !m_xBinding.is() || m_sFacetName.isEmpty() )
- throw RuntimeException( ::rtl::OUString(), *this );
+ throw RuntimeException( OUString(), *this );
return new AddConditionDialog( _pParent, m_sFacetName, m_xBinding );
}