summaryrefslogtreecommitdiff
path: root/sw/source/ui/dialog
diff options
context:
space:
mode:
authorTor Lillqvist <tml@collabora.com>2018-11-02 22:58:16 +0200
committerTor Lillqvist <tml@collabora.com>2018-11-03 15:31:08 +0100
commit1c39485653d97e26aa3d5b51bf2fd0a1f4e14f0c (patch)
treec6006d9bd7ba231404bc9f7e426b6426257db9f4 /sw/source/ui/dialog
parent882c7f4a1feb81ed74b4243d884ecc3a954e3bed (diff)
Start of work in progress on making dialogs work in the iOS app
Build the swui library for non-DESKTOP platforms, too. Handle fallout for !HAVE_FEATURE_DBCONNECTIVITY and !HAVE_FEATURE_AVMEDIA (both of which features we for now don't want to bother with in the iOS app). Make VclAbstractDialogFactory::Create() do its thing also on non-DESKTOP. This commit just causes more code to be compiled for the non-DESKTOP case, dialogs in general surely don't actually work yet in the iOS app. For instance: vcl/source/window/builder.cxx:2060: probably need to implement sfxlo-CustomPropertiesControl or add a makesfxlo-CustomPropertiesControl function Change-Id: I579efba605f519dcbf407b675be88c7c6ee0f19b Reviewed-on: https://gerrit.libreoffice.org/62794 Tested-by: Jenkins Reviewed-by: Tor Lillqvist <tml@collabora.com>
Diffstat (limited to 'sw/source/ui/dialog')
-rw-r--r--sw/source/ui/dialog/swdlgfact.cxx40
1 files changed, 40 insertions, 0 deletions
diff --git a/sw/source/ui/dialog/swdlgfact.cxx b/sw/source/ui/dialog/swdlgfact.cxx
index c30b671d3b29..6badd0175224 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include "swdlgfact.hxx"
#include <svl/style.hxx>
#include <svx/svxids.hrc>
@@ -377,7 +379,14 @@ void AbstractSwInsertDBColAutoPilot_Impl::DataToDoc( const uno::Sequence< uno::A
uno::Reference< sdbc::XConnection> xConnection,
uno::Reference< sdbc::XResultSet > xResultSet)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
pDlg->DataToDoc(rSelection, rxSource, xConnection, xResultSet);
+#else
+ (void) rSelection;
+ (void) rxSource;
+ (void) xConnection;
+ (void) xResultSet;
+#endif
}
bool AbstractDropDownFieldDialog_Impl::PrevButtonPressed() const
@@ -800,8 +809,13 @@ VclPtr<AbstractSwBreakDlg> SwAbstractDialogFactory_Impl::CreateSwBreakDlg(weld::
VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateSwChangeDBDlg(SwView& rVw)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
VclPtr<Dialog> pDlg = VclPtr<SwChangeDBDlg>::Create(rVw);
return VclPtr<VclAbstractDialog_Impl>::Create(pDlg);
+#else
+ (void) rVw;
+ return nullptr;
+#endif
}
VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwCharDlg(weld::Window* pParent, SwView& pVw,
@@ -826,8 +840,16 @@ VclPtr<AbstractSwInsertDBColAutoPilot> SwAbstractDialogFactory_Impl::CreateSwIns
uno::Reference<sdbcx::XColumnsSupplier> xColSupp,
const SwDBData& rData)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
VclPtr<SwInsertDBColAutoPilot> pDlg = VclPtr<SwInsertDBColAutoPilot>::Create( rView, rxSource, xColSupp, rData );
return VclPtr<AbstractSwInsertDBColAutoPilot_Impl>::Create( pDlg );
+#else
+ (void) rView;
+ (void) rxSource;
+ (void) xColSupp;
+ (void) rData;
+ return nullptr;
+#endif
}
VclPtr<SfxAbstractTabDialog> SwAbstractDialogFactory_Impl::CreateSwFootNoteOptionDlg(weld::Window *pParent, SwWrtShell &rSh)
@@ -1126,7 +1148,13 @@ VclPtr<VclAbstractDialog> SwAbstractDialogFactory_Impl::CreateIndexMarkModalDlg(
VclPtr<AbstractMailMergeWizard> SwAbstractDialogFactory_Impl::CreateMailMergeWizard(
SwView& rView, std::shared_ptr<SwMailMergeConfigItem>& rConfigItem)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
return VclPtr<AbstractMailMergeWizard_Impl>::Create( VclPtr<SwMailMergeWizard>::Create(rView, rConfigItem));
+#else
+ (void) rView;
+ (void) rConfigItem;
+ return nullptr;
+#endif
}
GlossaryGetCurrGroup SwAbstractDialogFactory_Impl::GetGlossaryCurrGroupFunc()
@@ -1199,20 +1227,32 @@ CreateTabPage SwAbstractDialogFactory_Impl::GetTabPageCreatorFunc( sal_uInt16 nI
void SwAbstractDialogFactory_Impl::ExecuteMMResultSaveDialog(weld::Window* pParent)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
SwMMResultSaveDialog aDialog(pParent);
aDialog.run();
+#else
+ (void) pParent;
+#endif
}
void SwAbstractDialogFactory_Impl::ExecuteMMResultPrintDialog(weld::Window* pParent)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
SwMMResultPrintDialog aDialog(pParent);
aDialog.run();
+#else
+ (void) pParent;
+#endif
}
void SwAbstractDialogFactory_Impl::ExecuteMMResultEmailDialog(weld::Window* pParent)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
SwMMResultEmailDialog aDialog(pParent);
aDialog.run();
+#else
+ (void) pParent;
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */