[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - include/svtools svtools/source

[Gabor Kelemen]

 include/svtools/strings.hrc       |    1 +
 svtools/source/dialogs/insdlg.cxx |    1 +
 2 files changed, 2 insertions(+)

New commits:
commit 6ba85aad17a1a69fa6113d3c2ed8732b048ab3ee
Author: Gabor Kelemen <kelem...@ubuntu.com>
Date:   Wed Nov 29 00:20:09 2017 +0100

    tdf#114124 Translate 'PNG Bitmap' string in Calc Paste dropdown
    
    Change-Id: I8356f241d0742276cf32aa301c35055a7f3c5898
    Reviewed-on: https://gerrit.libreoffice.org/45447
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>
    (cherry picked from commit f66ace21cdf4fec85c05be1a85ecfdaa8c281066)
    Reviewed-on: https://gerrit.libreoffice.org/45622

diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc
index a7af8ca5889d..ebda4b746df8 100644
--- a/include/svtools/strings.hrc
+++ b/include/svtools/strings.hrc
@@ -94,6 +94,7 @@
 #define STR_FORMAT_ID_DIALOG_60                 NC_("STR_FORMAT_ID_DIALOG_60", 
"OpenOffice.org 1.0 dialog")
 #define STR_FORMAT_ID_FILEGRPDESCRIPTOR         
NC_("STR_FORMAT_ID_FILEGRPDESCRIPTOR", "Link")
 #define STR_FORMAT_ID_HTML_NO_COMMENT           
NC_("STR_FORMAT_ID_HTML_NO_COMMENT", "HTML format without comments")
+#define STR_FORMAT_ID_PNG_BITMAP                
NC_("STR_FORMAT_ID_PNG_BITMAP", "PNG Bitmap")
 
 #define STR_ERROR_OBJNOCREATE                   NC_("STR_ERROR_OBJNOCREATE", 
"Object % could not be inserted.")
 #define STR_ERROR_OBJNOCREATE_FROM_FILE         
NC_("STR_ERROR_OBJNOCREATE_FROM_FILE", "Object from file % could not be 
inserted.")
diff --git a/svtools/source/dialogs/insdlg.cxx 
b/svtools/source/dialogs/insdlg.cxx
index 08c68596063f..a7ed5ca32c1a 100644
--- a/svtools/source/dialogs/insdlg.cxx
+++ b/svtools/source/dialogs/insdlg.cxx
@@ -264,6 +264,7 @@ OUString SvPasteObjectHelper::GetSotFormatUIName( 
SotClipboardFormatId nId )
         { SotClipboardFormatId::HTML_NO_COMMENT,     
STR_FORMAT_ID_HTML_NO_COMMENT },
         { SotClipboardFormatId::RICHTEXT,            STR_FORMAT_ID_RICHTEXT },
         { SotClipboardFormatId::STRING_TSVC,         STR_FORMAT_ID_STRING_TSVC 
},
+        { SotClipboardFormatId::PNG,                 STR_FORMAT_ID_PNG_BITMAP 
},
     };
 
     const char* pResId = nullptr;

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits