diff options
| author | Mikhail Voytenko <mav@openoffice.org> | 2011-01-24 12:37:15 +0100 |
|---|---|---|
| committer | Mikhail Voytenko <mav@openoffice.org> | 2011-01-24 12:37:15 +0100 |
| commit | b55473cd10240c7ae3c8b4dbc34fbd44146f4a87 (patch) | |
| tree | 46235ce41b8cc650fca7ca4a1ec9465aa6f155c6 | |
| parent | 605209eda74b0b31a8da020a2dfd2bbadbb1c7d4 (diff) | |
removetooltypes01: #i112600# adjust rebase for windows
| -rw-r--r-- | fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx | 2 | ||||
| -rw-r--r-- | sfx2/inc/sfx2/viewsh.hxx | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx index c750cc3fa14b..2fadaa6bfdff 100644 --- a/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx +++ b/fpicker/source/win32/filepicker/VistaFilePickerEventHandler.cxx @@ -111,7 +111,7 @@ ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::AddRef() //----------------------------------------------------------------------------------------- ULONG STDMETHODCALLTYPE VistaFilePickerEventHandler::Release() { - sal_uLong nReturn = --m_nRefCount; + ULONG nReturn = --m_nRefCount; if ( m_nRefCount == 0 ) delete this; diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 6c643da7b978..042974d87123 100644 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -238,10 +238,10 @@ public: void AdjustVisArea(const Rectangle& rRect); // Printing Interface - virtual SfxPrinter* GetPrinter( sal_Bool bCreate = FALSE ); - virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, USHORT nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=FALSE ); + virtual SfxPrinter* GetPrinter( sal_Bool bCreate = sal_False ); + virtual sal_uInt16 SetPrinter( SfxPrinter *pNewPrinter, sal_uInt16 nDiffFlags = SFX_PRINTER_ALL, bool bIsAPI=sal_False ); virtual SfxTabPage* CreatePrintOptionsPage( Window *pParent, const SfxItemSet &rOptions ); - void LockPrinter( BOOL bLock = TRUE ); + void LockPrinter( sal_Bool bLock = sal_True ); sal_Bool IsPrinterLocked() const; virtual JobSetup GetJobSetup() const; Printer* GetActivePrinter() const; |