[Libreoffice-commits] core.git: sw/inc sw/source

[Noel Grandin (via logerrit)]

 sw/inc/cmdid.h                    |    3 ---
 sw/source/ui/frmdlg/frmpage.cxx   |    6 +-----
 sw/source/uibase/shells/grfsh.cxx |    1 -
 3 files changed, 1 insertion(+), 9 deletions(-)

New commits:
commit 4b6424f81dc6e4a4c34b830d6a24f4aa7356a642
Author:     Noel Grandin <noelgran...@gmail.com>
AuthorDate: Sun Feb 27 20:40:32 2022 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Feb 28 09:29:35 2022 +0100

    remove unused FN_PARAM_GRF*
    
    ever since
        commit dec81fe5aa2200b9b351240209fde9434a830c5d
        Date:   Tue May 15 09:03:55 2001 +0000
        #86986# SfxFileDialog/SvxImportGraphicDialog removed
    
    Change-Id: I5d75770dc86e40870abcc8dfe7b62f6711d6aa9c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130655
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index 53a0f49c3e54..71012919a888 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -795,9 +795,6 @@ class SwUINumRuleItem;
 #define FN_PARAM_FIELD_SUBTYPE          
TypedWhichId<SfxUInt16Item>(FN_PARAM+56)
 #define FN_PARAM_FIELD_FORMAT           
TypedWhichId<SfxUInt32Item>(FN_PARAM+57)
 
-#define FN_PARAM_GRF_REALSIZE           TypedWhichId<SvxSizeItem>(FN_PARAM+70)
-#define FN_PARAM_GRF_DIALOG             (FN_PARAM+71)
-
 #define FN_PARAM_PRINTER                TypedWhichId<SwPtrItem>(FN_PARAM+78) 
/* Printer */
 #define FN_PARAM_STDFONTS               TypedWhichId<SwPtrItem>(FN_PARAM+79) 
/* ConfigItem Standardfonts */
 
diff --git a/sw/source/ui/frmdlg/frmpage.cxx b/sw/source/ui/frmdlg/frmpage.cxx
index 6975fda7b824..66837f87fe43 100644
--- a/sw/source/ui/frmdlg/frmpage.cxx
+++ b/sw/source/ui/frmdlg/frmpage.cxx
@@ -905,11 +905,7 @@ void SwFramePage::Reset( const SfxItemSet *rSet )
     if ( m_sDlgType == "PictureDialog" || m_sDlgType == "ObjectDialog" )
     {
         OSL_ENSURE(pSh , "shell not found");
-        //OS: only for the variant Insert/Graphic/Properties
-        if(SfxItemState::SET == rSet->GetItemState(FN_PARAM_GRF_REALSIZE, 
false, &pItem))
-            m_aGrfSize = static_cast<const SvxSizeItem*>(pItem)->GetSize();
-        else
-            pSh->GetGrfSize( m_aGrfSize );
+        pSh->GetGrfSize( m_aGrfSize );
 
         if ( !m_bNew )
         {
diff --git a/sw/source/uibase/shells/grfsh.cxx 
b/sw/source/uibase/shells/grfsh.cxx
index fa293272d0b9..06e4049cd87c 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -278,7 +278,6 @@ void SwGrfShell::Execute(SfxRequest &rReq)
                     // contains SID_ATTR_GRAF_FRMSIZE_PERCENT
                     FN_GET_PRINT_AREA, FN_GET_PRINT_AREA,
                     FN_PARAM_GRF_CONNECT, FN_PARAM_GRF_CONNECT,
-                    FN_PARAM_GRF_DIALOG, FN_PARAM_GRF_DIALOG,
                     FN_SET_FRM_NAME, FN_KEEP_ASPECT_RATIO,
                     FN_SET_FRM_ALT_NAME, FN_SET_FRM_ALT_NAME,
                     FN_UNO_DESCRIPTION, FN_UNO_DESCRIPTION>  aSet( GetPool() );