Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
2fec2ab3
Kaydet (Commit)
2fec2ab3
authored
May 18, 2017
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
SVT_RESSTR can go now
Change-Id: I641fbea510d56cabb440f894aae938430ce30ce0
üst
1807db24
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
29 deletions
+30
-29
RemoteFilesDialog.cxx
fpicker/source/office/RemoteFilesDialog.cxx
+4
-4
fpsofficeResMgr.hxx
fpicker/source/office/fpsofficeResMgr.hxx
+4
-1
iodlg.cxx
fpicker/source/office/iodlg.cxx
+22
-22
fwkresid.hxx
framework/inc/classes/fwkresid.hxx
+0
-2
No files found.
fpicker/source/office/RemoteFilesDialog.cxx
Dosyayı görüntüle @
2fec2ab3
...
...
@@ -229,7 +229,7 @@ RemoteFilesDialog::RemoteFilesDialog( vcl::Window* pParent, PickerFlags nBits )
m_pOk_btn
->
SetClickHdl
(
LINK
(
this
,
RemoteFilesDialog
,
OkHdl
)
);
m_pCancel_btn
->
SetClickHdl
(
LINK
(
this
,
RemoteFilesDialog
,
CancelHdl
)
);
m_sRootLabel
=
fpicker
::
Svt
ResId
(
STR_SVT_ROOTLABEL
);
m_sRootLabel
=
Fps
ResId
(
STR_SVT_ROOTLABEL
);
m_pPath
=
VclPtr
<
Breadcrumb
>::
Create
(
get
<
vcl
::
Window
>
(
"breadcrumb_container"
)
);
m_pPath
->
set_hexpand
(
true
);
m_pPath
->
SetClickHdl
(
LINK
(
this
,
RemoteFilesDialog
,
SelectBreadcrumbHdl
)
);
...
...
@@ -853,7 +853,7 @@ IMPL_LINK ( RemoteFilesDialog, EditServiceMenuHdl, MenuButton *, pButton, void )
if
(
nPos
>=
0
)
{
OUString
sMsg
=
fpicker
::
Svt
ResId
(
STR_SVT_DELETESERVICE
);
OUString
sMsg
=
Fps
ResId
(
STR_SVT_DELETESERVICE
);
sMsg
=
sMsg
.
replaceFirst
(
"$servicename$"
,
m_pServices_lb
->
GetSelectEntry
()
);
ScopedVclPtrInstance
<
MessageDialog
>
aBox
(
this
,
sMsg
,
VclMessageType
::
Question
,
VclButtonsType
::
YesNo
);
...
...
@@ -1086,7 +1086,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, NewFolderHdl, Button*, void )
OUString
aTitle
;
aContent
.
getTitle
(
aTitle
);
ScopedVclPtrInstance
<
QueryFolderNameDialog
>
aDlg
(
this
,
aTitle
,
fpicker
::
SVT_RESSTR
(
STR_SVT_NEW_FOLDER
)
);
ScopedVclPtrInstance
<
QueryFolderNameDialog
>
aDlg
(
this
,
aTitle
,
FpsResId
(
STR_SVT_NEW_FOLDER
)
);
bool
bHandled
=
false
;
while
(
!
bHandled
)
...
...
@@ -1158,7 +1158,7 @@ IMPL_LINK_NOARG ( RemoteFilesDialog, OkHdl, Button*, void )
{
if
(
m_eMode
==
REMOTEDLG_MODE_SAVE
)
{
OUString
sMsg
=
fpicker
::
Svt
ResId
(
STR_SVT_ALREADYEXISTOVERWRITE
);
OUString
sMsg
=
Fps
ResId
(
STR_SVT_ALREADYEXISTOVERWRITE
);
sMsg
=
sMsg
.
replaceFirst
(
"$filename$"
,
sName
);
ScopedVclPtrInstance
<
MessageDialog
>
aBox
(
this
,
sMsg
,
VclMessageType
::
Question
,
VclButtonsType
::
YesNo
);
if
(
aBox
->
Execute
()
!=
RET_YES
)
...
...
fpicker/source/office/fpsofficeResMgr.hxx
Dosyayı görüntüle @
2fec2ab3
...
...
@@ -37,7 +37,10 @@ namespace fpicker
};
}
#define SVT_RESSTR(i) SvtResId(i).toString()
inline
OUString
FpsResId
(
sal_uInt16
nId
)
{
return
fpicker
::
SvtResId
(
nId
);
}
#endif
...
...
fpicker/source/office/iodlg.cxx
Dosyayı görüntüle @
2fec2ab3
...
...
@@ -628,14 +628,14 @@ void SvtFileDialog::Init_Impl
if
(
nStyle
&
PickerFlags
::
ReadOnly
)
{
_pCbReadOnly
->
SetHelpId
(
HID_FILEOPEN_READONLY
);
_pCbReadOnly
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_READONLY
)
);
_pCbReadOnly
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_READONLY
)
);
_pCbReadOnly
->
SetClickHdl
(
LINK
(
this
,
SvtFileDialog
,
ClickHdl_Impl
)
);
_pCbReadOnly
->
Show
();
}
if
(
nStyle
&
PickerFlags
::
Password
)
{
pImpl
->
_pCbPassword
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_PASSWORD
)
);
pImpl
->
_pCbPassword
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_PASSWORD
)
);
pImpl
->
_pCbPassword
->
SetClickHdl
(
LINK
(
this
,
SvtFileDialog
,
ClickHdl_Impl
)
);
pImpl
->
_pCbPassword
->
Show
();
}
...
...
@@ -657,15 +657,15 @@ void SvtFileDialog::Init_Impl
if
(
nStyle
&
PickerFlags
::
PathDialog
)
{
pImpl
->
_pFtFileName
->
SetText
(
Svt
ResId
(
STR_PATHNAME
)
);
pImpl
->
_pFtFileName
->
SetText
(
Fps
ResId
(
STR_PATHNAME
)
);
nResId
=
STR_PATHSELECT
;
nButtonResId
=
STR_BUTTONSELECT
;
}
SetText
(
Svt
ResId
(
nResId
)
);
SetText
(
Fps
ResId
(
nResId
)
);
if
(
nButtonResId
)
pImpl
->
_pBtnFileOpen
->
SetText
(
Svt
ResId
(
nButtonResId
)
);
pImpl
->
_pBtnFileOpen
->
SetText
(
Fps
ResId
(
nButtonResId
)
);
if
(
FILEDLG_TYPE_FILEDLG
!=
pImpl
->
_eDlgType
)
{
...
...
@@ -742,7 +742,7 @@ IMPL_LINK_NOARG( SvtFileDialog, NewFolderHdl_Impl, Button*, void)
SmartContent
aContent
(
_pFileView
->
GetViewURL
(
)
);
OUString
aTitle
;
aContent
.
getTitle
(
aTitle
);
ScopedVclPtrInstance
<
QueryFolderNameDialog
>
aDlg
(
this
,
aTitle
,
SVT_RESSTR
(
STR_SVT_NEW_FOLDER
));
ScopedVclPtrInstance
<
QueryFolderNameDialog
>
aDlg
(
this
,
aTitle
,
FpsResId
(
STR_SVT_NEW_FOLDER
));
bool
bHandled
=
false
;
while
(
!
bHandled
)
...
...
@@ -1068,7 +1068,7 @@ void SvtFileDialog::OpenHdl_Impl(void* pVoid)
{
if
(
::
utl
::
UCBContentHelper
::
Exists
(
aFileObj
.
GetMainURL
(
INetURLObject
::
DecodeMechanism
::
NONE
)
)
)
{
OUString
aMsg
=
SVT_RESSTR
(
STR_SVT_ALREADYEXISTOVERWRITE
);
OUString
aMsg
=
FpsResId
(
STR_SVT_ALREADYEXISTOVERWRITE
);
aMsg
=
aMsg
.
replaceFirst
(
"$filename$"
,
aFileObj
.
getName
(
INetURLObject
::
LAST_SEGMENT
,
true
,
INetURLObject
::
DecodeMechanism
::
WithCharset
)
...
...
@@ -1106,7 +1106,7 @@ void SvtFileDialog::OpenHdl_Impl(void* pVoid)
if
(
!
bExists
)
{
OUString
sError
(
SVT_RESSTR
(
RID_FILEOPEN_NOTEXISTENTFILE
)
);
OUString
sError
(
FpsResId
(
RID_FILEOPEN_NOTEXISTENTFILE
)
);
OUString
sInvalidFile
(
aFileObj
.
GetMainURL
(
INetURLObject
::
DecodeMechanism
::
ToIUri
)
);
if
(
INetProtocol
::
File
==
aFileObj
.
GetProtocol
()
)
...
...
@@ -1825,7 +1825,7 @@ short SvtFileDialog::PrepareExecute()
if
(
bEmpty
)
{
ScopedVclPtrInstance
<
MessageDialog
>
aBox
(
this
,
SVT_RESSTR
(
STR_SVT_NOREMOVABLEDEVICE
));
ScopedVclPtrInstance
<
MessageDialog
>
aBox
(
this
,
FpsResId
(
STR_SVT_NOREMOVABLEDEVICE
));
aBox
->
Execute
();
return
0
;
}
...
...
@@ -1881,7 +1881,7 @@ short SvtFileDialog::PrepareExecute()
// set up initial filter
sal_uInt16
nFilterCount
=
GetFilterCount
();
OUString
aAll
=
SvtResId
(
STR_FILTERNAME_ALL
).
toString
(
);
OUString
aAll
=
FpsResId
(
STR_FILTERNAME_ALL
);
bool
bHasAll
=
pImpl
->
HasFilterListEntry
(
aAll
);
if
(
pImpl
->
GetCurFilter
()
||
nFilterCount
==
1
||
(
nFilterCount
==
2
&&
bHasAll
)
)
{
...
...
@@ -2434,7 +2434,7 @@ void SvtFileDialog::AddControls_Impl( )
// create the "insert as link" checkbox, if needed
if
(
_nPickerFlags
&
PickerFlags
::
InsertAsLink
)
{
_pCbLinkBox
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_INSERT_AS_LINK
)
);
_pCbLinkBox
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_INSERT_AS_LINK
)
);
_pCbLinkBox
->
SetHelpId
(
HID_FILEDLG_LINK_CB
);
_pCbLinkBox
->
SetClickHdl
(
LINK
(
this
,
SvtFileDialog
,
ClickHdl_Impl
)
);
_pCbLinkBox
->
Show
();
...
...
@@ -2449,7 +2449,7 @@ void SvtFileDialog::AddControls_Impl( )
pImpl
->
DisableFilterBoxAutoWidth
();
// "preview"
_pCbPreviewBox
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_SHOW_PREVIEW
)
);
_pCbPreviewBox
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_SHOW_PREVIEW
)
);
_pCbPreviewBox
->
SetHelpId
(
HID_FILEDLG_PREVIEW_CB
);
_pCbPreviewBox
->
SetClickHdl
(
LINK
(
this
,
SvtFileDialog
,
ClickHdl_Impl
)
);
_pCbPreviewBox
->
Show
();
...
...
@@ -2462,12 +2462,12 @@ void SvtFileDialog::AddControls_Impl( )
_pPrevBmp
->
SetBackground
(
Wallpaper
(
Color
(
COL_WHITE
)
)
);
_pPrevBmp
->
SetSizePixel
(
_pPrevWin
->
GetSizePixel
());
_pPrevBmp
->
Show
();
_pPrevBmp
->
SetAccessibleName
(
SVT_RESSTR
(
STR_PREVIEW
));
_pPrevBmp
->
SetAccessibleName
(
FpsResId
(
STR_PREVIEW
));
}
if
(
_nPickerFlags
&
PickerFlags
::
AutoExtension
)
{
pImpl
->
_pCbAutoExtension
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_AUTO_EXTENSION
)
);
pImpl
->
_pCbAutoExtension
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_AUTO_EXTENSION
)
);
pImpl
->
_pCbAutoExtension
->
Check
();
pImpl
->
_pCbAutoExtension
->
SetClickHdl
(
LINK
(
this
,
SvtFileDialog
,
AutoExtensionHdl_Impl
)
);
pImpl
->
_pCbAutoExtension
->
Show
();
...
...
@@ -2475,21 +2475,21 @@ void SvtFileDialog::AddControls_Impl( )
if
(
_nPickerFlags
&
PickerFlags
::
FilterOptions
)
{
pImpl
->
_pCbOptions
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_FILTER_OPTIONS
)
);
pImpl
->
_pCbOptions
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_FILTER_OPTIONS
)
);
pImpl
->
_pCbOptions
->
SetClickHdl
(
LINK
(
this
,
SvtFileDialog
,
ClickHdl_Impl
)
);
pImpl
->
_pCbOptions
->
Show
();
}
if
(
_nPickerFlags
&
PickerFlags
::
Selection
)
{
_pCbSelection
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_SELECTION
)
);
_pCbSelection
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_SELECTION
)
);
_pCbSelection
->
SetClickHdl
(
LINK
(
this
,
SvtFileDialog
,
ClickHdl_Impl
)
);
_pCbSelection
->
Show
();
}
if
(
_nPickerFlags
&
PickerFlags
::
PlayButton
)
{
_pPbPlay
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_PLAY
)
);
_pPbPlay
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_PLAY
)
);
_pPbPlay
->
SetHelpId
(
HID_FILESAVE_DOPLAY
);
_pPbPlay
->
SetClickHdl
(
LINK
(
this
,
SvtFileDialog
,
PlayButtonHdl_Impl
)
);
_pPbPlay
->
Show
();
...
...
@@ -2497,7 +2497,7 @@ void SvtFileDialog::AddControls_Impl( )
if
(
_nPickerFlags
&
PickerFlags
::
ShowVersions
)
{
pImpl
->
_pFtFileVersion
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_VERSION
)
);
pImpl
->
_pFtFileVersion
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_VERSION
)
);
pImpl
->
_pFtFileVersion
->
Show
();
pImpl
->
_pLbFileVersion
->
SetHelpId
(
HID_FILEOPEN_VERSION
);
...
...
@@ -2505,7 +2505,7 @@ void SvtFileDialog::AddControls_Impl( )
}
else
if
(
_nPickerFlags
&
PickerFlags
::
Templates
)
{
pImpl
->
_pFtTemplates
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_TEMPLATES
)
);
pImpl
->
_pFtTemplates
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_TEMPLATES
)
);
pImpl
->
_pFtTemplates
->
Show
();
pImpl
->
_pLbTemplates
->
SetHelpId
(
HID_FILEOPEN_VERSION
);
...
...
@@ -2516,14 +2516,14 @@ void SvtFileDialog::AddControls_Impl( )
}
else
if
(
_nPickerFlags
&
PickerFlags
::
ImageTemplate
)
{
pImpl
->
_pFtImageTemplates
->
SetText
(
Svt
ResId
(
STR_SVT_FILEPICKER_IMAGE_TEMPLATE
)
);
pImpl
->
_pFtImageTemplates
->
SetText
(
Fps
ResId
(
STR_SVT_FILEPICKER_IMAGE_TEMPLATE
)
);
pImpl
->
_pFtImageTemplates
->
Show
();
pImpl
->
_pLbImageTemplates
->
SetHelpId
(
HID_FILEOPEN_IMAGE_TEMPLATE
);
pImpl
->
_pLbImageTemplates
->
Show
();
}
pImpl
->
_pPlaces
=
VclPtr
<
PlacesListBox
>::
Create
(
_pContainer
,
this
,
SVT_RESSTR
(
STR_PLACES_TITLE
),
WB_BORDER
);
pImpl
->
_pPlaces
=
VclPtr
<
PlacesListBox
>::
Create
(
_pContainer
,
this
,
FpsResId
(
STR_PLACES_TITLE
),
WB_BORDER
);
pImpl
->
_pPlaces
->
SetHelpId
(
"SVT_HID_FILESAVE_PLACES_LISTBOX"
);
Size
aSize
(
LogicToPixel
(
Size
(
50
,
85
),
MapUnit
::
MapAppFont
));
pImpl
->
_pPlaces
->
set_height_request
(
aSize
.
Height
());
...
...
@@ -2692,7 +2692,7 @@ void SvtFileDialog::appendDefaultExtension(OUString& _rFileName,
void
SvtFileDialog
::
initDefaultPlaces
(
)
{
PlacePtr
pRootPlace
(
new
Place
(
SVT_RESSTR
(
STR_DEFAULT_DIRECTORY
),
GetStandardDir
()
)
);
PlacePtr
pRootPlace
(
new
Place
(
FpsResId
(
STR_DEFAULT_DIRECTORY
),
GetStandardDir
()
)
);
pImpl
->
_pPlaces
->
AppendPlace
(
pRootPlace
);
// Load from user settings
...
...
framework/inc/classes/fwkresid.hxx
Dosyayı görüntüle @
2fec2ab3
...
...
@@ -34,8 +34,6 @@ class FWE_DLLPUBLIC FwkResId : public ResId
static
ResMgr
*
GetResManager
();
};
#define FWK_RESSTR(x) FwkResId(x).toString()
}
#endif // __FRAMEWORK_CLASSES_FWKRESID
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment