dbaccess/source/ui/inc/defaultobjectnamecheck.hxx | 4 ++--
dbaccess/source/ui/inc/dsmeta.hxx | 3 +--
dbaccess/source/ui/misc/defaultobjectnamecheck.cxx | 20 ++++++--------------
dbaccess/source/ui/misc/dsmeta.cxx | 21 ++-------------------
4 files changed, 11 insertions(+), 37 deletions(-)
New commits:
commit 08b923efcb22bae08c799ccc654797076468fa83
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Sep 4 21:11:36 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 5 08:57:18 2022 +0200
DataSourceMetaData doesn't need a pimpl
it is module private
Change-Id: Ib0817d7964e603157a9369d3ef0685e2b79f0aa9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139376
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/source/ui/inc/dsmeta.hxx
b/dbaccess/source/ui/inc/dsmeta.hxx
index 69b13ebb7965..0c8646a53cbd 100644
--- a/dbaccess/source/ui/inc/dsmeta.hxx
+++ b/dbaccess/source/ui/inc/dsmeta.hxx
@@ -42,7 +42,6 @@ namespace dbaui
// DataSourceMetaData
class FeatureSet;
- class DataSourceMetaData_Impl;
/** encapsulates meta data for a data source
On the long run, this class should a) encapsulate *all* meta data which
@@ -65,7 +64,7 @@ namespace dbaui
static AuthenticationMode getAuthentication( const OUString& _sURL );
private:
- std::shared_ptr< DataSourceMetaData_Impl > m_pImpl;
+ OUString m_sURL;
};
// FeatureSet
diff --git a/dbaccess/source/ui/misc/dsmeta.cxx
b/dbaccess/source/ui/misc/dsmeta.cxx
index 402bdd7bfa34..526a39ecbcff 100644
--- a/dbaccess/source/ui/misc/dsmeta.cxx
+++ b/dbaccess/source/ui/misc/dsmeta.cxx
@@ -140,26 +140,9 @@ namespace dbaui
return s_aSupport[ _sURL ].eAuthentication;
}
- // DataSourceMetaData_Impl
- class DataSourceMetaData_Impl
- {
- public:
- explicit DataSourceMetaData_Impl(OUString sURL);
-
- const OUString& getType() const { return m_sURL; }
-
- private:
- const OUString m_sURL;
- };
-
- DataSourceMetaData_Impl::DataSourceMetaData_Impl( OUString _sURL )
- :m_sURL(std::move( _sURL ))
- {
- }
-
// DataSourceMetaData
DataSourceMetaData::DataSourceMetaData( const OUString& _sURL )
- :m_pImpl( std::make_shared<DataSourceMetaData_Impl>( _sURL ) )
+ :m_sURL( _sURL )
{
}
@@ -169,7 +152,7 @@ namespace dbaui
const FeatureSet& DataSourceMetaData::getFeatureSet() const
{
- return lcl_getFeatureSet( m_pImpl->getType() );
+ return lcl_getFeatureSet( m_sURL );
}
AuthenticationMode DataSourceMetaData::getAuthentication( const OUString&
_sURL )
commit 90f3182141d37407715254d5118aae907d559b41
Author: Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Sep 4 15:08:04 2022 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Sep 5 08:56:58 2022 +0200
HierarchicalNameCheck doesn't need a pimpl
already module private≈
Change-Id: Id5ea44b88c5cd6776d41fc71ac6c5fa4d639aab9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/139366
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
index 157f201ddc6a..c75528940e15 100644
--- a/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
+++ b/dbaccess/source/ui/inc/defaultobjectnamecheck.hxx
@@ -31,14 +31,14 @@ namespace dbaui
{
// HierarchicalNameCheck
- struct HierarchicalNameCheck_Impl;
/** class implementing the IObjectNameCheck interface, and checking given
object names
against a hierarchical name container
*/
class HierarchicalNameCheck :public IObjectNameCheck
{
private:
- std::unique_ptr< HierarchicalNameCheck_Impl > m_pImpl;
+ css::uno::Reference< css::container::XHierarchicalNameAccess >
mxHierarchicalNames;
+ OUString msRelativeRoot;
public:
/** constructs a HierarchicalNameCheck instance
diff --git a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
index 809e90a777cc..d2a158d2b76e 100644
--- a/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
+++ b/dbaccess/source/ui/misc/defaultobjectnamecheck.cxx
@@ -67,21 +67,13 @@ namespace dbaui
}
- // HierarchicalNameCheck_Impl
- struct HierarchicalNameCheck_Impl
- {
- Reference< XHierarchicalNameAccess > xHierarchicalNames;
- OUString sRelativeRoot;
- };
-
// HierarchicalNameCheck
HierarchicalNameCheck::HierarchicalNameCheck( const Reference<
XHierarchicalNameAccess >& _rxNames, const OUString& _rRelativeRoot )
- :m_pImpl( new HierarchicalNameCheck_Impl )
{
- m_pImpl->xHierarchicalNames = _rxNames;
- m_pImpl->sRelativeRoot = _rRelativeRoot;
+ mxHierarchicalNames = _rxNames;
+ msRelativeRoot = _rRelativeRoot;
- if ( !m_pImpl->xHierarchicalNames.is() )
+ if ( !mxHierarchicalNames.is() )
throw IllegalArgumentException();
}
@@ -94,15 +86,15 @@ namespace dbaui
try
{
OUStringBuffer aCompleteName;
- if ( !m_pImpl->sRelativeRoot.isEmpty() )
+ if ( !msRelativeRoot.isEmpty() )
{
- aCompleteName.append( m_pImpl->sRelativeRoot );
+ aCompleteName.append( msRelativeRoot );
aCompleteName.append( "/" );
}
aCompleteName.append( _rObjectName );
OUString sCompleteName( aCompleteName.makeStringAndClear() );
- if ( !m_pImpl->xHierarchicalNames->hasByHierarchicalName(
sCompleteName ) )
+ if ( !mxHierarchicalNames->hasByHierarchicalName( sCompleteName ) )
return true;
}
catch( const Exception& )
