TransferableObjectDescriptor::mnOle2Misc field is unused

which means that SfxObjectShell::GetMiscStatus becomes unused

Change-Id: I5c89a2cd5c77c7f08a57fdac08237aab514fc7fa
Reviewed-on: https://gerrit.libreoffice.org/38843
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

12 files changed, 0 insertions, 81 deletions

diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx
index e1e683694a9f..fc13b6a0b345 100644
--- a/include/sfx2/objsh.hxx
+++ b/include/sfx2/objsh.hxx
@@ -92,10 +92,6 @@ enum class SfxEventHintId;
 #define ASPECT_ICON         4
 #define ASPECT_DOCPRINT     8
 
-// must be the same as in OLE2
-#define SVOBJ_MISCSTATUS_NOTRESIZEABLE          512
-#define SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE  2048
-
 namespace sfx2
 {
     class SvLinkSource;
@@ -626,7 +622,6 @@ public:
     virtual void      SetVisArea( const tools::Rectangle & rVisArea );
     const tools::Rectangle & GetVisArea() const;
     void              SetVisAreaSize( const Size & rVisSize );
-    virtual sal_uIntPtr GetMiscStatus() const;
 
     MapUnit         GetMapUnit() const;
     void            SetMapUnit( MapUnit nMUnit );
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx
index 8a9e0bb180ea..bc3c6eceacab 100644
--- a/include/svtools/transfer.hxx
+++ b/include/svtools/transfer.hxx
@@ -70,13 +70,11 @@ struct TransferableObjectDescriptor
     sal_uInt16          mnViewAspect;
     Point               maDragStartPos;
     Size                maSize;
-    sal_uInt32          mnOle2Misc;
     OUString            maTypeName;
     OUString            maDisplayName;
 
     TransferableObjectDescriptor()
         : mnViewAspect(css::embed::Aspects::MSOLE_CONTENT)
-        , mnOle2Misc(0)
     {}
 
     SVT_DLLPUBLIC friend SvStream&  WriteTransferableObjectDescriptor( SvStream& rOStm, const TransferableObjectDescriptor& rObjDesc );
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 588e4a8ab0d6..14487d300c3f 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -524,10 +524,6 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
         {
             if (xObj.is())
             {
-                //TODO/LATER: needs status for RESIZEONPRINTERCHANGE
-                //if( SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->getStatus( nAspect ) )
-                //    aIPObj->OnDocumentPrinterChanged( mpDocSh->GetPrinter(sal_False) );
-
                 bool bInsertNewObject = true;
 
                 Size aSize;
diff --git a/sfx2/source/doc/objembed.cxx b/sfx2/source/doc/objembed.cxx
index 437334e75528..7428a5e39ed7 100644
--- a/sfx2/source/doc/objembed.cxx
+++ b/sfx2/source/doc/objembed.cxx
@@ -136,12 +136,6 @@ void SfxObjectShell::SetVisAreaSize( const Size & rVisSize )
 }
 
 
-sal_uIntPtr SfxObjectShell::GetMiscStatus() const
-{
-    return 0;
-}
-
-
 MapUnit SfxObjectShell::GetMapUnit() const
 {
     return pImpl->m_nMapUnit;
@@ -161,7 +155,6 @@ void SfxObjectShell::FillTransferableObjectDescriptor( TransferableObjectDescrip
     FillClass( &rDesc.maClassName, &nClipFormat, &aAppName, &rDesc.maTypeName, &aShortName, SOFFICE_FILEFORMAT_CURRENT );
 
     rDesc.mnViewAspect = ASPECT_CONTENT;
-    rDesc.mnOle2Misc = GetMiscStatus();
     rDesc.maSize = OutputDevice::LogicToLogic( GetVisArea().GetSize(), GetMapUnit(), MapUnit::Map100thMM );
     rDesc.maDragStartPos = Point();
     rDesc.maDisplayName.clear();
diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx
index f0efafec87e8..2e2d0d325d93 100644
--- a/sfx2/source/doc/sfxbasemodel.cxx
+++ b/sfx2/source/doc/sfxbasemodel.cxx
@@ -1891,8 +1891,6 @@ Any SAL_CALL SfxBaseModel::getTransferData( const datatransfer::DataFlavor& aFla
                 // TODO/LATER: ViewAspect needs to be sal_Int64
                 aDesc.mnViewAspect = sal::static_int_cast< sal_uInt16 >( embed::Aspects::MSOLE_CONTENT );
 
-                //TODO/LATER: status needs to become sal_Int64
-                aDesc.mnOle2Misc = m_pData->m_pObjectShell->GetMiscStatus();
                 Size aSize = m_pData->m_pObjectShell->GetVisArea().GetSize();
 
                 MapUnit aMapUnit = m_pData->m_pObjectShell->GetMapUnit();
diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index a705e72f33a8..e18c674f2a69 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -116,7 +116,6 @@ class SM_DLLPUBLIC SmDocShell : public SfxObjectShell, public SfxListener
                                   sal_Int32 nFileFormat,
                                   bool bTemplate = false ) const override;
 
-    virtual sal_uIntPtr GetMiscStatus() const override;
     virtual void        OnDocumentPrinterChanged( Printer * ) override;
     virtual bool        InitNew( const css::uno::Reference< css::embed::XStorage >& xStorage ) override;
     virtual bool        Load( SfxMedium& rMedium ) override;
diff --git a/starmath/source/document.cxx b/starmath/source/document.cxx
index f814db1962c7..ef1ce59cf0fe 100644
--- a/starmath/source/document.cxx
+++ b/starmath/source/document.cxx
@@ -1294,12 +1294,6 @@ void SmDocShell::FillClass(SvGlobalName* pClassName,
     }
 }
 
-sal_uIntPtr SmDocShell::GetMiscStatus() const
-{
-    return SfxObjectShell::GetMiscStatus() | SVOBJ_MISCSTATUS_NOTRESIZEABLE
-                                             | SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE;
-}
-
 void SmDocShell::SetModified(bool bModified)
 {
     if( IsEnableSetModified() )
diff --git a/svtools/source/misc/embedtransfer.cxx b/svtools/source/misc/embedtransfer.cxx
index 6bf862dc1080..1f265ea705d7 100644
--- a/svtools/source/misc/embedtransfer.cxx
+++ b/svtools/source/misc/embedtransfer.cxx
@@ -215,9 +215,6 @@ void SvEmbedTransferHelper::FillTransferableObjectDescriptor( TransferableObject
     // so for internal transport something different should be found
     rDesc.mnViewAspect = sal::static_int_cast<sal_uInt16>( nAspect );
 
-    //TODO/LATER: status needs to become sal_Int64
-    rDesc.mnOle2Misc = sal::static_int_cast<sal_Int32>(xObj->getStatus( rDesc.mnViewAspect ));
-
     Size aSize;
     MapMode aMapMode( MapUnit::Map100thMM );
     if ( nAspect == embed::Aspects::MSOLE_ICON )
diff --git a/svx/source/svdraw/svdoole2.cxx b/svx/source/svdraw/svdoole2.cxx
index 772afa3d0f5b..c7d5e354fbfd 100644
--- a/svx/source/svdraw/svdoole2.cxx
+++ b/svx/source/svdraw/svdoole2.cxx
@@ -999,22 +999,6 @@ void SdrOle2Obj::Connect_Impl()
                     << comphelper::anyToString( cppu::getCaughtException() ) );
         }
     }
-
-    //TODO/LATER: wait for definition of MiscStatus RESIZEONPRINTERCHANGE
-    //if ( xObjRef.is() && (*ppObjRef)->GetMiscStatus() & SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE )
-    {
-        //TODO/LATER: needs a new handling for OnPrinterChanged
-        /*
-        if (pModel && pModel->GetRefDevice() &&
-            pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER)
-        {
-            // no RefDevice or RefDevice is not a printer
-            bool bModified = (*ppObjRef)->IsModified();
-            Printer* pPrinter = (Printer*) pModel->GetRefDevice();
-            (*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
-            (*ppObjRef)->SetModified( bModified );
-        }*/
-    }
 }
 
 void SdrOle2Obj::ObjectLoaded()
@@ -1853,33 +1837,6 @@ void SdrOle2Obj::GetObjRef_Impl()
                     pModel->SetChanged( false );
                 }
             }
