From 37ec75564d18f50e656a78bf046e6e86a3e914c1 Mon Sep 17 00:00:00 2001
From: Maxim Monastirsky <momonasmon@gmail.com>
Date: Wed, 9 Sep 2020 16:19:05 +0300
Subject: Remove the useless Export sdi property

Maybe I'm missing something, but its usage -
"if ( !GetExport() && !GetHidden() )" seems like expects
it to be true and false at the same time. Anyway, there's
no diff in workdir/SdiTarget after this change, so should
be safe to remove.

Change-Id: I6db508ff40c05dc828ffa91bb41a37c17b697503
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/102345
Tested-by: Jenkins
Tested-by: Maxim Monastirsky <momonasmon@gmail.com>
Reviewed-by: Maxim Monastirsky <momonasmon@gmail.com>
---
 idl/source/objects/slot.cxx | 29 -----------------------------
 idl/source/prj/command.cxx  |  1 -
 idl/source/prj/globals.cxx  |  1 -
 idl/source/prj/parser.cxx   |  1 -
 4 files changed, 32 deletions(-)

(limited to 'idl/source')

diff --git a/idl/source/objects/slot.cxx b/idl/source/objects/slot.cxx
index 1793da697c5c..30b6b1fe0eca 100644
--- a/idl/source/objects/slot.cxx
+++ b/idl/source/objects/slot.cxx
@@ -31,7 +31,6 @@ SvMetaSlot::SvMetaSlot()
     , pNextSlot(nullptr)
     , nListPos(0)
     , aReadOnlyDoc ( true )
-    , aExport( true )
 {
 }
 
@@ -42,7 +41,6 @@ SvMetaSlot::SvMetaSlot( SvMetaType * pType )
     , pNextSlot(nullptr)
     , nListPos(0)
     , aReadOnlyDoc ( true )
-    , aExport( true )
 {
 }
 
@@ -52,23 +50,6 @@ bool SvMetaSlot::GetReadOnlyDoc() const
     return static_cast<SvMetaSlot *>(GetRef())->GetReadOnlyDoc();
 }
 
-bool SvMetaSlot::GetExport() const
-{
-    if( aExport.IsSet() || !GetRef() ) return aExport;
-    return static_cast<SvMetaSlot *>(GetRef())->GetExport();
-}
-
-bool SvMetaSlot::GetHidden() const
-{
-    // when export is set, but hidden is not the default is used
-    if ( aExport.IsSet() )
-        return !aExport;
-    else if( !GetRef() )
-        return false;
-    else
-        return static_cast<SvMetaSlot *>(GetRef())->GetHidden();
-}
-
 bool SvMetaSlot::IsVariable() const
 {
     SvMetaType * pType = GetType();
@@ -191,7 +172,6 @@ void SvMetaSlot::ReadAttributesSvIdl( SvIdlDataBase & rBase,
     aStateMethod.ReadSvIdl( SvHash_StateMethod(), rInStm );
     ReadStringSvIdl( SvHash_DisableFlags(), rInStm, aDisableFlags );
     aReadOnlyDoc.ReadSvIdl( SvHash_ReadOnlyDoc(), rInStm );
-    aExport.ReadSvIdl( SvHash_Export(), rInStm );
     aToggle.ReadSvIdl( SvHash_Toggle(), rInStm );
     aAutoUpdate.ReadSvIdl( SvHash_AutoUpdate(), rInStm );
     aAsynchron.ReadSvIdl( SvHash_Asynchron(), rInStm );
@@ -357,9 +337,6 @@ void SvMetaSlot::WriteSlotStubs( const OString& rShellName,
                                 std::vector<OString> & rList,
                                 SvStream & rOutStm ) const
 {
-    if ( !GetExport() && !GetHidden() )
-        return;
-
     OString aMethodName( GetExecMethod() );
     if ( !aMethodName.isEmpty() &&
          aMethodName != "NoExec" )
@@ -416,9 +393,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
                             size_t nStart,
                             SvIdlDataBase & rBase, SvStream & rOutStm )
 {
-    if ( !GetExport() && !GetHidden() )
-        return;
-
     rOutStm.WriteCharPtr( "// Slot Nr. " )
        .WriteOString( OString::number(nListPos) )
        .WriteCharPtr( " : " );
@@ -596,9 +570,6 @@ void SvMetaSlot::WriteSlot( const OString& rShellName, sal_uInt16 nCount,
 
 sal_uInt16 SvMetaSlot::WriteSlotParamArray( SvIdlDataBase & rBase, SvStream & rOutStm ) const
 {
-    if ( !GetExport() && !GetHidden() )
-        return 0;
-
     if( IsMethod() )
     {
         SvMetaType * pType = GetType();
diff --git a/idl/source/prj/command.cxx b/idl/source/prj/command.cxx
index 2e09351d5d68..ea3e4de0b078 100644
--- a/idl/source/prj/command.cxx
+++ b/idl/source/prj/command.cxx
@@ -79,7 +79,6 @@ char const * const SyntaxStrings[] = {
 "\t\tAutoUpdate",
 "\t\tContainer",
 "\t\tExecMethod     = Identifier",
-"\t\tExport*",
 "\t\tFastCall",
 "\t\tGet, Set",
 "\t\tGroupId        = Identifier",
diff --git a/idl/source/prj/globals.cxx b/idl/source/prj/globals.cxx
index 5231076e4e28..1540f53e6305 100644
--- a/idl/source/prj/globals.cxx
+++ b/idl/source/prj/globals.cxx
@@ -76,7 +76,6 @@ SvGlobalHashNames::SvGlobalHashNames()
     A_ENTRY(ExecMethod)
     A_ENTRY(StateMethod)
     A_ENTRY(GroupId)
-    A_ENTRY(Export)
     A_ENTRY(define)
     A_ENTRY(MenuConfig)
     A_ENTRY(ToolBoxConfig)
diff --git a/idl/source/prj/parser.cxx b/idl/source/prj/parser.cxx
index dc5bb4f14444..7053cd905a07 100644
--- a/idl/source/prj/parser.cxx
+++ b/idl/source/prj/parser.cxx
@@ -386,7 +386,6 @@ void SvIdlParser::ReadSlotAttribute( SvMetaSlot& rSlot )
     ReadIfIdAttribute(rSlot.aStateMethod, SvHash_StateMethod() );
     ReadStringSvIdl( SvHash_DisableFlags(), rInStm, rSlot.aDisableFlags );
     ReadIfBoolAttribute(rSlot.aReadOnlyDoc, SvHash_ReadOnlyDoc() );
-    ReadIfBoolAttribute(rSlot.aExport, SvHash_Export() );
 
     ReadIfBoolAttribute(rSlot.aToggle, SvHash_Toggle() );
     ReadIfBoolAttribute(rSlot.aAutoUpdate, SvHash_AutoUpdate() );
-- 
cgit v1.2.3