diff options
Diffstat (limited to 'sfx2')
25 files changed, 48 insertions, 60 deletions
diff --git a/sfx2/Library_qstart.mk b/sfx2/Library_qstart.mk index 2344d79746..f31c8fb394 100755 --- a/sfx2/Library_qstart.mk +++ b/sfx2/Library_qstart.mk @@ -72,9 +72,7 @@ $(eval $(call gb_Library_add_linked_libs,qstart_gtk,\ ucbhelper \ utl \ vcl \ - vos3 \ xml2 \ - eggtray \ sfx \ )) diff --git a/sfx2/Library_sfx.mk b/sfx2/Library_sfx.mk index c18b46c8f1..0e58d301a0 100755 --- a/sfx2/Library_sfx.mk +++ b/sfx2/Library_sfx.mk @@ -74,7 +74,6 @@ $(eval $(call gb_Library_add_linked_libs,sfx,\ ucbhelper \ utl \ vcl \ - vos3 \ xml2 \ $(gb_STDLIBS) \ )) diff --git a/sfx2/Module_sfx2.mk b/sfx2/Module_sfx2.mk index b88e2581f2..e5c738ac87 100755 --- a/sfx2/Module_sfx2.mk +++ b/sfx2/Module_sfx2.mk @@ -34,14 +34,14 @@ $(eval $(call gb_Module_add_targets,sfx2,\ Package_sdi \ )) -$(eval $(call gb_Module_add_check_targets,sfx2,\ - CppunitTest_sfx2_metadatable \ -)) +#$(eval $(call gb_Module_add_check_targets,sfx2,\ +# CppunitTest_sfx2_metadatable \ +#)) -$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ - JunitTest_sfx2_complex \ - JunitTest_sfx2_unoapi \ -)) +#$(eval $(call gb_Module_add_subsequentcheck_targets,sfx2,\ +# JunitTest_sfx2_complex \ +# JunitTest_sfx2_unoapi \ +#)) ifeq ($(OS),LINUX) ifeq ($(ENABLE_SYSTRAY_GTK),TRUE) diff --git a/sfx2/inc/sfx2/sfxbasemodel.hxx b/sfx2/inc/sfx2/sfxbasemodel.hxx index b414774d0b..f7b3101154 100755 --- a/sfx2/inc/sfx2/sfxbasemodel.hxx +++ b/sfx2/inc/sfx2/sfxbasemodel.hxx @@ -1626,7 +1626,7 @@ public: i_rModel.MethodEntryCheck( i_eState != E_INITIALIZING ); } SfxModelGuard( SfxModelSubComponent& i_rSubComponent ) - :m_aGuard( Application::GetSolarMutex() ) + :m_aGuard() { i_rSubComponent.MethodEntryCheck(); } @@ -1645,7 +1645,7 @@ public: } private: - SolarMutexClearableGuard m_aGuard; + SolarMutexResettableGuard m_aGuard; }; #undef css diff --git a/sfx2/inc/sfx2/viewsh.hxx b/sfx2/inc/sfx2/viewsh.hxx index 34bb1ef56d..049fabb214 100755 --- a/sfx2/inc/sfx2/viewsh.hxx +++ b/sfx2/inc/sfx2/viewsh.hxx @@ -302,7 +302,7 @@ public: SAL_DLLPRIVATE bool GlobalKeyInput_Impl( const KeyEvent &rKeyEvent ); SAL_DLLPRIVATE void NewIPClient_Impl( SfxInPlaceClient *pIPClient ) - { GetIPClientList_Impl(TRUE)->push_back(pIPClient); } + { GetIPClientList_Impl(sal_True)->push_back(pIPClient); } SAL_DLLPRIVATE void IPClientGone_Impl( SfxInPlaceClient *pIPClient ); SAL_DLLPRIVATE SfxInPlaceClientList* GetIPClientList_Impl( sal_Bool bCreate = sal_True ) const; SAL_DLLPRIVATE void ResetAllClients_Impl( SfxInPlaceClient *pIP ); @@ -381,4 +381,4 @@ inline SfxViewFrame* SfxViewShell::GetViewFrame() const #endif // #ifndef _SFXVIEWSH_HXX -/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
\ No newline at end of file +/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sfx2/source/appl/appserv.cxx b/sfx2/source/appl/appserv.cxx index b99479c346..872a83997c 100755 --- a/sfx2/source/appl/appserv.cxx +++ b/sfx2/source/appl/appserv.cxx @@ -941,7 +941,7 @@ void SfxApplication::OfaExec_Impl( SfxRequest& rReq ) if (pObjSh) pObjSh->SetConfigOptionsChecked(false); } - pView->GetBindings().InvalidateAll(FALSE); + pView->GetBindings().InvalidateAll(sal_False); pView = SfxViewFrame::GetNext( *pView ); } } diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 2be075caf9..6e6033ba58 100755 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -2150,16 +2150,6 @@ SFX2_DLLPUBLIC void SAL_CALL component_getImplementationEnvironment( *ppEnvironmentTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME ; } - - - // writer compatable document properties - aImpl = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/")); - aImpl += comp_CompatWriterDocProps::_getImplementationName(); - - aTempStr = aImpl; - aTempStr += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("/UNO/SERVICES")); - xNewKey = xKey->createKey( aTempStr ); - xNewKey->createKey( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("com.sun.star.writer.DocumentProperties")) ); SFX2_DLLPUBLIC void* SAL_CALL component_getFactory( const sal_Char* pImplementationName , void* pServiceManager , diff --git a/sfx2/source/appl/helpinterceptor.cxx b/sfx2/source/appl/helpinterceptor.cxx index d3ac6bc4ea..ee273ba890 100755 --- a/sfx2/source/appl/helpinterceptor.cxx +++ b/sfx2/source/appl/helpinterceptor.cxx @@ -136,7 +136,7 @@ void HelpInterceptor_Impl::SetStartURL( const String& rURL ) { m_pHistory = new HelpHistoryList_Impl; Any aEmptyViewData; - m_pHistory->insert( m_pHistory->begin(), new HelpHistoryEntry_Impl( rURL, aEmptyViewData, (sal_uIntPtr)0x0 ) ); + m_pHistory->insert( m_pHistory->begin(), new HelpHistoryEntry_Impl( rURL, aEmptyViewData)); m_nCurPos = m_pHistory->size() - 1; m_pWindow->UpdateToolbox(); @@ -169,7 +169,7 @@ Reference< XDispatch > SAL_CALL HelpInterceptor_Impl::queryDispatch( if ( m_xSlaveDispatcher.is() ) xResult = m_xSlaveDispatcher->queryDispatch( aURL, aTargetFrameName, nSearchFlags ); - BOOL bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); + sal_Bool bHelpURL = aURL.Complete.toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); if ( bHelpURL ) { diff --git a/sfx2/source/appl/linkmgr2.cxx b/sfx2/source/appl/linkmgr2.cxx index dfbf6e12b2..f67a15c192 100755 --- a/sfx2/source/appl/linkmgr2.cxx +++ b/sfx2/source/appl/linkmgr2.cxx @@ -353,7 +353,7 @@ void LinkManager::UpdateAllLinks( int nRet = QueryBox( pParentWin, WB_YES_NO | WB_DEF_YES, SfxResId( STR_QUERY_UPDATE_LINKS ) ).Execute(); if( RET_YES != nRet ) return ; // nothing should be updated - bAskUpdate = sal_False // once is enough + bAskUpdate = sal_False; // once is enough } pLink->Update(); @@ -467,7 +467,7 @@ void LinkManager::LinkServerShell(const OUString& rPath, SfxObjectShell& rServer } } -bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink, +sal_Bool LinkManager::InsertFileLink( sfx2::SvBaseLink& rLink, sal_uInt16 nFileType, const String& rFileNm, const String* pFilterNm, diff --git a/sfx2/source/appl/module.cxx b/sfx2/source/appl/module.cxx index e4472e4a52..3c6b5b1391 100755 --- a/sfx2/source/appl/module.cxx +++ b/sfx2/source/appl/module.cxx @@ -338,7 +338,7 @@ ImageList* SfxModule::GetImageList_Impl( sal_Bool bBig ) return pImpl->GetImageList( pResMgr, bBig ); } -SfxTabPage* SfxModule::CreateTabPage( sal_uInt16 Window*, const SfxItemSet& ) +SfxTabPage* SfxModule::CreateTabPage( sal_uInt16, Window*, const SfxItemSet& ) { return NULL; } diff --git a/sfx2/source/appl/newhelp.cxx b/sfx2/source/appl/newhelp.cxx index 02d56aac6e..68c44165ac 100755 --- a/sfx2/source/appl/newhelp.cxx +++ b/sfx2/source/appl/newhelp.cxx @@ -2640,8 +2640,8 @@ long SfxHelpTextWindow_Impl::PreNotify( NotifyEvent& rNEvt ) aMenu.InsertItem( TBI_COPY, String( SfxResId( STR_HELP_MENU_TEXT_COPY ) ), Image( SfxResId( IMG_HELP_TOOLBOX_COPY ) ) + ); aMenu.SetHelpId( TBI_COPY, ".uno:Copy" ); - ); aMenu.EnableItem( TBI_COPY, HasSelection() ); if ( bIsDebug ) @@ -3083,7 +3083,7 @@ IMPL_LINK( SfxHelpWindow_Impl, OpenHdl, SfxHelpIndexWindow_Impl* , EMPTYARG ) ::rtl::OUString sHelpURL; - BOOL bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); + bool bComplete = rtl::OUString(aEntry).toAsciiLowerCase().match(rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("vnd.sun.star.help")),0); if (bComplete) sHelpURL = ::rtl::OUString(aEntry); diff --git a/sfx2/source/appl/sfxhelp.cxx b/sfx2/source/appl/sfxhelp.cxx index 395ad6263a..1edce235f9 100755 --- a/sfx2/source/appl/sfxhelp.cxx +++ b/sfx2/source/appl/sfxhelp.cxx @@ -254,7 +254,6 @@ static Sequence< ::rtl::OUString > GetPropertyNames() SfxHelpOptions_Impl::SfxHelpOptions_Impl() : ConfigItem( ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Office.SFX/Help")) ) - , m_pIds( NULL ) { Sequence< ::rtl::OUString > aNames = GetPropertyNames(); Sequence< Any > aValues = GetProperties( aNames ); @@ -705,7 +704,7 @@ XubString SfxHelp::GetHelpText( const String& aCommandURL, const Window* pWindow static bool impl_hasHelpInstalled( const rtl::OUString &rLang = rtl::OUString() ) { String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); - AppendConfigToken_Impl( aHelpRootURL, sal_True ); + AppendConfigToken( aHelpRootURL, sal_True ); Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL ); return ( aFactories.getLength() != 0 ); @@ -752,7 +751,7 @@ static bool impl_showOnlineHelp( const String& rURL ) sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const String& rKeyword ) { String aHelpRootURL( DEFINE_CONST_OUSTRING("vnd.sun.star.help://") ); - AppendConfigToken( aHelpRootURL, sal_True, rLang ); + AppendConfigToken( aHelpRootURL, sal_True); Sequence< ::rtl::OUString > aFactories = SfxContentHelper::GetResultSet( aHelpRootURL ); /* rURL may be @@ -815,12 +814,12 @@ sal_Bool SfxHelp::Start_Impl( const String& rURL, const Window* pWindow, const S if ( !impl_hasHelpInstalled() ) { if ( impl_showOnlineHelp( aHelpURL ) ) - return TRUE; + return sal_True; else { NoHelpErrorBox aErrBox( const_cast< Window* >( pWindow ) ); aErrBox.Execute(); - return FALSE; + return sal_False; } } diff --git a/sfx2/source/control/bindings.cxx b/sfx2/source/control/bindings.cxx index bd9e574476..4924f0184f 100755 --- a/sfx2/source/control/bindings.cxx +++ b/sfx2/source/control/bindings.cxx @@ -98,7 +98,7 @@ static sal_uInt16 nTimeOut = 300; static sal_uInt32 nCache1 = 0; static sal_uInt32 nCache2 = 0; -typedef boost::unordered_map< USHORT, bool > InvalidateSlotMap; +typedef boost::unordered_map< sal_uInt16, bool > InvalidateSlotMap; //==================================================================== diff --git a/sfx2/source/control/unoctitm.cxx b/sfx2/source/control/unoctitm.cxx index bc2d04a12a..83873237f5 100755 --- a/sfx2/source/control/unoctitm.cxx +++ b/sfx2/source/control/unoctitm.cxx @@ -770,7 +770,7 @@ void SAL_CALL SfxDispatchController_Impl::dispatch( const ::com::sun::star::util bSuccess = aReq.IsDone() || pItem != NULL; if ( bVBARequest ) { - SFX_REQUEST_ARG( aReq, pDlgRet, SfxBoolItem, SID_DIALOG_RETURN, FALSE ); + SFX_REQUEST_ARG( aReq, pDlgRet, SfxBoolItem, SID_DIALOG_RETURN, sal_False ); if ( pDlgRet ) { bSuccess = pDlgRet->GetValue(); diff --git a/sfx2/source/dialog/passwd.cxx b/sfx2/source/dialog/passwd.cxx index 9da5724085..6d6c97037a 100755 --- a/sfx2/source/dialog/passwd.cxx +++ b/sfx2/source/dialog/passwd.cxx @@ -254,7 +254,7 @@ short SfxPasswordDialog::Execute() Size a6Size = LogicToPixel( Size( 6, 6 ), MAP_APPFONT ); long nMinHeight = maHelpBtn.GetPosPixel().Y() + maHelpBtn.GetSizePixel().Height() + a6Size.Height(); - USHORT nRowHided = 1; + sal_uInt16 nRowHided = 1; if ( SHOWEXTRAS_NONE == mnExtras ) { diff --git a/sfx2/source/dialog/splitwin.cxx b/sfx2/source/dialog/splitwin.cxx index a55b60d6c6..4473fe4b52 100755 --- a/sfx2/source/dialog/splitwin.cxx +++ b/sfx2/source/dialog/splitwin.cxx @@ -606,7 +606,7 @@ void SfxSplitWindow::InsertWindow( SfxDockingWindow* pDockWin, const Size& rSize // Das Fenster mu\s vor dem ersten Fenster eingef"ugt werden, das die // gleiche oder eine gr"o\sere Position hat als pDockWin. sal_uInt16 nCount = pDockArr->Count(); - USHORT nLastWindowIdx(0); + sal_uInt16 nLastWindowIdx(0); // Wenn gar kein Fenster gefunden wird, wird als erstes eingef"ugt sal_uInt16 nInsertPos = 0; diff --git a/sfx2/source/dialog/tabdlg.cxx b/sfx2/source/dialog/tabdlg.cxx index 203c1f83fc..084c8aa927 100755 --- a/sfx2/source/dialog/tabdlg.cxx +++ b/sfx2/source/dialog/tabdlg.cxx @@ -388,7 +388,7 @@ const SfxPoolItem* SfxTabPage::GetItem( const SfxItemSet& rSet, sal_uInt16 nSlot const SfxItemPool* pPool = rSet.GetPool(); sal_uInt16 nWh = pPool->GetWhich( nSlot, bDeep ); const SfxPoolItem* pItem = 0; - rSet.GetItemState( nWh, TRUE, &pItem ); + rSet.GetItemState( nWh, sal_True, &pItem ); if ( !pItem && nWh != nSlot ) pItem = &pPool->GetDefaultItem( nWh ); diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index b33b20b4b1..3ee4c70b07 100755 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -185,7 +185,7 @@ namespace sfx2 aCommandName.append( sImageURL.copy( nCommandImagePrefixLen ) ); const ::rtl::OUString sCommandName( aCommandName.makeStringAndClear() ); - const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, FALSE ) ); + const Image aPanelImage( GetImage( i_rDocFrame, sCommandName, sal_False ) ); return aPanelImage.GetXGraphic(); } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index 80769329ff..66aa0aaee9 100755 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -692,9 +692,10 @@ StyleTreeArr_Impl &MakeTree_Impl(StyleTreeArr_Impl &rArr) if(pCmp->aName == pEntry->aParent) { // initial sortiert einfuegen - sal_uInt16 ii; + sal_uInt16 nPos; for( nPos = 0 ; nPos < pCmp->Count() && - aSorter.compare((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ; nPos++); + aSorter.compare((*pCmp->pChilds)[nPos]->aName, pEntry->aName) < 0 ; nPos++) + {}; pCmp->Put(pEntry,nPos); break; } @@ -865,8 +866,8 @@ sal_uInt16 SfxCommonTemplateDialog_Impl::InfoOffsetToStyleNr(sal_uInt16 nId) void SfxCommonTemplateDialog_Impl::ReadResource() { // globale Benutzer-Resource auslesen - sal_uInt16 i; - for(i = 0; i < MAX_FAMILIES; ++i) + + for(sal_uInt16 i = 0; i < MAX_FAMILIES; ++i) pFamilyState[i] = 0; SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); @@ -895,7 +896,7 @@ void SfxCommonTemplateDialog_Impl::ReadResource() for(i = 0; i < nCount; ++i) { sal_uInt16 nSlot = 0; - switch( (USHORT)pStyleFamilies->at( i )->GetFamily() ) + switch( (sal_uInt16)pStyleFamilies->at( i )->GetFamily() ) { case SFX_STYLE_FAMILY_CHAR: nSlot = SID_STYLE_FAMILY1; break; case SFX_STYLE_FAMILY_PARA: nSlot = SID_STYLE_FAMILY2; break; @@ -1332,7 +1333,8 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) //Bubblesort sal_uInt16 nPos; for( nPos = aStrings.Count() ; nPos && - aSorter.compare(*(aStrings[nPos-1]), pStyle->GetName()) > 0 ; nPos--); + aSorter.compare(*(aStrings[nPos-1]), pStyle->GetName()) > 0 ; nPos--) + {}; aStrings.Insert( new String( pStyle->GetName() ), nPos ); pStyle = pStyleSheetPool->Next(); } @@ -1356,7 +1358,7 @@ void SfxCommonTemplateDialog_Impl::UpdateStyles_Impl(sal_uInt16 nFlags) nPos = 0; for(nPos = 0 ; nPos < nCount ; ++nPos ) { - aFmtLb.InsertEntry( *aStrings.GetObject( nPos ), 0, FALSE, nPos); + aFmtLb.InsertEntry( *aStrings.GetObject( nPos ), 0, sal_False, nPos); } aFmtLb.SetUpdateMode(true); } @@ -2288,7 +2290,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( pDlgWindow->FreeResource(); SfxViewFrame* pViewFrame = pBindings->GetDispatcher_Impl()->GetFrame(); pCurObjShell = pViewFrame->GetObjectShell(); - USHORT nSavedFilter = static_cast< USHORT >( LoadFactoryStyleFilter( pCurObjShell ) ); + sal_uInt16 nSavedFilter = static_cast< sal_uInt16 >( LoadFactoryStyleFilter( pCurObjShell ) ); Initialize(); m_aActionTbL.SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, ToolBoxLSelect)); @@ -2302,7 +2304,7 @@ SfxTemplateDialog_Impl::SfxTemplateDialog_Impl( m_aActionTbL.SetHelpId( HID_TEMPLDLG_TOOLBOX_LEFT ); if( nSavedFilter == HIERARCHICAL_FILTER_INDEX ) { - bHierarchical = FALSE; // Force content refresh + bHierarchical = sal_False; // Force content refresh aFilterLb.SelectEntry(String(SfxResId(STR_STYLE_FILTER_HIERARCHICAL))); FilterSelectHdl(&aFilterLb); } diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index fd45e858bf..aa983a8af3 100755 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -614,7 +614,7 @@ sal_Bool SfxObjectShell::DoLoad( SfxMedium *pMed ) SetError( nError, ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( OSL_LOG_PREFIX ) ) ); if (pMedium->GetFilter()->GetFilterFlags() & SFX_FILTER_STARTPRESENTATION) - pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, TRUE) ); + pSet->Put( SfxBoolItem( SID_DOC_STARTPRESENTATION, sal_True) ); } EnableSetModified( sal_False ); diff --git a/sfx2/source/doc/sfxbasemodel.cxx b/sfx2/source/doc/sfxbasemodel.cxx index f460ec946f..24094e2f94 100755 --- a/sfx2/source/doc/sfxbasemodel.cxx +++ b/sfx2/source/doc/sfxbasemodel.cxx @@ -3674,7 +3674,7 @@ void SAL_CALL SfxBaseModel::switchToStorage( const uno::Reference< XSTORAGE >& x xUICfgMgrStorage->setStorage( xStorage ); } } - m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = FALSE; + m_pData->m_pObjectShell->Get_Impl()->bOwnsStorage = sal_False; } uno::Reference< XSTORAGE > SAL_CALL SfxBaseModel::getDocumentStorage() diff --git a/sfx2/source/notify/eventsupplier.cxx b/sfx2/source/notify/eventsupplier.cxx index 8d53079c1f..23f5b72ab9 100755 --- a/sfx2/source/notify/eventsupplier.cxx +++ b/sfx2/source/notify/eventsupplier.cxx @@ -101,7 +101,7 @@ void SAL_CALL SfxEvents_Impl::replaceByName( const OUSTRING & aName, const ANY & ::rtl::OUString sType; if ( ( aNormalizedDescriptor.size() == 1 ) - && ( aProperties[0].Name.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM(PROP_EVENT_TYPE)) ) + && ( aNormalizedDescriptor.has( PROP_EVENT_TYPE) == 0 ) && ( aNormalizedDescriptor.get( PROP_EVENT_TYPE ) >>= sType ) && ( sType.getLength() == 0 ) ) diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 263358ca0a..09e624c27c 100755 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -582,7 +582,7 @@ SfxPoolItem* SfxFrameItem::Clone( SfxItemPool *) const return pNew; } -bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const +bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 ) const { if ( wFrame ) { @@ -593,7 +593,7 @@ bool SfxFrameItem::QueryValue( com::sun::star::uno::Any& rVal, BYTE ) const return sal_False; } -bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, BYTE ) +bool SfxFrameItem::PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 ) { Reference < XFrame > xFrame; if ( (rVal >>= xFrame) && xFrame.is() ) diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 890e13ffbb..10efcdc473 100755 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -792,7 +792,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) } if ( nId == SID_SETUPPRINTER ) { - rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, TRUE ) ); + rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, sal_True ) ); } // take the changes made in the dialog @@ -812,7 +812,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) rReq.SetReturnValue(SfxBoolItem(0,sal_False)); if ( nId == SID_SETUPPRINTER ) { - rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, FALSE ) ); + rReq.AppendItem( SfxBoolItem( SID_DIALOG_RETURN, sal_False ) ); } } } diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index 81d9e7dc10..5dd8b05f53 100755 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -438,7 +438,7 @@ enum ETypeFamily SAL_DLLPRIVATE void SfxViewShell::IPClientGone_Impl( SfxInPlaceClient *pIPClient ) { - SfxInPlaceClientList* pClientList = GetIPClientList_Impl(TRUE); + SfxInPlaceClientList* pClientList = GetIPClientList_Impl(sal_True); for( SfxInPlaceClientList::iterator it = pClientList->begin(); it < pClientList->end(); ++it ) { |