tdf#58407 Inserted images are now called Figure by default in caption

Created a new field type called Figure

Change-Id: Ic7f3d3b878d03f4d6a98727db489e48158f946a1
Reviewed-on: https://gerrit.libreoffice.org/52178
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>

13 files changed, 22 insertions, 5 deletions

diff --git a/sw/inc/poolfmt.hxx b/sw/inc/poolfmt.hxx
index 40ef1257ccd9..67191db7f676 100644
--- a/sw/inc/poolfmt.hxx
+++ b/sw/inc/poolfmt.hxx
@@ -345,6 +345,7 @@ RES_POOLCOLL_LABEL,                                     ///< Base labels.
 RES_POOLCOLL_LABEL_ABB,                                 ///< Label illustration.
 RES_POOLCOLL_LABEL_TABLE,                               ///< Label table.
 RES_POOLCOLL_LABEL_FRAME,                               ///< Label frame.
+RES_POOLCOLL_LABEL_FIGURE,                              ///< Label figure
 
 /// Other stuff.
 RES_POOLCOLL_FRAME,                                     ///< Frames.
diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index a4b39e3fe766..8564b1877f15 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -138,6 +138,7 @@
 #define STR_POOLCOLL_LABEL_TABLE                NC_("STR_POOLCOLL_LABEL_TABLE", "Table")
 #define STR_POOLCOLL_LABEL_FRAME                NC_("STR_POOLCOLL_LABEL_FRAME", "Text")
 #define STR_POOLCOLL_LABEL_DRAWING              NC_("STR_POOLCOLL_LABEL_DRAWING", "Drawing")
+#define STR_POOLCOLL_LABEL_FIGURE               NC_("STR_POOLCOLL_LABEL_FIGURE", "Figure")
 #define STR_POOLCOLL_JAKETADRESS                NC_("STR_POOLCOLL_JAKETADRESS", "Addressee")
 #define STR_POOLCOLL_SENDADRESS                 NC_("STR_POOLCOLL_SENDADRESS", "Sender")
 #define STR_POOLCOLL_TOX_IDXH                   NC_("STR_POOLCOLL_TOX_IDXH", "Index Heading")
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 2fde7b6bb55a..f8b1a6175167 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -116,11 +116,11 @@ const short lNumFirstLineOffset = -lNumIndent;
 const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
 
 // Count of SystemField-types of SwDoc.
-#define INIT_FLDTYPES   32
+#define INIT_FLDTYPES   33
 
 // Count of predefined Seq-field types. It is always the last
 // fields before INIT_FLDTYPES.
-#define INIT_SEQ_FLDTYPES   4
+#define INIT_SEQ_FLDTYPES   5
 
 // defined in sw/source/uibase/app/swmodule.cxx
 SW_DLLPUBLIC OUString SwResId(const char* pId);
diff --git a/sw/qa/python/check_styles.py b/sw/qa/python/check_styles.py
index a7a665ab7c96..d519ff8a634e 100644
--- a/sw/qa/python/check_styles.py
+++ b/sw/qa/python/check_styles.py
@@ -132,7 +132,7 @@ class CheckStyle(unittest.TestCase):
     def test_ParagraphFamily(self):
         xDoc = CheckStyle._uno.openEmptyWriterDoc()
         xParaStyles = xDoc.StyleFamilies["ParagraphStyles"]
