[Libreoffice-commits] core.git: dbaccess/source
Gergő Mocsi
gmocsi91 at gmail.com
Thu Mar 14 18:25:39 PDT 2013
dbaccess/source/core/inc/core_resource.hxx | 12 ++--
dbaccess/source/core/resource/core_resource.cxx | 23 +++----
dbaccess/source/ui/app/AppController.cxx | 6 +-
dbaccess/source/ui/app/AppController.hxx | 6 +-
dbaccess/source/ui/app/AppControllerDnD.cxx | 70 ++++++++++++------------
dbaccess/source/ui/app/AppControllerGen.cxx | 15 ++---
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4 -
dbaccess/source/ui/app/AppDetailView.cxx | 4 -
dbaccess/source/ui/app/AppIconControl.cxx | 2
dbaccess/source/ui/control/dbtreelistbox.cxx | 8 +-
dbaccess/source/ui/inc/callbacks.hxx | 2
11 files changed, 75 insertions(+), 77 deletions(-)
New commits:
commit bdc374eadf3c5b2a752eb5ce3cb346939b0fb77a
Author: Gergő Mocsi <gmocsi91 at gmail.com>
Date: Fri Feb 22 03:56:22 2013 +0100
fdo#38838, String to OUString in dbaccess
Replaced String with OUString in module dbaccess/ui/app , and also removed RTL_CONSTASCII_USTRINGPARAM deprecated macro.
Conflicts:
dbaccess/source/ui/app/AppControllerDnD.cxx
dbaccess/source/ui/app/AppControllerGen.cxx
dbaccess/source/ui/app/AppDetailPageHelper.cxx
dbaccess/source/ui/browser/unodatbr.cxx
Change-Id: Ie385d44c328fb3f919d53a604d51640a334a1013
Reviewed-on: https://gerrit.libreoffice.org/2386
Reviewed-by: Thomas Arnhold <thomas at arnhold.org>
Tested-by: Thomas Arnhold <thomas at arnhold.org>
diff --git a/dbaccess/source/core/inc/core_resource.hxx b/dbaccess/source/core/inc/core_resource.hxx
index 727d131..47e18e8 100644
--- a/dbaccess/source/core/inc/core_resource.hxx
+++ b/dbaccess/source/core/inc/core_resource.hxx
@@ -59,7 +59,7 @@ namespace dbaccess
public:
/** loads the string with the specified resource id
*/
- static ::rtl::OUString loadString(sal_uInt16 _nResId);
+ static OUString loadString(sal_uInt16 _nResId);
/** loads a string from the resource file, substituting a placeholder with a given string
@@ -70,10 +70,10 @@ namespace dbaccess
@param _rReplace
the string which should substitute the placeholder
*/
- static ::rtl::OUString loadString(
+ static OUString loadString(
sal_uInt16 _nResId,
const sal_Char* _pPlaceholderAscii,
- const ::rtl::OUString& _rReplace
+ const OUString& _rReplace
);
/** loads a string from the resource file, substituting two placeholders with given strings
@@ -89,12 +89,12 @@ namespace dbaccess
@param _rReplace2
the string which should substitute the second placeholder
*/
- static ::rtl::OUString loadString(
+ static OUString loadString(
sal_uInt16 _nResId,
const sal_Char* _pPlaceholderAscii1,
- const ::rtl::OUString& _rReplace1,
+ const OUString& _rReplace1,
const sal_Char* _pPlaceholderAscii2,
- const ::rtl::OUString& _rReplace2
+ const OUString& _rReplace2
);
};
diff --git a/dbaccess/source/core/resource/core_resource.cxx b/dbaccess/source/core/resource/core_resource.cxx
index ecc3321..6c3e6f4 100644
--- a/dbaccess/source/core/resource/core_resource.cxx
+++ b/dbaccess/source/core/resource/core_resource.cxx
@@ -56,32 +56,31 @@ namespace dbaccess
}
//------------------------------------------------------------------
- ::rtl::OUString ResourceManager::loadString(sal_uInt16 _nResId)
+ OUString ResourceManager::loadString(sal_uInt16 _nResId)
{
- ::rtl::OUString sReturn;
+ OUString sReturn;
ensureImplExists();
if (m_pImpl)
- sReturn = String(ResId(_nResId,*m_pImpl));
+ sReturn = OUString(ResId(_nResId,*m_pImpl));
return sReturn;
}
//------------------------------------------------------------------
- ::rtl::OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii, const ::rtl::OUString& _rReplace )
+ OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii, const OUString& _rReplace )
{
- String sString( loadString( _nResId ) );
- sString.SearchAndReplaceAscii( _pPlaceholderAscii, _rReplace );
- return sString;
+ OUString sString( loadString( _nResId ) );
+ return sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii), _rReplace );
}
//------------------------------------------------------------------
- ::rtl::OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii1, const ::rtl::OUString& _rReplace1,
- const sal_Char* _pPlaceholderAscii2, const ::rtl::OUString& _rReplace2 )
+ OUString ResourceManager::loadString( sal_uInt16 _nResId, const sal_Char* _pPlaceholderAscii1, const OUString& _rReplace1,
+ const sal_Char* _pPlaceholderAscii2, const OUString& _rReplace2 )
{
- String sString( loadString( _nResId ) );
- sString.SearchAndReplaceAscii( _pPlaceholderAscii1, _rReplace1 );
- sString.SearchAndReplaceAscii( _pPlaceholderAscii2, _rReplace2 );
+ OUString sString( loadString( _nResId ) );
+ sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii1), _rReplace1 );
+ sString = sString.replaceFirst( OUString::createFromAscii(_pPlaceholderAscii2), _rReplace2 );
return sString;
}
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx
index b447726..a08ac0b 100644
--- a/dbaccess/source/ui/app/AppController.cxx
+++ b/dbaccess/source/ui/app/AppController.cxx
@@ -2437,7 +2437,7 @@ Any OApplicationController::getCurrentSelection( Control& _rControl ) const
}
// -----------------------------------------------------------------------------
-sal_Bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*/, String& /*_rText*/ ) const
+sal_Bool OApplicationController::requestQuickHelp( const SvTreeListEntry* /*_pEntry*/, OUString& /*_rText*/ ) const
{
return sal_False;
}
@@ -2930,7 +2930,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
case DatabaseObjectContainer::REPORTS:
if ( eSelectedCategory != E_NONE )
throw IllegalArgumentException(
- String(ModuleRes(RID_STR_NO_DIFF_CAT)),
+ OUString(ModuleRes(RID_STR_NO_DIFF_CAT)),
*this, sal_Int16( pObject - aSelectedObjects.getConstArray() ) );
eSelectedCategory =
( pObject->Type == DatabaseObjectContainer::TABLES ) ? E_TABLE
@@ -2945,7 +2945,7 @@ void SAL_CALL OApplicationController::removeSelectionChangeListener( const Refer
{
OUString sMessage(
OUString(
- String(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE))).
+ OUString(ModuleRes(RID_STR_UNSUPPORTED_OBJECT_TYPE))).
replaceFirst("$type$", OUString::valueOf(sal_Int32(pObject->Type))));
throw IllegalArgumentException(sMessage, *this, sal_Int16( pObject - aSelectedObjects.getConstArray() ));
}
diff --git a/dbaccess/source/ui/app/AppController.hxx b/dbaccess/source/ui/app/AppController.hxx
index db82701..faf029d 100644
--- a/dbaccess/source/ui/app/AppController.hxx
+++ b/dbaccess/source/ui/app/AppController.hxx
@@ -280,7 +280,7 @@ namespace dbaui
@return
<TRUE/> if the paste opertions was successfull, otherwise <FALSE/>.
*/
- sal_Bool paste( ElementType _eType,const ::svx::ODataAccessDescriptor& _rPasteData ,const String& _sParentFolder = String(),sal_Bool _bMove = sal_False);
+ sal_Bool paste( ElementType _eType,const ::svx::ODataAccessDescriptor& _rPasteData ,const OUString& _sParentFolder = String(),sal_Bool _bMove = sal_False);
/// returns the system clipboard.
const TransferableDataHelper& getViewClipboard() const { return m_aSystemClipboard; }
@@ -349,7 +349,7 @@ namespace dbaui
<TRUE/> if the insert opertions was successfull, otherwise <FALSE/>.
*/
sal_Bool insertHierachyElement( ElementType _eType
- ,const String& _sParentFolder
+ ,const OUString& _sParentFolder
,sal_Bool _bCollection = sal_True
,const ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>& _xContent = ::com::sun::star::uno::Reference< ::com::sun::star::ucb::XContent>()
,sal_Bool _bMove = sal_False);
@@ -523,7 +523,7 @@ namespace dbaui
virtual bool interceptUserInput( const NotifyEvent& _rEvent );
// IControlActionListener overridables
- virtual sal_Bool requestQuickHelp( const SvTreeListEntry* _pEntry, String& _rText ) const;
+ virtual sal_Bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const;
virtual sal_Bool requestDrag( sal_Int8 _nAction, const Point& _rPosPixel );
virtual sal_Int8 queryDrop( const AcceptDropEvent& _rEvt, const DataFlavorExVector& _rFlavors );
virtual sal_Int8 executeDrop( const ExecuteDropEvent& _rEvt );
diff --git a/dbaccess/source/ui/app/AppControllerDnD.cxx b/dbaccess/source/ui/app/AppControllerDnD.cxx
index 76edb07..2b5d850 100644
--- a/dbaccess/source/ui/app/AppControllerDnD.cxx
+++ b/dbaccess/source/ui/app/AppControllerDnD.cxx
@@ -102,7 +102,7 @@ using namespace ::com::sun::star::ucb;
using namespace ::com::sun::star::util;
// -----------------------------------------------------------------------------
-void OApplicationController::deleteTables(const ::std::vector< ::rtl::OUString>& _rList)
+void OApplicationController::deleteTables(const ::std::vector< OUString>& _rList)
{
SharedConnection xConnection( ensureConnection() );
@@ -115,10 +115,10 @@ void OApplicationController::deleteTables(const ::std::vector< ::rtl::OUString>&
if ( xDrop.is() )
{
bool bConfirm = true;
- ::std::vector< ::rtl::OUString>::const_iterator aEnd = _rList.end();
- for (::std::vector< ::rtl::OUString>::const_iterator aIter = _rList.begin(); aIter != aEnd; ++aIter)
+ ::std::vector< OUString>::const_iterator aEnd = _rList.end();
+ for (::std::vector< OUString>::const_iterator aIter = _rList.begin(); aIter != aEnd; ++aIter)
{
- ::rtl::OUString sTableName = *aIter;
+ OUString sTableName = *aIter;
sal_Int32 nResult = RET_YES;
if ( bConfirm )
@@ -179,14 +179,14 @@ void OApplicationController::deleteTables(const ::std::vector< ::rtl::OUString>&
}
else
{
- String sMessage(ModuleRes(STR_MISSING_TABLES_XDROP));
+ OUString sMessage(ModuleRes(STR_MISSING_TABLES_XDROP));
ErrorBox aError(getView(), WB_OK, sMessage);
aError.Execute();
}
}
}
// -----------------------------------------------------------------------------
-void OApplicationController::deleteObjects( ElementType _eType, const ::std::vector< ::rtl::OUString>& _rList, bool _bConfirm )
+void OApplicationController::deleteObjects( ElementType _eType, const ::std::vector< OUString>& _rList, bool _bConfirm )
{
Reference< XNameContainer > xNames( getElements( _eType ), UNO_QUERY );
Reference< XHierarchicalNameContainer > xHierarchyName( xNames, UNO_QUERY );
@@ -199,19 +199,19 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec
// be the ancestor or child of another element from the list.
// We want to ensure that ancestors get deleted first, so we normalize the list in this respect.
// #i33353#
- ::std::set< ::rtl::OUString > aDeleteNames;
- // Note that this implicitly uses ::std::less< ::rtl::OUString > a comparison operation, which
+ ::std::set< OUString > aDeleteNames;
+ // Note that this implicitly uses ::std::less< OUString > a comparison operation, which
// results in lexicographical order, which is exactly what we need, because "foo" is *before*
// any "foo/bar" in this order.
::std::copy(
_rList.begin(), _rList.end(),
- ::std::insert_iterator< ::std::set< ::rtl::OUString > >( aDeleteNames, aDeleteNames.begin() )
+ ::std::insert_iterator< ::std::set< OUString > >( aDeleteNames, aDeleteNames.begin() )
);
- ::std::set< ::rtl::OUString >::size_type nCount = aDeleteNames.size();
- for ( ::std::set< ::rtl::OUString >::size_type nObjectsLeft = nCount; !aDeleteNames.empty(); )
+ ::std::set< OUString >::size_type nCount = aDeleteNames.size();
+ for ( ::std::set< OUString >::size_type nObjectsLeft = nCount; !aDeleteNames.empty(); )
{
- ::std::set< ::rtl::OUString >::iterator aThisRound = aDeleteNames.begin();
+ ::std::set< OUString >::iterator aThisRound = aDeleteNames.begin();
if ( eResult != svtools::QUERYDELETE_ALL )
{
@@ -254,15 +254,15 @@ void OApplicationController::deleteObjects( ElementType _eType, const ::std::vec
// which may also be a part of the list
// #i33353#
OSL_ENSURE( aThisRound->getLength() - 1 >= 0, "OApplicationController::deleteObjects: empty name?" );
- ::rtl::OUStringBuffer sSmallestSiblingName( *aThisRound );
+ OUStringBuffer sSmallestSiblingName( *aThisRound );
sSmallestSiblingName.append( (sal_Unicode)( '/' + 1) );
- ::std::set< ::rtl::OUString >::iterator aUpperChildrenBound = aDeleteNames.lower_bound( sSmallestSiblingName.makeStringAndClear() );
- for ( ::std::set< ::rtl::OUString >::iterator aObsolete = aThisRound;
+ ::std::set< OUString >::iterator aUpperChildrenBound = aDeleteNames.lower_bound( sSmallestSiblingName.makeStringAndClear() );
+ for ( ::std::set< OUString >::iterator aObsolete = aThisRound;
aObsolete != aUpperChildrenBound;
)
{
- ::std::set< ::rtl::OUString >::iterator aNextObsolete = aObsolete; ++aNextObsolete;
+ ::std::set< OUString >::iterator aNextObsolete = aObsolete; ++aNextObsolete;
aDeleteNames.erase( aObsolete );
--nObjectsLeft;
aObsolete = aNextObsolete;
@@ -304,7 +304,7 @@ void OApplicationController::deleteEntries()
if ( getContainer() )
{
- ::std::vector< ::rtl::OUString> aList;
+ ::std::vector< OUString> aList;
getSelectionElementNames(aList);
ElementType eType = getContainer()->getElementType();
switch(eType)
@@ -335,8 +335,8 @@ const SharedConnection& OApplicationController::ensureConnection( ::dbtools::SQL
if ( !m_xDataSourceConnection.is() )
{
WaitObject aWO(getView());
- String sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) );
- sConnectingContext.SearchAndReplaceAscii("$name$", getStrippedDatabaseName());
+ OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) );
+ sConnectingContext = sConnectingContext.replaceFirst("$name$", getStrippedDatabaseName());
m_xDataSourceConnection.reset( connect( getDatabaseName(), sConnectingContext, _pErrorInfo ) );
if ( m_xDataSourceConnection.is() )
@@ -443,7 +443,7 @@ Reference< XNameAccess > OApplicationController::getElements( ElementType _eType
return xElements;
}
// -----------------------------------------------------------------------------
-void OApplicationController::getSelectionElementNames(::std::vector< ::rtl::OUString>& _rNames) const
+void OApplicationController::getSelectionElementNames(::std::vector< OUString>& _rNames) const
{
SolarMutexGuard aSolarGuard;
::osl::MutexGuard aGuard( getMutex() );
@@ -496,10 +496,10 @@ TransferableHelper* OApplicationController::copyObject()
if ( xConnection.is() )
xMetaData = xConnection->getMetaData();
- ::rtl::OUString sName = getContainer()->getQualifiedName( NULL );
+ OUString sName = getContainer()->getQualifiedName( NULL );
if ( !sName.isEmpty() )
{
- ::rtl::OUString sDataSource = getDatabaseName();
+ OUString sDataSource = getDatabaseName();
if ( eType == E_TABLE )
{
@@ -515,7 +515,7 @@ TransferableHelper* OApplicationController::copyObject()
case E_FORM:
case E_REPORT:
{
- ::std::vector< ::rtl::OUString> aList;
+ ::std::vector< OUString> aList;
getSelectionElementNames(aList);
Reference< XHierarchicalNameAccess > xElements(getElements(eType),UNO_QUERY);
if ( xElements.is() && !aList.empty() )
@@ -543,7 +543,7 @@ TransferableHelper* OApplicationController::copyObject()
return NULL;
}
// -----------------------------------------------------------------------------
-sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAccessDescriptor& _rPasteData,const String& _sParentFolder ,sal_Bool _bMove)
+sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAccessDescriptor& _rPasteData,const OUString& _sParentFolder ,sal_Bool _bMove)
{
try
{
@@ -557,7 +557,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
{
// read all necessary data
- ::rtl::OUString sCommand;
+ OUString sCommand;
sal_Bool bEscapeProcessing = sal_True;
_rPasteData[daCommand] >>= sCommand;
@@ -566,7 +566,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
// plausibility check
sal_Bool bValidDescriptor = sal_False;
- ::rtl::OUString sDataSourceName = _rPasteData.getDataSource();
+ OUString sDataSourceName = _rPasteData.getDataSource();
if (CommandType::QUERY == nCommandType)
bValidDescriptor = sDataSourceName.getLength() && sCommand.getLength();
else if (CommandType::COMMAND == nCommandType)
@@ -578,7 +578,7 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
}
// the target object name (as we'll suggest it to the user)
- ::rtl::OUString sTargetName;
+ OUString sTargetName;
try
{
if ( CommandType::QUERY == nCommandType )
@@ -586,8 +586,8 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
if ( sTargetName.isEmpty() )
{
- String sDefaultName = String( ModuleRes( STR_QRY_TITLE ) );
- sDefaultName = sDefaultName.GetToken( 0, ' ' );
+ OUString sDefaultName = OUString( ModuleRes( STR_QRY_TITLE ) );
+ sDefaultName = sDefaultName.getToken( 0, ' ' );
Reference< XNameAccess > xQueries( getQueryDefintions(), UNO_QUERY_THROW );
sTargetName = ::dbtools::createUniqueName( xQueries, sDefaultName, sal_False );
@@ -695,9 +695,9 @@ sal_Bool OApplicationController::paste( ElementType _eType,const ::svx::ODataAcc
{
Reference<XPropertySet> xDstProp(xFac->createDataDescriptor());
- Sequence< ::rtl::OUString> aSeq = xSrcNameAccess->getElementNames();
- const ::rtl::OUString* pIter = aSeq.getConstArray();
- const ::rtl::OUString* pEnd = pIter + aSeq.getLength();
+ Sequence< OUString> aSeq = xSrcNameAccess->getElementNames();
+ const OUString* pIter = aSeq.getConstArray();
+ const OUString* pEnd = pIter + aSeq.getLength();
for( ; pIter != pEnd ; ++pIter)
{
Reference<XPropertySet> xSrcProp(xSrcNameAccess->getByName(*pIter),UNO_QUERY);
@@ -781,10 +781,10 @@ IMPL_LINK( OApplicationController, OnAsyncDrop, void*, /*NOTINTERESTEDIN*/ )
{
Reference<XContent> xContent;
m_aAsyncDrop.aDroppedData[daComponent] >>= xContent;
- ::std::vector< ::rtl::OUString> aList;
+ ::std::vector< OUString> aList;
sal_Int32 nIndex = 0;
- ::rtl::OUString sName = xContent->getIdentifier()->getContentIdentifier();
- ::rtl::OUString sErase = sName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part
+ OUString sName = xContent->getIdentifier()->getContentIdentifier();
+ OUString sErase = sName.getToken(0,'/',nIndex); // we don't want to have the "private:forms" part
if ( nIndex != -1 )
{
aList.push_back(sName.copy(sErase.getLength() + 1));
diff --git a/dbaccess/source/ui/app/AppControllerGen.cxx b/dbaccess/source/ui/app/AppControllerGen.cxx
index 6bc7640..6dfa8e8 100644
--- a/dbaccess/source/ui/app/AppControllerGen.cxx
+++ b/dbaccess/source/ui/app/AppControllerGen.cxx
@@ -139,9 +139,9 @@ void OApplicationController::convertToView(const OUString& _sName)
Reference< XDatabaseMetaData > xMeta = xConnection->getMetaData();
- String aName = String(ModuleRes(STR_TBL_TITLE));
- aName = aName.GetToken(0,' ');
- String aDefaultName = ::dbaui::createDefaultName(xMeta,xTables,aName);
+ OUString aName = OUString(ModuleRes(STR_TBL_TITLE));
+ aName = aName.getToken(0,' ');
+ OUString aDefaultName = ::dbaui::createDefaultName(xMeta,xTables,aName);
DynamicTableOrQueryNameCheck aNameChecker( xConnection, CommandType::TABLE );
OSaveAsDlg aDlg( getView(), CommandType::TABLE, getORB(), xConnection, aDefaultName, aNameChecker );
@@ -154,7 +154,7 @@ void OApplicationController::convertToView(const OUString& _sName)
::dbtools::composeTableName( xMeta, sCatalog, sSchema, sName, sal_False, ::dbtools::eInTableDefinitions ) );
Reference<XPropertySet> xView = ::dbaui::createView(sNewName,xConnection,xSourceObject);
if ( !xView.is() )
- throw SQLException(String(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*this,OUString("S1000") ,0,Any());
+ throw SQLException(OUString(ModuleRes(STR_NO_TABLE_FORMAT_INSIDE)),*this,OUString( "S1000" ) ,0,Any());
getContainer()->elementAdded(E_TABLE,sNewName,makeAny(xView));
}
}
@@ -390,9 +390,8 @@ void SAL_CALL OApplicationController::connect( ) throw (SQLException, RuntimeEx
aError.doThrow();
// no particular error, but nonetheless could not connect -> throw a generic exception
- String sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) );
- sConnectingContext.SearchAndReplaceAscii( "$name$", getStrippedDatabaseName() );
- ::dbtools::throwGenericSQLException( sConnectingContext, *this );
+ OUString sConnectingContext( ModuleRes( STR_COULDNOTCONNECT_DATASOURCE ) );
+ ::dbtools::throwGenericSQLException( sConnectingContext.replaceFirst( "$name$", getStrippedDatabaseName() ), *this );
}
}
@@ -664,7 +663,7 @@ void OApplicationController::onDocumentOpened( const OUString& _rName, const sal
}
}
// -----------------------------------------------------------------------------
-sal_Bool OApplicationController::insertHierachyElement(ElementType _eType,const String& _sParentFolder,sal_Bool _bCollection,const Reference<XContent>& _xContent,sal_Bool _bMove)
+sal_Bool OApplicationController::insertHierachyElement(ElementType _eType,const OUString& _sParentFolder,sal_Bool _bCollection,const Reference<XContent>& _xContent,sal_Bool _bMove)
{
Reference<XHierarchicalNameContainer> xNames(getElements(_eType), UNO_QUERY);
return dbaui::insertHierachyElement(getView()
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 4f1d87f..62ef52d 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -93,7 +93,7 @@ namespace
{
SvTreeListEntry* pReturn = NULL;
sal_Int32 nIndex = 0;
- String sName( _rName.getToken(0,'/',nIndex) );
+ OUString sName( _rName.getToken(0,'/',nIndex) );
SvTreeListEntry* pEntry = _pFirst;
while( pEntry )
@@ -1111,7 +1111,7 @@ void OAppDetailPageHelper::showPreview(const Reference< XContent >& _xContent)
Reference<document::XDocumentProperties> xProp(
aPreview, UNO_QUERY);
if ( xProp.is() )
- m_aDocumentInfo.fill(xProp,String());
+ m_aDocumentInfo.fill(xProp,OUString());
}
}
else
diff --git a/dbaccess/source/ui/app/AppDetailView.cxx b/dbaccess/source/ui/app/AppDetailView.cxx
index cddaf10..65663c6 100644
--- a/dbaccess/source/ui/app/AppDetailView.cxx
+++ b/dbaccess/source/ui/app/AppDetailView.cxx
@@ -428,13 +428,13 @@ void OTasksWindow::setHelpText(sal_uInt16 _nId)
DBG_CHKTHIS(OTasksWindow,NULL);
if ( _nId )
{
- String sText = ModuleRes(_nId);
+ OUString sText = ModuleRes(_nId);
m_aHelpText.SetText(sText);
}
else
{
- m_aHelpText.SetText(String());
+ m_aHelpText.SetText(OUString());
}
}
// -----------------------------------------------------------------------------
diff --git a/dbaccess/source/ui/app/AppIconControl.cxx b/dbaccess/source/ui/app/AppIconControl.cxx
index 9566823..0dc9d96 100644
--- a/dbaccess/source/ui/app/AppIconControl.cxx
+++ b/dbaccess/source/ui/app/AppIconControl.cxx
@@ -54,7 +54,7 @@ OApplicationIconControl::OApplicationIconControl(Window* _pParent)
for ( size_t i=0; i < sizeof(aCategories)/sizeof(aCategories[0]); ++i)
{
SvxIconChoiceCtrlEntry* pEntry = InsertEntry(
- String( ModuleRes( aCategories[i].nLabelResId ) ) ,
+ OUString( ModuleRes( aCategories[i].nLabelResId ) ) ,
Image( ModuleRes( aCategories[i].nImageResId ) ) );
if ( pEntry )
pEntry->SetUserData( new ElementType( aCategories[i].eType ) );
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 6b9d311..27cafea 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -323,7 +323,7 @@ void DBTreeListBox::RequestHelp( const HelpEvent& rHEvt )
SvTreeListEntry* pEntry = GetEntry( aPos );
if( pEntry )
{
- String sQuickHelpText;
+ OUString sQuickHelpText;
if ( m_pActionListener->requestQuickHelp( pEntry, sQuickHelpText ) )
{
Size aSize( GetOutputSizePixel().Width(), GetEntryHeight() );
@@ -408,7 +408,7 @@ sal_Bool DBTreeListBox::EditingEntry( SvTreeListEntry* pEntry, Selection& /*_aSe
return m_aEditingHandler.Call(pEntry) != 0;
}
// -----------------------------------------------------------------------------
-sal_Bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText )
+sal_Bool DBTreeListBox::EditedEntry( SvTreeListEntry* pEntry, const OUString& rNewText )
{
DBTreeEditedEntry aEntry;
aEntry.pEntry = pEntry;
@@ -475,7 +475,7 @@ namespace
}
else
{
- ::rtl::OUString sCommandURL( _pPopup->GetItemCommand( nId ) );
+ OUString sCommandURL( _pPopup->GetItemCommand( nId ) );
bool bEnabled = sCommandURL.isEmpty()
? _rController.isCommandEnabled( nId )
: _rController.isCommandEnabled( sCommandURL );
@@ -515,7 +515,7 @@ namespace
// more things to preserve:
// - the help command
- ::rtl::OUString sHelpURL = _rMenu.GetHelpCommand( nId );
+ OUString sHelpURL = _rMenu.GetHelpCommand( nId );
if ( !sHelpURL.isEmpty() )
_rMenu.SetHelpCommand( nCommandId, sHelpURL );
diff --git a/dbaccess/source/ui/inc/callbacks.hxx b/dbaccess/source/ui/inc/callbacks.hxx
index 9aaf4a1..e914505 100644
--- a/dbaccess/source/ui/inc/callbacks.hxx
+++ b/dbaccess/source/ui/inc/callbacks.hxx
@@ -49,7 +49,7 @@ namespace dbaui
/** requests a quick help text to display
@return <FALSE/> if the default quick help text should be used
*/
- virtual sal_Bool requestQuickHelp( const SvTreeListEntry* _pEntry, String& _rText ) const = 0;
+ virtual sal_Bool requestQuickHelp( const SvTreeListEntry* _pEntry, OUString& _rText ) const = 0;
/** handler for StartDrag requests
@return <TRUE/> if a drag operation was started
More information about the Libreoffice-commits
mailing list