diff options
| author | Noel Grandin <noel@peralex.com> | 2014-04-07 09:15:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-04-07 13:53:50 +0200 |
| commit | 74fdda0cd41d97b6c97d2115584ee48fd552514e (patch) | |
| tree | fa29308f180abbd7dec4c16f5603604a15fa079e | |
| parent | 1eee88dd6bf2c647aa3458d33a5f45c51c024186 (diff) | |
sfx2: sal_Bool->bool
Change-Id: I48ae51781f64e60deb0c03352087100729c8c3cd
130 files changed, 1791 insertions, 1801 deletions
diff --git a/include/sfx2/childwin.hxx b/include/sfx2/childwin.hxx index 8680809b4d15..0dec11a00583 100644 --- a/include/sfx2/childwin.hxx +++ b/include/sfx2/childwin.hxx @@ -208,7 +208,7 @@ public: void SetHideNotDelete( bool bOn ); bool IsHideNotDelete() const; bool IsHideAtToggle() const; - sal_Bool IsVisible() const; + bool IsVisible() const; void SetWantsFocus( bool ); bool WantsFocus() const; @@ -217,7 +217,7 @@ public: void SetFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > & ); SAL_DLLPRIVATE static void InitializeChildWinFactory_Impl(sal_uInt16, SfxChildWinInfo&); - SAL_DLLPRIVATE void SetVisible_Impl( sal_Bool bVis ); + SAL_DLLPRIVATE void SetVisible_Impl( bool bVis ); SAL_DLLPRIVATE void SetWorkWindow_Impl( SfxWorkWindow* ); SAL_DLLPRIVATE void Activate_Impl(); SAL_DLLPRIVATE void Deactivate_Impl(); @@ -281,7 +281,7 @@ public: public : \ static SfxChildWindow* CreateImpl(::Window *pParent, sal_uInt16 nId, \ SfxBindings *pBindings, SfxChildWinInfo* pInfo ); \ - static void RegisterChildWindow (sal_Bool bVisible=sal_False, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \ + static void RegisterChildWindow (bool bVisible=false, SfxModule *pMod=NULL, sal_uInt16 nFlags=0); \ virtual SfxChildWinInfo GetInfo() const SAL_OVERRIDE #define SFX_DECL_CHILDWINDOW_WITHID(Class) \ @@ -301,7 +301,7 @@ public: SfxChildWindow *pWin = new Class(pParent, nId, pBindings, pInfo);\ return pWin; \ } \ - void Class::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags) \ + void Class::RegisterChildWindow (bool bVis, SfxModule *pMod, sal_uInt16 nFlags) \ { \ SfxChildWinFactory *pFact = new SfxChildWinFactory( \ Class::CreateImpl, MyID, Pos ); \ diff --git a/include/sfx2/sfxbasemodel.hxx b/include/sfx2/sfxbasemodel.hxx index 2ed6834238e3..3225e28b694d 100644 --- a/include/sfx2/sfxbasemodel.hxx +++ b/include/sfx2/sfxbasemodel.hxx @@ -1334,7 +1334,7 @@ public: virtual sal_Bool SAL_CALL canCancelCheckOut( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual sal_Bool SAL_CALL canCheckIn( ) throw ( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - sal_Bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException ); + bool getBoolPropertyValue( const OUString& rName ) throw ( css::uno::RuntimeException ); // SfxListener diff --git a/include/sfx2/tabdlg.hxx b/include/sfx2/tabdlg.hxx index 54baa7a023ba..79c750021511 100644 --- a/include/sfx2/tabdlg.hxx +++ b/include/sfx2/tabdlg.hxx @@ -198,7 +198,7 @@ public: const sal_uInt16* GetInputRanges( const SfxItemPool& ); void SetInputSet( const SfxItemSet* pInSet ); const SfxItemSet* GetOutputItemSet() const { return pOutSet; } - bool IsFormat() const { return bFmt; } + sal_Bool IsFormat() const { return bFmt; } const PushButton& GetOKButton() const { return *m_pOKBtn; } PushButton& GetOKButton() { return *m_pOKBtn; } diff --git a/sd/source/ui/app/sddll.cxx b/sd/source/ui/app/sddll.cxx index 1863c758ae47..fd0d5b8bc66c 100644 --- a/sd/source/ui/app/sddll.cxx +++ b/sd/source/ui/app/sddll.cxx @@ -193,24 +193,24 @@ void SdDLL::RegisterControllers() SdTbxCtlDiaPages::RegisterControl( SID_PAGES_PER_ROW, pMod ); SdTbxCtlGlueEscDir::RegisterControl( SID_GLUE_ESCDIR, pMod ); - ::sd::AnimationChildWindow::RegisterChildWindow(0, pMod); + ::sd::AnimationChildWindow::RegisterChildWindow(false, pMod); ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16) ::sd::DrawViewShell::GetInterfaceId(), pMod ); ::sd::NavigatorChildWindow::RegisterChildWindowContext( (sal_uInt16) ::sd::GraphicViewShell::GetInterfaceId(), pMod ); - ::sd::LayerDialogChildWindow::RegisterChildWindow(0, pMod); - - Svx3DChildWindow::RegisterChildWindow(0, pMod); - SvxFontWorkChildWindow::RegisterChildWindow(0, pMod); - SvxColorChildWindow::RegisterChildWindow(0, pMod, SFX_CHILDWIN_TASK); - SvxSearchDialogWrapper::RegisterChildWindow(0, pMod); - SvxBmpMaskChildWindow::RegisterChildWindow(0, pMod); - GalleryChildWindow::RegisterChildWindow(0, pMod); - SvxIMapDlgChildWindow::RegisterChildWindow(0, pMod); - SvxHlinkDlgWrapper::RegisterChildWindow(0, pMod); - ::sd::SpellDialogChildWindow::RegisterChildWindow(0, pMod); - ::avmedia::MediaPlayer::RegisterChildWindow(0, pMod); - ::sd::LeftPaneImpressChildWindow::RegisterChildWindow(0, pMod); - ::sd::LeftPaneDrawChildWindow::RegisterChildWindow(0, pMod); - ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(0, pMod); + ::sd::LayerDialogChildWindow::RegisterChildWindow(false, pMod); + + Svx3DChildWindow::RegisterChildWindow(false, pMod); + SvxFontWorkChildWindow::RegisterChildWindow(false, pMod); + SvxColorChildWindow::RegisterChildWindow(false, pMod, SFX_CHILDWIN_TASK); + SvxSearchDialogWrapper::RegisterChildWindow(false, pMod); + SvxBmpMaskChildWindow::RegisterChildWindow(false, pMod); + GalleryChildWindow::RegisterChildWindow(false, pMod); + SvxIMapDlgChildWindow::RegisterChildWindow(false, pMod); + SvxHlinkDlgWrapper::RegisterChildWindow(false, pMod); + ::sd::SpellDialogChildWindow::RegisterChildWindow(false, pMod); + ::avmedia::MediaPlayer::RegisterChildWindow(false, pMod); + ::sd::LeftPaneImpressChildWindow::RegisterChildWindow(false, pMod); + ::sd::LeftPaneDrawChildWindow::RegisterChildWindow(false, pMod); + ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod); SvxFillToolBoxControl::RegisterControl(0, pMod); SvxLineStyleToolBoxControl::RegisterControl(0, pMod); diff --git a/sfx2/inc/bitset.hxx b/sfx2/inc/bitset.hxx index 071151351f3d..fdc17e14bb40 100644 --- a/sfx2/inc/bitset.hxx +++ b/sfx2/inc/bitset.hxx @@ -30,7 +30,7 @@ public: BitSet operator<<( sal_uInt16 nOffset ) const; BitSet operator>>( sal_uInt16 nOffset ) const; static sal_uInt16 CountBits( sal_uIntPtr nBits ); - sal_Bool operator!() const; + bool operator!() const; BitSet(); BitSet( const BitSet& rOrig ); ~BitSet(); @@ -51,20 +51,20 @@ public: BitSet operator^( sal_uInt16 nBit ) const; BitSet& operator^=( const BitSet& rSet ); BitSet& operator^=( sal_uInt16 nBit ); - sal_Bool IsRealSubSet( const BitSet& rSet ) const; - sal_Bool IsSubSet( const BitSet& rSet ) const; - sal_Bool IsRealSuperSet( const BitSet& rSet ) const; - sal_Bool Contains( sal_uInt16 nBit ) const; - sal_Bool IsSuperSet( const BitSet& rSet ) const; - sal_Bool operator==( const BitSet& rSet ) const; - sal_Bool operator==( sal_uInt16 nBit ) const; - sal_Bool operator!=( const BitSet& rSet ) const; - sal_Bool operator!=( sal_uInt16 nBit ) const; + bool IsRealSubSet( const BitSet& rSet ) const; + bool IsSubSet( const BitSet& rSet ) const; + bool IsRealSuperSet( const BitSet& rSet ) const; + bool Contains( sal_uInt16 nBit ) const; + bool IsSuperSet( const BitSet& rSet ) const; + bool operator==( const BitSet& rSet ) const; + bool operator==( sal_uInt16 nBit ) const; + bool operator!=( const BitSet& rSet ) const; + bool operator!=( sal_uInt16 nBit ) const; }; // returns sal_True if the set is empty -inline sal_Bool BitSet::operator!() const +inline bool BitSet::operator!() const { return nCount == 0; } @@ -145,43 +145,43 @@ inline BitSet& BitSet::operator^=( sal_uInt16 ) #endif // determines if the other bitset is a real superset -inline sal_Bool BitSet::IsRealSubSet( const BitSet& ) const +inline bool BitSet::IsRealSubSet( const BitSet& ) const { - return sal_False; + return false; } // determines if the other bitset is a superset or equal -inline sal_Bool BitSet::IsSubSet( const BitSet& ) const +inline bool BitSet::IsSubSet( const BitSet& ) const { - return sal_False; + return false; } // determines if the other bitset is a real subset -inline sal_Bool BitSet::IsRealSuperSet( const BitSet& ) const +inline bool BitSet::IsRealSuperSet( const BitSet& ) const { - return sal_False; + return false; } // determines if the other bitset is a subset or equal -inline sal_Bool BitSet::IsSuperSet( const BitSet& ) const +inline bool BitSet::IsSuperSet( const BitSet& ) const { - return sal_False; + return false; } // determines if the bit is the only one in the bitset -inline sal_Bool BitSet::operator==( sal_uInt16 ) const +inline bool BitSet::operator==( sal_uInt16 ) const { - return sal_False; + return false; } // determines if the bitsets aren't equal -inline sal_Bool BitSet::operator!=( const BitSet& rSet ) const +inline bool BitSet::operator!=( const BitSet& rSet ) const { return !( *this == rSet ); } // determines if the bitset doesn't contain only this bit -inline sal_Bool BitSet::operator!=( sal_uInt16 nBit ) const +inline bool BitSet::operator!=( sal_uInt16 nBit ) const { return !( *this == nBit ); } diff --git a/sfx2/inc/guisaveas.hxx b/sfx2/inc/guisaveas.hxx index 0e9905ef2ec2..60c575405f45 100644 --- a/sfx2/inc/guisaveas.hxx +++ b/sfx2/inc/guisaveas.hxx @@ -57,15 +57,15 @@ private: public: SfxStoringHelper(); - sal_Bool GUIStoreModel( + bool GUIStoreModel( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > xModel, const OUString& aSlotName, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgsSequence, - sal_Bool bPreselectPassword, + bool bPreselectPassword, const OUString& aUserSelectedName, sal_uInt16 nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES ); - static sal_Bool CheckFilterOptionsAppearence( + static bool CheckFilterOptionsAppearence( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& xFilterCFG, const OUString& aFilterName ); @@ -74,13 +74,13 @@ public: const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel, const ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentProperties>& i_xOldDocInfo, - sal_Bool bNoModify ); + bool bNoModify ); - static sal_Bool WarnUnacceptableFormat( + static bool WarnUnacceptableFormat( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel, const OUString& aOldUIName, const OUString& aDefUIName, - sal_Bool bCanProceedFurther ); + bool bCanProceedFurther ); static Window* GetModelWindow( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >& xModel ); diff --git a/sfx2/inc/idpool.hxx b/sfx2/inc/idpool.hxx index e2679420721a..89d3077aeabf 100644 --- a/sfx2/inc/idpool.hxx +++ b/sfx2/inc/idpool.hxx @@ -31,13 +31,13 @@ private: sal_uInt16 nRange; sal_uInt16 nOffset; public: - sal_Bool Lock( const BitSet& rLockSet ); - sal_Bool IsLocked( sal_uInt16 nId ) const; + bool Lock( const BitSet& rLockSet ); + bool IsLocked( sal_uInt16 nId ) const; IdPool( sal_uInt16 nMin = 1, sal_uInt16 nMax = USHRT_MAX ); sal_uInt16 Get(); - sal_Bool Put( sal_uInt16 nId ); - sal_Bool Lock( const Range& rRange ); - sal_Bool Lock( sal_uInt16 nId ); + bool Put( sal_uInt16 nId ); + bool Lock( const Range& rRange ); + bool Lock( sal_uInt16 nId ); }; @@ -45,7 +45,7 @@ public: // returns sal_True if the id is locked -inline sal_Bool IdPool::IsLocked( sal_uInt16 nId ) const +inline bool IdPool::IsLocked( sal_uInt16 nId ) const { return ( this->Contains(nId-nOffset) ); } diff --git a/sfx2/inc/inettbc.hxx b/sfx2/inc/inettbc.hxx index 9b6b7cca9eeb..a0447b480be4 100644 --- a/sfx2/inc/inettbc.hxx +++ b/sfx2/inc/inettbc.hxx @@ -32,7 +32,7 @@ class SfxURLToolBoxControl_Impl : public SfxToolBoxControl private: SvtURLBox* GetURLBox() const; - void OpenURL( const OUString& rName, sal_Bool bNew ) const; + void OpenURL( const OUString& rName, bool bNew ) const; DECL_LINK( OpenHdl, void* ); DECL_LINK( SelectHdl, void* ); diff --git a/sfx2/source/appl/app.cxx b/sfx2/source/appl/app.cxx index 64ff4327572f..6e51c1bc0b5b 100644 --- a/sfx2/source/appl/app.cxx +++ b/sfx2/source/appl/app.cxx @@ -190,7 +190,7 @@ SfxApplication::SfxApplication() SAL_INFO( "sfx.appl", "{ initialize DDE" ); - sal_Bool bOk = InitializeDde(); + bool bOk = InitializeDde(); #ifdef DBG_UTIL if( !bOk ) @@ -327,7 +327,7 @@ void SfxApplication::SetViewFrame_Impl( SfxViewFrame *pFrame ) // DocWinActivate : both frames belong to the same TopWindow // TopWinActivate : both frames belong to different TopWindows - sal_Bool bTaskActivate = pOldContainerFrame != pNewContainerFrame; + bool bTaskActivate = pOldContainerFrame != pNewContainerFrame; if ( pOldContainerFrame ) { diff --git a/sfx2/source/appl/appbaslib.cxx b/sfx2/source/appl/appbaslib.cxx index aeee95233dff..d22dc48030d4 100644 --- a/sfx2/source/appl/appbaslib.cxx +++ b/sfx2/source/appl/appbaslib.cxx @@ -141,8 +141,7 @@ void SfxBasicManagerHolder::impl_releaseContainers() mxDialogContainer.clear(); } -sal_Bool -SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sModules ) +bool SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sModules ) { #ifdef DISABLE_SCRIPTING (void) sModules; @@ -150,7 +149,7 @@ SfxBasicManagerHolder::LegacyPsswdBinaryLimitExceeded( Sequence< OUString >& sMo if ( mpBasicManager ) return mpBasicManager->LegacyPsswdBinaryLimitExceeded( sModules ); #endif - return sal_True; + return true; } diff --git a/sfx2/source/appl/appcfg.cxx b/sfx2/source/appl/appcfg.cxx index 959cdd2fda57..225fc4cb2c75 100644 --- a/sfx2/source/appl/appcfg.cxx +++ b/sfx2/source/appl/appcfg.cxx @@ -518,7 +518,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_ATTR_BUTTON_BIGSIZE), true, &pItem) ) { DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected"); - sal_Bool bBigSize = ( (const SfxBoolItem*)pItem )->GetValue(); + bool bBigSize = ( (const SfxBoolItem*)pItem )->GetValue(); aMiscOptions.SetSymbolsSize( sal::static_int_cast< sal_Int16 >( bBigSize ? SFX_SYMBOLS_SIZE_LARGE : SFX_SYMBOLS_SIZE_SMALL ) ); @@ -633,7 +633,7 @@ void SfxApplication::SetOptions_Impl( const SfxItemSet& rSet ) if ( SFX_ITEM_SET == rSet.GetItemState(rPool.GetWhich(SID_WELCOMESCREEN_RESET ), true, &pItem)) { DBG_ASSERT(pItem->ISA(SfxBoolItem), "BoolItem expected"); - sal_Bool bReset = ((const SfxBoolItem *)pItem)->GetValue(); + bool bReset = ((const SfxBoolItem *)pItem)->GetValue(); if ( bReset ) { OSL_FAIL( "Not implemented, may be EOL!" ); diff --git a/sfx2/source/appl/appdata.cxx b/sfx2/source/appl/appdata.cxx index 21ed0693202f..82f4c2d2c611 100644 --- a/sfx2/source/appl/appdata.cxx +++ b/sfx2/source/appl/appdata.cxx @@ -114,10 +114,10 @@ SfxAppData_Impl::SfxAppData_Impl( SfxApplication* ) , pInterfaces( 0 ) , nDocNo(0) , nInterfaces( 0 ) - , bDowning( sal_True ) - , bInQuit( sal_False ) - , bInvalidateOnUnlock( sal_False ) - , bODFVersionWarningLater( sal_False ) + , bDowning( true ) + , bInQuit( false ) + , bInvalidateOnUnlock( false ) + , bODFVersionWarningLater( false ) { #ifndef DISABLE_SCRIPTING diff --git a/sfx2/source/appl/appdispatchprovider.cxx b/sfx2/source/appl/appdispatchprovider.cxx index f7b6f16beea5..740b052206b8 100644 --- a/sfx2/source/appl/appdispatchprovider.cxx +++ b/sfx2/source/appl/appdispatchprovider.cxx @@ -133,7 +133,7 @@ Reference < XDispatch > SAL_CALL SfxAppDispatchProvider::queryDispatch( FrameSearchFlags /*eSearchFlags*/ ) throw( RuntimeException, std::exception ) { sal_uInt16 nId( 0 ); - sal_Bool bMasterCommand( sal_False ); + bool bMasterCommand( false ); Reference < XDispatch > xDisp; const SfxSlot* pSlot = 0; SfxDispatcher* pAppDisp = SFX_APP()->GetAppDispatcher_Impl(); diff --git a/sfx2/source/appl/appinit.cxx b/sfx2/source/appl/appinit.cxx index 1ff37e1938b4..fe4611fffc05 100644 --- a/sfx2/source/appl/appinit.cxx +++ b/sfx2/source/appl/appinit.cxx @@ -260,7 +260,7 @@ bool SfxApplication::Initialize_Impl() Registrations_Impl(); // Subklasse initialisieren - pAppData_Impl->bDowning = sal_False; + pAppData_Impl->bDowning = false; Init(); // get CHAOS item pool... diff --git a/sfx2/source/appl/appopen.cxx b/sfx2/source/appl/appopen.cxx index d399d7f733d4..96f604a4fdec 100644 --- a/sfx2/source/appl/appopen.cxx +++ b/sfx2/source/appl/appopen.cxx @@ -118,20 +118,20 @@ using namespace ::sfx2; class SfxOpenDocStatusListener_Impl : public WeakImplHelper1< XDispatchResultListener > { public: - sal_Bool bFinished; - sal_Bool bSuccess; + bool bFinished; + bool bSuccess; virtual void SAL_CALL dispatchFinished( const DispatchResultEvent& Event ) throw(RuntimeException, std::exception) SAL_OVERRIDE; virtual void SAL_CALL disposing( const EventObject& Source ) throw(RuntimeException, std::exception) SAL_OVERRIDE; SfxOpenDocStatusListener_Impl() - : bFinished( sal_False ) - , bSuccess( sal_False ) + : bFinished( false ) + , bSuccess( false ) {} }; void SAL_CALL SfxOpenDocStatusListener_Impl::dispatchFinished( const DispatchResultEvent& aEvent ) throw(RuntimeException, std::exception) { bSuccess = ( aEvent.State == DispatchResultState::SUCCESS ); - bFinished = sal_True; + bFinished = true; } void SAL_CALL SfxOpenDocStatusListener_Impl::disposing( const EventObject& ) throw(RuntimeException, std::exception) @@ -234,7 +234,7 @@ sal_uInt32 CheckPasswd_Impl uno::Reference< beans::XPropertySet > xStorageProps( xStorage, uno::UNO_QUERY ); if ( xStorageProps.is() ) { - sal_Bool bIsEncrypted = sal_False; + bool bIsEncrypted = false; try { xStorageProps->getPropertyValue("HasEncryptedEntries") >>= bIsEncrypted; @@ -483,11 +483,11 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) SfxObjectShellLock xDoc; OUString aTemplateRegion, aTemplateName, aTemplateFileName; - sal_Bool bDirect = sal_False; // through FileName instead of Region/Template + bool bDirect = false; // through FileName instead of Region/Template SfxErrorContext aEc(ERRCTX_SFX_NEWDOC); if ( !pTemplNameItem && !pTemplFileNameItem ) { - sal_Bool bNewWin = sal_False; + bool bNewWin = false; Window* pTopWin = GetTopWindow(); SfxTemplateManagerDlg aTemplDlg; @@ -499,7 +499,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) { // the dialogue opens a document -> a new TopWindow appears pTopWin = GetTopWindow(); - bNewWin = sal_True; + bNewWin = true; } } @@ -524,7 +524,7 @@ void SfxApplication::NewDocExec_Impl( SfxRequest& rReq ) if ( pTemplFileNameItem ) { aTemplateFileName = pTemplFileNameItem->GetValue(); - bDirect = sal_True; + bDirect = true; } } @@ -758,7 +758,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) pURLList.clear(); } - sal_Bool bHyperlinkUsed = sal_False; + bool bHyperlinkUsed = false; if ( SID_OPENURL == nSID ) { @@ -781,7 +781,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { rReq.SetSlot( SID_OPENDOC ); nSID = SID_OPENDOC; - bHyperlinkUsed = sal_True; + bHyperlinkUsed = true; } // no else here! It's optional ... @@ -916,20 +916,20 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) } } - sal_Bool bFound = sal_False; + bool bFound = false; for ( sal_Int32 nProt=0; nProt<aProtocols.getLength(); nProt++ ) { WildCard aPattern(aProtocols[nProt]); if ( aPattern.Matches( aURL.Complete ) ) { - bFound = sal_True; + bFound = true; break; } } if ( !bFound ) { - sal_Bool bLoadInternal = sal_False; + bool bLoadInternal = false; try { sfx2::openUriExternally( @@ -939,7 +939,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) { rReq.RemoveItem( SID_TARGETNAME ); rReq.AppendItem( SfxStringItem( SID_TARGETNAME, OUString("_default") ) ); - bLoadInternal = sal_True; + bLoadInternal = true; } if ( !bLoadInternal ) return; @@ -989,7 +989,7 @@ void SfxApplication::OpenDocExec_Impl( SfxRequest& rReq ) rReq.RemoveItem( SID_DONELINK ); // check if the view must be hidden - sal_Bool bHidden = sal_False; + bool bHidden = false; SFX_REQUEST_ARG(rReq, pHidItem, SfxBoolItem, SID_HIDDEN, false); if ( pHidItem ) bHidden = pHidItem->GetValue(); diff --git a/sfx2/source/appl/appquit.cxx b/sfx2/source/appl/appquit.cxx index 26a8b2d78e07..4ec7bb1e256f 100644 --- a/sfx2/source/appl/appquit.cxx +++ b/sfx2/source/appl/appquit.cxx @@ -87,7 +87,7 @@ void SfxApplication::Deinitialize() SaveBasicAndDialogContainer(); #endif - pAppData_Impl->bDowning = sal_True; // due to Timer from DecAliveCount and QueryExit + pAppData_Impl->bDowning = true; // due to Timer from DecAliveCount and QueryExit DELETEZ( pAppData_Impl->pTemplates ); @@ -95,14 +95,14 @@ void SfxApplication::Deinitialize() // this method. Therefore this call makes no sense and is the source of // some stack traces, which we don't understand. // For more information see: - pAppData_Impl->bDowning = sal_False; + pAppData_Impl->bDowning = false; DBG_ASSERT( !SfxViewFrame::GetFirst(), "existing SfxViewFrame after Execute" ); DBG_ASSERT( !SfxObjectShell::GetFirst(), "existing SfxObjectShell after Execute" ); pAppData_Impl->pAppDispat->Pop( *this, SFX_SHELL_POP_UNTIL ); pAppData_Impl->pAppDispat->Flush(); - pAppData_Impl->bDowning = sal_True; + pAppData_Impl->bDowning = true; pAppData_Impl->pAppDispat->DoDeactivate_Impl( true, NULL ); // call derived application-exit diff --git a/sfx2/source/appl/appreg.cxx b/sfx2/source/appl/appreg.cxx index 7c1cde67c0fd..a53f9871e255 100644 --- a/sfx2/source/appl/appreg.cxx +++ b/sfx2/source/appl/appreg.cxx @@ -53,11 +53,11 @@ void SfxApplication::Registrations_Impl() // ChildWindows SfxRecordingFloatWrapper_Impl::RegisterChildWindow(); - SfxNavigatorWrapper::RegisterChildWindow( sal_False, NULL, SFX_CHILDWIN_NEVERHIDE ); + SfxNavigatorWrapper::RegisterChildWindow( false, NULL, SFX_CHILDWIN_NEVERHIDE ); SfxPartChildWnd_Impl::RegisterChildWindow(); - SfxTemplateDialogWrapper::RegisterChildWindow(sal_True); + SfxTemplateDialogWrapper::RegisterChildWindow(true); SfxDockingWrapper::RegisterChildWindow(); - SfxInfoBarContainerChild::RegisterChildWindow( sal_True, NULL, SFX_CHILDWIN_NEVERHIDE ); + SfxInfoBarContainerChild::RegisterChildWindow( true, NULL, SFX_CHILDWIN_NEVERHIDE ); // Controller SfxToolBoxControl::RegisterControl(SID_REPEAT); diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index e845ab96431f..53250ba11738 100644 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -194,7 +194,7 @@ namespace } /// Find the correct location of the document (LICENSE.fodt, etc.), and return /// it in rURL if found. -static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL ) +static bool checkURL( const char *pName, const char *pExt, OUString &rURL ) { using namespace osl; DirectoryItem aDirItem; @@ -206,7 +206,7 @@ static sal_Bool checkURL( const char *pName, const char *pExt, OUString &rURL ) if (!rURL.isEmpty()) return DirectoryItem::get( rURL, aDirItem ) == DirectoryItem::E_None; else - return sal_False; + return false; } /// Displays CREDITS or LICENSE in any of the available version @@ -312,16 +312,16 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) } // block reentrant calls - pAppData_Impl->bInQuit = sal_True; + pAppData_Impl->bInQuit = true; Reference < XDesktop2 > xDesktop = Desktop::create ( ::comphelper::getProcessComponentContext() ); rReq.ForgetAllArgs(); // if terminate() failed, pAppData_Impl->bInQuit will now be sal_False, allowing further calls of SID_QUITAPP - sal_Bool bTerminated = xDesktop->terminate(); + bool bTerminated = xDesktop->terminate(); if (!bTerminated) // if terminate() was successful, SfxApplication is now dead! - pAppData_Impl->bInQuit = sal_False; + pAppData_Impl->bInQuit = false; // Set return value, terminate if possible rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bTerminated ) ); @@ -404,7 +404,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) } while( true ); - sal_Bool bOk = ( n == 0); + bool bOk = ( n == 0); rReq.SetReturnValue( SfxBoolItem( 0, bOk ) ); bDone = true; break; @@ -412,7 +412,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) case SID_SAVEDOCS: { - sal_Bool bOK = sal_True; + bool bOK = true; for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst(); pObjSh; pObjSh = SfxObjectShell::GetNext( *pObjSh ) ) @@ -423,7 +423,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) pObjSh->ExecuteSlot( aReq ); SfxBoolItem *pItem = PTR_CAST( SfxBoolItem, aReq.GetReturnValue() ); if ( !pItem || !pItem->GetValue() ) - bOK = sal_False; + bOK = false; } } @@ -666,7 +666,7 @@ void SfxApplication::MiscExec_Impl( SfxRequest& rReq ) // Evaluate Parameter OUString aToolbarName( aBuf.makeStringAndClear() ); - sal_Bool bShow( !xLayoutManager->isElementVisible( aToolbarName )); + bool bShow( !xLayoutManager->isElementVisible( aToolbarName )); if ( bShow ) { @@ -763,14 +763,14 @@ void SfxApplication::MiscState_Impl(SfxItemSet &rSet) case SID_SAVEDOCS: { - sal_Bool bModified = sal_False; + bool bModified = false; for ( SfxObjectShell *pObjSh = SfxObjectShell::GetFirst(); pObjSh; pObjSh = SfxObjectShell::GetNext( *pObjSh ) ) { if ( pObjSh->IsModified() ) { - bModified = sal_True; + bModified = true; break; } } @@ -845,7 +845,7 @@ extern "C" void basicide_macro_organizer( sal_Int16 ); #endif -OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, sal_Bool bChooseOnly, const OUString& rMacroDesc = OUString() ) +OUString ChooseMacro( const Reference< XModel >& rxLimitToDocument, bool bChooseOnly, const OUString& rMacroDesc = OUString() ) { #ifndef DISABLE_DYNLOADING // get basctl dllname @@ -1128,15 +1128,15 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) { const SfxItemSet* pArgs = rReq.GetArgs(); const SfxPoolItem* pItem; - sal_Bool bChooseOnly = sal_False; + bool bChooseOnly = false; Reference< XModel > xLimitToModel; if(pArgs && SFX_ITEM_SET == pArgs->GetItemState(SID_RECORDMACRO, false, &pItem) ) { - sal_Bool bRecord = ((SfxBoolItem*)pItem)->GetValue(); + bool bRecord = ((SfxBoolItem*)pItem)->GetValue(); if ( bRecord ) { // !Hack - bChooseOnly = sal_False; + bChooseOnly = false; SfxObjectShell* pCurrentShell = SfxObjectShell::Current(); OSL_ENSURE( pCurrentShell, "macro recording outside an SFX document?" ); if ( pCurrentShell ) @@ -1254,12 +1254,12 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) case SID_OFFICE_CHECK_PLZ: { - sal_Bool bRet = sal_False; + bool bRet = false; SFX_REQUEST_ARG(rReq, pStringItem, SfxStringItem, rReq.GetSlot(), false); if ( pStringItem ) { - bRet = sal_True /*!!!SfxIniManager::CheckPLZ( aPLZ )*/; + bRet = true /*!!!SfxIniManager::CheckPLZ( aPLZ )*/; } #ifndef DISABLE_SCRIPTING else @@ -1309,7 +1309,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) TransformItems( rReq.GetSlot(), *rReq.GetArgs(), aSeq ); Any aResult = xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aSeq ); frame::DispatchResultEvent aEvent; - sal_Bool bSuccess = (aResult >>= aEvent) && + bool bSuccess = (aResult >>= aEvent) && (aEvent.State == frame::DispatchResultState::SUCCESS); rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bSuccess ) ); } @@ -1329,7 +1329,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) TransformItems( rReq.GetSlot(), *rReq.GetArgs(), aSeq ); Any aResult = xHelper->executeDispatch( xProv, aCmd, OUString(), 0, aSeq ); frame::DispatchResultEvent aEvent; - sal_Bool bSuccess = (aResult >>= aEvent) && + bool bSuccess = (aResult >>= aEvent) && (aEvent.State == frame::DispatchResultState::SUCCESS); rReq.SetReturnValue( SfxBoolItem( rReq.GetSlot(), bSuccess ) ); } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 9d8d21046bc0..d6278bfb85a9 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -208,7 +208,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert } sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId); - sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); + bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); pItem->SetWhich( nWhich ); sal_uInt16 nSubCount = pType->nAttribs; @@ -327,7 +327,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert } sal_uInt16 nWhich = rSet.GetPool()->GetWhich(rArg.nSlotId); - sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); + bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); pItem->SetWhich( nWhich ); const SfxType* pType = rArg.pType; sal_uInt16 nSubCount = pType->nAttribs; @@ -361,14 +361,14 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else { // complex argument, could be passed in one struct - sal_Bool bAsWholeItem = sal_False; + bool bAsWholeItem = false; for ( sal_uInt16 n=0; n<nCount; n++ ) { const beans::PropertyValue& rProp = pPropsVal[n]; OUString aName = rProp.Name; if ( aName == OUString(rArg.pName, strlen(rArg.pName), RTL_TEXTENCODING_UTF8) ) { - bAsWholeItem = sal_True; + bAsWholeItem = true; #ifdef DBG_UTIL ++nFoundArgs; #endif @@ -391,7 +391,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert // complex argument; collect sub items from argument array and reconstruct complex item // only put item if at least one member was found and had the correct type // (is this a good idea?! Should we ask for *all* members?) - sal_Bool bRet = sal_False; + bool bRet = false; for ( sal_uInt16 n=0; n<nCount; n++ ) { const beans::PropertyValue& rProp = pPropsVal[n]; @@ -403,7 +403,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert if ( rProp.Name.equalsAsciiL(aStr.getStr(), aStr.getLength()) ) { // at least one member found ... - bRet = sal_True; + bRet = true; #ifdef DBG_UTIL ++nFoundArgs; #endif @@ -413,7 +413,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert if (!pItem->PutValue( rProp.Value, nSubId ) ) { // ... but it was not convertible - bRet = sal_False; + bRet = false; #ifdef DBG_UTIL OStringBuffer aDbgStr("Property not convertible: "); aDbgStr.append(rArg.pName); @@ -454,7 +454,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sHidden ) { - sal_Bool bVal = sal_False; + bool bVal = false; if (rProp.Value >>= bVal) rSet.Put( SfxBoolItem( SID_HIDDEN, bVal ) ); } @@ -482,7 +482,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sStatusInd ) { Reference<task::XStatusIndicator> xVal; - sal_Bool bOK = (rProp.Value >>= xVal); + bool bOK = (rProp.Value >>= xVal); DBG_ASSERT( bOK, "invalid type for StatusIndicator" ); if (bOK && xVal.is()) rSet.Put( SfxUnoAnyItem( SID_PROGRESS_STATUSBAR_CONTROL, rProp.Value ) ); @@ -490,7 +490,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sInteractionHdl ) { Reference<task::XInteractionHandler> xVal; - sal_Bool bOK = (rProp.Value >>= xVal); + bool bOK = (rProp.Value >>= xVal); DBG_ASSERT( bOK, "invalid type for InteractionHandler" ); if (bOK && xVal.is()) rSet.Put( SfxUnoAnyItem( SID_INTERACTIONHANDLER, rProp.Value ) ); @@ -502,7 +502,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sInputStream ) { Reference< XInputStream > xVal; - sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); + bool bOK = ((rProp.Value >>= xVal) && xVal.is()); DBG_ASSERT( bOK, "invalid type for InputStream" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_INPUTSTREAM, rProp.Value ) ); @@ -510,7 +510,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sStream ) { Reference< XInputStream > xVal; - sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); + bool bOK = ((rProp.Value >>= xVal) && xVal.is()); DBG_ASSERT( bOK, "invalid type for Stream" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_STREAM, rProp.Value ) ); @@ -518,7 +518,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sUCBContent ) { Reference< XContent > xVal; - sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); + bool bOK = ((rProp.Value >>= xVal) && xVal.is()); DBG_ASSERT( bOK, "invalid type for UCBContent" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_CONTENT, rProp.Value ) ); @@ -526,7 +526,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sOutputStream ) { Reference< XOutputStream > xVal; - sal_Bool bOK = ((rProp.Value >>= xVal) && xVal.is()); + bool bOK = ((rProp.Value >>= xVal) && xVal.is()); DBG_ASSERT( bOK, "invalid type for OutputStream" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_OUTPUTSTREAM, rProp.Value ) ); @@ -534,7 +534,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sPostData ) { Reference< XInputStream > xVal; - sal_Bool bOK = (rProp.Value >>= xVal); + bool bOK = (rProp.Value >>= xVal); DBG_ASSERT( bOK, "invalid type for PostData" ); if (bOK) rSet.Put( SfxUnoAnyItem( SID_POSTDATA, rProp.Value ) ); @@ -542,31 +542,31 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sFrame ) { Reference< XFrame > xFrame; - sal_Bool bOK = (rProp.Value >>= xFrame); + bool bOK = (rProp.Value >>= xFrame); DBG_ASSERT( bOK, "invalid type for Frame" ); if (bOK) rSet.Put( SfxUnoFrameItem( SID_FILLFRAME, xFrame ) ); } else if ( aName == sAsTemplate ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for AsTemplate" ); if (bOK) rSet.Put( SfxBoolItem( SID_TEMPLATE, bVal ) ); } else if ( aName == sOpenNewView ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for OpenNewView" ); if (bOK) rSet.Put( SfxBoolItem( SID_OPEN_NEW_VIEW, bVal ) ); } else if ( aName == sFailOnWarning ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for FailOnWarning" ); if (bOK) rSet.Put( SfxBoolItem( SID_FAIL_ON_WARNING, bVal ) ); @@ -574,7 +574,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sViewId ) { sal_Int16 nVal = -1; - sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); + bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); DBG_ASSERT( bOK, "invalid type for ViewId" ); if (bOK) rSet.Put( SfxUInt16Item( SID_VIEW_ID, nVal ) ); @@ -582,95 +582,95 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sPluginMode ) { sal_Int16 nVal = -1; - sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); + bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); DBG_ASSERT( bOK, "invalid type for PluginMode" ); if (bOK) rSet.Put( SfxUInt16Item( SID_PLUGIN_MODE, nVal ) ); } else if ( aName == sReadOnly ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for ReadOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_DOC_READONLY, bVal ) ); } else if ( aName == sDdeReconnect ) { - sal_Bool bVal = sal_True; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = true; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for DDEReconnect" ); if (bOK) rSet.Put( SfxBoolItem( SID_DDE_RECONNECT_ONLOAD, bVal ) ); } else if ( aName == sStartPresentation ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for StartPresentation" ); if (bOK) rSet.Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, bVal ) ); } else if ( aName == sSelectionOnly ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for SelectionOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_SELECTION, bVal ) ); } else if ( aName == sHidden ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for Hidden" ); if (bOK) rSet.Put( SfxBoolItem( SID_HIDDEN, bVal ) ); } else if ( aName == sMinimized ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for Minimized" ); if (bOK) rSet.Put( SfxBoolItem( SID_MINIMIZED, bVal ) ); } else if ( aName == sSilent ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for Silent" ); if (bOK) rSet.Put( SfxBoolItem( SID_SILENT, bVal ) ); } else if ( aName == sPreview ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for Preview" ); if (bOK) rSet.Put( SfxBoolItem( SID_PREVIEW, bVal ) ); } else if ( aName == sViewOnly ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for ViewOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_VIEWONLY, bVal ) ); } else if ( aName == sDontEdit ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for ViewOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_EDITDOC, !bVal ) ); } else if ( aName == sUseSystemDialog ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for ViewOnly" ); if (bOK) rSet.Put( SfxBoolItem( SID_FILE_DIALOG, bVal ) ); @@ -678,7 +678,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sStandardDir ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for StandardDir" ); if (bOK) rSet.Put( SfxStringItem( SID_STANDARD_DIR, sVal ) ); @@ -686,7 +686,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sBlackList ) { uno::Sequence<OUString> xVal; - sal_Bool bOK = (rProp.Value >>= xVal); + bool bOK = (rProp.Value >>= xVal); DBG_ASSERT( bOK, "invalid type or value for BlackList" ); if (bOK) { @@ -698,7 +698,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sFileName ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for FileName" ); if (bOK) rSet.Put( SfxStringItem( SID_FILE_NAME, sVal ) ); @@ -706,7 +706,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sSalvagedFile ) { OUString sVal; - sal_Bool bOK = (rProp.Value >>= sVal); + bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for SalvagedFile" ); if (bOK) rSet.Put( SfxStringItem( SID_DOC_SALVAGE, sVal ) ); @@ -714,7 +714,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sFolderName ) { OUString sVal; - sal_Bool bOK = (rProp.Value >>= sVal); + bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for FolderName" ); if (bOK) rSet.Put( SfxStringItem( SID_PATH, sVal ) ); @@ -722,7 +722,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sFrameName ) { OUString sVal; - sal_Bool bOK = (rProp.Value >>= sVal); + bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type for FrameName" ); if (bOK && !sVal.isEmpty()) rSet.Put( SfxStringItem( SID_TARGETNAME, sVal ) ); @@ -730,7 +730,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sMediaType ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for MediaType" ); if (bOK) rSet.Put( SfxStringItem( SID_CONTENTTYPE, sVal ) ); @@ -738,7 +738,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sTemplateName ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for TemplateName" ); if (bOK) rSet.Put( SfxStringItem( SID_TEMPLATE_NAME, sVal ) ); @@ -746,7 +746,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sTemplateRegionName ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for TemplateRegionName" ); if (bOK) rSet.Put( SfxStringItem( SID_TEMPLATE_REGIONNAME, sVal ) ); @@ -754,7 +754,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sJumpMark ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for JumpMark" ); if (bOK) rSet.Put( SfxStringItem( SID_JUMPMARK, sVal ) ); @@ -762,7 +762,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sCharacterSet ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for CharacterSet" ); if (bOK) rSet.Put( SfxStringItem( SID_CHARSET, sVal ) ); @@ -770,7 +770,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sFilterFlags ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for FilterFlags" ); if (bOK) rSet.Put( SfxStringItem( SID_FILE_FILTEROPTIONS, sVal ) ); @@ -778,7 +778,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sMacroExecMode ) { sal_Int16 nVal =-1; - sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); + bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); DBG_ASSERT( bOK, "invalid type for MacroExecMode" ); if (bOK) rSet.Put( SfxUInt16Item( SID_MACROEXECMODE, nVal ) ); @@ -786,15 +786,15 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sUpdateDocMode ) { sal_Int16 nVal =-1; - sal_Bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); + bool bOK = ((rProp.Value >>= nVal) && (nVal != -1)); DBG_ASSERT( bOK, "invalid type for UpdateDocMode" ); if (bOK) rSet.Put( SfxUInt16Item( SID_UPDATEDOCMODE, nVal ) ); } else if ( aName == sRepairPackage ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for RepairPackage" ); if (bOK) rSet.Put( SfxBoolItem( SID_REPAIRPACKAGE, bVal ) ); @@ -802,7 +802,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sDocumentTitle ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for DocumentTitle" ); if (bOK) rSet.Put( SfxStringItem( SID_DOCINFO_TITLE, sVal ) ); @@ -811,7 +811,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert { OUString sVal; // the base url can be set to empty ( for embedded objects for example ) - sal_Bool bOK = (rProp.Value >>= sVal); + bool bOK = (rProp.Value >>= sVal); DBG_ASSERT( bOK, "invalid type or value for DocumentBaseURL" ); if (bOK) rSet.Put( SfxStringItem( SID_DOC_BASEURL, sVal ) ); @@ -819,23 +819,23 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sHierarchicalDocumentName ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for HierarchicalDocumentName" ); if (bOK) rSet.Put( SfxStringItem( SID_DOC_HIERARCHICALNAME, sVal ) ); } else if ( aName == sCopyStreamIfPossible ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for CopyStreamIfPossible" ); if (bOK) rSet.Put( SfxBoolItem( SID_COPY_STREAM_IF_POSSIBLE, bVal ) ); } else if ( aName == sNoAutoSave ) { - sal_Bool bVal = sal_False; - sal_Bool bOK = (rProp.Value >>= bVal); + bool bVal = false; + bool bOK = (rProp.Value >>= bVal); DBG_ASSERT( bOK, "invalid type for NoAutoSave" ); if (bOK) rSet.Put( SfxBoolItem( SID_NOAUTOSAVE, bVal ) ); @@ -851,7 +851,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sSuggestedSaveAsDir ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsDir" ); if (bOK) rSet.Put( SfxStringItem( SID_SUGGESTEDSAVEASDIR, sVal ) ); @@ -859,7 +859,7 @@ void TransformParameters( sal_uInt16 nSlotId, const uno::Sequence<beans::Propert else if ( aName == sSuggestedSaveAsName ) { OUString sVal; - sal_Bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); + bool bOK = ((rProp.Value >>= sVal) && !sVal.isEmpty()); DBG_ASSERT( bOK, "invalid type or value for SuggestedSaveAsName" ); if (bOK) rSet.Put( SfxStringItem( SID_SUGGESTEDSAVEASNAME, sVal ) ); @@ -1280,7 +1280,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b { // slot is a property sal_uInt16 nWhich = rSet.GetPool()->GetWhich(nSlotId); - sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); + bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, false ); if ( pItem ) //??? { @@ -1332,7 +1332,7 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b { const SfxFormalArgument &rArg = pSlot->GetFormalArgument( nArg ); sal_uInt16 nWhich = rSet.GetPool()->GetWhich( rArg.nSlotId ); - sal_Bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); + bool bConvertTwips = ( rSet.GetPool()->GetMetric( nWhich ) == SFX_MAPUNIT_TWIP ); SFX_ITEMSET_ARG( &rSet, pItem, SfxPoolItem, nWhich, false ); if ( pItem ) //??? { @@ -1521,17 +1521,17 @@ void TransformItems( sal_uInt16 nSlotId, const SfxItemSet& rSet, uno::Sequence<b if ( rSet.GetItemState( SID_VIEWONLY, false, &pItem ) == SFX_ITEM_SET ) { pValue[nActProp].Name = OUString(sViewOnly); - pValue[nActProp++].Value <<= (sal_Bool) (( ((SfxBoolItem*)pItem)->GetValue() )); + pValue[nActProp++].Value <<= ((SfxBoolItem*)pItem)->GetValue() ; } if ( rSet.GetItemState( SID_EDITDOC, false, &pItem ) == SFX_ITEM_SET ) { pValue[nActProp].Name = OUString(sDontEdit); - pValue[nActProp++].Value <<= (sal_Bool) (!( ((SfxBoolItem*)pItem)->GetValue() )); + pValue[nActProp++].Value <<= !( ((SfxBoolItem*)pItem)->GetValue() ); } if ( rSet.GetItemState( SID_FILE_DIALOG, false, &pItem ) == SFX_ITEM_SET ) { pValue[nActProp].Name = OUString(sUseSystemDialog); - pValue[nActProp++].Value <<= (sal_Bool) ( ((SfxBoolItem*)pItem)->GetValue() ); + pValue[nActProp++].Value <<= ((SfxBoolItem*)pItem)->GetValue(); } if ( rSet.GetItemState( SID_STANDARD_DIR, false, &pItem ) == SFX_ITEM_SET ) { @@ -1721,7 +1721,7 @@ class RequestPackageReparation_Impl : public ::cppu::WeakImplHelper1< task::XInt public: RequestPackageReparation_Impl( const OUString& aName ); - sal_Bool isApproved(); + bool isApproved(); virtual uno::Any SAL_CALL getRequest() throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; virtual uno::Sequence< uno::Reference< task::XInteractionContinuation > > SAL_CALL getContinuations() throw( uno::RuntimeException, std::exception ) SAL_OVERRIDE; @@ -1742,7 +1742,7 @@ RequestPackageReparation_Impl::RequestPackageReparation_Impl( const OUString& aN m_lContinuations[1] = uno::Reference< task::XInteractionContinuation >( m_pDisapprove ); } -sal_Bool RequestPackageReparation_Impl::isApproved() +bool RequestPackageReparation_Impl::isApproved() { return m_pApprove->wasSelected(); } diff --git a/sfx2/source/appl/childwin.cxx b/sfx2/source/appl/childwin.cxx index b6f5c012a880..85d4d68f39d4 100644 --- a/sfx2/source/appl/childwin.cxx +++ b/sfx2/source/appl/childwin.cxx @@ -47,7 +47,7 @@ struct SfxChildWindow_Impl ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > xListener; SfxChildWinFactory* pFact; bool bHideNotDelete; - sal_Bool bVisible; + bool bVisible; bool bHideAtToggle; bool bWantsFocus; SfxModule* pContextModule; @@ -154,7 +154,7 @@ SfxChildWindow::SfxChildWindow(Window *pParentWindow, sal_uInt16 nId) pImp->bHideNotDelete = false; pImp->bHideAtToggle = false; pImp->bWantsFocus = true; - pImp->bVisible = sal_True; + pImp->bVisible = true; pImp->pContextModule = NULL; pImp->pWorkWin = NULL; @@ -632,12 +632,12 @@ bool SfxChildWinInfo::GetExtraData_Impl return false; } -sal_Bool SfxChildWindow::IsVisible() const +bool SfxChildWindow::IsVisible() const { return pImp->bVisible; } -void SfxChildWindow::SetVisible_Impl( sal_Bool bVis ) +void SfxChildWindow::SetVisible_Impl( bool bVis ) { pImp->bVisible = bVis; } diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx index 509b17bc453b..b4a68bb86f47 100644 --- a/sfx2/source/appl/fileobj.cxx +++ b/sfx2/source/appl/fileobj.cxx @@ -121,7 +121,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, // If the native format is reqested, has to be reset at the // end of the flag. Is solely in the sw/ndgrf.cxx used when // the link is removed form GraphicNode. - sal_Bool bOldNativFormat = bNativFormat; + bool bOldNativFormat = bNativFormat; // If about to print, waiting for the data to be available if( bGetSynchron ) @@ -137,7 +137,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, Application::Reschedule(); xMed = xTmpMed; - bClearMedium = sal_True; + bClearMedium = true; } } @@ -202,7 +202,7 @@ bool SvFileObject::GetData( ::com::sun::star::uno::Any & rData, if( xMed.Is() && !bSynchron && bClearMedium ) { xMed.Clear(); - bClearMedium = sal_False; + bClearMedium = false; } } } @@ -263,11 +263,11 @@ bool SvFileObject::Connect( sfx2::SvBaseLink* pLink ) return true; } -sal_Bool SvFileObject::LoadFile_Impl() +bool SvFileObject::LoadFile_Impl() { // We are still at Loading!! if( bWaitForData || !bLoadAgain || xMed.Is() || pDownLoadData ) - return sal_False; + return false; // at the moment on the current DocShell xMed = new SfxMedium( sFileNm, sReferer, STREAM_STD_READ ); @@ -279,13 +279,13 @@ sal_Bool SvFileObject::LoadFile_Impl() if( !bSynchron ) { - bLoadAgain = bDataReady = bInNewData = sal_False; - bWaitForData = sal_True; + bLoadAgain = bDataReady = bInNewData = false; + bWaitForData = true; SfxMediumRef xTmpMed = xMed; - bInCallDownLoad = sal_True; + bInCallDownLoad = true; xMed->DownLoad( STATIC_LINK( this, SvFileObject, LoadGrfReady_Impl ) ); - bInCallDownLoad = sal_False; + bInCallDownLoad = false; bClearMedium = !xMed.Is(); if( bClearMedium ) @@ -293,20 +293,20 @@ sal_Bool SvFileObject::LoadFile_Impl() return bDataReady; } - bWaitForData = sal_True; - bDataReady = bInNewData = sal_False; + bWaitForData = true; + bDataReady = bInNewData = false; xMed->DownLoad(); bLoadAgain = !xMed->IsRemote(); - bWaitForData = sal_False; + bWaitForData = false; // Graphic is finished, also send DataChanged of the Status change: SendStateChg_Impl( xMed->GetInStream() && xMed->GetInStream()->GetError() ? sfx2::LinkManager::STATE_LOAD_ERROR : sfx2::LinkManager::STATE_LOAD_OK ); - return sal_True; + return true; } -sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) +bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) { GraphicFilter& rGF = GraphicFilter::GetGraphicFilter(); @@ -348,8 +348,8 @@ sal_Bool SvFileObject::GetGraphic_Impl( Graphic& rGrf, SvStream* pStream ) if( !pDownLoadData->aGrf.GetContext() ) { delete pDownLoadData, pDownLoadData = 0; - bDataReady = sal_True; - bWaitForData = sal_False; + bDataReady = true; + bWaitForData = false; } } } @@ -503,14 +503,14 @@ void SvFileObject::Edit( Window* pParent, sfx2::SvBaseLink* pLink, const Link& r IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG ) { // When we come form here there it can not be an error no more. - pThis->bLoadError = sal_False; - pThis->bWaitForData = sal_False; - pThis->bInCallDownLoad = sal_False; + pThis->bLoadError = false; + pThis->bWaitForData = false; + pThis->bInCallDownLoad = false; if( !pThis->bInNewData && !pThis->bDataReady ) { // Graphic is finished, also send DataChanged from Status change - pThis->bDataReady = sal_True; + pThis->bDataReady = true; pThis->SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_OK ); // and then send the data again @@ -519,7 +519,7 @@ IMPL_STATIC_LINK( SvFileObject, LoadGrfReady_Impl, void*, EMPTYARG ) if( pThis->bDataReady ) { - pThis->bLoadAgain = sal_True; + pThis->bLoadAgain = true; if( pThis->xMed.Is() ) { pThis->xMed->SetDoneLink( Link() ); @@ -614,8 +614,8 @@ void SvFileObject::CancelTransfers() if( !bDataReady ) { // Do not set-up again - bLoadAgain = sal_False; - bDataReady = bLoadError = bWaitForData = sal_True; + bLoadAgain = false; + bDataReady = bLoadError = bWaitForData = true; SendStateChg_Impl( sfx2::LinkManager::STATE_LOAD_ABORT ); } } @@ -629,7 +629,7 @@ void SvFileObject::SendStateChg_Impl( sfx2::LinkManager::LinkState nState ) aAny <<= OUString::number( nState ); DataChanged( SotExchange::GetFormatName( sfx2::LinkManager::RegisterStatusInfoId()), aAny ); - bStateChangeCalled = sal_True; + bStateChangeCalled = true; } } diff --git a/sfx2/source/appl/fileobj.hxx b/sfx2/source/appl/fileobj.hxx index 6a1608041cc9..3c491edd5a20 100644 --- a/sfx2/source/appl/fileobj.hxx +++ b/sfx2/source/appl/fileobj.hxx @@ -39,19 +39,19 @@ class SvFileObject : public sfx2::SvLinkSource sal_uInt8 nType; - sal_Bool bLoadAgain : 1; - sal_Bool bSynchron : 1; - sal_Bool bLoadError : 1; - sal_Bool bWaitForData : 1; - sal_Bool bInNewData : 1; - sal_Bool bDataReady : 1; - sal_Bool bNativFormat : 1; - sal_Bool bClearMedium : 1; - sal_Bool bStateChangeCalled : 1; - sal_Bool bInCallDownLoad : 1; - - sal_Bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 ); - sal_Bool LoadFile_Impl(); + bool bLoadAgain : 1; + bool bSynchron : 1; + bool bLoadError : 1; + bool bWaitForData : 1; + bool bInNewData : 1; + bool bDataReady : 1; + bool bNativFormat : 1; + bool bClearMedium : 1; + bool bStateChangeCalled : 1; + bool bInCallDownLoad : 1; + + bool GetGraphic_Impl( Graphic&, SvStream* pStream = 0 ); + bool LoadFile_Impl(); void SendStateChg_Impl( sfx2::LinkManager::LinkState nState ); DECL_STATIC_LINK( SvFileObject, DelMedium_Impl, SfxMediumRef* ); diff --git a/sfx2/source/appl/helpdispatch.cxx b/sfx2/source/appl/helpdispatch.cxx index f9fd4f7bd565..5173c4e32563 100644 --- a/sfx2/source/appl/helpdispatch.cxx +++ b/sfx2/source/appl/helpdispatch.cxx @@ -58,7 +58,7 @@ void SAL_CALL HelpDispatch_Impl::dispatch( DBG_ASSERT( m_xRealDispatch.is(), "invalid dispatch" ); // search for a keyword (dispatch from the basic ide) - sal_Bool bHasKeyword = sal_False; + bool bHasKeyword = false; OUString sKeyword; const PropertyValue* pBegin = aArgs.getConstArray(); const PropertyValue* pEnd = pBegin + aArgs.getLength(); diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index 44aef3bd99c7..fa81e5455a69 100644 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -36,7 +36,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::util; using namespace ::com::sun::star::lang; -extern void AppendConfigToken_Impl( OUString& rURL, sal_Bool bQuestionMark ); // sfxhelp.cxx +extern void AppendConfigToken_Impl( OUString& rURL, bool bQuestionMark ); // sfxhelp.cxx // class HelpInterceptor_Impl -------------------------------------------- @@ -118,12 +118,12 @@ void HelpInterceptor_Impl::setInterception( Reference< XFrame > xFrame ) -sal_Bool HelpInterceptor_Impl::HasHistoryPred() const +bool HelpInterceptor_Impl::HasHistoryPred() const { return m_pHistory && ( m_nCurPos > 0 ); } -sal_Bool HelpInterceptor_Impl::HasHistorySucc() const +bool HelpInterceptor_Impl::HasHistorySucc() const { return m_pHistory && ( m_nCurPos < ( m_pHistory->size() - 1 ) ); } @@ -143,7 +143,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( if ( m_xSlaveDispatcher.is() ) xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags ); - sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match("vnd.sun.star.help",0); + bool bHelpURL = aURL.Complete.toAsciiLowerCase().match("vnd.sun.star.help",0); if ( bHelpURL ) { @@ -234,7 +234,7 @@ Sequence< OUString > SAL_CALL HelpInterceptor_Impl::getInterceptedURLs() void SAL_CALL HelpInterceptor_Impl::dispatch( const URL& aURL, const Sequence< ::com::sun::star::beans::PropertyValue >& ) throw( RuntimeException, std::exception ) { - sal_Bool bBack = ( OUString( ".uno:Backward" ) == aURL.Complete ); + bool bBack = ( OUString( ".uno:Backward" ) == aURL.Complete ); if ( bBack || OUString( ".uno:Forward" ) == aURL.Complete ) { if ( m_pHistory ) @@ -260,7 +260,7 @@ void SAL_CALL HelpInterceptor_Impl::dispatch( { HelpHistoryEntry_Impl* pEntry = m_pHistory->at( nPos ); if ( pEntry ) - m_pWindow->loadHelpContent(pEntry->aURL, sal_False); // false => dont add item to history again! + m_pWindow->loadHelpContent(pEntry->aURL, false); // false => dont add item to history again! } m_pWindow->UpdateToolbox(); diff --git a/sfx2/source/appl/helpinterceptor.hxx b/sfx2/source/appl/helpinterceptor.hxx index da24e05de573..e34686e7b40d 100644 --- a/sfx2/source/appl/helpinterceptor.hxx +++ b/sfx2/source/appl/helpinterceptor.hxx @@ -81,8 +81,8 @@ public: const com::sun::star::uno::Any& GetViewData()const {return m_aViewData;} - sal_Bool HasHistoryPred() const; // is there a predecessor for the current in the history - sal_Bool HasHistorySucc() const; // is there a successor for the current in the history + bool HasHistoryPred() const; // is there a predecessor for the current in the history + bool HasHistorySucc() const; // is there a successor for the current in the history // XDispatchProvider virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > SAL_CALL diff --git a/sfx2/source/appl/imestatuswindow.cxx b/sfx2/source/appl/imestatuswindow.cxx index e3e60fe88161..d38b69000484 100644 --- a/sfx2/source/appl/imestatuswindow.cxx +++ b/sfx2/source/appl/imestatuswindow.cxx @@ -93,11 +93,8 @@ void ImeStatusWindow::init() if (Application::CanToggleImeStatusWindow()) try { - sal_Bool bShow = sal_Bool(); - if (getConfig()->getPropertyValue( - OUString( - "ShowStatusWindow")) - >>= bShow) + bool bShow; + if (getConfig()->getPropertyValue(OUString("ShowStatusWindow")) >>= bShow) Application::ShowImeStatusWindow(bShow); } catch (css::uno::Exception &) @@ -112,10 +109,8 @@ bool ImeStatusWindow::isShowing() { try { - sal_Bool bShow = sal_Bool(); - if (getConfig()->getPropertyValue( - OUString("ShowStatusWindow")) - >>= bShow) + bool bShow; + if (getConfig()->getPropertyValue(OUString("ShowStatusWindow")) >>= bShow) return bShow; } catch (css::uno::Exception &) @@ -134,7 +129,7 @@ void ImeStatusWindow::show(bool bShow) css::uno::Reference< css::beans::XPropertySet > xConfig(getConfig()); xConfig->setPropertyValue( OUString("ShowStatusWindow"), - css::uno::makeAny(static_cast< sal_Bool >(bShow))); + css::uno::makeAny(bShow)); css::uno::Reference< css::util::XChangesBatch > xCommit( xConfig, css::uno::UNO_QUERY); // Degrade gracefully by not saving the settings permanently: diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 3839d8544219..5d39bac1a296 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -228,7 +228,7 @@ bool SvDDEObject::Connect( SvBaseLink * pSvLink ) // then the server is up, it just does not know the topic! if( sTopic.equalsIgnoreAsciiCase( "SYSTEM" ) ) { - sal_Bool bSysTopic; + bool bSysTopic; { DdeConnection aTmp(sServer, OUString("SYSTEM")); bSysTopic = !aTmp.GetError(); @@ -314,7 +314,7 @@ void SvDDEObject::Edit( Window* pParent, sfx2::SvBaseLink* pBaseLink, const Link } } -sal_Bool SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq ) +bool SvDDEObject::ImplHasOtherFormat( DdeTransaction& rReq ) { sal_uInt16 nFmt = 0; switch( rReq.GetFormat() ) @@ -400,7 +400,7 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData ) IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData ) { - sal_Bool bValid = (sal_Bool)(sal_uIntPtr)pData; + bool bValid = (sal_Bool)(sal_uIntPtr)pData; if( !bValid && ( pRequest || pLink )) { DdeTransaction* pReq = 0; diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index 354ac9588ce2..53810ab97c0f 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -44,7 +44,7 @@ class SvDDEObject : public SvLinkSource sal_uInt8 nError : 7; // Error code for dialogue - sal_Bool ImplHasOtherFormat( DdeTransaction& ); + bool ImplHasOtherFormat( DdeTransaction& ); DECL_LINK( ImplGetDDEData, DdeData* ); DECL_LINK( ImplDoneDDEData, void* ); diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index d61c2f169868..291671305a44 100644 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -573,7 +573,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) TypeId aType( TYPE(SfxObjectShell) ); - sal_Bool bFirst = sal_True; + bool bFirst = true; SfxObjectShell* pShell = pLinkMgr->GetPersist(); if( pShell && pShell->GetMedium() ) { @@ -587,7 +587,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) if ( !pShell ) { - bFirst = sal_False; + bFirst = false; pShell = SfxObjectShell::GetFirst( &aType, false ); } @@ -610,7 +610,7 @@ bool SvxInternalLink::Connect( sfx2::SvBaseLink* pLink ) if( bFirst ) { - bFirst = sal_False; + bFirst = false; pShell = SfxObjectShell::GetFirst( &aType, false ); } else diff --git a/sfx2/source/appl/linksrc.cxx b/sfx2/source/appl/linksrc.cxx index 3271237283f2..5c3e98c48b29 100644 --- a/sfx2/source/appl/linksrc.cxx +++ b/sfx2/source/appl/linksrc.cxx @@ -72,16 +72,16 @@ struct SvLinkSource_Entry_Impl SvBaseLinkRef xSink; OUString aDataMimeType; sal_uInt16 nAdviseModes; - sal_Bool bIsDataSink; + bool bIsDataSink; SvLinkSource_Entry_Impl( SvBaseLink* pLink, const OUString& rMimeType, sal_uInt16 nAdvMode ) : xSink( pLink ), aDataMimeType( rMimeType ), - nAdviseModes( nAdvMode ), bIsDataSink( sal_True ) + nAdviseModes( nAdvMode ), bIsDataSink( true ) {} SvLinkSource_Entry_Impl( SvBaseLink* pLink ) - : xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( sal_False ) + : xSink( pLink ), nAdviseModes( 0 ), bIsDataSink( false ) {} ~SvLinkSource_Entry_Impl(); @@ -122,7 +122,7 @@ public: SvLinkSource_Entry_Impl* Curr() { return nPos < aArr.size() ? aArr[ nPos ] : 0; } SvLinkSource_Entry_Impl* Next(); - sal_Bool IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry ); + bool IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry ); }; SvLinkSource_EntryIter_Impl::SvLinkSource_EntryIter_Impl( @@ -135,7 +135,7 @@ SvLinkSource_EntryIter_Impl::~SvLinkSource_EntryIter_Impl() aArr.clear(); } -sal_Bool SvLinkSource_EntryIter_Impl::IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry ) +bool SvLinkSource_EntryIter_Impl::IsValidCurrValue( SvLinkSource_Entry_Impl* pEntry ) { return ( nPos < aArr.size() && aArr[nPos] == pEntry && std::find( rOrigArr.begin(), rOrigArr.end(), pEntry ) != rOrigArr.end() ); @@ -176,7 +176,7 @@ struct SvLinkSource_Impl sal_uIntPtr nTimeout; css::uno::Reference<css::io::XInputStream> m_xInputStreamToLoadFrom; - sal_Bool m_bIsReadOnly; + bool m_bIsReadOnly; SvLinkSource_Impl() : pTimer(0) diff --git a/sfx2/source/appl/lnkbase2.cxx b/sfx2/source/appl/lnkbase2.cxx index 75a8c3e83d5d..ac85991fc124 100644 --- a/sfx2/source/appl/lnkbase2.cxx +++ b/sfx2/source/appl/lnkbase2.cxx @@ -71,7 +71,7 @@ struct ImplBaseLinkData // applies for all links sal_uIntPtr nCntntType; // Update Format // Not Ole-Links - sal_Bool bIntrnlLnk; // It is an internal link + bool bIntrnlLnk; // It is an internal link sal_uInt16 nUpdateMode; // UpdateMode }; @@ -87,7 +87,7 @@ struct ImplBaseLinkData ImplBaseLinkData() { ClientType.nCntntType = 0; - ClientType.bIntrnlLnk = sal_False; + ClientType.bIntrnlLnk = false; ClientType.nUpdateMode = 0; DDEType.pItem = NULL; } @@ -99,12 +99,12 @@ class ImplDdeItem : public DdeGetPutItem SvBaseLink* pLink; DdeData aData; Sequence< sal_Int8 > aSeq; // Datacontainer for DdeData !!! - sal_Bool bIsValidData : 1; - sal_Bool bIsInDTOR : 1; + bool bIsValidData : 1; + bool bIsInDTOR : 1; public: ImplDdeItem( SvBaseLink& rLink, const OUString& rStr ) - : DdeGetPutItem( rStr ), pLink( &rLink ), bIsValidData( sal_False ), - bIsInDTOR( sal_False ) + : DdeGetPutItem( rStr ), pLink( &rLink ), bIsValidData( false ), + bIsInDTOR( false ) {} virtual ~ImplDdeItem(); @@ -114,11 +114,11 @@ public: void Notify() { - bIsValidData = sal_False; + bIsValidData = false; DdeGetPutItem::NotifyClient(); } - sal_Bool IsInDTOR() const { return bIsInDTOR; } + bool IsInDTOR() const { return bIsInDTOR; } }; @@ -147,7 +147,7 @@ SvBaseLink::SvBaseLink( sal_uInt16 nUpdateMode, sal_uIntPtr nContentType ) // It it going to be a Ole-Link, pImplData->ClientType.nUpdateMode = nUpdateMode; pImplData->ClientType.nCntntType = nContentType; - pImplData->ClientType.bIntrnlLnk = sal_False; + pImplData->ClientType.bIntrnlLnk = false; } @@ -367,12 +367,12 @@ void SvBaseLink::_GetRealObject( bool bConnect) nObjType = OBJECT_INTERN; xObj = pImpl->m_pLinkMgr->CreateObj( this ); - pImplData->ClientType.bIntrnlLnk = sal_True; + pImplData->ClientType.bIntrnlLnk = true; nObjType = OBJECT_CLIENT_DDE; // so we know what it once was! } else { - pImplData->ClientType.bIntrnlLnk = sal_False; + pImplData->ClientType.bIntrnlLnk = false; xObj = pImpl->m_pLinkMgr->CreateObj( this ); } } @@ -536,7 +536,7 @@ FileDialogHelper & SvBaseLink::GetInsertFileDialog(const OUString& rFactory) con ImplDdeItem::~ImplDdeItem() { - bIsInDTOR = sal_True; + bIsInDTOR = true; // So that no-one gets the idea to delete the pointer when Disconnecting! SvBaseLinkRef aRef( pLink ); aRef->Disconnect(); @@ -558,13 +558,13 @@ DdeData* ImplDdeItem::Get( sal_uIntPtr nFormat ) { aData = DdeData( (const char *)aSeq.getConstArray(), aSeq.getLength(), nFormat ); - bIsValidData = sal_True; + bIsValidData = true; return &aData; } } } aSeq.realloc( 0 ); - bIsValidData = sal_False; + bIsValidData = false; return 0; } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 03d761149652..b54060dcf834 100644 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -174,7 +174,7 @@ namespace sfx2 { - void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList ) + void HandleTaskPaneList( Window* pWindow, bool bAddToList ) { Window* pParent = pWindow->GetParent(); DBG_ASSERT( pParent, "HandleTaskPaneList(): every window here should have a parent" ); @@ -250,10 +250,10 @@ namespace sfx2 struct IndexEntry_Impl { - sal_Bool m_bSubEntry; + bool m_bSubEntry; OUString m_aURL; - IndexEntry_Impl( const OUString& rURL, sal_Bool bSubEntry ) : + IndexEntry_Impl( const OUString& rURL, bool bSubEntry ) : m_bSubEntry( bSubEntry ), m_aURL( rURL ) {} }; @@ -262,9 +262,9 @@ struct IndexEntry_Impl struct ContentEntry_Impl { OUString aURL; - sal_Bool bIsFolder; + bool bIsFolder; - ContentEntry_Impl( const OUString& rURL, sal_Bool bFolder ) : + ContentEntry_Impl( const OUString& rURL, bool bFolder ) : aURL( rURL ), bIsFolder( bFolder ) {} }; @@ -328,7 +328,7 @@ void ContentListBox_Impl::InitRoot() bool bIsFolder = ( '1' == cFolder ); SvTreeListEntry* pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, NULL, true ); if ( bIsFolder ) - pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) ); + pEntry->SetUserData( new ContentEntry_Impl( aURL, true ) ); } } @@ -371,7 +371,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) if ( bIsFolder ) { pEntry = InsertEntry( aTitle, aOpenBookImage, aClosedBookImage, pParent, true ); - pEntry->SetUserData( new ContentEntry_Impl( aURL, sal_True ) ); + pEntry->SetUserData( new ContentEntry_Impl( aURL, true ) ); } else { @@ -379,7 +379,7 @@ void ContentListBox_Impl::RequestingChildren( SvTreeListEntry* pParent ) Any aAny( ::utl::UCBContentHelper::GetProperty( aURL, OUString("TargetURL" ) ) ); OUString aTargetURL; if ( aAny >>= aTargetURL ) - pEntry->SetUserData( new ContentEntry_Impl( aTargetURL, sal_False ) ); + pEntry->SetUserData( new ContentEntry_Impl( aTargetURL, false ) ); } } } @@ -611,7 +611,7 @@ void IndexTabPage_Impl::InitializeIndex() { OUStringBuffer aURL = HELP_URL; aURL.append(sFactory); - AppendConfigToken(aURL, sal_True); + AppendConfigToken(aURL, true); Content aCnt( aURL.makeStringAndClear(), Reference< ::com::sun::star::ucb::XCommandEnvironment >(), comphelper::getProcessComponentContext() ); ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > xInfo = aCnt.getProperties(); @@ -635,7 +635,7 @@ void IndexTabPage_Impl::InitializeIndex() if ( ( aAnySeq[0] >>= aKeywordList ) && ( aAnySeq[1] >>= aKeywordRefList ) && ( aAnySeq[2] >>= aAnchorRefList ) && ( aAnySeq[3] >>= aTitleRefList ) ) { - sal_Bool insert; + bool insert; sal_uInt16 nPos; int ndx,tmp; OUString aIndex, aTempString; @@ -804,9 +804,9 @@ void IndexTabPage_Impl::SetKeyword( const OUString& rKeyword ) -sal_Bool IndexTabPage_Impl::HasKeyword() const +bool IndexTabPage_Impl::HasKeyword() const { - sal_Bool bRet = sal_False; + bool bRet = false; if ( !sKeyword.isEmpty() ) { sal_Int32 nPos = m_pIndexCB->GetEntryPos( sKeyword ); @@ -818,9 +818,9 @@ sal_Bool IndexTabPage_Impl::HasKeyword() const -sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase() +bool IndexTabPage_Impl::HasKeywordIgnoreCase() { - sal_Bool bRet = sal_False; + bool bRet = false; if ( !sKeyword.isEmpty() ) { sal_Int32 nEntries = m_pIndexCB->GetEntryCount(); @@ -832,7 +832,7 @@ sal_Bool IndexTabPage_Impl::HasKeywordIgnoreCase() if (rI18nHelper.MatchString( sIndexItem, sKeyword )) { sKeyword = sIndexItem; - bRet = sal_True; + bRet = true; } } } @@ -865,14 +865,14 @@ extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSearchBox(Window *pParent, bool SearchBox_Impl::PreNotify( NotifyEvent& rNEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( !IsInDropDown() && rNEvt.GetWindow() == GetSubEdit() && rNEvt.GetType() == EVENT_KEYINPUT && KEY_RETURN == rNEvt.GetKeyEvent()->GetKeyCode().GetCode() ) { aSearchLink.Call( NULL ); - bHandled = sal_True; + bHandled = true; } return bHandled || ComboBox::PreNotify( rNEvt ); } @@ -946,7 +946,7 @@ SearchTabPage_Impl::SearchTabPage_Impl(Window* pParent, SfxHelpIndexWindow_Impl* Any aUserItem = aViewOpt.GetUserItem( USERITEM_NAME ); if ( aUserItem >>= aUserData ) { - sal_Bool bChecked = ( 1 == aUserData.getToken(0, ';').toInt32() ) ? sal_True : sal_False; + bool bChecked = ( 1 == aUserData.getToken(0, ';').toInt32() ) ? sal_True : sal_False; m_pFullWordsCB->Check( bChecked ); bChecked = ( 1 == aUserData.getToken(1, ';').toInt32() ) ? sal_True : sal_False; m_pScopeCB->Check( bChecked ); @@ -1031,7 +1031,7 @@ IMPL_LINK_NOARG(SearchTabPage_Impl, SearchHdl) if ( !m_pFullWordsCB->IsChecked() ) aSearchText = sfx2::PrepareSearchString( aSearchText, xBreakIterator, true ); aSearchURL.append(aSearchText); - AppendConfigToken(aSearchURL, sal_False); + AppendConfigToken(aSearchURL, false); if ( m_pScopeCB->IsChecked() ) aSearchURL.append("&Scope=Heading"); std::vector< OUString > aFactories = SfxContentHelper::GetResultSet(aSearchURL.makeStringAndClear()); @@ -1107,9 +1107,9 @@ void SearchTabPage_Impl::ClearPage() -sal_Bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword ) +bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword ) { - sal_Bool bRet = sal_False; + bool bRet = false; m_pSearchED->SetText( rKeyword ); SearchHdl( NULL ); if ( m_pResultsLB->GetEntryCount() > 0 ) @@ -1117,7 +1117,7 @@ sal_Bool SearchTabPage_Impl::OpenKeyword( const OUString& rKeyword ) // found keyword -> open it m_pResultsLB->SelectEntryPos(0); OpenHdl( NULL ); - bRet = sal_True; + bRet = true; } return bRet; @@ -1190,7 +1190,7 @@ void BookmarksBox_Impl::DoAction( sal_uInt16 nAction ) sal_Int32 nPos = GetSelectEntryPos(); if ( nPos != LISTBOX_ENTRY_NOTFOUND ) { - SfxAddHelpBookmarkDialog_Impl aDlg( this, sal_True ); + SfxAddHelpBookmarkDialog_Impl aDlg( this, true ); aDlg.SetTitle( GetEntry( nPos ) ); if ( aDlg.Execute() == RET_OK ) { @@ -1337,7 +1337,7 @@ void BookmarksTabPage_Impl::AddBookmarks( const OUString& rTitle, const OUString OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory , const OUString& sContent , const OUString& sAnchor , - sal_Bool bUseQuestionMark) + bool bUseQuestionMark) { OUStringBuffer sHelpURL(256); sHelpURL.append(HELP_URL); @@ -1349,7 +1349,7 @@ OUString SfxHelpWindow_Impl::buildHelpURL(const OUString& sFactory , return sHelpURL.makeStringAndClear(); } -void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, sal_Bool bAddToHistory) +void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, bool bAddToHistory) { Reference< XComponentLoader > xLoader(getTextFrame(), UNO_QUERY); if (!xLoader.is()) @@ -1372,7 +1372,7 @@ void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, sal_Bool bAdd if ( !IsWait() ) EnterWait(); - sal_Bool bSuccess = sal_False; + bool bSuccess = false; // TODO implement locale fallback ... see below while(true) { try @@ -1380,7 +1380,7 @@ void SfxHelpWindow_Impl::loadHelpContent(const OUString& sHelpURL, sal_Bool bAdd Reference< XComponent > xContent = xLoader->loadComponentFromURL(sHelpURL, "_self", 0, Sequence< PropertyValue >()); if (xContent.is()) { - bSuccess = sal_True; + bSuccess = true; } } catch(const RuntimeException&) @@ -1461,7 +1461,7 @@ SfxHelpIndexWindow_Impl::~SfxHelpIndexWindow_Impl() void SfxHelpIndexWindow_Impl::Initialize() { OUStringBuffer aHelpURL(HELP_URL); - AppendConfigToken(aHelpURL, sal_True); + AppendConfigToken(aHelpURL, true); std::vector<OUString> aFactories = SfxContentHelper::GetResultSet(aHelpURL.makeStringAndClear()); for (size_t i = 0, n = aFactories.size(); i < n; ++i ) { @@ -1585,7 +1585,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl) OUString* pFactory = (OUString*)(sal_uIntPtr)aActiveLB.GetEntryData( aActiveLB.GetSelectEntryPos() ); if ( pFactory ) { - SetFactory( OUString( *pFactory ).toAsciiLowerCase(), sal_False ); + SetFactory( OUString( *pFactory ).toAsciiLowerCase(), false ); aSelectFactoryLink.Call( this ); } @@ -1597,7 +1597,7 @@ IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, SelectFactoryHdl) IMPL_LINK_NOARG(SfxHelpIndexWindow_Impl, KeywordHdl) { // keyword found on index? - sal_Bool bIndex = pIPage->HasKeyword(); + bool bIndex = pIPage->HasKeyword(); if( !bIndex) bIndex = pIPage->HasKeywordIgnoreCase(); @@ -1658,8 +1658,8 @@ bool SfxHelpIndexWindow_Impl::PreNotify( NotifyEvent& rNEvt ) sal_uInt16 nPageId = 0; HelpTabPage_Impl* pCurPage = GetCurrentPage( nPageId ); Control* pControl = pCurPage->GetLastFocusControl(); - sal_Bool bShift = rKeyCode.IsShift(); - sal_Bool bCtrl = rKeyCode.IsMod1(); + bool bShift = rKeyCode.IsShift(); + bool bCtrl = rKeyCode.IsMod1(); if ( !bCtrl && bShift && aActiveLB.HasChildPathFocus() ) { pControl->GrabFocus(); @@ -1722,7 +1722,7 @@ void SfxHelpIndexWindow_Impl::SetDoubleClickHdl( const Link& rLink ) -void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, sal_Bool bActive ) +void SfxHelpIndexWindow_Impl::SetFactory( const OUString& rFactory, bool bActive ) { if ( !rFactory.isEmpty() ) { @@ -1811,9 +1811,9 @@ void SfxHelpIndexWindow_Impl::GrabFocusBack() -sal_Bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const +bool SfxHelpIndexWindow_Impl::HasFocusOnEdit() const { - sal_Bool bRet = sal_False; + bool bRet = false; if ( aTabCtrl.GetCurPageId() == HELP_INDEX_PAGE_INDEX && pIPage ) bRet = pIPage->HasFocusOnEdit(); else if ( aTabCtrl.GetCurPageId() == HELP_INDEX_PAGE_SEARCH && pSPage ) @@ -1833,9 +1833,9 @@ OUString SfxHelpIndexWindow_Impl::GetSearchText() const -sal_Bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const +bool SfxHelpIndexWindow_Impl::IsFullWordSearch() const { - sal_Bool bRet = sal_False; + bool bRet = false; if ( aTabCtrl.GetCurPageId() == HELP_INDEX_PAGE_SEARCH && pSPage ) bRet = pSPage->IsFullWordSearch(); return bRet; @@ -1900,10 +1900,10 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : pTextWin ( new TextWin_Impl( this ) ), pSrchDlg ( NULL ), nMinPos ( 0 ), - bIsDebug ( sal_False ), - bIsIndexOn ( sal_False ), - bIsInClose ( sal_False ), - bIsFullWordSearch ( sal_False ) + bIsDebug ( false ), + bIsIndexOn ( false ), + bIsInClose ( false ), + bIsFullWordSearch ( false ) { sfx2::AddToTaskPaneList( &aToolBox ); @@ -1942,7 +1942,7 @@ SfxHelpTextWindow_Impl::SfxHelpTextWindow_Impl( SfxHelpWindow_Impl* pParent ) : char* pEnv = getenv( "help_debug" ); if ( pEnv ) - bIsDebug = sal_True; + bIsDebug = true; SvtMiscOptions().AddListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); @@ -1956,17 +1956,17 @@ SfxHelpTextWindow_Impl::~SfxHelpTextWindow_Impl() { sfx2::RemoveFromTaskPaneList( &aToolBox ); - bIsInClose = sal_True; + bIsInClose = true; SvtMiscOptions().RemoveListenerLink( LINK( this, SfxHelpTextWindow_Impl, NotifyHdl ) ); delete pSrchDlg; } -sal_Bool SfxHelpTextWindow_Impl::HasSelection() const +bool SfxHelpTextWindow_Impl::HasSelection() const { // is there any selection in the text and not only a cursor? - sal_Bool bRet = sal_False; + bool bRet = false; Reference < XTextRange > xRange = getCursor(); if ( xRange.is() ) { @@ -1982,7 +1982,7 @@ sal_Bool SfxHelpTextWindow_Impl::HasSelection() const void SfxHelpTextWindow_Impl::InitToolBoxImages() { - sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); + bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); aIndexOnImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_ON : IMG_HELP_TOOLBOX_INDEX_ON ) ); aIndexOffImage = Image( SfxResId( bLarge ? IMG_HELP_TOOLBOX_L_INDEX_OFF : IMG_HELP_TOOLBOX_INDEX_OFF ) ); @@ -2039,7 +2039,7 @@ void SfxHelpTextWindow_Impl::InitOnStartupBox( bool bOnlyText ) // 2) We read sal_True/sal_False => check box must be shown and enabled/disabled bool bHideBox = true; - sal_Bool bHelpAtStartup = sal_False; + bool bHelpAtStartup = false; try { xConfiguration = ConfigurationHelper::openConfig( @@ -2206,11 +2206,9 @@ IMPL_LINK_NOARG(SfxHelpTextWindow_Impl, SelectHdl) { // create descriptor, set string and find all words Reference < XSearchDescriptor > xSrchDesc = xSearchable->createSearchDescriptor(); - xSrchDesc->setPropertyValue( "SearchRegularExpression", - makeAny( sal_Bool( sal_True ) ) ); + xSrchDesc->setPropertyValue( "SearchRegularExpression", makeAny( true ) ); if ( bIsFullWordSearch ) - xSrchDesc->setPropertyValue( "SearchWords", - makeAny( sal_Bool( sal_True ) ) ); + xSrchDesc->setPropertyValue( "SearchWords", makeAny( true ) ); OUString sSearchString = sfx2::PrepareSearchString( aSearchText, GetBreakIterator(), false ); xSrchDesc->setSearchString( sSearchString ); @@ -2267,9 +2265,9 @@ IMPL_LINK( SfxHelpTextWindow_Impl, FindHdl, sfx2::SearchDialog*, pDlg ) { // create descriptor, set string and find all words Reference < XSearchDescriptor > xSrchDesc = xSearchable->createSearchDescriptor(); - xSrchDesc->setPropertyValue( "SearchWords", makeAny( sal_Bool( pDlg->IsOnlyWholeWords() != false ) ) ); - xSrchDesc->setPropertyValue( "SearchCaseSensitive", makeAny( sal_Bool( pDlg->IsMarchCase() != false ) ) ); - xSrchDesc->setPropertyValue( "SearchBackwards", makeAny( sal_Bool( pDlg->IsSearchBackwards() != false ) ) ); + xSrchDesc->setPropertyValue( "SearchWords", makeAny( pDlg->IsOnlyWholeWords() != false ) ); + xSrchDesc->setPropertyValue( "SearchCaseSensitive", makeAny( pDlg->IsMarchCase() != false ) ); + xSrchDesc->setPropertyValue( "SearchBackwards", makeAny( pDlg->IsSearchBackwards() != false ) ); xSrchDesc->setSearchString( sSearchText ); Reference< XInterface > xSelection; Reference< XTextRange > xCursor = getCursor(); @@ -2346,7 +2344,7 @@ IMPL_LINK( SfxHelpTextWindow_Impl, CheckHdl, CheckBox*, pBox ) { if ( xConfiguration.is() ) { - sal_Bool bChecked = pBox->IsChecked(); + bool bChecked = pBox->IsChecked(); OUString sPath( PATH_OFFICE_FACTORIES ); sPath += sCurrentFactory; try @@ -2448,7 +2446,7 @@ bool SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) Reference<XStatusListener>xStateListener = pStateListener = new HelpStatusListener_Impl(xDisp, aURL ); FeatureStateEvent rEvent = pStateListener->GetStateEvent(); - sal_Bool bCheck = sal_False; + bool bCheck = false; rEvent.State >>= bCheck; aMenu.CheckItem(TBI_SELECTIONMODE, bCheck); } @@ -2540,7 +2538,7 @@ void SfxHelpTextWindow_Impl::DataChanged( const DataChangedEvent& rDCEvt ) -void SfxHelpTextWindow_Impl::ToggleIndex( sal_Bool bOn ) +void SfxHelpTextWindow_Impl::ToggleIndex( bool bOn ) { bIsIndexOn = bOn; if ( bIsIndexOn ) @@ -2557,7 +2555,7 @@ void SfxHelpTextWindow_Impl::ToggleIndex( sal_Bool bOn ) -void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, sal_Bool _bIsFullWordSearch ) +void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch ) { aSearchText = rSearchText; bIsFullWordSearch = _bIsFullWordSearch; @@ -2569,7 +2567,7 @@ void SfxHelpTextWindow_Impl::SelectSearchText( const OUString& rSearchText, sal_ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const { #ifdef DBG_UTIL - sal_Bool bSetOff = sal_False; + bool bSetOff = false; #endif // set off the pagestyle header to prevent print output of the help URL try @@ -2598,13 +2596,12 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const if ( xContainer->getByName( sStyleName ) >>= xStyle ) { Reference < XPropertySet > xPropSet( xStyle, UNO_QUERY ); - xPropSet->setPropertyValue( "HeaderIsOn", - makeAny( sal_Bool( sal_False ) ) ); + xPropSet->setPropertyValue( "HeaderIsOn", makeAny( false ) ); Reference< XModifiable > xReset(xStyles, UNO_QUERY); xReset->setModified(sal_False); #ifdef DBG_UTIL - bSetOff = sal_True; + bSetOff = true; #endif } } @@ -2630,7 +2627,7 @@ void SfxHelpTextWindow_Impl::SetPageStyleHeaderOff() const void SfxHelpTextWindow_Impl::CloseFrame() { - bIsInClose = sal_True; + bIsInClose = true; try { ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloseable > xCloseable ( xFrame, ::com::sun::star::uno::UNO_QUERY ); @@ -2685,23 +2682,23 @@ void SfxHelpWindow_Impl::Split() nIndexSize = GetItemSize( INDEXWIN_ID ); nTextSize = GetItemSize( TEXTWIN_ID ); - sal_Bool bMod = sal_False; + bool bMod = false; if( nIndexSize < nMinSplitSize ) { nIndexSize = nMinSplitSize; nTextSize = nMaxSplitSize; - bMod = sal_True; + bMod = true; } else if( nTextSize < nMinSplitSize ) { nTextSize = nMinSplitSize; nIndexSize = nMaxSplitSize; - bMod = sal_True; + bMod = true; } else - bMod = sal_False; + bMod = false; if( bMod ) { @@ -2870,7 +2867,7 @@ void SfxHelpWindow_Impl::ShowStartPage() OUString sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(), "/start", OUString(), - sal_True); + true); loadHelpContent(sHelpURL); } @@ -2921,7 +2918,7 @@ IMPL_LINK_NOARG(SfxHelpWindow_Impl, OpenHdl) sHelpURL = SfxHelpWindow_Impl::buildHelpURL(pIndexWin->GetFactory(), aEntry, aAnchor, - sal_True); + true); } loadHelpContent(sHelpURL); @@ -2960,7 +2957,7 @@ IMPL_LINK( SfxHelpWindow_Impl, ChangeHdl, HelpListener_Impl*, pListener ) void SfxHelpWindow_Impl::openDone(const OUString& sURL , - sal_Bool bSuccess) + bool bSuccess) { INetURLObject aObj( sURL ); if ( aObj.GetProtocol() == INET_PROT_VND_SUN_STAR_HELP ) @@ -2970,7 +2967,7 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , if ( bGrabFocusToToolBox ) { pTextWin->GetToolBox().GrabFocus(); - bGrabFocusToToolBox = sal_False; + bGrabFocusToToolBox = false; } else pIndexWin->GrabFocusBack(); @@ -2985,14 +2982,13 @@ void SfxHelpWindow_Impl::openDone(const OUString& sURL , Reference < XViewSettingsSupplier > xSettings( xController, UNO_QUERY ); Reference < XPropertySet > xViewProps = xSettings->getViewSettings(); Reference< XPropertySetInfo > xInfo = xViewProps->getPropertySetInfo(); - Any aBoolAny = makeAny( sal_Bool( sal_True ) ); - xViewProps->setPropertyValue( "ShowContentTips", makeAny( sal_Bool( sal_False ) ) ); - xViewProps->setPropertyValue( "ShowGraphics", aBoolAny ); - xViewProps->setPropertyValue( "ShowTables", aBoolAny ); + xViewProps->setPropertyValue( "ShowContentTips", makeAny( false ) ); + xViewProps->setPropertyValue( "ShowGraphics", makeAny( true ) ); + xViewProps->setPropertyValue( "ShowTables", makeAny( true ) ); xViewProps->setPropertyValue( "HelpURL", makeAny( OUString("HID:SFX2_HID_HELP_ONHELP") ) ); OUString sProperty( "IsExecuteHyperlinks" ); if ( xInfo->hasPropertyByName( sProperty ) ) - xViewProps->setPropertyValue( sProperty, aBoolAny ); + xViewProps->setPropertyValue( sProperty, makeAny( true ) ); xController->restoreViewData(pHelpInterceptor->GetViewData()); } } @@ -3029,8 +3025,8 @@ SfxHelpWindow_Impl::SfxHelpWindow_Impl( nHeight ( 0 ), nIndexSize ( 40 ), nTextSize ( 60 ), - bIndex ( sal_True ), - bGrabFocusToToolBox ( sal_False ), + bIndex ( true ), + bGrabFocusToToolBox ( false ), aWinPos ( 0, 0 ), sTitle ( pParent->GetText() ) { @@ -3069,7 +3065,7 @@ SfxHelpWindow_Impl::~SfxHelpWindow_Impl() bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) { - sal_Bool bHandled = sal_False; + bool bHandled = false; if ( rNEvt.GetType() == EVENT_KEYINPUT ) { // Backward == <ALT><LEFT> or <BACKSPACE> Forward == <ALT><RIGHT> @@ -3079,13 +3075,13 @@ bool SfxHelpWindow_Impl::PreNotify( NotifyEvent& rNEvt ) ( !rKeyCode.GetModifier() && KEY_BACKSPACE == nKey && !pIndexWin->HasFocusOnEdit() ) ) { DoAction( rKeyCode.GetCode() == KEY_RIGHT ? TBI_FORWARD : TBI_BACKWARD ); - bHandled = sal_True; + bHandled = true; } else if ( rKeyCode.IsMod1() && ( KEY_F4 == nKey || KEY_W == nKey ) ) { // <CTRL><F4> or <CTRL><W> -> close top frame CloseWindow(); - bHandled = sal_True; + bHandled = true; } } return bHandled || Window::PreNotify( rNEvt ); @@ -3103,7 +3099,7 @@ void SfxHelpWindow_Impl::setContainerWindow( Reference < ::com::sun::star::awt:: void SfxHelpWindow_Impl::SetFactory( const OUString& rFactory ) { - pIndexWin->SetFactory( rFactory, sal_True ); + pIndexWin->SetFactory( rFactory, true ); } @@ -3196,7 +3192,7 @@ void SfxHelpWindow_Impl::DoAction( sal_uInt16 nActionId ) if ( aAny >>= aValue ) { OUString aTitle( aValue ); - SfxAddHelpBookmarkDialog_Impl aDlg( this, sal_False ); + SfxAddHelpBookmarkDialog_Impl aDlg( this, false ); aDlg.SetTitle( aTitle ); if ( aDlg.Execute() == RET_OK ) { @@ -3253,21 +3249,21 @@ void SfxHelpWindow_Impl::UpdateToolbox() -sal_Bool SfxHelpWindow_Impl::HasHistoryPredecessor() const +bool SfxHelpWindow_Impl::HasHistoryPredecessor() const { return pHelpInterceptor->HasHistoryPred(); } -sal_Bool SfxHelpWindow_Impl::HasHistorySuccessor() const +bool SfxHelpWindow_Impl::HasHistorySuccessor() const { return pHelpInterceptor->HasHistorySucc(); } // class SfxAddHelpBookmarkDialog_Impl ----------------------------------- -SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent, sal_Bool bRename) +SfxAddHelpBookmarkDialog_Impl::SfxAddHelpBookmarkDialog_Impl(Window* pParent, bool bRename) : ModalDialog( pParent, "BookmarkDialog", "sfx/ui/bookmarkdialog.ui") { get(m_pTitleED, "entry"); diff --git a/sfx2/source/appl/newhelp.hxx b/sfx2/source/appl/newhelp.hxx index 900dc84f9872..476652245353 100644 --- a/sfx2/source/appl/newhelp.hxx +++ b/sfx2/source/appl/newhelp.hxx @@ -148,12 +148,12 @@ public: inline OUString GetFactory() const { return sFactory; } OUString GetSelectEntry() const; inline void SetFocusOnBox() { m_pIndexCB->GrabFocus(); } - inline sal_Bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); } + inline bool HasFocusOnEdit() const { return m_pIndexCB->HasChildPathFocus(); } inline void SetKeywordHdl( const Link& rLink ) { aKeywordLink = rLink; } void SetKeyword( const OUString& rKeyword ); - sal_Bool HasKeyword() const; - sal_Bool HasKeywordIgnoreCase(); + bool HasKeyword() const; + bool HasKeywordIgnoreCase(); void OpenKeyword(); inline void SelectExecutableEntry() { m_pIndexCB->SelectExecutableEntry(); } @@ -224,10 +224,10 @@ public: OUString GetSelectEntry() const; void ClearPage(); inline void SetFocusOnBox() { m_pResultsLB->GrabFocus(); } - inline sal_Bool HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); } + inline bool HasFocusOnEdit() const { return m_pSearchED->HasChildPathFocus(); } inline OUString GetSearchText() const { return m_pSearchED->GetText(); } - inline sal_Bool IsFullWordSearch() const { return m_pFullWordsCB->IsChecked(); } - sal_Bool OpenKeyword( const OUString& rKeyword ); + inline bool IsFullWordSearch() const { return m_pFullWordsCB->IsChecked(); } + bool OpenKeyword( const OUString& rKeyword ); }; // class BookmarksTabPage_Impl ------------------------------------------- @@ -318,7 +318,7 @@ public: void SetDoubleClickHdl( const Link& rLink ); inline void SetSelectFactoryHdl( const Link& rLink ) { aSelectFactoryLink = rLink; } - void SetFactory( const OUString& rFactory, sal_Bool bActive ); + void SetFactory( const OUString& rFactory, bool bActive ); inline OUString GetFactory() const { return pIPage->GetFactory(); } OUString GetSelectEntry() const; void AddBookmarks( const OUString& rTitle, const OUString& rURL ); @@ -327,9 +327,9 @@ public: inline void UpdateTabControl() { aTabCtrl.Invalidate(); } void ClearSearchPage(); void GrabFocusBack(); - sal_Bool HasFocusOnEdit() const; + bool HasFocusOnEdit() const; OUString GetSearchText() const; - sal_Bool IsFullWordSearch() const; + bool IsFullWordSearch() const; void OpenKeyword( const OUString& rKeyword ); void SelectExecutableEntry(); inline bool WasCursorLeftOrRight(); @@ -424,12 +424,12 @@ private: ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > xConfiguration; long nMinPos; - sal_Bool bIsDebug; - sal_Bool bIsIndexOn; - sal_Bool bIsInClose; - sal_Bool bIsFullWordSearch; + bool bIsDebug; + bool bIsIndexOn; + bool bIsInClose; + bool bIsFullWordSearch; - sal_Bool HasSelection() const; + bool HasSelection() const; void InitToolBoxImages(); void InitOnStartupBox( bool bOnlyText ); void SetOnStartupBoxPosition(); @@ -459,8 +459,8 @@ public: getFrame() const { return xFrame; } inline void SetSelectHdl( const Link& rLink ) { aToolBox.SetSelectHdl( rLink ); } - void ToggleIndex( sal_Bool bOn ); - void SelectSearchText( const OUString& rSearchText, sal_Bool _bIsFullWordSearch ); + void ToggleIndex( bool bOn ); + void SelectSearchText( const OUString& rSearchText, bool _bIsFullWordSearch ); void SetPageStyleHeaderOff() const; inline ToolBox& GetToolBox() { return aToolBox; } void CloseFrame(); @@ -493,8 +493,8 @@ friend class SfxHelpIndexWindow_Impl; sal_Int32 nHeight; long nIndexSize; long nTextSize; - sal_Bool bIndex; - sal_Bool bGrabFocusToToolBox; + bool bIndex; + bool bGrabFocusToToolBox; Point aWinPos; OUString sTitle; OUString sKeyword; @@ -537,19 +537,19 @@ public: inline void OpenKeyword( const OUString& rKeyword ) { pIndexWin->OpenKeyword( rKeyword ); } inline OUString GetFactory() const { return pIndexWin->GetFactory(); } - sal_Bool HasHistoryPredecessor() const; // forward to interceptor - sal_Bool HasHistorySuccessor() const; // forward to interceptor + bool HasHistoryPredecessor() const; // forward to interceptor + bool HasHistorySuccessor() const; // forward to interceptor void openDone(const OUString& sURL , - sal_Bool bSuccess); + bool bSuccess); static OUString buildHelpURL(const OUString& sFactory , const OUString& sContent , const OUString& sAnchor , - sal_Bool bUseQuestionMark); + bool bUseQuestionMark); void loadHelpContent(const OUString& sHelpURL , - sal_Bool bAddToHistory = sal_True); + bool bAddToHistory = true); }; class SfxAddHelpBookmarkDialog_Impl : public ModalDialog @@ -557,14 +557,14 @@ class SfxAddHelpBookmarkDialog_Impl : public ModalDialog private: Edit* m_pTitleED; public: - SfxAddHelpBookmarkDialog_Impl( Window* pParent, sal_Bool bRename = sal_True ); + SfxAddHelpBookmarkDialog_Impl( Window* pParent, bool bRename = true ); void SetTitle( const OUString& rTitle ); OUString GetTitle() const { return m_pTitleED->GetText(); } }; /// Appends ?Language=xy&System=abc to the help URL in rURL -void AppendConfigToken(OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang = OUString()); +void AppendConfigToken(OUStringBuffer& rURL, bool bQuestionMark, const OUString &rLang = OUString()); #endif // INCLUDED_SFX2_SOURCE_APPL_NEWHELP_HXX diff --git a/sfx2/source/appl/opengrf.cxx b/sfx2/source/appl/opengrf.cxx index 8bdf43f5b7ce..143dcd9b7a84 100644 --- a/sfx2/source/appl/opengrf.cxx +++ b/sfx2/source/appl/opengrf.cxx @@ -110,9 +110,9 @@ SvxOpenGraphicDialog::~SvxOpenGraphicDialog() short SvxOpenGraphicDialog::Execute() { sal_uInt16 nImpRet; - sal_Bool bQuitLoop(sal_False); + bool bQuitLoop(false); - while( bQuitLoop == sal_False && + while( bQuitLoop == false && mpImpl->aFileDlg.Execute() == ERRCODE_NONE ) { if( !GetPath().isEmpty() ) diff --git a/sfx2/source/appl/panelist.hxx b/sfx2/source/appl/panelist.hxx index 23f3d8db6436..5e1ed0e97c69 100644 --- a/sfx2/source/appl/panelist.hxx +++ b/sfx2/source/appl/panelist.hxx @@ -26,17 +26,17 @@ namespace sfx2 { // source in newhelp.cxx - void HandleTaskPaneList( Window* pWindow, sal_Bool bAddToList ); + void HandleTaskPaneList( Window* pWindow, bool bAddToList ); // pWindow: just a system window or something which is child of a system window inline void AddToTaskPaneList( Window* pWindowToBeHandled ) { - HandleTaskPaneList( pWindowToBeHandled, sal_True ); + HandleTaskPaneList( pWindowToBeHandled, true ); } inline void RemoveFromTaskPaneList( Window* pWindowToBeHandled ) { - HandleTaskPaneList( pWindowToBeHandled, sal_False ); + HandleTaskPaneList( pWindowToBeHandled, false ); } } diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index b5f131d2cd4d..7a1f1756a0a6 100644 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -144,7 +144,7 @@ static OUString HelpLocaleString() return aLocaleStr; } -void AppendConfigToken( OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUString &rLang ) +void AppendConfigToken( OUStringBuffer& rURL, bool bQuestionMark, const OUString &rLang ) { OUString aLocaleStr( rLang ); if ( aLocaleStr.isEmpty() ) @@ -167,9 +167,9 @@ void AppendConfigToken( OUStringBuffer& rURL, sal_Bool bQuestionMark, const OUSt rURL.append(utl::ConfigManager::getProductVersion()); } -sal_Bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) +bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) { - sal_Bool bRet = sal_False; + bool bRet = false; OUString sAnchor; try @@ -183,7 +183,7 @@ sal_Bool GetHelpAnchor_Impl( const OUString& _rURL, OUString& _rAnchor ) if ( !sAnchor.isEmpty() ) { _rAnchor = sAnchor; - bRet = sal_True; + bRet = true; } } else @@ -355,7 +355,7 @@ OUString SfxHelp::CreateHelpURL_Impl( const OUString& aCommandURL, const OUStrin { // build up the help URL OUStringBuffer aHelpURL("vnd.sun.star.help://"); - sal_Bool bHasAnchor = sal_False; + bool bHasAnchor = false; OUString aAnchor; OUString aModuleName( rModuleName ); @@ -375,11 +375,11 @@ OUString SfxHelp::CreateHelpURL_Impl( const OUString& aCommandURL, const OUStrin RTL_TEXTENCODING_UTF8)); OUStringBuffer aTempURL = aHelpURL; - AppendConfigToken( aTempURL, sal_True ); + AppendConfigToken( aTempURL, true ); bHasAnchor = GetHelpAnchor_Impl(aTempURL.makeStringAndClear(), aAnchor); } - AppendConfigToken( aHelpURL, sal_True ); + AppendConfigToken( aHelpURL, true ); if ( bHasAnchor ) { @@ -488,7 +488,7 @@ OUString SfxHelp::GetHelpText( const OUString& aCommandURL, const Window* pWindo static bool impl_hasHelpInstalled( const OUString &rLang = OUString() ) { OUStringBuffer aHelpRootURL("vnd.sun.star.help://"); - AppendConfigToken(aHelpRootURL, sal_True, rLang); + AppendConfigToken(aHelpRootURL, true, rLang); std::vector< OUString > aFactories = SfxContentHelper::GetResultSet(aHelpRootURL.makeStringAndClear()); return !aFactories.empty(); @@ -531,7 +531,7 @@ static bool impl_showOnlineHelp( const OUString& rURL ) bool SfxHelp::Start_Impl(const OUString& rURL, const Window* pWindow, const OUString& rKeyword) { OUStringBuffer aHelpRootURL("vnd.sun.star.help://"); - AppendConfigToken(aHelpRootURL, sal_True); + AppendConfigToken(aHelpRootURL, true); SfxContentHelper::GetResultSet(aHelpRootURL.makeStringAndClear()); /* rURL may be diff --git a/sfx2/source/appl/sfxpicklist.cxx b/sfx2/source/appl/sfxpicklist.cxx index 20c8dd9f2ae6..85623749f21f 100644 --- a/sfx2/source/appl/sfxpicklist.cxx +++ b/sfx2/source/appl/sfxpicklist.cxx @@ -296,12 +296,12 @@ void SfxPickList::CreateMenuEntries( Menu* pMenu ) { ::osl::MutexGuard aGuard( thePickListMutex::get() ); - static sal_Bool bPickListMenuInitializing = sal_False; + static bool bPickListMenuInitializing = false; if ( bPickListMenuInitializing ) // method is not reentrant! return; - bPickListMenuInitializing = sal_True; + bPickListMenuInitializing = true; CreatePickListEntries(); for ( sal_uInt16 nId = START_ITEMID_PICKLIST; nId <= END_ITEMID_PICKLIST; ++nId ) @@ -324,7 +324,7 @@ void SfxPickList::CreateMenuEntries( Menu* pMenu ) CreatePicklistMenuTitle( pMenu, (sal_uInt16)(START_ITEMID_PICKLIST + i), pEntry->aName, i ); } - bPickListMenuInitializing = sal_False; + bPickListMenuInitializing = false; } void SfxPickList::ExecuteEntry( sal_uInt32 nIndex ) @@ -383,7 +383,7 @@ void SfxPickList::Notify( SfxBroadcaster&, const SfxHint& rHint ) { case SFX_EVENT_CREATEDOC: { - sal_Bool bAllowModif = pDocSh->IsEnableSetModified(); + bool bAllowModif = pDocSh->IsEnableSetModified(); if ( bAllowModif ) pDocSh->EnableSetModified( false ); diff --git a/sfx2/source/appl/shutdownicon.cxx b/sfx2/source/appl/shutdownicon.cxx index 6ba62be253f6..9a5c9e4247fc 100644 --- a/sfx2/source/appl/shutdownicon.cxx +++ b/sfx2/source/appl/shutdownicon.cxx @@ -479,7 +479,7 @@ IMPL_STATIC_LINK( ShutdownIcon, DialogClosedHdl_Impl, FileDialogHelper*, EMPTYAR // Set readonly flag - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; xPickerControls->getValue( ExtendedFilePickerElementIds::CHECKBOX_READONLY, 0 ) >>= bReadOnly; @@ -707,7 +707,7 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : // third argument only sets veto, everything else will be ignored! if (aArguments.getLength() > 2) { - sal_Bool bVeto = ::cppu::any2bool(aArguments[2]); + bool bVeto = ::cppu::any2bool(aArguments[2]); m_bVeto = bVeto; return; } @@ -718,7 +718,7 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : { try { - sal_Bool bQuickstart = ::cppu::any2bool( aArguments[0] ); + bool bQuickstart = ::cppu::any2bool( aArguments[0] ); if( !bQuickstart && !GetAutostart() ) return; aGuard.clear(); @@ -738,7 +738,7 @@ void SAL_CALL ShutdownIcon::initialize( const ::com::sun::star::uno::Sequence< : } if ( aArguments.getLength() > 1 ) { - sal_Bool bAutostart = ::cppu::any2bool( aArguments[1] ); + bool bAutostart = ::cppu::any2bool( aArguments[1] ); if (bAutostart && !GetAutostart()) SetAutostart( true ); if (!bAutostart && GetAutostart()) @@ -930,7 +930,7 @@ void SAL_CALL ShutdownIcon::setFastPropertyValue( ::sal_Int32 case PROPHANDLE_TERMINATEVETOSTATE : { // use new value in case it's a valid information only - sal_Bool bState( sal_False ); + bool bState( false ); if (! (aValue >>= bState)) return; diff --git a/sfx2/source/appl/workwin.cxx b/sfx2/source/appl/workwin.cxx index a8b89732c814..7e097d8b16e2 100644 --- a/sfx2/source/appl/workwin.cxx +++ b/sfx2/source/appl/workwin.cxx @@ -154,7 +154,7 @@ static const ResIdToResName pToolBarResToName[] = LayoutManagerListener::LayoutManagerListener( SfxWorkWindow* pWrkWin ) : - m_bHasFrame( sal_False ), + m_bHasFrame( false ), m_pWrkWin( pWrkWin ), m_aLayoutManagerPropName( "LayoutManager" ) { @@ -170,7 +170,7 @@ void LayoutManagerListener::setFrame( const css::uno::Reference< css::frame::XFr if ( m_pWrkWin && !m_bHasFrame ) { m_xFrame = xFrame; - m_bHasFrame = sal_True; + m_bHasFrame = true; if ( xFrame.is() ) { @@ -240,7 +240,7 @@ throw( css::uno::RuntimeException, std::exception ) if ( xFrame.is() ) { m_xFrame = css::uno::Reference< css::frame::XFrame >(); - m_bHasFrame = sal_False; + m_bHasFrame = false; css::uno::Reference< css::beans::XPropertySet > xPropSet( xFrame, css::uno::UNO_QUERY ); css::uno::Reference< css::frame::XLayoutManagerEventBroadcaster > xLayoutManager; @@ -280,7 +280,7 @@ throw( css::uno::RuntimeException, std::exception ) { SolarMutexGuard aGuard; m_pWrkWin = 0; - m_bHasFrame = sal_False; + m_bHasFrame = false; m_xFrame = css::uno::Reference< css::frame::XFrame >(); } @@ -298,23 +298,23 @@ throw (css::uno::RuntimeException, std::exception) { if ( eLayoutEvent == css::frame::LayoutManagerEvents::VISIBLE ) { - m_pWrkWin->MakeVisible_Impl( sal_True ); + m_pWrkWin->MakeVisible_Impl( true ); m_pWrkWin->ShowChildren_Impl(); m_pWrkWin->ArrangeChildren_Impl( sal_True ); } else if ( eLayoutEvent == css::frame::LayoutManagerEvents::INVISIBLE ) { - m_pWrkWin->MakeVisible_Impl( sal_False ); + m_pWrkWin->MakeVisible_Impl( false ); m_pWrkWin->HideChildren_Impl(); m_pWrkWin->ArrangeChildren_Impl( sal_True ); } else if ( eLayoutEvent == css::frame::LayoutManagerEvents::LOCK ) { - m_pWrkWin->Lock_Impl( sal_True ); + m_pWrkWin->Lock_Impl( true ); } else if ( eLayoutEvent == css::frame::LayoutManagerEvents::UNLOCK ) { - m_pWrkWin->Lock_Impl( sal_False ); + m_pWrkWin->Lock_Impl( false ); } } } @@ -360,16 +360,16 @@ static OUString GetResourceURLFromResId( sal_uInt16 nResId ) return theFilledToolBarResIdToResourceURLMap::get().findURL(nResId); } -sal_Bool IsAppWorkWinToolbox_Impl( sal_uInt16 nPos ) +bool IsAppWorkWinToolbox_Impl( sal_uInt16 nPos ) { switch ( nPos ) { case SFX_OBJECTBAR_APPLICATION : case SFX_OBJECTBAR_MACRO: case SFX_OBJECTBAR_FULLSCREEN: - return sal_True; + return true; default: - return sal_False; + return false; } } @@ -535,7 +535,7 @@ void SfxWorkWindow::Sort_Impl() } } - bSorted = sal_True; + bSorted = true; } @@ -554,8 +554,8 @@ SfxFrameWorkWin_Impl::SfxFrameWorkWin_Impl( Window *pWin, SfxFrame *pFrm, SfxFra if ( pConfigShell && pConfigShell->GetObjectShell() ) { bShowStatusBar = ( !pConfigShell->GetObjectShell()->IsInPlaceActive() ); - bDockingAllowed = sal_True; - bInternalDockingAllowed = sal_True; + bDockingAllowed = true; + bInternalDockingAllowed = true; } // The required split windows (one for each side) can be created @@ -588,13 +588,13 @@ SfxWorkWindow::SfxWorkWindow( Window *pWin, SfxBindings& rB, SfxWorkWindow* pPar pActiveChild( 0 ), nChildren( 0 ), nOrigMode( 0 ), - bSorted( sal_True ), - bDockingAllowed(sal_True), - bInternalDockingAllowed(sal_True), - bAllChildrenVisible(sal_True), + bSorted( true ), + bDockingAllowed(true), + bInternalDockingAllowed(true), + bAllChildrenVisible(true), #if HAVE_FEATURE_DESKTOP - bIsFullScreen( sal_False ), - bShowStatusBar( sal_True ), + bIsFullScreen( false ), + bShowStatusBar( true ), #else bIsFullScreen( sal_True ), bShowStatusBar( sal_False ), @@ -644,7 +644,7 @@ SfxWorkWindow::~SfxWorkWindow() m_xLayoutManagerListener->dispose(); } -void SfxWorkWindow::Lock_Impl( sal_Bool bLock ) +void SfxWorkWindow::Lock_Impl( bool bLock ) { if ( bLock ) m_nLock++; @@ -745,7 +745,7 @@ void SfxWorkWindow::DeleteControllers_Impl() // ObjectBars are all released at once, since they occupy a // fixed contiguous area in the array pChild aChildren.clear(); - bSorted = sal_False; + bSorted = false; nChildren = 0; } @@ -842,7 +842,7 @@ SvBorder SfxWorkWindow::Arrange_Impl() aSize = pCli->pWin->GetSizePixel(); SvBorder aTemp = aBorder; - sal_Bool bAllowHiding = sal_True; + bool bAllowHiding = true; switch ( pCli->eAlign ) { case SFX_ALIGN_HIGHESTTOP: @@ -852,7 +852,7 @@ SvBorder SfxWorkWindow::Arrange_Impl() aSize.Width() = aTmp.GetWidth(); if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW ) aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize ); - bAllowHiding = sal_False; + bAllowHiding = false; aBorder.Top() += aSize.Height(); aPos = aTmp.TopLeft(); aTmp.Top() += aSize.Height(); @@ -882,7 +882,7 @@ SvBorder SfxWorkWindow::Arrange_Impl() aSize.Height() = aTmp.GetHeight(); if ( pCli->pWin->GetType() == WINDOW_SPLITWINDOW ) aSize = ((SplitWindow *)(pCli->pWin))->CalcLayoutSizePixel( aSize ); - bAllowHiding = sal_False; + bAllowHiding = false; aBorder.Left() += aSize.Width(); aPos = aTmp.TopLeft(); aTmp.Left() += aSize.Width(); @@ -907,12 +907,12 @@ SvBorder SfxWorkWindow::Arrange_Impl() default: pCli->aSize = pCli->pWin->GetSizePixel(); - pCli->bResize = sal_False; + pCli->bResize = false; continue; } pCli->pWin->SetPosSizePixel( aPos, aSize ); - pCli->bResize = sal_False; + pCli->bResize = false; pCli->aSize = aSize; if( bAllowHiding && !RequestTopToolSpacePixel_Impl( aBorder ) ) { @@ -948,23 +948,23 @@ SvBorder SfxWorkWindow::Arrange_Impl() return IsDockingAllowed() ? aBorder : SvBorder(); } -sal_Bool SfxWorkWindow::PrepareClose_Impl() +bool SfxWorkWindow::PrepareClose_Impl() { for (sal_uInt16 n=0; n<aChildWins.size(); n++) { SfxChildWin_Impl *pCW = aChildWins[n]; SfxChildWindow *pChild = pCW->pWin; if ( pChild && !pChild->QueryClose() ) - return sal_False; + return false; } - return sal_True; + return true; } SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, - SfxChildAlignment eAlign, sal_Bool bCanGetFocus ) + SfxChildAlignment eAlign, bool bCanGetFocus ) { DBG_ASSERT( aChildren.size() < 255, "too many children" ); DBG_ASSERT( SfxChildAlignValid(eAlign), "invalid align" ); @@ -979,7 +979,7 @@ SfxChild_Impl* SfxWorkWindow::RegisterChild_Impl( Window& rWindow, pChild->bCanGetFocus = bCanGetFocus; aChildren.push_back(pChild); - bSorted = sal_False; + bSorted = false; nChildren++; return aChildren.back(); } @@ -1000,7 +1000,7 @@ void SfxWorkWindow::ReleaseChild_Impl( Window& rWindow ) if ( nPos < aChildren.size() ) { - bSorted = sal_False; + bSorted = false; nChildren--; aChildren.erase(aChildren.begin() + nPos); delete pChild; @@ -1080,7 +1080,7 @@ void SfxWorkWindow::ShowChildren_Impl() break; } - pCli->bSetFocus = sal_False; + pCli->bSetFocus = false; } else { @@ -1126,7 +1126,7 @@ void SfxWorkWindow::ResetObjectBars_Impl() { sal_uInt16 n; for ( n = 0; n < aObjBarList.size(); n++ ) - aObjBarList[n].bDestroy = sal_True; + aObjBarList[n].bDestroy = true; for ( n = 0; n < aChildWins.size(); ++n ) aChildWins[n]->nId = 0; @@ -1195,14 +1195,14 @@ bool SfxWorkWindow::KnowsObjectBar_Impl( sal_uInt16 nPos ) const -sal_Bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const +bool SfxWorkWindow::IsVisible_Impl( sal_uInt16 nMode ) const { switch( nUpdateMode ) { case SFX_VISIBILITY_STANDARD: - return sal_True; + return true; case SFX_VISIBILITY_UNVISIBLE: - return sal_False; + return false; case SFX_VISIBILITY_CLIENT: case SFX_VISIBILITY_SERVER: return !!(nMode & nUpdateMode); @@ -1279,16 +1279,16 @@ Reference< ::com::sun::star::task::XStatusIndicator > SfxWorkWindow::GetStatusIn -sal_Bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) +bool SfxWorkWindow::IsPluginMode( SfxObjectShell* pObjShell ) { if ( pObjShell && pObjShell->GetMedium() ) { SFX_ITEMSET_ARG( pObjShell->GetMedium()->GetItemSet(), pViewOnlyItem, SfxBoolItem, SID_VIEWONLY, false ); if ( pViewOnlyItem && pViewOnlyItem->GetValue() ) - return sal_True; + return true; } - return sal_False; + return false; } @@ -1337,7 +1337,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl() if ( !xLayoutManager.is() ) return; - sal_Bool bPluginMode( sal_False ); + bool bPluginMode( false ); SfxDispatcher* pDispatcher( GetBindings().GetDispatcher() ); if ( pDispatcher ) @@ -1352,7 +1352,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl() for ( n = 0; n < aObjBarList.size(); ++n ) { sal_uInt16 nId = aObjBarList[n].nId; - sal_Bool bDestroy = aObjBarList[n].bDestroy; + bool bDestroy = aObjBarList[n].bDestroy; // Determine the vaild mode for the ToolBox sal_uInt16 nTbxMode = aObjBarList[n].nMode; @@ -1404,7 +1404,7 @@ void SfxWorkWindow::UpdateObjectBars_Impl() { SfxSplitWindow *p = pSplit[n]; if (p->GetWindowCount()) - p->Lock(sal_False); + p->Lock(false); } } @@ -1425,7 +1425,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl() { SfxChildWin_Impl *pCW = aChildWins[n]; SfxChildWindow *pChildWin = pCW->pWin; - sal_Bool bCreate = sal_False; + bool bCreate = false; if ( pCW->nId && !pCW->bDisabled && (pCW->aInfo.nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE || IsVisible_Impl( pCW->nVisibility ) ) ) { // In the context is an appropriate ChildWindow allowed; @@ -1449,7 +1449,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl() bCreate = ( eAlign == SFX_ALIGN_NOALIGNMENT ); } else - bCreate = sal_True; + bCreate = true; if ( bCreate ) bCreate = AllowChildWindowCreation_Impl( *pCW ); @@ -1457,7 +1457,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl() // Currently, no window here, but it is enabled; windows // Create window and if possible theContext if ( bCreate ) - CreateChildWin_Impl( pCW, sal_False ); + CreateChildWin_Impl( pCW, false ); if ( !bAllChildrenVisible ) { @@ -1512,7 +1512,7 @@ void SfxWorkWindow::UpdateChildWindows_Impl() } } -void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, sal_Bool bSetFocus ) +void SfxWorkWindow::CreateChildWin_Impl( SfxChildWin_Impl *pCW, bool bSetFocus ) { pCW->aInfo.bVisible = true; @@ -1646,7 +1646,7 @@ void SfxWorkWindow::UpdateStatusBar_Impl() } } -void SfxWorkWindow::MakeVisible_Impl( sal_Bool bVis ) +void SfxWorkWindow::MakeVisible_Impl( bool bVis ) { if ( bVis ) nOrigMode = SFX_VISIBILITY_STANDARD; @@ -1657,13 +1657,13 @@ void SfxWorkWindow::MakeVisible_Impl( sal_Bool bVis ) nUpdateMode = nOrigMode; } -sal_Bool SfxWorkWindow::IsVisible_Impl() +bool SfxWorkWindow::IsVisible_Impl() { return nOrigMode != SFX_VISIBILITY_UNVISIBLE; } -void SfxWorkWindow::HidePopups_Impl(sal_Bool bHide, sal_Bool bParent, sal_uInt16 nId ) +void SfxWorkWindow::HidePopups_Impl(bool bHide, bool bParent, sal_uInt16 nId ) { for ( sal_uInt16 n = 0; n < aChildWins.size(); ++n ) { @@ -1889,7 +1889,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, if ( eChild == SFX_CHILDWIN_DOCKINGWINDOW || eAlign == SFX_ALIGN_NOALIGNMENT) { // configuration inside the SplitWindow, no change for the SplitWindows' configuration - pCli->bResize = sal_True; + pCli->bResize = true; pCli->aSize = pDockWin->GetSizePixel(); } } @@ -1898,7 +1898,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, { if( pCli->eAlign != eAlign ) { - bSorted = sal_False; + bSorted = false; pCli->eAlign = eAlign; } @@ -1923,7 +1923,7 @@ void SfxWorkWindow::ConfigChild_Impl(SfxChildIdentifier eChild, -void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, sal_Bool bEnabled, sal_uInt16 nMode ) +void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, bool bEnabled, sal_uInt16 nMode ) { sal_uInt16 nInter = (sal_uInt16) ( lId >> 16 ); sal_uInt16 nId = (sal_uInt16) ( lId & 0xFFFF ); @@ -1984,7 +1984,7 @@ void SfxWorkWindow::SetChildWindowVisible_Impl( sal_uInt32 lId, sal_Bool bEnable // The on/off status of a ChildWindow is switched -void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus) +void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, bool bSetFocus) { sal_uInt16 nCount = aChildWins.size(); sal_uInt16 n; @@ -2014,15 +2014,15 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus) { if ( pChild->QueryClose() ) { - pCW->bCreate = sal_False; + pCW->bCreate = false; if ( pChild->IsHideAtToggle() ) { - ShowChildWindow_Impl( nId, sal_False, bSetFocus ); + ShowChildWindow_Impl( nId, false, bSetFocus ); } else { // The Window should be switched off - pChild->SetVisible_Impl( sal_False ); + pChild->SetVisible_Impl( false ); RemoveChildWin_Impl( pCW ); } } @@ -2030,7 +2030,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus) else { // no actual Window exists, yet => just remember the "switched off" state - pCW->bCreate = sal_False; + pCW->bCreate = false; } } else @@ -2040,7 +2040,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus) { if ( pChild ) { - ShowChildWindow_Impl( nId, sal_True, bSetFocus ); + ShowChildWindow_Impl( nId, true, bSetFocus ); } else { @@ -2048,7 +2048,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus) CreateChildWin_Impl( pCW, bSetFocus ); if ( !pCW->pWin ) // no success - pCW->bCreate = sal_False; + pCW->bCreate = false; } } } @@ -2095,7 +2095,7 @@ void SfxWorkWindow::ToggleChildWindow_Impl(sal_uInt16 nId, sal_Bool bSetFocus) -sal_Bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId) +bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId) { sal_uInt16 nCount = aChildWins.size(); sal_uInt16 n; @@ -2113,10 +2113,10 @@ sal_Bool SfxWorkWindow::HasChildWindow_Impl(sal_uInt16 nId) if ( pParent ) return pParent->HasChildWindow_Impl( nId ); - return sal_False; + return false; } -sal_Bool SfxWorkWindow::IsFloating( sal_uInt16 nId ) +bool SfxWorkWindow::IsFloating( sal_uInt16 nId ) { SfxChildWin_Impl *pCW=NULL; SfxWorkWindow *pWork = pParent; @@ -2155,7 +2155,7 @@ sal_Bool SfxWorkWindow::IsFloating( sal_uInt16 nId ) // If new, then initialize, add this here depending on the flag or // the Parent pCW = new SfxChildWin_Impl( nId ); - pCW->bEnable = sal_False; + pCW->bEnable = false; pCW->nId = 0; pCW->nVisibility = 0; InitializeChild_Impl( pCW ); @@ -2169,12 +2169,12 @@ sal_Bool SfxWorkWindow::IsFloating( sal_uInt16 nId ) if ( pCW->aInfo.GetExtraData_Impl( &eAlign ) ) return( eAlign == SFX_ALIGN_NOALIGNMENT ); else - return sal_True; + return true; } -sal_Bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) +bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) { SfxChildWin_Impl *pCW=0; sal_uInt16 nCount = aChildWins.size(); @@ -2189,18 +2189,18 @@ sal_Bool SfxWorkWindow::KnowsChildWindow_Impl(sal_uInt16 nId) if (n<nCount) { if ( !(pCW->aInfo.nFlags & SFX_CHILDWIN_ALWAYSAVAILABLE) && !IsVisible_Impl( pCW->nVisibility ) ) - return sal_False; + return false; return pCW->bEnable; } else if ( pParent ) return pParent->KnowsChildWindow_Impl( nId ); else - return sal_False; + return false; } -void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, sal_Bool bOn, sal_Bool bSetFocus) +void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, bool bOn, bool bSetFocus) { SfxChildWin_Impl *pCW=NULL; SfxWorkWindow *pWork = pParent; @@ -2252,7 +2252,7 @@ void SfxWorkWindow::SetChildWindow_Impl(sal_uInt16 nId, sal_Bool bOn, sal_Bool b -void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_Bool bSetFocus) +void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, bool bVisible, bool bSetFocus) { sal_uInt16 nCount = aChildWins.size(); SfxChildWin_Impl* pCW=0; @@ -2298,7 +2298,7 @@ void SfxWorkWindow::ShowChildWindow_Impl(sal_uInt16 nId, sal_Bool bVisible, sal_ } else if ( bVisible ) { - SetChildWindow_Impl( nId, sal_True, bSetFocus ); + SetChildWindow_Impl( nId, true, bSetFocus ); pChildWin = pCW->pWin; } @@ -2362,7 +2362,7 @@ void SfxWorkWindow::ResetChildWindows_Impl() for ( sal_uInt16 n = 0; n < aChildWins.size(); ++n ) { aChildWins[n]->nId = 0; - aChildWins[n]->bEnable = sal_False; + aChildWins[n]->bEnable = false; } } @@ -2388,14 +2388,14 @@ Rectangle SfxFrameWorkWin_Impl::GetTopRect_Impl() // Virtual method to find out if there is room for a ChildWindow in the // client area of the parent. -sal_Bool SfxWorkWindow::RequestTopToolSpacePixel_Impl( SvBorder aBorder ) +bool SfxWorkWindow::RequestTopToolSpacePixel_Impl( SvBorder aBorder ) { if ( !IsDockingAllowed() || aClientArea.GetWidth() < aBorder.Left() + aBorder.Right() || aClientArea.GetHeight() < aBorder.Top() + aBorder.Bottom() ) - return sal_False; + return false; else - return sal_True;; + return true;; } void SfxWorkWindow::SaveStatus_Impl(SfxChildWindow *pChild, const SfxChildWinInfo &rInfo) @@ -2509,7 +2509,7 @@ SfxSplitWindow* SfxWorkWindow::GetSplitWindow_Impl( SfxChildAlignment eAlign ) } } -void SfxWorkWindow::MakeChildrenVisible_Impl( sal_Bool bVis ) +void SfxWorkWindow::MakeChildrenVisible_Impl( bool bVis ) { if ( pParent ) pParent->MakeChildrenVisible_Impl( bVis ); @@ -2538,14 +2538,14 @@ void SfxWorkWindow::MakeChildrenVisible_Impl( sal_Bool bVis ) } } -sal_Bool SfxWorkWindow::IsAutoHideMode( const SfxSplitWindow *pSplitWin ) +bool SfxWorkWindow::IsAutoHideMode( const SfxSplitWindow *pSplitWin ) { for ( sal_uInt16 n=0; n<SFX_SPLITWINDOWS_MAX; n++ ) { - if ( pSplit[n] != pSplitWin && pSplit[n]->IsAutoHide( sal_True ) ) - return sal_True; + if ( pSplit[n] != pSplitWin && pSplit[n]->IsAutoHide( true ) ) + return true; } - return sal_False; + return false; } @@ -2584,7 +2584,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin ) // Only the abandoned window may be invisible, because perhaps its // size is just beeing calculated before it is displayed. SfxSplitWindow* pSplitWin = pSplit[n]; - sal_Bool bDummyWindow = !pSplitWin->IsFadeIn(); + bool bDummyWindow = !pSplitWin->IsFadeIn(); Window *pDummy = pSplitWin->GetSplitWindow(); Window *pWin = bDummyWindow ? pDummy : pSplitWin; if ( (pSplitWin->IsPinned() && !bDummyWindow) || (!pWin->IsVisible() && pActSplitWin != pSplitWin) ) @@ -2696,7 +2696,7 @@ void SfxWorkWindow::ArrangeAutoHideWindows( SfxSplitWindow *pActSplitWin ) } } -Rectangle SfxWorkWindow::GetFreeArea( sal_Bool bAutoHide ) const +Rectangle SfxWorkWindow::GetFreeArea( bool bAutoHide ) const { if ( bAutoHide ) { @@ -2735,7 +2735,7 @@ void SfxWorkWindow::SetActiveChild_Impl( Window *pChild ) pActiveChild = pChild; } -sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) +bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) { // Sort all children under list std::vector<sal_uInt16> aList; @@ -2753,7 +2753,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) } if ( aList.empty() ) - return sal_False; + return false; sal_uInt16 nTopValue = ChildTravelValue( SFX_ALIGN_LOWESTTOP ); for ( sal_uInt16 i=0; i<aList.size(); i++ ) @@ -2792,7 +2792,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) if ( pAct->pWin == p ) { if( p->ActivateNextChild_Impl( bForward ) ) - return sal_True; + return true; break; } } @@ -2805,7 +2805,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) n = n-1; if ( n == 0 || n == aList.size()-1 ) - return sal_False; + return false; } for( ;; ) @@ -2824,7 +2824,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) p->SetActiveWindow_Impl( NULL ); pNext = NULL; if( p->ActivateNextChild_Impl( bForward ) ) - return sal_True; + return true; break; } } @@ -2833,7 +2833,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) { pNext->pWin->GrabFocus(); pActiveChild = pNext->pWin; - return sal_True; + return true; } } @@ -2846,7 +2846,7 @@ sal_Bool SfxWorkWindow::ActivateNextChild_Impl( sal_Bool bForward ) break; } - return sal_False; + return false; } void SfxWorkWindow::DataChanged_Impl( const DataChangedEvent& ) diff --git a/sfx2/source/appl/xpackcreator.cxx b/sfx2/source/appl/xpackcreator.cxx index e22cf44e6942..0274e5c09cbb 100644 --- a/sfx2/source/appl/xpackcreator.cxx +++ b/sfx2/source/appl/xpackcreator.cxx @@ -64,7 +64,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde if ( !xTargetStream.is() ) throw io::IOException(); // TODO/LATER - sal_Bool bSuccess = sal_False; + bool bSuccess = false; ::ucbhelper::Content aContent; if( ::ucbhelper::Content::create( aFolderUrl, xComEnv, comphelper::getProcessComponentContext(), aContent ) ) { @@ -111,7 +111,7 @@ void SAL_CALL OPackageStructureCreator::convertToPackage( const OUString& aFolde if ( pTempStream->GetError() ) throw io::IOException(); - bSuccess = sal_True; + bSuccess = true; } } } diff --git a/sfx2/source/bastyp/bitset.cxx b/sfx2/source/bastyp/bitset.cxx index 45f6894d0738..1cc36a78cdf2 100644 --- a/sfx2/source/bastyp/bitset.cxx +++ b/sfx2/source/bastyp/bitset.cxx @@ -256,13 +256,13 @@ BitSet& BitSet::operator|=( sal_uInt16 nBit ) // determines if the bit is set (may be the only one) -sal_Bool BitSet::Contains( sal_uInt16 nBit ) const +bool BitSet::Contains( sal_uInt16 nBit ) const { sal_uInt16 nBlock = nBit / 32; sal_uIntPtr nBitVal = 1L << (nBit % 32); if ( nBlock >= nBlocks ) - return sal_False; + return false; return ( nBitVal & *(pBitmap+nBlock) ) == nBitVal; } @@ -270,17 +270,17 @@ sal_Bool BitSet::Contains( sal_uInt16 nBit ) const // determines if the bitsets are equal -sal_Bool BitSet::operator==( const BitSet& rSet ) const +bool BitSet::operator==( const BitSet& rSet ) const { if ( nBlocks != rSet.nBlocks ) - return sal_False; + return false; sal_uInt16 nBlock = nBlocks; while ( nBlock-- > 0 ) if ( *(pBitmap+nBlock) != *(rSet.pBitmap+nBlock) ) - return sal_False; + return false; - return sal_True; + return true; } diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx index 7f810df8c85d..ce63b91d5e8d 100644 --- a/sfx2/source/bastyp/fltfnc.cxx +++ b/sfx2/source/bastyp/fltfnc.cxx @@ -116,7 +116,7 @@ namespace } static SfxFilterList_Impl* pFilterArr = 0; -static sal_Bool bFirstRead = sal_True; +static bool bFirstRead = true; static void CreateFilterArr() { @@ -565,7 +565,7 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** const SfxFilter* pFilter = pOldFilter; - sal_Bool bPreview = rMedium.IsPreview_Impl(); + bool bPreview = rMedium.IsPreview_Impl(); SFX_ITEMSET_ARG(rMedium.GetItemSet(), pReferer, SfxStringItem, SID_REFERER, false); if ( bPreview && rMedium.IsRemote() && ( !pReferer || !pReferer->GetValue().match("private:searchfolder:") ) ) return ERRCODE_ABORT; @@ -602,14 +602,14 @@ sal_uInt32 SfxFilterMatcher::DetectFilter( SfxMedium& rMedium, const SfxFilter** } } - sal_Bool bHidden = bPreview; + bool bHidden = bPreview; SFX_ITEMSET_ARG( rMedium.GetItemSet(), pFlags, SfxStringItem, SID_OPTIONS, false); if ( !bHidden && pFlags ) { OUString aFlags( pFlags->GetValue() ); aFlags = aFlags.toAsciiUpperCase(); if( -1 != aFlags.indexOf( 'H' ) ) - bHidden = sal_True; + bHidden = true; } *ppFilter = pFilter; @@ -1130,7 +1130,7 @@ void SfxFilterContainer::ReadFilters_Impl( bool bUpdate ) if ( !pFilterArr ) CreateFilterArr(); - bFirstRead = sal_False; + bFirstRead = false; SfxFilterList_Impl& rList = *pFilterArr; try diff --git a/sfx2/source/bastyp/frmhtml.cxx b/sfx2/source/bastyp/frmhtml.cxx index f9541d4006f5..c667f1948492 100644 --- a/sfx2/source/bastyp/frmhtml.cxx +++ b/sfx2/source/bastyp/frmhtml.cxx @@ -57,7 +57,7 @@ void SfxFrameHTMLParser::ParseFrameOptions( // Netscape does however not allow for a direct // seting to 0, while IE4.0 does // We will not mimic that bug ! - sal_Bool bMarginWidth = sal_False, bMarginHeight = sal_False; + bool bMarginWidth = false, bMarginHeight = false; for (size_t i = 0, n = rOptions.size(); i < n; ++i) { @@ -84,14 +84,14 @@ void SfxFrameHTMLParser::ParseFrameOptions( if( !bMarginHeight ) aMargin.Height() = 0; - bMarginWidth = sal_True; + bMarginWidth = true; break; case HTML_O_MARGINHEIGHT: aMargin.Height() = aOption.GetNumber(); if( !bMarginWidth ) aMargin.Width() = 0; - bMarginHeight = sal_True; + bMarginHeight = true; break; case HTML_O_SCROLLING: pFrame->SetScrollingMode( @@ -101,10 +101,10 @@ void SfxFrameHTMLParser::ParseFrameOptions( case HTML_O_FRAMEBORDER: { OUString aStr = aOption.GetString(); - sal_Bool bBorder = sal_True; + bool bBorder = true; if ( aStr.equalsIgnoreAsciiCase("NO") || aStr.equalsIgnoreAsciiCase("0") ) - bBorder = sal_False; + bBorder = false; pFrame->SetFrameBorder( bBorder ); break; } @@ -115,17 +115,17 @@ void SfxFrameHTMLParser::ParseFrameOptions( if (aOption.GetTokenString().equalsIgnoreAsciiCase(HTML_O_READONLY)) { OUString aStr = aOption.GetString(); - sal_Bool bReadonly = sal_True; + bool bReadonly = true; if ( aStr.equalsIgnoreAsciiCase("FALSE") ) - bReadonly = sal_False; + bReadonly = false; pFrame->SetReadOnly( bReadonly ); } else if (aOption.GetTokenString().equalsIgnoreAsciiCase(HTML_O_EDIT)) { OUString aStr = aOption.GetString(); - sal_Bool bEdit = sal_True; + bool bEdit = true; if ( aStr.equalsIgnoreAsciiCase("FALSE") ) - bEdit = sal_False; + bEdit = false; pFrame->SetEditable( bEdit ); } diff --git a/sfx2/source/bastyp/frmhtmlw.cxx b/sfx2/source/bastyp/frmhtmlw.cxx index fd51807079ca..1ef646d1322c 100644 --- a/sfx2/source/bastyp/frmhtmlw.cxx +++ b/sfx2/source/bastyp/frmhtmlw.cxx @@ -287,7 +287,7 @@ void SfxFrameHTMLWriter::Out_FrameDescriptor( .append('=').append(nVal); } - sal_Bool bVal = sal_True; + bool bVal = true; aAny = xSet->getPropertyValue("FrameIsAutoScroll"); if ( (aAny >>= bVal) && !bVal ) { diff --git a/sfx2/source/bastyp/helper.cxx b/sfx2/source/bastyp/helper.cxx index 00f98dac008e..e00e6cb266d5 100644 --- a/sfx2/source/bastyp/helper.cxx +++ b/sfx2/source/bastyp/helper.cxx @@ -164,7 +164,7 @@ std::vector< OUString > SfxContentHelper::GetHelpTreeViewContents( const OUStrin while ( xResultSet->next() ) { OUString aTitle( xRow->getString(1) ); - sal_Bool bFolder = xRow->getBoolean(2); + bool bFolder = xRow->getBoolean(2); OUString aRow = aTitle; aRow += "\t"; aRow += xContentAccess->queryContentIdentifierString(); diff --git a/sfx2/source/bastyp/sfxhtml.cxx b/sfx2/source/bastyp/sfxhtml.cxx index 174456ce4727..6f1c82526a44 100644 --- a/sfx2/source/bastyp/sfxhtml.cxx +++ b/sfx2/source/bastyp/sfxhtml.cxx @@ -119,7 +119,7 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase sal_uInt16 nShape = IMAP_OBJ_RECTANGLE; std::vector<sal_uInt32> aCoords; OUString aName, aHRef, aAlt, aTarget, sEmpty; - sal_Bool bNoHRef = sal_False; + bool bNoHRef = false; SvxMacroTableDtor aMacroTbl; for (size_t i = rOptions.size(); i; ) @@ -142,7 +142,7 @@ bool SfxHTMLParser::ParseAreaOptions(ImageMap * pImageMap, const OUString& rBase aHRef = INetURLObject::GetAbsURL( rBaseURL, rOption.GetString() ); break; case HTML_O_NOHREF: - bNoHRef = sal_True; + bNoHRef = true; break; case HTML_O_ALT: aAlt = rOption.GetString(); @@ -181,7 +181,7 @@ IMAPOBJ_SETEVENT: if( bNoHRef ) aHRef = ""; - sal_Bool bNewArea = sal_True; + bool bNewArea = true; switch( nShape ) { case IMAP_OBJ_RECTANGLE: @@ -222,7 +222,7 @@ IMAPOBJ_SETEVENT: } break; default: - bNewArea = sal_False; + bNewArea = false; } return bNewArea; @@ -270,7 +270,7 @@ void SfxHTMLParser::GetScriptType_Impl( SvKeyValueIterator *pHTTPHeader ) if( pHTTPHeader ) { SvKeyValue aKV; - for( sal_Bool bCont = pHTTPHeader->GetFirst( aKV ); bCont; + for( bool bCont = pHTTPHeader->GetFirst( aKV ); bCont; bCont = pHTTPHeader->GetNext( aKV ) ) { if( aKV.GetKey().equalsIgnoreAsciiCase( diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index 73be886eb76a..d42be952f725 100644 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -132,15 +132,15 @@ public: sal_uInt16 nCachedFunc2; // index for the second last called sal_uInt16 nMsgPos; // Message-Position relative the one to be updated SfxPopupAction ePopupAction; // Checked in DeleteFloatinWindow() - sal_Bool bContextChanged; - sal_Bool bMsgDirty; // Has a MessageServer been invalidated? - sal_Bool bAllMsgDirty; // Has a MessageServer been invalidated? - sal_Bool bAllDirty; // After InvalidateAll - sal_Bool bCtrlReleased; // while EnterRegistrations + bool bContextChanged; + bool bMsgDirty; // Has a MessageServer been invalidated? + bool bAllMsgDirty; // Has a MessageServer been invalidated? + bool bAllDirty; // After InvalidateAll + bool bCtrlReleased; // while EnterRegistrations AutoTimer aTimer; // for volatile Slots - sal_Bool bInUpdate; // for Assertions - sal_Bool bInNextJob; // for Assertions - sal_Bool bFirstRound; // First round in Update + bool bInUpdate; // for Assertions + bool bInNextJob; // for Assertions + bool bFirstRound; // First round in Update sal_uInt16 nFirstShell; // Shell, the first round is preferred sal_uInt16 nOwnRegLevel; // Counts the real Locks, exept those of the Super Bindings InvalidateSlotMap m_aInvalidateSlots; // store slots which are invalidated while in update @@ -203,17 +203,17 @@ SfxBindings::SfxBindings() nRegLevel(1) // first becomes 0, when the Dispatcher is set { pImp->nMsgPos = 0; - pImp->bAllMsgDirty = sal_True; - pImp->bContextChanged = sal_False; - pImp->bMsgDirty = sal_True; - pImp->bAllDirty = sal_True; + pImp->bAllMsgDirty = true; + pImp->bContextChanged = false; + pImp->bMsgDirty = true; + pImp->bAllDirty = true; pImp->ePopupAction = SFX_POPUP_DELETE; pImp->nCachedFunc1 = 0; pImp->nCachedFunc2 = 0; - pImp->bCtrlReleased = sal_False; - pImp->bFirstRound = sal_False; - pImp->bInNextJob = sal_False; - pImp->bInUpdate = sal_False; + pImp->bCtrlReleased = false; + pImp->bFirstRound = false; + pImp->bInNextJob = false; + pImp->bInUpdate = false; pImp->pSubBindings = NULL; pImp->pSuperBindings = NULL; pImp->pWorkWin = NULL; @@ -343,7 +343,7 @@ void SfxBindings::HidePopups( bool bHide ) // Hide SfxChildWindows DBG_ASSERT( pDispatcher, "HidePopups not allowed without dispatcher" ); if ( pImp->pWorkWin ) - pImp->pWorkWin->HidePopups_Impl( bHide, sal_True ); + pImp->pWorkWin->HidePopups_Impl( bHide, true ); } void SfxBindings::HidePopupCtrls_Impl( bool bHide ) @@ -373,7 +373,7 @@ void SfxBindings::Update_Impl { if( pCache->GetDispatch().is() && pCache->GetItemLink() ) { - pCache->SetCachedState(sal_True); + pCache->SetCachedState(true); if ( !pCache->GetInternalController() ) return; } @@ -387,7 +387,7 @@ void SfxBindings::Update_Impl const SfxSlotServer* pMsgServer = 0; SfxFoundCacheArr_Impl aFound; SfxItemSet *pSet = CreateSet_Impl( pCache, pRealSlot, &pMsgServer, aFound ); - sal_Bool bUpdated = sal_False; + bool bUpdated = false; if ( pSet ) { // Query Status @@ -406,7 +406,7 @@ void SfxBindings::Update_Impl pItem = &pSet->Get(nWhich); UpdateControllers_Impl( pInterface, aFound[nPos], pItem, eState ); } - bUpdated = sal_True; + bUpdated = true; } delete pSet; @@ -462,7 +462,7 @@ void SfxBindings::Update SfxStateCache* pCache = GetStateCache( nId ); if ( pCache ) { - pImp->bInUpdate = sal_True; + pImp->bInUpdate = true; if ( pImp->bMsgDirty ) { UpdateSlotServer_Impl(); @@ -471,10 +471,10 @@ void SfxBindings::Update if (pCache) { - sal_Bool bInternalUpdate = sal_True; + bool bInternalUpdate = true; if( pCache->GetDispatch().is() && pCache->GetItemLink() ) { - pCache->SetCachedState(sal_True); + pCache->SetCachedState(true); bInternalUpdate = ( pCache->GetInternalController() != 0 ); } @@ -486,14 +486,14 @@ void SfxBindings::Update ( !pMsgServer || !pMsgServer->GetSlot()->IsMode(SFX_SLOT_VOLATILE) ) ) { - pImp->bInUpdate = sal_False; + pImp->bInUpdate = false; InvalidateSlotsInMap_Impl(); return; } if (!pMsgServer) { pCache->SetState(SFX_ITEM_DISABLED, 0); - pImp->bInUpdate = sal_False; + pImp->bInUpdate = false; InvalidateSlotsInMap_Impl(); return; } @@ -501,10 +501,10 @@ void SfxBindings::Update Update_Impl(pCache); } - pImp->bAllDirty = sal_False; + pImp->bAllDirty = false; } - pImp->bInUpdate = sal_False; + pImp->bInUpdate = false; InvalidateSlotsInMap_Impl(); } } @@ -523,12 +523,12 @@ void SfxBindings::Update() if ( nRegLevel ) return; - pImp->bInUpdate = sal_True; + pImp->bInUpdate = true; pDispatcher->Flush(); pDispatcher->Update_Impl(); while ( !NextJob_Impl(0) ) ; // loop - pImp->bInUpdate = sal_False; + pImp->bInUpdate = false; InvalidateSlotsInMap_Impl(); } } @@ -568,7 +568,7 @@ void SfxBindings::SetState { // Update status if ( !pCache->IsControllerDirty() ) - pCache->Invalidate(sal_False); + pCache->Invalidate(false); pCache->SetState( SFX_ITEM_AVAILABLE, pItem ); //! Not implemented: Updates from EnumSlots via master slots @@ -602,7 +602,7 @@ void SfxBindings::SetState { // Update Status if ( !pCache->IsControllerDirty() ) - pCache->Invalidate(sal_False); + pCache->Invalidate(false); pCache->SetState( SFX_ITEM_AVAILABLE, &rItem ); //! Not implemented: Updates from EnumSlots via master slots @@ -676,7 +676,7 @@ void SfxBindings::InvalidateAll pImp->bAllMsgDirty = pImp->bAllMsgDirty || bWithMsg; pImp->bMsgDirty = pImp->bMsgDirty || pImp->bAllMsgDirty || bWithMsg; - pImp->bAllDirty = sal_True; + pImp->bAllDirty = true; for ( sal_uInt16 n = 0; n < pImp->pCaches->size(); ++n ) (*pImp->pCaches)[n]->Invalidate(bWithMsg); @@ -724,7 +724,7 @@ void SfxBindings::Invalidate // If SID is ever bound, then invalidate the cache SfxStateCache *pCache = (*pImp->pCaches)[n]; if ( pCache->GetId() == *pIds ) - pCache->Invalidate(sal_False); + pCache->Invalidate(false); // Next SID if ( !*++pIds ) @@ -787,7 +787,7 @@ void SfxBindings::InvalidateShell const SfxSlotServer *pMsgServer = pCache->GetSlotServer(*pDispatcher, pImp->xProv); if ( pMsgServer && pMsgServer->GetShellLevel() == nLevel ) - pCache->Invalidate(sal_False); + pCache->Invalidate(false); } pImp->nMsgPos = 0; if ( !nRegLevel ) @@ -795,7 +795,7 @@ void SfxBindings::InvalidateShell pImp->aTimer.Stop(); pImp->aTimer.SetTimeout(TIMEOUT_FIRST); pImp->aTimer.Start(); - pImp->bFirstRound = sal_True; + pImp->bFirstRound = true; pImp->nFirstShell = nLevel; } } @@ -825,7 +825,7 @@ void SfxBindings::Invalidate SfxStateCache* pCache = GetStateCache(nId); if ( pCache ) { - pCache->Invalidate(sal_False); + pCache->Invalidate(false); pImp->nMsgPos = std::min(GetSlotPos(nId), pImp->nMsgPos); if ( !nRegLevel ) { @@ -915,7 +915,7 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt ) sal_uInt16 nLow = nStartSearchAt; sal_uInt16 nMid = 0; sal_uInt16 nHigh = 0; - sal_Bool bFound = sal_False; + bool bFound = false; nHigh = pImp->pCaches->size() - 1; while ( !bFound && nLow <= nHigh ) { @@ -933,7 +933,7 @@ sal_uInt16 SfxBindings::GetSlotPos( sal_uInt16 nId, sal_uInt16 nStartSearchAt ) break; } else - bFound = sal_True; + bFound = true; } sal_uInt16 nPos = bFound ? nMid : nLow; DBG_ASSERT( nPos <= pImp->pCaches->size(), "" ); @@ -978,7 +978,7 @@ void SfxBindings::Register_Impl( SfxControllerItem& rItem, bool bInternal ) DBG_ASSERT( (nPos == pImp->pCaches->size()-1) || (*pImp->pCaches)[nPos]->GetId() < (*pImp->pCaches)[nPos+1]->GetId(), "" ); - pImp->bMsgDirty = sal_True; + pImp->bMsgDirty = true; } // enqueue the new binding @@ -1032,7 +1032,7 @@ void SfxBindings::Release( SfxControllerItem& rItem ) // was this the last controller? if ( pCache->GetItemLink() == 0 && !pCache->GetInternalController() ) { - pImp->bCtrlReleased = sal_True; + pImp->bCtrlReleased = true; } } @@ -1202,7 +1202,7 @@ void SfxBindings::Execute_Impl( SfxRequest& aReq, const SfxSlot* pSlot, SfxShell if ( pOldItem->ISA(SfxBoolItem) ) { // we can toggle Bools - sal_Bool bOldValue = ((const SfxBoolItem *)pOldItem)->GetValue(); + bool bOldValue = ((const SfxBoolItem *)pOldItem)->GetValue(); SfxBoolItem *pNewItem = (SfxBoolItem*) (pOldItem->Clone()); pNewItem->SetValue( !bOldValue ); aReq.AppendItem( *pNewItem ); @@ -1273,10 +1273,10 @@ void SfxBindings::UpdateSlotServer_Impl() { ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > xFrame ( pDispatcher->GetFrame()->GetFrame().GetFrameInterface(), UNO_QUERY ); - pImp->bContextChanged = sal_False; + pImp->bContextChanged = false; } else - pImp->bContextChanged = sal_True; + pImp->bContextChanged = true; } for (size_t i = 0, nCount = pImp->pCaches->size(); i < nCount; ++i) @@ -1285,7 +1285,7 @@ void SfxBindings::UpdateSlotServer_Impl() //GetSlotServer can modify pImp->pCaches pCache->GetSlotServer(*pDispatcher, pImp->xProv); } - pImp->bMsgDirty = pImp->bAllMsgDirty = sal_False; + pImp->bMsgDirty = pImp->bAllMsgDirty = false; Broadcast( SfxSimpleHint(SFX_HINT_DOCCHANGED) ); } @@ -1495,7 +1495,7 @@ void SfxBindings::UpdateControllers_Impl SfxStateCache *pEnumCache = GetStateCache( pSlave->GetSlotId() ); if ( pEnumCache ) { - pEnumCache->Invalidate(sal_False); + pEnumCache->Invalidate(false); // HACK(CONTROL/SELECT Kram) ??? if ( eState == SFX_ITEM_DONTCARE && pFound->nWhichId == 10144 ) @@ -1578,23 +1578,23 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) return sal_False; } - pImp->bAllDirty = sal_False; + pImp->bAllDirty = false; pImp->aTimer.SetTimeout(TIMEOUT_UPDATING); // at least 10 loops and further if more jobs are available but no input bool bPreEmptive = pTimer && !pSfxApp->Get_Impl()->nInReschedule; sal_uInt16 nLoops = 10; - pImp->bInNextJob = sal_True; + pImp->bInNextJob = true; const sal_uInt16 nCount = pImp->pCaches->size(); while ( pImp->nMsgPos < nCount ) { // iterate through the bound functions - sal_Bool bJobDone = sal_False; + bool bJobDone = false; while ( !bJobDone ) { SfxStateCache* pCache = (*pImp->pCaches)[pImp->nMsgPos]; DBG_ASSERT( pCache, "invalid SfxStateCache-position in job queue" ); - sal_Bool bWasDirty = pCache->IsControllerDirty(); + bool bWasDirty = pCache->IsControllerDirty(); if ( bWasDirty ) { Update_Impl( pCache ); @@ -1612,14 +1612,14 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) // Update of the preferred shell has been done, now may // also the others shells be updated - bJobDone = sal_False; - pImp->bFirstRound = sal_False; + bJobDone = false; + pImp->bFirstRound = false; pImp->nMsgPos = 0; } if ( bWasDirty && !bJobDone && bPreEmptive && (--nLoops == 0) ) { - pImp->bInNextJob = sal_False; + pImp->bInNextJob = false; return sal_False; } } @@ -1635,7 +1635,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) const SfxSlotServer *pSlotServer = pCache->GetSlotServer(*pDispatcher, pImp->xProv); if ( pSlotServer && pSlotServer->GetSlot()->IsMode(SFX_SLOT_VOLATILE) ) { - pCache->Invalidate(sal_False); + pCache->Invalidate(false); bVolatileSlotsPresent = true; } } @@ -1646,7 +1646,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) pImp->aTimer.Stop(); // Update round is finished - pImp->bInNextJob = sal_False; + pImp->bInNextJob = false; Broadcast(SfxSimpleHint(SFX_HINT_UPDATEDONE)); return sal_True; #ifdef DBG_UTIL @@ -1654,7 +1654,7 @@ IMPL_LINK( SfxBindings, NextJob_Impl, Timer *, pTimer ) catch (...) { OSL_FAIL("C++ exception caught!"); - pImp->bInNextJob = sal_False; + pImp->bInNextJob = false; } return sal_False; @@ -1697,7 +1697,7 @@ sal_uInt16 SfxBindings::EnterRegistrations(const char *pFile, int nLine) pImp->nCachedFunc2 = 0; // Mark if the all of the Caches have dissapered. - pImp->bCtrlReleased = sal_False; + pImp->bCtrlReleased = false; } return nRegLevel; @@ -1729,7 +1729,7 @@ void SfxBindings::LeaveRegistrations( sal_uInt16 nLevel, const char *pFile, int { if ( pImp->bContextChanged ) { - pImp->bContextChanged = sal_False; + pImp->bContextChanged = false; } SfxViewFrame* pFrame = pDispatcher->GetFrame(); @@ -1900,12 +1900,12 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) if ( !pDisp ) { - sal_Bool bDeleteCache = sal_False; + bool bDeleteCache = false; if ( !pCache ) { pCache = new SfxStateCache( nSlot ); pCache->GetSlotServer( *GetDispatcher_Impl(), pImp->xProv ); - bDeleteCache = sal_True; + bDeleteCache = true; } SfxItemState eState = SFX_ITEM_SET; @@ -1924,7 +1924,7 @@ SfxItemState SfxBindings::QueryState( sal_uInt16 nSlot, SfxPoolItem* &rpState ) if ( pType == ::getBooleanCppuType() ) { - sal_Bool bTemp = false; + bool bTemp = false; aAny >>= bTemp ; pItem = new SfxBoolItem( nSlot, bTemp ); } @@ -2062,7 +2062,7 @@ void SfxBindings::InvalidateUnoControllers_Impl() bool SfxBindings::IsInUpdate() const { - sal_Bool bInUpdate = pImp->bInUpdate; + bool bInUpdate = pImp->bInUpdate; if ( !bInUpdate && pImp->pSubBindings ) bInUpdate = pImp->pSubBindings->IsInUpdate(); return bInUpdate; @@ -2096,7 +2096,7 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XFrame > SfxBin void SfxBindings::SetDispatchProvider_Impl( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > & rProv ) { - sal_Bool bInvalidate = ( rProv != pImp->xProv ); + bool bInvalidate = ( rProv != pImp->xProv ); if ( bInvalidate ) { pImp->xProv = rProv; diff --git a/sfx2/source/control/ctrlitem.cxx b/sfx2/source/control/ctrlitem.cxx index 53167f61502b..067c938259bf 100644 --- a/sfx2/source/control/ctrlitem.cxx +++ b/sfx2/source/control/ctrlitem.cxx @@ -366,7 +366,7 @@ SfxMapUnit SfxControllerItem::GetCoreMetric() const // invalidate slot and its message|slot server as 'global' information // about the validated message|slot server is not made available - pCache->Invalidate( sal_True ); + pCache->Invalidate( true ); return rPool.GetMetric( nWhich ); } diff --git a/sfx2/source/control/dispatch.cxx b/sfx2/source/control/dispatch.cxx index 796444644a2f..fc02c3bac4d5 100644 --- a/sfx2/source/control/dispatch.cxx +++ b/sfx2/source/control/dispatch.cxx @@ -764,7 +764,7 @@ void SfxDispatcher::DoActivate_Impl( bool bMDI, SfxViewFrame* /* pOld */ ) pBind = pBind->GetSubBindings_Impl(); } - pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( sal_False, sal_False, 1 ); + pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( false, false, 1 ); } if(!pImp->aToDoStack.empty()) @@ -858,7 +858,7 @@ void SfxDispatcher::DoDeactivate_Impl( bool bMDI, SfxViewFrame* pNew ) pBind = pBind->GetSubBindings_Impl(); } - pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( sal_True, sal_False, 1 ); + pImp->pFrame->GetFrame().GetWorkWindow_Impl()->HidePopups_Impl( true, false, 1 ); } Flush(); @@ -1541,7 +1541,7 @@ void SfxDispatcher::_Update_Impl( bool bUIActive, bool bIsMDIApp, bool bIsIPOwne } if ( bUIActive || bIsActive ) - pWorkWin->SetChildWindowVisible_Impl( nId, sal_True, nMode ); + pWorkWin->SetChildWindowVisible_Impl( nId, true, nMode ); if ( bUIActive || bIsActive || !pWorkWin->IsFloating( (sal_uInt16) ( nId & 0xFFFF ) ) ) pImp->aChildWins.push_back( nId ); } @@ -1832,7 +1832,7 @@ sal_Bool SfxDispatcher::IsSlotEnabledByFilter_Impl( sal_uInt16 nSID ) const return sal_True; // search - sal_Bool bFound = 0 != bsearch( &nSID, pImp->pFilterSIDs, pImp->nFilterCount, + bool bFound = 0 != bsearch( &nSID, pImp->pFilterSIDs, pImp->nFilterCount, sizeof(sal_uInt16), SfxCompareSIDs_Impl ); // even if ReadOnlyDoc diff --git a/sfx2/source/control/querystatus.cxx b/sfx2/source/control/querystatus.cxx index 21a6c4401584..b8a83b3ba734 100644 --- a/sfx2/source/control/querystatus.cxx +++ b/sfx2/source/control/querystatus.cxx @@ -63,7 +63,7 @@ class SfxQueryStatus_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusL SfxQueryStatus_Impl(); SfxQueryStatus_Impl& operator=( const SfxQueryStatus& ); - sal_Bool m_bQueryInProgress; + bool m_bQueryInProgress; SfxItemState m_eState; SfxPoolItem* m_pItem; sal_uInt16 m_nSlotID; @@ -73,7 +73,7 @@ class SfxQueryStatus_Impl : public ::cppu::WeakImplHelper1< css::frame::XStatusL }; SfxQueryStatus_Impl::SfxQueryStatus_Impl( const Reference< XDispatchProvider >& rDispatchProvider, sal_uInt16 nSlotId, const OUString& rCommand ) : - m_bQueryInProgress( sal_False ), + m_bQueryInProgress( false ), m_eState( SFX_ITEM_DISABLED ), m_pItem( 0 ), m_nSlotID( nSlotId ) @@ -112,7 +112,7 @@ throw( RuntimeException, std::exception ) if ( pType == ::getBooleanCppuType() ) { - sal_Bool bTemp = false; + bool bTemp = false; rEvent.State >>= bTemp ; m_pItem = new SfxBoolItem( m_nSlotID, bTemp ); } @@ -182,7 +182,7 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem ) try { m_aCondition.reset(); - m_bQueryInProgress = sal_True; + m_bQueryInProgress = true; m_xDispatch->addStatusListener( Reference< XStatusListener >( static_cast< cppu::OWeakObject* >( this ), UNO_QUERY ), m_aCommand ); } @@ -197,7 +197,7 @@ SfxItemState SfxQueryStatus_Impl::QueryState( SfxPoolItem*& rpPoolItem ) m_aCondition.wait(); - m_bQueryInProgress = sal_False; + m_bQueryInProgress = false; rpPoolItem = m_pItem; return m_eState; } diff --git a/sfx2/source/control/recentdocsview.cxx b/sfx2/source/control/recentdocsview.cxx index e68332383c81..51e44b24248c 100644 --- a/sfx2/source/control/recentdocsview.cxx +++ b/sfx2/source/control/recentdocsview.cxx @@ -268,7 +268,7 @@ void RecentDocsView::OpenItem( const ThumbnailViewItem *pItem ) // documents will never be opened as templates aArgsList[1].Name = "AsTemplate"; - aArgsList[1].Value = makeAny( (sal_Bool) sal_False ); + aArgsList[1].Value = makeAny( false ); xDispatch = xDispatchProvider->queryDispatch( aTargetURL, "_default", 0 ); diff --git a/sfx2/source/control/sfxstatuslistener.cxx b/sfx2/source/control/sfxstatuslistener.cxx index eab1359a23d3..1fa50a604733 100644 --- a/sfx2/source/control/sfxstatuslistener.cxx +++ b/sfx2/source/control/sfxstatuslistener.cxx @@ -177,7 +177,7 @@ throw( RuntimeException, std::exception ) } else if ( pType == ::getBooleanCppuType() ) { - sal_Bool bTemp = false; + bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( m_nSlotID, bTemp ); } diff --git a/sfx2/source/control/shell.cxx b/sfx2/source/control/shell.cxx index d2add75bbd38..badc24fd33bf 100644 --- a/sfx2/source/control/shell.cxx +++ b/sfx2/source/control/shell.cxx @@ -348,8 +348,8 @@ void SfxShell::PutItem SfxStateCache* pCache = pBindings->GetStateCache( nSlotId ); if ( pCache ) { - pCache->SetState( SFX_ITEM_AVAILABLE, pItem->Clone(), sal_True ); - pCache->SetCachedState( sal_True ); + pCache->SetState( SFX_ITEM_AVAILABLE, pItem->Clone(), true ); + pCache->SetCachedState( true ); } } return; diff --git a/sfx2/source/control/sorgitm.cxx b/sfx2/source/control/sorgitm.cxx index e48175ac7840..0a4b83efd90d 100644 --- a/sfx2/source/control/sorgitm.cxx +++ b/sfx2/source/control/sorgitm.cxx @@ -90,7 +90,7 @@ bool SfxScriptOrganizerItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uIn bool SfxScriptOrganizerItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId ) { OUString aValue; - sal_Bool bRet = false; + bool bRet = false; nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { diff --git a/sfx2/source/control/statcach.cxx b/sfx2/source/control/statcach.cxx index b7efaed04c36..fcc7e7f65d92 100644 --- a/sfx2/source/control/statcach.cxx +++ b/sfx2/source/control/statcach.cxx @@ -80,7 +80,7 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame:: ::com::sun::star::uno::Reference< ::com::sun::star::frame::XStatusListener > xRef( (::cppu::OWeakObject*)this, ::com::sun::star::uno::UNO_QUERY ); if ( aStatus.Requery ) - pCache->Invalidate( sal_True ); + pCache->Invalidate( true ); else { SfxPoolItem *pItem=NULL; @@ -98,7 +98,7 @@ void SAL_CALL BindDispatch_Impl::statusChanged( const ::com::sun::star::frame:: ::com::sun::star::uno::Type pType = aAny.getValueType(); if ( pType == ::getBooleanCppuType() ) { - sal_Bool bTemp = false; + bool bTemp = false; aAny >>= bTemp ; pItem = new SfxBoolItem( nId, bTemp ); } @@ -166,7 +166,7 @@ const ::com::sun::star::frame::FeatureStateEvent& BindDispatch_Impl::GetStatus() return aStatus; } -void BindDispatch_Impl::Dispatch( uno::Sequence < beans::PropertyValue > aProps, sal_Bool bForceSynchron ) +void BindDispatch_Impl::Dispatch( uno::Sequence < beans::PropertyValue > aProps, bool bForceSynchron ) { if ( xDisp.is() && aStatus.IsEnabled ) { @@ -188,11 +188,11 @@ SfxStateCache::SfxStateCache( sal_uInt16 nFuncId ): pController(0), pLastItem( 0 ), eLastState( 0 ), - bItemVisible( sal_True ) + bItemVisible( true ) { - bCtrlDirty = sal_True; - bSlotDirty = sal_True; - bItemDirty = sal_True; + bCtrlDirty = true; + bSlotDirty = true; + bItemDirty = true; } @@ -212,12 +212,12 @@ SfxStateCache::~SfxStateCache() // invalidates the cache (next request will force update) -void SfxStateCache::Invalidate( sal_Bool bWithMsg ) +void SfxStateCache::Invalidate( bool bWithMsg ) { - bCtrlDirty = sal_True; + bCtrlDirty = true; if ( bWithMsg ) { - bSlotDirty = sal_True; + bSlotDirty = true; aSlotServ.SetSlot( 0 ); if ( pDispatch ) { @@ -250,8 +250,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons if ( !pSlot || !pSlot->pUnoName ) { - bSlotDirty = sal_False; - bCtrlDirty = sal_True; + bSlotDirty = false; + bCtrlDirty = true; return aSlotServ.GetSlot()? &aSlotServ: 0; } @@ -286,8 +286,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons if ( pDispatcher == &rDispat || pDispatcher == SFX_APP()->GetAppDispatcher_Impl() ) { // so we can use it directly - bSlotDirty = sal_False; - bCtrlDirty = sal_True; + bSlotDirty = false; + bCtrlDirty = true; return aSlotServ.GetSlot()? &aSlotServ: 0; } } @@ -297,8 +297,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons pDispatch->acquire(); // flags must be set before adding StatusListener because the dispatch object will set the state - bSlotDirty = sal_False; - bCtrlDirty = sal_True; + bSlotDirty = false; + bCtrlDirty = true; xDisp->addStatusListener( pDispatch, aURL ); } else if ( rDispat.GetFrame() ) @@ -310,8 +310,8 @@ const SfxSlotServer* SfxStateCache::GetSlotServer( SfxDispatcher &rDispat , cons } } - bSlotDirty = sal_False; - bCtrlDirty = sal_True; + bSlotDirty = false; + bCtrlDirty = true; } // we *always* return a SlotServer (if there is one); but in case of an external dispatch we might not use it @@ -328,7 +328,7 @@ void SfxStateCache::SetState ( SfxItemState eState, // <SfxItemState> from 'pState' const SfxPoolItem* pState, // Slot Status, 0 or -1 - sal_Bool bMaybeDirty + bool bMaybeDirty ) /* [Description] @@ -344,11 +344,11 @@ void SfxStateCache::SetState -void SfxStateCache::SetVisibleState( sal_Bool bShow ) +void SfxStateCache::SetVisibleState( bool bShow ) { SfxItemState eState( SFX_ITEM_AVAILABLE ); const SfxPoolItem* pState( NULL ); - sal_Bool bDeleteItem( sal_False ); + bool bDeleteItem( false ); if ( bShow != bItemVisible ) { @@ -358,7 +358,7 @@ void SfxStateCache::SetVisibleState( sal_Bool bShow ) if ( IsInvalidItem(pLastItem) || ( pLastItem == NULL )) { pState = new SfxVoidItem( nId ); - bDeleteItem = sal_True; + bDeleteItem = true; } else pState = pLastItem; @@ -368,7 +368,7 @@ void SfxStateCache::SetVisibleState( sal_Bool bShow ) else { pState = new SfxVisibilityItem( nId, false ); - bDeleteItem = sal_True; + bDeleteItem = true; } // Update Controller @@ -394,7 +394,7 @@ void SfxStateCache::SetState_Impl ( SfxItemState eState, // <SfxItemState> from 'pState' const SfxPoolItem* pState, // Slot Status, 0 or -1 - sal_Bool bMaybeDirty + bool bMaybeDirty ) { (void)bMaybeDirty; //unused @@ -443,17 +443,17 @@ void SfxStateCache::SetState_Impl else pLastItem = 0; eLastState = eState; - bItemDirty = sal_False; + bItemDirty = false; } - bCtrlDirty = sal_False; + bCtrlDirty = false; } // Set old status again in all the controllers -void SfxStateCache::SetCachedState( sal_Bool bAlways ) +void SfxStateCache::SetCachedState( bool bAlways ) { DBG_ASSERT(pController==NULL||pController->GetId()==nId, "Cache with wrong ControllerItem" ); @@ -475,7 +475,7 @@ void SfxStateCache::SetCachedState( sal_Bool bAlways ) ((SfxDispatchController_Impl *)pInternalController)->StateChanged( nId, eLastState, pLastItem, &aSlotServ ); // Controller is now ok - bCtrlDirty = sal_True; + bCtrlDirty = true; } } @@ -501,7 +501,7 @@ void SfxStateCache::DeleteFloatingWindows() return ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > (); } -void SfxStateCache::Dispatch( const SfxItemSet* pSet, sal_Bool bForceSynchron ) +void SfxStateCache::Dispatch( const SfxItemSet* pSet, bool bForceSynchron ) { // protect pDispatch against destruction in the call ::com::sun::star::uno::Reference < ::com::sun::star::frame::XStatusListener > xKeepAlive( pDispatch ); diff --git a/sfx2/source/control/thumbnailviewacc.cxx b/sfx2/source/control/thumbnailviewacc.cxx index 93e31bcb1ff6..60581cbc8888 100644 --- a/sfx2/source/control/thumbnailviewacc.cxx +++ b/sfx2/source/control/thumbnailviewacc.cxx @@ -175,14 +175,14 @@ sal_Int32 SAL_CALL ThumbnailViewAcc::getAccessibleIndexInParent() if( pParent ) { - sal_Bool bFound = sal_False; + bool bFound = false; for( sal_uInt16 i = 0, nCount = pParent->GetChildCount(); ( i < nCount ) && !bFound; i++ ) { if( pParent->GetChild( i ) == mpParent ) { nRet = i; - bFound = sal_True; + bFound = true; } } } @@ -459,7 +459,7 @@ sal_Bool SAL_CALL ThumbnailViewAcc::isAccessibleChildSelected( sal_Int32 nChildI ThrowIfDisposed(); const SolarMutexGuard aSolarGuard; ThumbnailViewItem* pItem = getItem (sal::static_int_cast< sal_uInt16 >(nChildIndex)); - sal_Bool bRet = sal_False; + bool bRet = false; if (pItem != NULL) bRet = mpParent->IsItemSelected( pItem->mnId ); @@ -839,12 +839,12 @@ void SAL_CALL ThumbnailViewItemAcc::addAccessibleEventListener( const uno::Refer if( rxListener.is() ) { ::std::vector< uno::Reference< accessibility::XAccessibleEventListener > >::const_iterator aIter = mxEventListeners.begin(); - sal_Bool bFound = sal_False; + bool bFound = false; while( !bFound && ( aIter != mxEventListeners.end() ) ) { if( *aIter == rxListener ) - bFound = sal_True; + bFound = true; else ++aIter; } diff --git a/sfx2/source/control/thumbnailviewacc.hxx b/sfx2/source/control/thumbnailviewacc.hxx index aa901065c216..a1847402e903 100644 --- a/sfx2/source/control/thumbnailviewacc.hxx +++ b/sfx2/source/control/thumbnailviewacc.hxx @@ -60,7 +60,7 @@ public: const ::com::sun::star::uno::Any& rOldValue, const ::com::sun::star::uno::Any& rNewValue ); - sal_Bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } + bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } static ThumbnailViewAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); @@ -193,7 +193,7 @@ public: void ParentDestroyed(); - sal_Bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } + bool HasAccessibleListeners() const { return( mxEventListeners.size() > 0 ); } static ThumbnailViewItemAcc* getImplementation( const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rxData ) throw(); diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index 15f09b423bc7..f9389bd1f3ac 100644 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -143,7 +143,7 @@ void SAL_CALL SfxUnoControllerItem::statusChanged(const ::com::sun::star::frame: if ( pType == ::getBooleanCppuType() ) { - sal_Bool bTemp = false; + bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( pCtrlItem->GetId(), bTemp ); } @@ -620,7 +620,6 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util sal_Int32 nMarkArg = -1; // Filter arguments which shouldn't be part of the sequence property value - sal_Bool bTemp = sal_Bool(); sal_uInt16 nModifier(0); std::vector< ::com::sun::star::beans::PropertyValue > aAddArgs; for( sal_Int32 n=0; n<nCount; n++ ) @@ -628,7 +627,8 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util const ::com::sun::star::beans::PropertyValue& rProp = aArgs[n]; if( rProp.Name == "SynchronMode" ) { - if( rProp.Value >>=bTemp ) + bool bTemp; + if( rProp.Value >>= bTemp ) nCall = bTemp ? SFX_CALLMODE_SYNCHRON : SFX_CALLMODE_ASYNCHRON; } else if( rProp.Name == "Bookmark" ) @@ -675,7 +675,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util xFrameRef = pViewFrame->GetFrame().GetFrameInterface(); } - sal_Bool bSuccess = sal_False; + bool bSuccess = false; const SfxPoolItem* pItem = NULL; SfxMapUnit eMapUnit( SFX_MAPUNIT_100TH_MM ); @@ -848,12 +848,12 @@ void SfxDispatchController_Impl::StateChanged( sal_uInt16 nSID, SfxItemState eSt // Bindings instance notifies controller about a state change, listeners must be notified also // Don't cache visibility state changes as they are volatile. We need our real state to send it // to our controllers after visibility is set to true. - sal_Bool bNotify = sal_True; + bool bNotify = true; if ( pState && !IsInvalidItem( pState ) ) { if ( !pState->ISA( SfxVisibilityItem ) ) { - sal_Bool bBothAvailable = pLastState && !IsInvalidItem(pLastState); + bool bBothAvailable = pLastState && !IsInvalidItem(pLastState); if ( bBothAvailable ) bNotify = pState->Type() != pLastState->Type() || *pState != *pLastState; if ( pLastState && !IsInvalidItem( pLastState ) ) diff --git a/sfx2/source/dialog/basedlgs.cxx b/sfx2/source/dialog/basedlgs.cxx index 51e70ce8bce6..c3bd05bf91f8 100644 --- a/sfx2/source/dialog/basedlgs.cxx +++ b/sfx2/source/dialog/basedlgs.cxx @@ -50,7 +50,7 @@ class SfxModelessDialog_Impl : public SfxListener public: OString aWinState; SfxChildWindow* pMgr; - sal_Bool bConstructed; + bool bConstructed; void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; Timer aMoveTimer; @@ -74,7 +74,7 @@ class SfxFloatingWindow_Impl : public SfxListener public: OString aWinState; SfxChildWindow* pMgr; - sal_Bool bConstructed; + bool bConstructed; Timer aMoveTimer; void Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) SAL_OVERRIDE; @@ -253,7 +253,7 @@ void SfxModelessDialog::StateChanged( StateChangedType nStateChange ) } } - pImp->bConstructed = sal_True; + pImp->bConstructed = true; } ModelessDialog::StateChanged( nStateChange ); @@ -343,7 +343,7 @@ void SfxModelessDialog::Init(SfxBindings *pBindinx, SfxChildWindow *pCW) pBindings = pBindinx; pImp = new SfxModelessDialog_Impl; pImp->pMgr = pCW; - pImp->bConstructed = sal_False; + pImp->bConstructed = false; SetUniqueId( GetHelpId() ); if ( pBindinx ) pImp->StartListening( *pBindinx ); @@ -485,7 +485,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, pImp( new SfxFloatingWindow_Impl ) { pImp->pMgr = pCW; - pImp->bConstructed = sal_False; + pImp->bConstructed = false; SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) @@ -505,7 +505,7 @@ SfxFloatingWindow::SfxFloatingWindow( SfxBindings *pBindinx, pImp( new SfxFloatingWindow_Impl ) { pImp->pMgr = pCW; - pImp->bConstructed = sal_False; + pImp->bConstructed = false; SetUniqueId( GetHelpId() ); SetHelpId(""); if ( pBindinx ) @@ -608,7 +608,7 @@ void SfxFloatingWindow::StateChanged( StateChangedType nStateChange ) // FloatingWindows are not centered by default if ( !pImp->aWinState.isEmpty() ) SetWindowState( pImp->aWinState ); - pImp->bConstructed = sal_True; + pImp->bConstructed = true; } FloatingWindow::StateChanged( nStateChange ); @@ -669,7 +669,7 @@ IMPL_LINK_NOARG(SfxSingleTabDialog, OKHdl_Impl) { CreateOutputItemSet( *GetInputItemSet() ); } - sal_Bool bModified = sal_False; + bool bModified = false; if ( pImpl->m_pSfxPage->HasExchangeSupport() ) { diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 9cc689018162..3a19ff50fc9e 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -506,9 +506,9 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const { OUString aValue; sal_Int32 nValue = 0; - sal_Bool bValue = sal_False; - sal_Bool bIsInt = sal_False; - sal_Bool bIsString = sal_False; + bool bValue = false; + bool bIsInt = false; + bool bIsString = false; nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) { @@ -522,31 +522,31 @@ bool SfxDocumentInfoItem::QueryValue( Any& rVal, sal_uInt8 nMemberId ) const bValue = isAutoloadEnabled(); break; case MID_DOCINFO_AUTOLOADSECS: - bIsInt = sal_True; + bIsInt = true; nValue = getAutoloadDelay(); break; case MID_DOCINFO_AUTOLOADURL: - bIsString = sal_True; + bIsString = true; aValue = getAutoloadURL(); break; case MID_DOCINFO_DEFAULTTARGET: - bIsString = sal_True; + bIsString = true; aValue = getDefaultTarget(); break; case MID_DOCINFO_DESCRIPTION: - bIsString = sal_True; + bIsString = true; aValue = getDescription(); break; case MID_DOCINFO_KEYWORDS: - bIsString = sal_True; + bIsString = true; aValue = getKeywords(); break; case MID_DOCINFO_SUBJECT: - bIsString = sal_True; + bIsString = true; aValue = getSubject(); break; case MID_DOCINFO_TITLE: - bIsString = sal_True; + bIsString = true; aValue = getTitle(); break; default: @@ -567,7 +567,7 @@ bool SfxDocumentInfoItem::PutValue( const Any& rVal, sal_uInt8 nMemberId ) { OUString aValue; sal_Int32 nValue=0; - sal_Bool bValue = sal_False; + bool bValue = false; bool bRet = false; nMemberId &= ~CONVERT_TWIPS; switch ( nMemberId ) @@ -653,10 +653,10 @@ SfxTabPage *SfxDocumentDescPage::Create(Window *pParent, const SfxItemSet &rItem bool SfxDocumentDescPage::FillItemSet(SfxItemSet &rSet) { // Test whether a change is present - const sal_Bool bTitleMod = m_pTitleEd->IsModified(); - const sal_Bool bThemeMod = m_pThemaEd->IsModified(); - const sal_Bool bKeywordsMod = m_pKeywordsEd->IsModified(); - const sal_Bool bCommentMod = m_pCommentEd->IsModified(); + const bool bTitleMod = m_pTitleEd->IsModified(); + const bool bThemeMod = m_pThemaEd->IsModified(); + const bool bKeywordsMod = m_pKeywordsEd->IsModified(); + const bool bCommentMod = m_pCommentEd->IsModified(); if ( !( bTitleMod || bThemeMod || bKeywordsMod || bCommentMod ) ) { return false; @@ -955,7 +955,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) ) { SfxDocumentInfoItem* m_pInfoItem = (SfxDocumentInfoItem*)pItem; - sal_Bool bUseData = ( TRISTATE_TRUE == m_pUseUserDataCB->GetState() ); + bool bUseData = ( TRISTATE_TRUE == m_pUseUserDataCB->GetState() ); m_pInfoItem->SetUseUserData( bUseData ); rSet.Put( SfxDocumentInfoItem( *m_pInfoItem ) ); bRet = true; @@ -969,7 +969,7 @@ bool SfxDocumentPage::FillItemSet( SfxItemSet& rSet ) if ( pExpSet && SFX_ITEM_SET == pExpSet->GetItemState( SID_DOCINFO, true, &pItem ) ) { SfxDocumentInfoItem* m_pInfoItem = (SfxDocumentInfoItem*)pItem; - sal_Bool bUseAuthor = bEnableUseUserData && m_pUseUserDataCB->IsChecked(); + bool bUseAuthor = bEnableUseUserData && m_pUseUserDataCB->IsChecked(); SfxDocumentInfoItem newItem( *m_pInfoItem ); newItem.resetUserData( bUseAuthor ? SvtUserOptions().GetFullName() @@ -1094,7 +1094,7 @@ void SfxDocumentPage::Reset( const SfxItemSet& rSet ) m_pFileValFt->SetText( aURL.GetPartBeforeLastName() ); // handle access data - sal_Bool m_bUseUserData = m_pInfoItem->IsUseUserData(); + bool m_bUseUserData = m_pInfoItem->IsUseUserData(); const LocaleDataWrapper& rLocaleWrapper( Application::GetSettings().GetLocaleDataWrapper() ); m_pCreateValFt->SetText( ConvertDateTime_Impl( m_pInfoItem->getAuthor(), m_pInfoItem->getCreationDate(), rLocaleWrapper ) ); @@ -1875,7 +1875,7 @@ Sequence< beans::PropertyValue > CustomPropertiesWindow::GetCustomProperties() c double nValue = 0; sal_uInt32 nIndex = const_cast< SvNumberFormatter& >( m_aNumberFormatter ).GetFormatIndex( NF_NUMBER_SYSTEM ); - sal_Bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ). + bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ). IsNumberFormat( pLine->m_aValueEdit.GetText(), nIndex, nValue ); if ( bIsNum ) aPropertiesSeq[i].Value <<= makeAny( nValue ); @@ -2383,7 +2383,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con { double dValue = 0.0; OUString sValue( (*it)->m_aValueEdit->GetText() ); - sal_Bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ). + bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ). IsNumberFormat( sValue, nIndex, dValue ); if ( bIsNum ) seqValue[k] = dValue; @@ -2401,7 +2401,7 @@ Sequence< document::CmisProperty > CmisPropertiesWindow::GetCmisProperties() con { double dValue = 0; OUString sValue( (*it)->m_aValueEdit->GetText() ); - sal_Bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ). + bool bIsNum = const_cast< SvNumberFormatter& >( m_aNumberFormatter ). IsNumberFormat( sValue, nIndex, dValue ); if ( bIsNum ) seqValue[k] = (sal_Int64) dValue; diff --git a/sfx2/source/dialog/dockwin.cxx b/sfx2/source/dialog/dockwin.cxx index 0ebf3197bf83..9955c4249a25 100644 --- a/sfx2/source/dialog/dockwin.cxx +++ b/sfx2/source/dialog/dockwin.cxx @@ -221,7 +221,7 @@ Window *pParent, sal_uInt16 nId, SfxBindings *pBindings, SfxChildWinInfo* pInfo return pWin; } -void SfxDockingWrapper::RegisterChildWindow (sal_Bool bVis, SfxModule *pMod, sal_uInt16 nFlags) +void SfxDockingWrapper::RegisterChildWindow (bool bVis, SfxModule *pMod, sal_uInt16 nFlags) { // pre-register a couple of docking windows for (int i=0; i < NUM_OF_DOCKINGWINDOWS; i++ ) @@ -403,15 +403,15 @@ friend class SfxDockingWindow; SfxChildAlignment eLastAlignment; SfxChildAlignment eDockAlignment; - sal_Bool bConstructed; + bool bConstructed; Size aMinSize; SfxSplitWindow* pSplitWin; - sal_Bool bSplitable; + bool bSplitable; Timer aMoveTimer; // The following members are only valid in the time from startDocking to // EndDocking: - sal_Bool bEndDocked; + bool bEndDocked; Size aSplitSize; long nHorizontalSize; long nVerticalSize; @@ -419,8 +419,8 @@ friend class SfxDockingWindow; sal_uInt16 nPos; sal_uInt16 nDockLine; sal_uInt16 nDockPos; - sal_Bool bNewLine; - sal_Bool bDockingPrevented; + bool bNewLine; + bool bDockingPrevented; OString aWinState; SfxChildAlignment GetLastAlignment() const @@ -649,7 +649,7 @@ void SfxDockingWindow::StartDocking() pImp->pSplitWin->GetWindowPos(this, pImp->nLine, pImp->nPos); pImp->nDockLine = pImp->nLine; pImp->nDockPos = pImp->nPos; - pImp->bNewLine = sal_False; + pImp->bNewLine = false; } } @@ -678,14 +678,14 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) if ( pImp->bDockingPrevented || !pWorkWin->IsInternalDockingAllowed() ) return false; - sal_Bool bFloatMode = sal_False; + bool bFloatMode = false; if ( GetOuterRect().IsInside( rPos ) && !IsDockingPrevented() ) { // Mouse within OuterRect: calculate Alignment and Rectangle SfxChildAlignment eAlign = CalcAlignment(rPos, rRect); if (eAlign == SFX_ALIGN_NOALIGNMENT) - bFloatMode = sal_True; + bFloatMode = true; pImp->SetDockAlignment(eAlign); } else @@ -694,7 +694,7 @@ bool SfxDockingWindow::Docking( const Point& rPos, Rectangle& rRect ) // Is this allowed? if (CheckAlignment(pImp->GetDockAlignment(),SFX_ALIGN_NOALIGNMENT) != SFX_ALIGN_NOALIGNMENT) return false; - bFloatMode = sal_True; + bFloatMode = true; if ( SFX_ALIGN_NOALIGNMENT != pImp->GetDockAlignment() ) { // Due to a bug the rRect may only be changed when the @@ -801,7 +801,7 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode ) } else { - pImp->pSplitWin->RemoveWindow(this,sal_False); + pImp->pSplitWin->RemoveWindow(this,false); pImp->nLine = pImp->nDockLine; pImp->nPos = pImp->nDockPos; pImp->pSplitWin->ReleaseWindow_Impl(this); @@ -821,9 +821,9 @@ void SfxDockingWindow::EndDocking( const Rectangle& rRect, bool bFloatMode ) } else { - pImp->bEndDocked = sal_True; + pImp->bEndDocked = true; DockingWindow::EndDocking(rRect, bFloatMode); - pImp->bEndDocked = sal_False; + pImp->bEndDocked = false; } SetAlignment( IsFloatingMode() ? SFX_ALIGN_NOALIGNMENT : pImp->GetDockAlignment() ); @@ -880,17 +880,17 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, } pImp = new SfxDockingWindow_Impl; - pImp->bConstructed = sal_False; + pImp->bConstructed = false; pImp->pSplitWin = 0; - pImp->bEndDocked = sal_False; - pImp->bDockingPrevented = sal_False; + pImp->bEndDocked = false; + pImp->bDockingPrevented = false; - pImp->bSplitable = sal_True; + pImp->bSplitable = true; // Initially set to default, the alignment is set in the subclass pImp->nLine = pImp->nDockLine = 0; pImp->nPos = pImp->nDockPos = 0; - pImp->bNewLine = sal_False; + pImp->bNewLine = false; pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT); pImp->aMoveTimer.SetTimeout(50); pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl)); @@ -931,17 +931,17 @@ SfxDockingWindow::SfxDockingWindow( SfxBindings *pBindinx, SfxChildWindow *pCW, } pImp = new SfxDockingWindow_Impl; - pImp->bConstructed = sal_False; + pImp->bConstructed = false; pImp->pSplitWin = 0; - pImp->bEndDocked = sal_False; - pImp->bDockingPrevented = sal_False; + pImp->bEndDocked = false; + pImp->bDockingPrevented = false; - pImp->bSplitable = sal_True; + pImp->bSplitable = true; // Initially set to default, the alignment is set in the subclass pImp->nLine = pImp->nDockLine = 0; pImp->nPos = pImp->nDockPos = 0; - pImp->bNewLine = sal_False; + pImp->bNewLine = false; pImp->SetLastAlignment(SFX_ALIGN_NOALIGNMENT); pImp->aMoveTimer.SetTimeout(50); pImp->aMoveTimer.SetTimeoutHdl(LINK(this,SfxDockingWindow,TimerHdl)); @@ -961,12 +961,12 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo) if ( !pMgr ) { pImp->SetDockAlignment( SFX_ALIGN_NOALIGNMENT ); - pImp->bConstructed = sal_True; + pImp->bConstructed = true; return; } if (pInfo && (pInfo->nFlags & SFX_CHILDWIN_FORCEDOCK)) - pImp->bDockingPrevented = sal_True; + pImp->bDockingPrevented = true; pImp->aSplitSize = GetOutputSizePixel(); if ( !GetFloatingSize().Width() ) @@ -979,7 +979,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo) pImp->aSplitSize.Height() = aMinSize.Height(); } - sal_Bool bVertHorzRead( sal_False ); + bool bVertHorzRead( false ); if (pInfo && !pInfo->aExtraString.isEmpty()) { // get information about alignment, split size and position in SplitWindow @@ -1044,7 +1044,7 @@ void SfxDockingWindow::Initialize(SfxChildWinInfo *pInfo) pImp->nVerticalSize = pImp->aSplitSize.Height(); pImp->nHorizontalSize = pImp->aSplitSize.Width(); if ( GetSplitSizeFromString( aStr, pImp->aSplitSize )) - bVertHorzRead = sal_True; + bVertHorzRead = true; } } } @@ -1131,12 +1131,12 @@ void SfxDockingWindow::Initialize_Impl() { if ( !pMgr ) { - pImp->bConstructed = sal_True; + pImp->bConstructed = true; return; } FloatingWindow* pFloatWin = GetFloatingWindow(); - sal_Bool bSet = sal_False; + bool bSet = false; if ( pFloatWin ) { bSet = !pFloatWin->IsDefaultPos(); @@ -1145,7 +1145,7 @@ void SfxDockingWindow::Initialize_Impl() { Point aPos = GetFloatingPos(); if ( aPos != Point() ) - bSet = sal_True; + bSet = true; } if ( !bSet) @@ -1173,7 +1173,7 @@ void SfxDockingWindow::Initialize_Impl() } // allow calling of docking handlers - pImp->bConstructed = sal_True; + pImp->bConstructed = true; } @@ -1310,7 +1310,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& aInRect.Bottom() -= nTBBorder/2; // calculate alignment resulting from docking rectangle - sal_Bool bBecomesFloating = sal_False; + bool bBecomesFloating = false; SfxChildAlignment eDockAlign = pImp->GetDockAlignment(); Rectangle aDockingRect( rRect ); if ( !IsFloatingMode() ) @@ -1329,7 +1329,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& Rectangle aIntersect = GetOuterRect().GetIntersection( aDockingRect ); if ( aIntersect.IsEmpty() ) // docking rectangle completely outside docking area -> floating mode - bBecomesFloating = sal_True; + bBecomesFloating = true; else { // create a small test rect around the mouse position and use this one @@ -1343,7 +1343,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& Rectangle aIntersectRect = aInRect.GetIntersection( aSmallDockingRect ); if ( aIntersectRect == aSmallDockingRect ) // docking rectangle completely inside (shrinked) inner area -> floating mode - bBecomesFloating = sal_True; + bBecomesFloating = true; } if ( bBecomesFloating ) @@ -1356,7 +1356,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& Point aInPosTL( aPos.X()-aInRect.Left(), aPos.Y()-aInRect.Top() ); Point aInPosBR( aPos.X()-aInRect.Left() + aDockingRect.GetWidth(), aPos.Y()-aInRect.Top() + aDockingRect.GetHeight() ); Size aInSize = aInRect.GetSize(); - sal_Bool bNoChange = sal_False; + bool bNoChange = false; // check if alignment is still unchanged switch ( GetAlignment() ) @@ -1367,7 +1367,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& if (aInPosTL.X() <= 0) { eDockAlign = GetAlignment(); - bNoChange = sal_True; + bNoChange = true; } break; case SFX_ALIGN_TOP: @@ -1376,7 +1376,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& if ( aInPosTL.Y() <= 0) { eDockAlign = GetAlignment(); - bNoChange = sal_True; + bNoChange = true; } break; case SFX_ALIGN_RIGHT: @@ -1385,7 +1385,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& if ( aInPosBR.X() >= aInSize.Width()) { eDockAlign = GetAlignment(); - bNoChange = sal_True; + bNoChange = true; } break; case SFX_ALIGN_BOTTOM: @@ -1394,7 +1394,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& if ( aInPosBR.Y() >= aInSize.Height()) { eDockAlign = GetAlignment(); - bNoChange = sal_True; + bNoChange = true; } break; default: @@ -1404,7 +1404,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& if ( !bNoChange ) { // alignment will change, test alignment according to distance of the docking rectangles edges - sal_Bool bForbidden = sal_True; + bool bForbidden = true; if ( aInPosTL.X() <= 0) { eDockAlign = CheckAlignment(pImp->GetDockAlignment(),SFX_ALIGN_LEFT); @@ -1461,7 +1461,7 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& // mouse over splitwindow, get line and position pImp->nDockLine = nLine; pImp->nDockPos = nPos; - pImp->bNewLine = sal_False; + pImp->bNewLine = false; } else { @@ -1472,18 +1472,18 @@ SfxChildAlignment SfxDockingWindow::CalcAlignment(const Point& rPos, Rectangle& // if this window is the only one in the last line, it can't be docked as new line in the same splitwindow pImp->nDockLine = pImp->nLine; pImp->nDockPos = pImp->nPos; - pImp->bNewLine = sal_False; + pImp->bNewLine = false; } else { // create new line pImp->nDockLine = pSplitWin->GetLineCount(); pImp->nDockPos = 0; - pImp->bNewLine = sal_True; + pImp->bNewLine = true; } } - sal_Bool bChanged = pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || eDockAlign != GetAlignment(); + bool bChanged = pImp->nLine != pImp->nDockLine || pImp->nPos != pImp->nDockPos || eDockAlign != GetAlignment(); if ( !bChanged && !IsFloatingMode() ) { // window only sightly moved, no change of any property diff --git a/sfx2/source/dialog/filedlghelper.cxx b/sfx2/source/dialog/filedlghelper.cxx index 1a9c8f5b4321..bfd215f2f888 100644 --- a/sfx2/source/dialog/filedlghelper.cxx +++ b/sfx2/source/dialog/filedlghelper.cxx @@ -282,7 +282,7 @@ void FileDialogHelper_Impl::handleControlStateChanged( const FilePickerEvent& aE { case CommonFilePickerElementIds::LISTBOX_FILTER: updateFilterOptionsBox(); - enablePasswordBox( sal_False ); + enablePasswordBox( false ); updateSelectionBox(); // only use it for export and with our own dialog if ( mbExport && !mbSystemPicker ) @@ -374,9 +374,9 @@ const SfxFilter* FileDialogHelper_Impl::getCurentSfxFilter() return pFilter; } -sal_Bool FileDialogHelper_Impl::updateExtendedControl( sal_Int16 _nExtendedControlId, sal_Bool _bEnable ) +bool FileDialogHelper_Impl::updateExtendedControl( sal_Int16 _nExtendedControlId, bool _bEnable ) { - sal_Bool bIsEnabled = sal_False; + bool bIsEnabled = false; uno::Reference < XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); if ( xCtrlAccess.is() ) @@ -394,9 +394,9 @@ sal_Bool FileDialogHelper_Impl::updateExtendedControl( sal_Int16 _nExtendedContr return bIsEnabled; } -sal_Bool FileDialogHelper_Impl::CheckFilterOptionsCapability( const SfxFilter* _pFilter ) +bool FileDialogHelper_Impl::CheckFilterOptionsCapability( const SfxFilter* _pFilter ) { - sal_Bool bResult = sal_False; + bool bResult = false; if( mxFilterCFG.is() && _pFilter ) { @@ -413,7 +413,7 @@ sal_Bool FileDialogHelper_Impl::CheckFilterOptionsCapability( const SfxFilter* _ { aProps[nProperty].Value >>= aServiceName; if( !aServiceName.isEmpty() ) - bResult = sal_True; + bResult = true; } } } @@ -426,9 +426,9 @@ sal_Bool FileDialogHelper_Impl::CheckFilterOptionsCapability( const SfxFilter* _ return bResult; } -sal_Bool FileDialogHelper_Impl::isInOpenMode() const +bool FileDialogHelper_Impl::isInOpenMode() const { - sal_Bool bRet = sal_False; + bool bRet = false; switch ( m_nDialogType ) { @@ -437,7 +437,7 @@ sal_Bool FileDialogHelper_Impl::isInOpenMode() const case FILEOPEN_PLAY: case FILEOPEN_READONLY_VERSION: case FILEOPEN_LINK_PREVIEW: - bRet = sal_True; + bRet = true; } return bRet; @@ -497,7 +497,7 @@ void FileDialogHelper_Impl::updateSelectionBox() return; // Does the selection box exist? - sal_Bool bSelectionBoxFound = sal_False; + bool bSelectionBoxFound = false; uno::Reference< XControlInformation > xCtrlInfo( mxFileDlg, UNO_QUERY ); if ( xCtrlInfo.is() ) { @@ -506,7 +506,7 @@ void FileDialogHelper_Impl::updateSelectionBox() for ( sal_uInt32 nCtrl = 0; nCtrl < nCount; ++nCtrl ) if ( aCtrlList[ nCtrl ] == "SelectionBox" ) { - bSelectionBoxFound = sal_True; + bSelectionBoxFound = true; break; } } @@ -518,16 +518,16 @@ void FileDialogHelper_Impl::updateSelectionBox() ExtendedFilePickerElementIds::CHECKBOX_SELECTION, ( mbSelectionEnabled && pFilter && ( pFilter->GetFilterFlags() & SFX_FILTER_SUPPORTSSELECTION ) != 0 ) ); uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); - xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, makeAny( (sal_Bool)mbSelection ) ); + xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, makeAny( mbSelection ) ); } } -void FileDialogHelper_Impl::enablePasswordBox( sal_Bool bInit ) +void FileDialogHelper_Impl::enablePasswordBox( bool bInit ) { if ( ! mbHasPassword ) return; - sal_Bool bWasEnabled = mbIsPwdEnabled; + bool bWasEnabled = mbIsPwdEnabled; const SfxFilter* pCurrentFilter = getCurentSfxFilter(); mbIsPwdEnabled = updateExtendedControl( @@ -556,13 +556,13 @@ void FileDialogHelper_Impl::enablePasswordBox( sal_Bool bInit ) // remember user settings until checkbox is enabled uno::Reference< XFilePickerControlAccess > xCtrlAccess( mxFileDlg, UNO_QUERY ); Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0 ); - sal_Bool bPassWord = sal_False; + bool bPassWord = false; mbPwdCheckBoxState = ( aValue >>= bPassWord ) && bPassWord; xCtrlAccess->setValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0, makeAny( sal_False ) ); } } -void FileDialogHelper_Impl::updatePreviewState( sal_Bool _bUpdatePreviewWindow ) +void FileDialogHelper_Impl::updatePreviewState( bool _bUpdatePreviewWindow ) { if ( mbHasPreview ) { @@ -574,7 +574,7 @@ void FileDialogHelper_Impl::updatePreviewState( sal_Bool _bUpdatePreviewWindow ) try { Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0 ); - sal_Bool bShowPreview = sal_False; + bool bShowPreview = false; if ( aValue >>= bShowPreview ) { @@ -1199,7 +1199,7 @@ IMPL_LINK( FileDialogHelper_Impl, InitControls, void*, NOTINTERESTEDIN ) { (void)NOTINTERESTEDIN; mnPostUserEventId = 0; - enablePasswordBox( sal_True ); + enablePasswordBox( true ); updateFilterOptionsBox( ); updateSelectionBox( ); @@ -1210,7 +1210,7 @@ void FileDialogHelper_Impl::preExecute() { loadConfig( ); setDefaultValues( ); - updatePreviewState( sal_False ); + updatePreviewState( false ); implInitializeFileName( ); @@ -1249,7 +1249,7 @@ void FileDialogHelper_Impl::implInitializeFileName( ) { try { - sal_Bool bAutoExtChecked = sal_False; + bool bAutoExtChecked = false; uno::Reference < XFilePickerControlAccess > xControlAccess( mxFileDlg, UNO_QUERY ); if ( xControlAccess.is() @@ -1457,7 +1457,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, try { Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0 ); - sal_Bool bSelection = sal_False; + bool bSelection = false; if ( aValue >>= bSelection ) rpSet->Put( SfxBoolItem( SID_SELECTION, bSelection ) ); } @@ -1478,7 +1478,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, try { Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_READONLY, 0 ); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; if ( ( aValue >>= bReadOnly ) && bReadOnly ) rpSet->Put( SfxBoolItem( SID_DOC_READONLY, bReadOnly ) ); } @@ -1518,7 +1518,7 @@ ErrCode FileDialogHelper_Impl::execute( std::vector<OUString>& rpURLList, try { Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0 ); - sal_Bool bPassWord = sal_False; + bool bPassWord = false; if ( ( aValue >>= bPassWord ) && bPassWord ) { // ask for a password @@ -1853,7 +1853,7 @@ void FileDialogHelper_Impl::addGraphicFilter() if ( aExtensions.getLength() > 240 ) aExtensions = FILEDIALOG_FILTER_ALL; #endif - sal_Bool bIsInOpenMode = isInOpenMode(); + bool bIsInOpenMode = isInOpenMode(); try { @@ -1953,7 +1953,7 @@ void FileDialogHelper_Impl::saveConfig() try { aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0 ); - sal_Bool bValue = sal_False; + bool bValue = false; aValue >>= bValue; SetToken( aUserData, 1, ' ', OUString::number( (sal_Int32) bValue ) ); @@ -1972,7 +1972,7 @@ void FileDialogHelper_Impl::saveConfig() } else { - sal_Bool bWriteConfig = sal_False; + bool bWriteConfig = false; SvtViewOptions aDlgOpt( E_DIALOG, IODLG_CONFIGNAME ); OUString aUserData(STD_CONFIG_STR); @@ -1989,10 +1989,10 @@ void FileDialogHelper_Impl::saveConfig() try { aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0 ); - sal_Bool bAutoExt = sal_True; + bool bAutoExt = true; aValue >>= bAutoExt; SetToken( aUserData, 0, ' ', OUString::number( (sal_Int32) bAutoExt ) ); - bWriteConfig = sal_True; + bWriteConfig = true; } catch( const IllegalArgumentException& ){} } @@ -2004,7 +2004,7 @@ void FileDialogHelper_Impl::saveConfig() utl::LocalFileHelper::IsLocalFile( aPath ) ) { SetToken( aUserData, 1, ' ', aPath ); - bWriteConfig = sal_True; + bWriteConfig = true; } } @@ -2013,12 +2013,12 @@ void FileDialogHelper_Impl::saveConfig() try { aValue = xDlg->getValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0 ); - sal_Bool bSelection = sal_True; + bool bSelection = true; aValue >>= bSelection; if ( comphelper::string::getTokenCount(aUserData, ' ') < 3 ) aUserData += " "; SetToken( aUserData, 2, ' ', OUString::number( (sal_Int32) bSelection ) ); - bWriteConfig = sal_True; + bWriteConfig = true; } catch( const IllegalArgumentException& ){} } @@ -2042,7 +2042,7 @@ namespace sPath = _rFallback.getToken( _nFallbackToken, ' ' ); // check if the path points to a valid (accessible) directory - sal_Bool bValid = sal_False; + bool bValid = false; if ( !sPath.isEmpty() ) { OUString sPathCheck( sPath ); @@ -2090,12 +2090,12 @@ void FileDialogHelper_Impl::loadConfig() try { // respect the last "insert as link" state - sal_Bool bLink = (sal_Bool) aUserData.getToken( 0, ' ' ).toInt32(); + bool bLink = aUserData.getToken( 0, ' ' ).toInt32(); aValue <<= bLink; xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_LINK, 0, aValue ); // respect the last "show preview" state - sal_Bool bShowPreview = (sal_Bool) aUserData.getToken( 1, ' ' ).toInt32(); + bool bShowPreview = aUserData.getToken( 1, ' ' ).toInt32(); aValue <<= bShowPreview; xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_PREVIEW, 0, aValue ); @@ -2140,7 +2140,7 @@ void FileDialogHelper_Impl::loadConfig() if ( mbHasAutoExt ) { sal_Int32 nFlag = aUserData.getToken( 0, ' ' ).toInt32(); - aValue <<= (sal_Bool) nFlag; + aValue <<= (bool) nFlag; try { xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_AUTOEXTENSION, 0, aValue ); @@ -2151,7 +2151,7 @@ void FileDialogHelper_Impl::loadConfig() if( mbHasSelectionBox ) { sal_Int32 nFlag = aUserData.getToken( 2, ' ' ).toInt32(); - aValue <<= (sal_Bool) nFlag; + aValue <<= (bool) nFlag; try { xDlg->setValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0, aValue ); @@ -2193,7 +2193,7 @@ void FileDialogHelper_Impl::setDefaultValues() } } -sal_Bool FileDialogHelper_Impl::isShowFilterExtensionEnabled() const +bool FileDialogHelper_Impl::isShowFilterExtensionEnabled() const { return !maFilters.empty(); } @@ -2644,7 +2644,7 @@ ErrCode RequestPassword(const SfxFilter* pCurrentFilter, OUString& aURL, SfxItem uno::Reference < task::XInteractionHandler2 > xInteractionHandler = task::InteractionHandler::createWithParent( ::comphelper::getProcessComponentContext(), 0 ); // TODO: need a save way to distinguish MS filters from other filters // for now MS-filters are the only alien filters that support encryption - sal_Bool bMSType = !pCurrentFilter->IsOwnFormat(); + bool bMSType = !pCurrentFilter->IsOwnFormat(); ::comphelper::DocPasswordRequestType eType = bMSType ? ::comphelper::DocPasswordRequestType_MS : ::comphelper::DocPasswordRequestType_STANDARD; diff --git a/sfx2/source/dialog/filedlgimpl.hxx b/sfx2/source/dialog/filedlgimpl.hxx index c59cf8ca914e..0b25cc51e6a5 100644 --- a/sfx2/source/dialog/filedlgimpl.hxx +++ b/sfx2/source/dialog/filedlgimpl.hxx @@ -106,19 +106,19 @@ namespace sfx2 void addFilter( const OUString& rFilterName, const OUString& rExtension ); void addGraphicFilter(); - void enablePasswordBox( sal_Bool bInit ); + void enablePasswordBox( bool bInit ); void updateFilterOptionsBox(); void updateExportButton(); void updateSelectionBox(); void updateVersions(); - void updatePreviewState( sal_Bool _bUpdatePreviewWindow = sal_True ); + void updatePreviewState( bool _bUpdatePreviewWindow = true ); void dispose(); void loadConfig(); void saveConfig(); const SfxFilter* getCurentSfxFilter(); - sal_Bool updateExtendedControl( sal_Int16 _nExtendedControlId, sal_Bool _bEnable ); + bool updateExtendedControl( sal_Int16 _nExtendedControlId, bool _bEnable ); ErrCode getGraphic( const OUString& rURL, Graphic& rGraphic ) const; void setDefaultValues(); @@ -132,9 +132,9 @@ namespace sfx2 void setControlHelpIds( const sal_Int16* _pControlId, const char** _pHelpId ); - sal_Bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); + bool CheckFilterOptionsCapability( const SfxFilter* _pFilter ); - sal_Bool isInOpenMode() const; + bool isInOpenMode() const; OUString getCurrentFilterUIName() const; void LoadLastUsedFilter( const OUString& _rContextIdentifier ); @@ -208,7 +208,7 @@ namespace sfx2 ErrCode getGraphic( Graphic& rGraphic ) const; void createMatcher( const OUString& rFactory ); - sal_Bool isShowFilterExtensionEnabled() const; + bool isShowFilterExtensionEnabled() const; void addFilterPair( const OUString& rFilter, const OUString& rFilterWithExtension ); OUString getFilterName( const OUString& rFilterWithExtension ) const; @@ -216,8 +216,8 @@ namespace sfx2 void SetContext( FileDialogHelper::Context _eNewContext ); - inline sal_Bool isSystemFilePicker() const { return mbSystemPicker; } - inline sal_Bool isPasswordEnabled() const { return mbIsPwdEnabled; } + inline bool isSystemFilePicker() const { return mbSystemPicker; } + inline bool isPasswordEnabled() const { return mbIsPwdEnabled; } }; } // end of namespace sfx2 diff --git a/sfx2/source/dialog/filtergrouping.cxx b/sfx2/source/dialog/filtergrouping.cxx index 29be1aedef9f..8e9cd78efd64 100644 --- a/sfx2/source/dialog/filtergrouping.cxx +++ b/sfx2/source/dialog/filtergrouping.cxx @@ -537,7 +537,7 @@ namespace sfx2 FilterGroupEntryReferrer::mapped_type aLookingFor; FindGroupEntry( FilterGroupEntryReferrer::mapped_type _rLookingFor ) : aLookingFor( _rLookingFor ) { } - sal_Bool operator() ( const MapGroupEntry2GroupEntry::value_type& _rMapEntry ) + bool operator() ( const MapGroupEntry2GroupEntry::value_type& _rMapEntry ) { return _rMapEntry.first == aLookingFor ? sal_True : sal_False; } @@ -753,7 +753,7 @@ namespace sfx2 void operator() ( const FilterDescriptor& _rFilterEntry ) { OUString sDisplayText = m_bAddExtension - ? addExtension( _rFilterEntry.First, _rFilterEntry.Second, sal_True, *m_pFileDlgImpl ) + ? addExtension( _rFilterEntry.First, _rFilterEntry.Second, true, *m_pFileDlgImpl ) : _rFilterEntry.First; m_xFilterManager->appendFilter( sDisplayText, _rFilterEntry.Second ); } @@ -764,9 +764,9 @@ namespace sfx2 - sal_Bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) + bool lcl_hasAllFilesFilter( TSortedFilterList& _rFilterMatcher, OUString& /* [out] */ _rAllFilterName ) { - sal_Bool bHasAll = sal_False; + bool bHasAll = false; _rAllFilterName = SfxResId( STR_SFX_FILTERNAME_ALL ).toString(); @@ -774,7 +774,7 @@ namespace sfx2 for ( const SfxFilter* pFilter = _rFilterMatcher.First(); pFilter && !bHasAll; pFilter = _rFilterMatcher.Next() ) { if ( pFilter->GetUIName() == _rAllFilterName ) - bHasAll = sal_True; + bHasAll = true; } return bHasAll; } @@ -838,7 +838,7 @@ namespace sfx2 StringPair* pFilters = aFilters.getArray(); StringPair* pEnd = pFilters + aFilters.getLength(); for ( ; pFilters != pEnd; ++pFilters ) - pFilters->First = addExtension( pFilters->First, pFilters->Second, sal_True, *m_pFileDlgImpl ); + pFilters->First = addExtension( pFilters->First, pFilters->Second, true, *m_pFileDlgImpl ); } m_xFilterGroupManager->appendFilterGroup( OUString(), aFilters ); } @@ -928,7 +928,7 @@ namespace sfx2 // (and always the first if there are more than one) using comphelper::string::getToken; sExtension = getToken(pDefaultFilter->GetWildcard().getGlob(), 0, ';'); - sUIName = addExtension( pDefaultFilter->GetUIName(), sExtension, sal_False, _rFileDlgImpl ); + sUIName = addExtension( pDefaultFilter->GetUIName(), sExtension, false, _rFileDlgImpl ); try { _rxFilterManager->appendFilter( sUIName, sExtension ); @@ -948,7 +948,7 @@ namespace sfx2 // Only use one extension (#i32434#) // (and always the first if there are more than one) sExtension = getToken(pFilter->GetWildcard().getGlob(), 0, ';'); - sUIName = addExtension( pFilter->GetUIName(), sExtension, sal_False, _rFileDlgImpl ); + sUIName = addExtension( pFilter->GetUIName(), sExtension, false, _rFileDlgImpl ); try { _rxFilterManager->appendFilter( sUIName, sExtension ); @@ -1054,7 +1054,7 @@ namespace sfx2 { aFilters[i].First = addExtension( aImportantFilterGroup[i].aUIName, aImportantFilterGroup[i].aWildcard, - sal_False, _rFileDlgImpl ); + false, _rFileDlgImpl ); aFilters[i].Second = aImportantFilterGroup[i].aWildcard; } @@ -1074,7 +1074,7 @@ namespace sfx2 { aFilters[i].First = addExtension( aFilterGroup[i].aUIName, aFilterGroup[i].aWildcard, - sal_False, _rFileDlgImpl ); + false, _rFileDlgImpl ); aFilters[i].Second = aFilterGroup[i].aWildcard; } @@ -1098,7 +1098,7 @@ namespace sfx2 { OUString aUIName = addExtension( aImportantFilterGroup[n].aUIName, aImportantFilterGroup[n].aWildcard, - sal_False, _rFileDlgImpl ); + false, _rFileDlgImpl ); _rxFilterManager->appendFilter( aUIName, aImportantFilterGroup[n].aWildcard ); if ( _rFirstNonEmpty.isEmpty() ) _rFirstNonEmpty = sUIName; @@ -1116,7 +1116,7 @@ namespace sfx2 { OUString aUIName = addExtension( aFilterGroup[n].aUIName, aFilterGroup[n].aWildcard, - sal_False, _rFileDlgImpl ); + false, _rFileDlgImpl ); _rxFilterManager->appendFilter( aUIName, aFilterGroup[n].aWildcard ); if ( _rFirstNonEmpty.isEmpty() ) _rFirstNonEmpty = sUIName; @@ -1175,7 +1175,7 @@ namespace sfx2 OUString addExtension( const OUString& _rDisplayText, const OUString& _rExtension, - sal_Bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl ) + bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl ) { static OUString sAllFilter( "(*.*)" ); static OUString sOpenBracket( " (" ); diff --git a/sfx2/source/dialog/filtergrouping.hxx b/sfx2/source/dialog/filtergrouping.hxx index 65daf82b56ae..12aab3ac37fb 100644 --- a/sfx2/source/dialog/filtergrouping.hxx +++ b/sfx2/source/dialog/filtergrouping.hxx @@ -83,7 +83,7 @@ namespace sfx2 OUString addExtension( const OUString& _rDisplayText, const OUString& _rExtension, - sal_Bool _bForOpen, + bool _bForOpen, FileDialogHelper_Impl& _rFileDlgImpl ); diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx index 8c0a3b72b3db..65b558f32b4b 100644 --- a/sfx2/source/dialog/mailmodel.cxx +++ b/sfx2/source/dialog/mailmodel.cxx @@ -130,7 +130,7 @@ void PrepareListener_Impl::disposing(const css::lang::EventObject& /*rEvent*/) t static const char PDF_DOCUMENT_TYPE[] = "pdf_Portable_Document_Format"; -sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XModel >& xModel ) +bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XModel >& xModel ) { try { @@ -138,7 +138,7 @@ sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XMode if ( xPropSet.is() ) { Any a = xPropSet->getPropertyValue("HasValidSignatures"); - sal_Bool bReturn = sal_Bool(); + bool bReturn; if ( a >>= bReturn ) return bReturn; } @@ -151,7 +151,7 @@ sal_Bool HasDocumentValidSignature( const css::uno::Reference< css::frame::XMode { } - return sal_False; + return false; } SfxMailModel::SaveResult SfxMailModel::ShowFilterOptionsDialog( @@ -660,7 +660,7 @@ SfxMailModel::SaveResult SfxMailModel::SaveDocumentAsFormat( // We need 1:1 copy of the document to preserve an added signature. aArgs.realloc( ++nNumArgs ); aArgs[nNumArgs-1].Name = "CopyStreamIfPossible"; - aArgs[nNumArgs-1].Value = css::uno::makeAny( (sal_Bool)sal_True ); + aArgs[nNumArgs-1].Value = css::uno::makeAny( true ); try { @@ -864,11 +864,11 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: } xSimpleMailMessage->setAttachement( aAttachmentSeq ); - sal_Bool bSend( sal_False ); + bool bSend( false ); try { xSimpleMailClient->sendSimpleMailMessage( xSimpleMailMessage, nSendFlags ); - bSend = sal_True; + bSend = true; } catch ( IllegalArgumentException& ) { @@ -877,7 +877,7 @@ SfxMailModel::SendMailResult SfxMailModel::Send( const css::uno::Reference< css: { } - if ( bSend == sal_False ) + if ( bSend == false ) { css::uno::Reference< css::awt::XWindow > xParentWindow = xFrame->getContainerWindow(); diff --git a/sfx2/source/dialog/mgetempl.cxx b/sfx2/source/dialog/mgetempl.cxx index a8a94f88df4e..de85449ae102 100644 --- a/sfx2/source/dialog/mgetempl.cxx +++ b/sfx2/source/dialog/mgetempl.cxx @@ -267,7 +267,7 @@ void SfxManageStyleSheetPage::UpdateName_Impl( ListBox* pBox, if ( pBox->IsEnabled() ) { // it is the current entry, which name was modified - const sal_Bool bSelect = pBox->GetSelectEntry() == aBuf; + const bool bSelect = pBox->GetSelectEntry() == aBuf; pBox->RemoveEntry( aBuf ); pBox->InsertEntry( rNew ); diff --git a/sfx2/source/dialog/partwnd.cxx b/sfx2/source/dialog/partwnd.cxx index f4ed16182542..9dd7b9ca5a33 100644 --- a/sfx2/source/dialog/partwnd.cxx +++ b/sfx2/source/dialog/partwnd.cxx @@ -159,9 +159,9 @@ void SfxPartDockWnd_Impl::Resize() -sal_Bool SfxPartDockWnd_Impl::QueryClose() +bool SfxPartDockWnd_Impl::QueryClose() { - sal_Bool bClose = sal_True; + bool bClose = true; SfxChildWindow* pChild = GetChildWindow_Impl(); if( pChild ) { diff --git a/sfx2/source/dialog/printopt.cxx b/sfx2/source/dialog/printopt.cxx index 9e166abdd8f9..a7c67bbeefb4 100644 --- a/sfx2/source/dialog/printopt.cxx +++ b/sfx2/source/dialog/printopt.cxx @@ -32,7 +32,7 @@ #include <sfx2/printopt.hxx> static sal_uInt16 aDPIArray[] = { 72, 96, 150, 200, 300, 600 }; -static sal_Bool bOutputForPrinter = sal_True; +static bool bOutputForPrinter = true; #define DPI_COUNT (sizeof(aDPIArray)/sizeof(aDPIArray[0 ])) @@ -248,7 +248,7 @@ void SfxCommonPrintOptionsTabPage::ImplSaveControls( PrinterOptions* pCurrentOpt IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox*, pBox ) { (void)pBox; //unused - const sal_Bool bReduceTransparency = m_pReduceTransparencyCB->IsChecked(); + const bool bReduceTransparency = m_pReduceTransparencyCB->IsChecked(); m_pReduceTransparencyAutoRB->Enable( bReduceTransparency ); m_pReduceTransparencyNoneRB->Enable( bReduceTransparency ); @@ -261,7 +261,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceTransparencyCBHdl, CheckBox* IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, pBox ) { (void)pBox; //unused - const sal_Bool bEnable = m_pReduceGradientsCB->IsChecked(); + const bool bEnable = m_pReduceGradientsCB->IsChecked(); m_pReduceGradientsStripesRB->Enable( bEnable ); m_pReduceGradientsColorRB->Enable( bEnable ); @@ -275,7 +275,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceGradientsCBHdl, CheckBox*, p IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBox ) { (void)pBox; //unused - const sal_Bool bEnable = m_pReduceBitmapsCB->IsChecked(); + const bool bEnable = m_pReduceBitmapsCB->IsChecked(); m_pReduceBitmapsOptimalRB->Enable( bEnable ); m_pReduceBitmapsNormalRB->Enable( bEnable ); @@ -291,7 +291,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ClickReduceBitmapsCBHdl, CheckBox*, pBo IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, RadioButton*, pButton ) { (void)pButton; //unused - const sal_Bool bEnable = m_pReduceGradientsCB->IsChecked() && m_pReduceGradientsStripesRB->IsChecked(); + const bool bEnable = m_pReduceGradientsCB->IsChecked() && m_pReduceGradientsStripesRB->IsChecked(); m_pReduceGradientsStepCountNF->Enable( bEnable ); @@ -301,7 +301,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceGradientsStripesRBHdl, Radi IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleReduceBitmapsResolutionRBHdl, RadioButton*, pButton ) { (void)pButton; //unused - const sal_Bool bEnable = m_pReduceBitmapsCB->IsChecked() && m_pReduceBitmapsResolutionRB->IsChecked(); + const bool bEnable = m_pReduceBitmapsCB->IsChecked() && m_pReduceBitmapsResolutionRB->IsChecked(); m_pReduceBitmapsResolutionLB->Enable( bEnable ); @@ -313,7 +313,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrinterRBHdl, RadioButton*, if( pButton->IsChecked() ) { ImplUpdateControls( &maPrinterOptions ); - bOutputForPrinter = sal_True; + bOutputForPrinter = true; } else ImplSaveControls( &maPrinterOptions ); @@ -326,7 +326,7 @@ IMPL_LINK( SfxCommonPrintOptionsTabPage, ToggleOutputPrintFileRBHdl, RadioButton if( pButton->IsChecked() ) { ImplUpdateControls( &maPrintFileOptions ); - bOutputForPrinter = sal_False; + bOutputForPrinter = false; m_pPDFCB->Disable(); } else diff --git a/sfx2/source/dialog/recfloat.cxx b/sfx2/source/dialog/recfloat.cxx index 83e85bd47c16..9b8faba9f52d 100644 --- a/sfx2/source/dialog/recfloat.cxx +++ b/sfx2/source/dialog/recfloat.cxx @@ -218,7 +218,7 @@ SfxRecordingFloat_Impl::~SfxRecordingFloat_Impl() bool SfxRecordingFloat_Impl::Close() { - sal_Bool bRet = SfxFloatingWindow::Close(); + bool bRet = SfxFloatingWindow::Close(); return bRet; } diff --git a/sfx2/source/dialog/securitypage.cxx b/sfx2/source/dialog/securitypage.cxx index 9fb9fb25b60b..fe41bedc485e 100644 --- a/sfx2/source/dialog/securitypage.cxx +++ b/sfx2/source/dialog/securitypage.cxx @@ -268,7 +268,7 @@ void SfxSecurityPage_Impl::Reset_Impl( const SfxItemSet & ) } } - sal_Bool bIsReadonly = pCurDocShell->IsReadOnly(); + bool bIsReadonly = pCurDocShell->IsReadOnly(); if (pCurDocShell->HasSecurityOptOpenReadOnly() && !bIsHTMLDoc) { m_pOpenReadonlyCB->Check( pCurDocShell->IsSecurityOptOpenReadOnly() ); diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index 2f3480a230ea..ba5fa5fb6b19 100644 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -74,7 +74,7 @@ namespace { private: SfxSplitWindow& mrSplitWindow; - const sal_Bool mbUpdateMode; + const bool mbUpdateMode; }; } @@ -82,8 +82,8 @@ struct SfxDock_Impl { sal_uInt16 nType; SfxDockingWindow* pWin; // SplitWindow has this window - sal_Bool bNewLine; - sal_Bool bHide; // SplitWindow had this window + bool bNewLine; + bool bHide; // SplitWindow had this window long nSize; }; @@ -109,10 +109,10 @@ class SfxEmptySplitWin_Impl : public SplitWindow friend class SfxSplitWindow; SfxSplitWindow* pOwner; - sal_Bool bFadeIn; - sal_Bool bAutoHide; - sal_Bool bSplit; - sal_Bool bEndAutoHide; + bool bFadeIn; + bool bAutoHide; + bool bSplit; + bool bEndAutoHide; Timer aTimer; Point aLastPos; sal_uInt16 nState; @@ -120,10 +120,10 @@ friend class SfxSplitWindow; SfxEmptySplitWin_Impl( SfxSplitWindow *pParent ) : SplitWindow( pParent->GetParent(), WinBits( WB_BORDER | WB_3DLOOK ) ) , pOwner( pParent ) - , bFadeIn( sal_False ) - , bAutoHide( sal_False ) - , bSplit( sal_False ) - , bEndAutoHide( sal_False ) + , bFadeIn( false ) + , bAutoHide( false ) + , bSplit( false ) + , bEndAutoHide( false ) , nState( 1 ) { aTimer.SetTimeoutHdl( @@ -168,7 +168,7 @@ void SfxEmptySplitWin_Impl::AutoHide() { pOwner->SetPinned_Impl( !pOwner->bPinned ); pOwner->SaveConfig_Impl(); - bAutoHide = sal_True; + bAutoHide = true; FadeIn(); } @@ -176,7 +176,7 @@ void SfxEmptySplitWin_Impl::FadeIn() { if (!bAutoHide ) bAutoHide = IsFadeNoButtonMode(); - pOwner->SetFadeIn_Impl( sal_True ); + pOwner->SetFadeIn_Impl( true ); pOwner->Show_Impl(); if ( bAutoHide ) { @@ -206,7 +206,7 @@ void SfxEmptySplitWin_Impl::MouseMove( const MouseEvent& rMEvt ) SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, - SfxWorkWindow *pW, sal_Bool bWithButtons, WinBits nBits ) + SfxWorkWindow *pW, bool bWithButtons, WinBits nBits ) /* [Description] @@ -220,8 +220,8 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, eAlign(eAl), pWorkWin(pW), pDockArr( new SfxDockArr_Impl ), - bLocked(sal_False), - bPinned(sal_True), + bLocked(false), + bPinned(true), pEmptyWin(NULL), pActive(NULL) { @@ -246,7 +246,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, break; case SFX_ALIGN_BOTTOM: eTbxAlign = WINDOWALIGN_BOTTOM; - bPinned = sal_True; + bPinned = true; break; default: eTbxAlign = WINDOWALIGN_TOP; // some sort of default... @@ -257,7 +257,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, pEmptyWin = new SfxEmptySplitWin_Impl( this ); if ( bPinned ) { - pEmptyWin->bFadeIn = sal_True; + pEmptyWin->bFadeIn = true; pEmptyWin->nState = 2; } @@ -276,8 +276,8 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, { pEmptyWin->nState = (sal_uInt16) aWinData.getToken( 1, ',' ).toInt32(); if ( pEmptyWin->nState & 2 ) - pEmptyWin->bFadeIn = sal_True; - bPinned = sal_True; // always assume pinned - floating mode not used anymore + pEmptyWin->bFadeIn = true; + bPinned = true; // always assume pinned - floating mode not used anymore sal_uInt16 i=2; sal_uInt16 nCount = (sal_uInt16) aWinData.getToken(i++, ',').toInt32(); @@ -285,8 +285,8 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, { SfxDock_Impl *pDock = new SfxDock_Impl; pDock->pWin = 0; - pDock->bNewLine = sal_False; - pDock->bHide = sal_True; + pDock->bNewLine = false; + pDock->bHide = true; pDock->nType = (sal_uInt16) aWinData.getToken(i++, ',').toInt32(); if ( !pDock->nType ) { @@ -299,7 +299,7 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, break; } else - pDock->bNewLine = sal_True; + pDock->bNewLine = true; } pDockArr->insert(pDockArr->begin() + n, pDock); @@ -308,8 +308,8 @@ SfxSplitWindow::SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, } else { - bPinned = sal_True; - pEmptyWin->bFadeIn = sal_True; + bPinned = true; + pEmptyWin->bFadeIn = true; pEmptyWin->nState = 2; } @@ -382,8 +382,8 @@ void SfxSplitWindow::StartSplit() if ( pEmptyWin ) { - pEmptyWin->bFadeIn = sal_True; - pEmptyWin->bSplit = sal_True; + pEmptyWin->bFadeIn = true; + pEmptyWin->bSplit = true; } Rectangle aRect = pWorkWin->GetFreeArea( !bPinned ); @@ -420,7 +420,7 @@ void SfxSplitWindow::SplitResize() void SfxSplitWindow::Split() { if ( pEmptyWin ) - pEmptyWin->bSplit = sal_False; + pEmptyWin->bSplit = false; SplitWindow::Split(); @@ -480,8 +480,8 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize short nLine = -1; // so that the first window cab set nline to 0 sal_uInt16 nL; sal_uInt16 nPos = 0; - sal_Bool bNewLine = sal_True; - sal_Bool bSaveConfig = sal_False; + bool bNewLine = true; + bool bSaveConfig = false; SfxDock_Impl *pFoundDock=0; sal_uInt16 nCount = pDockArr->size(); for ( sal_uInt16 n=0; n<nCount; n++ ) @@ -496,7 +496,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize // New line nPos = 0; - bNewLine = sal_True; + bNewLine = true; } if ( pDock->pWin ) @@ -516,7 +516,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize } // Line is opened - bNewLine = sal_False; + bNewLine = false; if ( pFoundDock ) break; } @@ -542,18 +542,18 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize { // Not found, insert at end pFoundDock = new SfxDock_Impl; - pFoundDock->bHide = sal_True; + pFoundDock->bHide = true; pDockArr->push_back( pFoundDock ); pFoundDock->nType = pDockWin->GetType(); nLine++; nPos = 0; - bNewLine = sal_True; + bNewLine = true; pFoundDock->bNewLine = bNewLine; - bSaveConfig = sal_True; + bSaveConfig = true; } pFoundDock->pWin = pDockWin; - pFoundDock->bHide = sal_False; + pFoundDock->bHide = false; InsertWindow_Impl( pFoundDock, rSize, nLine, nPos, bNewLine ); if ( bSaveConfig ) SaveConfig_Impl(); @@ -561,22 +561,22 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize -void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSave) +void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, bool bSave) { // The docking window is no longer stored in the internal data. SfxDock_Impl *pDock=0; sal_uInt16 nCount = pDockArr->size(); - sal_Bool bFound = sal_False; + bool bFound = false; for ( sal_uInt16 n=0; n<nCount; n++ ) { pDock = (*pDockArr)[n]; if ( pDock->nType == pDockWin->GetType() ) { if ( pDock->bNewLine && n<nCount-1 ) - (*pDockArr)[n+1]->bNewLine = sal_True; + (*pDockArr)[n+1]->bNewLine = true; // Window has a position, this we forget - bFound = sal_True; + bFound = true; pDockArr->erase(pDockArr->begin() + n); break; } @@ -592,7 +592,7 @@ void SfxSplitWindow::ReleaseWindow_Impl(SfxDockingWindow *pDockWin, sal_Bool bSa void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, - sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine) + sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) /* [Description] @@ -616,7 +616,7 @@ void SfxSplitWindow::MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize, - sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine) + sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) /* [Description] @@ -624,9 +624,9 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize given position and size. */ { - ReleaseWindow_Impl( pDockWin, sal_False ); + ReleaseWindow_Impl( pDockWin, false ); SfxDock_Impl *pDock = new SfxDock_Impl; - pDock->bHide = sal_False; + pDock->bHide = false; pDock->nType = pDockWin->GetType(); pDock->bNewLine = bNewLine; pDock->pWin = pDockWin; @@ -664,8 +664,8 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize DBG_ASSERT(pD->bNewLine, "No new line?"); // The posption is pushed to nPos==0 - pD->bNewLine = sal_False; - pDock->bNewLine = sal_True; + pD->bNewLine = false; + pDock->bNewLine = true; } nInsertPos = n != 0 ? nLastWindowIdx + 1 : 0; // ignore all non-windows after the last window @@ -687,7 +687,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, const Size& rSize, - sal_uInt16 nLine, sal_uInt16 nPos, sal_Bool bNewLine) + sal_uInt16 nLine, sal_uInt16 nPos, bool bNewLine) /* [Description] @@ -740,7 +740,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, // "pixel" actually only makes sense if also items with percentage or // relative sizes are present. nItemBits |= SWIB_PERCENTSIZE; - bLocked = sal_True; + bLocked = true; sal_uInt16 nSet = GetItemId( nLine ); InsertItem( pDockWin->GetType(), pDockWin, nWinSize, nPos, nSet, nItemBits ); @@ -752,21 +752,21 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, // caues by SfxDockingwindow (->SfxWorkWindow::ConfigChild_Impl) if ( !bPinned && !IsFloatingMode() ) { - bPinned = sal_True; - sal_Bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0; - pEmptyWin->bFadeIn = sal_False; - SetPinned_Impl( sal_False ); + bPinned = true; + bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0; + pEmptyWin->bFadeIn = false; + SetPinned_Impl( false ); pEmptyWin->Actualize(); OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering empty Splitwindow" ); - pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE; + pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, true )->nVisible = CHILD_VISIBLE; pWorkWin->ArrangeChildren_Impl(); if ( bFadeIn ) FadeIn(); } else { - sal_Bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0; - pEmptyWin->bFadeIn = sal_False; + bool bFadeIn = ( pEmptyWin->nState & 2 ) != 0; + pEmptyWin->bFadeIn = false; pEmptyWin->Actualize(); #ifdef DBG_UTIL if ( !bPinned || !pEmptyWin->bFadeIn ) @@ -778,7 +778,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, OSL_TRACE( "SfxSplitWindow::InsertWindow_Impl - registering real Splitwindow" ); } #endif - pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, sal_True )->nVisible = CHILD_VISIBLE; + pWorkWin->RegisterChild_Impl( *GetSplitWindow(), eAlign, true )->nVisible = CHILD_VISIBLE; pWorkWin->ArrangeChildren_Impl(); if ( bFadeIn ) FadeIn(); @@ -788,7 +788,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, } delete pDeactivateUpdateMode; - bLocked = sal_False; + bLocked = false; // workaround insuffiency of <SplitWindow> regarding dock layouting: // apply FIXED item size as 'original' item size to improve layouting of undock-dock-cycle of a window @@ -817,7 +817,7 @@ void SfxSplitWindow::InsertWindow_Impl( SfxDock_Impl* pDock, -void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide ) +void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, bool bHide ) /* [Description] @@ -868,7 +868,7 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide ) // Remove Windows, and if it was the last of the line, then also remove // the line (line = itemset) DeactivateUpdateMode* pDeactivateUpdateMode = new DeactivateUpdateMode( *this ); - bLocked = sal_True; + bLocked = true; RemoveItem( pDockWin->GetType() ); @@ -876,12 +876,12 @@ void SfxSplitWindow::RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide ) RemoveItem( nSet ); delete pDeactivateUpdateMode; - bLocked = sal_False; + bLocked = false; }; -sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, +bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, sal_uInt16& rLine, sal_uInt16& rPos ) const /* [Description] @@ -892,16 +892,16 @@ sal_Bool SfxSplitWindow::GetWindowPos( const SfxDockingWindow* pWindow, { sal_uInt16 nSet = GetSet ( pWindow->GetType() ); if ( nSet == SPLITWINDOW_ITEM_NOTFOUND ) - return sal_False; + return false; rPos = GetItemPos( pWindow->GetType(), nSet ); rLine = GetItemPos( nSet ); - return sal_True; + return true; } -sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, +bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, sal_uInt16& rLine, sal_uInt16& rPos ) const /* [Description] @@ -912,12 +912,12 @@ sal_Bool SfxSplitWindow::GetWindowPos( const Point& rTestPos, { sal_uInt16 nId = GetItemId( rTestPos ); if ( nId == 0 ) - return sal_False; + return false; sal_uInt16 nSet = GetSet ( nId ); rPos = GetItemPos( nId, nSet ); rLine = GetItemPos( nSet ); - return sal_True; + return true; } @@ -984,11 +984,11 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) if ( pTimer ) pTimer->Stop(); - if ( CursorIsOverRect( sal_False ) || !pTimer ) + if ( CursorIsOverRect( false ) || !pTimer ) { // If the cursor is within the window, display the SplitWindow and set // up the timer for close - pEmptyWin->bAutoHide = sal_True; + pEmptyWin->bAutoHide = true; if ( !IsVisible() ) pEmptyWin->FadeIn(); @@ -1011,7 +1011,7 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) // (user has simply moved the mouse over pEmptyWin) if ( IsVisible() ) { - pEmptyWin->bEndAutoHide = sal_False; + pEmptyWin->bEndAutoHide = false; if ( !Application::IsInModalMode() && !PopupMenu::IsInExecute() && !pEmptyWin->bSplit && !HasChildPathFocus( true ) ) @@ -1020,7 +1020,7 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) // Splitting is done, in any case, do not close. Even as long // as one of the Children has the focus, the window remains // open. - pEmptyWin->bEndAutoHide = sal_True; + pEmptyWin->bEndAutoHide = true; } if ( pEmptyWin->bEndAutoHide ) @@ -1052,9 +1052,9 @@ IMPL_LINK( SfxSplitWindow, TimerHdl, Timer*, pTimer) -sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const +bool SfxSplitWindow::CursorIsOverRect( bool bForceAdding ) const { - sal_Bool bVisible = IsVisible(); + bool bVisible = IsVisible(); // Also, take the collapsed SplitWindow into account Point aPos = pEmptyWin->GetParent()->OutputToScreenPixel( pEmptyWin->GetPosPixel() ); @@ -1087,8 +1087,8 @@ sal_Bool SfxSplitWindow::CursorIsOverRect( sal_Bool bForceAdding ) const } if ( aRect.IsInside( OutputToScreenPixel( ((Window*)this)->GetPointerPosPixel() ) ) ) - return sal_True; - return sal_False; + return true; + return false; } @@ -1101,19 +1101,19 @@ SplitWindow* SfxSplitWindow::GetSplitWindow() } -sal_Bool SfxSplitWindow::IsFadeIn() const +bool SfxSplitWindow::IsFadeIn() const { return pEmptyWin->bFadeIn; } -sal_Bool SfxSplitWindow::IsAutoHide( sal_Bool bSelf ) const +bool SfxSplitWindow::IsAutoHide( bool bSelf ) const { return bSelf ? pEmptyWin->bAutoHide && !pEmptyWin->bEndAutoHide : pEmptyWin->bAutoHide; } -void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn ) +void SfxSplitWindow::SetPinned_Impl( bool bOn ) { if ( bPinned == bOn ) return; @@ -1133,7 +1133,7 @@ void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn ) Hide(); pEmptyWin->Actualize(); OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - registering empty Splitwindow" ); - pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE; + pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, true )->nVisible = CHILD_VISIBLE; } Point aPos( GetPosPixel() ); @@ -1158,7 +1158,7 @@ void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn ) pWorkWin->ReleaseChild_Impl( *pEmptyWin ); pEmptyWin->Hide(); OSL_TRACE( "SfxSplitWindow::SetPinned_Impl - registering real Splitwindow" ); - pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE; + pWorkWin->RegisterChild_Impl( *this, eAlign, true )->nVisible = CHILD_VISIBLE; } } @@ -1168,7 +1168,7 @@ void SfxSplitWindow::SetPinned_Impl( sal_Bool bOn ) -void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn ) +void SfxSplitWindow::SetFadeIn_Impl( bool bOn ) { if ( bOn == pEmptyWin->bFadeIn ) return; @@ -1192,14 +1192,14 @@ void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn ) pWorkWin->ReleaseChild_Impl( *pEmptyWin ); pEmptyWin->Hide(); OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering real Splitwindow" ); - pWorkWin->RegisterChild_Impl( *this, eAlign, sal_True )->nVisible = CHILD_VISIBLE; + pWorkWin->RegisterChild_Impl( *this, eAlign, true )->nVisible = CHILD_VISIBLE; pWorkWin->ArrangeChildren_Impl(); pWorkWin->ShowChildren_Impl(); } } else { - pEmptyWin->bAutoHide = sal_False; + pEmptyWin->bAutoHide = false; pEmptyWin->nState &= ~2; if ( !IsFloatingMode() ) { @@ -1209,7 +1209,7 @@ void SfxSplitWindow::SetFadeIn_Impl( sal_Bool bOn ) Hide(); pEmptyWin->Actualize(); OSL_TRACE( "SfxSplitWindow::SetFadeIn_Impl - registering empty Splitwindow" ); - pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, sal_True )->nVisible = CHILD_VISIBLE; + pWorkWin->RegisterChild_Impl( *pEmptyWin, eAlign, true )->nVisible = CHILD_VISIBLE; pWorkWin->ArrangeChildren_Impl(); pWorkWin->ShowChildren_Impl(); pWorkWin->ArrangeAutoHideWindows( this ); @@ -1229,13 +1229,13 @@ void SfxSplitWindow::AutoHide() if ( !bPinned ) { // It "floats", thus dock it again - SetPinned_Impl( sal_True ); + SetPinned_Impl( true ); pWorkWin->ArrangeChildren_Impl(); } else { // In "limbo" - SetPinned_Impl( sal_False ); + SetPinned_Impl( false ); pWorkWin->ArrangeChildren_Impl(); pWorkWin->ArrangeAutoHideWindows( this ); } @@ -1248,11 +1248,11 @@ void SfxSplitWindow::FadeOut_Impl() { if ( pEmptyWin->aTimer.IsActive() ) { - pEmptyWin->bAutoHide = sal_False; + pEmptyWin->bAutoHide = false; pEmptyWin->aTimer.Stop(); } - SetFadeIn_Impl( sal_False ); + SetFadeIn_Impl( false ); Show_Impl(); } @@ -1264,7 +1264,7 @@ void SfxSplitWindow::FadeOut() void SfxSplitWindow::FadeIn() { - SetFadeIn_Impl( sal_True ); + SetFadeIn_Impl( true ); Show_Impl(); } @@ -1279,7 +1279,7 @@ void SfxSplitWindow::Show_Impl() } } -sal_Bool SfxSplitWindow::ActivateNextChild_Impl( sal_Bool bForward ) +bool SfxSplitWindow::ActivateNextChild_Impl( bool bForward ) { // If no pActive, go to first and last window (!bForward is first // decremented in the loop) @@ -1313,7 +1313,7 @@ sal_Bool SfxSplitWindow::ActivateNextChild_Impl( sal_Bool bForward ) if ( pD->pWin ) { pD->pWin->GrabFocus(); - return sal_True; + return true; } } } @@ -1326,12 +1326,12 @@ sal_Bool SfxSplitWindow::ActivateNextChild_Impl( sal_Bool bForward ) if ( pD->pWin ) { pD->pWin->GrabFocus(); - return sal_True; + return true; } } } - return sal_False; + return false; } void SfxSplitWindow::SetActiveWindow_Impl( SfxDockingWindow* pWin ) diff --git a/sfx2/source/dialog/srchdlg.cxx b/sfx2/source/dialog/srchdlg.cxx index 51744cf97cf3..f88bdd69104a 100644 --- a/sfx2/source/dialog/srchdlg.cxx +++ b/sfx2/source/dialog/srchdlg.cxx @@ -141,7 +141,7 @@ void SearchDialog::SetFocusOnEdit() bool SearchDialog::Close() { - sal_Bool bRet = ModelessDialog::Close(); + bool bRet = ModelessDialog::Close(); m_aCloseHdl.Call( this ); return bRet; } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index eb332ee46f59..0c8594029249 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -231,7 +231,7 @@ void DropListBox_Impl::MouseButtonDown( const MouseEvent& rMEvt ) { nModifier = rMEvt.GetModifier(); - sal_Bool bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), true ) ); + bool bHitEmptySpace = ( NULL == GetEntry( rMEvt.GetPosPixel(), true ) ); if( bHitEmptySpace && ( rMEvt.GetClicks() == 2 ) && rMEvt.IsMod1() ) Control::MouseButtonDown( rMEvt ); else @@ -269,7 +269,7 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt ) sal_uInt32 nFormatCount = aHelper.GetFormatCount(); if ( pDocShell ) { - sal_Bool bFormatFound = sal_False; + bool bFormatFound = false; for ( sal_uInt32 i = 0; i < nFormatCount; ++i ) { @@ -282,7 +282,7 @@ sal_Int8 DropListBox_Impl::ExecuteDrop( const ExecuteDropEvent& rEvt ) { PostUserEvent( LINK( this, DropListBox_Impl, OnAsyncExecuteDrop ), 0 ); - bFormatFound = sal_True; + bFormatFound = true; nRet = rEvt.mnAction; break; } @@ -357,8 +357,8 @@ PopupMenu* SfxActionListBox::CreateContextMenu( void ) if( !( GetSelectionCount() > 0 ) ) { - pDialog->EnableEdit( sal_False ); - pDialog->EnableDel( sal_False ); + pDialog->EnableEdit( false ); + pDialog->EnableDel( false ); } return pDialog->CreateContextMenu(); } @@ -577,7 +577,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, return sal_False; aParent = GetEntryText(pTarget); aStyle = GetEntryText(pEntry); - const sal_Bool bRet = (sal_Bool)aDropLink.Call(this); + const bool bRet = (bool)aDropLink.Call(this); rpNewParent = pTarget; lPos=0; IntlWrapper aIntlWrapper( Application::GetSettings().GetLanguageTag() ); @@ -587,7 +587,7 @@ sal_Bool StyleTreeListBox_Impl::NotifyMoving(SvTreeListEntry* pTarget, GetEntryText(pTmpEntry),GetEntryText(pEntry)) < 0; pTmpEntry=NextSibling(pTmpEntry),lPos++) ; - return bRet? (sal_Bool)2: sal_False; + return bRet ? (sal_Bool)2 : sal_False; } @@ -656,11 +656,11 @@ struct StyleTree_Impl OUString aName; OUString aParent; StyleTreeArr_Impl *pChildren; - sal_Bool bIsExpanded; - sal_Bool HasParent() const { return !aParent.isEmpty(); } + bool bIsExpanded; + bool HasParent() const { return !aParent.isEmpty(); } StyleTree_Impl(const OUString &rName, const OUString &rParent): - aName(rName), aParent(rParent), pChildren(0), bIsExpanded(0) {} + aName(rName), aParent(rParent), pChildren(0), bIsExpanded(false) {} ~StyleTree_Impl(); void Put(StyleTree_Impl* pIns, sal_uIntPtr lPos=ULONG_MAX); sal_uIntPtr Count(); @@ -749,15 +749,15 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) -inline sal_Bool IsExpanded_Impl( const ExpandedEntries_t& rEntries, +inline bool IsExpanded_Impl( const ExpandedEntries_t& rEntries, const OUString &rStr) { for (size_t n = 0; n < rEntries.size(); ++n) { if (rEntries[n] == rStr) - return sal_True; + return true; } - return sal_False; + return false; } @@ -798,23 +798,23 @@ SfxCommonTemplateDialog_Impl::SfxCommonTemplateDialog_Impl( SfxBindings* pB, Win nActFilter ( 0 ), nAppFilter ( 0 ), - bDontUpdate ( sal_False ), - bIsWater ( sal_False ), - bEnabled ( sal_True ), - bUpdate ( sal_False ), - bUpdateFamily ( sal_False ), - bCanEdit ( sal_False ), - bCanDel ( sal_False ), - bCanNew ( sal_True ), - bCanHide ( sal_True ), - bCanShow ( sal_False ), - bWaterDisabled ( sal_False ), - bNewByExampleDisabled ( sal_False ), - bUpdateByExampleDisabled( sal_False ), - bTreeDrag ( sal_True ), - bHierarchical ( sal_False ), - m_bWantHierarchical ( sal_False ), - bBindingUpdate ( sal_True ) + bDontUpdate ( false ), + bIsWater ( false ), + bEnabled ( true ), + bUpdate ( false ), + bUpdateFamily ( false ), + bCanEdit ( false ), + bCanDel ( false ), + bCanNew ( true ), + bCanHide ( true ), + bCanShow ( false ), + bWaterDisabled ( false ), + bNewByExampleDisabled ( false ), + bUpdateByExampleDisabled( false ), + bTreeDrag ( true ), + bHierarchical ( false ), + m_bWantHierarchical ( false ), + bBindingUpdate ( true ) { aFmtLb.SetAccessibleName(SfxResId(STR_STYLE_ELEMTLIST).toString()); aFmtLb.SetHelpId( HID_TEMPLATE_FMT ); @@ -835,7 +835,7 @@ sal_uInt16 SfxCommonTemplateDialog_Impl::StyleNrToInfoOffset(sal_uInt16 nId) -void SfxTemplateDialog_Impl::EnableEdit(sal_Bool bEnable) +void SfxTemplateDialog_Impl::EnableEdit(bool bEnable) { SfxCommonTemplateDialog_Impl::EnableEdit( bEnable ); if( !bEnable || !bUpdateByExampleDisabled ) @@ -1090,9 +1090,9 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr) } else { - EnableEdit( sal_False ); - EnableHide( sal_False ); - EnableShow( sal_False ); + EnableEdit( false ); + EnableHide( false ); + EnableShow( false ); } if ( pTreeBox ) @@ -1116,14 +1116,14 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr) } else { - sal_Bool bSelect = ! rStr.isEmpty(); + bool bSelect = ! rStr.isEmpty(); if ( bSelect ) { SvTreeListEntry* pEntry = (SvTreeListEntry*)aFmtLb.FirstVisible(); while ( pEntry && aFmtLb.GetEntryText( pEntry ) != rStr ) pEntry = (SvTreeListEntry*)aFmtLb.NextVisible( pEntry ); if ( !pEntry ) - bSelect = sal_False; + bSelect = false; else { if (!aFmtLb.IsSelected(pEntry)) @@ -1140,9 +1140,9 @@ void SfxCommonTemplateDialog_Impl::SelectStyle(const OUString &rStr) if ( !bSelect ) { aFmtLb.SelectAll( false ); - EnableEdit(sal_False); - EnableHide( sal_False ); - EnableShow( sal_False ); + EnableEdit(false); + EnableHide( false ); + EnableShow( false ); } } } @@ -1169,7 +1169,7 @@ OUString SfxCommonTemplateDialog_Impl::GetSelectedEntry() const -void SfxCommonTemplateDialog_Impl::EnableTreeDrag( sal_Bool bEnable ) +void SfxCommonTemplateDialog_Impl::EnableTreeDrag( bool bEnable ) { if ( pStyleSheetPool ) { @@ -1216,7 +1216,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() for(sal_uInt16 i = 0; i < nCount; ++i) FillBox_Impl(pTreeBox, aArr[i], aEntries); - EnableItem(SID_STYLE_WATERCAN,sal_False); + EnableItem(SID_STYLE_WATERCAN,false); SfxTemplateItem* pState = pFamilyState[nActFamily-1]; @@ -1240,7 +1240,7 @@ void SfxCommonTemplateDialog_Impl::FillTreeBox() } -sal_Bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const +bool SfxCommonTemplateDialog_Impl::HasSelectedStyle() const { return pTreeBox? pTreeBox->FirstSelected() != 0: aFmtLb.GetSelectionCount() != 0; @@ -1286,7 +1286,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) pItem = GetFamilyItem_Impl(); if((nFlags & UPDATE_FAMILY) == UPDATE_FAMILY) // Update view type list (Hierarchical, All, etc. { - CheckItem(nActFamily, sal_True); // check Button in Toolbox + CheckItem(nActFamily, true); // check Button in Toolbox aFilterLb.SetUpdateMode(false); aFilterLb.Clear(); //insert hierarchical at the beginning @@ -1334,7 +1334,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) if(nFlags & UPDATE_FAMILY_LIST) { - EnableItem(SID_STYLE_WATERCAN,sal_False); + EnableItem(SID_STYLE_WATERCAN,false); SfxStyleSheetBase *pStyle = pStyleSheetPool->First(); SvTreeListEntry* pEntry = aFmtLb.First(); @@ -1406,13 +1406,13 @@ void SfxCommonTemplateDialog_Impl::SetWaterCanState(const SfxBoolItem *pItem) if(pItem && !bWaterDisabled) { CheckItem(SID_STYLE_WATERCAN, pItem->GetValue()); - EnableItem( SID_STYLE_WATERCAN, sal_True ); + EnableItem( SID_STYLE_WATERCAN, true ); } else if(!bWaterDisabled) - EnableItem(SID_STYLE_WATERCAN, sal_True); + EnableItem(SID_STYLE_WATERCAN, true); else - EnableItem(SID_STYLE_WATERCAN, sal_False); + EnableItem(SID_STYLE_WATERCAN, false); // Ignore while in watercan mode statusupdates @@ -1445,10 +1445,10 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const Sfx DELETEZ(pFamilyState[nIdx]); if ( pItem ) pFamilyState[nIdx] = new SfxTemplateItem(*pItem); - bUpdate = sal_True; + bUpdate = true; // If used templates (how the hell you find this out??) - bUpdateFamily = sal_True; + bUpdateFamily = true; } @@ -1457,7 +1457,7 @@ void SfxCommonTemplateDialog_Impl::SetFamilyState( sal_uInt16 nSlotId, const Sfx void SfxCommonTemplateDialog_Impl::Update_Impl() { - sal_Bool bDocChanged=sal_False; + bool bDocChanged=false; SfxStyleSheetBasePool* pNewPool = NULL; SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); SfxObjectShell* pDocShell = pViewFrame->GetObjectShell(); @@ -1482,7 +1482,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() { StartListening(*pNewPool); pStyleSheetPool = pNewPool; - bDocChanged=sal_True; + bDocChanged=true; } } @@ -1501,7 +1501,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() // current region not within the allowed region or default if(nActFamily == 0xffff || 0 == (pItem = pFamilyState[nActFamily-1] ) ) { - CheckItem(nActFamily, sal_False); + CheckItem(nActFamily, false); SfxTemplateItem **ppItem = pFamilyState; const size_t nFamilyCount = pStyleFamilies->size(); size_t n; @@ -1517,7 +1517,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() else if( bDocChanged ) { // other DocShell -> all new - CheckItem( nActFamily, sal_True ); + CheckItem( nActFamily, true ); nActFilter = static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pDocShell ) ); if ( SFXSTYLEBIT_ALL == nActFilter ) nActFilter = pDocShell->GetAutoStyleFilterIndex(); @@ -1533,7 +1533,7 @@ void SfxCommonTemplateDialog_Impl::Update_Impl() else { // other filters for automatic - CheckItem( nActFamily, sal_True ); + CheckItem( nActFamily, true ); const SfxStyleFamilyItem *pStyleItem = GetFamilyItem_Impl(); if ( 0 == pStyleItem->GetFilterList()[ nActFilter ]->nFlags && nAppFilter != pItem->GetValue()) @@ -1560,7 +1560,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim ) (void)pTim; // unused if(!bDontUpdate) { - bDontUpdate=sal_True; + bDontUpdate=true; if(!pTreeBox) UpdateStyles_Impl(UPDATE_FAMILY_LIST); else @@ -1574,7 +1574,7 @@ IMPL_LINK( SfxCommonTemplateDialog_Impl, TimeOut, Timer *, pTim ) EnableDelete(); } } - bDontUpdate=sal_False; + bDontUpdate=false; DELETEZ(pTimer); } else @@ -1603,7 +1603,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint ) ) { - bUpdate = sal_False; + bUpdate = false; Update_Impl(); } else if ( bUpdateFamily ) @@ -1631,9 +1631,9 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint } else { - EnableEdit(sal_False); - EnableHide(sal_False); - EnableShow(sal_False); + EnableEdit(false); + EnableHide(false); + EnableShow(false); } } } @@ -1644,7 +1644,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint // the same template is used. Do not immediately call Update_Impl, // for the case that one of the documents is an internal InPlaceObjekt! case SFX_HINT_DOCCHANGED: - bUpdate = sal_True; + bUpdate = true; break; case SFX_HINT_DYING: { @@ -1683,7 +1683,7 @@ void SfxCommonTemplateDialog_Impl::Notify(SfxBroadcaster& /*rBC*/, const SfxHint // editing, if the current document has been assigned a different filter. void SfxCommonTemplateDialog_Impl::FilterSelect( sal_uInt16 nEntry, // Idx of the new Filters - sal_Bool bForce ) // Force update, even if the new filter is + bool bForce ) // Force update, even if the new filter is // equal to the current { if( nEntry != nActFilter || bForce ) @@ -1707,7 +1707,7 @@ void SfxCommonTemplateDialog_Impl::FilterSelect( // Internal: Perform functions through the Dispatcher -sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl( +bool SfxCommonTemplateDialog_Impl::Execute_Impl( sal_uInt16 nId, const OUString &rStr, const OUString& rRefStr, sal_uInt16 nFamily, sal_uInt16 nMask, sal_uInt16 *pIdx, const sal_uInt16* pModifier) { @@ -1746,7 +1746,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl( // Dialog can be destroyed while in Execute() because started // subdialogs are not modal to it (#i97888#). if ( !pItem || aDeleted ) - return sal_False; + return false; if ( (nId == SID_STYLE_NEW || SID_STYLE_EDIT == nId) && (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ) { @@ -1767,7 +1767,7 @@ sal_Bool SfxCommonTemplateDialog_Impl::Execute_Impl( } } - return sal_True; + return true; } @@ -1780,8 +1780,8 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) if (!bHierarchical) { // Turn on treeView - bHierarchical=sal_True; - m_bWantHierarchical = sal_True; + bHierarchical=true; + m_bWantHierarchical = true; SaveSelection(); // fdo#61429 store "hierarchical" const OUString aSelectEntry( GetSelectedEntry()); aFmtLb.Hide(); @@ -1812,9 +1812,9 @@ void SfxCommonTemplateDialog_Impl::EnableHierarchical(bool const bEnable) aFmtLb.Show(); // If bHierarchical, then the family can have changed // minus one since hierarchical is inserted at the start - m_bWantHierarchical = sal_False; // before FilterSelect + m_bWantHierarchical = false; // before FilterSelect FilterSelect(aFilterLb.GetSelectEntryPos() - 1, bHierarchical ); - bHierarchical=sal_False; + bHierarchical=false; } } @@ -1839,7 +1839,7 @@ void SfxCommonTemplateDialog_Impl::FamilySelect(sal_uInt16 nEntry) { if( nEntry != nActFamily ) { - CheckItem( nActFamily, sal_False ); + CheckItem( nActFamily, false ); nActFamily = nEntry; SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl(); SfxUInt16Item aItem( SID_STYLE_FAMILY, nEntry ); @@ -1859,8 +1859,8 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry) { case SID_STYLE_WATERCAN: { - const sal_Bool bState = IsCheckedItem(nEntry); - sal_Bool bCheck; + const bool bState = IsCheckedItem(nEntry); + bool bCheck; SfxBoolItem aBool; // when a template is chosen. if (!bState && HasSelectedStyle()) @@ -1870,12 +1870,12 @@ void SfxCommonTemplateDialog_Impl::ActionSelect(sal_uInt16 nEntry) Execute_Impl( SID_STYLE_WATERCAN, aTemplName, aEmpty, (sal_uInt16)GetFamilyItem_Impl()->GetFamily() ); - bCheck = sal_True; + bCheck = true; } else { Execute_Impl(SID_STYLE_WATERCAN, aEmpty, aEmpty, 0); - bCheck = sal_False; + bCheck = false; } CheckItem(nEntry, bCheck); aBool.SetValue(bCheck); @@ -2001,11 +2001,11 @@ SfxObjectShell* SfxCommonTemplateDialog_Impl::SaveSelection() IMPL_LINK( SfxCommonTemplateDialog_Impl, DropHdl, StyleTreeListBox_Impl *, pBox ) { - bDontUpdate=sal_True; + bDontUpdate=true; const SfxStyleFamilyItem *pItem = GetFamilyItem_Impl(); const SfxStyleFamily eFam = pItem->GetFamily(); long ret= pStyleSheetPool->SetParent(eFam,pBox->GetStyle(), pBox->GetParent())? 1L: 0L; - bDontUpdate=sal_False; + bDontUpdate=false; return ret; } @@ -2129,17 +2129,17 @@ void SfxCommonTemplateDialog_Impl::DeleteHdl(void *) { const OUString aTemplName(pTreeBox ? pTreeBox->GetEntryText(*it) : aFmtLb.GetEntryText(*it)); PrepareDeleteAction(); - bDontUpdate = sal_True; // To prevent the Treelistbox to shut down while deleting + bDontUpdate = true; // To prevent the Treelistbox to shut down while deleting Execute_Impl( SID_STYLE_DELETE, aTemplName, OUString(), (sal_uInt16)GetFamilyItem_Impl()->GetFamily() ); if ( pTreeBox ) { pTreeBox->RemoveParentKeepChildren( *it ); - bDontUpdate = sal_False; + bDontUpdate = false; } } - bDontUpdate = sal_False; //if everything is deleted set bDontUpdate back to false + bDontUpdate = false; //if everything is deleted set bDontUpdate back to false UpdateStyles_Impl(UPDATE_FAMILY_LIST); //and force-update the list } } @@ -2203,16 +2203,16 @@ void SfxCommonTemplateDialog_Impl::EnableDelete() OSL_ENSURE(pStyle, "Style not found"); if(pStyle && pStyle->IsUserDefined()) { - EnableDel(sal_True); + EnableDel(true); } else { - EnableDel(sal_False); + EnableDel(false); } } else { - EnableDel(sal_False); + EnableDel(false); } } @@ -2347,7 +2347,7 @@ SfxStyleFamily SfxCommonTemplateDialog_Impl::GetActualFamily() const -void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, sal_Bool bEnable) +void SfxCommonTemplateDialog_Impl::EnableExample_Impl(sal_uInt16 nId, bool bEnable) { if( nId == SID_STYLE_NEW_BY_EXAMPLE ) { @@ -2371,7 +2371,7 @@ PopupMenu* SfxCommonTemplateDialog_Impl::CreateContextMenu( void ) { pBindings->Invalidate( SID_STYLE_NEW, true, false ); pBindings->Update( SID_STYLE_NEW ); - bBindingUpdate = sal_False; + bBindingUpdate = false; } PopupMenu* pMenu = new PopupMenu( SfxResId( MN_CONTEXT_TEMPLDLG ) ); pMenu->SetSelectHdl( LINK( this, SfxCommonTemplateDialog_Impl, MenuSelectHdl ) ); @@ -2393,7 +2393,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( SfxCommonTemplateDialog_Impl( pB, pDlgWindow, true ), m_pFloat ( pDlgWindow ), - m_bZoomIn ( sal_False ), + m_bZoomIn ( false ), m_aActionTbL ( pDlgWindow, this ), m_aActionTbR ( pDlgWindow, SfxResId( TB_ACTION ) ) @@ -2406,7 +2406,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( SfxBindings* pB, SfxTemplatePanelControl* pDlgWindow ) : SfxCommonTemplateDialog_Impl( pB, pDlgWindow, true ), m_pFloat ( pDlgWindow ), - m_bZoomIn ( sal_False ), + m_bZoomIn ( false ), m_aActionTbL ( pDlgWindow, this ), m_aActionTbR ( pDlgWindow, SfxResId( TB_ACTION ) ) { @@ -2431,7 +2431,7 @@ void SfxTemplateDialog_Impl::Initialize (void) -void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnable ) +void SfxTemplateDialog_Impl::EnableFamilyItem( sal_uInt16 nId, bool bEnable ) { m_aActionTbL.EnableItem( nId, bEnable ); } @@ -2634,7 +2634,7 @@ void SfxTemplateDialog_Impl::Command( const CommandEvent& rCEvt ) -void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck) +void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, bool bCheck) { OUString aEmpty; switch(nMesId) @@ -2651,7 +2651,7 @@ void SfxTemplateDialog_Impl::EnableItem(sal_uInt16 nMesId, sal_Bool bCheck) -void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck) +void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, bool bCheck) { switch(nMesId) { @@ -2666,7 +2666,7 @@ void SfxTemplateDialog_Impl::CheckItem(sal_uInt16 nMesId, sal_Bool bCheck) -sal_Bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId) +bool SfxTemplateDialog_Impl::IsCheckedItem(sal_uInt16 nMesId) { switch(nMesId) { @@ -2782,16 +2782,16 @@ void SfxCommonTemplateDialog_Impl::SetFamily( sal_uInt16 nId ) if ( nId != nActFamily ) { if ( nActFamily != 0xFFFF ) - CheckItem( nActFamily, sal_False ); + CheckItem( nActFamily, false ); nActFamily = nId; if ( nId != 0xFFFF ) - bUpdateFamily = sal_True; + bUpdateFamily = true; } } void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl() { - bUpdateFamily = sal_False; + bUpdateFamily = false; SfxDispatcher* pDispat = pBindings->GetDispatcher_Impl(); SfxViewFrame *pViewFrame = pDispat->GetFrame(); @@ -2807,10 +2807,10 @@ void SfxCommonTemplateDialog_Impl::UpdateFamily_Impl() StartListening(*pStyleSheetPool); } - bWaterDisabled = sal_False; + bWaterDisabled = false; bCanNew = (pTreeBox || aFmtLb.GetSelectionCount() <= 1) ? sal_True : sal_False; - bTreeDrag = sal_True; - bUpdateByExampleDisabled = sal_False; + bTreeDrag = true; + bUpdateByExampleDisabled = false; if ( pStyleSheetPool ) { diff --git a/sfx2/source/dialog/tplcitem.cxx b/sfx2/source/dialog/tplcitem.cxx index de100e37bc23..33effd94397f 100644 --- a/sfx2/source/dialog/tplcitem.cxx +++ b/sfx2/source/dialog/tplcitem.cxx @@ -75,7 +75,7 @@ void SfxTemplateControllerItem::StateChanged( sal_uInt16 nSID, SfxItemState eSta DBG_ASSERT(pStateItem != 0, "SfxTemplateItem expected"); rTemplateDlg.SetFamilyState( GetId(), pStateItem ); } - sal_Bool bDisable = eState == SFX_ITEM_DISABLED; + bool bDisable = eState == SFX_ITEM_DISABLED; // Disable Familly sal_uInt16 nFamily = 0; switch( GetId()) diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index cf85a309dcb6..3ed9680e2334 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -225,7 +225,7 @@ void SfxVersionsTabListBox_Impl::setColSizes() SvSimpleTable::SetTabs(aStaticTabs, MAP_PIXEL); } -SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, sal_Bool bIsSaveVersionOnClose ) +SfxVersionDialog::SfxVersionDialog ( SfxViewFrame* pVwFrame, bool bIsSaveVersionOnClose ) : SfxModalDialog(NULL, "VersionsOfDialog", "sfx/ui/versionsofdialog.ui") , pViewFrame(pVwFrame) , m_pTable(NULL) @@ -342,7 +342,7 @@ void SfxVersionDialog::Init_Impl() m_pSaveCheckBox->Check( m_bIsSaveVersionOnClose ); - sal_Bool bEnable = !pObjShell->IsReadOnly(); + bool bEnable = !pObjShell->IsReadOnly(); m_pSaveButton->Enable( bEnable ); m_pSaveCheckBox->Enable( bEnable ); @@ -536,7 +536,7 @@ IMPL_LINK(SfxViewVersionDialog_Impl, ButtonHdl, Button*, pButton) return 0L; } -SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame, sal_Bool bIsSaveVersionOnClose ) +SfxCmisVersionsDialog::SfxCmisVersionsDialog ( SfxViewFrame* pVwFrame, bool bIsSaveVersionOnClose ) : SfxModalDialog(NULL, "VersionsCmisDialog", "sfx/ui/versionscmis.ui") , pViewFrame(pVwFrame) , m_pTable(NULL) diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx index 43c759d3e670..2eb9b6c381b4 100644 --- a/sfx2/source/doc/DocumentMetadataAccess.cxx +++ b/sfx2/source/doc/DocumentMetadataAccess.cxx @@ -1374,7 +1374,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException, storeMetadataToStorage(xStorage); if (sfx) { - const sal_Bool bOk = aMedium.Commit(); + const bool bOk = aMedium.Commit(); aMedium.Close(); if ( !bOk ) { sal_uInt32 nError = aMedium.GetError(); diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx index 7181593f7976..a94ec74297ee 100644 --- a/sfx2/source/doc/SfxDocumentMetaData.cxx +++ b/sfx2/source/doc/SfxDocumentMetaData.cxx @@ -1891,7 +1891,7 @@ SfxDocumentMetaData::loadFromStorage( sal_uInt64 version = SotStorage::GetVersion( xStorage ); // Oasis is also the default (0) - sal_Bool bOasis = ( version > SOFFICE_FILEFORMAT_60 || version == 0 ); + bool bOasis = ( version > SOFFICE_FILEFORMAT_60 || version == 0 ); const sal_Char *pServiceName = bOasis ? "com.sun.star.document.XMLOasisMetaImporter" : "com.sun.star.document.XMLMetaImporter"; @@ -1960,10 +1960,10 @@ SfxDocumentMetaData::storeToStorage( css::uno::makeAny(OUString("text/xml"))); xStreamProps->setPropertyValue( OUString("Compressed"), - css::uno::makeAny(static_cast<sal_Bool> (sal_False))); + css::uno::makeAny(false)); xStreamProps->setPropertyValue( OUString("UseCommonStoragePasswordEncryption"), - css::uno::makeAny(static_cast<sal_Bool> (sal_False))); + css::uno::makeAny(false)); css::uno::Reference<css::io::XOutputStream> xOutStream = xStream->getOutputStream(); if (!xOutStream.is()) throw css::uno::RuntimeException(); @@ -1975,7 +1975,7 @@ SfxDocumentMetaData::storeToStorage( const sal_uInt64 version = SotStorage::GetVersion( xStorage ); // Oasis is also the default (0) - const sal_Bool bOasis = ( version > SOFFICE_FILEFORMAT_60 || version == 0 ); + const bool bOasis = ( version > SOFFICE_FILEFORMAT_60 || version == 0 ); const sal_Char *pServiceName = bOasis ? "com.sun.star.document.XMLOasisMetaExporter" : "com.sun.star.document.XMLMetaExporter"; @@ -2081,7 +2081,7 @@ SfxDocumentMetaData::storeToMedium(const OUString & URL, storeToStorage(xStorage, md.getAsConstPropertyValueList()); - const sal_Bool bOk = aMedium.Commit(); + const bool bOk = aMedium.Commit(); aMedium.Close(); if ( !bOk ) { sal_uInt32 nError = aMedium.GetError(); diff --git a/sfx2/source/doc/docfac.cxx b/sfx2/source/doc/docfac.cxx index bdbd9ed2382e..fc3d48bdf7f4 100644 --- a/sfx2/source/doc/docfac.cxx +++ b/sfx2/source/doc/docfac.cxx @@ -68,7 +68,7 @@ struct SfxObjectFactory_Impl SfxModule* pModule; sal_uInt16 nImageId; OUString aStandardTemplate; - sal_Bool bTemplateInitialized; + bool bTemplateInitialized; SvGlobalName aClassName; SfxObjectFactory_Impl() : @@ -76,7 +76,7 @@ struct SfxObjectFactory_Impl pFilterContainer ( NULL ), pModule ( NULL ), nImageId ( 0 ), - bTemplateInitialized( sal_False ) + bTemplateInitialized( false ) {} }; @@ -216,7 +216,7 @@ void SfxObjectFactory::SetSystemTemplate( const OUString& rServiceName, const OU OUString aActualFilter; ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_ACTUAL_FILTER ) >>= aActualFilter; - sal_Bool bChanged(sal_False); + bool bChanged(false); ::comphelper::ConfigurationHelper::readRelativeKey( xConfig, CONF_PATH, PROP_DEF_TEMPL_CHANGED ) >>= bChanged; uno::Reference< container::XNameAccess > xFilterFactory( diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx index 2c4b7b563f81..dbe72e1b1241 100644 --- a/sfx2/source/doc/docfile.cxx +++ b/sfx2/source/doc/docfile.cxx @@ -1263,7 +1263,7 @@ uno::Reference < embed::XStorage > SfxMedium::GetStorage( bool bCreateTempIfNo ) uno::Sequence< beans::PropertyValue > aAddProps( 2 ); aAddProps[0].Name = "RepairPackage"; - aAddProps[0].Value <<= (sal_Bool)true; + aAddProps[0].Value <<= true; aAddProps[1].Name = "StatusIndicator"; aAddProps[1].Value <<= xProgressHandler; diff --git a/sfx2/source/doc/docinsert.cxx b/sfx2/source/doc/docinsert.cxx index 260fb429589c..fec9241989fe 100644 --- a/sfx2/source/doc/docinsert.cxx +++ b/sfx2/source/doc/docinsert.cxx @@ -188,7 +188,7 @@ IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl) try { Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_PASSWORD, 0 ); - sal_Bool bPassWord = sal_False; + bool bPassWord = false; if ( ( aValue >>= bPassWord ) && bPassWord ) { // ask for the password @@ -215,7 +215,7 @@ IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl) try { Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_SELECTION, 0 ); - sal_Bool bSelection = sal_False; + bool bSelection = false; if ( aValue >>= bSelection ) m_pItemSet->Put( SfxBoolItem( SID_SELECTION, bSelection ) ); } @@ -236,7 +236,7 @@ IMPL_LINK_NOARG(DocumentInserter, DialogClosedHdl) try { Any aValue = xCtrlAccess->getValue( ExtendedFilePickerElementIds::CHECKBOX_READONLY, 0 ); - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; if ( ( aValue >>= bReadOnly ) && bReadOnly ) m_pItemSet->Put( SfxBoolItem( SID_DOC_READONLY, bReadOnly ) ); } diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 01044c276ff9..2108d1920f81 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -73,13 +73,13 @@ namespace sfx2 struct DocumentMacroMode_Data { IMacroDocumentAccess& m_rDocumentAccess; - sal_Bool m_bMacroDisabledMessageShown; - sal_Bool m_bDocMacroDisabledMessageShown; + bool m_bMacroDisabledMessageShown; + bool m_bDocMacroDisabledMessageShown; DocumentMacroMode_Data( IMacroDocumentAccess& rDocumentAccess ) :m_rDocumentAccess( rDocumentAccess ) - ,m_bMacroDisabledMessageShown( sal_False ) - ,m_bDocMacroDisabledMessageShown( sal_False ) + ,m_bMacroDisabledMessageShown( false ) + ,m_bDocMacroDisabledMessageShown( false ) { } }; @@ -90,7 +90,7 @@ namespace sfx2 namespace { - void lcl_showGeneralSfxErrorOnce( const Reference< XInteractionHandler >& rxHandler, const sal_Int32 nSfxErrorCode, sal_Bool& rbAlreadyShown ) + void lcl_showGeneralSfxErrorOnce( const Reference< XInteractionHandler >& rxHandler, const sal_Int32 nSfxErrorCode, bool& rbAlreadyShown ) { if ( rbAlreadyShown ) return; @@ -99,17 +99,17 @@ namespace sfx2 aErrorCodeRequest.ErrCode = nSfxErrorCode; SfxMedium::CallApproveHandler( rxHandler, makeAny( aErrorCodeRequest ), false ); - rbAlreadyShown = sal_True; + rbAlreadyShown = true; } - void lcl_showMacrosDisabledError( const Reference< XInteractionHandler >& rxHandler, sal_Bool& rbAlreadyShown ) + void lcl_showMacrosDisabledError( const Reference< XInteractionHandler >& rxHandler, bool& rbAlreadyShown ) { lcl_showGeneralSfxErrorOnce( rxHandler, ERRCODE_SFX_MACROS_SUPPORT_DISABLED, rbAlreadyShown ); } - void lcl_showDocumentMacrosDisabledError( const Reference< XInteractionHandler >& rxHandler, sal_Bool& rbAlreadyShown ) + void lcl_showDocumentMacrosDisabledError( const Reference< XInteractionHandler >& rxHandler, bool& rbAlreadyShown ) { #ifdef MACOSX lcl_showGeneralSfxErrorOnce( rxHandler, ERRCODE_SFX_DOCUMENT_MACRO_DISABLED_MAC, rbAlreadyShown ); @@ -119,7 +119,7 @@ namespace sfx2 } - sal_Bool lcl_showMacroWarning( const Reference< XInteractionHandler >& rxHandler, + bool lcl_showMacroWarning( const Reference< XInteractionHandler >& rxHandler, const OUString& rDocumentLocation ) { DocumentMacroConfirmationRequest aRequest; @@ -243,7 +243,7 @@ namespace sfx2 if ( nMacroExecutionMode != MacroExecMode::FROM_LIST ) { // the trusted macro check will also retrieve the signature state ( small optimization ) - sal_Bool bHasTrustedMacroSignature = m_pData->m_rDocumentAccess.hasTrustedScriptingSignature( nMacroExecutionMode != MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN ); + bool bHasTrustedMacroSignature = m_pData->m_rDocumentAccess.hasTrustedScriptingSignature( nMacroExecutionMode != MacroExecMode::FROM_LIST_AND_SIGNED_NO_WARN ); sal_uInt16 nSignatureState = m_pData->m_rDocumentAccess.getScriptingSignatureState(); if ( nSignatureState == SIGNATURESTATE_SIGNATURES_BROKEN ) @@ -290,7 +290,7 @@ namespace sfx2 } // conformation is required - sal_Bool bSecure = sal_False; + bool bSecure = false; if ( eAutoConfirm == eNoAutoConfirm ) { diff --git a/sfx2/source/doc/doctempl.cxx b/sfx2/source/doc/doctempl.cxx index f92ac47193b9..fc563c5be123 100644 --- a/sfx2/source/doc/doctempl.cxx +++ b/sfx2/source/doc/doctempl.cxx @@ -121,8 +121,8 @@ class DocTempl_EntryData_Impl OUString maTitle; OUString maOwnURL; OUString maTargetURL; - sal_Bool mbIsOwner : 1; - sal_Bool mbDidConvert: 1; + bool mbIsOwner : 1; + bool mbDidConvert: 1; private: RegionData_Impl* GetParent() const { return mpParent; } @@ -158,7 +158,7 @@ class RegionData_Impl private: size_t GetEntryPos( const OUString& rTitle, - sal_Bool& rFound ) const; + bool& rFound ) const; const SfxDocTemplate_Impl* GetParent() const { return mpParent; } public: @@ -202,7 +202,7 @@ class SfxDocTemplate_Impl : public SvRefBase OUString maRootURL; OUString maStandardGroup; RegionList_Impl maRegions; - sal_Bool mbConstructed; + bool mbConstructed; uno::Reference< XAnyCompareFactory > m_rCompareFactory; @@ -220,7 +220,7 @@ public: void IncrementLock(); void DecrementLock(); - sal_Bool Construct( ); + bool Construct( ); void CreateFromHierarchy( Content &rTemplRoot ); void ReInitFromComponent(); void AddRegion( const OUString& rTitle, @@ -235,8 +235,8 @@ public: RegionData_Impl* GetRegion( const OUString& rName ) const; RegionData_Impl* GetRegion( size_t nIndex ) const; - sal_Bool GetTitleFromURL( const OUString& rURL, OUString& aTitle ); - sal_Bool InsertRegion( RegionData_Impl *pData, size_t nPos = size_t(-1) ); + bool GetTitleFromURL( const OUString& rURL, OUString& aTitle ); + bool InsertRegion( RegionData_Impl *pData, size_t nPos = size_t(-1) ); OUString GetRootURL() const { return maRootURL; } uno::Reference< XDocumentTemplates > getDocTemplates() { return mxTemplates; } @@ -271,7 +271,7 @@ SfxDocTemplate_Impl *gpTemplateData = 0; -static sal_Bool getTextProperty_Impl( Content& rContent, +static bool getTextProperty_Impl( Content& rContent, const OUString& rPropName, OUString& rPropValue ); @@ -610,7 +610,7 @@ bool SfxDocumentTemplates::CopyOrMove if ( bMove ) { // --**-- delete the original file - sal_Bool bDeleted = xTemplates->removeTemplate( pSourceRgn->GetTitle(), + bool bDeleted = xTemplates->removeTemplate( pSourceRgn->GetTitle(), pSource->GetTitle() ); if ( bDeleted ) pSourceRgn->DeleteEntry( nSourceIdx ); @@ -955,7 +955,7 @@ bool SfxDocumentTemplates::Delete if ( !pRegion ) return false; - sal_Bool bRet; + bool bRet; uno::Reference< XDocumentTemplates > xTemplates = pImp->getDocTemplates(); if ( nIdx == USHRT_MAX ) @@ -1194,7 +1194,7 @@ bool SfxDocumentTemplates::GetLogicNames RegionData_Impl *pData = NULL; DocTempl_EntryData_Impl *pEntry = NULL; - sal_Bool bFound = sal_False; + bool bFound = false; sal_uIntPtr nCount = GetRegionCount(); @@ -1210,7 +1210,7 @@ bool SfxDocumentTemplates::GetLogicNames pEntry = pData->GetEntry( j ); if ( pEntry && pEntry->GetTargetURL() == aPath ) { - bFound = sal_True; + bFound = true; } } } @@ -1286,8 +1286,8 @@ DocTempl_EntryData_Impl::DocTempl_EntryData_Impl( RegionData_Impl* pParent, mpParent = pParent; maTitle = SfxDocumentTemplates::ConvertResourceString( STR_TEMPLATE_NAME1_DEF, STR_TEMPLATE_NAME1, NUM_TEMPLATE_NAMES, rTitle ); - mbIsOwner = sal_False; - mbDidConvert= sal_False; + mbIsOwner = false; + mbDidConvert= false; } @@ -1354,7 +1354,7 @@ RegionData_Impl::~RegionData_Impl() } -size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, sal_Bool& rFound ) const +size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, bool& rFound ) const { #if 1 // Don't use binary search today size_t i; @@ -1366,12 +1366,12 @@ size_t RegionData_Impl::GetEntryPos( const OUString& rTitle, sal_Bool& rFound ) if ( pData->Compare( rTitle ) == 0 ) { - rFound = sal_True; + rFound = true; return i; } } - rFound = sal_False; + rFound = false; return i; #else @@ -1426,7 +1426,7 @@ void RegionData_Impl::AddEntry( const OUString& rTitle, OUString aLinkURL = aLinkObj.GetMainURL( INetURLObject::NO_DECODE ); DocTempl_EntryData_Impl* pEntry; - sal_Bool bFound = sal_False; + bool bFound = false; size_t nPos = GetEntryPos( rTitle, bFound ); if ( bFound ) @@ -1478,7 +1478,7 @@ const OUString& RegionData_Impl::GetHierarchyURL() DocTempl_EntryData_Impl* RegionData_Impl::GetEntry( const OUString& rName ) const { - sal_Bool bFound = sal_False; + bool bFound = false; long nPos = GetEntryPos( rName, bFound ); if ( bFound ) @@ -1518,7 +1518,7 @@ int RegionData_Impl::Compare( RegionData_Impl* pCompare ) const SfxDocTemplate_Impl::SfxDocTemplate_Impl() -: mbConstructed( sal_False ) +: mbConstructed( false ) , mnLockCounter( 0 ) { } @@ -1669,7 +1669,7 @@ void SfxDocTemplate_Impl::CreateFromHierarchy( Content &rTemplRoot ) } -sal_Bool SfxDocTemplate_Impl::Construct( ) +bool SfxDocTemplate_Impl::Construct( ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1693,7 +1693,7 @@ sal_Bool SfxDocTemplate_Impl::Construct( ) if ( ! aRootContent.is() ) return false; - mbConstructed = sal_True; + mbConstructed = true; maRootURL = aRootContent->getIdentifier()->getContentIdentifier(); ResStringArray aLongNames( SfxResId( TEMPLATE_LONG_NAMES_ARY ) ); @@ -1722,7 +1722,7 @@ void SfxDocTemplate_Impl::ReInitFromComponent() } -sal_Bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos ) +bool SfxDocTemplate_Impl::InsertRegion( RegionData_Impl *pNew, size_t nPos ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1774,7 +1774,7 @@ void SfxDocTemplate_Impl::Rescan() } -sal_Bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL, +bool SfxDocTemplate_Impl::GetTitleFromURL( const OUString& rURL, OUString& aTitle ) { if ( mxInfo.is() ) @@ -1830,11 +1830,11 @@ void SfxDocTemplate_Impl::Clear() } -sal_Bool getTextProperty_Impl( Content& rContent, +bool getTextProperty_Impl( Content& rContent, const OUString& rPropName, OUString& rPropValue ) { - sal_Bool bGotProperty = sal_False; + bool bGotProperty = false; // Get the property try @@ -1859,7 +1859,7 @@ sal_Bool getTextProperty_Impl( Content& rContent, aRelocImpl.makeAbsoluteURL( rPropValue ); } - bGotProperty = sal_True; + bGotProperty = true; } catch ( RuntimeException& ) {} catch ( Exception& ) {} diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index d4aea67b3510..c7ae37f99367 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -194,8 +194,8 @@ class SfxDocTplService_Impl Locale maLocale; Content maRootContent; Updater_Impl* mpUpdater; - sal_Bool mbIsInitialized : 1; - sal_Bool mbLocaleSet : 1; + bool mbIsInitialized : 1; + bool mbLocaleSet : 1; SfxURLRelocator_Impl maRelocator; @@ -203,22 +203,22 @@ class SfxDocTplService_Impl void getDefaultLocale(); void getDirList(); void readFolderList(); - sal_Bool needsUpdate(); + bool needsUpdate(); OUString getLongName( const OUString& rShortName ); - sal_Bool setTitleForURL( const OUString& rURL, const OUString& aTitle ); - sal_Bool getTitleFromURL( const OUString& rURL, OUString& aTitle, OUString& aType, sal_Bool& bDocHasTitle ); + bool setTitleForURL( const OUString& rURL, const OUString& aTitle ); + bool getTitleFromURL( const OUString& rURL, OUString& aTitle, OUString& aType, bool& bDocHasTitle ); - sal_Bool addEntry( Content& rParentFolder, + bool addEntry( Content& rParentFolder, const OUString& rTitle, const OUString& rTargetURL, const OUString& rType ); - sal_Bool createFolder( const OUString& rNewFolderURL, - sal_Bool bCreateParent, - sal_Bool bFsysFolder, + bool createFolder( const OUString& rNewFolderURL, + bool bCreateParent, + bool bFsysFolder, Content &rNewFolder ); - sal_Bool CreateNewUniqueFolderWithPrefix( const OUString& aPath, + bool CreateNewUniqueFolderWithPrefix( const OUString& aPath, const OUString& aPrefix, OUString& aNewFolderName, OUString& aNewFolderURL, @@ -228,34 +228,34 @@ class SfxDocTplService_Impl const OUString& aExt ); uno::Sequence< beans::StringPair > ReadUINamesForTemplateDir_Impl( const OUString& aUserPath ); - sal_Bool UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, + bool UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aGroupName, const OUString& aNewFolderName ); - sal_Bool ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, + bool ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aFsysGroupName, const OUString& aOldGroupName, const OUString& aNewGroupName ); - sal_Bool RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, + bool RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aGroupName ); - sal_Bool WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, + bool WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ); OUString CreateNewGroupFsys( const OUString& rGroupName, Content& aGroup ); - sal_Bool removeContent( Content& rContent ); - sal_Bool removeContent( const OUString& rContentURL ); + bool removeContent( Content& rContent ); + bool removeContent( const OUString& rContentURL ); - sal_Bool setProperty( Content& rContent, + bool setProperty( Content& rContent, const OUString& rPropName, const Any& rPropValue ); - sal_Bool getProperty( Content& rContent, + bool getProperty( Content& rContent, const OUString& rPropName, Any& rPropValue ); void createFromContent( GroupList_Impl& rList, Content &rContent, - sal_Bool bHierarchy, - sal_Bool bWriteableContent = sal_False ); + bool bHierarchy, + bool bWriteableContent = false ); void addHierGroup( GroupList_Impl& rList, const OUString& rTitle, const OUString& rOwnURL ); @@ -263,7 +263,7 @@ class SfxDocTplService_Impl const OUString& rTitle, const OUString& rUITitle, const OUString& rOwnURL, - sal_Bool bWriteableGroup = sal_False ); + bool bWriteableGroup = false ); void removeFromHierarchy( DocTemplates_EntryData_Impl *pData ); void addToHierarchy( GroupData_Impl *pGroup, DocTemplates_EntryData_Impl *pData ); @@ -285,31 +285,31 @@ public: SfxDocTplService_Impl( const uno::Reference< XComponentContext > & xContext ); ~SfxDocTplService_Impl(); - sal_Bool init() { if ( !mbIsInitialized ) init_Impl(); return mbIsInitialized; } + bool init() { if ( !mbIsInitialized ) init_Impl(); return mbIsInitialized; } Content getContent() const { return maRootContent; } void setLocale( const Locale & rLocale ); Locale getLocale(); - sal_Bool storeTemplate( const OUString& rGroupName, + bool storeTemplate( const OUString& rGroupName, const OUString& rTemplateName, const uno::Reference< frame::XStorable >& rStorable ); - sal_Bool addTemplate( const OUString& rGroupName, + bool addTemplate( const OUString& rGroupName, const OUString& rTemplateName, const OUString& rSourceURL ); - sal_Bool removeTemplate( const OUString& rGroupName, + bool removeTemplate( const OUString& rGroupName, const OUString& rTemplateName ); - sal_Bool renameTemplate( const OUString& rGroupName, + bool renameTemplate( const OUString& rGroupName, const OUString& rOldName, const OUString& rNewName ); - sal_Bool addGroup( const OUString& rGroupName ); - sal_Bool removeGroup( const OUString& rGroupName ); - sal_Bool renameGroup( const OUString& rOldName, + bool addGroup( const OUString& rGroupName ); + bool removeGroup( const OUString& rGroupName ); + bool renameGroup( const OUString& rOldName, const OUString& rNewName ); - void update( sal_Bool bUpdateNow ); + void update( bool bUpdateNow ); void doUpdate(); void finished() { mpUpdater = NULL; } }; @@ -338,23 +338,23 @@ class DocTemplates_EntryData_Impl OUString maTargetURL; OUString maHierarchyURL; - sal_Bool mbInHierarchy : 1; - sal_Bool mbInUse : 1; - sal_Bool mbUpdateType : 1; - sal_Bool mbUpdateLink : 1; + bool mbInHierarchy : 1; + bool mbInUse : 1; + bool mbUpdateType : 1; + bool mbUpdateLink : 1; public: DocTemplates_EntryData_Impl( const OUString& rTitle ); - void setInUse() { mbInUse = sal_True; } - void setHierarchy( sal_Bool bInHierarchy ) { mbInHierarchy = bInHierarchy; } - void setUpdateLink( sal_Bool bUpdateLink ) { mbUpdateLink = bUpdateLink; } - void setUpdateType( sal_Bool bUpdateType ) { mbUpdateType = bUpdateType; } + void setInUse() { mbInUse = true; } + void setHierarchy( bool bInHierarchy ) { mbInHierarchy = bInHierarchy; } + void setUpdateLink( bool bUpdateLink ) { mbUpdateLink = bUpdateLink; } + void setUpdateType( bool bUpdateType ) { mbUpdateType = bUpdateType; } - sal_Bool getInUse() const { return mbInUse; } - sal_Bool getInHierarchy() const { return mbInHierarchy; } - sal_Bool getUpdateLink() const { return mbUpdateLink; } - sal_Bool getUpdateType() const { return mbUpdateType; } + bool getInUse() const { return mbInUse; } + bool getInHierarchy() const { return mbInHierarchy; } + bool getUpdateLink() const { return mbUpdateLink; } + bool getUpdateType() const { return mbUpdateType; } const OUString& getHierarchyURL() const { return maHierarchyURL; } const OUString& getTargetURL() const { return maTargetURL; } @@ -374,20 +374,20 @@ class GroupData_Impl OUString maTitle; OUString maHierarchyURL; OUString maTargetURL; - sal_Bool mbInUse : 1; - sal_Bool mbInHierarchy : 1; + bool mbInUse : 1; + bool mbInHierarchy : 1; public: GroupData_Impl( const OUString& rTitle ); ~GroupData_Impl(); - void setInUse() { mbInUse = sal_True; } - void setHierarchy( sal_Bool bInHierarchy ) { mbInHierarchy = bInHierarchy; } + void setInUse() { mbInUse = true; } + void setHierarchy( bool bInHierarchy ) { mbInHierarchy = bInHierarchy; } void setHierarchyURL( const OUString& rURL ) { maHierarchyURL = rURL; } void setTargetURL( const OUString& rURL ) { maTargetURL = rURL; } - sal_Bool getInUse() const { return mbInUse; } - sal_Bool getInHierarchy() const { return mbInHierarchy; } + bool getInUse() const { return mbInUse; } + bool getInHierarchy() const { return mbInHierarchy; } const OUString& getHierarchyURL() const { return maHierarchyURL; } const OUString& getTargetURL() const { return maTargetURL; } const OUString& getTitle() const { return maTitle; } @@ -411,8 +411,8 @@ void SfxDocTplService_Impl::init_Impl() maCmdEnv = new TplTaskEnvironment( xInteractionHandler ); ::osl::ClearableMutexGuard aGuard( maMutex ); - sal_Bool bIsInitialized = sal_False; - sal_Bool bNeedsUpdate = sal_False; + bool bIsInitialized = false; + bool bNeedsUpdate = false; if ( !mbLocaleSet ) getDefaultLocale(); @@ -435,7 +435,7 @@ void SfxDocTplService_Impl::init_Impl() && ( aValue >>= aPropValue ) && aPropValue.equals( aTemplVers ) ) { - bIsInitialized = sal_True; + bIsInitialized = true; } else removeContent( maRootContent ); @@ -443,11 +443,11 @@ void SfxDocTplService_Impl::init_Impl() if ( !bIsInitialized ) { - if ( createFolder( maRootURL, sal_True, sal_False, maRootContent ) + if ( createFolder( maRootURL, true, false, maRootContent ) && setProperty( maRootContent, aTemplVersPropName, uno::makeAny( aTemplVers ) ) ) - bIsInitialized = sal_True; + bIsInitialized = true; - bNeedsUpdate = sal_True; + bNeedsUpdate = true; } if ( bIsInitialized ) @@ -476,7 +476,7 @@ void SfxDocTplService_Impl::init_Impl() aSolarGuard.clear(); ::osl::ClearableMutexGuard anotherGuard( maMutex ); - update( sal_True ); + update( true ); anotherGuard.clear(); SolarMutexGuard aSecondSolarGuard; @@ -485,7 +485,7 @@ void SfxDocTplService_Impl::init_Impl() } else if ( needsUpdate() ) // the UI should be shown only on the first update - update( sal_True ); + update( true ); } else { @@ -504,7 +504,7 @@ void SfxDocTplService_Impl::getDefaultLocale() if ( !mbLocaleSet ) { maLocale = LanguageTag( utl::ConfigManager::getLocale()).getLocale( false); - mbLocaleSet = sal_True; + mbLocaleSet = true; } } } @@ -610,14 +610,14 @@ void SfxDocTplService_Impl::getDirList() } -sal_Bool SfxDocTplService_Impl::needsUpdate() +bool SfxDocTplService_Impl::needsUpdate() { OUString aPropName( PROPERTY_NEEDSUPDATE ); - sal_Bool bNeedsUpdate = sal_True; + bool bNeedsUpdate = true; Any aValue; // Get the template dir list - sal_Bool bHasProperty = getProperty( maRootContent, aPropName, aValue ); + bool bHasProperty = getProperty( maRootContent, aPropName, aValue ); if ( bHasProperty ) aValue >>= bNeedsUpdate; @@ -635,7 +635,7 @@ sal_Bool SfxDocTplService_Impl::needsUpdate() } -sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUString& aTitle ) +bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUString& aTitle ) { if (m_xDocProps.is()) { @@ -664,9 +664,9 @@ sal_Bool SfxDocTplService_Impl::setTitleForURL( const OUString& rURL, const OUSt } -sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& aTitle, OUString& aType, sal_Bool& bDocHasTitle ) +bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& aTitle, OUString& aType, bool& bDocHasTitle ) { - bDocHasTitle = sal_False; + bDocHasTitle = false; if (m_xDocProps.is()) { @@ -704,18 +704,18 @@ sal_Bool SfxDocTplService_Impl::getTitleFromURL( const OUString& rURL, OUString& INetURLObject::DECODE_WITH_CHARSET ); } else - bDocHasTitle = sal_True; + bDocHasTitle = true; - return sal_True; + return true; } -sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, +bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, const OUString& rTitle, const OUString& rTargetURL, const OUString& rType ) { - sal_Bool bAddedEntry = sal_False; + bool bAddedEntry = false; INetURLObject aLinkObj( rParentFolder.getURL() ); aLinkObj.insertName( rTitle, false, @@ -734,7 +734,7 @@ sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, Sequence< Any > aValues(3); aValues[0] = makeAny( rTitle ); - aValues[1] = makeAny( sal_Bool( sal_False ) ); + aValues[1] = makeAny( false ); aValues[2] = makeAny( rTargetURL ); OUString aType( TYPE_LINK ); @@ -744,7 +744,7 @@ sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, { rParentFolder.insertNewContent( aType, aNames, aValues, aLink ); setProperty( aLink, aAdditionalProp, makeAny( rType ) ); - bAddedEntry = sal_True; + bAddedEntry = true; } catch( Exception& ) {} @@ -753,13 +753,13 @@ sal_Bool SfxDocTplService_Impl::addEntry( Content& rParentFolder, } -sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, - sal_Bool bCreateParent, - sal_Bool bFsysFolder, +bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, + bool bCreateParent, + bool bFsysFolder, Content &rNewFolder ) { Content aParent; - sal_Bool bCreatedFolder = sal_False; + bool bCreatedFolder = false; INetURLObject aParentURL( rNewFolderURL ); OUString aFolderName = aParentURL.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); @@ -784,7 +784,7 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, Sequence< Any > aValues(2); aValues[0] = makeAny( aFolderName ); - aValues[1] = makeAny( sal_Bool( sal_True ) ); + aValues[1] = makeAny( true ); OUString aType; @@ -794,7 +794,7 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, aType = TYPE_FOLDER; aParent.insertNewContent( aType, aNames, aValues, rNewFolder ); - bCreatedFolder = sal_True; + bCreatedFolder = true; } catch( RuntimeException& ) { @@ -814,7 +814,7 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, if ( ( aParentURL.getSegmentCount() >= 1 ) && createFolder( aParentURL.GetMainURL( INetURLObject::NO_DECODE ), bCreateParent, bFsysFolder, aParent ) ) { - bCreatedFolder = createFolder( rNewFolderURL, sal_False, bFsysFolder, rNewFolder ); + bCreatedFolder = createFolder( rNewFolderURL, false, bFsysFolder, rNewFolder ); } } @@ -822,13 +822,13 @@ sal_Bool SfxDocTplService_Impl::createFolder( const OUString& rNewFolderURL, } -sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& aPath, +bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& aPath, const OUString& aPrefix, OUString& aNewFolderName, OUString& aNewFolderURL, Content& aNewFolder ) { - sal_Bool bCreated = sal_False; + bool bCreated = false; INetURLObject aDirPath( aPath ); Content aParent; @@ -849,7 +849,7 @@ sal_Bool SfxDocTplService_Impl::CreateNewUniqueFolderWithPrefix( const OUString& Sequence< Any > aValues(2); aValues[0] = makeAny( aTryName ); - aValues[1] = makeAny( sal_Bool( sal_True ) ); + aValues[1] = makeAny( true ); OUString aType( TYPE_FSYS_FOLDER ); @@ -899,7 +899,7 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a for ( sal_Int32 nInd = 0; nInd < 32000; nInd++ ) { Content aNewFile; - sal_Bool bCreated = sal_False; + bool bCreated = false; OUString aTryName = aPrefix; if ( nInd ) aTryName += OUString::number( nInd ); @@ -915,7 +915,7 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a Sequence< Any > aValues(2); aValues[0] = makeAny( aTryName ); - aValues[1] = makeAny( sal_Bool( sal_True ) ); + aValues[1] = makeAny( true ); OUString aType( TYPE_FSYS_FILE ); @@ -949,16 +949,16 @@ OUString SfxDocTplService_Impl::CreateNewUniqueFileWithPrefix( const OUString& a } -sal_Bool SfxDocTplService_Impl::removeContent( Content& rContent ) +bool SfxDocTplService_Impl::removeContent( Content& rContent ) { - sal_Bool bRemoved = sal_False; + bool bRemoved = false; try { OUString aCmd( COMMAND_DELETE ); - Any aArg = makeAny( sal_Bool( sal_True ) ); + Any aArg = makeAny( true ); rContent.executeCommand( aCmd, aArg ); - bRemoved = sal_True; + bRemoved = true; } catch ( RuntimeException& ) {} catch ( Exception& ) {} @@ -967,22 +967,22 @@ sal_Bool SfxDocTplService_Impl::removeContent( Content& rContent ) } -sal_Bool SfxDocTplService_Impl::removeContent( const OUString& rContentURL ) +bool SfxDocTplService_Impl::removeContent( const OUString& rContentURL ) { Content aContent; if ( Content::create( rContentURL, maCmdEnv, comphelper::getProcessComponentContext(), aContent ) ) return removeContent( aContent ); else - return sal_False; + return false; } -sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent, +bool SfxDocTplService_Impl::setProperty( Content& rContent, const OUString& rPropName, const Any& rPropValue ) { - sal_Bool bPropertySet = sal_False; + bool bPropertySet = false; // Store the property try @@ -1041,7 +1041,7 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent, // now set the property rContent.setPropertyValue( rPropName, aPropValue ); - bPropertySet = sal_True; + bPropertySet = true; } catch ( RuntimeException& ) {} catch ( Exception& ) {} @@ -1050,11 +1050,11 @@ sal_Bool SfxDocTplService_Impl::setProperty( Content& rContent, } -sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent, +bool SfxDocTplService_Impl::getProperty( Content& rContent, const OUString& rPropName, Any& rPropValue ) { - sal_Bool bGotProperty = sal_False; + bool bGotProperty = false; // Get the property try @@ -1064,7 +1064,7 @@ sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent, // check, whether or not the property exists if ( !aPropInfo.is() || !aPropInfo->hasPropertyByName( rPropName ) ) { - return sal_False; + return false; } // now get the property @@ -1099,7 +1099,7 @@ sal_Bool SfxDocTplService_Impl::getProperty( Content& rContent, } } - bGotProperty = sal_True; + bGotProperty = true; } catch ( RuntimeException& ) {} catch ( Exception& ) {} @@ -1112,8 +1112,8 @@ SfxDocTplService_Impl::SfxDocTplService_Impl( const uno::Reference< XComponentCo { mxContext = xContext; mpUpdater = NULL; - mbIsInitialized = sal_False; - mbLocaleSet = sal_False; + mbIsInitialized = false; + mbLocaleSet = false; } @@ -1153,14 +1153,14 @@ void SfxDocTplService_Impl::setLocale( const Locale &rLocale ) ( maLocale.Language != rLocale.Language ) || ( maLocale.Country != rLocale.Country ) || ( maLocale.Variant != rLocale.Variant ) ) ) - mbIsInitialized = sal_False; + mbIsInitialized = false; maLocale = rLocale; - mbLocaleSet = sal_True; + mbLocaleSet = true; } -void SfxDocTplService_Impl::update( sal_Bool bUpdateNow ) +void SfxDocTplService_Impl::update( bool bUpdateNow ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1187,7 +1187,7 @@ void SfxDocTplService_Impl::doUpdate() GroupList_Impl aGroupList; // get the entries from the hierarchy - createFromContent( aGroupList, maRootContent, sal_True ); + createFromContent( aGroupList, maRootContent, true ); // get the entries from the template directories sal_Int32 nCountDir = maTemplateDirs.getLength(); @@ -1195,7 +1195,7 @@ void SfxDocTplService_Impl::doUpdate() Content aDirContent; // the last directory in the list must be writable - sal_Bool bWriteableDirectory = sal_True; + bool bWriteableDirectory = true; // the target folder might not exist, for this reason no interaction handler should be used uno::Reference< XCommandEnvironment > aQuietEnv; @@ -1205,10 +1205,10 @@ void SfxDocTplService_Impl::doUpdate() nCountDir--; if ( Content::create( pDirs[ nCountDir ], aQuietEnv, comphelper::getProcessComponentContext(), aDirContent ) ) { - createFromContent( aGroupList, aDirContent, sal_False, bWriteableDirectory ); + createFromContent( aGroupList, aDirContent, false, bWriteableDirectory ); } - bWriteableDirectory = sal_False; + bWriteableDirectory = false; } // now check the list @@ -1286,7 +1286,7 @@ uno::Sequence< beans::StringPair > SfxDocTplService_Impl::ReadUINamesForTemplate } -sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, +bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aGroupName, const OUString& aNewFolderName ) { @@ -1296,7 +1296,7 @@ sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString // it is possible that the name is used already, but it should be checked before for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ ) if ( aUINames[nInd].First.equals( aNewFolderName ) ) - return sal_False; + return false; aUINames.realloc( ++nLen ); aUINames[nLen-1].First = aNewFolderName; @@ -1306,7 +1306,7 @@ sal_Bool SfxDocTplService_Impl::UpdateUINamesForTemplateDir_Impl( const OUString } -sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, +bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aDefaultFsysGroupName, const OUString& aOldGroupName, const OUString& aNewGroupName ) @@ -1314,12 +1314,12 @@ sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUStrin uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); sal_Int32 nLen = aUINames.getLength(); - sal_Bool bChanged = sal_False; + bool bChanged = false; for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ ) if ( aUINames[nInd].Second.equals( aOldGroupName ) ) { aUINames[nInd].Second = aNewGroupName; - bChanged = sal_True; + bChanged = true; } if ( !bChanged ) @@ -1332,7 +1332,7 @@ sal_Bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUStrin } -sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, +bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aGroupName ) { uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); @@ -1340,10 +1340,10 @@ sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString uno::Sequence< beans::StringPair > aNewUINames( nLen ); sal_Int32 nNewLen = 0; - sal_Bool bChanged = sal_False; + bool bChanged = false; for ( sal_Int32 nInd = 0; nInd < nLen; nInd++ ) if ( aUINames[nInd].Second.equals( aGroupName ) ) - bChanged = sal_True; + bChanged = true; else { nNewLen++; @@ -1358,10 +1358,10 @@ sal_Bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString -sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, +bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ) { - sal_Bool bResult = sal_False; + bool bResult = false; try { uno::Reference< beans::XPropertySet > xTempFile( io::TempFile::create(mxContext), @@ -1390,7 +1390,7 @@ sal_Bool SfxDocTplService_Impl::WriteUINamesForTemplateDir_Impl( const OUString& OUString( "groupuinames.xml" ), ucb::NameClash::OVERWRITE, OUString( "text/xml" ) ); - bResult = sal_True; + bResult = true; } catch ( uno::Exception& ) { @@ -1449,7 +1449,7 @@ OUString SfxDocTplService_Impl::CreateNewGroupFsys( const OUString& rGroupName, } -sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) +bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1465,11 +1465,11 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) aNewGroupURL = aNewGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( Content::create( aNewGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aNewGroup ) || - ! createFolder( aNewGroupURL, sal_False, sal_False, aNewGroup ) ) + ! createFolder( aNewGroupURL, false, false, aNewGroup ) ) { // if there already was a group with this name or the new group // could not be created, we return here - return sal_False; + return false; } // Get the user template path entry ( new group will always @@ -1481,7 +1481,7 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) if ( nIndex ) nIndex--; else - return sal_False; // We don't know where to add the group + return false; // We don't know where to add the group aUserPath = maTemplateDirs[ nIndex ]; @@ -1505,7 +1505,7 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) // we could not create the folder, so we delete the group in the // hierarchy and return removeContent( aNewGroup ); - return sal_False; + return false; } if ( !UpdateUINamesForTemplateDir_Impl( aUserPath, rGroupName, aNewFolderName ) ) @@ -1514,7 +1514,7 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) // hierarchy, the folder and return removeContent( aNewGroup ); removeContent( aNewFolder ); - return sal_False; + return false; } // Now set the target url for this group and we are done @@ -1525,21 +1525,21 @@ sal_Bool SfxDocTplService_Impl::addGroup( const OUString& rGroupName ) { removeContent( aNewGroup ); removeContent( aNewFolder ); - return sal_False; + return false; } - return sal_True; + return true; } -sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) +bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) { // remove all the elements that have the prefix aTargetURL // if the group does not have other elements remove it ::osl::MutexGuard aGuard( maMutex ); - sal_Bool bResult = sal_False; + bool bResult = false; // create the group url INetURLObject aGroupObj( maRootURL ); @@ -1561,21 +1561,21 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) aValue >>= aGroupTargetURL; if ( aGroupTargetURL.isEmpty() ) - return sal_False; // nothing is allowed to be removed + return false; // nothing is allowed to be removed if ( !maTemplateDirs.getLength() ) - return sal_False; + return false; // check that the fs location is in writable folder and this is not a "My templates" folder INetURLObject aGroupParentFolder( aGroupTargetURL ); if (!aGroupParentFolder.removeSegment()) - return sal_False; + return false; OUString aGeneralTempPath = findParentTemplateDir( aGroupParentFolder.GetMainURL(INetURLObject::NO_DECODE)); if (aGeneralTempPath.isEmpty()) - return sal_False; + return false; // now get the content of the Group uno::Reference< XResultSet > xResultSet; @@ -1585,8 +1585,8 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) try { - sal_Bool bHasNonRemovable = sal_False; - sal_Bool bHasShared = sal_False; + bool bHasNonRemovable = false; + bool bHasShared = false; ResultSetInclude eInclude = INCLUDE_DOCUMENTS_ONLY; xResultSet = aGroup.createCursor( aProps, eInclude ); @@ -1607,10 +1607,10 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) if ( removeContent( aTemplTargetURL ) ) removeContent( aHierURL ); else - bHasNonRemovable = sal_True; + bHasNonRemovable = true; } else - bHasShared = sal_True; + bHasShared = true; } if ( !bHasNonRemovable && !bHasShared ) @@ -1620,7 +1620,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) { removeContent( aGroupURL ); RemoveUINamesForTemplateDir_Impl( aGeneralTempPath, rGroupName ); - bResult = sal_True; // the operation is successful only if the whole group is removed + bResult = true; // the operation is successful only if the whole group is removed } } else if ( !bHasNonRemovable ) @@ -1641,7 +1641,7 @@ sal_Bool SfxDocTplService_Impl::removeGroup( const OUString& rGroupName ) } -sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, +bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, const OUString& rNewName ) { ::osl::MutexGuard aGuard( maMutex ); @@ -1657,7 +1657,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, // Check, if there is a group with the new name, return false // if there is one. if ( Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) - return sal_False; + return false; aGroupObj.removeSegment(); aGroupObj.insertName( rOldName, false, @@ -1667,7 +1667,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, // When there is no group with the old name, we can't rename it if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) - return sal_False; + return false; OUString aGroupTargetURL; // there is no need to check whether target dir url is in target path, since if the target path is changed @@ -1678,21 +1678,21 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, aValue >>= aGroupTargetURL; if ( aGroupTargetURL.isEmpty() ) - return sal_False; + return false; if ( !maTemplateDirs.getLength() ) - return sal_False; + return false; // check that the fs location is in writable folder and this is not a "My templates" folder INetURLObject aGroupParentFolder( aGroupTargetURL ); if (!aGroupParentFolder.removeSegment() || isInternalTemplateDir(aGroupParentFolder.GetMainURL(INetURLObject::NO_DECODE))) { - return sal_False; + return false; } // check that the group can be renamed ( all the contents must be in target location ) - sal_Bool bCanBeRenamed = sal_False; + bool bCanBeRenamed = false; try { uno::Reference< XResultSet > xResultSet; @@ -1715,7 +1715,7 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, throw uno::Exception(); } - bCanBeRenamed = sal_True; + bCanBeRenamed = true; } } catch ( Exception& ) {} @@ -1740,11 +1740,11 @@ sal_Bool SfxDocTplService_Impl::renameGroup( const OUString& rOldName, } } - return sal_False; + return false; } -sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, +bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, const OUString& rTemplateName, const uno::Reference< frame::XStorable >& rStorable ) { @@ -1755,7 +1755,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, Content aGroup, aTemplate, aTargetGroup, aTemplateToRemove; OUString aGroupURL, aTemplateURL, aTemplateToRemoveTargetURL; INetURLObject aGroupObj( maRootURL ); - sal_Bool bRemoveOldTemplateContent = sal_False; + bool bRemoveOldTemplateContent = false; OUString sDocServiceName; aGroupObj.insertName( rGroupName, false, @@ -1764,7 +1764,7 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) - return sal_False; + return false; OUString aGroupTargetURL; OUString aPropName( TARGET_DIR_URL ); @@ -1786,13 +1786,13 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, { OUString aTargetTemplPropName( TARGET_URL ); - bRemoveOldTemplateContent = sal_True; + bRemoveOldTemplateContent = true; if ( getProperty( aTemplateToRemove, aTargetTemplPropName, aValue ) ) aValue >>= aTemplateToRemoveTargetURL; if ( aGroupTargetURL.isEmpty() || !maTemplateDirs.getLength() || (!aTemplateToRemoveTargetURL.isEmpty() && isInternalTemplateDir(aTemplateToRemoveTargetURL)) ) - return sal_False; // it is not allowed to remove the template + return false; // it is not allowed to remove the template } try @@ -1925,12 +1925,12 @@ sal_Bool SfxDocTplService_Impl::storeTemplate( const OUString& rGroupName, catch( Exception& ) { // the template was not stored - return sal_False; + return false; } } -sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, +bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, const OUString& rTemplateName, const OUString& rSourceURL ) { @@ -1948,7 +1948,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) - return sal_False; + return false; // Check, if there's a template with the given name in this group // Return false, if there already is a template @@ -1958,7 +1958,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) ) - return sal_False; + return false; // get the target url of the group OUString aTargetURL; @@ -1973,15 +1973,15 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, aTargetURL = CreateNewGroupFsys( rGroupName, aGroup ); if ( aTargetURL.isEmpty() ) - return sal_False; + return false; } // Get the content type OUString aTitle, aType, aTargetURL2; - sal_Bool bDocHasTitle = sal_False; + bool bDocHasTitle = false; if( !getTitleFromURL( rSourceURL, aTitle, aType, bDocHasTitle ) ) - return sal_False; + return false; INetURLObject aSourceObj( rSourceURL ); if ( rTemplateName.equals( aTitle ) ) @@ -2014,17 +2014,17 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, INetURLObject aNewTemplateTargetObj( aNewTemplateTargetURL ); OUString aNewTemplateTargetName = aNewTemplateTargetObj.getName( INetURLObject::LAST_SEGMENT, true, INetURLObject::DECODE_WITH_CHARSET ); if ( aNewTemplateTargetURL.isEmpty() || aNewTemplateTargetName.isEmpty() ) - return sal_False; + return false; // get access to source file Content aSourceContent; uno::Reference < ucb::XCommandEnvironment > xEnv; INetURLObject aSourceURL( rSourceURL ); if( ! Content::create( aSourceURL.GetMainURL( INetURLObject::NO_DECODE ), xEnv, comphelper::getProcessComponentContext(), aSourceContent ) ) - return sal_False; + return false; if( ! Content::create( aTargetURL, xEnv, comphelper::getProcessComponentContext(), aTargetGroup ) ) - return sal_False; + return false; // transfer source file try @@ -2034,7 +2034,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, aNewTemplateTargetName, NameClash::OVERWRITE, aType ) ) - return sal_False; + return false; // allow to edit the added template Content aResultContent; @@ -2042,19 +2042,19 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, { OUString aPropertyName( "IsReadOnly" ); uno::Any aProperty; - sal_Bool bReadOnly = sal_False; + bool bReadOnly = false; if ( getProperty( aResultContent, aPropertyName, aProperty ) && ( aProperty >>= bReadOnly ) && bReadOnly ) - setProperty( aResultContent, aPropertyName, uno::makeAny( (sal_Bool)sal_False ) ); + setProperty( aResultContent, aPropertyName, uno::makeAny( false ) ); } } catch ( ContentCreationException& ) - { return sal_False; } + { return false; } catch ( Exception& ) - { return sal_False; } + { return false; } // either the document has title and it is the same as requested, or we have to set it - sal_Bool bCorrectTitle = ( bDocHasTitle && aTitle.equals( rTemplateName ) ); + bool bCorrectTitle = ( bDocHasTitle && aTitle.equals( rTemplateName ) ); if ( !bCorrectTitle ) { if ( !bDocHasTitle ) @@ -2077,7 +2077,7 @@ sal_Bool SfxDocTplService_Impl::addTemplate( const OUString& rGroupName, // TODO/LATER: The user could be notified here that the renaming has failed // create a new entry in the hierarchy addEntry( aGroup, aTitle, aNewTemplateTargetURL, aType ); - return sal_False; + return false; } bool SfxDocTplService_Impl::isInternalTemplateDir(const OUString& rURL) const @@ -2104,7 +2104,7 @@ OUString SfxDocTplService_Impl::findParentTemplateDir(const OUString& rURL) cons return OUString(); } -sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName, +bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName, const OUString& rTemplateName ) { ::osl::MutexGuard aGuard( maMutex ); @@ -2121,7 +2121,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName, aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) - return sal_False; + return false; // Check, if there's a template with the given name in this group // Return false, if there is no template @@ -2131,7 +2131,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName, aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( !Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) ) - return sal_False; + return false; // get the target URL from the template OUString aTargetURL; @@ -2145,7 +2145,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName, if ( !aTargetURL.isEmpty() ) { if (isInternalTemplateDir(aTargetURL)) - return sal_False; + return false; removeContent( aTargetURL ); } @@ -2155,7 +2155,7 @@ sal_Bool SfxDocTplService_Impl::removeTemplate( const OUString& rGroupName, } -sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName, +bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName, const OUString& rOldName, const OUString& rNewName ) { @@ -2173,7 +2173,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName, aGroupURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( ! Content::create( aGroupURL, maCmdEnv, comphelper::getProcessComponentContext(), aGroup ) ) - return sal_False; + return false; // Check, if there's a template with the new name in this group // Return false, if there is one @@ -2183,7 +2183,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName, aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) ) - return sal_False; + return false; // Check, if there's a template with the old name in this group // Return false, if there is no template @@ -2194,7 +2194,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName, aTemplateURL = aGroupObj.GetMainURL( INetURLObject::NO_DECODE ); if ( !Content::create( aTemplateURL, maCmdEnv, comphelper::getProcessComponentContext(), aTemplate ) ) - return sal_False; + return false; OUString aTemplateTargetURL; OUString aTargetProp( TARGET_URL ); @@ -2204,7 +2204,7 @@ sal_Bool SfxDocTplService_Impl::renameTemplate( const OUString& rGroupName, aTargetValue >>= aTemplateTargetURL; if ( !setTitleForURL( aTemplateTargetURL, rNewName ) ) - return sal_False; + return false; // rename the template entry in the cache OUString aTitleProp( TITLE ); @@ -2400,7 +2400,7 @@ void SAL_CALL SfxDocTplService::update() throw( uno::RuntimeException, std::exception ) { if ( pImp->init() ) - pImp->update( sal_True ); + pImp->update( true ); } @@ -2487,7 +2487,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, if ( xResultSet.is() ) { GroupData_Impl *pGroup = new GroupData_Impl( rTitle ); - pGroup->setHierarchy( sal_True ); + pGroup->setHierarchy( true ); pGroup->setHierarchyURL( rOwnURL ); rList.push_back( pGroup ); @@ -2498,7 +2498,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, { while ( xResultSet->next() ) { - sal_Bool bUpdateType = sal_False; + bool bUpdateType = false; DocTemplates_EntryData_Impl *pData; OUString aTitle( xRow->getString( 1 ) ); @@ -2510,7 +2510,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, { OUString aTmpTitle; - sal_Bool bDocHasTitle = sal_False; + bool bDocHasTitle = false; if( !getTitleFromURL( aTargetDir, aTmpTitle, aType, bDocHasTitle ) ) { SAL_WARN( "sfx.doc", "addHierGroup(): template of alien format" ); @@ -2518,7 +2518,7 @@ void SfxDocTplService_Impl::addHierGroup( GroupList_Impl& rList, } if ( !aType.isEmpty() ) - bUpdateType = sal_True; + bUpdateType = true; } pData = pGroup->addEntry( aTitle, aTargetDir, aType, aHierURL ); @@ -2534,7 +2534,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, const OUString& rTitle, const OUString& rUITitle, const OUString& rOwnURL, - sal_Bool bWriteableGroup ) + bool bWriteableGroup ) { OUString aTitle; @@ -2609,7 +2609,7 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, if ( aChildTitle.equalsAscii( "sfx.tlx" ) || aChildTitle == "groupuinames.xml" ) continue; - sal_Bool bDocHasTitle = sal_False; + bool bDocHasTitle = false; if( !getTitleFromURL( aTargetURL, aChildTitle, aType, bDocHasTitle ) ) continue; @@ -2623,8 +2623,8 @@ void SfxDocTplService_Impl::addFsysGroup( GroupList_Impl& rList, void SfxDocTplService_Impl::createFromContent( GroupList_Impl& rList, Content &rContent, - sal_Bool bHierarchy, - sal_Bool bWriteableContent ) + bool bHierarchy, + bool bWriteableContent ) { OUString aTargetURL = rContent.get()->getIdentifier()->getContentIdentifier(); @@ -2761,7 +2761,7 @@ void SfxDocTplService_Impl::addGroupToHierarchy( GroupData_Impl *pGroup ) OUString aNewGroupURL = aNewGroupObj.GetMainURL( INetURLObject::NO_DECODE ); - if ( createFolder( aNewGroupURL, sal_False, sal_False, aGroup ) ) + if ( createFolder( aNewGroupURL, false, false, aGroup ) ) { setProperty( aGroup, aAdditionalProp, makeAny( pGroup->getTargetURL() ) ); pGroup->setHierarchyURL( aNewGroupURL ); @@ -2790,8 +2790,8 @@ void SfxDocTplService_Impl::removeFromHierarchy( GroupData_Impl *pGroup ) GroupData_Impl::GroupData_Impl( const OUString& rTitle ) { maTitle = rTitle; - mbInUse = sal_False; - mbInHierarchy = sal_False; + mbInUse = false; + mbInHierarchy = false; } @@ -2829,7 +2829,7 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, if ( !rHierURL.isEmpty() ) { pData->setHierarchyURL( rHierURL ); - pData->setHierarchy( sal_True ); + pData->setHierarchy( true ); } maEntries.push_back( pData ); } @@ -2838,7 +2838,7 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, if ( !rHierURL.isEmpty() ) { pData->setHierarchyURL( rHierURL ); - pData->setHierarchy( sal_True ); + pData->setHierarchy( true ); } if ( pData->getInHierarchy() ) @@ -2847,7 +2847,7 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, if ( rTargetURL != pData->getTargetURL() ) { pData->setTargetURL( rTargetURL ); - pData->setUpdateLink( sal_True ); + pData->setUpdateLink( true ); } } @@ -2858,10 +2858,10 @@ DocTemplates_EntryData_Impl* GroupData_Impl::addEntry( const OUString& rTitle, DocTemplates_EntryData_Impl::DocTemplates_EntryData_Impl( const OUString& rTitle ) { maTitle = rTitle; - mbInUse = sal_False; - mbInHierarchy = sal_False; - mbUpdateType = sal_False; - mbUpdateLink = sal_False; + mbInUse = false; + mbInHierarchy = false; + mbUpdateType = false; + mbUpdateLink = false; } } diff --git a/sfx2/source/doc/graphhelp.cxx b/sfx2/source/doc/graphhelp.cxx index 60329d0740aa..7d40cc8e27aa 100644 --- a/sfx2/source/doc/graphhelp.cxx +++ b/sfx2/source/doc/graphhelp.cxx @@ -195,21 +195,21 @@ void* GraphicHelper::getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, co // static -sal_Bool GraphicHelper::supportsMetaFileHandle_Impl() +bool GraphicHelper::supportsMetaFileHandle_Impl() { #ifdef WNT return sal_True; #else - return sal_False; + return false; #endif } // static -sal_Bool GraphicHelper::getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile, +bool GraphicHelper::getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile, const uno::Reference< io::XStream >& xStream ) { - sal_Bool bResult = sal_False; + bool bResult = false; SvStream* pStream = NULL; if ( xStream.is() ) @@ -233,9 +233,9 @@ sal_Bool GraphicHelper::getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile, } // static -sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const uno::Reference< io::XStream >& xStream ) +bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const uno::Reference< io::XStream >& xStream ) { - sal_Bool bResult = sal_False; + bool bResult = false; if ( nResID && xStream.is() ) { uno::Reference< uno::XComponentContext > xContext = ::comphelper::getProcessComponentContext(); @@ -259,7 +259,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un aStoreProps[1].Value <<= OUString("image/png"); xGraphProvider->storeGraphic( xGraphic, aStoreProps ); - bResult = sal_True; + bResult = true; } } catch(const uno::Exception&) @@ -272,7 +272,7 @@ sal_Bool GraphicHelper::getThumbnailReplacement_Impl( sal_Int32 nResID, const un // static -sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, sal_Bool /*bIsTemplate*/ ) +sal_uInt16 GraphicHelper::getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, bool /*bIsTemplate*/ ) { sal_uInt16 nResult = 0; diff --git a/sfx2/source/doc/graphhelp.hxx b/sfx2/source/doc/graphhelp.hxx index f9beeded2030..c0c3ed1c7747 100644 --- a/sfx2/source/doc/graphhelp.hxx +++ b/sfx2/source/doc/graphhelp.hxx @@ -38,16 +38,16 @@ public: static void* getWinMetaFileFromGDI_Impl( const GDIMetaFile* pGDIMeta, const Size& aMetaSize ); - static sal_Bool supportsMetaFileHandle_Impl(); + static bool supportsMetaFileHandle_Impl(); - static sal_Bool getThumbnailFormatFromGDI_Impl( + static bool getThumbnailFormatFromGDI_Impl( GDIMetaFile* pMetaFile, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); static sal_uInt16 getThumbnailReplacementIDByFactoryName_Impl( const OUString& aFactoryShortName, - sal_Bool bIsTemplate ); + bool bIsTemplate ); - static sal_Bool getThumbnailReplacement_Impl( + static bool getThumbnailReplacement_Impl( sal_Int32 nResID, const ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >& xStream ); diff --git a/sfx2/source/doc/guisaveas.cxx b/sfx2/source/doc/guisaveas.cxx index af578dd599d4..17866f9f0c3c 100644 --- a/sfx2/source/doc/guisaveas.cxx +++ b/sfx2/source/doc/guisaveas.cxx @@ -188,14 +188,14 @@ static sal_Int32 getDontFlags( sal_Int8 nStoreMode ) class DocumentSettingsGuard { uno::Reference< beans::XPropertySet > m_xDocumentSettings; - sal_Bool m_bPreserveReadOnly; - sal_Bool m_bReadOnlySupported; + bool m_bPreserveReadOnly; + bool m_bReadOnlySupported; - sal_Bool m_bRestoreSettings; + bool m_bRestoreSettings; public: - DocumentSettingsGuard( const uno::Reference< frame::XModel >& xModel, sal_Bool bReadOnly, sal_Bool bRestore ) - : m_bPreserveReadOnly( sal_False ) - , m_bReadOnlySupported( sal_False ) + DocumentSettingsGuard( const uno::Reference< frame::XModel >& xModel, bool bReadOnly, bool bRestore ) + : m_bPreserveReadOnly( false ) + , m_bReadOnlySupported( false ) , m_bRestoreSettings( bRestore ) { try @@ -212,7 +212,7 @@ public: { m_xDocumentSettings->getPropertyValue( aLoadReadonlyString ) >>= m_bPreserveReadOnly; m_xDocumentSettings->setPropertyValue( aLoadReadonlyString, uno::makeAny( bReadOnly ) ); - m_bReadOnlySupported = sal_True; + m_bReadOnlySupported = true; } catch( const uno::Exception& ) {} @@ -261,7 +261,7 @@ class ModelData_Impl ::comphelper::SequenceAsHashMap m_aMediaDescrHM; - sal_Bool m_bRecommendReadOnly; + bool m_bRecommendReadOnly; public: ModelData_Impl( SfxStoringHelper& aOwner, @@ -279,7 +279,7 @@ public: ::comphelper::SequenceAsHashMap& GetMediaDescr() { return m_aMediaDescrHM; } - sal_Bool IsRecommendReadOnly() const { return m_bRecommendReadOnly; } + bool IsRecommendReadOnly() const { return m_bRecommendReadOnly; } const ::comphelper::SequenceAsHashMap& GetDocProps(); @@ -295,27 +295,27 @@ public: uno::Sequence< beans::PropertyValue > GetPreselectedFilter_Impl( sal_Int8 nStoreMode ); uno::Sequence< beans::PropertyValue > GetDocServiceDefaultFilter(); - sal_Bool ExecuteFilterDialog_Impl( const OUString& aFilterName ); + bool ExecuteFilterDialog_Impl( const OUString& aFilterName ); sal_Int8 CheckSaveAcceptable( sal_Int8 nCurStatus ); sal_Int8 CheckStateForSave(); sal_Int8 CheckFilter( const OUString& ); - sal_Bool CheckFilterOptionsDialogExistence(); + bool CheckFilterOptionsDialogExistence(); - sal_Bool OutputFileDialog( sal_Int8 nStoreMode, + bool OutputFileDialog( sal_Int8 nStoreMode, const ::comphelper::SequenceAsHashMap& aPreselectedFilterPropsHM, - sal_Bool bSetStandardName, + bool bSetStandardName, OUString& aSuggestedName, - sal_Bool bPreselectPassword, + bool bPreselectPassword, OUString& aSuggestedDir, sal_Int16 nDialog, const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList ); - sal_Bool ShowDocumentInfoDialog(); + bool ShowDocumentInfoDialog(); OUString GetRecommendedDir( const OUString& aSuggestedDir ); OUString GetRecommendedName( const OUString& aSuggestedName, @@ -332,7 +332,7 @@ ModelData_Impl::ModelData_Impl( SfxStoringHelper& aOwner, , m_pDocumentPropsHM( NULL ) , m_pModulePropsHM( NULL ) , m_aMediaDescrHM( aMediaDescr ) -, m_bRecommendReadOnly( sal_False ) +, m_bRecommendReadOnly( false ) { CheckInteractionHandler(); OUString sModuleName; @@ -572,9 +572,9 @@ uno::Sequence< beans::PropertyValue > ModelData_Impl::GetPreselectedFilter_Impl( } -sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName ) +bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName ) { - sal_Bool bDialogUsed = sal_False; + bool bDialogUsed = false; try { uno::Sequence < beans::PropertyValue > aProps; @@ -596,7 +596,7 @@ sal_Bool ModelData_Impl::ExecuteFilterDialog_Impl( const OUString& aFilterName ) if( xFilterDialog.is() && xFilterProperties.is() ) { - bDialogUsed = sal_True; + bDialogUsed = true; uno::Reference< document::XExporter > xExporter( xFilterDialog, uno::UNO_QUERY ); if( xExporter.is() ) @@ -685,7 +685,7 @@ sal_Int8 ModelData_Impl::CheckStateForSave() return STATUS_SAVEAS; // check acceptable entries for media descriptor - sal_Bool bVersInfoNeedsStore = sal_False; + bool bVersInfoNeedsStore = false; ::comphelper::SequenceAsHashMap aAcceptedArgs; OUString aVersionCommentString("VersionComment"); @@ -696,7 +696,7 @@ sal_Int8 ModelData_Impl::CheckStateForSave() if ( GetMediaDescr().find( aVersionCommentString ) != GetMediaDescr().end() ) { - bVersInfoNeedsStore = sal_True; + bVersInfoNeedsStore = true; aAcceptedArgs[ aVersionCommentString ] = GetMediaDescr()[ aVersionCommentString ]; } if ( GetMediaDescr().find( aAuthorString ) != GetMediaDescr().end() ) @@ -716,7 +716,7 @@ sal_Int8 ModelData_Impl::CheckStateForSave() // the document must be modified unless the always-save flag is set. SvtMiscOptions aMiscOptions; - sal_Bool bAlwaysAllowSave = aMiscOptions.IsSaveAlwaysAllowed(); + bool bAlwaysAllowSave = aMiscOptions.IsSaveAlwaysAllowed(); if (!bAlwaysAllowSave) { if ( !GetModifiable()->isModified() && !bVersInfoNeedsStore ) @@ -732,9 +732,9 @@ sal_Int8 ModelData_Impl::CheckStateForSave() return nResult; } -sal_Bool hasMacros( const uno::Reference< frame::XModel >& xModel ) +bool hasMacros( const uno::Reference< frame::XModel >& xModel ) { - sal_Bool bHasMacros = sal_False; + bool bHasMacros = false; uno::Reference< script::XLibraryContainer > xContainer; uno::Reference< beans::XPropertySet > xProps( xModel, uno::UNO_QUERY ); if ( xProps.is() ) @@ -827,7 +827,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) return STATUS_SAVEAS; } } - if ( !SfxStoringHelper::WarnUnacceptableFormat( GetModel(), aUIName, aDefUIName, sal_True ) ) + if ( !SfxStoringHelper::WarnUnacceptableFormat( GetModel(), aUIName, aDefUIName, true ) ) return STATUS_SAVEAS_STANDARDNAME; } } @@ -836,7 +836,7 @@ sal_Int8 ModelData_Impl::CheckFilter( const OUString& aFilterName ) } -sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() +bool ModelData_Impl::CheckFilterOptionsDialogExistence() { uno::Sequence< beans::NamedValue > aSearchRequest( 1 ); aSearchRequest[0].Name = "DocumentService"; @@ -855,25 +855,25 @@ sal_Bool ModelData_Impl::CheckFilterOptionsDialogExistence() OUString("UIComponent"), OUString() ); if ( !aUIServName.isEmpty() ) - return sal_True; + return true; } } - return sal_False; + return false; } -sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, +bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, const ::comphelper::SequenceAsHashMap& aPreselectedFilterPropsHM, - sal_Bool bSetStandardName, + bool bSetStandardName, OUString& aSuggestedName, - sal_Bool bPreselectPassword, + bool bPreselectPassword, OUString& aSuggestedDir, sal_Int16 nDialog, const OUString& rStandardDir, const ::com::sun::star::uno::Sequence< OUString >& rBlackList) { - sal_Bool bUseFilterOptions = sal_False; + bool bUseFilterOptions = false; ::comphelper::SequenceAsHashMap::const_iterator aOverwriteIter = GetMediaDescr().find( OUString("Overwrite") ); @@ -889,7 +889,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, // we need to show the file dialog // check if we have a filter which allows for filter options, so we need a corresponding checkbox in the dialog - sal_Bool bAllowOptions = sal_False; + bool bAllowOptions = false; // in case of Export, filter options dialog is used if available if( !( nStoreMode & EXPORT_REQUESTED ) || ( nStoreMode & WIDEEXPORT_REQUESTED ) ) @@ -1143,7 +1143,7 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, if ( xExtFileDlg.is() ) { if ( SfxStoringHelper::CheckFilterOptionsAppearence( m_pOwner->GetFilterConfiguration(), aFilterName ) ) - bUseFilterOptions = sal_True; + bUseFilterOptions = true; if ( ( !( nStoreMode & EXPORT_REQUESTED ) || ( nStoreMode & WIDEEXPORT_REQUESTED ) ) && bUseFilterOptions ) { @@ -1174,9 +1174,9 @@ sal_Bool ModelData_Impl::OutputFileDialog( sal_Int8 nStoreMode, } -sal_Bool ModelData_Impl::ShowDocumentInfoDialog() +bool ModelData_Impl::ShowDocumentInfoDialog() { - sal_Bool bDialogUsed = sal_False; + bool bDialogUsed = false; try { uno::Reference< frame::XController > xController = GetModel()->getCurrentController(); @@ -1198,7 +1198,7 @@ sal_Bool ModelData_Impl::ShowDocumentInfoDialog() if ( xDispatch.is() ) { xDispatch->dispatch( aURL, uno::Sequence< beans::PropertyValue >() ); - bDialogUsed = sal_True; + bDialogUsed = true; } } } @@ -1348,21 +1348,21 @@ uno::Reference< ::com::sun::star::frame::XModuleManager2 > SfxStoringHelper::Get } -sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel, +bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel, const OUString& aSlotName, uno::Sequence< beans::PropertyValue >& aArgsSequence, - sal_Bool bPreselectPassword, + bool bPreselectPassword, const OUString& _aSuggestedName, sal_uInt16 nDocumentSignatureState ) { OUString aSuggestedName = _aSuggestedName; ModelData_Impl aModelData( *this, xModel, aArgsSequence ); - sal_Bool bDialogUsed = sal_False; + bool bDialogUsed = false; INetURLObject aURL; - sal_Bool bSetStandardName = sal_False; // can be set only for SaveAs + bool bSetStandardName = false; // can be set only for SaveAs // parse the slot name sal_Int8 nStoreMode = getStoreModeFromSlotName( aSlotName ); @@ -1372,7 +1372,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel aModelData.GetMediaDescr().find( ::rtl::OUString("SaveACopy") ); if ( aSaveACopyIter != aModelData.GetMediaDescr().end() ) { - sal_Bool bSaveACopy = sal_False; + bool bSaveACopy = false; aSaveACopyIter->second >>= bSaveACopy; if ( bSaveACopy ) nStoreMode = EXPORT_REQUESTED | SAVEACOPY_REQUESTED | WIDEEXPORT_REQUESTED; @@ -1384,7 +1384,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel aModelData.GetMediaDescr().find( OUString("SaveTo") ); if ( aSaveToIter != aModelData.GetMediaDescr().end() ) { - sal_Bool bWideExport = sal_False; + bool bWideExport = false; aSaveToIter->second >>= bWideExport; if ( bWideExport ) nStoreMode = EXPORT_REQUESTED | WIDEEXPORT_REQUESTED; @@ -1422,7 +1422,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // this should be a usual SaveAs operation nStoreMode = SAVEAS_REQUESTED; if ( nStatusSave == STATUS_SAVEAS_STANDARDNAME ) - bSetStandardName = sal_True; + bSetStandardName = true; } } @@ -1468,7 +1468,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel aModelData.GetStorable()->store(); } - return sal_False; + return false; } // preselect a filter for the storing process @@ -1494,7 +1494,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel sFilterNameString, OUString() ); - sal_Bool bUseFilterOptions = sal_False; + bool bUseFilterOptions = false; ::comphelper::SequenceAsHashMap::const_iterator aFileNameIter = aModelData.GetMediaDescr().find( OUString("URL") ); const OUString sFilterOptionsString(aFilterOptionsString); @@ -1511,7 +1511,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel { // execute filter options dialog since no options are set in the media descriptor if ( aModelData.ExecuteFilterDialog_Impl( aFilterName ) ) - bDialogUsed = sal_True; + bDialogUsed = true; } } @@ -1522,7 +1522,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel aModelData.GetMediaDescr().find( OUString("UseSystemDialog") ); if ( aDlgIter != aModelData.GetMediaDescr().end() ) { - sal_Bool bUseSystemDialog = sal_True; + bool bUseSystemDialog = true; if ( aDlgIter->second >>= bUseSystemDialog ) { if ( bUseSystemDialog ) @@ -1558,7 +1558,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( aBlackListIter != aModelData.GetMediaDescr().end() ) aBlackListIter->second >>= aBlackList; - sal_Bool bExit = sal_False; + bool bExit = false; while ( !bExit ) { // in case the dialog is opened a second time the folder should be the same as previously navigated to by the user, not what was handed over by initial parameters @@ -1573,19 +1573,19 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel if ( nStatusFilterSave == STATUS_SAVEAS_STANDARDNAME ) { // switch to best filter - bSetStandardName = sal_True; + bSetStandardName = true; } else if ( nStatusFilterSave == STATUS_SAVE ) { // user confirmed alien filter or "good" filter is used - bExit = sal_True; + bExit = true; } } else - bExit = sal_True; + bExit = true; } - bDialogUsed = sal_True; + bDialogUsed = true; aFileNameIter = aModelData.GetMediaDescr().find( OUString("URL") ); } else @@ -1634,14 +1634,14 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel ::comphelper::SequenceAsHashMap::const_iterator aIter = aModelData.GetMediaDescr().find( OUString("FilterFlags") ); - sal_Bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() ); + bool bFilterFlagsSet = ( aIter != aModelData.GetMediaDescr().end() ); if( !( nStoreMode & PDFEXPORT_REQUESTED ) && !bFilterFlagsSet && ( ( nStoreMode & EXPORT_REQUESTED ) || bUseFilterOptions ) ) { // execute filter options dialog if ( aModelData.ExecuteFilterDialog_Impl( aFilterName ) ) - bDialogUsed = sal_True; + bDialogUsed = true; } // so the arguments will not change any more and can be stored to the main location @@ -1670,7 +1670,7 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // use dispatch API to show document info dialog if ( aModelData.ShowDocumentInfoDialog() ) - bDialogUsed = sal_True; + bDialogUsed = true; else { OSL_FAIL( "Can't execute document info dialog!\n" ); @@ -1688,14 +1688,14 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel { if ( nStoreMode & EXPORT_REQUESTED ) { - SetDocInfoState(aModelData.GetModel(), xOldDocProps, sal_True); + SetDocInfoState(aModelData.GetModel(), xOldDocProps, true); } throw; } if ( nStoreMode & EXPORT_REQUESTED ) { - SetDocInfoState(aModelData.GetModel(), xOldDocProps, sal_True); + SetDocInfoState(aModelData.GetModel(), xOldDocProps, true); } } else @@ -1714,9 +1714,9 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // Launch PDF viewer if ( nStoreMode & PDFEXPORT_REQUESTED ) { FilterConfigItem aItem( "Office.Common/Filter/PDF/Export/" ); - sal_Bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false ); + bool aViewPDF = aItem.ReadBool( "ViewPDFAfterExport", false ); - if ( aViewPDF==sal_True ) { + if ( aViewPDF ) { uno::Reference<XSystemShellExecute> xSystemShellExecute(SystemShellExecute::create( ::comphelper::getProcessComponentContext() ) ); xSystemShellExecute->execute( aURL.GetMainURL( INetURLObject::NO_DECODE ), "", SystemShellExecuteFlags::URIS_ONLY ); } @@ -1727,11 +1727,11 @@ sal_Bool SfxStoringHelper::GUIStoreModel( uno::Reference< frame::XModel > xModel // static -sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( +bool SfxStoringHelper::CheckFilterOptionsAppearence( const uno::Reference< container::XNameAccess >& xFilterCFG, const OUString& aFilterName ) { - sal_Bool bUseFilterOptions = sal_False; + bool bUseFilterOptions = false; DBG_ASSERT( xFilterCFG.is(), "No filter configuration!\n" ); if( xFilterCFG.is() ) @@ -1746,7 +1746,7 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( OUString("UIComponent"), OUString() ); if( !aServiceName.isEmpty() ) - bUseFilterOptions = sal_True; + bUseFilterOptions = true; } } catch( const uno::Exception& ) @@ -1762,7 +1762,7 @@ sal_Bool SfxStoringHelper::CheckFilterOptionsAppearence( void SfxStoringHelper::SetDocInfoState( const uno::Reference< frame::XModel >& xModel, const uno::Reference< document::XDocumentProperties>& i_xOldDocProps, - sal_Bool bNoModify ) + bool bNoModify ) { uno::Reference<document::XDocumentPropertiesSupplier> const xModelDocPropsSupplier(xModel, uno::UNO_QUERY_THROW); @@ -1775,7 +1775,7 @@ void SfxStoringHelper::SetDocInfoState( if ( bNoModify && !xModifiable.is() ) throw uno::RuntimeException(); - sal_Bool bIsModified = bNoModify && xModifiable->isModified(); + bool bIsModified = bNoModify && xModifiable->isModified(); try { @@ -1833,19 +1833,19 @@ void SfxStoringHelper::SetDocInfoState( } // set the modified flag back if required - if ( bNoModify && bIsModified != xModifiable->isModified() ) + if ( ((bNoModify && bIsModified) ? 1 : 0) != xModifiable->isModified() ) xModifiable->setModified( bIsModified ); } // static -sal_Bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XModel >& xModel, +bool SfxStoringHelper::WarnUnacceptableFormat( const uno::Reference< frame::XModel >& xModel, const OUString& aOldUIName, const OUString& /*aDefUIName*/, - sal_Bool /*bCanProceedFurther*/ ) + bool /*bCanProceedFurther*/ ) { if ( !SvtSaveOptions().IsWarnAlienFormat() ) - return sal_True; + return true; Window* pWin = SfxStoringHelper::GetModelWindow( xModel ); SfxAlienWarningDialog aDlg( pWin, aOldUIName ); diff --git a/sfx2/source/doc/iframe.cxx b/sfx2/source/doc/iframe.cxx index 9fbd9f3537b0..16da605f2d63 100644 --- a/sfx2/source/doc/iframe.cxx +++ b/sfx2/source/doc/iframe.cxx @@ -108,18 +108,18 @@ public: class IFrameWindow_Impl : public Window { uno::Reference < frame::XFrame2 > mxFrame; - sal_Bool bBorder; + bool bBorder; public: IFrameWindow_Impl( Window *pParent, - sal_Bool bHasBorder, + bool bHasBorder, WinBits nWinBits = 0 ); public: - sal_Bool HasBorder() const { return bBorder; } + bool HasBorder() const { return bBorder; } }; -IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, sal_Bool bHasBorder, WinBits nWinBits ) +IFrameWindow_Impl::IFrameWindow_Impl( Window *pParent, bool bHasBorder, WinBits nWinBits ) : Window( pParent, nWinBits | WB_CLIPCHILDREN | WB_NODIALOGCONTROL | WB_DOCKBORDER ) , bBorder(bHasBorder) { @@ -208,7 +208,7 @@ throw( uno::RuntimeException, std::exception ) aProps[0].Name = "PluginMode"; aProps[0].Value <<= (sal_Int16) 2; aProps[1].Name = "ReadOnly"; - aProps[1].Value <<= (sal_Bool) sal_True; + aProps[1].Value <<= true; uno::Reference < frame::XDispatch > xDisp = mxFrame->queryDispatch( aTargetURL, "_self", 0 ); if ( xDisp.is() ) xDisp->dispatch( aTargetURL, aProps ); @@ -280,31 +280,31 @@ void SAL_CALL IFrameObject::setPropertyValue(const OUString& aPropertyName, cons break; case WID_FRAME_IS_AUTO_SCROLL: { - sal_Bool bIsAutoScroll = sal_Bool(); + bool bIsAutoScroll; if ( (aAny >>= bIsAutoScroll) && bIsAutoScroll ) maFrmDescr.SetScrollingMode( ScrollingAuto ); } break; case WID_FRAME_IS_SCROLLING_MODE: { - sal_Bool bIsScroll = sal_Bool(); + bool bIsScroll; if ( aAny >>= bIsScroll ) maFrmDescr.SetScrollingMode( bIsScroll ? ScrollingYes : ScrollingNo ); } break; case WID_FRAME_IS_BORDER: { - sal_Bool bIsBorder = sal_Bool(); + bool bIsBorder; if ( aAny >>= bIsBorder ) maFrmDescr.SetFrameBorder( bIsBorder ); } break; case WID_FRAME_IS_AUTO_BORDER: { - sal_Bool bIsAutoBorder = sal_Bool(); + bool bIsAutoBorder; if ( (aAny >>= bIsAutoBorder) ) { - sal_Bool bBorder = maFrmDescr.IsFrameBorderOn(); + bool bBorder = maFrmDescr.IsFrameBorderOn(); maFrmDescr.ResetBorder(); if ( bIsAutoBorder ) maFrmDescr.SetFrameBorder( bBorder ); @@ -358,25 +358,25 @@ uno::Any SAL_CALL IFrameObject::getPropertyValue(const OUString& aPropertyName) break; case WID_FRAME_IS_AUTO_SCROLL: { - sal_Bool bIsAutoScroll = ( maFrmDescr.GetScrollingMode() == ScrollingAuto ); + bool bIsAutoScroll = ( maFrmDescr.GetScrollingMode() == ScrollingAuto ); aAny <<= bIsAutoScroll; } break; case WID_FRAME_IS_SCROLLING_MODE: { - sal_Bool bIsScroll = ( maFrmDescr.GetScrollingMode() == ScrollingYes ); + bool bIsScroll = ( maFrmDescr.GetScrollingMode() == ScrollingYes ); aAny <<= bIsScroll; } break; case WID_FRAME_IS_BORDER: { - sal_Bool bIsBorder = maFrmDescr.IsFrameBorderOn(); + bool bIsBorder = maFrmDescr.IsFrameBorderOn(); aAny <<= bIsBorder; } break; case WID_FRAME_IS_AUTO_BORDER: { - sal_Bool bIsAutoBorder = !maFrmDescr.IsFrameBorderSet(); + bool bIsAutoBorder = !maFrmDescr.IsFrameBorderSet(); aAny <<= bIsAutoBorder; } break; diff --git a/sfx2/source/doc/objcont.cxx b/sfx2/source/doc/objcont.cxx index 11c747d47e50..bea59cd4c3e2 100644 --- a/sfx2/source/doc/objcont.cxx +++ b/sfx2/source/doc/objcont.cxx @@ -559,14 +559,14 @@ bool SfxObjectShell::IsUseUserData() const void SfxObjectShell::SetQueryLoadTemplate( bool bNew ) { - if ( pImp->bQueryLoadTemplate != (bNew ? 1 : 0) ) + if ( pImp->bQueryLoadTemplate != bNew ) SetModified( true ); pImp->bQueryLoadTemplate = bNew; } void SfxObjectShell::SetUseUserData( bool bNew ) { - if ( pImp->bUseUserData != (bNew ? 1 : 0) ) + if ( pImp->bUseUserData != bNew ) SetModified( true ); pImp->bUseUserData = bNew; } @@ -583,14 +583,14 @@ bool SfxObjectShell::IsSaveVersionOnClose() const void SfxObjectShell::SetLoadReadonly( bool bNew ) { - if ( pImp->bLoadReadonly != (bNew ? 1 : 0) ) + if ( pImp->bLoadReadonly != bNew ) SetModified( true ); pImp->bLoadReadonly = bNew; } void SfxObjectShell::SetSaveVersionOnClose( bool bNew ) { - if ( pImp->bSaveVersionOnClose != (bNew ? 1 : 0) ) + if ( pImp->bSaveVersionOnClose != bNew ) SetModified( true ); pImp->bSaveVersionOnClose = bNew; } diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 46f0c21a174f..163e3261cdbd 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -171,7 +171,7 @@ sal_uInt16 const aTitleMap_Impl[3][2] = void SfxObjectShell::AbortImport() { - pImp->bIsAbortingImport = sal_True; + pImp->bIsAbortingImport = true; } @@ -274,7 +274,7 @@ bool SfxObjectShell::IsTemplate() const void SfxObjectShell::EnableSetModified( bool bEnable ) { #ifdef DBG_UTIL - if ( (bEnable ? 1 : 0) == pImp->m_bEnableSetModified ) + if ( bEnable == pImp->m_bEnableSetModified ) DBG_WARNING( "SFX_PERSIST: EnableSetModified 2x called with the same value" ); #endif pImp->m_bEnableSetModified = bEnable; @@ -339,7 +339,7 @@ void SfxObjectShell::SetModified( bool bModifiedP ) if( !IsEnableSetModified() ) return; - if( pImp->m_bIsModified != (bModifiedP ? 1 : 0) ) + if( pImp->m_bIsModified != bModifiedP ) { pImp->m_bIsModified = bModifiedP; ModifyChanged(); @@ -411,7 +411,7 @@ void SfxObjectShell::SetReadOnlyUI( bool bReadOnly ) */ { - if ( (bReadOnly ? 1 : 0) != pImp->bReadOnlyUI ) + if ( bReadOnly != pImp->bReadOnlyUI ) { pImp->bReadOnlyUI = bReadOnly; Broadcast( SfxSimpleHint(SFX_HINT_MODECHANGED) ); @@ -639,7 +639,7 @@ void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL ) } // the cleaning is forbidden only once - pImp->m_bAllowShareControlFileClean = sal_True; + pImp->m_bAllowShareControlFileClean = true; // now remove the temporary file the document is based currently on ::utl::UCBContentHelper::Kill( aTempFileURL ); @@ -651,7 +651,7 @@ void SfxObjectShell::FreeSharedFile( const OUString& aTempFileURL ) void SfxObjectShell::DoNotCleanShareControlFile() { - pImp->m_bAllowShareControlFileClean = sal_False; + pImp->m_bAllowShareControlFileClean = false; } @@ -727,7 +727,7 @@ void SfxObjectShell::SetTitle if ( pImp->bIsNamedVisible && USHRT_MAX != pImp->nVisualDocumentNumber ) { pSfxApp->ReleaseIndex(pImp->nVisualDocumentNumber); - pImp->bIsNamedVisible = 0; + pImp->bIsNamedVisible = false; } // Set Title @@ -963,7 +963,7 @@ void SfxObjectShell::SetNamedVisibility_Impl() { if ( !pImp->bIsNamedVisible ) { - pImp->bIsNamedVisible = sal_True; + pImp->bIsNamedVisible = true; if ( !HasName() && USHRT_MAX == pImp->nVisualDocumentNumber && pImp->aTitle.isEmpty() ) { pImp->nVisualDocumentNumber = SFX_APP()->GetFreeIndex(); @@ -1106,7 +1106,7 @@ void SfxObjectShell::CheckEncryption_Impl( const uno::Reference< task::XInteract aErrorCode.ErrCode = ERRCODE_SFX_INCOMPLETE_ENCRYPTION; SfxMedium::CallApproveHandler( xHandler, uno::makeAny( aErrorCode ), false ); - pImp->m_bIncomplEncrWarnShown = sal_True; + pImp->m_bIncomplEncrWarnShown = true; } // broken signatures imply no macro execution at all @@ -1182,7 +1182,7 @@ void SfxObjectShell::InitOwnModel_Impl() impl_addToModelCollection(xModel); } - pImp->bModelInitialized = sal_True; + pImp->bModelInitialized = true; } } @@ -1195,7 +1195,7 @@ void SfxObjectShell::FinishedLoading( sal_uInt16 nFlags ) { pImp->nFlagsInProgress |= SFX_LOADED_MAINDOCUMENT; ((SfxHeaderAttributes_Impl*)GetHeaderAttributes())->SetAttributes(); - pImp->bImportDone = sal_True; + pImp->bImportDone = true; if( !IsAbortingImport() ) PositionView_Impl(); @@ -1605,7 +1605,7 @@ void SfxHeaderAttributes_Impl::SetAttributes() { bAlert = true; SvKeyValue aPair; - for( sal_Bool bCont = xIter->GetFirst( aPair ); bCont; + for( bool bCont = xIter->GetFirst( aPair ); bCont; bCont = xIter->GetNext( aPair ) ) SetAttribute( aPair ); } @@ -2007,7 +2007,7 @@ void SfxObjectShell_Impl::showBrokenSignatureWarning( const uno::Reference< task if ( !bSignatureErrorIsShown ) { SfxObjectShell::UseInteractionToHandleError( _rxInteraction, ERRCODE_SFX_BROKENSIGNATURE ); - const_cast< SfxObjectShell_Impl* >( this )->bSignatureErrorIsShown = sal_True; + const_cast< SfxObjectShell_Impl* >( this )->bSignatureErrorIsShown = true; } } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index f01f199ed281..7cf4d1244d18 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -144,15 +144,15 @@ SFX_IMPL_INTERFACE(SfxObjectShell,SfxShell,SfxResId(0)) class SfxClosePreventer_Impl : public ::cppu::WeakImplHelper1< ::com::sun::star::util::XCloseListener > { - sal_Bool m_bGotOwnership; - sal_Bool m_bPreventClose; + bool m_bGotOwnership; + bool m_bPreventClose; public: SfxClosePreventer_Impl(); - sal_Bool HasOwnership() { return m_bGotOwnership; } + bool HasOwnership() { return m_bGotOwnership; } - void SetPreventClose( sal_Bool bPrevent ) { m_bPreventClose = bPrevent; } + void SetPreventClose( bool bPrevent ) { m_bPreventClose = bPrevent; } virtual void SAL_CALL queryClosing( const lang::EventObject& aEvent, sal_Bool bDeliverOwnership ) throw ( uno::RuntimeException, util::CloseVetoException, std::exception ) SAL_OVERRIDE; @@ -164,8 +164,8 @@ public: } ; SfxClosePreventer_Impl::SfxClosePreventer_Impl() -: m_bGotOwnership( sal_False ) -, m_bPreventClose( sal_True ) +: m_bGotOwnership( false ) +, m_bPreventClose( true ) { } @@ -201,12 +201,12 @@ public: ~SfxInstanceCloseGuard_Impl(); - sal_Bool Init_Impl( const uno::Reference< util::XCloseable >& xCloseable ); + bool Init_Impl( const uno::Reference< util::XCloseable >& xCloseable ); }; -sal_Bool SfxInstanceCloseGuard_Impl::Init_Impl( const uno::Reference< util::XCloseable >& xCloseable ) +bool SfxInstanceCloseGuard_Impl::Init_Impl( const uno::Reference< util::XCloseable >& xCloseable ) { - sal_Bool bResult = sal_False; + bool bResult = false; // do not allow reinit after the successful init if ( xCloseable.is() && !m_xCloseable.is() ) @@ -217,7 +217,7 @@ sal_Bool SfxInstanceCloseGuard_Impl::Init_Impl( const uno::Reference< util::XClo m_xPreventer = uno::Reference< util::XCloseListener >( m_pPreventer ); xCloseable->addCloseListener( m_xPreventer ); m_xCloseable = xCloseable; - bResult = sal_True; + bResult = true; } catch( uno::Exception& ) { @@ -244,7 +244,7 @@ SfxInstanceCloseGuard_Impl::~SfxInstanceCloseGuard_Impl() { if ( m_pPreventer ) { - m_pPreventer->SetPreventClose( sal_False ); + m_pPreventer->SetPreventClose( false ); if ( m_pPreventer->HasOwnership() ) m_xCloseable->close( sal_True ); // TODO: do it asynchronously @@ -390,7 +390,7 @@ void SfxObjectShell::CheckIn( ) if ( checkinDlg.Execute( ) == RET_OK ) { OUString sComment = checkinDlg.GetComment( ); - sal_Bool bMajor = checkinDlg.IsMajor( ); + bool bMajor = checkinDlg.IsMajor( ); xCmisDoc->checkIn( bMajor, sComment ); uno::Reference< util::XModifiable > xModifiable( GetModel( ), uno::UNO_QUERY ); if ( xModifiable.is( ) ) @@ -443,7 +443,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // this guard is created here to have it destruction at the end of the method SfxInstanceCloseGuard_Impl aModelGuard; - sal_Bool bIsPDFExport = sal_False; + bool bIsPDFExport = false; switch(nId) { case SID_VERSION: @@ -484,7 +484,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) else { // no argument containing DocInfo; check optional arguments - sal_Bool bReadOnly = IsReadOnly(); + bool bReadOnly = IsReadOnly(); SFX_REQUEST_ARG(rReq, pROItem, SfxBoolItem, SID_DOC_READONLY, false); if ( pROItem ) // override readonly attribute of document @@ -558,7 +558,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) case SID_EXPORTDOCASPDF: case SID_DIRECTEXPORTDOCASPDF: - bIsPDFExport = sal_True; + bIsPDFExport = true; case SID_EXPORTDOC: case SID_SAVEASDOC: case SID_SAVEDOC: @@ -660,11 +660,11 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) } - sal_Bool bPreselectPassword = sal_False; + bool bPreselectPassword = false; SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldEncryptionDataItem, SfxUnoAnyItem, SID_ENCRYPTIONDATA, false ); SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pOldPasswordItem, SfxStringItem, SID_PASSWORD, false ); if ( pOldEncryptionDataItem || pOldPasswordItem ) - bPreselectPassword = sal_True; + bPreselectPassword = true; uno::Sequence< beans::PropertyValue > aDispatchArgs; if ( rReq.GetArgs() ) @@ -724,7 +724,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // by default versions should be preserved always except in case of an explicit // SaveAs via GUI, so the flag must be reset to guarantee this - pImp->bPreserveVersions = sal_True; + pImp->bPreserveVersions = true; sal_uIntPtr lErr=GetErrorCode(); if ( !lErr && nErrorCode ) @@ -794,7 +794,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) return; } - sal_Bool bInFrameSet = sal_False; + bool bInFrameSet = false; sal_uInt16 nFrames=0; pFrame = SfxViewFrame::GetFirst( this ); while ( pFrame ) @@ -804,7 +804,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) // In this document there still exists a view that is // in a FrameSet , which of course may not be closed // geclosed werden - bInFrameSet = sal_True; + bInFrameSet = true; } else nFrames++; @@ -951,7 +951,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) { // Loop over the CMIS Properties to find cmis:isVersionSeriesCheckedOut bool bIsGoogleFile = false; - sal_Bool bCheckedOut = sal_False; + bool bCheckedOut = false; for ( sal_Int32 i = 0; i < aCmisProperties.getLength(); ++i ) { if ( aCmisProperties[i].Id == "cmis:isVersionSeriesCheckedOut" ) @@ -987,7 +987,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) { // Loop over the CMIS Properties to find cmis:isVersionSeriesCheckedOut bool bFoundCheckedout = false; - sal_Bool bCheckedOut = sal_False; + bool bCheckedOut = false; for ( sal_Int32 i = 0; i < aCmisProperties.getLength() && !bFoundCheckedout; ++i ) { if ( aCmisProperties[i].Id == "cmis:isVersionSeriesCheckedOut" ) @@ -1311,7 +1311,7 @@ void SfxObjectShell::StateView_Impl(SfxItemSet& /*rSet*/) sal_uInt16 SfxObjectShell::ImplCheckSignaturesInformation( const uno::Sequence< security::DocumentSignatureInformation >& aInfos ) { - sal_Bool bCertValid = sal_True; + bool bCertValid = true; sal_uInt16 nResult = SIGNATURESTATE_NOSIGNATURES; int nInfos = aInfos.getLength(); bool bCompleteSignature = true; @@ -1427,7 +1427,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent ) // check whether the document is signed ImplGetSignatureState( false ); // document signature ImplGetSignatureState( true ); // script signature - sal_Bool bHasSign = ( pImp->nScriptingSignatureState != SIGNATURESTATE_NOSIGNATURES || pImp->nDocumentSignatureState != SIGNATURESTATE_NOSIGNATURES ); + bool bHasSign = ( pImp->nScriptingSignatureState != SIGNATURESTATE_NOSIGNATURES || pImp->nDocumentSignatureState != SIGNATURESTATE_NOSIGNATURES ); // the target ODF version on saving SvtSaveOptions aSaveOpt; @@ -1511,7 +1511,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent ) // We sign only ODF1.2, that means that if this point has been reached, // the ODF1.2 signing process should be used. // This code still might be called to show the signature of ODF1.1 document. - sal_Bool bSigned = GetMedium()->SignContents_Impl( + bool bSigned = GetMedium()->SignContents_Impl( bScriptingContent, aODFVersion, pImp->nDocumentSignatureState == SIGNATURESTATE_SIGNATURES_OK @@ -1532,7 +1532,7 @@ void SfxObjectShell::ImplSign( bool bScriptingContent ) else pImp->nDocumentSignatureState = SIGNATURESTATE_UNKNOWN;// Re-Check - pImp->bSignatureErrorIsShown = sal_False; + pImp->bSignatureErrorIsShown = false; Invalidate( SID_SIGNATURE ); Invalidate( SID_MACRO_SIGNATURE ); diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 9aedbfd4ce2a..d33f8369ec29 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -426,7 +426,7 @@ void SfxObjectShell::PrepareSecondTryLoad_Impl() { // only for internal use pImp->m_xDocStorage = uno::Reference< embed::XStorage >(); - pImp->m_bIsInit = sal_False; + pImp->m_bIsInit = false; ResetError(); } @@ -437,7 +437,7 @@ bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage >& if ( pImp->m_bIsInit ) return false; - pImp->m_bIsInit = sal_True; + pImp->m_bIsInit = true; if ( xStorage.is() ) { // no notification is required the storage is set the first time @@ -464,7 +464,7 @@ bool SfxObjectShell::GeneralInit_Impl( const uno::Reference< embed::XStorage >& } } else - pImp->m_bCreateTempStor = sal_True; + pImp->m_bCreateTempStor = true; return true; } @@ -595,7 +595,7 @@ bool SfxObjectShell::ImportFromGeneratedStream_Impl( // allow the subfilter to reinit the model if ( pImp->m_bIsInit ) - pImp->m_bIsInit = sal_False; + pImp->m_bIsInit = false; if ( LoadOwnFormat( *pMedium ) ) { @@ -661,7 +661,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) pMed->GetItemSet()->Put( SfxStringItem( SID_DOC_BASEURL, aBaseURL ) ); pImp->nLoadedFlags = 0; - pImp->bModelInitialized = sal_False; + pImp->bModelInitialized = false; //TODO/LATER: make a clear strategy how to handle "UsesStorage" etc. bool bOwnStorageFormat = IsOwnStorageFormat_Impl( *pMedium ); @@ -722,7 +722,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( !GetError() ) { pImp->nLoadedFlags = 0; - pImp->bModelInitialized = sal_False; + pImp->bModelInitialized = false; bOk = xStorage.is() && LoadOwnFormat( *pMed ); if ( bOk ) { @@ -752,7 +752,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) if ( GetError() == ERRCODE_NONE ) { pImp->nLoadedFlags = 0; - pImp->bModelInitialized = sal_False; + pImp->bModelInitialized = false; if ( pMedium->GetFilter() && ( pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARONEFILTER ) ) { uno::Reference < beans::XPropertySet > xSet( GetModel(), uno::UNO_QUERY ); @@ -760,7 +760,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) bool bSetProperty = true; try { - xSet->setPropertyValue( sLockUpdates, makeAny( (sal_Bool) sal_True ) ); + xSet->setPropertyValue( sLockUpdates, makeAny( true ) ); } catch(const beans::UnknownPropertyException& ) { @@ -771,7 +771,7 @@ bool SfxObjectShell::DoLoad( SfxMedium *pMed ) { try { - xSet->setPropertyValue( sLockUpdates, makeAny( (sal_Bool) sal_False ) ); + xSet->setPropertyValue( sLockUpdates, makeAny( false ) ); } catch(const beans::UnknownPropertyException& ) {} @@ -1017,7 +1017,7 @@ bool SfxObjectShell::DoSave() { ModifyBlocker_Impl aBlock( this ); - pImp->bIsSaving = sal_True; + pImp->bIsSaving = true; uno::Sequence< beans::NamedValue > aEncryptionData; if ( IsPackageStorageFormat_Impl( *GetMedium() ) ) @@ -1380,7 +1380,7 @@ bool SfxObjectShell::SaveTo_Impl return false; bool bOldStat = pImp->bForbidReload; - pImp->bForbidReload = sal_True; + pImp->bForbidReload = true; // lock user interface while saving the document Lock_Impl( this, true ); @@ -1920,7 +1920,7 @@ bool SfxObjectShell::DoSaveObjectAs( SfxMedium& rMedium, bool bCommit ) SetupStorage( xNewStor, SOFFICE_FILEFORMAT_CURRENT, false, false ); } - pImp->bIsSaving = sal_False; + pImp->bIsSaving = false; bOk = SaveAsOwnFormat( rMedium ); if ( bCommit ) @@ -2081,7 +2081,7 @@ bool SfxObjectShell::DoSaveCompleted( SfxMedium* pNewMed ) pImp->nDocumentSignatureState = SIGNATURESTATE_NOSIGNATURES; pImp->nScriptingSignatureState = pNewMed->GetCachedSignatureState_Impl(); OSL_ENSURE( pImp->nScriptingSignatureState != SIGNATURESTATE_SIGNATURES_BROKEN, "The signature must not be broken at this place" ); - pImp->bSignatureErrorIsShown = sal_False; + pImp->bSignatureErrorIsShown = false; // TODO/LATER: in future the medium must control own signature state, not the document pNewMed->SetCachedSignatureState_Impl( SIGNATURESTATE_NOSIGNATURES ); // set the default value back @@ -2264,7 +2264,7 @@ bool SfxObjectShell::ImportFrom(SfxMedium& rMedium, if (xInsertPosition.is()) { aArgs.realloc( ++nEnd ); aArgs[nEnd-1].Name = "InsertMode"; - aArgs[nEnd-1].Value <<= (sal_Bool) sal_True; + aArgs[nEnd-1].Value <<= true; aArgs.realloc( ++nEnd ); aArgs[nEnd-1].Name = "TextInsertModeRange"; aArgs[nEnd-1].Value <<= xInsertPosition; @@ -2582,7 +2582,7 @@ bool SfxObjectShell::Save_Impl( const SfxItemSet* pSet ) } - pImp->bIsSaving = sal_True; + pImp->bIsSaving = true; bool bSaved = false; SFX_ITEMSET_ARG( GetMedium()->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false); if ( pSalvageItem ) @@ -2826,7 +2826,7 @@ bool SfxObjectShell::PreDoSaveAs_Impl bool bCopyTo = GetCreateMode() == SFX_CREATE_MODE_EMBEDDED || (pSaveToItem && pSaveToItem->GetValue()); // distinguish between "Save" and "SaveAs" - pImp->bIsSaving = sal_False; + pImp->bIsSaving = false; // copy version list from "old" medium to target medium, so it can be used on saving if ( pImp->bPreserveVersions ) @@ -3125,7 +3125,7 @@ uno::Reference< embed::XStorage > SfxObjectShell::GetStorage() OSL_ENSURE( pImp->m_xDocStorage.is(), "The method must either return storage or throw an exception!" ); SetupStorage( pImp->m_xDocStorage, SOFFICE_FILEFORMAT_CURRENT, false, false ); - pImp->m_bCreateTempStor = sal_False; + pImp->m_bCreateTempStor = false; SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_STORAGECHANGED, GlobalEventConfig::GetEventName(STR_EVENT_STORAGECHANGED), this ) ); } catch( uno::Exception& ) diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 0d00015943e7..ba859764e582 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -214,63 +214,63 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) ,nVisualDocumentNumber( USHRT_MAX) ,nDocumentSignatureState( SIGNATURESTATE_UNKNOWN ) ,nScriptingSignatureState( SIGNATURESTATE_UNKNOWN ) - ,bInList( sal_False) - ,bClosing( sal_False) - ,bIsSaving( sal_False) - ,bPasswd( sal_False) - ,bIsNamedVisible( sal_False) - ,bIsTemplate(sal_False) - ,bIsAbortingImport ( sal_False) - ,bImportDone ( sal_False) - ,bInPrepareClose( sal_False ) - ,bPreparedForClose( sal_False ) - ,bForbidReload( sal_False ) - ,bBasicInitialized( sal_False ) - ,bIsPrintJobCancelable( sal_True ) - ,bOwnsStorage( sal_True ) - ,bNoBaseURL( sal_False ) - ,bInitialized( sal_False ) - ,bSignatureErrorIsShown( sal_False ) - ,bModelInitialized( sal_False ) - ,bPreserveVersions( sal_True ) - ,m_bMacroSignBroken( sal_False ) - ,m_bNoBasicCapabilities( sal_False ) - ,m_bDocRecoverySupport( sal_True ) - ,bQueryLoadTemplate( sal_True ) - ,bLoadReadonly( sal_False ) - ,bUseUserData( sal_True ) - ,bSaveVersionOnClose( sal_False ) - ,m_bSharedXMLFlag( sal_False ) - ,m_bAllowShareControlFileClean( sal_True ) - ,m_bConfigOptionsChecked( sal_False ) + ,bInList( false) + ,bClosing( false) + ,bIsSaving( false) + ,bPasswd( false) + ,bIsNamedVisible( false) + ,bIsTemplate(false) + ,bIsAbortingImport ( false) + ,bImportDone ( false) + ,bInPrepareClose( false ) + ,bPreparedForClose( false ) + ,bForbidReload( false ) + ,bBasicInitialized( false ) + ,bIsPrintJobCancelable( true ) + ,bOwnsStorage( true ) + ,bNoBaseURL( false ) + ,bInitialized( false ) + ,bSignatureErrorIsShown( false ) + ,bModelInitialized( false ) + ,bPreserveVersions( true ) + ,m_bMacroSignBroken( false ) + ,m_bNoBasicCapabilities( false ) + ,m_bDocRecoverySupport( true ) + ,bQueryLoadTemplate( true ) + ,bLoadReadonly( false ) + ,bUseUserData( true ) + ,bSaveVersionOnClose( false ) + ,m_bSharedXMLFlag( false ) + ,m_bAllowShareControlFileClean( true ) + ,m_bConfigOptionsChecked( false ) ,lErr(ERRCODE_NONE) ,nEventId ( 0) ,pReloadTimer ( 0) ,pMarkData( 0 ) ,nLoadedFlags ( SFX_LOADED_ALL ) ,nFlagsInProgress( 0 ) - ,bModalMode( sal_False ) - ,bRunningMacro( sal_False ) - ,bReloadAvailable( sal_False ) + ,bModalMode( false ) + ,bRunningMacro( false ) + ,bReloadAvailable( false ) ,nAutoLoadLocks( 0 ) ,pModule( 0 ) ,eFlags( SFXOBJECTSHELL_UNDEFINED ) - ,bReadOnlyUI( sal_False ) + ,bReadOnlyUI( false ) ,nStyleFilter( 0 ) - ,bDisposing( sal_False ) - ,m_bEnableSetModified( sal_True ) - ,m_bIsModified( sal_False ) + ,bDisposing( false ) + ,m_bEnableSetModified( true ) + ,m_bIsModified( false ) ,m_nMapUnit( MAP_100TH_MM ) - ,m_bCreateTempStor( sal_False ) - ,m_bIsInit( sal_False ) - ,m_bIncomplEncrWarnShown( sal_False ) + ,m_bCreateTempStor( false ) + ,m_bIsInit( false ) + ,m_bIncomplEncrWarnShown( false ) ,m_nModifyPasswordHash( 0 ) - ,m_bModifyPasswordEntered( sal_False ) + ,m_bModifyPasswordEntered( false ) { SfxObjectShell* pDoc = &_rDocShell; SfxObjectShellArr_Impl &rArr = SFX_APP()->GetObjectShells_Impl(); rArr.push_back( pDoc ); - bInList = sal_True; + bInList = true; } @@ -297,7 +297,7 @@ SfxObjectShell::SfxObjectShell( const sal_uInt64 i_nCreationFlags ) const bool bDocRecovery = ( i_nCreationFlags & SFXMODEL_DISABLE_DOCUMENT_RECOVERY ) == 0; if ( !bDocRecovery ) - pImp->m_bDocRecoverySupport = sal_False; + pImp->m_bDocRecoverySupport = false; } @@ -441,7 +441,7 @@ bool SfxObjectShell::Close() if ( !pImp->bDisposing && GetProgress() ) return false; - pImp->bClosing = sal_True; + pImp->bClosing = true; Reference< util::XCloseable > xCloseable( GetBaseModel(), UNO_QUERY ); if ( xCloseable.is() ) @@ -452,7 +452,7 @@ bool SfxObjectShell::Close() } catch (const Exception&) { - pImp->bClosing = sal_False; + pImp->bClosing = false; } } @@ -464,7 +464,7 @@ bool SfxObjectShell::Close() SfxObjectShellArr_Impl::iterator it = std::find( rDocs.begin(), rDocs.end(), this ); if ( it != rDocs.end() ) rDocs.erase( it ); - pImp->bInList = sal_False; + pImp->bInList = false; } } @@ -551,8 +551,8 @@ struct BoolEnv_Impl { SfxObjectShell_Impl* pImp; BoolEnv_Impl( SfxObjectShell_Impl* pImpP) : pImp( pImpP ) - { pImpP->bInPrepareClose = sal_True; } - ~BoolEnv_Impl() { pImp->bInPrepareClose = sal_False; } + { pImpP->bInPrepareClose = true; } + ~BoolEnv_Impl() { pImp->bInPrepareClose = false; } }; @@ -592,7 +592,7 @@ bool SfxObjectShell::PrepareClose if( GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) { - pImp->bPreparedForClose = sal_True; + pImp->bPreparedForClose = true; return true; } @@ -643,7 +643,7 @@ bool SfxObjectShell::PrepareClose return false; } - pImp->bPreparedForClose = sal_True; + pImp->bPreparedForClose = true; return true; } @@ -702,7 +702,7 @@ BasicManager* SfxObjectShell::GetBasicManager() const void SfxObjectShell::SetHasNoBasic() { - pImp->m_bNoBasicCapabilities = sal_True; + pImp->m_bNoBasicCapabilities = true; } @@ -841,7 +841,7 @@ void SfxObjectShell::InitBasicManager_Impl() DBG_ASSERT( !pImp->bBasicInitialized && !pImp->pBasicManager->isValid(), "Lokaler BasicManager bereits vorhanden"); pImp->pBasicManager->reset( BasicManagerRepository::getDocumentBasicManager( GetModel() ) ); DBG_ASSERT( pImp->pBasicManager->isValid(), "SfxObjectShell::InitBasicManager_Impl: did not get a BasicManager!" ); - pImp->bBasicInitialized = sal_True; + pImp->bBasicInitialized = true; #endif } @@ -1118,7 +1118,7 @@ SfxObjectShell* SfxObjectShell::GetShellFromComponent( const Reference<lang::XCo void SfxObjectShell::SetInitialized_Impl( const bool i_fromInitNew ) { - pImp->bInitialized = sal_True; + pImp->bInitialized = true; if ( i_fromInitNew ) { SetActivateEvent_Impl( SFX_EVENT_CREATEDOC ); diff --git a/sfx2/source/doc/printhelper.cxx b/sfx2/source/doc/printhelper.cxx index 1ab89faf9191..016652ecdf58 100644 --- a/sfx2/source/doc/printhelper.cxx +++ b/sfx2/source/doc/printhelper.cxx @@ -598,7 +598,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& SfxViewShell* pView = pViewFrm->GetViewShell(); if ( !pView ) return; - sal_Bool bMonitor = sal_False; + bool bMonitor = false; // We need this information at the end of this method, if we start the vcl printer // by executing the slot. Because if it is a ucb relevant URL we must wait for // finishing the print job and move the temporary local file by using the ucb @@ -610,7 +610,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& uno::Sequence < beans::PropertyValue > aCheckedArgs( rOptions.getLength() ); sal_Int32 nProps = 0; - sal_Bool bWaitUntilEnd = sal_False; + bool bWaitUntilEnd = false; sal_Int16 nDuplexMode = ::com::sun::star::view::DuplexMode::UNKNOWN; for ( int n = 0; n < rOptions.getLength(); ++n ) { @@ -708,7 +708,7 @@ void SAL_CALL SfxPrintHelper::print(const uno::Sequence< beans::PropertyValue >& else if ( rProp.Name.equalsAscii( "Collate" ) || rProp.Name.equalsAscii( "Sort" ) ) { - sal_Bool bTemp = sal_Bool(); + bool bTemp; if ( rProp.Value >>= bTemp ) { aCheckedArgs[nProps].Name = "Collate"; diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index 38720fce1d75..1a0f6e6f253e 100644 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -887,7 +887,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& // but _only_ before load() or initNew() methods if ( m_pData->m_pObjectShell.Is() && !m_pData->m_pObjectShell->GetMedium() ) { - sal_Bool bEmb(sal_False); + bool bEmb(false); if ( ( rArgs[0].Value >>= bEmb ) && bEmb ) m_pData->m_pObjectShell->SetCreateMode_Impl( SFX_CREATE_MODE_EMBEDDED ); } @@ -911,7 +911,7 @@ sal_Bool SAL_CALL SfxBaseModel::attachResource( const OUString& pObjectShell->SetVisArea( aVisArea ); } - sal_Bool bBreakMacroSign = sal_False; + bool bBreakMacroSign = false; if ( aArgs.get( "BreakMacroSignature" ) >>= bBreakMacroSign ) { pObjectShell->BreakMacroSign_Impl( bBreakMacroSign ); @@ -1282,7 +1282,7 @@ sal_Bool SAL_CALL SfxBaseModel::disableSetModified() throw (RuntimeException, st if ( !m_pData->m_pObjectShell.Is() ) throw RuntimeException(); - sal_Bool bResult = m_pData->m_pObjectShell->IsEnableSetModified(); + bool bResult = m_pData->m_pObjectShell->IsEnableSetModified(); m_pData->m_pObjectShell->EnableSetModified( false ); return bResult; @@ -1295,7 +1295,7 @@ sal_Bool SAL_CALL SfxBaseModel::enableSetModified() throw (RuntimeException, std if ( !m_pData->m_pObjectShell.Is() ) throw RuntimeException(); - sal_Bool bResult = m_pData->m_pObjectShell->IsEnableSetModified(); + bool bResult = m_pData->m_pObjectShell->IsEnableSetModified(); m_pData->m_pObjectShell->EnableSetModified( true ); return bResult; @@ -1533,7 +1533,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > m_pData->m_pObjectShell->AddLog( OUString( OSL_LOG_PREFIX "storeSelf" ) ); SfxSaveGuard aSaveGuard(this, m_pData, false); - sal_Bool bCheckIn = sal_False; + bool bCheckIn = false; for ( sal_Int32 nInd = 0; nInd < aSeqArgs.getLength(); nInd++ ) { // check that only acceptable parameters are provided here @@ -1581,7 +1581,7 @@ void SAL_CALL SfxBaseModel::storeSelf( const Sequence< beans::PropertyValue > SFX_APP()->NotifyEvent( SfxEventHint( SFX_EVENT_SAVEDOC, GlobalEventConfig::GetEventName(STR_EVENT_SAVEDOC), m_pData->m_pObjectShell ) ); - sal_Bool bRet = sal_False; + bool bRet = false; // TODO/LATER: let the embedded case of saving be handled more careful if ( m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED ) @@ -1773,7 +1773,7 @@ void SAL_CALL SfxBaseModel::initNew() if( m_pData->m_pObjectShell->GetMedium() ) throw frame::DoubleInitializationException(); - sal_Bool bRes = m_pData->m_pObjectShell->DoInitNew( NULL ); + bool bRes = m_pData->m_pObjectShell->DoInitNew( NULL ); sal_uInt32 nErrCode = m_pData->m_pObjectShell->GetError() ? m_pData->m_pObjectShell->GetError() : ERRCODE_IO_CANTCREATE; m_pData->m_pObjectShell->ResetError(); @@ -1854,7 +1854,7 @@ void SAL_CALL SfxBaseModel::load( const Sequence< beans::PropertyValue >& seqA } SFX_ITEMSET_ARG( pMedium->GetItemSet(), pSalvageItem, SfxStringItem, SID_DOC_SALVAGE, false ); - sal_Bool bSalvage = pSalvageItem ? sal_True : sal_False; + bool bSalvage = pSalvageItem ? sal_True : sal_False; // load document if ( !m_pData->m_pObjectShell->DoLoad(pMedium) ) @@ -2593,9 +2593,9 @@ uno::Sequence< document::CmisVersion > SAL_CALL SfxBaseModel::getAllVersions( ) return aVersions; } -sal_Bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) throw ( RuntimeException ) +bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) throw ( RuntimeException ) { - sal_Bool bValue = sal_False; + bool bValue = false; if ( m_pData->m_pObjectShell ) { SfxMedium* pMedium = m_pData->m_pObjectShell->GetMedium(); @@ -2615,7 +2615,7 @@ sal_Bool SfxBaseModel::getBoolPropertyValue( const OUString& rName ) throw ( Run catch ( const Exception & ) { // Simply ignore it: it's likely the document isn't versionable in that case - bValue = sal_False; + bValue = false; } } } @@ -2926,7 +2926,7 @@ void SfxBaseModel::impl_store( const OUString& sURL if( sURL.isEmpty() ) throw frame::IllegalArgumentIOException(); - sal_Bool bSaved = sal_False; + bool bSaved = false; if ( !bSaveTo && m_pData->m_pObjectShell && !sURL.isEmpty() && !sURL.startsWith( "private:stream" ) && ::utl::UCBContentHelper::EqualURLs( getLocation(), sURL ) ) @@ -2961,7 +2961,7 @@ void SfxBaseModel::impl_store( const OUString& sURL try { storeSelf( aArgHash.getAsConstPropertyValueList() ); - bSaved = sal_True; + bSaved = true; } catch( const lang::IllegalArgumentException& ) { @@ -3046,7 +3046,7 @@ void SfxBaseModel::impl_store( const OUString& sURL // since saving a document modifies its DocumentProperties, the current // DocumentProperties must be saved on "SaveTo", so it can be restored // after saving - sal_Bool bCopyTo = bSaveTo || + bool bCopyTo = bSaveTo || m_pData->m_pObjectShell->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED; Reference<document::XDocumentProperties> xOldDocProps; if ( bCopyTo ) @@ -3059,7 +3059,7 @@ void SfxBaseModel::impl_store( const OUString& sURL m_pData->m_xDocumentProperties = xNewDocProps; } - sal_Bool bRet = m_pData->m_pObjectShell->APISaveAs_Impl( sURL, aParams ); + bool bRet = m_pData->m_pObjectShell->APISaveAs_Impl( sURL, aParams ); if ( bCopyTo ) { @@ -3232,7 +3232,7 @@ Reference < container::XIndexAccess > SAL_CALL SfxBaseModel::getViewData() throw for ( SfxViewFrame *pFrame = SfxViewFrame::GetFirst( m_pData->m_pObjectShell ); pFrame; pFrame = SfxViewFrame::GetNext( *pFrame, m_pData->m_pObjectShell ) ) { - sal_Bool bIsActive = ( pFrame == pActFrame ); + bool bIsActive = ( pFrame == pActFrame ); pFrame->GetViewShell()->WriteUserDataSequence( aSeq ); aAny <<= aSeq; xCont->insertByIndex( bIsActive ? 0 : nCount, aAny ); @@ -3382,7 +3382,7 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() SfxModelGuard aGuard( *this ); Sequence< OUString > aResult; - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if ( m_pData->m_pObjectShell.Is() ) { Reference < embed::XStorage > xStorage = m_pData->m_pObjectShell->GetStorage(); @@ -3400,7 +3400,7 @@ Sequence< OUString > SAL_CALL SfxBaseModel::getDocumentSubStoragesNames() } } - bSuccess = sal_True; + bSuccess = true; } } @@ -3584,7 +3584,7 @@ Reference< ui::XUIConfigurationManager2 > SfxBaseModel::getUIConfigurationManage Reference< XComponentContext > xContext( ::comphelper::getProcessComponentContext() ); Sequence< Reference< container::XIndexContainer > > rToolbars; - sal_Bool bImported = framework::UIConfigurationImporterOOo1x::ImportCustomToolbars( + bool bImported = framework::UIConfigurationImporterOOo1x::ImportCustomToolbars( xNewUIConfMan, rToolbars, xContext, xOOo1ConfigStorage ); if ( bImported ) { @@ -3744,9 +3744,9 @@ void SAL_CALL SfxBaseModel::loadFromStorage( const Reference< embed::XStorage >& pMedium->UseInteractionHandler( true ); SFX_ITEMSET_ARG( &aSet, pTemplateItem, SfxBoolItem, SID_TEMPLATE, false); - sal_Bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); + bool bTemplate = pTemplateItem && pTemplateItem->GetValue(); m_pData->m_pObjectShell->SetActivateEvent_Impl( bTemplate ? SFX_EVENT_CREATEDOC : SFX_EVENT_OPENDOC ); - m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = sal_False; + m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = false; // load document if ( !m_pData->m_pObjectShell->DoLoad(pMedium) ) @@ -3787,7 +3787,7 @@ void SAL_CALL SfxBaseModel::storeToStorage( const Reference< embed::XStorage >& nVersion = pFilter->GetVersion(); } - sal_Bool bSuccess = sal_False; + bool bSuccess = false; if ( xStorage == m_pData->m_pObjectShell->GetStorage() ) { // storing to the own storage @@ -3853,7 +3853,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const Reference< embed::XStorage >& getUIConfigurationManager2()->setStorage( xStorage ); } } - m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = sal_False; + m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = false; } Reference< embed::XStorage > SAL_CALL SfxBaseModel::getDocumentStorage() @@ -4319,8 +4319,8 @@ Reference< frame::XController2 > SAL_CALL SfxBaseModel::createViewController( SfxFrame& rFrame = pViewFrame->GetFrame(); // MBA: layoutmanager of inplace frame starts locked and invisible - rFrame.GetWorkWindow_Impl()->MakeVisible_Impl( sal_False ); - rFrame.GetWorkWindow_Impl()->Lock_Impl( sal_True ); + rFrame.GetWorkWindow_Impl()->MakeVisible_Impl( false ); + rFrame.GetWorkWindow_Impl()->Lock_Impl( true ); rFrame.GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER ); pViewFrame->GetWindow().SetBorderStyle( WINDOW_BORDER_NOBORDER ); diff --git a/sfx2/source/doc/sfxmodelfactory.cxx b/sfx2/source/doc/sfxmodelfactory.cxx index a8f57f17bf74..15c8e732a8d3 100644 --- a/sfx2/source/doc/sfxmodelfactory.cxx +++ b/sfx2/source/doc/sfxmodelfactory.cxx @@ -155,9 +155,9 @@ namespace sfx2 Reference< XInterface > SAL_CALL SfxModelFactory::createInstanceWithArguments( const Sequence< Any >& _rArguments ) throw (Exception, RuntimeException, std::exception) { ::comphelper::NamedValueCollection aArgs( _rArguments ); - const sal_Bool bEmbeddedObject = aArgs.getOrDefault( "EmbeddedObject", sal_False ); - const sal_Bool bScriptSupport = aArgs.getOrDefault( "EmbeddedScriptSupport", sal_True ); - const sal_Bool bDocRecoverySupport = aArgs.getOrDefault( "DocumentRecoverySupport", sal_True ); + const bool bEmbeddedObject = aArgs.getOrDefault( "EmbeddedObject", sal_False ); + const bool bScriptSupport = aArgs.getOrDefault( "EmbeddedScriptSupport", sal_True ); + const bool bDocRecoverySupport = aArgs.getOrDefault( "DocumentRecoverySupport", sal_True ); sal_uInt64 nCreationFlags = ( bEmbeddedObject ? SFXMODEL_EMBEDDED_OBJECT : 0 ) diff --git a/sfx2/source/inc/appbaslib.hxx b/sfx2/source/inc/appbaslib.hxx index 2763b75c5a1e..5810afdbb789 100644 --- a/sfx2/source/inc/appbaslib.hxx +++ b/sfx2/source/inc/appbaslib.hxx @@ -82,7 +82,7 @@ public: /** checks if any modules in the SfxLibraryContainer exceed the binary limits. */ - sal_Bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& sModules ); + bool LegacyPsswdBinaryLimitExceeded( ::com::sun::star::uno::Sequence< OUString >& sModules ); private: diff --git a/sfx2/source/inc/appdata.hxx b/sfx2/source/inc/appdata.hxx index 29b82b2eb1fe..87226020cfe1 100644 --- a/sfx2/source/inc/appdata.hxx +++ b/sfx2/source/inc/appdata.hxx @@ -135,11 +135,11 @@ public: sal_uInt16 nDocNo; // current Doc-Number (AutoName) sal_uInt16 nInterfaces; - sal_Bool bDispatcherLocked:1; // do nothing - sal_Bool bDowning:1; // sal_True on Exit and afterwards - sal_Bool bInQuit : 1; - sal_Bool bInvalidateOnUnlock : 1; - sal_Bool bODFVersionWarningLater : 1; + bool bDispatcherLocked:1; // do nothing + bool bDowning:1; // sal_True on Exit and afterwards + bool bInQuit : 1; + bool bInvalidateOnUnlock : 1; + bool bODFVersionWarningLater : 1; SfxAppData_Impl( SfxApplication* ); ~SfxAppData_Impl(); diff --git a/sfx2/source/inc/eventsupplier.hxx b/sfx2/source/inc/eventsupplier.hxx index 62d74f213b9f..91e409e5f1ce 100644 --- a/sfx2/source/inc/eventsupplier.hxx +++ b/sfx2/source/inc/eventsupplier.hxx @@ -88,7 +88,7 @@ public: virtual void SAL_CALL disposing( const css::lang::EventObject& Source ) throw( css::uno::RuntimeException, std::exception ) SAL_OVERRIDE; - static SvxMacro* ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, sal_Bool bNormalizeMacro ); + static SvxMacro* ConvertToMacro( const css::uno::Any& rElement, SfxObjectShell* pDoc, bool bNormalizeMacro ); static void NormalizeMacro( const css::uno::Any& rIn, css::uno::Any& rOut, SfxObjectShell* pDoc ); static void NormalizeMacro( const ::comphelper::NamedValueCollection& i_eventDescriptor, diff --git a/sfx2/source/inc/fltoptint.hxx b/sfx2/source/inc/fltoptint.hxx index 248d0534b2ea..eafe21ab4a39 100644 --- a/sfx2/source/inc/fltoptint.hxx +++ b/sfx2/source/inc/fltoptint.hxx @@ -51,7 +51,7 @@ public: RequestFilterOptions( ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel > rModel, ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > rProperties ); - sal_Bool isAbort() { return m_pAbort->wasSelected(); } + bool isAbort() { return m_pAbort->wasSelected(); } ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > getFilterOptions() { diff --git a/sfx2/source/inc/objshimp.hxx b/sfx2/source/inc/objshimp.hxx index 9af90843c915..72cbd9657767 100644 --- a/sfx2/source/inc/objshimp.hxx +++ b/sfx2/source/inc/objshimp.hxx @@ -63,7 +63,7 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess sal_uInt16 nVisualDocumentNumber; sal_Int16 nDocumentSignatureState; sal_Int16 nScriptingSignatureState; - sal_Bool bInList:1, // if reachable by First/Next + bool bInList:1, // if reachable by First/Next bClosing:1, // sal_True while Close(), to prevent recurrences Notification bIsSaving:1, bPasswd:1, @@ -101,40 +101,40 @@ struct SfxObjectShell_Impl : public ::sfx2::IMacroDocumentAccess MarkData_Impl* pMarkData; sal_uInt16 nLoadedFlags; sal_uInt16 nFlagsInProgress; - sal_Bool bModalMode; - sal_Bool bRunningMacro; - sal_Bool bReloadAvailable; + bool bModalMode; + bool bRunningMacro; + bool bReloadAvailable; sal_uInt16 nAutoLoadLocks; SfxModule* pModule; SfxObjectShellFlags eFlags; - sal_Bool bReadOnlyUI; + bool bReadOnlyUI; SvRefBaseRef xHeaderAttributes; ::rtl::Reference< SfxBaseModel > pBaseModel; sal_uInt16 nStyleFilter; - sal_Bool bDisposing; + bool bDisposing; - sal_Bool m_bEnableSetModified; - sal_Bool m_bIsModified; + bool m_bEnableSetModified; + bool m_bIsModified; Rectangle m_aVisArea; MapUnit m_nMapUnit; - sal_Bool m_bCreateTempStor; + bool m_bCreateTempStor; ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage > m_xDocStorage; - sal_Bool m_bIsInit; + bool m_bIsInit; OUString m_aSharedFileURL; ::com::sun::star::uno::Reference< ::com::sun::star::logging::XSimpleLogRing > m_xLogRing; - sal_Bool m_bIncomplEncrWarnShown; + bool m_bIncomplEncrWarnShown; // TODO/LATER: m_aModifyPasswordInfo should completely replace m_nModifyPasswordHash in future sal_uInt32 m_nModifyPasswordHash; ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > m_aModifyPasswordInfo; - sal_Bool m_bModifyPasswordEntered; + bool m_bModifyPasswordEntered; SfxObjectShell_Impl( SfxObjectShell& _rDocShell ); virtual ~SfxObjectShell_Impl(); diff --git a/sfx2/source/inc/partwnd.hxx b/sfx2/source/inc/partwnd.hxx index 6798d161f227..b3a5c946f772 100644 --- a/sfx2/source/inc/partwnd.hxx +++ b/sfx2/source/inc/partwnd.hxx @@ -70,7 +70,7 @@ public: WinBits nBits ); virtual ~SfxPartDockWnd_Impl(); - sal_Bool QueryClose(); + bool QueryClose(); virtual void FillInfo(SfxChildWinInfo&) const SAL_OVERRIDE; ::com::sun::star::uno::Reference < ::com::sun::star::frame::XFrame > ForgetFrame(); }; diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index d55e299688b2..680a454ead1a 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -83,11 +83,11 @@ struct StringList_Impl : private Resource ResId aResId; StringList_Impl( const ResId& rErrIdP, sal_uInt16 nId) - : Resource( rErrIdP ),aResId(nId, *rErrIdP.GetResMgr()){} + : Resource( rErrIdP ), aResId(nId, *rErrIdP.GetResMgr()) {} ~StringList_Impl() { FreeResource(); } - OUString GetString(){ return aResId.toString(); } - operator sal_Bool(){return IsAvailableRes(aResId.SetRT(RSC_STRING));} + OUString GetString() { return aResId.toString(); } + operator bool() { return IsAvailableRes(aResId.SetRT(RSC_STRING)); } }; diff --git a/sfx2/source/inc/splitwin.hxx b/sfx2/source/inc/splitwin.hxx index f3a985bee804..e01b44e88f8e 100644 --- a/sfx2/source/inc/splitwin.hxx +++ b/sfx2/source/inc/splitwin.hxx @@ -36,8 +36,8 @@ private: SfxChildAlignment eAlign; SfxWorkWindow* pWorkWin; SfxDockArr_Impl* pDockArr; - sal_Bool bLocked; - sal_Bool bPinned; + bool bLocked; + bool bPinned; SfxEmptySplitWin_Impl* pEmptyWin; SfxDockingWindow* pActive; @@ -45,12 +45,12 @@ private: const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, - sal_Bool bNewLine=sal_False ); + bool bNewLine=false ); DECL_LINK( TimerHdl, Timer* ); - sal_Bool CursorIsOverRect( sal_Bool bForceAdding = sal_False ) const; - void SetPinned_Impl( sal_Bool ); - void SetFadeIn_Impl( sal_Bool ); + bool CursorIsOverRect( bool bForceAdding = false ) const; + void SetPinned_Impl( bool ); + void SetFadeIn_Impl( bool ); void SaveConfig_Impl(); void FadeOut_Impl(); @@ -64,12 +64,12 @@ protected: public: SfxSplitWindow( Window* pParent, SfxChildAlignment eAl, - SfxWorkWindow *pW, sal_Bool bWithButtons, + SfxWorkWindow *pW, bool bWithButtons, WinBits nBits = WB_BORDER | WB_SIZEABLE | WB_3DLOOK ); virtual ~SfxSplitWindow(); - void ReleaseWindow_Impl(SfxDockingWindow *pWin, sal_Bool bSaveConfig=sal_True); + void ReleaseWindow_Impl(SfxDockingWindow *pWin, bool bSaveConfig=true); void InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize); @@ -78,43 +78,43 @@ public: const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, - sal_Bool bNewLine=sal_False ); + bool bNewLine=false ); void MoveWindow( SfxDockingWindow* pDockWin, const Size& rSize, sal_uInt16 nLine, sal_uInt16 nPos, - sal_Bool bNewLine=sal_False ); + bool bNewLine=false ); - void RemoveWindow( SfxDockingWindow* pDockWin, sal_Bool bHide=sal_True); + void RemoveWindow( SfxDockingWindow* pDockWin, bool bHide=true); - void Lock( sal_Bool bLock=sal_True ) + void Lock( bool bLock=true ) { bLocked = bLock; SetUpdateMode( !bLock ); } using Window::IsLocked; - sal_Bool IsLocked() const { return bLocked; } - sal_Bool GetWindowPos( const SfxDockingWindow* pWindow, + bool IsLocked() const { return bLocked; } + bool GetWindowPos( const SfxDockingWindow* pWindow, sal_uInt16& rLine, sal_uInt16& rPos ) const; - sal_Bool GetWindowPos( const Point& rTestPos, + bool GetWindowPos( const Point& rTestPos, sal_uInt16& rLine, sal_uInt16& rPos ) const; sal_uInt16 GetLineCount() const; long GetLineSize( sal_uInt16 ) const; sal_uInt16 GetWindowCount(sal_uInt16 nLine) const; sal_uInt16 GetWindowCount() const; - sal_Bool IsPinned() const { return bPinned; } - sal_Bool IsFadeIn() const; - sal_Bool IsAutoHide( sal_Bool bSelf = sal_False ) const; + bool IsPinned() const { return bPinned; } + bool IsFadeIn() const; + bool IsAutoHide( bool bSelf = false ) const; SplitWindow* GetSplitWindow(); virtual void AutoHide() SAL_OVERRIDE; virtual void FadeOut() SAL_OVERRIDE; virtual void FadeIn() SAL_OVERRIDE; void Show_Impl(); - void Pin_Impl( sal_Bool bPinned ); - sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); + void Pin_Impl( bool bPinned ); + bool ActivateNextChild_Impl( bool bForward = true ); void SetActiveWindow_Impl( SfxDockingWindow* pWin ); }; diff --git a/sfx2/source/inc/statcach.hxx b/sfx2/source/inc/statcach.hxx index e472c404aaec..eb900ea00171 100644 --- a/sfx2/source/inc/statcach.hxx +++ b/sfx2/source/inc/statcach.hxx @@ -56,7 +56,7 @@ public: void Release(); const ::com::sun::star::frame::FeatureStateEvent& GetStatus() const; - void Dispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, sal_Bool bForceSynchron = sal_False ); + void Dispatch( com::sun::star::uno::Sequence < com::sun::star::beans::PropertyValue > aProps, bool bForceSynchron = false ); }; class SfxStateCache @@ -70,14 +70,14 @@ friend class BindDispatch_Impl; SfxSlotServer aSlotServ; // SlotServer, SlotPtr = 0 -> not on Stack SfxPoolItem* pLastItem; // Last sent Item, never -1 SfxItemState eLastState; // Last sent State - sal_Bool bCtrlDirty:1; // Update Controller? - sal_Bool bSlotDirty:1; // Present Funktion, must be updated - sal_Bool bItemVisible:1; // item visibility - sal_Bool bItemDirty; // Validity of pLastItem + bool bCtrlDirty:1; // Update Controller? + bool bSlotDirty:1; // Present Funktion, must be updated + bool bItemVisible:1; // item visibility + bool bItemDirty; // Validity of pLastItem private: SfxStateCache( const SfxStateCache& rOrig ); // inward - void SetState_Impl( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False ); + void SetState_Impl( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false ); public: SfxStateCache( sal_uInt16 nFuncId ); @@ -89,17 +89,17 @@ public: const SfxSlotServer* GetSlotServer( SfxDispatcher &rDispat ) { return GetSlotServer( rDispat, ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatchProvider > () ); } ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch > GetDispatch() const; - void Dispatch( const SfxItemSet* pSet, sal_Bool bForceSynchron = sal_False ); - sal_Bool IsControllerDirty() const + void Dispatch( const SfxItemSet* pSet, bool bForceSynchron = false ); + bool IsControllerDirty() const { return bCtrlDirty ? sal_True : sal_False; } SfxPoolItem* GetItem() const { return pLastItem; } void ClearCache(); - void SetState( SfxItemState, const SfxPoolItem*, sal_Bool bMaybeDirty=sal_False ); - void SetCachedState(sal_Bool bAlways = sal_False); + void SetState( SfxItemState, const SfxPoolItem*, bool bMaybeDirty=false ); + void SetCachedState(bool bAlways = false); void DeleteFloatingWindows(); - void Invalidate( sal_Bool bWithSlot ); - void SetVisibleState( sal_Bool bShow=sal_True ); + void Invalidate( bool bWithSlot ); + void SetVisibleState( bool bShow=true ); SfxControllerItem* ChangeItemLink( SfxControllerItem* pNewBinding ); SfxControllerItem* GetItemLink() const; @@ -120,7 +120,7 @@ public: inline void SfxStateCache::ClearCache() { - bItemDirty = sal_True; + bItemDirty = true; } @@ -133,8 +133,8 @@ inline SfxControllerItem* SfxStateCache::ChangeItemLink( SfxControllerItem* pNew pController = pNewBinding; if ( pNewBinding ) { - bCtrlDirty = sal_True; - bItemDirty = sal_True; + bCtrlDirty = true; + bItemDirty = true; } return pOldBinding; } diff --git a/sfx2/source/inc/templdgi.hxx b/sfx2/source/inc/templdgi.hxx index 751d9bb77354..d5cc46fe0c75 100644 --- a/sfx2/source/inc/templdgi.hxx +++ b/sfx2/source/inc/templdgi.hxx @@ -193,7 +193,7 @@ protected: sal_uInt16 nActFilter; // FilterIdx sal_uInt16 nAppFilter; // Filter, which has set the application (for automatic) - sal_Bool bDontUpdate :1, + bool bDontUpdate :1, bIsWater :1, bEnabled :1, bUpdate :1, @@ -218,14 +218,14 @@ protected: DECL_LINK( TimeOut, Timer * ); - virtual void EnableItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {} - virtual void CheckItem( sal_uInt16 /*nMesId*/, sal_Bool /*bCheck*/ = sal_True ) {} - virtual sal_Bool IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return sal_True; } + virtual void EnableItem( sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true ) {} + virtual void CheckItem( sal_uInt16 /*nMesId*/, bool /*bCheck*/ = true ) {} + virtual bool IsCheckedItem( sal_uInt16 /*nMesId*/ ) { return true; } virtual void LoadedFamilies() {} virtual void Update() { UpdateStyles_Impl(UPDATE_FAMILY_LIST); } virtual void InvalidateBindings(); virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) = 0; - virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ) = 0; + virtual void EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) = 0; virtual void ClearFamilyList() = 0; virtual void ReplaceUpdateButtonByMenu(); @@ -235,24 +235,24 @@ protected: void HideHdl( void* ); void ShowHdl( void* ); - sal_Bool Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, + bool Execute_Impl( sal_uInt16 nId, const OUString& rStr, const OUString& rRefStr, sal_uInt16 nFamily, sal_uInt16 nMask = 0, sal_uInt16* pIdx = NULL, const sal_uInt16* pModifier = NULL ); void UpdateStyles_Impl(sal_uInt16 nFlags); const SfxStyleFamilyItem* GetFamilyItem_Impl() const; - sal_Bool IsInitialized() const { return nActFamily != 0xffff; } + bool IsInitialized() const { return nActFamily != 0xffff; } void ResetFocus(); void EnableDelete(); void Initialize(); void EnableHierarchical(bool); - void FilterSelect( sal_uInt16 nFilterIdx, sal_Bool bForce = sal_False ); + void FilterSelect( sal_uInt16 nFilterIdx, bool bForce = false ); void SetFamilyState( sal_uInt16 nSlotId, const SfxTemplateItem* ); void SetWaterCanState( const SfxBoolItem* pItem ); void SelectStyle( const OUString& rStyle ); - sal_Bool HasSelectedStyle() const; + bool HasSelectedStyle() const; SfxStyleSheetBase *GetSelectedStyle() const; void FillTreeBox(); void Update_Impl(); @@ -280,29 +280,29 @@ public: DECL_LINK( MenuSelectHdl, Menu * ); - virtual void EnableEdit( sal_Bool b = sal_True ) { bCanEdit = b; } - virtual void EnableDel( sal_Bool b = sal_True ) { bCanDel = b; } - virtual void EnableNew( sal_Bool b = sal_True ) { bCanNew = b; } - virtual void EnableHide( sal_Bool b = sal_True ) { bCanHide = b; } - virtual void EnableShow( sal_Bool b = sal_True ) { bCanShow = b; } + virtual void EnableEdit( bool b = true ) { bCanEdit = b; } + virtual void EnableDel( bool b = true ) { bCanDel = b; } + virtual void EnableNew( bool b = true ) { bCanNew = b; } + virtual void EnableHide( bool b = true ) { bCanHide = b; } + virtual void EnableShow( bool b = true ) { bCanShow = b; } ISfxTemplateCommon* GetISfxTemplateCommon() { return &aISfxTemplateCommon; } Window* GetWindow() { return pWindow; } - void EnableTreeDrag( sal_Bool b = sal_True ); + void EnableTreeDrag( bool b = true ); void ExecuteContextMenu_Impl( const Point& rPos, Window* pWin ); - void EnableExample_Impl( sal_uInt16 nId, sal_Bool bEnable ); + void EnableExample_Impl( sal_uInt16 nId, bool bEnable ); SfxStyleFamily GetActualFamily() const; OUString GetSelectedEntry() const; SfxObjectShell* GetObjectShell() const { return pCurObjShell; } virtual void PrepareDeleteAction(); // disable buttons, change button text, etc. when del is going to happen - inline sal_Bool CanEdit( void ) const { return bCanEdit; } - inline sal_Bool CanDel( void ) const { return bCanDel; } - inline sal_Bool CanNew( void ) const { return bCanNew; } - inline sal_Bool CanHide( void ) const { return bCanHide; } - inline sal_Bool CanShow( void ) const { return bCanShow; } + inline bool CanEdit( void ) const { return bCanEdit; } + inline bool CanDel( void ) const { return bCanDel; } + inline bool CanNew( void ) const { return bCanNew; } + inline bool CanHide( void ) const { return bCanHide; } + inline bool CanShow( void ) const { return bCanShow; } // normaly for derivates from SvTreeListBoxes, but in this case the dialog handles context menus virtual PopupMenu* CreateContextMenu( void ); @@ -334,7 +334,7 @@ private: friend class SfxTemplatePanelControl; Window* m_pFloat; - sal_Bool m_bZoomIn; + bool m_bZoomIn; DropToolBox_Impl m_aActionTbL; ToolBox m_aActionTbR; @@ -345,13 +345,13 @@ private: protected: virtual void Command( const CommandEvent& rMEvt ); - virtual void EnableEdit( sal_Bool = sal_True ) SAL_OVERRIDE; - virtual void EnableItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True ) SAL_OVERRIDE; - virtual void CheckItem( sal_uInt16 nMesId, sal_Bool bCheck = sal_True ) SAL_OVERRIDE; - virtual sal_Bool IsCheckedItem( sal_uInt16 nMesId ) SAL_OVERRIDE; + virtual void EnableEdit( bool = true ) SAL_OVERRIDE; + virtual void EnableItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; + virtual void CheckItem( sal_uInt16 nMesId, bool bCheck = true ) SAL_OVERRIDE; + virtual bool IsCheckedItem( sal_uInt16 nMesId ) SAL_OVERRIDE; virtual void LoadedFamilies() SAL_OVERRIDE; virtual void InsertFamilyItem( sal_uInt16 nId, const SfxStyleFamilyItem* pIten ) SAL_OVERRIDE; - virtual void EnableFamilyItem( sal_uInt16 nId, sal_Bool bEnabled = sal_True ) SAL_OVERRIDE; + virtual void EnableFamilyItem( sal_uInt16 nId, bool bEnabled = true ) SAL_OVERRIDE; virtual void ClearFamilyList() SAL_OVERRIDE; virtual void ReplaceUpdateButtonByMenu() SAL_OVERRIDE; diff --git a/sfx2/source/inc/versdlg.hxx b/sfx2/source/inc/versdlg.hxx index 5170d537ae19..bba4b4f781bc 100644 --- a/sfx2/source/inc/versdlg.hxx +++ b/sfx2/source/inc/versdlg.hxx @@ -64,7 +64,7 @@ class SfxVersionDialog : public SfxModalDialog void Open_Impl(); public: - SfxVersionDialog ( SfxViewFrame* pFrame, sal_Bool ); + SfxVersionDialog ( SfxViewFrame* pFrame, bool ); virtual ~SfxVersionDialog (); bool IsSaveVersionOnClose() const { return m_bIsSaveVersionOnClose; } }; @@ -102,7 +102,7 @@ class SfxCmisVersionsDialog : public SfxModalDialog void LoadVersions(); public: - SfxCmisVersionsDialog ( SfxViewFrame* pFrame, sal_Bool ); + SfxCmisVersionsDialog ( SfxViewFrame* pFrame, bool ); virtual ~SfxCmisVersionsDialog (); }; diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index 0c002cdfb78a..fcb3d9090d05 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -47,12 +47,12 @@ private: sal_uInt16 nId; sal_uInt16 nCount; sal_uInt16 nLocks; - sal_Bool bResCtor : 1; // SV Menu created from resource - sal_Bool bOLE : 1; // InPlaceMenu - sal_Bool bHelpInitialized : 1; - sal_Bool bIsActive : 1; - sal_Bool bControllersUnBound : 1; - sal_Bool bIsAddonPopupMenu : 1; + bool bResCtor : 1; // SV Menu created from resource + bool bOLE : 1; // InPlaceMenu + bool bHelpInitialized : 1; + bool bIsActive : 1; + bool bControllersUnBound : 1; + bool bIsAddonPopupMenu : 1; private: void Construct_Impl(); @@ -65,8 +65,8 @@ private: void BindControllers(); protected: - SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, sal_Bool bWithHelp, - SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False ); + SfxVirtualMenu( sal_uInt16 nOwnId, SfxVirtualMenu* pParent, Menu& rMenu, bool bWithHelp, + SfxBindings &rBind, bool bOLEServer=false, bool bRes=false, bool bIsAddonMenu=false ); void CreateFromSVMenu(); DECL_LINK( Highlight, void * ); @@ -81,10 +81,10 @@ protected: public: ~SfxVirtualMenu(); - SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp, - SfxBindings &rBind, sal_Bool bOLEServer=sal_False, sal_Bool bRes=sal_False, sal_Bool bIsAddonMenu=sal_False ); - void CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ); - void EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ); + SfxVirtualMenu( Menu *pStarViewMenu, bool bWithHelp, + SfxBindings &rBind, bool bOLEServer=false, bool bRes=false, bool bIsAddonMenu=false ); + void CheckItem( sal_uInt16 nItemId, bool bCheck ); + void EnableItem( sal_uInt16 nItemId, bool bEnable ); void SetItemText( sal_uInt16 nItemId, const OUString& rText ); sal_uInt16 GetItemCount() const; @@ -98,9 +98,9 @@ public: { pParent = pNewParent; } void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); - sal_Bool IsFromResource() const + bool IsFromResource() const { return bResCtor; } - void InitPopup(sal_uInt16 nPos, sal_Bool bOLE = sal_True); + void InitPopup(sal_uInt16 nPos, bool bOLE = true); void InitializeHelp(); void SetResMgr(ResMgr* pMgr) {pResMgr = pMgr; } ResMgr* GetResMgr() { return pResMgr; } diff --git a/sfx2/source/inc/workwin.hxx b/sfx2/source/inc/workwin.hxx index bc54c75cbfd5..19a0bbc6b4ce 100644 --- a/sfx2/source/inc/workwin.hxx +++ b/sfx2/source/inc/workwin.hxx @@ -50,7 +50,7 @@ struct SfxObjectBar_Impl sal_uInt16 nMode; // special visibility flags sal_uInt16 nPos; sal_uInt16 nIndex; - sal_Bool bDestroy; + bool bDestroy; OUString aName; SfxInterface* pIFace; @@ -59,7 +59,7 @@ struct SfxObjectBar_Impl nMode(0), nPos(0), nIndex(0), - bDestroy(sal_False), + bDestroy(false), pIFace(0) {} }; @@ -70,13 +70,13 @@ struct SfxObjectBar_Impl struct SfxStatBar_Impl { sal_uInt16 nId; - sal_Bool bOn; - sal_Bool bTemp; + bool bOn; + bool bTemp; SfxStatBar_Impl() : nId(0), - bOn(sal_True), - bTemp(sal_False) + bOn(true), + bTemp(false) {} }; @@ -94,14 +94,14 @@ struct SfxChild_Impl Size aSize; SfxChildAlignment eAlign; sal_uInt16 nVisible; - sal_Bool bResize; - sal_Bool bCanGetFocus; - sal_Bool bSetFocus; + bool bResize; + bool bCanGetFocus; + bool bSetFocus; SfxChild_Impl( Window& rChild, const Size& rSize, - SfxChildAlignment eAlignment, sal_Bool bIsVisible ): - pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(sal_False), - bCanGetFocus( sal_False ), bSetFocus( sal_False ) + SfxChildAlignment eAlignment, bool bIsVisible ): + pWin(&rChild), aSize(rSize), eAlign(eAlignment), bResize(false), + bCanGetFocus( false ), bSetFocus( false ) { nVisible = bIsVisible ? CHILD_VISIBLE : CHILD_NOT_VISIBLE; } @@ -113,23 +113,23 @@ struct SfxChildWin_Impl sal_uInt16 nInterfaceId; // the current context sal_uInt16 nId; // current Id SfxChildWindow* pWin; - sal_Bool bCreate; + bool bCreate; SfxChildWinInfo aInfo; SfxChild_Impl* pCli; // != 0 at direct Children sal_uInt16 nVisibility; - sal_Bool bEnable; - sal_Bool bDisabled; + bool bEnable; + bool bDisabled; SfxChildWin_Impl( sal_uInt32 nID ) : nSaveId((sal_uInt16) (nID & 0xFFFF) ), nInterfaceId((sal_uInt16) (nID >> 16)), nId(nSaveId), pWin(0), - bCreate(sal_False), + bCreate(false), pCli(0), nVisibility( sal_False ), - bEnable( sal_True ), - bDisabled( sal_False ) + bEnable( true ), + bDisabled( false ) {} }; @@ -200,7 +200,7 @@ class LayoutManagerListener : public ::cppu::WeakImplHelper2< virtual void SAL_CALL layoutEvent( const ::com::sun::star::lang::EventObject& aSource, ::sal_Int16 eLayoutEvent, const ::com::sun::star::uno::Any& aInfo ) throw (::com::sun::star::uno::RuntimeException, std::exception) SAL_OVERRIDE; private: - sal_Bool m_bHasFrame; + bool m_bHasFrame; SfxWorkWindow* m_pWrkWin; ::com::sun::star::uno::WeakReference< ::com::sun::star::frame::XFrame > m_xFrame; OUString m_aLayoutManagerPropName; @@ -227,12 +227,12 @@ protected: sal_uInt16 nUpdateMode; sal_uInt16 nChildren; sal_uInt16 nOrigMode; - sal_Bool bSorted : 1; - sal_Bool bDockingAllowed : 1; - sal_Bool bInternalDockingAllowed : 1; - sal_Bool bAllChildrenVisible : 1; - sal_Bool bIsFullScreen : 1; - sal_Bool bShowStatusBar : 1; + bool bSorted : 1; + bool bDockingAllowed : 1; + bool bInternalDockingAllowed : 1; + bool bAllChildrenVisible : 1; + bool bIsFullScreen : 1; + bool bShowStatusBar : 1; sal_Int32 m_nLock; OUString m_aStatusBarResName; OUString m_aLayoutManagerPropName; @@ -241,15 +241,15 @@ protected: ::com::sun::star::uno::Reference< ::com::sun::star::lang::XComponent > m_xLayoutManagerListener; protected: - void CreateChildWin_Impl(SfxChildWin_Impl*,sal_Bool); + void CreateChildWin_Impl(SfxChildWin_Impl*,bool); void RemoveChildWin_Impl(SfxChildWin_Impl*); void Sort_Impl(); SfxChild_Impl* FindChild_Impl( const Window& rWindow ) const; - virtual sal_Bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); + virtual bool RequestTopToolSpacePixel_Impl( SvBorder aBorder ); virtual Rectangle GetTopRect_Impl(); SvBorder Arrange_Impl(); virtual void SaveStatus_Impl(SfxChildWindow*, const SfxChildWinInfo&); - static sal_Bool IsPluginMode( SfxObjectShell* pObjShell ); + static bool IsPluginMode( SfxObjectShell* pObjShell ); public: SfxWorkWindow( Window *pWin, SfxBindings& rBindings, SfxWorkWindow* pParent = NULL); @@ -258,14 +258,14 @@ public: { return *pBindings; } Window* GetWindow() const { return pWorkWin; } - Rectangle GetFreeArea( sal_Bool bAutoHide ) const; - void SetDockingAllowed(sal_Bool bSet) + Rectangle GetFreeArea( bool bAutoHide ) const; + void SetDockingAllowed(bool bSet) { bDockingAllowed = bSet; } - void SetInternalDockingAllowed(sal_Bool bSet) + void SetInternalDockingAllowed(bool bSet) { bInternalDockingAllowed = bSet; } - sal_Bool IsDockingAllowed() const + bool IsDockingAllowed() const { return bDockingAllowed; } - sal_Bool IsInternalDockingAllowed() const + bool IsInternalDockingAllowed() const { return bInternalDockingAllowed; } SfxWorkWindow* GetParent_Impl() const { return pParent; } @@ -273,21 +273,21 @@ public: // Methods for all Child windows void DataChanged_Impl( const DataChangedEvent& rDCEvt ); void ReleaseChild_Impl( Window& rWindow ); - SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, sal_Bool bCanGetFocus=sal_False ); + SfxChild_Impl* RegisterChild_Impl( Window& rWindow, SfxChildAlignment eAlign, bool bCanGetFocus=false ); void ShowChildren_Impl(); void HideChildren_Impl(); - sal_Bool PrepareClose_Impl(); + bool PrepareClose_Impl(); virtual void ArrangeChildren_Impl( sal_Bool bForce = sal_True ); void DeleteControllers_Impl(); - void HidePopups_Impl(sal_Bool bHide, sal_Bool bParent=sal_False, sal_uInt16 nId=0); + void HidePopups_Impl(bool bHide, bool bParent=false, sal_uInt16 nId=0); void ConfigChild_Impl(SfxChildIdentifier, SfxDockingConfig, sal_uInt16); - void MakeChildrenVisible_Impl( sal_Bool bVis ); + void MakeChildrenVisible_Impl( bool bVis ); void ArrangeAutoHideWindows( SfxSplitWindow *pSplit ); - sal_Bool IsAutoHideMode( const SfxSplitWindow *pSplit ); + bool IsAutoHideMode( const SfxSplitWindow *pSplit ); void EndAutoShow_Impl( Point aPos ); - void SetFullScreen_Impl( sal_Bool bSet ) { bIsFullScreen = bSet; } - sal_Bool IsFullScreen_Impl() const { return bIsFullScreen; } + void SetFullScreen_Impl( bool bSet ) { bIsFullScreen = bSet; } + bool IsFullScreen_Impl() const { return bIsFullScreen; } // Methods for Objectbars virtual void UpdateObjectBars_Impl(); @@ -295,29 +295,29 @@ public: void SetObjectBar_Impl( sal_uInt16 nPos, sal_uInt32 nResId, SfxInterface *pIFace, const OUString* pName=0 ); bool KnowsObjectBar_Impl( sal_uInt16 nPos ) const; - sal_Bool IsVisible_Impl(); - void MakeVisible_Impl( sal_Bool ); + bool IsVisible_Impl(); + void MakeVisible_Impl( bool ); void SetObjectBarVisibility_Impl( sal_uInt16 nVis ); - sal_Bool IsContainer_Impl() const; - void Lock_Impl( sal_Bool ); + bool IsContainer_Impl() const; + void Lock_Impl( bool ); // Methods for ChildWindows void UpdateChildWindows_Impl(); void ResetChildWindows_Impl(); - void SetChildWindowVisible_Impl( sal_uInt32, sal_Bool, sal_uInt16 ); - void ToggleChildWindow_Impl(sal_uInt16,sal_Bool); - sal_Bool HasChildWindow_Impl(sal_uInt16); - sal_Bool KnowsChildWindow_Impl(sal_uInt16); - void ShowChildWindow_Impl(sal_uInt16, sal_Bool bVisible, sal_Bool bSetFocus); - void SetChildWindow_Impl(sal_uInt16, sal_Bool bOn, sal_Bool bSetFocus); + void SetChildWindowVisible_Impl( sal_uInt32, bool, sal_uInt16 ); + void ToggleChildWindow_Impl(sal_uInt16,bool); + bool HasChildWindow_Impl(sal_uInt16); + bool KnowsChildWindow_Impl(sal_uInt16); + void ShowChildWindow_Impl(sal_uInt16, bool bVisible, bool bSetFocus); + void SetChildWindow_Impl(sal_uInt16, bool bOn, bool bSetFocus); SfxChildWindow* GetChildWindow_Impl(sal_uInt16); virtual void InitializeChild_Impl(SfxChildWin_Impl*); SfxSplitWindow* GetSplitWindow_Impl(SfxChildAlignment); - sal_Bool IsVisible_Impl( sal_uInt16 nMode ) const; - sal_Bool IsFloating( sal_uInt16 nId ); + bool IsVisible_Impl( sal_uInt16 nMode ) const; + bool IsFloating( sal_uInt16 nId ); void SetActiveChild_Impl( Window *pChild ); - virtual sal_Bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); + virtual bool ActivateNextChild_Impl( sal_Bool bForward = sal_True ); bool AllowChildWindowCreation_Impl( const SfxChildWin_Impl& i_rCW ) const; // Methods for StatusBar diff --git a/sfx2/source/inet/inettbc.cxx b/sfx2/source/inet/inettbc.cxx index f55430432ba1..e98f028dbb14 100644 --- a/sfx2/source/inet/inettbc.cxx +++ b/sfx2/source/inet/inettbc.cxx @@ -78,7 +78,7 @@ SvtURLBox* SfxURLToolBoxControl_Impl::GetURLBox() const -void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, sal_Bool /*bNew*/ ) const +void SfxURLToolBoxControl_Impl::OpenURL( const OUString& rName, bool /*bNew*/ ) const { OUString aName; OUString aFilter; @@ -167,7 +167,7 @@ IMPL_LINK_NOARG(SfxURLToolBoxControl_Impl, SelectHdl) OUString aName( pURLBox->GetURL() ); if ( !pURLBox->IsTravelSelect() && !aName.isEmpty() ) - OpenURL( aName, sal_False ); + OpenURL( aName, false ); return 1L; } diff --git a/sfx2/source/menu/mnuitem.cxx b/sfx2/source/menu/mnuitem.cxx index b27663ea4f44..a4da1786b269 100644 --- a/sfx2/source/menu/mnuitem.cxx +++ b/sfx2/source/menu/mnuitem.cxx @@ -172,7 +172,7 @@ void SfxMenuControl::StateChanged #ifdef UNIX if (nSID == SID_PASTE) - pOwnMenu->EnableItem( GetId(), sal_True ); + pOwnMenu->EnableItem( GetId(), true ); else #endif pOwnMenu->EnableItem( GetId(), bIsObjMenu @@ -183,7 +183,7 @@ void SfxMenuControl::StateChanged { // check only for non-Object Menus if ( !bIsObjMenu ) - pOwnMenu->CheckItem( GetId(), sal_False ); + pOwnMenu->CheckItem( GetId(), false ); if ( pOwnMenu->GetSVMenu()->GetItemText( GetId() ) != GetTitle() ) { diff --git a/sfx2/source/menu/mnumgr.cxx b/sfx2/source/menu/mnumgr.cxx index f4ef62a0e606..379905b7215c 100644 --- a/sfx2/source/menu/mnumgr.cxx +++ b/sfx2/source/menu/mnumgr.cxx @@ -264,7 +264,7 @@ SfxMenuManager::SfxMenuManager( Menu* pMenuArg, SfxBindings &rBindings ) nType(0) { bAddClipboardFuncs = false; - SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, sal_False, rBindings, sal_True, sal_True ); + SfxVirtualMenu* pVMenu = new SfxVirtualMenu( pMenuArg, false, rBindings, true, true ); Construct(*pVMenu); } diff --git a/sfx2/source/menu/virtmenu.cxx b/sfx2/source/menu/virtmenu.cxx index 9c07bc32c829..8795ee402b99 100644 --- a/sfx2/source/menu/virtmenu.cxx +++ b/sfx2/source/menu/virtmenu.cxx @@ -62,7 +62,7 @@ class SfxMenuImageControl_Impl : public SfxControllerItem { SfxVirtualMenu* pMenu; long lRotation; - sal_Bool bIsMirrored; + bool bIsMirrored; protected: virtual void StateChanged( sal_uInt16 nSID, SfxItemState eState, const SfxPoolItem* pState ) SAL_OVERRIDE; @@ -71,7 +71,7 @@ public: : SfxControllerItem( nSlotId, rBindings ) , pMenu( pVMenu ) , lRotation( 0 ) - , bIsMirrored( sal_False ) + , bIsMirrored( false ) {} void Update(); }; @@ -139,7 +139,7 @@ static Image RetrieveAddOnImage( Reference< com::sun::star::frame::XFrame >& rFr if the OLE server application exist or not. */ -sal_Bool IsItemHidden_Impl( sal_uInt16 nItemId, int bOleServer, int bMac ) +bool IsItemHidden_Impl( sal_uInt16 nItemId, int bOleServer, int bMac ) { return ( bMac && ( nItemId == SID_MINIMIZED ) ) || @@ -167,8 +167,8 @@ void SfxVirtualMenu::Construct_Impl() SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, - SfxVirtualMenu* pOwnParent, Menu& rMenu, sal_Bool bWithHelp, - SfxBindings &rBindings, sal_Bool bOLEServer, sal_Bool bRes, sal_Bool bIsAddonMenu ): + SfxVirtualMenu* pOwnParent, Menu& rMenu, bool bWithHelp, + SfxBindings &rBindings, bool bOLEServer, bool bRes, bool bIsAddonMenu ): pItems(0), pImageControl(0), pBindings(&rBindings), @@ -188,19 +188,19 @@ SfxVirtualMenu::SfxVirtualMenu( sal_uInt16 nOwnId, pWindowMenu = NULL; pPickMenu = NULL; pAddonsMenu = NULL; - bIsActive = sal_False; - bControllersUnBound = sal_False; + bIsActive = false; + bControllersUnBound = false; CreateFromSVMenu(); Construct_Impl(); - bHelpInitialized = sal_False; + bHelpInitialized = false; } // creates a virtual menu from a StarView MenuBar or PopupMenu -SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp, - SfxBindings &rBindings, sal_Bool bOLEServer, sal_Bool bRes, sal_Bool bIsAddonMenu ): +SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, bool bWithHelp, + SfxBindings &rBindings, bool bOLEServer, bool bRes, bool bIsAddonMenu ): pItems(0), pImageControl(0), pBindings(&rBindings), @@ -221,11 +221,11 @@ SfxVirtualMenu::SfxVirtualMenu( Menu *pStarViewMenu, sal_Bool bWithHelp, pWindowMenu = NULL; pPickMenu = NULL; pAddonsMenu = NULL; - bIsActive = sal_False; - bControllersUnBound = sal_False; + bIsActive = false; + bControllersUnBound = false; CreateFromSVMenu(); Construct_Impl(); - bHelpInitialized = sal_False; + bHelpInitialized = false; } @@ -243,7 +243,7 @@ SfxVirtualMenu::~SfxVirtualMenu() if ( bIsActive ) { - pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False; + pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = false; } if (pItems) @@ -497,7 +497,7 @@ IMPL_LINK_NOARG(SfxVirtualMenu, SettingsChanged) { sal_uInt16 nItemCount = pSVMenu->GetItemCount(); SfxViewFrame *pViewFrame = pBindings->GetDispatcher()->GetFrame(); - sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus(); + bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus(); Reference<com::sun::star::frame::XFrame> xFrame( pViewFrame->GetFrame().GetFrameInterface() ); if ( !bIsAddonPopupMenu ) @@ -568,7 +568,7 @@ void SfxVirtualMenu::UpdateImages( Menu* pMenu ) framework::AddonsOptions aAddonOptions; - sal_Bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus(); + bool bIcons = Application::GetSettings().GetStyleSettings().GetUseImagesInMenus(); if ( bIcons ) { sal_uInt16 nItemCount = pMenu->GetItemCount(); @@ -641,7 +641,7 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu ) // Only a binded Menu-Controller as already an Id! if ( !rCtrl.GetId() ) { - bIsAddonPopupMenu = sal_False; + bIsAddonPopupMenu = false; DBG_ASSERT( !pSubMenu, "Popup already exists!"); // Check if the popup is an Add-On popup menu @@ -651,12 +651,12 @@ bool SfxVirtualMenu::Bind_Impl( Menu *pMenu ) ( nSID == SID_ADDONHELP ) || (( (sal_uInt32)aCommand.getLength() > nAddonsPopupPrefixLen ) && ( aCommand.startsWith( ADDONSPOPUPMENU_URL_PREFIX ) ) ) ) - bIsAddonPopupMenu = sal_True; + bIsAddonPopupMenu = true; // Create VirtualMenu for Sub-Menu - sal_Bool bRes = bResCtor; + bool bRes = bResCtor; pSubMenu = new SfxVirtualMenu( nSID, this, - *pMenu, sal_False, *pBindings, bOLE, bRes, bIsAddonPopupMenu ); + *pMenu, false, *pBindings, bOLE, bRes, bIsAddonPopupMenu ); SAL_INFO("sfx", "New VirtualMenu " << pSubMenu << " created"); @@ -706,7 +706,7 @@ void SfxVirtualMenu::BindControllers() } pBindings->LEAVEREGISTRATIONS(); - bControllersUnBound = sal_False; + bControllersUnBound = false; } void SfxVirtualMenu::UnbindControllers() @@ -733,7 +733,7 @@ void SfxVirtualMenu::UnbindControllers() } pBindings->LEAVEREGISTRATIONS(); - bControllersUnBound = sal_True; + bControllersUnBound = true; } @@ -790,7 +790,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) if ( pMenu ) { - sal_Bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); + bool bDontHide = SvtMenuOptions().IsEntryHidingEnabled(); sal_uInt16 nFlag = pMenu->GetMenuFlags(); if ( bDontHide ) nFlag &= ~MENU_FLAG_HIDEDISABLEDENTRIES; @@ -895,7 +895,7 @@ IMPL_LINK( SfxVirtualMenu, Activate, Menu *, pMenu ) pBindings->Update( SID_IMAGE_ORIENTATION ); // Supress the Status updates until Deactivate - pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = sal_True; + pBindings->ENTERREGISTRATIONS(); ++nLocks; bIsActive = true; return sal_True; } @@ -926,7 +926,7 @@ IMPL_LINK( SfxVirtualMenu, Deactivate, Menu *, pMenu ) // when the menu is disabled (= closed) if ( pParent ) UnbindControllers(); - pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = sal_False; + pBindings->LEAVEREGISTRATIONS(); --nLocks; bIsActive = false; } return sal_True; } @@ -995,7 +995,7 @@ Menu* SfxVirtualMenu::GetSVMenu() const // set the checkmark of the specified item -void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) +void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, bool bCheck ) { DBG_ASSERT( this != 0, ""); DBG_ASSERT( pSVMenu != 0, "" ); @@ -1006,7 +1006,7 @@ void SfxVirtualMenu::CheckItem( sal_uInt16 nItemId, sal_Bool bCheck ) // set the enabled-state of the specified item -void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, sal_Bool bEnable ) +void SfxVirtualMenu::EnableItem( sal_uInt16 nItemId, bool bEnable ) { DBG_ASSERT( this != 0, ""); DBG_ASSERT( pSVMenu != 0, "" ); @@ -1046,7 +1046,7 @@ void SfxVirtualMenu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu *pMenu ) // Forces the initialization, which is otherwise only happens in Activate -void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, sal_Bool /*bOLE*/ ) +void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, bool /*bOLE*/ ) { sal_uInt16 nSID = pSVMenu->GetItemId(nPos); @@ -1058,9 +1058,9 @@ void SfxVirtualMenu::InitPopup( sal_uInt16 nPos, sal_Bool /*bOLE*/ ) if ( !rCtrl.GetId() ) { // Generate VirtualMenu for Sub-Menu - sal_Bool bRes = bResCtor; + bool bRes = bResCtor; SfxVirtualMenu *pSubMenu = - new SfxVirtualMenu(nSID, this, *pMenu, sal_False, *pBindings, bOLE, bRes); + new SfxVirtualMenu(nSID, this, *pMenu, false, *pBindings, bOLE, bRes); SAL_INFO("sfx", "New VirtualMenu " << pSubMenu << " created"); @@ -1076,7 +1076,7 @@ void SfxVirtualMenu::InitializeHelp() SfxMenuControl &rCtrl = pItems[nPos]; if ( nSlotId && !rCtrl.GetId() ) { - InitPopup( nPos, sal_True ); + InitPopup( nPos, true ); } SfxVirtualMenu *pSubMenu = rCtrl.GetPopupMenu(); @@ -1084,7 +1084,7 @@ void SfxVirtualMenu::InitializeHelp() pSubMenu->InitializeHelp(); } - bHelpInitialized = sal_True; + bHelpInitialized = true; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 6d92c0e3f231..9832c47e3492 100644 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -283,12 +283,12 @@ void SAL_CALL SfxEvents_Impl::notifyEvent( const document::EventObject& aEvent ) OUString aName = aEvent.EventName; long nCount = maEventNames.getLength(); long nIndex = 0; - sal_Bool bFound = sal_False; + bool bFound = false; while ( !bFound && ( nIndex < nCount ) ) { if ( maEventNames[nIndex] == aName ) - bFound = sal_True; + bFound = true; else nIndex += 1; } @@ -341,7 +341,7 @@ SfxEvents_Impl::~SfxEvents_Impl() } -SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShell* pObjShell, sal_Bool bNormalizeMacro ) +SvxMacro* SfxEvents_Impl::ConvertToMacro( const uno::Any& rElement, SfxObjectShell* pObjShell, bool bNormalizeMacro ) { SvxMacro* pMacro = NULL; uno::Sequence < beans::PropertyValue > aProperties; diff --git a/sfx2/source/notify/globalevents.cxx b/sfx2/source/notify/globalevents.cxx index 13a8798529ba..cb27cb2ef698 100644 --- a/sfx2/source/notify/globalevents.cxx +++ b/sfx2/source/notify/globalevents.cxx @@ -337,13 +337,13 @@ sal_Bool SAL_CALL SfxGlobalEvents_Impl::has(const uno::Any& aElement) uno::Reference< frame::XModel > xDoc; aElement >>= xDoc; - sal_Bool bHas = sal_False; + bool bHas = false; // SAFE -> ::osl::ResettableMutexGuard aLock(m_aLock); TModelList::iterator pIt = impl_searchDoc(xDoc); if (pIt != m_lModels.end()) - bHas = sal_True; + bHas = true; aLock.clear(); // <- SAFE diff --git a/sfx2/source/sidebar/PanelDescriptor.hxx b/sfx2/source/sidebar/PanelDescriptor.hxx index c7e16396f86c..d53414d1c3ce 100644 --- a/sfx2/source/sidebar/PanelDescriptor.hxx +++ b/sfx2/source/sidebar/PanelDescriptor.hxx @@ -30,7 +30,7 @@ class PanelDescriptor { public: ::rtl::OUString msTitle; - sal_Bool mbIsTitleBarOptional; + bool mbIsTitleBarOptional; ::rtl::OUString msId; ::rtl::OUString msDeckId; ::rtl::OUString msTitleBarIconURL; diff --git a/sfx2/source/sidebar/Theme.cxx b/sfx2/source/sidebar/Theme.cxx index 55cd68bc5131..151cfed648e2 100644 --- a/sfx2/source/sidebar/Theme.cxx +++ b/sfx2/source/sidebar/Theme.cxx @@ -1097,10 +1097,10 @@ void Theme::ProcessNewValue ( } case PT_Boolean: { - sal_Bool nValue (0); + bool nValue (false); if (rValue >>= nValue) { - maBooleans[nIndex] = (nValue==sal_True); + maBooleans[nIndex] = nValue; if (eItem == Bool_IsHighContrastModeActive) { mbIsHighContrastModeSetManually = true; diff --git a/sfx2/source/statbar/stbitem.cxx b/sfx2/source/statbar/stbitem.cxx index 1af408f8f33d..9805c80fe45b 100644 --- a/sfx2/source/statbar/stbitem.cxx +++ b/sfx2/source/statbar/stbitem.cxx @@ -264,7 +264,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) } else if ( pType == ::getBooleanCppuType() ) { - sal_Bool bTemp = 0; + bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( nSlotID, bTemp ); } diff --git a/sfx2/source/toolbox/imgmgr.cxx b/sfx2/source/toolbox/imgmgr.cxx index 3546c1de2e6a..7e56fc0d88c9 100644 --- a/sfx2/source/toolbox/imgmgr.cxx +++ b/sfx2/source/toolbox/imgmgr.cxx @@ -129,7 +129,7 @@ static ImageList* GetImageList( bool bBig ) return rpList; } -static sal_Int16 impl_convertBools( sal_Bool bLarge ) +static sal_Int16 impl_convertBools( bool bLarge ) { sal_Int16 nIndex( 0 ); if ( bLarge ) @@ -199,7 +199,7 @@ void SfxImageManager_Impl::SetSymbolsSize_Impl( sal_Int16 nNewSymbolsSize ) if ( nNewSymbolsSize != m_nSymbolsSize ) { m_nSymbolsSize = nNewSymbolsSize; - sal_Bool bLarge( m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE ); + bool bLarge( m_nSymbolsSize == SFX_SYMBOLS_SIZE_LARGE ); for ( sal_uInt32 n=0; n < m_aToolBoxes.size(); n++ ) { @@ -331,7 +331,7 @@ Image SfxImageManager::GetImage( sal_uInt16 nId, bool bBig ) const Image SfxImageManager::GetImage( sal_uInt16 nId ) const { - sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); + bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); return GetImage( nId, bLarge ); } @@ -339,7 +339,7 @@ Image SfxImageManager::GetImage( sal_uInt16 nId ) const Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const { - sal_Bool bGlobal = ( pImp->m_pModule == 0 ); + bool bGlobal = ( pImp->m_pModule == 0 ); ImageList* pImageList = pImp->GetImageList( bBig ); if ( pImageList && pImageList->HasImageAtPos( nId ) ) return pImageList->GetImage( nId ); @@ -356,7 +356,7 @@ Image SfxImageManager::SeekImage( sal_uInt16 nId, bool bBig ) const Image SfxImageManager::SeekImage( sal_uInt16 nId ) const { - sal_Bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); + bool bLarge = SvtMiscOptions().AreCurrentSymbolsLarge(); return SeekImage( nId, bLarge ); } diff --git a/sfx2/source/toolbox/tbxitem.cxx b/sfx2/source/toolbox/tbxitem.cxx index 50100aae2675..81cae6cf568c 100644 --- a/sfx2/source/toolbox/tbxitem.cxx +++ b/sfx2/source/toolbox/tbxitem.cxx @@ -543,7 +543,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) } else if ( pType == ::getBooleanCppuType() ) { - sal_Bool bTemp = false; + bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( nSlotId, bTemp ); } @@ -1089,7 +1089,7 @@ throw ( ::com::sun::star::uno::RuntimeException, std::exception ) } else if ( pType == ::getBooleanCppuType() ) { - sal_Bool bTemp = false; + bool bTemp = false; rEvent.State >>= bTemp ; pItem = new SfxBoolItem( nSlotId, bTemp ); } diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 1fd37a7e69bd..416f08502350 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -127,7 +127,7 @@ bool SfxFrame::DoClose() bool bRet = false; if ( !pImp->bClosing ) { - pImp->bClosing = sal_True; + pImp->bClosing = true; CancelTransfers(); // now close frame; it will be deleted if this call is successful, so don't use any members after that! @@ -148,7 +148,7 @@ bool SfxFrame::DoClose() } catch( ::com::sun::star::util::CloseVetoException& ) { - pImp->bClosing = sal_False; + pImp->bClosing = false; bRet = false; } catch( ::com::sun::star::lang::DisposedException& ) @@ -199,7 +199,7 @@ bool SfxFrame::PrepareClose_Impl( bool bUI ) // prevent recursive calls if( !pImp->bPrepClosing ) { - pImp->bPrepClosing = sal_True; + pImp->bPrepClosing = true; SfxObjectShell* pCur = GetCurrentDocument() ; if( pCur ) @@ -230,7 +230,7 @@ bool SfxFrame::PrepareClose_Impl( bool bUI ) nRet = (*pChildArr)[ nPos ]->PrepareClose_Impl( bUI ); } - pImp->bPrepClosing = sal_False; + pImp->bPrepClosing = false; } if ( nRet && pImp->pWorkWin ) @@ -276,7 +276,7 @@ bool SfxFrame::IsClosing_Impl() const void SfxFrame::SetIsClosing_Impl() { - pImp->bClosing = sal_True; + pImp->bClosing = true; } sal_uInt16 SfxFrame::GetChildFrameCount() const @@ -288,7 +288,7 @@ void SfxFrame::CancelTransfers( bool /*bCancelLoadEnv*/ ) { if( !pImp->bInCancelTransfers ) { - pImp->bInCancelTransfers = sal_True; + pImp->bInCancelTransfers = true; SfxObjectShell* pObj = GetCurrentDocument(); if( pObj ) //&& !( pObj->Get_Impl()->nLoadedFlags & SFX_LOADED_ALL )) { @@ -312,7 +312,7 @@ void SfxFrame::CancelTransfers( bool /*bCancelLoadEnv*/ ) // Check if StarOne-Loader should be canceled SfxFrameWeak wFrame( this ); if (wFrame.Is()) - pImp->bInCancelTransfers = sal_False; + pImp->bInCancelTransfers = false; } } diff --git a/sfx2/source/view/frmload.cxx b/sfx2/source/view/frmload.cxx index 9a8fc26203ae..9c5413ba75c9 100644 --- a/sfx2/source/view/frmload.cxx +++ b/sfx2/source/view/frmload.cxx @@ -142,7 +142,7 @@ private: const SfxFilterMatcher& rMatcher ) const; - sal_Bool impl_createNewDocWithSlotParam( + bool impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const css::uno::Reference< css::frame::XFrame >& i_rxFrame, const bool i_bHidden @@ -323,14 +323,14 @@ OUString SfxFrameLoader_Impl::impl_askForFilter_nothrow( const Reference< XInter namespace { - sal_Bool lcl_getDispatchResult( const SfxPoolItem* _pResult ) + bool lcl_getDispatchResult( const SfxPoolItem* _pResult ) { if ( !_pResult ) - return sal_False; + return false; // default must be set to true, because some return values // cant be checked, but nonetheless indicate "success"! - sal_Bool bSuccess = sal_True; + bool bSuccess = true; // On the other side some special slots return a boolean state, // which can be set to FALSE. @@ -343,7 +343,7 @@ namespace } -sal_Bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const Reference< XFrame >& i_rxFrame, +bool SfxFrameLoader_Impl::impl_createNewDocWithSlotParam( const sal_uInt16 _nSlotID, const Reference< XFrame >& i_rxFrame, const bool i_bHidden ) { SfxRequest aRequest( _nSlotID, SFX_CALLMODE_SYNCHRON, SFX_APP()->GetPool() ); @@ -394,7 +394,7 @@ void SfxFrameLoader_Impl::impl_determineFilter( ::comphelper::NamedValueCollecti // add property "AsTemplate" to descriptor. But suppress this step // if such property already exists. if ( pFilter->IsOwnTemplateFormat() && !io_rDescriptor.has( "AsTemplate" ) ) - io_rDescriptor.put( "AsTemplate", sal_Bool( sal_True ) ); + io_rDescriptor.put( "AsTemplate", true ); // The DocumentService property will finally be used to determine the document type to create, so // override it with the service name as indicated by the found filter. @@ -502,7 +502,7 @@ void SfxFrameLoader_Impl::impl_handleCaughtError_nothrow( const Any& i_rCaughtEr const Reference< XInteractionHandler2 > xHandler( xInteraction, UNO_QUERY ); #if OSL_DEBUG_LEVEL > 0 - const sal_Bool bHandled = + const bool bHandled = #endif xHandler.is() && xHandler->handleInteractionRequest( pRequest.get() ); @@ -669,7 +669,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA aDescriptor.put( "FileName", aDescriptor.get( "URL" ) ); } - sal_Bool bLoadSuccess = sal_False; + bool bLoadSuccess = false; try { // extract view releant arguments from the loader args @@ -726,7 +726,7 @@ sal_Bool SAL_CALL SfxFrameLoader_Impl::load( const Sequence< PropertyValue >& rA // plug the document into the frame impl_createDocumentView( xModel, _rTargetFrame, aViewCreationArgs, sViewName ); - bLoadSuccess = sal_True; + bLoadSuccess = true; } catch ( Exception& ) { diff --git a/sfx2/source/view/impframe.hxx b/sfx2/source/view/impframe.hxx index b052bc2a16cc..7b23889efb79 100644 --- a/sfx2/source/view/impframe.hxx +++ b/sfx2/source/view/impframe.hxx @@ -41,12 +41,12 @@ public: SfxViewFrame* pCurrentViewFrame; SfxFrameDescriptor* pDescr; sal_uInt16 nLocks; - sal_Bool bClosing : 1; - sal_Bool bPrepClosing : 1; - sal_Bool bInCancelTransfers : 1; - sal_Bool bOwnsBindings : 1; - sal_Bool bReleasingComponent : 1; - sal_Bool bInPlace : 1; + bool bClosing : 1; + bool bPrepClosing : 1; + bool bInCancelTransfers : 1; + bool bOwnsBindings : 1; + bool bReleasingComponent : 1; + bool bInPlace : 1; SfxFrame* pFrame; SfxWorkWindow* pWorkWin; SvBorder aBorder; @@ -62,12 +62,12 @@ public: ,pCurrentViewFrame( NULL ) ,pDescr( NULL ) ,nLocks( 0 ) - ,bClosing(sal_False) - ,bPrepClosing(sal_False) - ,bInCancelTransfers( sal_False ) - ,bOwnsBindings( sal_False ) - ,bReleasingComponent( sal_False ) - ,bInPlace( sal_False ) + ,bClosing(false) + ,bPrepClosing(false) + ,bInCancelTransfers( false ) + ,bOwnsBindings( false ) + ,bReleasingComponent( false ) + ,bInPlace( false ) ,pFrame( pAntiImplP ) ,pWorkWin( 0 ) ,pExternalContainerWindow( NULL ) diff --git a/sfx2/source/view/impviewframe.hxx b/sfx2/source/view/impviewframe.hxx index d63a635b8c9d..35c65a54615c 100644 --- a/sfx2/source/view/impviewframe.hxx +++ b/sfx2/source/view/impviewframe.hxx @@ -41,15 +41,15 @@ struct SfxViewFrame_Impl Window* pFocusWin; sal_uInt16 nDocViewNo; sal_uInt16 nCurViewId; - sal_Bool bResizeInToOut:1; - sal_Bool bDontOverwriteResizeInToOut:1; - sal_Bool bObjLocked:1; - sal_Bool bReloading:1; - sal_Bool bIsDowning:1; - sal_Bool bModal:1; - sal_Bool bEnabled:1; - sal_Bool bWindowWasEnabled:1; - sal_Bool bActive; + bool bResizeInToOut:1; + bool bDontOverwriteResizeInToOut:1; + bool bObjLocked:1; + bool bReloading:1; + bool bIsDowning:1; + bool bModal:1; + bool bEnabled:1; + bool bWindowWasEnabled:1; + bool bActive; OUString aFactoryName; ::boost::optional< bool > aHasToolPanels; @@ -60,8 +60,8 @@ struct SfxViewFrame_Impl , pWindow( 0 ) , pActiveChild(0) , pFocusWin(0) - , bWindowWasEnabled(sal_True) - , bActive( sal_False ) + , bWindowWasEnabled(true) + , bActive( false ) { } diff --git a/sfx2/source/view/ipclient.cxx b/sfx2/source/view/ipclient.cxx index adbc5d2c0941..da4037910d11 100644 --- a/sfx2/source/view/ipclient.cxx +++ b/sfx2/source/view/ipclient.cxx @@ -70,10 +70,10 @@ using namespace com::sun::star; // SfxEmbedResizeGuard class SfxBooleanFlagGuard { - sal_Bool& m_rFlag; - sal_Bool m_bLifeValue; + bool& m_rFlag; + bool m_bLifeValue; public: - SfxBooleanFlagGuard( sal_Bool& bFlag, sal_Bool bLifeValue ) + SfxBooleanFlagGuard( bool& bFlag, bool bLifeValue ) : m_rFlag( bFlag ) , m_bLifeValue( bLifeValue ) { @@ -104,9 +104,9 @@ public: SfxInPlaceClient* m_pClient; sal_Int64 m_nAspect; // ViewAspect that is assigned from the container Rectangle m_aLastObjAreaPixel; // area of object in coordinate system of the container (without scaling) - sal_Bool m_bStoreObject; - sal_Bool m_bUIActive; // set and cleared when notification for UI (de)activation is sent - sal_Bool m_bResizeNoScale; + bool m_bStoreObject; + bool m_bUIActive; // set and cleared when notification for UI (de)activation is sent + bool m_bResizeNoScale; uno::Reference < embed::XEmbeddedObject > m_xObject; uno::Reference < embed::XEmbeddedClient > m_xClient; @@ -115,9 +115,9 @@ public: SfxInPlaceClient_Impl() : m_pClient( NULL ) , m_nAspect( 0 ) - , m_bStoreObject( sal_True ) - , m_bUIActive( sal_False ) - , m_bResizeNoScale( sal_False ) + , m_bStoreObject( true ) + , m_bUIActive( false ) + , m_bResizeNoScale( false ) {} virtual ~SfxInPlaceClient_Impl(); @@ -359,7 +359,7 @@ void SAL_CALL SfxInPlaceClient_Impl::activatingUI() throw uno::RuntimeException(); m_pClient->GetViewShell()->ResetAllClients_Impl(m_pClient); - m_bUIActive = sal_True; + m_bUIActive = true; m_pClient->GetViewShell()->UIActivating( m_pClient ); } @@ -383,7 +383,7 @@ void SAL_CALL SfxInPlaceClient_Impl::deactivatedUI() throw uno::RuntimeException(); m_pClient->GetViewShell()->UIDeactivated( m_pClient ); - m_bUIActive = sal_False; + m_bUIActive = false; } @@ -504,7 +504,7 @@ void SAL_CALL SfxInPlaceClient_Impl::changedPlacement( const awt::Rectangle& aPo { // the calculation of the object area has not changed the object size // it should be done here then - SfxBooleanFlagGuard aGuard( m_bResizeNoScale, sal_True ); + SfxBooleanFlagGuard aGuard( m_bResizeNoScale, true ); // new size of the object area without scaling Size aNewObjSize( Fraction( aNewLogicRect.GetWidth() ) / m_aScaleWidth, @@ -629,7 +629,7 @@ SfxInPlaceClient::~SfxInPlaceClient() m_pViewSh->IPClientGone_Impl(this); // deleting the client before storing the object means discarding all changes - m_pImp->m_bStoreObject = sal_False; + m_pImp->m_bStoreObject = false; SetObject(0); m_pImp->m_pClient = NULL; @@ -880,7 +880,7 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb ) if ( m_pImp->m_xObject.is() ) { - sal_Bool bSaveCopyAs = sal_False; + bool bSaveCopyAs = false; if ( nVerb == -8 ) // "Save Copy as..." { svt::EmbeddedObjectRef::TryRunningState( m_pImp->m_xObject ); @@ -888,19 +888,19 @@ ErrCode SfxInPlaceClient::DoVerb( long nVerb ) uno::Reference< frame::XModel > xEmbModel( m_pImp->m_xObject->getComponent(), uno::UNO_QUERY ); if ( xEmbModel.is() ) { - bSaveCopyAs = sal_True; + bSaveCopyAs = true; try { SfxStoringHelper aHelper; uno::Sequence< beans::PropertyValue > aDispatchArgs( 1 ); aDispatchArgs[0].Name = "SaveTo"; - aDispatchArgs[0].Value <<= (sal_Bool)sal_True; + aDispatchArgs[0].Value <<= true; aHelper.GUIStoreModel( xEmbModel, "SaveAs", aDispatchArgs, - sal_False, + false, "" ); } catch( const task::ErrorCodeIOException& aErrorEx ) @@ -1033,8 +1033,8 @@ void SfxInPlaceClient::DeactivateObject() { try { - m_pImp->m_bUIActive = sal_False; - sal_Bool bHasFocus = sal_False; + m_pImp->m_bUIActive = false; + bool bHasFocus = false; uno::Reference< frame::XModel > xModel( m_pImp->m_xObject->getComponent(), uno::UNO_QUERY ); if ( xModel.is() ) { @@ -1080,7 +1080,7 @@ void SfxInPlaceClient::ResetObject() { try { - m_pImp->m_bUIActive = sal_False; + m_pImp->m_bUIActive = false; if ( m_pImp->m_xObject->getStatus( m_pImp->m_nAspect ) & embed::EmbedMisc::MS_EMBED_ACTIVATEWHENVISIBLE ) m_pImp->m_xObject->changeState( embed::EmbedStates::INPLACE_ACTIVE ); else diff --git a/sfx2/source/view/sfxbasecontroller.cxx b/sfx2/source/view/sfxbasecontroller.cxx index 281637b8e2f6..64ec9eaf393d 100644 --- a/sfx2/source/view/sfxbasecontroller.cxx +++ b/sfx2/source/view/sfxbasecontroller.cxx @@ -1303,7 +1303,7 @@ void SfxBaseController::ConnectSfxFrame_Impl( const ConnectSfxFrame i_eConnect ) pViewFrame->LockAdjustPosSizePixel(); if ( nPluginMode == 3 ) - rFrame.GetWorkWindow_Impl()->SetInternalDockingAllowed( sal_False ); + rFrame.GetWorkWindow_Impl()->SetInternalDockingAllowed( false ); if ( !rFrame.IsInPlace() ) pViewFrame->GetDispatcher()->Update_Impl(); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index de27a595485e..9ed802172c63 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -1680,7 +1680,7 @@ void SfxViewFrame::GetDocNumber_Impl() void SfxViewFrame::Enable( bool bEnable ) { - if ( (bEnable ? 1 : 0) != pImp->bEnabled ) + if ( bEnable != pImp->bEnabled ) { pImp->bEnabled = bEnable; @@ -1761,7 +1761,7 @@ bool SfxViewFrame::IsVisible() const void SfxViewFrame::LockObjectShell_Impl( bool bLock ) { - DBG_ASSERT( pImp->bObjLocked != (bLock ? 1 : 0), "Wrong Locked status!" ); + DBG_ASSERT( pImp->bObjLocked != bLock, "Wrong Locked status!" ); DBG_ASSERT( GetObjectShell(), "No Document!" ); GetObjectShell()->OwnerLock(bLock); diff --git a/sfx2/source/view/viewfrm2.cxx b/sfx2/source/view/viewfrm2.cxx index de2cef6980ea..9a7f23667c0d 100644 --- a/sfx2/source/view/viewfrm2.cxx +++ b/sfx2/source/view/viewfrm2.cxx @@ -164,7 +164,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) case SID_SHOWPOPUPS : { SFX_REQUEST_ARG(rReq, pShowItem, SfxBoolItem, SID_SHOWPOPUPS, false); - sal_Bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; + bool bShow = pShowItem ? pShowItem->GetValue() : sal_True; SFX_REQUEST_ARG(rReq, pIdItem, SfxUInt16Item, SID_CONFIGITEMID, false); sal_uInt16 nId = pIdItem ? pIdItem->GetValue() : 0; @@ -188,7 +188,7 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) pBind = pBind->GetSubBindings_Impl(); } - pWorkWin->HidePopups_Impl( !bShow, sal_True, nId ); + pWorkWin->HidePopups_Impl( !bShow, true, nId ); pWorkWin->MakeChildrenVisible_Impl( bShow ); } @@ -249,22 +249,22 @@ void SfxViewFrame::Exec_Impl(SfxRequest &rReq ) bOther = (pFrame != this); // Document only needs to be queried, if no other View present. - sal_Bool bClosed = sal_False; - sal_Bool bUI = sal_True; + bool bClosed = false; + bool bUI = true; if ( ( bOther || pDocSh->PrepareClose( bUI ) ) ) { if ( !bOther ) pDocSh->SetModified( false ); rReq.Done(); // Must call this before Close()! - bClosed = sal_False; + bClosed = false; try { xTask->close(sal_True); - bClosed = sal_True; + bClosed = true; } catch( CloseVetoException& ) { - bClosed = sal_False; + bClosed = false; } } @@ -379,8 +379,8 @@ void SfxViewFrame::INetState_Impl( SfxItemSet &rItemSet ) // Add/SaveToBookmark at BASIC-IDE, QUERY-EDITOR etc. disable SfxObjectShell *pDocSh = GetObjectShell(); - sal_Bool bPseudo = pDocSh && !( pDocSh->GetFactory().GetFlags() & SFXOBJECTSHELL_HASOPENDOC ); - sal_Bool bEmbedded = pDocSh && pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED; + bool bPseudo = pDocSh && !( pDocSh->GetFactory().GetFlags() & SFXOBJECTSHELL_HASOPENDOC ); + bool bEmbedded = pDocSh && pDocSh->GetCreateMode() == SFX_CREATE_MODE_EMBEDDED; if ( !pDocSh || bPseudo || bEmbedded || !pDocSh->HasName() ) rItemSet.DisableItem( SID_CREATELINK ); } @@ -394,7 +394,7 @@ void SfxViewFrame::Activate( bool bMDI ) { DBG_ASSERT(GetViewShell(), "No Shell"); if ( bMDI ) - pImp->bActive = sal_True; + pImp->bActive = true; //(mba): here maybe as in Beanframe NotifyEvent ?! } @@ -402,7 +402,7 @@ void SfxViewFrame::Deactivate( bool bMDI ) { DBG_ASSERT(GetViewShell(), "No Shell"); if ( bMDI ) - pImp->bActive = sal_False; + pImp->bActive = false; //(mba): here maybe as in Beanframe NotifyEvent ?! } diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 5e67a385ee5b..d5c846e7f9b6 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -64,10 +64,10 @@ class SfxPrinterController : public vcl::PrinterController, public SfxListener mutable Reference<awt::XDevice> mxDevice; SfxViewShell* mpViewShell; SfxObjectShell* mpObjectShell; - sal_Bool m_bOrigStatus; - sal_Bool m_bNeedsChange; - sal_Bool m_bApi; - sal_Bool m_bTempPrinter; + bool m_bOrigStatus; + bool m_bNeedsChange; + bool m_bApi; + bool m_bTempPrinter; util::DateTime m_aLastPrinted; OUString m_aLastPrintedBy; @@ -80,7 +80,7 @@ public: const Any& i_rSelection, const Any& i_rViewProp, const Reference< view::XRenderable >& i_xRender, - sal_Bool i_bApi, sal_Bool i_bDirect, + bool i_bApi, bool i_bDirect, SfxViewShell* pView, const uno::Sequence< beans::PropertyValue >& rProps ); @@ -100,7 +100,7 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_ const Any& i_rSelection, const Any& i_rViewProp, const Reference< view::XRenderable >& i_xRender, - sal_Bool i_bApi, sal_Bool i_bDirect, + bool i_bApi, bool i_bDirect, SfxViewShell* pView, const uno::Sequence< beans::PropertyValue >& rProps ) @@ -111,8 +111,8 @@ SfxPrinterController::SfxPrinterController( const boost::shared_ptr<Printer>& i_ , mpLastPrinter( NULL ) , mpViewShell( pView ) , mpObjectShell(0) - , m_bOrigStatus( sal_False ) - , m_bNeedsChange( sal_False ) + , m_bOrigStatus( false ) + , m_bNeedsChange( false ) , m_bApi(i_bApi) , m_bTempPrinter( i_rPrinter.get() != NULL ) { @@ -190,7 +190,7 @@ const Any& SfxPrinterController::getSelectionObject() const const beans::PropertyValue* pVal = getValue( OUString( "PrintSelectionOnly" ) ); if( pVal ) { - sal_Bool bSel = sal_False; + bool bSel = false; pVal->Value >>= bSel; return bSel ? maSelection : maCompleteSelection; } @@ -301,7 +301,7 @@ void SfxPrinterController::jobStarted() if ( m_bOrigStatus && !SvtPrintWarningOptions().IsModifyDocumentOnPrintingAllowed() ) { mpObjectShell->EnableSetModified( false ); - m_bNeedsChange = sal_True; + m_bNeedsChange = true; } // refresh document info @@ -415,7 +415,7 @@ private: SfxViewShell* _pViewSh; PrinterSetupDialog* _pSetupParent; SfxItemSet* _pOptions; - sal_Bool _bHelpDisabled; + bool _bHelpDisabled; DECL_LINK( Execute, void * ); @@ -425,7 +425,7 @@ public: Link GetLink() const { return LINK( this, SfxDialogExecutor_Impl, Execute); } const SfxItemSet* GetOptions() const { return _pOptions; } - void DisableHelp() { _bHelpDisabled = sal_True; } + void DisableHelp() { _bHelpDisabled = true; } }; SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSetupDialog* pParent ) : @@ -433,7 +433,7 @@ SfxDialogExecutor_Impl::SfxDialogExecutor_Impl( SfxViewShell* pViewSh, PrinterSe _pViewSh ( pViewSh ), _pSetupParent ( pParent ), _pOptions ( NULL ), - _bHelpDisabled ( sal_False ) + _bHelpDisabled ( false ) { } @@ -494,8 +494,8 @@ SfxPrinter* SfxViewShell::SetPrinter_Impl( SfxPrinter *pNewPrinter ) Size aNewPgSz = pNewPrinter->GetPaperSizePixel(); // Determine the changes in page format - sal_Bool bOriChg = (eOldOri != eNewOri) && bOriToDoc; - sal_Bool bPgSzChg = ( aOldPgSz.Height() != + bool bOriChg = (eOldOri != eNewOri) && bOriToDoc; + bool bPgSzChg = ( aOldPgSz.Height() != ( bOriChg ? aNewPgSz.Width() : aNewPgSz.Height() ) || aOldPgSz.Width() != ( bOriChg ? aNewPgSz.Height() : aNewPgSz.Width() ) ) && @@ -635,7 +635,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) bool bSilent = false; // does the function have been called by the user interface or by an API call - sal_Bool bIsAPI = rReq.GetArgs() && rReq.GetArgs()->Count(); + bool bIsAPI = rReq.GetArgs() && rReq.GetArgs()->Count(); if ( bIsAPI ) { // the function have been called by the API @@ -652,7 +652,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) OUString aHelpFilterName( "writer_web_HTML_help" ); SfxMedium* pMedium = GetViewFrame()->GetObjectShell()->GetMedium(); const SfxFilter* pFilter = pMedium ? pMedium->GetFilter() : NULL; - sal_Bool bPrintOnHelp = ( pFilter && pFilter->GetFilterName() == aHelpFilterName ); + bool bPrintOnHelp = ( pFilter && pFilter->GetFilterName() == aHelpFilterName ); const sal_uInt16 nId = rReq.GetSlot(); switch( nId ) @@ -674,10 +674,10 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) // should we print only the selection or the whole document SFX_REQUEST_ARG(rReq, pSelectItem, SfxBoolItem, SID_SELECTION, false); - sal_Bool bSelection = ( pSelectItem != NULL && pSelectItem->GetValue() ); + bool bSelection = ( pSelectItem != NULL && pSelectItem->GetValue() ); // detect non api call from writer ( that adds SID_SELECTION ) and reset bIsAPI if ( pSelectItem && rReq.GetArgs()->Count() == 1 ) - bIsAPI = sal_False; + bIsAPI = false; uno::Sequence < beans::PropertyValue > aProps; if ( bIsAPI ) @@ -710,16 +710,16 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) else if ( aProps[nProp].Name == "Asynchron" ) { aProps[nProp]. Name = "Wait"; - sal_Bool bAsynchron = sal_False; + bool bAsynchron = false; aProps[nProp].Value >>= bAsynchron; - aProps[nProp].Value <<= (sal_Bool) (!bAsynchron); + aProps[nProp].Value <<= (!bAsynchron); } else if ( aProps[nProp].Name == "Silent" ) { aProps[nProp]. Name = "MonitorVisible"; - sal_Bool bPrintSilent = sal_False; + bool bPrintSilent = false; aProps[nProp].Value >>= bPrintSilent; - aProps[nProp].Value <<= (sal_Bool) (!bPrintSilent); + aProps[nProp].Value <<= (!bPrintSilent); } } } diff --git a/sw/source/core/uibase/app/swmodule.cxx b/sw/source/core/uibase/app/swmodule.cxx index 7d4c1cd68b27..b075a473d130 100644 --- a/sw/source/core/uibase/app/swmodule.cxx +++ b/sw/source/core/uibase/app/swmodule.cxx @@ -360,23 +360,23 @@ void SwDLL::RegisterControls() SwTableOptimizeCtrl::RegisterControl(FN_OPTIMIZE_TABLE, pMod); - SvxIMapDlgChildWindow::RegisterChildWindow( sal_False, pMod ); - SvxSearchDialogWrapper::RegisterChildWindow( sal_False, pMod ); - SvxHlinkDlgWrapper::RegisterChildWindow( sal_False, pMod ); - SvxFontWorkChildWindow::RegisterChildWindow( sal_False, pMod ); - SwFldDlgWrapper::RegisterChildWindow( sal_False, pMod ); - SwFldDataOnlyDlgWrapper::RegisterChildWindow( sal_False, pMod ); - SvxContourDlgChildWindow::RegisterChildWindow( sal_False, pMod ); + SvxIMapDlgChildWindow::RegisterChildWindow( false, pMod ); + SvxSearchDialogWrapper::RegisterChildWindow( false, pMod ); + SvxHlinkDlgWrapper::RegisterChildWindow( false, pMod ); + SvxFontWorkChildWindow::RegisterChildWindow( false, pMod ); + SwFldDlgWrapper::RegisterChildWindow( false, pMod ); + SwFldDataOnlyDlgWrapper::RegisterChildWindow( false, pMod ); + SvxContourDlgChildWindow::RegisterChildWindow( false, pMod ); SwNavigationChild::RegisterChildWindowContext( pMod ); - SwInputChild::RegisterChildWindow( sal_False, pMod, SFX_CHILDWIN_FORCEDOCK ); - SwRedlineAcceptChild::RegisterChildWindow( sal_False, pMod ); - SwSyncChildWin::RegisterChildWindow( sal_True, pMod ); - SwMailMergeChildWindow::RegisterChildWindow( sal_False, pMod ); - SwInsertIdxMarkWrapper::RegisterChildWindow( sal_False, pMod ); - SwInsertAuthMarkWrapper::RegisterChildWindow( sal_False, pMod ); - SwWordCountWrapper::RegisterChildWindow( sal_False, pMod ); - SvxRubyChildWindow::RegisterChildWindow( sal_False, pMod); - SwSpellDialogChildWindow::RegisterChildWindow(sal_False, pMod); + SwInputChild::RegisterChildWindow( false, pMod, SFX_CHILDWIN_FORCEDOCK ); + SwRedlineAcceptChild::RegisterChildWindow( false, pMod ); + SwSyncChildWin::RegisterChildWindow( true, pMod ); + SwMailMergeChildWindow::RegisterChildWindow( false, pMod ); + SwInsertIdxMarkWrapper::RegisterChildWindow( false, pMod ); + SwInsertAuthMarkWrapper::RegisterChildWindow( false, pMod ); + SwWordCountWrapper::RegisterChildWindow( false, pMod ); + SvxRubyChildWindow::RegisterChildWindow( false, pMod); + SwSpellDialogChildWindow::RegisterChildWindow(false, pMod); SvxGrafRedToolBoxControl::RegisterControl( SID_ATTR_GRAF_RED, pMod ); SvxGrafGreenToolBoxControl::RegisterControl( SID_ATTR_GRAF_GREEN, pMod ); @@ -395,14 +395,14 @@ void SwDLL::RegisterControls() SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_LEFT_TO_RIGHT, pMod); SvxCTLTextTbxCtrl::RegisterControl(SID_ATTR_PARA_RIGHT_TO_LEFT, pMod); - GalleryChildWindow::RegisterChildWindow(0, pMod); + GalleryChildWindow::RegisterChildWindow(false, pMod); ::avmedia::MediaToolBoxControl::RegisterControl(SID_AVMEDIA_TOOLBOX, pMod); - ::avmedia::MediaPlayer::RegisterChildWindow(0, pMod); + ::avmedia::MediaPlayer::RegisterChildWindow(false, pMod); SvxSmartTagsControl::RegisterControl(SID_OPEN_SMARTTAGMENU, pMod); - ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(0, pMod); - ::sfx2::TaskPaneWrapper::RegisterChildWindow(0, pMod); + ::sfx2::sidebar::SidebarChildWindow::RegisterChildWindow(false, pMod); + ::sfx2::TaskPaneWrapper::RegisterChildWindow(false, pMod); } /************************************************************************* |