-        vEmptyDocStyles = ['Standard', 'Heading', 'Text body', 'List', 'Caption', 'Index', 'First line indent', 'Hanging indent', 'Text body indent', 'Salutation', 'Signature', 'List Indent', 'Marginalia', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5', 'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Heading 10', 'Title', 'Subtitle', 'Numbering 1 Start', 'Numbering 1', 'Numbering 1 End', 'Numbering 1 Cont.', 'Numbering 2 Start', 'Numbering 2', 'Numbering 2 End', 'Numbering 2 Cont.', 'Numbering 3 Start', 'Numbering 3', 'Numbering 3 End', 'Numbering 3 Cont.', 'Numbering 4 Start', 'Numbering 4', 'Numbering 4 End', 'Numbering 4 Cont.', 'Numbering 5 Start', 'Numbering 5', 'Numbering 5 End', 'Numbering 5 Cont.', 'List 1 Start', 'List 1', 'List 1 End', 'List 1 Cont.', 'List 2 Start', 'List 2', 'List 2 End', 'List 2 Cont.', 'List 3 Start', 'List 3', 'List 3 End', 'List 3 Cont.', 'List 4 Start', 'List 4', 'List 4 End', 'List 4 Cont.', 'List 5 Start', 'List 5', 'List 5 End', 'List 5 Cont.', 'Index Heading', 'Index 1', 'Index 2', 'Index 3', 'Index Separator', 'Contents Heading', 'Contents 1', 'Contents 2', 'Contents 3', 'Contents 4', 'Contents 5', 'User Index Heading', 'User Index 1', 'User Index 2', 'User Index 3', 'User Index 4', 'User Index 5', 'Contents 6', 'Contents 7', 'Contents 8', 'Contents 9', 'Contents 10', 'Illustration Index Heading', 'Illustration Index 1', 'Object index heading', 'Object index 1', 'Table index heading', 'Table index 1', 'Bibliography Heading', 'Bibliography 1', 'User Index 6', 'User Index 7', 'User Index 8', 'User Index 9', 'User Index 10', 'Header', 'Header left', 'Header right', 'Footer', 'Footer left', 'Footer right', 'Table Contents', 'Table Heading', 'Illustration', 'Table', 'Text', 'Frame contents', 'Footnote', 'Addressee', 'Sender', 'Endnote', 'Drawing', 'Quotations', 'Preformatted Text', 'Horizontal Line', 'List Contents', 'List Heading']
+        vEmptyDocStyles = ['Standard', 'Heading', 'Text body', 'List', 'Caption', 'Index', 'First line indent', 'Hanging indent', 'Text body indent', 'Salutation', 'Signature', 'List Indent', 'Marginalia', 'Heading 1', 'Heading 2', 'Heading 3', 'Heading 4', 'Heading 5', 'Heading 6', 'Heading 7', 'Heading 8', 'Heading 9', 'Heading 10', 'Title', 'Subtitle', 'Numbering 1 Start', 'Numbering 1', 'Numbering 1 End', 'Numbering 1 Cont.', 'Numbering 2 Start', 'Numbering 2', 'Numbering 2 End', 'Numbering 2 Cont.', 'Numbering 3 Start', 'Numbering 3', 'Numbering 3 End', 'Numbering 3 Cont.', 'Numbering 4 Start', 'Numbering 4', 'Numbering 4 End', 'Numbering 4 Cont.', 'Numbering 5 Start', 'Numbering 5', 'Numbering 5 End', 'Numbering 5 Cont.', 'List 1 Start', 'List 1', 'List 1 End', 'List 1 Cont.', 'List 2 Start', 'List 2', 'List 2 End', 'List 2 Cont.', 'List 3 Start', 'List 3', 'List 3 End', 'List 3 Cont.', 'List 4 Start', 'List 4', 'List 4 End', 'List 4 Cont.', 'List 5 Start', 'List 5', 'List 5 End', 'List 5 Cont.', 'Index Heading', 'Index 1', 'Index 2', 'Index 3', 'Index Separator', 'Contents Heading', 'Contents 1', 'Contents 2', 'Contents 3', 'Contents 4', 'Contents 5', 'User Index Heading', 'User Index 1', 'User Index 2', 'User Index 3', 'User Index 4', 'User Index 5', 'Contents 6', 'Contents 7', 'Contents 8', 'Contents 9', 'Contents 10', 'Illustration Index Heading', 'Illustration Index 1', 'Object index heading', 'Object index 1', 'Table index heading', 'Table index 1', 'Bibliography Heading', 'Bibliography 1', 'User Index 6', 'User Index 7', 'User Index 8', 'User Index 9', 'User Index 10', 'Header', 'Header left', 'Header right', 'Footer', 'Footer left', 'Footer right', 'Table Contents', 'Table Heading', 'Illustration', 'Table', 'Text','Figure', 'Frame contents', 'Footnote', 'Addressee', 'Sender', 'Endnote', 'Drawing', 'Quotations', 'Preformatted Text', 'Horizontal Line', 'List Contents', 'List Heading']
         self.__test_StyleFamily(xParaStyles, vEmptyDocStyles, "SwXStyle")
         self.__test_StyleFamilyIndex(xParaStyles, vEmptyDocStyles, "SwXStyle")
         self.__test_StyleFamilyInsert(xDoc, xParaStyles, vEmptyDocStyles, "com.sun.star.style.ParagraphStyle", "com.sun.star.style.CharacterStyle")
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index c261d9eee8a5..1ca77504320d 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -1649,6 +1649,8 @@ void DocumentFieldsManager::InitFieldTypes()       // is being called by the CTO
                 SwResId(STR_POOLCOLL_LABEL_FRAME), nsSwGetSetExpType::GSE_SEQ) );
     mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
                 SwResId(STR_POOLCOLL_LABEL_DRAWING), nsSwGetSetExpType::GSE_SEQ) );
