cui/source/dialogs/cuigaldlg.cxx | 11 ++++++++-
cui/source/options/treeopt.cxx | 2 +
sfx2/source/dialog/dinfdlg.cxx | 17 ++++++++++----
svx/source/gallery2/galctrl.cxx | 3 ++
sw/Module_sw.mk | 2 -
sw/source/ui/dialog/swdlgfact.cxx | 40 ++++++++++++++++++++++++++++++++++
sw/source/ui/fldui/fldedt.cxx | 4 +++
sw/source/ui/fldui/fldtdlg.cxx | 11 +++++++++
sw/source/uibase/dialog/swabstdlg.cxx | 5 ----
sw/source/uibase/shells/basesh.cxx | 4 +++
vcl/source/window/abstdlg.cxx | 4 ---
11 files changed, 88 insertions(+), 15 deletions(-)
New commits:
commit 8f0e74ed6d363c6eee6874872742721ef8ae4a36
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Nov 2 23:06:26 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sat Nov 3 15:31:22 2018 +0100
Handle the case if no digital signature code is implemented (iOS, currently)
Change-Id: I1cf37fccdd3a58d50a015b3fc32c32fba89f2f09
Reviewed-on: https://gerrit.libreoffice.org/62795
Tested-by: Jenkins
Reviewed-by: Tor Lillqvist <t...@collabora.com>
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 1a503ca264f3..a22ebdc6087c 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -869,13 +869,20 @@ void SfxDocumentPage::ImplUpdateSignatures()
SfxMedium* pMedium = pDoc->GetMedium();
if ( pMedium && !pMedium->GetName().isEmpty() &&
pMedium->GetStorage().is() )
{
- Reference< security::XDocumentDigitalSignatures > xD(
-
security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext())
);
-
+ Reference< security::XDocumentDigitalSignatures > xD;
+ try
+ {
+ xD =
security::DocumentDigitalSignatures::createDefault(comphelper::getProcessComponentContext());
+ }
+ catch ( const css::uno::DeploymentException& )
+ {
+ }
OUString s;
Sequence< security::DocumentSignatureInformation > aInfos;
- aInfos = xD->verifyDocumentContentSignatures(
pMedium->GetZipStorageToSign_Impl(),
- uno::Reference<
io::XInputStream >() );
+
+ if ( xD.is() )
+ aInfos = xD->verifyDocumentContentSignatures(
pMedium->GetZipStorageToSign_Impl(),
+ uno::Reference<
io::XInputStream >() );
if ( aInfos.getLength() > 1 )
s = m_aMultiSignedStr;
else if ( aInfos.getLength() == 1 )
commit 1c39485653d97e26aa3d5b51bf2fd0a1f4e14f0c
Author: Tor Lillqvist <t...@collabora.com>
AuthorDate: Fri Nov 2 22:58:16 2018 +0200
Commit: Tor Lillqvist <t...@collabora.com>
CommitDate: Sat Nov 3 15:31:08 2018 +0100
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 <t...@collabora.com>
diff --git a/cui/source/dialogs/cuigaldlg.cxx b/cui/source/dialogs/cuigaldlg.cxx
index 3bb5d6154677..c6cdada72e37 100644
--- a/cui/source/dialogs/cuigaldlg.cxx
+++ b/cui/source/dialogs/cuigaldlg.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <sal/config.h>
#include <algorithm>
@@ -810,6 +812,7 @@ void TPGalleryThemeProperties::FillFilterList()
}
}
+#if HAVE_FEATURE_AVMEDIA
// media filters
static const char aWildcard[] = "*.";
::avmedia::FilterNameVector aFilters;
@@ -839,6 +842,9 @@ void TPGalleryThemeProperties::FillFilterList()
}
}
}
+#else
+ (void) nFirstExtFilterPos;
+#endif
// 'All' filters
OUString aExtensions;
@@ -863,6 +869,7 @@ void TPGalleryThemeProperties::FillFilterList()
}
}
+#if HAVE_FEATURE_AVMEDIA
// media filters
for(std::pair<OUString,OUString> & aFilter : aFilters)
{
@@ -873,6 +880,7 @@ void TPGalleryThemeProperties::FillFilterList()
aExtensions += aWildcard + aFilter.second.getToken( 0, ';', nIndex
);
}
}
+#endif
#if defined(_WIN32)
if (aExtensions.getLength() > 240)
@@ -1007,13 +1015,14 @@ void TPGalleryThemeProperties::DoPreview()
ErrorHandler::HandleError( ERRCODE_IO_NOTEXISTSPATH );
GetParent()->EnterWait();
}
+#if HAVE_FEATURE_AVMEDIA
else if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL(
INetURLObject::DecodeMechanism::Unambiguous ), "" ) )
{
xMediaPlayer = ::avmedia::MediaWindow::createPlayer(
_aURL.GetMainURL( INetURLObject::DecodeMechanism::NONE ), "" );
if( xMediaPlayer.is() )
xMediaPlayer->start();
}
-
+#endif
bInputAllowed = true;
aPreviewString = aString;
}
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 56501b26b8d7..08d8f5974d3c 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -299,7 +299,9 @@ static VclPtr<SfxTabPage> CreateGeneralTabPage(sal_uInt16
nId, TabPageParent pPa
case RID_SVXPAGE_INET_PROXY: fnCreate =
&SvxProxyTabPage::Create; break;
case RID_SVXPAGE_INET_SECURITY: fnCreate =
&SvxSecurityTabPage::Create; break;
case RID_SVXPAGE_INET_MAIL: fnCreate =
&SvxEMailTabPage::Create; break;
+#if HAVE_FEATURE_DESKTOP
case RID_SVXPAGE_PERSONALIZATION: fnCreate =
&SvxPersonalizationTabPage::Create; break;
+#endif
case RID_SVXPAGE_COLORCONFIG: fnCreate =
&SvxColorOptionsTabPage::Create; break;
case RID_OFAPAGE_HTMLOPT: fnCreate =
&OfaHtmlTabPage::Create; break;
case SID_OPTFILTER_MSOFFICE: fnCreate =
&OfaMSFilterTabPage::Create; break;
diff --git a/svx/source/gallery2/galctrl.cxx b/svx/source/gallery2/galctrl.cxx
index 5fd5b35762b1..3560421cacc7 100644
--- a/svx/source/gallery2/galctrl.cxx
+++ b/svx/source/gallery2/galctrl.cxx
@@ -17,6 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
#include <vcl/svapp.hxx>
#include <sfx2/viewfrm.hxx>
@@ -61,11 +62,13 @@ bool GalleryPreview::SetGraphic( const INetURLObject& _aURL
)
{
bool bRet = true;
Graphic aGraphic;
+#if HAVE_FEATURE_AVMEDIA
if( ::avmedia::MediaWindow::isMediaURL( _aURL.GetMainURL(
INetURLObject::DecodeMechanism::Unambiguous ), "" ) )
{
aGraphic = BitmapEx(RID_SVXBMP_GALLERY_MEDIA);
}
else
+#endif
{
GraphicFilter& rFilter = GraphicFilter::GetGraphicFilter();
GalleryProgress aProgress( &rFilter );
diff --git a/sw/Module_sw.mk b/sw/Module_sw.mk
index 308b4474c5dc..b89b839c7aa0 100644
--- a/sw/Module_sw.mk
+++ b/sw/Module_sw.mk
@@ -26,7 +26,7 @@ $(eval $(call gb_Module_add_targets,sw,\
Library_msword \
Library_sw \
Library_swd \
- $(call gb_Helper_optional,DESKTOP,Library_swui) \
+ Library_swui \
UIConfig_sglobal \
UIConfig_sweb \
UIConfig_swform \
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: */
diff --git a/sw/source/ui/fldui/fldedt.cxx b/sw/source/ui/fldui/fldedt.cxx
index 353f634bbff8..2f4dfe8020bb 100644
--- a/sw/source/ui/fldui/fldedt.cxx
+++ b/sw/source/ui/fldui/fldedt.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <sfx2/basedlgs.hxx>
#include <sfx2/viewfrm.hxx>
#include <sfx2/request.hxx>
@@ -190,10 +192,12 @@ VclPtr<SfxTabPage> SwFieldEditDlg::CreatePage(sal_uInt16
nGroup)
pTabPage = SwFieldDokInfPage::Create(get_content_area(), pSet);
break;
}
+#if HAVE_FEATURE_DBCONNECTIVITY
case GRP_DB:
pTabPage = SwFieldDBPage::Create(get_content_area(), nullptr);
static_cast<SwFieldDBPage*>(pTabPage.get())->SetWrtShell(*pSh);
break;
+#endif
case GRP_VAR:
pTabPage = SwFieldVarPage::Create(get_content_area(), nullptr);
break;
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index cfaa6e23f91b..045252a575e8 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <cmdid.h>
#include <swtypes.hxx>
#include <unotools/confignode.hxx>
@@ -79,6 +81,7 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper*
pCW, vcl::Window *pPa
-1,
utl::OConfigurationTreeRoot::CM_READONLY);
+#if HAVE_FEATURE_DBCONNECTIVITY
bool bDatabaseFields = true;
aCfgRoot.getNodeValue(
OUString("DatabaseFields")) >>= bDatabaseFields;
@@ -86,6 +89,7 @@ SwFieldDlg::SwFieldDlg(SfxBindings* pB, SwChildWinWrapper*
pCW, vcl::Window *pPa
if (bDatabaseFields)
m_nDbId = AddTabPage("database", SwFieldDBPage::Create, nullptr);
else
+#endif
RemoveTabPage("database");
}
else
@@ -276,6 +280,7 @@ void SwFieldDlg::InsertHdl()
void SwFieldDlg::ActivateDatabasePage()
{
+#if HAVE_FEATURE_DBCONNECTIVITY
m_bDataBaseMode = true;
ShowPage(m_nDbId);
SfxTabPage* pDBPage = GetTabPage(m_nDbId);
@@ -289,6 +294,7 @@ void SwFieldDlg::ActivateDatabasePage()
RemoveTabPage("docinfo");
RemoveTabPage("ref");
RemoveTabPage("functions");
+#endif
}
void SwFieldDlg::ShowReferencePage()
@@ -298,6 +304,7 @@ void SwFieldDlg::ShowReferencePage()
void SwFieldDlg::PageCreated(sal_uInt16 nId, SfxTabPage& rPage)
{
+#if HAVE_FEATURE_DBCONNECTIVITY
if (nId == m_nDbId)
{
SfxDispatcher* pDispatch = m_pBindings->GetDispatcher();
@@ -313,6 +320,10 @@ void SwFieldDlg::PageCreated(sal_uInt16 nId, SfxTabPage&
rPage)
static_cast<SwFieldDBPage&>(rPage).SetWrtShell(static_cast<SwView*>(pViewShell)->GetWrtShell());
}
}
+#else
+ (void) nId;
+ (void) rPage;
+#endif
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/dialog/swabstdlg.cxx
b/sw/source/uibase/dialog/swabstdlg.cxx
index 78e8272c897d..f726a8274cb7 100644
--- a/sw/source/uibase/dialog/swabstdlg.cxx
+++ b/sw/source/uibase/dialog/swabstdlg.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
-
#include <swabstdlg.hxx>
#include <osl/module.hxx>
@@ -38,7 +36,6 @@ extern "C" SwAbstractDialogFactory* SwCreateDialogFactory();
SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
{
SwFuncPtrCreateDialogFactory fp = nullptr;
-#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
static const OUString sLibName(SWUI_DLL_NAME);
@@ -49,7 +46,7 @@ SwAbstractDialogFactory* SwAbstractDialogFactory::Create()
#else
fp = SwCreateDialogFactory;
#endif
-#endif
+
if ( fp )
return fp();
return nullptr;
diff --git a/sw/source/uibase/shells/basesh.cxx
b/sw/source/uibase/shells/basesh.cxx
index 5e2ee8a5e808..84cce3758271 100644
--- a/sw/source/uibase/shells/basesh.cxx
+++ b/sw/source/uibase/shells/basesh.cxx
@@ -17,6 +17,8 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
+#include <config_features.h>
+
#include <sal/config.h>
#include <hintids.hxx>
@@ -2868,6 +2870,7 @@ void SwBaseShell::ExecField( SfxRequest const & rReq )
sal_uInt16 nSlot = rReq.GetSlot();
switch( nSlot )
{
+#if HAVE_FEATURE_DBCONNECTIVITY
case FN_CHANGE_DBFIELD:
{
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
@@ -2875,6 +2878,7 @@ void SwBaseShell::ExecField( SfxRequest const & rReq )
pDlg->Execute();
}
break;
+#endif
default:
OSL_FAIL("wrong dispatcher");
}
diff --git a/vcl/source/window/abstdlg.cxx b/vcl/source/window/abstdlg.cxx
index 24ec49ea51d6..8c9a7bb3c2d3 100644
--- a/vcl/source/window/abstdlg.cxx
+++ b/vcl/source/window/abstdlg.cxx
@@ -17,8 +17,6 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#include <config_features.h>
-
#include <rtl/ustring.hxx>
#include <osl/module.hxx>
#include <vcl/abstdlg.hxx>
@@ -35,7 +33,6 @@ extern "C" VclAbstractDialogFactory* CreateDialogFactory();
VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
{
FuncPtrCreateDialogFactory fp = nullptr;
-#if HAVE_FEATURE_DESKTOP
#ifndef DISABLE_DYNLOADING
static ::osl::Module aDialogLibrary;
if (aDialogLibrary.is() ||
@@ -48,7 +45,6 @@ VclAbstractDialogFactory* VclAbstractDialogFactory::Create()
#else
fp = CreateDialogFactory;
#endif
-#endif
if ( fp )
return fp();
return nullptr;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
