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
fae41025
Kaydet (Commit)
fae41025
authored
Mar 11, 2014
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
svx: sal_Bool->bool
Change-Id: I8eac9bfecbf8ecc4aa5dd2b098bb57aab3dd424e
üst
86ffac74
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
27 additions
and
33 deletions
+27
-33
verttexttbxctrl.hxx
include/svx/verttexttbxctrl.hxx
+2
-2
view3d.hxx
include/svx/view3d.hxx
+6
-12
viewpt3d.hxx
include/svx/viewpt3d.hxx
+3
-3
drviews2.cxx
sd/source/ui/view/drviews2.cxx
+1
-1
view3d.cxx
svx/source/engine3d/view3d.cxx
+2
-2
view3d1.cxx
svx/source/engine3d/view3d1.cxx
+3
-3
viewpt3d2.cxx
svx/source/engine3d/viewpt3d2.cxx
+7
-7
verttexttbxctrl.cxx
svx/source/tbxctrls/verttexttbxctrl.cxx
+3
-3
No files found.
include/svx/verttexttbxctrl.hxx
Dosyayı görüntüle @
fae41025
...
@@ -27,14 +27,14 @@
...
@@ -27,14 +27,14 @@
*/
*/
class
SvxVertCTLTextTbxCtrl
:
public
SfxToolBoxControl
class
SvxVertCTLTextTbxCtrl
:
public
SfxToolBoxControl
{
{
sal_B
ool
bCheckVertical
;
//determines whether vertical mode or CTL mode has to be checked
b
ool
bCheckVertical
;
//determines whether vertical mode or CTL mode has to be checked
public
:
public
:
SvxVertCTLTextTbxCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
);
SvxVertCTLTextTbxCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
);
~
SvxVertCTLTextTbxCtrl
();
~
SvxVertCTLTextTbxCtrl
();
virtual
void
StateChanged
(
sal_uInt16
nSID
,
SfxItemState
eState
,
virtual
void
StateChanged
(
sal_uInt16
nSID
,
SfxItemState
eState
,
const
SfxPoolItem
*
pState
);
const
SfxPoolItem
*
pState
);
void
SetVert
(
sal_B
ool
bSet
)
{
bCheckVertical
=
bSet
;}
void
SetVert
(
b
ool
bSet
)
{
bCheckVertical
=
bSet
;}
};
};
...
...
include/svx/view3d.hxx
Dosyayı görüntüle @
fae41025
...
@@ -63,7 +63,7 @@ protected:
...
@@ -63,7 +63,7 @@ protected:
// Migrate selections
// Migrate selections
Impl3DMirrorConstructOverlay
*
mpMirrorOverlay
;
Impl3DMirrorConstructOverlay
*
mpMirrorOverlay
;
sal_B
ool
bDoubleSided
;
b
ool
bDoubleSided
;
void
InitView
();
void
InitView
();
...
@@ -108,7 +108,7 @@ public:
...
@@ -108,7 +108,7 @@ public:
// Means to create all Extrudes in a certain depth order.
// Means to create all Extrudes in a certain depth order.
void
DoDepthArrange
(
E3dScene
*
pScene
,
double
fDepth
);
void
DoDepthArrange
(
E3dScene
*
pScene
,
double
fDepth
);
void
ConvertMarkedToPolyObj
(
sal_B
ool
bLineToArea
);
void
ConvertMarkedToPolyObj
(
b
ool
bLineToArea
);
E3dScene
*
SetCurrent3DObj
(
E3dObject
*
p3DObj
);
E3dScene
*
SetCurrent3DObj
(
E3dObject
*
p3DObj
);
void
Start3DCreation
();
void
Start3DCreation
();
...
@@ -242,18 +242,12 @@ public:
...
@@ -242,18 +242,12 @@ public:
bool
IsBreak3DObjPossible
()
const
;
bool
IsBreak3DObjPossible
()
const
;
void
Break3DObj
();
void
Break3DObj
();
sal_Bool
DoubleSided
()
const
bool
DoubleSided
()
const
{
return
bDoubleSided
;
}
{
return
bDoubleSided
;
}
sal_Bool
&
DoubleSided
()
bool
&
DoubleSided
()
{
return
bDoubleSided
;
}
{
return
bDoubleSided
;
}
SfxItemSet
Get3DAttributes
(
E3dScene
*
pInScene
=
NULL
,
sal_Bool
bOnly3DAttr
=
sal_F
alse
)
const
;
SfxItemSet
Get3DAttributes
(
E3dScene
*
pInScene
=
NULL
,
bool
bOnly3DAttr
=
f
alse
)
const
;
void
Set3DAttributes
(
const
SfxItemSet
&
rAttr
,
E3dScene
*
pInScene
=
NULL
,
sal_Bool
bOnly3DAttr
=
sal_F
alse
);
void
Set3DAttributes
(
const
SfxItemSet
&
rAttr
,
E3dScene
*
pInScene
=
NULL
,
bool
bOnly3DAttr
=
f
alse
);
};
};
#endif // INCLUDED_SVX_VIEW3D_HXX
#endif // INCLUDED_SVX_VIEW3D_HXX
...
...
include/svx/viewpt3d.hxx
Dosyayı görüntüle @
fae41025
...
@@ -70,7 +70,7 @@ class SVX_DLLPUBLIC Viewport3D
...
@@ -70,7 +70,7 @@ class SVX_DLLPUBLIC Viewport3D
basegfx
::
B3DPoint
aViewPoint
;
// Beobachterstandpunkt in Weltkoordinaten;
basegfx
::
B3DPoint
aViewPoint
;
// Beobachterstandpunkt in Weltkoordinaten;
// wird mit der Transformation berechnet
// wird mit der Transformation berechnet
sal_B
ool
bTfValid
;
// Flag, ob Transformation gueltig ist
b
ool
bTfValid
;
// Flag, ob Transformation gueltig ist
double
fWRatio
;
// Device/View-Seitenverhaeltnisse
double
fWRatio
;
// Device/View-Seitenverhaeltnisse
double
fHRatio
;
double
fHRatio
;
...
@@ -95,11 +95,11 @@ class SVX_DLLPUBLIC Viewport3D
...
@@ -95,11 +95,11 @@ class SVX_DLLPUBLIC Viewport3D
double
GetFarClipDist
()
const
{
return
fFarClipDist
;
}
double
GetFarClipDist
()
const
{
return
fFarClipDist
;
}
void
SetProjection
(
ProjectionType
ePrj
)
void
SetProjection
(
ProjectionType
ePrj
)
{
eProjection
=
ePrj
;
bTfValid
=
sal_F
alse
;
}
{
eProjection
=
ePrj
;
bTfValid
=
f
alse
;
}
ProjectionType
GetProjection
()
const
{
return
(
eProjection
);
}
ProjectionType
GetProjection
()
const
{
return
(
eProjection
);
}
void
SetAspectMapping
(
AspectMapType
eAsp
)
void
SetAspectMapping
(
AspectMapType
eAsp
)
{
eAspectMapping
=
eAsp
;
bTfValid
=
sal_F
alse
;
}
{
eAspectMapping
=
eAsp
;
bTfValid
=
f
alse
;
}
AspectMapType
GetAspectMapping
()
{
return
eAspectMapping
;
}
AspectMapType
GetAspectMapping
()
{
return
eAspectMapping
;
}
void
SetViewWindow
(
double
fX
,
double
fY
,
double
fW
,
double
fH
);
void
SetViewWindow
(
double
fX
,
double
fY
,
double
fW
,
double
fH
);
...
...
sd/source/ui/view/drviews2.cxx
Dosyayı görüntüle @
fae41025
...
@@ -673,7 +673,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
...
@@ -673,7 +673,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
else
else
{
{
WaitObject
aWait
(
(
Window
*
)
GetActiveWindow
()
);
WaitObject
aWait
(
(
Window
*
)
GetActiveWindow
()
);
mpDrawView
->
ConvertMarkedToPolyObj
(
sal_F
alse
);
mpDrawView
->
ConvertMarkedToPolyObj
(
f
alse
);
}
}
}
}
...
...
svx/source/engine3d/view3d.cxx
Dosyayı görüntüle @
fae41025
...
@@ -1534,8 +1534,8 @@ void E3dView::InitView ()
...
@@ -1534,8 +1534,8 @@ void E3dView::InitView ()
nVDefaultSegments
=
12
;
nVDefaultSegments
=
12
;
aDefaultLightColor
=
RGB_Color
(
COL_WHITE
);
aDefaultLightColor
=
RGB_Color
(
COL_WHITE
);
aDefaultAmbientColor
=
RGB_Color
(
COL_BLACK
);
aDefaultAmbientColor
=
RGB_Color
(
COL_BLACK
);
bDoubleSided
=
sal_F
alse
;
bDoubleSided
=
f
alse
;
mpMirrorOverlay
=
0L
;
mpMirrorOverlay
=
0L
;
}
}
bool
E3dView
::
IsBreak3DObjPossible
()
const
bool
E3dView
::
IsBreak3DObjPossible
()
const
...
...
svx/source/engine3d/view3d1.cxx
Dosyayı görüntüle @
fae41025
...
@@ -42,7 +42,7 @@
...
@@ -42,7 +42,7 @@
#include <svx/svdogrp.hxx>
#include <svx/svdogrp.hxx>
#include <svx/e3dsceneupdater.hxx>
#include <svx/e3dsceneupdater.hxx>
void
E3dView
::
ConvertMarkedToPolyObj
(
sal_B
ool
bLineToArea
)
void
E3dView
::
ConvertMarkedToPolyObj
(
b
ool
bLineToArea
)
{
{
SdrObject
*
pNewObj
=
NULL
;
SdrObject
*
pNewObj
=
NULL
;
...
@@ -96,7 +96,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask)
...
@@ -96,7 +96,7 @@ void Imp_E3dView_InorderRun3DObjects(const SdrObject* pObj, sal_uInt32& rMask)
}
}
}
}
SfxItemSet
E3dView
::
Get3DAttributes
(
E3dScene
*
pInScene
,
sal_B
ool
/*bOnly3DAttr*/
)
const
SfxItemSet
E3dView
::
Get3DAttributes
(
E3dScene
*
pInScene
,
b
ool
/*bOnly3DAttr*/
)
const
{
{
// Creating itemset with corresponding field
// Creating itemset with corresponding field
SfxItemSet
aSet
(
SfxItemSet
aSet
(
...
@@ -151,7 +151,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/
...
@@ -151,7 +151,7 @@ SfxItemSet E3dView::Get3DAttributes(E3dScene* pInScene, sal_Bool /*bOnly3DAttr*/
return
(
aSet
);
return
(
aSet
);
}
}
void
E3dView
::
Set3DAttributes
(
const
SfxItemSet
&
rAttr
,
E3dScene
*
pInScene
,
sal_B
ool
bReplaceAll
)
void
E3dView
::
Set3DAttributes
(
const
SfxItemSet
&
rAttr
,
E3dScene
*
pInScene
,
b
ool
bReplaceAll
)
{
{
sal_uInt32
nSelectedItems
(
0L
);
sal_uInt32
nSelectedItems
(
0L
);
...
...
svx/source/engine3d/viewpt3d2.cxx
Dosyayı görüntüle @
fae41025
...
@@ -32,7 +32,7 @@ Viewport3D::Viewport3D() :
...
@@ -32,7 +32,7 @@ Viewport3D::Viewport3D() :
eAspectMapping
(
AS_NO_MAPPING
),
eAspectMapping
(
AS_NO_MAPPING
),
aDeviceRect
(
Point
(
0
,
0
),
Size
(
-
1
,
-
1
)),
aDeviceRect
(
Point
(
0
,
0
),
Size
(
-
1
,
-
1
)),
aViewPoint
(
0
,
0
,
5000
),
aViewPoint
(
0
,
0
,
5000
),
bTfValid
(
0
),
bTfValid
(
false
),
fWRatio
(
1.0
),
fWRatio
(
1.0
),
fHRatio
(
1.0
)
fHRatio
(
1.0
)
{
{
...
@@ -123,7 +123,7 @@ void Viewport3D::MakeTransform(void)
...
@@ -123,7 +123,7 @@ void Viewport3D::MakeTransform(void)
aViewTf
*=
aTemp
;
aViewTf
*=
aTemp
;
}
}
bTfValid
=
sal_T
rue
;
bTfValid
=
t
rue
;
}
}
}
}
...
@@ -181,7 +181,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect)
...
@@ -181,7 +181,7 @@ void Viewport3D::SetDeviceWindow(const Rectangle& rRect)
void
Viewport3D
::
SetVRP
(
const
basegfx
::
B3DPoint
&
rNewVRP
)
void
Viewport3D
::
SetVRP
(
const
basegfx
::
B3DPoint
&
rNewVRP
)
{
{
aVRP
=
rNewVRP
;
aVRP
=
rNewVRP
;
bTfValid
=
sal_F
alse
;
bTfValid
=
f
alse
;
}
}
// Set View Plane Normal
// Set View Plane Normal
...
@@ -190,7 +190,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
...
@@ -190,7 +190,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
{
{
aVPN
=
rNewVPN
;
aVPN
=
rNewVPN
;
aVPN
.
normalize
();
aVPN
.
normalize
();
bTfValid
=
sal_F
alse
;
bTfValid
=
f
alse
;
}
}
// Set View Up Vector
// Set View Up Vector
...
@@ -198,7 +198,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
...
@@ -198,7 +198,7 @@ void Viewport3D::SetVPN(const basegfx::B3DVector& rNewVPN)
void
Viewport3D
::
SetVUV
(
const
basegfx
::
B3DVector
&
rNewVUV
)
void
Viewport3D
::
SetVUV
(
const
basegfx
::
B3DVector
&
rNewVUV
)
{
{
aVUV
=
rNewVUV
;
aVUV
=
rNewVUV
;
bTfValid
=
sal_F
alse
;
bTfValid
=
f
alse
;
}
}
// Set Center Of Projection
// Set Center Of Projection
...
@@ -208,7 +208,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
...
@@ -208,7 +208,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
aPRP
=
rNewPRP
;
aPRP
=
rNewPRP
;
aPRP
.
setX
(
0.0
);
aPRP
.
setX
(
0.0
);
aPRP
.
setY
(
0.0
);
aPRP
.
setY
(
0.0
);
bTfValid
=
sal_F
alse
;
bTfValid
=
f
alse
;
}
}
// Set View Plane Distance
// Set View Plane Distance
...
@@ -216,7 +216,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
...
@@ -216,7 +216,7 @@ void Viewport3D::SetPRP(const basegfx::B3DPoint& rNewPRP)
void
Viewport3D
::
SetVPD
(
double
fNewVPD
)
void
Viewport3D
::
SetVPD
(
double
fNewVPD
)
{
{
fVPD
=
fNewVPD
;
fVPD
=
fNewVPD
;
bTfValid
=
sal_F
alse
;
bTfValid
=
f
alse
;
}
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
svx/source/tbxctrls/verttexttbxctrl.cxx
Dosyayı görüntüle @
fae41025
...
@@ -33,21 +33,21 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem);
...
@@ -33,21 +33,21 @@ SFX_IMPL_TOOLBOX_CONTROL(SvxVertTextTbxCtrl, SfxBoolItem);
SvxCTLTextTbxCtrl
::
SvxCTLTextTbxCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SvxCTLTextTbxCtrl
::
SvxCTLTextTbxCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SvxVertCTLTextTbxCtrl
(
nSlotId
,
nId
,
rTbx
)
SvxVertCTLTextTbxCtrl
(
nSlotId
,
nId
,
rTbx
)
{
{
SetVert
(
sal_F
alse
);
SetVert
(
f
alse
);
addStatusListener
(
OUString
(
".uno:CTLFontState"
));
addStatusListener
(
OUString
(
".uno:CTLFontState"
));
}
}
SvxVertTextTbxCtrl
::
SvxVertTextTbxCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SvxVertTextTbxCtrl
::
SvxVertTextTbxCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SvxVertCTLTextTbxCtrl
(
nSlotId
,
nId
,
rTbx
)
SvxVertCTLTextTbxCtrl
(
nSlotId
,
nId
,
rTbx
)
{
{
SetVert
(
sal_T
rue
);
SetVert
(
t
rue
);
addStatusListener
(
OUString
(
".uno:VerticalTextState"
));
addStatusListener
(
OUString
(
".uno:VerticalTextState"
));
}
}
/* ---------------------------------------------------------------------------*/
/* ---------------------------------------------------------------------------*/
SvxVertCTLTextTbxCtrl
::
SvxVertCTLTextTbxCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SvxVertCTLTextTbxCtrl
::
SvxVertCTLTextTbxCtrl
(
sal_uInt16
nSlotId
,
sal_uInt16
nId
,
ToolBox
&
rTbx
)
:
SfxToolBoxControl
(
nSlotId
,
nId
,
rTbx
),
SfxToolBoxControl
(
nSlotId
,
nId
,
rTbx
),
bCheckVertical
(
sal_T
rue
)
bCheckVertical
(
t
rue
)
{
{
}
}
...
...
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