[Libreoffice-commits] core.git: 25 commits - desktop/source filter/source include/sfx2 sc/inc sc/source sd/inc sd/source sfx2/source solenv/bin starmath/source svx/AllLangResTarget_ofa.mk svx/source sw/inc sw/source vcl/opengl vcl/source
Caolán McNamara
caolanm at redhat.com
Mon Nov 24 08:37:21 PST 2014
desktop/source/app/app.cxx | 3
desktop/source/app/desktop.hrc | 2
desktop/source/app/desktop.src | 5 +
filter/source/graphicfilter/ipict/ipict.cxx | 5 +
include/sfx2/app.hxx | 1
include/sfx2/imgmgr.hxx | 6 -
include/sfx2/msgpool.hxx | 5 -
include/sfx2/objface.hxx | 11 +-
include/sfx2/sfx.hrc | 2
sc/inc/sc.hrc | 3
sc/source/ui/app/inputwin.cxx | 10 +-
sc/source/ui/app/scmod.cxx | 4 -
sc/source/ui/drawfunc/chartsh.cxx | 2
sc/source/ui/drawfunc/drawsh.cxx | 2
sc/source/ui/drawfunc/drformsh.cxx | 2
sc/source/ui/drawfunc/drtxtob.cxx | 2
sc/source/ui/drawfunc/graphsh.cxx | 2
sc/source/ui/drawfunc/mediash.cxx | 2
sc/source/ui/drawfunc/objdraw.src | 21 -----
sc/source/ui/drawfunc/oleobjsh.cxx | 2
sc/source/ui/optdlg/calcoptionsdlg.cxx | 34 ++++----
sc/source/ui/src/sc.src | 2
sc/source/ui/view/cellsh.cxx | 2
sc/source/ui/view/formatsh.cxx | 2
sc/source/ui/view/prevwsh.cxx | 2
sc/source/ui/view/tabvwsh.cxx | 2
sd/inc/glob.hrc | 2
sd/source/core/glob.src | 4 -
sd/source/ui/app/sdmod.cxx | 2
sd/source/ui/app/strings.src | 4 -
sd/source/ui/view/outlnvsh.cxx | 4 -
sd/source/ui/view/presvish.cxx | 8 +-
sfx2/source/appl/appdata.cxx | 1
sfx2/source/appl/appquit.cxx | 1
sfx2/source/appl/appserv.cxx | 7 -
sfx2/source/appl/module.cxx | 2
sfx2/source/appl/workwin.cxx | 14 ---
sfx2/source/control/dispatch.cxx | 15 +--
sfx2/source/control/msgpool.cxx | 7 -
sfx2/source/control/objface.cxx | 95 ++++--------------------
sfx2/source/inc/appdata.hxx | 1
sfx2/source/inc/workwin.hxx | 6 -
sfx2/source/toolbox/imgmgr.cxx | 107 +++++-----------------------
sfx2/source/view/viewfrm.cxx | 4 -
solenv/bin/concat-deps.c | 11 +-
starmath/source/smres.src | 5 -
starmath/source/view.cxx | 2
svx/AllLangResTarget_ofa.mk | 1
svx/source/form/fmshell.cxx | 12 +--
svx/source/src/app.hrc | 95 ------------------------
svx/source/src/app.src | 62 ----------------
svx/source/toolbars/extrusionbar.cxx | 2
svx/source/toolbars/fontworkbar.cxx | 2
sw/inc/helpid.h | 1
sw/inc/swtypes.hxx | 2
sw/source/ui/app/app.src | 84 ---------------------
sw/source/ui/config/mailconfigpage.cxx | 2
sw/source/ui/shells/shells.src | 36 ---------
sw/source/ui/web/web.src | 12 ---
sw/source/uibase/app/apphdl.cxx | 2
sw/source/uibase/ribbar/inputwin.cxx | 6 -
sw/source/uibase/shells/annotsh.cxx | 2
sw/source/uibase/shells/beziersh.cxx | 2
sw/source/uibase/shells/drawsh.cxx | 2
sw/source/uibase/shells/drformsh.cxx | 2
sw/source/uibase/shells/drwtxtsh.cxx | 2
sw/source/uibase/shells/frmsh.cxx | 2
sw/source/uibase/shells/grfsh.cxx | 2
sw/source/uibase/shells/listsh.cxx | 2
sw/source/uibase/shells/mediash.cxx | 2
sw/source/uibase/shells/olesh.cxx | 2
sw/source/uibase/shells/tabsh.cxx | 2
sw/source/uibase/shells/textsh.cxx | 2
sw/source/uibase/uiview/pview.cxx | 2
sw/source/uibase/uiview/srcview.cxx | 2
sw/source/uibase/uiview/view0.cxx | 2
sw/source/uibase/utlui/navipi.cxx | 4 -
sw/source/uibase/web/wformsh.cxx | 2
sw/source/uibase/web/wfrmsh.cxx | 2
sw/source/uibase/web/wgrfsh.cxx | 2
sw/source/uibase/web/wlistsh.cxx | 2
sw/source/uibase/web/wolesh.cxx | 2
sw/source/uibase/web/wtabsh.cxx | 2
sw/source/uibase/web/wtextsh.cxx | 2
sw/source/uibase/web/wview.cxx | 2
vcl/opengl/gdiimpl.cxx | 12 +--
vcl/source/window/builder.cxx | 2
87 files changed, 177 insertions(+), 644 deletions(-)
New commits:
commit d163c42f6bb95480b7c28770dbcc54ddc7efe1f1
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 16:07:57 2014 +0000
now unused helpid
Change-Id: I826141a1176a9288af1a9def64c49118110446f8
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 39bb545..4129196 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -359,7 +359,6 @@
#define HID_PVIEW_ZOOM_LB "SW_HID_PVIEW_ZOOM_LB"
#define HID_MAIL_MERGE_SELECT "SW_HID_MAIL_MERGE_SELECT"
-#define HID_MODULE_TOOLBOX "SW_HID_MODULE_TOOLBOX"
#define HID_MM_SELECTDBTABLEDDIALOG "SW_HID_MM_SELECTDBTABLEDDIALOG"
commit 2d5d2a9086fc7060157e7d947e9e0879355420a3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 15:36:38 2014 +0000
these were just ids, shouldn't be backed by actual string resources
Change-Id: I639fafce2c4aa919b7f1f6c993dabecf16d312da
diff --git a/sc/source/ui/drawfunc/objdraw.src b/sc/source/ui/drawfunc/objdraw.src
index 1981bb1..065fdf8 100644
--- a/sc/source/ui/drawfunc/objdraw.src
+++ b/sc/source/ui/drawfunc/objdraw.src
@@ -364,27 +364,6 @@
};\
};
- // Objekt-Leisten
-
-String RID_DRAW_OBJECTBAR
-{
- Text [ en-US ] = "Drawing Object Bar" ;
-};
-
- // Text-Toolbox
-
-String RID_TEXT_TOOLBOX
-{
- Text [ en-US ] = "Text Object Bar" ;
-};
-
- // Graphics toolbox
-
-String RID_GRAPHIC_OBJECTBAR
-{
- Text [ en-US ] = "Image Object Bar";
-};
-
// Popup-Menues ---------------------------------------------------------------------
String RID_POPUP_DRAW
diff --git a/starmath/source/smres.src b/starmath/source/smres.src
index 0647dec..68c74d6 100644
--- a/starmath/source/smres.src
+++ b/starmath/source/smres.src
@@ -374,11 +374,6 @@ String RID_ERR_RIGHTEXPECTED
Text [ en-US ] = "'RIGHT' expected" ;
};
-String RID_MATH_TOOLBOX
-{
- Text [ en-US ] = "Main Toolbar" ;
-};
-
StringArray RID_PRINTUIOPTIONS
{
ItemList [en-US] =
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index bad018d..c1ec4eb 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -466,11 +466,6 @@ String STR_REDLINE_UNKNOWN_AUTHOR
Text [ en-US ] = "Unknown Author";
};
-String RID_MODULE_TOOLBOX
-{
- Text [ en-US ] = "Function Bar (viewing mode)" ;
-};
-
String STR_DONT_ASK_AGAIN
{
Text [ en-US ] = "~Do not show warning again" ;
@@ -608,83 +603,6 @@ String STR_ACCESS_COLUMN_WIDTH
Text [ en-US ] = "Column %1 Width";
};
-ToolBox RID_MODULE_TOOLBOX
-{
- HelpID = HID_MODULE_TOOLBOX ;
- Border = TRUE ;
- SVLook = TRUE ;
- Dockable = TRUE ;
- Moveable = TRUE ;
- Sizeable = TRUE ;
- Closeable = TRUE ;
- Zoomable = TRUE ;
- HideWhenDeactivate = TRUE ;
- LineSpacing = TRUE ;
- Customize = TRUE ;
- MenuStrings = TRUE ;
- Hide = TRUE ;
- ItemList =
- {
- ToolBoxItem
- {
- Identifier = SID_SAVEASDOC ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_EDITDOC ;
- };
- ToolBoxItem
- {
- Identifier = SID_MAIL_SENDDOC ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_DIRECTEXPORTDOCASPDF ;
- };
- ToolBoxItem
- {
- Identifier = SID_PRINTDOCDIRECT ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_COPY ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_SEARCH_DLG ;
- };
- ToolBoxItem
- {
- Identifier = SID_NAVIGATOR ;
- };
- ToolBoxItem
- {
- Type = TOOLBOXITEM_SEPARATOR ;
- };
- ToolBoxItem
- {
- Identifier = SID_ATTR_ZOOM ;
- };
- };
- Scroll = TRUE ;
-};
-
String STR_CAPTION_TABLE
{
Text [ en-US ] = "%PRODUCTNAME Writer Table";
diff --git a/sw/source/ui/shells/shells.src b/sw/source/ui/shells/shells.src
index 0c151d9..3b2aa69 100644
--- a/sw/source/ui/shells/shells.src
+++ b/sw/source/ui/shells/shells.src
@@ -115,42 +115,6 @@ String STR_PAGE_COUNT_CUSTOM
{
Text [ en-US ] = "Page %1 of %2 (Page %3)" ;
};
-String RID_TEXT_TOOLBOX
-{
- Text [ en-US ] = "Text Object Bar" ;
-};
-String RID_TABLE_TOOLBOX
-{
- Text [ en-US ] = "Table Object Bar" ;
-};
-String RID_FRAME_TOOLBOX
-{
- Text [ en-US ] = "Frame Object Bar" ;
-};
-String RID_GRAFIK_TOOLBOX
-{
- Text [ en-US ] = "Images Object Bar" ;
-};
-String RID_OLE_TOOLBOX
-{
- Text [ en-US ] = "Object" ;
-};
-String RID_DRAW_TOOLBOX
-{
- Text [ en-US ] = "Draw Object Bar" ;
-};
-String RID_BEZIER_TOOLBOX
-{
- Text [ en-US ] = "Bézier Object Bar" ;
-};
-String RID_DRAW_TEXT_TOOLBOX
-{
- Text [ en-US ] = "Text Object Bar/Images" ;
-};
-String RID_NUM_TOOLBOX
-{
- Text [ en-US ] = "Numbering Object Bar" ;
-};
String STR_SHELLNAME_TEXT
{
Text [ en-US ] = "Text" ;
diff --git a/sw/source/ui/web/web.src b/sw/source/ui/web/web.src
index 3c6d181..a28d30c 100644
--- a/sw/source/ui/web/web.src
+++ b/sw/source/ui/web/web.src
@@ -59,17 +59,5 @@ String RID_WEBTEXT_TOOLBOX
{
Text [ en-US ] = "Text Object Bar/Web" ;
};
-String RID_WEBFRAME_TOOLBOX
-{
- Text [ en-US ] = "Frame Object Bar/Web" ;
-};
-String RID_WEBGRAPHIC_TOOLBOX
-{
- Text [ en-US ] = "Image Object Bar/Web" ;
-};
-String RID_WEBOLE_TOOLBOX
-{
- Text [ en-US ] = "Object/Web" ;
-};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 6c6a68cd566908eb6b22fe9e9b2c2426c853b6f9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 15:11:24 2014 +0000
so GetOffResManager_Impl is unused
which makes sense, because all that's left in ofa.res is
error strings
Change-Id: Ieedcbd5c9c723ac1a89035add11a61d41b2381a9
diff --git a/include/sfx2/app.hxx b/include/sfx2/app.hxx
index 3673761..56bea9b 100644
--- a/include/sfx2/app.hxx
+++ b/include/sfx2/app.hxx
@@ -241,7 +241,6 @@ public:
// already removed, or the below methods?
SAL_DLLPRIVATE SfxSlotPool& GetAppSlotPool_Impl() const;
SAL_DLLPRIVATE SfxModule* GetModule_Impl();
- SAL_DLLPRIVATE ResMgr* GetOffResManager_Impl();
static bool loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWidth);
diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx
index 88bfb1c..0d9e820 100644
--- a/sfx2/source/appl/appdata.cxx
+++ b/sfx2/source/appl/appdata.cxx
@@ -112,7 +112,6 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* )
, pViewShells(0)
, pObjShells(0)
, pSfxResManager(0)
- , pOfaResMgr(0)
, pBasicManager( new SfxBasicManagerHolder )
, pBasMgrListener( new SfxBasicManagerCreationListener( *this ) )
, pViewFrame( 0 )
diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx
index 2367e51a..e7efa6e 100644
--- a/sfx2/source/appl/appquit.cxx
+++ b/sfx2/source/appl/appquit.cxx
@@ -110,7 +110,6 @@ void SfxApplication::Deinitialize()
DELETEZ(pAppData_Impl->pAppDispat);
SfxResId::DeleteResMgr();
SvtResId::DeleteResMgr();
- DELETEZ(pAppData_Impl->pOfaResMgr);
// from here no SvObjects have to exists
DELETEZ(pAppData_Impl->pMatcher);
diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx
index 29a47a0..84de443 100644
--- a/sfx2/source/appl/appserv.cxx
+++ b/sfx2/source/appl/appserv.cxx
@@ -875,13 +875,6 @@ OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChoose
#endif
-ResMgr* SfxApplication::GetOffResManager_Impl()
-{
- if ( !pAppData_Impl->pOfaResMgr )
- pAppData_Impl->pOfaResMgr = ResMgr::CreateResMgr( "ofa");
- return pAppData_Impl->pOfaResMgr;
-}
-
namespace
{
#if HAVE_FEATURE_SCRIPTING
diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx
index 65e0402..ab37450 100644
--- a/sfx2/source/inc/appdata.hxx
+++ b/sfx2/source/inc/appdata.hxx
@@ -119,7 +119,6 @@ public:
SfxViewShellArr_Impl* pViewShells;
SfxObjectShellArr_Impl* pObjShells;
ResMgr* pSfxResManager;
- ResMgr* pOfaResMgr;
SfxBasicManagerHolder* pBasicManager;
SfxBasicManagerCreationListener*
pBasMgrListener;
commit 577dd616bc438bfddf5f65246b1564737bba6a6f
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 15:09:58 2014 +0000
so these ResIds are only being used for the numerical value
Change-Id: I21c67b56424de59d7231f8420055775cd5f67aae
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 9dd834f..e6a9a92 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -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& );
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index 84657ca..1f45e96 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/chartsh.cxx b/sc/source/ui/drawfunc/chartsh.cxx
index 59072ea..e222a0b 100644
--- a/sc/source/ui/drawfunc/chartsh.cxx
+++ b/sc/source/ui/drawfunc/chartsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/drawsh.cxx b/sc/source/ui/drawfunc/drawsh.cxx
index 9f0ce37..1bae28d 100644
--- a/sc/source/ui/drawfunc/drawsh.cxx
+++ b/sc/source/ui/drawfunc/drawsh.cxx
@@ -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));
diff --git a/sc/source/ui/drawfunc/drformsh.cxx b/sc/source/ui/drawfunc/drformsh.cxx
index 8c93b92..b3d1383 100644
--- a/sc/source/ui/drawfunc/drformsh.cxx
+++ b/sc/source/ui/drawfunc/drformsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/drtxtob.cxx b/sc/source/ui/drawfunc/drtxtob.cxx
index 0c9d4fe..a8410a4 100644
--- a/sc/source/ui/drawfunc/drtxtob.cxx
+++ b/sc/source/ui/drawfunc/drtxtob.cxx
@@ -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));
diff --git a/sc/source/ui/drawfunc/graphsh.cxx b/sc/source/ui/drawfunc/graphsh.cxx
index c74431a..6ee703e 100644
--- a/sc/source/ui/drawfunc/graphsh.cxx
+++ b/sc/source/ui/drawfunc/graphsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/mediash.cxx b/sc/source/ui/drawfunc/mediash.cxx
index ce11351..66e969a 100644
--- a/sc/source/ui/drawfunc/mediash.cxx
+++ b/sc/source/ui/drawfunc/mediash.cxx
@@ -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));
}
diff --git a/sc/source/ui/drawfunc/oleobjsh.cxx b/sc/source/ui/drawfunc/oleobjsh.cxx
index 8621221..7b08485 100644
--- a/sc/source/ui/drawfunc/oleobjsh.cxx
+++ b/sc/source/ui/drawfunc/oleobjsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/view/cellsh.cxx b/sc/source/ui/view/cellsh.cxx
index 2d44764..f670fd3 100644
--- a/sc/source/ui/view/cellsh.cxx
+++ b/sc/source/ui/view/cellsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 9632c17..9a556ec 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -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) :
diff --git a/sc/source/ui/view/prevwsh.cxx b/sc/source/ui/view/prevwsh.cxx
index babb226..5d36224 100644
--- a/sc/source/ui/view/prevwsh.cxx
+++ b/sc/source/ui/view/prevwsh.cxx
@@ -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));
}
diff --git a/sc/source/ui/view/tabvwsh.cxx b/sc/source/ui/view/tabvwsh.cxx
index 027adfc..c7070da 100644
--- a/sc/source/ui/view/tabvwsh.cxx
+++ b/sc/source/ui/view/tabvwsh.cxx
@@ -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());
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 04a96d8..328db05 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -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());
diff --git a/sd/source/ui/view/presvish.cxx b/sd/source/ui/view/presvish.cxx
index 2f6a68c..a36d3a0 100644
--- a/sd/source/ui/view/presvish.cxx
+++ b/sd/source/ui/view/presvish.cxx
@@ -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 );
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 588bf6e..448fdfe 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -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;
diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx
index 79387be..b2a1b28 100644
--- a/sfx2/source/view/viewfrm.cxx
+++ b/sfx2/source/view/viewfrm.cxx
@@ -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
}
diff --git a/starmath/source/view.cxx b/starmath/source/view.cxx
index 5cdc210..d4fe21e 100644
--- a/starmath/source/view.cxx
+++ b/starmath/source/view.cxx
@@ -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);
diff --git a/svx/source/form/fmshell.cxx b/svx/source/form/fmshell.cxx
index 62d0880..91fb513 100644
--- a/svx/source/form/fmshell.cxx
+++ b/svx/source/form/fmshell.cxx
@@ -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);
}
diff --git a/svx/source/toolbars/extrusionbar.cxx b/svx/source/toolbars/extrusionbar.cxx
index d26311e..814acfd 100644
--- a/svx/source/toolbars/extrusionbar.cxx
+++ b/svx/source/toolbars/extrusionbar.cxx
@@ -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 );
diff --git a/svx/source/toolbars/fontworkbar.cxx b/svx/source/toolbars/fontworkbar.cxx
index d420734..1f3a89e 100644
--- a/svx/source/toolbars/fontworkbar.cxx
+++ b/svx/source/toolbars/fontworkbar.cxx
@@ -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 );
diff --git a/sw/source/uibase/app/apphdl.cxx b/sw/source/uibase/app/apphdl.cxx
index 003a232..6db25ae 100644
--- a/sw/source/uibase/app/apphdl.cxx
+++ b/sw/source/uibase/app/apphdl.cxx
@@ -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
diff --git a/sw/source/uibase/shells/annotsh.cxx b/sw/source/uibase/shells/annotsh.cxx
index 319e1ae..172bd26 100644
--- a/sw/source/uibase/shells/annotsh.cxx
+++ b/sw/source/uibase/shells/annotsh.cxx
@@ -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));
}
diff --git a/sw/source/uibase/shells/beziersh.cxx b/sw/source/uibase/shells/beziersh.cxx
index 7ba6f6d..a9d5903 100644
--- a/sw/source/uibase/shells/beziersh.cxx
+++ b/sw/source/uibase/shells/beziersh.cxx
@@ -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)
diff --git a/sw/source/uibase/shells/drawsh.cxx b/sw/source/uibase/shells/drawsh.cxx
index 5986acb..6ee669d 100644
--- a/sw/source/uibase/shells/drawsh.cxx
+++ b/sw/source/uibase/shells/drawsh.cxx
@@ -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());
}
diff --git a/sw/source/uibase/shells/drformsh.cxx b/sw/source/uibase/shells/drformsh.cxx
index 68eb28e..2c04eb5 100644
--- a/sw/source/uibase/shells/drformsh.cxx
+++ b/sw/source/uibase/shells/drformsh.cxx
@@ -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)
diff --git a/sw/source/uibase/shells/drwtxtsh.cxx b/sw/source/uibase/shells/drwtxtsh.cxx
index 36defc2..3ec5c14 100644
--- a/sw/source/uibase/shells/drwtxtsh.cxx
+++ b/sw/source/uibase/shells/drwtxtsh.cxx
@@ -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());
}
diff --git a/sw/source/uibase/shells/frmsh.cxx b/sw/source/uibase/shells/frmsh.cxx
index 8ba06c9..dcea131 100644
--- a/sw/source/uibase/shells/frmsh.cxx
+++ b/sw/source/uibase/shells/frmsh.cxx
@@ -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)
diff --git a/sw/source/uibase/shells/grfsh.cxx b/sw/source/uibase/shells/grfsh.cxx
index 2679b8b..7407d7f 100644
--- a/sw/source/uibase/shells/grfsh.cxx
+++ b/sw/source/uibase/shells/grfsh.cxx
@@ -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)
diff --git a/sw/source/uibase/shells/listsh.cxx b/sw/source/uibase/shells/listsh.cxx
index 7e24741..5d3ab97 100644
--- a/sw/source/uibase/shells/listsh.cxx
+++ b/sw/source/uibase/shells/listsh.cxx
@@ -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)
diff --git a/sw/source/uibase/shells/mediash.cxx b/sw/source/uibase/shells/mediash.cxx
index 3f0ee00..feafe2c 100644
--- a/sw/source/uibase/shells/mediash.cxx
+++ b/sw/source/uibase/shells/mediash.cxx
@@ -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)
diff --git a/sw/source/uibase/shells/olesh.cxx b/sw/source/uibase/shells/olesh.cxx
index a872e3a..2bb5d97 100644
--- a/sw/source/uibase/shells/olesh.cxx
+++ b/sw/source/uibase/shells/olesh.cxx
@@ -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) :
diff --git a/sw/source/uibase/shells/tabsh.cxx b/sw/source/uibase/shells/tabsh.cxx
index 90e441d..d6992ba 100644
--- a/sw/source/uibase/shells/tabsh.cxx
+++ b/sw/source/uibase/shells/tabsh.cxx
@@ -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)
diff --git a/sw/source/uibase/shells/textsh.cxx b/sw/source/uibase/shells/textsh.cxx
index 89f0871..ea9e96f 100644
--- a/sw/source/uibase/shells/textsh.cxx
+++ b/sw/source/uibase/shells/textsh.cxx
@@ -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);
diff --git a/sw/source/uibase/uiview/pview.cxx b/sw/source/uibase/uiview/pview.cxx
index 4adc0a2..22efb9c 100644
--- a/sw/source/uibase/uiview/pview.cxx
+++ b/sw/source/uibase/uiview/pview.cxx
@@ -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)
diff --git a/sw/source/uibase/uiview/srcview.cxx b/sw/source/uibase/uiview/srcview.cxx
index 9ba50da..2a4c455 100644
--- a/sw/source/uibase/uiview/srcview.cxx
+++ b/sw/source/uibase/uiview/srcview.cxx
@@ -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());
}
diff --git a/sw/source/uibase/uiview/view0.cxx b/sw/source/uibase/uiview/view0.cxx
index c7e81bb..7424cf9 100644
--- a/sw/source/uibase/uiview/view0.cxx
+++ b/sw/source/uibase/uiview/view0.cxx
@@ -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
}
diff --git a/sw/source/uibase/web/wformsh.cxx b/sw/source/uibase/web/wformsh.cxx
index be3b7b8..f831965 100644
--- a/sw/source/uibase/web/wformsh.cxx
+++ b/sw/source/uibase/web/wformsh.cxx
@@ -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)
diff --git a/sw/source/uibase/web/wfrmsh.cxx b/sw/source/uibase/web/wfrmsh.cxx
index b28b57f..07572f7 100644
--- a/sw/source/uibase/web/wfrmsh.cxx
+++ b/sw/source/uibase/web/wfrmsh.cxx
@@ -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)
diff --git a/sw/source/uibase/web/wgrfsh.cxx b/sw/source/uibase/web/wgrfsh.cxx
index b9fd940..54f59a1 100644
--- a/sw/source/uibase/web/wgrfsh.cxx
+++ b/sw/source/uibase/web/wgrfsh.cxx
@@ -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)
diff --git a/sw/source/uibase/web/wlistsh.cxx b/sw/source/uibase/web/wlistsh.cxx
index 5d9e9c8..efda0b9 100644
--- a/sw/source/uibase/web/wlistsh.cxx
+++ b/sw/source/uibase/web/wlistsh.cxx
@@ -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)
diff --git a/sw/source/uibase/web/wolesh.cxx b/sw/source/uibase/web/wolesh.cxx
index 2a30b7f..e10f082 100644
--- a/sw/source/uibase/web/wolesh.cxx
+++ b/sw/source/uibase/web/wolesh.cxx
@@ -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) :
diff --git a/sw/source/uibase/web/wtabsh.cxx b/sw/source/uibase/web/wtabsh.cxx
index 013f2bb..0d3c20c 100644
--- a/sw/source/uibase/web/wtabsh.cxx
+++ b/sw/source/uibase/web/wtabsh.cxx
@@ -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)
diff --git a/sw/source/uibase/web/wtextsh.cxx b/sw/source/uibase/web/wtextsh.cxx
index 901a78f..077e942 100644
--- a/sw/source/uibase/web/wtextsh.cxx
+++ b/sw/source/uibase/web/wtextsh.cxx
@@ -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);
diff --git a/sw/source/uibase/web/wview.cxx b/sw/source/uibase/web/wview.cxx
index 258cdcd..027fa05 100644
--- a/sw/source/uibase/web/wview.cxx
+++ b/sw/source/uibase/web/wview.cxx
@@ -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)
commit 0b3e6b79af3721f51569d2b7090713f41d522ece
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 15:03:39 2014 +0000
ResId return from GetObjectBarResId is only used for its numerical id
Change-Id: I173d20d68b25a614e25b1c933cc5f18f7116ab9c
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 32e0090..9dd834f 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -75,7 +75,7 @@ public:
void RegisterChildWindow(sal_uInt16, bool bContext = false);
void RegisterChildWindow(sal_uInt16, bool bContext, sal_uInt32 nFeature);
void RegisterStatusBar( const ResId& );
- const ResId& GetObjectBarResId( sal_uInt16 nNo ) const;
+ sal_uInt32 GetObjectBarId(sal_uInt16 nNo) const;
sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const;
sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const;
sal_uInt16 GetObjectBarCount() const;
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index de2a3b4..7ee9f08 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1328,7 +1328,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
SfxObjectBars_Impl& rBar = pImp->aObjBars[nPos & SFX_POSITION_MASK];
rBar.nMode = nPos;
- rBar.nResId = pIFace->GetObjectBarResId(nNo).GetId();
+ rBar.nResId = pIFace->GetObjectBarId(nNo);
rBar.pIFace = pIFace;
if ( bUIActive || bIsActive )
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 00309db..588bf6e 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -400,7 +400,7 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, const ResId& rResId, s
return new SfxObjectUI_Impl(nPos, rResId, true, nFeature);
}
-const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const
+sal_uInt32 SfxInterface::GetObjectBarId(sal_uInt16 nNo) const
{
bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
if ( bGenoType )
@@ -409,14 +409,14 @@ const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const
sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
if ( nNo < nBaseCount )
// The Super class comes first
- return pGenoType->GetObjectBarResId( nNo );
+ return pGenoType->GetObjectBarId(nNo);
else
nNo = nNo - nBaseCount;
}
assert( nNo<pImpData->aObjectBars.size() );
- return pImpData->aObjectBars[nNo]->aResId;
+ return pImpData->aObjectBars[nNo]->aResId.GetId();
}
sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
commit 6283d3d4c3019c3435a7465ad7b072f83b0e7cc9
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:56:45 2014 +0000
in passing RegisterChildWindow already never used its pStr arg
Change-Id: I506581507f078a87088c85867724f1c446ea76d5
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 728e31b..32e0090 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -72,8 +72,8 @@ public:
void RegisterObjectBar(sal_uInt16, const ResId&);
void RegisterObjectBar(sal_uInt16, const ResId&, sal_uInt32 nFeature);
- void RegisterChildWindow( sal_uInt16, bool bContext = false, const OUString* pST=0 );
- void RegisterChildWindow( sal_uInt16, bool bContext, sal_uInt32 nFeature, const OUString* pST=0 );
+ void RegisterChildWindow(sal_uInt16, bool bContext = false);
+ void RegisterChildWindow(sal_uInt16, bool bContext, sal_uInt32 nFeature);
void RegisterStatusBar( const ResId& );
const ResId& GetObjectBarResId( sal_uInt16 nNo ) const;
sal_uInt16 GetObjectBarPos( sal_uInt16 nNo ) const;
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 3a6cff3..00309db 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -449,13 +449,12 @@ sal_uInt16 SfxInterface::GetObjectBarCount() const
return pImpData->aObjectBars.size();
}
-
-void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, const OUString* pChildWinName)
+void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext)
{
- RegisterChildWindow( nId, bContext, 0UL, pChildWinName );
+ RegisterChildWindow(nId, bContext, 0UL);
}
-void SfxInterface::RegisterChildWindow(sal_uInt16 nId, bool bContext, sal_uInt32 nFeature, const OUString*)
+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);
pUI->bContext = bContext;
commit ce7a7c63eaf14e586bf48e4c35b50acf382c6de2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:55:01 2014 +0000
so RegisterObjectBar's pStr arg is never used
Change-Id: Idf0642255490583fa20a05d2c834b941eb696918
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index fe2311c..728e31b 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -70,8 +70,8 @@ public:
const SfxInterface* GetGenoType() const { return pGenoType; }
- void RegisterObjectBar( sal_uInt16, const ResId&, const OUString* pST=0 );
- void RegisterObjectBar( sal_uInt16, const ResId&, sal_uInt32 nFeature, const OUString* pST=0 );
+ void RegisterObjectBar(sal_uInt16, const ResId&);
+ void RegisterObjectBar(sal_uInt16, const ResId&, sal_uInt32 nFeature);
void RegisterChildWindow( sal_uInt16, bool bContext = false, const OUString* pST=0 );
void RegisterChildWindow( sal_uInt16, bool bContext, sal_uInt32 nFeature, const OUString* pST=0 );
void RegisterStatusBar( const ResId& );
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 7b9d6e9..3a6cff3 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -380,13 +380,12 @@ void SfxInterface::RegisterPopupMenu( const ResId& rResId )
pImpData->aPopupRes = rResId;
}
-void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId,
- const OUString *pStr )
+void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, const ResId& rResId)
{
- RegisterObjectBar( nPos, rResId, 0UL, pStr );
+ RegisterObjectBar(nPos, rResId, 0UL);
}
-void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr )
+void SfxInterface::RegisterObjectBar(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature)
{
SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl(nPos, rResId, nFeature);
if ( pUI )
commit a3d92af125ae22dc2243fe5b88e194eb41ca3dce
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:52:46 2014 +0000
so CreateObjectBarUI_Impl's pStr arg is unused
Change-Id: Ia18c380ef46eff546e6ee6534695bcafba1b3c6d
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index e13f0d9..7b9d6e9 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -108,13 +108,9 @@ struct SfxInterface_Impl
}
};
-static SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr );
-
-
-
+static SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature);
// constuctor, registeres a new unit
-
SfxInterface::SfxInterface( const char *pClassName,
const ResId& rNameResId,
SfxInterfaceId nId,
@@ -392,12 +388,12 @@ void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId,
void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr )
{
- SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr );
+ SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl(nPos, rResId, nFeature);
if ( pUI )
pImpData->aObjectBars.push_back(pUI);
}
-SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr )
+SfxObjectUI_Impl* CreateObjectBarUI_Impl(sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature)
{
if ((nPos & SFX_VISIBILITY_MASK) == 0)
nPos |= SFX_VISIBILITY_STANDARD;
commit fdba97bb3940b2763167510fab91df4b33293115
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:51:03 2014 +0000
so SfxObjectUI_Impl pName is only set, never read
Change-Id: If920c1d32c457e339c13010a19670c917de9c3aa
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 8f603c4..e13f0d9 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -378,23 +378,18 @@ const SfxSlot* SfxInterface::GetRealSlot( sal_uInt16 nSlotId ) const
return pSlot->pLinkedSlot;
}
-
-
void SfxInterface::RegisterPopupMenu( const ResId& rResId )
{
pImpData->aPopupRes = rResId;
}
-
-
void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId,
const OUString *pStr )
{
RegisterObjectBar( nPos, rResId, 0UL, pStr );
}
-
void SfxInterface::RegisterObjectBar( sal_uInt16 nPos, const ResId& rResId, sal_uInt32 nFeature, const OUString *pStr )
{
SfxObjectUI_Impl* pUI = CreateObjectBarUI_Impl( nPos, rResId, nFeature, pStr );
@@ -407,24 +402,7 @@ SfxObjectUI_Impl* CreateObjectBarUI_Impl( sal_uInt16 nPos, const ResId& rResId,
if ((nPos & SFX_VISIBILITY_MASK) == 0)
nPos |= SFX_VISIBILITY_STANDARD;
- SfxObjectUI_Impl* pUI = new SfxObjectUI_Impl(nPos, rResId, true, nFeature);
-
- if (pStr == 0)
- {
- ResId aResId(rResId);
- aResId.SetRT(RSC_STRING);
- aResId.SetResMgr(rResId.GetResMgr());
- if( ! aResId.GetResMgr() )
- aResId.SetResMgr( SfxApplication::GetOrCreate()->GetOffResManager_Impl() );
- if ( !aResId.GetResMgr() || !aResId.GetResMgr()->IsAvailable(aResId) )
- pUI->pName = new OUString ("NoName");
- else
- pUI->pName = new OUString(aResId.toString());
- }
- else
- pUI->pName = new OUString(*pStr);
-
- return pUI;
+ return new SfxObjectUI_Impl(nPos, rResId, true, nFeature);
}
const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const
@@ -446,9 +424,6 @@ const ResId& SfxInterface::GetObjectBarResId( sal_uInt16 nNo ) const
return pImpData->aObjectBars[nNo]->aResId;
}
-
-
-
sal_uInt16 SfxInterface::GetObjectBarPos( sal_uInt16 nNo ) const
{
bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
commit 03f54ec22c956f3433ede07ecca57445feb549f7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:45:23 2014 +0000
so SfxInterface::GetObjectBarName is now unused
Change-Id: I88f5c84386216339d617589ba6a7e0de1235a9e9
diff --git a/include/sfx2/objface.hxx b/include/sfx2/objface.hxx
index 8a83741..fe2311c 100644
--- a/include/sfx2/objface.hxx
+++ b/include/sfx2/objface.hxx
@@ -80,7 +80,6 @@ public:
sal_uInt32 GetObjectBarFeature( sal_uInt16 nNo ) const;
sal_uInt16 GetObjectBarCount() const;
void SetObjectBarPos( sal_uInt16 nPos, sal_uInt16 nId );
- const OUString* GetObjectBarName( sal_uInt16 nNo ) const;
bool IsObjectBarVisible( sal_uInt16 nNo) const;
sal_uInt32 GetChildWindowFeature( sal_uInt16 nNo ) const;
sal_uInt32 GetChildWindowId( sal_uInt16 nNo ) const;
diff --git a/sfx2/source/control/objface.cxx b/sfx2/source/control/objface.cxx
index 101033c..8f603c4 100644
--- a/sfx2/source/control/objface.cxx
+++ b/sfx2/source/control/objface.cxx
@@ -548,13 +548,11 @@ sal_uInt16 SfxInterface::GetChildWindowCount() const
return pImpData->aChildWindows.size();
}
-
const ResId& SfxInterface::GetPopupMenuResId() const
{
return pImpData->aPopupRes;
}
-
const ResId& SfxInterface::GetStatusBarResId() const
{
if (pImpData->aStatBarRes.GetId() == 0 && pGenoType)
@@ -563,27 +561,6 @@ const ResId& SfxInterface::GetStatusBarResId() const
return pImpData->aStatBarRes;
}
-
-
-const OUString* SfxInterface::GetObjectBarName ( sal_uInt16 nNo ) const
-{
- bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
- if ( bGenoType )
- {
- // Are there toolbars in the super class?
- sal_uInt16 nBaseCount = pGenoType->GetObjectBarCount();
- if ( nNo < nBaseCount )
- // The Super class comes first
- return pGenoType->GetObjectBarName( nNo );
- else
- nNo = nNo - nBaseCount;
- }
-
- assert( nNo<pImpData->aObjectBars.size() );
-
- return pImpData->aObjectBars[nNo]->pName;
-}
-
sal_uInt32 SfxInterface::GetObjectBarFeature ( sal_uInt16 nNo ) const
{
bool bGenoType = (pGenoType != 0 && !pGenoType->HasName());
commit 22cc0d397e86a48f97ab764c1acb56ec5bd042eb
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:44:02 2014 +0000
so nothing consumes SfxObjectBars_Impl's name
Change-Id: I7bd8c0078656bc6fb9d144db8c65dfb8ca304b22
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index d722dfd..de2a3b4 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -89,7 +89,6 @@ struct SfxObjectBars_Impl
{
sal_uInt32 nResId; // Resource - and ConfigId of the Toolbox
sal_uInt16 nMode; // special visibility flags
- OUString aName;
SfxInterface* pIFace;
SfxObjectBars_Impl() : nResId(0), nMode(0), pIFace(NULL) {}
@@ -1330,11 +1329,6 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
SfxObjectBars_Impl& rBar = pImp->aObjBars[nPos & SFX_POSITION_MASK];
rBar.nMode = nPos;
rBar.nResId = pIFace->GetObjectBarResId(nNo).GetId();
- const OUString *pName = pIFace->GetObjectBarName(nNo);
- if ( pName )
- rBar.aName = *pName;
- else
- rBar.aName = "";
rBar.pIFace = pIFace;
if ( bUIActive || bIsActive )
commit e2e26d21f2c16904228748407414c1c6a4b5dbe7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:41:56 2014 +0000
nothing is then consuming the SetObjectBar_Impl pName arg
Change-Id: Ib45f28cae69983848a0fa524bed747512dcab1c0
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index 50a6f76..6a9a716 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1134,8 +1134,8 @@ void SfxWorkWindow::ResetObjectBars_Impl()
aChildWins[n]->nId = 0;
}
-void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
- SfxInterface* pIFace, const OUString *pName)
+void SfxWorkWindow::SetObjectBar_Impl(sal_uInt16 nPos, sal_uInt32 nResId,
+ SfxInterface* pIFace)
{
DBG_ASSERT( (nPos & SFX_POSITION_MASK) < SFX_OBJECTBAR_MAX,
"object bar position overflow" );
@@ -1143,7 +1143,7 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
sal_uInt16 nRealPos = nPos & SFX_POSITION_MASK;
if ( pParent && IsAppWorkWinToolbox_Impl( nRealPos ) )
{
- pParent->SetObjectBar_Impl( nPos, nResId, pIFace, pName );
+ pParent->SetObjectBar_Impl(nPos, nResId, pIFace);
return;
}
diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx
index d2f286b..d722dfd 100644
--- a/sfx2/source/control/dispatch.cxx
+++ b/sfx2/source/control/dispatch.cxx
@@ -1339,8 +1339,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
if ( bUIActive || bIsActive )
{
- pWorkWin->SetObjectBar_Impl(
- nPos, rBar.nResId, rBar.pIFace, &rBar.aName );
+ pWorkWin->SetObjectBar_Impl(nPos, rBar.nResId, rBar.pIFace);
}
if ( !bVisible )
@@ -1403,8 +1402,8 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne
{
SfxObjectBars_Impl& rBar = pImp->aObjBars[nPos];
rBar = rFixed;
- pWorkWin->SetObjectBar_Impl( rFixed.nMode,
- rFixed.nResId, rFixed.pIFace, &rFixed.aName );
+ pWorkWin->SetObjectBar_Impl(rFixed.nMode,
+ rFixed.nResId, rFixed.pIFace);
}
}
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 8f902b1..f9bde5b 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -290,8 +290,8 @@ public:
// Methods for Objectbars
virtual void UpdateObjectBars_Impl();
void ResetObjectBars_Impl();
- void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
- SfxInterface *pIFace, const OUString* pName=0 );
+ void SetObjectBar_Impl(sal_uInt16 nPos, sal_uInt32 nResId,
+ SfxInterface *pIFace);
bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const;
bool IsVisible_Impl();
void MakeVisible_Impl( bool );
commit 5a1ff4db38588bcf222cea24050c64d41b53635a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:37:37 2014 +0000
no use is made of SfxObjectBar_Impl's aName
Change-Id: I4afc85d4ff9b5743dd506a6a5a4ba1657d6025cb
diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx
index e1c0867..50a6f76 100644
--- a/sfx2/source/appl/workwin.cxx
+++ b/sfx2/source/appl/workwin.cxx
@@ -1134,8 +1134,6 @@ void SfxWorkWindow::ResetObjectBars_Impl()
aChildWins[n]->nId = 0;
}
-
-
void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
SfxInterface* pIFace, const OUString *pName)
{
@@ -1154,10 +1152,6 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
aObjBar.nId = sal::static_int_cast<sal_uInt16>(nResId);
aObjBar.nPos = nRealPos;
aObjBar.nMode = (nPos & SFX_VISIBILITY_MASK);
- if (pName)
- aObjBar.aName = *pName;
- else
- aObjBar.aName = "";
for ( sal_uInt16 n=0; n<aObjBarList.size(); n++ )
{
@@ -1171,8 +1165,6 @@ void SfxWorkWindow::SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId,
aObjBarList.push_back( aObjBar );
}
-
-
bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const
/* [Description]
diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx
index 970bbd7..8f902b1 100644
--- a/sfx2/source/inc/workwin.hxx
+++ b/sfx2/source/inc/workwin.hxx
@@ -43,7 +43,6 @@ class SfxWorkWindow;
// This struct makes all relevant Informationen available of Toolboxes
-
struct SfxObjectBar_Impl
{
sal_uInt16 nId; // Resource - and ConfigId of Toolbox
@@ -51,7 +50,6 @@ struct SfxObjectBar_Impl
sal_uInt16 nPos;
sal_uInt16 nIndex;
bool bDestroy;
- OUString aName;
SfxInterface* pIFace;
SfxObjectBar_Impl() :
commit 38ff61b44e466ac138632c71ed538749fdada2b0
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 14:00:22 2014 +0000
no use is made of _pResMgr
so the relevant ctor argument is useless
Change-Id: I32f733cc12820f311656b7e140a36c50e504c739
diff --git a/include/sfx2/msgpool.hxx b/include/sfx2/msgpool.hxx
index f21277e..2e3abdb 100644
--- a/include/sfx2/msgpool.hxx
+++ b/include/sfx2/msgpool.hxx
@@ -37,7 +37,6 @@ class SFX2_DLLPUBLIC SfxSlotPool
{
SfxSlotGroupArr_Impl* _pGroups;
SfxSlotPool* _pParentPool;
- ResMgr* _pResMgr;
SfxInterfaceArr_Impl* _pInterfaces;
sal_uInt16 _nCurGroup;
sal_uInt16 _nCurInterface;
@@ -47,8 +46,8 @@ private:
const SfxSlot* SeekSlot( sal_uInt16 nObject );
public:
- SfxSlotPool( SfxSlotPool* pParent=0, ResMgr* pMgr=0);
- ~SfxSlotPool();
+ SfxSlotPool(SfxSlotPool* pParent=0);
+ ~SfxSlotPool();
void RegisterInterface( SfxInterface& rFace );
void ReleaseInterface( SfxInterface& rFace );
diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx
index 00dde74..424880e 100644
--- a/sfx2/source/appl/module.cxx
+++ b/sfx2/source/appl/module.cxx
@@ -167,7 +167,7 @@ void SfxModule::Construct_Impl()
SfxModule* pPtr = (SfxModule*)this;
rArr.push_back( pPtr );
pImpl = new SfxModule_Impl;
- pImpl->pSlotPool = new SfxSlotPool( &pApp->GetAppSlotPool_Impl(), pResMgr );
+ pImpl->pSlotPool = new SfxSlotPool(&pApp->GetAppSlotPool_Impl());
pImpl->pTbxCtrlFac=0;
pImpl->pStbCtrlFac=0;
diff --git a/sfx2/source/control/msgpool.cxx b/sfx2/source/control/msgpool.cxx
index f059dad..ac0026d 100644
--- a/sfx2/source/control/msgpool.cxx
+++ b/sfx2/source/control/msgpool.cxx
@@ -33,21 +33,16 @@
#include <sfx2/sfx.hrc>
-SfxSlotPool::SfxSlotPool( SfxSlotPool *pParent, ResMgr* pResManager )
+SfxSlotPool::SfxSlotPool(SfxSlotPool *pParent)
: _pGroups(0)
, _pParentPool( pParent )
- , _pResMgr( pResManager )
, _pInterfaces(0)
, _nCurGroup(0)
, _nCurInterface(0)
, _nCurMsg(0)
{
- if ( !_pResMgr )
- _pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl();
}
-
-
SfxSlotPool::~SfxSlotPool()
{
_pParentPool = 0;
commit 12bdc6093fbfd28b885f2783a6fc7a63547f0344
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 13:44:16 2014 +0000
DB_DELIM is not defined in non-existent ofa
Change-Id: I5327bf4a414ba647e84cea572bb18aa86c96316e
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index a77b553..24b0ea0 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -170,9 +170,7 @@ const sal_Unicode cMarkSeparator = '|';
// Sequences names for jumps are <name of sequence>!<no>
const sal_Unicode cSequenceMarkSeparator = '!';
-#ifndef DB_DELIM // This is defined in OFA!
#define DB_DELIM ((sal_Unicode)0xff) // Database <-> table separator.
-#endif
typedef sal_uInt16 SetAttrMode;
commit a0cc5cac5c39be76a7e79f2ebff9a6ffba046ccf
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 13:42:25 2014 +0000
RID_DEFAULTIMAGELIST_[L]C global fallback now known to be unused
Change-Id: I93e358a9761f8f4fb22310239dbce8f621529eb8
diff --git a/svx/AllLangResTarget_ofa.mk b/svx/AllLangResTarget_ofa.mk
index ea925ae..48d45a0 100644
--- a/svx/AllLangResTarget_ofa.mk
+++ b/svx/AllLangResTarget_ofa.mk
@@ -27,7 +27,6 @@ $(eval $(call gb_SrsTarget_SrsTarget,svx/ofa))
$(eval $(call gb_SrsTarget_add_files,svx/ofa,\
svx/source/src/errtxt.src \
- svx/source/src/app.src \
))
# vim: set noet sw=4 ts=4:
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
deleted file mode 100644
index 791112f..0000000
--- a/svx/source/src/app.src
+++ /dev/null
@@ -1,49 +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 incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-#include <svx/svxids.hrc>
-
-#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
-
-#define IMAGE_ID_LIST\
- IdList = {\
- SID_HLINKBAR_LINK; \
- SID_HLINKBAR_SEARCH; \
- SID_HLINKBAR_TARGET; \
- SID_HYPERLINK_DIALOG; \
- };\
- IdCount = {\
- 4;\
- };
-
-ImageList RID_DEFAULTIMAGELIST_SC
-{
- Prefix = "sc";
- MASKCOLOR
- IMAGE_ID_LIST
-};
-
-ImageList RID_DEFAULTIMAGELIST_LC
-{
- Prefix = "lc";
- MASKCOLOR
- IMAGE_ID_LIST
-};
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 49bbd88605cf4106773c35f3c0d81068fd2b3394
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 13:38:32 2014 +0000
show that GetImageManager never has a NULL module
and remove resulting dead branches
Change-Id: I969c943b9ff7e56d22efb4eff5bee644f9792676
diff --git a/include/sfx2/imgmgr.hxx b/include/sfx2/imgmgr.hxx
index 0804cf1..7798852 100644
--- a/include/sfx2/imgmgr.hxx
+++ b/include/sfx2/imgmgr.hxx
@@ -34,10 +34,10 @@ class SFX2_DLLPUBLIC SfxImageManager
SfxImageManager_Impl* pImp;
public:
- static SfxImageManager* GetImageManager( SfxModule* );
+ static SfxImageManager* GetImageManager(SfxModule&);
- SfxImageManager( SfxModule* pModule = 0 );
- ~SfxImageManager();
+ SfxImageManager(SfxModule& rModule);
+ ~SfxImageManager();
void RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags=0xFFFF);
void ReleaseToolBox( ToolBox *pBox );
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 534a921..7a1a84f 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -187,7 +187,7 @@ ScInputWindow::ScInputWindow( vcl::Window* pParent, SfxBindings* pBind ) :
mbIsMultiLine ( lcl_isExperimentalMode() )
{
ScModule* pScMod = SC_MOD();
- SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
+ SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
// #i73615# don't rely on SfxViewShell::Current while constructing the input line
// (also for GetInputHdl below)
@@ -281,7 +281,7 @@ ScInputWindow::~ScInputWindow()
}
}
- SfxImageManager::GetImageManager( SC_MOD() )->ReleaseToolBox( this );
+ SfxImageManager::GetImageManager( *SC_MOD() )->ReleaseToolBox( this );
}
void ScInputWindow::SetInputHandler( ScInputHandler* pNew )
@@ -648,7 +648,7 @@ void ScInputWindow::SetOkCancelMode()
EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
ScModule* pScMod = SC_MOD();
- SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
+ SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
if (!bIsOkCancelMode)
{
RemoveItem( 3 ); // Remove SID_INPUT_SUM and SID_INPUT_EQUAL
@@ -670,7 +670,7 @@ void ScInputWindow::SetSumAssignMode()
EnableButtons( pViewFrm && !pViewFrm->GetChildWindow( SID_OPENDLG_FUNCTION ) );
ScModule* pScMod = SC_MOD();
- SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
+ SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
if (bIsOkCancelMode)
{
// Remove SID_INPUT_CANCEL, and SID_INPUT_OK
@@ -783,7 +783,7 @@ void ScInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
// update item images
ScModule* pScMod = SC_MOD();
- SfxImageManager* pImgMgr = SfxImageManager::GetImageManager( pScMod );
+ SfxImageManager* pImgMgr = SfxImageManager::GetImageManager(*pScMod);
// IMAGE macro uses pScMod, pImgMg
SetItemImage( SID_INPUT_FUNCTION, IMAGE( SID_INPUT_FUNCTION ) );
diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx
index 4c865a1..7891777 100644
--- a/sfx2/source/toolbox/imgmgr.cxx
+++ b/sfx2/source/toolbox/imgmgr.cxx
@@ -55,7 +55,7 @@ public:
std::vector< ToolBoxInf_Impl* > m_aToolBoxes;
sal_Int16 m_nSymbolsSize;
ImageList* m_pImageList[IMAGELIST_COUNT];
- SfxModule* m_pModule;
+ SfxModule& m_rModule;
bool m_bAppEventListener;
ImageList* GetImageList( bool bBig );
@@ -65,8 +65,7 @@ public:
DECL_LINK( OptionsChanged_Impl, void* );
DECL_LINK( SettingsChanged_Impl, VclWindowEvent* );
-
- SfxImageManager_Impl( SfxModule* pModule );
+ SfxImageManager_Impl(SfxModule& rModule);
~SfxImageManager_Impl();
};
@@ -76,57 +75,25 @@ namespace
class theImageManagerImplMap :
public rtl::Static<SfxImageManagerImplMap, theImageManagerImplMap> {};
-
- class theGlobalImageManager :
- public rtl::StaticWithArg<SfxImageManager_Impl, SfxModule*,
- theGlobalImageManager> {};
}
-static SfxImageManager_Impl* GetImageManager( SfxModule* pModule )
+static SfxImageManager_Impl* GetImageManager(SfxModule& rModule)
{
SolarMutexGuard aGuard;
- if ( pModule == 0 )
- {
- return &theGlobalImageManager::get(NULL);
- }
+ SfxImageManagerImplMap &rImageManager_ImplMap =
+ theImageManagerImplMap::get();
+ SfxImageManager_Impl* pImpl( 0 );
+ SfxModule* pModule(&rModule);
+ SfxImageManagerImplMap::const_iterator pIter = rImageManager_ImplMap.find(pModule);
+ if ( pIter != rImageManager_ImplMap.end() )
+ pImpl = pIter->second.get();
else
{
- SfxImageManagerImplMap &rImageManager_ImplMap =
- theImageManagerImplMap::get();
- SfxImageManager_Impl* pImpl( 0 );
- SfxImageManagerImplMap::const_iterator pIter = rImageManager_ImplMap.find(pModule);
- if ( pIter != rImageManager_ImplMap.end() )
- pImpl = pIter->second.get();
- else
- {
- rImageManager_ImplMap[pModule].reset(new SfxImageManager_Impl(pModule));
- pImpl = rImageManager_ImplMap[pModule].get();
- }
- return pImpl;
+ rImageManager_ImplMap[pModule].reset(new SfxImageManager_Impl(rModule));
+ pImpl = rImageManager_ImplMap[pModule].get();
}
-}
-
-// Global image list
-static ImageList* GetImageList( bool bBig )
-{
- SolarMutexGuard aGuard;
- ImageList* rpList = NULL;
-
- ResMgr *pResMgr = SfxApplication::GetOrCreate()->GetOffResManager_Impl();
-
- ResId aResId( bBig ? ( RID_DEFAULTIMAGELIST_LC ) : ( RID_DEFAULTIMAGELIST_SC ), *pResMgr);
-
- aResId.SetRT( RSC_IMAGELIST );
-
- DBG_ASSERT( pResMgr->IsAvailable(aResId), "No default ImageList!" );
-
- if ( pResMgr->IsAvailable(aResId) )
- rpList = new ImageList( aResId );
- else
- rpList = new ImageList();
-
- return rpList;
+ return pImpl;
}
static sal_Int16 impl_convertBools( bool bLarge )
@@ -137,10 +104,8 @@ static sal_Int16 impl_convertBools( bool bLarge )
return nIndex;
}
-
-
-SfxImageManager_Impl::SfxImageManager_Impl( SfxModule* pModule )
- : m_pModule(pModule)
+SfxImageManager_Impl::SfxImageManager_Impl(SfxModule& rModule)
+ : m_rModule(rModule)
, m_bAppEventListener(false)
{
m_nSymbolsSize = m_aOpt.GetCurrentSymbolsSize();
@@ -171,10 +136,7 @@ ImageList* SfxImageManager_Impl::GetImageList( bool bBig )
sal_Int32 nIndex = impl_convertBools( bBig );
if ( !m_pImageList[nIndex] )
{
- if ( !m_pModule )
- m_pImageList[nIndex] = ::GetImageList( bBig );
- else
- m_pImageList[nIndex] = m_pModule->GetImageList_Impl( bBig );
+ m_pImageList[nIndex] = m_rModule.GetImageList_Impl( bBig );
}
return m_pImageList[nIndex];
@@ -274,23 +236,15 @@ IMPL_LINK( SfxImageManager_Impl, SettingsChanged_Impl, VclWindowEvent*, pEvent)
return 0L;
}
-
-
-
-
-SfxImageManager::SfxImageManager( SfxModule* pModule )
+SfxImageManager::SfxImageManager(SfxModule& rModule)
{
- pImp = ::GetImageManager( pModule );
+ pImp = ::GetImageManager(rModule);
}
-
-
SfxImageManager::~SfxImageManager()
{
}
-
-
namespace
{
typedef boost::unordered_map< SfxModule*, boost::shared_ptr<SfxImageManager> > SfxImageManagerMap;
@@ -299,26 +253,24 @@ namespace
public rtl::Static<SfxImageManagerMap, theImageManagerMap> {};
}
-SfxImageManager* SfxImageManager::GetImageManager( SfxModule* pModule )
+SfxImageManager* SfxImageManager::GetImageManager(SfxModule& rModule)
{
SolarMutexGuard aGuard;
SfxImageManager* pSfxImageManager(0);
SfxImageManagerMap &rImageManagerMap = theImageManagerMap::get();
-
+ SfxModule* pModule = &rModule;
SfxImageManagerMap::const_iterator pIter = rImageManagerMap.find(pModule);
if ( pIter != rImageManagerMap.end() )
pSfxImageManager = pIter->second.get();
else
{
- rImageManagerMap[pModule].reset(new SfxImageManager(pModule));
+ rImageManagerMap[pModule].reset(new SfxImageManager(rModule));
pSfxImageManager = rImageManagerMap[pModule].get();
}
return pSfxImageManager;
}
-
-
Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const
{
ImageList* pImageList = pImp->GetImageList( bBig );
@@ -327,41 +279,26 @@ Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const
return Image();
}
-
-
Image SfxImageManager::GetImage( sal_uInt16 nId ) const
{
bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
return GetImage( nId, bLarge );
}
-
-
Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const
{
- bool bGlobal = ( pImp->m_pModule == 0 );
ImageList* pImageList = pImp->GetImageList( bBig );
- if ( pImageList && pImageList->HasImageAtPos( nId ) )
+ if (pImageList && pImageList->HasImageAtPos(nId))
return pImageList->GetImage( nId );
- else if ( !bGlobal )
- {
- pImageList = ::GetImageManager( 0 )->GetImageList( bBig );
- if ( pImageList )
- return pImageList->GetImage( nId );
- }
return Image();
}
-
-
Image SfxImageManager::SeekImage( sal_uInt16 nId ) const
{
bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge();
return SeekImage( nId, bLarge );
}
-
-
void SfxImageManager::RegisterToolBox( ToolBox *pBox, sal_uInt16 nFlags )
{
SolarMutexGuard aGuard;
diff --git a/sw/source/ui/config/mailconfigpage.cxx b/sw/source/ui/config/mailconfigpage.cxx
index 66206a2..37da1bf 100644
--- a/sw/source/ui/config/mailconfigpage.cxx
+++ b/sw/source/ui/config/mailconfigpage.cxx
@@ -229,7 +229,7 @@ SwTestAccountSettingsDialog::SwTestAccountSettingsDialog(SwMailConfigPage* pPare
m_sCompleted = m_pResult1->GetText();
m_sFailed = m_pResult2->GetText();
- SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD() );
+ SfxImageManager* pManager = SfxImageManager::GetImageManager(*SW_MOD());
m_aFailedImg = pManager->GetImage(FN_FORMULA_CANCEL);
m_aCompletedImg = pManager->GetImage(FN_FORMULA_APPLY);
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx
index faa7633..c9cd78a 100644
--- a/sw/source/uibase/ribbar/inputwin.cxx
+++ b/sw/source/uibase/ribbar/inputwin.cxx
@@ -77,7 +77,7 @@ SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind )
aEdit.SetSizePixel( aEdit.CalcMinimumSize() );
- SfxImageManager* pManager = SfxImageManager::GetImageManager( SW_MOD() );
+ SfxImageManager* pManager = SfxImageManager::GetImageManager( *SW_MOD() );
pManager->RegisterToolBox(this);
pView = ::GetActiveView();
@@ -127,7 +127,7 @@ SwInputWindow::SwInputWindow( vcl::Window* pParent, SfxBindings* pBind )
SwInputWindow::~SwInputWindow()
{
- SfxImageManager::GetImageManager( SW_MOD() )->ReleaseToolBox(this);
+ SfxImageManager::GetImageManager( *SW_MOD() )->ReleaseToolBox(this);
// wake rulers
if(pView)
@@ -165,7 +165,7 @@ void SwInputWindow::DataChanged( const DataChangedEvent& rDCEvt )
{
// update item images
SwModule *pMod = SW_MOD();
- SfxImageManager *pImgMgr = SfxImageManager::GetImageManager( pMod );
+ SfxImageManager *pImgMgr = SfxImageManager::GetImageManager(*pMod);
SetItemImage( FN_FORMULA_CALC, pImgMgr->GetImage(FN_FORMULA_CALC ));
SetItemImage( FN_FORMULA_CANCEL, pImgMgr->GetImage(FN_FORMULA_CANCEL ));
SetItemImage( FN_FORMULA_APPLY, pImgMgr->GetImage(FN_FORMULA_APPLY ));
diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx
index 0df9924..005e204 100644
--- a/sw/source/uibase/utlui/navipi.cxx
+++ b/sw/source/uibase/utlui/navipi.cxx
@@ -813,7 +813,7 @@ SwNavigationPI::SwNavigationPI( SfxBindings* _pBindings,
StartListening(*SfxGetpApp());
if ( pCreateView )
StartListening(*pCreateView);
- SfxImageManager* pImgMan = SfxImageManager::GetImageManager( SW_MOD() );
+ SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
pImgMan->RegisterToolBox(&aContentToolBox, SFX_TOOLBOX_CHANGEOUTSTYLE);
pImgMan->RegisterToolBox(&aGlobalToolBox, SFX_TOOLBOX_CHANGEOUTSTYLE);
@@ -862,7 +862,7 @@ SwNavigationPI::~SwNavigationPI()
EndListening(*SfxGetpApp());
- SfxImageManager* pImgMan = SfxImageManager::GetImageManager( SW_MOD() );
+ SfxImageManager* pImgMan = SfxImageManager::GetImageManager(*SW_MOD());
pImgMan->ReleaseToolBox(&aContentToolBox);
pImgMan->ReleaseToolBox(&aGlobalToolBox);
delete aContentToolBox.GetItemWindow(FN_PAGENUMBER);
commit 80a60371b3fbdfff01a0e59a56a53da9587f9b14
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 13:09:41 2014 +0000
move RID_APPTITLE to desktop where its used
rename the other ones and remove the unused ones
Change-Id: I0e636cd5d1799e0f9cb815a4bfa20b16039ecb3f
diff --git a/desktop/source/app/app.cxx b/desktop/source/app/app.cxx
index 1158142..f5722e4 100644
--- a/desktop/source/app/app.cxx
+++ b/desktop/source/app/app.cxx
@@ -1419,9 +1419,8 @@ int Desktop::Main()
// create title string
LanguageTag aLocale( LANGUAGE_SYSTEM);
- ResMgr* pLabelResMgr = ResMgr::SearchCreateResMgr( "ofa", aLocale );
+ ResMgr* pLabelResMgr = GetDesktopResManager();
OUString aTitle = pLabelResMgr ? ResId(RID_APPTITLE, *pLabelResMgr).toString() : OUString();
- delete pLabelResMgr;
#ifdef DBG_UTIL
//include buildid in non product builds
diff --git a/desktop/source/app/desktop.hrc b/desktop/source/app/desktop.hrc
index e305944..4ed5c9f 100644
--- a/desktop/source/app/desktop.hrc
+++ b/desktop/source/app/desktop.hrc
@@ -64,6 +64,8 @@
#define STR_TITLE_USERDATALOCKED (RID_DESKTOP_STRING_START+206)
#define STR_TITLE_EXPIRED (RID_DESKTOP_STRING_START+207)
+#define RID_APPTITLE (RID_DESKTOP_STRING_START+208)
+
#endif // _DESKTOP_HRC_
diff --git a/desktop/source/app/desktop.src b/desktop/source/app/desktop.src
index e2e0416..19962c2 100644
--- a/desktop/source/app/desktop.src
+++ b/desktop/source/app/desktop.src
@@ -169,4 +169,9 @@ String STR_BOOSTRAP_ERR_NOACCESSRIGHTS
Text [ en-US ] = "%PRODUCTNAME user installation could not be processed due to missing access rights. Please make sure that you have sufficient access rights for the following location and restart %PRODUCTNAME:\n\n";
};
+String RID_APPTITLE
+{
+ Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ;
+};
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/sfx2/sfx.hrc b/include/sfx2/sfx.hrc
index 6909d1c..98fffe2 100644
--- a/include/sfx2/sfx.hrc
+++ b/include/sfx2/sfx.hrc
@@ -114,8 +114,6 @@
#define RID_DEFAULTABOUT (RID_SFX_START+0)
-#define RID_APPTITLE (RID_SFX_START+4)
-
#define DLG_STYLE_DESIGNER (RID_SFX_START+8)
#define RID_SFX_INCORRECT_PASSWORD (RID_SFX_START+216)
diff --git a/sc/inc/sc.hrc b/sc/inc/sc.hrc
index bc39f32..1f95e32 100644
--- a/sc/inc/sc.hrc
+++ b/sc/inc/sc.hrc
@@ -1006,7 +1006,8 @@
#define STR_TITLE_AUTHOR (STR_START + 442)
#define STR_TITLE_DATE (STR_START + 443)
#define STR_UNKNOWN_USER_CONFLICT (STR_START + 444)
-#define STR_END (STR_UNKNOWN_USER_CONFLICT)
+#define RID_SC_NAME (STR_START + 445)
+#define STR_END (RID_SC_NAME)
#define BMP_START (STR_END)
diff --git a/sc/source/ui/app/scmod.cxx b/sc/source/ui/app/scmod.cxx
index c0a9c90..84657ca 100644
--- a/sc/source/ui/app/scmod.cxx
+++ b/sc/source/ui/app/scmod.cxx
@@ -119,7 +119,7 @@
static sal_uInt16 nIdleCount = 0;
-SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_APPTITLE))
+SFX_IMPL_INTERFACE(ScModule, SfxShell, ScResId(RID_SC_NAME))
void ScModule::InitInterface_Impl()
{
diff --git a/sc/source/ui/src/sc.src b/sc/source/ui/src/sc.src
index f6ab971..1fbb98d 100644
--- a/sc/source/ui/src/sc.src
+++ b/sc/source/ui/src/sc.src
@@ -21,7 +21,7 @@
// App-Titel------------------------------------------------------
-String RID_APPTITLE
+String RID_SC_NAME
{
Text [ en-US ] = "%PRODUCTNAME Calc" ;
};
diff --git a/sd/inc/glob.hrc b/sd/inc/glob.hrc
index f9fc89e..483b826 100644
--- a/sd/inc/glob.hrc
+++ b/sd/inc/glob.hrc
@@ -47,7 +47,7 @@
#define STR_TEXTOBJECTBARSHELL RID_GLOB_START+23
#define STR_STDOBJECTBARSHELL RID_GLOB_START+24
#define STR_BEZIEROBJECTBARSHELL RID_GLOB_START+25
-#define STR_APPLICATIONOBJECTBAR RID_GLOB_START+26
+#define RID_SD_NAME RID_GLOB_START+26
#define STR_LAYOUT_TITLE RID_GLOB_START+27
#define STR_LAYOUT_OUTLINE RID_GLOB_START+28
#define STR_LAYOUT_BACKGROUNDOBJECTS RID_GLOB_START+29
diff --git a/sd/source/core/glob.src b/sd/source/core/glob.src
index 8bdd59e..5de4ee0 100644
--- a/sd/source/core/glob.src
+++ b/sd/source/core/glob.src
@@ -179,9 +179,9 @@ String STR_BEZIEROBJECTBARSHELL
{
Text [ en-US ] = "Bézier mode" ;
};
-String STR_APPLICATIONOBJECTBAR
+String RID_SD_NAME
{
- Text [ en-US ] = "StarImpress 4.0" ;
+ Text [ en-US ] = "%PRODUCTNAME Impress" ;
};
String STR_GLUEPOINTSOBJECTBARSHELL
{
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index 0d891e5..facf4e4 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -59,7 +59,7 @@ TYPEINIT1( SdModule, SfxModule );
#define SdModule
#include "sdslots.hxx"
-SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(STR_APPLICATIONOBJECTBAR))
+SFX_IMPL_INTERFACE(SdModule, SfxModule, SdResId(RID_SD_NAME))
void SdModule::InitInterface_Impl()
{
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index f5944fe..791112f 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -19,11 +19,6 @@
#include <svx/svxids.hrc>
-String RID_APPTITLE
-{
- Text = "%PRODUCTNAME %PRODUCTVERSION%PRODUCTEXTENSION" ;
-};
-
#define MASKCOLOR MaskColor = Color { Red = 0xFFFF; Green = 0x0000; Blue = 0xFFFF; };
#define IMAGE_ID_LIST\
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index 7874da6..bad018d 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -33,7 +33,7 @@
String RID_SW_NAME
{
- Text = "StarWriter" ;
+ Text = "%PRODUCTNAME Writer" ;
};
String STR_PRINT_MERGE_MACRO
commit 47f891c567ecd54add9763506c48f42afaf6863b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 12:55:36 2014 +0000
RID_APPTITLE is unused in sd, StarImpress 4.0
Change-Id: I85053455c61322cc76df80a60885c38d1f71b3d3
diff --git a/sd/source/ui/app/strings.src b/sd/source/ui/app/strings.src
index 06b0fcf..1327eb6 100644
--- a/sd/source/ui/app/strings.src
+++ b/sd/source/ui/app/strings.src
@@ -64,10 +64,6 @@ String STR_DRAW_TEXT_TOOLBOX
{
Text [ en-US ] = "Text Object Bar" ;
};
-String RID_APPTITLE
-{
- Text = "StarImpress 4.0" ;
-};
String STR_NULL
{
Text [ en-US ] = "None" ;
commit c3e428785b9596744a05d205bbb505bbb99cce8b
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 12:49:01 2014 +0000
remove unused defines from app.hrc
Change-Id: Ib58c20897a765d81020fc440a48abc4aa966619f
diff --git a/svx/source/src/app.hrc b/svx/source/src/app.hrc
deleted file mode 100644
index beee99a..0000000
--- a/svx/source/src/app.hrc
+++ /dev/null
@@ -1,95 +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 incorporates work covered by the following license notice:
- *
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed
- * with this work for additional information regarding copyright
- * ownership. The ASF licenses this file to you under the Apache
- * License, Version 2.0 (the "License"); you may not use this file
- * except in compliance with the License. You may obtain a copy of
- * the License at http://www.apache.org/licenses/LICENSE-2.0 .
- */
-
-// Resource-Id's for OFA
-
-#ifndef _OFF_APP_HRC
-#define _OFF_APP_HRC
-
-#include <svl/solar.hrc>
-#include <sfx2/sfxsids.hrc>
-
-// Dialoge ---------------------------------------------------------------
-
-#define RID_OFAPAGE_HTMLOPT (RID_OFA_START + 100)
-#define RID_OFA_AUTOCORR_DLG (RID_OFA_START + 101)
-#define RID_OFADLG_OPTIONS_TREE_PAGES (RID_OFA_START + 116)
-#define RID_OFAPAGE_MSFILTEROPT2 (RID_OFA_START + 121)
-
-// TabPages --------------------------------------------------------------
-
-#define OFA_TP_MISC (RID_OFA_START + 200)
-
-#define OFA_TP_VIEW (RID_OFA_START + 202)
-#define OFA_TP_LANGUAGES (RID_OFA_START + 205)
-
-//die RID_??_TP_* stehen nochmal im offids.hrc
-#define RID_SW_TP_CONTENT_OPT (RID_OFA_START + 206)
-#define RID_SW_TP_STD_FONT (RID_OFA_START + 208)
-#define RID_SW_TP_OPTPRINT_PAGE (RID_OFA_START + 209)
-#define RID_SW_TP_OPTTABLE_PAGE (RID_OFA_START + 210)
-#define RID_SW_TP_OPTSHDWCRSR (RID_OFA_START + 211)
-#define RID_SW_TP_REDLINE_OPT (RID_OFA_START + 212)
-#define RID_SW_TP_OPTLOAD_PAGE (RID_OFA_START + 214)
-#define RID_SW_TP_OPTTEST_PAGE (RID_OFA_START + 215)
-#define RID_SW_TP_BACKGROUND (RID_OFA_START + 217)
-#define SID_SC_TP_LAYOUT (RID_OFA_START + 218)
-#define SID_SC_TP_CONTENT (RID_OFA_START + 219)
-#define SID_SC_TP_GRID (RID_OFA_START + 221)
-#define SID_SC_TP_USERLISTS (RID_OFA_START + 222)
-#define SID_SC_TP_CALC (RID_OFA_START + 223)
-#define SID_SC_TP_CHANGES (RID_OFA_START + 224)
-#define SID_SD_TP_CONTENTS (RID_OFA_START + 225)
-#define SID_SD_TP_SNAP (RID_OFA_START + 227)
-#define SID_SD_TP_PRINT (RID_OFA_START + 220)
-#define SID_SD_TP_MISC (RID_OFA_START + 231)
-#define SID_SI_TP_CONTENTS (RID_OFA_START + 232)
-#define SID_SI_TP_SNAP (RID_OFA_START + 234)
-#define SID_SI_TP_PRINT (RID_OFA_START + 236)
-#define SID_SI_TP_MISC (RID_OFA_START + 237)
-#define RID_SW_TP_HTML_CONTENT_OPT (RID_OFA_START + 240)
-#define RID_SW_TP_HTML_OPTPRINT_PAGE (RID_OFA_START + 242)
-#define RID_SW_TP_HTML_OPTTABLE_PAGE (RID_OFA_START + 243)
-#define RID_SW_TP_HTML_OPTGRID_PAGE (RID_OFA_START + 244)
-#define RID_SW_TP_HTML_OPTSHDWCRSR (RID_OFA_START + 246)
-#define RID_SW_TP_STD_FONT_CJK (RID_OFA_START + 247)
-#define RID_SC_TP_PRINT (RID_OFA_START + 248)
-#define OFA_TP_MEMORY (RID_OFA_START + 250)
-#define RID_SW_TP_STD_FONT_CTL (RID_OFA_START + 251)
-#define RID_SW_TP_OPTCOMPATIBILITY_PAGE (RID_OFA_START + 255)
-#define RID_SW_TP_OPTCAPTION_PAGE (RID_OFA_START + 256)
-#define SID_SC_TP_FORMULA (RID_OFA_START + 257)
-#define SID_SC_TP_COMPATIBILITY (RID_OFA_START + 258)
-#define RID_SC_TP_DEFAULTS (RID_OFA_START + 259)
-#define RID_SW_TP_COMPARISON_OPT (RID_OFA_START + 260)
-
-// Strings ------------------------------------------
-
-#define RID_STR_DATE (RID_OFA_START + 108)
-#define RID_DESKTOP (RID_OFA_START + 109)
-
-// "Uberlaufkontrolle der HID's
-#define ACT_HID_END HID_OFA_TP_MEMORY
-#if ACT_HID_END > HID_OFA_END
-#error Resource-Ueberlauf bei den HIDs der OFA
-#endif
-
-#endif
-
-/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svx/source/src/app.src b/svx/source/src/app.src
index 0b52b097..f5944fe 100644
--- a/svx/source/src/app.src
+++ b/svx/source/src/app.src
@@ -18,7 +18,6 @@
*/
#include <svx/svxids.hrc>
-#include "app.hrc"
String RID_APPTITLE
{
@@ -52,11 +51,4 @@ ImageList RID_DEFAULTIMAGELIST_LC
IMAGE_ID_LIST
};
-// Strings ---------------------------------------------------------------
-
-String RID_DESKTOP
-{
- Text = "%PRODUCTNAME" ;
-};
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
commit 5eb4ccb005f86717f886e5bc0079c739904eec61
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 10:45:44 2014 +0000
coverity#1242658 Untrusted loop bound
Change-Id: Ie22cb785065342582ca59f871a7b4da7e7bc77e5
diff --git a/filter/source/graphicfilter/ipict/ipict.cxx b/filter/source/graphicfilter/ipict/ipict.cxx
index acef0b7..38e7cde 100644
--- a/filter/source/graphicfilter/ipict/ipict.cxx
+++ b/filter/source/graphicfilter/ipict/ipict.cxx
@@ -906,7 +906,7 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
sal_uInt16 nByteCount, nCount, nD;
sal_uLong nSrcBitsPos;
- if ( nRowBytes < 2 * nWidth )
+ if (nWidth > nRowBytes / 2)
BITMAPERROR;
size_t nMinRecordSize;
@@ -921,6 +921,9 @@ sal_uLong PictReader::ReadPixMapEtc( Bitmap &rBitmap, bool bBaseAddr, bool bColo
const size_t nMaxRows = pPict->remainingSize() / nMinRowWidth;
if (nHeight > nMaxRows)
BITMAPERROR;
+ const size_t nMaxCols = pPict->remainingSize() / nHeight;
+ if (nWidth > nMaxCols)
+ BITMAPERROR;
for ( ny = 0; ny < nHeight; ny++ )
{
commit a5f9e77e98b63ccf2be01d9850be122e9742b157
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 10:39:07 2014 +0000
coverity#1242421 Dereference after null check
Change-Id: I18441a147ed74ad2fc8a952ced1320b8b26e3ea9
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index bac546e..e0dba64 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -2397,7 +2397,7 @@ void VclBuilder::handleAtkObject(xmlreader::XmlReader &reader, const OString &rI
const OString &rKey = aI->first;
const OString &rValue = aI->second;
- if (rKey.match("AtkObject::"))
+ if (pWindow && rKey.match("AtkObject::"))
pWindow->set_property(rKey.copy(RTL_CONSTASCII_LENGTH("AtkObject::")), rValue);
else
SAL_WARN("vcl.layout", "unhandled atk prop: " << rKey.getStr());
commit f47080cb24e19d6b2356307c46bfc587a3f53c69
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 10:35:39 2014 +0000
coverity#1255387 help coverity out here wrt Division by zero
Change-Id: I3923655d6d4b9c2906cda72e1f91f20d9b5a1354
diff --git a/vcl/opengl/gdiimpl.cxx b/vcl/opengl/gdiimpl.cxx
index 1c420e7..d6bf6ab 100644
--- a/vcl/opengl/gdiimpl.cxx
+++ b/vcl/opengl/gdiimpl.cxx
@@ -879,20 +879,22 @@ void OpenGLSalGraphicsImpl::DrawTransformedTexture(
const basegfx::B2DPoint& rX,
const basegfx::B2DPoint& rY )
{
- if (!rTexture.GetWidth() || !rTexture.GetHeight())
+ const int nTexWidth = rTexture.GetWidth();
+ const int nTexHeight = rTexture.GetHeight();
+ if (nTexWidth == 0 || nTexHeight == 0)
return;
const basegfx::B2DVector aXRel = rX - rNull;
const basegfx::B2DVector aYRel = rY - rNull;
const float aValues[] = {
- (float) aXRel.getX()/rTexture.GetWidth(), (float) aXRel.getY()/rTexture.GetWidth(), 0, 0,
- (float) aYRel.getX()/rTexture.GetHeight(), (float) aYRel.getY()/rTexture.GetHeight(), 0, 0,
+ (float) aXRel.getX()/nTexWidth, (float) aXRel.getY()/nTexWidth, 0, 0,
+ (float) aYRel.getX()/nTexHeight, (float) aYRel.getY()/nTexHeight, 0, 0,
0, 0, 1, 0,
(float) rNull.getX(), (float) rNull.getY(), 0, 1 };
glm::mat4 mMatrix = glm::make_mat4( aValues );
GLfloat aVertices[8] = {
- 0, (float) rTexture.GetHeight(), 0, 0,
- (float) rTexture.GetWidth(), 0, (float) rTexture.GetWidth(), (float) rTexture.GetHeight() };
+ 0, (float) nTexHeight, 0, 0,
+ (float) nTexWidth, 0, (float) nTexWidth, (float) nTexHeight };
GLfloat aTexCoord[8];
SalTwoRect aPosAry;
commit b162a663a3e9c0fba1e638bd52920957f011630d
Author: Caolán McNamara <caolanm at redhat.com>
Date: Mon Nov 24 10:22:54 2014 +0000
coverity#1255908 Resource leak
Change-Id: I90b8e89eba915e46cc2288f4ff5bee725fc8a1fc
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 0b0d160..f656970 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -1275,27 +1275,27 @@ IMPL_LINK( ScCalcOptionsDialog, TestClickHdl, PushButton*, )
// Automatically test the current implementation of OpenCL. If it
// seems good, whitelist it. If it seems bad, blacklist it.
- auto pTestDocument = new OpenCLTester();
+ std::unique_ptr<OpenCLTester> xTestDocument(new OpenCLTester());
- pTestDocument->addTest(BinOp("Plus", "+", -1000, 1000, 3e-10,
+ xTestDocument->addTest(BinOp("Plus", "+", -1000, 1000, 3e-10,
[] (double nLhs, double nRhs)
{
return nLhs + nRhs;
}));
- pTestDocument->addTest(BinOp("Minus", "-", -1000, 1000, 3e-10,
+ xTestDocument->addTest(BinOp("Minus", "-", -1000, 1000, 3e-10,
[] (double nLhs, double nRhs)
{
return nLhs - nRhs;
}));
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list