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
da941336
Kaydet (Commit)
da941336
authored
Mar 21, 2011
tarafından
Luboš Luňák
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
BOOL -> sal_Bool, get rid of useless and removed BYTE
üst
a1907dd5
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
19 additions
and
19 deletions
+19
-19
KDESalFrame.cxx
vcl/unx/kde4/KDESalFrame.cxx
+5
-5
KDESalFrame.hxx
vcl/unx/kde4/KDESalFrame.hxx
+1
-1
KDESalGraphics.cxx
vcl/unx/kde4/KDESalGraphics.cxx
+7
-7
KDESalGraphics.hxx
vcl/unx/kde4/KDESalGraphics.hxx
+6
-6
No files found.
vcl/unx/kde4/KDESalFrame.cxx
Dosyayı görüntüle @
da941336
...
@@ -62,7 +62,7 @@ KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nState ) :
...
@@ -62,7 +62,7 @@ KDESalFrame::KDESalFrame( SalFrame* pParent, sal_uLong nState ) :
{
{
}
}
void
KDESalFrame
::
Show
(
BOOL
bVisible
,
BOOL
bNoActivate
)
void
KDESalFrame
::
Show
(
sal_Bool
bVisible
,
sal_Bool
bNoActivate
)
{
{
if
(
!
GetParent
()
&&
!
(
GetStyle
()
&
SAL_FRAME_STYLE_INTRO
)
)
if
(
!
GetParent
()
&&
!
(
GetStyle
()
&
SAL_FRAME_STYLE_INTRO
)
)
{
{
...
@@ -180,7 +180,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
...
@@ -180,7 +180,7 @@ static Font toFont( const QFont &rQFont, const ::com::sun::star::lang::Locale& r
void
KDESalFrame
::
UpdateSettings
(
AllSettings
&
rSettings
)
void
KDESalFrame
::
UpdateSettings
(
AllSettings
&
rSettings
)
{
{
StyleSettings
style
(
rSettings
.
GetStyleSettings
()
);
StyleSettings
style
(
rSettings
.
GetStyleSettings
()
);
BOOL
bSetTitleFont
=
false
;
sal_Bool
bSetTitleFont
=
false
;
// General settings
// General settings
QPalette
pal
=
kapp
->
palette
();
QPalette
pal
=
kapp
->
palette
();
...
@@ -275,9 +275,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
...
@@ -275,9 +275,9 @@ void KDESalFrame::UpdateSettings( AllSettings& rSettings )
{
{
Color
aColor2
=
style
.
GetLightColor
();
Color
aColor2
=
style
.
GetLightColor
();
style
.
style
.
SetCheckedColor
(
Color
(
(
BYTE
)(
((
sal_uInt16
)
aBack
.
GetRed
()
+
(
sal_uInt16
)
aColor2
.
GetRed
())
/
2
),
SetCheckedColor
(
Color
(
(((
sal_uInt16
)
aBack
.
GetRed
()
+
(
sal_uInt16
)
aColor2
.
GetRed
())
/
2
),
(
BYTE
)(
((
sal_uInt16
)
aBack
.
GetGreen
()
+
(
sal_uInt16
)
aColor2
.
GetGreen
())
/
2
),
(((
sal_uInt16
)
aBack
.
GetGreen
()
+
(
sal_uInt16
)
aColor2
.
GetGreen
())
/
2
),
(
BYTE
)(
((
sal_uInt16
)
aBack
.
GetBlue
()
+
(
sal_uInt16
)
aColor2
.
GetBlue
())
/
2
)
(((
sal_uInt16
)
aBack
.
GetBlue
()
+
(
sal_uInt16
)
aColor2
.
GetBlue
())
/
2
)
)
);
)
);
}
}
...
...
vcl/unx/kde4/KDESalFrame.hxx
Dosyayı görüntüle @
da941336
...
@@ -55,7 +55,7 @@ class KDESalFrame : public X11SalFrame
...
@@ -55,7 +55,7 @@ class KDESalFrame : public X11SalFrame
virtual
void
ReleaseGraphics
(
SalGraphics
*
pGraphics
);
virtual
void
ReleaseGraphics
(
SalGraphics
*
pGraphics
);
virtual
void
updateGraphics
(
bool
bClear
);
virtual
void
updateGraphics
(
bool
bClear
);
virtual
void
UpdateSettings
(
AllSettings
&
rSettings
);
virtual
void
UpdateSettings
(
AllSettings
&
rSettings
);
virtual
void
Show
(
BOOL
bVisible
,
BOOL
bNoActivate
);
virtual
void
Show
(
sal_Bool
bVisible
,
sal_Bool
bNoActivate
);
};
};
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
vcl/unx/kde4/KDESalGraphics.cxx
Dosyayı görüntüle @
da941336
...
@@ -102,7 +102,7 @@ KDESalGraphics::~KDESalGraphics()
...
@@ -102,7 +102,7 @@ KDESalGraphics::~KDESalGraphics()
delete
m_image
;
delete
m_image
;
}
}
BOOL
KDESalGraphics
::
IsNativeControlSupported
(
ControlType
type
,
ControlPart
part
)
sal_Bool
KDESalGraphics
::
IsNativeControlSupported
(
ControlType
type
,
ControlPart
part
)
{
{
if
(
type
==
CTRL_PUSHBUTTON
)
return
true
;
if
(
type
==
CTRL_PUSHBUTTON
)
return
true
;
...
@@ -161,9 +161,9 @@ BOOL KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par
...
@@ -161,9 +161,9 @@ BOOL KDESalGraphics::IsNativeControlSupported( ControlType type, ControlPart par
aPos was or was not inside the native widget specified by the
aPos was or was not inside the native widget specified by the
nType/nPart combination.
nType/nPart combination.
*/
*/
BOOL
KDESalGraphics
::
hitTestNativeControl
(
ControlType
nType
,
ControlPart
nPart
,
sal_Bool
KDESalGraphics
::
hitTestNativeControl
(
ControlType
nType
,
ControlPart
nPart
,
const
Rectangle
&
rControlRegion
,
const
Point
&
rPos
,
const
Rectangle
&
rControlRegion
,
const
Point
&
rPos
,
BOOL
&
rIsInside
)
sal_Bool
&
rIsInside
)
{
{
if
(
nType
==
CTRL_SCROLLBAR
)
if
(
nType
==
CTRL_SCROLLBAR
)
{
{
...
@@ -303,7 +303,7 @@ static QRegion XRegionToQRegion( XLIB_Region xr )
...
@@ -303,7 +303,7 @@ static QRegion XRegionToQRegion( XLIB_Region xr )
}
}
#endif
#endif
BOOL
KDESalGraphics
::
drawNativeControl
(
ControlType
type
,
ControlPart
part
,
sal_Bool
KDESalGraphics
::
drawNativeControl
(
ControlType
type
,
ControlPart
part
,
const
Rectangle
&
rControlRegion
,
ControlState
nControlState
,
const
Rectangle
&
rControlRegion
,
ControlState
nControlState
,
const
ImplControlValue
&
value
,
const
ImplControlValue
&
value
,
const
OUString
&
)
const
OUString
&
)
...
@@ -314,7 +314,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
...
@@ -314,7 +314,7 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
return
false
;
return
false
;
}
}
BOOL
returnVal
=
true
;
sal_Bool
returnVal
=
true
;
QRect
widgetRect
=
region2QRect
(
rControlRegion
);
QRect
widgetRect
=
region2QRect
(
rControlRegion
);
if
(
type
==
CTRL_SPINBOX
&&
part
==
PART_ALL_BUTTONS
)
if
(
type
==
CTRL_SPINBOX
&&
part
==
PART_ALL_BUTTONS
)
...
@@ -679,13 +679,13 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
...
@@ -679,13 +679,13 @@ BOOL KDESalGraphics::drawNativeControl( ControlType type, ControlPart part,
return
returnVal
;
return
returnVal
;
}
}
BOOL
KDESalGraphics
::
getNativeControlRegion
(
ControlType
type
,
ControlPart
part
,
sal_Bool
KDESalGraphics
::
getNativeControlRegion
(
ControlType
type
,
ControlPart
part
,
const
Rectangle
&
controlRegion
,
ControlState
controlState
,
const
Rectangle
&
controlRegion
,
ControlState
controlState
,
const
ImplControlValue
&
val
,
const
ImplControlValue
&
val
,
const
OUString
&
,
const
OUString
&
,
Rectangle
&
nativeBoundingRegion
,
Rectangle
&
nativeContentRegion
)
Rectangle
&
nativeBoundingRegion
,
Rectangle
&
nativeContentRegion
)
{
{
b
ool
retVal
=
false
;
sal_B
ool
retVal
=
false
;
QRect
boundingRect
=
region2QRect
(
controlRegion
);
QRect
boundingRect
=
region2QRect
(
controlRegion
);
QRect
contentRect
=
boundingRect
;
QRect
contentRect
=
boundingRect
;
...
...
vcl/unx/kde4/KDESalGraphics.hxx
Dosyayı görüntüle @
da941336
...
@@ -51,16 +51,16 @@ class KDESalGraphics : public X11SalGraphics
...
@@ -51,16 +51,16 @@ class KDESalGraphics : public X11SalGraphics
@param part Specification of the widget's part if it consists of more than one.
@param part Specification of the widget's part if it consists of more than one.
@return true if the platform supports native drawing of the widget type defined by part.
@return true if the platform supports native drawing of the widget type defined by part.
*/
*/
virtual
BOOL
IsNativeControlSupported
(
ControlType
type
,
ControlPart
part
);
virtual
sal_Bool
IsNativeControlSupported
(
ControlType
type
,
ControlPart
part
);
/** Test whether the position is in the native widget.
/** Test whether the position is in the native widget.
If the return value is TRUE, bIsInside contains information whether
If the return value is TRUE, bIsInside contains information whether
aPos was or was not inside the native widget specified by the
aPos was or was not inside the native widget specified by the
type/part combination.
type/part combination.
*/
*/
virtual
BOOL
hitTestNativeControl
(
ControlType
type
,
ControlPart
part
,
virtual
sal_Bool
hitTestNativeControl
(
ControlType
type
,
ControlPart
part
,
const
Rectangle
&
rControlRegion
,
const
Point
&
aPos
,
const
Rectangle
&
rControlRegion
,
const
Point
&
aPos
,
BOOL
&
rIsInside
);
sal_Bool
&
rIsInside
);
/** Draw the requested control described by part/nControlState.
/** Draw the requested control described by part/nControlState.
@param rControlRegion
@param rControlRegion
...
@@ -72,7 +72,7 @@ class KDESalGraphics : public X11SalGraphics
...
@@ -72,7 +72,7 @@ class KDESalGraphics : public X11SalGraphics
@param aCaption
@param aCaption
A caption or title string (like button text etc.)
A caption or title string (like button text etc.)
*/
*/
virtual
BOOL
drawNativeControl
(
ControlType
type
,
ControlPart
part
,
virtual
sal_Bool
drawNativeControl
(
ControlType
type
,
ControlPart
part
,
const
Rectangle
&
rControlRegion
,
ControlState
nControlState
,
const
Rectangle
&
rControlRegion
,
ControlState
nControlState
,
const
ImplControlValue
&
aValue
,
const
ImplControlValue
&
aValue
,
const
rtl
::
OUString
&
aCaption
);
const
rtl
::
OUString
&
aCaption
);
...
@@ -85,7 +85,7 @@ class KDESalGraphics : public X11SalGraphics
...
@@ -85,7 +85,7 @@ class KDESalGraphics : public X11SalGraphics
@param aValue An optional value (tristate/numerical/string)
@param aValue An optional value (tristate/numerical/string)
@param aCaption A caption or title string (like button text etc.)
@param aCaption A caption or title string (like button text etc.)
*/
*/
virtual
BOOL
drawNativeControlText
(
ControlType
,
ControlPart
,
virtual
sal_Bool
drawNativeControlText
(
ControlType
,
ControlPart
,
const
Rectangle
&
,
ControlState
,
const
Rectangle
&
,
ControlState
,
const
ImplControlValue
&
,
const
ImplControlValue
&
,
const
rtl
::
OUString
&
)
{
return
false
;
}
const
rtl
::
OUString
&
)
{
return
false
;
}
...
@@ -106,7 +106,7 @@ class KDESalGraphics : public X11SalGraphics
...
@@ -106,7 +106,7 @@ class KDESalGraphics : public X11SalGraphics
@param aCaption
@param aCaption
A caption or title string (like button text etc.)
A caption or title string (like button text etc.)
*/
*/
virtual
BOOL
getNativeControlRegion
(
ControlType
type
,
ControlPart
part
,
virtual
sal_Bool
getNativeControlRegion
(
ControlType
type
,
ControlPart
part
,
const
Rectangle
&
rControlRegion
,
ControlState
nControlState
,
const
Rectangle
&
rControlRegion
,
ControlState
nControlState
,
const
ImplControlValue
&
aValue
,
const
ImplControlValue
&
aValue
,
const
rtl
::
OUString
&
aCaption
,
const
rtl
::
OUString
&
aCaption
,
...
...
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