Repository.mk | 1 bin/update_pch | 1 desktop/Pagein_draw.mk | 1 desktop/Pagein_impress.mk | 1 sd/CppunitTest_sd_dialogs_test.mk | 1 sd/Library_sd.mk | 65 ++++ sd/Library_sdui.mk | 133 -------- sd/Module_sd.mk | 1 sd/inc/pch/precompiled_sdui.cxx | 12 sd/inc/pch/precompiled_sdui.hxx | 529 ---------------------------------- sd/inc/sdabstdlg.hxx | 2 sd/source/console/presenter.component | 18 - sd/source/ui/dlg/copydlg.cxx | 47 +-- sd/source/ui/dlg/headerfooterdlg.cxx | 5 sd/source/ui/dlg/morphdlg.cxx | 6 sd/source/ui/dlg/sdabstdlg.cxx | 33 -- sd/source/ui/dlg/sduiexp.cxx | 4 sd/util/sd.component | 6 18 files changed, 105 insertions(+), 761 deletions(-)
New commits: commit 2cf7c26293462406d91ee050c6677930065e660b Author: Noel Grandin <[email protected]> AuthorDate: Tue Feb 13 14:21:57 2024 +0200 Commit: Noel Grandin <[email protected]> CommitDate: Wed Feb 14 12:43:43 2024 +0100 merge sdui library into sd which eliminates another dynamic-symbol lookup and another complication which was making it harder to do better with --enable-mergedlibs sd is relatively small, so even the combined library is not as big as one of the sw and sc libraries Change-Id: Ibef8077d70a5abc7361c95f5dbb8c43447610188 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/163302 Tested-by: Jenkins Reviewed-by: Noel Grandin <[email protected]> diff --git a/Repository.mk b/Repository.mk index 8c9923bcc6c2..add9133fefa4 100644 --- a/Repository.mk +++ b/Repository.mk @@ -517,7 +517,6 @@ $(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 4719e5f9269f..e7ede0a5d692 100755 --- a/bin/update_pch +++ b/bin/update_pch @@ -92,7 +92,6 @@ 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 2fd0ef6ba4ff..abf7435032d6 100644 --- a/desktop/Pagein_draw.mk +++ b/desktop/Pagein_draw.mk @@ -11,7 +11,6 @@ $(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 f3e4ff7b6d59..9b15cc1fe1ba 100644 --- a/desktop/Pagein_impress.mk +++ b/desktop/Pagein_impress.mk @@ -11,7 +11,6 @@ $(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 839f702de7ef..fd3ca391477f 100644 --- a/sd/CppunitTest_sd_dialogs_test.mk +++ b/sd/CppunitTest_sd_dialogs_test.mk @@ -40,7 +40,6 @@ $(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 01c546ad3dca..8103d5cb0b01 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -49,7 +49,6 @@ $(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)),) @@ -78,6 +77,7 @@ $(eval $(call gb_Library_use_libraries,sd,\ drawinglayercore \ drawinglayer \ editeng \ + fwk \ i18nlangtag \ i18nutil \ icg \ @@ -603,4 +603,67 @@ 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 deleted file mode 100644 index 30a502bcbdf6..000000000000 --- a/sd/Library_sdui.mk +++ /dev/null @@ -1,133 +0,0 @@ -# -*- 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 b3a825254652..68f81cd83382 100644 --- a/sd/Module_sd.mk +++ b/sd/Module_sd.mk @@ -15,7 +15,6 @@ $(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 deleted file mode 100644 index 0471b10db738..000000000000 --- a/sd/inc/pch/precompiled_sdui.cxx +++ /dev/null @@ -1,12 +0,0 @@ -/* -*- 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 deleted file mode 100644 index f7743dd6d27a..000000000000 --- a/sd/inc/pch/precompiled_sdui.hxx +++ /dev/null @@ -1,529 +0,0 @@ -/* -*- 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 <sal/config.h> -#if PCH_LEVEL >= 1 -#include <algorithm> -#include <array> -#include <cassert> -#include <chrono> -#include <cmath> -#include <cstddef> -#include <cstdlib> -#include <cstring> -#include <deque> -#include <float.h> -#include <functional> -#include <initializer_list> -#include <iomanip> -#include <iterator> -#include <limits.h> -#include <limits> -#include <map> -#include <math.h> -#include <memory> -#include <mutex> -#include <new> -#include <numeric> -#include <optional> -#include <ostream> -#include <set> -#include <span> -#include <stddef.h> -#include <stdexcept> -#include <string.h> -#include <string> -#include <string_view> -#include <type_traits> -#include <typeinfo> -#include <unordered_map> -#include <unordered_set> -#include <utility> -#include <vector> -#include <boost/property_tree/ptree_fwd.hpp> -#endif // PCH_LEVEL >= 1 -#if PCH_LEVEL >= 2 -#include <osl/conditn.hxx> -#include <osl/diagnose.h> -#include <osl/doublecheckedlocking.h> -#include <osl/endian.h> -#include <osl/getglobalmutex.hxx> -#include <osl/interlck.h> -#include <osl/mutex.h> -#include <osl/mutex.hxx> -#include <osl/socket_decl.hxx> -#include <osl/thread.h> -#include <osl/time.h> -#include <rtl/alloc.h> -#include <rtl/byteseq.h> -#include <rtl/character.hxx> -#include <rtl/instance.hxx> -#include <rtl/locale.h> -#include <rtl/math.h> -#include <rtl/ref.hxx> -#include <rtl/strbuf.h> -#include <rtl/strbuf.hxx> -#include <rtl/string.h> -#include <rtl/string.hxx> -#include <rtl/stringconcat.hxx> -#include <rtl/stringutils.hxx> -#include <rtl/textcvt.h> -#include <rtl/textenc.h> -#include <rtl/ustrbuf.h> -#include <rtl/ustrbuf.hxx> -#include <rtl/ustring.h> -#include <rtl/ustring.hxx> -#include <rtl/uuid.h> -#include <sal/backtrace.hxx> -#include <sal/log.hxx> -#include <sal/macros.h> -#include <sal/saldllapi.h> -#include <sal/types.h> -#include <sal/typesizes.h> -#include <vcl/BinaryDataContainer.hxx> -#include <vcl/BitmapColor.hxx> -#include <vcl/BitmapPalette.hxx> -#include <vcl/ColorMask.hxx> -#include <vcl/GraphicAttributes.hxx> -#include <vcl/GraphicExternalLink.hxx> -#include <vcl/GraphicObject.hxx> -#include <vcl/IDialogRenderable.hxx> -#include <vcl/ITiledRenderable.hxx> -#include <vcl/InterimItemWindow.hxx> -#include <vcl/Scanline.hxx> -#include <vcl/WindowPosSize.hxx> -#include <vcl/alpha.hxx> -#include <vcl/animate/Animation.hxx> -#include <vcl/animate/AnimationFrame.hxx> -#include <vcl/bitmap.hxx> -#include <vcl/bitmap/BitmapTypes.hxx> -#include <vcl/bitmapex.hxx> -#include <vcl/builderpage.hxx> -#include <vcl/cairo.hxx> -#include <vcl/checksum.hxx> -#include <vcl/ctrl.hxx> -#include <vcl/customweld.hxx> -#include <vcl/dllapi.h> -#include <vcl/dockwin.hxx> -#include <vcl/event.hxx> -#include <vcl/fntstyle.hxx> -#include <vcl/font.hxx> -#include <vcl/formatter.hxx> -#include <vcl/gdimtf.hxx> -#include <vcl/gfxlink.hxx> -#include <vcl/gradient.hxx> -#include <vcl/graph.hxx> -#include <vcl/idle.hxx> -#include <vcl/image.hxx> -#include <vcl/kernarray.hxx> -#include <vcl/keycod.hxx> -#include <vcl/keycodes.hxx> -#include <vcl/mapmod.hxx> -#include <vcl/metaactiontypes.hxx> -#include <vcl/metric.hxx> -#include <vcl/outdev.hxx> -#include <vcl/ptrstyle.hxx> -#include <vcl/region.hxx> -#include <vcl/rendercontext/AddFontSubstituteFlags.hxx> -#include <vcl/rendercontext/AntialiasingFlags.hxx> -#include <vcl/rendercontext/DrawGridFlags.hxx> -#include <vcl/rendercontext/DrawImageFlags.hxx> -#include <vcl/rendercontext/DrawModeFlags.hxx> -#include <vcl/rendercontext/DrawTextFlags.hxx> -#include <vcl/rendercontext/GetDefaultFontFlags.hxx> -#include <vcl/rendercontext/ImplMapRes.hxx> -#include <vcl/rendercontext/InvertFlags.hxx> -#include <vcl/rendercontext/RasterOp.hxx> -#include <vcl/rendercontext/SalLayoutFlags.hxx> -#include <vcl/rendercontext/State.hxx> -#include <vcl/rendercontext/SystemTextColorFlags.hxx> -#include <vcl/salgtype.hxx> -#include <vcl/salnativewidgets.hxx> -#include <vcl/scrollable.hxx> -#include <vcl/settings.hxx> -#include <vcl/svapp.hxx> -#include <vcl/syswin.hxx> -#include <vcl/task.hxx> -#include <vcl/timer.hxx> -#include <vcl/transfer.hxx> -#include <vcl/uitest/factory.hxx> -#include <vcl/vclenum.hxx> -#include <vcl/vclptr.hxx> -#include <vcl/vclreferencebase.hxx> -#include <vcl/vectorgraphicdata.hxx> -#include <vcl/wall.hxx> -#include <vcl/weld.hxx> -#include <vcl/weldutils.hxx> -#include <vcl/window.hxx> -#include <vcl/windowstate.hxx> -#include <vcl/wintypes.hxx> -#endif // PCH_LEVEL >= 2 -#if PCH_LEVEL >= 3 -#include <basegfx/basegfxdllapi.h> -#include <basegfx/color/bcolor.hxx> -#include <basegfx/matrix/b2dhommatrix.hxx> -#include <basegfx/matrix/hommatrixtemplate.hxx> -#include <basegfx/numeric/ftools.hxx> -#include <basegfx/point/b2dpoint.hxx> -#include <basegfx/point/b2ipoint.hxx> -#include <basegfx/polygon/b2dpolygon.hxx> -#include <basegfx/polygon/b2dpolypolygon.hxx> -#include <basegfx/range/Range2D.hxx> -#include <basegfx/range/b2drange.hxx> -#include <basegfx/range/b2drectangle.hxx> -#include <basegfx/range/basicrange.hxx> -#include <basegfx/tuple/Size2D.hxx> -#include <basegfx/tuple/Tuple2D.hxx> -#include <basegfx/tuple/Tuple3D.hxx> -#include <basegfx/tuple/b2dtuple.hxx> -#include <basegfx/tuple/b2i64tuple.hxx> -#include <basegfx/tuple/b2ituple.hxx> -#include <basegfx/tuple/b3dtuple.hxx> -#include <basegfx/utils/bgradient.hxx> -#include <basegfx/utils/common.hxx> -#include <basegfx/vector/b2dsize.hxx> -#include <basegfx/vector/b2dvector.hxx> -#include <basegfx/vector/b2enums.hxx> -#include <basegfx/vector/b2isize.hxx> -#include <basegfx/vector/b2ivector.hxx> -#include <com/sun/star/awt/DeviceInfo.hpp> -#include <com/sun/star/awt/Gradient2.hpp> -#include <com/sun/star/awt/GradientStyle.hpp> -#include <com/sun/star/awt/Key.hpp> -#include <com/sun/star/awt/KeyGroup.hpp> -#include <com/sun/star/awt/PosSize.hpp> -#include <com/sun/star/awt/SystemPointer.hpp> -#include <com/sun/star/awt/XWindow.hpp> -#include <com/sun/star/awt/XWindowPeer.hpp> -#include <com/sun/star/beans/PropertyValue.hpp> -#include <com/sun/star/beans/XPropertySet.hpp> -#include <com/sun/star/container/XChild.hpp> -#include <com/sun/star/container/XIndexContainer.hpp> -#include <com/sun/star/container/XIndexReplace.hpp> -#include <com/sun/star/container/XNameContainer.hpp> -#include <com/sun/star/container/XNamed.hpp> -#include <com/sun/star/datatransfer/DataFlavor.hpp> -#include <com/sun/star/datatransfer/XTransferable.hpp> -#include <com/sun/star/datatransfer/XTransferable2.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboard.hpp> -#include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> -#include <com/sun/star/datatransfer/dnd/DNDConstants.hpp> -#include <com/sun/star/datatransfer/dnd/DropTargetDragEvent.hpp> -#include <com/sun/star/datatransfer/dnd/DropTargetDropEvent.hpp> -#include <com/sun/star/datatransfer/dnd/XDragGestureListener.hpp> -#include <com/sun/star/datatransfer/dnd/XDragSourceListener.hpp> -#include <com/sun/star/datatransfer/dnd/XDropTargetListener.hpp> -#include <com/sun/star/document/EventObject.hpp> -#include <com/sun/star/document/XCmisDocument.hpp> -#include <com/sun/star/document/XDocumentEventBroadcaster.hpp> -#include <com/sun/star/document/XDocumentPropertiesSupplier.hpp> -#include <com/sun/star/document/XDocumentRecovery.hpp> -#include <com/sun/star/document/XDocumentSubStorageSupplier.hpp> -#include <com/sun/star/document/XEmbeddedScripts.hpp> -#include <com/sun/star/document/XEventBroadcaster.hpp> -#include <com/sun/star/document/XEventsSupplier.hpp> -#include <com/sun/star/document/XLinkTargetSupplier.hpp> -#include <com/sun/star/document/XScriptInvocationContext.hpp> -#include <com/sun/star/document/XShapeEventBroadcaster.hpp> -#include <com/sun/star/document/XStorageBasedDocument.hpp> -#include <com/sun/star/document/XUndoManagerSupplier.hpp> -#include <com/sun/star/document/XViewDataSupplier.hpp> -#include <com/sun/star/drawing/DashStyle.hpp> -#include <com/sun/star/drawing/HatchStyle.hpp> -#include <com/sun/star/drawing/LineCap.hpp> -#include <com/sun/star/drawing/TextFitToSizeType.hpp> -#include <com/sun/star/drawing/XDrawPageDuplicator.hpp> -#include <com/sun/star/drawing/XDrawPages.hpp> -#include <com/sun/star/drawing/XDrawPagesSupplier.hpp> -#include <com/sun/star/drawing/XLayerSupplier.hpp> -#include <com/sun/star/drawing/XMasterPagesSupplier.hpp> -#include <com/sun/star/drawing/XPresenterHelper.hpp> -#include <com/sun/star/drawing/framework/XConfigurationController.hpp> -#include <com/sun/star/embed/Aspects.hpp> -#include <com/sun/star/embed/XStorage.hpp> -#include <com/sun/star/embed/XVisualObject.hpp> -#include <com/sun/star/form/FormComponentType.hpp> -#include <com/sun/star/frame/XDispatch.hpp> -#include <com/sun/star/frame/XFrame.hpp> -#include <com/sun/star/frame/XLoadable.hpp> -#include <com/sun/star/frame/XModel3.hpp> -#include <com/sun/star/frame/XModule.hpp> -#include <com/sun/star/frame/XStatusListener.hpp> -#include <com/sun/star/frame/XStorable2.hpp> -#include <com/sun/star/frame/XTerminateListener.hpp> -#include <com/sun/star/frame/XTitle.hpp> -#include <com/sun/star/frame/XTitleChangeBroadcaster.hpp> -#include <com/sun/star/frame/XUntitledNumbers.hpp> -#include <com/sun/star/graphic/XGraphic.hpp> -#include <com/sun/star/graphic/XPrimitive2D.hpp> -#include <com/sun/star/i18n/ForbiddenCharacters.hpp> -#include <com/sun/star/i18n/WordType.hpp> -#include <com/sun/star/io/XInputStream.hpp> -#include <com/sun/star/io/XOutputStream.hpp> -#include <com/sun/star/io/XSeekable.hpp> -#include <com/sun/star/io/XStream.hpp> -#include <com/sun/star/io/XTruncate.hpp> -#include <com/sun/star/lang/DisposedException.hpp> -#include <com/sun/star/lang/EventObject.hpp> -#include <com/sun/star/lang/Locale.hpp> -#include <com/sun/star/lang/XComponent.hpp> -#include <com/sun/star/lang/XEventListener.hpp> -#include <com/sun/star/lang/XMultiComponentFactory.hpp> -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#include <com/sun/star/lang/XServiceInfo.hpp> -#include <com/sun/star/lang/XSingleServiceFactory.hpp> -#include <com/sun/star/lang/XTypeProvider.hpp> -#include <com/sun/star/lang/XUnoTunnel.hpp> -#include <com/sun/star/presentation/XCustomPresentationSupplier.hpp> -#include <com/sun/star/presentation/XHandoutMasterSupplier.hpp> -#include <com/sun/star/presentation/XPresentationSupplier.hpp> -#include <com/sun/star/rdf/XDocumentMetadataAccess.hpp> -#include <com/sun/star/rendering/CompositeOperation.hpp> -#include <com/sun/star/rendering/TextDirection.hpp> -#include <com/sun/star/script/XStarBasicAccess.hpp> -#include <com/sun/star/script/provider/XScriptProviderSupplier.hpp> -#include <com/sun/star/style/NumberingType.hpp> -#include <com/sun/star/style/XStyle.hpp> -#include <com/sun/star/style/XStyleFamiliesSupplier.hpp> -#include <com/sun/star/text/textfield/Type.hpp> -#include <com/sun/star/ucb/XAnyCompareFactory.hpp> -#include <com/sun/star/ui/XUIConfigurationManagerSupplier.hpp> -#include <com/sun/star/uno/Any.h> -#include <com/sun/star/uno/Any.hxx> -#include <com/sun/star/uno/Reference.h> -#include <com/sun/star/uno/Reference.hxx> -#include <com/sun/star/uno/RuntimeException.hpp> -#include <com/sun/star/uno/Sequence.h> -#include <com/sun/star/uno/Sequence.hxx> -#include <com/sun/star/uno/Type.h> -#include <com/sun/star/uno/Type.hxx> -#include <com/sun/star/uno/TypeClass.hdl> -#include <com/sun/star/uno/XInterface.hpp> -#include <com/sun/star/uno/XWeak.hpp> -#include <com/sun/star/uno/genfunc.h> -#include <com/sun/star/uno/genfunc.hxx> -#include <com/sun/star/util/Date.hpp> -#include <com/sun/star/util/DateTime.hpp> -#include <com/sun/star/util/Time.hpp> -#include <com/sun/star/util/XAccounting.hpp> -#include <com/sun/star/util/XCloseable.hpp> -#include <com/sun/star/util/XModifiable2.hpp> -#include <com/sun/star/view/XPrintJobBroadcaster.hpp> -#include <com/sun/star/view/XPrintable.hpp> -#include <com/sun/star/view/XRenderable.hpp> -#include <comphelper/compbase.hxx> -#include <comphelper/comphelperdllapi.h> -#include <comphelper/errcode.hxx> -#include <comphelper/interfacecontainer4.hxx> -#include <comphelper/servicehelper.hxx> -#include <comphelper/unoimplbase.hxx> -#include <cppu/cppudllapi.h> -#include <cppu/unotype.hxx> -#include <cppuhelper/basemutex.hxx> -#include <cppuhelper/compbase.hxx> -#include <cppuhelper/cppuhelperdllapi.h> -#include <cppuhelper/implbase.hxx> -#include <cppuhelper/implbase_ex.hxx> -#include <cppuhelper/implbase_ex_post.hxx> -#include <cppuhelper/implbase_ex_pre.hxx> -#include <cppuhelper/queryinterface.hxx> -#include <cppuhelper/weak.hxx> -#include <cppuhelper/weakref.hxx> -#include <docmodel/color/ComplexColor.hxx> -#include <docmodel/color/Transformation.hxx> -#include <docmodel/dllapi.h> -#include <docmodel/theme/ThemeColorType.hxx> -#include <drawinglayer/drawinglayerdllapi.h> -#include <drawinglayer/geometry/viewinformation2d.hxx> -#include <drawinglayer/primitive2d/CommonTypes.hxx> -#include <drawinglayer/primitive2d/Primitive2DContainer.hxx> -#include <drawinglayer/primitive2d/Primitive2DVisitor.hxx> -#include <drawinglayer/primitive2d/baseprimitive2d.hxx> -#include <editeng/editdata.hxx> -#include <editeng/editengdllapi.h> -#include <editeng/editstat.hxx> -#include <editeng/editview.hxx> -#include <editeng/eedata.hxx> -#include <editeng/eeitem.hxx> -#include <editeng/flditem.hxx> -#include <editeng/forbiddencharacterstable.hxx> -#include <editeng/numdef.hxx> -#include <editeng/outliner.hxx> -#include <editeng/outlobj.hxx> -#include <editeng/overflowingtxt.hxx> -#include <editeng/paragraphdata.hxx> -#include <editeng/svxenum.hxx> -#include <editeng/svxfont.hxx> -#include <helper/simplereferencecomponent.hxx> -#include <i18nlangtag/i18nlangtagdllapi.h> -#include <i18nlangtag/lang.h> -#include <i18nlangtag/languagetag.hxx> -#include <o3tl/cow_wrapper.hxx> -#include <o3tl/deleter.hxx> -#include <o3tl/enumarray.hxx> -#include <o3tl/hash_combine.hxx> -#include <o3tl/safeint.hxx> -#include <o3tl/sorted_vector.hxx> -#include <o3tl/strong_int.hxx> -#include <o3tl/typed_flags_set.hxx> -#include <o3tl/underlyingenumvalue.hxx> -#include <o3tl/unit_conversion.hxx> -#include <salhelper/salhelperdllapi.h> -#include <salhelper/simplereferenceobject.hxx> -#include <salhelper/thread.hxx> -#include <sfx2/basedlgs.hxx> -#include <sfx2/dllapi.h> -#include <sfx2/namedcolor.hxx> -#include <sfx2/objsh.hxx> -#include <sfx2/sfxbasemodel.hxx> -#include <sfx2/shell.hxx> -#include <sfx2/tabdlg.hxx> -#include <sot/exchange.hxx> -#include <sot/formats.hxx> -#include <sot/sotdllapi.h> -#include <svl/SfxBroadcaster.hxx> -#include <svl/eitem.hxx> -#include <svl/hint.hxx> -#include <svl/intitem.hxx> -#include <svl/itempool.hxx> -#include <svl/itemset.hxx> -#include <svl/languageoptions.hxx> -#include <svl/lstner.hxx> -#include <svl/poolitem.hxx> -#include <svl/setitem.hxx> -#include <svl/stritem.hxx> -#include <svl/style.hxx> -#include <svl/stylesheetuser.hxx> -#include <svl/svldllapi.h> -#include <svl/typedwhich.hxx> -#include <svl/undo.hxx> -#include <svl/urlbmk.hxx> -#include <svl/whichranges.hxx> -#include <svtools/accessibilityoptions.hxx> -#include <svtools/colorcfg.hxx> -#include <svtools/svtdllapi.h> -#include <svtools/unitconv.hxx> -#include <svtools/valueset.hxx> -#include <svx/XPropertyEntry.hxx> -#include <svx/drawitem.hxx> -#include <svx/flagsdef.hxx> -#include <svx/fmdmod.hxx> -#include <svx/ipolypolygoneditorcontroller.hxx> -#include <svx/itextprovider.hxx> -#include <svx/sdr/animation/scheduler.hxx> -#include <svx/sdr/overlay/overlayobject.hxx> -#include <svx/sdr/overlay/overlayobjectlist.hxx> -#include <svx/sdr/properties/defaultproperties.hxx> -#include <svx/sdr/properties/properties.hxx> -#include <svx/sdrobjectuser.hxx> -#include <svx/sdtaditm.hxx> -#include <svx/sdtaitm.hxx> -#include <svx/sdtakitm.hxx> -#include <svx/selectioncontroller.hxx> -#include <svx/svdcrtv.hxx> -#include <svx/svddef.hxx> -#include <svx/svddrag.hxx> -#include <svx/svddrgv.hxx> -#include <svx/svdedtv.hxx> -#include <svx/svdedxv.hxx> -#include <svx/svdglev.hxx> -#include <svx/svdglue.hxx> -#include <svx/svdhdl.hxx> -#include <svx/svdhlpln.hxx> -#include <svx/svdlayer.hxx> -#include <svx/svdmark.hxx> -#include <svx/svdmodel.hxx> -#include <svx/svdmrkv.hxx> -#include <svx/svdoattr.hxx> -#include <svx/svdobj.hxx> -#include <svx/svdobjkind.hxx> -#include <svx/svdoedge.hxx> -#include <svx/svdotext.hxx> -#include <svx/svdpntv.hxx> -#include <svx/svdpoev.hxx> -#include <svx/svdsnpv.hxx> -#include <svx/svdsob.hxx> -#include <svx/svdtext.hxx> -#include <svx/svdtrans.hxx> -#include <svx/svdtypes.hxx> -#include <svx/svdundo.hxx> -#include <svx/svdxcgv.hxx> -#include <svx/svxdllapi.h> -#include <svx/unomod.hxx> -#include <svx/xdash.hxx> -#include <svx/xdef.hxx> -#include <svx/xhatch.hxx> -#include <svx/xpoly.hxx> -#include <svx/xtable.hxx> -#include <tools/color.hxx> -#include <tools/date.hxx> -#include <tools/datetime.hxx> -#include <tools/debug.hxx> -#include <tools/degree.hxx> -#include <tools/fldunit.hxx> -#include <tools/fontenum.hxx> -#include <tools/fract.hxx> -#include <tools/gen.hxx> -#include <tools/globname.hxx> -#include <tools/helpers.hxx> -#include <tools/lineend.hxx> -#include <tools/link.hxx> -#include <tools/long.hxx> -#include <tools/mapunit.hxx> -#include <tools/poly.hxx> -#include <tools/ref.hxx> -#include <tools/solar.h> -#include <tools/stream.hxx> -#include <tools/time.hxx> -#include <tools/toolsdllapi.h> -#include <tools/urlobj.hxx> -#include <tools/weakbase.h> -#include <typelib/typeclass.h> -#include <typelib/typedescription.h> -#include <typelib/uik.h> -#include <uno/any2.h> -#include <uno/data.h> -#include <uno/sequence2.h> -#include <unotools/fontcvt.hxx> -#include <unotools/fontdefs.hxx> -#include <unotools/options.hxx> -#include <unotools/resmgr.hxx> -#include <unotools/syslocale.hxx> -#include <unotools/tempfile.hxx> -#include <unotools/unotoolsdllapi.h> -#include <unotools/weakref.hxx> -#endif // PCH_LEVEL >= 3 -#if PCH_LEVEL >= 4 -#include <DrawController.hxx> -#include <DrawDocShell.hxx> -#include <View.hxx> -#include <drawdoc.hxx> -#include <fupoor.hxx> -#include <pres.hxx> -#include <sddllapi.h> -#include <sdmod.hxx> -#include <sdpage.hxx> -#include <sdresid.hxx> -#include <unomodel.hxx> -#endif // PCH_LEVEL >= 4 - -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/inc/sdabstdlg.hxx b/sd/inc/sdabstdlg.hxx index 594602af2589..41c90b65a520 100644 --- a/sd/inc/sdabstdlg.hxx +++ b/sd/inc/sdabstdlg.hxx @@ -198,4 +198,6 @@ 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 deleted file mode 100644 index 3e1bc8508d36..000000000000 --- a/sd/source/console/presenter.component +++ /dev/null @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!-- - * 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/. - * ---> -<component loader="com.sun.star.loader.SharedLibrary" environment="@CPPU_ENV@" - xmlns="http://openoffice.org/2010/uno-components";> - <implementation name="org.libreoffice.comp.PresenterScreenJob" - constructor="sd_PresenterScreenJob_get_implementation" /> - <implementation name="org.libreoffice.comp.PresenterScreenProtocolHandler" - constructor="sd_PresenterProtocolHandler_get_implementation"> - <service name="com.sun.star.frame.ProtocolHandler"/> - </implementation> -</component> diff --git a/sd/source/ui/dlg/copydlg.cxx b/sd/source/ui/dlg/copydlg.cxx index 44ad8703e9e3..f68ac2c245bf 100644 --- a/sd/source/ui/dlg/copydlg.cxx +++ b/sd/source/ui/dlg/copydlg.cxx @@ -28,6 +28,7 @@ #include <unotools/viewoptions.hxx> #include <svtools/unitconv.hxx> #include <o3tl/string_view.hxx> +#include <tools/long.hxx> #include <sdattr.hrc> #include <View.hxx> @@ -96,10 +97,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); @@ -121,30 +122,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 ) ) { @@ -180,10 +181,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<sal_uInt16>(m_xNumFldCopies->get_value()) ) ); rOutAttrs.Put( SfxInt32Item( ATTR_COPY_MOVE_X, nMoveX ) ); @@ -220,9 +221,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 @@ -240,14 +241,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 8401ec38cd6e..31b3e00f817a 100644 --- a/sd/source/ui/dlg/headerfooterdlg.cxx +++ b/sd/source/ui/dlg/headerfooterdlg.cxx @@ -26,6 +26,7 @@ #include <editeng/outlobj.hxx> #include <sfx2/viewfrm.hxx> #include <tools/debug.hxx> +#include <tools/long.hxx> #include <Outliner.hxx> #include <headerfooterdlg.hxx> @@ -708,12 +709,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<double>(nWidth * maPageSize.Height()) / static_cast<double>(maPageSize.Width()) ); + nHeight = maPageSize.Width() == 0 ? 0 : ::tools::Long( static_cast<double>(nWidth * maPageSize.Height()) / static_cast<double>(maPageSize.Width()) ); } else { nHeight = maOutRect.GetHeight(); - nWidth = maPageSize.Height() == 0 ? 0 : tools::Long( static_cast<double>(nHeight * maPageSize.Width()) / static_cast<double>(maPageSize.Height()) ); + nWidth = maPageSize.Height() == 0 ? 0 : ::tools::Long( static_cast<double>(nHeight * maPageSize.Width()) / static_cast<double>(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 c0d7f4e5af20..2ffdda95b942 100644 --- a/sd/source/ui/dlg/morphdlg.cxx +++ b/sd/source/ui/dlg/morphdlg.cxx @@ -21,11 +21,13 @@ #include <sdmod.hxx> #include <sdiocmpt.hxx> +#include <sot/storage.hxx> #include <svx/xdef.hxx> #include <svx/xfillit0.hxx> #include <svx/xlineit0.hxx> #include <svx/svdobj.hxx> #include <svl/itemset.hxx> +#include <tools/ref.hxx> #include <com/sun/star/drawing/LineStyle.hpp> using namespace com::sun::star; @@ -65,7 +67,7 @@ MorphDlg::~MorphDlg() void MorphDlg::LoadSettings() { - tools::SvRef<SotStorageStream> xIStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING , + ::tools::SvRef<SotStorageStream> xIStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING , SdOptionStreamMode::Load ) ); sal_uInt16 nSteps; bool bOrient, bAttrib; @@ -89,7 +91,7 @@ void MorphDlg::LoadSettings() void MorphDlg::SaveSettings() const { - tools::SvRef<SotStorageStream> xOStm( SD_MOD()->GetOptionStream( SD_OPTION_MORPHING , + ::tools::SvRef<SotStorageStream> 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 2b686a3e8882..f91bdd053489 100644 --- a/sd/source/ui/dlg/sdabstdlg.cxx +++ b/sd/source/ui/dlg/sdabstdlg.cxx @@ -19,37 +19,6 @@ #include <sdabstdlg.hxx> -#include <osl/module.hxx> - -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<SdAbstractDialogFactory*(SAL_CALL*)()>( - aDialogLibrary.getFunctionSymbol("SdCreateDialogFactory")); -#else - fp = SdCreateDialogFactory; -#endif - if (fp) - return fp(); - return nullptr; -} +SdAbstractDialogFactory* SdAbstractDialogFactory::Create() { return SdCreateDialogFactory(); } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/dlg/sduiexp.cxx b/sd/source/ui/dlg/sduiexp.cxx index 62901c70d0aa..c6284c2e4f2d 100644 --- a/sd/source/ui/dlg/sduiexp.cxx +++ b/sd/source/ui/dlg/sduiexp.cxx @@ -22,12 +22,10 @@ class SdAbstractDialogFactory; -extern "C" { -SAL_DLLPUBLIC_EXPORT SdAbstractDialogFactory* SdCreateDialogFactory() +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 24f54893bbd6..de0de6d8caca 100644 --- a/sd/util/sd.component +++ b/sd/util/sd.component @@ -71,4 +71,10 @@ </implementation> <implementation name="com.sun.star.comp.Impress.oox.PowerPointExport" constructor="css_comp_Impress_oox_PowerPointExport"/> + <implementation name="org.libreoffice.comp.PresenterScreenJob" + constructor="sd_PresenterScreenJob_get_implementation" /> + <implementation name="org.libreoffice.comp.PresenterScreenProtocolHandler" + constructor="sd_PresenterProtocolHandler_get_implementation"> + <service name="com.sun.star.frame.ProtocolHandler"/> + </implementation> </component>
