[Libreoffice-commits] core.git: dbaccess/source extensions/source framework/source reportdesign/source sfx2/source toolkit/source xmloff/inc
elixir
prashant3.yishu at gmail.com
Mon Feb 25 05:00:34 PST 2013
dbaccess/source/ui/querydesign/QueryDesignView.cxx | 370 ++++++-------
extensions/source/propctrlr/formcomponenthandler.cxx | 314 +++++------
framework/source/fwe/classes/addonsoptions.cxx | 384 +++++++-------
reportdesign/source/ui/inspection/GeometryHandler.cxx | 362 ++++++-------
reportdesign/source/ui/inspection/metadata.cxx | 64 +-
sfx2/source/doc/Metadatable.cxx | 228 ++++----
sfx2/source/doc/SfxDocumentMetaData.cxx | 492 +++++++++---------
toolkit/source/controls/unocontrols.cxx | 450 ++++++++--------
xmloff/inc/txtfldi.hxx | 456 ++++++++--------
xmloff/inc/xmloff/txtparae.hxx | 194 +++----
10 files changed, 1657 insertions(+), 1657 deletions(-)
New commits:
commit 5269589ae4fbe65a7c4e3de3d429bc834348bf79
Author: elixir <prashant3.yishu at gmail.com>
Date: Fri Feb 22 14:12:26 2013 +0530
fdo#38838,::rtl::OUString_to_OUString
Change-Id: I7c9ebd01c16ff066008e53de865560ad78215bab
Reviewed-on: https://gerrit.libreoffice.org/2330
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/dbaccess/source/ui/querydesign/QueryDesignView.cxx b/dbaccess/source/ui/querydesign/QueryDesignView.cxx
index 49330e5..ab74b23 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 7f62516..dc102c1 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:
{
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list