[Libreoffice-commits] core.git: Branch 'distro/collabora/cp-6.2' - sw/inc sw/source

[Scott Clarke (via logerrit)]

 sw/inc/strings.hrc                              |    1 +
 sw/source/core/doc/doc.cxx                      |    2 ++
 sw/source/core/text/EnhancedPDFExportHelper.cxx |    6 +++++-
 sw/source/uibase/docvw/AnnotationWin2.cxx       |   12 ++++++++++++
 4 files changed, 20 insertions(+), 1 deletion(-)

New commits:
commit cf7d723194d7a20e9c014dcf94dff7edfc6b7c04
Author:     Scott Clarke <scott.clarke at codethink.co.uk>
AuthorDate: Fri Sep 6 14:26:52 2019 +0100
Commit:     Michael Meeks <michael.meeks at collabora.com>
CommitDate: Fri Nov 29 14:29:29 2019 +0100

    Make resolved comments appear resolved when printed
    
    Added an indication to resolved comments when printing them or
    exporting them as a PDF.
    
    Change-Id: I9a84b76d6f12cca3c4541d19a0890cbd1cf430a7
    Reviewed-on: https://gerrit.libreoffice.org/78712
    Tested-by: Jenkins
    Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt at cib.de>
    Reviewed-on: https://gerrit.libreoffice.org/83740
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Michael Meeks <michael.meeks at collabora.com>

diff --git a/sw/inc/strings.hrc b/sw/inc/strings.hrc
index f094e5736947..324c49c88051 100644
--- a/sw/inc/strings.hrc
+++ b/sw/inc/strings.hrc
@@ -659,6 +659,7 @@
 #define STR_POSTIT_SHOW                         NC_("STR_POSTIT_SHOW", "Show All")
 #define STR_POSTIT_HIDE                         NC_("STR_POSTIT_HIDE", "Hide All")
 #define STR_POSTIT_DELETE                       NC_("STR_POSTIT_DELETE", "Delete All")
+#define STR_RESOLVED                            NC_("STR_RESOLVED", "RESOLVED")
 
 #define STR_MARGIN_TOOLTIP_LEFT                 NC_("STR_MARGIN_TOOLTIP_LEFT", "Left: ")
 #define STR_MARGIN_TOOLTIP_RIGHT                NC_("STR_MARGIN_TOOLTIP_RIGHT", ". Right: ")
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 2c69bb7fa1fe..59ea8ea19672 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -616,6 +616,8 @@ static void lcl_FormatPostIt(
     aStr += " ";
     SvtSysLocale aSysLocale;
     aStr += /*(LocaleDataWrapper&)*/aSysLocale.GetLocaleData().getDate( pField->GetDate() );
+    if(pField->GetResolved())
+        aStr += " " + SwResId(STR_RESOLVED);
     pIDCO->InsertString( aPam, aStr );
 
     pIDCO->SplitNode( *aPam.GetPoint(), false );
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index 4ad8d67964a2..8ddead098a80 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -75,6 +75,7 @@
 #include <calbck.hxx>
 #include <stack>
 #include <frmtool.hxx>
+#include <strings.hrc>
 
 #include <tools/globname.hxx>
 #include <svx/svdobj.hxx>
@@ -1598,7 +1599,10 @@ void SwEnhancedPDFExportHelper::EnhancedPDFExport()
                             pNumFormatter->GetOutputString( aDateDiff.GetDate(), nFormat, sDate, &pColor );
 
                             // The title should consist of the author and the date:
-                            aNote.Title = pField->GetPar1() + ", " + sDate;
+                            if(pField->GetResolved())
+                                aNote.Title = pField->GetPar1() + ", " + sDate + ", " + SwResId(STR_RESOLVED);
+                            else
+                                aNote.Title = pField->GetPar1() + ", " + sDate;
                             // Guess what the contents contains...
                             aNote.Contents = pField->GetText();
 
diff --git a/sw/source/uibase/docvw/AnnotationWin2.cxx b/sw/source/uibase/docvw/AnnotationWin2.cxx
index 1016118aedec..48db11fdd37e 100644
--- a/sw/source/uibase/docvw/AnnotationWin2.cxx
+++ b/sw/source/uibase/docvw/AnnotationWin2.cxx
@@ -300,6 +300,18 @@ void SwAnnotationWin::Draw(OutputDevice* pDev, const Point& rPt, const Size& rSz
         mpMetadataDate->SetControlFont( aOrigFont );
     }
 
+    if (mpMetadataResolved->IsVisible())
+    {
+        vcl::Font aOrigFont(mpMetadataResolved->GetControlFont());
+        Size aSize(PixelToLogic(mpMetadataResolved->GetSizePixel()));
+        Point aPos(PixelToLogic(mpMetadataResolved->GetPosPixel()));
+        aPos += rPt;
+        vcl::Font aFont( mpMetadataResolved->GetSettings().GetStyleSettings().GetFieldFont() );
+        mpMetadataResolved->SetControlFont( aFont );
+        mpMetadataResolved->Draw(pDev, aPos, aSize, nInFlags);
+        mpMetadataResolved->SetControlFont( aOrigFont );
+    }
+
     mpSidebarTextControl->Draw(pDev, rPt, rSz, nInFlags);
 
     const drawinglayer::geometry::ViewInformation2D aNewViewInfos;