+    mpFieldTypes->push_back( new SwSetExpFieldType(&m_rDoc,
+                SwResId(STR_POOLCOLL_LABEL_FIGURE), nsSwGetSetExpType::GSE_SEQ) );
 
     assert( mpFieldTypes->size() == INIT_FLDTYPES );
 }
diff --git a/sw/source/core/doc/DocumentStylePoolManager.cxx b/sw/source/core/doc/DocumentStylePoolManager.cxx
index c94d940b3716..f5740dc12bee 100644
--- a/sw/source/core/doc/DocumentStylePoolManager.cxx
+++ b/sw/source/core/doc/DocumentStylePoolManager.cxx
@@ -369,6 +369,7 @@ static const char* STR_POOLCOLL_EXTRA_ARY[]
     STR_POOLCOLL_LABEL_ABB,
     STR_POOLCOLL_LABEL_TABLE,
     STR_POOLCOLL_LABEL_FRAME,
+    STR_POOLCOLL_LABEL_FIGURE,
     // Miscellaneous
     STR_POOLCOLL_FRAME,
     STR_POOLCOLL_FOOTNOTE,
@@ -936,6 +937,7 @@ SwTextFormatColl* DocumentStylePoolManager::GetTextCollFromPool( sal_uInt16 nId,
         case RES_POOLCOLL_LABEL_TABLE:          // caption table
         case RES_POOLCOLL_LABEL_FRAME:          // caption frame
         case RES_POOLCOLL_LABEL_DRAWING:        // caption drawing
+        case RES_POOLCOLL_LABEL_FIGURE:
             break;
 
         case RES_POOLCOLL_JAKETADRESS:          // envelope address
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx b/sw/source/core/doc/SwStyleNameMapper.cxx
index c3d3faf55c73..809f2826e4c6 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -157,6 +157,7 @@ const struct SwTableEntry ExtraProgNameTable [] =
     ENTRY( "Illustration" ),
     ENTRY( "Table" ),
     ENTRY( "Text" ),
+    ENTRY( "Figure" ),//RES_POOLCOLL_LABEL_FIGURE
     ENTRY( "Frame contents" ),
     ENTRY( "Footnote" ),
     ENTRY( "Addressee" ),
@@ -364,6 +365,7 @@ lcl_GetSpecialExtraName(const OUString& rExtraName, const bool bIsUIName )
         RES_POOLCOLL_LABEL_ABB - RES_POOLCOLL_EXTRA_BEGIN,
         RES_POOLCOLL_LABEL_TABLE - RES_POOLCOLL_EXTRA_BEGIN,
         RES_POOLCOLL_LABEL_FRAME- RES_POOLCOLL_EXTRA_BEGIN,
+        RES_POOLCOLL_LABEL_FIGURE-RES_POOLCOLL_EXTRA_BEGIN,
         0
     };
     const sal_uInt16 * pIds;
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 9effd62c50ee..a0a43025a871 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -272,6 +272,7 @@ sal_uInt16 GetPoolParent( sal_uInt16 nId )
             case RES_POOLCOLL_LABEL_TABLE:
             case RES_POOLCOLL_LABEL_FRAME:
             case RES_POOLCOLL_LABEL_DRAWING:
