summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorelixir <prashant3.yishu@gmail.com>2013-02-22 14:12:26 +0530
committerThomas Arnhold <thomas@arnhold.org>2013-02-25 13:00:14 +0000
commit5269589ae4fbe65a7c4e3de3d429bc834348bf79 (patch)
treeef667f8ad2d7a8f98e9e180d4585571c691903c3
parentc1d3315e8d1e4d8be4bcabcf343ef5dd76d63691 (diff)
fdo#38838,::rtl::OUString_to_OUString
Change-Id: I7c9ebd01c16ff066008e53de865560ad78215bab Reviewed-on: https://gerrit.libreoffice.org/2330 Reviewed-by: Thomas Arnhold <thomas@arnhold.org> Tested-by: Thomas Arnhold <thomas@arnhold.org>
Diffstat
-rw-r--r--dbaccess/source/ui/querydesign/QueryDesignView.cxx370
-rw-r--r--extensions/source/propctrlr/formcomponenthandler.cxx314
-rw-r--r--framework/source/fwe/classes/addonsoptions.cxx384
-rw-r--r--reportdesign/source/ui/inspection/GeometryHandler.cxx362
-rw-r--r--reportdesign/source/ui/inspection/metadata.cxx64
-rw-r--r--sfx2/source/doc/Metadatable.cxx228
-rw-r--r--sfx2/source/doc/SfxDocumentMetaData.cxx492
-rw-r--r--toolkit/source/controls/unocontrols.cxx450
-rw-r--r--xmloff/inc/txtfldi.hxx456
-rw-r--r--xmloff/inc/xmloff/txtparae.hxx194
10 files changed, 1657 insertions, 1657 deletions
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 49330e5d2b99..ab74b23d1901 100644
--- a/dbaccess/source/ui/querydesign/QueryDesignView.cxx
+++ b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
@@ -69,8 +69,8 @@ using namespace ::com::sun::star::container;
// please look at the book LargeScale C++ to know why
namespace
{
- static const ::rtl::OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND "));
- static const ::rtl::OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR "));
+ static const OUString C_AND(RTL_CONSTASCII_USTRINGPARAM(" AND "));
+ static const OUString C_OR(RTL_CONSTASCII_USTRINGPARAM(" OR "));
// forward declarations
sal_Bool InsertJoin( const OQueryDesignView* _pView,
@@ -101,22 +101,22 @@ namespace
bool _bAddOrOnOneLine);
//------------------------------------------------------------------------------
- ::rtl::OUString quoteTableAlias(sal_Bool _bQuote, const ::rtl::OUString& _sAliasName, const ::rtl::OUString& _sQuote)
+ OUString quoteTableAlias(sal_Bool _bQuote, const OUString& _sAliasName, const OUString& _sQuote)
{
- ::rtl::OUString sRet;
+ OUString sRet;
if ( _bQuote && !_sAliasName.isEmpty() )
{
sRet = ::dbtools::quoteName(_sQuote,_sAliasName);
- const static ::rtl::OUString sTableSeparater('.');
+ const static OUString sTableSeparater('.');
sRet += sTableSeparater;
}
return sRet;
}
//------------------------------------------------------------------------------
- ::rtl::OUString getTableRange(const OQueryDesignView* _pView,const ::connectivity::OSQLParseNode* _pTableRef)
+ OUString getTableRange(const OQueryDesignView* _pView,const ::connectivity::OSQLParseNode* _pTableRef)
{
Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection();
- ::rtl::OUString sTableRange;
+ OUString sTableRange;
if ( _pTableRef )
{
sTableRange = ::connectivity::OSQLParseNode::getTableRange(_pTableRef);
@@ -145,9 +145,9 @@ namespace
try
{
Reference<XNameAccess> xReferencedTableColumns(aInfoData->getReferencedTable()->getColumns());
- Sequence< ::rtl::OUString> aSeq = aInfoData->getReferencingTable()->getColumns()->getElementNames();
- const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ Sequence< OUString> aSeq = aInfoData->getReferencingTable()->getColumns()->getElementNames();
+ const OUString* pIter = aSeq.getConstArray();
+ const OUString* pEnd = pIter + aSeq.getLength();
for(;pIter != pEnd;++pIter)
{
if ( xReferencedTableColumns->hasByName(*pIter) )
@@ -167,12 +167,12 @@ namespace
}
else
{
- ::rtl::OUString aSourceFieldName(_aDragLeft->GetField());
- ::rtl::OUString aDestFieldName(_aDragRight->GetField());
+ OUString aSourceFieldName(_aDragLeft->GetField());
+ OUString aDestFieldName(_aDragRight->GetField());
// the connection could point on the other side
if(pConn->GetSourceWin() == _aDragRight->GetTabWindow())
{
- ::rtl::OUString aTmp(aSourceFieldName);
+ OUString aTmp(aSourceFieldName);
aSourceFieldName = aDestFieldName;
aDestFieldName = aTmp;
}
@@ -188,13 +188,13 @@ namespace
}
}
//------------------------------------------------------------------------------
- ::rtl::OUString ParseCondition( OQueryController& rController
+ OUString ParseCondition( OQueryController& rController
,const ::connectivity::OSQLParseNode* pCondition
- ,const ::rtl::OUString _sDecimal
+ ,const OUString _sDecimal
,const ::com::sun::star::lang::Locale& _rLocale
,sal_uInt32 _nStartIndex)
{
- ::rtl::OUString aCondition;
+ OUString aCondition;
Reference< XConnection> xConnection = rController.getConnection();
if ( xConnection.is() )
{
@@ -252,7 +252,7 @@ namespace
sal_Bool bErg = sal_False;
- ::rtl::OUString aTableRange,aColumnName;
+ OUString aTableRange,aColumnName;
sal_uInt16 nCntAccount;
::connectivity::OSQLParseTreeIterator& rParseIter = static_cast<OQueryController&>(_pView->getController()).getParseIterator();
rParseIter.getColumnRange( pColumnRef, aColumnName, aTableRange );
@@ -289,11 +289,11 @@ namespace
return eErrorCode;
}
//------------------------------------------------------------------------------
- ::rtl::OUString BuildJoinCriteria( const Reference< XConnection>& _xConnection,
+ OUString BuildJoinCriteria( const Reference< XConnection>& _xConnection,
const OConnectionLineDataVec* pLineDataList,
const OQueryTableConnectionData* pData)
{
- ::rtl::OUStringBuffer aCondition;
+ OUStringBuffer aCondition;
if ( _xConnection.is() )
{
OConnectionLineDataVec::const_iterator aIter = pLineDataList->begin();
@@ -301,8 +301,8 @@ namespace
try
{
const Reference< XDatabaseMetaData > xMetaData = _xConnection->getMetaData();
- const ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
- const ::rtl::OUString sEqual(RTL_CONSTASCII_USTRINGPARAM(" = "));
+ const OUString aQuote = xMetaData->getIdentifierQuoteString();
+ const OUString sEqual(RTL_CONSTASCII_USTRINGPARAM(" = "));
for(;aIter != aEnd;++aIter)
{
@@ -334,7 +334,7 @@ namespace
void JoinCycle( const Reference< XConnection>& _xConnection,
OQueryTableConnection* _pEntryConn,
const OQueryTableWindow* _pEntryTabTo,
- ::rtl::OUString& _rJoin )
+ OUString& _rJoin )
{
OSL_ENSURE(_pEntryConn,"TableConnection can not be null!");
@@ -345,21 +345,21 @@ namespace
if(!_rJoin.isEmpty() && _rJoin.lastIndexOf(')') == (_rJoin.getLength()-1))
{
bBrace = sal_True;
- _rJoin = _rJoin.replaceAt(_rJoin.getLength()-1,1,::rtl::OUString(' '));
+ _rJoin = _rJoin.replaceAt(_rJoin.getLength()-1,1,OUString(' '));
}
(_rJoin += C_AND) += BuildJoinCriteria(_xConnection,pData->GetConnLineDataList(),pData);
if(bBrace)
- _rJoin += ::rtl::OUString(')');
+ _rJoin += OUString(')');
_pEntryConn->SetVisited(sal_True);
}
}
//------------------------------------------------------------------------------
- ::rtl::OUString BuildTable( const Reference< XConnection>& _xConnection,
+ OUString BuildTable( const Reference< XConnection>& _xConnection,
const OQueryTableWindow* pEntryTab,
bool _bForce = false
)
{
- ::rtl::OUString aDBName(pEntryTab->GetComposedName());
+ OUString aDBName(pEntryTab->GetComposedName());
if( _xConnection.is() )
{
@@ -367,16 +367,16 @@ namespace
{
Reference< XDatabaseMetaData > xMetaData = _xConnection->getMetaData();
- ::rtl::OUString sCatalog, sSchema, sTable;
+ OUString sCatalog, sSchema, sTable;
::dbtools::qualifiedNameComponents( xMetaData, aDBName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation );
- ::rtl::OUString aTableListStr = ::dbtools::composeTableNameForSelect( _xConnection, sCatalog, sSchema, sTable );
+ OUString aTableListStr = ::dbtools::composeTableNameForSelect( _xConnection, sCatalog, sSchema, sTable );
- ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
+ OUString aQuote = xMetaData->getIdentifierQuoteString();
if ( _bForce || isAppendTableAliasEnabled( _xConnection ) || pEntryTab->GetAliasName() != aDBName )
{
- aTableListStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
+ aTableListStr += OUString(RTL_CONSTASCII_USTRINGPARAM(" "));
if ( generateAsBeforeTableAlias( _xConnection ) )
- aTableListStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("AS "));
+ aTableListStr += OUString(RTL_CONSTASCII_USTRINGPARAM("AS "));
aTableListStr += ::dbtools::quoteName( aQuote, pEntryTab->GetAliasName() );
}
aDBName = aTableListStr;
@@ -389,9 +389,9 @@ namespace
return aDBName;
}
//------------------------------------------------------------------------------
- ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection,
- const ::rtl::OUString& rLh,
- const ::rtl::OUString& rRh,
+ OUString BuildJoin( const Reference< XConnection>& _xConnection,
+ const OUString& rLh,
+ const OUString& rRh,
const OQueryTableConnectionData* pData)
{
@@ -429,7 +429,7 @@ namespace
return aErg;
}
//------------------------------------------------------------------------------
- ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection,
+ OUString BuildJoin( const Reference< XConnection>& _xConnection,
const OQueryTableWindow* pLh,
const OQueryTableWindow* pRh,
const OQueryTableConnectionData* pData
@@ -439,8 +439,8 @@ namespace
return BuildJoin(_xConnection,BuildTable(_xConnection,pLh,bForce),BuildTable(_xConnection,pRh,bForce),pData);
}
//------------------------------------------------------------------------------
- ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection,
- const ::rtl::OUString &rLh,
+ OUString BuildJoin( const Reference< XConnection>& _xConnection,
+ const OUString &rLh,
const OQueryTableWindow* pRh,
const OQueryTableConnectionData* pData
)
@@ -448,9 +448,9 @@ namespace
return BuildJoin(_xConnection,rLh,BuildTable(_xConnection,pRh),pData);
}
//------------------------------------------------------------------------------
- ::rtl::OUString BuildJoin( const Reference< XConnection>& _xConnection,
+ OUString BuildJoin( const Reference< XConnection>& _xConnection,
const OQueryTableWindow* pLh,
- const ::rtl::OUString &rRh,
+ const OUString &rRh,
const OQueryTableConnectionData* pData
)
{
@@ -476,7 +476,7 @@ namespace
return BuildJoin(_xConnection, rRh, BuildTable(_xConnection,pLh), &data);
}
//------------------------------------------------------------------------------
- typedef ::std::map< ::rtl::OUString,sal_Bool,::comphelper::UStringMixLess> tableNames_t;
+ typedef ::std::map< OUString,sal_Bool,::comphelper::UStringMixLess> tableNames_t;
//------------------------------------------------------------------------------
void addConnectionTableNames( const Reference< XConnection>& _xConnection,
const OQueryTableConnection* const pEntryConn,
@@ -486,7 +486,7 @@ namespace
const OQueryTableWindow* const pEntryTabFrom = static_cast<OQueryTableWindow*>(pEntryConn->GetSourceWin());
const OQueryTableWindow* const pEntryTabTo = static_cast<OQueryTableWindow*>(pEntryConn->GetDestWin());
- ::rtl::OUString sTabName(BuildTable(_xConnection,pEntryTabFrom));
+ OUString sTabName(BuildTable(_xConnection,pEntryTabFrom));
if(_rTableNames.find(sTabName) == _rTableNames.end())
_rTableNames[sTabName] = sal_True;
sTabName = BuildTable(_xConnection,pEntryTabTo);
@@ -497,7 +497,7 @@ namespace
void GetNextJoin( const Reference< XConnection>& _xConnection,
OQueryTableConnection* pEntryConn,
OQueryTableWindow* pEntryTabTo,
- ::rtl::OUString &aJoin,
+ OUString &aJoin,
tableNames_t &_rTableNames)
{
OQueryTableConnectionData* pEntryConnData = static_cast<OQueryTableConnectionData*>(pEntryConn->GetData().get());
@@ -623,15 +623,15 @@ namespace
return InsertJoinConnection(_pView,pCondition, INNER_JOIN,NULL,NULL) != eOk;
}
//------------------------------------------------------------------------------
- ::rtl::OUString GenerateSelectList( const OQueryDesignView* _pView,
+ OUString GenerateSelectList( const OQueryDesignView* _pView,
OTableFields& _rFieldList,
sal_Bool bAlias)
{
Reference< XConnection> xConnection = static_cast<OQueryController&>(_pView->getController()).getConnection();
if ( !xConnection.is() )
- return ::rtl::OUString();
+ return OUString();
- ::rtl::OUStringBuffer aTmpStr,aFieldListStr;
+ OUStringBuffer aTmpStr,aFieldListStr;
sal_Bool bAsterix = sal_False;
int nVis = 0;
@@ -653,23 +653,23 @@ namespace
try
{
const Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData();
- const ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
+ const OUString aQuote = xMetaData->getIdentifierQuoteString();
OJoinTableView::OTableWindowMap* pTabList = _pView->getTableView()->GetTabWinMap();
- const static ::rtl::OUString sFieldSeparator(RTL_CONSTASCII_USTRINGPARAM(", "));
- const static ::rtl::OUString s_sAs(RTL_CONSTASCII_USTRINGPARAM(" AS "));
+ const static OUString sFieldSeparator(RTL_CONSTASCII_USTRINGPARAM(", "));
+ const static OUString s_sAs(RTL_CONSTASCII_USTRINGPARAM(" AS "));
aIter = _rFieldList.begin();
for(;aIter != aEnd;++aIter)
{
OTableFieldDescRef pEntryField = *aIter;
- ::rtl::OUString rFieldName = pEntryField->GetField();
+ OUString rFieldName = pEntryField->GetField();
if ( !rFieldName.isEmpty() && pEntryField->IsVisible() )
{
- aTmpStr = ::rtl::OUString();
- const ::rtl::OUString rAlias = pEntryField->GetAlias();
- const ::rtl::OUString rFieldAlias = pEntryField->GetFieldAlias();
+ aTmpStr = OUString();
+ const OUString rAlias = pEntryField->GetAlias();
+ const OUString rFieldAlias = pEntryField->GetFieldAlias();
aTmpStr.append(quoteTableAlias((bAlias || bAsterix),rAlias,aQuote));
@@ -704,7 +704,7 @@ namespace
if ( pEntryField->isAggreateFunction() )
{
OSL_ENSURE(!pEntryField->GetFunction().isEmpty(),"Functionname darf hier nicht leer sein! ;-(");
- ::rtl::OUStringBuffer aTmpStr2( pEntryField->GetFunction());
+ OUStringBuffer aTmpStr2( pEntryField->GetFunction());
aTmpStr2.appendAscii("(");
aTmpStr2.append(aTmpStr.makeStringAndClear());
aTmpStr2.appendAscii(")");
@@ -734,15 +734,15 @@ namespace
}
//------------------------------------------------------------------------------
sal_Bool GenerateCriterias( OQueryDesignView* _pView,
- ::rtl::OUStringBuffer& rRetStr,
- ::rtl::OUStringBuffer& rHavingStr,
+ OUStringBuffer& rRetStr,
+ OUStringBuffer& rHavingStr,
OTableFields& _rFieldList,
sal_Bool bMulti )
{
// * darf keine Filter enthalten : habe ich die entsprechende Warnung schon angezeigt ?
sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS **
- ::rtl::OUString aFieldName,aCriteria,aWhereStr,aHavingStr,aWork/*,aOrderStr*/;
+ OUString aFieldName,aCriteria,aWhereStr,aHavingStr,aWork/*,aOrderStr*/;
// Zeilenweise werden die Ausdr"ucke mit AND verknuepft
sal_uInt16 nMaxCriteria = 0;
OTableFields::iterator aIter = _rFieldList.begin();
@@ -757,12 +757,12 @@ namespace
try
{
const Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData();
- const ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
+ const OUString aQuote = xMetaData->getIdentifierQuoteString();
const IParseContext& rContext = static_cast<OQueryController&>(_pView->getController()).getParser().getContext();
for (sal_uInt16 i=0 ; i < nMaxCriteria ; i++)
{
- aHavingStr = aWhereStr = ::rtl::OUString();
+ aHavingStr = aWhereStr = OUString();
for(aIter = _rFieldList.begin();aIter != aEnd;++aIter)
{
@@ -783,7 +783,7 @@ namespace
bCritsOnAsterikWarning = sal_True;
continue;
}
- aWork = ::rtl::OUString();
+ aWork = OUString();
aWork += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
@@ -796,7 +796,7 @@ namespace
if ( pEntryField->isAggreateFunction() || pEntryField->IsGroupBy() )
{
if (aHavingStr.isEmpty()) // noch keine Kriterien
- aHavingStr += ::rtl::OUString('('); // Klammern
+ aHavingStr += OUString('('); // Klammern
else
aHavingStr += C_AND;
@@ -804,15 +804,15 @@ namespace
{
OSL_ENSURE(!pEntryField->GetFunction().isEmpty(),"No function name for aggregate given!");
aHavingStr += pEntryField->GetFunction();
- aHavingStr += ::rtl::OUString('('); // Klammern
+ aHavingStr += OUString('('); // Klammern
aHavingStr += aWork;
- aHavingStr += ::rtl::OUString(')'); // Klammern
+ aHavingStr += OUString(')'); // Klammern
}
else
aHavingStr += aWork;
- ::rtl::OUString aTmp = aCriteria;
- ::rtl::OUString aErrorMsg;
+ OUString aTmp = aCriteria;
+ OUString aErrorMsg;
Reference<XPropertySet> xColumn;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
@@ -821,7 +821,7 @@ namespace
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
pParseNode->replaceNodeValue(pEntryField->GetAlias(),aFieldName);
- ::rtl::OUString sHavingStr = aHavingStr;
+ OUString sHavingStr = aHavingStr;
sal_uInt32 nCount = pParseNode->count();
for( sal_uInt32 node = 1 ; node < nCount ; ++node)
@@ -838,14 +838,14 @@ namespace
else
{
if ( aWhereStr.isEmpty() ) // noch keine Kriterien
- aWhereStr += ::rtl::OUString('('); // Klammern
+ aWhereStr += OUString('('); // Klammern
else
aWhereStr += C_AND;
- aWhereStr += ::rtl::OUString(' ');
+ aWhereStr += OUString(' ');
// aCriteria could have some german numbers so I have to be sure here
- ::rtl::OUString aTmp = aCriteria;
- ::rtl::OUString aErrorMsg;
+ OUString aTmp = aCriteria;
+ OUString aErrorMsg;
Reference<XPropertySet> xColumn;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode( _pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
@@ -854,7 +854,7 @@ namespace
{
if (bMulti && !(pEntryField->isOtherFunction() || (aFieldName.toChar() == '*')))
pParseNode->replaceNodeValue(pEntryField->GetAlias(),aFieldName);
- ::rtl::OUString aWhere = aWhereStr;
+ OUString aWhere = aWhereStr;
pParseNode->parseNodeToStr( aWhere,
xConnection,
&rContext,
@@ -865,7 +865,7 @@ namespace
else
{
aWhereStr += aWork;
- aWhereStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("="));
+ aWhereStr += OUString(RTL_CONSTASCII_USTRINGPARAM("="));
aWhereStr += aCriteria;
}
}
@@ -874,7 +874,7 @@ namespace
else if ( !i && pEntryField->isCondition() )
{
if (aWhereStr.isEmpty()) // noch keine Kriterien
- aWhereStr += ::rtl::OUString('('); // Klammern
+ aWhereStr += OUString('('); // Klammern
else
aWhereStr += C_AND;
aWhereStr += pEntryField->GetField();
@@ -882,7 +882,7 @@ namespace
}
if (!aWhereStr.isEmpty())
{
- aWhereStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig
+ aWhereStr += OUString(')'); // Klammern zu fuer 'AND' Zweig
if (rRetStr.getLength()) // schon Feldbedingungen ?
rRetStr.append(C_OR);
else // Klammern auf fuer 'OR' Zweig
@@ -891,7 +891,7 @@ namespace
}
if (!aHavingStr.isEmpty())
{
- aHavingStr += ::rtl::OUString(')'); // Klammern zu fuer 'AND' Zweig
+ aHavingStr += OUString(')'); // Klammern zu fuer 'AND' Zweig
if (rHavingStr.getLength()) // schon Feldbedingungen ?
rHavingStr.append(C_OR);
else // Klammern auf fuer 'OR' Zweig
@@ -915,7 +915,7 @@ namespace
SqlParseError GenerateOrder( OQueryDesignView* _pView,
OTableFields& _rFieldList,
sal_Bool bMulti,
- ::rtl::OUString& _rsRet)
+ OUString& _rsRet)
{
const OQueryController& rController = static_cast<OQueryController&>(_pView->getController());
Reference< XConnection> xConnection = rController.getConnection();
@@ -924,13 +924,13 @@ namespace
SqlParseError eErrorCode = eOk;
- ::rtl::OUString aColumnName;
- ::rtl::OUString aWorkStr;
+ OUString aColumnName;
+ OUString aWorkStr;
try
{
const bool bColumnAliasInOrderBy = rController.getSdbMetaData().supportsColumnAliasInOrderBy();
Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData();
- ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
+ OUString aQuote = xMetaData->getIdentifierQuoteString();
// * darf keine Filter enthalten : habe ich die entsprechende Warnung schon angezeigt ?
sal_Bool bCritsOnAsterikWarning = sal_False; // ** TMFS **
OTableFields::iterator aIter = _rFieldList.begin();
@@ -962,7 +962,7 @@ namespace
{
OSL_ENSURE(!pEntryField->GetFunction().isEmpty(),"Functionname darf hier nicht leer sein! ;-(");
aWorkStr += pEntryField->GetFunction();
- aWorkStr += ::rtl::OUString('(');
+ aWorkStr += OUString('(');
aWorkStr += quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
// only quote column name when we don't have a numeric
if ( pEntryField->isNumeric() )
@@ -970,7 +970,7 @@ namespace
else
aWorkStr += ::dbtools::quoteName(aQuote, aColumnName);
- aWorkStr += ::rtl::OUString(')');
+ aWorkStr += OUString(')');
}
else if ( pEntryField->isOtherFunction() )
{
@@ -1000,7 +1000,7 @@ namespace
eErrorCode = eStatementTooLong;
else
{
- _rsRet = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "));
+ _rsRet = OUString(RTL_CONSTASCII_USTRINGPARAM(" ORDER BY "));
_rsRet += aWorkStr;
}
}
@@ -1015,7 +1015,7 @@ namespace
//------------------------------------------------------------------------------
void GenerateInnerJoinCriterias(const Reference< XConnection>& _xConnection,
- ::rtl::OUString& _rJoinCrit,
+ OUString& _rJoinCrit,
const ::std::vector<OTableConnection*>* _pConnList)
{
::std::vector<OTableConnection*>::const_iterator aIter = _pConnList->begin();
@@ -1036,26 +1036,26 @@ namespace
void searchAndAppendName(const Reference< XConnection>& _xConnection,
const OQueryTableWindow* _pTableWindow,
tableNames_t& _rTableNames,
- ::rtl::OUString& _rsTableListStr
+ OUString& _rsTableListStr
)
{
- ::rtl::OUString sTabName(BuildTable(_xConnection,_pTableWindow));
+ OUString sTabName(BuildTable(_xConnection,_pTableWindow));
if(_rTableNames.find(sTabName) == _rTableNames.end())
{
_rTableNames[sTabName] = sal_True;
_rsTableListStr += sTabName;
- _rsTableListStr += ::rtl::OUString(',');
+ _rsTableListStr += OUString(',');
}
}
//------------------------------------------------------------------------------
- ::rtl::OUString GenerateFromClause( const Reference< XConnection>& _xConnection,
+ OUString GenerateFromClause( const Reference< XConnection>& _xConnection,
const OQueryTableView::OTableWindowMap* pTabList,
const ::std::vector<OTableConnection*>* pConnList
)
{
- ::rtl::OUString aTableListStr;
+ OUString aTableListStr;
// used to avoid putting a table twice in FROM clause
tableNames_t aTableNames;
@@ -1090,7 +1090,7 @@ namespace
OQueryTableConnection* pEntryConn = static_cast<OQueryTableConnection*>(*aConIter);
if(!pEntryConn->IsVisited() && pEntryConn->GetSourceWin() == aRIter->second )
{
- ::rtl::OUString aJoin;
+ OUString aJoin;
GetNextJoin(_xConnection,
pEntryConn,
static_cast<OQueryTableWindow*>(pEntryConn->GetDestWin()),
@@ -1099,7 +1099,7 @@ namespace
if(!aJoin.isEmpty())
{
- ::rtl::OUString aStr;
+ OUString aStr;
switch(static_cast<OQueryTableConnectionData*>(pEntryConn->GetData().get())->GetJoinType())
{
case LEFT_JOIN:
@@ -1108,17 +1108,17 @@ namespace
{
// create outer join
if ( bUseEscape )
- aStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("{ OJ "));
+ aStr += OUString(RTL_CONSTASCII_USTRINGPARAM("{ OJ "));
aStr += aJoin;
if ( bUseEscape )
- aStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" }"));
+ aStr += OUString(RTL_CONSTASCII_USTRINGPARAM(" }"));
}
break;
default:
aStr += aJoin;
break;
}
- aStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(","));
+ aStr += OUString(RTL_CONSTASCII_USTRINGPARAM(","));
aTableListStr += aStr;
}
}
@@ -1157,29 +1157,29 @@ namespace
if(!pEntryTab->ExistsAConn())
{
aTableListStr += BuildTable(_xConnection,pEntryTab);
- aTableListStr += ::rtl::OUString(',');
+ aTableListStr += OUString(',');
}
}
if(!aTableListStr.isEmpty())
- aTableListStr = aTableListStr.replaceAt(aTableListStr.getLength()-1,1, ::rtl::OUString() );
+ aTableListStr = aTableListStr.replaceAt(aTableListStr.getLength()-1,1, OUString() );
return aTableListStr;
}
//------------------------------------------------------------------------------
- ::rtl::OUString GenerateGroupBy(const OQueryDesignView* _pView,OTableFields& _rFieldList, sal_Bool bMulti )
+ OUString GenerateGroupBy(const OQueryDesignView* _pView,OTableFields& _rFieldList, sal_Bool bMulti )
{
OQueryController& rController = static_cast<OQueryController&>(_pView->getController());
const Reference< XConnection> xConnection = rController.getConnection();
if(!xConnection.is())
- return ::rtl::OUString();
+ return OUString();
::std::map< rtl::OUString,bool> aGroupByNames;
- ::rtl::OUString aGroupByStr;
+ OUString aGroupByStr;
try
{
const Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData();
- const ::rtl::OUString aQuote = xMetaData->getIdentifierQuoteString();
+ const OUString aQuote = xMetaData->getIdentifierQuoteString();
OTableFields::iterator aIter = _rFieldList.begin();
OTableFields::iterator aEnd = _rFieldList.end();
@@ -1189,7 +1189,7 @@ namespace
if ( pEntryField->IsGroupBy() )
{
OSL_ENSURE(!pEntryField->GetField().isEmpty(),"Kein FieldName vorhanden!;-(");
- ::rtl::OUString sGroupByPart = quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
+ OUString sGroupByPart = quoteTableAlias(bMulti,pEntryField->GetAlias(),aQuote);
// only quote the field name when it isn't calculated
if ( pEntryField->isNoneFunction() )
@@ -1198,15 +1198,15 @@ namespace
}
else
{
- ::rtl::OUString aTmp = pEntryField->GetField();
- ::rtl::OUString aErrorMsg;
+ OUString aTmp = pEntryField->GetField();
+ OUString aErrorMsg;
Reference<XPropertySet> xColumn;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr< ::connectivity::OSQLParseNode> pParseNode(_pView->getPredicateTreeFromEntry(pEntryField,aTmp,aErrorMsg,xColumn));
SAL_WNODEPRECATED_DECLARATIONS_POP
if (pParseNode.get())
{
- ::rtl::OUString sGroupBy;
+ OUString sGroupBy;
pParseNode->getChild(0)->parseNodeToStr( sGroupBy,
xConnection,
&rController.getParser().getContext(),
@@ -1221,14 +1221,14 @@ namespace
{
aGroupByNames.insert(::std::map< rtl::OUString,bool>::value_type(sGroupByPart,true));
aGroupByStr += sGroupByPart;
- aGroupByStr += ::rtl::OUString(',');
+ aGroupByStr += OUString(',');
}
}
}
if ( !aGroupByStr.isEmpty() )
{
- aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, ::rtl::OUString(' ') );
- ::rtl::OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY "));
+ aGroupByStr = aGroupByStr.replaceAt(aGroupByStr.getLength()-1,1, OUString(' ') );
+ OUString aGroupByStr2(RTL_CONSTASCII_USTRINGPARAM(" GROUP BY "));
aGroupByStr2 += aGroupByStr;
aGroupByStr = aGroupByStr2;
}
@@ -1374,7 +1374,7 @@ namespace
bool bAddOrOnOneLine)
{
const ::com::sun::star::lang::Locale aLocale = _pView->getLocale();
- const ::rtl::OUString sDecimal = _pView->getDecimalSeparator();
+ const OUString sDecimal = _pView->getDecimalSeparator();
// ich werde ein paar Mal einen gecasteten Pointer auf meinen ::com::sun::star::sdbcx::Container brauchen
OQueryController& rController = static_cast<OQueryController&>(_pView->getController());
@@ -1413,8 +1413,8 @@ namespace
const ::connectivity::OSQLParseNode* pValueExp = pCondition->getChild(0);
if (SQL_ISRULE(pValueExp, column_ref ) )
{
- ::rtl::OUString aColumnName;
- ::rtl::OUString aCondition;
+ OUString aColumnName;
+ OUString aCondition;
Reference< XConnection> xConnection = rController.getConnection();
if ( xConnection.is() )
{
@@ -1480,7 +1480,7 @@ namespace
else if ( SQL_ISRULE(pCondition->getChild(0), column_ref ) )
{
// parse condition
- ::rtl::OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1);
+ OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1);
OTableFieldDescRef aDragLeft = new OTableFieldDesc();
if ( eOk == ( eErrorCode = FillDragInfo(_pView,pCondition->getChild(0),aDragLeft)) )
{
@@ -1492,11 +1492,11 @@ namespace
else
{
// Funktions-Bedingung parsen
- ::rtl::OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1);
+ OUString sCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,1);
Reference< XConnection> xConnection = rController.getConnection();
Reference< XDatabaseMetaData > xMetaData = xConnection->getMetaData();
// the international doesn't matter I have a string
- ::rtl::OUString sName;
+ OUString sName;
pCondition->getChild(0)->parseNodeToPredicateStr(sName,
xConnection,
rController.getNumberFormatter(),
@@ -1516,7 +1516,7 @@ namespace
else if( SQL_ISRULEOR2(pCondition,existence_test,unique_test) )
{
// Funktions-Bedingung parsen
- ::rtl::OUString aCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,0);
+ OUString aCondition = ParseCondition(rController,pCondition,sDecimal,aLocale,0);
OTableFieldDescRef aDragLeft = new OTableFieldDesc();
aDragLeft->SetField(aCondition);
@@ -1546,10 +1546,10 @@ namespace
SQL_ISRULEOR3(pFunction, extract_exp, fold, char_substring_fct) ||
SQL_ISRULEOR2(pFunction,length_exp,char_value_fct),
"Illegal call!");
- ::rtl::OUString aCondition;
+ OUString aCondition;
OTableFieldDescRef aDragLeft = new OTableFieldDesc();
- ::rtl::OUString aColumnName;
+ OUString aColumnName;
Reference< XConnection> xConnection = rController.getConnection();
if(xConnection.is())
{
@@ -1585,7 +1585,7 @@ namespace
for(;aIter != aTabEnd;++aIter)
{
OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second);
- if (pTabWin->ExistsField( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aDragLeft ))
+ if (pTabWin->ExistsField( OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aDragLeft ))
{
aDragLeft->SetAlias(String());
aDragLeft->SetTable(String());
@@ -1596,7 +1596,7 @@ namespace
else if( eOk != ( eErrorCode = FillDragInfo(_pView,pParamNode,aDragLeft))
&& SQL_ISRULE(pParamNode,num_value_exp) )
{
- ::rtl::OUString sParameterValue;
+ OUString sParameterValue;
pParamNode->parseNodeToStr( sParameterValue,
xConnection,
&rController.getParser().getContext());
@@ -1638,7 +1638,7 @@ namespace
if ( SQL_ISRULE(pCondition->getChild(0), column_ref )
|| SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref) )
{
- ::rtl::OUString aCondition;
+ OUString aCondition;
OTableFieldDescRef aDragLeft = new OTableFieldDesc();
if ( SQL_ISRULE(pCondition->getChild(0), column_ref ) && SQL_ISRULE(pCondition->getChild(pCondition->count()-1), column_ref ) )
@@ -1699,22 +1699,22 @@ namespace
case SQL_NODE_LESS:
// take the opposite as we change the order
i--;
- aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
+ aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM(">"));
break;
case SQL_NODE_LESSEQ:
// take the opposite as we change the order
i--;
- aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
+ aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM(">="));
break;
case SQL_NODE_GREAT:
// take the opposite as we change the order
i--;
- aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
+ aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM("<"));
break;
case SQL_NODE_GREATEQ:
// take the opposite as we change the order
i--;
- aCondition = aCondition + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
+ aCondition = aCondition + OUString(RTL_CONSTASCII_USTRINGPARAM("<="));
break;
default:
break;
@@ -1755,7 +1755,7 @@ namespace
}
else // kann sich nur um einen Expr. Ausdruck handeln
{
- ::rtl::OUString aName,aCondition;
+ OUString aName,aCondition;
::connectivity::OSQLParseNode *pLhs = pCondition->getChild(0);
::connectivity::OSQLParseNode *pRhs = pCondition->getChild(2);
@@ -1789,7 +1789,7 @@ namespace
//------------------------------------------------------------------------------
namespace
{
- OQueryTableWindow* lcl_findColumnInTables( const ::rtl::OUString& _rColumName, const OJoinTableView::OTableWindowMap& _rTabList, OTableFieldDescRef& _rInfo )
+ OQueryTableWindow* lcl_findColumnInTables( const OUString& _rColumName, const OJoinTableView::OTableWindowMap& _rTabList, OTableFieldDescRef& _rInfo )
{
OJoinTableView::OTableWindowMap::const_iterator aIter = _rTabList.begin();
OJoinTableView::OTableWindowMap::const_iterator aEnd = _rTabList.end();
@@ -1806,9 +1806,9 @@ namespace
//------------------------------------------------------------------------------
void InsertColumnRef(const OQueryDesignView* _pView,
const ::connectivity::OSQLParseNode * pColumnRef,
- ::rtl::OUString& aColumnName,
- const ::rtl::OUString& aColumnAlias,
- ::rtl::OUString& aTableRange,
+ OUString& aColumnName,
+ const OUString& aColumnAlias,
+ OUString& aTableRange,
OTableFieldDescRef& _raInfo,
OJoinTableView::OTableWindowMap* pTabList)
{
@@ -1840,8 +1840,8 @@ namespace
}
if (!bFound)
{
- _raInfo->SetTable(::rtl::OUString());
- _raInfo->SetAlias(::rtl::OUString());
+ _raInfo->SetTable(OUString());
+ _raInfo->SetAlias(OUString());
_raInfo->SetField(aColumnName);
_raInfo->SetFieldAlias(aColumnAlias); // nyi : hier ein fortlaufendes Expr_1, Expr_2 ...
_raInfo->SetFunctionType(FKT_OTHER);
@@ -2030,8 +2030,8 @@ namespace
break;
}
- ::rtl::OUString sComposedName;
- ::rtl::OUString sAlias;
+ OUString sComposedName;
+ OUString sAlias;
OQueryTableView* pTableView = static_cast<OQueryTableView*>(_pView->getTableView());
pTableView->clearLayoutInformation();
@@ -2057,7 +2057,7 @@ namespace
// if the alias is the complete (composed) table, then shorten it
if ( aKeyComp( sComposedName, aIter->first ) )
{
- ::rtl::OUString sCatalog, sSchema, sTable;
+ OUString sCatalog, sSchema, sTable;
::dbtools::qualifiedNameComponents( xMetaData, sComposedName, sCatalog, sSchema, sTable, ::dbtools::eInDataManipulation );
sAlias = sTable;
}
@@ -2143,7 +2143,7 @@ namespace
{
SqlParseError eErrorCode = eOk;
sal_Bool bFirstField = sal_True;
- ::rtl::OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));
+ OUString sAsterix(RTL_CONSTASCII_USTRINGPARAM("*"));
OJoinTableView::OTableWindowMap::iterator aIter = _pTabList->begin();
OJoinTableView::OTableWindowMap::iterator aEnd = _pTabList->end();
for(;aIter != aEnd && eOk == eErrorCode ;++aIter)
@@ -2182,7 +2182,7 @@ namespace
OQueryController& rController = static_cast<OQueryController&>(_pView->getController());
Reference< XConnection> xConnection = rController.getConnection();
- ::rtl::OUString aColumnName,aTableRange;
+ OUString aColumnName,aTableRange;
for (sal_uInt32 i = 0; i < pParseTree->count() && eOk == eErrorCode ; ++i)
{
::connectivity::OSQLParseNode * pColumnRef = pParseTree->getChild(i);
@@ -2197,7 +2197,7 @@ namespace
if ( SQL_ISRULE(pColumnRef,derived_column) )
{
- ::rtl::OUString aColumnAlias(rController.getParseIterator().getColumnAlias(pColumnRef)); // kann leer sein
+ OUString aColumnAlias(rController.getParseIterator().getColumnAlias(pColumnRef)); // kann leer sein
pColumnRef = pColumnRef->getChild(0);
OTableFieldDescRef aInfo = new OTableFieldDesc();
@@ -2218,7 +2218,7 @@ namespace
SQL_ISRULEOR3(pColumnRef, extract_exp, fold, char_substring_fct) ||
SQL_ISRULEOR2(pColumnRef,length_exp,char_value_fct))
{
- ::rtl::OUString aColumns;
+ OUString aColumns;
pColumnRef->parseNodeToPredicateStr(aColumns,
xConnection,
rController.getNumberFormatter(),
@@ -2247,7 +2247,7 @@ namespace
for(;aIter != aEnd;++aIter)
{
OQueryTableWindow* pTabWin = static_cast<OQueryTableWindow*>(aIter->second);
- if (pTabWin->ExistsField( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aInfo ))
+ if (pTabWin->ExistsField( OUString(RTL_CONSTASCII_USTRINGPARAM("*")), aInfo ))
{
aInfo->SetAlias(String());
aInfo->SetTable(String());
@@ -2257,12 +2257,12 @@ namespace
}
else
{
- ::rtl::OUString sFieldName = aColumns;
+ OUString sFieldName = aColumns;
if ( pParamRef )
{ // we got an aggregate function but without column name inside
// so we set the whole argument of the function as field name
nFunctionType |= FKT_NUMERIC;
- sFieldName = ::rtl::OUString();
+ sFieldName = OUString();
pParamRef->parseNodeToStr( sFieldName,
xConnection,
&rController.getParser().getContext(),
@@ -2296,7 +2296,7 @@ namespace
}
else
{
- ::rtl::OUString aColumns;
+ OUString aColumns;
pColumnRef->parseNodeToStr( aColumns,
xConnection,
&rController.getParser().getContext(),
@@ -2367,7 +2367,7 @@ namespace
_pSelectionBrw->AddOrder( aDragLeft, eOrderDir, i);
else // it could be a alias name for a field
{
- ::rtl::OUString aTableRange,aColumnName;
+ OUString aTableRange,aColumnName;
::connectivity::OSQLParseTreeIterator& rParseIter = rController.getParseIterator();
rParseIter.getColumnRange( pArgument, aColumnName, aTableRange );
@@ -2392,7 +2392,7 @@ namespace
Reference< XConnection> xConnection = rController.getConnection();
if(xConnection.is())
{
- ::rtl::OUString sCondition;
+ OUString sCondition;
pArgument->parseNodeToPredicateStr(sCondition,
xConnection,
rController.getNumberFormatter(),
@@ -2461,7 +2461,7 @@ namespace
Reference< XConnection> xConnection = rController.getConnection();
if(xConnection.is())
{
- ::rtl::OUString sGroupByExpression;
+ OUString sGroupByExpression;
pArgument->parseNodeToStr( sGroupByExpression,
xConnection,
&rController.getParser().getContext(),
@@ -2693,7 +2693,7 @@ void OQueryDesignView::clear()
m_pTableView->ClearAll();
}
// -----------------------------------------------------------------------------
-void OQueryDesignView::setStatement(const ::rtl::OUString& /*_rsStatement*/)
+void OQueryDesignView::setStatement(const OUString& /*_rsStatement*/)
{
}
// -----------------------------------------------------------------------------
@@ -2755,19 +2755,19 @@ void OQueryDesignView::paste()
}
}
// -----------------------------------------------------------------------------
-void OQueryDesignView::TableDeleted(const ::rtl::OUString& rAliasName)
+void OQueryDesignView::TableDeleted(const OUString& rAliasName)
{
// Nachricht, dass Tabelle aus dem Fenster gel"oscht wurde
DeleteFields(rAliasName);
static_cast<OQueryController&>(getController()).InvalidateFeature(ID_BROWSER_ADDTABLE); // view nochmal bescheid sagen
}
//------------------------------------------------------------------------------
-void OQueryDesignView::DeleteFields( const ::rtl::OUString& rAliasName )
+void OQueryDesignView::DeleteFields( const OUString& rAliasName )
{
m_pSelectionBox->DeleteFields( rAliasName );
}
// -----------------------------------------------------------------------------
-bool OQueryDesignView::HasFieldByAliasName(const ::rtl::OUString& rFieldName, OTableFieldDescRef& rInfo) const
+bool OQueryDesignView::HasFieldByAliasName(const OUString& rFieldName, OTableFieldDescRef& rInfo) const
{
return m_pSelectionBox->HasFieldByAliasName( rFieldName, rInfo);
}
@@ -2786,7 +2786,7 @@ sal_Int32 OQueryDesignView::getColWidth(sal_uInt16 _nColPos) const
return nWidth;
}
//------------------------------------------------------------------------------
-void OQueryDesignView::fillValidFields(const ::rtl::OUString& sAliasName, ComboBox* pFieldList)
+void OQueryDesignView::fillValidFields(const OUString& sAliasName, ComboBox* pFieldList)
{
OSL_ENSURE(pFieldList != NULL, "OQueryDesignView::FillValidFields : What the hell do you think I can do with a NULL-ptr ? This will crash !");
pFieldList->Clear();
@@ -2794,8 +2794,8 @@ void OQueryDesignView::fillValidFields(const ::rtl::OUString& sAliasName, ComboB
sal_Bool bAllTables = sAliasName.isEmpty();
OJoinTableView::OTableWindowMap* pTabWins = m_pTableView->GetTabWinMap();
- ::rtl::OUString strCurrentPrefix;
- ::std::vector< ::rtl::OUString> aFields;
+ OUString strCurrentPrefix;
+ ::std::vector< OUString> aFields;
OJoinTableView::OTableWindowMap::iterator aIter = pTabWins->begin();
OJoinTableView::OTableWindowMap::iterator aEnd = pTabWins->end();
for(;aIter != aEnd;++aIter)
@@ -2804,16 +2804,16 @@ void OQueryDesignView::fillValidFields(const ::rtl::OUString& sAliasName, ComboB
if (bAllTables || (pCurrentWin->GetAliasName() == sAliasName))
{
strCurrentPrefix = pCurrentWin->GetAliasName();
- strCurrentPrefix += ::rtl::OUString('.');
+ strCurrentPrefix += OUString('.');
pCurrentWin->EnumValidFields(aFields);
- ::std::vector< ::rtl::OUString>::iterator aStrIter = aFields.begin();
- ::std::vector< ::rtl::OUString>::iterator aStrEnd = aFields.end();
+ ::std::vector< OUString>::iterator aStrIter = aFields.begin();
+ ::std::vector< OUString>::iterator aStrEnd = aFields.end();
for(;aStrIter != aStrEnd;++aStrIter)
{
if (bAllTables || aStrIter->toChar() == '*')
- pFieldList->InsertEntry(::rtl::OUString(strCurrentPrefix) += *aStrIter);
+ pFieldList->InsertEntry(OUString(strCurrentPrefix) += *aStrIter);
else
pFieldList->InsertEntry(*aStrIter);
}
@@ -2860,7 +2860,7 @@ sal_Bool OQueryDesignView::checkStatement()
return bRet;
}
//-------------------------------------------------------------------------------
-::rtl::OUString OQueryDesignView::getStatement()
+OUString OQueryDesignView::getStatement()
{
OQueryController& rController = static_cast<OQueryController&>(getController());
m_rController.clearError();
@@ -2889,40 +2889,40 @@ sal_Bool OQueryDesignView::checkStatement()
if ( !nFieldcount ) // keine Felder sichtbar also zur"uck
{
rUnUsedFields = rFieldList;
- return ::rtl::OUString();
+ return OUString();
}
OQueryTableView::OTableWindowMap* pTabList = m_pTableView->GetTabWinMap();
sal_uInt32 nTabcount = pTabList->size();
- ::rtl::OUString aFieldListStr(GenerateSelectList(this,rFieldList,nTabcount>1));
+ OUString aFieldListStr(GenerateSelectList(this,rFieldList,nTabcount>1));
if( aFieldListStr.isEmpty() )
- return ::rtl::OUString();
+ return OUString();
// Ausnahmebehandlung, wenn keine Felder angegeben worden sind
// Dann darf die Tabpage nicht gewechselt werden
- // Im TabBarSelectHdl wird der SQL-::rtl::OUString auf STATEMENT_NOFIELDS abgefragt
+ // Im TabBarSelectHdl wird der SQL-OUString auf STATEMENT_NOFIELDS abgefragt
// und eine Errormeldung erzeugt
// ----------------- Tabellenliste aufbauen ----------------------
const ::std::vector<OTableConnection*>* pConnList = m_pTableView->getTableConnections();
Reference< XConnection> xConnection = rController.getConnection();
- ::rtl::OUString aTableListStr(GenerateFromClause(xConnection,pTabList,pConnList));
+ OUString aTableListStr(GenerateFromClause(xConnection,pTabList,pConnList));
OSL_ENSURE(!aTableListStr.isEmpty(), "OQueryDesignView::getStatement() : unerwartet : habe Felder, aber keine Tabellen !");
// wenn es Felder gibt, koennen die nur durch Einfuegen aus einer schon existenten Tabelle entstanden sein; wenn andererseits
// eine Tabelle geloescht wird, verschwinden auch die zugehoerigen Felder -> ergo KANN es das nicht geben, dass Felder
// existieren, aber keine Tabellen (und aFieldListStr hat schon eine Laenge, das stelle ich oben sicher)
- ::rtl::OUStringBuffer aHavingStr,aCriteriaListStr;
+ OUStringBuffer aHavingStr,aCriteriaListStr;
// ----------------- Kriterien aufbauen ----------------------
if (!GenerateCriterias(this,aCriteriaListStr,aHavingStr,rFieldList, nTabcount > 1))
- return ::rtl::OUString();
+ return OUString();
- ::rtl::OUString aJoinCrit;
+ OUString aJoinCrit;
GenerateInnerJoinCriterias(xConnection,aJoinCrit,pConnList);
if(!aJoinCrit.isEmpty())
{
- ::rtl::OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( "));
+ OUString aTmp(RTL_CONSTASCII_USTRINGPARAM("( "));
aTmp += aJoinCrit;
- aTmp += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" )"));
+ aTmp += OUString(RTL_CONSTASCII_USTRINGPARAM(" )"));
if(aCriteriaListStr.getLength())
{
aTmp += C_AND;
@@ -2931,16 +2931,16 @@ sal_Bool OQueryDesignView::checkStatement()
aCriteriaListStr = aTmp;
}
// ----------------- Statement aufbauen ----------------------
- ::rtl::OUStringBuffer aSqlCmd(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")));
+ OUStringBuffer aSqlCmd(OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT ")));
if(static_cast<OQueryController&>(getController()).isDistinct())
- aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" DISTINCT ")));
+ aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" DISTINCT ")));
aSqlCmd.append(aFieldListStr);
- aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")));
+ aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM ")));
aSqlCmd.append(aTableListStr);
if (aCriteriaListStr.getLength())
{
- aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")));
+ aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" WHERE ")));
aSqlCmd.append(aCriteriaListStr.makeStringAndClear());
}
// ----------------- GroupBy aufbauen und Anh"angen ------------
@@ -2955,11 +2955,11 @@ sal_Bool OQueryDesignView::checkStatement()
// ----------------- having Anh"angen ------------
if(aHavingStr.getLength())
{
- aSqlCmd.append(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")));
+ aSqlCmd.append(OUString(RTL_CONSTASCII_USTRINGPARAM(" HAVING ")));
aSqlCmd.append(aHavingStr.makeStringAndClear());
}
// ----------------- Sortierung aufbauen und Anh"angen ------------
- ::rtl::OUString sOrder;
+ OUString sOrder;
SqlParseError eErrorCode = eOk;
if ( (eErrorCode = GenerateOrder(this,rFieldList,nTabcount > 1,sOrder)) == eOk)
aSqlCmd.append(sOrder);
@@ -2971,11 +2971,11 @@ sal_Bool OQueryDesignView::checkStatement()
m_rController.displayError();
}
- ::rtl::OUString sSQL = aSqlCmd.makeStringAndClear();
+ OUString sSQL = aSqlCmd.makeStringAndClear();
if ( xConnection.is() )
{
::connectivity::OSQLParser& rParser( rController.getParser() );
- ::rtl::OUString sErrorMessage;
+ OUString sErrorMessage;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
::std::auto_ptr<OSQLParseNode> pParseNode( rParser.parseTree( sErrorMessage, sSQL, sal_True ) );
SAL_WNODEPRECATED_DECLARATIONS_POP
@@ -2988,7 +2988,7 @@ sal_Bool OQueryDesignView::checkStatement()
if ( pCondition ) // no where clause
{
OSQLParseNode::compress(pCondition);
- ::rtl::OUString sTemp;
+ OUString sTemp;
pParseNode->parseNodeToStr(sTemp,xConnection);
sSQL = sTemp;
}
@@ -3055,7 +3055,7 @@ void OQueryDesignView::SaveUIConfig()
// -----------------------------------------------------------------------------
OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pEntry,
const String& _sCriteria,
- ::rtl::OUString& _rsErrorMessage,
+ OUString& _rsErrorMessage,
Reference<XPropertySet>& _rxColumn) const
{
OSL_ENSURE(pEntry.is(),"Entry is null!");
@@ -3087,9 +3087,9 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
if ( nType == DataType::OTHER || (!sFunction.Len() && pEntry->isNumericOrAggreateFunction()) )
{
// first try the international version
- ::rtl::OUString sSql;
- sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * "));
- sSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE "));
+ OUString sSql;
+ sSql += OUString(RTL_CONSTASCII_USTRINGPARAM("SELECT * "));
+ sSql += OUString(RTL_CONSTASCII_USTRINGPARAM(" FROM x WHERE "));
sSql += pEntry->GetField();
sSql += _sCriteria;
SAL_WNODEPRECATED_DECLARATIONS_PUSH
@@ -3112,9 +3112,9 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
Reference<XDatabaseMetaData> xMeta = xConnection->getMetaData();
parse::OParseColumn* pColumn = new parse::OParseColumn( pEntry->GetField(),
- ::rtl::OUString(),
- ::rtl::OUString(),
- ::rtl::OUString(),
+ OUString(),
+ OUString(),
+ OUString(),
ColumnValue::NULLABLE_UNKNOWN,
0,
0,
@@ -3122,9 +3122,9 @@ OSQLParseNode* OQueryDesignView::getPredicateTreeFromEntry(OTableFieldDescRef pE
sal_False,
sal_False,
xMeta.is() && xMeta->supportsMixedCaseQuotedIdentifiers(),
- ::rtl::OUString(),
- ::rtl::OUString(),
- ::rtl::OUString());
+ OUString(),
+ OUString(),
+ OUString());
_rxColumn = pColumn;
pColumn->setFunction(sal_True);
pColumn->setRealName(pEntry->GetField());
@@ -3296,7 +3296,7 @@ namespace {
// (which should then be renamed...)
void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* pNode
- ,const ::rtl::OUString& sFunctionTerm
+ ,const OUString& sFunctionTerm
,OTableFieldDescRef& aInfo)
{
// get the type of the expression, as far as easily possible
@@ -3482,7 +3482,7 @@ void OQueryDesignView::fillFunctionInfo( const ::connectivity::OSQLParseNode* p
if ( SQL_ISRULEOR2(pNode,length_exp,char_value_fct) )
pFunctionName = pFunctionName->getChild(0);
- ::rtl::OUString sFunctionName = pFunctionName->getTokenValue();
+ OUString sFunctionName = pFunctionName->getTokenValue();
if ( sFunctionName.isEmpty() )
sFunctionName = ::rtl::OStringToOUString(OSQLParser::TokenIDToStr(pFunctionName->getTokenID()),RTL_TEXTENCODING_UTF8);
diff --git a/extensions/source/propctrlr/formcomponenthandler.cxx b/extensions/source/propctrlr/formcomponenthandler.cxx
index 7f62516bbb91..dc102c118321 100644
--- a/extensions/source/propctrlr/formcomponenthandler.cxx
+++ b/extensions/source/propctrlr/formcomponenthandler.cxx
@@ -161,16 +161,16 @@ namespace pcr
//--------------------------------------------------------------------
IMPLEMENT_FORWARD_XINTERFACE2(FormComponentPropertyHandler,FormComponentPropertyHandler_Base,::comphelper::OPropertyContainer)
//--------------------------------------------------------------------
- ::rtl::OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
+ OUString SAL_CALL FormComponentPropertyHandler::getImplementationName_static( ) throw (RuntimeException)
{
- return ::rtl::OUString( "com.sun.star.comp.extensions.FormComponentPropertyHandler" );
+ return OUString( "com.sun.star.comp.extensions.FormComponentPropertyHandler" );
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupportedServiceNames_static( ) throw (RuntimeException)
{
- Sequence< ::rtl::OUString > aSupported( 1 );
- aSupported[0] = ::rtl::OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" );
+ Sequence< OUString > aSupported( 1 );
+ aSupported[0] = OUString( "com.sun.star.form.inspection.FormComponentPropertyHandler" );
return aSupported;
}
@@ -195,7 +195,7 @@ namespace pcr
namespace
{
- bool lcl_isLanguageDependentProperty( ::rtl::OUString aName )
+ bool lcl_isLanguageDependentProperty( OUString aName )
{
bool bRet = false;
@@ -213,7 +213,7 @@ namespace pcr
}
Reference< resource::XStringResourceResolver > lcl_getStringResourceResolverForProperty
- ( Reference< XPropertySet > _xComponent, const ::rtl::OUString& _rPropertyName,
+ ( Reference< XPropertySet > _xComponent, const OUString& _rPropertyName,
const Any& _rPropertyValue )
{
Reference< resource::XStringResourceResolver > xRet;
@@ -221,7 +221,7 @@ namespace pcr
if ( (eType == TypeClass_STRING || eType == TypeClass_SEQUENCE) &&
lcl_isLanguageDependentProperty( _rPropertyName ) )
{
- static const ::rtl::OUString s_sResourceResolverPropName("ResourceResolver");
+ static const OUString s_sResourceResolverPropName("ResourceResolver");
Reference< resource::XStringResourceResolver > xStringResourceResolver;
try
@@ -244,7 +244,7 @@ namespace pcr
}
//--------------------------------------------------------------------
- Any FormComponentPropertyHandler::impl_getPropertyValue_throw( const ::rtl::OUString& _rPropertyName ) const
+ Any FormComponentPropertyHandler::impl_getPropertyValue_throw( const OUString& _rPropertyName ) const
{
const PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) );
@@ -257,14 +257,14 @@ namespace pcr
TypeClass eType = aPropertyValue.getValueType().getTypeClass();
if( eType == TypeClass_STRING )
{
- ::rtl::OUString aPropStr;
+ OUString aPropStr;
aPropertyValue >>= aPropStr;
if( aPropStr.getLength() > 1 )
{
- ::rtl::OUString aPureIdStr = aPropStr.copy( 1 );
+ OUString aPureIdStr = aPropStr.copy( 1 );
if( xStringResourceResolver->hasEntryForId( aPureIdStr ) )
{
- ::rtl::OUString aResourceStr = xStringResourceResolver->resolveString( aPureIdStr );
+ OUString aResourceStr = xStringResourceResolver->resolveString( aPureIdStr );
aPropertyValue <<= aResourceStr;
}
}
@@ -272,21 +272,21 @@ namespace pcr
// StringItemList?
else if( eType == TypeClass_SEQUENCE )
{
- Sequence< ::rtl::OUString > aStrings;
+ Sequence< OUString > aStrings;
aPropertyValue >>= aStrings;
- const ::rtl::OUString* pStrings = aStrings.getConstArray();
+ const OUString* pStrings = aStrings.getConstArray();
sal_Int32 nCount = aStrings.getLength();
- Sequence< ::rtl::OUString > aResolvedStrings;
+ Sequence< OUString > aResolvedStrings;
aResolvedStrings.realloc( nCount );
- ::rtl::OUString* pResolvedStrings = aResolvedStrings.getArray();
+ OUString* pResolvedStrings = aResolvedStrings.getArray();
try
{
for ( sal_Int32 i = 0; i < nCount; ++i )
{
- ::rtl::OUString aIdStr = pStrings[i];
- ::rtl::OUString aPureIdStr = aIdStr.copy( 1 );
+ OUString aIdStr = pStrings[i];
+ OUString aPureIdStr = aIdStr.copy( 1 );
if( xStringResourceResolver->hasEntryForId( aPureIdStr ) )
pResolvedStrings[i] = xStringResourceResolver->resolveString( aPureIdStr );
else
@@ -305,7 +305,7 @@ namespace pcr
}
//--------------------------------------------------------------------
- Any SAL_CALL FormComponentPropertyHandler::getPropertyValue( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
+ Any SAL_CALL FormComponentPropertyHandler::getPropertyValue( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
{
if( _rPropertyName == PROPERTY_ROWSET )
return ::comphelper::OPropertyContainer::getPropertyValue( _rPropertyName );
@@ -315,7 +315,7 @@ namespace pcr
}
//--------------------------------------------------------------------
- void SAL_CALL FormComponentPropertyHandler::setPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
+ void SAL_CALL FormComponentPropertyHandler::setPropertyValue( const OUString& _rPropertyName, const Any& _rValue ) throw (UnknownPropertyException, RuntimeException)
{
if( _rPropertyName == PROPERTY_ROWSET )
{
@@ -360,12 +360,12 @@ namespace pcr
TypeClass eType = aPropertyValue.getValueType().getTypeClass();
if( eType == TypeClass_STRING )
{
- ::rtl::OUString aPropStr;
+ OUString aPropStr;
aPropertyValue >>= aPropStr;
if( aPropStr.getLength() > 1 )
{
- ::rtl::OUString aPureIdStr = aPropStr.copy( 1 );
- ::rtl::OUString aValueStr;
+ OUString aPureIdStr = aPropStr.copy( 1 );
+ OUString aValueStr;
_rValue >>= aValueStr;
xStringResourceManager->setString( aPureIdStr, aValueStr );
aValue = aPropertyValue; // set value to force modified
@@ -374,31 +374,31 @@ namespace pcr
// StringItemList?
else if( eType == TypeClass_SEQUENCE )
{
- static ::rtl::OUString aDot(".");
- static ::rtl::OUString aEsc("&");
+ static OUString aDot(".");
+ static OUString aEsc("&");
// Put strings into resource using new ids
- Sequence< ::rtl::OUString > aNewStrings;
+ Sequence< OUString > aNewStrings;
_rValue >>= aNewStrings;
- const ::rtl::OUString* pNewStrings = aNewStrings.getConstArray();
+ const OUString* pNewStrings = aNewStrings.getConstArray();
sal_Int32 nNewCount = aNewStrings.getLength();
// Create new Ids
- ::rtl::OUString* pNewPureIds = new ::rtl::OUString[nNewCount];
- ::rtl::OUString aIdStrBase = aDot;
+ OUString* pNewPureIds = new OUString[nNewCount];
+ OUString aIdStrBase = aDot;
Any aNameAny = m_xComponent->getPropertyValue(PROPERTY_NAME);
- ::rtl::OUString sControlName;
+ OUString sControlName;
aNameAny >>= sControlName;
aIdStrBase += sControlName;
aIdStrBase += aDot;
aIdStrBase += _rPropertyName;
sal_Int32 i;
- ::rtl::OUString aDummyStr;
+ OUString aDummyStr;
for ( i = 0; i < nNewCount; ++i )
{
sal_Int32 nUniqueId = xStringResourceManager->getUniqueNumericId();
- ::rtl::OUString aPureIdStr = ::rtl::OUString::valueOf( nUniqueId );
+ OUString aPureIdStr = OUString::valueOf( nUniqueId );
aPureIdStr += aIdStrBase;
pNewPureIds[i] = aPureIdStr;
// Force usage of next Unique Id
@@ -409,28 +409,28 @@ namespace pcr
Sequence< Locale > aLocaleSeq = xStringResourceManager->getLocales();
const Locale* pLocale = aLocaleSeq.getConstArray();
sal_Int32 nLocaleCount = aLocaleSeq.getLength();
- Sequence< ::rtl::OUString > aOldIdStrings;
+ Sequence< OUString > aOldIdStrings;
aPropertyValue >>= aOldIdStrings;
try
{
- const ::rtl::OUString* pOldIdStrings = aOldIdStrings.getConstArray();
+ const OUString* pOldIdStrings = aOldIdStrings.getConstArray();
sal_Int32 nOldIdCount = aOldIdStrings.getLength();
for ( i = 0; i < nNewCount; ++i )
{
- ::rtl::OUString aOldIdStr;
- ::rtl::OUString aOldPureIdStr;
+ OUString aOldIdStr;
+ OUString aOldPureIdStr;
if( i < nOldIdCount )
{
aOldIdStr = pOldIdStrings[i];
aOldPureIdStr = aOldIdStr.copy( 1 );
}
- ::rtl::OUString aNewPureIdStr = pNewPureIds[i];
+ OUString aNewPureIdStr = pNewPureIds[i];
for ( sal_Int32 iLocale = 0; iLocale < nLocaleCount; ++iLocale )
{
Locale aLocale = pLocale[iLocale];
- ::rtl::OUString aResourceStr;
+ OUString aResourceStr;
if( !aOldPureIdStr.isEmpty() )
{
if( xStringResourceManager->hasEntryForIdAndLocale( aOldPureIdStr, aLocale ) )
@@ -449,28 +449,28 @@ namespace pcr
// Set new strings for current locale and create
// new Id sequence as new property value
- Sequence< ::rtl::OUString > aNewIdStrings;
+ Sequence< OUString > aNewIdStrings;
aNewIdStrings.realloc( nNewCount );
- ::rtl::OUString* pNewIdStrings = aNewIdStrings.getArray();
+ OUString* pNewIdStrings = aNewIdStrings.getArray();
for ( i = 0; i < nNewCount; ++i )
{
- ::rtl::OUString aPureIdStr = pNewPureIds[i];
- ::rtl::OUString aStr = pNewStrings[i];
+ OUString aPureIdStr = pNewPureIds[i];
+ OUString aStr = pNewStrings[i];
xStringResourceManager->setString( aPureIdStr, aStr );
- ::rtl::OUString aIdStr = aEsc;
+ OUString aIdStr = aEsc;
aIdStr += aPureIdStr;
pNewIdStrings[i] = aIdStr;
}
aValue <<= aNewIdStrings;
// Remove old ids from resource for all locales
- const ::rtl::OUString* pOldIdStrings = aOldIdStrings.getConstArray();
+ const OUString* pOldIdStrings = aOldIdStrings.getConstArray();
sal_Int32 nOldIdCount = aOldIdStrings.getLength();
for( i = 0 ; i < nOldIdCount ; ++i )
{
- ::rtl::OUString aIdStr = pOldIdStrings[i];
- ::rtl::OUString aPureIdStr = aIdStr.copy( 1 );
+ OUString aIdStr = pOldIdStrings[i];
+ OUString aPureIdStr = aIdStr.copy( 1 );
for ( sal_Int32 iLocale = 0; iLocale < nLocaleCount; ++iLocale )
{
Locale aLocale = pLocale[iLocale];
@@ -492,7 +492,7 @@ namespace pcr
}
//--------------------------------------------------------------------
- Any SAL_CALL FormComponentPropertyHandler::convertToPropertyValue( const ::rtl::OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
+ Any SAL_CALL FormComponentPropertyHandler::convertToPropertyValue( const OUString& _rPropertyName, const Any& _rControlValue ) throw (UnknownPropertyException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
PropertyId nPropId( impl_getPropertyId_throw( _rPropertyName ) );
@@ -512,7 +512,7 @@ namespace pcr
if ( m_aPropertiesWithDefListEntry.find( _rPropertyName ) != m_aPropertiesWithDefListEntry.end() )
{
// it's a control with a string list
- ::rtl::OUString sStringValue;
+ OUString sStringValue;
if ( _rControlValue >>= sStringValue )
{ // note that ColorListBoxes might transfer values either as string or as css.util.Color,
// so this check here is important
@@ -525,7 +525,7 @@ namespace pcr
{
case PROPERTY_ID_DATASOURCE:
{
- ::rtl::OUString sControlValue;
+ OUString sControlValue;
OSL_VERIFY( _rControlValue >>= sControlValue );
if ( !sControlValue.isEmpty() )
@@ -534,7 +534,7 @@ namespace pcr
if ( !xDatabaseContext->hasByName( sControlValue ) )
{
::svt::OFileNotation aTransformer(sControlValue);
- aPropertyValue <<= ::rtl::OUString( aTransformer.get( ::svt::OFileNotation::N_URL ) );
+ aPropertyValue <<= OUString( aTransformer.get( ::svt::OFileNotation::N_URL ) );
}
}
}
@@ -545,10 +545,10 @@ namespace pcr
case PROPERTY_ID_SHOW_RECORDACTIONS:
case PROPERTY_ID_SHOW_FILTERSORT:
{
- ::rtl::OUString sControlValue;
+ OUString sControlValue;
OSL_VERIFY( _rControlValue >>= sControlValue );
- ::std::vector< ::rtl::OUString > aListEntries;
+ ::std::vector< OUString > aListEntries;
tools::StringListResource aRes( PcrRes( RID_RSC_ENUM_SHOWHIDE ), aListEntries );
OSL_ENSURE( aListEntries.size() == 2, "FormComponentPropertyHandler::convertToPropertyValue: broken resource for Show/Hide!" );
sal_Bool bShow = ( aListEntries.size() < 2 ) || ( sControlValue == aListEntries[1] );
@@ -560,7 +560,7 @@ namespace pcr
case PROPERTY_ID_TARGET_URL:
case PROPERTY_ID_IMAGE_URL:
{
- ::rtl::OUString sControlValue;
+ OUString sControlValue;
OSL_VERIFY( _rControlValue >>= sControlValue );
// Don't convert a placeholder
if ( nPropId == PROPERTY_ID_IMAGE_URL && sControlValue.equals( String( PcrRes( RID_EMBED_IMAGE_PLACEHOLDER ) ) ) )
@@ -568,7 +568,7 @@ namespace pcr
else
{
INetURLObject aDocURL( impl_getDocumentURL_nothrow() );
- aPropertyValue <<= (::rtl::OUString)URIHelper::SmartRel2Abs( aDocURL, sControlValue, Link(), false, true, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI );
+ aPropertyValue <<= (OUString)URIHelper::SmartRel2Abs( aDocURL, sControlValue, Link(), false, true, INetURLObject::WAS_ENCODED, INetURLObject::DECODE_TO_IURI );
}
}
break;
@@ -627,7 +627,7 @@ namespace pcr
}
//--------------------------------------------------------------------
- Any SAL_CALL FormComponentPropertyHandler::convertToControlValue( const ::rtl::OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
+ Any SAL_CALL FormComponentPropertyHandler::convertToControlValue( const OUString& _rPropertyName, const Any& _rPropertyValue, const Type& _rControlValueType ) throw (UnknownPropertyException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
sal_Int32 nPropId = m_pInfoService->getPropertyId( _rPropertyName );
@@ -654,13 +654,13 @@ namespace pcr
case PROPERTY_ID_SHOW_RECORDACTIONS:
case PROPERTY_ID_SHOW_FILTERSORT:
{
- ::std::vector< ::rtl::OUString > aListEntries;
+ ::std::vector< OUString > aListEntries;
tools::StringListResource aRes( PcrRes( RID_RSC_ENUM_SHOWHIDE ), aListEntries );
OSL_ENSURE( aListEntries.size() == 2, "FormComponentPropertyHandler::convertToControlValue: broken resource for Show/Hide!" );
if ( aListEntries.size() == 2 )
{
- ::rtl::OUString sControlValue = ::comphelper::getBOOL( _rPropertyValue )
+ OUString sControlValue = ::comphelper::getBOOL( _rPropertyValue )
? aListEntries[1]
: aListEntries[0];
aControlValue <<= sControlValue;
@@ -674,7 +674,7 @@ namespace pcr
OSL_ENSURE( _rControlValueType.getTypeClass() == TypeClass_STRING,
"FormComponentPropertyHandler::convertToControlValue: wrong ControlValueType!" );
- ::rtl::OUString sDataSource;
+ OUString sDataSource;
_rPropertyValue >>= sDataSource;
if ( !sDataSource.isEmpty() )
{
@@ -688,7 +688,7 @@ namespace pcr
//////////////////////////////////////////////////////////////
case PROPERTY_ID_CONTROLLABEL:
{
- ::rtl::OUString sControlValue;
+ OUString sControlValue;
Reference< XPropertySet > xSet;
_rPropertyValue >>= xSet;
@@ -697,9 +697,9 @@ namespace pcr
xPSI = xSet->getPropertySetInfo();
if ( xPSI.is() && xPSI->hasPropertyByName( PROPERTY_LABEL ) )
{
- ::rtl::OUStringBuffer aValue;
+ OUStringBuffer aValue;
aValue.append( (sal_Unicode)'<' );
- ::rtl::OUString sLabel;
+ OUString sLabel;
OSL_VERIFY( xSet->getPropertyValue( PROPERTY_LABEL ) >>= sLabel );
aValue.append( sLabel );
aValue.append( (sal_Unicode)'>' );
@@ -758,7 +758,7 @@ namespace pcr
FontDescriptor aFont;
OSL_VERIFY( _rPropertyValue >>= aFont );
- ::rtl::OUStringBuffer displayName;
+ OUStringBuffer displayName;
if ( aFont.Name.isEmpty() )
{
displayName.append( String( PcrRes( RID_STR_FONT_DEFAULT ) ) );
@@ -808,7 +808,7 @@ namespace pcr
}
//--------------------------------------------------------------------
- PropertyState SAL_CALL FormComponentPropertyHandler::getPropertyState( const ::rtl::OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
+ PropertyState SAL_CALL FormComponentPropertyHandler::getPropertyState( const OUString& _rPropertyName ) throw (UnknownPropertyException, RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_xPropertyState.is() )
@@ -822,7 +822,7 @@ namespace pcr
::osl::MutexGuard aGuard( m_aMutex );
FormComponentPropertyHandler_Base::addPropertyChangeListener( _rxListener );
if ( m_xComponent.is() )
- m_xComponent->addPropertyChangeListener( ::rtl::OUString(), _rxListener );
+ m_xComponent->addPropertyChangeListener( OUString(), _rxListener );
}
//--------------------------------------------------------------------
@@ -830,7 +830,7 @@ namespace pcr
{
::osl::MutexGuard aGuard( m_aMutex );
if ( m_xComponent.is() )
- m_xComponent->removePropertyChangeListener( ::rtl::OUString(), _rxListener );
+ m_xComponent->removePropertyChangeListener( OUString(), _rxListener );
FormComponentPropertyHandler_Base::removePropertyChangeListener( _rxListener );
}
@@ -862,7 +862,7 @@ namespace pcr
// filter the properties
PropertyId nPropId( 0 );
- ::rtl::OUString sDisplayName;
+ OUString sDisplayName;
Property* pProperty = aAllProperties.getArray();
Property* pPropertiesEnd = pProperty + aAllProperties.getLength();
@@ -927,16 +927,16 @@ namespace pcr
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL FormComponentPropertyHandler::getSupersededProperties( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getSupersededProperties( ) throw (RuntimeException)
{
- return Sequence< ::rtl::OUString >( );
+ return Sequence< OUString >( );
}
//--------------------------------------------------------------------
- Sequence< ::rtl::OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
+ Sequence< OUString > SAL_CALL FormComponentPropertyHandler::getActuatingProperties( ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- ::std::vector< ::rtl::OUString > aInterestingProperties;
+ ::std::vector< OUString > aInterestingProperties;
aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_DATASOURCE) );
aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMAND) );
aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_COMMANDTYPE) );
@@ -959,11 +959,11 @@ namespace pcr
aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_FORMATKEY) );
aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_EMPTY_IS_NULL) );
aInterestingProperties.push_back( static_cast<const rtl::OUString&>(PROPERTY_TOGGLE) );
- return Sequence< ::rtl::OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() );
+ return Sequence< OUString >( &(*aInterestingProperties.begin()), aInterestingProperties.size() );
}
//--------------------------------------------------------------------
- LineDescriptor SAL_CALL FormComponentPropertyHandler::describePropertyLine( const ::rtl::OUString& _rPropertyName,
+ LineDescriptor SAL_CALL FormComponentPropertyHandler::describePropertyLine( const OUString& _rPropertyName,
const Reference< XPropertyControlFactory >& _rxControlFactory )
throw (UnknownPropertyException, NullPointerException, RuntimeException)
{
@@ -1256,7 +1256,7 @@ namespace pcr
)
nResId = RID_RSC_ENUM_SHOWHIDE;
- ::std::vector< ::rtl::OUString > aListEntries;
+ ::std::vector< OUString > aListEntries;
tools::StringListResource aRes(PcrRes(nResId),aListEntries);
aDescriptor.Control = PropertyHandlerHelper::createListBoxControl( _rxControlFactory, aListEntries, sal_False, sal_False );
bNeedDefaultStringIfVoidAllowed = true;
@@ -1268,9 +1268,9 @@ namespace pcr
bool bIsEnumProperty = ( nPropertyUIFlags & PROP_FLAG_ENUM ) != 0;
if ( bIsEnumProperty || ( PROPERTY_ID_TARGET_FRAME == nPropId ) )
{
- ::std::vector< ::rtl::OUString > aEnumValues = m_pInfoService->getPropertyEnumRepresentations( nPropId );
- ::std::vector< ::rtl::OUString >::const_iterator pStart = aEnumValues.begin();
- ::std::vector< ::rtl::OUString >::const_iterator pEnd = aEnumValues.end();
+ ::std::vector< OUString > aEnumValues = m_pInfoService->getPropertyEnumRepresentations( nPropId );
+ ::std::vector< OUString >::const_iterator pStart = aEnumValues.begin();
+ ::std::vector< OUString >::const_iterator pEnd = aEnumValues.end();
// for a checkbox: if "ambiguous" is not allowed, remove this from the sequence
if ( ( PROPERTY_ID_DEFAULT_STATE == nPropId )
@@ -1295,7 +1295,7 @@ namespace pcr
++pStart;
// copy the sequence
- ::std::vector< ::rtl::OUString > aListEntries( pEnd - pStart );
+ ::std::vector< OUString > aListEntries( pEnd - pStart );
::std::copy( pStart, pEnd, aListEntries.begin() );
// create the control
@@ -1360,10 +1360,10 @@ namespace pcr
{
aDescriptor.PrimaryButtonId = rtl::OUString::createFromAscii(UID_PROP_DLG_ATTR_DATASOURCE);
- ::std::vector< ::rtl::OUString > aListEntries;
+ ::std::vector< OUString > aListEntries;
Reference< XDatabaseContext > xDatabaseContext = sdb::DatabaseContext::create( m_aContext.getUNOContext() );
- Sequence< ::rtl::OUString > aDatasources = xDatabaseContext->getElementNames();
+ Sequence< OUString > aDatasources = xDatabaseContext->getElementNames();
aListEntries.resize( aDatasources.getLength() );
::std::copy( aDatasources.getConstArray(), aDatasources.getConstArray() + aDatasources.getLength(),
aListEntries.begin() );
@@ -1374,7 +1374,7 @@ namespace pcr
case PROPERTY_ID_CONTROLSOURCE:
{
- ::std::vector< ::rtl::OUString > aFieldNames;
+ ::std::vector< OUString > aFieldNames;
impl_initFieldList_nothrow( aFieldNames );
aDescriptor.Control = PropertyHandlerHelper::createComboBoxControl(
_rxControlFactory, aFieldNames, sal_False, sal_False );
@@ -1410,12 +1410,12 @@ namespace pcr
aDescriptor.HasSecondaryButton = sal_True;
bool bIsDataProperty = ( nPropertyUIFlags & PROP_FLAG_DATA_PROPERTY ) != 0;
- aDescriptor.Category = bIsDataProperty ? ::rtl::OUString("Data") : ::rtl::OUString("General");
+ aDescriptor.Category = bIsDataProperty ? OUString("Data") : OUString("General");
return aDescriptor;
}
//--------------------------------------------------------------------
- InteractiveSelectionResult SAL_CALL FormComponentPropertyHandler::onInteractivePropertySelection( const ::rtl::OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
+ InteractiveSelectionResult SAL_CALL FormComponentPropertyHandler::onInteractivePropertySelection( const OUString& _rPropertyName, sal_Bool /*_bPrimary*/, Any& _rData, const Reference< XObjectInspectorUI >& _rxInspectorUI ) throw (UnknownPropertyException, NullPointerException, RuntimeException)
{
if ( !_rxInspectorUI.is() )
throw NullPointerException();
@@ -1435,7 +1435,7 @@ namespace pcr
case PROPERTY_ID_FILTER:
case PROPERTY_ID_SORT:
{
- ::rtl::OUString sClause;
+ OUString sClause;
if ( impl_dialogFilterOrSort_nothrow( PROPERTY_ID_FILTER == nPropId, sClause, aGuard ) )
{
_rData <<= sClause;
@@ -1513,12 +1513,12 @@ namespace pcr
OSL_PRECOND( _rxInspectorUI.is(), "lcl_rebuildAndResetCommand: invalid BrowserUI!" );
OSL_PRECOND( _rxHandler.is(), "lcl_rebuildAndResetCommand: invalid handler!" );
_rxInspectorUI->rebuildPropertyUI( PROPERTY_COMMAND );
- _rxHandler->setPropertyValue( PROPERTY_COMMAND, makeAny( ::rtl::OUString() ) );
+ _rxHandler->setPropertyValue( PROPERTY_COMMAND, makeAny( OUString() ) );
}
}
//--------------------------------------------------------------------
- void SAL_CALL FormComponentPropertyHandler::actuatingPropertyChanged( const ::rtl::OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException)
+ void SAL_CALL FormComponentPropertyHandler::actuatingPropertyChanged( const OUString& _rActuatingPropertyName, const Any& _rNewValue, const Any& /*_rOldValue*/, const Reference< XObjectInspectorUI >& _rxInspectorUI, sal_Bool _bFirstTimeInit ) throw (NullPointerException, RuntimeException)
{
if ( !_rxInspectorUI.is() )
throw NullPointerException();
@@ -1592,7 +1592,7 @@ namespace pcr
// ----- DataField -----
case PROPERTY_ID_CONTROLSOURCE:
{
- ::rtl::OUString sControlSource;
+ OUString sControlSource;
_rNewValue >>= sControlSource;
if ( impl_componentHasProperty_throw( PROPERTY_FILTERPROPOSAL ) )
_rxInspectorUI->enablePropertyUI( PROPERTY_FILTERPROPOSAL, !sControlSource.isEmpty() );
@@ -1665,7 +1665,7 @@ namespace pcr
{
if ( impl_isSupportedProperty_nothrow( PROPERTY_ID_IMAGEPOSITION ) )
{
- ::rtl::OUString sImageURL;
+ OUString sImageURL;
OSL_VERIFY( _rNewValue >>= sImageURL );
_rxInspectorUI->enablePropertyUI( PROPERTY_IMAGEPOSITION, !sImageURL.isEmpty() );
}
@@ -1710,7 +1710,7 @@ namespace pcr
// propagate the changes to the min/max/default fields
Any aCurrentProp;
- ::rtl::OUString aAffectedProps[] = { PROPERTY_VALUE, PROPERTY_DEFAULT_VALUE, PROPERTY_VALUEMIN, PROPERTY_VALUEMAX };
+ OUString aAffectedProps[] = { PROPERTY_VALUE, PROPERTY_DEFAULT_VALUE, PROPERTY_VALUEMIN, PROPERTY_VALUEMAX };
for (sal_uInt16 i=0; i<SAL_N_ELEMENTS(aAffectedProps); ++i)
{
Reference< XPropertyControl > xControl;
@@ -1755,7 +1755,7 @@ namespace pcr
aNewDesc.nKey = 0;
// give each control which has to know this an own copy of the description
- ::rtl::OUString aFormattedPropertyControls[] = {
+ OUString aFormattedPropertyControls[] = {
PROPERTY_EFFECTIVE_MIN, PROPERTY_EFFECTIVE_MAX, PROPERTY_EFFECTIVE_DEFAULT, PROPERTY_EFFECTIVE_VALUE
};
for ( sal_uInt16 i=0; i<SAL_N_ELEMENTS(aFormattedPropertyControls); ++i )
@@ -1815,9 +1815,9 @@ namespace pcr
ListSourceType eLSType = ListSourceType_VALUELIST;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_LISTSOURCETYPE ) >>= eLSType );
- ::rtl::OUString sListSource;
+ OUString sListSource;
{
- Sequence< ::rtl::OUString > aListSource;
+ Sequence< OUString > aListSource;
Any aListSourceValue( impl_getPropertyValue_throw( PROPERTY_LISTSOURCE ) );
if ( aListSourceValue >>= aListSource )
{
@@ -1838,7 +1838,7 @@ namespace pcr
// ----- BoundColumn -----
case PROPERTY_ID_BOUNDCOLUMN:
{
- ::rtl::OUString sControlSource;
+ OUString sControlSource;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_CONTROLSOURCE ) >>= sControlSource );
ListSourceType eLSType = ListSourceType_VALUELIST;
@@ -1856,11 +1856,11 @@ namespace pcr
case PROPERTY_ID_SCALEIMAGE:
case PROPERTY_ID_SCALE_MODE:
{
- ::rtl::OUString sControlSource;
+ OUString sControlSource;
if ( impl_isSupportedProperty_nothrow( PROPERTY_ID_CONTROLSOURCE ) )
impl_getPropertyValue_throw( PROPERTY_CONTROLSOURCE ) >>= sControlSource;
- ::rtl::OUString sImageURL;
+ OUString sImageURL;
impl_getPropertyValue_throw( PROPERTY_IMAGE_URL ) >>= sImageURL;
_rxInspectorUI->enablePropertyUI( impl_getPropertyNameFromId_nothrow( _nPropId ),
@@ -1872,7 +1872,7 @@ namespace pcr
// ----- InputRequired -----
case PROPERTY_ID_INPUT_REQUIRED:
{
- ::rtl::OUString sControlSource;
+ OUString sControlSource;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_CONTROLSOURCE ) >>= sControlSource );
sal_Bool bEmptyIsNULL = sal_False;
@@ -1895,7 +1895,7 @@ namespace pcr
case PROPERTY_ID_SELECTEDITEMS:
case PROPERTY_ID_DEFAULT_SELECT_SEQ:
{
- Sequence< ::rtl::OUString > aEntries;
+ Sequence< OUString > aEntries;
impl_getPropertyValue_throw( PROPERTY_STRINGITEMLIST ) >>= aEntries;
bool isEnabled = aEntries.getLength() != 0;
@@ -1913,7 +1913,7 @@ namespace pcr
// ----- TargetFrame ------
case PROPERTY_ID_TARGET_FRAME:
{
- ::rtl::OUString sTargetURL;
+ OUString sTargetURL;
impl_getPropertyValue_throw( PROPERTY_TARGET_URL ) >>= sTargetURL;
FormButtonType eButtonType( FormButtonType_URL );
if ( 0 != m_nClassId )
@@ -2157,8 +2157,8 @@ namespace pcr
for ( sal_Int32 i = 0; i < nKnownControlTypes; ++i )
{
- ::rtl::OUString sServiceName( "com.sun.star.awt." );
- sServiceName += ::rtl::OUString::createFromAscii( aControlModelServiceNames[ i ] );
+ OUString sServiceName( "com.sun.star.awt." );
+ sServiceName += OUString::createFromAscii( aControlModelServiceNames[ i ] );
if ( xServiceInfo->supportsService( sServiceName ) )
{
@@ -2342,7 +2342,7 @@ namespace pcr
}
//------------------------------------------------------------------------
- void FormComponentPropertyHandler::impl_initFieldList_nothrow( ::std::vector< ::rtl::OUString >& _rFieldNames ) const
+ void FormComponentPropertyHandler::impl_initFieldList_nothrow( ::std::vector< OUString >& _rFieldNames ) const
{
clearContainer( _rFieldNames );
try
@@ -2356,19 +2356,19 @@ namespace pcr
if ( !xFormSet.is() )
return;
- ::rtl::OUString sObjectName;
+ OUString sObjectName;
OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_COMMAND ) >>= sObjectName );
// when there is no command we don't need to ask for columns
if ( !sObjectName.isEmpty() && impl_ensureRowsetConnection_nothrow() )
{
- ::rtl::OUString aDatabaseName;
+ OUString aDatabaseName;
OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_DATASOURCE ) >>= aDatabaseName );
sal_Int32 nObjectType = CommandType::COMMAND;
OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_COMMANDTYPE ) >>= nObjectType );
- Sequence< ::rtl::OUString > aFields( ::dbtools::getFieldNamesByCommandDescriptor( m_xRowSetConnection, nObjectType, sObjectName ) );
+ Sequence< OUString > aFields( ::dbtools::getFieldNamesByCommandDescriptor( m_xRowSetConnection, nObjectType, sObjectName ) );
- const ::rtl::OUString* pFields = aFields.getConstArray();
+ const OUString* pFields = aFields.getConstArray();
for ( sal_Int32 i = 0; i < aFields.getLength(); ++i, ++pFields )
_rFieldNames.push_back( *pFields );
}
@@ -2422,7 +2422,7 @@ namespace pcr
// report errors, if necessary
if ( aError.isValid() )
{
- ::rtl::OUString sDataSourceName;
+ OUString sDataSourceName;
try
{
xRowSetProps->getPropertyValue( PROPERTY_DATASOURCE ) >>= sDataSourceName;
@@ -2470,7 +2470,7 @@ namespace pcr
case CommandType::TABLE:
case CommandType::QUERY:
{
- ::std::vector< ::rtl::OUString > aNames;
+ ::std::vector< OUString > aNames;
if ( impl_ensureRowsetConnection_nothrow() )
{
if ( nCommandType == CommandType::TABLE )
@@ -2494,7 +2494,7 @@ namespace pcr
}
//------------------------------------------------------------------------
- void FormComponentPropertyHandler::impl_fillTableNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const
+ void FormComponentPropertyHandler::impl_fillTableNames_throw( ::std::vector< OUString >& _out_rNames ) const
{
OSL_PRECOND( m_xRowSetConnection.is(), "FormComponentPropertyHandler::impl_fillTableNames_throw: need a connection!" );
_out_rNames.resize( 0 );
@@ -2507,16 +2507,16 @@ namespace pcr
if ( !xTableNames.is() )
return;
- Sequence< ::rtl::OUString> aTableNames = xTableNames->getElementNames();
+ Sequence< OUString> aTableNames = xTableNames->getElementNames();
sal_uInt32 nCount = aTableNames.getLength();
- const ::rtl::OUString* pTableNames = aTableNames.getConstArray();
+ const OUString* pTableNames = aTableNames.getConstArray();
for ( sal_uInt32 i=0; i<nCount; ++i ,++pTableNames )
_out_rNames.push_back( *pTableNames );
}
//------------------------------------------------------------------------
- void FormComponentPropertyHandler::impl_fillQueryNames_throw( ::std::vector< ::rtl::OUString >& _out_rNames ) const
+ void FormComponentPropertyHandler::impl_fillQueryNames_throw( ::std::vector< OUString >& _out_rNames ) const
{
OSL_PRECOND( m_xRowSetConnection.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: need a connection!" );
_out_rNames.resize( 0 );
@@ -2530,20 +2530,20 @@ namespace pcr
}
}
//------------------------------------------------------------------------
- void FormComponentPropertyHandler::impl_fillQueryNames_throw( const Reference< XNameAccess >& _xQueryNames,::std::vector< ::rtl::OUString >& _out_rNames,const ::rtl::OUString& _sName ) const
+ void FormComponentPropertyHandler::impl_fillQueryNames_throw( const Reference< XNameAccess >& _xQueryNames,::std::vector< OUString >& _out_rNames,const OUString& _sName ) const
{
DBG_ASSERT( _xQueryNames.is(), "FormComponentPropertyHandler::impl_fillQueryNames_throw: no way to obtain the queries of the connection!" );
if ( !_xQueryNames.is() )
return;
- Sequence< ::rtl::OUString> aQueryNames = _xQueryNames->getElementNames();
+ Sequence< OUString> aQueryNames = _xQueryNames->getElementNames();
sal_uInt32 nCount = aQueryNames.getLength();
- const ::rtl::OUString* pQueryNames = aQueryNames.getConstArray();
+ const OUString* pQueryNames = aQueryNames.getConstArray();
sal_Bool bAdd = !_sName.isEmpty();
for ( sal_uInt32 i=0; i<nCount; i++, ++pQueryNames )
{
- ::rtl::OUStringBuffer sTemp;
+ OUStringBuffer sTemp;
if ( bAdd )
{
sTemp.append(_sName);
@@ -2585,7 +2585,7 @@ namespace pcr
case ListSourceType_TABLE:
case ListSourceType_QUERY:
{
- ::std::vector< ::rtl::OUString > aListEntries;
+ ::std::vector< OUString > aListEntries;
if ( impl_ensureRowsetConnection_nothrow() )
{
if ( nListSourceType == ListSourceType_QUERY )
@@ -2605,7 +2605,7 @@ namespace pcr
}
//------------------------------------------------------------------------
- bool FormComponentPropertyHandler::impl_dialogListSelection_nothrow( const ::rtl::OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
+ bool FormComponentPropertyHandler::impl_dialogListSelection_nothrow( const OUString& _rProperty, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
OSL_PRECOND( m_pInfoService.get(), "FormComponentPropertyHandler::impl_dialogListSelection_nothrow: no property meta data!" );
@@ -2616,12 +2616,12 @@ namespace pcr
}
//------------------------------------------------------------------------
- bool FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow( bool _bFilter, ::rtl::OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
+ bool FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow( bool _bFilter, OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
OSL_PRECOND( Reference< XRowSet >( m_xComponent, UNO_QUERY ).is(),
"FormComponentPropertyHandler::impl_dialogFilterOrSort_nothrow: to be called for forms only!" );
- _out_rSelectedClause = ::rtl::OUString();
+ _out_rSelectedClause = OUString();
bool bSuccess = false;
SQLExceptionInfo aErrorInfo;
try
@@ -2635,7 +2635,7 @@ namespace pcr
if ( !xComposer.is() )
return false;
- ::rtl::OUString sPropertyUIName( m_pInfoService->getPropertyTranslation( _bFilter ? PROPERTY_ID_FILTER : PROPERTY_ID_SORT ) );
+ OUString sPropertyUIName( m_pInfoService->getPropertyTranslation( _bFilter ? PROPERTY_ID_FILTER : PROPERTY_ID_SORT ) );
// create the dialog
Reference< XExecutableDialog > xDialog;
@@ -2651,10 +2651,10 @@ namespace pcr
// initialize the dialog
Reference< XPropertySet > xDialogProps( xDialog, UNO_QUERY_THROW );
- xDialogProps->setPropertyValue( ::rtl::OUString( "QueryComposer" ), makeAny( xComposer ) );
- xDialogProps->setPropertyValue( ::rtl::OUString( "RowSet" ), makeAny( m_xComponent ) );
- xDialogProps->setPropertyValue( ::rtl::OUString( "ParentWindow" ), makeAny( VCLUnoHelper::GetInterface( impl_getDefaultDialogParent_nothrow() ) ) );
- xDialogProps->setPropertyValue( ::rtl::OUString( "Title" ), makeAny( sPropertyUIName ) );
+ xDialogProps->setPropertyValue( OUString( "QueryComposer" ), makeAny( xComposer ) );
+ xDialogProps->setPropertyValue( OUString( "RowSet" ), makeAny( m_xComponent ) );
+ xDialogProps->setPropertyValue( OUString( "ParentWindow" ), makeAny( VCLUnoHelper::GetInterface( impl_getDefaultDialogParent_nothrow() ) ) );
+ xDialogProps->setPropertyValue( OUString( "Title" ), makeAny( sPropertyUIName ) );
_rClearBeforeDialog.clear();
bSuccess = ( xDialog->execute() != 0 );
@@ -2767,7 +2767,7 @@ namespace pcr
bool FormComponentPropertyHandler::impl_browseForImage_nothrow( Any& _out_rNewValue, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
bool bIsLink = true;// reflect the legacy behavior
- ::rtl::OUString aStrTrans = m_pInfoService->getPropertyTranslation( PROPERTY_ID_IMAGE_URL );
+ OUString aStrTrans = m_pInfoService->getPropertyTranslation( PROPERTY_ID_IMAGE_URL );
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_LINK_PREVIEW,
@@ -2791,7 +2791,7 @@ namespace pcr
}
- ::rtl::OUString sCurValue;
+ OUString sCurValue;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_IMAGE_URL ) >>= sCurValue );
if ( !sCurValue.isEmpty() && sCurValue.compareToAscii(GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH(GRAPHOBJ_URLPREFIX) ) != 0 )
{
@@ -2820,7 +2820,7 @@ namespace pcr
}
else
- _out_rNewValue <<= (::rtl::OUString)aFileDlg.GetPath();
+ _out_rNewValue <<= (OUString)aFileDlg.GetPath();
}
return bSuccess;
}
@@ -2831,7 +2831,7 @@ namespace pcr
::sfx2::FileDialogHelper aFileDlg(
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0);
- ::rtl::OUString sURL;
+ OUString sURL;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_TARGET_URL ) >>= sURL );
INetURLObject aParser( sURL );
if ( INET_PROT_FILE == aParser.GetProtocol() )
@@ -2842,7 +2842,7 @@ namespace pcr
_rClearBeforeDialog.clear();
bool bSuccess = ( 0 == aFileDlg.Execute() );
if ( bSuccess )
- _out_rNewValue <<= (::rtl::OUString)aFileDlg.GetPath();
+ _out_rNewValue <<= (OUString)aFileDlg.GetPath();
return bSuccess;
}
@@ -2886,7 +2886,7 @@ namespace pcr
ui::dialogs::TemplateDescription::FILEOPEN_READONLY_VERSION, 0,
rtl::OUString("sdatabase"));
- ::rtl::OUString sDataSource;
+ OUString sDataSource;
OSL_VERIFY( impl_getPropertyValue_throw( PROPERTY_DATASOURCE ) >>= sDataSource );
INetURLObject aParser( sDataSource );
if ( INET_PROT_FILE == aParser.GetProtocol() )
@@ -2905,7 +2905,7 @@ namespace pcr
_rClearBeforeDialog.clear();
bool bSuccess = ( 0 == aFileDlg.Execute() );
if ( bSuccess )
- _out_rNewValue <<= (::rtl::OUString)aFileDlg.GetPath();
+ _out_rNewValue <<= (OUString)aFileDlg.GetPath();
return bSuccess;
}
@@ -2977,7 +2977,7 @@ namespace pcr
whose UI is to be disabled while the SQL command property is
being edited.
*/
- virtual ::rtl::OUString* getPropertiesToDisable() = 0;
+ virtual OUString* getPropertiesToDisable() = 0;
};
//--------------------------------------------------------------------
@@ -3024,13 +3024,13 @@ namespace pcr
FormSQLCommandUI( const Reference< XPropertySet >& _rxForm );
// ISQLCommandAdapter
- virtual ::rtl::OUString getSQLCommand() const;
+ virtual OUString getSQLCommand() const;
virtual sal_Bool getEscapeProcessing() const;
- virtual void setSQLCommand( const ::rtl::OUString& _rCommand ) const;
+ virtual void setSQLCommand( const OUString& _rCommand ) const;
virtual void setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const;
// ISQLCommandPropertyUI
- virtual ::rtl::OUString* getPropertiesToDisable();
+ virtual OUString* getPropertiesToDisable();
};
//--------------------------------------------------------------------
@@ -3043,9 +3043,9 @@ namespace pcr
}
//....................................................................
- ::rtl::OUString FormSQLCommandUI::getSQLCommand() const
+ OUString FormSQLCommandUI::getSQLCommand() const
{
- ::rtl::OUString sCommand;
+ OUString sCommand;
OSL_VERIFY( m_xObject->getPropertyValue( PROPERTY_COMMAND ) >>= sCommand );
return sCommand;
}
@@ -3059,7 +3059,7 @@ namespace pcr
}
//....................................................................
- void FormSQLCommandUI::setSQLCommand( const ::rtl::OUString& _rCommand ) const
+ void FormSQLCommandUI::setSQLCommand( const OUString& _rCommand ) const
{
m_xObject->setPropertyValue( PROPERTY_COMMAND, makeAny( _rCommand ) );
}
@@ -3071,14 +3071,14 @@ namespace pcr
}
//....................................................................
- ::rtl::OUString* FormSQLCommandUI::getPropertiesToDisable()
+ OUString* FormSQLCommandUI::getPropertiesToDisable()
{
- static ::rtl::OUString s_aCommandProps[] = {
+ static OUString s_aCommandProps[] = {
PROPERTY_DATASOURCE,
PROPERTY_COMMAND,
PROPERTY_COMMANDTYPE,
PROPERTY_ESCAPE_PROCESSING,
- ::rtl::OUString()
+ OUString()
};
return s_aCommandProps;
}
@@ -3091,13 +3091,13 @@ namespace pcr
ValueListCommandUI( const Reference< XPropertySet >& _rxListOrCombo );
// ISQLCommandAdapter
- virtual ::rtl::OUString getSQLCommand() const;
+ virtual OUString getSQLCommand() const;
virtual sal_Bool getEscapeProcessing() const;
- virtual void setSQLCommand( const ::rtl::OUString& _rCommand ) const;
+ virtual void setSQLCommand( const OUString& _rCommand ) const;
virtual void setEscapeProcessing( const sal_Bool _bEscapeProcessing ) const;
// ISQLCommandPropertyUI
- virtual ::rtl::OUString* getPropertiesToDisable();
+ virtual OUString* getPropertiesToDisable();
private:
mutable bool m_bPropertyValueIsList;
};
@@ -3113,9 +3113,9 @@ namespace pcr
}
//....................................................................
- ::rtl::OUString ValueListCommandUI::getSQLCommand() const
+ OUString ValueListCommandUI::getSQLCommand() const
{
- ::rtl::OUString sValue;
+ OUString sValue;
m_bPropertyValueIsList = false;
// for combo boxes, the property is a mere string
@@ -3123,7 +3123,7 @@ namespace pcr
if ( aValue >>= sValue )
return sValue;
- Sequence< ::rtl::OUString > aValueList;
+ Sequence< OUString > aValueList;
if ( aValue >>= aValueList )
{
m_bPropertyValueIsList = true;
@@ -3147,11 +3147,11 @@ namespace pcr
}
//....................................................................
- void ValueListCommandUI::setSQLCommand( const ::rtl::OUString& _rCommand ) const
+ void ValueListCommandUI::setSQLCommand( const OUString& _rCommand ) const
{
Any aValue;
if ( m_bPropertyValueIsList )
- aValue <<= Sequence< ::rtl::OUString >( &_rCommand, 1 );
+ aValue <<= Sequence< OUString >( &_rCommand, 1 );
else
aValue <<= _rCommand;
m_xObject->setPropertyValue( PROPERTY_LISTSOURCE, aValue );
@@ -3165,12 +3165,12 @@ namespace pcr
}
//....................................................................
- ::rtl::OUString* ValueListCommandUI::getPropertiesToDisable()
+ OUString* ValueListCommandUI::getPropertiesToDisable()
{
- static ::rtl::OUString s_aListSourceProps[] = {
+ static OUString s_aListSourceProps[] = {
PROPERTY_LISTSOURCETYPE,
PROPERTY_LISTSOURCE,
- ::rtl::OUString()
+ OUString()
};
return s_aListSourceProps;
}
@@ -3218,14 +3218,14 @@ namespace pcr
{
m_xBrowserUI = _rxInspectorUI;
// disable everything which would affect this property
- const ::rtl::OUString* pToDisable = xCommandUI->getPropertiesToDisable();
+ const OUString* pToDisable = xCommandUI->getPropertiesToDisable();
while ( !pToDisable->isEmpty() )
{
m_xBrowserUI->enablePropertyUIElements( *pToDisable++, PropertyLineElement::All, sal_False );
}
// but enable the browse button for the property itself - so it can be used to raise the query designer
- ::rtl::OUString sPropertyName( impl_getPropertyNameFromId_nothrow( _nDesignForProperty ) );
+ OUString sPropertyName( impl_getPropertyNameFromId_nothrow( _nDesignForProperty ) );
m_xBrowserUI->enablePropertyUIElements( sPropertyName, PropertyLineElement::PrimaryButton, sal_True );
}
}
@@ -3249,7 +3249,7 @@ namespace pcr
if ( !xCommandUI.is() )
throw NullPointerException();
- const ::rtl::OUString* pToEnable = xCommandUI->getPropertiesToDisable();
+ const OUString* pToEnable = xCommandUI->getPropertiesToDisable();
while ( !pToEnable->isEmpty() )
{
m_xBrowserUI->enablePropertyUIElements( *pToEnable++, PropertyLineElement::All, sal_True );
@@ -3272,7 +3272,7 @@ namespace pcr
{
try
{
- ::rtl::OUString sPropertyValue;
+ OUString sPropertyValue;
// first, we need the name of an existent data source
if ( _xFormProperties->getPropertySetInfo()->hasPropertyByName(PROPERTY_DATASOURCE) )
_xFormProperties->getPropertyValue( PROPERTY_DATASOURCE ) >>= sPropertyValue;
@@ -3294,9 +3294,9 @@ namespace pcr
return bHas;
}
//------------------------------------------------------------------------
- ::rtl::OUString FormComponentPropertyHandler::impl_getDocumentURL_nothrow() const
+ OUString FormComponentPropertyHandler::impl_getDocumentURL_nothrow() const
{
- ::rtl::OUString sURL;
+ OUString sURL;
try
{
Reference< XModel > xDocument( impl_getContextDocument_nothrow() );
diff --git a/framework/source/fwe/classes/addonsoptions.cxx b/framework/source/fwe/classes/addonsoptions.cxx
index 09d075e4d337..eeaf5847ec9a 100644
--- a/framework/source/fwe/classes/addonsoptions.cxx
+++ b/framework/source/fwe/classes/addonsoptions.cxx
@@ -48,11 +48,11 @@ using namespace ::com::sun::star::beans ;
using namespace ::com::sun::star::lang ;
using namespace ::com::sun::star;
-#define ROOTNODE_ADDONMENU ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" ))
-#define PATHDELIMITER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/" ))
+#define ROOTNODE_ADDONMENU OUString(RTL_CONSTASCII_USTRINGPARAM("Office.Addons" ))
+#define PATHDELIMITER OUString(RTL_CONSTASCII_USTRINGPARAM("/" ))
#define SEPARATOR_URL_STR "private:separator"
#define SEPARATOR_URL_LEN 17
-#define SEPARATOR_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR ))
+#define SEPARATOR_URL OUString(RTL_CONSTASCII_USTRINGPARAM( SEPARATOR_URL_STR ))
#define PROPERTYNAME_URL ADDONSMENUITEM_PROPERTYNAME_URL
#define PROPERTYNAME_TITLE ADDONSMENUITEM_PROPERTYNAME_TITLE
@@ -63,32 +63,32 @@ using namespace ::com::sun::star;
#define PROPERTYNAME_CONTROLTYPE ADDONSMENUITEM_PROPERTYNAME_CONTROLTYPE
#define PROPERTYNAME_WIDTH ADDONSMENUITEM_PROPERTYNAME_WIDTH
-#define PROPERTYNAME_IMAGESMALL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmall" ))
-#define PROPERTYNAME_IMAGEBIG ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBig" ))
-#define PROPERTYNAME_IMAGESMALLHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHC" ))
-#define PROPERTYNAME_IMAGEBIGHC ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHC" ))
-#define PROPERTYNAME_IMAGESMALL_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallURL" ))
-#define PROPERTYNAME_IMAGEBIG_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigURL" ))
-#define PROPERTYNAME_IMAGESMALLHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHCURL" ))
-#define PROPERTYNAME_IMAGEBIGHC_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHCURL" ))
-
-#define IMAGES_NODENAME ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("UserDefinedImages" ))
-#define PRIVATE_IMAGE_URL ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("private:image/" ))
-
-#define PROPERTYNAME_MERGEMENU_MERGEPOINT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
-#define PROPERTYNAME_MERGEMENU_MERGECOMMAND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" ))
-#define PROPERTYNAME_MERGEMENU_MERGECOMMANDPARAMETER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" ))
-#define PROPERTYNAME_MERGEMENU_MERGEFALLBACK ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
-#define PROPERTYNAME_MERGEMENU_MERGECONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
-#define PROPERTYNAME_MERGEMENU_MENUITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MenuItems" ))
-
-#define PROPERTYNAME_MERGETOOLBAR_TOOLBAR ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeToolBar" ))
-#define PROPERTYNAME_MERGETOOLBAR_MERGEPOINT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
-#define PROPERTYNAME_MERGETOOLBAR_MERGECOMMAND ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" ))
-#define PROPERTYNAME_MERGETOOLBAR_MERGECOMMANDPARAMETER ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" ))
-#define PROPERTYNAME_MERGETOOLBAR_MERGEFALLBACK ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
-#define PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
-#define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" ))
+#define PROPERTYNAME_IMAGESMALL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmall" ))
+#define PROPERTYNAME_IMAGEBIG OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBig" ))
+#define PROPERTYNAME_IMAGESMALLHC OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHC" ))
+#define PROPERTYNAME_IMAGEBIGHC OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHC" ))
+#define PROPERTYNAME_IMAGESMALL_URL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallURL" ))
+#define PROPERTYNAME_IMAGEBIG_URL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigURL" ))
+#define PROPERTYNAME_IMAGESMALLHC_URL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageSmallHCURL" ))
+#define PROPERTYNAME_IMAGEBIGHC_URL OUString(RTL_CONSTASCII_USTRINGPARAM("ImageBigHCURL" ))
+
+#define IMAGES_NODENAME OUString(RTL_CONSTASCII_USTRINGPARAM("UserDefinedImages" ))
+#define PRIVATE_IMAGE_URL OUString(RTL_CONSTASCII_USTRINGPARAM("private:image/" ))
+
+#define PROPERTYNAME_MERGEMENU_MERGEPOINT OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
+#define PROPERTYNAME_MERGEMENU_MERGECOMMAND OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" ))
+#define PROPERTYNAME_MERGEMENU_MERGECOMMANDPARAMETER OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" ))
+#define PROPERTYNAME_MERGEMENU_MERGEFALLBACK OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
+#define PROPERTYNAME_MERGEMENU_MERGECONTEXT OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
+#define PROPERTYNAME_MERGEMENU_MENUITEMS OUString(RTL_CONSTASCII_USTRINGPARAM("MenuItems" ))
+
+#define PROPERTYNAME_MERGETOOLBAR_TOOLBAR OUString(RTL_CONSTASCII_USTRINGPARAM("MergeToolBar" ))
+#define PROPERTYNAME_MERGETOOLBAR_MERGEPOINT OUString(RTL_CONSTASCII_USTRINGPARAM("MergePoint" ))
+#define PROPERTYNAME_MERGETOOLBAR_MERGECOMMAND OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommand" ))
+#define PROPERTYNAME_MERGETOOLBAR_MERGECOMMANDPARAMETER OUString(RTL_CONSTASCII_USTRINGPARAM("MergeCommandParameter" ))
+#define PROPERTYNAME_MERGETOOLBAR_MERGEFALLBACK OUString(RTL_CONSTASCII_USTRINGPARAM("MergeFallback" ))
+#define PROPERTYNAME_MERGETOOLBAR_MERGECONTEXT OUString(RTL_CONSTASCII_USTRINGPARAM("MergeContext" ))
+#define PROPERTYNAME_MERGETOOLBAR_TOOLBARITEMS OUString(RTL_CONSTASCII_USTRINGPARAM("ToolBarItems" ))
// The following order is mandatory. Please add properties at the end!
#define INDEX_URL 0
@@ -204,7 +204,7 @@ class AddonsOptions_Impl : public ConfigItem
@onerror -
*//*-*****************************************************************************************************/
- virtual void Notify( const Sequence< ::rtl::OUString >& lPropertyNames );
+ virtual void Notify( const Sequence< OUString >& lPropertyNames );
/*-****************************************************************************************************//**
@short write changes to configuration
@@ -243,11 +243,11 @@ class AddonsOptions_Impl : public ConfigItem
const Sequence< Sequence< PropertyValue > >& GetAddonsMenu () const ;
const Sequence< Sequence< PropertyValue > >& GetAddonsMenuBarPart () const ;
const Sequence< Sequence< PropertyValue > >& GetAddonsToolBarPart ( sal_uInt32 nIndex ) const ;
- const ::rtl::OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
+ const OUString GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const;
const Sequence< Sequence< PropertyValue > >& GetAddonsHelpMenu () const ;
Image GetImageFromURL( const rtl::OUString& aURL, sal_Bool bBig, sal_Bool bNoScale ) const;
const MergeMenuInstructionContainer& GetMergeMenuInstructions() const;
- bool GetMergeToolbarInstructions( const ::rtl::OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const;
+ bool GetMergeToolbarInstructions( const OUString& rToolbarName, MergeToolbarInstructionContainer& rToolbarInstructions ) const;
void ReadConfigurationData();
@@ -258,7 +258,7 @@ class AddonsOptions_Impl : public ConfigItem
private:
struct OUStringHashCode
{
- size_t operator()( const ::rtl::OUString& sString ) const
+ size_t operator()( const OUString& sString ) const
{
return sString.hashCode();
}
@@ -273,10 +273,10 @@ class AddonsOptions_Impl : public ConfigItem
Image aImageBigNoScale;
};
- typedef boost::unordered_map< ::rtl::OUString, ImageEntry, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ImageManager;
- typedef boost::unordered_map< ::rtl::OUString, sal_uInt32, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > StringToIndexMap;
+ typedef boost::unordered_map< OUString, ImageEntry, OUStringHashCode, ::std::equal_to< OUString > > ImageManager;
+ typedef boost::unordered_map< OUString, sal_uInt32, OUStringHashCode, ::std::equal_to< OUString > > StringToIndexMap;
typedef std::vector< Sequence< Sequence< PropertyValue > > > AddonToolBars;
- typedef ::boost::unordered_map< ::rtl::OUString, MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< ::rtl::OUString > > ToolbarMergingInstructions;
+ typedef ::boost::unordered_map< OUString, MergeToolbarInstructionContainer, OUStringHashCode, ::std::equal_to< OUString > > ToolbarMergingInstructions;
enum ImageSize
{
@@ -306,27 +306,27 @@ class AddonsOptions_Impl : public ConfigItem
sal_Bool ReadMenuMergeInstructions( MergeMenuInstructionContainer& rContainer );
sal_Bool ReadToolbarMergeInstructions( ToolbarMergingInstructions& rToolbarMergeMap );
- sal_Bool ReadMergeMenuData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu );
- sal_Bool ReadMergeToolbarData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems );
- sal_Bool ReadMenuItem( const ::rtl::OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu = sal_False );
- sal_Bool ReadPopupMenu( const ::rtl::OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu );
+ sal_Bool ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu );
+ sal_Bool ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems );
+ sal_Bool ReadMenuItem( const OUString& aMenuItemNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu = sal_False );
+ sal_Bool ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu );
sal_Bool AppendPopupMenu( Sequence< PropertyValue >& aTargetPopupMenu, const Sequence< PropertyValue >& rSourcePopupMenu );
- sal_Bool ReadToolBarItem( const ::rtl::OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem );
- sal_Bool ReadImagesItem( const ::rtl::OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem );
- ImageEntry* ReadImageData( const ::rtl::OUString& aImagesNodeName );
- void ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId );
- void ReadImageFromURL( ImageSize nImageSize, const ::rtl::OUString& aURL, Image& aImage, Image& aNoScaleImage );
- sal_Bool HasAssociatedImages( const ::rtl::OUString& aURL );
- void SubstituteVariables( ::rtl::OUString& aURL );
-
- sal_Bool ReadSubMenuEntries( const Sequence< ::rtl::OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu );
+ sal_Bool ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem );
+ sal_Bool ReadImagesItem( const OUString& aImagesItemNodeName, Sequence< PropertyValue >& aImagesItem );
+ ImageEntry* ReadImageData( const OUString& aImagesNodeName );
+ void ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId );
+ void ReadImageFromURL( ImageSize nImageSize, const OUString& aURL, Image& aImage, Image& aNoScaleImage );
+ sal_Bool HasAssociatedImages( const OUString& aURL );
+ void SubstituteVariables( OUString& aURL );
+
+ sal_Bool ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenu );
void InsertToolBarSeparator( Sequence< Sequence< PropertyValue > >& rAddonOfficeToolBarSeq );
- ::rtl::OUString GeneratePrefixURL();
+ OUString GeneratePrefixURL();
- Sequence< ::rtl::OUString > GetPropertyNamesMenuItem( const ::rtl::OUString& aPropertyRootNode ) const;
- Sequence< ::rtl::OUString > GetPropertyNamesPopupMenu( const ::rtl::OUString& aPropertyRootNode ) const;
- Sequence< ::rtl::OUString > GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const;
- Sequence< ::rtl::OUString > GetPropertyNamesImages( const ::rtl::OUString& aPropertyRootNode ) const;
+ Sequence< OUString > GetPropertyNamesMenuItem( const OUString& aPropertyRootNode ) const;
+ Sequence< OUString > GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const;
+ Sequence< OUString > GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const;
+ Sequence< OUString > GetPropertyNamesImages( const OUString& aPropertyRootNode ) const;
sal_Bool CreateImageFromSequence( Image& rImage, sal_Bool bBig, Sequence< sal_Int8 >& rBitmapDataSeq ) const;
//-------------------------------------------------------------------------------------------------------------
@@ -334,18 +334,18 @@ class AddonsOptions_Impl : public ConfigItem
//-------------------------------------------------------------------------------------------------------------
private:
- ImageEntry* ReadOptionalImageData( const ::rtl::OUString& aMenuNodeName );
+ ImageEntry* ReadOptionalImageData( const OUString& aMenuNodeName );
sal_Int32 m_nRootAddonPopupMenuId;
- ::rtl::OUString m_aPropNames[PROPERTYCOUNT_INDEX];
- ::rtl::OUString m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
- ::rtl::OUString m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR];
- ::rtl::OUString m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR];
- ::rtl::OUString m_aEmpty;
- ::rtl::OUString m_aPathDelimiter;
- ::rtl::OUString m_aSeparator;
- ::rtl::OUString m_aRootAddonPopupMenuURLPrexfix;
- ::rtl::OUString m_aPrivateImageURL;
+ OUString m_aPropNames[PROPERTYCOUNT_INDEX];
+ OUString m_aPropImagesNames[PROPERTYCOUNT_IMAGES];
+ OUString m_aPropMergeMenuNames[PROPERTYCOUNT_MERGE_MENUBAR];
+ OUString m_aPropMergeToolbarNames[PROPERTYCOUNT_MERGE_TOOLBAR];
+ OUString m_aEmpty;
+ OUString m_aPathDelimiter;
+ OUString m_aSeparator;
+ OUString m_aRootAddonPopupMenuURLPrexfix;
+ OUString m_aPrivateImageURL;
Sequence< Sequence< PropertyValue > > m_aCachedMenuProperties;
Sequence< Sequence< PropertyValue > > m_aCachedMenuBarPartProperties;
AddonToolBars m_aCachedToolBarPartProperties;
@@ -457,7 +457,7 @@ void AddonsOptions_Impl::ReadConfigurationData()
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-void AddonsOptions_Impl::Notify( const Sequence< ::rtl::OUString >& /*lPropertyNames*/ )
+void AddonsOptions_Impl::Notify( const Sequence< OUString >& /*lPropertyNames*/ )
{
Application::PostUserEvent( STATIC_LINK( 0, AddonsOptions, Notify ) );
}
@@ -516,7 +516,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions_Impl::GetAddonsToolBa
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-const ::rtl::OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const
+const OUString AddonsOptions_Impl::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const
{
if ( nIndex < m_aCachedToolBarPartResourceNames.size() )
return m_aCachedToolBarPartResourceNames[nIndex];
@@ -544,7 +544,7 @@ const MergeMenuInstructionContainer& AddonsOptions_Impl::GetMergeMenuInstruction
// public method
//*****************************************************************************************************************
bool AddonsOptions_Impl::GetMergeToolbarInstructions(
- const ::rtl::OUString& rToolbarName,
+ const OUString& rToolbarName,
MergeToolbarInstructionContainer& rToolbarInstructions ) const
{
ToolbarMergingInstructions::const_iterator pIter = m_aCachedToolbarMergingInstructions.find( rToolbarName );
@@ -582,9 +582,9 @@ Image AddonsOptions_Impl::GetImageFromURL( const rtl::OUString& aURL, sal_Bool b
sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue > >& rAddonMenuSeq )
{
// Read the AddonMenu set and fill property sequences
- ::rtl::OUString aAddonMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/AddonMenu" ));
- Sequence< ::rtl::OUString > aAddonMenuNodeSeq = GetNodeNames( aAddonMenuNodeName );
- ::rtl::OUString aAddonMenuItemNode( aAddonMenuNodeName + m_aPathDelimiter );
+ OUString aAddonMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/AddonMenu" ));
+ Sequence< OUString > aAddonMenuNodeSeq = GetNodeNames( aAddonMenuNodeName );
+ OUString aAddonMenuItemNode( aAddonMenuNodeName + m_aPathDelimiter );
sal_uInt32 nCount = aAddonMenuNodeSeq.getLength();
sal_uInt32 nIndex = 0;
@@ -600,7 +600,7 @@ sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue
for ( sal_uInt32 n = 0; n < nCount; n++ )
{
- ::rtl::OUString aRootMenuItemNode( aAddonMenuItemNode + aAddonMenuNodeSeq[n] );
+ OUString aRootMenuItemNode( aAddonMenuItemNode + aAddonMenuNodeSeq[n] );
// Read the MenuItem
if ( ReadMenuItem( aRootMenuItemNode, aMenuItem ) )
@@ -621,9 +621,9 @@ sal_Bool AddonsOptions_Impl::ReadAddonMenuSet( Sequence< Sequence< PropertyValue
sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeHelpMenuSeq )
{
// Read the AddonMenu set and fill property sequences
- ::rtl::OUString aAddonHelpMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeHelp" ));
- Sequence< ::rtl::OUString > aAddonHelpMenuNodeSeq = GetNodeNames( aAddonHelpMenuNodeName );
- ::rtl::OUString aAddonHelpMenuItemNode( aAddonHelpMenuNodeName + m_aPathDelimiter );
+ OUString aAddonHelpMenuNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeHelp" ));
+ Sequence< OUString > aAddonHelpMenuNodeSeq = GetNodeNames( aAddonHelpMenuNodeName );
+ OUString aAddonHelpMenuItemNode( aAddonHelpMenuNodeName + m_aPathDelimiter );
sal_uInt32 nCount = aAddonHelpMenuNodeSeq.getLength();
sal_uInt32 nIndex = 0;
@@ -639,7 +639,7 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu
for ( sal_uInt32 n = 0; n < nCount; n++ )
{
- ::rtl::OUString aRootMenuItemNode( aAddonHelpMenuItemNode + aAddonHelpMenuNodeSeq[n] );
+ OUString aRootMenuItemNode( aAddonHelpMenuItemNode + aAddonHelpMenuNodeSeq[n] );
// Read the MenuItem
if ( ReadMenuItem( aRootMenuItemNode, aMenuItem, sal_True ) )
@@ -660,9 +660,9 @@ sal_Bool AddonsOptions_Impl::ReadOfficeHelpSet( Sequence< Sequence< PropertyValu
sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyValue > >& rAddonOfficeMenuBarSeq )
{
// Read the OfficeMenuBar set and fill property sequences
- ::rtl::OUString aAddonMenuBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBar" ));
- Sequence< ::rtl::OUString > aAddonMenuBarNodeSeq = GetNodeNames( aAddonMenuBarNodeName );
- ::rtl::OUString aAddonMenuBarNode( aAddonMenuBarNodeName + m_aPathDelimiter );
+ OUString aAddonMenuBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBar" ));
+ Sequence< OUString > aAddonMenuBarNodeSeq = GetNodeNames( aAddonMenuBarNodeName );
+ OUString aAddonMenuBarNode( aAddonMenuBarNodeName + m_aPathDelimiter );
sal_uInt32 nCount = aAddonMenuBarNodeSeq.getLength();
sal_uInt32 nIndex = 0;
@@ -678,13 +678,13 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV
for ( sal_uInt32 n = 0; n < nCount; n++ )
{
- ::rtl::OUString aPopupMenuNode( aAddonMenuBarNode + aAddonMenuBarNodeSeq[n] );
+ OUString aPopupMenuNode( aAddonMenuBarNode + aAddonMenuBarNodeSeq[n] );
// Read the MenuItem
if ( ReadPopupMenu( aPopupMenuNode, aPopupMenu ) )
{
// Successfully read a popup menu, append to our list
- ::rtl::OUString aPopupTitle;
+ OUString aPopupTitle;
if ( aPopupMenu[OFFSET_POPUPMENU_TITLE].Value >>= aPopupTitle )
{
StringToIndexMap::const_iterator pIter = aTitleToIndexMap.find( aPopupTitle );
@@ -716,15 +716,15 @@ sal_Bool AddonsOptions_Impl::ReadOfficeMenuBarSet( Sequence< Sequence< PropertyV
sal_Bool AddonsOptions_Impl::ReadOfficeToolBarSet( AddonToolBars& rAddonOfficeToolBars, std::vector< rtl::OUString >& rAddonOfficeToolBarResNames )
{
// Read the OfficeToolBar set and fill property sequences
- ::rtl::OUString aAddonToolBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolBar" ));
- Sequence< ::rtl::OUString > aAddonToolBarNodeSeq = GetNodeNames( aAddonToolBarNodeName );
- ::rtl::OUString aAddonToolBarNode( aAddonToolBarNodeName + m_aPathDelimiter );
+ OUString aAddonToolBarNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolBar" ));
+ Sequence< OUString > aAddonToolBarNodeSeq = GetNodeNames( aAddonToolBarNodeName );
+ OUString aAddonToolBarNode( aAddonToolBarNodeName + m_aPathDelimiter );
sal_uInt32 nCount = aAddonToolBarNodeSeq.getLength();
for ( sal_uInt32 n = 0; n < nCount; n++ )
{
- ::rtl::OUString aToolBarItemNode( aAddonToolBarNode + aAddonToolBarNodeSeq[n] );
+ OUString aToolBarItemNode( aAddonToolBarNode + aAddonToolBarNodeSeq[n] );
rAddonOfficeToolBarResNames.push_back( aAddonToolBarNodeSeq[n] );
rAddonOfficeToolBars.push_back( m_aEmptyAddonToolBar );
ReadToolBarItemSet( aToolBarItemNode, rAddonOfficeToolBars[n] );
@@ -741,8 +741,8 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarIte
{
sal_Bool bInsertSeparator = sal_False;
sal_uInt32 nToolBarItemCount = rAddonOfficeToolBarSeq.getLength();
- ::rtl::OUString aAddonToolBarItemSetNode( rToolBarItemSetNodeName + m_aPathDelimiter );
- Sequence< ::rtl::OUString > aAddonToolBarItemSetNodeSeq = GetNodeNames( rToolBarItemSetNodeName );
+ OUString aAddonToolBarItemSetNode( rToolBarItemSetNodeName + m_aPathDelimiter );
+ Sequence< OUString > aAddonToolBarItemSetNodeSeq = GetNodeNames( rToolBarItemSetNodeName );
Sequence< PropertyValue > aToolBarItem( PROPERTYCOUNT_TOOLBARITEM );
// Init the property value sequence
@@ -757,7 +757,7 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItemSet( const rtl::OUString rToolBarIte
sal_uInt32 nCount = aAddonToolBarItemSetNodeSeq.getLength();
for ( sal_uInt32 n = 0; n < nCount; n++ )
{
- ::rtl::OUString aToolBarItemNode( aAddonToolBarItemSetNode + aAddonToolBarItemSetNodeSeq[n] );
+ OUString aToolBarItemNode( aAddonToolBarItemSetNode + aAddonToolBarItemSetNodeSeq[n] );
// Read the ToolBarItem
if ( ReadToolBarItem( aToolBarItemNode, aToolBarItem ) )
@@ -808,22 +808,22 @@ void AddonsOptions_Impl::InsertToolBarSeparator( Sequence< Sequence< PropertyVal
sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
{
// Read the user-defined Images set and fill image manager
- ::rtl::OUString aAddonImagesNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/Images" ));
- Sequence< ::rtl::OUString > aAddonImagesNodeSeq = GetNodeNames( aAddonImagesNodeName );
- ::rtl::OUString aAddonImagesNode( aAddonImagesNodeName + m_aPathDelimiter );
+ OUString aAddonImagesNodeName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/Images" ));
+ Sequence< OUString > aAddonImagesNodeSeq = GetNodeNames( aAddonImagesNodeName );
+ OUString aAddonImagesNode( aAddonImagesNodeName + m_aPathDelimiter );
sal_uInt32 nCount = aAddonImagesNodeSeq.getLength();
// Init the property value sequence
- Sequence< ::rtl::OUString > aAddonImageItemNodePropNames( 1 );
- ::rtl::OUString aURL;
+ Sequence< OUString > aAddonImageItemNodePropNames( 1 );
+ OUString aURL;
for ( sal_uInt32 n = 0; n < nCount; n++ )
{
- ::rtl::OUString aImagesItemNode( aAddonImagesNode + aAddonImagesNodeSeq[n] );
+ OUString aImagesItemNode( aAddonImagesNode + aAddonImagesNodeSeq[n] );
// Create sequence for data access
- ::rtl::OUStringBuffer aBuffer( aImagesItemNode );
+ OUStringBuffer aBuffer( aImagesItemNode );
aBuffer.append( m_aPathDelimiter );
aBuffer.append( m_aPropNames[ OFFSET_MENUITEM_URL ] );
aAddonImageItemNodePropNames[0] = aBuffer.makeStringAndClear();
@@ -836,11 +836,11 @@ sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
!aURL.isEmpty() &&
!HasAssociatedImages( aURL ))
{
- ::rtl::OUStringBuffer aBuf( aImagesItemNode );
+ OUStringBuffer aBuf( aImagesItemNode );
aBuf.append( m_aPathDelimiter );
aBuf.append( IMAGES_NODENAME );
aBuf.append( m_aPathDelimiter );
- ::rtl::OUString aImagesUserDefinedItemNode = aBuf.makeStringAndClear();
+ OUString aImagesUserDefinedItemNode = aBuf.makeStringAndClear();
// Read a user-defined images data
ImageEntry* pImageEntry = ReadImageData( aImagesUserDefinedItemNode );
@@ -860,14 +860,14 @@ sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
// private method
//*****************************************************************************************************************
-::rtl::OUString AddonsOptions_Impl::GeneratePrefixURL()
+OUString AddonsOptions_Impl::GeneratePrefixURL()
{
// Create an unique prefixed Add-On popup menu URL so it can be identified later as a runtime popup menu.
// They use a different image manager, so they must be identified by the sfx2/framework code.
- ::rtl::OUString aPopupMenuURL;
- ::rtl::OUStringBuffer aBuf( m_aRootAddonPopupMenuURLPrexfix.getLength() + 3 );
+ OUString aPopupMenuURL;
+ OUStringBuffer aBuf( m_aRootAddonPopupMenuURLPrexfix.getLength() + 3 );
aBuf.append( m_aRootAddonPopupMenuURLPrexfix );
- aBuf.append( ::rtl::OUString::valueOf( ++m_nRootAddonPopupMenuId ));
+ aBuf.append( OUString::valueOf( ++m_nRootAddonPopupMenuId ));
aPopupMenuURL = aBuf.makeStringAndClear();
return aPopupMenuURL;
}
@@ -878,32 +878,32 @@ sal_Bool AddonsOptions_Impl::ReadImages( ImageManager& aImageManager )
sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionContainer& aContainer )
{
- const ::rtl::OUString aMenuMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBarMerging/" ));
+ const OUString aMenuMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeMenuBarMerging/" ));
- Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aMenuMergeRootName );
- ::rtl::OUString aAddonMergeNode( aMenuMergeRootName );
+ Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aMenuMergeRootName );
+ OUString aAddonMergeNode( aMenuMergeRootName );
sal_uInt32 nCount = aAddonMergeNodesSeq.getLength();
// Init the property value sequence
- Sequence< ::rtl::OUString > aNodePropNames( 5 );
+ Sequence< OUString > aNodePropNames( 5 );
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
- ::rtl::OUString aMergeAddonInstructions( aAddonMergeNode + aAddonMergeNodesSeq[i] );
+ OUString aMergeAddonInstructions( aAddonMergeNode + aAddonMergeNodesSeq[i] );
- Sequence< ::rtl::OUString > aAddonInstMergeNodesSeq = GetNodeNames( aMergeAddonInstructions );
+ Sequence< OUString > aAddonInstMergeNodesSeq = GetNodeNames( aMergeAddonInstructions );
sal_uInt32 nCountAddons = aAddonInstMergeNodesSeq.getLength();
for ( sal_uInt32 j = 0; j < nCountAddons; j++ )
{
- ::rtl::OUStringBuffer aMergeAddonInstructionBase( aMergeAddonInstructions );
+ OUStringBuffer aMergeAddonInstructionBase( aMergeAddonInstructions );
aMergeAddonInstructionBase.append( m_aPathDelimiter );
aMergeAddonInstructionBase.append( aAddonInstMergeNodesSeq[j] );
aMergeAddonInstructionBase.append( m_aPathDelimiter );
// Create sequence for data access
- ::rtl::OUStringBuffer aBuffer( aMergeAddonInstructionBase );
+ OUStringBuffer aBuffer( aMergeAddonInstructionBase );
aBuffer.append( m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MERGEPOINT ] );
aNodePropNames[0] = aBuffer.makeStringAndClear();
@@ -932,7 +932,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionCont
aNodePropValues[3] >>= aMergeMenuInstruction.aMergeFallback;
aNodePropValues[4] >>= aMergeMenuInstruction.aMergeContext;
- ::rtl::OUString aMergeMenuBase = aMergeAddonInstructionBase.makeStringAndClear();
+ OUString aMergeMenuBase = aMergeAddonInstructionBase.makeStringAndClear();
ReadMergeMenuData( aMergeMenuBase, aMergeMenuInstruction.aMergeMenu );
aContainer.push_back( aMergeMenuInstruction );
@@ -945,16 +945,16 @@ sal_Bool AddonsOptions_Impl::ReadMenuMergeInstructions( MergeMenuInstructionCont
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
+sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeMenu )
{
- ::rtl::OUString aMergeMenuBaseNode( aMergeAddonInstructionBase+m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MENUITEMS ] );
+ OUString aMergeMenuBaseNode( aMergeAddonInstructionBase+m_aPropMergeMenuNames[ OFFSET_MERGEMENU_MENUITEMS ] );
- Sequence< ::rtl::OUString > aSubMenuNodeNames = GetNodeNames( aMergeMenuBaseNode );
+ Sequence< OUString > aSubMenuNodeNames = GetNodeNames( aMergeMenuBaseNode );
aMergeMenuBaseNode += m_aPathDelimiter;
// extend the node names to have full path strings
for ( sal_uInt32 i = 0; i < (sal_uInt32)aSubMenuNodeNames.getLength(); i++ )
- aSubMenuNodeNames[i] = ::rtl::OUString( aMergeMenuBaseNode + aSubMenuNodeNames[i] );
+ aSubMenuNodeNames[i] = OUString( aMergeMenuBaseNode + aSubMenuNodeNames[i] );
return ReadSubMenuEntries( aSubMenuNodeNames, rMergeMenu );
}
@@ -964,32 +964,32 @@ sal_Bool AddonsOptions_Impl::ReadMergeMenuData( const ::rtl::OUString& aMergeAdd
//*****************************************************************************************************************
sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstructions& rCachedToolbarMergingInstructions )
{
- const ::rtl::OUString aToolbarMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolbarMerging/" ));
+ const OUString aToolbarMergeRootName( RTL_CONSTASCII_USTRINGPARAM( "AddonUI/OfficeToolbarMerging/" ));
- Sequence< ::rtl::OUString > aAddonMergeNodesSeq = GetNodeNames( aToolbarMergeRootName );
- ::rtl::OUString aAddonMergeNode( aToolbarMergeRootName );
+ Sequence< OUString > aAddonMergeNodesSeq = GetNodeNames( aToolbarMergeRootName );
+ OUString aAddonMergeNode( aToolbarMergeRootName );
sal_uInt32 nCount = aAddonMergeNodesSeq.getLength();
// Init the property value sequence
- Sequence< ::rtl::OUString > aNodePropNames( 6 );
+ Sequence< OUString > aNodePropNames( 6 );
for ( sal_uInt32 i = 0; i < nCount; i++ )
{
- ::rtl::OUString aMergeAddonInstructions( aAddonMergeNode + aAddonMergeNodesSeq[i] );
+ OUString aMergeAddonInstructions( aAddonMergeNode + aAddonMergeNodesSeq[i] );
- Sequence< ::rtl::OUString > aAddonInstMergeNodesSeq = GetNodeNames( aMergeAddonInstructions );
+ Sequence< OUString > aAddonInstMergeNodesSeq = GetNodeNames( aMergeAddonInstructions );
sal_uInt32 nCountAddons = aAddonInstMergeNodesSeq.getLength();
for ( sal_uInt32 j = 0; j < nCountAddons; j++ )
{
- ::rtl::OUStringBuffer aMergeAddonInstructionBase( aMergeAddonInstructions );
+ OUStringBuffer aMergeAddonInstructionBase( aMergeAddonInstructions );
aMergeAddonInstructionBase.append( m_aPathDelimiter );
aMergeAddonInstructionBase.append( aAddonInstMergeNodesSeq[j] );
aMergeAddonInstructionBase.append( m_aPathDelimiter );
// Create sequence for data access
- ::rtl::OUStringBuffer aBuffer( aMergeAddonInstructionBase );
+ OUStringBuffer aBuffer( aMergeAddonInstructionBase );
aBuffer.append( m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBAR ] );
aNodePropNames[0] = aBuffer.makeStringAndClear();
@@ -1037,12 +1037,12 @@ sal_Bool AddonsOptions_Impl::ReadToolbarMergeInstructions( ToolbarMergingInstruc
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const ::rtl::OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems )
+sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const OUString& aMergeAddonInstructionBase, Sequence< Sequence< PropertyValue > >& rMergeToolbarItems )
{
- ::rtl::OUStringBuffer aBuffer( aMergeAddonInstructionBase );
+ OUStringBuffer aBuffer( aMergeAddonInstructionBase );
aBuffer.append( m_aPropMergeToolbarNames[ OFFSET_MERGETOOLBAR_TOOLBARITEMS ] );
- ::rtl::OUString aMergeToolbarBaseNode = aBuffer.makeStringAndClear();
+ OUString aMergeToolbarBaseNode = aBuffer.makeStringAndClear();
return ReadToolBarItemSet( aMergeToolbarBaseNode, rMergeToolbarItems );
}
@@ -1050,11 +1050,11 @@ sal_Bool AddonsOptions_Impl::ReadMergeToolbarData( const ::rtl::OUString& aMerge
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu )
+sal_Bool AddonsOptions_Impl::ReadMenuItem( const OUString& aMenuNodeName, Sequence< PropertyValue >& aMenuItem, sal_Bool bIgnoreSubMenu )
{
sal_Bool bResult = sal_False;
- ::rtl::OUString aStrValue;
- ::rtl::OUString aAddonMenuItemTreeNode( aMenuNodeName + m_aPathDelimiter );
+ OUString aStrValue;
+ OUString aAddonMenuItemTreeNode( aMenuNodeName + m_aPathDelimiter );
Sequence< Any > aMenuItemNodePropValues;
aMenuItemNodePropValues = GetProperties( GetPropertyNamesMenuItem( aAddonMenuItemTreeNode ) );
@@ -1062,13 +1062,13 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName,
{
aMenuItem[ OFFSET_MENUITEM_TITLE ].Value <<= aStrValue;
- ::rtl::OUString aRootSubMenuName( aAddonMenuItemTreeNode + m_aPropNames[ INDEX_SUBMENU ] );
- Sequence< ::rtl::OUString > aRootSubMenuNodeNames = GetNodeNames( aRootSubMenuName );
+ OUString aRootSubMenuName( aAddonMenuItemTreeNode + m_aPropNames[ INDEX_SUBMENU ] );
+ Sequence< OUString > aRootSubMenuNodeNames = GetNodeNames( aRootSubMenuName );
if ( aRootSubMenuNodeNames.getLength() > 0 && !bIgnoreSubMenu )
{
// Set a unique prefixed Add-On popup menu URL so it can be identified later
- ::rtl::OUString aPopupMenuURL = GeneratePrefixURL();
- ::rtl::OUString aPopupMenuImageId;
+ OUString aPopupMenuURL = GeneratePrefixURL();
+ OUString aPopupMenuImageId;
aMenuItemNodePropValues[ OFFSET_MENUITEM_IMAGEIDENTIFIER ] >>= aPopupMenuImageId;
ReadAndAssociateImages( aPopupMenuURL, aPopupMenuImageId );
@@ -1082,9 +1082,9 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName,
// Continue to read the sub menu nodes
Sequence< Sequence< PropertyValue > > aSubMenuSeq;
- ::rtl::OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter );
+ OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter );
for ( sal_uInt32 n = 0; n < (sal_uInt32)aRootSubMenuNodeNames.getLength(); n++ )
- aRootSubMenuNodeNames[n] = ::rtl::OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] );
+ aRootSubMenuNodeNames[n] = OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] );
ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq );
aMenuItem[ OFFSET_MENUITEM_SUBMENU ].Value <<= aSubMenuSeq;
bResult = sal_True;
@@ -1092,7 +1092,7 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName,
else if (( aMenuItemNodePropValues[ OFFSET_MENUITEM_URL ] >>= aStrValue ) && !aStrValue.isEmpty() )
{
// A simple menu item => read the other properties;
- ::rtl::OUString aMenuImageId;
+ OUString aMenuImageId;
aMenuItemNodePropValues[ OFFSET_MENUITEM_IMAGEIDENTIFIER ] >>= aMenuImageId;
ReadAndAssociateImages( aStrValue, aMenuImageId );
@@ -1124,11 +1124,11 @@ sal_Bool AddonsOptions_Impl::ReadMenuItem( const ::rtl::OUString& aMenuNodeName,
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-sal_Bool AddonsOptions_Impl::ReadPopupMenu( const ::rtl::OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu )
+sal_Bool AddonsOptions_Impl::ReadPopupMenu( const OUString& aPopupMenuNodeName, Sequence< PropertyValue >& aPopupMenu )
{
sal_Bool bResult = sal_False;
- ::rtl::OUString aStrValue;
- ::rtl::OUString aAddonPopupMenuTreeNode( aPopupMenuNodeName + m_aPathDelimiter );
+ OUString aStrValue;
+ OUString aAddonPopupMenuTreeNode( aPopupMenuNodeName + m_aPathDelimiter );
Sequence< Any > aPopupMenuNodePropValues;
aPopupMenuNodePropValues = GetProperties( GetPropertyNamesPopupMenu( aAddonPopupMenuTreeNode ) );
@@ -1137,22 +1137,22 @@ sal_Bool AddonsOptions_Impl::ReadPopupMenu( const ::rtl::OUString& aPopupMenuNod
{
aPopupMenu[ OFFSET_POPUPMENU_TITLE ].Value <<= aStrValue;
- ::rtl::OUString aRootSubMenuName( aAddonPopupMenuTreeNode + m_aPropNames[ INDEX_SUBMENU ] );
- Sequence< ::rtl::OUString > aRootSubMenuNodeNames = GetNodeNames( aRootSubMenuName );
+ OUString aRootSubMenuName( aAddonPopupMenuTreeNode + m_aPropNames[ INDEX_SUBMENU ] );
+ Sequence< OUString > aRootSubMenuNodeNames = GetNodeNames( aRootSubMenuName );
if ( aRootSubMenuNodeNames.getLength() > 0 )
{
// A top-level popup menu needs a title
// Set a unique prefixed Add-On popup menu URL so it can be identified later
- ::rtl::OUString aPopupMenuURL = GeneratePrefixURL();
+ OUString aPopupMenuURL = GeneratePrefixURL();
aPopupMenu[ OFFSET_POPUPMENU_URL ].Value <<= aPopupMenuURL;
aPopupMenu[ OFFSET_POPUPMENU_CONTEXT ].Value <<= aPopupMenuNodePropValues[ OFFSET_POPUPMENU_CONTEXT ];
// Continue to read the sub menu nodes
Sequence< Sequence< PropertyValue > > aSubMenuSeq;
- ::rtl::OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter );
+ OUString aSubMenuRootNodeName( aRootSubMenuName + m_aPathDelimiter );
for ( sal_uInt32 n = 0; n < (sal_uInt32)aRootSubMenuNodeNames.getLength(); n++ )
- aRootSubMenuNodeNames[n] = ::rtl::OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] );
+ aRootSubMenuNodeNames[n] = OUString( aSubMenuRootNodeName + aRootSubMenuNodeNames[n] );
ReadSubMenuEntries( aRootSubMenuNodeNames, aSubMenuSeq );
aPopupMenu[ OFFSET_POPUPMENU_SUBMENU ].Value <<= aSubMenuSeq;
bResult = sal_True;
@@ -1186,12 +1186,12 @@ sal_Bool AddonsOptions_Impl::AppendPopupMenu( Sequence< PropertyValue >& rTarget
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
+sal_Bool AddonsOptions_Impl::ReadToolBarItem( const OUString& aToolBarItemNodeName, Sequence< PropertyValue >& aToolBarItem )
{
sal_Bool bResult = sal_False;
- ::rtl::OUString aTitle;
- ::rtl::OUString aURL;
- ::rtl::OUString aAddonToolBarItemTreeNode( aToolBarItemNodeName + m_aPathDelimiter );
+ OUString aTitle;
+ OUString aURL;
+ OUString aAddonToolBarItemTreeNode( aToolBarItemNodeName + m_aPathDelimiter );
Sequence< Any > aToolBarItemNodePropValues;
aToolBarItemNodePropValues = GetProperties( GetPropertyNamesToolBarItem( aAddonToolBarItemTreeNode ) );
@@ -1215,7 +1215,7 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarIte
else if (( aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_TITLE ] >>= aTitle ) && !aTitle.isEmpty() )
{
// A normal toolbar item must also have title => read the other properties;
- ::rtl::OUString aImageId;
+ OUString aImageId;
// Try to map a user-defined image URL to our internal private image URL
aToolBarItemNodePropValues[ OFFSET_TOOLBARITEM_IMAGEIDENTIFIER ] >>= aImageId;
@@ -1243,7 +1243,7 @@ sal_Bool AddonsOptions_Impl::ReadToolBarItem( const ::rtl::OUString& aToolBarIte
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< ::rtl::OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
+sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< OUString >& aSubMenuNodeNames, Sequence< Sequence< PropertyValue > >& rSubMenuSeq )
{
Sequence< PropertyValue > aMenuItem( PROPERTYCOUNT_MENUITEM );
@@ -1273,7 +1273,7 @@ sal_Bool AddonsOptions_Impl::ReadSubMenuEntries( const Sequence< ::rtl::OUString
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-sal_Bool AddonsOptions_Impl::HasAssociatedImages( const ::rtl::OUString& aURL )
+sal_Bool AddonsOptions_Impl::HasAssociatedImages( const OUString& aURL )
{
ImageManager::const_iterator pIter = m_aImageManager.find( aURL );
return ( pIter != m_aImageManager.end() );
@@ -1282,12 +1282,12 @@ sal_Bool AddonsOptions_Impl::HasAssociatedImages( const ::rtl::OUString& aURL )
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-void AddonsOptions_Impl::SubstituteVariables( ::rtl::OUString& aURL )
+void AddonsOptions_Impl::SubstituteVariables( OUString& aURL )
{
if (( aURL.compareToAscii( RTL_CONSTASCII_STRINGPARAM( EXPAND_PROTOCOL )) == 0 ) )
{
// cut protocol
- ::rtl::OUString macro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) );
+ OUString macro( aURL.copy( sizeof ( EXPAND_PROTOCOL ) -1 ) );
// decode uric class chars
macro = ::rtl::Uri::decode(
macro, rtl_UriDecodeWithCharset, RTL_TEXTENCODING_UTF8 );
@@ -1299,7 +1299,7 @@ void AddonsOptions_Impl::SubstituteVariables( ::rtl::OUString& aURL )
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OUString& aImageURL, Image& aImage, Image& aImageNoScale )
+void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const OUString& aImageURL, Image& aImage, Image& aImageNoScale )
{
SvStream* pStream = UcbStreamHelper::CreateStream( aImageURL, STREAM_STD_READ );
if ( pStream && ( pStream->GetErrorCode() == 0 ))
@@ -1344,7 +1344,7 @@ void AddonsOptions_Impl::ReadImageFromURL( ImageSize nImageSize, const ::rtl::OU
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, const ::rtl::OUString& aImageId )
+void AddonsOptions_Impl::ReadAndAssociateImages( const OUString& aURL, const OUString& aImageId )
{
const int MAX_NUM_IMAGES = 2;
const char* aExtArray[MAX_NUM_IMAGES] = { "_16", "_26" };
@@ -1355,14 +1355,14 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co
bool bImageFound = true;
ImageEntry aImageEntry;
- ::rtl::OUString aImageURL( aImageId );
+ OUString aImageURL( aImageId );
SubstituteVariables( aImageURL );
// Loop to create the four possible image names and try to read the bitmap files
for ( int i = 0; i < MAX_NUM_IMAGES; i++ )
{
- ::rtl::OUStringBuffer aFileURL( aImageURL );
+ OUStringBuffer aFileURL( aImageURL );
aFileURL.appendAscii( aExtArray[i] );
aFileURL.appendAscii( pBmpExt );
@@ -1393,12 +1393,12 @@ void AddonsOptions_Impl::ReadAndAssociateImages( const ::rtl::OUString& aURL, co
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const ::rtl::OUString& aImagesNodeName )
+AddonsOptions_Impl::ImageEntry* AddonsOptions_Impl::ReadImageData( const OUString& aImagesNodeName )
{
- Sequence< ::rtl::OUString > aImageDataNodeNames = GetPropertyNamesImages( aImagesNodeName );
+ Sequence< OUString > aImageDataNodeNames = GetPropertyNamesImages( aImagesNodeName );
Sequence< Any > aPropertyData;
Sequence< sal_Int8 > aImageDataSeq;
- ::rtl::OUString aImageURL;
+ OUString aImageURL;
ImageEntry* pEntry = NULL;
@@ -1495,17 +1495,17 @@ sal_Bool AddonsOptions_Impl::CreateImageFromSequence( Image& rImage, sal_Bool bB
return bResult;
}
-Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const ::rtl::OUString& aPropertyRootNode ) const
+Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const OUString& aPropertyRootNode ) const
{
- Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_MENUITEM );
+ Sequence< OUString > lResult( PROPERTYCOUNT_MENUITEM );
// Create property names dependent from the root node name
- lResult[OFFSET_MENUITEM_URL] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
- lResult[OFFSET_MENUITEM_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
- lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] );
- lResult[OFFSET_MENUITEM_TARGET] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] );
- lResult[OFFSET_MENUITEM_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
- lResult[OFFSET_MENUITEM_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] );
+ lResult[OFFSET_MENUITEM_URL] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
+ lResult[OFFSET_MENUITEM_TITLE] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
+ lResult[OFFSET_MENUITEM_IMAGEIDENTIFIER] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER ] );
+ lResult[OFFSET_MENUITEM_TARGET] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] );
+ lResult[OFFSET_MENUITEM_CONTEXT] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
+ lResult[OFFSET_MENUITEM_SUBMENU] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] );
return lResult;
}
@@ -1513,15 +1513,15 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesMenuItem( const
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const ::rtl::OUString& aPropertyRootNode ) const
+Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const OUString& aPropertyRootNode ) const
{
// The URL is automatically set and not read from the configuration.
- Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_POPUPMENU-1 );
+ Sequence< OUString > lResult( PROPERTYCOUNT_POPUPMENU-1 );
// Create property names dependent from the root node name
- lResult[OFFSET_POPUPMENU_TITLE] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
- lResult[OFFSET_POPUPMENU_CONTEXT] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
- lResult[OFFSET_POPUPMENU_SUBMENU] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] );
+ lResult[OFFSET_POPUPMENU_TITLE] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
+ lResult[OFFSET_POPUPMENU_CONTEXT] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
+ lResult[OFFSET_POPUPMENU_SUBMENU] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_SUBMENU ] );
return lResult;
}
@@ -1529,18 +1529,18 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesPopupMenu( const
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const ::rtl::OUString& aPropertyRootNode ) const
+Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( const OUString& aPropertyRootNode ) const
{
- Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_TOOLBARITEM );
+ Sequence< OUString > lResult( PROPERTYCOUNT_TOOLBARITEM );
// Create property names dependent from the root node name
- lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
- lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
- lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER] );
- lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] );
- lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
- lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] );
- lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] );
+ lResult[0] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_URL ] );
+ lResult[1] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TITLE ] );
+ lResult[2] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_IMAGEIDENTIFIER] );
+ lResult[3] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_TARGET ] );
+ lResult[4] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTEXT ] );
+ lResult[5] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_CONTROLTYPE ] );
+ lResult[6] = OUString( aPropertyRootNode + m_aPropNames[ INDEX_WIDTH ] );
return lResult;
}
@@ -1548,19 +1548,19 @@ Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesToolBarItem( con
//*****************************************************************************************************************
// private method
//*****************************************************************************************************************
-Sequence< ::rtl::OUString > AddonsOptions_Impl::GetPropertyNamesImages( const ::rtl::OUString& aPropertyRootNode ) const
+Sequence< OUString > AddonsOptions_Impl::GetPropertyNamesImages( const OUString& aPropertyRootNode ) const
{
- Sequence< ::rtl::OUString > lResult( PROPERTYCOUNT_IMAGES );
+ Sequence< OUString > lResult( PROPERTYCOUNT_IMAGES );
// Create property names dependent from the root node name
- lResult[0] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] );
- lResult[1] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] );
- lResult[2] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] );
- lResult[3] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] );
- lResult[4] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] );
- lResult[5] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] );
- lResult[6] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL] );
- lResult[7] = ::rtl::OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] );
+ lResult[0] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL ] );
+ lResult[1] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG ] );
+ lResult[2] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC ] );
+ lResult[3] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC ] );
+ lResult[4] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALL_URL ] );
+ lResult[5] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIG_URL ] );
+ lResult[6] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_SMALLHC_URL] );
+ lResult[7] = OUString( aPropertyRootNode + m_aPropImagesNames[ OFFSET_IMAGES_BIGHC_URL ] );
return lResult;
}
@@ -1656,7 +1656,7 @@ const Sequence< Sequence< PropertyValue > >& AddonsOptions::GetAddonsToolBarPart
//*****************************************************************************************************************
// public method
//*****************************************************************************************************************
-const ::rtl::OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const
+const OUString AddonsOptions::GetAddonsToolbarResourceName( sal_uInt32 nIndex ) const
{
MutexGuard aGuard( GetOwnStaticMutex() );
return m_pDataContainer->GetAddonsToolbarResourceName( nIndex );
@@ -1684,7 +1684,7 @@ const MergeMenuInstructionContainer& AddonsOptions::GetMergeMenuInstructions() c
// public method
//*****************************************************************************************************************
bool AddonsOptions::GetMergeToolbarInstructions(
- const ::rtl::OUString& rToolbarName,
+ const OUString& rToolbarName,
MergeToolbarInstructionContainer& rToolbarInstructions ) const
{
MutexGuard aGuard( GetOwnStaticMutex() );
diff --git a/reportdesign/source/ui/inspection/GeometryHandler.cxx b/reportdesign/source/ui/inspection/GeometryHandler.cxx
index 472bb30b15ed..90d10bec1cfb 100644
--- a/reportdesign/source/ui/inspection/GeometryHandler.cxx
+++ b/reportdesign/source/ui/inspection/GeometryHandler.cxx
@@ -124,27 +124,27 @@ using namespace ::com::sun::star;
namespace{
// comparing two property instances
-struct PropertyCompare : public ::std::binary_function< beans::Property, ::rtl::OUString , bool >
+struct PropertyCompare : public ::std::binary_function< beans::Property, OUString , bool >
{
- bool operator() (const beans::Property& x, const ::rtl::OUString& y) const
+ bool operator() (const beans::Property& x, const OUString& y) const
{
return x.Name.equals(y);
}
- bool operator() (const ::rtl::OUString& x,const beans::Property& y) const
+ bool operator() (const OUString& x,const beans::Property& y) const
{
return x.equals(y.Name);
}
};
// -----------------------------------------------------------------------------
-::rtl::OUString lcl_getQuotedFunctionName(const ::rtl::OUString& _sFunction)
+OUString lcl_getQuotedFunctionName(const OUString& _sFunction)
{
- ::rtl::OUString sQuotedFunctionName(RTL_CONSTASCII_USTRINGPARAM("["));
- sQuotedFunctionName += _sFunction + ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
+ OUString sQuotedFunctionName(RTL_CONSTASCII_USTRINGPARAM("["));
+ sQuotedFunctionName += _sFunction + OUString(RTL_CONSTASCII_USTRINGPARAM("]"));
return sQuotedFunctionName;
}
// -----------------------------------------------------------------------------
-::rtl::OUString lcl_getQuotedFunctionName(const uno::Reference< report::XFunction>& _xFunction)
+OUString lcl_getQuotedFunctionName(const uno::Reference< report::XFunction>& _xFunction)
{
return lcl_getQuotedFunctionName(_xFunction->getName());
}
@@ -181,7 +181,7 @@ void lcl_collectFunctionNames(const uno::Reference< report::XSection>& _xSection
// -----------------------------------------------------------------------------
void lcl_convertFormulaTo(const uno::Any& _aPropertyValue,uno::Any& _rControlValue)
{
- ::rtl::OUString sName;
+ OUString sName;
_aPropertyValue >>= sName;
const sal_Int32 nLen = sName.getLength();
if ( nLen )
@@ -207,9 +207,9 @@ template <typename T, T base> T lcl_round(T value)
} // anonymous namespace
// -----------------------------------------------------------------------------
-bool GeometryHandler::impl_isDataField(const ::rtl::OUString& _sName) const
+bool GeometryHandler::impl_isDataField(const OUString& _sName) const
{
- const ::rtl::OUString* pEnd = m_aFieldNames.getConstArray() + m_aFieldNames.getLength();
+ const OUString* pEnd = m_aFieldNames.getConstArray() + m_aFieldNames.getLength();
bool bIsField = ( ::std::find( m_aFieldNames.getConstArray(), pEnd, _sName ) != pEnd );
if ( !bIsField )
@@ -220,9 +220,9 @@ bool GeometryHandler::impl_isDataField(const ::rtl::OUString& _sName) const
return bIsField;
}
// -----------------------------------------------------------------------------
-::rtl::OUString GeometryHandler::impl_convertToFormula( const uno::Any& _rControlValue )
+OUString GeometryHandler::impl_convertToFormula( const uno::Any& _rControlValue )
{
- ::rtl::OUString sName;
+ OUString sName;
_rControlValue >>= sName;
if ( sName.isEmpty() )
@@ -248,7 +248,7 @@ GeometryHandler::GeometryHandler(uno::Reference< uno::XComponentContext > const
try
{
const uno::Reference< lang::XMultiComponentFactory > xFac = m_xContext->getServiceManager();
- m_xFormComponentHandler.set(xFac->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW);
+ m_xFormComponentHandler.set(xFac->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.form.inspection.FormComponentPropertyHandler")),m_xContext),uno::UNO_QUERY_THROW);
m_xTypeConverter.set(script::Converter::create(context));
loadDefaultFunctions();
}
@@ -262,34 +262,34 @@ GeometryHandler::~GeometryHandler()
DBG_DTOR(rpt_GeometryHandler,NULL);
}
//------------------------------------------------------------------------
-::rtl::OUString SAL_CALL GeometryHandler::getImplementationName( ) throw(uno::RuntimeException)
+OUString SAL_CALL GeometryHandler::getImplementationName( ) throw(uno::RuntimeException)
{
return getImplementationName_Static();
}
//------------------------------------------------------------------------
-sal_Bool SAL_CALL GeometryHandler::supportsService( const ::rtl::OUString& ServiceName ) throw(uno::RuntimeException)
+sal_Bool SAL_CALL GeometryHandler::supportsService( const OUString& ServiceName ) throw(uno::RuntimeException)
{
return ::comphelper::existsValue(ServiceName,getSupportedServiceNames_static());
}
//------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > SAL_CALL GeometryHandler::getSupportedServiceNames( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupportedServiceNames( ) throw(uno::RuntimeException)
{
return getSupportedServiceNames_static();
}
//------------------------------------------------------------------------
-::rtl::OUString GeometryHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
+OUString GeometryHandler::getImplementationName_Static( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.GeometryHandler"));
+ return OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.comp.report.GeometryHandler"));
}
//------------------------------------------------------------------------
-uno::Sequence< ::rtl::OUString > GeometryHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
+uno::Sequence< OUString > GeometryHandler::getSupportedServiceNames_static( ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aSupported(1);
- aSupported[0] = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.GeometryHandler"));
+ uno::Sequence< OUString > aSupported(1);
+ aSupported[0] = OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.inspection.GeometryHandler"));
return aSupported;
}
@@ -334,7 +334,7 @@ void SAL_CALL GeometryHandler::removeEventListener(const uno::Reference< lang::X
void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface > & _rxInspectee ) throw (uno::RuntimeException, lang::NullPointerException)
{
::osl::MutexGuard aGuard( m_aMutex );
- m_sScope = m_sDefaultFunction = ::rtl::OUString();
+ m_sScope = m_sDefaultFunction = OUString();
m_bNewFunction = false;
m_nDataFieldType = 0;
m_xFunction.clear();
@@ -345,9 +345,9 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface >
m_xReportComponent->removePropertyChangeListener(PROPERTY_DATAFIELD,static_cast< beans::XPropertyChangeListener* >( this ));
const uno::Reference< container::XNameContainer > xObjectAsContainer( _rxInspectee, uno::UNO_QUERY );
- m_xReportComponent.set( xObjectAsContainer->getByName( ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "ReportComponent" ) ) ), uno::UNO_QUERY );
+ m_xReportComponent.set( xObjectAsContainer->getByName( OUString( RTL_CONSTASCII_USTRINGPARAM( "ReportComponent" ) ) ), uno::UNO_QUERY );
- const ::rtl::OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet"));
+ const OUString sRowSet(RTL_CONSTASCII_USTRINGPARAM("RowSet"));
if ( xObjectAsContainer->hasByName( sRowSet ) )
{
const uno::Any aRowSet( xObjectAsContainer->getByName(sRowSet) );
@@ -376,7 +376,7 @@ void SAL_CALL GeometryHandler::inspect( const uno::Reference< uno::XInterface >
m_xFormComponentHandler->inspect(m_xReportComponent);
}
-uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException)
+uno::Any SAL_CALL GeometryHandler::getPropertyValue(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
::osl::MutexGuard aGuard( m_aMutex );
uno::Any aPropertyValue;
@@ -391,7 +391,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop
lcl_convertFormulaTo(aPropertyValue,aPropertyValue);
if ( PROPERTY_ID_DATAFIELD == nId )
{
- ::rtl::OUString sDataField;
+ OUString sDataField;
aPropertyValue >>= sDataField;
switch(m_nDataFieldType)
{
@@ -425,7 +425,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop
{
uno::Any aDataField = m_xReportComponent->getPropertyValue( PROPERTY_DATAFIELD );
lcl_convertFormulaTo(aDataField,aDataField);
- ::rtl::OUString sDataField;
+ OUString sDataField;
aDataField >>= sDataField;
switch(m_nDataFieldType)
{
@@ -458,7 +458,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop
break;
case PROPERTY_ID_MIMETYPE:
{
- ::rtl::OUString sValue;
+ OUString sValue;
m_xReportComponent->getPropertyValue( PropertyName ) >>= sValue;
aPropertyValue <<= impl_ConvertMimeTypeToUI_nothrow(sValue);
}
@@ -470,7 +470,7 @@ uno::Any SAL_CALL GeometryHandler::getPropertyValue(const ::rtl::OUString & Prop
return aPropertyValue;
}
-void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException)
+void SAL_CALL GeometryHandler::setPropertyValue(const OUString & PropertyName, const uno::Any & Value) throw (uno::RuntimeException, beans::UnknownPropertyException, beans::PropertyVetoException)
{
::osl::ResettableMutexGuard aGuard( m_aMutex );
uno::Any aNewValue = Value;
@@ -486,15 +486,15 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
OBlocker aBlocker(m_bIn);
m_xReportComponent->setPropertyValue(PropertyName, aNewValue);
bHandled = true;
- const ::rtl::OUString sOldFunctionName = m_sDefaultFunction;
- const ::rtl::OUString sOldScope = m_sScope;
+ const OUString sOldFunctionName = m_sDefaultFunction;
+ const OUString sOldScope = m_sScope;
uno::Any aPropertyValue;
lcl_convertFormulaTo(Value,aPropertyValue);
- ::rtl::OUString sDataField;
+ OUString sDataField;
aPropertyValue >>= sDataField;
- m_sScope = m_sDefaultFunction = ::rtl::OUString();
+ m_sScope = m_sDefaultFunction = OUString();
m_xFunction.clear();
const sal_uInt32 nOldDataFieldType = m_nDataFieldType;
if ( !sDataField.isEmpty() )
@@ -513,9 +513,9 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
bHandled = true;
Value >>= m_nDataFieldType;
- const ::rtl::OUString sOldFunctionName = m_sDefaultFunction;
- const ::rtl::OUString sOldScope = m_sScope;
- m_sDefaultFunction = m_sScope = ::rtl::OUString();
+ const OUString sOldFunctionName = m_sDefaultFunction;
+ const OUString sOldScope = m_sScope;
+ m_sDefaultFunction = m_sScope = OUString();
if ( m_nDataFieldType == COUNTER )
{
@@ -527,7 +527,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
removeFunction();
m_xFunction.clear();
OBlocker aBlocker(m_bIn);
- m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(::rtl::OUString()));
+ m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(OUString()));
}
resetOwnProperties(aGuard,sOldFunctionName,sOldScope,m_nDataFieldType);
}
@@ -535,12 +535,12 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
case PROPERTY_ID_FORMULALIST:
{
bHandled = true;
- ::rtl::OUString sFunction;
+ OUString sFunction;
if ( !(Value >>= sFunction) || sFunction.isEmpty() )
{
if ( m_nDataFieldType == FUNCTION )
{
- m_sDefaultFunction = ::rtl::OUString();
+ m_sDefaultFunction = OUString();
if ( m_bNewFunction )
removeFunction();
m_xFunction.clear();
@@ -548,7 +548,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
beans::PropertyChangeEvent aEvent;
aEvent.PropertyName = PROPERTY_SCOPE;
aEvent.OldValue <<= m_sScope;
- m_sScope = ::rtl::OUString();
+ m_sScope = OUString();
aEvent.NewValue <<= m_sScope;
aGuard.clear();
m_aPropertyListeners.notify( aEvent, &beans::XPropertyChangeListener::propertyChange );
@@ -556,25 +556,25 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
else if ( m_nDataFieldType == USER_DEF_FUNCTION )
{
OBlocker aBlocker(m_bIn);
- m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(::rtl::OUString()));
+ m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(OUString()));
}
}
else if ( m_nDataFieldType == USER_DEF_FUNCTION )
{
- ::rtl::OUString sDataField;
+ OUString sDataField;
OBlocker aBlocker(m_bIn);
const sal_uInt32 nNewDataType = impl_getDataFieldType_throw(sFunction);
if ( nNewDataType != UNDEF_DATA && nNewDataType != m_nDataFieldType )
{
- const ::rtl::OUString sOldFunctionName = m_sDefaultFunction;
- const ::rtl::OUString sOldScope = m_sScope;
- m_sScope = m_sDefaultFunction = ::rtl::OUString();
+ const OUString sOldFunctionName = m_sDefaultFunction;
+ const OUString sOldScope = m_sScope;
+ m_sScope = m_sDefaultFunction = OUString();
m_xFunction.clear();
if ( nNewDataType == COUNTER )
impl_isCounterFunction_throw(sFunction,m_sScope);
else
{
- ::rtl::OUString sNamePostFix;
+ OUString sNamePostFix;
const uno::Reference< report::XFunctionsSupplier> xFunctionsSupplier = fillScope_throw(sNamePostFix);
isDefaultFunction(sFunction,sDataField,xFunctionsSupplier,true);
}
@@ -590,7 +590,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
{
uno::Any aPropertyValue = m_xReportComponent->getPropertyValue(PROPERTY_DATAFIELD);
lcl_convertFormulaTo(aPropertyValue,aPropertyValue);
- ::rtl::OUString sDataField;
+ OUString sDataField;
aPropertyValue >>= sDataField;
if ( m_nDataFieldType == FUNCTION && (!isDefaultFunction(sDataField,sDataField) || m_sDefaultFunction != sFunction) )
{
@@ -606,7 +606,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
break;
case PROPERTY_ID_SCOPE:
if ( !(Value >>= m_sScope) )
- m_sScope = ::rtl::OUString();
+ m_sScope = OUString();
else
{
if ( m_bNewFunction )
@@ -617,16 +617,16 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
{
OSL_ENSURE(m_xFunction.is(),"Where is my function gone!");
- ::rtl::OUString sNamePostFix;
+ OUString sNamePostFix;
const uno::Reference< report::XFunctionsSupplier> xFunctionsSupplier = fillScope_throw(sNamePostFix);
- ::rtl::OUString sQuotedFunctionName(lcl_getQuotedFunctionName(m_xFunction));
+ OUString sQuotedFunctionName(lcl_getQuotedFunctionName(m_xFunction));
if ( isDefaultFunction(sQuotedFunctionName,sQuotedFunctionName,xFunctionsSupplier,true) )
m_bNewFunction = false;
else
{
- ::rtl::OUString sDefaultFunctionName;
- ::rtl::OUString sDataField;
+ OUString sDefaultFunctionName;
+ OUString sDataField;
OSL_VERIFY( impl_isDefaultFunction_nothrow(m_xFunction,sDataField,sDefaultFunctionName) );
m_sDefaultFunction = sDefaultFunctionName;
createDefaultFunction(aGuard,m_sDefaultFunction,sDataField);
@@ -673,7 +673,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
break;
case PROPERTY_ID_MIMETYPE:
{
- ::rtl::OUString sValue;
+ OUString sValue;
Value >>= sValue;
aNewValue <<= impl_ConvertUIToMimeType_nothrow(sValue);
}
@@ -686,7 +686,7 @@ void SAL_CALL GeometryHandler::setPropertyValue(const ::rtl::OUString & Property
}
// -----------------------------------------------------------------------------
-beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const ::rtl::OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException)
+beans::PropertyState SAL_CALL GeometryHandler::getPropertyState(const OUString & PropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
::osl::MutexGuard aGuard( m_aMutex );
return m_xFormComponentHandler->getPropertyState(PropertyName);
@@ -700,7 +700,7 @@ void GeometryHandler::implCreateListLikeControl(
,sal_Bool _bTrueIfListBoxFalseIfComboBox
)
{
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
tools::StringListResource aRes(ModuleRes(_nResId),aList);
implCreateListLikeControl(_rxControlFactory,out_Descriptor,aList,_bReadOnlyControl,_bTrueIfListBoxFalseIfComboBox);
@@ -709,7 +709,7 @@ void GeometryHandler::implCreateListLikeControl(
void GeometryHandler::implCreateListLikeControl(
const uno::Reference< inspection::XPropertyControlFactory >& _rxControlFactory
,inspection::LineDescriptor & out_Descriptor
- ,const ::std::vector< ::rtl::OUString>& _aEntries
+ ,const ::std::vector< OUString>& _aEntries
,sal_Bool _bReadOnlyControl
,sal_Bool _bTrueIfListBoxFalseIfComboBox
)
@@ -726,7 +726,7 @@ void GeometryHandler::implCreateListLikeControl(
}
// -----------------------------------------------------------------------------
-inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const ::rtl::OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException)
+inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const OUString & PropertyName, const uno::Reference< inspection::XPropertyControlFactory > & _xControlFactory) throw (beans::UnknownPropertyException, lang::NullPointerException,uno::RuntimeException)
{
inspection::LineDescriptor aOut;
const sal_Int32 nId = m_pInfoService->getPropertyId(PropertyName);
@@ -745,21 +745,21 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
break;
case PROPERTY_ID_FORMULALIST:
{
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
impl_fillFormulaList_nothrow(aList);
implCreateListLikeControl(_xControlFactory,aOut,aList,sal_False,sal_True);
}
break;
case PROPERTY_ID_SCOPE:
{
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
impl_fillScopeList_nothrow(aList);
implCreateListLikeControl(_xControlFactory,aOut,aList,sal_False,sal_True);
}
break;
case PROPERTY_ID_MIMETYPE:
{
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
impl_fillMimeTypes_nothrow(aList);
implCreateListLikeControl(_xControlFactory,aOut,aList,sal_False,sal_True);
}
@@ -861,9 +861,9 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
if ( nId != -1 )
{
aOut.Category = ((m_pInfoService->getPropertyUIFlags(nId ) & PROP_FLAG_DATA_PROPERTY) != 0) ?
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Data"))
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Data"))
:
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("General"));
+ OUString(RTL_CONSTASCII_USTRINGPARAM("General"));
aOut.HelpURL = HelpIdUrl::getHelpURL( m_pInfoService->getPropertyHelpId( nId ) );
aOut.DisplayName = m_pInfoService->getPropertyTranslation(nId);
}
@@ -880,7 +880,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
xNumericControl->setDecimalDigits( 2 );
xNumericControl->setValueUnit( util::MeasureUnit::MM_100TH );
uno::Reference< drawing::XShapeDescriptor> xShapeDesc(m_xReportComponent,uno::UNO_QUERY);
- bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape"));
+ bool bSetMin = !xShapeDesc.is() || xShapeDesc->getShapeType() != OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.drawing.CustomShape"));
if ( bSetMin )
xNumericControl->setMinValue(beans::Optional<double>(sal_True,0.0));
if ( nDisplayUnit != -1 )
@@ -934,7 +934,7 @@ inspection::LineDescriptor SAL_CALL GeometryHandler::describePropertyLine(const
return aOut;
}
// -----------------------------------------------------------------------------
-beans::Property GeometryHandler::getProperty(const ::rtl::OUString & PropertyName)
+beans::Property GeometryHandler::getProperty(const OUString & PropertyName)
{
uno::Sequence< beans::Property > aProps = getSupportedProperties();
const beans::Property* pIter = aProps.getConstArray();
@@ -944,11 +944,11 @@ beans::Property GeometryHandler::getProperty(const ::rtl::OUString & PropertyNam
return beans::Property();
return *pFind;
}
-uno::Any GeometryHandler::getConstantValue(sal_Bool _bToControlValue,sal_uInt16 _nResId,const uno::Any& _aValue,const ::rtl::OUString& _sConstantName,const ::rtl::OUString & PropertyName )
+uno::Any GeometryHandler::getConstantValue(sal_Bool _bToControlValue,sal_uInt16 _nResId,const uno::Any& _aValue,const OUString& _sConstantName,const OUString & PropertyName )
{
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
tools::StringListResource aRes(ModuleRes(_nResId),aList);
- uno::Sequence< ::rtl::OUString > aSeq(aList.size());
+ uno::Sequence< OUString > aSeq(aList.size());
::std::copy( aList.begin(), aList.end(), aSeq.getArray() );
uno::Reference< inspection::XStringRepresentation > xConversionHelper = inspection::StringRepresentation::createConstant( m_xContext,m_xTypeConverter,_sConstantName,aSeq);
@@ -958,14 +958,14 @@ uno::Any GeometryHandler::getConstantValue(sal_Bool _bToControlValue,sal_uInt16
}
else
{
- ::rtl::OUString sControlValue;
+ OUString sControlValue;
_aValue >>= sControlValue;
const beans::Property aProp = getProperty(PropertyName);
return xConversionHelper->convertToPropertyValue( sControlValue, aProp.Type );
}
}
-uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString & PropertyName, const uno::Any & _rControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException)
+uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const OUString & PropertyName, const uno::Any & _rControlValue) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
::osl::MutexGuard aGuard( m_aMutex );
uno::Any aPropertyValue( _rControlValue );
@@ -974,14 +974,14 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString
{
case PROPERTY_ID_FORCENEWPAGE:
case PROPERTY_ID_NEWROWORCOL:
- aPropertyValue = getConstantValue(sal_False,RID_STR_FORCENEWPAGE_CONST,_rControlValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ForceNewPage")),PropertyName);
+ aPropertyValue = getConstantValue(sal_False,RID_STR_FORCENEWPAGE_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ForceNewPage")),PropertyName);
break;
case PROPERTY_ID_GROUPKEEPTOGETHER:
- aPropertyValue = getConstantValue(sal_False,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.GroupKeepTogether")),PropertyName);
+ aPropertyValue = getConstantValue(sal_False,RID_STR_GROUPKEEPTOGETHER_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.GroupKeepTogether")),PropertyName);
break;
case PROPERTY_ID_PAGEHEADEROPTION:
case PROPERTY_ID_PAGEFOOTEROPTION:
- aPropertyValue = getConstantValue(sal_False,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportPrintOption")),PropertyName);
+ aPropertyValue = getConstantValue(sal_False,RID_STR_REPORTPRINTOPTION_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportPrintOption")),PropertyName);
break;
case PROPERTY_ID_BACKCOLOR:
case PROPERTY_ID_CONTROLBACKGROUND:
@@ -995,7 +995,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString
case PROPERTY_ID_KEEPTOGETHER:
if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
{
- aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName);
+ aPropertyValue = getConstantValue(sal_False,RID_STR_KEEPTOGETHER_CONST,_rControlValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName);
break;
}
// run through
@@ -1023,7 +1023,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString
if ( _rControlValue.getValueType().getTypeClass() == uno::TypeClass_STRING )
{
- ::rtl::OUString sControlValue;
+ OUString sControlValue;
_rControlValue >>= sControlValue;
const uno::Reference< inspection::XStringRepresentation > xConversionHelper = inspection::StringRepresentation::create( m_xContext,m_xTypeConverter );
@@ -1050,7 +1050,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString
return uno::makeAny( impl_convertToFormula( _rControlValue ) );
case PROPERTY_ID_DATAFIELD:
{
- ::rtl::OUString sDataField;
+ OUString sDataField;
_rControlValue >>= sDataField;
if ( isDefaultFunction(sDataField,sDataField) )
{
@@ -1082,11 +1082,11 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString
break;
case PROPERTY_ID_TYPE:
{
- ::rtl::OUString sValue;
+ OUString sValue;
_rControlValue >>= sValue;
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
tools::StringListResource aRes(ModuleRes(RID_STR_TYPE_CONST),aList);
- ::std::vector< ::rtl::OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
+ ::std::vector< OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
if ( aFind != aList.end() )
aPropertyValue <<= static_cast<sal_uInt32>(aFind - aList.begin());
}
@@ -1096,22 +1096,22 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString
break;
case PROPERTY_ID_VERTICALALIGN:
{
- ::rtl::OUString sValue;
+ OUString sValue;
_rControlValue >>= sValue;
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
tools::StringListResource aRes(ModuleRes(RID_STR_VERTICAL_ALIGN_CONST),aList);
- ::std::vector< ::rtl::OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
+ ::std::vector< OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
if ( aFind != aList.end() )
aPropertyValue <<= static_cast<style::VerticalAlignment>(aFind - aList.begin());
}
break;
case PROPERTY_ID_PARAADJUST:
{
- ::rtl::OUString sValue;
+ OUString sValue;
_rControlValue >>= sValue;
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
tools::StringListResource aRes(ModuleRes(RID_STR_PARAADJUST_CONST),aList);
- ::std::vector< ::rtl::OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
+ ::std::vector< OUString >::iterator aFind = ::std::find(aList.begin(),aList.end(),sValue);
if ( aFind != aList.end() )
aPropertyValue <<= static_cast<sal_Int16>(aFind - aList.begin());
}
@@ -1122,7 +1122,7 @@ uno::Any SAL_CALL GeometryHandler::convertToPropertyValue(const ::rtl::OUString
return aPropertyValue;
}
-uno::Any SAL_CALL GeometryHandler::convertToControlValue(const ::rtl::OUString & PropertyName, const uno::Any & _rPropertyValue, const uno::Type & _rControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException)
+uno::Any SAL_CALL GeometryHandler::convertToControlValue(const OUString & PropertyName, const uno::Any & _rPropertyValue, const uno::Type & _rControlValueType) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
uno::Any aControlValue( _rPropertyValue );
if ( !aControlValue.hasValue() )
@@ -1139,19 +1139,19 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const ::rtl::OUString &
break;
case PROPERTY_ID_FORCENEWPAGE:
case PROPERTY_ID_NEWROWORCOL:
- aControlValue = getConstantValue(sal_True,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ForceNewPage")),PropertyName);
+ aControlValue = getConstantValue(sal_True,RID_STR_FORCENEWPAGE_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ForceNewPage")),PropertyName);
break;
case PROPERTY_ID_GROUPKEEPTOGETHER:
- aControlValue = getConstantValue(sal_True,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.GroupKeepTogether")),PropertyName);
+ aControlValue = getConstantValue(sal_True,RID_STR_GROUPKEEPTOGETHER_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.GroupKeepTogether")),PropertyName);
break;
case PROPERTY_ID_PAGEHEADEROPTION:
case PROPERTY_ID_PAGEFOOTEROPTION:
- aControlValue = getConstantValue(sal_True,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportPrintOption")),PropertyName);
+ aControlValue = getConstantValue(sal_True,RID_STR_REPORTPRINTOPTION_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.ReportPrintOption")),PropertyName);
break;
case PROPERTY_ID_KEEPTOGETHER:
if ( uno::Reference< report::XGroup>(m_xReportComponent,uno::UNO_QUERY).is())
{
- aControlValue = getConstantValue(sal_True,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName);
+ aControlValue = getConstantValue(sal_True,RID_STR_KEEPTOGETHER_CONST,aPropertyValue,OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.report.KeepTogether")),PropertyName);
break;
}
// run through
@@ -1194,7 +1194,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const ::rtl::OUString &
break;
case PROPERTY_ID_DATAFIELD:
{
- ::rtl::OUString sValue;
+ OUString sValue;
aControlValue >>= sValue;
if ( isDefaultFunction(sValue,sValue) )
aControlValue <<= sValue;
@@ -1227,7 +1227,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const ::rtl::OUString &
break;
case PROPERTY_ID_TYPE:
{
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
tools::StringListResource aRes(ModuleRes(RID_STR_TYPE_CONST),aList);
if ( m_nDataFieldType < aList.size() )
aControlValue <<= aList[m_nDataFieldType];
@@ -1237,7 +1237,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const ::rtl::OUString &
{
style::VerticalAlignment nParagraphVertAlign = style::VerticalAlignment_TOP;
aPropertyValue >>= nParagraphVertAlign;
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
tools::StringListResource aRes(ModuleRes(RID_STR_VERTICAL_ALIGN_CONST),aList);
if ( static_cast<sal_Int16>(nParagraphVertAlign) < static_cast<sal_Int16>(aList.size()) )
aControlValue <<= aList[nParagraphVertAlign];
@@ -1247,7 +1247,7 @@ uno::Any SAL_CALL GeometryHandler::convertToControlValue(const ::rtl::OUString &
{
sal_Int16 nParagraphAdjust = style::ParagraphAdjust_LEFT;
aPropertyValue >>= nParagraphAdjust;
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
tools::StringListResource aRes(ModuleRes(RID_STR_PARAADJUST_CONST),aList);
if ( nParagraphAdjust < static_cast<sal_Int16>(aList.size()) )
aControlValue <<= aList[nParagraphAdjust];
@@ -1287,7 +1287,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie
aNewProps.reserve(20); // only a guess
m_pInfoService->getExcludeProperties( aNewProps, m_xFormComponentHandler );
- const ::rtl::OUString pIncludeProperties[] =
+ const OUString pIncludeProperties[] =
{
PROPERTY_FORCENEWPAGE
,PROPERTY_KEEPTOGETHER
@@ -1302,7 +1302,7 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie
,PROPERTY_VISIBLE
,PROPERTY_PAGEHEADEROPTION
,PROPERTY_PAGEFOOTEROPTION
- ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlLabel"))
+ ,OUString(RTL_CONSTASCII_USTRINGPARAM("ControlLabel"))
,PROPERTY_POSITIONX
,PROPERTY_POSITIONY
,PROPERTY_WIDTH
@@ -1359,14 +1359,14 @@ uno::Sequence< beans::Property > SAL_CALL GeometryHandler::getSupportedPropertie
return uno::Sequence< beans::Property > (&(*aNewProps.begin()),aNewProps.size());
}
-uno::Sequence< ::rtl::OUString > SAL_CALL GeometryHandler::getSupersededProperties() throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL GeometryHandler::getSupersededProperties() throw (uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aRet;
+ uno::Sequence< OUString > aRet;
const uno::Reference<report::XReportDefinition> xReport(m_xReportComponent,uno::UNO_QUERY);
if ( xReport.is() && !uno::Reference< report::XSection>(xReport->getParent(),uno::UNO_QUERY).is() )
{
aRet.realloc(5);
- ::rtl::OUString* pIter = aRet.getArray();
+ OUString* pIter = aRet.getArray();
*pIter++ = PROPERTY_POSITIONX;
*pIter++ = PROPERTY_POSITIONY;
*pIter++ = PROPERTY_WIDTH;
@@ -1376,11 +1376,11 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GeometryHandler::getSupersededProperti
return aRet;
}
-uno::Sequence< ::rtl::OUString > SAL_CALL GeometryHandler::getActuatingProperties() throw (uno::RuntimeException)
+uno::Sequence< OUString > SAL_CALL GeometryHandler::getActuatingProperties() throw (uno::RuntimeException)
{
::osl::MutexGuard aGuard( m_aMutex );
- uno::Sequence< ::rtl::OUString > aSeq(5);
+ uno::Sequence< OUString > aSeq(5);
aSeq[0] = PROPERTY_BACKTRANSPARENT;
aSeq[1] = PROPERTY_CONTROLBACKGROUNDTRANSPARENT;
aSeq[2] = PROPERTY_FORMULALIST;
@@ -1390,12 +1390,12 @@ uno::Sequence< ::rtl::OUString > SAL_CALL GeometryHandler::getActuatingPropertie
return ::comphelper::concatSequences(m_xFormComponentHandler->getActuatingProperties(),aSeq);
}
-::sal_Bool SAL_CALL GeometryHandler::isComposable(const ::rtl::OUString & _rPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException)
+::sal_Bool SAL_CALL GeometryHandler::isComposable(const OUString & _rPropertyName) throw (uno::RuntimeException, beans::UnknownPropertyException)
{
return m_pInfoService->isComposable( _rPropertyName, m_xFormComponentHandler );
}
-inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePropertySelection(const ::rtl::OUString & PropertyName, ::sal_Bool Primary, uno::Any & _rData, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException)
+inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePropertySelection(const OUString & PropertyName, ::sal_Bool Primary, uno::Any & _rData, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI) throw (uno::RuntimeException, beans::UnknownPropertyException, lang::NullPointerException)
{
if ( !_rxInspectorUI.is() )
throw lang::NullPointerException();
@@ -1404,7 +1404,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
::osl::ClearableMutexGuard aGuard( m_aMutex );
inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
- ::rtl::OUString sClause;
+ OUString sClause;
if ( impl_dialogFilter_nothrow( sClause, aGuard ) )
{
_rData <<= sClause;
@@ -1417,7 +1417,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
::osl::ClearableMutexGuard aGuard( m_aMutex );
inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
const uno::Reference< report::XReportControlFormat> xReportControlFormat(m_xReportComponent,uno::UNO_QUERY);
aGuard.clear();
@@ -1437,9 +1437,9 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
::osl::ClearableMutexGuard aGuard( m_aMutex );
- ::rtl::OUString sFormula;
+ OUString sFormula;
m_xReportComponent->getPropertyValue(PropertyName) >>= sFormula;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
uno::Reference< uno::XComponentContext > xContext = m_xContext;
uno::Reference< beans::XPropertySet > xRowSet( m_xRowSet,uno::UNO_QUERY);
aGuard.clear();
@@ -1457,7 +1457,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
::osl::ClearableMutexGuard aGuard( m_aMutex );
inspection::InteractiveSelectionResult eResult = inspection::InteractiveSelectionResult_Cancelled;
- const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ const uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
const uno::Reference< report::XShape> xShape(m_xReportComponent,uno::UNO_QUERY);
aGuard.clear();
@@ -1476,7 +1476,7 @@ inspection::InteractiveSelectionResult SAL_CALL GeometryHandler::onInteractivePr
return m_xFormComponentHandler->onInteractivePropertySelection(PropertyName, Primary, _rData, _rxInspectorUI);
}
-void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI, ::sal_Bool _bFirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException)
+void SAL_CALL GeometryHandler::actuatingPropertyChanged(const OUString & ActuatingPropertyName, const uno::Any & NewValue, const uno::Any & OldValue, const uno::Reference< inspection::XObjectInspectorUI > & _rxInspectorUI, ::sal_Bool _bFirstTimeInit) throw (uno::RuntimeException, lang::NullPointerException)
{
if ( !_rxInspectorUI.is() )
throw lang::NullPointerException();
@@ -1525,7 +1525,7 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString &
sal_Bool bEnable = (m_nDataFieldType != DATA_OR_FORMULA && m_nDataFieldType != COUNTER );
if ( bEnable )
{
- ::rtl::OUString sValue;
+ OUString sValue;
m_xReportComponent->getPropertyValue( PROPERTY_DATAFIELD ) >>= sValue;
bEnable = !sValue.isEmpty();
}
@@ -1564,9 +1564,9 @@ void SAL_CALL GeometryHandler::actuatingPropertyChanged(const ::rtl::OUString &
return m_xFormComponentHandler->suspend(Suspend);
}
// -----------------------------------------------------------------------------
-bool GeometryHandler::impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
+bool GeometryHandler::impl_dialogFilter_nothrow( OUString& _out_rSelectedClause, ::osl::ClearableMutexGuard& _rClearBeforeDialog ) const
{
- _out_rSelectedClause = ::rtl::OUString();
+ _out_rSelectedClause = OUString();
bool bSuccess = false;
::dbtools::SQLExceptionInfo aErrorInfo;
uno::Reference< awt::XWindow > xInspectorWindow;
@@ -1574,15 +1574,15 @@ bool GeometryHandler::impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelected
try
{
xFactory = m_xContext->getServiceManager();
- xInspectorWindow.set(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
- uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY);
+ xInspectorWindow.set(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY);
if ( !xCon.is() )
return false;
uno::Reference< beans::XPropertySet> xRowSetProp(m_xRowSet,uno::UNO_QUERY);
if ( !m_xRowSet.is() )
{
- m_xRowSet.set(xFactory->createInstanceWithContext(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RowSet")),m_xContext),uno::UNO_QUERY);
+ m_xRowSet.set(xFactory->createInstanceWithContext(OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdb.RowSet")),m_xContext),uno::UNO_QUERY);
xRowSetProp.set(m_xRowSet,uno::UNO_QUERY);
xRowSetProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,uno::makeAny(xCon));
::comphelper::copyProperties(m_xReportComponent,xRowSetProp);
@@ -1598,7 +1598,7 @@ bool GeometryHandler::impl_dialogFilter_nothrow( ::rtl::OUString& _out_rSelected
uno::Reference< ui::dialogs::XExecutableDialog > xDialog = sdb::FilterDialog::createWithQuery(m_xContext, xComposer, m_xRowSet, xInspectorWindow);
const String aGcc3WorkaroundTemporary( ModuleRes(RID_STR_FILTER));
- const ::rtl::OUString sPropertyUIName( aGcc3WorkaroundTemporary );
+ const OUString sPropertyUIName( aGcc3WorkaroundTemporary );
// initialize the dialog
xDialog->setTitle( sPropertyUIName );
@@ -1649,7 +1649,7 @@ void GeometryHandler::checkPosAndSize( const awt::Point& _aNewPos,
}
}
// -----------------------------------------------------------------------------
-void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const
+void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< OUString >& _out_rList) const
{
if ( m_nDataFieldType == FUNCTION )
::std::transform(m_aDefaultFunctions.begin(),m_aDefaultFunctions.end(),::std::back_inserter(_out_rList),::boost::bind( &DefaultFunction::getName, _1 ));
@@ -1657,29 +1657,29 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUStrin
::std::transform(m_aFunctionNames.begin(),m_aFunctionNames.end(),::std::back_inserter(_out_rList),::o3tl::select1st<TFunctions::value_type>());
}
// -----------------------------------------------------------------------------
-::rtl::OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const ::rtl::OUString& _sUIName) const
+OUString GeometryHandler::impl_ConvertUIToMimeType_nothrow(const OUString& _sUIName) const
{
- ::std::vector< ::rtl::OUString > aList;
+ ::std::vector< OUString > aList;
impl_fillMimeTypes_nothrow(aList);
- ::rtl::OUString sRet;
- ::std::vector< ::rtl::OUString >::const_iterator aFind = ::std::find(aList.begin(),aList.end(),_sUIName);
+ OUString sRet;
+ ::std::vector< OUString >::const_iterator aFind = ::std::find(aList.begin(),aList.end(),_sUIName);
if ( aFind != aList.end() )
{
const sal_Size nPos = aFind - aList.begin();
const uno::Reference< report::XReportDefinition> xReportDefinition(m_xReportComponent,uno::UNO_QUERY);
if ( xReportDefinition.is() )
{
- const uno::Sequence< ::rtl::OUString > aMimeTypes( xReportDefinition->getAvailableMimeTypes() );
+ const uno::Sequence< OUString > aMimeTypes( xReportDefinition->getAvailableMimeTypes() );
sRet = aMimeTypes[nPos];
}
}
return sRet;
}
// -----------------------------------------------------------------------------
-::rtl::OUString GeometryHandler::impl_ConvertMimeTypeToUI_nothrow(const ::rtl::OUString& _sMimetype) const
+OUString GeometryHandler::impl_ConvertMimeTypeToUI_nothrow(const OUString& _sMimetype) const
{
::comphelper::MimeConfigurationHelper aMimeHelper(m_xContext);
- ::rtl::OUString sRet;
+ OUString sRet;
const SfxFilter* pFilter = SfxFilter::GetDefaultFilter( aMimeHelper.GetDocServiceNameFromMediaType(_sMimetype) );
if ( pFilter )
sRet = pFilter->GetUIName();
@@ -1688,19 +1688,19 @@ void GeometryHandler::impl_fillFormulaList_nothrow(::std::vector< ::rtl::OUStrin
return sRet;
}
// -----------------------------------------------------------------------------
-void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const
+void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< OUString >& _out_rList) const
{
try
{
const uno::Reference< report::XReportDefinition> xReportDefinition(m_xReportComponent,uno::UNO_QUERY);
if ( xReportDefinition.is() )
{
- uno::Sequence< ::rtl::OUString > aMimeTypes( xReportDefinition->getAvailableMimeTypes() );
- const ::rtl::OUString* pIter = aMimeTypes.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aMimeTypes.getLength();
+ uno::Sequence< OUString > aMimeTypes( xReportDefinition->getAvailableMimeTypes() );
+ const OUString* pIter = aMimeTypes.getConstArray();
+ const OUString* pEnd = pIter + aMimeTypes.getLength();
for(;pIter != pEnd; ++pIter)
{
- const ::rtl::OUString sDocName( impl_ConvertMimeTypeToUI_nothrow(*pIter) );
+ const OUString sDocName( impl_ConvertMimeTypeToUI_nothrow(*pIter) );
if ( !sDocName.isEmpty() )
_out_rList.push_back(sDocName);
}
@@ -1712,7 +1712,7 @@ void GeometryHandler::impl_fillMimeTypes_nothrow(::std::vector< ::rtl::OUString
}
}
// -----------------------------------------------------------------------------
-void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString >& _out_rList) const
+void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< OUString >& _out_rList) const
{
try
{
@@ -1744,7 +1744,7 @@ void GeometryHandler::impl_fillScopeList_nothrow(::std::vector< ::rtl::OUString
}
}
// -----------------------------------------------------------------------------
-uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::rtl::OUString& _rsNamePostFix)
+uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(OUString& _rsNamePostFix)
{
uno::Reference< report::XFunctionsSupplier> xReturn;
@@ -1797,7 +1797,7 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r
const uno::Reference< report::XGroup> xGroup(xGroups->getByIndex(i),uno::UNO_QUERY_THROW);
String sGroupName = String(ModuleRes(RID_STR_SCOPE_GROUP));
sGroupName.SearchAndReplaceAscii("%1",xGroup->getExpression());
- if ( m_sScope == ::rtl::OUString(sGroupName) )
+ if ( m_sScope == OUString(sGroupName) )
{
_rsNamePostFix = xGroup->getExpression();
xReturn = xGroup.get();
@@ -1811,8 +1811,8 @@ uno::Reference< report::XFunctionsSupplier> GeometryHandler::fillScope_throw(::r
return xReturn;
}
// -----------------------------------------------------------------------------
-sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunction
- ,::rtl::OUString& _rDataField
+sal_Bool GeometryHandler::isDefaultFunction( const OUString& _sQuotedFunction
+ ,OUString& _rDataField
,const uno::Reference< report::XFunctionsSupplier>& _xFunctionsSupplier
,bool _bSet) const
{
@@ -1828,10 +1828,10 @@ sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunc
{
if ( !_xFunctionsSupplier.is() || _xFunctionsSupplier == aFind.first->second.second )
{
- const beans::Optional< ::rtl::OUString> aInitalFormula = aFind.first->second.first->getInitialFormula();
+ const beans::Optional< OUString> aInitalFormula = aFind.first->second.first->getInitialFormula();
if ( aInitalFormula.IsPresent )
{
- ::rtl::OUString sDefaultFunctionName;
+ OUString sDefaultFunctionName;
bDefaultFunction = impl_isDefaultFunction_nothrow(aFind.first->second.first,_rDataField,sDefaultFunctionName);
if ( bDefaultFunction )
{
@@ -1864,8 +1864,8 @@ sal_Bool GeometryHandler::isDefaultFunction( const ::rtl::OUString& _sQuotedFunc
}
// -----------------------------------------------------------------------------
sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference< report::XFunction>& _xFunction
- ,::rtl::OUString& _rDataField
- ,::rtl::OUString& _rsDefaultFunctionName) const
+ ,OUString& _rDataField
+ ,OUString& _rsDefaultFunctionName) const
{
sal_Bool bDefaultFunction = sal_False;
try
@@ -1884,7 +1884,7 @@ sal_Bool GeometryHandler::impl_isDefaultFunction_nothrow( const uno::Reference<
xub_StrLen end = sFormula.Len();
if ( aTextSearch.SearchFrwrd(sFormula,&start,&end) && start == 0 && end == sFormula.Len()) // default function found
{
- aSearchOptions.searchString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"));
+ aSearchOptions.searchString = OUString(RTL_CONSTASCII_USTRINGPARAM("\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"));
utl::TextSearch aDataSearch(aSearchOptions);
aDataSearch.SearchFrwrd(sFormula,&start,&end );
++start;
@@ -1910,10 +1910,10 @@ void GeometryHandler::loadDefaultFunctions()
m_aCounterFunction.m_bPreEvaluated = sal_False;
m_aCounterFunction.m_bDeepTraversing = sal_False;
m_aCounterFunction.m_sName = String(ModuleRes(RID_STR_F_COUNTER));
- m_aCounterFunction.m_sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%FunctionName] + 1"));
- m_aCounterFunction.m_sSearchString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*"));
+ m_aCounterFunction.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%FunctionName] + 1"));
+ m_aCounterFunction.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*[:digit:]*"));
m_aCounterFunction.m_sInitialFormula.IsPresent = sal_True;
- m_aCounterFunction.m_sInitialFormula.Value = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1"));
+ m_aCounterFunction.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:1"));
DefaultFunction aDefault;
aDefault.m_bDeepTraversing = sal_False;
@@ -1921,33 +1921,33 @@ void GeometryHandler::loadDefaultFunctions()
aDefault.m_bPreEvaluated = sal_True;
aDefault.m_sName = String(ModuleRes(RID_STR_F_ACCUMULATION));
- aDefault.m_sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column] + [%FunctionName]"));
- aDefault.m_sSearchString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"));
+ aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column] + [%FunctionName]"));
+ aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:\\[[:alpha:]+([:space:]*[:alnum:]*)*\\][:space:]*\\+[:space:]*\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]"));
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
+ aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
m_aDefaultFunctions.push_back(aDefault);
aDefault.m_sName = String(ModuleRes(RID_STR_F_MINIMUM));
- aDefault.m_sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])"));
- aDefault.m_sSearchString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"));
+ aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] < [%FunctionName];[%Column];[%FunctionName])"));
+ aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*<[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"));
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
+ aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
m_aDefaultFunctions.push_back(aDefault);
aDefault.m_sName = String(ModuleRes(RID_STR_F_MAXIMUM));
- aDefault.m_sFormula = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])"));
- aDefault.m_sSearchString = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"));
+ aDefault.m_sFormula = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF([%Column] > [%FunctionName];[%Column];[%FunctionName])"));
+ aDefault.m_sSearchString = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:IF\\((\\[[:alpha:]+([:space:]*[:alnum:]*)*\\])[:space:]*>[:space:]*(\\[[:alpha:]+([:space:]*[:alnum:]*)*\\]);[:space:]*\\1[:space:]*;[:space:]*\\3[:space:]*\\)"));
aDefault.m_sInitialFormula.IsPresent = sal_True;
- aDefault.m_sInitialFormula.Value = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
+ aDefault.m_sInitialFormula.Value = OUString(RTL_CONSTASCII_USTRINGPARAM("rpt:[%Column]"));
m_aDefaultFunctions.push_back(aDefault);
}
}
// -----------------------------------------------------------------------------
-void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const ::rtl::OUString& _sFunction,const ::rtl::OUString& _sDataField)
+void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard ,const OUString& _sFunction,const OUString& _sDataField)
{
try
{
- ::rtl::OUString sNamePostFix;
+ OUString sNamePostFix;
const uno::Reference< report::XFunctionsSupplier> xFunctionsSupplier = fillScope_throw(sNamePostFix);
::std::vector< DefaultFunction >::const_iterator aIter = m_aDefaultFunctions.begin();
@@ -1956,8 +1956,8 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard
{
if ( aIter->m_sName == _sFunction )
{
- const ::rtl::OUString sFunctionName( _sFunction + _sDataField + sNamePostFix);
- const ::rtl::OUString sQuotedFunctionName(lcl_getQuotedFunctionName(sFunctionName));
+ const OUString sFunctionName( _sFunction + _sDataField + sNamePostFix);
+ const OUString sQuotedFunctionName(lcl_getQuotedFunctionName(sFunctionName));
beans::PropertyChangeEvent aEvent;
aEvent.PropertyName = PROPERTY_SCOPE;
@@ -1969,7 +1969,7 @@ void GeometryHandler::createDefaultFunction(::osl::ResettableMutexGuard& _aGuard
if ( xFunctionsSupplier == aFind.first->second.second )
{
m_xFunction = aFind.first->second.first;
- ::rtl::OUString sTemp;
+ OUString sTemp;
isDefaultFunction(sQuotedFunctionName,sTemp,uno::Reference< report::XFunctionsSupplier>(),true); // implicitly sets the m_sScope
break;
}
@@ -1997,7 +1997,7 @@ void GeometryHandler::removeFunction()
{
if ( m_xFunction.is() )
{
- const ::rtl::OUString sQuotedFunctionName(lcl_getQuotedFunctionName(m_xFunction));
+ const OUString sQuotedFunctionName(lcl_getQuotedFunctionName(m_xFunction));
::std::pair<TFunctions::iterator,TFunctions::iterator> aFind = m_aFunctionNames.equal_range(sQuotedFunctionName);
while ( aFind.first != aFind.second )
{
@@ -2014,10 +2014,10 @@ void GeometryHandler::removeFunction()
}
}
// -----------------------------------------------------------------------------
-void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const ::rtl::OUString& _sOldFunctionName,const ::rtl::OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType)
+void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,const OUString& _sOldFunctionName,const OUString& _sOldScope,const sal_uInt32 _nOldDataFieldType)
{
- const ::rtl::OUString sNewFunction = m_sDefaultFunction;
- const ::rtl::OUString sNewScope = m_sScope;
+ const OUString sNewFunction = m_sDefaultFunction;
+ const OUString sNewScope = m_sScope;
const sal_uInt32 nNewDataFieldType = m_nDataFieldType;
_aGuard.clear();
if ( _nOldDataFieldType != nNewDataFieldType )
@@ -2049,12 +2049,12 @@ void GeometryHandler::resetOwnProperties(::osl::ResettableMutexGuard& _aGuard,co
_aGuard.reset();
}
//------------------------------------------------------------------------
-void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< ::rtl::OUString >& _rFieldNames ) const
+void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< OUString >& _rFieldNames ) const
{
_rFieldNames.realloc(0);
try
{
- uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
+ uno::Reference< awt::XWindow> xInspectorWindow(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("DialogParentWindow"))) ,uno::UNO_QUERY);
Window* pInspectorWindow = VCLUnoHelper::GetWindow( xInspectorWindow );
WaitObject aWaitCursor( pInspectorWindow );
@@ -2065,10 +2065,10 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< ::rtl::OUString
if ( !xFormSet.is() )
return;
- ::rtl::OUString sObjectName;
+ OUString sObjectName;
OSL_VERIFY( xFormSet->getPropertyValue( PROPERTY_COMMAND ) >>= sObjectName );
// when there is no command we don't need to ask for columns
- uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY);
+ uno::Reference<sdbc::XConnection> xCon(m_xContext->getValueByName( OUString(RTL_CONSTASCII_USTRINGPARAM("ActiveConnection"))) ,uno::UNO_QUERY);
if ( !sObjectName.isEmpty() && xCon.is() )
{
sal_Int32 nObjectType = sdb::CommandType::COMMAND;
@@ -2083,12 +2083,12 @@ void GeometryHandler::impl_initFieldList_nothrow( uno::Sequence< ::rtl::OUString
}
}
// -----------------------------------------------------------------------------
-bool GeometryHandler::impl_isCounterFunction_throw(const ::rtl::OUString& _sQuotedFunctionName,::rtl::OUString& _Out_sScope) const
+bool GeometryHandler::impl_isCounterFunction_throw(const OUString& _sQuotedFunctionName,OUString& _Out_sScope) const
{
::std::pair<TFunctions::const_iterator,TFunctions::const_iterator> aFind = m_aFunctionNames.equal_range(_sQuotedFunctionName);
while ( aFind.first != aFind.second )
{
- const beans::Optional< ::rtl::OUString> aInitalFormula = aFind.first->second.first->getInitialFormula();
+ const beans::Optional< OUString> aInitalFormula = aFind.first->second.first->getInitialFormula();
if ( aInitalFormula.IsPresent )
{
const String sFormula( aFind.first->second.first->getFormula() );
@@ -2118,12 +2118,12 @@ bool GeometryHandler::impl_isCounterFunction_throw(const ::rtl::OUString& _sQuot
return aFind.first != aFind.second;
}
// -----------------------------------------------------------------------------
-void GeometryHandler::impl_createFunction(const ::rtl::OUString& _sFunctionName,const ::rtl::OUString& _sDataField,const DefaultFunction& _aFunction)
+void GeometryHandler::impl_createFunction(const OUString& _sFunctionName,const OUString& _sDataField,const DefaultFunction& _aFunction)
{
if ( m_bNewFunction )
removeFunction();
- const ::rtl::OUString sQuotedFunctionName(lcl_getQuotedFunctionName(_sFunctionName));
+ const OUString sQuotedFunctionName(lcl_getQuotedFunctionName(_sFunctionName));
m_xFunction.set(report::Function::create(m_xContext));
m_xFunction->setName( _sFunctionName );
@@ -2138,14 +2138,14 @@ void GeometryHandler::impl_createFunction(const ::rtl::OUString& _sFunctionName,
m_xFunction->setDeepTraversing(_aFunction.m_bDeepTraversing);
if ( _aFunction.m_sInitialFormula.IsPresent )
{
- beans::Optional< ::rtl::OUString> aInitialFormula = _aFunction.m_sInitialFormula;
+ beans::Optional< OUString> aInitialFormula = _aFunction.m_sInitialFormula;
String sInitialFormula = aInitialFormula.Value;
sInitialFormula.SearchAndReplaceAll(sPlaceHolder1,_sDataField);
sInitialFormula.SearchAndReplaceAll(sPlaceHolder2,_sFunctionName);
aInitialFormula.Value = sInitialFormula;
m_xFunction->setInitialFormula( aInitialFormula );
}
- ::rtl::OUString sNamePostFix;
+ OUString sNamePostFix;
const uno::Reference< report::XFunctionsSupplier> xFunctionsSupplier = fillScope_throw(sNamePostFix);
const uno::Reference< container::XIndexContainer> xFunctions(xFunctionsSupplier->getFunctions(),uno::UNO_QUERY_THROW);
xFunctions->insertByIndex(xFunctions->getCount(),uno::makeAny(m_xFunction));
@@ -2155,23 +2155,23 @@ void GeometryHandler::impl_createFunction(const ::rtl::OUString& _sFunctionName,
// -----------------------------------------------------------------------------
void GeometryHandler::impl_setCounterFunction_throw()
{
- ::rtl::OUString sNamePostFix;
+ OUString sNamePostFix;
fillScope_throw(sNamePostFix);
- ::rtl::OUString sFunctionName = m_aCounterFunction.m_sName;
+ OUString sFunctionName = m_aCounterFunction.m_sName;
sFunctionName += sNamePostFix;
- const ::rtl::OUString sQuotedFunctionName = lcl_getQuotedFunctionName(sFunctionName);
- ::rtl::OUString sScope;
+ const OUString sQuotedFunctionName = lcl_getQuotedFunctionName(sFunctionName);
+ OUString sScope;
if ( !(!sFunctionName.isEmpty() && m_aFunctionNames.find(sQuotedFunctionName) != m_aFunctionNames.end() && impl_isCounterFunction_throw(sQuotedFunctionName,sScope)) )
- impl_createFunction(sFunctionName,::rtl::OUString(),m_aCounterFunction);
+ impl_createFunction(sFunctionName,OUString(),m_aCounterFunction);
OBlocker aBlocker(m_bIn);
m_xReportComponent->setPropertyValue(PROPERTY_DATAFIELD,uno::makeAny(impl_convertToFormula( uno::makeAny(sQuotedFunctionName))));
}
// -----------------------------------------------------------------------------
-sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const ::rtl::OUString& _sDataField) const
+sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const OUString& _sDataField) const
{
sal_uInt32 nDataFieldType = UNDEF_DATA;
- ::rtl::OUString sDataField;
+ OUString sDataField;
if ( !_sDataField.isEmpty() )
sDataField = _sDataField;
else
@@ -2190,7 +2190,7 @@ sal_uInt32 GeometryHandler::impl_getDataFieldType_throw(const ::rtl::OUString& _
else if ( m_aFunctionNames.find(sDataField) != m_aFunctionNames.end() )
{
nDataFieldType = USER_DEF_FUNCTION;
- ::rtl::OUString sScope;
+ OUString sScope;
if ( impl_isCounterFunction_throw(sDataField,sScope) )
nDataFieldType = COUNTER;
}
@@ -2211,15 +2211,15 @@ void SAL_CALL GeometryHandler::propertyChange(const beans::PropertyChangeEvent&
if ( !m_bIn )
{
const sal_uInt32 nOldDataFieldType = m_nDataFieldType;
- const ::rtl::OUString sOldFunctionName = m_sDefaultFunction;
- const ::rtl::OUString sOldScope = m_sScope;
- m_sDefaultFunction = m_sScope = ::rtl::OUString();
+ const OUString sOldFunctionName = m_sDefaultFunction;
+ const OUString sOldScope = m_sScope;
+ m_sDefaultFunction = m_sScope = OUString();
m_nDataFieldType = impl_getDataFieldType_throw();
if ( UNDEF_DATA == m_nDataFieldType )
m_nDataFieldType = nOldDataFieldType;
uno::Any aDataField = m_xReportComponent->getPropertyValue( PROPERTY_DATAFIELD );
lcl_convertFormulaTo(aDataField,aDataField);
- ::rtl::OUString sDataField;
+ OUString sDataField;
aDataField >>= sDataField;
switch(m_nDataFieldType)
{
diff --git a/reportdesign/source/ui/inspection/metadata.cxx b/reportdesign/source/ui/inspection/metadata.cxx
index b80d19f78ebf..93f25514cf28 100644
--- a/reportdesign/source/ui/inspection/metadata.cxx
+++ b/reportdesign/source/ui/inspection/metadata.cxx
@@ -47,7 +47,7 @@ namespace rptui
sal_uInt32 nUIFlags;
OPropertyInfoImpl(
- const ::rtl::OUString& rName,
+ const OUString& rName,
sal_Int32 _nId,
const String& aTranslation,
const rtl::OString& _sHelpId,
@@ -55,7 +55,7 @@ namespace rptui
};
//------------------------------------------------------------------------
- OPropertyInfoImpl::OPropertyInfoImpl(const ::rtl::OUString& _rName, sal_Int32 _nId,
+ OPropertyInfoImpl::OPropertyInfoImpl(const OUString& _rName, sal_Int32 _nId,
const String& aString, const rtl::OString& sHid, sal_uInt32 _nUIFlags)
:sName(_rName)
,sTranslation(aString)
@@ -226,7 +226,7 @@ namespace rptui
}
//------------------------------------------------------------------------
- bool OPropertyInfoService::isComposable( const ::rtl::OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxFormComponentHandler )
+ bool OPropertyInfoService::isComposable( const OUString& _rPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _rxFormComponentHandler )
{
sal_Int32 nId = getPropertyId( _rPropertyName );
if ( nId != -1 )
@@ -242,40 +242,40 @@ namespace rptui
void OPropertyInfoService::getExcludeProperties(::std::vector< beans::Property >& _rExcludeProperties,const ::com::sun::star::uno::Reference< ::com::sun::star::inspection::XPropertyHandler >& _xFormComponentHandler)
{
uno::Sequence< beans::Property > aProps = _xFormComponentHandler->getSupportedProperties();
- static const ::rtl::OUString pExcludeProperties[] =
+ static const OUString pExcludeProperties[] =
{
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Printable")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("WordBreak")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLine")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tag")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpText")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HelpURL")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ValueMin")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ValueMax")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Spin")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValue")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValueMin")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValueMax")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultSpinValue")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SpinIncrement")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Repeat")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("RepeatDelay")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("ControlLabel")), /// TODO: has to be checked
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), // comment this out if you want to have title feature for charts
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Enabled")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Printable")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("WordBreak")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("MultiLine")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Tag")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("HelpText")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("HelpURL")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("MaxTextLen")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("ReadOnly")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Tabstop")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("TabIndex")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("ValueMin")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("ValueMax")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Spin")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValue")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValueMin")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SpinValueMax")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("DefaultSpinValue")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SpinIncrement")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Repeat")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("RepeatDelay")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("ControlLabel")), /// TODO: has to be checked
+ OUString(RTL_CONSTASCII_USTRINGPARAM("LabelControl")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("Title")), // comment this out if you want to have title feature for charts
PROPERTY_MAXTEXTLEN,
PROPERTY_EFFECTIVEDEFAULT,
PROPERTY_EFFECTIVEMAX,
PROPERTY_EFFECTIVEMIN,
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("HideInactiveSelection")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitAction")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("InputRequired")),
- ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalAlign")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("HideInactiveSelection")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("SubmitAction")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("InputRequired")),
+ OUString(RTL_CONSTASCII_USTRINGPARAM("VerticalAlign")),
PROPERTY_ALIGN,
PROPERTY_EMPTY_IS_NULL,
PROPERTY_FILTERPROPOSAL
diff --git a/sfx2/source/doc/Metadatable.cxx b/sfx2/source/doc/Metadatable.cxx
index 855429e9a48e..0a9e4a2c59b5 100644
--- a/sfx2/source/doc/Metadatable.cxx
+++ b/sfx2/source/doc/Metadatable.cxx
@@ -115,12 +115,12 @@ static const char s_content [] = "content.xml";
static const char s_styles [] = "styles.xml";
static const char s_prefix [] = "id"; // prefix for generated xml:id
-static bool isContentFile(::rtl::OUString const & i_rPath)
+static bool isContentFile(OUString const & i_rPath)
{
return i_rPath == s_content;
}
-static bool isStylesFile (::rtl::OUString const & i_rPath)
+static bool isStylesFile (OUString const & i_rPath)
{
return i_rPath == s_styles;
}
@@ -178,7 +178,7 @@ public:
true iff the element has successfully been registered
*/
virtual bool TryRegisterMetadatable(Metadatable& i_xObject,
- ::rtl::OUString const& i_rStreamName, ::rtl::OUString const& i_rIdref)
+ OUString const& i_rStreamName, OUString const& i_rIdref)
= 0;
/** unregister an ODF element.
@@ -202,10 +202,10 @@ public:
protected:
virtual bool LookupXmlId(const Metadatable& i_xObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref) const = 0;
+ OUString & o_rStream, OUString & o_rIdref) const = 0;
- virtual Metadatable* LookupElement(const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const = 0;
+ virtual Metadatable* LookupElement(const OUString & i_rStreamName,
+ const OUString & i_rIdref) const = 0;
};
// XmlIdRegistryDocument ---------------------------------------------
@@ -222,7 +222,7 @@ public:
virtual void RegisterMetadatableAndCreateID(Metadatable& i_xObject);
virtual bool TryRegisterMetadatable(Metadatable& i_xObject,
- ::rtl::OUString const& i_rStreamName, ::rtl::OUString const& i_rIdref);
+ OUString const& i_rStreamName, OUString const& i_rIdref);
virtual void UnregisterMetadatable(Metadatable const&);
@@ -242,12 +242,12 @@ public:
// unfortunately public, Metadatable::RegisterAsCopyOf needs this
virtual bool LookupXmlId(const Metadatable& i_xObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref) const;
+ OUString & o_rStream, OUString & o_rIdref) const;
private:
- virtual Metadatable* LookupElement(const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const;
+ virtual Metadatable* LookupElement(const OUString & i_rStreamName,
+ const OUString & i_rIdref) const;
struct XmlIdRegistry_Impl;
::std::auto_ptr<XmlIdRegistry_Impl> m_pImpl;
@@ -316,7 +316,7 @@ public:
virtual void RegisterMetadatableAndCreateID(Metadatable& i_xObject);
virtual bool TryRegisterMetadatable(Metadatable& i_xObject,
- ::rtl::OUString const& i_rStreamName, ::rtl::OUString const& i_rIdref);
+ OUString const& i_rStreamName, OUString const& i_rIdref);
virtual void UnregisterMetadatable(Metadatable const&);
@@ -332,10 +332,10 @@ public:
private:
virtual bool LookupXmlId(const Metadatable& i_xObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref) const;
+ OUString & o_rStream, OUString & o_rIdref) const;
- virtual Metadatable* LookupElement(const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const;
+ virtual Metadatable* LookupElement(const OUString & i_rStreamName,
+ const OUString & i_rIdref) const;
/** create a Clipboard Metadatable for i_rObject. */
::boost::shared_ptr<MetadatableClipboard> CreateClipboard(
@@ -376,8 +376,8 @@ XmlIdRegistry::GetElementByMetadataReference(
beans::StringPair
XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const
{
- ::rtl::OUString path;
- ::rtl::OUString idref;
+ OUString path;
+ OUString idref;
if (LookupXmlId(i_rObject, path, idref))
{
if (LookupElement(path, idref) == &i_rObject)
@@ -391,19 +391,19 @@ XmlIdRegistry::GetXmlIdForElement(const Metadatable& i_rObject) const
/// generate unique xml:id
template< typename T >
-/*static*/ ::rtl::OUString create_id(const
- ::boost::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash > & i_rXmlIdMap)
+/*static*/ OUString create_id(const
+ ::boost::unordered_map< OUString, T, OUStringHash > & i_rXmlIdMap)
{
static rtlRandomPool s_Pool( rtl_random_createPool() );
- const ::rtl::OUString prefix(s_prefix);
- typename ::boost::unordered_map< ::rtl::OUString, T, ::rtl::OUStringHash >
+ const OUString prefix(s_prefix);
+ typename ::boost::unordered_map< OUString, T, OUStringHash >
::const_iterator iter;
- ::rtl::OUString id;
+ OUString id;
do
{
sal_Int32 n;
rtl_random_getBytes(s_Pool, & n, sizeof(n));
- id = prefix + ::rtl::OUString::valueOf(static_cast<sal_Int32>(abs(n)));
+ id = prefix + OUString::valueOf(static_cast<sal_Int32>(abs(n)));
iter = i_rXmlIdMap.find(id);
}
while (iter != i_rXmlIdMap.end());
@@ -417,8 +417,8 @@ template< typename T >
typedef ::std::list< Metadatable* > XmlIdList_t;
/// Idref -> (content.xml element list, styles.xml element list)
-typedef ::boost::unordered_map< ::rtl::OUString,
- ::std::pair< XmlIdList_t, XmlIdList_t >, ::rtl::OUStringHash > XmlIdMap_t;
+typedef ::boost::unordered_map< OUString,
+ ::std::pair< XmlIdList_t, XmlIdList_t >, OUStringHash > XmlIdMap_t;
/// pointer hash template
template<typename T> struct PtrHash
@@ -431,7 +431,7 @@ template<typename T> struct PtrHash
/// element -> (stream name, idref)
typedef ::boost::unordered_map< const Metadatable*,
- ::std::pair< ::rtl::OUString, ::rtl::OUString>, PtrHash<Metadatable> >
+ ::std::pair< OUString, OUString>, PtrHash<Metadatable> >
XmlIdReverseMap_t;
struct XmlIdRegistryDocument::XmlIdRegistry_Impl
@@ -440,21 +440,21 @@ struct XmlIdRegistryDocument::XmlIdRegistry_Impl
: m_XmlIdMap(), m_XmlIdReverseMap() { }
bool TryInsertMetadatable(Metadatable& i_xObject,
- const ::rtl::OUString & i_rStream, const ::rtl::OUString & i_rIdref);
+ const OUString & i_rStream, const OUString & i_rIdref);
bool LookupXmlId(const Metadatable& i_xObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref) const;
+ OUString & o_rStream, OUString & o_rIdref) const;
- Metadatable* LookupElement(const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const;
+ Metadatable* LookupElement(const OUString & i_rStreamName,
+ const OUString & i_rIdref) const;
const XmlIdList_t * LookupElementList(
- const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const;
+ const OUString & i_rStreamName,
+ const OUString & i_rIdref) const;
XmlIdList_t * LookupElementList(
- const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref)
+ const OUString & i_rStreamName,
+ const OUString & i_rIdref)
{
return const_cast<XmlIdList_t*>(
const_cast<const XmlIdRegistry_Impl*>(this)
@@ -469,7 +469,7 @@ struct XmlIdRegistryDocument::XmlIdRegistry_Impl
static void
rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter,
- ::rtl::OUString const & i_rStream, Metadatable const& i_rObject)
+ OUString const & i_rStream, Metadatable const& i_rObject)
{
if (i_rIter != i_rXmlIdMap.end())
{
@@ -487,8 +487,8 @@ rmIter(XmlIdMap_t & i_rXmlIdMap, XmlIdMap_t::iterator const& i_rIter,
const XmlIdList_t *
XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElementList(
- const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const
+ const OUString & i_rStreamName,
+ const OUString & i_rIdref) const
{
const XmlIdMap_t::const_iterator iter( m_XmlIdMap.find(i_rIdref) );
if (iter != m_XmlIdMap.end())
@@ -507,12 +507,12 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElementList(
Metadatable*
XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElement(
- const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const
+ const OUString & i_rStreamName,
+ const OUString & i_rIdref) const
{
if (!isValidXmlId(i_rStreamName, i_rIdref))
{
- throw lang::IllegalArgumentException(::rtl::OUString(
+ throw lang::IllegalArgumentException(OUString(
"illegal XmlId"), 0, 0);
}
@@ -539,7 +539,7 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupElement(
bool
XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupXmlId(
const Metadatable& i_rObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref) const
+ OUString & o_rStream, OUString & o_rIdref) const
{
const XmlIdReverseMap_t::const_iterator iter(
m_XmlIdReverseMap.find(&i_rObject) );
@@ -562,7 +562,7 @@ XmlIdRegistryDocument::XmlIdRegistry_Impl::LookupXmlId(
bool
XmlIdRegistryDocument::XmlIdRegistry_Impl::TryInsertMetadatable(
Metadatable & i_rObject,
- const ::rtl::OUString & i_rStreamName, const ::rtl::OUString & i_rIdref)
+ const OUString & i_rStreamName, const OUString & i_rIdref)
{
const bool bContent( isContentFile(i_rStreamName) );
OSL_ENSURE(isContentFile(i_rStreamName) || isStylesFile(i_rStreamName),
@@ -650,26 +650,26 @@ XmlIdRegistryDocument::~XmlIdRegistryDocument()
bool
XmlIdRegistryDocument::LookupXmlId(
const Metadatable& i_rObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref) const
+ OUString & o_rStream, OUString & o_rIdref) const
{
return m_pImpl->LookupXmlId(i_rObject, o_rStream, o_rIdref);
}
Metadatable*
XmlIdRegistryDocument::LookupElement(
- const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const
+ const OUString & i_rStreamName,
+ const OUString & i_rIdref) const
{
return m_pImpl->LookupElement(i_rStreamName, i_rIdref);
}
bool
XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
- ::rtl::OUString const& i_rStreamName, ::rtl::OUString const& i_rIdref)
+ OUString const& i_rStreamName, OUString const& i_rIdref)
{
OSL_TRACE("TryRegisterMetadatable: %p (%s#%s)\n", &i_rObject,
- ::rtl::OUStringToOString(i_rStreamName, RTL_TEXTENCODING_UTF8).getStr(),
- ::rtl::OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(i_rStreamName, RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8).getStr());
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"TryRegisterMetadatable called for MetadatableUndo?");
@@ -678,19 +678,19 @@ XmlIdRegistryDocument::TryRegisterMetadatable(Metadatable & i_rObject,
if (!isValidXmlId(i_rStreamName, i_rIdref))
{
- throw lang::IllegalArgumentException(::rtl::OUString(
+ throw lang::IllegalArgumentException(OUString(
"illegal XmlId"), 0, 0);
}
if (i_rObject.IsInContent()
? !isContentFile(i_rStreamName)
: !isStylesFile(i_rStreamName))
{
- throw lang::IllegalArgumentException(::rtl::OUString(
+ throw lang::IllegalArgumentException(OUString(
"illegal XmlId: wrong stream"), 0, 0);
}
- ::rtl::OUString old_path;
- ::rtl::OUString old_idref;
+ OUString old_path;
+ OUString old_idref;
m_pImpl->LookupXmlId(i_rObject, old_path, old_idref);
if (old_path == i_rStreamName && old_idref == i_rIdref)
{
@@ -726,11 +726,11 @@ XmlIdRegistryDocument::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
"RegisterMetadatableAndCreateID called for MetadatableClipboard?");
const bool isInContent( i_rObject.IsInContent() );
- const ::rtl::OUString stream( ::rtl::OUString::createFromAscii(
+ const OUString stream( OUString::createFromAscii(
isInContent ? s_content : s_styles ) );
// check if we have a latent xmlid, and if yes, remove it
- ::rtl::OUString old_path;
- ::rtl::OUString old_idref;
+ OUString old_path;
+ OUString old_idref;
m_pImpl->LookupXmlId(i_rObject, old_path, old_idref);
XmlIdMap_t::iterator old_id( m_pImpl->m_XmlIdMap.end() );
@@ -750,7 +750,7 @@ XmlIdRegistryDocument::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
}
// create id
- const ::rtl::OUString id( create_id(m_pImpl->m_XmlIdMap) );
+ const OUString id( create_id(m_pImpl->m_XmlIdMap) );
OSL_ENSURE(m_pImpl->m_XmlIdMap.find(id) == m_pImpl->m_XmlIdMap.end(),
"created id is in use");
m_pImpl->m_XmlIdMap.insert(::std::make_pair(id, isInContent
@@ -763,8 +763,8 @@ void XmlIdRegistryDocument::UnregisterMetadatable(const Metadatable& i_rObject)
{
OSL_TRACE("UnregisterMetadatable: %p", &i_rObject);
- ::rtl::OUString path;
- ::rtl::OUString idref;
+ OUString path;
+ OUString idref;
if (!m_pImpl->LookupXmlId(i_rObject, path, idref))
{
OSL_FAIL("unregister: no xml id?");
@@ -806,8 +806,8 @@ void XmlIdRegistryDocument::RegisterCopy(Metadatable const& i_rSource,
(i_rSource.IsInContent() == i_rCopy.IsInContent()),
"RegisterCopy: not in same stream?");
- ::rtl::OUString path;
- ::rtl::OUString idref;
+ OUString path;
+ OUString idref;
if (!m_pImpl->LookupXmlId( i_rSource, path, idref ))
{
OSL_FAIL("no xml id?");
@@ -869,8 +869,8 @@ XmlIdRegistryDocument::JoinMetadatables(
OSL_TRACE("JoinMetadatables: %p <- %p", &i_rMerged, &i_rOther);
bool mergedOwnsRef;
- ::rtl::OUString path;
- ::rtl::OUString idref;
+ OUString path;
+ OUString idref;
if (m_pImpl->LookupXmlId(i_rMerged, path, idref))
{
mergedOwnsRef = (m_pImpl->LookupElement(path, idref) == &i_rMerged);
@@ -897,14 +897,14 @@ XmlIdRegistryDocument::JoinMetadatables(
struct RMapEntry
{
RMapEntry() : m_pLink() { }
- RMapEntry(::rtl::OUString const& i_rStream,
- ::rtl::OUString const& i_rXmlId,
+ RMapEntry(OUString const& i_rStream,
+ OUString const& i_rXmlId,
::boost::shared_ptr<MetadatableClipboard> const& i_pLink
= ::boost::shared_ptr<MetadatableClipboard>())
: m_Stream(i_rStream), m_XmlId(i_rXmlId), m_pLink(i_pLink)
{}
- ::rtl::OUString m_Stream;
- ::rtl::OUString m_XmlId;
+ OUString m_Stream;
+ OUString m_XmlId;
// this would have been an auto_ptr, if only that would have compiled...
::boost::shared_ptr<MetadatableClipboard> m_pLink;
};
@@ -916,8 +916,8 @@ typedef ::boost::unordered_map< const Metadatable*,
ClipboardXmlIdReverseMap_t;
/// Idref -> (content.xml element, styles.xml element)
-typedef ::boost::unordered_map< ::rtl::OUString,
- ::std::pair< Metadatable*, Metadatable* >, ::rtl::OUStringHash >
+typedef ::boost::unordered_map< OUString,
+ ::std::pair< Metadatable*, Metadatable* >, OUStringHash >
ClipboardXmlIdMap_t;
struct XmlIdRegistryClipboard::XmlIdRegistry_Impl
@@ -926,20 +926,20 @@ struct XmlIdRegistryClipboard::XmlIdRegistry_Impl
: m_XmlIdMap(), m_XmlIdReverseMap() { }
bool TryInsertMetadatable(Metadatable& i_xObject,
- const ::rtl::OUString & i_rStream, const ::rtl::OUString & i_rIdref);
+ const OUString & i_rStream, const OUString & i_rIdref);
bool LookupXmlId(const Metadatable& i_xObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref,
+ OUString & o_rStream, OUString & o_rIdref,
MetadatableClipboard const* &o_rpLink) const;
- Metadatable* LookupElement(const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const;
+ Metadatable* LookupElement(const OUString & i_rStreamName,
+ const OUString & i_rIdref) const;
- Metadatable* const* LookupEntry(const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const;
+ Metadatable* const* LookupEntry(const OUString & i_rStreamName,
+ const OUString & i_rIdref) const;
- Metadatable* * LookupEntry(const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref)
+ Metadatable* * LookupEntry(const OUString & i_rStreamName,
+ const OUString & i_rIdref)
{
return const_cast<Metadatable**>(
const_cast<const XmlIdRegistry_Impl*>(this)
@@ -955,7 +955,7 @@ struct XmlIdRegistryClipboard::XmlIdRegistry_Impl
static void
rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap,
ClipboardXmlIdMap_t::iterator const& i_rIter,
- ::rtl::OUString const & i_rStream, Metadatable const& i_rObject)
+ OUString const & i_rStream, Metadatable const& i_rObject)
{
if (i_rIter != i_rXmlIdMap.end())
{
@@ -976,12 +976,12 @@ rmIter(ClipboardXmlIdMap_t & i_rXmlIdMap,
Metadatable* const*
XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry(
- const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const
+ const OUString & i_rStreamName,
+ const OUString & i_rIdref) const
{
if (!isValidXmlId(i_rStreamName, i_rIdref))
{
- throw lang::IllegalArgumentException(::rtl::OUString(
+ throw lang::IllegalArgumentException(OUString(
"illegal XmlId"), 0, 0);
}
@@ -1002,8 +1002,8 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupEntry(
Metadatable*
XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupElement(
- const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const
+ const OUString & i_rStreamName,
+ const OUString & i_rIdref) const
{
Metadatable * const * ppEntry = LookupEntry(i_rStreamName, i_rIdref);
return ppEntry ? *ppEntry : 0;
@@ -1012,7 +1012,7 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupElement(
bool
XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupXmlId(
const Metadatable& i_rObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref,
+ OUString & o_rStream, OUString & o_rIdref,
MetadatableClipboard const* &o_rpLink) const
{
const ClipboardXmlIdReverseMap_t::const_iterator iter(
@@ -1037,7 +1037,7 @@ XmlIdRegistryClipboard::XmlIdRegistry_Impl::LookupXmlId(
bool
XmlIdRegistryClipboard::XmlIdRegistry_Impl::TryInsertMetadatable(
Metadatable & i_rObject,
- const ::rtl::OUString & i_rStreamName, const ::rtl::OUString & i_rIdref)
+ const OUString & i_rStreamName, const OUString & i_rIdref)
{
bool bContent( isContentFile(i_rStreamName) );
OSL_ENSURE(isContentFile(i_rStreamName) || isStylesFile(i_rStreamName),
@@ -1081,7 +1081,7 @@ XmlIdRegistryClipboard::~XmlIdRegistryClipboard()
bool
XmlIdRegistryClipboard::LookupXmlId(
const Metadatable& i_rObject,
- ::rtl::OUString & o_rStream, ::rtl::OUString & o_rIdref) const
+ OUString & o_rStream, OUString & o_rIdref) const
{
const MetadatableClipboard * pLink;
return m_pImpl->LookupXmlId(i_rObject, o_rStream, o_rIdref, pLink);
@@ -1089,19 +1089,19 @@ XmlIdRegistryClipboard::LookupXmlId(
Metadatable*
XmlIdRegistryClipboard::LookupElement(
- const ::rtl::OUString & i_rStreamName,
- const ::rtl::OUString & i_rIdref) const
+ const OUString & i_rStreamName,
+ const OUString & i_rIdref) const
{
return m_pImpl->LookupElement(i_rStreamName, i_rIdref);
}
bool
XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
- ::rtl::OUString const& i_rStreamName, ::rtl::OUString const& i_rIdref)
+ OUString const& i_rStreamName, OUString const& i_rIdref)
{
OSL_TRACE("TryRegisterMetadatable: %p (%s#%s)\n", &i_rObject,
- ::rtl::OUStringToOString(i_rStreamName, RTL_TEXTENCODING_UTF8).getStr(),
- ::rtl::OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8).getStr());
+ OUStringToOString(i_rStreamName, RTL_TEXTENCODING_UTF8).getStr(),
+ OUStringToOString(i_rIdref, RTL_TEXTENCODING_UTF8).getStr());
OSL_ENSURE(!dynamic_cast<MetadatableUndo*>(&i_rObject),
"TryRegisterMetadatable called for MetadatableUndo?");
@@ -1110,19 +1110,19 @@ XmlIdRegistryClipboard::TryRegisterMetadatable(Metadatable & i_rObject,
if (!isValidXmlId(i_rStreamName, i_rIdref))
{
- throw lang::IllegalArgumentException(::rtl::OUString(
+ throw lang::IllegalArgumentException(OUString(
"illegal XmlId"), 0, 0);
}
if (i_rObject.IsInContent()
? !isContentFile(i_rStreamName)
: !isStylesFile(i_rStreamName))
{
- throw lang::IllegalArgumentException(::rtl::OUString(
+ throw lang::IllegalArgumentException(OUString(
"illegal XmlId: wrong stream"), 0, 0);
}
- ::rtl::OUString old_path;
- ::rtl::OUString old_idref;
+ OUString old_path;
+ OUString old_idref;
const MetadatableClipboard * pLink;
m_pImpl->LookupXmlId(i_rObject, old_path, old_idref, pLink);
if (old_path == i_rStreamName && old_idref == i_rIdref)
@@ -1159,11 +1159,11 @@ XmlIdRegistryClipboard::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
"RegisterMetadatableAndCreateID called for MetadatableClipboard?");
bool isInContent( i_rObject.IsInContent() );
- ::rtl::OUString stream( ::rtl::OUString::createFromAscii(
+ OUString stream( OUString::createFromAscii(
isInContent ? s_content : s_styles ) );
- ::rtl::OUString old_path;
- ::rtl::OUString old_idref;
+ OUString old_path;
+ OUString old_idref;
LookupXmlId(i_rObject, old_path, old_idref);
if (!old_idref.isEmpty() &&
(m_pImpl->LookupElement(old_path, old_idref) == &i_rObject))
@@ -1172,7 +1172,7 @@ XmlIdRegistryClipboard::RegisterMetadatableAndCreateID(Metadatable & i_rObject)
}
// create id
- const ::rtl::OUString id( create_id(m_pImpl->m_XmlIdMap) );
+ const OUString id( create_id(m_pImpl->m_XmlIdMap) );
OSL_ENSURE(m_pImpl->m_XmlIdMap.find(id) == m_pImpl->m_XmlIdMap.end(),
"created id is in use");
m_pImpl->m_XmlIdMap.insert(::std::make_pair(id, isInContent
@@ -1187,8 +1187,8 @@ void XmlIdRegistryClipboard::UnregisterMetadatable(const Metadatable& i_rObject)
{
OSL_TRACE("UnregisterMetadatable: %p", &i_rObject);
- ::rtl::OUString path;
- ::rtl::OUString idref;
+ OUString path;
+ OUString idref;
const MetadatableClipboard * pLink;
if (!m_pImpl->LookupXmlId(i_rObject, path, idref, pLink))
{
@@ -1235,9 +1235,9 @@ XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
{
OSL_TRACE("RegisterCopyClipboard: %p -> "/*"%p"*/"(%s#%s) (%d)\n",
/*&i_rSource,*/ &i_rCopy,
- ::rtl::OUStringToOString(i_rReference.First,
+ OUStringToOString(i_rReference.First,
RTL_TEXTENCODING_UTF8).getStr(),
- ::rtl::OUStringToOString(i_rReference.Second,
+ OUStringToOString(i_rReference.Second,
RTL_TEXTENCODING_UTF8).getStr(),
i_isLatent);
@@ -1247,7 +1247,7 @@ XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
if (!isValidXmlId(i_rReference.First, i_rReference.Second))
{
- throw lang::IllegalArgumentException(::rtl::OUString(
+ throw lang::IllegalArgumentException(OUString(
"illegal XmlId"), 0, 0);
}
@@ -1269,8 +1269,8 @@ XmlIdRegistryClipboard::RegisterCopyClipboard(Metadatable & i_rCopy,
MetadatableClipboard const*
XmlIdRegistryClipboard::SourceLink(Metadatable const& i_rObject)
{
- ::rtl::OUString path;
- ::rtl::OUString idref;
+ OUString path;
+ OUString idref;
const MetadatableClipboard * pLink( 0 );
m_pImpl->LookupXmlId(i_rObject, path, idref, pLink);
return pLink;
@@ -1324,12 +1324,12 @@ Metadatable::SetMetadataReference(
}
else
{
- ::rtl::OUString streamName( i_rReference.First );
+ OUString streamName( i_rReference.First );
if (streamName.isEmpty())
{
// handle empty stream name as auto-detect.
// necessary for importing flat file format.
- streamName = ::rtl::OUString::createFromAscii(
+ streamName = OUString::createFromAscii(
IsInContent() ? s_content : s_styles );
}
XmlIdRegistry & rReg( dynamic_cast<XmlIdRegistry&>( GetRegistry() ) );
@@ -1340,7 +1340,7 @@ Metadatable::SetMetadataReference(
else
{
throw lang::IllegalArgumentException(
- ::rtl::OUString("Metadatable::"
+ OUString("Metadatable::"
"SetMetadataReference: argument is invalid"), /*this*/0, 0);
}
}
@@ -1563,14 +1563,14 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther,
// XMetadatable mixin
// ::com::sun::star::rdf::XNode:
-::rtl::OUString SAL_CALL MetadatableMixin::getStringValue()
+OUString SAL_CALL MetadatableMixin::getStringValue()
throw (::com::sun::star::uno::RuntimeException)
{
return getNamespace() + getLocalName();
}
// ::com::sun::star::rdf::XURI:
-::rtl::OUString SAL_CALL MetadatableMixin::getLocalName()
+OUString SAL_CALL MetadatableMixin::getLocalName()
throw (::com::sun::star::uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -1580,14 +1580,14 @@ Metadatable::JoinMetadatable(Metadatable const & i_rOther,
ensureMetadataReference(); // N.B.: side effect!
mdref = getMetadataReference();
}
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
buf.append(mdref.First);
buf.append(static_cast<sal_Unicode>('#'));
buf.append(mdref.Second);
return buf.makeStringAndClear();
}
-::rtl::OUString SAL_CALL MetadatableMixin::getNamespace()
+OUString SAL_CALL MetadatableMixin::getNamespace()
throw (::com::sun::star::uno::RuntimeException)
{
SolarMutexGuard aGuard;
@@ -1607,7 +1607,7 @@ throw (uno::RuntimeException)
if (!pObject)
{
throw uno::RuntimeException(
- ::rtl::OUString(
+ OUString(
"MetadatableMixin: cannot get core object; not inserted?"),
*this);
}
@@ -1625,7 +1625,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException)
if (!pObject)
{
throw uno::RuntimeException(
- ::rtl::OUString(
+ OUString(
"MetadatableMixin: cannot get core object; not inserted?"),
*this);
}
@@ -1641,7 +1641,7 @@ throw (uno::RuntimeException)
if (!pObject)
{
throw uno::RuntimeException(
- ::rtl::OUString(
+ OUString(
"MetadatableMixin: cannot get core object; not inserted?"),
*this);
}
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index eef17b72bab0..cfecf3ff6283 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -110,7 +110,7 @@
namespace {
/// a list of attribute-lists, where attribute means name and content
-typedef std::vector<std::vector<std::pair<const char*, ::rtl::OUString> > >
+typedef std::vector<std::vector<std::pair<const char*, OUString> > >
AttrVector;
typedef ::cppu::WeakComponentImplHelper6<
@@ -131,90 +131,90 @@ public:
css::uno::Reference< css::uno::XComponentContext > const & context);
// ::com::sun::star::lang::XServiceInfo:
- virtual ::rtl::OUString SAL_CALL getImplementationName()
+ virtual OUString SAL_CALL getImplementationName()
throw (css::uno::RuntimeException);
virtual ::sal_Bool SAL_CALL supportsService(
- const ::rtl::OUString & ServiceName) throw (css::uno::RuntimeException);
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL
+ const OUString & ServiceName) throw (css::uno::RuntimeException);
+ virtual css::uno::Sequence< OUString > SAL_CALL
getSupportedServiceNames() throw (css::uno::RuntimeException);
// ::com::sun::star::lang::XComponent:
virtual void SAL_CALL dispose() throw (css::uno::RuntimeException);
// ::com::sun::star::document::XDocumentProperties:
- virtual ::rtl::OUString SAL_CALL getAuthor()
+ virtual OUString SAL_CALL getAuthor()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setAuthor(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setAuthor(const OUString & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getGenerator()
+ virtual OUString SAL_CALL getGenerator()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setGenerator(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setGenerator(const OUString & the_value)
throw (css::uno::RuntimeException);
virtual css::util::DateTime SAL_CALL getCreationDate()
throw (css::uno::RuntimeException);
virtual void SAL_CALL setCreationDate(const css::util::DateTime & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTitle()
+ virtual OUString SAL_CALL getTitle()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setTitle(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setTitle(const OUString & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getSubject()
+ virtual OUString SAL_CALL getSubject()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setSubject(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setSubject(const OUString & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getDescription()
+ virtual OUString SAL_CALL getDescription()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setDescription(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setDescription(const OUString & the_value)
throw (css::uno::RuntimeException);
- virtual css::uno::Sequence< ::rtl::OUString > SAL_CALL getKeywords()
+ virtual css::uno::Sequence< OUString > SAL_CALL getKeywords()
throw (css::uno::RuntimeException);
virtual void SAL_CALL setKeywords(
- const css::uno::Sequence< ::rtl::OUString > & the_value)
+ const css::uno::Sequence< OUString > & the_value)
throw (css::uno::RuntimeException);
virtual css::lang::Locale SAL_CALL getLanguage()
throw (css::uno::RuntimeException);
virtual void SAL_CALL setLanguage(const css::lang::Locale & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getModifiedBy()
+ virtual OUString SAL_CALL getModifiedBy()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setModifiedBy(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setModifiedBy(const OUString & the_value)
throw (css::uno::RuntimeException);
virtual css::util::DateTime SAL_CALL getModificationDate()
throw (css::uno::RuntimeException);
virtual void SAL_CALL setModificationDate(
const css::util::DateTime & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getPrintedBy()
+ virtual OUString SAL_CALL getPrintedBy()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setPrintedBy(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setPrintedBy(const OUString & the_value)
throw (css::uno::RuntimeException);
virtual css::util::DateTime SAL_CALL getPrintDate()
throw (css::uno::RuntimeException);
virtual void SAL_CALL setPrintDate(const css::util::DateTime & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTemplateName()
+ virtual OUString SAL_CALL getTemplateName()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setTemplateName(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setTemplateName(const OUString & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getTemplateURL()
+ virtual OUString SAL_CALL getTemplateURL()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setTemplateURL(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setTemplateURL(const OUString & the_value)
throw (css::uno::RuntimeException);
virtual css::util::DateTime SAL_CALL getTemplateDate()
throw (css::uno::RuntimeException);
virtual void SAL_CALL setTemplateDate(const css::util::DateTime & the_value)
throw (css::uno::RuntimeException);
- virtual ::rtl::OUString SAL_CALL getAutoloadURL()
+ virtual OUString SAL_CALL getAutoloadURL()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setAutoloadURL(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setAutoloadURL(const OUString & the_value)
throw (css::uno::RuntimeException);
virtual ::sal_Int32 SAL_CALL getAutoloadSecs()
throw (css::uno::RuntimeException);
virtual void SAL_CALL setAutoloadSecs(::sal_Int32 the_value)
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
- virtual ::rtl::OUString SAL_CALL getDefaultTarget()
+ virtual OUString SAL_CALL getDefaultTarget()
throw (css::uno::RuntimeException);
- virtual void SAL_CALL setDefaultTarget(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL setDefaultTarget(const OUString & the_value)
throw (css::uno::RuntimeException);
virtual css::uno::Sequence< css::beans::NamedValue > SAL_CALL
getDocumentStatistics() throw (css::uno::RuntimeException);
@@ -229,7 +229,7 @@ public:
throw (css::uno::RuntimeException);
virtual void SAL_CALL setEditingDuration(::sal_Int32 the_value)
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException);
- virtual void SAL_CALL resetUserData(const ::rtl::OUString & the_value)
+ virtual void SAL_CALL resetUserData(const OUString & the_value)
throw (css::uno::RuntimeException);
virtual css::uno::Reference< css::beans::XPropertyContainer > SAL_CALL
getUserDefinedProperties() throw (css::uno::RuntimeException);
@@ -239,7 +239,7 @@ public:
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException,
css::io::WrongFormatException,
css::lang::WrappedTargetException, css::io::IOException);
- virtual void SAL_CALL loadFromMedium(const ::rtl::OUString & URL,
+ virtual void SAL_CALL loadFromMedium(const OUString & URL,
const css::uno::Sequence< css::beans::PropertyValue > & Medium)
throw (css::uno::RuntimeException,
css::io::WrongFormatException,
@@ -249,7 +249,7 @@ public:
const css::uno::Sequence< css::beans::PropertyValue > & Medium)
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException,
css::lang::WrappedTargetException, css::io::IOException);
- virtual void SAL_CALL storeToMedium(const ::rtl::OUString & URL,
+ virtual void SAL_CALL storeToMedium(const OUString & URL,
const css::uno::Sequence< css::beans::PropertyValue > & Medium)
throw (css::uno::RuntimeException,
css::lang::WrappedTargetException, css::io::IOException);
@@ -302,21 +302,21 @@ protected:
/// meta-data super node in the meta-data DOM tree
css::uno::Reference< css::xml::dom::XNode> m_xParent;
/// standard meta data (single occurrence)
- std::map< ::rtl::OUString, css::uno::Reference<css::xml::dom::XNode> >
+ std::map< OUString, css::uno::Reference<css::xml::dom::XNode> >
m_meta;
/// standard meta data (multiple occurrences)
- std::map< ::rtl::OUString,
+ std::map< OUString,
std::vector<css::uno::Reference<css::xml::dom::XNode> > > m_metaList;
/// user-defined meta data (meta:user-defined) @ATTENTION may be null!
css::uno::Reference<css::beans::XPropertyContainer> m_xUserDefined;
// now for some meta-data attributes; these are not updated directly in the
// DOM because updates (detecting "empty" elements) would be quite messy
- ::rtl::OUString m_TemplateName;
- ::rtl::OUString m_TemplateURL;
+ OUString m_TemplateName;
+ OUString m_TemplateURL;
css::util::DateTime m_TemplateDate;
- ::rtl::OUString m_AutoloadURL;
+ OUString m_AutoloadURL;
sal_Int32 m_AutoloadSecs;
- ::rtl::OUString m_DefaultTarget;
+ OUString m_DefaultTarget;
/// check if we are initialized properly
void SAL_CALL checkInit() const;
@@ -324,7 +324,7 @@ protected:
void SAL_CALL init(css::uno::Reference<css::xml::dom::XDocument> i_xDom);
/// update element in DOM tree
void SAL_CALL updateElement(const char *i_name,
- std::vector<std::pair<const char *, ::rtl::OUString> >* i_pAttrs = 0);
+ std::vector<std::pair<const char *, OUString> >* i_pAttrs = 0);
/// update user-defined meta data and attributes in DOM tree
void SAL_CALL updateUserDefinedAndAttributes();
/// create empty DOM tree (XDocument)
@@ -333,22 +333,22 @@ protected:
css::uno::Reference<css::beans::XPropertySet> SAL_CALL getURLProperties(
const css::uno::Sequence<css::beans::PropertyValue> & i_rMedium) const;
/// get text of standard meta data element
- ::rtl::OUString SAL_CALL getMetaText(const char* i_name) const;
+ OUString SAL_CALL getMetaText(const char* i_name) const;
/// set text of standard meta data element iff not equal to existing text
bool SAL_CALL setMetaText(const char* i_name,
- const ::rtl::OUString & i_rValue);
+ const OUString & i_rValue);
/// set text of standard meta data element iff not equal to existing text
void SAL_CALL setMetaTextAndNotify(const char* i_name,
- const ::rtl::OUString & i_rValue);
+ const OUString & i_rValue);
/// get text of standard meta data element's attribute
- ::rtl::OUString SAL_CALL getMetaAttr(const char* i_name,
+ OUString SAL_CALL getMetaAttr(const char* i_name,
const char* i_attr) const;
/// get text of a list of standard meta data elements (multiple occ.)
- css::uno::Sequence< ::rtl::OUString > SAL_CALL getMetaList(
+ css::uno::Sequence< OUString > SAL_CALL getMetaList(
const char* i_name) const;
/// set text of a list of standard meta data elements (multiple occ.)
bool SAL_CALL setMetaList(const char* i_name,
- const css::uno::Sequence< ::rtl::OUString > & i_rValue,
+ const css::uno::Sequence< OUString > & i_rValue,
AttrVector const* = 0);
void createUserDefined();
};
@@ -365,20 +365,20 @@ protected:
public:
CompatWriterDocPropsImpl( css::uno::Reference< css::uno::XComponentContext > const & context) : CompatWriterDocPropsImpl_BASE( context ) {}
// XCompatWriterDocPropsImpl
- virtual ::rtl::OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException) { return msManager; }
- virtual void SAL_CALL setManager( const ::rtl::OUString& _manager ) throw (::com::sun::star::uno::RuntimeException) { msManager = _manager; }
- virtual ::rtl::OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException){ return msCategory; }
- virtual void SAL_CALL setCategory( const ::rtl::OUString& _category ) throw (::com::sun::star::uno::RuntimeException){ msCategory = _category; }
- virtual ::rtl::OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException){ return msCompany; }
- virtual void SAL_CALL setCompany( const ::rtl::OUString& _company ) throw (::com::sun::star::uno::RuntimeException){ msCompany = _company; }
+ virtual OUString SAL_CALL getManager() throw (::com::sun::star::uno::RuntimeException) { return msManager; }
+ virtual void SAL_CALL setManager( const OUString& _manager ) throw (::com::sun::star::uno::RuntimeException) { msManager = _manager; }
+ virtual OUString SAL_CALL getCategory() throw (::com::sun::star::uno::RuntimeException){ return msCategory; }
+ virtual void SAL_CALL setCategory( const OUString& _category ) throw (::com::sun::star::uno::RuntimeException){ msCategory = _category; }
+ virtual OUString SAL_CALL getCompany() throw (::com::sun::star::uno::RuntimeException){ return msCompany; }
+ virtual void SAL_CALL setCompany( const OUString& _company ) throw (::com::sun::star::uno::RuntimeException){ msCompany = _company; }
// XServiceInfo
- virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
+ virtual OUString SAL_CALL getImplementationName( ) throw (::com::sun::star::uno::RuntimeException)
{
return comp_CompatWriterDocProps::_getImplementationName();
}
- virtual ::sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException)
+ virtual ::sal_Bool SAL_CALL supportsService( const OUString& ServiceName ) throw (::com::sun::star::uno::RuntimeException)
{
css::uno::Sequence< rtl::OUString > sServiceNames= getSupportedServiceNames();
sal_Int32 nLen = sServiceNames.getLength();
@@ -396,7 +396,7 @@ public:
return bRes;
}
- virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException)
+ virtual ::com::sun::star::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames( ) throw (::com::sun::star::uno::RuntimeException)
{
return comp_CompatWriterDocProps::_getSupportedServiceNames();
}
@@ -499,12 +499,12 @@ bool isValidDateTime(const css::util::DateTime & i_rDateTime)
return i_rDateTime.Month > 0;
}
-std::pair< ::rtl::OUString, ::rtl::OUString > SAL_CALL
+std::pair< OUString, OUString > SAL_CALL
getQualifier(const char* i_name) {
- ::rtl::OUString nm = ::rtl::OUString::createFromAscii(i_name);
+ OUString nm = OUString::createFromAscii(i_name);
sal_Int32 ix = nm.indexOf(static_cast<sal_Unicode> (':'));
if (ix == -1) {
- return std::make_pair(::rtl::OUString(), nm);
+ return std::make_pair(OUString(), nm);
} else {
return std::make_pair(nm.copy(0,ix), nm.copy(ix+1));
}
@@ -512,22 +512,22 @@ getQualifier(const char* i_name) {
// get namespace for standard qualified names
// NB: only call this with statically known strings!
-::rtl::OUString SAL_CALL getNameSpace(const char* i_qname) throw ()
+OUString SAL_CALL getNameSpace(const char* i_qname) throw ()
{
DBG_ASSERT(i_qname, "SfxDocumentMetaData: getNameSpace: argument is null");
const char * ns = "";
- ::rtl::OUString n = getQualifier(i_qname).first;
+ OUString n = getQualifier(i_qname).first;
if ( n == "xlink" ) ns = s_nsXLink;
if ( n == "dc" ) ns = s_nsDC;
if ( n == "office" ) ns = s_nsODF;
if ( n == "meta" ) ns = s_nsODFMeta;
DBG_ASSERT(*ns, "SfxDocumentMetaData: unknown namespace prefix");
- return ::rtl::OUString::createFromAscii(ns);
+ return OUString::createFromAscii(ns);
}
bool SAL_CALL
textToDateOrDateTime(css::util::Date & io_rd, css::util::DateTime & io_rdt,
- bool & o_rIsDateTime, ::rtl::OUString i_text) throw ()
+ bool & o_rIsDateTime, OUString i_text) throw ()
{
if (::sax::Converter::convertDateOrDateTime(
io_rd, io_rdt, o_rIsDateTime, i_text)) {
@@ -541,7 +541,7 @@ textToDateOrDateTime(css::util::Date & io_rd, css::util::DateTime & io_rdt,
// convert string to date/time
bool SAL_CALL
-textToDateTime(css::util::DateTime & io_rdt, ::rtl::OUString i_text) throw ()
+textToDateTime(css::util::DateTime & io_rdt, OUString i_text) throw ()
{
if (::sax::Converter::convertDateTime(io_rdt, i_text)) {
return true;
@@ -554,7 +554,7 @@ textToDateTime(css::util::DateTime & io_rdt, ::rtl::OUString i_text) throw ()
// convert string to date/time with default return value
css::util::DateTime SAL_CALL
-textToDateTimeDefault(::rtl::OUString i_text) throw ()
+textToDateTimeDefault(OUString i_text) throw ()
{
css::util::DateTime dt;
static_cast<void> (textToDateTime(dt, i_text));
@@ -563,35 +563,35 @@ textToDateTimeDefault(::rtl::OUString i_text) throw ()
}
// convert date to string
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
dateToText(css::util::Date const& i_rd) throw ()
{
if (isValidDate(i_rd)) {
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
::sax::Converter::convertDate(buf, i_rd);
return buf.makeStringAndClear();
} else {
- return ::rtl::OUString();
+ return OUString();
}
}
// convert date/time to string
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
dateTimeToText(css::util::DateTime const& i_rdt) throw ()
{
if (isValidDateTime(i_rdt)) {
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
::sax::Converter::convertDateTime(buf, i_rdt, true);
return buf.makeStringAndClear();
} else {
- return ::rtl::OUString();
+ return OUString();
}
}
// convert string to duration
bool
-textToDuration(css::util::Duration& io_rDur, ::rtl::OUString const& i_rText)
+textToDuration(css::util::Duration& io_rDur, OUString const& i_rText)
throw ()
{
if (::sax::Converter::convertDuration(io_rDur, i_rText)) {
@@ -603,7 +603,7 @@ throw ()
}
}
-sal_Int32 textToDuration(::rtl::OUString const& i_rText) throw ()
+sal_Int32 textToDuration(OUString const& i_rText) throw ()
{
css::util::Duration d;
if (textToDuration(d, i_rText)) {
@@ -617,15 +617,15 @@ sal_Int32 textToDuration(::rtl::OUString const& i_rText) throw ()
}
// convert duration to string
-::rtl::OUString durationToText(css::util::Duration const& i_rDur) throw ()
+OUString durationToText(css::util::Duration const& i_rDur) throw ()
{
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
::sax::Converter::convertDuration(buf, i_rDur);
return buf.makeStringAndClear();
}
// convert duration to string
-::rtl::OUString SAL_CALL durationToText(sal_Int32 i_value) throw ()
+OUString SAL_CALL durationToText(sal_Int32 i_value) throw ()
{
css::util::Duration ud;
ud.Days = static_cast<sal_Int16>(i_value / (24 * 3600));
@@ -644,30 +644,30 @@ SfxDocumentMetaData::getURLProperties(
css::uno::Reference<css::lang::XMultiComponentFactory> xMsf (
m_xContext->getServiceManager());
css::uno::Reference< css::beans::XPropertyContainer> xPropArg(
- xMsf->createInstanceWithContext(::rtl::OUString(
+ xMsf->createInstanceWithContext(OUString(
"com.sun.star.beans.PropertyBag"), m_xContext),
css::uno::UNO_QUERY_THROW);
try {
- ::rtl::OUString dburl =
- ::rtl::OUString("DocumentBaseURL");
- ::rtl::OUString hdn =
- ::rtl::OUString("HierarchicalDocumentName");
+ OUString dburl =
+ OUString("DocumentBaseURL");
+ OUString hdn =
+ OUString("HierarchicalDocumentName");
for (sal_Int32 i = 0; i < i_rMedium.getLength(); ++i) {
if (i_rMedium[i].Name.equals(dburl)) {
xPropArg->addProperty(
- ::rtl::OUString("BaseURI"),
+ OUString("BaseURI"),
css::beans::PropertyAttribute::MAYBEVOID,
i_rMedium[i].Value);
} else if (i_rMedium[i].Name.equals(hdn)) {
xPropArg->addProperty(
- ::rtl::OUString("StreamRelPath"),
+ OUString("StreamRelPath"),
css::beans::PropertyAttribute::MAYBEVOID,
i_rMedium[i].Value);
}
}
- xPropArg->addProperty(::rtl::OUString("StreamName"),
+ xPropArg->addProperty(OUString("StreamName"),
css::beans::PropertyAttribute::MAYBEVOID,
- css::uno::makeAny(::rtl::OUString(s_meta)));
+ css::uno::makeAny(OUString(s_meta)));
} catch (const css::uno::Exception &) {
// ignore
}
@@ -677,12 +677,12 @@ SfxDocumentMetaData::getURLProperties(
// return the text of the (hopefully unique, i.e., normalize first!) text
// node _below_ the given node
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
getNodeText(css::uno::Reference<css::xml::dom::XNode> i_xNode)
throw (css::uno::RuntimeException)
{
if (!i_xNode.is()) throw css::uno::RuntimeException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::getNodeText: argument is null"), i_xNode);
for (css::uno::Reference<css::xml::dom::XNode> c = i_xNode->getFirstChild();
c.is();
@@ -691,34 +691,34 @@ getNodeText(css::uno::Reference<css::xml::dom::XNode> i_xNode)
try {
return c->getNodeValue();
} catch (const css::xml::dom::DOMException &) { // too big?
- return ::rtl::OUString();
+ return OUString();
}
}
}
- return ::rtl::OUString();
+ return OUString();
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getMetaText(const char* i_name) const
// throw (css::uno::RuntimeException)
{
checkInit();
- const ::rtl::OUString name( ::rtl::OUString::createFromAscii(i_name) );
+ const OUString name( OUString::createFromAscii(i_name) );
DBG_ASSERT(m_meta.find(name) != m_meta.end(),
"SfxDocumentMetaData::getMetaText: not found");
css::uno::Reference<css::xml::dom::XNode> xNode = m_meta.find(name)->second;
- return (xNode.is()) ? getNodeText(xNode) : ::rtl::OUString();
+ return (xNode.is()) ? getNodeText(xNode) : OUString();
}
bool SAL_CALL
SfxDocumentMetaData::setMetaText(const char* i_name,
- const ::rtl::OUString & i_rValue)
+ const OUString & i_rValue)
// throw (css::uno::RuntimeException)
{
checkInit();
- const ::rtl::OUString name( ::rtl::OUString::createFromAscii(i_name) );
+ const OUString name( OUString::createFromAscii(i_name) );
DBG_ASSERT(m_meta.find(name) != m_meta.end(),
"SfxDocumentMetaData::setMetaText: not found");
css::uno::Reference<css::xml::dom::XNode> xNode = m_meta.find(name)->second;
@@ -762,7 +762,7 @@ SfxDocumentMetaData::setMetaText(const char* i_name,
} catch (const css::xml::dom::DOMException & e) {
css::uno::Any a(e);
throw css::lang::WrappedTargetRuntimeException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::setMetaText: DOM exception"),
css::uno::Reference<css::uno::XInterface>(*this), a);
}
@@ -770,7 +770,7 @@ SfxDocumentMetaData::setMetaText(const char* i_name,
void SAL_CALL
SfxDocumentMetaData::setMetaTextAndNotify(const char* i_name,
- const ::rtl::OUString & i_rValue)
+ const OUString & i_rValue)
// throw (css::uno::RuntimeException)
{
::osl::ClearableMutexGuard g(m_aMutex);
@@ -780,11 +780,11 @@ SfxDocumentMetaData::setMetaTextAndNotify(const char* i_name,
}
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getMetaAttr(const char* i_name, const char* i_attr) const
// throw (css::uno::RuntimeException)
{
- ::rtl::OUString name = ::rtl::OUString::createFromAscii(i_name);
+ OUString name = OUString::createFromAscii(i_name);
DBG_ASSERT(m_meta.find(name) != m_meta.end(),
"SfxDocumentMetaData::getMetaAttr: not found");
css::uno::Reference<css::xml::dom::XNode> xNode = m_meta.find(name)->second;
@@ -794,21 +794,21 @@ SfxDocumentMetaData::getMetaAttr(const char* i_name, const char* i_attr) const
return xElem->getAttributeNS(getNameSpace(i_attr),
getQualifier(i_attr).second);
} else {
- return ::rtl::OUString();
+ return OUString();
}
}
-css::uno::Sequence< ::rtl::OUString> SAL_CALL
+css::uno::Sequence< OUString> SAL_CALL
SfxDocumentMetaData::getMetaList(const char* i_name) const
// throw (css::uno::RuntimeException)
{
checkInit();
- ::rtl::OUString name = ::rtl::OUString::createFromAscii(i_name);
+ OUString name = OUString::createFromAscii(i_name);
DBG_ASSERT(m_metaList.find(name) != m_metaList.end(),
"SfxDocumentMetaData::getMetaList: not found");
std::vector<css::uno::Reference<css::xml::dom::XNode> > const & vec =
m_metaList.find(name)->second;
- css::uno::Sequence< ::rtl::OUString> ret(vec.size());
+ css::uno::Sequence< OUString> ret(vec.size());
for (size_t i = 0; i < vec.size(); ++i) {
ret[i] = getNodeText(vec.at(i));
}
@@ -817,7 +817,7 @@ SfxDocumentMetaData::getMetaList(const char* i_name) const
bool SAL_CALL
SfxDocumentMetaData::setMetaList(const char* i_name,
- const css::uno::Sequence< ::rtl::OUString> & i_rValue,
+ const css::uno::Sequence< OUString> & i_rValue,
AttrVector const* i_pAttrs)
// throw (css::uno::RuntimeException)
{
@@ -827,7 +827,7 @@ SfxDocumentMetaData::setMetaList(const char* i_name,
"SfxDocumentMetaData::setMetaList: invalid args");
try {
- ::rtl::OUString name = ::rtl::OUString::createFromAscii(i_name);
+ OUString name = OUString::createFromAscii(i_name);
DBG_ASSERT(m_metaList.find(name) != m_metaList.end(),
"SfxDocumentMetaData::setMetaList: not found");
std::vector<css::uno::Reference<css::xml::dom::XNode> > & vec =
@@ -841,7 +841,7 @@ SfxDocumentMetaData::setMetaList(const char* i_name,
for (sal_Int32 i = 0; i < i_rValue.getLength(); ++i) {
css::uno::Reference<css::xml::dom::XNode> xNode(vec.at(i));
if (xNode.is()) {
- ::rtl::OUString val = getNodeText(xNode);
+ OUString val = getNodeText(xNode);
if (!val.equals(i_rValue[i])) {
isEqual = false;
break;
@@ -882,11 +882,11 @@ SfxDocumentMetaData::setMetaList(const char* i_name,
m_xDoc->createTextNode(i_rValue[i]), css::uno::UNO_QUERY_THROW);
// set attributes
if (i_pAttrs != 0) {
- for (std::vector<std::pair<const char*, ::rtl::OUString> >
+ for (std::vector<std::pair<const char*, OUString> >
::const_iterator it = (*i_pAttrs)[i].begin();
it != (*i_pAttrs)[i].end(); ++it) {
xElem->setAttributeNS(getNameSpace(it->first),
- ::rtl::OUString::createFromAscii(it->first),
+ OUString::createFromAscii(it->first),
it->second);
}
}
@@ -899,17 +899,17 @@ SfxDocumentMetaData::setMetaList(const char* i_name,
} catch (const css::xml::dom::DOMException & e) {
css::uno::Any a(e);
throw css::lang::WrappedTargetRuntimeException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::setMetaList: DOM exception"),
css::uno::Reference<css::uno::XInterface>(*this), a);
}
}
// convert property list to string list and attribute list
-std::pair<css::uno::Sequence< ::rtl::OUString>, AttrVector> SAL_CALL
+std::pair<css::uno::Sequence< OUString>, AttrVector> SAL_CALL
propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
{
- ::comphelper::SequenceAsVector< ::rtl::OUString > values;
+ ::comphelper::SequenceAsVector< OUString > values;
AttrVector attrs;
css::uno::Reference<css::beans::XPropertySetInfo> xSetInfo
@@ -920,7 +920,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
if (props[i].Attributes & css::beans::PropertyAttribute::TRANSIENT) {
continue;
}
- const ::rtl::OUString name = props[i].Name;
+ const OUString name = props[i].Name;
css::uno::Any any;
try {
any = i_xPropSet->getPropertyValue(name);
@@ -928,7 +928,7 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
// ignore
}
const css::uno::Type & type = any.getValueType();
- std::vector<std::pair<const char*, ::rtl::OUString> > as;
+ std::vector<std::pair<const char*, OUString> > as;
as.push_back(std::make_pair(static_cast<const char*>("meta:name"),
name));
const char* vt = "meta:value-type";
@@ -937,13 +937,13 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
if (type == ::cppu::UnoType<bool>::get()) {
bool b = false;
any >>= b;
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
::sax::Converter::convertBool(buf, b);
values.push_back(buf.makeStringAndClear());
as.push_back(std::make_pair(vt,
- ::rtl::OUString("boolean")));
- } else if (type == ::cppu::UnoType< ::rtl::OUString>::get()) {
- ::rtl::OUString s;
+ OUString("boolean")));
+ } else if (type == ::cppu::UnoType< OUString>::get()) {
+ OUString s;
any >>= s;
values.push_back(s);
// #i90847# OOo 2.x does stupid things if value-type="string";
@@ -953,20 +953,20 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
if (4 <= i)
{
as.push_back(std::make_pair(vt,
- ::rtl::OUString("string")));
+ OUString("string")));
}
} else if (type == ::cppu::UnoType<css::util::DateTime>::get()) {
css::util::DateTime dt;
any >>= dt;
values.push_back(dateTimeToText(dt));
as.push_back(std::make_pair(vt,
- ::rtl::OUString("date")));
+ OUString("date")));
} else if (type == ::cppu::UnoType<css::util::Date>::get()) {
css::util::Date d;
any >>= d;
values.push_back(dateToText(d));
as.push_back(std::make_pair(vt,
- ::rtl::OUString("date")));
+ OUString("date")));
} else if (type == ::cppu::UnoType<css::util::Time>::get()) {
// #i97029#: replaced by Duration
// Time is supported for backward compatibility with OOo 3.x, x<=2
@@ -979,22 +979,22 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
ud.MilliSeconds = 10 * ut.HundredthSeconds;
values.push_back(durationToText(ud));
as.push_back(std::make_pair(vt,
- ::rtl::OUString("time")));
+ OUString("time")));
} else if (type == ::cppu::UnoType<css::util::Duration>::get()) {
css::util::Duration ud;
any >>= ud;
values.push_back(durationToText(ud));
as.push_back(std::make_pair(vt,
- ::rtl::OUString("time")));
+ OUString("time")));
} else if (::cppu::UnoType<double>::get().isAssignableFrom(type)) {
// support not just double, but anything that can be converted
double d = 0;
any >>= d;
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
::sax::Converter::convertDouble(buf, d);
values.push_back(buf.makeStringAndClear());
as.push_back(std::make_pair(vt,
- ::rtl::OUString("float")));
+ OUString("float")));
} else {
DBG_WARNING1("SfxDocumentMetaData: unsupported property type: %s",
OUStringToOString(any.getValueTypeName(),
@@ -1010,9 +1010,9 @@ propsToStrings(css::uno::Reference<css::beans::XPropertySet> const & i_xPropSet)
// remove the given element from the DOM, and iff i_pAttrs != 0 insert new one
void SAL_CALL
SfxDocumentMetaData::updateElement(const char *i_name,
- std::vector<std::pair<const char *, ::rtl::OUString> >* i_pAttrs)
+ std::vector<std::pair<const char *, OUString> >* i_pAttrs)
{
- ::rtl::OUString name = ::rtl::OUString::createFromAscii(i_name);
+ OUString name = OUString::createFromAscii(i_name);
try {
// remove old element
css::uno::Reference<css::xml::dom::XNode> xNode =
@@ -1028,11 +1028,11 @@ SfxDocumentMetaData::updateElement(const char *i_name,
css::uno::UNO_QUERY_THROW);
xNode.set(xElem, css::uno::UNO_QUERY_THROW);
// set attributes
- for (std::vector<std::pair<const char *, ::rtl::OUString> >
+ for (std::vector<std::pair<const char *, OUString> >
::const_iterator it = i_pAttrs->begin();
it != i_pAttrs->end(); ++it) {
xElem->setAttributeNS(getNameSpace(it->first),
- ::rtl::OUString::createFromAscii(it->first), it->second);
+ OUString::createFromAscii(it->first), it->second);
}
m_xParent->appendChild(xNode);
}
@@ -1040,7 +1040,7 @@ SfxDocumentMetaData::updateElement(const char *i_name,
} catch (const css::xml::dom::DOMException & e) {
css::uno::Any a(e);
throw css::lang::WrappedTargetRuntimeException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::updateElement: DOM exception"),
css::uno::Reference<css::uno::XInterface>(*this), a);
}
@@ -1052,21 +1052,21 @@ void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes()
createUserDefined();
const css::uno::Reference<css::beans::XPropertySet> xPSet(m_xUserDefined,
css::uno::UNO_QUERY_THROW);
- const std::pair<css::uno::Sequence< ::rtl::OUString>, AttrVector>
+ const std::pair<css::uno::Sequence< OUString>, AttrVector>
udStringsAttrs( propsToStrings(xPSet) );
(void) setMetaList("meta:user-defined", udStringsAttrs.first,
&udStringsAttrs.second);
// update elements with attributes
- std::vector<std::pair<const char *, ::rtl::OUString> > attributes;
+ std::vector<std::pair<const char *, OUString> > attributes;
if (!m_TemplateName.isEmpty() || !m_TemplateURL.isEmpty()
|| isValidDateTime(m_TemplateDate)) {
attributes.push_back(std::make_pair(
static_cast<const char*>("xlink:type"),
- ::rtl::OUString("simple")));
+ OUString("simple")));
attributes.push_back(std::make_pair(
static_cast<const char*>("xlink:actuate"),
- ::rtl::OUString("onRequest")));
+ OUString("onRequest")));
attributes.push_back(std::make_pair(
static_cast<const char*>("xlink:title"), m_TemplateName));
attributes.push_back(std::make_pair(
@@ -1102,7 +1102,7 @@ void SAL_CALL SfxDocumentMetaData::updateUserDefinedAndAttributes()
const sal_Char* show = m_DefaultTarget == "_blank" ? "new" : "replace";
attributes.push_back(std::make_pair(
static_cast<const char*>("xlink:show"),
- ::rtl::OUString::createFromAscii(show)));
+ OUString::createFromAscii(show)));
updateElement("meta:hyperlink-behaviour", &attributes);
} else {
updateElement("meta:hyperlink-behaviour");
@@ -1118,7 +1118,7 @@ SfxDocumentMetaData::createDOM() const // throw (css::uno::RuntimeException)
css::uno::Reference<css::xml::dom::XDocumentBuilder> xBuilder( css::xml::dom::DocumentBuilder::create(m_xContext) );
css::uno::Reference<css::xml::dom::XDocument> xDoc = xBuilder->newDocument();
if (!xDoc.is()) throw css::uno::RuntimeException(
- ::rtl::OUString("SfxDocumentMetaData::createDOM: "
+ OUString("SfxDocumentMetaData::createDOM: "
"cannot create new document"),
*const_cast<SfxDocumentMetaData*>(this));
return xDoc;
@@ -1128,7 +1128,7 @@ void SAL_CALL
SfxDocumentMetaData::checkInit() const // throw (css::uno::RuntimeException)
{
if (!m_isInitialized) {
- throw css::uno::RuntimeException(::rtl::OUString(
+ throw css::uno::RuntimeException(OUString(
"SfxDocumentMetaData::checkInit: not initialized"),
*const_cast<SfxDocumentMetaData*>(this));
}
@@ -1141,7 +1141,7 @@ void SAL_CALL SfxDocumentMetaData::init(
css::uno::Reference<css::xml::dom::XDocument> i_xDoc)
{
if (!i_xDoc.is()) throw css::uno::RuntimeException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::init: no DOM tree given"), *this);
css::uno::Reference<css::xml::xpath::XXPathAPI> xPath = css::xml::xpath::XPathAPI::create(m_xContext);
@@ -1150,18 +1150,18 @@ void SAL_CALL SfxDocumentMetaData::init(
m_xDoc = i_xDoc;
// select nodes for standard meta data stuff
- xPath->registerNS(::rtl::OUString("xlink"),
- ::rtl::OUString::createFromAscii(s_nsXLink));
- xPath->registerNS(::rtl::OUString("dc"),
- ::rtl::OUString::createFromAscii(s_nsDC));
- xPath->registerNS(::rtl::OUString("office"),
- ::rtl::OUString::createFromAscii(s_nsODF));
- xPath->registerNS(::rtl::OUString("meta"),
- ::rtl::OUString::createFromAscii(s_nsODFMeta));
+ xPath->registerNS(OUString("xlink"),
+ OUString::createFromAscii(s_nsXLink));
+ xPath->registerNS(OUString("dc"),
+ OUString::createFromAscii(s_nsDC));
+ xPath->registerNS(OUString("office"),
+ OUString::createFromAscii(s_nsODF));
+ xPath->registerNS(OUString("meta"),
+ OUString::createFromAscii(s_nsODFMeta));
// NB: we do not handle the single-XML-file ODF variant, which would
// have the root element office:document.
// The root of such documents must be converted in the importer!
- ::rtl::OUString prefix(
+ OUString prefix(
"/child::office:document-meta/child::office:meta");
css::uno::Reference<css::xml::dom::XNode> xDocNode(
m_xDoc, css::uno::UNO_QUERY_THROW);
@@ -1189,7 +1189,7 @@ void SAL_CALL SfxDocumentMetaData::init(
{
OSL_TRACE("SfxDocumentMetaData::init(): "
"deleting unexpected root element: %s",
- ::rtl::OUStringToOString(xNode->getLocalName(),
+ OUStringToOString(xNode->getLocalName(),
RTL_TEXTENCODING_UTF8).getStr());
i_xDoc->removeChild(xNode);
xNode = i_xDoc->getFirstChild(); // start over
@@ -1200,27 +1200,27 @@ void SAL_CALL SfxDocumentMetaData::init(
}
if (!xRElem.is()) {
xRElem = i_xDoc->createElementNS(
- ::rtl::OUString::createFromAscii(s_nsODF),
- ::rtl::OUString("office:document-meta"));
+ OUString::createFromAscii(s_nsODF),
+ OUString("office:document-meta"));
css::uno::Reference<css::xml::dom::XNode> xRNode(xRElem,
css::uno::UNO_QUERY_THROW);
i_xDoc->appendChild(xRNode);
}
- xRElem->setAttributeNS(::rtl::OUString::createFromAscii(s_nsODF),
- ::rtl::OUString("office:version"),
- ::rtl::OUString("1.0"));
+ xRElem->setAttributeNS(OUString::createFromAscii(s_nsODF),
+ OUString("office:version"),
+ OUString("1.0"));
// does not exist, otherwise m_xParent would not be null
css::uno::Reference<css::xml::dom::XNode> xParent (
i_xDoc->createElementNS(
- ::rtl::OUString::createFromAscii(s_nsODF),
- ::rtl::OUString("office:meta")),
+ OUString::createFromAscii(s_nsODF),
+ OUString("office:meta")),
css::uno::UNO_QUERY_THROW);
xRElem->appendChild(xParent);
m_xParent = xParent;
} catch (const css::xml::dom::DOMException & e) {
css::uno::Any a(e);
throw css::lang::WrappedTargetRuntimeException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::init: DOM exception"),
css::uno::Reference<css::uno::XInterface>(*this), a);
}
@@ -1229,7 +1229,7 @@ void SAL_CALL SfxDocumentMetaData::init(
// select nodes for elements of which we only handle one occurrence
for (const char **pName = s_stdMeta; *pName != 0; ++pName) {
- ::rtl::OUString name = ::rtl::OUString::createFromAscii(*pName);
+ OUString name = OUString::createFromAscii(*pName);
// NB: If a document contains more than one occurrence of a
// meta-data element, we arbitrarily pick one of them here.
// We do not remove the others, i.e., when we write the
@@ -1238,7 +1238,7 @@ void SAL_CALL SfxDocumentMetaData::init(
// application-specific.
css::uno::Reference<css::xml::dom::XNode> xNode =
xPath->selectSingleNode(m_xParent,
- ::rtl::OUString("child::") + name);
+ OUString("child::") + name);
// Do not create an empty element if it is missing;
// for certain elements, such as dateTime, this would be invalid
m_meta[name] = xNode;
@@ -1246,10 +1246,10 @@ void SAL_CALL SfxDocumentMetaData::init(
// select nodes for elements of which we handle all occurrences
for (const char **pName = s_stdMetaList; *pName != 0; ++pName) {
- ::rtl::OUString name = ::rtl::OUString::createFromAscii(*pName);
+ OUString name = OUString::createFromAscii(*pName);
css::uno::Reference<css::xml::dom::XNodeList> nodes =
xPath->selectNodeList(m_xParent,
- ::rtl::OUString("child::") + name);
+ OUString("child::") + name);
std::vector<css::uno::Reference<css::xml::dom::XNode> > v;
for (sal_Int32 i = 0; i < nodes->getLength(); ++i) {
v.push_back(nodes->item(i));
@@ -1270,7 +1270,7 @@ void SAL_CALL SfxDocumentMetaData::init(
std::vector<css::uno::Reference<css::xml::dom::XNode> > & vec =
- m_metaList[::rtl::OUString("meta:user-defined")];
+ m_metaList[OUString("meta:user-defined")];
m_xUserDefined.clear(); // #i105826#: reset (may be re-initialization)
if ( !vec.empty() )
{
@@ -1283,13 +1283,13 @@ void SAL_CALL SfxDocumentMetaData::init(
css::uno::Reference<css::xml::dom::XElement> xElem(*it,
css::uno::UNO_QUERY_THROW);
css::uno::Any any;
- ::rtl::OUString name = xElem->getAttributeNS(
- ::rtl::OUString::createFromAscii(s_nsODFMeta),
- ::rtl::OUString("name"));
- ::rtl::OUString type = xElem->getAttributeNS(
- ::rtl::OUString::createFromAscii(s_nsODFMeta),
- ::rtl::OUString("value-type"));
- ::rtl::OUString text = getNodeText(*it);
+ OUString name = xElem->getAttributeNS(
+ OUString::createFromAscii(s_nsODFMeta),
+ OUString("name"));
+ OUString type = xElem->getAttributeNS(
+ OUString::createFromAscii(s_nsODFMeta),
+ OUString("value-type"));
+ OUString text = getNodeText(*it);
if ( type == "float" ) {
double d;
if (::sax::Converter::convertDouble(d, text)) {
@@ -1374,17 +1374,17 @@ SfxDocumentMetaData::SfxDocumentMetaData(
}
// com.sun.star.uno.XServiceInfo:
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getImplementationName() throw (css::uno::RuntimeException)
{
return comp_SfxDocumentMetaData::_getImplementationName();
}
::sal_Bool SAL_CALL
-SfxDocumentMetaData::supportsService(::rtl::OUString const & serviceName)
+SfxDocumentMetaData::supportsService(OUString const & serviceName)
throw (css::uno::RuntimeException)
{
- css::uno::Sequence< ::rtl::OUString > serviceNames =
+ css::uno::Sequence< OUString > serviceNames =
comp_SfxDocumentMetaData::_getSupportedServiceNames();
for (::sal_Int32 i = 0; i < serviceNames.getLength(); ++i) {
if (serviceNames[i] == serviceName)
@@ -1393,7 +1393,7 @@ SfxDocumentMetaData::supportsService(::rtl::OUString const & serviceName)
return sal_False;
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL
+css::uno::Sequence< OUString > SAL_CALL
SfxDocumentMetaData::getSupportedServiceNames()
throw (css::uno::RuntimeException)
{
@@ -1421,21 +1421,21 @@ void SAL_CALL SfxDocumentMetaData::dispose() throw (css::uno::RuntimeException)
// ::com::sun::star::document::XDocumentProperties:
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getAuthor() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
return getMetaText("meta:initial-creator");
}
-void SAL_CALL SfxDocumentMetaData::setAuthor(const ::rtl::OUString & the_value)
+void SAL_CALL SfxDocumentMetaData::setAuthor(const OUString & the_value)
throw (css::uno::RuntimeException)
{
setMetaTextAndNotify("meta:initial-creator", the_value);
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getGenerator() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1443,7 +1443,7 @@ SfxDocumentMetaData::getGenerator() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setGenerator(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setGenerator(const OUString & the_value)
throw (css::uno::RuntimeException)
{
setMetaTextAndNotify("meta:generator", the_value);
@@ -1463,20 +1463,20 @@ SfxDocumentMetaData::setCreationDate(const css::util::DateTime & the_value)
setMetaTextAndNotify("meta:creation-date", dateTimeToText(the_value));
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getTitle() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
return getMetaText("dc:title");
}
-void SAL_CALL SfxDocumentMetaData::setTitle(const ::rtl::OUString & the_value)
+void SAL_CALL SfxDocumentMetaData::setTitle(const OUString & the_value)
throw (css::uno::RuntimeException)
{
setMetaTextAndNotify("dc:title", the_value);
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getSubject() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1484,13 +1484,13 @@ SfxDocumentMetaData::getSubject() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setSubject(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setSubject(const OUString & the_value)
throw (css::uno::RuntimeException)
{
setMetaTextAndNotify("dc:subject", the_value);
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getDescription() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1498,13 +1498,13 @@ SfxDocumentMetaData::getDescription() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setDescription(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setDescription(const OUString & the_value)
throw (css::uno::RuntimeException)
{
setMetaTextAndNotify("dc:description", the_value);
}
-css::uno::Sequence< ::rtl::OUString >
+css::uno::Sequence< OUString >
SAL_CALL SfxDocumentMetaData::getKeywords() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1513,7 +1513,7 @@ SAL_CALL SfxDocumentMetaData::getKeywords() throw (css::uno::RuntimeException)
void SAL_CALL
SfxDocumentMetaData::setKeywords(
- const css::uno::Sequence< ::rtl::OUString > & the_value)
+ const css::uno::Sequence< OUString > & the_value)
throw (css::uno::RuntimeException)
{
::osl::ClearableMutexGuard g(m_aMutex);
@@ -1528,7 +1528,7 @@ css::lang::Locale SAL_CALL
{
::osl::MutexGuard g(m_aMutex);
css::lang::Locale loc;
- ::rtl::OUString text = getMetaText("dc:language");
+ OUString text = getMetaText("dc:language");
sal_Int32 ix = text.indexOf(static_cast<sal_Unicode> ('-'));
if (ix == -1) {
loc.Language = text;
@@ -1543,14 +1543,14 @@ void SAL_CALL
SfxDocumentMetaData::setLanguage(const css::lang::Locale & the_value)
throw (css::uno::RuntimeException)
{
- ::rtl::OUString text = the_value.Language;
+ OUString text = the_value.Language;
if (!the_value.Country.isEmpty()) {
- text += ::rtl::OUString("-").concat(the_value.Country);
+ text += OUString("-").concat(the_value.Country);
}
setMetaTextAndNotify("dc:language", text);
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getModifiedBy() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1558,7 +1558,7 @@ SfxDocumentMetaData::getModifiedBy() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setModifiedBy(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setModifiedBy(const OUString & the_value)
throw (css::uno::RuntimeException)
{
setMetaTextAndNotify("dc:creator", the_value);
@@ -1578,7 +1578,7 @@ SfxDocumentMetaData::setModificationDate(const css::util::DateTime & the_value)
setMetaTextAndNotify("dc:date", dateTimeToText(the_value));
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getPrintedBy() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1586,7 +1586,7 @@ SfxDocumentMetaData::getPrintedBy() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setPrintedBy(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setPrintedBy(const OUString & the_value)
throw (css::uno::RuntimeException)
{
setMetaTextAndNotify("meta:printed-by", the_value);
@@ -1606,7 +1606,7 @@ SfxDocumentMetaData::setPrintDate(const css::util::DateTime & the_value)
setMetaTextAndNotify("meta:print-date", dateTimeToText(the_value));
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getTemplateName() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1615,7 +1615,7 @@ SfxDocumentMetaData::getTemplateName() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setTemplateName(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setTemplateName(const OUString & the_value)
throw (css::uno::RuntimeException)
{
::osl::ClearableMutexGuard g(m_aMutex);
@@ -1627,7 +1627,7 @@ SfxDocumentMetaData::setTemplateName(const ::rtl::OUString & the_value)
}
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getTemplateURL() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1636,7 +1636,7 @@ SfxDocumentMetaData::getTemplateURL() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setTemplateURL(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setTemplateURL(const OUString & the_value)
throw (css::uno::RuntimeException)
{
::osl::ClearableMutexGuard g(m_aMutex);
@@ -1669,7 +1669,7 @@ SfxDocumentMetaData::setTemplateDate(const css::util::DateTime & the_value)
}
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getAutoloadURL() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1678,7 +1678,7 @@ SfxDocumentMetaData::getAutoloadURL() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setAutoloadURL(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setAutoloadURL(const OUString & the_value)
throw (css::uno::RuntimeException)
{
::osl::ClearableMutexGuard g(m_aMutex);
@@ -1703,7 +1703,7 @@ SfxDocumentMetaData::setAutoloadSecs(::sal_Int32 the_value)
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
{
if (the_value < 0) throw css::lang::IllegalArgumentException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::setAutoloadSecs: argument is negative"),
*this, 0);
::osl::ClearableMutexGuard g(m_aMutex);
@@ -1715,7 +1715,7 @@ SfxDocumentMetaData::setAutoloadSecs(::sal_Int32 the_value)
}
}
-::rtl::OUString SAL_CALL
+OUString SAL_CALL
SfxDocumentMetaData::getDefaultTarget() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
@@ -1724,7 +1724,7 @@ SfxDocumentMetaData::getDefaultTarget() throw (css::uno::RuntimeException)
}
void SAL_CALL
-SfxDocumentMetaData::setDefaultTarget(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::setDefaultTarget(const OUString & the_value)
throw (css::uno::RuntimeException)
{
::osl::ClearableMutexGuard g(m_aMutex);
@@ -1744,10 +1744,10 @@ SfxDocumentMetaData::getDocumentStatistics() throw (css::uno::RuntimeException)
::comphelper::SequenceAsVector<css::beans::NamedValue> stats;
for (size_t i = 0; s_stdStats[i] != 0; ++i) {
const char * aName = s_stdStatAttrs[i];
- ::rtl::OUString text = getMetaAttr("meta:document-statistic", aName);
+ OUString text = getMetaAttr("meta:document-statistic", aName);
if (text.isEmpty()) continue;
css::beans::NamedValue stat;
- stat.Name = ::rtl::OUString::createFromAscii(s_stdStats[i]);
+ stat.Name = OUString::createFromAscii(s_stdStats[i]);
sal_Int32 val;
css::uno::Any any;
if (!::sax::Converter::convertNumber(val, text, 0,
@@ -1771,16 +1771,16 @@ SfxDocumentMetaData::setDocumentStatistics(
{
::osl::ClearableMutexGuard g(m_aMutex);
checkInit();
- std::vector<std::pair<const char *, ::rtl::OUString> > attributes;
+ std::vector<std::pair<const char *, OUString> > attributes;
for (sal_Int32 i = 0; i < the_value.getLength(); ++i) {
- const ::rtl::OUString name = the_value[i].Name;
+ const OUString name = the_value[i].Name;
// inefficently search for matching attribute
for (size_t j = 0; s_stdStats[j] != 0; ++j) {
if (name.equalsAscii(s_stdStats[j])) {
const css::uno::Any any = the_value[i].Value;
sal_Int32 val = 0;
if (any >>= val) {
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
::sax::Converter::convertNumber(buf, val);
attributes.push_back(std::make_pair(s_stdStatAttrs[j],
buf.makeStringAndClear()));
@@ -1802,7 +1802,7 @@ SfxDocumentMetaData::setDocumentStatistics(
SfxDocumentMetaData::getEditingCycles() throw (css::uno::RuntimeException)
{
::osl::MutexGuard g(m_aMutex);
- ::rtl::OUString text = getMetaText("meta:editing-cycles");
+ OUString text = getMetaText("meta:editing-cycles");
sal_Int32 ret;
if (::sax::Converter::convertNumber(ret, text,
0, std::numeric_limits<sal_Int16>::max())) {
@@ -1817,10 +1817,10 @@ SfxDocumentMetaData::setEditingCycles(::sal_Int16 the_value)
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
{
if (the_value < 0) throw css::lang::IllegalArgumentException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::setEditingCycles: argument is negative"),
*this, 0);
- ::rtl::OUStringBuffer buf;
+ OUStringBuffer buf;
::sax::Converter::convertNumber(buf, the_value);
setMetaTextAndNotify("meta:editing-cycles", buf.makeStringAndClear());
}
@@ -1837,14 +1837,14 @@ SfxDocumentMetaData::setEditingDuration(::sal_Int32 the_value)
throw (css::uno::RuntimeException, css::lang::IllegalArgumentException)
{
if (the_value < 0) throw css::lang::IllegalArgumentException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::setEditingDuration: argument is negative"),
*this, 0);
setMetaTextAndNotify("meta:editing-duration", durationToText(the_value));
}
void SAL_CALL
-SfxDocumentMetaData::resetUserData(const ::rtl::OUString & the_value)
+SfxDocumentMetaData::resetUserData(const OUString & the_value)
throw (css::uno::RuntimeException)
{
::osl::ClearableMutexGuard g(m_aMutex);
@@ -1855,14 +1855,14 @@ SfxDocumentMetaData::resetUserData(const ::rtl::OUString & the_value)
css::util::DateTime uDT(now.Get100Sec(), now.GetSec(), now.GetMin(),
now.GetHour(), now.GetDay(), now.GetMonth(), now.GetYear());
bModified |= setMetaText("meta:creation-date", dateTimeToText(uDT));
- bModified |= setMetaText("dc:creator", ::rtl::OUString());
- bModified |= setMetaText("meta:printed-by", ::rtl::OUString());
+ bModified |= setMetaText("dc:creator", OUString());
+ bModified |= setMetaText("meta:printed-by", OUString());
bModified |= setMetaText("dc:date", dateTimeToText(css::util::DateTime()));
bModified |= setMetaText("meta:print-date",
dateTimeToText(css::util::DateTime()));
bModified |= setMetaText("meta:editing-duration", durationToText(0));
bModified |= setMetaText("meta:editing-cycles",
- ::rtl::OUString("1"));
+ OUString("1"));
if (bModified) {
g.clear();
@@ -1891,14 +1891,14 @@ SfxDocumentMetaData::loadFromStorage(
css::lang::WrappedTargetException, css::io::IOException)
{
if (!xStorage.is()) throw css::lang::IllegalArgumentException(
- ::rtl::OUString("SfxDocumentMetaData::loadFromStorage:"
+ OUString("SfxDocumentMetaData::loadFromStorage:"
" argument is null"), *this, 0);
::osl::MutexGuard g(m_aMutex);
// open meta data file
css::uno::Reference<css::io::XStream> xStream(
xStorage->openStreamElement(
- ::rtl::OUString(s_meta),
+ OUString(s_meta),
css::embed::ElementModes::READ) );
if (!xStream.is()) throw css::uno::RuntimeException();
css::uno::Reference<css::io::XInputStream> xInStream =
@@ -1923,22 +1923,22 @@ SfxDocumentMetaData::loadFromStorage(
css::uno::Reference<css::beans::XPropertySet> xPropArg =
getURLProperties(Medium);
try {
- xPropArg->getPropertyValue(::rtl::OUString("BaseURI"))
+ xPropArg->getPropertyValue(OUString("BaseURI"))
>>= input.sSystemId;
- input.sSystemId += ::rtl::OUString("/").concat(
- ::rtl::OUString(s_meta));
+ input.sSystemId += OUString("/").concat(
+ OUString(s_meta));
} catch (const css::uno::Exception &) {
- input.sSystemId = ::rtl::OUString(s_meta);
+ input.sSystemId = OUString(s_meta);
}
css::uno::Sequence< css::uno::Any > args(1);
args[0] <<= xPropArg;
css::uno::Reference<css::xml::sax::XDocumentHandler> xDocHandler (
xMsf->createInstanceWithArgumentsAndContext(
- ::rtl::OUString::createFromAscii(pServiceName), args, m_xContext),
+ OUString::createFromAscii(pServiceName), args, m_xContext),
css::uno::UNO_QUERY_THROW);
if (!xDocHandler.is()) throw css::uno::RuntimeException(
- ::rtl::OUString("SfxDocumentMetaData::loadFromStorage:"
+ OUString("SfxDocumentMetaData::loadFromStorage:"
" cannot create XMLOasisMetaImporter service"), *this);
css::uno::Reference<css::document::XImporter> xImp (xDocHandler,
css::uno::UNO_QUERY_THROW);
@@ -1947,7 +1947,7 @@ SfxDocumentMetaData::loadFromStorage(
try {
xParser->parseStream(input);
} catch (const css::xml::sax::SAXException &) {
- throw css::io::WrongFormatException(::rtl::OUString(
+ throw css::io::WrongFormatException(OUString(
"SfxDocumentMetaData::loadFromStorage:"
" XML parsing exception"), *this);
}
@@ -1963,7 +1963,7 @@ SfxDocumentMetaData::storeToStorage(
css::lang::WrappedTargetException, css::io::IOException)
{
if (!xStorage.is()) throw css::lang::IllegalArgumentException(
- ::rtl::OUString("SfxDocumentMetaData::storeToStorage:"
+ OUString("SfxDocumentMetaData::storeToStorage:"
" argument is null"), *this, 0);
::osl::MutexGuard g(m_aMutex);
checkInit();
@@ -1973,20 +1973,20 @@ SfxDocumentMetaData::storeToStorage(
// write into storage
css::uno::Reference<css::io::XStream> xStream =
- xStorage->openStreamElement(::rtl::OUString(s_meta),
+ xStorage->openStreamElement(OUString(s_meta),
css::embed::ElementModes::WRITE
| css::embed::ElementModes::TRUNCATE);
if (!xStream.is()) throw css::uno::RuntimeException();
css::uno::Reference< css::beans::XPropertySet > xStreamProps(xStream,
css::uno::UNO_QUERY_THROW);
xStreamProps->setPropertyValue(
- ::rtl::OUString("MediaType"),
- css::uno::makeAny(::rtl::OUString("text/xml")));
+ OUString("MediaType"),
+ css::uno::makeAny(OUString("text/xml")));
xStreamProps->setPropertyValue(
- ::rtl::OUString("Compressed"),
+ OUString("Compressed"),
css::uno::makeAny(static_cast<sal_Bool> (sal_False)));
xStreamProps->setPropertyValue(
- ::rtl::OUString("UseCommonStoragePasswordEncryption"),
+ OUString("UseCommonStoragePasswordEncryption"),
css::uno::makeAny(static_cast<sal_Bool> (sal_False)));
css::uno::Reference<css::io::XOutputStream> xOutStream =
xStream->getOutputStream();
@@ -2013,7 +2013,7 @@ SfxDocumentMetaData::storeToStorage(
css::uno::Reference<css::document::XExporter> xExp(
xMsf->createInstanceWithArgumentsAndContext(
- ::rtl::OUString::createFromAscii(pServiceName), args, m_xContext),
+ OUString::createFromAscii(pServiceName), args, m_xContext),
css::uno::UNO_QUERY_THROW);
xExp->setSourceDocument(css::uno::Reference<css::lang::XComponent>(this));
css::uno::Reference<css::document::XFilter> xFilter(xExp,
@@ -2025,13 +2025,13 @@ SfxDocumentMetaData::storeToStorage(
xTransaction->commit();
}
} else {
- throw css::io::IOException(::rtl::OUString(
+ throw css::io::IOException(OUString(
"SfxDocumentMetaData::storeToStorage: cannot filter"), *this);
}
}
void SAL_CALL
-SfxDocumentMetaData::loadFromMedium(const ::rtl::OUString & URL,
+SfxDocumentMetaData::loadFromMedium(const OUString & URL,
const css::uno::Sequence< css::beans::PropertyValue > & Medium)
throw (css::uno::RuntimeException, css::io::WrongFormatException,
css::lang::WrappedTargetException, css::io::IOException)
@@ -2060,13 +2060,13 @@ SfxDocumentMetaData::loadFromMedium(const ::rtl::OUString & URL,
throw;
} catch (const css::uno::Exception & e) {
throw css::lang::WrappedTargetException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::loadFromMedium: exception"),
css::uno::Reference<css::uno::XInterface>(*this),
css::uno::makeAny(e));
}
if (!xStorage.is()) {
- throw css::uno::RuntimeException(::rtl::OUString(
+ throw css::uno::RuntimeException(OUString(
"SfxDocumentMetaData::loadFromMedium: cannot get Storage"),
*this);
}
@@ -2074,7 +2074,7 @@ SfxDocumentMetaData::loadFromMedium(const ::rtl::OUString & URL,
}
void SAL_CALL
-SfxDocumentMetaData::storeToMedium(const ::rtl::OUString & URL,
+SfxDocumentMetaData::storeToMedium(const OUString & URL,
const css::uno::Sequence< css::beans::PropertyValue > & Medium)
throw (css::uno::RuntimeException,
css::lang::WrappedTargetException, css::io::IOException)
@@ -2089,7 +2089,7 @@ SfxDocumentMetaData::storeToMedium(const ::rtl::OUString & URL,
if (!xStorage.is()) {
- throw css::uno::RuntimeException(::rtl::OUString(
+ throw css::uno::RuntimeException(OUString(
"SfxDocumentMetaData::storeToMedium: cannot get Storage"),
*this);
}
@@ -2114,7 +2114,7 @@ SfxDocumentMetaData::storeToMedium(const ::rtl::OUString & URL,
nError = ERRCODE_IO_GENERAL;
}
- throw css::task::ErrorCodeIOException( ::rtl::OUString(),
+ throw css::task::ErrorCodeIOException( OUString(),
css::uno::Reference< css::uno::XInterface >(), nError);
}
@@ -2139,13 +2139,13 @@ SfxDocumentMetaData::initialize(
if (any >>= xDoc) {
if (!xDoc.is()) {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("SfxDocumentMetaData::"
+ OUString("SfxDocumentMetaData::"
"initialize: argument is null"),
*this, static_cast<sal_Int16>(i));
}
} else {
throw css::lang::IllegalArgumentException(
- ::rtl::OUString("SfxDocumentMetaData::"
+ OUString("SfxDocumentMetaData::"
"initialize: argument must be XDocument"),
*this, static_cast<sal_Int16>(i));
}
@@ -2185,7 +2185,7 @@ SfxDocumentMetaData::createClone()
} catch (const css::uno::Exception & e) {
css::uno::Any a(e);
throw css::lang::WrappedTargetRuntimeException(
- ::rtl::OUString(
+ OUString(
"SfxDocumentMetaData::createClone: exception"),
css::uno::Reference<css::uno::XInterface>(*this), a);
}
@@ -2290,7 +2290,7 @@ void SfxDocumentMetaData::createUserDefined()
{
css::uno::Sequence<css::uno::Type> types(11);
types[0] = ::cppu::UnoType<bool>::get();
- types[1] = ::cppu::UnoType< ::rtl::OUString>::get();
+ types[1] = ::cppu::UnoType< OUString>::get();
types[2] = ::cppu::UnoType<css::util::DateTime>::get();
types[3] = ::cppu::UnoType<css::util::Date>::get();
types[4] = ::cppu::UnoType<css::util::Duration>::get();
@@ -2303,10 +2303,10 @@ void SfxDocumentMetaData::createUserDefined()
types[10] = ::cppu::UnoType<css::util::Time>::get();
css::uno::Sequence<css::uno::Any> args(2);
args[0] <<= css::beans::NamedValue(
- ::rtl::OUString("AllowedTypes"),
+ OUString("AllowedTypes"),
css::uno::makeAny(types));
// #i94175#: ODF allows empty user-defined property names!
- args[1] <<= css::beans::NamedValue( ::rtl::OUString(
+ args[1] <<= css::beans::NamedValue( OUString(
"AllowEmptyPropertyName"),
css::uno::makeAny(sal_True));
@@ -2314,7 +2314,7 @@ void SfxDocumentMetaData::createUserDefined()
m_xContext->getServiceManager());
m_xUserDefined.set(
xMsf->createInstanceWithContext(
- ::rtl::OUString(
+ OUString(
"com.sun.star.beans.PropertyBag"), m_xContext),
css::uno::UNO_QUERY_THROW);
const css::uno::Reference<css::lang::XInitialization> xInit(
@@ -2346,12 +2346,12 @@ void SfxDocumentMetaData::createUserDefined()
// component helper namespace
namespace comp_CompatWriterDocProps {
- ::rtl::OUString SAL_CALL _getImplementationName() {
- return ::rtl::OUString(
+ OUString SAL_CALL _getImplementationName() {
+ return OUString(
"CompatWriterDocPropsImpl");
}
- css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
+ css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
css::uno::Sequence< rtl::OUString > aServiceNames(1);
aServiceNames[ 0 ] = rtl::OUString( "com.sun.star.writer.DocumentProperties" );
@@ -2368,15 +2368,15 @@ namespace comp_CompatWriterDocProps {
}
namespace comp_SfxDocumentMetaData {
-::rtl::OUString SAL_CALL _getImplementationName() {
- return ::rtl::OUString(
+OUString SAL_CALL _getImplementationName() {
+ return OUString(
"SfxDocumentMetaData");
}
-css::uno::Sequence< ::rtl::OUString > SAL_CALL _getSupportedServiceNames()
+css::uno::Sequence< OUString > SAL_CALL _getSupportedServiceNames()
{
- css::uno::Sequence< ::rtl::OUString > s(1);
- s[0] = ::rtl::OUString(
+ css::uno::Sequence< OUString > s(1);
+ s[0] = OUString(
"com.sun.star.document.DocumentProperties");
return s;
}
diff --git a/toolkit/source/controls/unocontrols.cxx b/toolkit/source/controls/unocontrols.cxx
index 162087113538..e98c6782e993 100644
--- a/toolkit/source/controls/unocontrols.cxx
+++ b/toolkit/source/controls/unocontrols.cxx
@@ -68,18 +68,18 @@ using ::com::sun::star::uno::Reference;
using namespace ::toolkit;
#define IMPL_SERVICEINFO_DERIVED( ImplName, BaseClass, ServiceName ) \
- ::rtl::OUString SAL_CALL ImplName::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return ::rtl::OUString( "stardiv.Toolkit." #ImplName ); } \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \
+ OUString SAL_CALL ImplName::getImplementationName( ) throw(::com::sun::star::uno::RuntimeException) { return OUString( "stardiv.Toolkit." #ImplName ); } \
+ ::com::sun::star::uno::Sequence< OUString > SAL_CALL ImplName::getSupportedServiceNames() throw(::com::sun::star::uno::RuntimeException) \
{ \
- ::com::sun::star::uno::Sequence< ::rtl::OUString > aNames = BaseClass::getSupportedServiceNames( ); \
+ ::com::sun::star::uno::Sequence< OUString > aNames = BaseClass::getSupportedServiceNames( ); \
aNames.realloc( aNames.getLength() + 1 ); \
- aNames[ aNames.getLength() - 1 ] = ::rtl::OUString::createFromAscii( ServiceName ); \
+ aNames[ aNames.getLength() - 1 ] = OUString::createFromAscii( ServiceName ); \
return aNames; \
} \
uno::Reference< graphic::XGraphic >
-ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& xOutGraphicObj, const ::rtl::OUString& _rURL )
+ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic::XGraphicObject >& xOutGraphicObj, const OUString& _rURL )
{
if( ( _rURL.compareToAscii( UNO_NAME_GRAPHOBJ_URLPREFIX, RTL_CONSTASCII_LENGTH( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) == 0 ) )
{
@@ -94,7 +94,7 @@ ImageHelper::getGraphicAndGraphicObjectFromURL_nothrow( uno::Reference< graphic:
}
::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic >
-ImageHelper::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
+ImageHelper::getGraphicFromURL_nothrow( const OUString& _rURL )
{
uno::Reference< graphic::XGraphic > xGraphic;
if ( _rURL.isEmpty() )
@@ -105,7 +105,7 @@ ImageHelper::getGraphicFromURL_nothrow( const ::rtl::OUString& _rURL )
uno::Reference< uno::XComponentContext > xContext( ::comphelper::getProcessComponentContext() );
uno::Reference< graphic::XGraphicProvider > xProvider( graphic::GraphicProvider::create(xContext) );
uno::Sequence< beans::PropertyValue > aMediaProperties(1);
- aMediaProperties[0].Name = ::rtl::OUString( "URL" );
+ aMediaProperties[0].Name = OUString( "URL" );
aMediaProperties[0].Value <<= _rURL;
xGraphic = xProvider->queryGraphic( aMediaProperties );
}
@@ -125,9 +125,9 @@ UnoControlEditModel::UnoControlEditModel( const Reference< XComponentContext >&
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXEdit );
}
-::rtl::OUString UnoControlEditModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlEditModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlEditModel );
+ return OUString::createFromAscii( szServiceName_UnoControlEditModel );
}
uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -140,7 +140,7 @@ uno::Any UnoControlEditModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
aReturn <<= (sal_Int16)awt::LineEndFormat::LINE_FEED; // LF
break;
case BASEPROPERTY_DEFAULTCONTROL:
- aReturn <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlEdit );
+ aReturn <<= OUString::createFromAscii( szServiceName_UnoControlEdit );
break;
default:
aReturn = UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -210,16 +210,16 @@ void SAL_CALL UnoEditControl::release( ) throw ()
IMPLEMENT_FORWARD_XTYPEPROVIDER2( UnoEditControl, UnoControlBase, UnoEditControl_Base )
-::rtl::OUString UnoEditControl::GetComponentServiceName()
+OUString UnoEditControl::GetComponentServiceName()
{
// by default, we want a simple edit field
- ::rtl::OUString sName( "Edit" );
+ OUString sName( "Edit" );
// but maybe we are to display multi-line text?
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_MULTILINE ) );
sal_Bool b = sal_Bool();
if ( ( aVal >>= b ) && b )
- sName= ::rtl::OUString("MultiLineEdit");
+ sName= OUString("MultiLineEdit");
return sName;
}
@@ -231,7 +231,7 @@ sal_Bool SAL_CALL UnoEditControl::setModel(const uno::Reference< awt::XControlMo
return bReturn;
}
-void UnoEditControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
+void UnoEditControl::ImplSetPeerProperty( const OUString& rPropName, const uno::Any& rVal )
{
sal_Bool bDone = sal_False;
if ( GetPropertyId( rPropName ) == BASEPROPERTY_TEXT )
@@ -240,7 +240,7 @@ void UnoEditControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, cons
uno::Reference < awt::XTextComponent > xTextComponent( getPeer(), uno::UNO_QUERY );
if ( xTextComponent.is() )
{
- ::rtl::OUString sText;
+ OUString sText;
rVal >>= sText;
ImplCheckLocalize( sText );
xTextComponent->setText( sText );
@@ -304,7 +304,7 @@ void UnoEditControl::removeTextListener(const uno::Reference< awt::XTextListener
maTextListeners.removeInterface( l );
}
-void UnoEditControl::setText( const ::rtl::OUString& aText ) throw(uno::RuntimeException)
+void UnoEditControl::setText( const OUString& aText ) throw(uno::RuntimeException)
{
if ( mbHasTextProperty )
{
@@ -339,7 +339,7 @@ namespace
}
}
-void UnoEditControl::insertText( const awt::Selection& rSel, const ::rtl::OUString& rNewText ) throw(uno::RuntimeException)
+void UnoEditControl::insertText( const awt::Selection& rSel, const OUString& rNewText ) throw(uno::RuntimeException)
{
// normalize the selection - OUString::replaceAt has a strange behaviour if the min is greater than the max
awt::Selection aSelection( rSel );
@@ -359,16 +359,16 @@ void UnoEditControl::insertText( const awt::Selection& rSel, const ::rtl::OUStri
aNewSelection.Min = aNewSelection.Max;
#endif
- ::rtl::OUString aOldText = getText();
- ::rtl::OUString aNewText = aOldText.replaceAt( aSelection.Min, aSelection.Max - aSelection.Min, rNewText );
+ OUString aOldText = getText();
+ OUString aNewText = aOldText.replaceAt( aSelection.Min, aSelection.Max - aSelection.Min, rNewText );
setText( aNewText );
setSelection( aNewSelection );
}
-::rtl::OUString UnoEditControl::getText() throw(uno::RuntimeException)
+OUString UnoEditControl::getText() throw(uno::RuntimeException)
{
- ::rtl::OUString aText = maText;
+ OUString aText = maText;
if ( mbHasTextProperty )
aText = ImplGetPropertyValue_UString( BASEPROPERTY_TEXT );
@@ -382,9 +382,9 @@ void UnoEditControl::insertText( const awt::Selection& rSel, const ::rtl::OUStri
return aText;
}
-::rtl::OUString UnoEditControl::getSelectedText( void ) throw(uno::RuntimeException)
+OUString UnoEditControl::getSelectedText( void ) throw(uno::RuntimeException)
{
- ::rtl::OUString sSelected;
+ OUString sSelected;
uno::Reference< awt::XTextComponent > xText( getPeer(), uno::UNO_QUERY );
if ( xText.is() )
sSelected = xText->getSelectedText();
@@ -473,16 +473,16 @@ void UnoEditControl::getColumnsAndLines( sal_Int16& nCols, sal_Int16& nLines ) t
Impl_getColumnsAndLines( nCols, nLines );
}
-::rtl::OUString UnoEditControl::getImplementationName( ) throw(uno::RuntimeException)
+OUString UnoEditControl::getImplementationName( ) throw(uno::RuntimeException)
{
- return ::rtl::OUString( "stardiv.Toolkit.UnoEditControl" );
+ return OUString( "stardiv.Toolkit.UnoEditControl" );
}
-uno::Sequence< ::rtl::OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException)
+uno::Sequence< OUString > UnoEditControl::getSupportedServiceNames() throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString > aNames = UnoControlBase::getSupportedServiceNames( );
+ uno::Sequence< OUString > aNames = UnoControlBase::getSupportedServiceNames( );
aNames.realloc( aNames.getLength() + 1 );
- aNames[ aNames.getLength() - 1 ] = ::rtl::OUString::createFromAscii( szServiceName2_UnoControlEdit );
+ aNames[ aNames.getLength() - 1 ] = OUString::createFromAscii( szServiceName2_UnoControlEdit );
return aNames;
}
@@ -512,9 +512,9 @@ UnoControlFileControlModel::UnoControlFileControlModel( const Reference< XCompon
ImplRegisterProperty( BASEPROPERTY_HIDEINACTIVESELECTION );
}
-::rtl::OUString UnoControlFileControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlFileControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlFileControlModel );
+ return OUString::createFromAscii( szServiceName_UnoControlFileControlModel );
}
uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -522,7 +522,7 @@ uno::Any UnoControlFileControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlFileControl );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlFileControl );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -554,9 +554,9 @@ UnoFileControl::UnoFileControl()
{
}
-::rtl::OUString UnoFileControl::GetComponentServiceName()
+OUString UnoFileControl::GetComponentServiceName()
{
- return ::rtl::OUString("filecontrol");
+ return OUString("filecontrol");
}
// ----------------------------------------------------
@@ -584,7 +584,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_GRAPHIC ) )
{
mbAdjustingGraphic = true;
- ::rtl::OUString sImageURL;
+ OUString sImageURL;
OSL_VERIFY( rValue >>= sImageURL );
setDependentFastPropertyValue( BASEPROPERTY_GRAPHIC, uno::makeAny( ImageHelper::getGraphicFromURL_nothrow( sImageURL ) ) );
mbAdjustingGraphic = false;
@@ -595,7 +595,7 @@ void SAL_CALL GraphicControlModel::setFastPropertyValue_NoBroadcast( sal_Int32 n
if ( !mbAdjustingGraphic && ImplHasProperty( BASEPROPERTY_IMAGEURL ) )
{
mbAdjustingGraphic = true;
- setDependentFastPropertyValue( BASEPROPERTY_IMAGEURL, uno::makeAny( ::rtl::OUString() ) );
+ setDependentFastPropertyValue( BASEPROPERTY_IMAGEURL, uno::makeAny( OUString() ) );
mbAdjustingGraphic = false;
}
break;
@@ -646,9 +646,9 @@ UnoControlButtonModel::UnoControlButtonModel( const Reference< XComponentContext
osl_atomic_decrement( &m_refCount );
}
-::rtl::OUString UnoControlButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlButtonModel );
+ return OUString::createFromAscii( szServiceName_UnoControlButtonModel );
}
uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -656,7 +656,7 @@ uno::Any UnoControlButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlButton ) );
+ return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlButton ) );
case BASEPROPERTY_TOGGLE:
return uno::makeAny( (sal_Bool)sal_False );
case BASEPROPERTY_ALIGN:
@@ -698,9 +698,9 @@ UnoButtonControl::UnoButtonControl()
maComponentInfos.nHeight = 14;
}
-::rtl::OUString UnoButtonControl::GetComponentServiceName()
+OUString UnoButtonControl::GetComponentServiceName()
{
- ::rtl::OUString aName( "pushbutton" );
+ OUString aName( "pushbutton" );
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_PUSHBUTTONTYPE ) );
sal_Int16 n = sal_Int16();
if ( ( aVal >>= n ) && n )
@@ -708,11 +708,11 @@ UnoButtonControl::UnoButtonControl()
// Use PushButtonType later when available...
switch ( n )
{
- case 1 /*PushButtonType::OK*/: aName= ::rtl::OUString("okbutton");
+ case 1 /*PushButtonType::OK*/: aName= OUString("okbutton");
break;
- case 2 /*PushButtonType::CANCEL*/: aName= ::rtl::OUString("cancelbutton");
+ case 2 /*PushButtonType::CANCEL*/: aName= OUString("cancelbutton");
break;
- case 3 /*PushButtonType::HELP*/: aName= ::rtl::OUString("helpbutton");
+ case 3 /*PushButtonType::HELP*/: aName= OUString("helpbutton");
break;
default:
{
@@ -794,14 +794,14 @@ void SAL_CALL UnoButtonControl::itemStateChanged( const awt::ItemEvent& rEvent )
maItemListeners.itemStateChanged( aEvent );
}
-void UnoButtonControl::setLabel( const ::rtl::OUString& rLabel ) throw(uno::RuntimeException)
+void UnoButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= rLabel;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
}
-void UnoButtonControl::setActionCommand( const ::rtl::OUString& rCommand ) throw(uno::RuntimeException)
+void UnoButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException)
{
maActionCommand = rCommand;
if ( getPeer().is() )
@@ -836,15 +836,15 @@ UnoControlImageControlModel::UnoControlImageControlModel( const Reference< XComp
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXImageControl );
}
-::rtl::OUString UnoControlImageControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlImageControlModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlImageControlModel );
+ return OUString::createFromAscii( szServiceName_UnoControlImageControlModel );
}
uno::Any UnoControlImageControlModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
{
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
- return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlImageControl ) );
+ return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlImageControl ) );
if ( nPropId == BASEPROPERTY_IMAGE_SCALE_MODE )
return makeAny( awt::ImageScaleMode::Anisotropic );
@@ -920,9 +920,9 @@ UnoImageControlControl::UnoImageControlControl()
maComponentInfos.nHeight = 100;
}
-::rtl::OUString UnoImageControlControl::GetComponentServiceName()
+OUString UnoImageControlControl::GetComponentServiceName()
{
- return ::rtl::OUString("fixedimage");
+ return OUString("fixedimage");
}
void UnoImageControlControl::dispose() throw(uno::RuntimeException)
@@ -962,9 +962,9 @@ UnoControlRadioButtonModel::UnoControlRadioButtonModel( const Reference< XCompon
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXRadioButton );
}
-::rtl::OUString UnoControlRadioButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlRadioButtonModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlRadioButtonModel );
+ return OUString::createFromAscii( szServiceName_UnoControlRadioButtonModel );
}
uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -972,7 +972,7 @@ uno::Any UnoControlRadioButtonModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlRadioButton ) );
+ return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlRadioButton ) );
case BASEPROPERTY_VISUALEFFECT:
return uno::makeAny( (sal_Int16)awt::VisualEffect::LOOK3D );
@@ -1013,9 +1013,9 @@ UnoRadioButtonControl::UnoRadioButtonControl()
maComponentInfos.nHeight = 12;
}
-::rtl::OUString UnoRadioButtonControl::GetComponentServiceName()
+OUString UnoRadioButtonControl::GetComponentServiceName()
{
- return ::rtl::OUString("radiobutton");
+ return OUString("radiobutton");
}
void UnoRadioButtonControl::dispose() throw(uno::RuntimeException)
@@ -1082,14 +1082,14 @@ void UnoRadioButtonControl::removeActionListener(const uno::Reference< awt::XAct
maActionListeners.removeInterface( l );
}
-void UnoRadioButtonControl::setLabel( const ::rtl::OUString& rLabel ) throw(uno::RuntimeException)
+void UnoRadioButtonControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= rLabel;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
}
-void UnoRadioButtonControl::setActionCommand( const ::rtl::OUString& rCommand ) throw(uno::RuntimeException)
+void UnoRadioButtonControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException)
{
maActionCommand = rCommand;
if ( getPeer().is() )
@@ -1172,9 +1172,9 @@ UnoControlCheckBoxModel::UnoControlCheckBoxModel( const Reference< XComponentCon
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCheckBox );
}
-::rtl::OUString UnoControlCheckBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlCheckBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlCheckBoxModel );
+ return OUString::createFromAscii( szServiceName_UnoControlCheckBoxModel );
}
uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1182,7 +1182,7 @@ uno::Any UnoControlCheckBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
switch ( nPropId )
{
case BASEPROPERTY_DEFAULTCONTROL:
- return uno::makeAny( ::rtl::OUString::createFromAscii( szServiceName_UnoControlCheckBox ) );
+ return uno::makeAny( OUString::createFromAscii( szServiceName_UnoControlCheckBox ) );
case BASEPROPERTY_VISUALEFFECT:
return uno::makeAny( (sal_Int16)awt::VisualEffect::LOOK3D );
@@ -1222,9 +1222,9 @@ UnoCheckBoxControl::UnoCheckBoxControl()
maComponentInfos.nHeight = 12;
}
-::rtl::OUString UnoCheckBoxControl::GetComponentServiceName()
+OUString UnoCheckBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString("checkbox");
+ return OUString("checkbox");
}
void UnoCheckBoxControl::dispose() throw(uno::RuntimeException)
@@ -1283,7 +1283,7 @@ void UnoCheckBoxControl::removeActionListener(const uno::Reference< awt::XAction
maActionListeners.removeInterface( l );
}
-void UnoCheckBoxControl::setActionCommand( const ::rtl::OUString& rCommand ) throw(uno::RuntimeException)
+void UnoCheckBoxControl::setActionCommand( const OUString& rCommand ) throw(uno::RuntimeException)
{
maActionCommand = rCommand;
if ( getPeer().is() )
@@ -1294,7 +1294,7 @@ void UnoCheckBoxControl::setActionCommand( const ::rtl::OUString& rCommand ) thr
}
-void UnoCheckBoxControl::setLabel( const ::rtl::OUString& rLabel ) throw(uno::RuntimeException)
+void UnoCheckBoxControl::setLabel( const OUString& rLabel ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= rLabel;
@@ -1357,9 +1357,9 @@ UnoControlFixedHyperlinkModel::UnoControlFixedHyperlinkModel( const Reference< X
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedHyperlink );
}
-::rtl::OUString UnoControlFixedHyperlinkModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlFixedHyperlinkModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlFixedHyperlinkModel );
+ return OUString::createFromAscii( szServiceName_UnoControlFixedHyperlinkModel );
}
uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1367,7 +1367,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlFixedHyperlink );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlFixedHyperlink );
return aAny;
}
else if ( nPropId == BASEPROPERTY_BORDER )
@@ -1379,7 +1379,7 @@ uno::Any UnoControlFixedHyperlinkModel::ImplGetDefaultValue( sal_uInt16 nPropId
else if ( nPropId == BASEPROPERTY_URL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString();
+ aAny <<= OUString();
return aAny;
}
@@ -1415,9 +1415,9 @@ UnoFixedHyperlinkControl::UnoFixedHyperlinkControl()
maComponentInfos.nHeight = 12;
}
-::rtl::OUString UnoFixedHyperlinkControl::GetComponentServiceName()
+OUString UnoFixedHyperlinkControl::GetComponentServiceName()
{
- return ::rtl::OUString("fixedhyperlink");
+ return OUString("fixedhyperlink");
}
// uno::XInterface
@@ -1441,26 +1441,26 @@ sal_Bool UnoFixedHyperlinkControl::isTransparent() throw(uno::RuntimeException)
return sal_True;
}
-void UnoFixedHyperlinkControl::setText( const ::rtl::OUString& Text ) throw(uno::RuntimeException)
+void UnoFixedHyperlinkControl::setText( const OUString& Text ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= Text;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
}
-::rtl::OUString UnoFixedHyperlinkControl::getText() throw(uno::RuntimeException)
+OUString UnoFixedHyperlinkControl::getText() throw(uno::RuntimeException)
{
return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL );
}
-void UnoFixedHyperlinkControl::setURL( const ::rtl::OUString& URL ) throw(::com::sun::star::uno::RuntimeException)
+void UnoFixedHyperlinkControl::setURL( const OUString& URL ) throw(::com::sun::star::uno::RuntimeException)
{
uno::Any aAny;
aAny <<= URL;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_URL ), aAny, sal_True );
}
-::rtl::OUString UnoFixedHyperlinkControl::getURL( ) throw(::com::sun::star::uno::RuntimeException)
+OUString UnoFixedHyperlinkControl::getURL( ) throw(::com::sun::star::uno::RuntimeException)
{
return ImplGetPropertyValue_UString( BASEPROPERTY_URL );
}
@@ -1544,9 +1544,9 @@ UnoControlFixedTextModel::UnoControlFixedTextModel( const Reference< XComponentC
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXFixedText );
}
-::rtl::OUString UnoControlFixedTextModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlFixedTextModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlFixedTextModel );
+ return OUString::createFromAscii( szServiceName_UnoControlFixedTextModel );
}
uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1554,7 +1554,7 @@ uno::Any UnoControlFixedTextModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlFixedText );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlFixedText );
return aAny;
}
else if ( nPropId == BASEPROPERTY_BORDER )
@@ -1596,9 +1596,9 @@ UnoFixedTextControl::UnoFixedTextControl()
maComponentInfos.nHeight = 12;
}
-::rtl::OUString UnoFixedTextControl::GetComponentServiceName()
+OUString UnoFixedTextControl::GetComponentServiceName()
{
- return ::rtl::OUString("fixedtext");
+ return OUString("fixedtext");
}
// uno::XInterface
@@ -1622,14 +1622,14 @@ sal_Bool UnoFixedTextControl::isTransparent() throw(uno::RuntimeException)
return sal_True;
}
-void UnoFixedTextControl::setText( const ::rtl::OUString& Text ) throw(uno::RuntimeException)
+void UnoFixedTextControl::setText( const OUString& Text ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= Text;
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LABEL ), aAny, sal_True );
}
-::rtl::OUString UnoFixedTextControl::getText() throw(uno::RuntimeException)
+OUString UnoFixedTextControl::getText() throw(uno::RuntimeException)
{
return ImplGetPropertyValue_UString( BASEPROPERTY_LABEL );
}
@@ -1685,9 +1685,9 @@ UnoControlGroupBoxModel::UnoControlGroupBoxModel( const Reference< XComponentCon
ImplRegisterProperty( BASEPROPERTY_CONTEXT_WRITING_MODE );
}
-::rtl::OUString UnoControlGroupBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlGroupBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlGroupBoxModel );
+ return OUString::createFromAscii( szServiceName_UnoControlGroupBoxModel );
}
uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -1695,7 +1695,7 @@ uno::Any UnoControlGroupBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlGroupBox );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlGroupBox );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -1729,9 +1729,9 @@ UnoGroupBoxControl::UnoGroupBoxControl()
maComponentInfos.nHeight = 100;
}
-::rtl::OUString UnoGroupBoxControl::GetComponentServiceName()
+OUString UnoGroupBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString("groupbox");
+ return OUString("groupbox");
}
sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
@@ -1744,8 +1744,8 @@ sal_Bool UnoGroupBoxControl::isTransparent() throw(uno::RuntimeException)
// =====================================================================================================================
struct ListItem
{
- ::rtl::OUString ItemText;
- ::rtl::OUString ItemImageURL;
+ OUString ItemText;
+ OUString ItemImageURL;
Any ItemData;
ListItem()
@@ -1755,7 +1755,7 @@ struct ListItem
{
}
- ListItem( const ::rtl::OUString& i_rItemText )
+ ListItem( const OUString& i_rItemText )
:ItemText( i_rItemText )
,ItemImageURL()
,ItemData()
@@ -1763,7 +1763,7 @@ struct ListItem
}
};
-typedef beans::Pair< ::rtl::OUString, ::rtl::OUString > UnoListItem;
+typedef beans::Pair< OUString, OUString > UnoListItem;
struct StripItemData : public ::std::unary_function< ListItem, UnoListItem >
{
@@ -1787,7 +1787,7 @@ struct UnoControlListBoxModel_Data
const ListItem& getItem( const sal_Int32 i_nIndex ) const
{
if ( ( i_nIndex < 0 ) || ( i_nIndex >= sal_Int32( m_aListItems.size() ) ) )
- throw IndexOutOfBoundsException( ::rtl::OUString(), m_rAntiImpl );
+ throw IndexOutOfBoundsException( OUString(), m_rAntiImpl );
return m_aListItems[ i_nIndex ];
}
@@ -1799,7 +1799,7 @@ struct UnoControlListBoxModel_Data
ListItem& insertItem( const sal_Int32 i_nIndex )
{
if ( ( i_nIndex < 0 ) || ( i_nIndex > sal_Int32( m_aListItems.size() ) ) )
- throw IndexOutOfBoundsException( ::rtl::OUString(), m_rAntiImpl );
+ throw IndexOutOfBoundsException( OUString(), m_rAntiImpl );
return *m_aListItems.insert( m_aListItems.begin() + i_nIndex, ListItem() );
}
@@ -1823,7 +1823,7 @@ struct UnoControlListBoxModel_Data
void removeItem( const sal_Int32 i_nIndex )
{
if ( ( i_nIndex < 0 ) || ( i_nIndex >= sal_Int32( m_aListItems.size() ) ) )
- throw IndexOutOfBoundsException( ::rtl::OUString(), m_rAntiImpl );
+ throw IndexOutOfBoundsException( OUString(), m_rAntiImpl );
m_aListItems.erase( m_aListItems.begin() + i_nIndex );
}
@@ -1868,9 +1868,9 @@ UnoControlListBoxModel::~UnoControlListBoxModel()
}
IMPL_SERVICEINFO_DERIVED( UnoControlListBoxModel, UnoControlModel, szServiceName2_UnoControlListBoxModel )
// ---------------------------------------------------------------------------------------------------------------------
-::rtl::OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlListBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlListBoxModel );
+ return OUString::createFromAscii( szServiceName_UnoControlListBoxModel );
}
// ---------------------------------------------------------------------------------------------------------------------
@@ -1879,7 +1879,7 @@ uno::Any UnoControlListBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlListBox );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlListBox );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -1908,9 +1908,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlListBoxModel::getPropertySet
// ---------------------------------------------------------------------------------------------------------------------
namespace
{
- struct CreateListItem : public ::std::unary_function< ::rtl::OUString, ListItem >
+ struct CreateListItem : public ::std::unary_function< OUString, ListItem >
{
- ListItem operator()( const ::rtl::OUString& i_rItemText )
+ ListItem operator()( const OUString& i_rItemText )
{
return ListItem( i_rItemText );
}
@@ -1933,7 +1933,7 @@ void SAL_CALL UnoControlListBoxModel::setFastPropertyValue_NoBroadcast( sal_Int3
if ( !m_pData->m_bSettingLegacyProperty )
{
// synchronize the legacy StringItemList property with our list items
- Sequence< ::rtl::OUString > aStringItemList;
+ Sequence< OUString > aStringItemList;
Any aPropValue;
getFastPropertyValue( aPropValue, BASEPROPERTY_STRINGITEMLIST );
OSL_VERIFY( aPropValue >>= aStringItemList );
@@ -1978,7 +1978,7 @@ void UnoControlListBoxModel::ImplNormalizePropertySequence( const sal_Int32 _nCo
}
// ---------------------------------------------------------------------------------------------------------------------
-void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const ::rtl::OUString& i_rItemText, const ::rtl::OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
+void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
// SYNCHRONIZED ----->
@@ -1991,26 +1991,26 @@ void SAL_CALL UnoControlListBoxModel::insertItem( ::sal_Int32 i_nPosition, const
}
// ---------------------------------------------------------------------------------------------------------------------
-void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const ::rtl::OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException)
+void SAL_CALL UnoControlListBoxModel::insertItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
// SYNCHRONIZED ----->
ListItem& rItem( m_pData->insertItem( i_nPosition ) );
rItem.ItemText = i_rItemText;
- impl_handleInsert( i_nPosition, i_rItemText, ::boost::optional< ::rtl::OUString >(), aGuard );
+ impl_handleInsert( i_nPosition, i_rItemText, ::boost::optional< OUString >(), aGuard );
// <----- SYNCHRONIZED
}
// ---------------------------------------------------------------------------------------------------------------------
-void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const ::rtl::OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
+void SAL_CALL UnoControlListBoxModel::insertItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
// SYNCHRONIZED ----->
ListItem& rItem( m_pData->insertItem( i_nPosition ) );
rItem.ItemImageURL = i_rItemImageURL;
- impl_handleInsert( i_nPosition, ::boost::optional< ::rtl::OUString >(), i_rItemImageURL, aGuard );
+ impl_handleInsert( i_nPosition, ::boost::optional< OUString >(), i_rItemImageURL, aGuard );
// <----- SYNCHRONIZED
}
@@ -2037,31 +2037,31 @@ void SAL_CALL UnoControlListBoxModel::removeAllItems( ) throw (::com::sun::star
}
// ---------------------------------------------------------------------------------------------------------------------
-void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const ::rtl::OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException)
+void SAL_CALL UnoControlListBoxModel::setItemText( ::sal_Int32 i_nPosition, const OUString& i_rItemText ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
// SYNCHRONIZED ----->
ListItem& rItem( m_pData->getItem( i_nPosition ) );
rItem.ItemText = i_rItemText;
- impl_handleModify( i_nPosition, i_rItemText, ::boost::optional< ::rtl::OUString >(), aGuard );
+ impl_handleModify( i_nPosition, i_rItemText, ::boost::optional< OUString >(), aGuard );
// <----- SYNCHRONIZED
}
// ---------------------------------------------------------------------------------------------------------------------
-void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const ::rtl::OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
+void SAL_CALL UnoControlListBoxModel::setItemImage( ::sal_Int32 i_nPosition, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
// SYNCHRONIZED ----->
ListItem& rItem( m_pData->getItem( i_nPosition ) );
rItem.ItemImageURL = i_rItemImageURL;
- impl_handleModify( i_nPosition, ::boost::optional< ::rtl::OUString >(), i_rItemImageURL, aGuard );
+ impl_handleModify( i_nPosition, ::boost::optional< OUString >(), i_rItemImageURL, aGuard );
// <----- SYNCHRONIZED
}
// ---------------------------------------------------------------------------------------------------------------------
-void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const ::rtl::OUString& i_rItemText, const ::rtl::OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
+void SAL_CALL UnoControlListBoxModel::setItemTextAndImage( ::sal_Int32 i_nPosition, const OUString& i_rItemText, const OUString& i_rItemImageURL ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::ClearableMutexGuard aGuard( GetMutex() );
// SYNCHRONIZED ----->
@@ -2082,7 +2082,7 @@ void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, cons
}
// ---------------------------------------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
+OUString SAL_CALL UnoControlListBoxModel::getItemText( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::MutexGuard aGuard( GetMutex() );
const ListItem& rItem( m_pData->getItem( i_nPosition ) );
@@ -2090,7 +2090,7 @@ void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, cons
}
// ---------------------------------------------------------------------------------------------------------------------
-::rtl::OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
+OUString SAL_CALL UnoControlListBoxModel::getItemImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::MutexGuard aGuard( GetMutex() );
const ListItem& rItem( m_pData->getItem( i_nPosition ) );
@@ -2098,11 +2098,11 @@ void SAL_CALL UnoControlListBoxModel::setItemData( ::sal_Int32 i_nPosition, cons
}
// ---------------------------------------------------------------------------------------------------------------------
-beans::Pair< ::rtl::OUString, ::rtl::OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
+beans::Pair< OUString, OUString > SAL_CALL UnoControlListBoxModel::getItemTextAndImage( ::sal_Int32 i_nPosition ) throw (IndexOutOfBoundsException, RuntimeException)
{
::osl::MutexGuard aGuard( GetMutex() );
const ListItem& rItem( m_pData->getItem( i_nPosition ) );
- return beans::Pair< ::rtl::OUString, ::rtl::OUString >( rItem.ItemText, rItem.ItemImageURL );
+ return beans::Pair< OUString, OUString >( rItem.ItemText, rItem.ItemImageURL );
}
// ---------------------------------------------------------------------------------------------------------------------
@@ -2114,7 +2114,7 @@ Any SAL_CALL UnoControlListBoxModel::getItemData( ::sal_Int32 i_nPosition ) thro
}
// ---------------------------------------------------------------------------------------------------------------------
-Sequence< beans::Pair< ::rtl::OUString, ::rtl::OUString > > SAL_CALL UnoControlListBoxModel::getAllItems( ) throw (RuntimeException)
+Sequence< beans::Pair< OUString, OUString > > SAL_CALL UnoControlListBoxModel::getAllItems( ) throw (RuntimeException)
{
::osl::MutexGuard aGuard( GetMutex() );
return m_pData->getAllItems();
@@ -2135,9 +2135,9 @@ void SAL_CALL UnoControlListBoxModel::removeItemListListener( const uno::Referen
}
// ---------------------------------------------------------------------------------------------------------------------
-void UnoControlListBoxModel::impl_getStringItemList( ::std::vector< ::rtl::OUString >& o_rStringItems ) const
+void UnoControlListBoxModel::impl_getStringItemList( ::std::vector< OUString >& o_rStringItems ) const
{
- Sequence< ::rtl::OUString > aStringItemList;
+ Sequence< OUString > aStringItemList;
Any aPropValue;
getFastPropertyValue( aPropValue, BASEPROPERTY_STRINGITEMLIST );
OSL_VERIFY( aPropValue >>= aStringItemList );
@@ -2151,9 +2151,9 @@ void UnoControlListBoxModel::impl_getStringItemList( ::std::vector< ::rtl::OUStr
}
// ---------------------------------------------------------------------------------------------------------------------
-void UnoControlListBoxModel::impl_setStringItemList_nolck( const ::std::vector< ::rtl::OUString >& i_rStringItems )
+void UnoControlListBoxModel::impl_setStringItemList_nolck( const ::std::vector< OUString >& i_rStringItems )
{
- Sequence< ::rtl::OUString > aStringItems( i_rStringItems.size() );
+ Sequence< OUString > aStringItems( i_rStringItems.size() );
::std::copy(
i_rStringItems.begin(),
i_rStringItems.end(),
@@ -2173,17 +2173,17 @@ void UnoControlListBoxModel::impl_setStringItemList_nolck( const ::std::vector<
}
// ---------------------------------------------------------------------------------------------------------------------
-void UnoControlListBoxModel::impl_handleInsert( const sal_Int32 i_nItemPosition, const ::boost::optional< ::rtl::OUString >& i_rItemText,
- const ::boost::optional< ::rtl::OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify )
+void UnoControlListBoxModel::impl_handleInsert( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText,
+ const ::boost::optional< OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify )
{
// SYNCHRONIZED ----->
// sync with legacy StringItemList property
- ::std::vector< ::rtl::OUString > aStringItems;
+ ::std::vector< OUString > aStringItems;
impl_getStringItemList( aStringItems );
OSL_ENSURE( size_t( i_nItemPosition ) <= aStringItems.size(), "UnoControlListBoxModel::impl_handleInsert" );
if ( size_t( i_nItemPosition ) <= aStringItems.size() )
{
- const ::rtl::OUString sItemText( !!i_rItemText ? *i_rItemText : ::rtl::OUString() );
+ const OUString sItemText( !!i_rItemText ? *i_rItemText : OUString() );
aStringItems.insert( aStringItems.begin() + i_nItemPosition, sItemText );
}
@@ -2201,7 +2201,7 @@ void UnoControlListBoxModel::impl_handleRemove( const sal_Int32 i_nItemPosition,
// SYNCHRONIZED ----->
const bool bAllItems = ( i_nItemPosition < 0 );
// sync with legacy StringItemList property
- ::std::vector< ::rtl::OUString > aStringItems;
+ ::std::vector< OUString > aStringItems;
impl_getStringItemList( aStringItems );
if ( !bAllItems )
{
@@ -2228,20 +2228,20 @@ void UnoControlListBoxModel::impl_handleRemove( const sal_Int32 i_nItemPosition,
}
else
{
- impl_notifyItemListEvent_nolck( i_nItemPosition, ::boost::optional< ::rtl::OUString >(), ::boost::optional< ::rtl::OUString >(),
+ impl_notifyItemListEvent_nolck( i_nItemPosition, ::boost::optional< OUString >(), ::boost::optional< OUString >(),
&XItemListListener::listItemRemoved );
}
}
// ---------------------------------------------------------------------------------------------------------------------
-void UnoControlListBoxModel::impl_handleModify( const sal_Int32 i_nItemPosition, const ::boost::optional< ::rtl::OUString >& i_rItemText,
- const ::boost::optional< ::rtl::OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify )
+void UnoControlListBoxModel::impl_handleModify( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText,
+ const ::boost::optional< OUString >& i_rItemImageURL, ::osl::ClearableMutexGuard& i_rClearBeforeNotify )
{
// SYNCHRONIZED ----->
if ( !!i_rItemText )
{
// sync with legacy StringItemList property
- ::std::vector< ::rtl::OUString > aStringItems;
+ ::std::vector< OUString > aStringItems;
impl_getStringItemList( aStringItems );
OSL_ENSURE( size_t( i_nItemPosition ) < aStringItems.size(), "UnoControlListBoxModel::impl_handleModify" );
if ( size_t( i_nItemPosition ) < aStringItems.size() )
@@ -2264,8 +2264,8 @@ void UnoControlListBoxModel::impl_handleModify( const sal_Int32 i_nItemPosition,
}
// ---------------------------------------------------------------------------------------------------------------------
-void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_nItemPosition, const ::boost::optional< ::rtl::OUString >& i_rItemText,
- const ::boost::optional< ::rtl::OUString >& i_rItemImageURL,
+void UnoControlListBoxModel::impl_notifyItemListEvent_nolck( const sal_Int32 i_nItemPosition, const ::boost::optional< OUString >& i_rItemText,
+ const ::boost::optional< OUString >& i_rItemImageURL,
void ( SAL_CALL XItemListListener::*NotificationMethod )( const ItemListEvent& ) )
{
ItemListEvent aEvent;
@@ -2297,9 +2297,9 @@ UnoListBoxControl::UnoListBoxControl()
maComponentInfos.nHeight = 12;
}
-::rtl::OUString UnoListBoxControl::GetComponentServiceName()
+OUString UnoListBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString("listbox");
+ return OUString("listbox");
}
IMPL_SERVICEINFO_DERIVED( UnoListBoxControl, UnoControlBase, szServiceName2_UnoControlListBox )
@@ -2339,11 +2339,11 @@ void UnoListBoxControl::updateFromModel()
// notify the change of the SelectedItems property, again. While our base class, in updateFromModel,
// already did this, our peer(s) can only legitimately set the selection after they have the string
// item list, which we just notified with the itemListChanged call.
- const ::rtl::OUString sSelectedItemsPropName( GetPropertyName( BASEPROPERTY_SELECTEDITEMS ) );
+ const OUString sSelectedItemsPropName( GetPropertyName( BASEPROPERTY_SELECTEDITEMS ) );
ImplSetPeerProperty( sSelectedItemsPropName, ImplGetPropertyValue( sSelectedItemsPropName ) );
}
-void UnoListBoxControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
+void UnoListBoxControl::ImplSetPeerProperty( const OUString& rPropName, const uno::Any& rVal )
{
if ( rPropName == GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) )
// do not forward this to our peer. We are a XItemListListener at our model, and changes in the string item
@@ -2395,25 +2395,25 @@ void UnoListBoxControl::removeItemListener(const uno::Reference < awt::XItemList
maItemListeners.removeInterface( l );
}
-void UnoListBoxControl::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException)
+void UnoListBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString> aSeq( 1 );
+ uno::Sequence< OUString> aSeq( 1 );
aSeq.getArray()[0] = aItem;
addItems( aSeq, nPos );
}
-void UnoListBoxControl::addItems( const uno::Sequence< ::rtl::OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException)
+void UnoListBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException)
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
sal_uInt16 nNewItems = (sal_uInt16)aItems.getLength();
sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength();
sal_uInt16 nNewLen = nOldLen + nNewItems;
- uno::Sequence< ::rtl::OUString> aNewSeq( nNewLen );
- ::rtl::OUString* pNewData = aNewSeq.getArray();
- ::rtl::OUString* pOldData = aSeq.getArray();
+ uno::Sequence< OUString> aNewSeq( nNewLen );
+ OUString* pNewData = aNewSeq.getArray();
+ OUString* pOldData = aSeq.getArray();
if ( ( nPos < 0 ) || ( nPos > nOldLen ) )
nPos = (sal_uInt16) nOldLen;
@@ -2439,7 +2439,7 @@ void UnoListBoxControl::addItems( const uno::Sequence< ::rtl::OUString>& aItems,
void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException)
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength();
if ( nOldLen && ( nPos < nOldLen ) )
@@ -2449,9 +2449,9 @@ void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(un
sal_uInt16 nNewLen = nOldLen - nCount;
- uno::Sequence< ::rtl::OUString> aNewSeq( nNewLen );
- ::rtl::OUString* pNewData = aNewSeq.getArray();
- ::rtl::OUString* pOldData = aSeq.getArray();
+ uno::Sequence< OUString> aNewSeq( nNewLen );
+ OUString* pNewData = aNewSeq.getArray();
+ OUString* pOldData = aSeq.getArray();
sal_uInt16 n;
// Items vor der Entfern-Position
@@ -2471,26 +2471,26 @@ void UnoListBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(un
sal_Int16 UnoListBoxControl::getItemCount() throw(uno::RuntimeException)
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
return (sal_Int16)aSeq.getLength();
}
-::rtl::OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException)
+OUString UnoListBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException)
{
- ::rtl::OUString aItem;
+ OUString aItem;
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
if ( nPos < aSeq.getLength() )
aItem = aSeq.getConstArray()[nPos];
return aItem;
}
-uno::Sequence< ::rtl::OUString> UnoListBoxControl::getItems() throw(uno::RuntimeException)
+uno::Sequence< OUString> UnoListBoxControl::getItems() throw(uno::RuntimeException)
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
return aSeq;
}
@@ -2517,9 +2517,9 @@ uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::Run
return aSeq;
}
-::rtl::OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException)
+OUString UnoListBoxControl::getSelectedItem() throw(uno::RuntimeException)
{
- ::rtl::OUString aItem;
+ OUString aItem;
if ( getPeer().is() )
{
uno::Reference < awt::XListBox > xListBox( getPeer(), uno::UNO_QUERY );
@@ -2528,9 +2528,9 @@ uno::Sequence<sal_Int16> UnoListBoxControl::getSelectedItemsPos() throw(uno::Run
return aItem;
}
-uno::Sequence< ::rtl::OUString> UnoListBoxControl::getSelectedItems() throw(uno::RuntimeException)
+uno::Sequence< OUString> UnoListBoxControl::getSelectedItems() throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
if ( getPeer().is() )
{
uno::Reference < awt::XListBox > xListBox( getPeer(), uno::UNO_QUERY );
@@ -2559,7 +2559,7 @@ void UnoListBoxControl::selectItemsPos( const uno::Sequence<sal_Int16>& aPositio
ImplUpdateSelectedItemsProperty();
}
-void UnoListBoxControl::selectItem( const ::rtl::OUString& aItem, sal_Bool bSelect ) throw(uno::RuntimeException)
+void UnoListBoxControl::selectItem( const OUString& aItem, sal_Bool bSelect ) throw(uno::RuntimeException)
{
if ( getPeer().is() )
{
@@ -2738,9 +2738,9 @@ uno::Reference< beans::XPropertySetInfo > UnoControlComboBoxModel::getPropertySe
}
-::rtl::OUString UnoControlComboBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlComboBoxModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlComboBoxModel );
+ return OUString::createFromAscii( szServiceName_UnoControlComboBoxModel );
}
void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const uno::Any& rValue ) throw (uno::Exception)
{
@@ -2749,7 +2749,7 @@ void SAL_CALL UnoControlComboBoxModel::setFastPropertyValue_NoBroadcast( sal_Int
if ( nHandle == BASEPROPERTY_STRINGITEMLIST && !m_pData->m_bSettingLegacyProperty)
{
// synchronize the legacy StringItemList property with our list items
- Sequence< ::rtl::OUString > aStringItemList;
+ Sequence< OUString > aStringItemList;
Any aPropValue;
getFastPropertyValue( aPropValue, BASEPROPERTY_STRINGITEMLIST );
OSL_VERIFY( aPropValue >>= aStringItemList );
@@ -2779,7 +2779,7 @@ uno::Any UnoControlComboBoxModel::ImplGetDefaultValue( sal_uInt16 nPropId ) cons
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlComboBox );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlComboBox );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -2798,9 +2798,9 @@ UnoComboBoxControl::UnoComboBoxControl()
}
IMPL_SERVICEINFO_DERIVED( UnoComboBoxControl, UnoEditControl, szServiceName2_UnoControlComboBox )
-::rtl::OUString UnoComboBoxControl::GetComponentServiceName()
+OUString UnoComboBoxControl::GetComponentServiceName()
{
- return ::rtl::OUString("combobox");
+ return OUString("combobox");
}
void UnoComboBoxControl::dispose() throw(uno::RuntimeException)
@@ -2845,7 +2845,7 @@ void UnoComboBoxControl::updateFromModel()
EventObject aEvent( getModel() );
xItemListListener->itemListChanged( aEvent );
}
-void UnoComboBoxControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
+void UnoComboBoxControl::ImplSetPeerProperty( const OUString& rPropName, const uno::Any& rVal )
{
if ( rPropName == GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) )
// do not forward this to our peer. We are a XItemListListener at our model, and changes in the string item
@@ -2986,25 +2986,25 @@ void SAL_CALL UnoComboBoxControl::itemListChanged( const lang::EventObject& i_rE
xPeerListener->itemListChanged( i_rEvent );
}
-void UnoComboBoxControl::addItem( const ::rtl::OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException)
+void UnoComboBoxControl::addItem( const OUString& aItem, sal_Int16 nPos ) throw(uno::RuntimeException)
{
- uno::Sequence< ::rtl::OUString> aSeq( 1 );
+ uno::Sequence< OUString> aSeq( 1 );
aSeq.getArray()[0] = aItem;
addItems( aSeq, nPos );
}
-void UnoComboBoxControl::addItems( const uno::Sequence< ::rtl::OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException)
+void UnoComboBoxControl::addItems( const uno::Sequence< OUString>& aItems, sal_Int16 nPos ) throw(uno::RuntimeException)
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
sal_uInt16 nNewItems = (sal_uInt16)aItems.getLength();
sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength();
sal_uInt16 nNewLen = nOldLen + nNewItems;
- uno::Sequence< ::rtl::OUString> aNewSeq( nNewLen );
- ::rtl::OUString* pNewData = aNewSeq.getArray();
- const ::rtl::OUString* pOldData = aSeq.getConstArray();
+ uno::Sequence< OUString> aNewSeq( nNewLen );
+ OUString* pNewData = aNewSeq.getArray();
+ const OUString* pOldData = aSeq.getConstArray();
if ( ( nPos < 0 ) || ( nPos > nOldLen ) )
nPos = (sal_uInt16) nOldLen;
@@ -3030,7 +3030,7 @@ void UnoComboBoxControl::addItems( const uno::Sequence< ::rtl::OUString>& aItems
void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(uno::RuntimeException)
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
sal_uInt16 nOldLen = (sal_uInt16)aSeq.getLength();
if ( nOldLen && ( nPos < nOldLen ) )
@@ -3040,9 +3040,9 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(u
sal_uInt16 nNewLen = nOldLen - nCount;
- uno::Sequence< ::rtl::OUString> aNewSeq( nNewLen );
- ::rtl::OUString* pNewData = aNewSeq.getArray();
- ::rtl::OUString* pOldData = aSeq.getArray();
+ uno::Sequence< OUString> aNewSeq( nNewLen );
+ OUString* pNewData = aNewSeq.getArray();
+ OUString* pOldData = aSeq.getArray();
sal_uInt16 n;
// items before the deletion position
@@ -3062,26 +3062,26 @@ void UnoComboBoxControl::removeItems( sal_Int16 nPos, sal_Int16 nCount ) throw(u
sal_Int16 UnoComboBoxControl::getItemCount() throw(uno::RuntimeException)
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
return (sal_Int16)aSeq.getLength();
}
-::rtl::OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException)
+OUString UnoComboBoxControl::getItem( sal_Int16 nPos ) throw(uno::RuntimeException)
{
- ::rtl::OUString aItem;
+ OUString aItem;
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
if ( nPos < aSeq.getLength() )
aItem = aSeq.getConstArray()[nPos];
return aItem;
}
-uno::Sequence< ::rtl::OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeException)
+uno::Sequence< OUString> UnoComboBoxControl::getItems() throw(uno::RuntimeException)
{
uno::Any aVal = ImplGetPropertyValue( GetPropertyName( BASEPROPERTY_STRINGITEMLIST ) );
- uno::Sequence< ::rtl::OUString> aSeq;
+ uno::Sequence< OUString> aSeq;
aVal >>= aSeq;
return aSeq;
}
@@ -3200,9 +3200,9 @@ UnoControlDateFieldModel::UnoControlDateFieldModel( const Reference< XComponentC
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXDateField );
}
-::rtl::OUString UnoControlDateFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlDateFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlDateFieldModel );
+ return OUString::createFromAscii( szServiceName_UnoControlDateFieldModel );
}
uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -3210,7 +3210,7 @@ uno::Any UnoControlDateFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlDateField );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlDateField );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -3248,9 +3248,9 @@ UnoDateFieldControl::UnoDateFieldControl()
mbLongFormat = 2;
}
-::rtl::OUString UnoDateFieldControl::GetComponentServiceName()
+OUString UnoDateFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString("datefield");
+ return OUString("datefield");
}
// uno::XInterface
@@ -3286,7 +3286,7 @@ void UnoDateFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
// also change the text property (#i25106#)
if ( xPeer.is() )
{
- ::rtl::OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT );
+ OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT );
ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), sal_False );
}
@@ -3442,9 +3442,9 @@ UnoControlTimeFieldModel::UnoControlTimeFieldModel( const Reference< XComponentC
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXTimeField );
}
-::rtl::OUString UnoControlTimeFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlTimeFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlTimeFieldModel );
+ return OUString::createFromAscii( szServiceName_UnoControlTimeFieldModel );
}
uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -3452,7 +3452,7 @@ uno::Any UnoControlTimeFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlTimeField );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlTimeField );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -3489,9 +3489,9 @@ UnoTimeFieldControl::UnoTimeFieldControl()
mnLast = Time( 23, 59, 59, 99 ).GetTime();
}
-::rtl::OUString UnoTimeFieldControl::GetComponentServiceName()
+OUString UnoTimeFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString("timefield");
+ return OUString("timefield");
}
// uno::XInterface
@@ -3521,7 +3521,7 @@ void UnoTimeFieldControl::textChanged( const awt::TextEvent& e ) throw(uno::Runt
{
// also change the text property (#i25106#)
uno::Reference< awt::XVclWindowPeer > xPeer( getPeer(), uno::UNO_QUERY );
- ::rtl::OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT );
+ OUString sTextPropertyName = GetPropertyName( BASEPROPERTY_TEXT );
ImplSetPropertyValue( sTextPropertyName, xPeer->getProperty( sTextPropertyName ), sal_False );
// re-calc the Time property
@@ -3643,9 +3643,9 @@ UnoControlNumericFieldModel::UnoControlNumericFieldModel( const Reference< XComp
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXNumericField );
}
-::rtl::OUString UnoControlNumericFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlNumericFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlNumericFieldModel );
+ return OUString::createFromAscii( szServiceName_UnoControlNumericFieldModel );
}
uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -3653,7 +3653,7 @@ uno::Any UnoControlNumericFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlNumericField );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlNumericField );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -3690,9 +3690,9 @@ UnoNumericFieldControl::UnoNumericFieldControl()
mnLast = 0x7FFFFFFF;
}
-::rtl::OUString UnoNumericFieldControl::GetComponentServiceName()
+OUString UnoNumericFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString("numericfield");
+ return OUString("numericfield");
}
// uno::XInterface
@@ -3841,9 +3841,9 @@ UnoControlCurrencyFieldModel::UnoControlCurrencyFieldModel( const Reference< XCo
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXCurrencyField );
}
-::rtl::OUString UnoControlCurrencyFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlCurrencyFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlCurrencyFieldModel );
+ return OUString::createFromAscii( szServiceName_UnoControlCurrencyFieldModel );
}
uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -3851,7 +3851,7 @@ uno::Any UnoControlCurrencyFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlCurrencyField );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlCurrencyField );
return aAny;
}
if ( nPropId == BASEPROPERTY_CURSYM_POSITION )
@@ -3892,9 +3892,9 @@ UnoCurrencyFieldControl::UnoCurrencyFieldControl()
mnLast = 0x7FFFFFFF;
}
-::rtl::OUString UnoCurrencyFieldControl::GetComponentServiceName()
+OUString UnoCurrencyFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString("longcurrencyfield");
+ return OUString("longcurrencyfield");
}
// uno::XInterface
@@ -4042,9 +4042,9 @@ UnoControlPatternFieldModel::UnoControlPatternFieldModel( const Reference< XComp
UNO_CONTROL_MODEL_REGISTER_PROPERTIES( VCLXPatternField );
}
-::rtl::OUString UnoControlPatternFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlPatternFieldModel::getServiceName() throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlPatternFieldModel );
+ return OUString::createFromAscii( szServiceName_UnoControlPatternFieldModel );
}
uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -4052,7 +4052,7 @@ uno::Any UnoControlPatternFieldModel::ImplGetDefaultValue( sal_uInt16 nPropId )
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlPatternField );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlPatternField );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -4085,26 +4085,26 @@ UnoPatternFieldControl::UnoPatternFieldControl()
{
}
-::rtl::OUString UnoPatternFieldControl::GetComponentServiceName()
+OUString UnoPatternFieldControl::GetComponentServiceName()
{
- return ::rtl::OUString("patternfield");
+ return OUString("patternfield");
}
-void UnoPatternFieldControl::ImplSetPeerProperty( const ::rtl::OUString& rPropName, const uno::Any& rVal )
+void UnoPatternFieldControl::ImplSetPeerProperty( const OUString& rPropName, const uno::Any& rVal )
{
sal_uInt16 nType = GetPropertyId( rPropName );
if ( ( nType == BASEPROPERTY_TEXT ) || ( nType == BASEPROPERTY_EDITMASK ) || ( nType == BASEPROPERTY_LITERALMASK ) )
{
// These masks cannot be set consecutively
- ::rtl::OUString Text = ImplGetPropertyValue_UString( BASEPROPERTY_TEXT );
- ::rtl::OUString EditMask = ImplGetPropertyValue_UString( BASEPROPERTY_EDITMASK );
- ::rtl::OUString LiteralMask = ImplGetPropertyValue_UString( BASEPROPERTY_LITERALMASK );
+ OUString Text = ImplGetPropertyValue_UString( BASEPROPERTY_TEXT );
+ OUString EditMask = ImplGetPropertyValue_UString( BASEPROPERTY_EDITMASK );
+ OUString LiteralMask = ImplGetPropertyValue_UString( BASEPROPERTY_LITERALMASK );
uno::Reference < awt::XPatternField > xPF( getPeer(), uno::UNO_QUERY );
if (xPF.is())
{
// same comment as in UnoControl::ImplSetPeerProperty - see there
- ::rtl::OUString sText( Text );
+ OUString sText( Text );
ImplCheckLocalize( sText );
xPF->setString( sText );
xPF->setMasks( EditMask, LiteralMask );
@@ -4129,17 +4129,17 @@ IMPL_XTYPEPROVIDER_START( UnoPatternFieldControl )
UnoSpinFieldControl::getTypes()
IMPL_XTYPEPROVIDER_END
-void UnoPatternFieldControl::setString( const ::rtl::OUString& rString ) throw(uno::RuntimeException)
+void UnoPatternFieldControl::setString( const OUString& rString ) throw(uno::RuntimeException)
{
setText( rString );
}
-::rtl::OUString UnoPatternFieldControl::getString() throw(uno::RuntimeException)
+OUString UnoPatternFieldControl::getString() throw(uno::RuntimeException)
{
return getText();
}
-void UnoPatternFieldControl::setMasks( const ::rtl::OUString& EditMask, const ::rtl::OUString& LiteralMask ) throw(uno::RuntimeException)
+void UnoPatternFieldControl::setMasks( const OUString& EditMask, const OUString& LiteralMask ) throw(uno::RuntimeException)
{
uno::Any aAny;
aAny <<= EditMask;
@@ -4148,7 +4148,7 @@ void UnoPatternFieldControl::setMasks( const ::rtl::OUString& EditMask, const ::
ImplSetPropertyValue( GetPropertyName( BASEPROPERTY_LITERALMASK ), aAny, sal_True );
}
-void UnoPatternFieldControl::getMasks( ::rtl::OUString& EditMask, ::rtl::OUString& LiteralMask ) throw(uno::RuntimeException)
+void UnoPatternFieldControl::getMasks( OUString& EditMask, OUString& LiteralMask ) throw(uno::RuntimeException)
{
EditMask = ImplGetPropertyValue_UString( BASEPROPERTY_EDITMASK );
LiteralMask = ImplGetPropertyValue_UString( BASEPROPERTY_LITERALMASK );
@@ -4188,9 +4188,9 @@ UnoControlProgressBarModel::UnoControlProgressBarModel( const Reference< XCompon
ImplRegisterProperty( BASEPROPERTY_PROGRESSVALUE_MIN );
}
-::rtl::OUString UnoControlProgressBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlProgressBarModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlProgressBarModel );
+ return OUString::createFromAscii( szServiceName_UnoControlProgressBarModel );
}
uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -4198,7 +4198,7 @@ uno::Any UnoControlProgressBarModel::ImplGetDefaultValue( sal_uInt16 nPropId ) c
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlProgressBar );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlProgressBar );
return aAny;
}
@@ -4232,9 +4232,9 @@ UnoProgressBarControl::UnoProgressBarControl()
{
}
-::rtl::OUString UnoProgressBarControl::GetComponentServiceName()
+OUString UnoProgressBarControl::GetComponentServiceName()
{
- return ::rtl::OUString("ProgressBar");
+ return OUString("ProgressBar");
}
// uno::XInterface
@@ -4319,9 +4319,9 @@ UnoControlFixedLineModel::UnoControlFixedLineModel( const Reference< XComponentC
ImplRegisterProperty( BASEPROPERTY_PRINTABLE );
}
-::rtl::OUString UnoControlFixedLineModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
+OUString UnoControlFixedLineModel::getServiceName( ) throw(::com::sun::star::uno::RuntimeException)
{
- return ::rtl::OUString::createFromAscii( szServiceName_UnoControlFixedLineModel );
+ return OUString::createFromAscii( szServiceName_UnoControlFixedLineModel );
}
uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) const
@@ -4329,7 +4329,7 @@ uno::Any UnoControlFixedLineModel::ImplGetDefaultValue( sal_uInt16 nPropId ) con
if ( nPropId == BASEPROPERTY_DEFAULTCONTROL )
{
uno::Any aAny;
- aAny <<= ::rtl::OUString::createFromAscii( szServiceName_UnoControlFixedLine );
+ aAny <<= OUString::createFromAscii( szServiceName_UnoControlFixedLine );
return aAny;
}
return UnoControlModel::ImplGetDefaultValue( nPropId );
@@ -4363,9 +4363,9 @@ UnoFixedLineControl::UnoFixedLineControl()
maComponentInfos.nHeight = 100; // ??
}
-::rtl::OUString UnoFixedLineControl::GetComponentServiceName()
+OUString UnoFixedLineControl::GetComponentServiceName()
{
- return ::rtl::OUString("FixedLine");
+ return OUString("FixedLine");
}
sal_Bool UnoFixedLineControl::isTransparent() throw(uno::RuntimeException)
diff --git a/xmloff/inc/txtfldi.hxx b/xmloff/inc/txtfldi.hxx
index a78f77d69f58..691de3d07a46 100644
--- a/xmloff/inc/txtfldi.hxx
+++ b/xmloff/inc/txtfldi.hxx
@@ -125,16 +125,16 @@ enum XMLTextFieldAttrTokens
/// abstract class for text field import
class XMLTextFieldImportContext : public SvXMLImportContext
{
- const ::rtl::OUString sIsFixed;
+ const OUString sIsFixed;
// data members
- ::rtl::OUStringBuffer sContentBuffer; /// collect character data
- ::rtl::OUString sContent; /// character data after collection
- ::rtl::OUString sServiceName; /// service name for text field
+ OUStringBuffer sContentBuffer; /// collect character data
+ OUString sContent; /// character data after collection
+ OUString sServiceName; /// service name for text field
XMLTextImportHelper& rTextImportHelper; /// the import helper
protected:
- ::rtl::OUString sServicePrefix;
+ OUString sServicePrefix;
// data members for use in subclasses
sal_Bool bValid; /// ist dieses Feld gltig?
@@ -148,12 +148,12 @@ public:
XMLTextImportHelper& rHlp, /// Text import helper
const sal_Char* pService, /// name of SO API service
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& rLocalName); /// element name w/o prefix
+ const OUString& rLocalName); /// element name w/o prefix
virtual ~XMLTextFieldImportContext();
/// process character data: will be collected in member sContentBuffer
- virtual void Characters( const ::rtl::OUString& sContent );
+ virtual void Characters( const OUString& sContent );
/// parses attributes and calls ProcessAttribute
virtual void StartElement(
@@ -169,7 +169,7 @@ public:
SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrefix,
- const ::rtl::OUString& rName,
+ const OUString& rName,
sal_uInt16 nToken);
@@ -178,14 +178,14 @@ protected:
/// get helper
inline XMLTextImportHelper& GetImportHelper() { return rTextImportHelper; }
- inline ::rtl::OUString GetServiceName() { return sServiceName; }
- inline void SetServiceName(::rtl::OUString sStr) { sServiceName = sStr; }
+ inline OUString GetServiceName() { return sServiceName; }
+ inline void SetServiceName(OUString sStr) { sServiceName = sStr; }
- ::rtl::OUString GetContent();
+ OUString GetContent();
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue ) = 0;
+ const OUString& sAttrValue ) = 0;
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -195,7 +195,7 @@ protected:
/// create field from ServiceName
sal_Bool CreateField(::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & xField,
- const ::rtl::OUString& sServiceName);
+ const OUString& sServiceName);
/// force an update of the field's value
/// call update on optional XUptadeable interface; (disable Fixed property)
@@ -211,10 +211,10 @@ class XMLSenderFieldImportContext : public XMLTextFieldImportContext
sal_Int16 nSubType; /// API subtype for ExtUser field
- const ::rtl::OUString sEmpty; /// empty string
- const ::rtl::OUString sPropertyFixed;
- const ::rtl::OUString sPropertyFieldSubType;
- const ::rtl::OUString sPropertyContent;
+ const OUString sEmpty; /// empty string
+ const OUString sPropertyFixed;
+ const OUString sPropertyFieldSubType;
+ const OUString sPropertyContent;
protected:
@@ -230,7 +230,7 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName, /// element name w/o prefix
+ const OUString& sLocalName, /// element name w/o prefix
sal_uInt16 nToken); /// element token
protected:
@@ -242,7 +242,7 @@ protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -256,10 +256,10 @@ class XMLAuthorFieldImportContext : public XMLSenderFieldImportContext
{
sal_Bool bAuthorFullName;
- const ::rtl::OUString sServiceAuthor;
- const ::rtl::OUString sPropertyAuthorFullName;
- const ::rtl::OUString sPropertyFixed;
- const ::rtl::OUString sPropertyContent;
+ const OUString sServiceAuthor;
+ const OUString sPropertyAuthorFullName;
+ const OUString sPropertyFixed;
+ const OUString sPropertyContent;
public:
@@ -269,7 +269,7 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName, /// element name w/o prefix
+ const OUString& sLocalName, /// element name w/o prefix
sal_uInt16 nToken); /// element token
protected:
@@ -290,13 +290,13 @@ protected:
class XMLPlaceholderFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sEmpty; /// empty string
- const ::rtl::OUString sServiceJumpEdit;
- const ::rtl::OUString sPropertyPlaceholderType;
- const ::rtl::OUString sPropertyPlaceholder;
- const ::rtl::OUString sPropertyHint;
+ const OUString sEmpty; /// empty string
+ const OUString sServiceJumpEdit;
+ const OUString sPropertyPlaceholderType;
+ const OUString sPropertyPlaceholder;
+ const OUString sPropertyHint;
- ::rtl::OUString sDescription;
+ OUString sDescription;
sal_Int16 nPlaceholderType;
@@ -308,13 +308,13 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName); /// element name w/o prefix
+ const OUString& sLocalName); /// element name w/o prefix
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -326,13 +326,13 @@ class XMLTimeFieldImportContext : public XMLTextFieldImportContext
{
protected:
- const ::rtl::OUString sPropertyNumberFormat;
- const ::rtl::OUString sPropertyFixed;
- const ::rtl::OUString sPropertyDateTimeValue;
- const ::rtl::OUString sPropertyDateTime;
- const ::rtl::OUString sPropertyAdjust;
- const ::rtl::OUString sPropertyIsDate;
- const ::rtl::OUString sPropertyIsFixedLanguage;
+ const OUString sPropertyNumberFormat;
+ const OUString sPropertyFixed;
+ const OUString sPropertyDateTimeValue;
+ const OUString sPropertyDateTime;
+ const OUString sPropertyAdjust;
+ const OUString sPropertyIsDate;
+ const OUString sPropertyIsFixedLanguage;
double fTimeValue;
::com::sun::star::util::DateTime aDateTimeValue;
@@ -353,11 +353,11 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName); /// element name w/o prefix
+ const OUString& sLocalName); /// element name w/o prefix
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -379,22 +379,22 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName); /// element name w/o prefix
+ const OUString& sLocalName); /// element name w/o prefix
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
};
/** import page continuation fields (<text:page-continuation-string>) */
class XMLPageContinuationImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertySubType;
- const ::rtl::OUString sPropertyUserText;
- const ::rtl::OUString sPropertyNumberingType;
+ const OUString sPropertySubType;
+ const OUString sPropertyUserText;
+ const OUString sPropertyNumberingType;
- ::rtl::OUString sString; /// continuation string
+ OUString sString; /// continuation string
com::sun::star::text::PageNumberType eSelectPage; /// previous, current
/// or next page
sal_Bool sStringOK; /// continuation string encountered?
@@ -407,12 +407,12 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName); /// element name w/o prefix
+ const OUString& sLocalName); /// element name w/o prefix
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -424,12 +424,12 @@ public:
/** import page number fields (<text:page-number>) */
class XMLPageNumberImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertySubType;
- const ::rtl::OUString sPropertyNumberingType;
- const ::rtl::OUString sPropertyOffset;
+ const OUString sPropertySubType;
+ const OUString sPropertyNumberingType;
+ const OUString sPropertyOffset;
- ::rtl::OUString sNumberFormat;
- ::rtl::OUString sNumberSync;
+ OUString sNumberFormat;
+ OUString sNumberSync;
sal_Int16 nPageAdjust;
com::sun::star::text::PageNumberType eSelectPage; /// previous, current
/// or next page
@@ -443,12 +443,12 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName); /// element name w/o prefix
+ const OUString& sLocalName); /// element name w/o prefix
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -460,15 +460,15 @@ public:
/** superclass for database fields: handle database and table names */
class XMLDatabaseFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyDataBaseName;
- const ::rtl::OUString sPropertyDataBaseURL;
- const ::rtl::OUString sPropertyTableName;
- const ::rtl::OUString sPropertyDataCommandType;
- const ::rtl::OUString sPropertyIsVisible;
+ const OUString sPropertyDataBaseName;
+ const OUString sPropertyDataBaseURL;
+ const OUString sPropertyTableName;
+ const OUString sPropertyDataCommandType;
+ const OUString sPropertyIsVisible;
- ::rtl::OUString sDatabaseName;
- ::rtl::OUString sDatabaseURL;
- ::rtl::OUString sTableName;
+ OUString sDatabaseName;
+ OUString sDatabaseURL;
+ OUString sTableName;
sal_Int32 nCommandType;
sal_Bool bCommandTypeOK;
@@ -488,7 +488,7 @@ protected:
XMLTextImportHelper& rHlp,
const sal_Char* pServiceName,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName,
+ const OUString& sLocalName,
bool bUseDisplay );
public:
@@ -497,7 +497,7 @@ TYPEINFO();
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -507,7 +507,7 @@ TYPEINFO();
/// handle database-location children
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList );
};
@@ -522,20 +522,20 @@ public:
XMLDatabaseNameImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
};
/** import database next fields (<text:database-next>) */
class XMLDatabaseNextImportContext : public XMLDatabaseFieldImportContext
{
- const ::rtl::OUString sPropertyCondition;
- const ::rtl::OUString sTrue;
- ::rtl::OUString sCondition;
+ const OUString sPropertyCondition;
+ const OUString sTrue;
+ OUString sCondition;
sal_Bool bConditionOK;
protected:
@@ -545,7 +545,7 @@ protected:
XMLTextImportHelper& rHlp,
const sal_Char* pServiceName,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
public:
@@ -554,11 +554,11 @@ public:
XMLDatabaseNextImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -571,7 +571,7 @@ public:
/** import database select fields (<text:database-select>) */
class XMLDatabaseSelectImportContext : public XMLDatabaseNextImportContext
{
- const ::rtl::OUString sPropertySetNumber;
+ const OUString sPropertySetNumber;
sal_Int32 nNumber;
sal_Bool bNumberOK;
@@ -582,11 +582,11 @@ public:
XMLDatabaseSelectImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -598,10 +598,10 @@ public:
/** import database display number fields (<text:database-row-number>) */
class XMLDatabaseNumberImportContext : public XMLDatabaseFieldImportContext
{
- const ::rtl::OUString sPropertyNumberingType;
- const ::rtl::OUString sPropertySetNumber;
- ::rtl::OUString sNumberFormat;
- ::rtl::OUString sNumberSync;
+ const OUString sPropertyNumberingType;
+ const OUString sPropertySetNumber;
+ OUString sNumberFormat;
+ OUString sNumberSync;
sal_Int32 nValue;
sal_Bool bValueOK;
@@ -612,11 +612,11 @@ public:
XMLDatabaseNumberImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -628,10 +628,10 @@ public:
/** import docinfo fields with only fixed atribute */
class XMLSimpleDocInfoImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyFixed;
- const ::rtl::OUString sPropertyContent;
- const ::rtl::OUString sPropertyAuthor;
- const ::rtl::OUString sPropertyCurrentPresentation;
+ const OUString sPropertyFixed;
+ const OUString sPropertyContent;
+ const OUString sPropertyAuthor;
+ const OUString sPropertyCurrentPresentation;
protected:
sal_Bool bFixed;
@@ -645,7 +645,7 @@ public:
XMLSimpleDocInfoImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName,
+ const OUString& sLocalName,
sal_uInt16 nToken,
sal_Bool bContent,
sal_Bool bAuthor);
@@ -654,7 +654,7 @@ protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -669,9 +669,9 @@ protected:
/** import docinfo fields with date or time attributes and numberformats */
class XMLDateTimeDocInfoImportContext : public XMLSimpleDocInfoImportContext
{
- const ::rtl::OUString sPropertyNumberFormat;
- const ::rtl::OUString sPropertyIsDate;
- const ::rtl::OUString sPropertyIsFixedLanguage;
+ const OUString sPropertyNumberFormat;
+ const OUString sPropertyIsDate;
+ const OUString sPropertyIsFixedLanguage;
sal_Int32 nFormat;
sal_Bool bFormatOK;
@@ -686,14 +686,14 @@ public:
XMLDateTimeDocInfoImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName,
+ const OUString& sLocalName,
sal_uInt16 nToken);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -706,7 +706,7 @@ protected:
/** import revision field (<text:editing-cycles>) */
class XMLRevisionDocInfoImportContext : public XMLSimpleDocInfoImportContext
{
- const ::rtl::OUString sPropertyRevision;
+ const OUString sPropertyRevision;
public:
@@ -715,7 +715,7 @@ public:
XMLRevisionDocInfoImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName,
+ const OUString& sLocalName,
sal_uInt16 nToken);
protected:
@@ -732,9 +732,9 @@ protected:
class XMLUserDocInfoImportContext : public XMLSimpleDocInfoImportContext
{
rtl::OUString aName;
- const ::rtl::OUString sPropertyName;
- const ::rtl::OUString sPropertyNumberFormat;
- const ::rtl::OUString sPropertyIsFixedLanguage;
+ const OUString sPropertyName;
+ const OUString sPropertyNumberFormat;
+ const OUString sPropertyIsFixedLanguage;
sal_Int32 nFormat;
sal_Bool bFormatOK;
sal_Bool bIsDefaultLanguage;
@@ -746,14 +746,14 @@ public:
XMLUserDocInfoImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName,
+ const OUString& sLocalName,
sal_uInt16 nToken);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
virtual void PrepareField(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropertySet);
@@ -764,10 +764,10 @@ protected:
/** import hidden paragraph fields (<text:hidden-paragraph>) */
class XMLHiddenParagraphImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyCondition;
- const ::rtl::OUString sPropertyIsHidden;
+ const OUString sPropertyCondition;
+ const OUString sPropertyIsHidden;
- ::rtl::OUString sCondition;
+ OUString sCondition;
sal_Bool bIsHidden;
public:
@@ -777,13 +777,13 @@ public:
XMLHiddenParagraphImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -796,15 +796,15 @@ protected:
/** import conditional text fields (<text:conditional-text>) */
class XMLConditionalTextImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyCondition;
- const ::rtl::OUString sPropertyTrueContent;
- const ::rtl::OUString sPropertyFalseContent;
- const ::rtl::OUString sPropertyIsConditionTrue;
- const ::rtl::OUString sPropertyCurrentPresentation;
+ const OUString sPropertyCondition;
+ const OUString sPropertyTrueContent;
+ const OUString sPropertyFalseContent;
+ const OUString sPropertyIsConditionTrue;
+ const OUString sPropertyCurrentPresentation;
- ::rtl::OUString sCondition;
- ::rtl::OUString sTrueContent;
- ::rtl::OUString sFalseContent;
+ OUString sCondition;
+ OUString sTrueContent;
+ OUString sFalseContent;
sal_Bool bConditionOK;
sal_Bool bTrueOK;
@@ -818,13 +818,13 @@ public:
XMLConditionalTextImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -837,12 +837,12 @@ protected:
/** import conditional text fields (<text:hidden-text>) */
class XMLHiddenTextImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyCondition;
- const ::rtl::OUString sPropertyContent;
- const ::rtl::OUString sPropertyIsHidden;
+ const OUString sPropertyCondition;
+ const OUString sPropertyContent;
+ const OUString sPropertyIsHidden;
- ::rtl::OUString sCondition;
- ::rtl::OUString sString;
+ OUString sCondition;
+ OUString sString;
sal_Bool bConditionOK;
sal_Bool bStringOK;
@@ -855,13 +855,13 @@ public:
XMLHiddenTextImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -874,9 +874,9 @@ protected:
/** import file name fields (<text:file-name>) */
class XMLFileNameImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyFixed;
- const ::rtl::OUString sPropertyFileFormat;
- const ::rtl::OUString sPropertyCurrentPresentation;
+ const OUString sPropertyFixed;
+ const OUString sPropertyFileFormat;
+ const OUString sPropertyCurrentPresentation;
sal_Int16 nFormat;
sal_Bool bFixed;
@@ -888,13 +888,13 @@ public:
XMLFileNameImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -907,7 +907,7 @@ protected:
/** import document template name fields (<text:template-name>) */
class XMLTemplateNameImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyFileFormat;
+ const OUString sPropertyFileFormat;
sal_Int16 nFormat;
@@ -918,13 +918,13 @@ public:
XMLTemplateNameImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -936,8 +936,8 @@ protected:
/** import chapter fields (<text:chapter>) */
class XMLChapterImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyChapterFormat;
- const ::rtl::OUString sPropertyLevel;
+ const OUString sPropertyChapterFormat;
+ const OUString sPropertyLevel;
sal_Int16 nFormat;
sal_Int8 nLevel;
@@ -949,13 +949,13 @@ public:
XMLChapterImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -968,10 +968,10 @@ protected:
/** import count fields (<text:[XXX]-count>) */
class XMLCountFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyNumberingType;
+ const OUString sPropertyNumberingType;
- ::rtl::OUString sNumberFormat;
- ::rtl::OUString sLetterSync;
+ OUString sNumberFormat;
+ OUString sLetterSync;
sal_Bool bNumberFormatOK;
@@ -982,14 +982,14 @@ public:
XMLCountFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName,
+ const OUString& sLocalName,
sal_uInt16 nToken);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1003,10 +1003,10 @@ protected:
/** import page variable fields (<text:get-page-variable>) */
class XMLPageVarGetFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyNumberingType;
+ const OUString sPropertyNumberingType;
- ::rtl::OUString sNumberFormat;
- ::rtl::OUString sLetterSync;
+ OUString sNumberFormat;
+ OUString sLetterSync;
sal_Bool bNumberFormatOK;
@@ -1017,13 +1017,13 @@ public:
XMLPageVarGetFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1035,8 +1035,8 @@ protected:
/** import page variable fields (<text:get-page-variable>) */
class XMLPageVarSetFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyOn;
- const ::rtl::OUString sPropertyOffset;
+ const OUString sPropertyOn;
+ const OUString sPropertyOffset;
sal_Int16 nAdjust;
sal_Bool bActive;
@@ -1048,13 +1048,13 @@ public:
XMLPageVarSetFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1067,15 +1067,15 @@ protected:
class XMLMacroFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyHint;
- const ::rtl::OUString sPropertyMacroName;
- const ::rtl::OUString sPropertyScriptURL;
- const ::rtl::OUString sPropertyLibraryName;
+ const OUString sPropertyHint;
+ const OUString sPropertyMacroName;
+ const OUString sPropertyScriptURL;
+ const OUString sPropertyLibraryName;
- ::rtl::OUString sDescription;
+ OUString sDescription;
SvXMLImportContextRef xEventContext;
- ::rtl::OUString sMacro; // macro for old documents (pre 638i)
+ OUString sMacro; // macro for old documents (pre 638i)
sal_Bool bDescriptionOK;
@@ -1086,20 +1086,20 @@ public:
XMLMacroFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// for <office:events> children
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList );
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1112,12 +1112,12 @@ protected:
/** import reference fields (<text:reference-get>) */
class XMLReferenceFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyReferenceFieldPart;
- const ::rtl::OUString sPropertyReferenceFieldSource;
- const ::rtl::OUString sPropertySourceName;
- const ::rtl::OUString sPropertyCurrentPresentation;
+ const OUString sPropertyReferenceFieldPart;
+ const OUString sPropertyReferenceFieldSource;
+ const OUString sPropertySourceName;
+ const OUString sPropertyCurrentPresentation;
- ::rtl::OUString sName;
+ OUString sName;
sal_uInt16 nElementToken;
sal_Int16 nSource;
sal_Int16 nType;
@@ -1133,7 +1133,7 @@ public:
XMLTextImportHelper& rHlp,
sal_uInt16 nToken,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
@@ -1144,7 +1144,7 @@ protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1166,11 +1166,11 @@ public:
XMLDdeFieldDeclsImportContext(SvXMLImport& rImport,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList> & xAttrList );
@@ -1182,11 +1182,11 @@ public:
/** import dde field declaration (<text:dde-connection-decl>) */
class XMLDdeFieldDeclImportContext : public SvXMLImportContext
{
- const ::rtl::OUString sPropertyIsAutomaticUpdate;
- const ::rtl::OUString sPropertyName;
- const ::rtl::OUString sPropertyDDECommandType;
- const ::rtl::OUString sPropertyDDECommandFile;
- const ::rtl::OUString sPropertyDDECommandElement;
+ const OUString sPropertyIsAutomaticUpdate;
+ const OUString sPropertyName;
+ const OUString sPropertyDDECommandType;
+ const OUString sPropertyDDECommandFile;
+ const OUString sPropertyDDECommandElement;
const SvXMLTokenMap& rTokenMap;
@@ -1196,7 +1196,7 @@ public:
XMLDdeFieldDeclImportContext(SvXMLImport& rImport,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName,
+ const OUString& sLocalName,
const SvXMLTokenMap& rMap);
// create fieldmaster
@@ -1210,8 +1210,8 @@ public:
/** import dde fields (<text:dde-connection>) */
class XMLDdeFieldImportContext : public XMLTextFieldImportContext
{
- ::rtl::OUString sName;
- ::rtl::OUString sPropertyContent;
+ OUString sName;
+ OUString sPropertyContent;
public:
TYPEINFO();
@@ -1219,13 +1219,13 @@ public:
XMLDdeFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// create textfield, attach master, and insert into document
virtual void EndElement();
@@ -1249,13 +1249,13 @@ public:
XMLSheetNameImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// no attributes -> empty method
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// no atributes -> empty method
virtual void PrepareField(
@@ -1267,12 +1267,12 @@ protected:
class XMLUrlFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyURL;
- const ::rtl::OUString sPropertyTargetFrame;
- const ::rtl::OUString sPropertyRepresentation;
+ const OUString sPropertyURL;
+ const OUString sPropertyTargetFrame;
+ const OUString sPropertyRepresentation;
- ::rtl::OUString sURL;
- ::rtl::OUString sFrame;
+ OUString sURL;
+ OUString sFrame;
sal_Bool bFrameOK;
public:
@@ -1282,13 +1282,13 @@ public:
XMLUrlFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// no attributes -> empty method
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// no atributes -> empty method
virtual void PrepareField(
@@ -1300,7 +1300,7 @@ protected:
class XMLBibliographyFieldImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyFields;
+ const OUString sPropertyFields;
::std::vector< ::com::sun::star::beans::PropertyValue> aValues;
@@ -1311,7 +1311,7 @@ public:
XMLBibliographyFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
@@ -1322,14 +1322,14 @@ protected:
/// empty method; all attributes are handled in StartElement
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// convert aValues into sequence and set property
virtual void PrepareField(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropertySet);
- static const sal_Char* MapBibliographyFieldName(::rtl::OUString sName);
+ static const sal_Char* MapBibliographyFieldName(OUString sName);
};
@@ -1337,18 +1337,18 @@ protected:
/** Import an annotation field (<text:annotation>) */
class XMLAnnotationImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyAuthor;
- const ::rtl::OUString sPropertyInitials;
- const ::rtl::OUString sPropertyContent;
- const ::rtl::OUString sPropertyDate;
- const ::rtl::OUString sPropertyTextRange;
- const ::rtl::OUString sPropertyName;
-
- ::rtl::OUStringBuffer aAuthorBuffer;
- ::rtl::OUStringBuffer aInitialsBuffer;
+ const OUString sPropertyAuthor;
+ const OUString sPropertyInitials;
+ const OUString sPropertyContent;
+ const OUString sPropertyDate;
+ const OUString sPropertyTextRange;
+ const OUString sPropertyName;
+
+ OUStringBuffer aAuthorBuffer;
+ OUStringBuffer aInitialsBuffer;
OUString aName;
- ::rtl::OUStringBuffer aTextBuffer;
- ::rtl::OUStringBuffer aDateBuffer;
+ OUStringBuffer aTextBuffer;
+ OUStringBuffer aDateBuffer;
com::sun::star::uno::Reference < com::sun::star::beans::XPropertySet > mxField;
com::sun::star::uno::Reference < com::sun::star::text::XTextCursor > mxCursor;
@@ -1365,13 +1365,13 @@ public:
XMLTextImportHelper& rHlp,
sal_uInt16 nToken,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attributes
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// set properties
virtual void PrepareField(
@@ -1380,7 +1380,7 @@ protected:
virtual SvXMLImportContext *CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<
::com::sun::star::xml::sax::XAttributeList >& xAttrList );
virtual void EndElement();
@@ -1390,12 +1390,12 @@ protected:
/** Import a script field (<text:script>) */
class XMLScriptImportContext : public XMLTextFieldImportContext
{
- const ::rtl::OUString sPropertyScriptType;
- const ::rtl::OUString sPropertyURLContent;
- const ::rtl::OUString sPropertyContent;
+ const OUString sPropertyScriptType;
+ const OUString sPropertyURLContent;
+ const OUString sPropertyContent;
- ::rtl::OUString sContent;
- ::rtl::OUString sScriptType;
+ OUString sContent;
+ OUString sScriptType;
sal_Bool bContentOK;
sal_Bool bScriptTypeOK;
@@ -1407,13 +1407,13 @@ public:
XMLScriptImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attributes
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// set properties
virtual void PrepareField(
@@ -1432,13 +1432,13 @@ public:
XMLMeasureFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1471,18 +1471,18 @@ public:
XMLDropDownFieldImportContext(SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
virtual SvXMLImportContext* CreateChildContext(
sal_uInt16 nPrefix,
- const ::rtl::OUString& rLocalName,
+ const OUString& rLocalName,
const ::com::sun::star::uno::Reference<com::sun::star::xml::sax::XAttributeList >& xAttrList );
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1500,11 +1500,11 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName); /// element name w/o prefix
+ const OUString& sLocalName); /// element name w/o prefix
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1522,11 +1522,11 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName); /// element name w/o prefix
+ const OUString& sLocalName); /// element name w/o prefix
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1544,11 +1544,11 @@ public:
SvXMLImport& rImport, /// XML Import
XMLTextImportHelper& rHlp, /// Text import helper
sal_uInt16 nPrfx, /// namespace prefix
- const ::rtl::OUString& sLocalName); /// element name w/o prefix
+ const OUString& sLocalName); /// element name w/o prefix
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
@@ -1558,10 +1558,10 @@ public:
class XMLCustomPropertyFieldImportContext : public XMLTextFieldImportContext
{
- ::rtl::OUString sName;
+ OUString sName;
::com::sun::star::uno::Any aValue;
- const ::rtl::OUString sPropertyName;
- const ::rtl::OUString sPropertyValue;
+ const OUString sPropertyName;
+ const OUString sPropertyValue;
public:
@@ -1570,13 +1570,13 @@ public:
XMLCustomPropertyFieldImportContext (SvXMLImport& rImport,
XMLTextImportHelper& rHlp,
sal_uInt16 nPrfx,
- const ::rtl::OUString& sLocalName);
+ const OUString& sLocalName);
protected:
/// process attribute values
virtual void ProcessAttribute( sal_uInt16 nAttrToken,
- const ::rtl::OUString& sAttrValue );
+ const OUString& sAttrValue );
/// prepare XTextField for insertion into document
virtual void PrepareField(
diff --git a/xmloff/inc/xmloff/txtparae.hxx b/xmloff/inc/xmloff/txtparae.hxx
index b46b78e001c6..d4f71ba96586 100644
--- a/xmloff/inc/xmloff/txtparae.hxx
+++ b/xmloff/inc/xmloff/txtparae.hxx
@@ -94,8 +94,8 @@ class XMLOFF_DLLPUBLIC XMLTextParagraphExport : public XMLStyleExport
sal_Bool bBlock;
// keep track of open rubies
- ::rtl::OUString sOpenRubyText;
- ::rtl::OUString sOpenRubyCharStyle;
+ OUString sOpenRubyText;
+ OUString sOpenRubyCharStyle;
sal_Bool bOpenRuby;
XMLTextListsHelper* mpTextListsHelper;
@@ -108,92 +108,92 @@ public:
protected:
- const ::rtl::OUString sActualSize;
+ const OUString sActualSize;
// Implement Title/Description Elements UI (#i73249#)
- const ::rtl::OUString sTitle;
- const ::rtl::OUString sDescription;
- const ::rtl::OUString sAnchorCharStyleName;
- const ::rtl::OUString sAnchorPageNo;
- const ::rtl::OUString sAnchorType;
- const ::rtl::OUString sBeginNotice;
- const ::rtl::OUString sBookmark;
- const ::rtl::OUString sCategory;
- const ::rtl::OUString sChainNextName;
- const ::rtl::OUString sCharStyleName;
- const ::rtl::OUString sCharStyleNames;
- const ::rtl::OUString sContourPolyPolygon;
- const ::rtl::OUString sDocumentIndex;
- const ::rtl::OUString sDocumentIndexMark;
- const ::rtl::OUString sEndNotice;
- const ::rtl::OUString sFootnote;
- const ::rtl::OUString sFootnoteCounting;
- const ::rtl::OUString sFrame;
- const ::rtl::OUString sFrameHeightAbsolute;
- const ::rtl::OUString sFrameHeightPercent;
- const ::rtl::OUString sFrameStyleName;
- const ::rtl::OUString sFrameWidthAbsolute;
- const ::rtl::OUString sFrameWidthPercent;
- const ::rtl::OUString sGraphicFilter;
- const ::rtl::OUString sGraphicRotation;
- const ::rtl::OUString sGraphicURL;
- const ::rtl::OUString sReplacementGraphicURL;
- const ::rtl::OUString sHeight;
- const ::rtl::OUString sHoriOrient;
- const ::rtl::OUString sHoriOrientPosition;
- const ::rtl::OUString sHyperLinkName;
- const ::rtl::OUString sHyperLinkTarget;
- const ::rtl::OUString sHyperLinkURL;
- const ::rtl::OUString sIsAutomaticContour;
- const ::rtl::OUString sIsCollapsed;
- const ::rtl::OUString sIsPixelContour;
- const ::rtl::OUString sIsStart;
- const ::rtl::OUString sIsSyncHeightToWidth;
- const ::rtl::OUString sIsSyncWidthToHeight;
- const ::rtl::OUString sNumberingRules;
- const ::rtl::OUString sNumberingType;
- const ::rtl::OUString sPageDescName;
- const ::rtl::OUString sPageStyleName;
- const ::rtl::OUString sParaChapterNumberingLevel;
- const ::rtl::OUString sParaConditionalStyleName;
- const ::rtl::OUString sParagraphService;
- const ::rtl::OUString sParaStyleName;
- const ::rtl::OUString sPositionEndOfDoc;
- const ::rtl::OUString sPrefix;
- const ::rtl::OUString sRedline;
- const ::rtl::OUString sReferenceId;
- const ::rtl::OUString sReferenceMark;
- const ::rtl::OUString sRelativeHeight;
- const ::rtl::OUString sRelativeWidth;
- const ::rtl::OUString sRuby;
- const ::rtl::OUString sRubyAdjust;
- const ::rtl::OUString sRubyCharStyleName;
- const ::rtl::OUString sRubyText;
- const ::rtl::OUString sServerMap;
- const ::rtl::OUString sShapeService;
- const ::rtl::OUString sSizeType;
- const ::rtl::OUString sSoftPageBreak;
- const ::rtl::OUString sStartAt;
- const ::rtl::OUString sSuffix;
- const ::rtl::OUString sTableService;
- const ::rtl::OUString sText;
- const ::rtl::OUString sTextContentService;
- const ::rtl::OUString sTextEmbeddedService;
- const ::rtl::OUString sTextEndnoteService;
- const ::rtl::OUString sTextField;
- const ::rtl::OUString sTextFieldService;
- const ::rtl::OUString sTextFrameService;
- const ::rtl::OUString sTextGraphicService;
- const ::rtl::OUString sTextPortionType;
- const ::rtl::OUString sTextSection;
- const ::rtl::OUString sUnvisitedCharStyleName;
- const ::rtl::OUString sVertOrient;
- const ::rtl::OUString sVertOrientPosition;
- const ::rtl::OUString sVisitedCharStyleName;
- const ::rtl::OUString sWidth;
- const ::rtl::OUString sWidthType;
- const ::rtl::OUString sTextFieldStart;
- const ::rtl::OUString sTextFieldEnd;
- const ::rtl::OUString sTextFieldStartEnd;
+ const OUString sTitle;
+ const OUString sDescription;
+ const OUString sAnchorCharStyleName;
+ const OUString sAnchorPageNo;
+ const OUString sAnchorType;
+ const OUString sBeginNotice;
+ const OUString sBookmark;
+ const OUString sCategory;
+ const OUString sChainNextName;
+ const OUString sCharStyleName;
+ const OUString sCharStyleNames;
+ const OUString sContourPolyPolygon;
+ const OUString sDocumentIndex;
+ const OUString sDocumentIndexMark;
+ const OUString sEndNotice;
+ const OUString sFootnote;
+ const OUString sFootnoteCounting;
+ const OUString sFrame;
+ const OUString sFrameHeightAbsolute;
+ const OUString sFrameHeightPercent;
+ const OUString sFrameStyleName;
+ const OUString sFrameWidthAbsolute;
+ const OUString sFrameWidthPercent;
+ const OUString sGraphicFilter;
+ const OUString sGraphicRotation;
+ const OUString sGraphicURL;
+ const OUString sReplacementGraphicURL;
+ const OUString sHeight;
+ const OUString sHoriOrient;
+ const OUString sHoriOrientPosition;
+ const OUString sHyperLinkName;
+ const OUString sHyperLinkTarget;
+ const OUString sHyperLinkURL;
+ const OUString sIsAutomaticContour;
+ const OUString sIsCollapsed;
+ const OUString sIsPixelContour;
+ const OUString sIsStart;
+ const OUString sIsSyncHeightToWidth;
+ const OUString sIsSyncWidthToHeight;
+ const OUString sNumberingRules;
+ const OUString sNumberingType;
+ const OUString sPageDescName;
+ const OUString sPageStyleName;
+ const OUString sParaChapterNumberingLevel;
+ const OUString sParaConditionalStyleName;
+ const OUString sParagraphService;
+ const OUString sParaStyleName;
+ const OUString sPositionEndOfDoc;
+ const OUString sPrefix;
+ const OUString sRedline;
+ const OUString sReferenceId;
+ const OUString sReferenceMark;
+ const OUString sRelativeHeight;
+ const OUString sRelativeWidth;
+ const OUString sRuby;
+ const OUString sRubyAdjust;
+ const OUString sRubyCharStyleName;
+ const OUString sRubyText;
+ const OUString sServerMap;
+ const OUString sShapeService;
+ const OUString sSizeType;
+ const OUString sSoftPageBreak;
+ const OUString sStartAt;
+ const OUString sSuffix;
+ const OUString sTableService;
+ const OUString sText;
+ const OUString sTextContentService;
+ const OUString sTextEmbeddedService;
+ const OUString sTextEndnoteService;
+ const OUString sTextField;
+ const OUString sTextFieldService;
+ const OUString sTextFrameService;
+ const OUString sTextGraphicService;
+ const OUString sTextPortionType;
+ const OUString sTextSection;
+ const OUString sUnvisitedCharStyleName;
+ const OUString sVertOrient;
+ const OUString sVertOrientPosition;
+ const OUString sVisitedCharStyleName;
+ const OUString sWidth;
+ const OUString sWidthType;
+ const OUString sTextFieldStart;
+ const OUString sTextFieldEnd;
+ const OUString sTextFieldStartEnd;
SinglePropertySetInfoCache aCharStyleNamesPropInfoCache;
@@ -232,7 +232,7 @@ protected:
const SvXMLAutoStylePoolP& GetAutoStylePool() const { return rAutoStylePool; }
public:
- ::rtl::OUString FindTextStyleAndHyperlink(
+ OUString FindTextStyleAndHyperlink(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
sal_Bool& rbHyperlink,
@@ -259,8 +259,8 @@ protected:
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet,
sal_Bool bShape,
- ::rtl::OUString *pMinHeightValue = 0,
- ::rtl::OUString *pMinWidthValue = 0 );
+ OUString *pMinHeightValue = 0,
+ OUString *pMinWidthValue = 0 );
virtual void exportStyleAttributes(
const ::com::sun::star::uno::Reference<
@@ -378,13 +378,13 @@ protected:
virtual void setTextEmbeddedGraphicURL(
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet >& rPropSet,
- ::rtl::OUString& rStreamName ) const;
+ OUString& rStreamName ) const;
/// export a footnote and styles
void exportTextFootnote(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet > & rPropSet,
- const ::rtl::OUString& sString,
+ const OUString& sString,
sal_Bool bAutoStyles, sal_Bool bProgress );
/// helper for exportTextFootnote
@@ -393,7 +393,7 @@ protected:
::com::sun::star::text::XFootnote > & rPropSet,
const ::com::sun::star::uno::Reference<
::com::sun::star::text::XText> & rText,
- const ::rtl::OUString& sString,
+ const OUString& sString,
sal_Bool bAutoStyles,
sal_Bool bIsEndnote, sal_Bool bProgress );
@@ -408,7 +408,7 @@ protected:
void exportTextMark(
const ::com::sun::star::uno::Reference<
::com::sun::star::beans::XPropertySet> & xPropSet,
- const ::rtl::OUString& rProperty,
+ const OUString& rProperty,
const enum ::xmloff::token::XMLTokenEnum pElements[],
sal_Bool bAutoStyles);
@@ -504,11 +504,11 @@ public:
const XMLPropertyState** pAddState = NULL, bool bDontSeek = false );
/// find style name for specified family and parent
- ::rtl::OUString Find(
+ OUString Find(
sal_uInt16 nFamily,
const ::com::sun::star::uno::Reference <
::com::sun::star::beans::XPropertySet > & rPropSet,
- const ::rtl::OUString& rParent,
+ const OUString& rParent,
const XMLPropertyState** pAddState = NULL ) const;
static SvXMLExportPropertyMapper *CreateShapeExtPropMapper(
@@ -565,7 +565,7 @@ public:
// This method exports the given OUString
void exportText(
- const ::rtl::OUString& rText,
+ const OUString& rText,
bool& rPrevCharWasSpace );
// This method collects all automatic styles for the given XText
generated by cgit (git 2.34.1) at 2025-03-01 20:35:22 +0000