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
535e9e7f
Kaydet (Commit)
535e9e7f
authored
May 06, 2012
tarafından
Caolán McNamara
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
tidy ResId String/rtl::OUString cast foo
Change-Id: I1e8fca182a27efb403e903b424ca4c1c0d3acc49
üst
0672b7a9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
37 additions
and
39 deletions
+37
-39
alreadyopen.cxx
uui/source/alreadyopen.cxx
+5
-5
filechanged.cxx
uui/source/filechanged.cxx
+4
-4
iahndl-locking.cxx
uui/source/iahndl-locking.cxx
+8
-10
iahndl.cxx
uui/source/iahndl.cxx
+2
-2
lockfailed.cxx
uui/source/lockfailed.cxx
+3
-3
nameclashdlg.cxx
uui/source/nameclashdlg.cxx
+3
-3
openlocked.cxx
uui/source/openlocked.cxx
+3
-3
passworddlg.cxx
uui/source/passworddlg.cxx
+6
-6
trylater.cxx
uui/source/trylater.cxx
+3
-3
No files found.
uui/source/alreadyopen.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -31,23 +31,23 @@
AlreadyOpenQueryBox
::
AlreadyOpenQueryBox
(
Window
*
pParent
,
ResMgr
*
pResMgr
,
const
String
&
aMessage
,
sal_Bool
bIsStoring
)
:
MessBox
(
pParent
,
0
,
String
(
ResId
(
STR_ALREADYOPEN_TITLE
,
*
pResMgr
)
),
ResId
(
STR_ALREADYOPEN_TITLE
,
*
pResMgr
).
toString
(
),
aMessage
)
{
SetImage
(
QueryBox
::
GetStandardImage
()
);
if
(
bIsStoring
)
{
AddButton
(
String
(
ResId
(
STR_ALREADYOPEN_RETRY_SAVE_BTN
,
*
pResMgr
)
),
RET_YES
,
AddButton
(
ResId
(
STR_ALREADYOPEN_RETRY_SAVE_BTN
,
*
pResMgr
).
toString
(
),
RET_YES
,
BUTTONDIALOG_DEFBUTTON
|
BUTTONDIALOG_OKBUTTON
|
BUTTONDIALOG_FOCUSBUTTON
);
AddButton
(
String
(
ResId
(
STR_ALREADYOPEN_SAVE_BTN
,
*
pResMgr
)
),
RET_NO
,
0
);
AddButton
(
ResId
(
STR_ALREADYOPEN_SAVE_BTN
,
*
pResMgr
).
toString
(
),
RET_NO
,
0
);
AddButton
(
BUTTON_CANCEL
,
RET_CANCEL
,
BUTTONDIALOG_CANCELBUTTON
);
}
else
{
AddButton
(
String
(
ResId
(
STR_ALREADYOPEN_READONLY_BTN
,
*
pResMgr
)
),
RET_YES
,
AddButton
(
ResId
(
STR_ALREADYOPEN_READONLY_BTN
,
*
pResMgr
).
toString
(
),
RET_YES
,
BUTTONDIALOG_DEFBUTTON
|
BUTTONDIALOG_OKBUTTON
|
BUTTONDIALOG_FOCUSBUTTON
);
AddButton
(
String
(
ResId
(
STR_ALREADYOPEN_OPEN_BTN
,
*
pResMgr
)
),
RET_NO
,
0
);
AddButton
(
ResId
(
STR_ALREADYOPEN_OPEN_BTN
,
*
pResMgr
).
toString
(
),
RET_NO
,
0
);
AddButton
(
BUTTON_CANCEL
,
RET_CANCEL
,
BUTTONDIALOG_CANCELBUTTON
);
}
...
...
uui/source/filechanged.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -31,17 +31,17 @@
FileChangedQueryBox
::
FileChangedQueryBox
(
Window
*
pParent
,
ResMgr
*
pResMgr
)
:
MessBox
(
pParent
,
0
,
String
(
ResId
(
STR_FILECHANGED_TITLE
,
*
pResMgr
)
),
ResId
(
STR_FILECHANGED_TITLE
,
*
pResMgr
).
toString
(
),
String
::
EmptyString
()
)
{
SetImage
(
QueryBox
::
GetStandardImage
()
);
AddButton
(
String
(
ResId
(
STR_FILECHANGED_SAVEANYWAY_BTN
,
*
pResMgr
)
),
RET_YES
,
BUTTONDIALOG_DEFBUTTON
|
BUTTONDIALOG_OKBUTTON
|
BUTTONDIALOG_FOCUSBUTTON
);
AddButton
(
ResId
(
STR_FILECHANGED_SAVEANYWAY_BTN
,
*
pResMgr
).
toString
(
),
RET_YES
,
BUTTONDIALOG_DEFBUTTON
|
BUTTONDIALOG_OKBUTTON
|
BUTTONDIALOG_FOCUSBUTTON
);
AddButton
(
BUTTON_CANCEL
,
RET_CANCEL
,
BUTTONDIALOG_CANCELBUTTON
);
SetButtonHelpText
(
RET_YES
,
String
::
EmptyString
()
);
SetMessText
(
String
(
ResId
(
STR_FILECHANGED_MSG
,
*
pResMgr
)
)
);
SetMessText
(
ResId
(
STR_FILECHANGED_MSG
,
*
pResMgr
).
toString
()
);
}
FileChangedQueryBox
::~
FileChangedQueryBox
()
...
...
uui/source/iahndl-locking.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -97,10 +97,9 @@ handleLockedDocumentRequest_(
{
aArguments
.
push_back
(
!
aInfo
.
isEmpty
()
?
aInfo
:
::
rtl
::
OUString
(
String
(
ResId
(
STR_UNKNOWNUSER
,
*
xManager
.
get
()
)
)
)
);
aMessage
=
String
(
ResId
(
STR_OPENLOCKED_MSG
,
*
xManager
.
get
()
)
);
:
ResId
(
STR_UNKNOWNUSER
,
*
xManager
.
get
()
).
toString
()
);
aMessage
=
ResId
(
STR_OPENLOCKED_MSG
,
*
xManager
.
get
()).
toString
();
aMessage
=
UUIInteractionHelper
::
replaceMessageWithArguments
(
aMessage
,
aArguments
);
...
...
@@ -112,10 +111,9 @@ handleLockedDocumentRequest_(
{
aArguments
.
push_back
(
!
aInfo
.
isEmpty
()
?
aInfo
:
::
rtl
::
OUString
(
String
(
ResId
(
STR_UNKNOWNUSER
,
*
xManager
.
get
()
)
)
)
);
aMessage
=
String
(
ResId
(
STR_TRYLATER_MSG
,
*
xManager
.
get
()
)
);
:
ResId
(
STR_UNKNOWNUSER
,
*
xManager
.
get
()
).
toString
()
);
aMessage
=
ResId
(
STR_TRYLATER_MSG
,
*
xManager
.
get
()).
toString
();
aMessage
=
UUIInteractionHelper
::
replaceMessageWithArguments
(
aMessage
,
aArguments
);
...
...
@@ -127,10 +125,10 @@ handleLockedDocumentRequest_(
nMode
==
UUI_DOC_OWN_SAVE_LOCK
)
{
aArguments
.
push_back
(
aInfo
);
aMessage
=
String
(
ResId
(
nMode
==
UUI_DOC_OWN_SAVE_LOCK
aMessage
=
ResId
(
nMode
==
UUI_DOC_OWN_SAVE_LOCK
?
STR_ALREADYOPEN_SAVE_MSG
:
STR_ALREADYOPEN_MSG
,
*
xManager
.
get
()
)
);
*
xManager
.
get
()
)
.
toString
(
);
aMessage
=
UUIInteractionHelper
::
replaceMessageWithArguments
(
aMessage
,
aArguments
);
...
...
uui/source/iahndl.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -1312,10 +1312,10 @@ UUIInteractionHelper::handleGenericErrorRequest(
rtl
::
OUString
aTitle
(
utl
::
ConfigManager
::
getProductName
()
);
::
rtl
::
OUString
aErrTitle
=
String
(
ResId
(
nError
==
ERRCODE_SFX_BROKENSIGNATURE
=
ResId
(
nError
==
ERRCODE_SFX_BROKENSIGNATURE
?
STR_WARNING_BROKENSIGNATURE_TITLE
:
STR_WARNING_INCOMPLETE_ENCRYPTION_TITLE
,
*
xManager
.
get
()
)
);
*
xManager
.
get
()
)
.
toString
(
);
if
(
!
aTitle
.
isEmpty
()
&&
!
aErrTitle
.
isEmpty
()
)
aTitle
+=
::
rtl
::
OUString
(
RTL_CONSTASCII_USTRINGPARAM
(
" - "
)
);
...
...
uui/source/lockfailed.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -33,7 +33,7 @@
LockFailedQueryBox
::
LockFailedQueryBox
(
Window
*
pParent
,
ResMgr
*
pResMgr
)
:
MessBox
(
pParent
,
0
,
String
(
ResId
(
STR_LOCKFAILED_TITLE
,
*
pResMgr
)
),
ResId
(
STR_LOCKFAILED_TITLE
,
*
pResMgr
).
toString
(
),
String
::
EmptyString
()
)
{
SetImage
(
ErrorBox
::
GetStandardImage
()
);
...
...
@@ -41,8 +41,8 @@ LockFailedQueryBox::LockFailedQueryBox( Window* pParent, ResMgr* pResMgr ) :
AddButton
(
BUTTON_OK
,
RET_OK
,
BUTTONDIALOG_OKBUTTON
);
AddButton
(
BUTTON_CANCEL
,
RET_CANCEL
,
BUTTONDIALOG_CANCELBUTTON
);
SetMessText
(
String
(
ResId
(
STR_LOCKFAILED_MSG
,
*
pResMgr
)
)
);
SetCheckBoxText
(
String
(
ResId
(
STR_LOCKFAILED_DONTSHOWAGAIN
,
*
pResMgr
)
)
);
SetMessText
(
ResId
(
STR_LOCKFAILED_MSG
,
*
pResMgr
).
toString
()
);
SetCheckBoxText
(
ResId
(
STR_LOCKFAILED_DONTSHOWAGAIN
,
*
pResMgr
).
toString
()
);
}
LockFailedQueryBox
::~
LockFailedQueryBox
()
...
...
uui/source/nameclashdlg.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -83,11 +83,11 @@ NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
String
aInfo
;
if
(
bAllowOverwrite
)
{
aInfo
=
String
(
ResId
(
STR_RENAME_OR_REPLACE
,
*
pResMgr
)
);
aInfo
=
ResId
(
STR_RENAME_OR_REPLACE
,
*
pResMgr
).
toString
(
);
}
else
{
aInfo
=
String
(
ResId
(
STR_NAME_CLASH_RENAME_ONLY
,
*
pResMgr
)
);
aInfo
=
ResId
(
STR_NAME_CLASH_RENAME_ONLY
,
*
pResMgr
).
toString
(
);
maBtnOverwrite
.
Hide
();
}
...
...
@@ -95,7 +95,7 @@ NameClashDialog::NameClashDialog( Window* pParent, ResMgr* pResMgr,
if
(
osl
::
FileBase
::
E_None
!=
osl
::
FileBase
::
getSystemPathFromFileURL
(
rTargetFolderURL
,
aPath
)
)
aPath
=
rTargetFolderURL
;
maSameName
=
String
(
ResId
(
STR_SAME_NAME_USED
,
*
pResMgr
)
);
maSameName
=
ResId
(
STR_SAME_NAME_USED
,
*
pResMgr
).
toString
(
);
aInfo
.
SearchAndReplaceAscii
(
"%NAME"
,
rClashingName
);
aInfo
.
SearchAndReplaceAscii
(
"%FOLDER"
,
aPath
);
...
...
uui/source/openlocked.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -31,15 +31,15 @@
OpenLockedQueryBox
::
OpenLockedQueryBox
(
Window
*
pParent
,
ResMgr
*
pResMgr
,
const
String
&
aMessage
)
:
MessBox
(
pParent
,
0
,
String
(
ResId
(
STR_OPENLOCKED_TITLE
,
*
pResMgr
)
),
ResId
(
STR_OPENLOCKED_TITLE
,
*
pResMgr
).
toString
(
),
aMessage
)
{
SetImage
(
QueryBox
::
GetStandardImage
()
);
AddButton
(
String
(
ResId
(
STR_OPENLOCKED_OPENREADONLY_BTN
,
*
pResMgr
)
),
RET_YES
,
AddButton
(
ResId
(
STR_OPENLOCKED_OPENREADONLY_BTN
,
*
pResMgr
).
toString
(
),
RET_YES
,
BUTTONDIALOG_DEFBUTTON
|
BUTTONDIALOG_OKBUTTON
|
BUTTONDIALOG_FOCUSBUTTON
);
AddButton
(
String
(
ResId
(
STR_OPENLOCKED_OPENCOPY_BTN
,
*
pResMgr
)
),
RET_NO
,
0
);
AddButton
(
ResId
(
STR_OPENLOCKED_OPENCOPY_BTN
,
*
pResMgr
).
toString
(
),
RET_NO
,
0
);
AddButton
(
BUTTON_CANCEL
,
RET_CANCEL
,
BUTTONDIALOG_CANCELBUTTON
);
SetButtonHelpText
(
RET_YES
,
String
()
);
...
...
uui/source/passworddlg.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -73,13 +73,13 @@ PasswordDialog::PasswordDialog(
{
const
sal_uInt16
nOpenToModifyErrStrId
=
bOpenToModify
?
STR_ERROR_PASSWORD_TO_MODIFY_WRONG
:
STR_ERROR_PASSWORD_TO_OPEN_WRONG
;
const
sal_uInt16
nErrStrId
=
bIsSimplePasswordRequest
?
STR_ERROR_SIMPLE_PASSWORD_WRONG
:
nOpenToModifyErrStrId
;
String
aErrorMsg
(
ResId
(
nErrStrId
,
*
pResourceMgr
));
rtl
::
OUString
aErrorMsg
(
ResId
(
nErrStrId
,
*
pResourceMgr
).
toString
(
));
ErrorBox
aErrorBox
(
this
,
WB_OK
,
aErrorMsg
);
aErrorBox
.
Execute
();
}
// default settings for enter password or reenter passwd...
String
aTitle
(
ResId
(
STR_TITLE_ENTER_PASSWORD
,
*
pResourceMgr
)
);
rtl
::
OUString
aTitle
(
ResId
(
STR_TITLE_ENTER_PASSWORD
,
*
pResourceMgr
).
toString
()
);
aFTConfirmPassword
.
Hide
();
aEDConfirmPassword
.
Hide
();
aFTConfirmPassword
.
Enable
(
sal_False
);
...
...
@@ -88,9 +88,9 @@ PasswordDialog::PasswordDialog(
// settings for create password
if
(
nDialogMode
==
task
::
PasswordRequestMode_PASSWORD_CREATE
)
{
aTitle
=
String
(
ResId
(
STR_TITLE_CREATE_PASSWORD
,
*
pResourceMgr
)
);
aTitle
=
ResId
(
STR_TITLE_CREATE_PASSWORD
,
*
pResourceMgr
).
toString
(
);
aFTConfirmPassword
.
SetText
(
String
(
ResId
(
STR_CONFIRM_SIMPLE_PASSWORD
,
*
pResourceMgr
)
)
);
aFTConfirmPassword
.
SetText
(
ResId
(
STR_CONFIRM_SIMPLE_PASSWORD
,
*
pResourceMgr
).
toString
()
);
aFTConfirmPassword
.
Show
();
aEDConfirmPassword
.
Show
();
...
...
@@ -116,12 +116,12 @@ PasswordDialog::PasswordDialog(
SetText
(
aTitle
);
sal_uInt16
nStrId
=
bOpenToModify
?
STR_ENTER_PASSWORD_TO_MODIFY
:
STR_ENTER_PASSWORD_TO_OPEN
;
aFTPassword
.
SetText
(
String
(
ResId
(
nStrId
,
*
pResourceMgr
)
)
);
aFTPassword
.
SetText
(
ResId
(
nStrId
,
*
pResourceMgr
).
toString
()
);
aFTPassword
.
SetText
(
aFTPassword
.
GetText
()
+
aDocURL
);
if
(
bIsSimplePasswordRequest
)
{
DBG_ASSERT
(
aDocURL
.
isEmpty
(),
"A simple password request should not have a document URL! Use document password request instead."
);
aFTPassword
.
SetText
(
String
(
ResId
(
STR_ENTER_SIMPLE_PASSWORD
,
*
pResourceMgr
)
)
);
aFTPassword
.
SetText
(
ResId
(
STR_ENTER_SIMPLE_PASSWORD
,
*
pResourceMgr
).
toString
()
);
}
FreeResource
();
...
...
uui/source/trylater.cxx
Dosyayı görüntüle @
535e9e7f
...
...
@@ -31,14 +31,14 @@
TryLaterQueryBox
::
TryLaterQueryBox
(
Window
*
pParent
,
ResMgr
*
pResMgr
,
const
String
&
aMessage
)
:
MessBox
(
pParent
,
0
,
String
(
ResId
(
STR_TRYLATER_TITLE
,
*
pResMgr
)
),
ResId
(
STR_TRYLATER_TITLE
,
*
pResMgr
).
toString
(
),
aMessage
)
{
SetImage
(
QueryBox
::
GetStandardImage
()
);
AddButton
(
String
(
ResId
(
STR_TRYLATER_RETRYSAVING_BTN
,
*
pResMgr
)
),
RET_YES
,
AddButton
(
ResId
(
STR_TRYLATER_RETRYSAVING_BTN
,
*
pResMgr
).
toString
(
),
RET_YES
,
BUTTONDIALOG_DEFBUTTON
|
BUTTONDIALOG_OKBUTTON
|
BUTTONDIALOG_FOCUSBUTTON
);
AddButton
(
String
(
ResId
(
STR_TRYLATER_SAVEAS_BTN
,
*
pResMgr
)
),
RET_NO
,
0
);
AddButton
(
ResId
(
STR_TRYLATER_SAVEAS_BTN
,
*
pResMgr
).
toString
(
),
RET_NO
,
0
);
AddButton
(
BUTTON_CANCEL
,
RET_CANCEL
,
BUTTONDIALOG_CANCELBUTTON
);
SetButtonHelpText
(
RET_YES
,
String
::
EmptyString
()
);
...
...
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