+            case RES_POOLCOLL_LABEL_FIGURE:
                     nRet = RES_POOLCOLL_LABEL;                  break;
             }
             break;
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index 0b4c65966f2c..1087e04c0a6e 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -812,6 +812,7 @@ bool SwGetRefField::QueryValue( uno::Any& rAny, sal_uInt16 nWhichId ) const
                 case RES_POOLCOLL_LABEL_TABLE:
                 case RES_POOLCOLL_LABEL_FRAME:
                 case RES_POOLCOLL_LABEL_DRAWING:
+                case RES_POOLCOLL_LABEL_FIGURE:
                     SwStyleNameMapper::FillProgName(nPoolId, sTmp) ;
                 break;
             }
@@ -939,6 +940,9 @@ void SwGetRefField::ConvertProgrammaticToUIName()
                 case RES_POOLCOLL_LABEL_DRAWING:
                     pResId = STR_POOLCOLL_LABEL_DRAWING;
                 break;
+                case RES_POOLCOLL_LABEL_FIGURE:
+                    pResId = STR_POOLCOLL_LABEL_FIGURE;
+                break;
             }
             if (pResId)
                 SetPar1(SwResId(pResId));
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index d719537891eb..436f437b7c8c 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -590,6 +590,7 @@ void SAL_CALL SwXFieldMaster::setPropertyValue(
                 RES_POOLCOLL_LABEL_ABB - RES_POOLCOLL_EXTRA_BEGIN,
                 RES_POOLCOLL_LABEL_TABLE - RES_POOLCOLL_EXTRA_BEGIN,
                 RES_POOLCOLL_LABEL_FRAME- RES_POOLCOLL_EXTRA_BEGIN,
+                RES_POOLCOLL_LABEL_FIGURE - RES_POOLCOLL_EXTRA_BEGIN,
                 0
             };
             for(const sal_uInt16 * pIds = nIds; *pIds; ++pIds)
@@ -637,7 +638,8 @@ void SAL_CALL SwXFieldMaster::setPropertyValue(
             ( sTypeName == SwResId(STR_POOLCOLL_LABEL_TABLE) ||
               sTypeName == SwResId(STR_POOLCOLL_LABEL_DRAWING) ||
               sTypeName == SwResId(STR_POOLCOLL_LABEL_FRAME) ||
-              sTypeName == SwResId(STR_POOLCOLL_LABEL_ABB) )))
+              sTypeName == SwResId(STR_POOLCOLL_LABEL_ABB) ||
+              sTypeName == SwResId(STR_POOLCOLL_LABEL_FIGURE) )))
         {
             throw lang::IllegalArgumentException();
         }
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 1ea83ac0cccb..15b79ed60001 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -487,6 +487,7 @@ SwCaptionOptPage::SwCaptionOptPage(vcl::Window* pParent, const SfxItemSet& rSet)
     SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_TABLE, m_sTable);
     SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FRAME, m_sText);
     SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_DRAWING, m_sDrawing);
+    SwStyleNameMapper::FillUIName(RES_POOLCOLL_LABEL_FIGURE, m_sFigure);
 
     SwWrtShell* pSh = ::GetActiveWrtShell();
 
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index b8860053de0c..135eefb21216 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -160,7 +160,7 @@ SwCaptionDialog::SwCaptionDialog( vcl::Window *pParent, SwView &rV ) :
     sal_uInt16 nPoolId = 0;
     if (eType & SelectionType::Graphic)
     {
-        nPoolId = RES_POOLCOLL_LABEL_ABB;
+        nPoolId = RES_POOLCOLL_LABEL_FIGURE;
         sString = ::GetOldGrfCat();
         bCopyAttributes = true;
         sObjectName = rSh.GetFlyName();
diff --git a/sw/source/uibase/inc/optload.hxx b/sw/source/uibase/inc/optload.hxx
index a106d250b885..6502a9b6407d 100644
--- a/sw/source/uibase/inc/optload.hxx
+++ b/sw/source/uibase/inc/optload.hxx
@@ -157,6 +157,7 @@ private:
     OUString m_sOLE;
 
     OUString m_sIllustration;
+    OUString m_sFigure;
     OUString m_sTable;
     OUString m_sText;
     OUString m_sDrawing;