-
-            sal_Int64 nMiscStatus = mpImpl->mxObjRef->getStatus( GetAspect() );
-            (void)nMiscStatus;
-            //TODO/LATER: wait until ResizeOnPrinterChange is defined
-            //if ( nMiscStatus & SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE )
-            {
-                if (pModel && pModel->GetRefDevice() &&
-                    pModel->GetRefDevice()->GetOutDevType() == OUTDEV_PRINTER)
-                {
-                    if (!mpImpl->mbInDestruction)
-                    {
-                        //TODO/LATER: printerchange notification
-                        /*
-                        // prevent SetModified (don't want no update here)
-                        bool bWasEnabled = (*ppObjRef)->IsEnableSetModified();
-                        if ( bWasEnabled )
-                            (*ppObjRef)->EnableSetModified( false );
-
-                        // no RefDevice or RefDevice is not a printer
-                        Printer* pPrinter = (Printer*) pModel->GetRefDevice();
-                        (*ppObjRef)->OnDocumentPrinterChanged( pPrinter );
-
-                        // reset state
-                        (*ppObjRef)->EnableSetModified( bWasEnabled );*/
-                    }
-                }
-            }
         }
 
         if ( mpImpl->mxObjRef.is() )
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index 9d2114516c5d..801ef8324840 100644
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -180,7 +180,6 @@ public:
     virtual Printer  *GetDocumentPrinter() override;
     virtual OutputDevice* GetDocumentRefDev() override;
     virtual void      OnDocumentPrinterChanged( Printer * pNewPrinter ) override;
