summaryrefslogtreecommitdiff
path: root/sw/source/ui/table
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-04-20 11:06:07 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-04-22 21:29:36 +0200
commit60f3e4b843da89678e022eed837ee66e726b1920 (patch)
tree4cffea5d364e3ed9bd3e68c7b471f313c237a98e /sw/source/ui/table
parent4a7ebfea57094b914c4b1c3e46936dbf67dec499 (diff)
place an intermediate class as parent for SfxTabPages
so a SfxTabPage can be parented by a vcl::Window or a welded native notebook tabpage. That ways the same SfxTabPage can be used at the same time in both a native dialog or a vcl dialog. The impl can be changed to the weld api, and when hosted in a native dialog the vcl impl of that will be instantiated, while native otherwise. e.g. print options appearing in print options dialog and general options. This allows incremental changeover. Change-Id: I6f1fed1e8d0898b01853bb878757bad41cbf9bba Reviewed-on: https://gerrit.libreoffice.org/53193 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sw/source/ui/table')
-rw-r--r--sw/source/ui/table/tabledlg.cxx12
1 files changed, 6 insertions, 6 deletions
diff --git a/sw/source/ui/table/tabledlg.cxx b/sw/source/ui/table/tabledlg.cxx
index e25d0b12dce5..cfb40108bc27 100644
--- a/sw/source/ui/table/tabledlg.cxx
+++ b/sw/source/ui/table/tabledlg.cxx
@@ -399,10 +399,10 @@ void SwFormatTablePage::ModifyHdl(const Edit * pEdit)
bModified = true;
}
-VclPtr<SfxTabPage> SwFormatTablePage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwFormatTablePage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
- return VclPtr<SwFormatTablePage>::Create( pParent, *rAttrSet );
+ return VclPtr<SwFormatTablePage>::Create( pParent.pParent, *rAttrSet );
}
bool SwFormatTablePage::FillItemSet( SfxItemSet* rCoreSet )
@@ -799,10 +799,10 @@ void SwTableColumnPage::dispose()
SfxTabPage::dispose();
}
-VclPtr<SfxTabPage> SwTableColumnPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwTableColumnPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
- return VclPtr<SwTableColumnPage>::Create( pParent, *rAttrSet );
+ return VclPtr<SwTableColumnPage>::Create( pParent.pParent, *rAttrSet );
}
void SwTableColumnPage::Reset( const SfxItemSet* )
@@ -1363,10 +1363,10 @@ void SwTextFlowPage::dispose()
SfxTabPage::dispose();
}
-VclPtr<SfxTabPage> SwTextFlowPage::Create( vcl::Window* pParent,
+VclPtr<SfxTabPage> SwTextFlowPage::Create( TabPageParent pParent,
const SfxItemSet* rAttrSet)
{
- return VclPtr<SwTextFlowPage>::Create(pParent, *rAttrSet);
+ return VclPtr<SwTextFlowPage>::Create(pParent.pParent, *rAttrSet);
}
bool SwTextFlowPage::FillItemSet( SfxItemSet* rSet )