strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

tdf#83877 Move SignatureLineDialog to cui

Browse source 
next to SignSignatureLineDialog

Change-Id: I26efa96ec6dae4d9e091abc8cafd9b841118ef31
Reviewed-on: https://gerrit.libreoffice.org/52781
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de>
This commit is contained in:
Samuel Mehrbrodt 2018-04-12 16:18:37 +02:00
parent 167dea2eac
commit 6f6f37b7a4
16 changed files with 56 additions and 48 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cui/Library_cui.mk
View file

@ -121,6 +121,7 @@ $(eval $(call gb_Library_add_exception_objects,cui,\
cui/source/dialogs/pastedlg \
cui/source/dialogs/postdlg \
cui/source/dialogs/scriptdlg \
cui/source/dialogs/SignatureLineDialog \
cui/source/dialogs/SignSignatureLineDialog \
cui/source/dialogs/sdrcelldlg \
cui/source/dialogs/showcols \

1
cui/UIConfig_cui.mk
View file

@ -180,6 +180,7 @@ $(eval $(call gb_UIConfig_add_uifiles,cui,\
cui/uiconfig/ui/shadowtabpage \
cui/uiconfig/ui/showcoldialog \
cui/uiconfig/ui/similaritysearchdialog \
cui/uiconfig/ui/signatureline \
cui/uiconfig/ui/signsignatureline \
cui/uiconfig/ui/slantcornertabpage \
cui/uiconfig/ui/smarttagoptionspage \

4
svx/source/dialog/SignatureLineDialog.cxx → cui/source/dialogs/SignatureLineDialog.cxx
View file

@ -7,7 +7,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#include <svx/SignatureLineDialog.hxx>
#include <SignatureLineDialog.hxx>
#include <comphelper/processfactory.hxx>
#include <comphelper/xmltools.hxx>
@ -39,7 +39,7 @@ using namespace css::graphic;
SignatureLineDialog::SignatureLineDialog(weld::Widget* pParent, Reference<XModel> xModel,
bool bEditExisting)
: GenericDialogController(pParent, "svx/ui/signatureline.ui", "SignatureLineDialog")
: GenericDialogController(pParent, "cui/ui/signatureline.ui", "SignatureLineDialog")
, m_xEditName(m_xBuilder->weld_entry("edit_name"))
, m_xEditTitle(m_xBuilder->weld_entry("edit_title"))
, m_xEditEmail(m_xBuilder->weld_entry("edit_email"))

1
cui/source/factory/cuiexp.cxx
View file

@ -41,6 +41,7 @@
#include <cuicharmap.hxx>
#include <cuihyperdlg.hxx>
#include <cfgutil.hxx>
#include <SignatureLineDialog.hxx>
#include <SignSignatureLineDialog.hxx>
#include <SpellDialog.hxx>
#include <zoom.hxx>

13
cui/source/factory/dlgfact.cxx
View file

@ -60,6 +60,7 @@
#include <insdlg.hxx>
#include <pastedlg.hxx>
#include <linkdlg.hxx>
#include <SignatureLineDialog.hxx>
#include <SignSignatureLineDialog.hxx>
#include <SpellDialog.hxx>
#include <cfg.hxx>
@ -192,6 +193,11 @@ void AbstractSvxCharacterMapDialog_Impl::SetText(const OUString& rStr)
m_xDlg->set_title(rStr);
}
short AbstractSignatureLineDialog_Impl::Execute()
{
return m_xDlg->execute();
}
short AbstractSignSignatureLineDialog_Impl::Execute()
{
return m_xDlg->execute();
@ -1575,6 +1581,13 @@ VclPtr<AbstractScreenshotAnnotationDlg> AbstractDialogFactory_Impl::CreateScreen
return VclPtr<AbstractScreenshotAnnotationDlg_Impl>::Create(pDlg);
}
VclPtr<AbstractSignatureLineDialog> AbstractDialogFactory_Impl::CreateSignatureLineDialog(
weld::Window* pParent, const Reference<XModel> xModel, bool bEditExisting)
{
return VclPtr<AbstractSignatureLineDialog_Impl>::Create(
new SignatureLineDialog(pParent, xModel, bEditExisting));
}
VclPtr<AbstractSignSignatureLineDialog>
AbstractDialogFactory_Impl::CreateSignSignatureLineDialog(weld::Window* pParent,
const Reference<XModel> xModel)

18
cui/source/factory/dlgfact.hxx
View file

@ -533,6 +533,20 @@ class AbstractScreenshotAnnotationDlg_Impl : public AbstractScreenshotAnnotation
DECL_ABSTDLG_BASE(AbstractScreenshotAnnotationDlg_Impl, ScreenshotAnnotationDlg)
};
class SignatureLineDialog;
class AbstractSignatureLineDialog_Impl : public AbstractSignatureLineDialog
{
protected:
std::unique_ptr<SignatureLineDialog> m_xDlg;
public:
explicit AbstractSignatureLineDialog_Impl(SignatureLineDialog* p)
: m_xDlg(p)
{
}
virtual short Execute() override;
};
class SignSignatureLineDialog;
class AbstractSignSignatureLineDialog_Impl : public AbstractSignSignatureLineDialog
{
@ -726,6 +740,10 @@ public:
virtual VclPtr<AbstractScreenshotAnnotationDlg> CreateScreenshotAnnotationDlg(vcl::Window * pParent, Dialog& rParentDialog) override;
virtual VclPtr<AbstractSignatureLineDialog>
CreateSignatureLineDialog(weld::Window* pParent,
const css::uno::Reference<css::frame::XModel> xModel, bool bEditExisting) override;
virtual VclPtr<AbstractSignSignatureLineDialog>
CreateSignSignatureLineDialog(weld::Window* pParent,
const css::uno::Reference<css::frame::XModel> xModel) override;

7
include/svx/SignatureLineDialog.hxx → cui/source/inc/SignatureLineDialog.hxx
View file

@ -6,16 +6,15 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/
#ifndef INCLUDED_SW_INC_SIGNATURELINEDIALOG_HXX
#define INCLUDED_SW_INC_SIGNATURELINEDIALOG_HXX
#ifndef INCLUDED_CUI_INC_SIGNATURELINEDIALOG_HXX
#define INCLUDED_CUI_INC_SIGNATURELINEDIALOG_HXX
#include <svx/stddlg.hxx>
#include <vcl/weld.hxx>
#include <com/sun/star/beans/XPropertySet.hpp>
#include <com/sun/star/uno/Reference.hxx>
class SVX_DLLPUBLIC SignatureLineDialog : public weld::GenericDialogController
class SignatureLineDialog : public weld::GenericDialogController
{
public:
SignatureLineDialog(weld::Widget* pParent, css::uno::Reference<css::frame::XModel> xModel,

0
svx/uiconfig/ui/signatureline.ui → cui/uiconfig/ui/signatureline.ui
View file

13
include/vcl/abstdlg.hxx
View file

@ -119,6 +119,12 @@ protected:
virtual ~AbstractScreenshotAnnotationDlg() override = default;
};
class VCL_DLLPUBLIC AbstractSignatureLineDialog : public VclAbstractDialog
{
protected:
virtual ~AbstractSignatureLineDialog() override = default;
};
class VCL_DLLPUBLIC AbstractSignSignatureLineDialog : public VclAbstractDialog
{
protected:
@ -136,6 +142,13 @@ public:
// creates instance of PasswordToOpenModifyDialog from cui
virtual VclPtr<AbstractPasswordToOpenModifyDialog> CreatePasswordToOpenModifyDialog(weld::Window * pParent, sal_uInt16 nMaxPasswdLen, bool bIsPasswordToModify) = 0;
// creates instance of SignatureDialog from cui
virtual VclPtr<AbstractSignatureLineDialog>
CreateSignatureLineDialog(weld::Window* pParent,
const css::uno::Reference<css::frame::XModel> xModel,
bool bEditExisting)
= 0;
// creates instance of SignSignatureDialog from cui
virtual VclPtr<AbstractSignSignatureLineDialog>
CreateSignSignatureLineDialog(weld::Window* pParent,

1
svx/Library_svx.mk
View file

@ -149,7 +149,6 @@ $(eval $(call gb_Library_add_exception_objects,svx,\
svx/source/dialog/rulritem \
svx/source/dialog/SafeModeDialog \
svx/source/dialog/SafeModeUI \
svx/source/dialog/SignatureLineDialog \
svx/source/dialog/SpellDialogChildWindow \
svx/source/dialog/srchctrl \
svx/source/dialog/srchdlg \

1
svx/UIConfig_svx.mk
View file

@ -91,7 +91,6 @@ $(eval $(call gb_UIConfig_add_uifiles,svx,\
svx/uiconfig/ui/sidebarpossize \
svx/uiconfig/ui/sidebarstylespanel \
svx/uiconfig/ui/sidebartextpanel \
svx/uiconfig/ui/signatureline \
svx/uiconfig/ui/stylemenu \
svx/uiconfig/ui/textcharacterspacingcontrol \
svx/uiconfig/ui/textcontrolchardialog \

4
sw/inc/swabstdlg.hxx
View file

@ -394,10 +394,6 @@ public:
SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) = 0;
virtual VclPtr<AbstractSwConvertTableDlg> CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0;
virtual VclPtr<VclAbstractDialog> CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV) = 0;
virtual VclPtr<VclAbstractDialog>
CreateSignatureLineDialog(SwView& rView, css::uno::Reference<css::frame::XModel> xModel,
bool bEditExisting)
= 0;
virtual VclPtr<AbstractSwInsertDBColAutoPilot> CreateSwInsertDBColAutoPilot(SwView& rView,
css::uno::Reference< css::sdbc::XDataSource> rxSource,

13
sw/source/ui/dialog/swdlgfact.cxx
View file

@ -83,7 +83,6 @@
#include <mailconfigpage.hxx>
#include <uiborder.hxx>
#include <mmresultdialogs.hxx>
#include <svx/SignatureLineDialog.hxx>
using namespace ::com::sun::star;
using namespace css::frame;
@ -125,10 +124,6 @@ short AbstractSwSortDlg_Impl::Execute()
{
return m_xDlg->execute();
}
short AbstractSignatureLineDialog_Impl::Execute()
{
return m_xDlg->execute();
}
IMPL_ABSTDLG_BASE(AbstractTabDialog_Impl);
short AbstractSwConvertTableDlg_Impl::Execute()
{
@ -751,14 +746,6 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwCaptionDialog (
return VclPtr<VclAbstractDialog_Impl>::Create( pDlg );
}
VclPtr<VclAbstractDialog>
SwAbstractDialogFactory_Impl::CreateSignatureLineDialog(SwView& rV, Reference<XModel> xModel,
bool bEditExisting)
{
return VclPtr<AbstractSignatureLineDialog_Impl>::Create(
new SignatureLineDialog(rV.GetFrameWeld(), xModel, bEditExisting));
}
VclPtr<AbstractSwInsertDBColAutoPilot> SwAbstractDialogFactory_Impl::CreateSwInsertDBColAutoPilot( SwView& rView,
uno::Reference< sdbc::XDataSource> rxSource,
uno::Reference<sdbcx::XColumnsSupplier> xColSupp,

17
sw/source/ui/dialog/swdlgfact.hxx
View file

@ -29,7 +29,6 @@ class SwSortDlg;
class SwTableHeightDlg;
class SwTableWidthDlg;
class SwMergeTableDlg;
class SignatureLineDialog;
class SfxTabDialog;
class SwConvertTableDlg;
class SwInsertDBColAutoPilot;
@ -136,18 +135,6 @@ public:
virtual short Execute() override;
};
class AbstractSignatureLineDialog_Impl : public VclAbstractDialog
{
protected:
std::unique_ptr<SignatureLineDialog> m_xDlg;
public:
explicit AbstractSignatureLineDialog_Impl(SignatureLineDialog* p)
: m_xDlg(p)
{
}
virtual short Execute() override;
};
class AbstractSwBreakDlg_Impl : public AbstractSwBreakDlg
{
protected:
@ -515,10 +502,6 @@ public:
SwCharDlgMode nDialogMode, const OUString* pFormatStr = nullptr) override;
virtual VclPtr<AbstractSwConvertTableDlg> CreateSwConvertTableDlg(SwView& rView, bool bToTable) override;
virtual VclPtr<VclAbstractDialog> CreateSwCaptionDialog ( vcl::Window *pParent, SwView &rV) override;
virtual VclPtr<VclAbstractDialog>
CreateSignatureLineDialog(SwView& rView, css::uno::Reference<css::frame::XModel> xModel,
bool bEditExisting) override;
virtual VclPtr<AbstractSwInsertDBColAutoPilot> CreateSwInsertDBColAutoPilot(SwView& rView,
css::uno::Reference< css::sdbc::XDataSource> rxSource,
css::uno::Reference<css::sdbcx::XColumnsSupplier> xColSupp,

1
sw/source/ui/dialog/swuiexp.cxx
View file

@ -42,7 +42,6 @@
#include <selglos.hxx>
#include <splittbl.hxx>
#include <tautofmt.hxx>
#include <svx/SignatureLineDialog.hxx>
#include <swmodalredlineacceptdlg.hxx>
#include <swrenamexnameddlg.hxx>
#include <swuiidxmrk.hxx>

9
sw/source/uibase/uiview/viewdlg2.cxx
View file

@ -21,7 +21,6 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
#include <svx/svdograf.hxx>
#include <svx/SignatureLineDialog.hxx>
#include <fldmgr.hxx>
#include <expfld.hxx>
#include <modcfg.hxx>
@ -67,12 +66,12 @@ void SwView::ExecDlgExt(SfxRequest const &rReq)
case SID_INSERT_SIGNATURELINE:
case SID_EDIT_SIGNATURELINE:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
assert(pFact && "SwAbstractDialogFactory fail!");
VclAbstractDialogFactory* pFact = VclAbstractDialogFactory::Create();
assert(pFact && "VclAbstractDialogFactory fail!");
const uno::Reference<frame::XModel> xModel(GetCurrentDocument());
ScopedVclPtr<VclAbstractDialog> pDialog(
pFact->CreateSignatureLineDialog(*this, xModel, rReq.GetSlot() == SID_EDIT_SIGNATURELINE));
ScopedVclPtr<AbstractSignatureLineDialog> pDialog(pFact->CreateSignatureLineDialog(
GetFrameWeld(), xModel, rReq.GetSlot() == SID_EDIT_SIGNATURELINE));
assert(pDialog && "Dialog creation failed!");
if (pDialog)