summaryrefslogtreecommitdiff
path: root/sw/source/uibase
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2016-10-13 10:12:06 +0100
committerCaolán McNamara <caolanm@redhat.com>2016-10-13 10:36:01 +0100
commitf1bb456e60f208ff5c422f025fe2e4f3404d8bb4 (patch)
tree9aaf331e2dea226e02c639de27c309722c3321fb /sw/source/uibase
parent15cea705426e9c58b034a8d9ac8d1e3802b4cc74 (diff)
no need to inherit MenuResource from Resource
Change-Id: I17a6e456de50841173e356c620b4c9f67b945574
Diffstat (limited to 'sw/source/uibase')
-rw-r--r--sw/source/uibase/utlui/unotools.cxx6
-rw-r--r--sw/source/uibase/utlui/unotools.src11
2 files changed, 6 insertions, 11 deletions
diff --git a/sw/source/uibase/utlui/unotools.cxx b/sw/source/uibase/utlui/unotools.cxx
index a23774cc862f..4a89a65a9229 100644
--- a/sw/source/uibase/utlui/unotools.cxx
+++ b/sw/source/uibase/utlui/unotools.cxx
@@ -550,11 +550,9 @@ void SwFrameCtrlWindow::Resize()
pExampleFrame->ClearDocument();
}
-MenuResource::MenuResource(const ResId& rResId) :
- Resource(rResId),
- aMenuArray(ResId(1,*rResId.GetResMgr()))
+MenuResource::MenuResource(const ResId& rResId)
+ : aMenuArray(rResId)
{
- FreeResource();
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/uibase/utlui/unotools.src b/sw/source/uibase/utlui/unotools.src
index 0bd6b2108226..0ae74dd0b6da 100644
--- a/sw/source/uibase/utlui/unotools.src
+++ b/sw/source/uibase/utlui/unotools.src
@@ -26,16 +26,13 @@ String STR_SERVICE_UNAVAILABLE
Text [ en-US ] = "The following service is not available: ";
};
-Resource RES_FRMEX_MENU
+StringArray RES_FRMEX_MENU
{
- StringArray 1
- {
ItemList [ en-US ] =
{
- < "~Zoom" ; ST_MENU_ZOOM; > ;
- < "~Upwards" ; ST_MENU_UP; > ;
- < "Do~wnwards" ; ST_MENU_DOWN; > ;
- };
+ < "~Zoom" ; ST_MENU_ZOOM; > ;
+ < "~Upwards" ; ST_MENU_UP; > ;
+ < "Do~wnwards" ; ST_MENU_DOWN; > ;
};
};