ODFstudio/odfstudio
2
0
Fork 0
Code Issues Packages Activity

so these ResIds are only being used for the numerical value

Browse Source 
Change-Id: I21c67b56424de59d7231f8420055775cd5f67aae
This commit is contained in:
Caolán McNamara
2014-11-24 16:36:02 +00:00
parent 0b3e6b79af
commit 577dd616bc
45 changed files with 68 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/sfx2/objface.hxx
+2 -2
View File
@@ -70,8 +70,8 @@ public:
const SfxInterface* GetGenoType() const { return pGenoType; }
void RegisterObjectBar(sal_uInt16, const ResId&);
void RegisterObjectBar(sal_uInt16, const ResId&, sal_uInt32 nFeature);
void RegisterObjectBar(sal_uInt16, sal_uInt32 nResId);
void RegisterObjectBar(sal_uInt16, sal_uInt32 nResId, sal_uInt32 nFeature);
void RegisterChildWindow(sal_uInt16, bool bContext = false);
void RegisterChildWindow(sal_uInt16, bool bContext, sal_uInt32 nFeature);
void RegisterStatusBar( const ResId& );
sc/source/ui/app/scmod.cxx
+1 -1
View File
@@ -124,7 +124,7 @@ SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_SC_NAME))
void ScModule::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
ScResId(RID_OBJECTBAR_APP));
RID_OBJECTBAR_APP);
GetStaticInterface()->RegisterStatusBar(ScResId(SCCFG_STATUSBAR));
}
sc/source/ui/drawfunc/chartsh.cxx
+1 -1
View File
@@ -50,7 +50,7 @@ SFX_IMPL_INTERFACE(ScChartShell, ScDrawShell, ScResId(SCSTR_CHARTSHELL))
void ScChartShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
ScResId(RID_DRAW_OBJECTBAR));
RID_DRAW_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CHART));
}
sc/source/ui/drawfunc/drawsh.cxx
+1 -1
View File
@@ -67,7 +67,7 @@ SFX_IMPL_INTERFACE(ScDrawShell, SfxShell, ScResId(SCSTR_DRAWSHELL))
void ScDrawShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
ScResId(RID_DRAW_OBJECTBAR));
RID_DRAW_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAW));
sc/source/ui/drawfunc/drformsh.cxx
+1 -1
View File
@@ -45,7 +45,7 @@ SFX_IMPL_INTERFACE(ScDrawFormShell, ScDrawShell, ScResId(SCSTR_DRAWFORMSHELL))
void ScDrawFormShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
ScResId(RID_OBJECTBAR_FORMAT));
RID_OBJECTBAR_FORMAT);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWFORM));
}
sc/source/ui/drawfunc/drtxtob.cxx
+1 -1
View File
@@ -86,7 +86,7 @@ SFX_IMPL_INTERFACE(ScDrawTextObjectBar, SfxShell, ScResId(SCSTR_DRAWTEXTSHELL))
void ScDrawTextObjectBar::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
ScResId(RID_TEXT_TOOLBOX));
RID_TEXT_TOOLBOX);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_DRAWTEXT));
sc/source/ui/drawfunc/graphsh.cxx
+1 -1
View File
@@ -69,7 +69,7 @@ SFX_IMPL_INTERFACE(ScGraphicShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL))
void ScGraphicShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
ScResId(RID_GRAPHIC_OBJECTBAR));
RID_GRAPHIC_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_GRAPHIC));
}
sc/source/ui/drawfunc/mediash.cxx
+1 -1
View File
@@ -39,7 +39,7 @@ SFX_IMPL_INTERFACE(ScMediaShell, ScDrawShell, ScResId(SCSTR_GRAPHICSHELL))
void ScMediaShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, ScResId(RID_MEDIA_OBJECTBAR));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_MEDIA_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_MEDIA));
}
sc/source/ui/drawfunc/oleobjsh.cxx
+1 -1
View File
@@ -45,7 +45,7 @@ SFX_IMPL_INTERFACE(ScOleObjectShell, ScDrawShell, ScResId(SCSTR_OLEOBJECTSHELL))
void ScOleObjectShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
ScResId(RID_DRAW_OBJECTBAR));
RID_DRAW_OBJECTBAR);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_OLE));
}
sc/source/ui/view/cellsh.cxx
+1 -1
View File
@@ -69,7 +69,7 @@ SFX_IMPL_INTERFACE(ScCellShell, ScFormatShell, ScResId(SCSTR_CELLSHELL))
void ScCellShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
ScResId(RID_OBJECTBAR_FORMAT));
RID_OBJECTBAR_FORMAT);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_CELLS));
}
sc/source/ui/view/formatsh.cxx
+1 -1
View File
@@ -124,7 +124,7 @@ SFX_IMPL_INTERFACE(ScFormatShell, SfxShell, ScResId(SCSTR_FORMATSHELL))
void ScFormatShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
ScResId(RID_OBJECTBAR_FORMAT));
RID_OBJECTBAR_FORMAT);
}
ScFormatShell::ScFormatShell(ScViewData* pData) :
sc/source/ui/view/prevwsh.cxx
+1 -1
View File
@@ -90,7 +90,7 @@ SFX_IMPL_INTERFACE(ScPreviewShell, SfxViewShell, ScResId(SCSTR_PREVIEWSHELL))
void ScPreviewShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER|SFX_VISIBILITY_READONLYDOC,
ScResId(RID_OBJECTBAR_PREVIEW));
RID_OBJECTBAR_PREVIEW);
GetStaticInterface()->RegisterPopupMenu(ScResId(RID_POPUP_PREVIEW));
}
sc/source/ui/view/tabvwsh.cxx
+1 -1
View File
@@ -51,7 +51,7 @@ SFX_IMPL_INTERFACE(ScTabViewShell, SfxViewShell, ScResId(SCSTR_TABVIEWSHELL))
void ScTabViewShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
ScResId(RID_OBJECTBAR_TOOLS));
RID_OBJECTBAR_TOOLS);
GetStaticInterface()->RegisterChildWindow(FID_INPUTLINE_STATUS);
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
sd/source/ui/view/outlnvsh.cxx
+2 -2
View File
@@ -113,9 +113,9 @@ void OutlineViewShell::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(SdResId(RID_OUTLINE_POPUP));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
SdResId(RID_OUTLINE_TOOLBOX));
RID_OUTLINE_TOOLBOX);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC,
SdResId(RID_DRAW_VIEWER_TOOLBOX));
RID_DRAW_VIEWER_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterChildWindow(SvxHlinkDlgWrapper::GetChildWindowId());
sd/source/ui/view/presvish.cxx
+4 -4
View File
@@ -65,13 +65,13 @@ SFX_IMPL_INTERFACE(PresentationViewShell, DrawViewShell, SdResId( STR_PRESVIEWSH
void PresentationViewShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
SdResId(RID_DRAW_TOOLBOX));
RID_DRAW_TOOLBOX);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER | SFX_VISIBILITY_READONLYDOC,
SdResId(RID_DRAW_VIEWER_TOOLBOX) );
RID_DRAW_VIEWER_TOOLBOX);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OPTIONS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
SdResId(RID_DRAW_OPTIONS_TOOLBOX));
RID_DRAW_OPTIONS_TOOLBOX);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_COMMONTASK | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_SERVER,
SdResId(RID_DRAW_COMMONTASK_TOOLBOX));
RID_DRAW_COMMONTASK_TOOLBOX);
}
TYPEINIT1( PresentationViewShell, DrawViewShell );
sfx2/source/control/objface.cxx
+13 -18
View File
@@ -56,21 +56,20 @@ SfxCompareSlots_bsearch( const void* pSmaller, const void* pBigger )
struct SfxObjectUI_Impl
{
sal_uInt16 nPos;
ResId aResId;
sal_uInt32 nResId;
bool bVisible;
bool bContext;
OUString* pName;
sal_uInt32 nFeature;
SfxObjectUI_Impl(sal_uInt16 n, const ResId& rResId, bool bVis, sal_uInt32 nFeat) :
SfxObjectUI_Impl(sal_uInt16 n, sal_uInt32 nId, bool bVis, sal_uInt32 nFeat) :
nPos(n),
aResId(rResId.GetId(), *rResId.GetResMgr()),
nResId(nId),
bVisible(bVis),
bContext(false),
pName(0),
nFeature(nFeat)
{
aResId.SetRT(rResId.GetRT());
}
~SfxObjectUI_Impl()
@@ -108,7 +107,7 @@ struct SfxInterface_Impl
}
};
static SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature);
static SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nResId, sal_uInt32 nFeature);
// constuctor, registeres a new unit
SfxInterface::SfxInterface( const char *pClassName,
@@ -380,24 +379,24 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId )
pImpData->aPopupRes = rResId;
}
void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, const ResId& rResId)
void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, sal_uInt32 nResId)
{
RegisterObjectBar(nPos, rResId, 0UL);
RegisterObjectBar(nPos, nResId, 0UL);
}
void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature)
void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, sal_uInt32 nResId, sal_uInt32 nFeature)
{
SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl(nPos, rResId, nFeature);
SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl(nPos, nResId, nFeature);
if ( pUI )
pImpData->aObjectBars.push_back(pUI);
}
SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature)
SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, sal_uInt32 nResId, sal_uInt32 nFeature)
{
if ((nPos & SFX_VISIBILITY_MASK) == 0)
nPos |= SFX_VISIBILITY_STANDARD;
return new SfxObjectUI_Impl(nPos, rResId, true, nFeature);
return new SfxObjectUI_Impl(nPos, nResId, true, nFeature);
}
sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const
@@ -416,7 +415,7 @@ sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const
assert( nNo<pImpData->aObjectBars.size() );
return pImpData->aObjectBars[nNo]->aResId.GetId();
return pImpData->aObjectBars[nNo]->nResId;
}
sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
@@ -438,9 +437,6 @@ sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
return pImpData->aObjectBars[nNo]->nPos;
}
sal_uInt16 SfxInterface::GetObjectBarCount() const
{
if (pGenoType && ! pGenoType->HasName())
@@ -456,7 +452,7 @@ void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext)
void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32 nFeature)
{
SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, ResId(nId, *SfxApplication::GetOrCreate()->GetOffResManager_Impl()), true, nFeature);
SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(0, nId, true, nFeature);
pUI->bContext = bContext;
pImpData->aChildWindows.push_back(pUI);
}
@@ -466,7 +462,6 @@ void SfxInterface::RegisterStatusBar(const ResId& rResId)
pImpData->aStatBarRes = rResId;
}
sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const
{
if ( pGenoType )
@@ -482,7 +477,7 @@ sal_uInt32 SfxInterface::GetChildWindowId (sal_uInt16 nNo) const
assert( nNo<pImpData->aChildWindows.size() );
sal_uInt32 nRet = pImpData->aChildWindows[nNo]->aResId.GetId();
sal_uInt32 nRet = pImpData->aChildWindows[nNo]->nResId;
if ( pImpData->aChildWindows[nNo]->bContext )
nRet += sal_uInt32( nClassId ) << 16;
return nRet;
sfx2/source/view/viewfrm.cxx
+2 -2
View File
@@ -152,8 +152,8 @@ void SfxViewFrame::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_BROWSER);
GetStaticInterface()->RegisterChildWindow(SID_RECORDING_FLOATWINDOW);
#if HAVE_FEATURE_DESKTOP
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, SfxResId(RID_FULLSCREENTOOLBOX) );
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, SfxResId(RID_ENVTOOLBOX) );
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_FULLSCREEN | SFX_VISIBILITY_FULLSCREEN, RID_FULLSCREENTOOLBOX);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_STANDARD, RID_ENVTOOLBOX );
#endif
}
starmath/source/view.cxx
+1 -1
View File
@@ -934,7 +934,7 @@ SFX_IMPL_INTERFACE(SmViewShell, SfxViewShell, SmResId(0))
void SmViewShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_FULLSCREEN | SFX_VISIBILITY_SERVER,
SmResId(RID_MATH_TOOLBOX ));
RID_MATH_TOOLBOX);
//Dummy-Objectbar, to avoid quiver while activating
GetStaticInterface()->RegisterChildWindow(SID_TASKPANE);
svx/source/form/fmshell.cxx
+6 -6
View File
@@ -171,15 +171,15 @@ SFX_IMPL_INTERFACE(FmFormShell, SfxShell, SVX_RES(RID_STR_FORMSHELL))
void FmFormShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC,
SVX_RES(RID_SVXTBX_FORM_NAVIGATION),
RID_SVXTBX_FORM_NAVIGATION,
FM_UI_FEATURE_SHOW_DATABASEBAR);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_NAVIGATION|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_READONLYDOC,
SVX_RES(RID_SVXTBX_FORM_FILTER),
RID_SVXTBX_FORM_FILTER,
FM_UI_FEATURE_SHOW_FILTERBAR);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_READONLYDOC,
SVX_RES(RID_SVXTBX_TEXT_CONTROL_ATTRIBUTES),
RID_SVXTBX_TEXT_CONTROL_ATTRIBUTES,
FM_UI_FEATURE_SHOW_TEXT_CONTROL_BAR);
GetStaticInterface()->RegisterChildWindow(SID_FM_ADD_FIELD, false, FM_UI_FEATURE_SHOW_FIELD);
@@ -189,15 +189,15 @@ void FmFormShell::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SID_FM_SHOW_DATANAVIGATOR, false, FM_UI_FEATURE_SHOW_DATANAVIGATOR);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD,
SVX_RES(RID_SVXTBX_CONTROLS),
RID_SVXTBX_CONTROLS,
FM_UI_FEATURE_TB_CONTROLS);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD,
SVX_RES(RID_SVXTBX_MORECONTROLS),
RID_SVXTBX_MORECONTROLS,
FM_UI_FEATURE_TB_MORECONTROLS);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT | SFX_VISIBILITY_STANDARD,
SVX_RES(RID_SVXTBX_FORMDESIGN),
RID_SVXTBX_FORMDESIGN,
FM_UI_FEATURE_TB_FORMDESIGN);
}
svx/source/toolbars/extrusionbar.cxx
+1 -1
View File
@@ -58,7 +58,7 @@ SFX_IMPL_INTERFACE(ExtrusionBar, SfxShell, SVX_RES(RID_SVX_EXTRUSION_BAR))
void ExtrusionBar::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_EXTRUSION_BAR) );
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_SVX_EXTRUSION_BAR);
}
TYPEINIT1( ExtrusionBar, SfxShell );
svx/source/toolbars/fontworkbar.cxx
+1 -1
View File
@@ -176,7 +176,7 @@ SFX_IMPL_INTERFACE(FontworkBar, SfxShell, SVX_RES(RID_SVX_FONTWORK_BAR))
void FontworkBar::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SVX_RES(RID_SVX_FONTWORK_BAR));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_SVX_FONTWORK_BAR);
}
TYPEINIT1( FontworkBar, SfxShell );
sw/source/uibase/app/apphdl.cxx
+1 -1
View File
@@ -122,7 +122,7 @@ void SwModule::InitInterface_Impl()
GetStaticInterface()->RegisterStatusBar(SW_RES(CFG_STATUSBAR));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_APPLICATION | SFX_VISIBILITY_DESKTOP | SFX_VISIBILITY_STANDARD | SFX_VISIBILITY_CLIENT | SFX_VISIBILITY_VIEWER,
SW_RES(RID_MODULE_TOOLBOX));
RID_MODULE_TOOLBOX);
}
// other states
sw/source/uibase/shells/annotsh.cxx
+1 -1
View File
@@ -140,7 +140,7 @@ SFX_IMPL_INTERFACE(SwAnnotationShell, SfxShell, SW_RES(STR_SHELLNAME_DRAW_TEXT))
void SwAnnotationShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_ANNOTATION_POPUPMENU));
}
sw/source/uibase/shells/beziersh.cxx
+1 -1
View File
@@ -49,7 +49,7 @@ void SwBezierShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAW_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_BEZIER_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_BEZIER_TOOLBOX);
}
TYPEINIT1(SwBezierShell,SwBaseShell)
sw/source/uibase/shells/drawsh.cxx
+1 -1
View File
@@ -81,7 +81,7 @@ void SwDrawShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAW_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_DRAW_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
}
sw/source/uibase/shells/drformsh.cxx
+1 -1
View File
@@ -63,7 +63,7 @@ void SwDrawFormShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAWFORM_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
}
TYPEINIT1(SwDrawFormShell, SwDrawBaseShell)
sw/source/uibase/shells/drwtxtsh.cxx
+1 -1
View File
@@ -87,7 +87,7 @@ void SwDrawTextShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRWTXT_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_DRAW_TEXT_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_DRAW_TEXT_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(SvxFontWorkChildWindow::GetChildWindowId());
}
sw/source/uibase/shells/frmsh.cxx
+1 -1
View File
@@ -114,7 +114,7 @@ void SwFrameShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_FRM_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_FRAME_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_FRAME_TOOLBOX);
}
void SwFrameShell::Execute(SfxRequest &rReq)
sw/source/uibase/shells/grfsh.cxx
+1 -1
View File
@@ -103,7 +103,7 @@ void SwGrfShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_GRF_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_GRAFIK_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_GRAFIK_TOOLBOX);
}
void SwGrfShell::Execute(SfxRequest &rReq)
sw/source/uibase/shells/listsh.cxx
+1 -1
View File
@@ -55,7 +55,7 @@ SFX_IMPL_INTERFACE(SwListShell, SwBaseShell, SW_RES(STR_SHELLNAME_LIST))
void SwListShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_NUM_TOOLBOX);
}
TYPEINIT1(SwListShell,SwBaseShell)
sw/source/uibase/shells/mediash.cxx
+1 -1
View File
@@ -75,7 +75,7 @@ void SwMediaShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_MEDIA_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_MEDIA_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_MEDIA_TOOLBOX);
}
void SwMediaShell::ExecMedia(SfxRequest &rReq)
sw/source/uibase/shells/olesh.cxx
+1 -1
View File
@@ -43,7 +43,7 @@ void SwOleShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_OLE_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_OLE_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_OLE_TOOLBOX);
}
SwOleShell::SwOleShell(SwView &_rView) :
sw/source/uibase/shells/tabsh.cxx
+1 -1
View File
@@ -97,7 +97,7 @@ void SwTableShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TAB_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TABLE_TOOLBOX);
}
TYPEINIT1(SwTableShell,SwBaseShell)
sw/source/uibase/shells/textsh.cxx
+1 -1
View File
@@ -122,7 +122,7 @@ void SwTextShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TEXT_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(FN_EDIT_FORMULA);
GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD);
sw/source/uibase/uiview/pview.cxx
+1 -1
View File
@@ -96,7 +96,7 @@ void SwPagePreview::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_PPREVIEW_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_CLIENT|SFX_VISIBILITY_FULLSCREEN|SFX_VISIBILITY_READONLYDOC,
SW_RES(RID_PVIEW_TOOLBOX));
RID_PVIEW_TOOLBOX);
}
TYPEINIT1(SwPagePreview,SfxViewShell)
sw/source/uibase/uiview/srcview.cxx
+1 -1
View File
@@ -122,7 +122,7 @@ void SwSrcView::InitInterface_Impl()
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_SRCVIEW_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
SW_RES(RID_WEBTOOLS_TOOLBOX) );
RID_WEBTOOLS_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(SvxSearchDialogWrapper::GetChildWindowId());
}
sw/source/uibase/uiview/view0.cxx
+1 -1
View File
@@ -111,7 +111,7 @@ void SwView::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(FN_MAILMERGE_CHILDWINDOW, false, CHILDWIN_MAILMERGE);
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
SW_RES(RID_TOOLS_TOOLBOX));
RID_TOOLS_TOOLBOX);
#endif
}
sw/source/uibase/web/wformsh.cxx
+1 -1
View File
@@ -42,7 +42,7 @@ void SwWebDrawFormShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_DRAWFORM_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
}
TYPEINIT1(SwWebDrawFormShell, SwDrawFormShell)
sw/source/uibase/web/wfrmsh.cxx
+1 -1
View File
@@ -41,7 +41,7 @@ void SwWebFrameShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_FRM_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBFRAME_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBFRAME_TOOLBOX);
}
TYPEINIT1(SwWebFrameShell, SwFrameShell)
sw/source/uibase/web/wgrfsh.cxx
+1 -1
View File
@@ -44,7 +44,7 @@ void SwWebGrfShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_GRF_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBGRAPHIC_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBGRAPHIC_TOOLBOX);
}
TYPEINIT1(SwWebGrfShell,SwGrfShell)
sw/source/uibase/web/wlistsh.cxx
+1 -1
View File
@@ -38,7 +38,7 @@ SFX_IMPL_INTERFACE(SwWebListShell, SwListShell, SW_RES(STR_SHELLNAME_LIST))
void SwWebListShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_NUM_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_NUM_TOOLBOX);
}
TYPEINIT1(SwWebListShell,SwListShell)
sw/source/uibase/web/wolesh.cxx
+1 -1
View File
@@ -41,7 +41,7 @@ void SwWebOleShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_OLE_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_WEBOLE_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_WEBOLE_TOOLBOX);
}
SwWebOleShell::SwWebOleShell(SwView &_rView) :
sw/source/uibase/web/wtabsh.cxx
+1 -1
View File
@@ -44,7 +44,7 @@ void SwWebTableShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TAB_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TABLE_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TABLE_TOOLBOX);
}
TYPEINIT1(SwWebTableShell,SwTableShell)
sw/source/uibase/web/wtextsh.cxx
+1 -1
View File
@@ -47,7 +47,7 @@ void SwWebTextShell::InitInterface_Impl()
{
GetStaticInterface()->RegisterPopupMenu(SW_RES(MN_TEXT_POPUPMENU));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, SW_RES(RID_TEXT_TOOLBOX));
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_OBJECT, RID_TEXT_TOOLBOX);
GetStaticInterface()->RegisterChildWindow(FN_EDIT_FORMULA);
GetStaticInterface()->RegisterChildWindow(FN_INSERT_FIELD);
sw/source/uibase/web/wview.cxx
+1 -1
View File
@@ -80,7 +80,7 @@ void SwWebView::InitInterface_Impl()
GetStaticInterface()->RegisterChildWindow(SfxInfoBarContainerChild::GetChildWindowId());
GetStaticInterface()->RegisterObjectBar(SFX_OBJECTBAR_TOOLS|SFX_VISIBILITY_STANDARD|SFX_VISIBILITY_SERVER,
SW_RES(RID_WEBTOOLS_TOOLBOX) );
RID_WEBTOOLS_TOOLBOX);
}
TYPEINIT1(SwWebView,SwView)