commit 51cd6a93a6dd5bbe98548ea0fd702410a6a2d001
author Caolán McNamara <caolanm@redhat.com> Tue Mar 19 13:07:27 2019 +0000
committer Caolán McNamara <caolanm@redhat.com> Tue Mar 19 16:03:30 2019 +0100
tree 256f116ba664bbac703bbc4b91892194fe64a793
parent 7a9f6df7fb83ec23d09cb5744c2c865fa22e7143

Resolves: tdf#124024 scaling factor isn't displayed correctly

Change-Id: If08731217c0839ebd8d51399bb0dd1a3b598dceb
Reviewed-on: https://gerrit.libreoffice.org/69420
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>

include/svx/frmdirlbox.hxx

diff --git a/include/svx/frmdirlbox.hxx b/include/svx/frmdirlbox.hxx
index c1cd4b3..a44c6bf 100644
--- a/include/svx/frmdirlbox.hxx
+++ b/include/svx/frmdirlbox.hxx
@@ -45,7 +45,12 @@ public:
    bool get_value_changed_from_saved() const { return m_xControl->get_value_changed_from_saved(); }
    SvxFrameDirection get_active_id() const { return static_cast<SvxFrameDirection>(m_xControl->get_active_id().toUInt32()); }
    void set_active_id(SvxFrameDirection eDir) { m_xControl->set_active_id(OUString::number(static_cast<sal_uInt32>(eDir))); }
    void remove_id(SvxFrameDirection eDir) { m_xControl->remove_id(OUString::number(static_cast<sal_uInt32>(eDir))); }
    void remove_id(SvxFrameDirection eDir)
    {
        int nPos = m_xControl->find_id(OUString::number(static_cast<sal_uInt32>(eDir)));
        if (nPos != -1)
            m_xControl->remove(nPos);
    }
    void set_active(int pos) { m_xControl->set_active(pos); }
    int get_active() const { return m_xControl->get_active(); }
    void set_sensitive(bool bSensitive) { m_xControl->set_sensitive(bSensitive); }

sc/source/ui/docshell/docsh4.cxx

diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index dd91eff..d75ef81 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1726,8 +1726,8 @@ void ScDocShell::ExecutePageStyle( const SfxViewShell& rCaller,

                                PageStyleModified( aNewName, false );
                                pRequest->Done();
                                pDlg->disposeOnce();
                            }
                            pDlg->disposeOnce();
                        });
                    }
                }

sc/source/ui/pagedlg/tptable.cxx

diff --git a/sc/source/ui/pagedlg/tptable.cxx b/sc/source/ui/pagedlg/tptable.cxx
index d1e7229..cead94e 100644
--- a/sc/source/ui/pagedlg/tptable.cxx
+++ b/sc/source/ui/pagedlg/tptable.cxx
@@ -223,7 +223,7 @@ void ScTablePage::Reset( const SfxItemSet* rCoreSet )
        m_xEdScalePageNum->set_value( (nPages > 0) ? nPages : 1 );
    }

    if (m_xLbScaleMode->get_active() == 0)
    if (m_xLbScaleMode->get_active() == -1)
    {
        // fall back to 100%
        OSL_FAIL( "ScTablePage::Reset - missing scaling item" );