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
5e971b27
Kaydet (Commit)
5e971b27
authored
Şub 06, 2016
tarafından
Chris Sherlock
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
vcl: rename EXC_* constants to EXCEPTION_*, EXC is too much like 'execute'
Change-Id: I2f79e0419b27391cc9bdc45576e67eecdbc9efa4
üst
249e3d6d
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
21 additions
and
21 deletions
+21
-21
canvasdemo.cxx
canvas/workben/canvasdemo.cxx
+2
-2
app.cxx
desktop/source/app/app.cxx
+3
-3
exceptiontypes.hxx
include/vcl/exceptiontypes.hxx
+5
-5
demoshow.cxx
slideshow/test/demoshow.cxx
+2
-2
svapp.cxx
vcl/source/app/svapp.cxx
+4
-4
svmain.cxx
vcl/source/app/svmain.cxx
+3
-3
outdevgrind.cxx
vcl/workben/outdevgrind.cxx
+2
-2
No files found.
canvas/workben/canvasdemo.cxx
Dosyayı görüntüle @
5e971b27
...
...
@@ -623,9 +623,9 @@ void TestWindow::Paint( const Rectangle& /*rRect*/ )
USHORT
DemoApp
::
Exception
(
USHORT
nError
)
{
switch
(
nError
&
EXC_MAJORTYPE
)
switch
(
nError
&
EXC
EPTION
_MAJORTYPE
)
{
case
EXC
_RSC
NOTLOADED
:
case
EXC
EPTION_RESOURCE
NOTLOADED
:
Abort
(
"Error: could not load language resources.
\n
Please check your installation.
\n
"
);
break
;
}
...
...
desktop/source/app/app.cxx
Dosyayı görüntüle @
5e971b27
...
...
@@ -1207,7 +1207,7 @@ void Desktop::Exception(sal_uInt16 nError)
bool
bAllowRecoveryAndSessionManagement
=
(
(
!
rArgs
.
IsNoRestore
()
)
&&
// some use cases of office must work without recovery
(
!
rArgs
.
IsHeadless
()
)
&&
((
nError
&
EXC
_MAJORTYPE
)
!=
EXC
_DISPLAY
)
&&
// recovery can't work without UI ... but UI layer seems to be the reason for this crash
((
nError
&
EXC
EPTION_MAJORTYPE
)
!=
EXCEPTION
_DISPLAY
)
&&
// recovery can't work without UI ... but UI layer seems to be the reason for this crash
(
Application
::
IsInExecute
()
)
// crashes during startup and shutdown should be ignored (they indicates a corrupt installation ...)
);
if
(
bAllowRecoveryAndSessionManagement
)
...
...
@@ -1215,9 +1215,9 @@ void Desktop::Exception(sal_uInt16 nError)
FlushConfiguration
();
switch
(
nError
&
EXC_MAJORTYPE
)
switch
(
nError
&
EXC
EPTION
_MAJORTYPE
)
{
case
EXC
_RSC
NOTLOADED
:
case
EXC
EPTION_RESOURCE
NOTLOADED
:
{
OUString
aResExceptionString
;
Application
::
Abort
(
aResExceptionString
);
...
...
include/vcl/exceptiontypes.hxx
Dosyayı görüntüle @
5e971b27
...
...
@@ -20,11 +20,11 @@
#ifndef INCLUDED_VCL_EXCEPTIONTYPES_HXX
#define INCLUDED_VCL_EXCEPTIONTYPES_HXX
#define EXC
_RSC
NOTLOADED ((sal_uInt16)0x0100)
#define EXC_SYSTEM ((sal_uInt16)0x0300)
#define EXC_DISPLAY ((sal_uInt16)0x0400)
#define EXC_MAJORTYPE ((sal_uInt16)0xFF00)
#define EXC_MINORTYPE ((sal_uInt16)0x00FF)
#define EXC
EPTION_RESOURCE
NOTLOADED ((sal_uInt16)0x0100)
#define EXC
EPTION
_SYSTEM ((sal_uInt16)0x0300)
#define EXC
EPTION
_DISPLAY ((sal_uInt16)0x0400)
#define EXC
EPTION
_MAJORTYPE ((sal_uInt16)0xFF00)
#define EXC
EPTION
_MINORTYPE ((sal_uInt16)0x00FF)
#endif // INCLUDED_VCL_EXCEPTIONTYPES_HXX
...
...
slideshow/test/demoshow.cxx
Dosyayı görüntüle @
5e971b27
...
...
@@ -483,9 +483,9 @@ void DemoWindow::Resize()
sal_uInt16
DemoApp
::
Exception
(
sal_uInt16
nError
)
{
switch
(
nError
&
EXC_MAJORTYPE
)
switch
(
nError
&
EXC
EPTION
_MAJORTYPE
)
{
case
EXC
_RSC
NOTLOADED
:
case
EXC
EPTION_RESOURCE
NOTLOADED
:
Abort
(
"Error: could not load language resources.
\n
Please check your installation.
\n
"
);
break
;
}
...
...
vcl/source/app/svapp.cxx
Dosyayı görüntüle @
5e971b27
...
...
@@ -279,15 +279,15 @@ OUString Application::GetAppFileName()
void
Application
::
Exception
(
sal_uInt16
nError
)
{
switch
(
nError
&
EXC_MAJORTYPE
)
switch
(
nError
&
EXC
EPTION
_MAJORTYPE
)
{
// System has precedence (so do nothing)
case
EXC_SYSTEM
:
case
EXC_DISPLAY
:
case
EXC
EPTION
_SYSTEM
:
case
EXC
EPTION
_DISPLAY
:
break
;
#ifdef DBG_UTIL
case
EXC
_RSC
NOTLOADED
:
case
EXC
EPTION_RESOURCE
NOTLOADED
:
Abort
(
"Resource not loaded"
);
break
;
default
:
...
...
vcl/source/app/svmain.cxx
Dosyayı görüntüle @
5e971b27
...
...
@@ -107,7 +107,7 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo
(
pInfo
->
Signal
==
osl_Signal_FloatDivideByZero
)
||
(
pInfo
->
Signal
==
osl_Signal_DebugBreak
)
)
{
nVCLException
=
EXC_SYSTEM
;
nVCLException
=
EXC
EPTION
_SYSTEM
;
if
(
OpenGLZone
::
isInZone
())
OpenGLZone
::
hardDisable
();
}
...
...
@@ -115,12 +115,12 @@ oslSignalAction SAL_CALL VCLExceptionSignal_impl( void* /*pData*/, oslSignalInfo
// RC
if
((
pInfo
->
Signal
==
osl_Signal_User
)
&&
(
pInfo
->
UserSignal
==
OSL_SIGNAL_USER_RESOURCEFAILURE
)
)
nVCLException
=
EXC
_RSC
NOTLOADED
;
nVCLException
=
EXC
EPTION_RESOURCE
NOTLOADED
;
// DISPLAY-Unix
if
((
pInfo
->
Signal
==
osl_Signal_User
)
&&
(
pInfo
->
UserSignal
==
OSL_SIGNAL_USER_X11SUBSYSTEMERROR
)
)
nVCLException
=
EXC_DISPLAY
;
nVCLException
=
EXC
EPTION
_DISPLAY
;
if
(
nVCLException
)
{
...
...
vcl/workben/outdevgrind.cxx
Dosyayı görüntüle @
5e971b27
...
...
@@ -832,9 +832,9 @@ void TestWindow::Paint(vcl::RenderContext& rRenderContext, const Rectangle&)
void
GrindApp
::
Exception
(
sal_uInt16
nError
)
{
switch
(
nError
&
EXC_MAJORTYPE
)
switch
(
nError
&
EXC
EPTION
_MAJORTYPE
)
{
case
EXC
_RSC
NOTLOADED
:
case
EXC
EPTION_RESOURCE
NOTLOADED
:
Abort
(
"Error: could not load language resources.
\n
Please check your installation.
\n
"
);
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