diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2013-09-02 09:03:31 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-09-02 12:22:34 +0100 |
| commit | ed0f0fa730186a99e3e315ef55f63410af8146b2 (patch) | |
| tree | 2f757a4d622846362a3173082f0719a4f823ea57 /dbaccess | |
| parent | 3b6d6d1741fae5940987358c30176858717b4f72 (diff) | |
XubString->OUString
Change-Id: I5424a148c7173409e6e56f9483fcc769696707bc
Diffstat (limited to 'dbaccess')
| -rw-r--r-- | dbaccess/source/ui/app/AppController.cxx | 4 | ||||
| -rw-r--r-- | dbaccess/source/ui/inc/TableCopyHelper.hxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/dbaccess/source/ui/app/AppController.cxx b/dbaccess/source/ui/app/AppController.cxx index 8ab54d24b068..b97a02e2a1ac 100644 --- a/dbaccess/source/ui/app/AppController.cxx +++ b/dbaccess/source/ui/app/AppController.cxx @@ -2520,7 +2520,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) OUString sName = xContent->getIdentifier()->getContentIdentifier(); sal_Int32 nIndex = 0; sName = sName.copy(sName.getToken(0,'/',nIndex).getLength() + 1); - if ( m_aAsyncDrop.aUrl.Len() >= sName.getLength() && 0 == sName.compareTo(m_aAsyncDrop.aUrl,sName.getLength()) ) + if ( m_aAsyncDrop.aUrl.getLength() >= sName.getLength() && m_aAsyncDrop.aUrl.startsWith(sName) ) { m_aAsyncDrop.aDroppedData.clear(); return DND_ACTION_NONE; @@ -2530,7 +2530,7 @@ sal_Int8 OApplicationController::executeDrop( const ExecuteDropEvent& _rEvt ) Reference< XHierarchicalNameAccess > xContainer(getElements(m_aAsyncDrop.nType),UNO_QUERY); Reference<XNameAccess> xNameAccess(xContainer,UNO_QUERY); - if ( m_aAsyncDrop.aUrl.Len() && xContainer.is() && xContainer->hasByHierarchicalName(m_aAsyncDrop.aUrl) ) + if ( !m_aAsyncDrop.aUrl.isEmpty() && xContainer.is() && xContainer->hasByHierarchicalName(m_aAsyncDrop.aUrl) ) xNameAccess.set(xContainer->getByHierarchicalName(m_aAsyncDrop.aUrl),UNO_QUERY); if ( xNameAccess.is() ) diff --git a/dbaccess/source/ui/inc/TableCopyHelper.hxx b/dbaccess/source/ui/inc/TableCopyHelper.hxx index f2b1dc503543..31ca3de9c0f3 100644 --- a/dbaccess/source/ui/inc/TableCopyHelper.hxx +++ b/dbaccess/source/ui/inc/TableCopyHelper.hxx @@ -74,7 +74,7 @@ namespace dbaui //for transfor the tablename OUString sDefaultTableName; - String aUrl; + OUString aUrl; SotStorageStreamRef aHtmlRtfStorage; ElementType nType; SvTreeListEntry* pDroppedAt; |