Move OutputDevice members to VclPtr: chart2, sfx2, cui.
Change-Id: If9228f8777edd4532e9a167eae23095c5e232a6c
This commit is contained in:
@@ -181,8 +181,8 @@ private:
|
||||
VclPtr< FixedImage > m_spSymbol;
|
||||
VclPtr< SeriesHeaderEdit > m_spSeriesName;
|
||||
VclPtr< FixedText > m_spColorBar;
|
||||
OutputDevice * m_pDevice;
|
||||
Link m_aChangeLink;
|
||||
VclPtr< OutputDevice> m_pDevice;
|
||||
Link m_aChangeLink;
|
||||
|
||||
void notifyChanges();
|
||||
DECL_LINK( SeriesNameChanged, void * );
|
||||
|
@@ -140,7 +140,7 @@ private:
|
||||
|
||||
//UUUU SvxPage_Impl* pImpl;
|
||||
MarginPosition m_nPos;
|
||||
Printer* mpDefPrinter;
|
||||
VclPtr<Printer> mpDefPrinter;
|
||||
|
||||
bool mbDelPrinter : 1;
|
||||
|
||||
|
@@ -373,8 +373,7 @@ void SvxPageDescPage::dispose()
|
||||
{
|
||||
if(mbDelPrinter)
|
||||
{
|
||||
delete mpDefPrinter;
|
||||
mpDefPrinter = NULL;
|
||||
mpDefPrinter.disposeAndClear();
|
||||
mbDelPrinter = false;
|
||||
}
|
||||
m_pPaperSizeBox.clear();
|
||||
|
@@ -477,7 +477,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread
|
||||
{
|
||||
private:
|
||||
/// of course we must know the printer which execute the job
|
||||
SfxPrinter* m_pPrinter;
|
||||
VclPtr<SfxPrinter> m_pPrinter;
|
||||
/// this describes the target location for the printed temp file
|
||||
OUString m_sTargetURL;
|
||||
/// it holds the temp file alive, till the print job will finish and remove it from disk automatically if the object die
|
||||
@@ -504,7 +504,7 @@ class ImplUCBPrintWatcher : public ::osl::Thread
|
||||
SolarMutexGuard aGuard;
|
||||
while( m_pPrinter->IsPrinting() )
|
||||
Application::Yield();
|
||||
m_pPrinter = NULL; // don't delete it! It's borrowed only :-)
|
||||
m_pPrinter.clear(); // don't delete it! It's borrowed only :-)
|
||||
}
|
||||
/* } SAFE */
|
||||
|
||||
|
Reference in New Issue
Block a user