-    virtual sal_uLong     GetMiscStatus() const override;
 
     virtual void            PrepareReload() override;
     virtual void            SetModified( bool = true ) override;
diff --git a/sw/source/uibase/app/docsh.cxx b/sw/source/uibase/app/docsh.cxx
index ff2fd5c76088..fc112a080bff 100644
--- a/sw/source/uibase/app/docsh.cxx
+++ b/sw/source/uibase/app/docsh.cxx
@@ -902,11 +902,6 @@ void SwDocShell::OnDocumentPrinterChanged( Printer * pNewPrinter )
         GetDoc()->getIDocumentDeviceAccess().setPrinter( nullptr, true, true );
 }
 
-sal_uLong SwDocShell::GetMiscStatus() const
-{
-    return SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE;
-}
-
 // #i20883# Digital Signatures and Encryption
 HiddenInformation SwDocShell::GetHiddenInformationState( HiddenInformation nStates )
 {
diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx
index 08527aa134de..c6b6e929300a 100644
--- a/sw/source/uibase/wrtsh/wrtsh1.cxx
+++ b/sw/source/uibase/wrtsh/wrtsh1.cxx
@@ -711,8 +711,6 @@ void SwWrtShell::CalcAndSetScale( svt::EmbeddedObjectRef& xObj,
     {
         if ( (embed::EmbedMisc::EMBED_ACTIVATEIMMEDIATELY & nMisc)
              || bLinkingChart
-            // TODO/LATER: ResizeOnPrinterChange
-             //|| SVOBJ_MISCSTATUS_RESIZEONPRINTERCHANGE & xObj->GetMiscStatus()
              // --> OD #i117189# - refine condition for non-resizable objects
              // non-resizable objects need to be set the size back by this method
              || ( bNoTextFramePrtAreaChanged && nMisc & embed::EmbedMisc::EMBED_NEVERRESIZE ) )