diff --git a/Repository.mk b/Repository.mk index add9133fefa4..8c9923bcc6c2 100644 --- a/Repository.mk +++ b/Repository.mk @@ -517,6 +517,7 @@ $(eval $(call gb_Helper_register_plugins_for_install,OOOLIBS,ooo, \ cui \ $(if $(USING_X11),desktop_detector) \ icg \ + sdui \ $(if $(ENABLE_GEN),vclplug_gen) \ $(if $(filter $(OS),WNT),vclplug_win) \ $(if $(filter $(OS),MACOSX),vclplug_osx) \ diff --git a/bin/update_pch b/bin/update_pch index e7ede0a5d692..4719e5f9269f 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -92,6 +92,7 @@ DEFAULTS = \ 'sc.scui' : ( 1, EXCLUDE, EXCLUDE, INCLUDE), # 15.0 'sc.vbaobj' : ( 1, EXCLUDE, EXCLUDE, INCLUDE), # 17.3 'sd.sd' : ( 4, EXCLUDE, EXCLUDE, INCLUDE), # 47.4 + 'sd.sdui' : ( 4, EXCLUDE, INCLUDE, INCLUDE), # 9.4 'sdext.PresentationMinimizer' : ( 2, EXCLUDE, INCLUDE, INCLUDE), # 4.1 'sdext.PresenterScreen' : ( 2, EXCLUDE, INCLUDE, EXCLUDE), # 7.1 'sfx2.sfx' : ( 3, EXCLUDE, EXCLUDE, EXCLUDE), # 27.4 diff --git a/desktop/Pagein_draw.mk b/desktop/Pagein_draw.mk index abf7435032d6..2fd0ef6ba4ff 100644 --- a/desktop/Pagein_draw.mk +++ b/desktop/Pagein_draw.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Pagein_Pagein,draw)) $(eval $(call gb_Pagein_add_objects,draw,\ sd \ + sdui \ svx \ svxcore \ )) diff --git a/desktop/Pagein_impress.mk b/desktop/Pagein_impress.mk index 9b15cc1fe1ba..f3e4ff7b6d59 100644 --- a/desktop/Pagein_impress.mk +++ b/desktop/Pagein_impress.mk @@ -11,6 +11,7 @@ $(eval $(call gb_Pagein_Pagein,impress)) $(eval $(call gb_Pagein_add_objects,impress,\ sd \ + sdui \ svx \ svxcore \ )) diff --git a/sd/CppunitTest_sd_dialogs_test.mk b/sd/CppunitTest_sd_dialogs_test.mk index fd3ca391477f..839f702de7ef 100644 --- a/sd/CppunitTest_sd_dialogs_test.mk +++ b/sd/CppunitTest_sd_dialogs_test.mk @@ -40,6 +40,7 @@ $(eval $(call gb_CppunitTest_use_libraries,sd_dialogs_test, \ salhelper \ sax \ sd \ + sdui \ sfx \ sot \ svl \ diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index 8103d5cb0b01..01c546ad3dca 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -49,6 +49,7 @@ $(eval $(call gb_Library_set_include,sd,\ $(eval $(call gb_Library_add_defs,sd,\ -DSD_DLLIMPLEMENTATION \ + -DSDUI_DLL_NAME=\"$(call gb_Library_get_runtime_filename,$(call gb_Library__get_name,sdui))\" \ )) ifneq ($(strip $(dbg_anim_log)$(DBG_ANIM_LOG)),) @@ -77,7 +78,6 @@ $(eval $(call gb_Library_use_libraries,sd,\ drawinglayercore \ drawinglayer \ editeng \ - fwk \ i18nlangtag \ i18nutil \ icg \ @@ -603,67 +603,4 @@ endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE endif # ENABLE_SDREMOTE=TRUE -$(eval $(call gb_Library_add_exception_objects,sd,\ - sd/source/ui/dlg/brkdlg \ - sd/source/ui/dlg/copydlg \ - sd/source/ui/dlg/custsdlg \ - sd/source/ui/dlg/dlgchar \ - sd/source/ui/dlg/dlgfield \ - sd/source/ui/dlg/dlgolbul \ - sd/source/ui/dlg/dlgpage \ - sd/source/ui/dlg/dlgsnap \ - sd/source/ui/dlg/headerfooterdlg \ - sd/source/ui/dlg/inspagob \ - sd/source/ui/dlg/masterlayoutdlg \ - sd/source/ui/dlg/morphdlg \ - sd/source/ui/dlg/paragr \ - sd/source/ui/dlg/present \ - sd/source/ui/dlg/prltempl \ - sd/source/ui/dlg/prntopts \ - sd/source/ui/dlg/RemoteDialog \ - sd/source/ui/dlg/RemoteDialogClientBox \ - sd/source/ui/dlg/sddlgfact \ - sd/source/ui/dlg/sdpreslt \ - sd/source/ui/dlg/sduiexp \ - sd/source/ui/dlg/tabtempl \ - sd/source/ui/dlg/tpaction \ - sd/source/ui/dlg/tpoption \ - sd/source/ui/dlg/vectdlg \ - sd/source/ui/dlg/PhotoAlbumDialog \ - sd/source/ui/dlg/BulletAndPositionDlg \ - sd/source/console/PresenterAccessibility \ - sd/source/console/PresenterBitmapContainer \ - sd/source/console/PresenterButton \ - sd/source/console/PresenterCanvasHelper \ - sd/source/console/PresenterConfigurationAccess \ - sd/source/console/PresenterController \ - sd/source/console/PresenterCurrentSlideObserver \ - sd/source/console/PresenterFrameworkObserver \ - sd/source/console/PresenterGeometryHelper \ - sd/source/console/PresenterHelpView \ - sd/source/console/PresenterHelper \ - sd/source/console/PresenterNotesView \ - sd/source/console/PresenterPaintManager \ - sd/source/console/PresenterPane \ - sd/source/console/PresenterPaneBase \ - sd/source/console/PresenterPaneBorderPainter \ - sd/source/console/PresenterPaneContainer \ - sd/source/console/PresenterPaneFactory \ - sd/source/console/PresenterProtocolHandler \ - sd/source/console/PresenterScreen \ - sd/source/console/PresenterScrollBar \ - sd/source/console/PresenterSlidePreview \ - sd/source/console/PresenterSlideShowView \ - sd/source/console/PresenterSlideSorter \ - sd/source/console/PresenterSprite \ - sd/source/console/PresenterSpritePane \ - sd/source/console/PresenterTextView \ - sd/source/console/PresenterTheme \ - sd/source/console/PresenterTimer \ - sd/source/console/PresenterToolBar \ - sd/source/console/PresenterUIPainter \ - sd/source/console/PresenterViewFactory \ - sd/source/console/PresenterWindowManager \ -)) - # vim: set noet sw=4 ts=4: diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk new file mode 100644 index 000000000000..30a502bcbdf6 --- /dev/null +++ b/sd/Library_sdui.mk @@ -0,0 +1,133 @@ +# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*- +# +# This file is part of the LibreOffice project. +# +# This Source Code Form is subject to the terms of the Mozilla Public +# 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/. +# + +$(eval $(call gb_Library_Library,sdui)) + +$(eval $(call gb_Library_set_plugin_for,sdui,sd)) + +$(eval $(call gb_Library_set_componentfile,sdui,sd/source/console/presenter,services)) + +$(eval $(call gb_Library_set_include,sdui,\ + $$(INCLUDE) \ + -I$(SRCDIR)/sd/inc \ + -I$(SRCDIR)/sd/source/ui/inc \ +)) + +ifeq ($(ENABLE_SDREMOTE),TRUE) +$(eval $(call gb_Library_add_defs,sdui,\ + -DENABLE_SDREMOTE \ +)) + +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),TRUE) +$(eval $(call gb_Library_add_defs,sdui,\ + -DENABLE_SDREMOTE_BLUETOOTH \ +)) +endif + +endif + +$(eval $(call gb_Library_use_custom_headers,sdui,\ + officecfg/registry \ +)) + +$(eval $(call gb_Library_set_precompiled_header,sdui,sd/inc/pch/precompiled_sdui)) + +$(eval $(call gb_Library_use_external,sdui,boost_headers)) + +$(eval $(call gb_Library_use_sdk_api,sdui)) + +$(eval $(call gb_Library_use_libraries,sdui,\ + basegfx \ + comphelper \ + cppcanvas \ + cppu \ + cppuhelper \ + editeng \ + i18nlangtag \ + fwk \ + sal \ + salhelper \ + sfx \ + sot \ + svl \ + svt \ + svxcore \ + svx \ + tl \ + utl \ + vcl \ +)) + +$(eval $(call gb_Library_add_exception_objects,sdui,\ + sd/source/ui/dlg/brkdlg \ + sd/source/ui/dlg/copydlg \ + sd/source/ui/dlg/custsdlg \ + sd/source/ui/dlg/dlgchar \ + sd/source/ui/dlg/dlgfield \ + sd/source/ui/dlg/dlgolbul \ + sd/source/ui/dlg/dlgpage \ + sd/source/ui/dlg/dlgsnap \ + sd/source/ui/dlg/headerfooterdlg \ + sd/source/ui/dlg/inspagob \ + sd/source/ui/dlg/masterlayoutdlg \ + sd/source/ui/dlg/morphdlg \ + sd/source/ui/dlg/paragr \ + sd/source/ui/dlg/present \ + sd/source/ui/dlg/prltempl \ + sd/source/ui/dlg/prntopts \ + sd/source/ui/dlg/RemoteDialog \ + sd/source/ui/dlg/RemoteDialogClientBox \ + sd/source/ui/dlg/sddlgfact \ + sd/source/ui/dlg/sdpreslt \ + sd/source/ui/dlg/sduiexp \ + sd/source/ui/dlg/tabtempl \ + sd/source/ui/dlg/tpaction \ + sd/source/ui/dlg/tpoption \ + sd/source/ui/dlg/vectdlg \ + sd/source/ui/dlg/PhotoAlbumDialog \ + sd/source/ui/dlg/BulletAndPositionDlg \ + sd/source/console/PresenterAccessibility \ + sd/source/console/PresenterBitmapContainer \ + sd/source/console/PresenterButton \ + sd/source/console/PresenterCanvasHelper \ + sd/source/console/PresenterConfigurationAccess \ + sd/source/console/PresenterController \ + sd/source/console/PresenterCurrentSlideObserver \ + sd/source/console/PresenterFrameworkObserver \ + sd/source/console/PresenterGeometryHelper \ + sd/source/console/PresenterHelpView \ + sd/source/console/PresenterHelper \ + sd/source/console/PresenterNotesView \ + sd/source/console/PresenterPaintManager \ + sd/source/console/PresenterPane \ + sd/source/console/PresenterPaneBase \ + sd/source/console/PresenterPaneBorderPainter \ + sd/source/console/PresenterPaneContainer \ + sd/source/console/PresenterPaneFactory \ + sd/source/console/PresenterProtocolHandler \ + sd/source/console/PresenterScreen \ + sd/source/console/PresenterScrollBar \ + sd/source/console/PresenterSlidePreview \ + sd/source/console/PresenterSlideShowView \ + sd/source/console/PresenterSlideSorter \ + sd/source/console/PresenterSprite \ + sd/source/console/PresenterSpritePane \ + sd/source/console/PresenterTextView \ + sd/source/console/PresenterTheme \ + sd/source/console/PresenterTimer \ + sd/source/console/PresenterToolBar \ + sd/source/console/PresenterUIPainter \ + sd/source/console/PresenterViewFactory \ + sd/source/console/PresenterWindowManager \ +)) + +# $(WORKDIR)/inc/sd/sddll0.hxx : + # echo "#define" DLL_NAME \"$(if $(filter-out WNT,$(OS)),lib)sd$(DLLPOSTFIX)$(DLLPOST)\" > $@ + +# vim: set noet sw=4 ts=4: diff --git a/sd/Module_sd.mk b/sd/Module_sd.mk index 68f81cd83382..b3a825254652 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -15,6 +15,7 @@ $(eval $(call gb_Module_Module,sd)) $(eval $(call gb_Module_add_targets,sd,\ Library_sd \ Library_sdd \ + Library_sdui \ Package_opengl \ Package_xml \ UIConfig_sdraw \ diff --git a/sd/inc/pch/precompiled_sdui.cxx b/sd/inc/pch/precompiled_sdui.cxx new file mode 100644 index 000000000000..0471b10db738 --- /dev/null +++ b/sd/inc/pch/precompiled_sdui.cxx @@ -0,0 +1,12 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * 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/. + */ + +#include "precompiled_sdui.hxx" + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx new file mode 100644 index 000000000000..f7743dd6d27a --- /dev/null +++ b/sd/inc/pch/precompiled_sdui.hxx @@ -0,0 +1,529 @@ +/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * 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/. + */ + +/* + This file has been autogenerated by update_pch.sh. It is possible to edit it + manually (such as when an include file has been moved/renamed/removed). All such + manual changes will be rewritten by the next run of update_pch.sh (which presumably + also fixes all possible problems, so it's usually better to use it). + + Generated on 2023-07-19 09:28:08 using: + ./bin/update_pch sd sdui --cutoff=4 --exclude:system --include:module --include:local + + If after updating build fails, use the following command to locate conflicting headers: + ./bin/update_pch_bisect ./sd/inc/pch/precompiled_sdui.hxx "make sd.build" --find-conflicts +*/ + +#include +#if PCH_LEVEL >= 1 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif // PCH_LEVEL >= 1 +#if PCH_LEVEL >= 2 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif // PCH_LEVEL >= 2 +#if PCH_LEVEL >= 3 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif // PCH_LEVEL >= 3 +#if PCH_LEVEL >= 4 +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#endif // PCH_LEVEL >= 4 + +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 41c90b65a520..594602af2589 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -198,6 +198,4 @@ protected: ~SdAbstractDialogFactory() {} }; -SdAbstractDialogFactory* SdCreateDialogFactory(); - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/console/presenter.component b/sd/source/console/presenter.component new file mode 100644 index 000000000000..3e1bc8508d36 --- /dev/null +++ b/sd/source/console/presenter.component @@ -0,0 +1,18 @@ + + + + + + + + diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index f68ac2c245bf..44ad8703e9e3 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -28,7 +28,6 @@ #include #include #include -#include #include #include @@ -97,10 +96,10 @@ void CopyDlg::Reset() // tdf#125011 draw/impress sizes are in mm_100th already, "normalize" to // decimal shift by number of decimal places the widgets are using (2) then // scale by the ui scaling factor - auto nPageWidth = ::tools::Long(m_xMtrFldMoveX->normalize(aPageSize.Width()) / maUIScale); - auto nPageHeight = ::tools::Long(m_xMtrFldMoveX->normalize(aPageSize.Height()) / maUIScale); - auto nRectWidth = ::tools::Long(m_xMtrFldMoveX->normalize(aRect.GetWidth()) / maUIScale); - auto nRectHeight = ::tools::Long(m_xMtrFldMoveX->normalize(aRect.GetHeight()) / maUIScale); + auto nPageWidth = tools::Long(m_xMtrFldMoveX->normalize(aPageSize.Width()) / maUIScale); + auto nPageHeight = tools::Long(m_xMtrFldMoveX->normalize(aPageSize.Height()) / maUIScale); + auto nRectWidth = tools::Long(m_xMtrFldMoveX->normalize(aRect.GetWidth()) / maUIScale); + auto nRectHeight = tools::Long(m_xMtrFldMoveX->normalize(aRect.GetHeight()) / maUIScale); m_xMtrFldMoveX->set_range(-nPageWidth, nPageWidth, FieldUnit::MM_100TH); m_xMtrFldMoveY->set_range(-nPageHeight, nPageHeight, FieldUnit::MM_100TH); @@ -122,30 +121,30 @@ void CopyDlg::Reset() else m_xNumFldCopies->set_value(1); - ::tools::Long nMoveX = 500; + tools::Long nMoveX = 500; if( const SfxInt32Item* pPoolItem = mrOutAttrs.GetItemIfSet( ATTR_COPY_MOVE_X ) ) nMoveX = pPoolItem->GetValue(); - SetMetricValue( *m_xMtrFldMoveX, ::tools::Long(nMoveX / maUIScale), MapUnit::Map100thMM); + SetMetricValue( *m_xMtrFldMoveX, tools::Long(nMoveX / maUIScale), MapUnit::Map100thMM); - ::tools::Long nMoveY = 500; + tools::Long nMoveY = 500; if( const SfxInt32Item* pPoolItem = mrOutAttrs.GetItemIfSet( ATTR_COPY_MOVE_Y ) ) nMoveY = pPoolItem->GetValue(); - SetMetricValue( *m_xMtrFldMoveY, ::tools::Long(nMoveY / maUIScale), MapUnit::Map100thMM); + SetMetricValue( *m_xMtrFldMoveY, tools::Long(nMoveY / maUIScale), MapUnit::Map100thMM); if( const SdrAngleItem* pPoolItem = mrOutAttrs.GetItemIfSet( ATTR_COPY_ANGLE ) ) m_xMtrFldAngle->set_value( pPoolItem->GetValue().get(), FieldUnit::NONE); else m_xMtrFldAngle->set_value(0, FieldUnit::NONE); - ::tools::Long nWidth = 0; + tools::Long nWidth = 0; if( const SfxInt32Item* pPoolItem = mrOutAttrs.GetItemIfSet( ATTR_COPY_WIDTH ) ) nWidth = pPoolItem->GetValue(); - SetMetricValue( *m_xMtrFldWidth, ::tools::Long(nWidth / maUIScale), MapUnit::Map100thMM); + SetMetricValue( *m_xMtrFldWidth, tools::Long(nWidth / maUIScale), MapUnit::Map100thMM); - ::tools::Long nHeight = 0; + tools::Long nHeight = 0; if( const SfxInt32Item* pPoolItem = mrOutAttrs.GetItemIfSet( ATTR_COPY_HEIGHT ) ) nHeight = pPoolItem->GetValue(); - SetMetricValue( *m_xMtrFldHeight, ::tools::Long(nHeight / maUIScale), MapUnit::Map100thMM); + SetMetricValue( *m_xMtrFldHeight, tools::Long(nHeight / maUIScale), MapUnit::Map100thMM); if( const XColorItem* pPoolItem = mrOutAttrs.GetItemIfSet( ATTR_COPY_START_COLOR ) ) { @@ -181,10 +180,10 @@ void CopyDlg::Reset() */ void CopyDlg::GetAttr( SfxItemSet& rOutAttrs ) { - ::tools::Long nMoveX = ::tools::Long( GetCoreValue( *m_xMtrFldMoveX, MapUnit::Map100thMM) * maUIScale); - ::tools::Long nMoveY = ::tools::Long( GetCoreValue( *m_xMtrFldMoveY, MapUnit::Map100thMM) * maUIScale); - ::tools::Long nHeight = ::tools::Long( GetCoreValue( *m_xMtrFldHeight, MapUnit::Map100thMM) * maUIScale); - ::tools::Long nWidth = ::tools::Long( GetCoreValue( *m_xMtrFldWidth, MapUnit::Map100thMM) * maUIScale); + tools::Long nMoveX = tools::Long( GetCoreValue( *m_xMtrFldMoveX, MapUnit::Map100thMM) * maUIScale); + tools::Long nMoveY = tools::Long( GetCoreValue( *m_xMtrFldMoveY, MapUnit::Map100thMM) * maUIScale); + tools::Long nHeight = tools::Long( GetCoreValue( *m_xMtrFldHeight, MapUnit::Map100thMM) * maUIScale); + tools::Long nWidth = tools::Long( GetCoreValue( *m_xMtrFldWidth, MapUnit::Map100thMM) * maUIScale); rOutAttrs.Put( SfxUInt16Item( ATTR_COPY_NUMBER, static_cast(m_xNumFldCopies->get_value()) ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_X, nMoveX ) ); @@ -221,9 +220,9 @@ IMPL_LINK_NOARG(CopyDlg, SetViewData, weld::Button&, void) { ::tools::Rectangle aRect = mpView->GetAllMarkedRect(); - SetMetricValue( *m_xMtrFldMoveX, ::tools::Long( aRect.GetWidth() / + SetMetricValue( *m_xMtrFldMoveX, tools::Long( aRect.GetWidth() / maUIScale ), MapUnit::Map100thMM); - SetMetricValue( *m_xMtrFldMoveY, ::tools::Long( aRect.GetHeight() / + SetMetricValue( *m_xMtrFldMoveY, tools::Long( aRect.GetHeight() / maUIScale ), MapUnit::Map100thMM); // sets color attribute @@ -241,14 +240,14 @@ IMPL_LINK_NOARG(CopyDlg, SetDefault, weld::Button&, void) { m_xNumFldCopies->set_value(1); - ::tools::Long nValue = 500; - SetMetricValue( *m_xMtrFldMoveX, ::tools::Long(nValue / maUIScale), MapUnit::Map100thMM); - SetMetricValue( *m_xMtrFldMoveY, ::tools::Long(nValue / maUIScale), MapUnit::Map100thMM); + tools::Long nValue = 500; + SetMetricValue( *m_xMtrFldMoveX, tools::Long(nValue / maUIScale), MapUnit::Map100thMM); + SetMetricValue( *m_xMtrFldMoveY, tools::Long(nValue / maUIScale), MapUnit::Map100thMM); nValue = 0; m_xMtrFldAngle->set_value(nValue, FieldUnit::DEGREE); - SetMetricValue( *m_xMtrFldWidth, ::tools::Long(nValue / maUIScale), MapUnit::Map100thMM); - SetMetricValue( *m_xMtrFldHeight, ::tools::Long(nValue / maUIScale), MapUnit::Map100thMM); + SetMetricValue( *m_xMtrFldWidth, tools::Long(nValue / maUIScale), MapUnit::Map100thMM); + SetMetricValue( *m_xMtrFldHeight, tools::Long(nValue / maUIScale), MapUnit::Map100thMM); // set color attribute if( const XColorItem* pPoolItem = mrOutAttrs.GetItemIfSet( ATTR_COPY_START_COLOR ) ) diff --git a/sd/source/ui/dlg/headerfooterdlg.cxx b/sd/source/ui/dlg/headerfooterdlg.cxx index 31b3e00f817a..8401ec38cd6e 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -26,7 +26,6 @@ #include #include #include -#include #include #include @@ -709,12 +708,12 @@ void PresLayoutPreview::Paint(vcl::RenderContext& rRenderContext, const ::tools: if( maPageSize.Width() > maPageSize.Height() ) { nWidth = maOutRect.GetWidth(); - nHeight = maPageSize.Width() == 0 ? 0 : ::tools::Long( static_cast(nWidth * maPageSize.Height()) / static_cast(maPageSize.Width()) ); + nHeight = maPageSize.Width() == 0 ? 0 : tools::Long( static_cast(nWidth * maPageSize.Height()) / static_cast(maPageSize.Width()) ); } else { nHeight = maOutRect.GetHeight(); - nWidth = maPageSize.Height() == 0 ? 0 : ::tools::Long( static_cast(nHeight * maPageSize.Width()) / static_cast(maPageSize.Height()) ); + nWidth = maPageSize.Height() == 0 ? 0 : tools::Long( static_cast(nHeight * maPageSize.Width()) / static_cast(maPageSize.Height()) ); } maOutRect.AdjustLeft((maOutRect.GetWidth() - nWidth) >> 1 ); diff --git a/sd/source/ui/dlg/morphdlg.cxx b/sd/source/ui/dlg/morphdlg.cxx index 2ffdda95b942..c0d7f4e5af20 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -21,13 +21,11 @@ #include #include -#include #include #include #include #include #include -#include #include using namespace com::sun::star; @@ -67,7 +65,7 @@ MorphDlg::~MorphDlg() void MorphDlg::LoadSettings() { - ::tools::SvRef xIStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING , + tools::SvRef xIStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING , SdOptionStreamMode::Load ) ); sal_uInt16 nSteps; bool bOrient, bAttrib; @@ -91,7 +89,7 @@ void MorphDlg::LoadSettings() void MorphDlg::SaveSettings() const { - ::tools::SvRef xOStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING , + tools::SvRef xOStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING , SdOptionStreamMode::Store ) ); if( xOStm.is() ) diff --git a/sd/source/ui/dlg/sdabstdlg.cxx b/sd/source/ui/dlg/sdabstdlg.cxx index f91bdd053489..2b686a3e8882 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -19,6 +19,37 @@ #include -SdAbstractDialogFactory* SdAbstractDialogFactory::Create() { return SdCreateDialogFactory(); } +#include + +typedef SdAbstractDialogFactory* (*SdFuncPtrCreateDialogFactory)(); + +#ifndef DISABLE_DYNLOADING + +extern "C" { +static void thisModule() {} +} + +#else + +extern "C" SdAbstractDialogFactory* SdCreateDialogFactory(); + +#endif + +SdAbstractDialogFactory* SdAbstractDialogFactory::Create() +{ + SdFuncPtrCreateDialogFactory fp = nullptr; +#ifndef DISABLE_DYNLOADING + static ::osl::Module aDialogLibrary; + static constexpr OUStringLiteral sLibName(u"" SDUI_DLL_NAME); + if (aDialogLibrary.is() || aDialogLibrary.loadRelative(&thisModule, sLibName)) + fp = reinterpret_cast( + aDialogLibrary.getFunctionSymbol("SdCreateDialogFactory")); +#else + fp = SdCreateDialogFactory; +#endif + if (fp) + return fp(); + return nullptr; +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx index c6284c2e4f2d..62901c70d0aa 100644 --- a/sd/source/ui/dlg/sduiexp.cxx +++ b/sd/source/ui/dlg/sduiexp.cxx @@ -22,10 +22,12 @@ class SdAbstractDialogFactory; -SdAbstractDialogFactory* SdCreateDialogFactory() +extern "C" { +SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* SdCreateDialogFactory() { static SdAbstractDialogFactory_Impl aFactory; return &aFactory; } +} /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/util/sd.component b/sd/util/sd.component index de0de6d8caca..24f54893bbd6 100644 --- a/sd/util/sd.component +++ b/sd/util/sd.component @@ -71,10 +71,4 @@ - - - -