summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--sd/source/ui/dlg/navigatr.cxx7
-rw-r--r--sd/source/ui/dlg/tpaction.cxx4
-rw-r--r--sd/source/ui/view/GraphicViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/ImpressViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/OutlineViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/PresentationViewShellBase.cxx8
-rw-r--r--sd/source/ui/view/SlideSorterViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/ViewShellBase.cxx2
-rw-r--r--sd/source/ui/view/viewshe3.cxx7
-rw-r--r--sd/util/makefile.mk3
10 files changed, 18 insertions, 21 deletions
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index db2e69e6038c..173399779834 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -47,10 +47,10 @@
#include <sfx2/viewfrm.hxx>
#include <sfx2/dockwin.hxx>
+#include <sfx2/sfxresid.hxx>
#include "pres.hxx"
#include "navigatr.hxx"
-//#include "navichld.hxx"
#include "navigatr.hrc"
#include "pgjump.hxx"
#include "app.hrc"
@@ -319,7 +319,10 @@ IMPL_LINK( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox )
USHORT nRId = GetDragTypeSdResId( (NavigatorDragType)nID );
if( nRId > 0 )
{
- pMenu->InsertItem( nID, String( SdResId( nRId ) ) );
+ if (nID==STR_NONE)
+ pMenu->InsertItem( nID, String( SfxResId( nRId ) ) );
+ else
+ pMenu->InsertItem( nID, String( SdResId( nRId ) ) );
pMenu->SetHelpId( nID, HID_SD_NAVIGATOR_MENU1 +
nID - NAVIGATOR_DRAGTYPE_URL );
}
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 80ba0b78c9f9..179b9b159f99 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -49,7 +49,7 @@
#include <com/sun/star/embed/VerbAttributes.hpp>
#include "sdattr.hxx"
-
+#include <sfx2/sfxresid.hxx>
#include <vcl/waitobj.hxx>
#include <osl/file.hxx>
@@ -508,7 +508,7 @@ void SdTPAction::OpenFileDialog()
// filter makes the (Windows system) open file dialog follow
// links on the desktop to directories.
aFileDialog.AddFilter (
- String (SdResId (STR_SFX_FILTERNAME_ALL)),
+ String (SfxResId (STR_SFX_FILTERNAME_ALL)),
String (RTL_CONSTASCII_USTRINGPARAM("*.*")));
diff --git a/sd/source/ui/view/GraphicViewShellBase.cxx b/sd/source/ui/view/GraphicViewShellBase.cxx
index ed5b77d02655..694212c79fce 100644
--- a/sd/source/ui/view/GraphicViewShellBase.cxx
+++ b/sd/source/ui/view/GraphicViewShellBase.cxx
@@ -65,7 +65,7 @@ SfxViewShell* __EXPORT GraphicViewShellBase::CreateInstance (
void GraphicViewShellBase::RegisterFactory( USHORT nPrio )
{
pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+ &CreateInstance,&InitFactory,nPrio);
InitFactory();
}
void GraphicViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/ImpressViewShellBase.cxx b/sd/source/ui/view/ImpressViewShellBase.cxx
index 7bd904a5e87b..5ad7ae17540e 100644
--- a/sd/source/ui/view/ImpressViewShellBase.cxx
+++ b/sd/source/ui/view/ImpressViewShellBase.cxx
@@ -65,7 +65,7 @@ SfxViewShell* __EXPORT ImpressViewShellBase::CreateInstance (
void ImpressViewShellBase::RegisterFactory( USHORT nPrio )
{
pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+ &CreateInstance,&InitFactory,nPrio);
InitFactory();
}
void ImpressViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/OutlineViewShellBase.cxx b/sd/source/ui/view/OutlineViewShellBase.cxx
index f89fd1a6a669..5f0e59a70dbd 100644
--- a/sd/source/ui/view/OutlineViewShellBase.cxx
+++ b/sd/source/ui/view/OutlineViewShellBase.cxx
@@ -63,7 +63,7 @@ SfxViewShell* __EXPORT OutlineViewShellBase::CreateInstance (
void OutlineViewShellBase::RegisterFactory( USHORT nPrio )
{
pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+ &CreateInstance,&InitFactory,nPrio);
InitFactory();
}
void OutlineViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/PresentationViewShellBase.cxx b/sd/source/ui/view/PresentationViewShellBase.cxx
index 8019fb7ec1e9..c1d5615debdb 100644
--- a/sd/source/ui/view/PresentationViewShellBase.cxx
+++ b/sd/source/ui/view/PresentationViewShellBase.cxx
@@ -55,12 +55,6 @@ TYPEINIT1(PresentationViewShellBase, ViewShellBase);
// We have to expand the SFX_IMPL_VIEWFACTORY macro to call LateInit() after a
// new PresentationViewShellBase object has been constructed.
-/*
-SFX_IMPL_VIEWFACTORY(PresentationViewShellBase, SdResId(STR_DEFAULTVIEW))
-{
- SFX_VIEW_REGISTRATION(DrawDocShell);
-}
-*/
SfxViewFactory* PresentationViewShellBase::pFactory;
SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
SfxViewFrame *_pFrame, SfxViewShell *pOldView)
@@ -73,7 +67,7 @@ SfxViewShell* __EXPORT PresentationViewShellBase::CreateInstance (
void PresentationViewShellBase::RegisterFactory( USHORT nPrio )
{
pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+ &CreateInstance,&InitFactory,nPrio);
InitFactory();
}
void PresentationViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/SlideSorterViewShellBase.cxx b/sd/source/ui/view/SlideSorterViewShellBase.cxx
index 5523966dfcf9..7baea7021f65 100644
--- a/sd/source/ui/view/SlideSorterViewShellBase.cxx
+++ b/sd/source/ui/view/SlideSorterViewShellBase.cxx
@@ -67,7 +67,7 @@ SfxViewShell* __EXPORT SlideSorterViewShellBase::CreateInstance (
void SlideSorterViewShellBase::RegisterFactory( USHORT nPrio )
{
pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+ &CreateInstance,&InitFactory,nPrio);
InitFactory();
}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 3e0f6297f8d6..1876fd8e089e 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -263,7 +263,7 @@ SfxViewShell* __EXPORT ViewShellBase::CreateInstance (
void ViewShellBase::RegisterFactory( USHORT nPrio )
{
pFactory = new SfxViewFactory(
- &CreateInstance,&InitFactory,nPrio,SdResId(STR_DEFAULTVIEW));
+ &CreateInstance,&InitFactory,nPrio);
InitFactory();
}
void ViewShellBase::InitFactory()
diff --git a/sd/source/ui/view/viewshe3.cxx b/sd/source/ui/view/viewshe3.cxx
index 86e441939b0e..a7ba78f8cbcb 100644
--- a/sd/source/ui/view/viewshe3.cxx
+++ b/sd/source/ui/view/viewshe3.cxx
@@ -37,8 +37,9 @@
#include "GraphicViewShellBase.hxx"
#include <sfx2/viewfrm.hxx>
+#include <svl/svtools.hrc>
#include <com/sun/star/lang/Locale.hpp>
-
+#include <svtools/svtdata.hxx>
#include <utility>
#include <vector>
@@ -168,7 +169,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
{
// #87229# Set the necessary string like in
// sfx2/source/view/viewfrm.cxx ver 1.23 ln 1072 ff.
- String aTmp(ResId(STR_UNDO, *SFX_APP()->GetSfxResManager()));
+ String aTmp( SvtResId( STR_UNDO ) );
aTmp += pUndoManager->GetUndoActionComment(0);
rSet.Put(SfxStringItem(SID_UNDO, aTmp));
}
@@ -196,7 +197,7 @@ void ViewShell::GetMenuState( SfxItemSet &rSet )
{
// #87229# Set the necessary string like in
// sfx2/source/view/viewfrm.cxx ver 1.23 ln 1081 ff.
- String aTmp(ResId(STR_REDO, *SFX_APP()->GetSfxResManager()));
+ String aTmp(SvtResId(STR_REDO));
aTmp += pUndoManager->GetRedoActionComment(0);
rSet.Put(SfxStringItem(SID_REDO, aTmp));
}
diff --git a/sd/util/makefile.mk b/sd/util/makefile.mk
index 6b1e6ebf1676..b8642e5951c5 100644
--- a/sd/util/makefile.mk
+++ b/sd/util/makefile.mk
@@ -55,8 +55,7 @@ RESLIB1SRSFILES=\
$(SRS)$/animui.srs \
$(SRS)$/slideshow.srs \
$(SRS)$/uitable.srs \
- $(SRS)$/uiannotations.srs \
- $(SOLARCOMMONRESDIR)$/sfx.srs
+ $(SRS)$/uiannotations.srs
# --- StarDraw DLL
generated by cgit (git 2.34.1) at 2025-02-11 05:53:26 +0000