diff options
Diffstat (limited to 'vcl/osx')
-rw-r--r-- | vcl/osx/OSXTransferable.cxx | 4 | ||||
-rw-r--r-- | vcl/osx/OSXTransferable.hxx | 2 | ||||
-rw-r--r-- | vcl/osx/clipboard.cxx | 2 | ||||
-rw-r--r-- | vcl/osx/salmenu.cxx | 8 | ||||
-rw-r--r-- | vcl/osx/salnativewidgets.cxx | 8 | ||||
-rw-r--r-- | vcl/osx/salprn.cxx | 12 |
6 files changed, 13 insertions, 23 deletions
diff --git a/vcl/osx/OSXTransferable.cxx b/vcl/osx/OSXTransferable.cxx index 0857116eb58b..d01b4aaf470c 100644 --- a/vcl/osx/OSXTransferable.cxx +++ b/vcl/osx/OSXTransferable.cxx @@ -119,9 +119,9 @@ sal_Bool SAL_CALL OSXTransferable::isDataFlavorSupported(const DataFlavor& aFlav { for (sal_Int32 i = 0; i < mFlavorList.getLength(); i++) if (compareDataFlavors(aFlavor, mFlavorList[i])) - return sal_True; + return true; - return sal_False; + return false; } diff --git a/vcl/osx/OSXTransferable.hxx b/vcl/osx/OSXTransferable.hxx index 2ccbfdf167fa..7177bef30b1d 100644 --- a/vcl/osx/OSXTransferable.hxx +++ b/vcl/osx/OSXTransferable.hxx @@ -62,10 +62,8 @@ public: virtual sal_Bool SAL_CALL isDataFlavorSupported( const ::com::sun::star::datatransfer::DataFlavor& aFlavor ) throw( ::com::sun::star::uno::RuntimeException, std::exception ); - // Helper functions not part of the XTransferable interface - void initClipboardItemList(); //com::sun::star::uno::Any getClipboardItemData(ClipboardItemPtr_t clipboardItem); diff --git a/vcl/osx/clipboard.cxx b/vcl/osx/clipboard.cxx index 6932faec07b4..f27f0d37d7a9 100644 --- a/vcl/osx/clipboard.cxx +++ b/vcl/osx/clipboard.cxx @@ -344,4 +344,4 @@ Sequence< OUString > SAL_CALL AquaClipboard::getSupportedServiceNames() throw( R return clipboard_getSupportedServiceNames(); } -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/vcl/osx/salmenu.cxx b/vcl/osx/salmenu.cxx index cf46277d9806..30b9a37b5edc 100644 --- a/vcl/osx/salmenu.cxx +++ b/vcl/osx/salmenu.cxx @@ -205,7 +205,7 @@ static void initAppMenu() -SalMenu* AquaSalInstance::CreateMenu( sal_Bool bMenuBar, Menu* pVCLMenu ) +SalMenu* AquaSalInstance::CreateMenu( bool bMenuBar, Menu* pVCLMenu ) { initAppMenu(); @@ -343,7 +343,7 @@ sal_Int32 removeUnusedItemsRunner(NSMenu * pMenu) bool AquaSalMenu::ShowNativePopupMenu(FloatingWindow * pWin, const Rectangle& rRect, sal_uLong nFlags) { - // do not use native popup menu when AQUA_NATIVE_MENUS is set to sal_False + // do not use native popup menu when AQUA_NATIVE_MENUS is set to false if( ! VisibleMenuBar() ) { return false; } @@ -633,7 +633,7 @@ void AquaSalMenu::SetSubMenu( SalMenuItem* pSalMenuItem, SalMenu* pSubMenu, unsi } } -void AquaSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck ) +void AquaSalMenu::CheckItem( unsigned nPos, bool bCheck ) { if( nPos < maItems.size() ) { @@ -642,7 +642,7 @@ void AquaSalMenu::CheckItem( unsigned nPos, sal_Bool bCheck ) } } -void AquaSalMenu::EnableItem( unsigned nPos, sal_Bool bEnable ) +void AquaSalMenu::EnableItem( unsigned nPos, bool bEnable ) { if( nPos < maItems.size() ) { diff --git a/vcl/osx/salnativewidgets.cxx b/vcl/osx/salnativewidgets.cxx index 2ed64b1d18e8..574010a98511 100644 --- a/vcl/osx/salnativewidgets.cxx +++ b/vcl/osx/salnativewidgets.cxx @@ -264,7 +264,7 @@ static bool AquaGetScrollRect( /* TODO: int nScreen, */ ControlPart nPart, /* * IsNativeControlSupported() * -------------------------- - * Returns sal_True if the platform supports native + * Returns true if the platform supports native * drawing of the control defined by nPart. * */ @@ -398,7 +398,7 @@ bool AquaSalGraphics::IsNativeControlSupported( ControlType nType, ControlPart n /* * HitTestNativeControl() * - * If the return value is sal_True, bIsInside contains information whether + * If the return value is true, bIsInside contains information whether * aPos was or was not inside the native widget specified by the * nType/nPart combination. */ @@ -409,7 +409,7 @@ bool AquaSalGraphics::hitTestNativeControl( ControlType nType, ControlPart nPart { Rectangle aRect; bool bValid = AquaGetScrollRect( /* TODO: m_nScreen */ nPart, rControlRegion, aRect ); - rIsInside = bValid ? aRect.IsInside( rPos ) : sal_False; + rIsInside = bValid ? aRect.IsInside( rPos ) : false; if( NSAppKitVersionNumber < NSAppKitVersionNumber10_7 && GetSalData()->mbIsScrollbarDoubleMax ) { @@ -1200,7 +1200,7 @@ bool AquaSalGraphics::drawNativeControl(ControlType nType, /* * GetNativeControlRegion() * - * If the return value is sal_True, rNativeBoundingRegion + * If the return value is true, rNativeBoundingRegion * contains the true bounding region covered by the control * including any adornment, while rNativeContentRegion contains the area * within the control that can be safely drawn into without drawing over diff --git a/vcl/osx/salprn.cxx b/vcl/osx/salprn.cxx index c4b032647b51..3171b00e3831 100644 --- a/vcl/osx/salprn.cxx +++ b/vcl/osx/salprn.cxx @@ -544,7 +544,7 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, // inform application that it can release its data // this is awkward, but the XRenderable interface has no method for this, - // so we need to call XRenderadble::render one last time with IsLastPage = sal_True + // so we need to call XRenderadble::render one last time with IsLastPage = true i_rController.setLastPage( true ); GDIMetaFile aPageFile; if( mrContext ) @@ -560,8 +560,6 @@ bool AquaSalInfoPrinter::StartJob( const OUString* i_pFileName, return bSuccess; } - - bool AquaSalInfoPrinter::EndJob() { mnStartPageOffsetX = mnStartPageOffsetY = 0; @@ -569,8 +567,6 @@ bool AquaSalInfoPrinter::EndJob() return true; } - - bool AquaSalInfoPrinter::AbortJob() { mbJob = false; @@ -579,8 +575,6 @@ bool AquaSalInfoPrinter::AbortJob() return false; } - - SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) { if( i_bNewJobData && i_pSetupData ) @@ -593,8 +587,6 @@ SalGraphics* AquaSalInfoPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_b return mpGraphics; } - - bool AquaSalInfoPrinter::EndPage() { mpGraphics->InvalidateContext(); @@ -662,7 +654,7 @@ bool AquaSalPrinter::AbortJob() -SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, sal_Bool i_bNewJobData ) +SalGraphics* AquaSalPrinter::StartPage( ImplJobSetup* i_pSetupData, bool i_bNewJobData ) { return mpInfoPrinter->StartPage( i_pSetupData, i_bNewJobData ); } |