reportdesign/source/ui/misc/statusbarcontroller.cxx | 2 +-
reportdesign/source/ui/misc/toolboxcontroller.cxx | 2 +-
sd/source/ui/view/DocumentRenderer.cxx | 5 +++--
starmath/source/unomodel.cxx | 4 ++--
sw/inc/printdata.hxx | 2 +-
sw/source/core/view/printdata.cxx | 3 +--
6 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 54fbea8679ff37bc4b2914b41da22b782be3a9d2
Author: Michael Meeks <michael.me...@collabora.com>
Date: Mon Mar 16 21:46:08 2015 +0000
more toolkit API adaptations.
Change-Id: I55e3153bf38af376fe367d575ceb19f5b4405e1c
diff --git a/reportdesign/source/ui/misc/statusbarcontroller.cxx
b/reportdesign/source/ui/misc/statusbarcontroller.cxx
index cbc9afa..8646cb3 100644
--- a/reportdesign/source/ui/misc/statusbarcontroller.cxx
+++ b/reportdesign/source/ui/misc/statusbarcontroller.cxx
@@ -86,7 +86,7 @@ void SAL_CALL OStatusbarController::initialize( const
Sequence< Any >& _rArgumen
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
- StatusBar* pStatusBar =
static_cast<StatusBar*>(VCLUnoHelper::GetWindow(m_xParentWindow));
+ VclPtr< StatusBar > pStatusBar =
static_cast<StatusBar*>(VCLUnoHelper::GetWindow(m_xParentWindow).get());
if ( pStatusBar )
{
const sal_uInt16 nCount = pStatusBar->GetItemCount();
diff --git a/reportdesign/source/ui/misc/toolboxcontroller.cxx
b/reportdesign/source/ui/misc/toolboxcontroller.cxx
index cb83281..d2b5ad8 100644
--- a/reportdesign/source/ui/misc/toolboxcontroller.cxx
+++ b/reportdesign/source/ui/misc/toolboxcontroller.cxx
@@ -127,7 +127,7 @@ void SAL_CALL OToolboxController::initialize( const
Sequence< Any >& _rArguments
SolarMutexGuard aSolarMutexGuard;
::osl::MutexGuard aGuard(m_aMutex);
- ToolBox* pToolBox =
static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()));
+ VclPtr< ToolBox > pToolBox =
static_cast<ToolBox*>(VCLUnoHelper::GetWindow(getParent()).get());
if ( pToolBox )
{
const sal_uInt16 nCount = pToolBox->GetItemCount();
diff --git a/sd/source/ui/view/DocumentRenderer.cxx
b/sd/source/ui/view/DocumentRenderer.cxx
index ec4dd2c..fe12b05 100644
--- a/sd/source/ui/view/DocumentRenderer.cxx
+++ b/sd/source/ui/view/DocumentRenderer.cxx
@@ -1195,8 +1195,9 @@ public:
if (aDev >>= xRenderDevice)
{
VCLXDevice* pDevice = VCLXDevice::GetImplementation(xRenderDevice);
- OutputDevice* pOut = pDevice ? pDevice->GetOutputDevice() : NULL;
- mpPrinter = dynamic_cast<Printer*>(pOut);
+ VclPtr< OutputDevice > pOut = pDevice ? pDevice->GetOutputDevice()
+ : VclPtr< OutputDevice >();
+ mpPrinter = dynamic_cast<Printer*>(pOut.get());
Size aPageSizePixel = mpPrinter ? mpPrinter->GetPaperSizePixel() :
Size();
if( aPageSizePixel != maPrinterPageSizePixel )
{
diff --git a/starmath/source/unomodel.cxx b/starmath/source/unomodel.cxx
index 591c1f2..d47292b 100644
--- a/starmath/source/unomodel.cxx
+++ b/starmath/source/unomodel.cxx
@@ -1037,8 +1037,8 @@ void SAL_CALL SmModel::render(
if (xRenderDevice.is())
{
VCLXDevice* pDevice = VCLXDevice::GetImplementation( xRenderDevice );
- OutputDevice* pOut = pDevice ? pDevice->GetOutputDevice() : NULL;
-
+ VclRef< OutputDevice> pOut = pDevice ? pDevice->GetOutputDevice()
+ : VclRef< OutputDevice >();
if (!pOut)
throw RuntimeException();
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 95a5c2a..8e3e17b 100644
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -172,7 +172,7 @@ public:
class SwPrintUIOptions : public vcl::PrinterOptionsHelper
{
- OutputDevice* m_pLast;
+ VclPtr< OutputDevice > m_pLast;
const SwPrintData & m_rDefaultPrintData;
public:
diff --git a/sw/source/core/view/printdata.cxx
b/sw/source/core/view/printdata.cxx
index bb1a4996..3fbe894 100644
--- a/sw/source/core/view/printdata.cxx
+++ b/sw/source/core/view/printdata.cxx
@@ -158,7 +158,6 @@ SwPrintUIOptions::SwPrintUIOptions(
bool bHasSelection,
bool bHasPostIts,
const SwPrintData &rDefaultPrintData ) :
- m_pLast( NULL ),
m_rDefaultPrintData( rDefaultPrintData )
{
ResStringArray aLocalizedStrings( SW_RES( STR_PRINTOPTUI ) );
@@ -487,7 +486,7 @@ bool SwPrintUIOptions::processPropertiesAndCheckFormat(
const uno::Sequence< bea
if (pDevice)
pOut = pDevice->GetOutputDevice();
}
- bChanged = bChanged || (pOut != m_pLast);
+ bChanged = bChanged || (pOut.get() != m_pLast.get());
if( pOut )
m_pLast = pOut;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
