[Libreoffice-commits] core.git: Branch 'feature/chart-opengl2' - 2 commits - chart2/source sfx2/source
yangzhang
yangzhang at multicorewareinc.com
Wed Jan 15 08:23:40 PST 2014
chart2/source/view/main/DummyXShape.cxx | 2 -
chart2/source/view/main/OpenGLRender.cxx | 2 -
sfx2/source/appl/shutdownicon.cxx | 42 +++++++++++++++----------------
3 files changed, 23 insertions(+), 23 deletions(-)
New commits:
commit fce26e7cf30feb714c03b13ba7feae2394c76651
Author: yangzhang <yangzhang at multicorewareinc.com>
Date: Wed Jan 15 16:30:27 2014 +0800
Fix the error of shutdownicon.cxx.
Change-Id: I91d62edd72e884a0139d3aca46aff0db88b202be
Signed-off-by: shaochunfang <shaochun at multicorewareinc.com>
diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx
index ea865f4..2987d39 100644
--- a/sfx2/source/appl/shutdownicon.cxx
+++ b/sfx2/source/appl/shutdownicon.cxx
@@ -213,9 +213,9 @@ public:
class IdleTerminate : Timer
{
- Reference< XDesktop2 > m_xDesktop;
+ ::com::sun::star::uno::Reference< XDesktop2 > m_xDesktop;
public:
- IdleTerminate (Reference< XDesktop2 > xDesktop)
+ IdleTerminate (::com::sun::star::uno::Reference< XDesktop2 > xDesktop)
{
m_xDesktop = xDesktop;
Start();
@@ -257,7 +257,7 @@ void ShutdownIcon::deInitSystray()
}
-ShutdownIcon::ShutdownIcon( const Reference< XComponentContext > & rxContext ) :
+ShutdownIcon::ShutdownIcon( const ::com::sun::star::uno::Reference< XComponentContext > & rxContext ) :
ShutdownIconServiceBase( m_aMutex ),
m_bVeto ( false ),
m_bListenForTermination ( false ),
@@ -285,16 +285,16 @@ void ShutdownIcon::OpenURL( const OUString& aURL, const OUString& rTarget, const
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
- Reference < XDispatchProvider > xDispatchProvider( getInstance()->m_xDesktop, UNO_QUERY );
+ ::com::sun::star::uno::Reference < XDispatchProvider > xDispatchProvider( getInstance()->m_xDesktop, UNO_QUERY );
if ( xDispatchProvider.is() )
{
com::sun::star::util::URL aDispatchURL;
aDispatchURL.Complete = aURL;
- Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
+ ::com::sun::star::uno::Reference< util::XURLTransformer > xURLTransformer( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
try
{
- Reference< com::sun::star::frame::XDispatch > xDispatch;
+ ::com::sun::star::uno::Reference< com::sun::star::frame::XDispatch > xDispatch;
xURLTransformer->parseStrict( aDispatchURL );
xDispatch = xDispatchProvider->queryDispatch( aDispatchURL, rTarget, 0 );
@@ -330,18 +330,18 @@ void ShutdownIcon::FromTemplate()
{
if ( getInstance() && getInstance()->m_xDesktop.is() )
{
- Reference < ::com::sun::star::frame::XFramesSupplier > xDesktop ( getInstance()->m_xDesktop, UNO_QUERY);
- Reference < ::com::sun::star::frame::XFrame > xFrame( xDesktop->getActiveFrame() );
+ ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFramesSupplier > xDesktop ( getInstance()->m_xDesktop, UNO_QUERY);
+ ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame( xDesktop->getActiveFrame() );
if ( !xFrame.is() )
- xFrame = Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY );
+ xFrame = ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame >( xDesktop, UNO_QUERY );
URL aTargetURL;
aTargetURL.Complete = "slot:5500";
- Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
+ ::com::sun::star::uno::Reference< util::XURLTransformer > xTrans( util::URLTransformer::create( ::comphelper::getProcessComponentContext() ) );
xTrans->parseStrict( aTargetURL );
- Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY );
- Reference < ::com::sun::star::frame::XDispatch > xDisp;
+ ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatchProvider > xProv( xFrame, UNO_QUERY );
+ ::com::sun::star::uno::Reference < ::com::sun::star::frame::XDispatch > xDisp;
if ( xProv.is() )
{
if (aTargetURL.Protocol == "slot:")
@@ -355,7 +355,7 @@ void ShutdownIcon::FromTemplate()
PropertyValue* pArg = aArgs.getArray();
pArg[0].Name = "Referer";
pArg[0].Value <<= OUString("private:user");
- Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
+ ::com::sun::star::uno::Reference< ::com::sun::star::frame::XNotifyingDispatch > xNotifyer( xDisp, UNO_QUERY );
if ( xNotifyer.is() )
{
EnterModalMode();
@@ -424,7 +424,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
// use constructor for filling up filters automatically!
if ( ERRCODE_NONE == pThis->m_pFileDlg->GetError() )
{
- Reference< XFilePicker > xPicker = pThis->m_pFileDlg->GetFilePicker();
+ ::com::sun::star::uno::Reference< XFilePicker > xPicker = pThis->m_pFileDlg->GetFilePicker();
try
{
@@ -432,8 +432,8 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
if ( xPicker.is() )
{
- Reference < XFilePickerControlAccess > xPickerControls ( xPicker, UNO_QUERY );
- Reference < XFilterManager > xFilterManager ( xPicker, UNO_QUERY );
+ ::com::sun::star::uno::Reference < XFilePickerControlAccess > xPickerControls ( xPicker, UNO_QUERY );
+ ::com::sun::star::uno::Reference < XFilterManager > xFilterManager ( xPicker, UNO_QUERY );
Sequence< OUString > sFiles = xPicker->getFiles();
int nFiles = sFiles.getLength();
@@ -441,7 +441,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR
int nArgs=3;
Sequence< PropertyValue > aArgs(3);
- Reference < com::sun::star::task::XInteractionHandler2 > xInteraction(
+ ::com::sun::star::uno::Reference < com::sun::star::task::XInteractionHandler2 > xInteraction(
task::InteractionHandler::createWithParent(::comphelper::getProcessComponentContext(), 0) );
aArgs[0].Name = "InteractionHandler";
@@ -570,7 +570,7 @@ void ShutdownIcon::addTerminateListener()
if (pInst->m_bListenForTermination)
return;
- Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
+ ::com::sun::star::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
if ( ! xDesktop.is())
return;
@@ -586,7 +586,7 @@ void ShutdownIcon::terminateDesktop()
if ( ! pInst)
return;
- Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
+ ::com::sun::star::uno::Reference< XDesktop2 > xDesktop = pInst->m_xDesktop;
if ( ! xDesktop.is())
return;
@@ -595,7 +595,7 @@ void ShutdownIcon::terminateDesktop()
xDesktop->removeTerminateListener( pInst );
// terminate desktop only if no tasks exist
- Reference< XIndexAccess > xTasks ( xDesktop->getFrames(), UNO_QUERY );
+ ::com::sun::star::uno::Reference< XIndexAccess > xTasks ( xDesktop->getFrames(), UNO_QUERY );
if( xTasks.is() && xTasks->getCount() < 1 )
new IdleTerminate( xDesktop );
@@ -639,7 +639,7 @@ void ShutdownIcon::init() throw( ::com::sun::star::uno::Exception )
::osl::ResettableMutexGuard aGuard( m_aMutex );
m_pResMgr = pResMgr;
aGuard.clear();
- Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext );
+ ::com::sun::star::uno::Reference < XDesktop2 > xDesktop = Desktop::create( m_xContext );
aGuard.reset();
m_xDesktop = xDesktop;
}
commit 04c0b2271c19ff2d6a12aa03bcdaff6a77ddcc78
Author: Peilin <peilin at multicorewareinc.com>
Date: Wed Jan 15 16:07:26 2014 +0800
modify the color property and adjust bitmap pos&size
Change-Id: I487d2b12acda6fe25913d2488110afc63ba1e37e
diff --git a/chart2/source/view/main/DummyXShape.cxx b/chart2/source/view/main/DummyXShape.cxx
index 596c0c4..64b1692 100644
--- a/chart2/source/view/main/DummyXShape.cxx
+++ b/chart2/source/view/main/DummyXShape.cxx
@@ -453,7 +453,7 @@ void setProperties( const VLineProperties& rLineProperties, std::map<OUString, u
//LineColor
if(rLineProperties.Color.hasValue())
rTargetProps.insert(std::pair<OUString, uno::Any>(
- UNO_NAME_LINECOLOR, rLineProperties.Transparence));
+ UNO_NAME_LINECOLOR, rLineProperties.Color));
//LineDashName
if(rLineProperties.DashName.hasValue())
diff --git a/chart2/source/view/main/OpenGLRender.cxx b/chart2/source/view/main/OpenGLRender.cxx
index 9559498..9bd3e49 100644
--- a/chart2/source/view/main/OpenGLRender.cxx
+++ b/chart2/source/view/main/OpenGLRender.cxx
@@ -525,7 +525,7 @@ int OpenGLRender::InitOpenGL(GLWindow aWindow)
BitmapEx OpenGLRender::GetAsBitmap()
{
boost::scoped_array<sal_uInt8> buf(new sal_uInt8[m_iWidth * m_iHeight * 4]);
- glReadPixels(0, 0, m_iWidth, m_iHeight, GL_RGBA, GL_UNSIGNED_BYTE, buf.get());
+ glReadPixels(0, 0, m_iWidth, m_iHeight, GL_BGRA, GL_UNSIGNED_BYTE, buf.get());
Bitmap aBitmap( Size(m_iWidth, m_iHeight), 24 );
AlphaMask aAlpha( Size(m_iWidth, m_iHeight) );
More information about the Libreoffice-commits
mailing list