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
46662428
Kaydet (Commit)
46662428
authored
May 03, 2013
tarafından
Noel Grandin
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
fdo#46808, Convert graphic::Primitive2DTools to new style
Change-Id: I9719b43dbf98cfca29638f54cc907e48c7ad28b7
üst
6e0d0934
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
59 additions
and
74 deletions
+59
-74
UnoApi_offapi.mk
offapi/UnoApi_offapi.mk
+1
-1
Primitive2DTools.idl
offapi/com/sun/star/graphic/Primitive2DTools.idl
+1
-7
appmisc.cxx
sfx2/source/appl/appmisc.cxx
+29
-34
svgdata.cxx
vcl/source/gdi/svgdata.cxx
+28
-32
No files found.
offapi/UnoApi_offapi.mk
Dosyayı görüntüle @
46662428
...
...
@@ -189,6 +189,7 @@ $(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/frame,\
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/graphic,\
GraphicObject \
GraphicProvider \
Primitive2DTools \
))
$(eval $(call gb_UnoApi_add_idlfiles_nohdl,offapi,offapi/com/sun/star/inspection,\
DefaultHelpProvider \
...
...
@@ -938,7 +939,6 @@ $(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/graphic
GraphicRasterizer \
GraphicRendererVCL \
MediaProperties \
Primitive2DTools \
))
$(eval $(call gb_UnoApi_add_idlfiles_noheader,offapi,offapi/com/sun/star/i18n,\
ChapterCollator \
...
...
offapi/com/sun/star/graphic/Primitive2DTools.idl
Dosyayı görüntüle @
46662428
...
...
@@ -27,13 +27,7 @@ module com { module sun { module star { module graphic
/**
Service
that
describes
the
necessary
interfaces
and
properties
for
tooling
involved
with
XPrimitive2D
interfaces
*/
service
Primitive2DTools
{
/**
Interface
to
render
B2DPrimitives
to
a
XBitmap
*/
interface
::
com
::
sun
::
star
::
graphic
::
XPrimitive2DRenderer
;
}
;
service
Primitive2DTools
:
XPrimitive2DRenderer
;
}
; } ; } ; } ;
...
...
sfx2/source/appl/appmisc.cxx
Dosyayı görüntüle @
46662428
...
...
@@ -30,7 +30,7 @@
#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
#include <com/sun/star/beans/PropertyValue.hpp>
#include <com/sun/star/frame/XFrame.hpp>
#include <com/sun/star/graphic/
XPrimitive2DRenderer
.hpp>
#include <com/sun/star/graphic/
Primitive2DTools
.hpp>
#include <com/sun/star/util/XURLTransformer.hpp>
#include <com/sun/star/frame/XFramesSupplier.hpp>
#include <com/sun/star/uno/Reference.h>
...
...
@@ -218,44 +218,39 @@ bool SfxApplication::loadBrandSvg(const char *pName, BitmapEx &rBitmap, int nWid
// UNO dance to render from drawinglayer
// ---------------------------------------------------------------------
uno
::
Reference
<
lang
::
XMultiServiceFactory
>
xFactory
(
::
comphelper
::
getProcessServiceFactory
());
const
OUString
aServiceName
(
"com.sun.star.graphic.Primitive2DTools"
);
uno
::
Reference
<
uno
::
XComponentContext
>
xContext
(
::
comphelper
::
getProcessComponentContext
());
try
{
const
uno
::
Reference
<
graphic
::
XPrimitive2DRenderer
>
xPrimitive2DRenderer
(
xFactory
->
createInstance
(
aServiceName
),
uno
::
UNO_QUERY_THROW
);
if
(
xPrimitive2DRenderer
.
is
())
const
uno
::
Reference
<
graphic
::
XPrimitive2DRenderer
>
xPrimitive2DRenderer
=
graphic
::
Primitive2DTools
::
create
(
xContext
);
// cancel out rasterize's mm2pixel conversion
// see fFactor100th_mmToInch in
// drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
const
double
fFakeDPI
=
2.54
*
1000.0
;
geometry
::
RealRectangle2D
aRealRect
(
0
,
0
,
nWidth
,
nWidth
/
fAspectRatio
);
const
uno
::
Reference
<
rendering
::
XBitmap
>
xBitmap
(
xPrimitive2DRenderer
->
rasterize
(
drawinglayer
::
primitive2d
::
Primitive2DSequence
(
&
xTransformRef
,
1
),
uno
::
Sequence
<
beans
::
PropertyValue
>
(),
fFakeDPI
,
fFakeDPI
,
aRealRect
,
500000
));
if
(
xBitmap
.
is
())
{
// cancel out rasterize's mm2pixel conversion
// see fFactor100th_mmToInch in
// drawinglayer/source/drawinglayeruno/xprimitive2drenderer.cxx
const
double
fFakeDPI
=
2.54
*
1000.0
;
geometry
::
RealRectangle2D
aRealRect
(
0
,
0
,
nWidth
,
nWidth
/
fAspectRatio
);
const
uno
::
Reference
<
rendering
::
XBitmap
>
xBitmap
(
xPrimitive2DRenderer
->
rasterize
(
drawinglayer
::
primitive2d
::
Primitive2DSequence
(
&
xTransformRef
,
1
),
uno
::
Sequence
<
beans
::
PropertyValue
>
(),
fFakeDPI
,
fFakeDPI
,
aRealRect
,
500000
));
if
(
xBitmap
.
is
())
{
const
uno
::
Reference
<
rendering
::
XIntegerReadOnlyBitmap
>
xIntBmp
(
xBitmap
,
uno
::
UNO_QUERY_THROW
);
const
uno
::
Reference
<
rendering
::
XIntegerReadOnlyBitmap
>
xIntBmp
(
xBitmap
,
uno
::
UNO_QUERY_THROW
);
if
(
xIntBmp
.
is
())
{
rBitmap
=
vcl
::
unotools
::
bitmapExFromXBitmap
(
xIntBmp
);
return
true
;
}
if
(
xIntBmp
.
is
())
{
rBitmap
=
vcl
::
unotools
::
bitmapExFromXBitmap
(
xIntBmp
);
return
true
;
}
}
}
...
...
vcl/source/gdi/svgdata.cxx
Dosyayı görüntüle @
46662428
...
...
@@ -22,7 +22,7 @@
#include <comphelper/processfactory.hxx>
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
#include <com/sun/star/graphic/XSvgParser.hpp>
#include <com/sun/star/graphic/
XPrimitive2DRenderer
.hpp>
#include <com/sun/star/graphic/
Primitive2DTools
.hpp>
#include <com/sun/star/rendering/XIntegerReadOnlyBitmap.hpp>
#include <vcl/canvastools.hxx>
#include <comphelper/seqstream.hxx>
...
...
@@ -46,43 +46,39 @@ BitmapEx VCL_DLLPUBLIC convertPrimitive2DSequenceToBitmapEx(
{
// create replacement graphic from maSequence
// create XPrimitive2DRenderer
uno
::
Reference
<
lang
::
XMultiServiceFactory
>
xFactory
(
::
comphelper
::
getProcessServiceFactory
());
const
OUString
aServiceName
(
"com.sun.star.graphic.Primitive2DTools"
);
uno
::
Reference
<
uno
::
XComponentContext
>
xContext
(
::
comphelper
::
getProcessComponentContext
());
try
{
const
uno
::
Reference
<
graphic
::
XPrimitive2DRenderer
>
xPrimitive2DRenderer
(
xFactory
->
createInstance
(
aServiceName
),
uno
::
UNO_QUERY_THROW
);
const
uno
::
Reference
<
graphic
::
XPrimitive2DRenderer
>
xPrimitive2DRenderer
=
graphic
::
Primitive2DTools
::
create
(
xContext
);
if
(
xPrimitive2DRenderer
.
is
())
uno
::
Sequence
<
beans
::
PropertyValue
>
aViewParameters
;
geometry
::
RealRectangle2D
aRealRect
;
aRealRect
.
X1
=
rTargetRange
.
getMinX
();
aRealRect
.
Y1
=
rTargetRange
.
getMinY
();
aRealRect
.
X2
=
rTargetRange
.
getMaxX
();
aRealRect
.
Y2
=
rTargetRange
.
getMaxY
();
// get system DPI
const
Size
aDPI
(
Application
::
GetDefaultDevice
()
->
LogicToPixel
(
Size
(
1
,
1
),
MAP_INCH
));
const
uno
::
Reference
<
rendering
::
XBitmap
>
xBitmap
(
xPrimitive2DRenderer
->
rasterize
(
rSequence
,
aViewParameters
,
aDPI
.
getWidth
(),
aDPI
.
getHeight
(),
aRealRect
,
nMaximumQuadraticPixels
));
if
(
xBitmap
.
is
())
{
uno
::
Sequence
<
beans
::
PropertyValue
>
aViewParameters
;
geometry
::
RealRectangle2D
aRealRect
;
aRealRect
.
X1
=
rTargetRange
.
getMinX
();
aRealRect
.
Y1
=
rTargetRange
.
getMinY
();
aRealRect
.
X2
=
rTargetRange
.
getMaxX
();
aRealRect
.
Y2
=
rTargetRange
.
getMaxY
();
// get system DPI
const
Size
aDPI
(
Application
::
GetDefaultDevice
()
->
LogicToPixel
(
Size
(
1
,
1
),
MAP_INCH
));
const
uno
::
Reference
<
rendering
::
XBitmap
>
xBitmap
(
xPrimitive2DRenderer
->
rasterize
(
rSequence
,
aViewParameters
,
aDPI
.
getWidth
(),
aDPI
.
getHeight
(),
aRealRect
,
nMaximumQuadraticPixels
));
if
(
xBitmap
.
is
())
{
const
uno
::
Reference
<
rendering
::
XIntegerReadOnlyBitmap
>
xIntBmp
(
xBitmap
,
uno
::
UNO_QUERY_THROW
);
const
uno
::
Reference
<
rendering
::
XIntegerReadOnlyBitmap
>
xIntBmp
(
xBitmap
,
uno
::
UNO_QUERY_THROW
);
if
(
xIntBmp
.
is
())
{
aRetval
=
vcl
::
unotools
::
bitmapExFromXBitmap
(
xIntBmp
);
}
if
(
xIntBmp
.
is
())
{
aRetval
=
vcl
::
unotools
::
bitmapExFromXBitmap
(
xIntBmp
);
}
}
}
...
...
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