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
e256519a
Kaydet (Commit)
e256519a
authored
Mar 19, 2017
tarafından
Matteo Casalin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
OUString-related simplifications
Change-Id: I2f4099410bcdb9e04583cd37bf63ef86ce81f7e5
üst
4a268ebc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
28 additions
and
56 deletions
+28
-56
viewfrm.cxx
sfx2/source/view/viewfrm.cxx
+24
-48
viewfrm2.cxx
sfx2/source/view/viewfrm2.cxx
+4
-8
No files found.
sfx2/source/view/viewfrm.cxx
Dosyayı görüntüle @
e256519a
...
...
@@ -239,7 +239,7 @@ static bool AskPasswordToModify_Impl( const uno::Reference< task::XInteractionHa
else
{
// the binary format
bResult
=
(
SfxMedium
::
CreatePasswordToModifyHash
(
pPasswordRequest
->
getPasswordToModify
(),
OUString
(
"com.sun.star.text.TextDocument"
).
equals
(
pFilter
->
GetServiceName
()
)
)
==
nPasswordHash
);
bResult
=
(
SfxMedium
::
CreatePasswordToModifyHash
(
pPasswordRequest
->
getPasswordToModify
(),
pFilter
->
GetServiceName
()
==
"com.sun.star.text.TextDocument"
)
==
nPasswordHash
);
}
}
else
...
...
@@ -718,7 +718,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq )
{
SfxAllItemSet
aSet
(
pApp
->
GetPool
()
);
aSet
.
Put
(
SfxStringItem
(
SID_FILE_NAME
,
pMedium
->
GetName
()
)
);
aSet
.
Put
(
SfxStringItem
(
SID_TARGETNAME
,
OUString
(
"_blank"
)
)
);
aSet
.
Put
(
SfxStringItem
(
SID_TARGETNAME
,
"_blank"
)
);
if
(
pSavedOptions
)
aSet
.
Put
(
*
pSavedOptions
);
if
(
pSavedReferer
)
...
...
@@ -924,30 +924,18 @@ void SfxViewFrame::StateHistory_Impl( SfxItemSet &rSet )
rSet
.
DisableItem
(
SID_CLEARHISTORY
);
if
(
pShUndoMgr
&&
pShUndoMgr
->
GetUndoActionCount
()
)
{
OUString
aTmp
(
SvtResId
(
STR_UNDO
).
toString
());
aTmp
+=
pShUndoMgr
->
GetUndoActionComment
();
rSet
.
Put
(
SfxStringItem
(
SID_UNDO
,
aTmp
)
);
}
rSet
.
Put
(
SfxStringItem
(
SID_UNDO
,
SvtResId
(
STR_UNDO
).
toString
()
+
pShUndoMgr
->
GetUndoActionComment
()
)
);
else
rSet
.
DisableItem
(
SID_UNDO
);
if
(
pShUndoMgr
&&
pShUndoMgr
->
GetRedoActionCount
()
)
{
OUString
aTmp
(
SvtResId
(
STR_REDO
).
toString
());
aTmp
+=
pShUndoMgr
->
GetRedoActionComment
();
rSet
.
Put
(
SfxStringItem
(
SID_REDO
,
aTmp
)
);
}
rSet
.
Put
(
SfxStringItem
(
SID_REDO
,
SvtResId
(
STR_REDO
).
toString
()
+
pShUndoMgr
->
GetRedoActionComment
()
)
);
else
rSet
.
DisableItem
(
SID_REDO
);
SfxRepeatTarget
*
pTarget
=
pSh
->
GetRepeatTarget
();
if
(
pShUndoMgr
&&
pTarget
&&
pShUndoMgr
->
GetRepeatActionCount
()
&&
pShUndoMgr
->
CanRepeat
(
*
pTarget
)
)
{
OUString
aTmp
(
SvtResId
(
STR_REPEAT
).
toString
());
aTmp
+=
pShUndoMgr
->
GetRepeatActionComment
(
*
pTarget
);
rSet
.
Put
(
SfxStringItem
(
SID_REPEAT
,
aTmp
)
);
}
if
(
pShUndoMgr
&&
pTarget
&&
pShUndoMgr
->
GetRepeatActionCount
()
&&
pShUndoMgr
->
CanRepeat
(
*
pTarget
)
)
rSet
.
Put
(
SfxStringItem
(
SID_REPEAT
,
SvtResId
(
STR_REPEAT
).
toString
()
+
pShUndoMgr
->
GetRepeatActionComment
(
*
pTarget
)
)
);
else
rSet
.
DisableItem
(
SID_REPEAT
);
}
...
...
@@ -1171,7 +1159,7 @@ void SfxViewFrame::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
SignatureState
nSignatureState
=
GetObjectShell
()
->
GetDocumentSignatureState
();
InfoBarType
aInfoBarType
(
InfoBarType
::
Info
);
OUString
sMessage
(
""
)
;
OUString
sMessage
;
switch
(
nSignatureState
)
{
...
...
@@ -2370,9 +2358,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEra
else
nEndPos
++
;
OUString
aEndStr
=
rStr
.
copy
(
nEndPos
);
rStr
=
rStr
.
copy
(
0
,
nStartPos
);
rStr
+=
aEndStr
;
rStr
=
rStr
.
copy
(
0
,
nStartPos
)
+
rStr
.
copy
(
nEndPos
);
}
if
(
bEraseTrailingEmptyLines
&&
nStartPos
!=
-
1
)
{
...
...
@@ -2382,11 +2368,7 @@ void CutLines( OUString& rStr, sal_Int32 nStartLine, sal_Int32 nLines, bool bEra
n
++
;
if
(
n
>
nStartPos
)
{
OUString
aEndStr
=
rStr
.
copy
(
n
);
rStr
=
rStr
.
copy
(
0
,
nStartPos
);
rStr
+=
aEndStr
;
}
rStr
=
rStr
.
copy
(
0
,
nStartPos
)
+
rStr
.
copy
(
n
);
}
}
...
...
@@ -2493,29 +2475,26 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
xLibCont
,
css
::
uno
::
UNO_QUERY
);
OUString
sLib
(
aLibName
);
css
::
uno
::
Reference
<
css
::
container
::
XNameAccess
>
xLib
;
if
(
xRoot
->
hasByName
(
sLib
))
if
(
xRoot
->
hasByName
(
aLibName
))
{
// library must be loaded
aTemp
=
xRoot
->
getByName
(
sLib
);
xLibCont
->
loadLibrary
(
sLib
);
aTemp
=
xRoot
->
getByName
(
aLibName
);
xLibCont
->
loadLibrary
(
aLibName
);
aTemp
>>=
xLib
;
}
else
{
xLib
.
set
(
xLibCont
->
createLibrary
(
sLib
),
css
::
uno
::
UNO_QUERY
);
xLib
.
set
(
xLibCont
->
createLibrary
(
aLibName
),
css
::
uno
::
UNO_QUERY
);
}
// pack the macro as direct usable "sub" routine
OUString
sCode
;
OUStringBuffer
sRoutine
(
10000
);
OUString
sMacroName
(
aMacroName
);
bool
bReplace
=
false
;
// get module
OUString
sModule
(
aModuleName
);
if
(
xLib
->
hasByName
(
sModule
))
if
(
xLib
->
hasByName
(
aModuleName
))
{
if
(
!
aOUSource
.
isEmpty
()
)
{
...
...
@@ -2523,7 +2502,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
}
else
{
aTemp
=
xLib
->
getByName
(
sModul
e
);
aTemp
=
xLib
->
getByName
(
aModuleNam
e
);
aTemp
>>=
sCode
;
sRoutine
.
append
(
sCode
);
}
...
...
@@ -2533,7 +2512,7 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
// append new method
sRoutine
.
append
(
"
\n
sub "
);
sRoutine
.
append
(
s
MacroName
);
sRoutine
.
append
(
a
MacroName
);
sRoutine
.
append
(
"
\n
"
);
sRoutine
.
append
(
sMacro
);
sRoutine
.
append
(
"
\n
end sub
\n
"
);
...
...
@@ -2545,14 +2524,14 @@ void SfxViewFrame::AddDispatchMacroToBasic_Impl( const OUString& sMacro )
css
::
uno
::
Reference
<
css
::
container
::
XNameContainer
>
xModulCont
(
xLib
,
css
::
uno
::
UNO_QUERY
);
xModulCont
->
replaceByName
(
sModul
e
,
aTemp
);
xModulCont
->
replaceByName
(
aModuleNam
e
,
aTemp
);
}
else
{
css
::
uno
::
Reference
<
css
::
container
::
XNameContainer
>
xModulCont
(
xLib
,
css
::
uno
::
UNO_QUERY
);
xModulCont
->
insertByName
(
sModul
e
,
aTemp
);
xModulCont
->
insertByName
(
aModuleNam
e
,
aTemp
);
}
// #i17355# update the Basic IDE
...
...
@@ -2586,7 +2565,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
case
SID_RECORDMACRO
:
{
// try to find any active recorder on this frame
OUString
sProperty
(
"DispatchRecorderSupplier"
);
const
OUString
sProperty
(
"DispatchRecorderSupplier"
);
css
::
uno
::
Reference
<
css
::
frame
::
XFrame
>
xFrame
(
GetFrame
().
GetFrameInterface
(),
css
::
uno
::
UNO_QUERY
);
...
...
@@ -2667,7 +2646,7 @@ void SfxViewFrame::MiscExec_Impl( SfxRequest& rReq )
if
(
xLayoutManager
.
is
()
)
{
OUString
aStatusbarResString
(
"private:resource/statusbar/statusbar"
);
const
OUString
aStatusbarResString
(
"private:resource/statusbar/statusbar"
);
// Evaluate parameter.
const
SfxBoolItem
*
pShowItem
=
rReq
.
GetArg
<
SfxBoolItem
>
(
rReq
.
GetSlot
());
bool
bShow
(
true
);
...
...
@@ -2783,12 +2762,11 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
break
;
}
OUString
sProperty
(
"DispatchRecorderSupplier"
);
css
::
uno
::
Reference
<
css
::
beans
::
XPropertySet
>
xSet
(
GetFrame
().
GetFrameInterface
(),
css
::
uno
::
UNO_QUERY
);
css
::
uno
::
Any
aProp
=
xSet
->
getPropertyValue
(
sProperty
);
css
::
uno
::
Any
aProp
=
xSet
->
getPropertyValue
(
"DispatchRecorderSupplier"
);
css
::
uno
::
Reference
<
css
::
frame
::
XDispatchRecorderSupplier
>
xSupplier
;
if
(
aProp
>>=
xSupplier
)
rSet
.
Put
(
SfxBoolItem
(
nWhich
,
xSupplier
.
is
()
)
);
...
...
@@ -2808,12 +2786,11 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
break
;
}
OUString
sProperty
(
"DispatchRecorderSupplier"
);
css
::
uno
::
Reference
<
css
::
beans
::
XPropertySet
>
xSet
(
GetFrame
().
GetFrameInterface
(),
css
::
uno
::
UNO_QUERY
);
css
::
uno
::
Any
aProp
=
xSet
->
getPropertyValue
(
sProperty
);
css
::
uno
::
Any
aProp
=
xSet
->
getPropertyValue
(
"DispatchRecorderSupplier"
);
css
::
uno
::
Reference
<
css
::
frame
::
XDispatchRecorderSupplier
>
xSupplier
;
if
(
!
(
aProp
>>=
xSupplier
)
||
!
xSupplier
.
is
()
)
rSet
.
DisableItem
(
nWhich
);
...
...
@@ -2832,8 +2809,7 @@ void SfxViewFrame::MiscState_Impl(SfxItemSet &rSet)
rSet
.
Put
(
SfxBoolItem
(
nWhich
,
false
));
else
{
OUString
aStatusbarResString
(
"private:resource/statusbar/statusbar"
);
bool
bShow
=
xLayoutManager
->
isElementVisible
(
aStatusbarResString
);
bool
bShow
=
xLayoutManager
->
isElementVisible
(
"private:resource/statusbar/statusbar"
);
rSet
.
Put
(
SfxBoolItem
(
nWhich
,
bShow
));
}
break
;
...
...
sfx2/source/view/viewfrm2.cxx
Dosyayı görüntüle @
e256519a
...
...
@@ -140,8 +140,7 @@ void SfxViewFrame::UpdateTitle()
OUString
aSbxName
=
pObjSh
->
SfxShell
::
GetName
();
if
(
IsVisible
()
)
{
aSbxName
+=
":"
;
aSbxName
+=
OUString
::
number
(
m_pImpl
->
nDocViewNo
);
aSbxName
+=
":"
+
OUString
::
number
(
m_pImpl
->
nDocViewNo
);
}
SetName
(
aSbxName
);
...
...
@@ -213,11 +212,10 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq )
}
SfxRequest
aReq
(
SID_OPENDOC
,
SfxCallMode
::
SYNCHRON
,
GetPool
()
);
OUString
aFact
(
"private:factory/"
);
aFact
+=
aFactName
;
const
OUString
aFact
(
"private:factory/"
+
aFactName
);
aReq
.
AppendItem
(
SfxStringItem
(
SID_FILE_NAME
,
aFact
)
);
aReq
.
AppendItem
(
SfxFrameItem
(
SID_DOCFRAME
,
&
GetFrame
()
)
);
aReq
.
AppendItem
(
SfxStringItem
(
SID_TARGETNAME
,
OUString
(
"_blank"
)
)
);
aReq
.
AppendItem
(
SfxStringItem
(
SID_TARGETNAME
,
"_blank"
)
);
SfxGetpApp
()
->
ExecuteSlot
(
aReq
);
const
SfxViewFrameItem
*
pItem
=
dynamic_cast
<
const
SfxViewFrameItem
*>
(
aReq
.
GetReturnValue
()
);
if
(
pItem
)
...
...
@@ -293,9 +291,7 @@ void SfxViewFrame::GetState_Impl( SfxItemSet &rSet )
{
if
(
!
m_pImpl
->
aFactoryName
.
isEmpty
()
)
{
OUString
aFact
(
"private:factory/"
);
aFact
+=
m_pImpl
->
aFactoryName
;
rSet
.
Put
(
SfxStringItem
(
nWhich
,
aFact
)
);
rSet
.
Put
(
SfxStringItem
(
nWhich
,
"private:factory/"
+
m_pImpl
->
aFactoryName
)
);
}
break
;
}
...
...
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