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

[Muhammet Kara (via logerrit)]

 sfx2/inc/SfxRedactionHelper.hxx                     |    4 ++++
 svx/source/sidebar/possize/PosSizePropertyPanel.cxx |    7 ++-----
 2 files changed, 6 insertions(+), 5 deletions(-)

New commits:
commit 63ef7120bf0d7fd3cb6801f4e7e9fbae4a4f2363
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Tue Nov 26 14:53:44 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Tue Nov 26 18:34:11 2019 +0100

    Comment the searchInMetaFile method
    
    Change-Id: Icbf1f852f8deb5392a820b46db4da19aef30f491
    Reviewed-on: https://gerrit.libreoffice.org/83754
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/sfx2/inc/SfxRedactionHelper.hxx b/sfx2/inc/SfxRedactionHelper.hxx
index ae72c39f4886..0262fe243d0b 100644
--- a/sfx2/inc/SfxRedactionHelper.hxx
+++ b/sfx2/inc/SfxRedactionHelper.hxx
@@ -97,6 +97,10 @@ public:
      * */
     static PageMargins getPageMarginsForCalc(css::uno::Reference<css::frame::XModel>& xModel);
 
+    /*
+     * Used to find the text portions to be redacted. Returns a list of rectangles to cover those
+     * areas to be redacted. Probably the most crucial part of the auto-redaction process.
+     * */
     static void searchInMetaFile(const RedactionTarget* pRedactionTarget, const GDIMetaFile& rMtf,
                                  std::vector<tools::Rectangle>& aRedactionRectangles,
                                  uno::Reference<XComponent>& xComponent);
commit 9a62f351f346913fbbd7bacdeb0ae67eaebaa15d
Author:     Muhammet Kara <muhammet.kara at collabora.com>
AuthorDate: Tue Nov 26 14:56:17 2019 +0300
Commit:     Muhammet Kara <muhammet.kara at collabora.com>
CommitDate: Tue Nov 26 18:33:44 2019 +0100

    Enable edit chart button on desktop and web
    
    Change-Id: Iad98ff3e0b7f3cc6608a119134ce3595dd921e58
    Reviewed-on: https://gerrit.libreoffice.org/83755
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice at gmail.com>
    Reviewed-by: Muhammet Kara <muhammet.kara at collabora.com>

diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index c6b5ccecc72c..36d13b1d843f 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -289,7 +289,6 @@ void PosSizePropertyPanel::HandleContextChange(
     bool bShowAngle = false;
     bool bShowFlip = false;
     bool bShowEditChart = false;
-    bool bIsMobile = comphelper::LibreOfficeKit::isActive() && comphelper::LibreOfficeKit::isMobile(SfxLokHelper::getView());
 
     switch (maContext.GetCombinedContext_DI())
     {
@@ -316,15 +315,13 @@ void PosSizePropertyPanel::HandleContextChange(
             break;
 
         case CombinedEnumContext(Application::WriterVariants, Context::OLE):
-            if (bIsMobile)
-                bShowEditChart = true;
+            bShowEditChart = true;
             break;
 
         case CombinedEnumContext(Application::Calc, Context::OLE):
         case CombinedEnumContext(Application::DrawImpress, Context::OLE):
             bShowPosition = true;
-            if (bIsMobile)
-                bShowEditChart = true;
+            bShowEditChart = true;
             break;
 
         case CombinedEnumContext(Application::Calc, Context::Chart):