summaryrefslogtreecommitdiff
path: root/fpicker/source/office
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-04-29 23:36:57 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-04-30 11:22:09 +0100
commit8a0685d49f679d6f98de2f357f1ec74590573852 (patch)
tree97eb05105a45186049c1c3dad20233c29747ed9c /fpicker/source/office
parentb18cfdc7cd3755c147970f86d23973f337be01a7 (diff)
make ResId::toString a non-static member
Change-Id: I756c0a19bea7b1cc0e290d9f382a04d655819bfb
Diffstat (limited to 'fpicker/source/office')
-rw-r--r--fpicker/source/office/fpsofficeResMgr.hxx2
-rw-r--r--fpicker/source/office/iodlg.cxx4
2 files changed, 4 insertions, 2 deletions
diff --git a/fpicker/source/office/fpsofficeResMgr.hxx b/fpicker/source/office/fpsofficeResMgr.hxx
index 1318a29b3831..f3ef1edb4d79 100644
--- a/fpicker/source/office/fpsofficeResMgr.hxx
+++ b/fpicker/source/office/fpsofficeResMgr.hxx
@@ -55,6 +55,8 @@ namespace
};
}
+#define SVT_RESSTR(i) SvtResId(i).toString()
+
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx
index ce350e0658c0..64797c5c69b9 100644
--- a/fpicker/source/office/iodlg.cxx
+++ b/fpicker/source/office/iodlg.cxx
@@ -3015,7 +3015,7 @@ void SvtFileDialog::AddControls_Impl( )
_pImp->_pLbImageTemplates->SetHelpId( HID_FILEOPEN_IMAGE_TEMPLATE );
}
- _pImp->_pPlaces = new PlacesListBox( this, ResId::toString( SvtResId( STR_PLACES_TITLE ) ), SvtResId( LB_EXPLORERFILE_PLACES_LISTBOX ) );
+ _pImp->_pPlaces = new PlacesListBox( this, SVT_RESSTR(STR_PLACES_TITLE), SvtResId(LB_EXPLORERFILE_PLACES_LISTBOX) );
initDefaultPlaces();
}
@@ -3343,7 +3343,7 @@ void SvtFileDialog::appendDefaultExtension(String& _rFileName,
void SvtFileDialog::initDefaultPlaces( )
{
- PlacePtr pRootPlace( new Place( ResId::toString( SvtResId( STR_DEFAULT_DIRECTORY ) ), GetStandardDir() ) );
+ PlacePtr pRootPlace( new Place( SVT_RESSTR(STR_DEFAULT_DIRECTORY), GetStandardDir() ) );
_pImp->_pPlaces->AppendPlace( pRootPlace );
// Load from user settings