summaryrefslogtreecommitdiff
path: root/sw/source/ui/uno
diff options
context:
space:
mode:
Diffstat (limited to 'sw/source/ui/uno')
-rw-r--r--sw/source/ui/uno/SwXDocumentSettings.cxx4
-rw-r--r--sw/source/ui/uno/swdet2.cxx6
-rw-r--r--sw/source/ui/uno/swdetect.cxx18
-rw-r--r--sw/source/ui/uno/swdetect.hxx4
-rw-r--r--sw/source/ui/uno/unoatxt.cxx26
-rw-r--r--sw/source/ui/uno/unomailmerge.cxx38
-rw-r--r--sw/source/ui/uno/unomod.cxx30
-rw-r--r--sw/source/ui/uno/unotxdoc.cxx122
-rw-r--r--sw/source/ui/uno/unotxvw.cxx28
9 files changed, 138 insertions, 138 deletions
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 9b847644234f..57eeb265e109 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -753,14 +753,14 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf
case HANDLE_FIELD_AUTO_UPDATE:
{
SwFldUpdateFlags nFlags = mpDoc->getFieldUpdateFlags(true);
- BOOL bFieldUpd = (nFlags == AUTOUPD_FIELD_ONLY || nFlags == AUTOUPD_FIELD_AND_CHARTS );
+ sal_Bool bFieldUpd = (nFlags == AUTOUPD_FIELD_ONLY || nFlags == AUTOUPD_FIELD_AND_CHARTS );
rValue.setValue(&bFieldUpd, ::getBooleanCppuType());
}
break;
case HANDLE_CHART_AUTO_UPDATE:
{
SwFldUpdateFlags nFlags = mpDoc->getFieldUpdateFlags(true);
- BOOL bChartUpd = nFlags == AUTOUPD_FIELD_AND_CHARTS;
+ sal_Bool bChartUpd = nFlags == AUTOUPD_FIELD_AND_CHARTS;
rValue.setValue(&bChartUpd, ::getBooleanCppuType());
}
break;
diff --git a/sw/source/ui/uno/swdet2.cxx b/sw/source/ui/uno/swdet2.cxx
index cf27027148a7..2adba8f5c841 100644
--- a/sw/source/ui/uno/swdet2.cxx
+++ b/sw/source/ui/uno/swdet2.cxx
@@ -57,16 +57,16 @@ bool IsDocShellRegistered()
//-------------------------------------------------------------------------
-ULONG SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter )
+sal_uLong SwFilterDetect::DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter )
{
- ULONG nRet = ERRCODE_NONE;
+ sal_uLong nRet = ERRCODE_NONE;
if( *ppFilter )
{
// verify the given filter
String aPrefFlt = (*ppFilter)->GetUserData();
// detection for TextFilter needs an additional checking
- BOOL bDetected = SwIoSystem::IsFileFilter( rMedium, aPrefFlt );
+ sal_Bool bDetected = SwIoSystem::IsFileFilter( rMedium, aPrefFlt );
return bDetected ? nRet : ERRCODE_ABORT;
}
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index aa54b4707935..133935a5330c 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -180,7 +180,7 @@ SwFilterDetect::~SwFilterDetect()
SfxApplication* pApp = SFX_APP();
SfxAllItemSet *pSet = new SfxAllItemSet( pApp->GetPool() );
TransformParameters( SID_OPENDOC, lDescriptor, *pSet );
- SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, FALSE );
+ SFX_ITEMSET_ARG( pSet, pItem, SfxBoolItem, SID_DOC_READONLY, sal_False );
bWasReadOnly = pItem && pItem->GetValue();
@@ -200,8 +200,8 @@ SwFilterDetect::~SwFilterDetect()
else
{
// ctor of SfxMedium uses owner transition of ItemSet
- SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, FALSE, NULL, pSet );
- aMedium.UseInteractionHandler( TRUE );
+ SfxMedium aMedium( aURL, bWasReadOnly ? STREAM_STD_READ : STREAM_STD_READWRITE, sal_False, NULL, pSet );
+ aMedium.UseInteractionHandler( sal_True );
if ( aMedium.GetErrorCode() == ERRCODE_NONE )
{
// remember input stream and content and put them into the descriptor later
@@ -210,7 +210,7 @@ SwFilterDetect::~SwFilterDetect()
xContent = aMedium.GetContent();
bReadOnly = aMedium.IsReadOnly();
- BOOL bIsStorage = aMedium.IsStorage();
+ sal_Bool bIsStorage = aMedium.IsStorage();
if ( bIsStorage )
{
uno::Reference< embed::XStorage > xStorage = aMedium.GetStorage( sal_False );
@@ -256,7 +256,7 @@ SwFilterDetect::~SwFilterDetect()
aTypeName = pPreFilter->GetTypeName();
}
- aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pPreFilter ? pPreFilter->IsOwnTemplateFormat() : FALSE, &aFilterName );
+ aTypeName = SfxFilter::GetTypeFromStorage( xStorage, pPreFilter ? pPreFilter->IsOwnTemplateFormat() : sal_False, &aFilterName );
}
catch( lang::WrappedTargetException& aWrap )
{
@@ -329,9 +329,9 @@ SwFilterDetect::~SwFilterDetect()
else
pFilter = SfxFilterMatcher().GetFilter4EA( aTypeName );
- BOOL bTestWriter = !pFilter || pFilter->GetServiceName().EqualsAscii("com.sun.star.text.TextDocument") ||
+ sal_Bool bTestWriter = !pFilter || pFilter->GetServiceName().EqualsAscii("com.sun.star.text.TextDocument") ||
pFilter->GetServiceName().EqualsAscii("com.sun.star.text.WebDocument");
- BOOL bTestGlobal = !pFilter || pFilter->GetServiceName().EqualsAscii("com.sun.star.text.GlobalDocument");
+ sal_Bool bTestGlobal = !pFilter || pFilter->GetServiceName().EqualsAscii("com.sun.star.text.GlobalDocument");
const SfxFilter* pOrigFilter = NULL;
if ( !bTestWriter && !bTestGlobal && pFilter )
@@ -341,10 +341,10 @@ SwFilterDetect::~SwFilterDetect()
// example: HTML filter for Calc
pOrigFilter = pFilter;
pFilter = SfxFilterMatcher().GetFilter4EA( pFilter->GetTypeName() );
- bTestWriter = TRUE;
+ bTestWriter = sal_True;
}
- ULONG nErr = ERRCODE_NONE;
+ sal_uLong nErr = ERRCODE_NONE;
if ( pFilter || bTestWriter )
nErr = DetectFilter( aMedium, &pFilter );
if ( nErr != ERRCODE_NONE )
diff --git a/sw/source/ui/uno/swdetect.hxx b/sw/source/ui/uno/swdetect.hxx
index d3c65df67ce5..507d6eb0c386 100644
--- a/sw/source/ui/uno/swdetect.hxx
+++ b/sw/source/ui/uno/swdetect.hxx
@@ -78,8 +78,8 @@ class SfxFilter;
class SwFilterDetect : public ::cppu::WeakImplHelper2< ::com::sun::star::document::XExtendedFilterDetection, ::com::sun::star::lang::XServiceInfo >
{
- static ULONG DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
- static ULONG GlobDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
+ static sal_uLong DetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
+ static sal_uLong GlobDetectFilter( SfxMedium& rMedium, const SfxFilter** ppFilter );
public:
SwFilterDetect( const REFERENCE < ::com::sun::star::lang::XMultiServiceFactory >& xFactory );
virtual ~SwFilterDetect();
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 4578ef27c2ea..f763792a3ef9 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -134,7 +134,7 @@ uno::Any SwXAutoTextContainer::getByIndex(sal_Int32 nIndex)
uno::Any aRet;
sal_uInt16 nCount = pGlossaries->GetGroupCnt();
if ( 0 <= nIndex && nIndex < nCount )
- aRet = getByName(pGlossaries->GetGroupName( static_cast< USHORT >(nIndex) ));
+ aRet = getByName(pGlossaries->GetGroupName( static_cast< sal_uInt16 >(nIndex) ));
else
throw lang::IndexOutOfBoundsException();
return aRet;
@@ -165,8 +165,8 @@ uno::Any SwXAutoTextContainer::getByName(const OUString& GroupName)
uno::Reference< text::XAutoTextGroup > xGroup;
if ( pGlossaries && hasByName( GroupName ) ) // group name already known?
- // TRUE = create group if not already available
- xGroup = pGlossaries->GetAutoTextGroup( GroupName, TRUE );
+ // sal_True = create group if not already available
+ xGroup = pGlossaries->GetAutoTextGroup( GroupName, sal_True );
if ( !xGroup.is() )
throw container::NoSuchElementException();
@@ -274,15 +274,15 @@ OUString SwXAutoTextContainer::getImplementationName(void) throw( uno::RuntimeEx
/* -----------------------------06.04.00 11:11--------------------------------
---------------------------------------------------------------------------*/
-BOOL SwXAutoTextContainer::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
+sal_Bool SwXAutoTextContainer::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
const uno::Sequence< OUString > aNames = SwXAutoTextContainer_getSupportedServiceNames();
for(sal_Int32 nService = 0; nService < aNames.getLength(); nService++)
{
if(aNames.getConstArray()[nService] == rServiceName)
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
/* -----------------------------06.04.00 11:11--------------------------------
@@ -837,7 +837,7 @@ OUString SwXAutoTextGroup::getImplementationName(void) throw( uno::RuntimeExcept
/* -----------------------------06.04.00 11:11--------------------------------
---------------------------------------------------------------------------*/
-BOOL SwXAutoTextGroup::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
+sal_Bool SwXAutoTextGroup::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
return C2U("com.sun.star.text.AutoTextGroup") == rServiceName;
}
@@ -961,7 +961,7 @@ void SwXAutoTextEntry::GetBodyText ()
{
::vos::OGuard aGuard(Application::GetSolarMutex());
- xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, FALSE );
+ xDocSh = pGlossaries->EditGroupDoc ( sGroupName, sEntryName, sal_False );
DBG_ASSERT( xDocSh.Is(), "SwXAutoTextEntry::GetBodyText: unexpected: no doc returned by EditGroupDoc!" );
// start listening at the document
@@ -1159,7 +1159,7 @@ OUString SwXAutoTextEntry::getImplementationName(void) throw( uno::RuntimeExcept
/* -----------------------------06.04.00 11:11--------------------------------
---------------------------------------------------------------------------*/
-BOOL SwXAutoTextEntry::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
+sal_Bool SwXAutoTextEntry::supportsService(const OUString& rServiceName) throw( uno::RuntimeException )
{
return C2U("com.sun.star.text.AutoTextEntry") == rServiceName;
}
@@ -1220,7 +1220,7 @@ OUString SwAutoTextEventDescriptor::getImplementationName()
---------------------------------------------------------------------------*/
void SwAutoTextEventDescriptor::replaceByName(
- const USHORT nEvent,
+ const sal_uInt16 nEvent,
const SvxMacro& rMacro)
throw(
lang::IllegalArgumentException,
@@ -1242,7 +1242,7 @@ void SwAutoTextEventDescriptor::replaceByName(
if( pBlocks && !pBlocks->GetError())
{
- USHORT nIndex = pBlocks->GetIndex( rAutoTextEntry.GetEntryName() );
+ sal_uInt16 nIndex = pBlocks->GetIndex( rAutoTextEntry.GetEntryName() );
if( nIndex != USHRT_MAX )
{
SvxMacroTableDtor aMacroTable;
@@ -1263,7 +1263,7 @@ void SwAutoTextEventDescriptor::replaceByName(
---------------------------------------------------------------------------*/
void SwAutoTextEventDescriptor::getByName(
SvxMacro& rMacro,
- const USHORT nEvent )
+ const sal_uInt16 nEvent )
throw(
container::NoSuchElementException,
lang::WrappedTargetException,
@@ -1287,7 +1287,7 @@ void SwAutoTextEventDescriptor::getByName(
if ( pBlocks && !pBlocks->GetError())
{
- USHORT nIndex = pBlocks->GetIndex( rAutoTextEntry.GetEntryName() );
+ sal_uInt16 nIndex = pBlocks->GetIndex( rAutoTextEntry.GetEntryName() );
if( nIndex != USHRT_MAX )
{
SvxMacroTableDtor aMacroTable;
diff --git a/sw/source/ui/uno/unomailmerge.cxx b/sw/source/ui/uno/unomailmerge.cxx
index 06b9e62b4a94..0051d98324a7 100644
--- a/sw/source/ui/uno/unomailmerge.cxx
+++ b/sw/source/ui/uno/unomailmerge.cxx
@@ -154,11 +154,11 @@ static CloseResult CloseModelAndDocSh(
////////////////////////////////////////////////////////////
-static BOOL LoadFromURL_impl(
+static sal_Bool LoadFromURL_impl(
Reference< frame::XModel > &rxModel,
SfxObjectShellRef &rxDocSh,
const String &rURL,
- BOOL bClose )
+ sal_Bool bClose )
throw (RuntimeException)
{
// try to open the document readonly and hidden
@@ -176,7 +176,7 @@ static BOOL LoadFromURL_impl(
}
catch( Exception & )
{
- return FALSE;
+ return sal_False;
}
// try to get the DocShell
@@ -189,7 +189,7 @@ static BOOL LoadFromURL_impl(
pTmpDocShell = pTextDoc ? pTextDoc->GetDocShell() : 0;
}
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
if (xTmpModel.is() && pTmpDocShell) // everything available?
{
if (bClose)
@@ -197,7 +197,7 @@ static BOOL LoadFromURL_impl(
// set new stuff
rxModel = xTmpModel;
rxDocSh = pTmpDocShell;
- bRes = TRUE;
+ bRes = sal_True;
}
else
{
@@ -373,15 +373,15 @@ namespace
////////////////////////////////////////////////////////////
-static BOOL DeleteTmpFile_Impl(
+static sal_Bool DeleteTmpFile_Impl(
Reference< frame::XModel > &rxModel,
SfxObjectShellRef &rxDocSh,
const String &rTmpFileURL )
{
- BOOL bRes = FALSE;
+ sal_Bool bRes = sal_False;
if (rTmpFileURL.Len())
{
- BOOL bDelete = TRUE;
+ sal_Bool bDelete = sal_True;
if ( eVetoed == CloseModelAndDocSh( rxModel, rxDocSh ) )
{
// somebody vetoed the closing, and took the ownership of the document
@@ -389,7 +389,7 @@ static BOOL DeleteTmpFile_Impl(
Reference< XEventListener > xEnsureDelete( new DelayedFileDeletion( rxModel, rTmpFileURL ) );
// note: as soon as #106931# is fixed, the whole DelayedFileDeletion is to be superseeded by
// a better solution
- bDelete = FALSE;
+ bDelete = sal_False;
}
rxModel = 0;
@@ -404,7 +404,7 @@ static BOOL DeleteTmpFile_Impl(
}
}
else
- bRes = TRUE; // file will be deleted delayed
+ bRes = sal_True; // file will be deleted delayed
}
return bRes;
}
@@ -494,7 +494,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
const OUString &rName = pArguments[i].Name;
const Any &rValue = pArguments[i].Value;
- BOOL bOK = TRUE;
+ sal_Bool bOK = sal_True;
if (rName.equalsAscii( GetPropName( UNO_NAME_SELECTION ) ))
bOK = rValue >>= aCurSelection;
else if (rName.equalsAscii( GetPropName( UNO_NAME_RESULT_SET ) ))
@@ -513,7 +513,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
{
bOK = rValue >>= aCurDocumentURL;
if (aCurDocumentURL.getLength()
- && !LoadFromURL_impl( xCurModel, xCurDocSh, aCurDocumentURL, FALSE ))
+ && !LoadFromURL_impl( xCurModel, xCurDocSh, aCurDocumentURL, sal_False ))
throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to create document from URL: " ) ) + aCurDocumentURL, static_cast < cppu::OWeakObject * > ( this ) );
}
else if (rName.equalsAscii( GetPropName( UNO_NAME_OUTPUT_URL ) ))
@@ -624,7 +624,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
aCurSelection = aTranslated;
}
- SfxViewFrame* pFrame = SfxViewFrame::GetFirst( xCurDocSh, FALSE);
+ SfxViewFrame* pFrame = SfxViewFrame::GetFirst( xCurDocSh, sal_False);
SwView *pView = PTR_CAST( SwView, pFrame->GetViewShell() );
if (!pView)
throw RuntimeException();
@@ -690,7 +690,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
// aDescriptor[ svx::daColumnObject ] not used
aDescriptor[ svx::daSelection ] <<= aCurSelection;
- USHORT nMergeType;
+ sal_uInt16 nMergeType;
switch (nCurOutputType)
{
case MailMergeType::PRINTER : nMergeType = DBMGR_MERGE_MAILMERGE; break;
@@ -711,7 +711,7 @@ uno::Any SAL_CALL SwXMailMerge::execute(
uno::Reference< mail::XMailService > xInService;
if (MailMergeType::PRINTER == nCurOutputType)
{
- SwPrintData aPrtData = *SW_MOD()->GetPrtOptions( FALSE );
+ SwPrintData aPrtData = *SW_MOD()->GetPrtOptions( sal_False );
IDocumentDeviceAccess* pIDDA = rSh.getIDocumentDeviceAccess();
SwPrintData* pShellPrintData = pIDDA->getPrintData();
if (pShellPrintData)
@@ -823,13 +823,13 @@ uno::Any SAL_CALL SwXMailMerge::execute(
if ( !bStoredAsTemporary )
throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to save temporary file." ) ), static_cast < cppu::OWeakObject * > ( this ) );
- pMgr->SetMergeSilent( TRUE ); // suppress dialogs, message boxes, etc.
+ pMgr->SetMergeSilent( sal_True ); // suppress dialogs, message boxes, etc.
const SwXMailMerge *pOldSrc = pMgr->GetMailMergeEvtSrc();
DBG_ASSERT( !pOldSrc || pOldSrc == this, "Ooops... different event source already set." );
pMgr->SetMailMergeEvtSrc( this ); // launch events for listeners
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE), xCurDocSh));
- BOOL bSucc = pMgr->MergeNew( aMergeDesc );
+ sal_Bool bSucc = pMgr->MergeNew( aMergeDesc );
SFX_APP()->NotifyEvent(SfxEventHint(SW_EVENT_MAIL_MERGE_END, SwDocShell::GetEventName(STR_SW_EVENT_MAIL_MERGE_END), xCurDocSh));
pMgr->SetMailMergeEvtSrc( pOldSrc );
@@ -965,7 +965,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
OUString aText;
bOK = rValue >>= aText;
if (aText.getLength()
- && !LoadFromURL_impl( xModel, xDocSh, aText, TRUE ))
+ && !LoadFromURL_impl( xModel, xDocSh, aText, sal_True ))
throw RuntimeException( OUString ( RTL_CONSTASCII_USTRINGPARAM ( "Failed to create document from URL: " ) ) + aText, static_cast < cppu::OWeakObject * > ( this ) );
aDocumentURL = aText;
}
@@ -1038,7 +1038,7 @@ void SAL_CALL SwXMailMerge::setPropertyValue(
if (bChanged)
{
PropertyChangeEvent aChgEvt( (XPropertySet *) this, rPropertyName,
- FALSE, pCur->nWID, aOld, rValue );
+ sal_False, pCur->nWID, aOld, rValue );
launchEvent( aChgEvt );
}
}
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index 75b76b6de887..31e28fccb5d6 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -292,9 +292,9 @@ sal_Bool SwXModule::supportsService(const OUString& rServiceName) throw( Runtime
for(sal_Int32 nService = 0; nService < aNames.getLength(); nService++)
{
if(aNames.getConstArray()[nService] == rServiceName)
- return TRUE;
+ return sal_True;
}
- return FALSE;
+ return sal_False;
}
/* -----------------------------06.04.00 10:59--------------------------------
@@ -685,10 +685,10 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_DRAWINGS : mpViewOption->SetDraw(bVal); break;
case HANDLE_VIEWSET_FIELD_COMMANDS : mpViewOption->SetFldName(bVal); break;
case HANDLE_VIEWSET_ANNOTATIONS : mpViewOption->SetPostIts(bVal); break;
- case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
+ case HANDLE_VIEWSET_INDEX_MARK_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, sal_True); break;
case HANDLE_VIEWSET_NONPRINTING_CHARACTERS: mpViewOption->SetViewMetaChars( bVal ); break;
- case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
- case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, TRUE); break;
+ case HANDLE_VIEWSET_FOOTNOTE_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, sal_True); break;
+ case HANDLE_VIEWSET_TEXT_FIELD_BACKGROUND : mpViewOption->SetAppearanceFlag(VIEWOPT_FIELD_SHADINGS, bVal, sal_True); break;
case HANDLE_VIEWSET_PARA_BREAKS : mpViewOption->SetParagraph(bVal); break;
case HANDLE_VIEWSET_SOFT_HYPHENS : mpViewOption->SetSoftHyph(bVal); break;
case HANDLE_VIEWSET_SPACES : mpViewOption->SetBlank(bVal); break;
@@ -698,7 +698,7 @@ void SwXViewSettings::_setSingleValue( const comphelper::PropertyInfo & rInfo, c
case HANDLE_VIEWSET_HIDDEN_TEXT : mpViewOption->SetShowHiddenField(bVal); break;
case HANDLE_VIEWSET_HIDDEN_CHARACTERS : mpViewOption->SetShowHiddenChar(bVal); break;
case HANDLE_VIEWSET_HIDDEN_PARAGRAPHS : mpViewOption->SetShowHiddenPara(bVal); break;
- case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, TRUE); break;
+ case HANDLE_VIEWSET_TABLE_BOUNDARIES : mpViewOption->SetAppearanceFlag(VIEWOPT_TABLE_BOUNDARIES, bVal, sal_True); break;
case HANDLE_VIEWSET_TEXT_BOUNDARIES : mpViewOption->SetDocBoundaries(bVal); break;
case HANDLE_VIEWSET_SMOOTH_SCROLLING : mpViewOption->SetSmoothScroll(bVal); break;
case HANDLE_VIEWSET_SOLID_MARK_HANDLES : mpViewOption->SetSolidMarkHdl(bVal); break;
@@ -890,13 +890,13 @@ void SwXViewSettings::_preGetValues ()
void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, uno::Any & rValue )
throw(UnknownPropertyException, WrappedTargetException )
{
- sal_Bool bBool = TRUE;
+ sal_Bool bBool = sal_True;
sal_Bool bBoolVal;
switch( rInfo.mnHandle )
{
case HANDLE_VIEWSET_SHOW_RULER: bBoolVal = mpConstViewOption->IsViewAnyRuler(); break;
- case HANDLE_VIEWSET_HRULER : bBoolVal = mpConstViewOption->IsViewHRuler(TRUE); break;
- case HANDLE_VIEWSET_VRULER : bBoolVal = mpConstViewOption->IsViewVRuler(TRUE);break;
+ case HANDLE_VIEWSET_HRULER : bBoolVal = mpConstViewOption->IsViewHRuler(sal_True); break;
+ case HANDLE_VIEWSET_VRULER : bBoolVal = mpConstViewOption->IsViewVRuler(sal_True);break;
case HANDLE_VIEWSET_VRULER_RIGHT : bBoolVal = mpConstViewOption->IsVRulerRight();break;
case HANDLE_VIEWSET_HSCROLL: bBoolVal = mpConstViewOption->IsViewHScrollBar();break;
case HANDLE_VIEWSET_VSCROLL: bBoolVal = mpConstViewOption->IsViewVScrollBar();break;
@@ -926,28 +926,28 @@ void SwXViewSettings::_getSingleValue( const comphelper::PropertyInfo & rInfo, u
case HANDLE_VIEWSET_IS_RASTER_VISIBLE : bBoolVal = mpConstViewOption->IsGridVisible(); break;
case HANDLE_VIEWSET_IS_SNAP_TO_RASTER : bBoolVal = mpConstViewOption->IsSnap(); break;
case HANDLE_VIEWSET_RASTER_RESOLUTION_X :
- bBool = FALSE;
+ bBool = sal_False;
rValue <<= (sal_Int32) TWIP_TO_MM100(mpConstViewOption->GetSnapSize().Width());
break;
case HANDLE_VIEWSET_RASTER_RESOLUTION_Y :
- bBool = FALSE;
+ bBool = sal_False;
rValue <<= (sal_Int32) TWIP_TO_MM100(mpConstViewOption->GetSnapSize().Height());
break;
case HANDLE_VIEWSET_RASTER_SUBDIVISION_X :
- bBool = FALSE;
+ bBool = sal_False;
rValue <<= (sal_Int32) mpConstViewOption->GetDivisionX();
break;
case HANDLE_VIEWSET_RASTER_SUBDIVISION_Y :
- bBool = FALSE;
+ bBool = sal_False;
rValue <<= (sal_Int32) mpConstViewOption->GetDivisionY();
break;
case HANDLE_VIEWSET_ZOOM :
- bBool = FALSE;
+ bBool = sal_False;
rValue <<= (sal_Int16)mpConstViewOption->GetZoom();
break;
case HANDLE_VIEWSET_ZOOM_TYPE:
{
- bBool = FALSE;
+ bBool = sal_False;
sal_Int16 nRet(0);
switch (mpConstViewOption->GetZoomType())
{
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index b0b95657600c..549988b106a3 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -191,7 +191,7 @@ SwPrintUIOptions * lcl_GetPrintUIOptions(
if (!pDocShell)
return NULL;
- const BOOL bWebDoc = NULL != dynamic_cast< const SwWebDocShell * >(pDocShell);
+ const sal_Bool bWebDoc = NULL != dynamic_cast< const SwWebDocShell * >(pDocShell);
const bool bSwSrcView = NULL != dynamic_cast< const SwSrcView * >(pView);
const SwView * pSwView = dynamic_cast< const SwView * >(pView);
const bool bHasSelection = pSwView ? pSwView->HasSelection( sal_False ) : false; // check for any selection, not just text selection
@@ -222,7 +222,7 @@ void lcl_DisposeView( SfxViewFrame* pToClose, SwDocShell* pDocShell )
{
// check if the view frame still exists
SfxViewFrame* pFound = SfxViewFrame::GetFirst( pDocShell,
- FALSE );
+ sal_False );
while(pFound)
{
if( pFound == pToClose)
@@ -232,7 +232,7 @@ void lcl_DisposeView( SfxViewFrame* pToClose, SwDocShell* pDocShell )
}
pFound = SfxViewFrame::GetNext( *pFound,
pDocShell,
- FALSE );
+ sal_False );
}
}
/* -----------------------------10.03.00 18:02--------------------------------
@@ -818,7 +818,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
0);
pSearch->FillSearchItemSet(aSearch);
pSearch->FillReplaceItemSet(aReplace);
- BOOL bCancel;
+ sal_Bool bCancel;
nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles,
eStart, eEnd, bCancel,
(FindRanges)eRanges,
@@ -830,7 +830,7 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
SwTxtFmtColl *pReplaceColl = lcl_GetParaStyle(pSearch->sReplaceText, pUnoCrsr->GetDoc());;
- BOOL bCancel;
+ sal_Bool bCancel;
nResult = pUnoCrsr->Find( *pSearchColl,
eStart, eEnd, bCancel,
(FindRanges)eRanges, pReplaceColl );
@@ -839,8 +839,8 @@ sal_Int32 SwXTextDocument::replaceAll(const Reference< util::XSearchDescriptor >
else
{
//todo/mba: assuming that notes should be omitted
- BOOL bSearchInNotes = FALSE;
- BOOL bCancel;
+ sal_Bool bSearchInNotes = sal_False;
+ sal_Bool bCancel;
nResult = pUnoCrsr->Find( aSearchOpt, bSearchInNotes,
eStart, eEnd, bCancel,
(FindRanges)eRanges,
@@ -950,7 +950,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
RES_TXTATR_INETFMT, RES_TXTATR_CHARFMT,
0);
pSearch->FillSearchItemSet(aSearch);
- BOOL bCancel;
+ sal_Bool bCancel;
nResult = (sal_Int32)pUnoCrsr->Find( aSearch, !pSearch->bStyles,
eStart, eEnd, bCancel,
(FindRanges)eRanges,
@@ -962,7 +962,7 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
SwTxtFmtColl *pSearchColl = lcl_GetParaStyle(pSearch->sSearchText, pUnoCrsr->GetDoc());
//pSearch->sReplaceText
SwTxtFmtColl *pReplaceColl = 0;
- BOOL bCancel;
+ sal_Bool bCancel;
nResult = (sal_Int32)pUnoCrsr->Find( *pSearchColl,
eStart, eEnd, bCancel,
(FindRanges)eRanges, pReplaceColl );
@@ -970,8 +970,8 @@ SwUnoCrsr* SwXTextDocument::FindAny(const Reference< util::XSearchDescriptor >
else
{
//todo/mba: assuming that notes should be omitted
- BOOL bSearchInNotes = FALSE;
- BOOL bCancel;
+ sal_Bool bSearchInNotes = sal_False;
+ sal_Bool bCancel;
nResult = (sal_Int32)pUnoCrsr->Find( aSearchOpt, bSearchInNotes,
eStart, eEnd, bCancel,
(FindRanges)eRanges,
@@ -1088,7 +1088,7 @@ Sequence< beans::PropertyValue > SwXTextDocument::getPagePrintSettings(void)
pArray[6] = beans::PropertyValue(C2U("HoriMargin"), -1, aVal, PropertyState_DIRECT_VALUE);
aVal <<= (sal_Int32)TWIP_TO_MM100_UNSIGNED(aData.GetVertSpace());
pArray[7] = beans::PropertyValue(C2U("VertMargin"), -1, aVal, PropertyState_DIRECT_VALUE);
- BOOL bTemp = aData.GetLandscape();
+ sal_Bool bTemp = aData.GetLandscape();
aVal.setValue(&bTemp, ::getCppuBooleanType());
pArray[8] = beans::PropertyValue(C2U("IsLandscape"), -1, aVal, PropertyState_DIRECT_VALUE);
}
@@ -1120,7 +1120,7 @@ sal_uInt32 lcl_Any_To_ULONG(const Any& rValue, sal_Bool& bException)
/*-- 09.06.2004 12:18:10---------------------------------------------------
-----------------------------------------------------------------------*/
-String lcl_CreateOutlineString( USHORT nIndex,
+String lcl_CreateOutlineString( sal_uInt16 nIndex,
const SwOutlineNodes& rOutlineNodes, const SwNumRule* pOutlRule)
{
String sEntry;
@@ -1167,13 +1167,13 @@ void SwXTextDocument::setPagePrintSettings(const Sequence< beans::PropertyValue
{
if(!nVal || nVal > 0xff)
throw RuntimeException();
- aData.SetRow((BYTE)nVal);
+ aData.SetRow((sal_uInt8)nVal);
}
else if(COMPARE_EQUAL == sName.CompareToAscii("PageColumns"))
{
if(!nVal || nVal > 0xff)
throw RuntimeException();
- aData.SetCol((BYTE)nVal);
+ aData.SetCol((sal_uInt8)nVal);
}
else if(COMPARE_EQUAL == sName.CompareToAscii("LeftMargin"))
{
@@ -1536,7 +1536,7 @@ void SwXTextDocument::Reactivate(SwDocShell* pNewDocShell)
if(pDocShell && pDocShell != pNewDocShell)
Invalidate();
pDocShell = pNewDocShell;
- bObjectValid = TRUE;
+ bObjectValid = sal_True;
}
/*-- 18.12.98 11:55:26---------------------------------------------------
@@ -1914,9 +1914,9 @@ sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( R
)
return sal_True;
- BOOL bWebDoc = (0 != PTR_CAST(SwWebDocShell, pDocShell));
- BOOL bGlobalDoc = (0 != PTR_CAST(SwGlobalDocShell, pDocShell));
- BOOL bTextDoc = (!bWebDoc && !bGlobalDoc);
+ sal_Bool bWebDoc = (0 != PTR_CAST(SwWebDocShell, pDocShell));
+ sal_Bool bGlobalDoc = (0 != PTR_CAST(SwGlobalDocShell, pDocShell));
+ sal_Bool bTextDoc = (!bWebDoc && !bGlobalDoc);
return (
(bWebDoc && rServiceName.equalsAsciiL(RTL_CONSTASCII_STRINGPARAM("com.sun.star.text.WebDocument" ))) ||
@@ -1929,9 +1929,9 @@ sal_Bool SwXTextDocument::supportsService(const OUString& rServiceName) throw( R
* --------------------------------------------------*/
Sequence< OUString > SwXTextDocument::getSupportedServiceNames(void) throw( RuntimeException )
{
- BOOL bWebDoc = (0 != PTR_CAST(SwWebDocShell, pDocShell));
- BOOL bGlobalDoc = (0 != PTR_CAST(SwGlobalDocShell, pDocShell));
- BOOL bTextDoc = (!bWebDoc && !bGlobalDoc);
+ sal_Bool bWebDoc = (0 != PTR_CAST(SwWebDocShell, pDocShell));
+ sal_Bool bGlobalDoc = (0 != PTR_CAST(SwGlobalDocShell, pDocShell));
+ sal_Bool bTextDoc = (!bWebDoc && !bGlobalDoc);
Sequence< OUString > aRet (3);
OUString* pArray = aRet.getArray();
@@ -2220,7 +2220,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
break;
case WID_DOC_HIDE_TIPS :
{
- BOOL bTemp = SW_MOD()->GetModuleConfig()->IsHideFieldTips();
+ sal_Bool bTemp = SW_MOD()->GetModuleConfig()->IsHideFieldTips();
aAny.setValue(&bTemp, ::getBooleanCppuType());
}
break;
@@ -2247,7 +2247,7 @@ Any SwXTextDocument::getPropertyValue(const OUString& rPropertyName)
break;
case WID_DOC_TWO_DIGIT_YEAR:
{
- aAny <<= static_cast < sal_Int16 > (pDocShell->GetDoc()->GetNumberFormatter ( TRUE )->GetYear2000());
+ aAny <<= static_cast < sal_Int16 > (pDocShell->GetDoc()->GetNumberFormatter ( sal_True )->GetYear2000());
}
break;
case WID_DOC_AUTOMATIC_CONTROL_FOCUS:
@@ -2413,7 +2413,7 @@ void SwXTextDocument::updateLinks( ) throw(RuntimeException)
if( rLnkMan.GetLinks().Count() )
{
UnoActionContext aAction(pDoc);
- rLnkMan.UpdateAllLinks( FALSE, FALSE, TRUE );
+ rLnkMan.UpdateAllLinks( sal_False, sal_False, sal_True );
}
}
//XPropertyState
@@ -2741,7 +2741,7 @@ sal_Int32 SAL_CALL SwXTextDocument::getRendererCount(
// --> FME 2005-05-23 #122919# Force field update before PDF export:
- pWrtShell->ViewShell::UpdateFlds(TRUE);
+ pWrtShell->ViewShell::UpdateFlds(sal_True);
// <--
if( bStateChanged )
pRenderDocShell->EnableSetModified( sal_True );
@@ -2857,7 +2857,7 @@ uno::Sequence< beans::PropertyValue > SAL_CALL SwXTextDocument::getRenderer(
// determine the correct page number from the renderer index
// --> OD 2010-10-01 #i114875
// consider brochure print
- const USHORT nPage = bPrintProspect
+ const sal_uInt16 nPage = bPrintProspect
? nRenderer + 1
: m_pRenderData->GetPagesToPrint()[ nRenderer ];
// <--
@@ -3229,50 +3229,50 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
//USER STYLES
const SwCharFmts *pFmts = pDoc->GetCharFmts();
- for(USHORT i = 0; i < pFmts->Count(); ++i)
+ for(sal_uInt16 i = 0; i < pFmts->Count(); ++i)
{
const SwAttrSet &rAttrSet = (*pFmts)[i]->GetAttrSet();
LanguageType nLang = LANGUAGE_DONTKNOW;
if (bLatin)
{
- nLang = rAttrSet.GetLanguage( FALSE ).GetLanguage();
+ nLang = rAttrSet.GetLanguage( sal_False ).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bAsian)
{
- nLang = rAttrSet.GetCJKLanguage( FALSE ).GetLanguage();
+ nLang = rAttrSet.GetCJKLanguage( sal_False ).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bComplex)
{
- nLang = rAttrSet.GetCTLLanguage( FALSE ).GetLanguage();
+ nLang = rAttrSet.GetCTLLanguage( sal_False ).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
}
const SwTxtFmtColls *pColls = pDoc->GetTxtFmtColls();
- for (USHORT i = 0; i < pColls->Count(); ++i)
+ for (sal_uInt16 i = 0; i < pColls->Count(); ++i)
{
const SwAttrSet &rAttrSet = (*pColls)[i]->GetAttrSet();
LanguageType nLang = LANGUAGE_DONTKNOW;;
if (bLatin)
{
- nLang = rAttrSet.GetLanguage( FALSE ).GetLanguage();
+ nLang = rAttrSet.GetLanguage( sal_False ).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bAsian)
{
- nLang = rAttrSet.GetCJKLanguage( FALSE ).GetLanguage();
+ nLang = rAttrSet.GetCJKLanguage( sal_False ).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bComplex)
{
- nLang = rAttrSet.GetCTLLanguage( FALSE ).GetLanguage();
+ nLang = rAttrSet.GetCTLLanguage( sal_False ).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
@@ -3297,19 +3297,19 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
LanguageType nLang = LANGUAGE_DONTKNOW;
if (bLatin)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_LANGUAGE, FALSE )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_LANGUAGE, sal_False )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bAsian)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CJK_LANGUAGE, FALSE )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CJK_LANGUAGE, sal_False )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bComplex)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CTL_LANGUAGE, FALSE )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(pSet->Get( RES_CHRATR_CTL_LANGUAGE, sal_False )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
@@ -3326,38 +3326,38 @@ uno::Sequence< lang::Locale > SAL_CALL SwXTextDocument::getDocumentLanguages(
if(pOutliner)
{
EditEngine& rEditEng = (EditEngine&)pOutliner->GetEditEngine();
- ULONG nParCount = pOutliner->GetParagraphCount();
- for (ULONG nPar=0; nPar<nParCount; nPar++)
+ sal_uLong nParCount = pOutliner->GetParagraphCount();
+ for (sal_uLong nPar=0; nPar<nParCount; nPar++)
{
//every paragraph
SvUShorts aPortions;
- rEditEng.GetPortions( (USHORT)nPar, aPortions );
+ rEditEng.GetPortions( (sal_uInt16)nPar, aPortions );
- for ( USHORT nPos = aPortions.Count(); nPos; )
+ for ( sal_uInt16 nPos = aPortions.Count(); nPos; )
{
//every position
--nPos;
- USHORT nEnd = aPortions.GetObject( nPos );
- USHORT nStart = nPos ? aPortions.GetObject( nPos - 1 ) : 0;
- ESelection aSelection( (USHORT)nPar, nStart, (USHORT)nPar, nEnd );
+ sal_uInt16 nEnd = aPortions.GetObject( nPos );
+ sal_uInt16 nStart = nPos ? aPortions.GetObject( nPos - 1 ) : 0;
+ ESelection aSelection( (sal_uInt16)nPar, nStart, (sal_uInt16)nPar, nEnd );
SfxItemSet aAttr = rEditEng.GetAttribs( aSelection );
LanguageType nLang = LANGUAGE_DONTKNOW;
if (bLatin)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE, FALSE )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE, sal_False )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bAsian)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CJK, FALSE )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CJK, sal_False )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
if (bComplex)
{
- nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CTL, FALSE )).GetLanguage();
+ nLang = dynamic_cast< const SvxLanguageItem & >(aAttr.Get( EE_CHAR_LANGUAGE_CTL, sal_False )).GetLanguage();
if (nLang != LANGUAGE_DONTKNOW && nLang != LANGUAGE_SYSTEM)
aAllLangs.insert( nLang );
}
@@ -3810,7 +3810,7 @@ Any lcl_GetDisplayBitmap(String sLinkSuffix)
if(USHRT_MAX != nImgId)
{
nImgId += 20000;
- BOOL bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
+ sal_Bool bHighContrast = Application::GetSettings().GetStyleSettings().GetHighContrastMode();
ImageList aEntryImages( SW_RES(bHighContrast ? IMG_NAVI_ENTRYBMPH : IMG_NAVI_ENTRYBMP) );
const Image& rImage = aEntryImages.GetImage( nImgId );
Bitmap aBitmap( rImage.GetBitmapEx().GetBitmap() );
@@ -4130,15 +4130,15 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
// disable anything in the view that should not be printed (or exported to PDF) by default
// (see also dialog "Tools/Options - StarOffice Writer - Formatting Aids"
// in section "Display of ...")
- aRenderViewOptions.SetParagraph( FALSE ); // paragraph end
- aRenderViewOptions.SetSoftHyph( FALSE ); // aka custom hyphens
- aRenderViewOptions.SetBlank( FALSE ); // spaces
- aRenderViewOptions.SetHardBlank( FALSE ); // non-breaking spaces
- aRenderViewOptions.SetTab( FALSE ); // tabs
- aRenderViewOptions.SetLineBreak( FALSE ); // breaks (type 1)
- aRenderViewOptions.SetPageBreak( FALSE ); // breaks (type 2)
- aRenderViewOptions.SetColumnBreak( FALSE ); // breaks (type 3)
- BOOL bVal = pPrtOptions? pPrtOptions->bPrintHiddenText : FALSE;
+ aRenderViewOptions.SetParagraph( sal_False ); // paragraph end
+ aRenderViewOptions.SetSoftHyph( sal_False ); // aka custom hyphens
+ aRenderViewOptions.SetBlank( sal_False ); // spaces
+ aRenderViewOptions.SetHardBlank( sal_False ); // non-breaking spaces
+ aRenderViewOptions.SetTab( sal_False ); // tabs
+ aRenderViewOptions.SetLineBreak( sal_False ); // breaks (type 1)
+ aRenderViewOptions.SetPageBreak( sal_False ); // breaks (type 2)
+ aRenderViewOptions.SetColumnBreak( sal_False ); // breaks (type 3)
+ sal_Bool bVal = pPrtOptions? pPrtOptions->bPrintHiddenText : sal_False;
if (bContainsHiddenChars)
aRenderViewOptions.SetShowHiddenChar( bVal ); // hidden text
if (bContainsHiddenFields)
@@ -4149,16 +4149,16 @@ SwViewOptionAdjust_Impl::AdjustViewOptions(SwPrintData const*const pPrtOptions)
if (bContainsPlaceHolders)
{
// should always be printed in PDF export!
- bVal = pPrtOptions ? pPrtOptions->bPrintTextPlaceholder : TRUE;
+ bVal = pPrtOptions ? pPrtOptions->bPrintTextPlaceholder : sal_True;
aRenderViewOptions.SetShowPlaceHolderFields( bVal );
}
if (bContainsFields)
- aRenderViewOptions.SetFldName( FALSE );
+ aRenderViewOptions.SetFldName( sal_False );
// we need to set this flag in order to get to see the visible effect of
// some of the above settings (needed for correct rendering)
- aRenderViewOptions.SetViewMetaChars( TRUE );
+ aRenderViewOptions.SetViewMetaChars( sal_True );
if (m_aOldViewOptions != aRenderViewOptions) // check if reformatting is necessary
{
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index c03935464abf..5e977275dfd8 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -797,11 +797,11 @@ Sequence< Sequence< PropertyValue > > SwXTextView::getRubyList( sal_Bool /*bAuto
SwDoc* pDoc = m_pView->GetDocShell()->GetDoc();
SwRubyList aList;
- USHORT nCount = pDoc->FillRubyList( *rSh.GetCrsr(), aList, 0 );
+ sal_uInt16 nCount = pDoc->FillRubyList( *rSh.GetCrsr(), aList, 0 );
Sequence< Sequence< PropertyValue > > aRet(nCount);
Sequence< PropertyValue >* pRet = aRet.getArray();
String aString;
- for(USHORT n = 0; n < nCount; n++)
+ for(sal_uInt16 n = 0; n < nCount; n++)
{
const SwRubyListEntryPtr pEntry = aList[n];
@@ -895,7 +895,7 @@ void SAL_CALL SwXTextView::setRubyList(
pEntry->GetRubyAttr().SetPosition(bValue ? 0 : 1);
}
}
- aList.Insert(pEntry, (USHORT)nPos);
+ aList.Insert(pEntry, (sal_uInt16)nPos);
}
SwDoc* pDoc = m_pView->GetDocShell()->GetDoc();
pDoc->SetRubyList( *rSh.GetCrsr(), aList, 0 );
@@ -1058,7 +1058,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue(
if (nWID == WID_PAGE_COUNT)
nCount = m_pView->GetDocShell()->GetDoc()->GetPageCount();
else // WID_LINE_COUNT
- nCount = m_pView->GetWrtShell().GetLineCount( FALSE /*of whole document*/ );
+ nCount = m_pView->GetWrtShell().GetLineCount( sal_False /*of whole document*/ );
aRet <<= nCount;
}
break;
@@ -1070,7 +1070,7 @@ uno::Any SAL_CALL SwXTextView::getPropertyValue(
const SwViewOption *pOpt = m_pView->GetWrtShell().GetViewOptions();
if (!pOpt)
throw RuntimeException();
- UINT32 nFlag = VIEWOPT_1_ONLINESPELL;
+ sal_uInt32 nFlag = VIEWOPT_1_ONLINESPELL;
sal_Bool bVal = 0 != (pOpt->GetCoreOptions() & nFlag);
aRet <<= bVal;
}
@@ -1129,7 +1129,7 @@ OUString SwXTextView::getImplementationName(void) throw( RuntimeException )
/* -----------------------------06.04.00 11:07--------------------------------
---------------------------------------------------------------------------*/
-BOOL SwXTextView::supportsService(const OUString& rServiceName) throw( RuntimeException )
+sal_Bool SwXTextView::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return rServiceName.equalsAscii("com.sun.star.text.TextDocumentView") ||
rServiceName.equalsAscii("com.sun.star.view.OfficeDocumentView");
@@ -1537,7 +1537,7 @@ sal_Bool SwXTextViewCursor::jumpToFirstPage(void) throw( uno::RuntimeException )
rSh.LeaveSelFrmMode();
}
rSh.EnterStdMode();
- bRet = rSh.SttEndDoc(TRUE);
+ bRet = rSh.SttEndDoc(sal_True);
}
else
throw uno::RuntimeException();
@@ -1559,7 +1559,7 @@ sal_Bool SwXTextViewCursor::jumpToLastPage(void) throw( uno::RuntimeException )
rSh.LeaveSelFrmMode();
}
rSh.EnterStdMode();
- bRet = rSh.SttEndDoc(FALSE);
+ bRet = rSh.SttEndDoc(sal_False);
rSh.SttPg();
}
else
@@ -1574,7 +1574,7 @@ sal_Bool SwXTextViewCursor::jumpToPage(sal_Int16 nPage) throw( uno::RuntimeExcep
::vos::OGuard aGuard(Application::GetSolarMutex());
sal_Bool bRet = sal_False;
if(m_pView)
- bRet = m_pView->GetWrtShell().GotoPage(nPage, TRUE);
+ bRet = m_pView->GetWrtShell().GotoPage(nPage, sal_True);
else
throw uno::RuntimeException();
return bRet;
@@ -1642,7 +1642,7 @@ sal_Int16 SwXTextViewCursor::getPage(void) throw( uno::RuntimeException )
{
SwWrtShell& rSh = m_pView->GetWrtShell();
SwPaM* pShellCrsr = rSh.GetCrsr();
- nRet = (short)pShellCrsr->GetPageNum( TRUE, 0 );
+ nRet = (short)pShellCrsr->GetPageNum( sal_True, 0 );
}
else
throw uno::RuntimeException();
@@ -2078,7 +2078,7 @@ OUString SwXTextViewCursor::getImplementationName(void) throw( RuntimeException
/* -----------------------------06.04.00 11:07--------------------------------
---------------------------------------------------------------------------*/
-BOOL SwXTextViewCursor::supportsService(const OUString& rServiceName) throw( RuntimeException )
+sal_Bool SwXTextViewCursor::supportsService(const OUString& rServiceName) throw( RuntimeException )
{
return !rServiceName.compareToAscii("com.sun.star.text.TextViewCursor") ||
!rServiceName.compareToAscii("com.sun.star.style.CharacterProperties") ||
@@ -2171,8 +2171,8 @@ uno::Reference< datatransfer::XTransferable > SAL_CALL SwXTextView::getTransfera
else
{
SwTransferable* pTransfer = new SwTransferable( rSh );
- const BOOL bLockedView = rSh.IsViewLocked();
- rSh.LockView( TRUE ); //lock visible section
+ const sal_Bool bLockedView = rSh.IsViewLocked();
+ rSh.LockView( sal_True ); //lock visible section
pTransfer->PrepareForCopy();
rSh.LockView( bLockedView );
return uno::Reference< datatransfer::XTransferable >( pTransfer );
@@ -2190,7 +2190,7 @@ void SAL_CALL SwXTextView::insertTransferable( const uno::Reference< datatransfe
{
SdrView *pSdrView = rSh.GetDrawView();
OutlinerView* pOLV = pSdrView->GetTextEditOutlinerView();
- pOLV->GetEditView().InsertText( xTrans, GetView()->GetDocShell()->GetMedium()->GetBaseURL(), FALSE );
+ pOLV->GetEditView().InsertText( xTrans, GetView()->GetDocShell()->GetMedium()->GetBaseURL(), sal_False );
}
else
{
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-30 16:39:44 +0000