summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/source/ui/slideshow/SlideShowRestarter.cxx3
-rw-r--r--sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx4
-rw-r--r--sd/source/ui/table/tableobjectbar.cxx2
-rw-r--r--sd/source/ui/toolpanel/LayoutMenu.cxx2
-rw-r--r--sd/source/ui/unoidl/DrawController.cxx3
-rw-r--r--sd/source/ui/view/GraphicObjectBar.cxx6
-rw-r--r--sd/source/ui/view/MediaObjectBar.cxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx27
-rw-r--r--sd/source/ui/view/ViewTabBar.cxx2
-rw-r--r--sd/source/ui/view/drbezob.cxx4
-rw-r--r--sd/source/ui/view/drtxtob.cxx10
-rw-r--r--sd/source/ui/view/drvwshrg.cxx4
-rw-r--r--sd/source/ui/view/frmview.cxx2
-rw-r--r--sd/source/ui/view/outlnvsh.cxx4
14 files changed, 23 insertions, 52 deletions
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index 8d556984462c..f1c918be8cd1 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -98,7 +98,8 @@ void SlideShowRestarter::Restart (void)
sal_Int32 SlideShowRestarter::GetDisplayCount (void)
{
- Reference<XComponentContext> xContext (comphelper_getProcessComponentContext());
+ const Reference<XComponentContext> xContext (
+ ::comphelper::getProcessComponentContext() );
Reference<XMultiComponentFactory> xFactory (
xContext->getServiceManager(), UNO_QUERY);
if ( ! xFactory.is())
diff --git a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
index 3068ea28c172..e6e3b89b12d5 100644
--- a/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
+++ b/sd/source/ui/slidesorter/model/SlsPageEnumerationProvider.cxx
@@ -84,8 +84,8 @@ public:
PageEnumeration PageEnumerationProvider::CreateAllPagesEnumeration (
const SlideSorterModel& rModel)
{
- AllPagesPredicate aPredicate;
- return PageEnumeration::Create(rModel, aPredicate);
+// AllPagesPredicate aPredicate; // spurious warning on unxsoli4 debug=t
+ return PageEnumeration::Create(rModel, AllPagesPredicate());
}
diff --git a/sd/source/ui/table/tableobjectbar.cxx b/sd/source/ui/table/tableobjectbar.cxx
index 330cfc9fd25d..20d1648a37ce 100644
--- a/sd/source/ui/table/tableobjectbar.cxx
+++ b/sd/source/ui/table/tableobjectbar.cxx
@@ -65,8 +65,6 @@ using namespace sd::ui::table;
#define TableObjectBar
#include "sdslots.hxx"
-SFX_DECL_TYPE( 13 );
-
namespace sd { namespace ui { namespace table {
diff --git a/sd/source/ui/toolpanel/LayoutMenu.cxx b/sd/source/ui/toolpanel/LayoutMenu.cxx
index 5ef45c90cf8b..6195c1a0c151 100644
--- a/sd/source/ui/toolpanel/LayoutMenu.cxx
+++ b/sd/source/ui/toolpanel/LayoutMenu.cxx
@@ -752,7 +752,7 @@ void LayoutMenu::Fill (void)
Reference<XControllerManager> xControllerManager (
Reference<XWeak>(&mrBase.GetDrawController()), UNO_QUERY_THROW);
Reference<XResourceId> xPaneId (ResourceId::create(
- comphelper_getProcessComponentContext(),
+ ::comphelper::getProcessComponentContext(),
FrameworkHelper::msCenterPaneURL));
Reference<XView> xView (FrameworkHelper::Instance(mrBase)->GetView(xPaneId));
if (xView.is())
diff --git a/sd/source/ui/unoidl/DrawController.cxx b/sd/source/ui/unoidl/DrawController.cxx
index 77dbc1fa4b22..51caedee6f6f 100644
--- a/sd/source/ui/unoidl/DrawController.cxx
+++ b/sd/source/ui/unoidl/DrawController.cxx
@@ -879,7 +879,8 @@ void DrawController::ProvideFrameworkControllers (void)
try
{
Reference<XController> xController (this);
- Reference<XComponentContext> xContext (comphelper_getProcessComponentContext());
+ const Reference<XComponentContext> xContext (
+ ::comphelper::getProcessComponentContext() );
mxConfigurationController = ConfigurationController::create(
xContext,
xController);
diff --git a/sd/source/ui/view/GraphicObjectBar.cxx b/sd/source/ui/view/GraphicObjectBar.cxx
index 448296eae603..d67d431b9d1f 100644
--- a/sd/source/ui/view/GraphicObjectBar.cxx
+++ b/sd/source/ui/view/GraphicObjectBar.cxx
@@ -39,14 +39,10 @@
#include <svtools/itempool.hxx>
#include <sfx2/app.hxx>
#include <sfx2/shell.hxx>
-#ifndef _SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <sfx2/request.hxx>
#include <sfx2/basedlgs.hxx>
-#ifndef _SVDOPATH_HXX //autogen
#include <svx/svdograf.hxx>
-#endif
#include <svx/grfflt.hxx>
#include <svtools/aeitem.hxx>
#include <svx/grafctrl.hxx>
@@ -72,8 +68,6 @@ using namespace sd;
namespace sd {
-SFX_DECL_TYPE( 13 );
-
// -----------------------
// - GraphicObjectBar -
diff --git a/sd/source/ui/view/MediaObjectBar.cxx b/sd/source/ui/view/MediaObjectBar.cxx
index 7bbf7ce61172..c05c55c0d6de 100644
--- a/sd/source/ui/view/MediaObjectBar.cxx
+++ b/sd/source/ui/view/MediaObjectBar.cxx
@@ -61,8 +61,6 @@ using namespace sd;
namespace sd {
-SFX_DECL_TYPE( 13 );
-
// ------------------
// - MediaObjectBar -
// ------------------
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 0ffd83faa2c2..2cf8164743a6 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1378,10 +1378,12 @@ void ViewShellBase::Implementation::SetPaneVisibility (
{
Reference<XControllerManager> xControllerManager (mrBase.GetController(), UNO_QUERY_THROW);
+ const Reference< XComponentContext > xContext(
+ ::comphelper::getProcessComponentContext() );
Reference<XResourceId> xPaneId (ResourceId::create(
- comphelper_getProcessComponentContext(), rsPaneURL));
+ xContext, rsPaneURL));
Reference<XResourceId> xViewId (ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(), rsViewURL, rsPaneURL));
+ xContext, rsViewURL, rsPaneURL));
// Determine the new visibility state.
const SfxItemSet* pArguments = rRequest.GetArgs();
@@ -1448,6 +1450,8 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
if ( ! xConfiguration.is())
throw RuntimeException();
+ const Reference< XComponentContext > xContext(
+ ::comphelper::getProcessComponentContext() );
SfxWhichIter aSetIterator (rSet);
sal_uInt16 nItemId (aSetIterator.FirstWhich());
while (nItemId > 0)
@@ -1460,25 +1464,22 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
{
case SID_LEFT_PANE_IMPRESS:
xResourceId = ResourceId::create(
- comphelper_getProcessComponentContext(),
- FrameworkHelper::msLeftImpressPaneURL);
+ xContext, FrameworkHelper::msLeftImpressPaneURL);
break;
case SID_LEFT_PANE_DRAW:
xResourceId = ResourceId::create(
- comphelper_getProcessComponentContext(),
- FrameworkHelper::msLeftDrawPaneURL);
+ xContext, FrameworkHelper::msLeftDrawPaneURL);
break;
case SID_RIGHT_PANE:
xResourceId = ResourceId::create(
- comphelper_getProcessComponentContext(),
- FrameworkHelper::msRightPaneURL);
+ xContext, FrameworkHelper::msRightPaneURL);
break;
case SID_NORMAL_MULTI_PANE_GUI:
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msImpressViewURL,
FrameworkHelper::msCenterPaneURL);
break;
@@ -1486,14 +1487,14 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
case SID_SLIDE_SORTER_MULTI_PANE_GUI:
case SID_DIAMODE:
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msSlideSorterURL,
FrameworkHelper::msCenterPaneURL);
break;
case SID_OUTLINEMODE:
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msOutlineViewURL,
FrameworkHelper::msCenterPaneURL);
break;
@@ -1502,14 +1503,14 @@ void ViewShellBase::Implementation::GetSlotState (SfxItemSet& rSet)
// There is only the master page mode for the handout
// view so ignore the master page flag.
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msHandoutViewURL,
FrameworkHelper::msCenterPaneURL);
break;
case SID_NOTESMODE:
xResourceId = ResourceId::createWithAnchorURL(
- comphelper_getProcessComponentContext(),
+ xContext,
FrameworkHelper::msNotesViewURL,
FrameworkHelper::msCenterPaneURL);
break;
diff --git a/sd/source/ui/view/ViewTabBar.cxx b/sd/source/ui/view/ViewTabBar.cxx
index d5e0ba8c2496..8b2440c0938f 100644
--- a/sd/source/ui/view/ViewTabBar.cxx
+++ b/sd/source/ui/view/ViewTabBar.cxx
@@ -442,7 +442,7 @@ bool ViewTabBar::ActivatePage (void)
{
xView = Reference<XView>(xConfigurationController->getResource(
ResourceId::create(
- comphelper_getProcessComponentContext(),
+ ::comphelper::getProcessComponentContext(),
FrameworkHelper::msCenterPaneURL)),
UNO_QUERY);
}
diff --git a/sd/source/ui/view/drbezob.cxx b/sd/source/ui/view/drbezob.cxx
index a1c68e18e131..a638af2638c3 100644
--- a/sd/source/ui/view/drbezob.cxx
+++ b/sd/source/ui/view/drbezob.cxx
@@ -38,9 +38,7 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/objface.hxx>
-#ifndef _SVXIDS_HRC
#include <svx/svxids.hrc>
-#endif
#include <svtools/eitem.hxx>
#include <sfx2/request.hxx>
#include <svx/svdopath.hxx>
@@ -80,8 +78,6 @@ namespace sd {
\************************************************************************/
-SFX_DECL_TYPE(13);
-
SFX_IMPL_INTERFACE(BezierObjectBar, ::SfxShell, SdResId(STR_BEZIEROBJECTBARSHELL))
{
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 9b15c3a02502..55980ff02050 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -34,15 +34,9 @@
#include "TextObjectBar.hxx"
-#ifndef _ULSPITEM_HXX
#include <svx/ulspitem.hxx>
-#endif
-#ifndef _LSPCITEM_HXX
#include <svx/lspcitem.hxx>
-#endif
-#ifndef _ADJITEM_HXX
#include <svx/adjitem.hxx>
-#endif
#include <vcl/vclenum.hxx>
#include <sfx2/app.hxx>
#include <svtools/whiter.hxx>
@@ -53,9 +47,7 @@
#include <svx/escpitem.hxx>
#include <svx/svdoutl.hxx>
#include <svtools/intitem.hxx>
-#ifndef _SVX_SRIPTTYPEITEM_HXX //autogen
#include <svx/scripttypeitem.hxx>
-#endif
#include <svx/outlobj.hxx>
#include <svx/writingmodeitem.hxx>
#include <svx/frmdiritem.hxx>
@@ -93,8 +85,6 @@ namespace sd {
|*
\************************************************************************/
-SFX_DECL_TYPE(13);
-
SFX_IMPL_INTERFACE( TextObjectBar, SfxShell, SdResId(STR_TEXTOBJECTBARSHELL) )
{
diff --git a/sd/source/ui/view/drvwshrg.cxx b/sd/source/ui/view/drvwshrg.cxx
index 89dacaee69fb..13d710bd4286 100644
--- a/sd/source/ui/view/drvwshrg.cxx
+++ b/sd/source/ui/view/drvwshrg.cxx
@@ -46,9 +46,7 @@
#include <svx/svxids.hrc>
#include <svx/hyprlink.hxx>
#include <svx/hyperdlg.hxx>
-#ifndef _AVMEDIA_MEDIAPLAYER_HXX
#include <avmedia/mediaplayer.hxx>
-#endif
#include "app.hrc"
@@ -80,8 +78,6 @@ namespace sd {
|*
\************************************************************************/
-SFX_DECL_TYPE(13);
-
SFX_IMPL_INTERFACE(DrawViewShell, SfxShell, SdResId(STR_DRAWVIEWSHELL))
{
diff --git a/sd/source/ui/view/frmview.cxx b/sd/source/ui/view/frmview.cxx
index 76557da84880..503fc5ab0624 100644
--- a/sd/source/ui/view/frmview.cxx
+++ b/sd/source/ui/view/frmview.cxx
@@ -121,7 +121,7 @@ FrameView::FrameView(SdDrawDocument* pDrawDoc, FrameView* pFrameView /* = NULK *
Reference<drawing::framework::XView> xView (
framework::FrameworkHelper::Instance(*pBase)->GetView(
drawing::framework::ResourceId::create(
- comphelper_getProcessComponentContext(),
+ ::comphelper::getProcessComponentContext(),
framework::FrameworkHelper::msCenterPaneURL)));
if (xView.is())
sViewURL = xView->getResourceId()->getResourceURL();
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index d629eef58fc6..e4eb22af0552 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -84,9 +84,7 @@
#include "sdresid.hxx"
#include "sdpage.hxx"
#include "fuoltext.hxx"
-#ifndef SD_FRAME_VIEW
#include "FrameView.hxx"
-#endif
#include "zoomlist.hxx"
#include "stlsheet.hxx"
#include "slideshow.hxx"
@@ -123,8 +121,6 @@ namespace sd {
|*
\************************************************************************/
-SFX_DECL_TYPE(13);
-
SFX_IMPL_INTERFACE(OutlineViewShell, SfxShell, SdResId(STR_OUTLINEVIEWSHELL))
{
generated by cgit (git 2.34.1) at 2024-08-05 21:32:04 +0000