Skip to content
Projeler
Gruplar
Parçacıklar
Yardım
Yükleniyor...
Oturum aç / Kaydol
Gezinmeyi değiştir
C
core
Proje
Proje
Ayrıntılar
Etkinlik
Cycle Analytics
Depo (repository)
Depo (repository)
Dosyalar
Kayıtlar (commit)
Dallar (branch)
Etiketler
Katkıda bulunanlar
Grafik
Karşılaştır
Grafikler
Konular (issue)
0
Konular (issue)
0
Liste
Pano
Etiketler
Kilometre Taşları
Birleştirme (merge) Talepleri
0
Birleştirme (merge) Talepleri
0
CI / CD
CI / CD
İş akışları (pipeline)
İşler
Zamanlamalar
Grafikler
Paketler
Paketler
Wiki
Wiki
Parçacıklar
Parçacıklar
Üyeler
Üyeler
Collapse sidebar
Close sidebar
Etkinlik
Grafik
Grafikler
Yeni bir konu (issue) oluştur
İşler
Kayıtlar (commit)
Konu (issue) Panoları
Kenar çubuğunu aç
LibreOffice
core
Commits
f4f23167
Kaydet (Commit)
f4f23167
authored
Ock 06, 2013
tarafından
Takeshi Abe
Dosyalara gözat
Seçenekler
Dosyalara Gözat
İndir
Eposta Yamaları
Sade Fark
sal_Bool to bool
Change-Id: I5a29ca056af443643bfef823d0a064c5d834d24f
üst
2a0e3c10
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
71 additions
and
71 deletions
+71
-71
apphdl.cxx
sw/source/ui/app/apphdl.cxx
+4
-4
appopt.cxx
sw/source/ui/app/appopt.cxx
+5
-5
docsh2.cxx
sw/source/ui/app/docsh2.cxx
+9
-8
docst.cxx
sw/source/ui/app/docst.cxx
+2
-2
docstyle.cxx
sw/source/ui/app/docstyle.cxx
+51
-52
No files found.
sw/source/ui/app/apphdl.cxx
Dosyayı görüntüle @
f4f23167
...
...
@@ -687,9 +687,9 @@ void SwModule::Notify( SfxBroadcaster& /*rBC*/, const SfxHint& rHint )
if
(
pWrtSh
)
{
SFX_ITEMSET_ARG
(
pDocSh
->
GetMedium
()
->
GetItemSet
(),
pUpdateDocItem
,
SfxUInt16Item
,
SID_UPDATEDOCMODE
,
sal_False
);
sal_Bool
bUpdateFields
=
sal_T
rue
;
bool
bUpdateFields
=
t
rue
;
if
(
pUpdateDocItem
&&
pUpdateDocItem
->
GetValue
()
==
document
::
UpdateDocMode
::
NO_UPDATE
)
bUpdateFields
=
sal_F
alse
;
bUpdateFields
=
f
alse
;
if
(
bUpdateFields
)
{
pWrtSh
->
UpdateInputFlds
();
...
...
@@ -768,11 +768,11 @@ void SwModule::ConfigurationChanged( utl::ConfigurationBroadcaster* pBrdCst, sal
}
else
if
(
pBrdCst
==
pColorConfig
||
pBrdCst
==
pAccessibilityOptions
)
{
sal_Bool
bAccessibility
=
sal_F
alse
;
bool
bAccessibility
=
f
alse
;
if
(
pBrdCst
==
pColorConfig
)
SwViewOption
::
ApplyColorConfigValues
(
*
pColorConfig
);
else
bAccessibility
=
sal_T
rue
;
bAccessibility
=
t
rue
;
//invalidate all edit windows
const
TypeId
aSwViewTypeId
=
TYPE
(
SwView
);
...
...
sw/source/ui/app/appopt.cxx
Dosyayı görüntüle @
f4f23167
...
...
@@ -74,7 +74,7 @@ using namespace ::com::sun::star::lang;
SfxItemSet
*
SwModule
::
CreateItemSet
(
sal_uInt16
nId
)
{
sal_Bool
bTextDialog
=
(
nId
==
SID_SW_EDITOPTIONS
)
?
sal_True
:
sal_False
;
bool
bTextDialog
=
(
nId
==
SID_SW_EDITOPTIONS
)
;
// the options for the Web- and Textdialog are put together here
SwViewOption
aViewOpt
=
*
GetUsrPref
(
!
bTextDialog
);
...
...
@@ -86,7 +86,7 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
if
(
pAppView
)
{
// if Text then no WebView and vice versa
sal_B
ool
bWebView
=
0
!=
PTR_CAST
(
SwWebView
,
pAppView
);
b
ool
bWebView
=
0
!=
PTR_CAST
(
SwWebView
,
pAppView
);
if
(
(
bWebView
&&
!
bTextDialog
)
||
(
!
bWebView
&&
bTextDialog
))
{
aViewOpt
=
*
pAppView
->
GetWrtShell
().
GetViewOptions
();
...
...
@@ -241,14 +241,14 @@ SfxItemSet* SwModule::CreateItemSet( sal_uInt16 nId )
void
SwModule
::
ApplyItemSet
(
sal_uInt16
nId
,
const
SfxItemSet
&
rSet
)
{
sal_B
ool
bTextDialog
=
nId
==
SID_SW_EDITOPTIONS
;
b
ool
bTextDialog
=
nId
==
SID_SW_EDITOPTIONS
;
SwView
*
pAppView
=
GetView
();
if
(
pAppView
&&
pAppView
->
GetViewFrame
()
!=
SfxViewFrame
::
Current
())
pAppView
=
0
;
if
(
pAppView
)
{
// the text dialog mustn't apply data to the web view and vice versa
sal_B
ool
bWebView
=
0
!=
PTR_CAST
(
SwWebView
,
pAppView
);
b
ool
bWebView
=
0
!=
PTR_CAST
(
SwWebView
,
pAppView
);
if
(
bWebView
==
bTextDialog
)
pAppView
=
0
;
}
...
...
@@ -499,7 +499,7 @@ SfxTabPage* SwModule::CreateTabPage( sal_uInt16 nId, Window* pParent, const SfxI
if
(
pCurrView
)
{
// if text then not WebView and vice versa
sal_B
ool
bWebView
=
0
!=
PTR_CAST
(
SwWebView
,
pCurrView
);
b
ool
bWebView
=
0
!=
PTR_CAST
(
SwWebView
,
pCurrView
);
if
(
(
bWebView
&&
RID_SW_TP_HTML_OPTTABLE_PAGE
==
nId
)
||
(
!
bWebView
&&
RID_SW_TP_HTML_OPTTABLE_PAGE
!=
nId
)
)
{
...
...
sw/source/ui/app/docsh2.cxx
Dosyayı görüntüle @
f4f23167
...
...
@@ -120,7 +120,7 @@ using namespace ::com::sun::star::uno;
using
namespace
::
com
::
sun
::
star
;
using
::
rtl
::
OUString
;
using
namespace
::
sfx2
;
extern
sal_B
ool
FindPhyStyle
(
SwDoc
&
,
const
String
&
,
SfxStyleFamily
);
extern
b
ool
FindPhyStyle
(
SwDoc
&
,
const
String
&
,
SfxStyleFamily
);
/*--------------------------------------------------------------------
Description: create DocInfo (virtual)
...
...
@@ -691,7 +691,8 @@ void SwDocShell::Execute(SfxRequest& rReq)
case
SID_PRINTPREVIEW
:
{
sal_Bool
bSet
=
sal_False
,
bFound
=
sal_False
,
bOnly
=
sal_True
;
sal_Bool
bSet
=
sal_False
;
bool
bFound
=
false
,
bOnly
=
true
;
SfxViewFrame
*
pTmpFrm
=
SfxViewFrame
::
GetFirst
(
this
);
SfxViewShell
*
pViewShell
=
SfxViewShell
::
Current
();
SwView
*
pCurrView
=
dynamic_cast
<
SwView
*>
(
pViewShell
);
...
...
@@ -700,11 +701,11 @@ void SwDocShell::Execute(SfxRequest& rReq)
while
(
pTmpFrm
)
// search PreView
{
if
(
IS_TYPE
(
SwView
,
pTmpFrm
->
GetViewShell
())
)
bOnly
=
sal_F
alse
;
bOnly
=
f
alse
;
else
if
(
IS_TYPE
(
SwPagePreView
,
pTmpFrm
->
GetViewShell
()))
{
pTmpFrm
->
GetFrame
().
Appear
();
bFound
=
sal_T
rue
;
bFound
=
t
rue
;
}
if
(
bFound
&&
!
bOnly
)
break
;
...
...
@@ -806,7 +807,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
}
pFlt
=
aIter
.
Next
();
}
sal_B
ool
bWeb
=
0
!=
dynamic_cast
<
SwWebDocShell
*>
(
this
);
b
ool
bWeb
=
0
!=
dynamic_cast
<
SwWebDocShell
*>
(
this
);
const
SfxFilter
*
pOwnFlt
=
SwDocShell
::
Factory
().
GetFilterContainer
()
->
GetFilter4FilterName
(
rtl
::
OUString
(
"writer8"
));
...
...
@@ -918,7 +919,7 @@ void SwDocShell::Execute(SfxRequest& rReq)
// the SourceView is not the 1 for SwWebDocShell
sal_uInt16
nSlot
=
SID_VIEWSHELL1
;
sal_Bool
bSetModified
=
sal_F
alse
;
bool
bSetModified
=
f
alse
;
SfxPrinter
*
pSavePrinter
=
0
;
if
(
0
!=
pSrcView
)
{
...
...
@@ -1146,9 +1147,9 @@ void SwDocShell::Execute(SfxRequest& rReq)
case
FN_NEW_GLOBAL_DOC
:
{
bDone
=
sal_False
;
sal_B
ool
bCreateHtml
=
FN_NEW_HTML_DOC
==
nWhich
;
b
ool
bCreateHtml
=
FN_NEW_HTML_DOC
==
nWhich
;
sal_B
ool
bCreateByOutlineLevel
=
false
;
//#outline level,add by zhaojianwei
b
ool
bCreateByOutlineLevel
=
false
;
//#outline level,add by zhaojianwei
sal_Int32
nTemplateOutlineLevel
=
0
;
//#outline level,add by zhaojianwei
String
aFileName
,
aTemplateName
;
...
...
sw/source/ui/app/docst.cxx
Dosyayı görüntüle @
f4f23167
...
...
@@ -961,10 +961,10 @@ sal_uInt16 SwDocShell::DoWaterCan(const String &rName, sal_uInt16 nFamily)
SwEditWin
&
rEdtWin
=
pView
->
GetEditWin
();
SwApplyTemplate
*
pApply
=
rEdtWin
.
GetApplyTemplate
();
sal_B
ool
bWaterCan
=
!
(
pApply
&&
pApply
->
eType
!=
0
);
b
ool
bWaterCan
=
!
(
pApply
&&
pApply
->
eType
!=
0
);
if
(
!
rName
.
Len
()
)
bWaterCan
=
sal_F
alse
;
bWaterCan
=
f
alse
;
SwApplyTemplate
aTemplate
;
aTemplate
.
eType
=
nFamily
;
...
...
sw/source/ui/app/docstyle.cxx
Dosyayı görüntüle @
f4f23167
...
...
@@ -112,7 +112,7 @@ SwImplShellAction::~SwImplShellAction()
static
SwCharFmt
*
lcl_FindCharFmt
(
SwDoc
&
rDoc
,
const
String
&
rName
,
SwDocStyleSheet
*
pStyle
=
0
,
sal_Bool
bCreate
=
sal_T
rue
)
bool
bCreate
=
t
rue
)
{
SwCharFmt
*
pFmt
=
0
;
if
(
rName
.
Len
()
)
...
...
@@ -158,7 +158,7 @@ static SwCharFmt* lcl_FindCharFmt( SwDoc& rDoc,
static
SwTxtFmtColl
*
lcl_FindParaFmt
(
SwDoc
&
rDoc
,
const
String
&
rName
,
SwDocStyleSheet
*
pStyle
=
0
,
sal_Bool
bCreate
=
sal_T
rue
)
bool
bCreate
=
t
rue
)
{
SwTxtFmtColl
*
pColl
=
0
;
...
...
@@ -201,7 +201,7 @@ static SwTxtFmtColl* lcl_FindParaFmt( SwDoc& rDoc,
static
SwFrmFmt
*
lcl_FindFrmFmt
(
SwDoc
&
rDoc
,
const
String
&
rName
,
SwDocStyleSheet
*
pStyle
=
0
,
sal_Bool
bCreate
=
sal_T
rue
)
bool
bCreate
=
t
rue
)
{
SwFrmFmt
*
pFmt
=
0
;
if
(
rName
.
Len
()
)
...
...
@@ -239,7 +239,7 @@ static SwFrmFmt* lcl_FindFrmFmt( SwDoc& rDoc,
static
const
SwPageDesc
*
lcl_FindPageDesc
(
SwDoc
&
rDoc
,
const
String
&
rName
,
SwDocStyleSheet
*
pStyle
=
0
,
sal_Bool
bCreate
=
sal_T
rue
)
bool
bCreate
=
t
rue
)
{
const
SwPageDesc
*
pDesc
=
0
;
...
...
@@ -273,7 +273,7 @@ static const SwPageDesc* lcl_FindPageDesc( SwDoc& rDoc,
static
const
SwNumRule
*
lcl_FindNumRule
(
SwDoc
&
rDoc
,
const
String
&
rName
,
SwDocStyleSheet
*
pStyle
=
0
,
sal_Bool
bCreate
=
sal_T
rue
)
bool
bCreate
=
t
rue
)
{
const
SwNumRule
*
pRule
=
0
;
...
...
@@ -325,23 +325,23 @@ static sal_uInt16 lcl_FindName(const SwPoolFmtList& rLst, SfxStyleFamily eFam,
return
USHRT_MAX
;
}
sal_B
ool
FindPhyStyle
(
SwDoc
&
rDoc
,
const
String
&
rName
,
SfxStyleFamily
eFam
)
b
ool
FindPhyStyle
(
SwDoc
&
rDoc
,
const
String
&
rName
,
SfxStyleFamily
eFam
)
{
switch
(
eFam
)
{
case
SFX_STYLE_FAMILY_CHAR
:
return
0
!=
lcl_FindCharFmt
(
rDoc
,
rName
,
0
,
sal_F
alse
);
return
0
!=
lcl_FindCharFmt
(
rDoc
,
rName
,
0
,
f
alse
);
case
SFX_STYLE_FAMILY_PARA
:
return
0
!=
lcl_FindParaFmt
(
rDoc
,
rName
,
0
,
sal_F
alse
);
return
0
!=
lcl_FindParaFmt
(
rDoc
,
rName
,
0
,
f
alse
);
case
SFX_STYLE_FAMILY_FRAME
:
return
0
!=
lcl_FindFrmFmt
(
rDoc
,
rName
,
0
,
sal_F
alse
);
return
0
!=
lcl_FindFrmFmt
(
rDoc
,
rName
,
0
,
f
alse
);
case
SFX_STYLE_FAMILY_PAGE
:
return
0
!=
lcl_FindPageDesc
(
rDoc
,
rName
,
0
,
sal_F
alse
);
return
0
!=
lcl_FindPageDesc
(
rDoc
,
rName
,
0
,
f
alse
);
case
SFX_STYLE_FAMILY_PSEUDO
:
return
0
!=
lcl_FindNumRule
(
rDoc
,
rName
,
0
,
sal_F
alse
);
return
0
!=
lcl_FindNumRule
(
rDoc
,
rName
,
0
,
f
alse
);
default
:
;
//prevent warning
}
return
sal_F
alse
;
return
f
alse
;
}
...
...
@@ -734,8 +734,8 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
rtl
::
OUString
sPageNum
;
String
sModel
,
sBreak
;
sal_Bool
bHasWesternFontPrefix
=
sal_F
alse
;
sal_Bool
bHasCJKFontPrefix
=
sal_F
alse
;
bool
bHasWesternFontPrefix
=
f
alse
;
bool
bHasCJKFontPrefix
=
f
alse
;
SvtCJKOptions
aCJKOptions
;
while
(
pItem
)
...
...
@@ -761,7 +761,7 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
*
pItem
,
SFX_ITEM_PRESENTATION_COMPLETE
,
eUnit
,
aItemPresentation
,
&
aIntlWrapper
)
)
{
sal_Bool
bIsDefault
=
sal_F
alse
;
bool
bIsDefault
=
f
alse
;
switch
(
pItem
->
Which
()
)
{
case
SID_ATTR_PARA_PAGENUM
:
...
...
@@ -779,11 +779,11 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
case
RES_CHRATR_CJK_POSTURE
:
case
RES_CHRATR_CJK_WEIGHT
:
if
(
aCJKOptions
.
IsCJKFontEnabled
())
bIsDefault
=
sal_T
rue
;
bIsDefault
=
t
rue
;
if
(
!
bHasCJKFontPrefix
)
{
aItemPresentation
.
Insert
(
SW_RESSTR
(
STR_CJK_FONT
),
0
);
bHasCJKFontPrefix
=
sal_T
rue
;
bHasCJKFontPrefix
=
t
rue
;
}
break
;
case
RES_CHRATR_FONT
:
...
...
@@ -794,12 +794,12 @@ String SwDocStyleSheet::GetDescription(SfxMapUnit eUnit)
if
(
!
bHasWesternFontPrefix
)
{
aItemPresentation
.
Insert
(
SW_RESSTR
(
STR_WESTERN_FONT
),
0
);
bHasWesternFontPrefix
=
sal_T
rue
;
bIsDefault
=
sal_T
rue
;
bHasWesternFontPrefix
=
t
rue
;
bIsDefault
=
t
rue
;
}
// no break;
default
:
bIsDefault
=
sal_T
rue
;
bIsDefault
=
t
rue
;
}
if
(
bIsDefault
)
{
...
...
@@ -1250,7 +1250,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
((
SwConditionTxtFmtColl
*
)
pColl
)
->
RemoveCondition
(
aCond
);
const
String
&
rStyle
=
pCondItem
->
GetStyle
(
i
);
if
(
rStyle
.
Len
()
&&
0
!=
(
pFindFmt
=
lcl_FindParaFmt
(
rDoc
,
rStyle
,
0
,
sal_T
rue
)))
0
!=
(
pFindFmt
=
lcl_FindParaFmt
(
rDoc
,
rStyle
,
0
,
t
rue
)))
{
aCond
.
RegisterToFormat
(
*
pFindFmt
);
((
SwConditionTxtFmtColl
*
)
pColl
)
->
InsertCondition
(
aCond
);
...
...
@@ -1283,7 +1283,7 @@ void SwDocStyleSheet::SetItemSet( const SfxItemSet& rSet,
{
const
String
&
rStyle
=
pCondItem
->
GetStyle
(
i
);
if
(
rStyle
.
Len
()
&&
0
!=
(
pFindFmt
=
lcl_FindParaFmt
(
rDoc
,
rStyle
,
0
,
sal_T
rue
)))
0
!=
(
pFindFmt
=
lcl_FindParaFmt
(
rDoc
,
rStyle
,
0
,
t
rue
)))
{
pCColl
->
InsertCondition
(
SwCollCondition
(
pFindFmt
,
pCmds
[
i
].
nCnd
,
pCmds
[
i
].
nSubCond
)
);
...
...
@@ -1612,9 +1612,9 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
sal_uInt16
nPoolId
=
USHRT_MAX
;
SwFmt
*
pFmt
=
0
;
sal_B
ool
bCreate
=
FillPhysical
==
eFType
;
sal_Bool
bDeleteInfo
=
sal_F
alse
;
sal_B
ool
bFillOnlyInfo
=
FillAllInfo
==
eFType
;
b
ool
bCreate
=
FillPhysical
==
eFType
;
bool
bDeleteInfo
=
f
alse
;
b
ool
bFillOnlyInfo
=
FillAllInfo
==
eFType
;
std
::
vector
<
void
*>
aDelArr
;
switch
(
nFamily
)
...
...
@@ -1624,9 +1624,9 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
bPhysical
=
0
!=
pCharFmt
;
if
(
bFillOnlyInfo
&&
!
bPhysical
)
{
bDeleteInfo
=
sal_T
rue
;
bDeleteInfo
=
t
rue
;
::
lcl_SaveStyles
(
static_cast
<
sal_uInt16
>
(
nFamily
),
aDelArr
,
rDoc
);
pCharFmt
=
lcl_FindCharFmt
(
rDoc
,
aName
,
this
,
sal_T
rue
);
pCharFmt
=
lcl_FindCharFmt
(
rDoc
,
aName
,
this
,
t
rue
);
}
pFmt
=
pCharFmt
;
...
...
@@ -1651,9 +1651,9 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
bPhysical
=
0
!=
pColl
;
if
(
bFillOnlyInfo
&&
!
bPhysical
)
{
bDeleteInfo
=
sal_T
rue
;
bDeleteInfo
=
t
rue
;
::
lcl_SaveStyles
(
static_cast
<
sal_uInt16
>
(
nFamily
),
aDelArr
,
rDoc
);
pColl
=
lcl_FindParaFmt
(
rDoc
,
aName
,
this
,
sal_T
rue
);
pColl
=
lcl_FindParaFmt
(
rDoc
,
aName
,
this
,
t
rue
);
}
pFmt
=
pColl
;
...
...
@@ -1674,9 +1674,9 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
bPhysical
=
0
!=
pFrmFmt
;
if
(
bFillOnlyInfo
&&
bPhysical
)
{
bDeleteInfo
=
sal_T
rue
;
bDeleteInfo
=
t
rue
;
::
lcl_SaveStyles
(
static_cast
<
sal_uInt16
>
(
nFamily
),
aDelArr
,
rDoc
);
pFrmFmt
=
lcl_FindFrmFmt
(
rDoc
,
aName
,
this
,
sal_T
rue
);
pFrmFmt
=
lcl_FindFrmFmt
(
rDoc
,
aName
,
this
,
t
rue
);
}
pFmt
=
pFrmFmt
;
if
(
!
bCreate
&&
!
pFmt
)
...
...
@@ -1693,9 +1693,9 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
bPhysical
=
0
!=
pDesc
;
if
(
bFillOnlyInfo
&&
!
pDesc
)
{
bDeleteInfo
=
sal_T
rue
;
bDeleteInfo
=
t
rue
;
::
lcl_SaveStyles
(
static_cast
<
sal_uInt16
>
(
nFamily
),
aDelArr
,
rDoc
);
pDesc
=
lcl_FindPageDesc
(
rDoc
,
aName
,
this
,
sal_T
rue
);
pDesc
=
lcl_FindPageDesc
(
rDoc
,
aName
,
this
,
t
rue
);
}
if
(
pDesc
)
...
...
@@ -1721,9 +1721,9 @@ sal_Bool SwDocStyleSheet::FillStyleSheet( FillStyleType eFType )
bPhysical
=
0
!=
pNumRule
;
if
(
bFillOnlyInfo
&&
!
pNumRule
)
{
bDeleteInfo
=
sal_T
rue
;
bDeleteInfo
=
t
rue
;
::
lcl_SaveStyles
(
static_cast
<
sal_uInt16
>
(
nFamily
),
aDelArr
,
rDoc
);
pNumRule
=
lcl_FindNumRule
(
rDoc
,
aName
,
this
,
sal_T
rue
);
pNumRule
=
lcl_FindNumRule
(
rDoc
,
aName
,
this
,
t
rue
);
}
if
(
pNumRule
)
...
...
@@ -1982,7 +1982,7 @@ sal_uLong SwDocStyleSheet::GetHelpId( String& rFile )
{
case
SFX_STYLE_FAMILY_CHAR
:
if
(
!
pCharFmt
&&
0
==
(
pCharFmt
=
lcl_FindCharFmt
(
rDoc
,
aName
,
0
,
sal_F
alse
))
)
0
==
(
pCharFmt
=
lcl_FindCharFmt
(
rDoc
,
aName
,
0
,
f
alse
))
)
{
nId
=
SwStyleNameMapper
::
GetPoolIdFromUIName
(
aName
,
nsSwGetPoolIdFromName
::
GET_POOLID_CHRFMT
);
return
USHRT_MAX
==
nId
?
0
:
nId
;
...
...
@@ -1992,7 +1992,7 @@ sal_uLong SwDocStyleSheet::GetHelpId( String& rFile )
case
SFX_STYLE_FAMILY_PARA
:
if
(
!
pColl
&&
0
==
(
pColl
=
lcl_FindParaFmt
(
rDoc
,
aName
,
0
,
sal_F
alse
))
)
0
==
(
pColl
=
lcl_FindParaFmt
(
rDoc
,
aName
,
0
,
f
alse
))
)
{
nId
=
SwStyleNameMapper
::
GetPoolIdFromUIName
(
aName
,
nsSwGetPoolIdFromName
::
GET_POOLID_TXTCOLL
);
return
USHRT_MAX
==
nId
?
0
:
nId
;
...
...
@@ -2002,7 +2002,7 @@ sal_uLong SwDocStyleSheet::GetHelpId( String& rFile )
case
SFX_STYLE_FAMILY_FRAME
:
if
(
!
pFrmFmt
&&
0
==
(
pFrmFmt
=
lcl_FindFrmFmt
(
rDoc
,
aName
,
0
,
sal_F
alse
)
)
)
0
==
(
pFrmFmt
=
lcl_FindFrmFmt
(
rDoc
,
aName
,
0
,
f
alse
)
)
)
{
nId
=
SwStyleNameMapper
::
GetPoolIdFromUIName
(
aName
,
nsSwGetPoolIdFromName
::
GET_POOLID_FRMFMT
);
return
USHRT_MAX
==
nId
?
0
:
nId
;
...
...
@@ -2012,7 +2012,7 @@ sal_uLong SwDocStyleSheet::GetHelpId( String& rFile )
case
SFX_STYLE_FAMILY_PAGE
:
if
(
!
pDesc
&&
0
==
(
pDesc
=
lcl_FindPageDesc
(
rDoc
,
aName
,
0
,
sal_F
alse
)
)
)
0
==
(
pDesc
=
lcl_FindPageDesc
(
rDoc
,
aName
,
0
,
f
alse
)
)
)
{
nId
=
SwStyleNameMapper
::
GetPoolIdFromUIName
(
aName
,
nsSwGetPoolIdFromName
::
GET_POOLID_PAGEDESC
);
return
USHRT_MAX
==
nId
?
0
:
nId
;
...
...
@@ -2025,7 +2025,7 @@ sal_uLong SwDocStyleSheet::GetHelpId( String& rFile )
case
SFX_STYLE_FAMILY_PSEUDO
:
if
(
!
pNumRule
&&
0
==
(
pNumRule
=
lcl_FindNumRule
(
rDoc
,
aName
,
0
,
sal_F
alse
)
)
)
0
==
(
pNumRule
=
lcl_FindNumRule
(
rDoc
,
aName
,
0
,
f
alse
)
)
)
{
nId
=
SwStyleNameMapper
::
GetPoolIdFromUIName
(
aName
,
nsSwGetPoolIdFromName
::
GET_POOLID_NUMRULE
);
return
USHRT_MAX
==
nId
?
0
:
nId
;
...
...
@@ -2186,7 +2186,7 @@ void SwDocStyleSheetPool::Replace( SfxStyleSheetBase& rSource,
SwImplShellAction
aTmpSh
(
rDoc
);
sal_B
ool
bSwSrcPool
=
GetAppName
()
==
rSource
.
GetPool
().
GetAppName
();
b
ool
bSwSrcPool
=
GetAppName
()
==
rSource
.
GetPool
().
GetAppName
();
if
(
SFX_STYLE_FAMILY_PAGE
==
eFamily
&&
bSwSrcPool
)
{
// deal with separately!
...
...
@@ -2273,28 +2273,28 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle)
if
(
!
pStyle
)
return
;
sal_Bool
bBroadcast
=
sal_T
rue
;
bool
bBroadcast
=
t
rue
;
SwImplShellAction
aTmpSh
(
rDoc
);
const
String
&
rName
=
pStyle
->
GetName
();
switch
(
pStyle
->
GetFamily
()
)
{
case
SFX_STYLE_FAMILY_CHAR
:
{
SwCharFmt
*
pFmt
=
lcl_FindCharFmt
(
rDoc
,
rName
,
0
,
sal_F
alse
);
SwCharFmt
*
pFmt
=
lcl_FindCharFmt
(
rDoc
,
rName
,
0
,
f
alse
);
if
(
pFmt
)
rDoc
.
DelCharFmt
(
pFmt
);
}
break
;
case
SFX_STYLE_FAMILY_PARA
:
{
SwTxtFmtColl
*
pColl
=
lcl_FindParaFmt
(
rDoc
,
rName
,
0
,
sal_F
alse
);
SwTxtFmtColl
*
pColl
=
lcl_FindParaFmt
(
rDoc
,
rName
,
0
,
f
alse
);
if
(
pColl
)
rDoc
.
DelTxtFmtColl
(
pColl
);
}
break
;
case
SFX_STYLE_FAMILY_FRAME
:
{
SwFrmFmt
*
pFmt
=
lcl_FindFrmFmt
(
rDoc
,
rName
,
0
,
sal_F
alse
);
SwFrmFmt
*
pFmt
=
lcl_FindFrmFmt
(
rDoc
,
rName
,
0
,
f
alse
);
if
(
pFmt
)
rDoc
.
DelFrmFmt
(
pFmt
);
}
...
...
@@ -2311,13 +2311,13 @@ void SwDocStyleSheetPool::Remove( SfxStyleSheetBase* pStyle)
{
if
(
!
rDoc
.
DelNumRule
(
rName
)
)
// Only send Broadcast, when something was deleted
bBroadcast
=
sal_F
alse
;
bBroadcast
=
f
alse
;
}
break
;
default
:
OSL_ENSURE
(
!
this
,
"unknown style family"
);
bBroadcast
=
sal_F
alse
;
bBroadcast
=
f
alse
;
}
if
(
bBroadcast
)
...
...
@@ -2399,8 +2399,7 @@ SfxStyleSheetBase* SwDocStyleSheetPool::Find( const String& rName,
nSMask
=
SWSTYLEBIT_HTML
;
}
const
sal_Bool
bSearchUsed
=
(
n
!=
SFXSTYLEBIT_ALL
&&
n
&
SFXSTYLEBIT_USED
)
?
sal_True
:
sal_False
;
const
bool
bSearchUsed
=
(
n
!=
SFXSTYLEBIT_ALL
&&
n
&
SFXSTYLEBIT_USED
);
const
SwModify
*
pMod
=
0
;
mxStyleSheet
->
SetPhysical
(
sal_False
);
...
...
@@ -2648,7 +2647,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
if
(
(
nId
&
COLL_GET_RANGE_BITS
)
!=
COLL_HTML_BITS
)
{
// but some we also want to see in this section
sal_Bool
bWeiter
=
sal_T
rue
;
bool
bWeiter
=
t
rue
;
switch
(
nId
)
{
case
RES_POOLCOLL_SENDADRESS
:
// --> ADDRESS
...
...
@@ -2665,7 +2664,7 @@ SfxStyleSheetBase* SwStyleSheetIterator::First()
case
RES_POOLCOLL_STANDARD
:
// --> P
case
RES_POOLCOLL_FOOTNOTE
:
case
RES_POOLCOLL_ENDNOTE
:
bWeiter
=
sal_F
alse
;
bWeiter
=
f
alse
;
break
;
}
if
(
bWeiter
)
...
...
@@ -2900,7 +2899,7 @@ void SwStyleSheetIterator::AppendStyleList(const boost::ptr_vector<String>& rLis
sal_Bool
bUsed
=
sal_False
;
for
(
sal_uInt16
i
=
0
;
i
<
rList
.
size
();
++
i
)
{
sal_Bool
bHidden
=
sal_F
alse
;
bool
bHidden
=
f
alse
;
sal_uInt16
nId
=
SwStyleNameMapper
::
GetPoolIdFromUIName
(
rList
[
i
],
(
SwGetPoolIdFromName
)
nSection
);
switch
(
nSection
)
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment