[Libreoffice-commits] core.git: basctl/source

[Noel Grandin (via logerrit)]

 basctl/source/basicide/documentenumeration.cxx |   20 ++++----------------
 basctl/source/basicide/documentenumeration.hxx |    4 ++--
 2 files changed, 6 insertions(+), 18 deletions(-)

New commits:
commit 822cc9e941bf4fcf99ad1214096deea5d0997802
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Tue Feb 28 10:08:48 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Tue Feb 28 11:41:12 2023 +0000

    flatten basctl::docs::DocumentEnumeration
    
    no need to use pimpl pattern here
    
    Change-Id: I289f545ff237b9770f3a193460a943e91b86fadb
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/147955
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/basctl/source/basicide/documentenumeration.cxx 
b/basctl/source/basicide/documentenumeration.cxx
index 59a85d6a9859..d71e02139e02 100644
--- a/basctl/source/basicide/documentenumeration.cxx
+++ b/basctl/source/basicide/documentenumeration.cxx
@@ -48,22 +48,10 @@ namespace basctl::docs {
 
     namespace FrameSearchFlag = ::com::sun::star::frame::FrameSearchFlag;
 
-    // DocumentEnumeration_Data
-    struct DocumentEnumeration_Data
-    {
-        Reference< css::uno::XComponentContext > aContext;
-        const IDocumentDescriptorFilter*    pFilter;
-
-        DocumentEnumeration_Data( Reference< css::uno::XComponentContext > 
const & _rContext, const IDocumentDescriptorFilter* _pFilter )
-            :aContext( _rContext )
-            ,pFilter( _pFilter )
-        {
-        }
-    };
-
     // DocumentEnumeration
     DocumentEnumeration::DocumentEnumeration( Reference< 
css::uno::XComponentContext > const & _rContext, const 
IDocumentDescriptorFilter* _pFilter )
-        :m_pData( new DocumentEnumeration_Data( _rContext, _pFilter ) )
+        : m_xContext( _rContext )
+        , m_pFilter( _pFilter )
     {
     }
 
@@ -152,11 +140,11 @@ namespace basctl::docs {
 
         try
         {
-            const Reference< XDesktop2 > xDesktop = Desktop::create( 
m_pData->aContext );
+            const Reference< XDesktop2 > xDesktop = Desktop::create( 
m_xContext );
             const Reference< XFrames > xFrames( xDesktop->getFrames(), 
UNO_SET_THROW );
             const Sequence< Reference< XFrame > > aFrames( 
xFrames->queryFrames( FrameSearchFlag::ALL ) );
 
-            lcl_getDocuments_nothrow( aFrames, _out_rDocuments, 
m_pData->pFilter );
+            lcl_getDocuments_nothrow( aFrames, _out_rDocuments, m_pFilter );
         }
         catch( const Exception& )
         {
diff --git a/basctl/source/basicide/documentenumeration.hxx 
b/basctl/source/basicide/documentenumeration.hxx
index 084a4aa0cf09..dfd4d2e8172f 100644
--- a/basctl/source/basicide/documentenumeration.hxx
+++ b/basctl/source/basicide/documentenumeration.hxx
@@ -51,7 +51,6 @@ namespace basctl::docs {
     };
 
 
-    struct DocumentEnumeration_Data;
     /** is a helper class for enumerating documents in OOo
 
         If you need a list of all open documents in OOo, this is little bit of
@@ -81,7 +80,8 @@ namespace basctl::docs {
         ) const;
 
     private:
-        std::unique_ptr< DocumentEnumeration_Data > m_pData;
+        css::uno::Reference< css::uno::XComponentContext > m_xContext;
+        const IDocumentDescriptorFilter* m_pFilter;
     };