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
f8ef1fe9
Kaydet (Commit)
f8ef1fe9
authored
Haz 13, 2014
tarafından
Stephan Bergmann
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
loplugin:staticcall
Change-Id: I6cd46964c523c9393e9d249fdb43aaa38679fa06
üst
0e44fb66
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
31 additions
and
31 deletions
+31
-31
sbxmod.cxx
basic/source/classes/sbxmod.cxx
+1
-1
exprtree.cxx
basic/source/comp/exprtree.cxx
+6
-6
inputbox.cxx
basic/source/runtime/inputbox.cxx
+1
-1
iosys.cxx
basic/source/runtime/iosys.cxx
+1
-1
methods.cxx
basic/source/runtime/methods.cxx
+6
-6
methods1.cxx
basic/source/runtime/methods1.cxx
+1
-1
runtime.cxx
basic/source/runtime/runtime.cxx
+7
-7
stdobj1.cxx
basic/source/runtime/stdobj1.cxx
+4
-4
sbxdate.cxx
basic/source/sbx/sbxdate.cxx
+2
-2
sbxscan.cxx
basic/source/sbx/sbxscan.cxx
+2
-2
No files found.
basic/source/classes/sbxmod.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -1209,7 +1209,7 @@ sal_uInt16 SbModule::Run( SbMethod* pMeth )
{
// Compare here with 1 instead of 0, because before nCallLvl--
while
(
GetSbData
()
->
pInst
->
nCallLvl
!=
1
)
GetpApp
()
->
Yield
();
Application
::
Yield
();
}
nRes
=
sal_True
;
...
...
basic/source/comp/exprtree.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -215,7 +215,7 @@ SbiExprNode* SbiExpression::Term( const KeywordSymbolInfo* pKeywordSymbolInfo )
return
new
SbiExprNode
(
pParser
,
aSym
);
}
// no keywords allowed from here on!
if
(
pParser
->
IsKwd
(
eTok
)
)
if
(
SbiTokenizer
::
IsKwd
(
eTok
)
)
{
if
(
pParser
->
IsCompatible
()
&&
eTok
==
INPUT
)
{
...
...
@@ -406,7 +406,7 @@ SbiExprNode* SbiExpression::ObjTerm( SbiSymDef& rObj )
{
pParser
->
Next
();
SbiToken
eTok
=
pParser
->
Next
();
if
(
eTok
!=
SYMBOL
&&
!
pParser
->
IsKwd
(
eTok
)
&&
!
pParser
->
IsExtra
(
eTok
)
)
if
(
eTok
!=
SYMBOL
&&
!
SbiTokenizer
::
IsKwd
(
eTok
)
&&
!
SbiTokenizer
::
IsExtra
(
eTok
)
)
{
// #66745 Some operators can also be allowed
// as identifiers, important for StarOne
...
...
@@ -573,7 +573,7 @@ SbiExprNode* SbiExpression::Operand( bool bUsedForTypeOf )
break
;
default
:
// keywords here are OK at the moment!
if
(
pParser
->
IsKwd
(
eTok
)
)
if
(
SbiTokenizer
::
IsKwd
(
eTok
)
)
{
pRes
=
Term
();
}
...
...
@@ -1018,7 +1018,7 @@ SbiParameters::SbiParameters( SbiParser* p, bool bStandaloneExpression, bool bPa
}
if
(
(
bBracket
&&
eTok
==
RPAREN
)
||
pParser
->
IsEoln
(
eTok
)
)
if
(
(
bBracket
&&
eTok
==
RPAREN
)
||
SbiTokenizer
::
IsEoln
(
eTok
)
)
{
if
(
eTok
==
RPAREN
)
{
...
...
@@ -1120,7 +1120,7 @@ SbiParameters::SbiParameters( SbiParser* p, bool bStandaloneExpression, bool bPa
eTok
=
pParser
->
Peek
();
if
(
eTok
!=
COMMA
)
{
if
(
(
bBracket
&&
eTok
==
RPAREN
)
||
pParser
->
IsEoln
(
eTok
)
)
if
(
(
bBracket
&&
eTok
==
RPAREN
)
||
SbiTokenizer
::
IsEoln
(
eTok
)
)
{
break
;
}
...
...
@@ -1131,7 +1131,7 @@ SbiParameters::SbiParameters( SbiParser* p, bool bStandaloneExpression, bool bPa
{
pParser
->
Next
();
eTok
=
pParser
->
Peek
();
if
(
(
bBracket
&&
eTok
==
RPAREN
)
||
pParser
->
IsEoln
(
eTok
)
)
if
(
(
bBracket
&&
eTok
==
RPAREN
)
||
SbiTokenizer
::
IsEoln
(
eTok
)
)
{
break
;
}
...
...
basic/source/runtime/inputbox.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -172,7 +172,7 @@ RTLFUNC(InputBox)
nX
=
rPar
.
Get
(
4
)
->
GetLong
();
nY
=
rPar
.
Get
(
5
)
->
GetLong
();
}
boost
::
scoped_ptr
<
SvRTLInputBox
>
pDlg
(
new
SvRTLInputBox
(
GetpApp
()
->
GetDefDialogParent
(),
boost
::
scoped_ptr
<
SvRTLInputBox
>
pDlg
(
new
SvRTLInputBox
(
Application
::
GetDefDialogParent
(),
rPrompt
,
aTitle
,
aDefault
,
nX
,
nY
));
pDlg
->
Execute
();
rPar
.
Get
(
0
)
->
PutString
(
pDlg
->
GetText
()
);
...
...
basic/source/runtime/iosys.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -997,7 +997,7 @@ void SbiIoSystem::WriteCon(const OUString& rText)
}
{
SolarMutexGuard
aSolarGuard
;
if
(
!
MessBox
(
GetpApp
()
->
GetDefDialogParent
(),
if
(
!
MessBox
(
Application
::
GetDefDialogParent
(),
WinBits
(
WB_OK_CANCEL
|
WB_DEF_OK
),
OUString
(),
s
).
Execute
()
)
{
...
...
basic/source/runtime/methods.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -235,8 +235,8 @@ RTLFUNC(Error)
}
else
{
pBasic
->
MakeErrorText
(
nErr
,
aErrorMsg
);
tmpErrMsg
=
pBasic
->
GetErrorText
();
StarBASIC
::
MakeErrorText
(
nErr
,
aErrorMsg
);
tmpErrMsg
=
StarBASIC
::
GetErrorText
();
}
// If this rtlfunc 'Error' passed a errcode the same as the active Err Objects's
// current err then return the description for the error message if it is set
...
...
@@ -1665,7 +1665,7 @@ RTLFUNC(StrComp)
i18n
::
TransliterationModules_IGNORE_WIDTH
);
}
LanguageType
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
LanguageType
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
pTransliterationWrapper
->
loadModuleIfNeeded
(
eLangType
);
nRetValue
=
pTransliterationWrapper
->
compareString
(
rStr1
,
rStr2
);
}
...
...
@@ -2145,7 +2145,7 @@ RTLFUNC(DateValue)
// by using SbiInstance::GetNumberFormatter.
// It seems that both locale number formatter and English number formatter
// are supported in Visual Basic.
LanguageType
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
LanguageType
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
if
(
!
bSuccess
&&
(
eLangType
!=
LANGUAGE_ENGLISH_US
)
)
{
// Create a new SvNumberFormatter by using LANGUAGE_ENGLISH to get the date value;
...
...
@@ -4597,7 +4597,7 @@ RTLFUNC(MsgBox)
}
else
{
aTitle
=
GetpApp
()
->
GetAppName
();
aTitle
=
Application
::
GetAppName
();
}
nType
&=
(
16
+
32
+
64
);
...
...
@@ -4605,7 +4605,7 @@ RTLFUNC(MsgBox)
SolarMutexGuard
aSolarGuard
;
Window
*
pParent
=
GetpApp
()
->
GetDefDialogParent
();
Window
*
pParent
=
Application
::
GetDefDialogParent
();
switch
(
nType
)
{
case
16
:
...
...
basic/source/runtime/methods1.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -2539,7 +2539,7 @@ RTLFUNC(FormatDateTime)
SbiInstance
::
PrepareNumberFormatter
(
pFormatter
,
n
,
n
,
n
);
}
LanguageType
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
LanguageType
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
sal_uIntPtr
nIndex
=
pFormatter
->
GetFormatIndex
(
NF_DATE_SYSTEM_LONG
,
eLangType
);
Color
*
pCol
;
pFormatter
->
GetOutputString
(
dDate
,
nIndex
,
aRetStr
,
&
pCol
);
...
...
basic/source/runtime/runtime.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -367,7 +367,7 @@ SbiDllMgr* SbiInstance::GetDllMgr()
// #39629 create NumberFormatter with the help of a static method now
SvNumberFormatter
*
SbiInstance
::
GetNumberFormatter
()
{
LanguageType
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
LanguageType
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
SvtSysLocale
aSysLocale
;
DateFormat
eDate
=
aSysLocale
.
GetLocaleData
().
getDateFormat
();
if
(
pNumberFormatter
)
...
...
@@ -401,7 +401,7 @@ void SbiInstance::PrepareNumberFormatter( SvNumberFormatter*& rpNumberFormatter,
}
else
{
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
}
DateFormat
eDate
;
if
(
peFormatterDateFormat
)
...
...
@@ -524,14 +524,14 @@ void SbiInstance::Abort()
{
StarBASIC
*
pErrBasic
=
GetCurrentBasic
(
pBasic
);
pErrBasic
->
RTError
(
nErr
,
aErrorMsg
,
pRun
->
nLine
,
pRun
->
nCol1
,
pRun
->
nCol2
);
pBasic
->
Stop
();
StarBASIC
::
Stop
();
}
// can be unequal to pRTBasic
StarBASIC
*
GetCurrentBasic
(
StarBASIC
*
pRTBasic
)
{
StarBASIC
*
pCurBasic
=
pRTBasic
;
SbModule
*
pActiveModule
=
pRTBasic
->
GetActiveModule
();
SbModule
*
pActiveModule
=
StarBASIC
::
GetActiveModule
();
if
(
pActiveModule
)
{
SbxObject
*
pParent
=
pActiveModule
->
GetParent
();
...
...
@@ -1669,16 +1669,16 @@ inline bool checkUnoStructCopy( bool bVBA, SbxVariableRef& refVal, SbxVariableRe
if
(
aAny
.
getValueType
().
getTypeClass
()
==
TypeClass_STRUCT
)
{
refVar
->
SetType
(
SbxOBJECT
);
SbxError
eOldErr
=
refVar
->
GetError
();
SbxError
eOldErr
=
SbxBase
::
GetError
();
// There are some circumstances when calling GetObject
// will trigger an error, we need to squash those here.
// Alternatively it is possible that the same scenario
// could overwrite and existing error. Lets prevent that
SbxObjectRef
xVarObj
=
(
SbxObject
*
)
refVar
->
GetObject
();
if
(
eOldErr
!=
SbxERR_OK
)
refVar
->
SetError
(
eOldErr
);
SbxBase
::
SetError
(
eOldErr
);
else
refVar
->
ResetError
();
SbxBase
::
ResetError
();
SbUnoStructRefObject
*
pUnoStructObj
=
PTR_CAST
(
SbUnoStructRefObject
,(
SbxObject
*
)
xVarObj
);
...
...
basic/source/runtime/stdobj1.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -88,8 +88,8 @@ void SbStdPicture::PropWidth( SbxVariable* pVar, SbxArray*, bool bWrite )
}
Size
aSize
=
aGraphic
.
GetPrefSize
();
aSize
=
GetpApp
()
->
GetAppWindow
()
->
LogicToPixel
(
aSize
,
aGraphic
.
GetPrefMapMode
()
);
aSize
=
GetpApp
()
->
GetAppWindow
()
->
PixelToLogic
(
aSize
,
MapMode
(
MAP_TWIP
)
);
aSize
=
Application
::
GetAppWindow
()
->
LogicToPixel
(
aSize
,
aGraphic
.
GetPrefMapMode
()
);
aSize
=
Application
::
GetAppWindow
()
->
PixelToLogic
(
aSize
,
MapMode
(
MAP_TWIP
)
);
pVar
->
PutInteger
(
(
sal_Int16
)
aSize
.
Width
()
);
}
...
...
@@ -103,8 +103,8 @@ void SbStdPicture::PropHeight( SbxVariable* pVar, SbxArray*, bool bWrite )
}
Size
aSize
=
aGraphic
.
GetPrefSize
();
aSize
=
GetpApp
()
->
GetAppWindow
()
->
LogicToPixel
(
aSize
,
aGraphic
.
GetPrefMapMode
()
);
aSize
=
GetpApp
()
->
GetAppWindow
()
->
PixelToLogic
(
aSize
,
MapMode
(
MAP_TWIP
)
);
aSize
=
Application
::
GetAppWindow
()
->
LogicToPixel
(
aSize
,
aGraphic
.
GetPrefMapMode
()
);
aSize
=
Application
::
GetAppWindow
()
->
PixelToLogic
(
aSize
,
MapMode
(
MAP_TWIP
)
);
pVar
->
PutInteger
(
(
sal_Int16
)
aSize
.
Height
()
);
}
...
...
basic/source/sbx/sbxdate.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -98,7 +98,7 @@ double ImpGetDate( const SbxValues* p )
}
else
{
LanguageType
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
LanguageType
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
boost
::
scoped_ptr
<
SvNumberFormatter
>
pFormatter
(
new
SvNumberFormatter
(
comphelper
::
getProcessComponentContext
(),
eLangType
));
...
...
@@ -267,7 +267,7 @@ start:
}
Color
*
pColor
;
LanguageType
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
LanguageType
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
boost
::
scoped_ptr
<
SvNumberFormatter
>
pFormatter
(
new
SvNumberFormatter
(
comphelper
::
getProcessComponentContext
(),
eLangType
));
sal_uInt32
nIndex
;
...
...
basic/source/sbx/sbxscan.cxx
Dosyayı görüntüle @
f8ef1fe9
...
...
@@ -664,7 +664,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
return
;
}
LanguageType
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
LanguageType
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
SvNumberFormatter
aFormatter
(
comphelper
::
getProcessComponentContext
(),
eLangType
);
sal_uInt32
nIndex
=
0
;
...
...
@@ -789,7 +789,7 @@ void SbxValue::Format( OUString& rRes, const OUString* pFmt ) const
{
SbxAppData
&
rAppData
=
GetSbxData_Impl
();
LanguageType
eLangType
=
GetpApp
()
->
GetSettings
().
GetLanguageTag
().
getLanguageType
();
LanguageType
eLangType
=
Application
::
GetSettings
().
GetLanguageTag
().
getLanguageType
();
if
(
rAppData
.
pBasicFormater
)
{
if
(
rAppData
.
eBasicFormaterLangType
!=
eLangType
)
...
...
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