diff options
| author | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
|---|---|---|
| committer | Jan Holesovsky <kendy@suse.cz> | 2011-03-18 15:59:29 +0100 |
| commit | 5a267de99f19bdab857429a81ffcfbb4d06f5bbd (patch) | |
| tree | 1425ce2404af0e2542e1be0dca3821600f5b82a8 /sw/source/filter/xml/xmlimp.cxx | |
| parent | 3bb681a344beb911d92b48469afbd0ccc51db1dd (diff) | |
| parent | 99ebfb7335c333a77910b1059b7b41fb34ff0899 (diff) | |
Merge remote-tracking branch 'origin/integration/dev300_m101'
Conflicts:
starmath/source/symbol.cxx
sw/source/core/doc/docnew.cxx
sw/source/core/doc/docnum.cxx
sw/source/core/draw/dview.cxx
sw/source/core/fields/docufld.cxx
sw/source/core/layout/calcmove.cxx
sw/source/filter/html/swhtml.cxx
sw/source/filter/rtf/rtftbl.cxx
sw/source/ui/config/modcfg.cxx
sw/source/ui/dialog/docstdlg.cxx
sw/source/ui/dialog/docstdlg.src
sw/source/ui/fldui/flddb.cxx
sw/source/ui/fldui/flddinf.cxx
sw/source/ui/fldui/flddok.cxx
sw/source/ui/fldui/fldfunc.cxx
sw/source/ui/fldui/fldmgr.cxx
sw/source/ui/fldui/fldpage.hxx
sw/source/ui/fldui/fldref.cxx
sw/source/ui/fldui/fldvar.cxx
sw/source/ui/fldui/fldvar.hxx
sw/source/ui/fldui/fldwrap.cxx
sw/source/ui/fldui/xfldui.cxx
sw/source/ui/inc/docstdlg.hxx
sw/source/ui/shells/langhelper.cxx
sw/source/ui/shells/txtattr.cxx
sw/source/ui/shells/txtcrsr.cxx
sw/source/ui/table/tabledlg.cxx
Diffstat (limited to 'sw/source/filter/xml/xmlimp.cxx')
| -rw-r--r-- | sw/source/filter/xml/xmlimp.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx index 00deda59fa55..b0904f059e0b 100644 --- a/sw/source/filter/xml/xmlimp.cxx +++ b/sw/source/filter/xml/xmlimp.cxx @@ -869,7 +869,7 @@ void SwXMLImport::endDocument( void ) if( !pPos->nContent.GetIndex() ) { SwTxtNode* pCurrNd; - ULONG nNodeIdx = pPos->nNode.GetIndex(); + sal_uLong nNodeIdx = pPos->nNode.GetIndex(); pDoc = pPaM->GetDoc(); DBG_ASSERT( pPos->nNode.GetNode().IsCntntNode(), @@ -944,9 +944,9 @@ void SwXMLImport::endDocument( void ) // Notify math objects. If we are in the package filter this will // be done by the filter object itself if( IsInsertMode() ) - pDoc->PrtOLENotify( FALSE ); + pDoc->PrtOLENotify( sal_False ); else if ( pDoc->IsOLEPrtNotifyPending() ) - pDoc->PrtOLENotify( TRUE ); + pDoc->PrtOLENotify( sal_True ); } // SJ: #i49801# -> now permitting repaints @@ -1194,7 +1194,7 @@ void SwXMLImport::SetConfigurationSettings(const Sequence < PropertyValue > & aC const PropertyValue* pValues = aConfigProps.getConstArray(); SvtSaveOptions aSaveOpt; - BOOL bIsUserSetting = aSaveOpt.IsLoadUserSettings(), + sal_Bool bIsUserSetting = aSaveOpt.IsLoadUserSettings(), bSet = bIsUserSetting; // for some properties we don't want to use the application |