[Libreoffice-commits] .: sw/inc
sw/inc/unodraw.hxx |5 +
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit 9803023cfeb41523d333111f19a5b3e055626788
Author: Miklos Vajna
Date: Tue Jan 29 17:33:28 2013 +0100
SwXShape and SwHTML{Parser,ImageWatcher} are no longer friends
Change-Id: Ibffbb6cba4fc3905a5d87be8305c9809bf67229b
diff --git a/sw/inc/unodraw.hxx b/sw/inc/unodraw.hxx
index 413d653..6680ae8 100644
--- a/sw/inc/unodraw.hxx
+++ b/sw/inc/unodraw.hxx
@@ -131,8 +131,6 @@ SwXShapeBaseClass;
class SwXShape : public SwXShapeBaseClass,
public SwClient
{
-friend class SwHTMLImageWatcher;
-friend class SwHTMLParser;
friend class SwXGroupShape;
friend class SwXDrawPage;
@@ -149,8 +147,6 @@ class SwXShape : public SwXShapeBaseClass,
sal_Boolm_bDescriptor;
-SwFrmFmt* GetFrmFmt() const { return
(SwFrmFmt*)GetRegisteredIn(); }
-
SvxShape* GetSvxShape();
/** method to determine top group object
@@ -273,6 +269,7 @@ public:
virtual ::rtl::OUString SAL_CALL getShapeType( ) throw
(::com::sun::star::uno::RuntimeException);
SwShapeDescriptor_Impl* GetDescImpl() {return pImpl;}
+SwFrmFmt* GetFrmFmt() const { return
(SwFrmFmt*)GetRegisteredIn(); }
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >
GetAggregationInterface() {return xShapeAgg;}
// helper
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/swabstdlg.hxx |2 -
sw/source/ui/config/optload.cxx |2 -
sw/source/ui/dialog/swdlgfact.cxx |2 -
sw/source/ui/dialog/swdlgfact.hxx |2 -
sw/source/ui/fldui/flddb.cxx |2 -
sw/source/ui/fldui/flddinf.cxx|2 -
sw/source/ui/fldui/flddok.cxx | 12 +++
sw/source/ui/fldui/fldfunc.cxx|2 -
sw/source/ui/fldui/fldmgr.cxx | 64 +++---
sw/source/ui/fldui/fldpage.cxx|4 +-
sw/source/ui/fldui/fldpage.hxx|4 +-
sw/source/ui/fldui/fldref.cxx |2 -
sw/source/ui/fldui/fldtdlg.cxx|2 -
sw/source/ui/fldui/fldvar.cxx |8 ++--
sw/source/ui/fldui/fldvar.hxx |6 +--
sw/source/ui/fldui/inpdlg.cxx |8 ++--
sw/source/ui/fldui/javaedit.cxx |2 -
sw/source/ui/frmdlg/cption.cxx|2 -
sw/source/ui/inc/fldmgr.hxx |8 ++--
sw/source/ui/inc/javaedit.hxx |2 -
sw/source/ui/shells/textfld.cxx | 13 ---
21 files changed, 76 insertions(+), 75 deletions(-)
New commits:
commit 17deff0c9a066ab4208747062577ab700dac60ef
Author: Takeshi Abe
Date: Fri Jan 25 10:43:17 2013 +0900
sal_Bool to bool
Change-Id: I3a18222fe21c05edc87e480086be7e4faef3219c
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 393cb5c..ac42c4b 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -142,7 +142,7 @@ public:
virtual String GetType() = 0;
virtual sal_BoolIsUrl() = 0;
virtual sal_BoolIsNew() = 0;
-virtual sal_BoolIsUpdate() = 0;
+virtual boolIsUpdate() = 0;
};
class AbstractMailMergeDlg : public VclAbstractDialog //add for SwMailMergeDlg
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index ca292f7..9c6f1a6 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -466,7 +466,7 @@ SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const
SfxItemSet& rSet )
}
-nCount = pMgr->GetFormatCount(TYP_SEQFLD, sal_False);
+nCount = pMgr->GetFormatCount(TYP_SEQFLD, false);
for ( i = 0; i < nCount; ++i )
{
aFormatBox.InsertEntry( pMgr->GetFormatStr(TYP_SEQFLD, i) );
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index b84e88b..da55531 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -462,7 +462,7 @@ sal_Bool AbstractJavaEditDialog_Impl::IsNew()
{
return pDlg->IsNew();
}
-sal_Bool AbstractJavaEditDialog_Impl::IsUpdate()
+bool AbstractJavaEditDialog_Impl::IsUpdate()
{
return pDlg->IsUpdate();
}
diff --git a/sw/source/ui/dialog/swdlgfact.hxx
b/sw/source/ui/dialog/swdlgfact.hxx
index 998bcbd..e5dbd90 100644
--- a/sw/source/ui/dialog/swdlgfact.hxx
+++ b/sw/source/ui/dialog/swdlgfact.hxx
@@ -315,7 +315,7 @@ class AbstractJavaEditDialog_Impl : public
AbstractJavaEditDialog
virtual String GetType();
virtual sal_BoolIsUrl();
virtual sal_BoolIsNew();
-virtual sal_BoolIsUpdate();
+virtual boolIsUpdate();
};
//for SwJavaEditDialog end
diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx
index 2985131..67fb05d 100644
--- a/sw/source/ui/fldui/flddb.cxx
+++ b/sw/source/ui/fldui/flddb.cxx
@@ -109,7 +109,7 @@ void SwFldDBPage::Reset(const SfxItemSet&)
aFormatLB.Clear();
-sal_uInt16 nSize = GetFldMgr().GetFormatCount(TYP_DBSETNUMBERFLD,
sal_False, IsFldDlgHtmlMode());
+sal_uInt16 nSize = GetFldMgr().GetFormatCount(TYP_DBSETNUMBERFLD, false,
IsFldDlgHtmlMode());
for( i = 0; i < nSize; ++i )
{
sal_uInt16 nEntryPos =
aFormatLB.InsertEntry(GetFldMgr().GetFormatStr(TYP_DBSETNUMBERFLD, i));
diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx
index 34adbd4..3f31e0c 100644
--- a/sw/source/ui/fldui/flddinf.cxx
+++ b/sw/source/ui/fldui/flddinf.cxx
@@ -386,7 +386,7 @@ sal_uInt16 SwFldDokInfPage::FillSelectionLB(sal_uInt16
nSubType)
}
else
{
-nSize = GetFldMgr().GetFormatCount(nTypeId, sal_False,
IsFldDlgHtmlMode());
+nSize = GetFldMgr().GetFormatCount(nTypeId, false, IsFldDlgHtmlMode());
for (sal_uInt16 i = 0; i < nSize; i++)
{
sal_uInt16 nPos =
aSelectionLB.InsertEntry(GetFldMgr().GetFormatStr(nTypeId, i));
diff --git a/sw/source/ui/fldui/flddok.cxx b/sw/source/ui/fldui/flddok.cxx
index 7577b34..b6fe5fd 100644
--- a/sw/source/ui/fldui/flddok.cxx
+++ b/sw/source/ui/fldui/flddok.cxx
@@ -86,7 +86,7 @@ void SwFldDokPage::Reset(const SfxItemSet& )
aTypeLB.Clear();
sal_uInt16 nPos, nTypeId;
-sal_Bool bPage = sal_False;
+bool bPage = false;
if (!IsFldEdit())
{
@@ -104,7 +104,7 @@ void SwFldDokPage::Reset(const SfxItemSet& )
{
nPos = aTypeLB.InsertEntry(SW_
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/hhcwrp.hxx |8
sw/source/ui/lingu/hhcwrp.cxx | 12
2 files changed, 8 insertions(+), 12 deletions(-)
New commits:
commit bc84545cb2c58f1f267ed2efb770bb5624ee7c70
Author: Matteo Casalin
Date: Wed Jan 23 23:48:38 2013 +0100
OUString: remove namespace and chained appends
Change-Id: I1eb7e61f3151c0469db26c69439e16be0f7063df
Reviewed-on: https://gerrit.libreoffice.org/1833
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 18fcd65..be20aa2 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -66,7 +66,7 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
voidSelectNewUnit_impl( const sal_Int32 nUnitStart,
const sal_Int32 nUnitEnd );
voidChangeText( const String &rNewText,
-const ::rtl::OUString& rOrigText,
+const OUString& rOrigText,
const ::com::sun::star::uno::Sequence< sal_Int32 >
*pOffsets,
SwPaM *pCrsr );
voidChangeText_impl( const String &rNewText, sal_Bool
bKeepAttributes );
@@ -75,15 +75,15 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
inline void SetDrawObj( sal_Bool bNew ) { m_bIsDrawObj = bNew; }
protected:
-virtual voidGetNextPortion( ::rtl::OUString& rNextPortion,
+virtual voidGetNextPortion( OUString& rNextPortion,
LanguageType& rLangOfPortion,
sal_Bool
bAllowImplicitChangesForNotConvertibleText );
virtual voidHandleNewUnit( const sal_Int32 nUnitStart,
const sal_Int32 nUnitEnd );
virtual voidReplaceUnit(
const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
-const ::rtl::OUString& rOrigText,
-const ::rtl::OUString& rReplaceWith,
+const OUString& rOrigText,
+const OUString& rReplaceWith,
const ::com::sun::star::uno::Sequence< sal_Int32 >
&rOffsets,
ReplacementAction eAction,
LanguageType *pNewUnitLanguage );
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 260afda..fb0615c 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -49,7 +49,6 @@
#include
-using ::rtl::OUString;
using namespace ::com::sun::star;
using namespace ::com::sun::star::text;
using namespace ::com::sun::star::uno;
@@ -169,7 +168,7 @@ SwHHCWrapper::~SwHHCWrapper()
void SwHHCWrapper::GetNextPortion(
-::rtl::OUString&rNextPortion,
+OUString& rNextPortion,
LanguageType& rLangOfPortion,
sal_Bool bAllowChanges )
{
@@ -380,15 +379,12 @@ void SwHHCWrapper::ChangeText_impl( const String
&rNewText, sal_Bool bKeepAttrib
void SwHHCWrapper::ReplaceUnit(
const sal_Int32 nUnitStart, const sal_Int32 nUnitEnd,
- const ::rtl::OUString& rOrigText,
+ const OUString& rOrigText,
const OUString& rReplaceWith,
const uno::Sequence< sal_Int32 > &rOffsets,
ReplacementAction eAction,
LanguageType *pNewUnitLanguage )
{
-static OUString aBracketedStart( "(" );
-static OUString aBracketedEnd( ")" );
-
OSL_ENSURE( nUnitStart >= 0 && nUnitEnd >= nUnitStart, "wrong arguments" );
if (!(nUnitStart >= 0 && nUnitEnd >= nUnitStart))
return;
@@ -413,12 +409,12 @@ void SwHHCWrapper::ReplaceUnit(
break;
case eReplacementBracketed :
{
-(((aNewTxt = aOrigTxt) += aBracketedStart) += rReplaceWith) +=
aBracketedEnd;
+aNewTxt = aOrigTxt + "(" + rReplaceWith + ")";
}
break;
case eOriginalBracketed :
{
-(((aNewTxt = rReplaceWith) += aBracketedStart) += aOrigTxt) +=
aBracketedEnd;
+aNewTxt = rReplaceWith + "(" + aOrigTxt + ")";
}
break;
case eReplacementAbove :
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/UI_swriter.mk |1 sw/inc/chrdlg.hrc |1 sw/inc/globals.hrc|1 sw/inc/helpid.h |1 sw/inc/swabstdlg.hxx |4 sw/source/ui/chrdlg/chardlg.cxx | 88 +--- sw/source/ui/chrdlg/chardlg.src | 50 -- sw/source/ui/dialog/swdlgfact.cxx | 21 -- sw/source/ui/dialog/swdlgfact.hxx |4 sw/source/ui/envelp/envfmt.cxx|2 sw/source/ui/inc/chrdlg.hxx | 11 + sw/source/ui/shells/annotsh.cxx |2 sw/source/ui/shells/drwtxtex.cxx |2 sw/source/ui/shells/textsh1.cxx |4 sw/uiconfig/swriter/ui/characterproperties.ui | 189 ++ 15 files changed, 256 insertions(+), 125 deletions(-) New commits: commit 70467371485ada5a30b88968607b93dd62b3383c Author: Caolán McNamara Date: Fri Jan 18 20:22:27 2013 + convert character properties tabdialog to .ui Change-Id: I73fc5fc19ae75971b0569b708f4104c79b9a9cc2 diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk index b7f8f74..f3a3735 100644 --- a/sw/UI_swriter.mk +++ b/sw/UI_swriter.mk @@ -15,6 +15,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\ sw/uiconfig/swriter/ui/bibliographyentry \ sw/uiconfig/swriter/ui/bulletsandnumbering \ sw/uiconfig/swriter/ui/captionoptions \ + sw/uiconfig/swriter/ui/characterproperties \ sw/uiconfig/swriter/ui/charurlpage \ sw/uiconfig/swriter/ui/columndialog \ sw/uiconfig/swriter/ui/columnpage \ diff --git a/sw/inc/chrdlg.hrc b/sw/inc/chrdlg.hrc index 5bbe3d6..48f8a95 100644 --- a/sw/inc/chrdlg.hrc +++ b/sw/inc/chrdlg.hrc @@ -21,7 +21,6 @@ #include "rcid.hrc" -#define DLG_CHAR(RC_CHRDLG_BEGIN + 1) #define DLG_PARA(RC_CHRDLG_BEGIN + 2) #define DLG_DROPCAPS(RC_CHRDLG_BEGIN + 8) #define DLG_DRAWCHAR(RC_CHRDLG_BEGIN + 9) diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc index 21c1232..5e1a49c 100644 --- a/sw/inc/globals.hrc +++ b/sw/inc/globals.hrc @@ -157,7 +157,6 @@ #define TP_MACRO_ASSIGN (RC_GLOBALS_BEGIN + 40) #define TP_FRM_URL (RC_GLOBALS_BEGIN + 42) -#define TP_CHAR_URL (RC_GLOBALS_BEGIN + 43) #define TP_CONTENT_OPT (RC_GLOBALS_BEGIN + 45) #define TP_STD_FONT (RC_GLOBALS_BEGIN + 47) diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h index bb1816b..ad87626 100644 --- a/sw/inc/helpid.h +++ b/sw/inc/helpid.h @@ -134,7 +134,6 @@ #define HID_DLG_FLDEDT_PREV "SW_HID_DLG_FLDEDT_PREV" #define HID_DLG_FLDEDT_ADDRESS "SW_HID_DLG_FLDEDT_ADDRESS" -#define HID_FILEDLG_CHARDLG "SW_HID_FILEDLG_CHARDLG" #define HID_FILEDLG_LOADTEMPLATE "SW_HID_FILEDLG_LOADTEMPLATE" #define HID_FILEDLG_MAILMRGE1 "SW_HID_FILEDLG_MAILMRGE1" #define HID_FILEDLG_MAILMRGE2 "SW_HID_FILEDLG_MAILMRGE2" diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx index f5aa68c..b672f66 100644 --- a/sw/inc/swabstdlg.hxx +++ b/sw/inc/swabstdlg.hxx @@ -355,8 +355,8 @@ public: virtual AbstractSwBreakDlg * CreateSwBreakDlg(Window *pParent, SwWrtShell &rSh) = 0; // add for SwBreakDlg virtual VclAbstractDialog * CreateSwChangeDBDlg(SwView& rVw) = 0; //add for SwChangeDBDlg -virtual SfxAbstractTabDialog * CreateSwCharDlg( Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, int nResId, // add for SwCharDlg -const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False) = 0; +virtual SfxAbstractTabDialog * CreateSwCharDlg(Window* pParent, SwView& pVw, const SfxItemSet& rCoreSet, +const String* pFmtStr = 0, sal_Bool bIsDrwTxtDlg = sal_False) = 0; // add for SwCharDlg virtual AbstractSwConvertTableDlg* CreateSwConvertTableDlg(SwView& rView, bool bToTable) = 0; //add for SwConvertTableDlg virtual VclAbstractDialog * CreateSwCaptionDialog ( Window *pParent, SwView &rV,int nResId) = 0; //add for SwCaptionDialog diff --git a/sw/source/ui/chrdlg/chardlg.cxx b/sw/source/ui/chrdlg/chardlg.cxx index dfccdec..e7efa91 100644 --- a/sw/source/ui/chrdlg/chardlg.cxx +++ b/sw/source/ui/chrdlg/chardlg.cxx @@ -58,13 +58,12 @@ using namespace ::com::sun::star::uno; using namespace ::sfx2; SwCharDlg::SwCharDlg(Window* pParent, SwView& rVw, const SfxItemSet& rCoreSet, - const String* pStr, sal_Bool bIsDrwTxtDlg) : -SfxTabDialog(pParent, SW_RES(DLG_CHAR), &rCoreSet, pStr != 0), -rView(rVw), -bIsDrwTxtMode(bIsDrwTxtDlg) +const String* pStr, bool bIsDrwTxtDlg) +: SfxTabDialog(0, pParent, "Charac
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/hhcwrp.hxx | 32 ++---
sw/source/ui/lingu/hhcwrp.cxx | 232 +-
2 files changed, 132 insertions(+), 132 deletions(-)
New commits:
commit 6704bb8eb0ac93da96cf58aac28c4f04e794dfd6
Author: Matteo Casalin
Date: Thu Jan 10 23:13:16 2013 +0100
Prefix class data members
Change-Id: I6734df58b589088809c712c3906f0cee3fd6a103
Reviewed-on: https://gerrit.libreoffice.org/1639
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
Reviewed-by: Noel Power
Tested-by: Noel Power
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index 85ee116..1ab2251 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -31,27 +31,27 @@ class SwPaM;
class SwHHCWrapper : public editeng::HangulHanjaConversion
{
-SwView *pView;
-Window* pWin;
-SwWrtShell &rWrtShell;
+SwView *mpView;
+Window* mpWin;
+SwWrtShell &mrWrtShell;
-SwConversionArgs *pConvArgs;/**< object for arguments (and results)
needed
+SwConversionArgs *mpConvArgs;/**< object for arguments (and results)
needed
to find of next convertible text
portion */
-xub_StrLen nLastPos; /**< starting position of the last found
text part
+xub_StrLen mnLastPos; /**< starting position of the last found
text part
(needs to be sth that gets not moved
like
SwPaM or SwPosition by replace
operations!) */
-sal_Int32 nUnitOffset;
+sal_Int32 mnUnitOffset;
-sal_uInt16 nPageCount; ///< page count for progress bar
-sal_uInt16 nPageStart; ///< first checked page
+sal_uInt16 mnPageCount; ///< page count for progress bar
+sal_uInt16 mnPageStart; ///< first checked page
-sal_BoolbIsDrawObj;
-sal_BoolbIsOtherCntnt;
-sal_BoolbStartChk;
-sal_BoolbIsSelection; ///< true if only the selected text should
be converted
-sal_BoolbStartDone;
-sal_BoolbEndDone;
+sal_BoolmbIsDrawObj;
+sal_BoolmbIsOtherCntnt;
+sal_BoolmbStartChk;
+sal_BoolmbIsSelection; ///< true if only the selected text
should be converted
+sal_BoolmbStartDone;
+sal_BoolmbEndDone;
/// from SvxSpellWrapper copied and modified
sal_BoolConvNext_impl();///< former SpellNext
@@ -71,8 +71,8 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
SwPaM *pCrsr );
voidChangeText_impl( const String &rNewText, sal_Bool
bKeepAttributes );
-inline sal_Bool IsDrawObj() { return bIsDrawObj; }
-inline void SetDrawObj( sal_Bool bNew ) { bIsDrawObj = bNew; }
+inline sal_Bool IsDrawObj() { return mbIsDrawObj; }
+inline void SetDrawObj( sal_Bool bNew ) { mbIsDrawObj = bNew; }
protected:
virtual voidGetNextPortion( ::rtl::OUString& rNextPortion,
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index 25187b2..b6da29b 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -101,56 +101,56 @@ SwHHCWrapper::SwHHCWrapper(
pTargetFont,
nConvOptions,
bIsInteractive ),
-rWrtShell( pSwView->GetWrtShell() )
+mrWrtShell( pSwView->GetWrtShell() )
{
-pConvArgs = 0;
-nLastPos= 0;
-nUnitOffset = 0;
-
-pView = pSwView;
-pWin= &pSwView->GetEditWin();
-bIsDrawObj = sal_False;
-bIsOtherCntnt = bStartChk = bOther;
-bIsSelection= bSelection;
-bStartDone = bOther || bStart;
-bEndDone= sal_False;
+mpConvArgs = 0;
+mnLastPos = 0;
+mnUnitOffset= 0;
+
+mpView = pSwView;
+mpWin = &pSwView->GetEditWin();
+mbIsDrawObj = sal_False;
+mbIsOtherCntnt = mbStartChk = bOther;
+mbIsSelection = bSelection;
+mbStartDone = bOther || bStart;
+mbEndDone= sal_False;
//bLastRet= sal_True;
-nPageCount = nPageStart = 0;
+mnPageCount = mnPageStart = 0;
}
SwHHCWrapper::~SwHHCWrapper()
{
-delete pConvArgs;
+delete mpConvArgs;
-rWrtShell.SetCareWin( NULL );
+mrWrtShell.SetCareWin( NULL );
// check for existence of a draw view which means that there are
// (or previously were) draw objects present in the document.
// I.e. we like to check those too.
-if ( IsDrawObj() /*&& bLastRet*/ && pView->GetWrtShell().HasDrawView() )
+if ( IsDrawObj() /*&& bLastRet*/ && mpView->GetWrtShell().HasDrawView() )
{
-Cursor *pSave = pView->GetWindow()->GetCursor();
+Cursor *pSave = mpView->GetWindow()->GetCursor();
{
SwKeepConversionDirectionStateContext aContex
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/hhcwrp.hxx |3 ---
sw/source/ui/lingu/hhcwrp.cxx |8 +---
2 files changed, 1 insertion(+), 10 deletions(-)
New commits:
commit 9d3789af2b509a8a8a1c9a923218d67104f11f3f
Author: Matteo Casalin
Date: Mon Jan 7 23:42:10 2013 +0100
Remove unused class members
Change-Id: I44fe6ad3dacc65e28256aca98588b7dfe92d73ae
Reviewed-on: https://gerrit.libreoffice.org/1638
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx
index b5819c8..85ee116 100644
--- a/sw/inc/hhcwrp.hxx
+++ b/sw/inc/hhcwrp.hxx
@@ -47,12 +47,9 @@ class SwHHCWrapper : public editeng::HangulHanjaConversion
sal_uInt16 nPageStart; ///< first checked page
sal_BoolbIsDrawObj;
-sal_BoolbIsStart;
sal_BoolbIsOtherCntnt;
sal_BoolbStartChk;
sal_BoolbIsSelection; ///< true if only the selected text should
be converted
-sal_BoolbInfoBox; ///< true if message should be displayed
at the end
-sal_BoolbIsConvSpecial; ///< true if special regions: header,
footer, ... should be converted
sal_BoolbStartDone;
sal_BoolbEndDone;
diff --git a/sw/source/ui/lingu/hhcwrp.cxx b/sw/source/ui/lingu/hhcwrp.cxx
index d6256e9..25187b2 100644
--- a/sw/source/ui/lingu/hhcwrp.cxx
+++ b/sw/source/ui/lingu/hhcwrp.cxx
@@ -110,11 +110,8 @@ SwHHCWrapper::SwHHCWrapper(
pView = pSwView;
pWin= &pSwView->GetEditWin();
bIsDrawObj = sal_False;
-bIsStart= bStart;
bIsOtherCntnt = bStartChk = bOther;
-bIsConvSpecial = sal_True;
bIsSelection= bSelection;
-bInfoBox= sal_False;
bStartDone = bOther || bStart;
bEndDone= sal_False;
//bLastRet= sal_True;
@@ -660,7 +657,6 @@ sal_Bool SwHHCWrapper::ConvNext_impl( )
if( bIsOtherCntnt && bStartDone && bEndDone ) // document completely
checked?
{
-bInfoBox = sal_True;
return sal_False;
}
@@ -675,13 +671,11 @@ sal_Bool SwHHCWrapper::ConvNext_impl( )
else if ( bStartDone && bEndDone )
{
// body region done, ask about special region
-if( bIsConvSpecial && HasOtherCnt_impl() )
+if( HasOtherCnt_impl() )
{
ConvStart_impl( pConvArgs, SVX_SPELL_OTHER );
bIsOtherCntnt = bGoOn = sal_True;
}
-else
-bInfoBox = sal_True;
}
else
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/hhcwrp.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1af49927f56c97baf4dec4d0a54faff251126db7 Author: Matteo Casalin Date: Fri Jan 11 08:12:12 2013 +0100 Use forward declaration instead of (doubled) #include Change-Id: I1cfb65a809e5dd56fb395c2f801bce5e5d75acfe Reviewed-on: https://gerrit.libreoffice.org/1642 Reviewed-by: Michael Stahl Tested-by: Michael Stahl diff --git a/sw/inc/hhcwrp.hxx b/sw/inc/hhcwrp.hxx index 0be12b5..b5819c8 100644 --- a/sw/inc/hhcwrp.hxx +++ b/sw/inc/hhcwrp.hxx @@ -20,12 +20,12 @@ #define _HHCWRP_HXX #include -#include class SwView; class Window; class SwWrtShell; struct SwConversionArgs; +class SwPaM; // ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/viewopt.hxx |8
sw/source/ui/config/caption.cxx |2 +-
sw/source/ui/config/fontcfg.cxx |8
sw/source/ui/config/modcfg.cxx | 12 ++--
sw/source/ui/config/optpage.cxx | 22 +++---
sw/source/ui/config/viewopt.cxx |2 +-
sw/source/ui/dbui/dbinsdlg.cxx | 26 +-
sw/source/ui/dbui/dbmgr.cxx | 16
sw/source/ui/inc/caption.hxx|4 ++--
sw/source/ui/inc/fontcfg.hxx|2 +-
10 files changed, 51 insertions(+), 51 deletions(-)
New commits:
commit 3fa2c6da4a912856f4a0572fafe7b32fc7d57e88
Author: Takeshi Abe
Date: Thu Jan 10 00:02:56 2013 +0900
sal_Bool to bool
Change-Id: Ib83c02d53fbae6a70781d9d9d7ab015b016c72a8
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 6c21e73..8efc3d4 100644
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -431,9 +431,9 @@ public:
SwViewOption& operator=( const SwViewOption &rOpt );
// Compare methods.
-sal_Bool IsEqualFlags ( const SwViewOption &rOpt ) const;
-inline sal_Bool operator == ( const SwViewOption &rOpt ) const;
-inline sal_Bool operator != ( const SwViewOption &rOpt ) const { return
!(*this == rOpt); }
+bool IsEqualFlags ( const SwViewOption &rOpt ) const;
+inline bool operator == ( const SwViewOption &rOpt ) const;
+inline bool operator != ( const SwViewOption &rOpt ) const { return
!(*this == rOpt); }
/*---
@@ -572,7 +572,7 @@ public:
};
-inline sal_Bool SwViewOption::operator==( const SwViewOption &rOpt ) const
+inline bool SwViewOption::operator==( const SwViewOption &rOpt ) const
{
return IsEqualFlags( rOpt ) && nZoom == rOpt.GetZoom();
}
diff --git a/sw/source/ui/config/caption.cxx b/sw/source/ui/config/caption.cxx
index 82136c3..9fb8b63 100644
--- a/sw/source/ui/config/caption.cxx
+++ b/sw/source/ui/config/caption.cxx
@@ -66,7 +66,7 @@ InsCaptionOpt& InsCaptionOpt::operator=( const InsCaptionOpt&
rOpt )
return *this;
}
-sal_Bool InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const
+bool InsCaptionOpt::operator==( const InsCaptionOpt& rOpt ) const
{
return (eObjType == rOpt.eObjType &&
aOleId == rOpt.aOleId); // So that identical Ole-IDs can't be
added multiple
diff --git a/sw/source/ui/config/fontcfg.cxx b/sw/source/ui/config/fontcfg.cxx
index c9cdcf5..d951355 100644
--- a/sw/source/ui/config/fontcfg.cxx
+++ b/sw/source/ui/config/fontcfg.cxx
@@ -168,9 +168,9 @@ SwStdFontConfig::~SwStdFontConfig()
{
}
-sal_Bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const
+bool SwStdFontConfig::IsFontDefault(sal_uInt16 nFontType) const
{
-sal_Bool bSame = sal_False;
+bool bSame = false;
SvtLinguOptions aLinguOpt;
SvtLinguConfig().GetOptions( aLinguOpt );
@@ -210,7 +210,7 @@ sal_Bool SwStdFontConfig::IsFontDefault(sal_uInt16
nFontType) const
case FONT_CAPTION_CJK :
case FONT_INDEX_CJK :
{
-sal_Bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCJK;
+bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCJK;
bSame = b1 && sDefaultFonts[nFontType] == sDefFontCJK;
}
break;
@@ -218,7 +218,7 @@ sal_Bool SwStdFontConfig::IsFontDefault(sal_uInt16
nFontType) const
case FONT_CAPTION_CTL :
case FONT_INDEX_CTL :
{
-sal_Bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCTL;
+bool b1 = sDefaultFonts[FONT_STANDARD_CJK] == sDefFontCTL;
bSame = b1 && sDefaultFonts[nFontType] == sDefFontCTL;
}
break;
diff --git a/sw/source/ui/config/modcfg.cxx b/sw/source/ui/config/modcfg.cxx
index f95b87b..765e4e1 100644
--- a/sw/source/ui/config/modcfg.cxx
+++ b/sw/source/ui/config/modcfg.cxx
@@ -74,7 +74,7 @@ const InsCaptionOpt* SwModuleOptions::GetCapOption(
}
else
{
-sal_Bool bFound = sal_False;
+bool bFound = false;
if(eType == OLE_CAP && pOleId)
{
for( sal_uInt16 nId = 0; nId <= GLOB_NAME_CHART && !bFound; nId++)
@@ -96,7 +96,7 @@ sal_Bool SwModuleOptions::SetCapOption(sal_Bool bHTML, const
InsCaptionOpt* pOpt
}
else if (pOpt)
{
-sal_Bool bFound = sal_False;
+bool bFound = false;
if(pOpt->GetObjType() == OLE_CAP && &pOpt->GetOleId())
{
for( sal_uInt16 nId = 0; nId <= GLOB_NAME_CHART; nId++)
@@ -161,7 +161,7 @@ String SwModuleOptions::ConvertWordDelimiter(const String&
rDelim, sal_Bool bFro
case 'x':
{
sal_Unicode nVal, nChar;
-sal_Bool bValidData = sal_True;
+bool bValidData = true;
xub_StrLen n;
for( n = 0, nChar = 0; n < 2 && i < rDelim.Len(); ++n,
++i )
[Libreoffice-commits] .: sw/inc
sw/inc/swscanner.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 22b999c3f977b1e13d2167b065253febaf73f3f6 Author: LuboÅ¡ LuÅák Date: Fri Dec 28 15:35:47 2012 +0100 fix the sw_swdoc_test crash Keeping a reference to an expired temporary is a rather bad idea. Change-Id: I4d93d644b7db957ea49bcf1127647b7e5427f469 diff --git a/sw/inc/swscanner.hxx b/sw/inc/swscanner.hxx index fcec9d8..b1f21ba 100644 --- a/sw/inc/swscanner.hxx +++ b/sw/inc/swscanner.hxx @@ -38,7 +38,7 @@ class SwScanner const rtl::OUString aPreDashReplacementText; rtl::OUString aText; const LanguageType* pLanguage; -const ModelToViewHelper& rConversionMap; +const ModelToViewHelper rConversionMap; sal_Int32 nStartPos; sal_Int32 nEndPos; sal_Int32 nBegin; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/index.hxx |4 ++--
sw/inc/ndtxt.hxx |2 +-
sw/inc/node.hxx|2 --
sw/inc/tblenum.hxx |2 +-
4 files changed, 4 insertions(+), 6 deletions(-)
New commits:
commit 4cf17dc564669bde2bdb15de3677761f3ec59d76
Author: Philipp Riemer
Date: Wed Dec 26 12:14:11 2012 +0100
translate remaining German comments in sw/inc
Change-Id: I76b03fd1fe374562fc7714361d08bc683ca8cb01
diff --git a/sw/inc/index.hxx b/sw/inc/index.hxx
index 0186b7f..e664538 100644
--- a/sw/inc/index.hxx
+++ b/sw/inc/index.hxx
@@ -129,8 +129,8 @@ public:
explicit SwIndexReg();
virtual ~SwIndexReg();
-// rtti, abgeleitete moegens gleichtun oder nicht. Wenn sie es gleichtun
-// kann ueber das SwIndexReg typsicher gecastet werden.
+/// rtti, derived classes might do the same. If so, one can cast typesavely
+/// via SwIndexReg.
TYPEINFO();
void MoveTo( SwIndexReg& rArr );
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index c0bf53b..18c2b02 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -206,7 +206,7 @@ public:
/// End: Data collected during idle time
protected:
-/// fuers Umhaengen der TxtFmtCollections (Outline-Nummerierung!!)
+/// for hanging TxtFmtCollections somewhere else (Outline-Numbering!)
virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
virtual void SwClientNotify( const SwModify&, const SfxHint& );
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index eeb7037..b79401f 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -569,8 +569,6 @@ public:
/// Set pointer in format of section on itself.
void NodesArrChgd();
-// ueberprueft bei _nicht_ versteckten Bereichen, ob es Inhalt gibt, der
-// _nicht_ in einem versteckten (Unter-)Bereich liegt
/** Check for not hidden areas whether there is content that is not in
a hidden sub-area. */
sal_Bool IsCntntHidden() const;
diff --git a/sw/inc/tblenum.hxx b/sw/inc/tblenum.hxx
index 1462998..ed41c0a 100644
--- a/sw/inc/tblenum.hxx
+++ b/sw/inc/tblenum.hxx
@@ -54,7 +54,7 @@ enum TblChgMode
enum SplitTbl_HeadlineOption
{
HEADLINE_NONE = 0, // Leave everything in place.
-HEADLINE_BORDERCOPY,// von der davor obere Line der vorhergehen
Line
+HEADLINE_BORDERCOPY,// Copy border of the previous line.
HEADLINE_CNTNTCOPY, // Copy 1st line with all contents.
HEADLINE_BOXATTRCOPY, // Copy box attributs of 1st line.
HEADLINE_BOXATRCOLLCOPY // Copy box attributes and paragraph styles of
1st line.
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/IDocumentTimerAccess.hxx | 20 +++-
sw/inc/doc.hxx |1 +
sw/source/core/doc/docfld.cxx |4 ++--
sw/source/core/doc/doclay.cxx | 33 +
sw/source/core/doc/docnew.cxx |2 +-
sw/source/core/inc/docfld.hxx | 14 --
sw/source/core/inc/rootfrm.hxx | 27 +--
7 files changed, 77 insertions(+), 24 deletions(-)
New commits:
commit 7a5272dc29c6efdaa99f97a627e6d9b695ae32f6
Author: pkoroau pkoroau
Date: Thu Dec 20 12:18:57 2012 +0100
fdo#38837: Timers must end eventually [Writer idle timer]
Change-Id: I36c6c56d7277b9b3853b846c86c1f4dd47ebdb08
Signed-off-by: LuboÅ¡ LuÅák
diff --git a/sw/inc/IDocumentTimerAccess.hxx b/sw/inc/IDocumentTimerAccess.hxx
index 84e3cd4..b2229f9 100644
--- a/sw/inc/IDocumentTimerAccess.hxx
+++ b/sw/inc/IDocumentTimerAccess.hxx
@@ -20,31 +20,41 @@
#ifndef IDOCUMENTTIMERACCESS_HXX_INCLUDED
#define IDOCUMENTTIMERACCESS_HXX_INCLUDED
- /** Get information about the current document state
+ /** Manipulate background jobs of the document. It starts with a mode of
+ 'started' and a block count of 0.
*/
class IDocumentTimerAccess
{
public:
/**
-Set modus to start, i.e. start timer if block count == 0
+Set modus to 'start'.
*/
virtual void StartIdling() = 0;
/**
-Set modus to stopped, i.e. stop timer if running
+Set mode to 'stopped'.
*/
virtual void StopIdling() = 0;
/**
-Increment block count, stop timer if running
+Increment block count.
*/
virtual void BlockIdling() = 0;
/**
-Decrement block count, start timer if block count == 0 AND modus == start
+Decrement block count.
*/
virtual void UnblockIdling() = 0;
+/**
+Do these jobs asynchronously: do grammar checking,
+do layout, and update fields.
+They will be delayed until mode is start AND block count == 0.
+The implementation might delay them further, for example
+it might wait until the application is idle.
+*/
+virtual void StartBackgroundJobs() = 0;
+
protected:
virtual ~IDocumentTimerAccess() {};
};
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index bfe2826..ef40d44 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -965,6 +965,7 @@ public:
virtual void StopIdling();
virtual void BlockIdling();
virtual void UnblockIdling();
+virtual void StartBackgroundJobs();
/** IDocumentChartDataProviderAccess
*/
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 0fc9f44..3fe8a0b 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2555,8 +2555,8 @@ void SwDocUpdtFld::RemoveFldType( const SwFieldType&
rType )
}
}
-SwDocUpdtFld::SwDocUpdtFld()
-: pFldSortLst(0), nFldLstGetMode(0)
+SwDocUpdtFld::SwDocUpdtFld(SwDoc* pDoc)
+: pFldSortLst(0), nFldLstGetMode(0), pDocument(pDoc)
{
bInUpdateFlds = bFldsDirty = sal_False;
memset( aFldTypeTable, 0, sizeof( aFldTypeTable ) );
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index f31c998..f73cc72 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1817,6 +1817,11 @@ void SwDoc::UnblockIdling()
aIdleTimer.Start();
}
+void SwDoc::StartBackgroundJobs() {
+// Trigger DoIdleJobs(), asynchronously.
+aIdleTimer.Start();
+}
+
/*
|*
|* SwDoc::DoIdleJobs()
@@ -1839,8 +1844,7 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
do {
if( pSh->ActionPend() )
{
-if( pTimer )
-pTimer->Start();
+pTimer->Start();
return 0;
}
pSh = (ViewShell*)pSh->GetNext();
@@ -1856,7 +1860,6 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
if (bIsOnlineSpell && bIsAutoGrammar)
StartGrammarChecking( *this );
}
-SwFldUpdateFlags nFldUpdFlag;
std::set aAllLayouts = GetAllLayouts();//swmod 080320
std::set::iterator pLayIter = aAllLayouts.begin();
for ( ;pLayIter != aAllLayouts.end();++pLayIter )
@@ -1864,20 +1867,28 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
if ((*pLayIter)->IsIdleFormat())
{
(*pLayIter)->GetCurrShell()->LayoutIdle();
-break;
+
+// Defer the remaining work.
+pTimer->Start();
+return 0;
}
}
-bool bAllValid = pLayIter == aAllLayouts.end() ? 1 : 0;
-if( bAllValid && ( AUTOUPD_FIELD_ONLY ==
- ( nFldUpdFlag = getFieldUpdateFlags(true) )
+
+SwFldUpdateFlags nFldUpdFlag = getFieldUpdateFlags(true);
+if( ( AUTOUPD_FIELD_ONLY == nFldUpdFlag
|| AUTOUPD_FIELD_AND_CHAR
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/unocrsrhelper.hxx |4 +-
sw/source/core/unocore/unocrsrhelper.cxx | 16 +-
sw/source/core/unocore/unodraw.cxx | 48 +++
sw/source/core/unocore/unofield.cxx | 16 +-
sw/source/core/unocore/unoidx.cxx| 12 +++
sw/source/core/unocore/unoobj.cxx|6 +--
sw/source/core/unocore/unoobj2.cxx |4 +-
sw/source/core/unocore/unoport.cxx |2 -
sw/source/core/unocore/unoredline.cxx|2 -
sw/source/core/unocore/unorefmk.cxx |2 -
sw/source/core/unocore/unosect.cxx | 10 +++---
sw/source/core/unocore/unosett.cxx | 36 +++
12 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit de5f128cb394baea1e4e67552b8c30709c596334
Author: Takeshi Abe
Date: Fri Dec 14 22:19:32 2012 +0900
sal_Bool to bool
Change-Id: I43a98cfaf0a508e99f7f6b413e67d4c1ebdacfba
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 016238f..a5892f6 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -77,7 +77,7 @@ namespace SwUnoCursorHelper
GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen const nIndex,
bool const bParent);
-sal_BoolgetCrsrPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
+boolgetCrsrPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
, SwPaM& rPam
, com::sun::star::uno::Any *pAny
,
com::sun::star::beans::PropertyState& eState
@@ -110,7 +110,7 @@ namespace SwUnoCursorHelper
SwPaM& rPam,
com::sun::star::beans::PropertyState&
eState);
-sal_BoolDocInsertStringSplitCR( SwDoc &rDoc,
+boolDocInsertStringSplitCR( SwDoc &rDoc,
const SwPaM &rNewCursor, const String &rText,
const bool bForceExpandHints );
voidmakeRedline( SwPaM& rPaM, const ::rtl::OUString& RedlineType,
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx
b/sw/source/core/unocore/unocrsrhelper.cxx
index d165d4b..584b2d7 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -120,7 +120,7 @@ GetNestedTextContent(SwTxtNode & rTextNode, xub_StrLen
const nIndex,
/* --
* Read the special properties of the cursor
* --*/
-sal_Bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
+bool getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
, SwPaM& rPam
, Any *pAny
, PropertyState& eState
@@ -129,7 +129,7 @@ sal_Bool getCrsrPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
PropertyState eNewState = PropertyState_DIRECT_VALUE;
//PropertyState_DEFAULT_VALUE
//PropertyState_AMBIGUOUS_VALUE
-sal_Bool bDone = sal_True;
+bool bDone = true;
switch(rEntry.nWID)
{
case FN_UNO_PARA_CONT_PREV_SUBTREE:
@@ -540,7 +540,7 @@ sal_Bool getCrsrPropertyValue(const
SfxItemPropertySimpleEntry& rEntry
break;
case RES_TXTATR_CHARFMT:
// no break here!
-default: bDone = sal_False;
+default: bDone = false;
}
if( bDone )
eState = eNewState;
@@ -910,12 +910,12 @@ void InsertFile(SwUnoCrsr* pUnoCrsr,
// insert text and scan for CR characters in order to insert
// paragraph breaks at those positions by calling SplitNode
-sal_Bool DocInsertStringSplitCR(
+bool DocInsertStringSplitCR(
SwDoc &rDoc,
const SwPaM &rNewCursor, const String &rText,
const bool bForceExpandHints )
{
-sal_Bool bOK = sal_True;
+bool bOK = true;
const enum IDocumentContentOperations::InsertFlags nInsertFlags =
(bForceExpandHints)
@@ -947,12 +947,12 @@ sal_Bool DocInsertStringSplitCR(
!rDoc.InsertString( rNewCursor, aTxt, nInsertFlags ))
{
OSL_FAIL( "Doc->Insert(Str) failed." );
-bOK = sal_False;
+bOK = false;
}
if (!rDoc.SplitNode( *rNewCursor.GetPoint(), false ) )
{
OSL_FAIL( "SplitNode failed" );
-bOK = sal_False;
+bOK = false;
}
nStartIdx = nIdx + 1;
nIdx = rText.Search( '\r', nStartIdx );
@@ -962,7 +962,7 @@ sal_Bool DocInsertStringSplitCR(
!rDoc.InsertString( rNewCursor, aTxt, nInsertFlags ))
{
OSL_FAIL( "Doc->Insert(Str) failed." );
-bOK = sal_False;
+bOK = false;
}
return bOK;
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 62b6bc5..ed19
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/unochart.hxx|2 -
sw/source/core/undo/rolbck.cxx | 14 +++
sw/source/core/undo/undel.cxx | 10 ++---
sw/source/core/undo/undobj.cxx |2 -
sw/source/core/undo/unmove.cxx |2 -
sw/source/core/undo/unovwr.cxx |2 -
sw/source/core/undo/untbl.cxx | 36 +-
sw/source/core/undo/untblk.cxx |2 -
sw/source/core/unocore/swunohelper.cxx |8 ++--
sw/source/core/unocore/unochart.cxx| 63 -
10 files changed, 71 insertions(+), 70 deletions(-)
New commits:
commit 20f2aaced1dabbd62ea516368b85e0e881d42165
Author: Takeshi Abe
Date: Thu Dec 13 21:52:13 2012 +0900
sal_Bool to bool
Change-Id: I56e3889774b13fc040f72d576b8ea530bf31f9a5
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index fce97d2..e40ac8e 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -66,7 +66,7 @@ class SwFrmFmt;
//
-sal_Bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const String
&rCellRangeName );
+bool FillRangeDescriptor( SwRangeDescriptor &rDesc, const String
&rCellRangeName );
//
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index a991a5e..10664f4 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -738,7 +738,7 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet&
rSet,
break;
pItem = aIter.NextItem();
pOrigItem = aOrigIter.NextItem();
-} while( sal_True );
+} while( true );
}
void SwHistorySetAttrSet::SetInDoc( SwDoc* pDoc, bool )
@@ -775,7 +775,7 @@ SwHistoryResetAttrSet::SwHistoryResetAttrSet( const
SfxItemSet& rSet,
SfxItemIter aIter( rSet );
bool bAutoStyle = false;
-while( sal_True )
+while( true )
{
const sal_uInt16 nWhich = aIter.GetCurItem()->Which();
@@ -1195,7 +1195,7 @@ void SwHistory::CopyFmtAttr( const SfxItemSet& rSet,
sal_uLong nNodeIdx )
if( aIter.IsAtEnd() )
break;
aIter.NextItem();
-} while( sal_True );
+} while( true );
}
}
@@ -1218,17 +1218,17 @@ void SwHistory::CopyAttr( SwpHints* pHts, sal_uLong
nNodeIdx,
break;
// never copy Flys and Ftn !!
-sal_Bool bNextAttr = sal_False;
+bool bNextAttr = false;
switch( pHt->Which() )
{
case RES_TXTATR_FIELD:
// no fields, ... copy ??
if( !bFields )
-bNextAttr = sal_True;
+bNextAttr = true;
break;
case RES_TXTATR_FLYCNT:
case RES_TXTATR_FTN:
-bNextAttr = sal_True;
+bNextAttr = true;
break;
}
@@ -1400,7 +1400,7 @@ void SwRegHistory::_MakeSetWhichIds()
{
SfxItemIter aIter( *pSet );
sal_uInt16 nW = aIter.FirstItem()->Which();
-while( sal_True )
+while( true )
{
m_WhichIdSet.insert( nW );
if( aIter.IsAtEnd() )
diff --git a/sw/source/core/undo/undel.cxx b/sw/source/core/undo/undel.cxx
index dc92233..9a53e8c 100644
--- a/sw/source/core/undo/undel.cxx
+++ b/sw/source/core/undo/undel.cxx
@@ -154,8 +154,8 @@ SwUndoDelete::SwUndoDelete( SwPaM& rPam, sal_Bool
bFullPara, sal_Bool bCalledByT
: pEnd->nNode.GetNode().GetTxtNode();
}
-sal_Bool bMoveNds = *pStt == *pEnd // any area still existent?
-? sal_False
+bool bMoveNds = *pStt == *pEnd // any area still existent?
+? false
: ( SaveCntnt( pStt, pEnd, pSttTxtNd, pEndTxtNd ) ||
bFromTableCopy );
if( pSttTxtNd && pEndTxtNd && pSttTxtNd != pEndTxtNd )
@@ -342,7 +342,7 @@ sal_Bool SwUndoDelete::SaveCntnt( const SwPosition* pStt,
const SwPosition* pEnd
// 1 - copy start in Start-String
if( pSttTxtNd )
{
-sal_Bool bOneNode = nSttNode == nEndNode;
+bool bOneNode = nSttNode == nEndNode;
xub_StrLen nLen = bOneNode ? nEndCntnt - nSttCntnt
: pSttTxtNd->GetTxt().Len() - nSttCntnt;
SwRegHistory aRHst( *pSttTxtNd, pHistory );
@@ -467,7 +467,7 @@ sal_Bool SwUndoDelete::CanGrouping( SwDoc* pDoc, const
SwPaM& rDelPam )
if( !FillSaveData( rDelPam, *pTmpSav, sal_False ))
delete pTmpSav, pTmpSav = 0;
-sal_Bool bOk = ( !pRedlSaveData && !pTmpSav ) ||
+bool bOk = ( !pRedlSaveData && !pTmpSav ) ||
( pRedlSaveData && pTmpSav &&
SwUndo::CanRedlineGroup( *pRedlSaveData, *pTmpSav, bBackSp ));
delete pTmpSav;
@@ -762,7 +762,7 @@ void SwUndoDelete::UndoImpl(::sw::UndoRedoContext &
rContext)
else
pInsNd = 0;
[Libreoffice-commits] .: sw/inc sw/source sw/uiconfig
sw/inc/helpid.h |1 -
sw/source/ui/frmdlg/cption.cxx |2 +-
sw/uiconfig/swriter/ui/insertcaption.ui |5 +
3 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 8f7855b61a29e47db70be92541422594ad99d13f
Author: Caolán McNamara
Date: Mon Dec 10 13:19:48 2012 +
some minor cleanup of caption dialog
ensure that some button in the dialog is the default button
ensure the CategoryBox is sorted like the original was
drop HID_DLG_CAPTION help id
put a big more spacing between groups
Change-Id: Id9e020a9dcad50c0d0b0ecb3bdbe7fd5434c8100
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 8c31ca4..917d9de 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -60,7 +60,6 @@
#define HID_INSERT_CHART
"SW_HID_INSERT_CHART"
#define HID_NAVIGATOR_TREELIST
"SW_HID_NAVIGATOR_TREELIST"
-#define HID_DLG_CAPTION
"SW_HID_DLG_CAPTION"
#define HID_DLG_GLOSS_DECIDE
"SW_HID_DLG_GLOSS_DECIDE"
#define HID_NAVIGATOR_TOOLBOX
"SW_HID_NAVIGATOR_TOOLBOX"
#define HID_NAVIGATOR_LISTBOX
"SW_HID_NAVIGATOR_LISTBOX"
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 84bbbe6..404b36d 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -551,7 +551,7 @@ long CategoryBox::PreNotify( NotifyEvent& rNEvt )
extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeCategoryBox(Window*
pParent)
{
-CategoryBox* pCategoryBox = new CategoryBox(pParent, WB_LEFT | WB_DROPDOWN
| WB_VCENTER | WB_3DLOOK);
+CategoryBox* pCategoryBox = new CategoryBox(pParent, WB_LEFT | WB_DROPDOWN
| WB_VCENTER | WB_3DLOOK | WB_SORT);
pCategoryBox->EnableAutoSize(true);
return pCategoryBox;
}
diff --git a/sw/uiconfig/swriter/ui/insertcaption.ui
b/sw/uiconfig/swriter/ui/insertcaption.ui
index 7a95855..9af1ea5 100644
--- a/sw/uiconfig/swriter/ui/insertcaption.ui
+++ b/sw/uiconfig/swriter/ui/insertcaption.ui
@@ -15,6 +15,7 @@
True
False
vertical
+12
True
@@ -71,6 +72,8 @@
True
False
+6
+6
True
@@ -290,6 +293,8 @@
False
True
True
+True
+True
True
False
True
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source sw/uiconfig sw/UI_swriter.mk
sw/UI_swriter.mk|1
sw/inc/globals.hrc |6
sw/source/ui/app/app.src| 21 +
sw/source/ui/config/optload.cxx | 16 +
sw/source/ui/frmdlg/cption.cxx | 221 ++---
sw/source/ui/frmdlg/cption.hrc | 21 -
sw/source/ui/frmdlg/cption.src | 180 --
sw/source/ui/inc/cption.hxx | 57 ++--
sw/source/ui/inc/optload.hxx| 12
sw/uiconfig/swriter/ui/insertcaption.ui | 401
10 files changed, 560 insertions(+), 376 deletions(-)
New commits:
commit 6bf7198ebd12d4ac60f9039a30339867e8a3ce8e
Author: Jack Leigh
Date: Fri Dec 7 18:22:54 2012 +
migrate 'Insert Caption' dialog to .ui file
Change-Id: I490c8057f1263f12f50b59c97ca9807138daab5d
Reviewed-on: https://gerrit.libreoffice.org/1266
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/UI_swriter.mk b/sw/UI_swriter.mk
index fc4a259..f39bb2f 100644
--- a/sw/UI_swriter.mk
+++ b/sw/UI_swriter.mk
@@ -20,6 +20,7 @@ $(eval $(call gb_UI_add_uifiles,modules/swriter,\
sw/uiconfig/swriter/ui/indexentry \
sw/uiconfig/swriter/ui/insertbookmark \
sw/uiconfig/swriter/ui/insertbreak \
+ sw/uiconfig/swriter/ui/insertcaption \
sw/uiconfig/swriter/ui/insertfootnote \
sw/uiconfig/swriter/ui/insertscript \
sw/uiconfig/swriter/ui/inserttable \
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 73c73ae..ec4c02e 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -69,6 +69,12 @@
#define SW_STR_NONE (RC_GLOBALS_BEGIN + 41)
+#define STR_CAPTION_BEGINNING (RC_GLOBALS_BEGIN + 42)
+#define STR_CAPTION_END (RC_GLOBALS_BEGIN + 43)
+#define STR_CAPTION_ABOVE (RC_GLOBALS_BEGIN + 44)
+#define STR_CAPTION_BELOW (RC_GLOBALS_BEGIN + 45)
+#define STR_CAPTION_CATEGORY_NONE (RC_GLOBALS_BEGIN + 46)
+
// DIALOGS ---
#define DLG_THESAURUS (RC_GLOBALS_BEGIN + 2)
diff --git a/sw/source/ui/app/app.src b/sw/source/ui/app/app.src
index dbfd44b..6952571 100644
--- a/sw/source/ui/app/app.src
+++ b/sw/source/ui/app/app.src
@@ -240,6 +240,27 @@ String SW_STR_NONE
Text [ en-US ] = "[None]" ;
};
+String STR_CAPTION_BEGINNING
+{
+Text [ en-US ] = "Above" ;
+};
+String STR_CAPTION_END
+{
+Text [ en-US ] = "Below" ;
+};
+String STR_CAPTION_ABOVE
+{
+Text [ en-US ] = "Above" ;
+};
+String STR_CAPTION_BELOW
+{
+Text [ en-US ] = "Below" ;
+};
+String STR_CAPTION_CATEGORY_NONE
+{
+Text [ en-US ] = "" ;
+};
+
InfoBox MSG_ERROR_SEND_MAIL
{
BUTTONS = WB_OK ;
diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx
index 045e897..f3fd604 100644
--- a/sw/source/ui/config/optload.cxx
+++ b/sw/source/ui/config/optload.cxx
@@ -345,9 +345,20 @@ SwCaptionOptDlg::~SwCaptionOptDlg()
{
}
+SwCaptionPreview::SwCaptionPreview( Window* pParent )
+: Window( pParent )
+{
+Init();
+}
+
SwCaptionPreview::SwCaptionPreview( Window* pParent, const ResId& rResId )
: Window( pParent, rResId )
{
+Init();
+}
+
+void SwCaptionPreview::Init()
+{
maDrawPos = Point( 4, 6 );
Wallpaper aBack( GetSettings().GetStyleSettings().GetWindowColor() );
@@ -377,6 +388,11 @@ void SwCaptionPreview::Paint( const Rectangle& rRect )
DrawText( Point( 4, 6 ), maText );
}
+extern "C" SAL_DLLPUBLIC_EXPORT Window* SAL_CALL makeSwCaptionPreview(Window*
pParent)
+{
+return new SwCaptionPreview(pParent);
+}
+
SwCaptionOptPage::SwCaptionOptPage( Window* pParent, const SfxItemSet& rSet )
: SfxTabPage(pParent, SW_RES(TP_OPTCAPTION_PAGE), rSet),
aCheckFT(this, SW_RES(FT_OBJECTS)),
diff --git a/sw/source/ui/frmdlg/cption.cxx b/sw/source/ui/frmdlg/cption.cxx
index 5d7f6eb..84bbbe6 100644
--- a/sw/source/ui/frmdlg/cption.cxx
+++ b/sw/source/ui/frmdlg/cption.cxx
@@ -43,8 +43,10 @@
#include
#include
#include
+#include
#include
#include
+
using namespace ::com::sun::star;
extern String* GetOldGrfCat();
@@ -97,37 +99,30 @@ public:
String SwCaptionDialog::our_aSepTextSave = rtl::OUString(": "); // Caption
separator text
SwCaptionDialog::SwCaptionDialog( Window *pParent, SwView &rV ) :
-
-SvxStandardDialog( pParent, SW_RES(DLG_CAPTION) ),
-
-aTextText (this, SW_RES(TXT_TEXT)),
-aTextEdit (this, SW_RES(EDT_TEXT)),
-aSettingsFL (this, SW_RES(FL_SETTINGS)),
-aCategoryText (this, SW_RES(TXT_CATEGORY)),
-aCategoryBox (this, SW_RES(BOX_CATEGORY)),
-aFormatText (this, SW_RES(TXT_FORMAT )),
-aFormatBox(this, SW_RES(BOX_FORMAT )),
-aNumberingSeparatorFT(this, SW_RES(FT_NUM_SEP )),
-aNumberingSeparatorED(this, SW_RES(ED_NUM_SEP )),
-aSepText (this, SW_RES(TXT_SEP )),
-aSepEdit (this, SW_RES(EDT_SEP )),
-aPosText
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/fldui.hrc |2 +-
sw/inc/swabstdlg.hxx |8
sw/source/ui/dialog/swdlgfact.cxx | 36
sw/source/ui/dialog/swdlgfact.hxx |8
sw/source/ui/inc/misc.hrc |2 +-
sw/source/ui/shells/textfld.cxx |3 +--
sw/source/ui/shells/textsh1.cxx |4 ++--
sw/source/ui/uiview/viewdlg2.cxx |4 ++--
8 files changed, 23 insertions(+), 44 deletions(-)
New commits:
commit 2401ebdd3667e776fab5e66e4e2d39106369276e
Author: Caolán McNamara
Date: Mon Dec 3 15:36:09 2012 +
drop unnecessary resource ids
Change-Id: Ie0018bde73eed6049d1ef2287157b86151766e83
diff --git a/sw/inc/fldui.hrc b/sw/inc/fldui.hrc
index be413f2..c500a1d 100644
--- a/sw/inc/fldui.hrc
+++ b/sw/inc/fldui.hrc
@@ -22,7 +22,7 @@
#define DLG_FLD_INPUT (RC_FLDDLG_BEGIN + 5)
#define DLG_CHANGE_DB (RC_FLDDLG_BEGIN + 9)
-#define DLG_JAVAEDIT(RC_FLDDLG_BEGIN + 10)
+
#define DLG_FLD_INSERT (RC_FLDDLG_BEGIN + 11)
#define DLG_FLD_DROPDOWN(RC_FLDDLG_BEGIN + 12)
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index 578c81d..5355b97 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -430,14 +430,14 @@ public:
virtual AbstractFldInputDlg*CreateFldInputDlg( int nResId,
Window *pParent, SwWrtShell
&rSh,
SwField* pField, sal_Bool
bNextButton = sal_False ) = 0; //add for SwFldInputDlg
-virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg( int nResId,
-Window * pParent, SwWrtShell
&rSh, sal_Bool bEd = sal_False) = 0; //add for SwInsFootNoteDlg
+virtual AbstractInsFootNoteDlg* CreateInsFootNoteDlg(Window * pParent,
+SwWrtShell &rSh, sal_Bool bEd = sal_False) = 0; //add for
SwInsFootNoteDlg
virtual VclAbstractDialog* CreateTitlePageDlg ( Window * pParent
) = 0;
virtual VclAbstractDialog * CreateVclSwViewDialog( int nResId,
SwView& rView, sal_Bool bCol =
sal_False ) = 0; //add for SwInsRowColDlg, SwLineNumberingDlg
virtual AbstractInsTableDlg*CreateInsTableDlg(SwView& rView) = 0;
//add for SwInsTableDlg
-virtual AbstractJavaEditDialog* CreateJavaEditDialog( int nResId,
-Window* pParent, SwWrtShell*
pWrtSh ) = 0; //add for SwJavaEditDialog
+virtual AbstractJavaEditDialog* CreateJavaEditDialog(Window* pParent,
+SwWrtShell* pWrtSh) = 0; //add for SwJavaEditDialog
virtual AbstractMailMergeDlg* CreateMailMergeDlg( int nResId,
Window* pParent, SwWrtShell&
rSh,
const String& rSourceName,
diff --git a/sw/source/ui/dialog/swdlgfact.cxx
b/sw/source/ui/dialog/swdlgfact.cxx
index 0d15759..3028bba 100644
--- a/sw/source/ui/dialog/swdlgfact.cxx
+++ b/sw/source/ui/dialog/swdlgfact.cxx
@@ -1163,21 +1163,11 @@ AbstractFldInputDlg*
SwAbstractDialogFactory_Impl::CreateFldInputDlg( int nResId
return 0;
}
-AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg(
int nResId,
-Window * pParent, SwWrtShell
&rSh, sal_Bool bEd ) //add for SwInsFootNoteDlg
+AbstractInsFootNoteDlg* SwAbstractDialogFactory_Impl::CreateInsFootNoteDlg(
+Window * pParent, SwWrtShell &rSh, sal_Bool bEd ) //add for
SwInsFootNoteDlg
{
-SwInsFootNoteDlg* pDlg=NULL;
-switch ( nResId )
-{
-case DLG_INS_FOOTNOTE :
-pDlg = new SwInsFootNoteDlg( pParent, rSh, bEd );
-break;
-default:
-break;
-}
-if ( pDlg )
-return new AbstractInsFootNoteDlg_Impl( pDlg );
-return 0;
+SwInsFootNoteDlg* pDlg = new SwInsFootNoteDlg(pParent, rSh, bEd);
+return new AbstractInsFootNoteDlg_Impl( pDlg );
}
VclAbstractDialog * SwAbstractDialogFactory_Impl::CreateTitlePageDlg ( Window
*pParent )
@@ -1212,21 +1202,11 @@ AbstractInsTableDlg *
SwAbstractDialogFactory_Impl::CreateInsTableDlg(SwView& rV
return new AbstractInsTableDlg_Impl( pDlg );
}
-AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog(
int nResId,
-Window* pParent, SwWrtShell*
pWrtSh ) //add for SwJavaEditDialog
+AbstractJavaEditDialog * SwAbstractDialogFactory_Impl::CreateJavaEditDialog(
+Window* pParent, SwWrtShell* pWrtSh) //add for SwJavaEditDialog
{
-SwJavaEditDialog* pDlg=NULL;
-switch ( nResId )
-{
-case DLG_JAVAEDIT :
-pDlg = new SwJavaEditDialog( pParent, pWrtSh );
-break;
-default:
-break;
-}
-if ( pDlg )
-return new AbstractJavaEditDialog_Impl( pDlg );
-return 0;
+SwJavaEditDialog* pDl
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/shellres.hxx |2 +-
sw/source/ui/utlui/initui.cxx |8
2 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 32c26ffb1f7585318a11f684a9886b58cea5b307
Author: Caolán McNamara
Date: Sat Dec 1 12:18:53 2012 +
Resolves: fdo#56549 crash in format->autocorrect->apply and edit changes
regression from cad9afa15f53d547733fa55f1353772f6d696611
Change-Id: I1aa36bf86969a5a90456817d360d59125948e519
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index af969a0..253c85d 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -87,7 +87,7 @@ struct SW_DLLPUBLIC ShellResource : public Resource
private:
void _GetAutoFmtNameLst() const;
-std::vector *pAutoFmtNameLst;
+mutable std::vector *pAutoFmtNameLst;
String sPageDescFirstName;
String sPageDescFollowName;
String sPageDescName;
diff --git a/sw/source/ui/utlui/initui.cxx b/sw/source/ui/utlui/initui.cxx
index be7fa01..768c7d6 100644
--- a/sw/source/ui/utlui/initui.cxx
+++ b/sw/source/ui/utlui/initui.cxx
@@ -229,10 +229,10 @@ struct ImpAutoFmtNameListLoader : public Resource
void ShellResource::_GetAutoFmtNameLst() const
{
-std::vector* pLst(pAutoFmtNameLst);
-pLst = new std::vector;
-pLst->reserve(STR_AUTOFMTREDL_END);
-ImpAutoFmtNameListLoader aTmp( *pLst );
+assert(!pAutoFmtNameLst);
+pAutoFmtNameLst = new std::vector;
+pAutoFmtNameLst->reserve(STR_AUTOFMTREDL_END);
+ImpAutoFmtNameListLoader aTmp(*pAutoFmtNameLst);
}
ImpAutoFmtNameListLoader::ImpAutoFmtNameListLoader( std::vector& rLst )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/fesh.hxx |4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) New commits: commit 2d7eaeb6322864eb68b765c9c71d60532cba479f Author: Miklos Vajna Date: Sun Nov 25 11:32:37 2012 +0100 SwFEShell: fix doxygen comments Change-Id: I49c0e34cf7e73e04be9020ef27b3d7e7e78028f0 diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx index dc4968a..8f88f4a 100644 --- a/sw/inc/fesh.hxx +++ b/sw/inc/fesh.hxx @@ -100,7 +100,7 @@ namespace svx #define FLYPROTECT_CONTENT (sal_uInt16) 1 #define FLYPROTECT_SIZE (sal_uInt16) 2 #define FLYPROTECT_POS (sal_uInt16) 4 -#define FLYPROTECT_PARENT (sal_uInt16) 8 /// Check only parents. +#define FLYPROTECT_PARENT (sal_uInt16) 8 ///< Check only parents. #define FLYPROTECT_FIXED(sal_uInt16) 16 /** Only protection that cannot be withdrawn e.g. by OLE-server; also relevant for dialog. */ @@ -116,7 +116,7 @@ enum ObjCntType OBJCNT_URLBUTTON, OBJCNT_GROUPOBJ, -OBJCNT_DONTCARE /// Not determinable - different objects are selected. +OBJCNT_DONTCARE ///< Not determinable - different objects are selected. }; //For GetAnyCurRect ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/calbck.hxx |8 ++--
sw/inc/swtable.hxx | 12 +++---
sw/source/core/attr/calbck.cxx |4 +-
sw/source/core/crsr/trvltbl.cxx|2 -
sw/source/core/doc/docfmt.cxx |2 -
sw/source/core/doc/tblafmt.cxx |2 -
sw/source/core/doc/tblcpy.cxx | 26 ++---
sw/source/core/doc/tblrwcl.cxx |2 -
sw/source/core/docnode/ndcopy.cxx | 12 +++---
sw/source/core/docnode/ndnotxt.cxx |2 -
sw/source/core/docnode/ndnum.cxx |2 -
sw/source/core/docnode/ndsect.cxx |6 +--
sw/source/core/docnode/ndtbl.cxx | 69 ++---
sw/source/core/docnode/ndtbl1.cxx | 46
sw/source/core/docnode/node.cxx|6 +--
sw/source/core/graphic/ndgrf.cxx |2 -
sw/source/core/inc/UndoTable.hxx |4 +-
sw/source/core/table/swtable.cxx |6 +--
sw/source/core/undo/untbl.cxx |6 +--
sw/source/filter/xml/xmltbli.cxx |4 +-
sw/source/filter/xml/xmltbli.hxx |2 -
21 files changed, 113 insertions(+), 112 deletions(-)
New commits:
commit 1aad15bf3968e243ff2ee2572e5bc3fc5cd8f108
Author: Takeshi Abe
Date: Wed Nov 21 07:34:08 2012 +0900
sal_Bool to bool
Change-Id: I0845702a9d0d590b0410df8bdcc3a12661f87714
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 75e3ead..4eb30e1 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -133,7 +133,7 @@ inline SwClient::SwClient() :
class SW_DLLPUBLIC SwModify: public SwClient
{
SwClient* pRoot;// the start of the linked list of clients
-sal_Bool bModifyLocked : 1; // don't broadcast changes now
+bool bModifyLocked : 1; // don't broadcast changes now
sal_Bool bLockClientList : 1; // may be set when this instance
notifies its clients
sal_Bool bInDocDTOR : 1;// workaround for problems when a lot
of objects are destroyed
sal_Bool bInCache : 1;
@@ -167,12 +167,12 @@ public:
// get information about attribute
virtual bool GetInfo( SfxPoolItem& ) const;
-void LockModify() { bModifyLocked = sal_True; }
-void UnlockModify() { bModifyLocked = sal_False; }
+void LockModify() { bModifyLocked = true; }
+void UnlockModify() { bModifyLocked = false; }
void SetInCache( sal_Bool bNew ){ bInCache = bNew; }
void SetInSwFntCache( sal_Bool bNew ) { bInSwFntCache = bNew; }
void SetInDocDTOR() { bInDocDTOR = sal_True; }
-sal_Bool IsModifyLocked() const { return bModifyLocked; }
+bool IsModifyLocked() const { return bModifyLocked; }
sal_Bool IsInDocDTOR()const { return bInDocDTOR; }
sal_Bool IsInCache() const { return bInCache; }
sal_Bool IsInSwFntCache() const { return bInSwFntCache; }
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 59c7504..be5b1de 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -124,14 +124,14 @@ protected:
// at HTML-import.
sal_uInt16 nRowsToRepeat; // Number of rows to repeat on every
page.
-sal_BoolbModifyLocked :1;
+boolbModifyLocked :1;
sal_BoolbNewModel :1; // sal_False: old SubTableModel;
sal_True: new RowSpanModel
#ifdef DBG_UTIL
/// This is set by functions (like Merge()) to forbid a late model change.
bool m_bDontChangeModel;
#endif
-sal_Bool IsModifyLocked(){ return bModifyLocked;}
+bool IsModifyLocked(){ return bModifyLocked;}
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem* pNew );
@@ -179,8 +179,8 @@ public:
sal_uInt16 IncGrfsThatResize() { return ++nGrfsThatResize; }
sal_uInt16 DecGrfsThatResize() { return nGrfsThatResize ?
--nGrfsThatResize : 0; }
-void LockModify() { bModifyLocked = sal_True; } // Must be used always
-void UnlockModify() { bModifyLocked = sal_False;} // in pairs!
+void LockModify() { bModifyLocked = true; } // Must be used always
+void UnlockModify() { bModifyLocked = false;} // in pairs!
void SetTableModel( sal_Bool bNew ){ bNewModel = bNew; }
sal_Bool IsNewModel() const { return bNewModel; }
@@ -308,9 +308,9 @@ public:
// Search all content-bearing boxes of the base line on which this box
stands.
// rBoxes as a return value for immediate use.
// steht. rBoxes auch als Return-Wert, um es gleich weiter zu benutzen
-// bToTop = sal_True -> up to base line, sal_False-> else only line of box.
+// bToTop = true -> up to base line, sal_False-> else only line of box.
SwSelBoxes& SelLineFromBox( const SwTableBox* pBox,
-SwSelBoxes& rBoxes, sal_Bool bToTop = sal_True )
const;
+SwSelBoxes& rBoxes, bool bToTop = true ) const;
// Get information from client
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/cellfml.hxx|2 +-
sw/inc/dbfld.hxx | 38 +++---
sw/inc/expfld.hxx | 12 ++--
sw/inc/usrfld.hxx | 16
sw/source/core/fields/dbfld.cxx | 20 ++--
sw/source/core/fields/expfld.cxx |2 +-
sw/source/core/fields/usrfld.cxx |4 ++--
sw/source/core/inc/frame.hxx |4 ++--
sw/source/core/layout/findfrm.cxx |6 +++---
sw/source/core/layout/flowfrm.cxx |4 ++--
sw/source/core/layout/flycnt.cxx |8
sw/source/core/text/porfld.cxx|2 +-
sw/source/core/text/porfld.hxx|4 ++--
sw/source/core/text/txtfld.cxx| 18 +-
sw/source/ui/app/appenv.cxx | 12 ++--
sw/source/ui/dbui/dbtree.cxx |4 ++--
sw/source/ui/inc/dbtree.hxx |2 +-
17 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit 30bd9fbd9317aeee15edbf98e50be59236c60a67
Author: Takeshi Abe
Date: Sat Nov 17 19:04:02 2012 +0900
sal_Bool to bool
Change-Id: I4700455a1f2057ac2cc32da0260c810311c84a4f
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index d5a6f2d..f4b8ead 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -99,7 +99,7 @@ protected:
String sFormel;///< current formula
NameTypeeNmType;///< current display method
-sal_BoolbValidValue;///< sal_True: recalculate formula
+boolbValidValue;///< true: recalculate formula
// find the node in which the formula is located
// TextFeld-> TextNode,
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index be2d0ba..a0529f3 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -75,9 +75,9 @@ class SW_DLLPUBLIC SwDBField : public SwValueField
rtl::OUString aContent;
rtl::OUString sFieldCode; ///< contains Word's field code
sal_uInt16 nSubType;
-sal_BoolbIsInBodyTxt: 1;
-sal_BoolbValidValue : 1;
-sal_BoolbInitialized: 1;
+boolbIsInBodyTxt: 1;
+boolbValidValue : 1;
+boolbInitialized: 1;
virtual String Expand() const;
virtual SwField*Copy() const;
@@ -97,7 +97,7 @@ public:
virtual String GetFieldName() const;
/// For calculations in expressions.
-voidChgValue( double d, sal_Bool bVal );
+voidChgValue( double d, bool bVal );
/// Get the evaluation via DBMgr string.
voidEvaluate();
@@ -107,11 +107,11 @@ public:
voidInitContent();
voidInitContent(const String& rExpansion);
-inline void ChgBodyTxtFlag( sal_Bool bIsInBody );
+inline void ChgBodyTxtFlag( bool bIsInBody );
-inline sal_Bool IsInitialized() const { return bInitialized; }
-inline void ClearInitialized() { bInitialized = sal_False; }
-inline void SetInitialized(){ bInitialized = sal_True; }
+inline bool IsInitialized() const { return bInitialized; }
+inline void ClearInitialized() { bInitialized = false; }
+inline void SetInitialized(){ bInitialized = true; }
/// Get name.
virtual const rtl::OUString& GetPar1() const;
@@ -130,7 +130,7 @@ inline void SwDBField::SetExpansion(const String& rStr)
{ aContent = rStr; }
/// set from UpdateExpFlds (the Node-Position is known there)
-inline void SwDBField::ChgBodyTxtFlag( sal_Bool bIsInBody )
+inline void SwDBField::ChgBodyTxtFlag( bool bIsInBody )
{ bIsInBodyTxt = bIsInBody; }
/*
@@ -182,7 +182,7 @@ public:
class SW_DLLPUBLIC SwDBNextSetField : public SwDBNameInfField
{
rtl::OUString aCond;
-sal_BoolbCondValid;
+boolbCondValid;
public:
SwDBNextSetField( SwDBNextSetFieldType*,
@@ -192,8 +192,8 @@ public:
virtual SwField*Copy() const;
voidEvaluate(SwDoc*);
-inline void SetCondValid(sal_Bool bCond);
-inline sal_Bool IsCondValid() const;
+inline void SetCondValid(bool bCond);
+inline bool IsCondValid() const;
// Condition
virtual const rtl::OUString& GetPar1() const;
@@ -202,10 +202,10 @@ public:
virtual boolPutValue( const com::sun::star::uno::Any& rVal,
sal_uInt16 nWhich );
};
-inline sal_Bool SwDBNextSetField::IsCondValid() const
+inline bool SwDBNextSetField::IsCondValid() const
{ return bCondValid; }
-inline void SwDBNextSetField::SetCondValid(sal_Bool bCond)
+inline void SwDBNextSetField::SetCondValid(bool bCond)
{ bCondValid = bCond; }
/*
@@ -229,7 +229,7 @@ class SwDBNumSetField : public SwDBNameInfField
{
rtl::O
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx |4 +-
sw/inc/editsh.hxx|2 -
sw/inc/sortopt.hxx |6 ++--
sw/source/core/doc/poolfmt.cxx | 12
sw/source/core/doc/sortopt.cxx |6 ++--
sw/source/core/edit/edfmt.cxx|2 -
sw/source/core/unocore/unoobj.cxx|8 ++---
sw/source/filter/html/htmlnum.cxx|4 +-
sw/source/filter/html/htmltab.cxx|2 -
sw/source/filter/html/svxcss1.cxx|4 +-
sw/source/filter/html/svxcss1.hxx|8 ++---
sw/source/filter/inc/wrtswtbl.hxx|2 -
sw/source/filter/writer/wrtswtbl.cxx |2 -
sw/source/filter/ww1/w1class.hxx |4 +-
sw/source/filter/xml/xmltbli.cxx |2 -
sw/source/ui/app/docstyle.cxx| 10 +++
sw/source/ui/config/cfgitems.cxx |2 -
sw/source/ui/dbui/dbtree.cxx |2 -
sw/source/ui/fldui/fldvar.cxx| 20 +++---
sw/source/ui/inc/cfgitems.hxx| 48 +--
20 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit 5bac137d48c2436316043ca2be558b9eb00fe87d
Author: Takeshi Abe
Date: Thu Nov 15 00:01:03 2012 +0900
sal_Bool to bool
Change-Id: I95a8effcc90a9651e30dc43f8db6edeaa7ace5ef
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ca5efc9..28f06ff 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1303,8 +1303,8 @@ public:
void ReplaceCompatabilityOptions(const SwDoc& rSource);
/// Query if style (paragraph- / character- / frame- / page-) is used.
-sal_Bool IsUsed( const SwModify& ) const;
-sal_Bool IsUsed( const SwNumRule& ) const;
+bool IsUsed( const SwModify& ) const;
+bool IsUsed( const SwNumRule& ) const;
/// Set name of newly loaded document template.
sal_uInt16 SetDocPattern( const String& rPatternName );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index a0c0ebb..d1a0fe9 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -363,7 +363,7 @@ public:
SwPageDesc* GetPageDescFromPool( sal_uInt16 nId );
/// Query if the paragraph-/character-/frame-/page-style is used.
-sal_Bool IsUsed( const SwModify& ) const;
+bool IsUsed( const SwModify& ) const;
/// @return required automatic format.
SwFrmFmt* GetFrmFmtFromPool( sal_uInt16 nId )
diff --git a/sw/inc/sortopt.hxx b/sw/inc/sortopt.hxx
index 2fa4623..a0da917 100644
--- a/sw/inc/sortopt.hxx
+++ b/sw/inc/sortopt.hxx
@@ -45,7 +45,7 @@ struct SW_DLLPUBLIC SwSortKey
String sSortType;
SwSortOrder eSortOrder;
sal_uInt16 nColumnId;
-sal_BoolbIsNumeric;
+boolbIsNumeric;
};
typedef std::vector SwSortKeys;
@@ -60,8 +60,8 @@ struct SW_DLLPUBLIC SwSortOptions
SwSortDirection eDirection;
sal_Unicode cDeli;
sal_uInt16 nLanguage;
-sal_BoolbTable;
-sal_BoolbIgnoreCase;
+boolbTable;
+boolbIgnoreCase;
};
#endif // _SORTOPT_HXX
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index 03ea2f8..0a1a508 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -1149,7 +1149,7 @@ SwFmt* SwDoc::GetFmtFromPool( sal_uInt16 nId )
SwAttrSet aSet( GetAttrPool(), pWhichRange );
{
-sal_Bool bIsModified = IsModified();
+bool bIsModified = IsModified();
{
::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
@@ -1455,7 +1455,7 @@ SwPageDesc* SwDoc::GetPageDescFromPool( sal_uInt16 nId,
bool bRegardLanguage )
ResId aResId( sal_uInt32(RC_POOLPAGEDESC_BEGIN + nId -
RES_POOLPAGE_BEGIN), *pSwResMgr );
String aNm( aResId );
{
-sal_Bool bIsModified = IsModified();
+bool bIsModified = IsModified();
{
::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
@@ -1640,7 +1640,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( sal_uInt16 nId )
const SvxNumberFormat::SvxNumPositionAndSpaceMode
eNumberFormatPositionAndSpaceMode
= numfunc::GetDefaultPositionAndSpaceMode();
//#i89178#
{
-sal_Bool bIsModified = IsModified();
+bool bIsModified = IsModified();
n = MakeNumRule( aNm, 0, false, eNumberFormatPositionAndSpaceMode );
@@ -2295,7 +2295,7 @@ bool SwDoc::IsPoolPageDescUsed( sal_uInt16 nId ) const
}
// See if the Paragraph/Character/Frame/Page style is in use
-sal_Bool SwDoc::IsUsed( const SwModify& rModify ) const
+bool SwDoc::IsUsed( const SwModify& rModify ) const
{
// Check if we have dependent ContentNodes in the Nodes array
// (also indirect ones for derived Formats)
@@ -2304,9 +2304,9 @@ sal_Bool SwDoc::IsUsed( const SwModify& rModify ) const
}
// See if the NumRule is used
-sal_Bool SwDoc::IsUsed( const SwNumRule& rRule ) const
+bool SwDoc::IsUsed( const SwNumRule& rRule ) const
{
-sal_Bool bUsed = rRule.GetTxtNodeLis
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/calbck.hxx |6 +++---
sw/inc/docufld.hxx |2 +-
sw/inc/fchrfmt.hxx |2 +-
sw/inc/fmtfld.hxx |2 +-
sw/inc/format.hxx |2 +-
sw/inc/frmfmt.hxx |2 +-
sw/inc/node.hxx|2 +-
sw/inc/pagedesc.hxx|2 +-
sw/inc/paratr.hxx |2 +-
sw/inc/section.hxx |2 +-
sw/inc/swtable.hxx |2 +-
sw/inc/tox.hxx |2 +-
sw/inc/txtatr.hxx |2 +-
sw/inc/txtinet.hxx |2 +-
sw/source/core/attr/calbck.cxx | 14 +++---
sw/source/core/attr/format.cxx |5 ++---
sw/source/core/doc/doctxm.cxx |6 +++---
sw/source/core/docnode/node.cxx|8
sw/source/core/docnode/section.cxx |6 +++---
sw/source/core/fields/docufld.cxx |6 +++---
sw/source/core/inc/flyfrm.hxx |2 +-
sw/source/core/inc/pagefrm.hxx |2 +-
sw/source/core/inc/tabfrm.hxx |2 +-
sw/source/core/inc/txtfrm.hxx |2 +-
sw/source/core/layout/atrfrm.cxx |4 ++--
sw/source/core/layout/fly.cxx |6 +++---
sw/source/core/layout/pagechg.cxx |6 +++---
sw/source/core/layout/pagedesc.cxx |4 ++--
sw/source/core/layout/tabfrm.cxx |6 +++---
sw/source/core/para/paratr.cxx |4 ++--
sw/source/core/table/swtable.cxx |8
sw/source/core/text/txtfrm.cxx |6 +++---
sw/source/core/txtnode/atrfld.cxx |6 +++---
sw/source/core/txtnode/fmtatr2.cxx |4 ++--
sw/source/core/txtnode/txtatr2.cxx | 12 ++--
35 files changed, 75 insertions(+), 76 deletions(-)
New commits:
commit eb020150e174335a9956f5259ddced0026163373
Author: Takeshi Abe
Date: Wed Nov 7 10:56:27 2012 +0900
sal_Bool to bool
Change-Id: Ia1001ff0f4778bdf5e22bf2800f533dfba80c048
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index d360c51..75e3ead 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -118,7 +118,7 @@ public:
TYPEINFO();
// get information about attribute
-virtual sal_Bool GetInfo( SfxPoolItem& ) const;
+virtual bool GetInfo( SfxPoolItem& ) const;
};
inline SwClient::SwClient() :
@@ -165,7 +165,7 @@ public:
const SwClient* GetDepends() const { return pRoot; }
// get information about attribute
-virtual sal_Bool GetInfo( SfxPoolItem& ) const;
+virtual bool GetInfo( SfxPoolItem& ) const;
void LockModify() { bModifyLocked = sal_True; }
void UnlockModify() { bModifyLocked = sal_False; }
@@ -199,7 +199,7 @@ public:
SwClient* GetToTell() { return pToTell; }
/** get Client information */
-virtual sal_Bool GetInfo( SfxPoolItem & ) const;
+virtual bool GetInfo( SfxPoolItem & ) const;
protected:
virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNewValue
);
virtual void SwClientNotify( const SwModify& rModify, const SfxHint& rHint
);
diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 0f6158b..23233cd 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -152,7 +152,7 @@ class SwPageNumberFieldType : public SwFieldType
{
sal_Int16 nNumberingType;
sal_uInt16 nNum, nMax;
-sal_BoolbVirtuell;
+boolbVirtuell;
public:
SwPageNumberFieldType();
diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index 0a911f0..7253ec5 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -76,7 +76,7 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8
nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8
nMemberId = 0 );
-virtual sal_BoolGetInfo( SfxPoolItem& rInfo ) const;
+virtual boolGetInfo( SfxPoolItem& rInfo ) const;
void SetCharFmt( SwFmt* pFmt ) { pFmt->Add(this); }
SwCharFmt* GetCharFmt() const { return (SwCharFmt*)GetRegisteredIn(); }
diff --git a/sw/inc/fmtfld.hxx b/sw/inc/fmtfld.hxx
index 5cc7ddb..850de3f 100644
--- a/sw/inc/fmtfld.hxx
+++ b/sw/inc/fmtfld.hxx
@@ -75,7 +75,7 @@ public:
virtual int operator==( const SfxPoolItem& ) const;
virtual SfxPoolItem*Clone( SfxItemPool* pPool = 0 ) const;
-virtual sal_Bool GetInfo( SfxPoolItem& rInfo ) const;
+virtual bool GetInfo( SfxPoolItem& rInfo ) const;
const SwField *GetFld() const { return pField; }
SwField *GetFld() { return pField; }
diff --git a/sw/inc/format.hxx b/sw/inc/format.hxx
index 593cb55..8b8b61b 100644
--- a/sw/inc/format.hxx
+++ b/sw/inc/format.hxx
@@ -81,7 +81,7 @@ public:
/// Query format information.
-virtual sal_Bool GetInfo( SfxPoolItem& ) const;
+virtual bool GetInfo( SfxPoolItem& ) const;
/// Copy attributes even among documents.
void CopyAttrs( const SwFmt&, sal_Bool bReplace=sal_True )
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/bparr.hxx|7 ---
sw/source/core/bastyp/bparr.cxx | 22 --
2 files changed, 12 insertions(+), 17 deletions(-)
New commits:
commit 53a227a707a52f1109f7e69022558afd2486659a
Author: Matteo Casalin
Date: Fri Nov 2 10:20:36 2012 +0100
Don't play dirty tricks for const objects
Change-Id: I92c2362b71cf3614b091c893c0fdb3248edb3ddd
Reviewed-on: https://gerrit.libreoffice.org/973
Tested-by: Caolán McNamara
Reviewed-by: Caolán McNamara
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index 2a644d3..7ce0880 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -75,13 +75,14 @@ struct BlockInfo { // block info:
class SW_DLLPUBLIC BigPtrArray
{
-BlockInfo** ppInf; // block info
+BlockInfo** ppInf; // block info
sal_uLong nSize; ///< number of elements
sal_uInt16 nMaxBlock; ///< current max. number of blocks
sal_uInt16 nBlock; ///< number of blocks
-sal_uInt16 nCur; ///< last block
+mutable
+sal_uInt16 nCur; ///< last used block
-sal_uInt16 Index2Block( sal_uLong ) const; ///< block search
+sal_uInt16 Index2Block( sal_uLong ) const; ///< block search
BlockInfo* InsBlock( sal_uInt16 ); ///< insert block
voidBlockDel( sal_uInt16 ); ///< some blocks were deleted
voidUpdIndex( sal_uInt16 ); ///< recalculate indices
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 72d066e..49d196d 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -128,11 +128,8 @@ void BigPtrArray::ForEach( sal_uLong nStart, sal_uLong
nEnd,
ElementPtr BigPtrArray::operator[]( sal_uLong idx ) const
{
assert(idx < nSize); // operator[]: Index out of bounds
-// because this function is not :
-BigPtrArray* pThis = (BigPtrArray*) this;
-sal_uInt16 cur = Index2Block( idx );
-BlockInfo* p = ppInf[ cur ];
-pThis->nCur = cur;
+nCur = Index2Block( idx );
+BlockInfo* p = ppInf[ nCur ];
return p->pData[ idx - p->nStart ];
}
@@ -337,8 +334,8 @@ void BigPtrArray::Insert( const ElementPtr& rElem,
sal_uLong pos )
++( *--pTo = *--pFrom )->nOffset;
}
// insert element and update indices
-((ElementPtr&)rElem)->nOffset = sal_uInt16(pos);
-((ElementPtr&)rElem)->pBlock = p;
+rElem->nOffset = sal_uInt16(pos);
+rElem->pBlock = p;
p->pData[ pos ] = rElem;
p->nEnd++;
p->nElem++;
@@ -437,13 +434,10 @@ void BigPtrArray::Remove( sal_uLong pos, sal_uLong n )
void BigPtrArray::Replace( sal_uLong idx, const ElementPtr& rElem)
{
assert(idx < nSize); // Index out of bounds
-// because this function ist not :
-BigPtrArray* pThis = (BigPtrArray*) this;
-sal_uInt16 cur = Index2Block( idx );
-BlockInfo* p = ppInf[ cur ];
-pThis->nCur = cur;
-((ElementPtr&)rElem)->nOffset = sal_uInt16(idx - p->nStart);
-((ElementPtr&)rElem)->pBlock = p;
+nCur = Index2Block( idx );
+BlockInfo* p = ppInf[ nCur ];
+rElem->nOffset = sal_uInt16(idx - p->nStart);
+rElem->pBlock = p;
p->pData[ idx - p->nStart ] = rElem;
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx| 14 +-
sw/inc/editsh.hxx |4 +-
sw/inc/tox.hxx|2 -
sw/source/core/doc/docsort.cxx| 52 +++---
sw/source/core/doc/doctxm.cxx | 28 ++--
sw/source/core/docnode/ndsect.cxx |2 -
sw/source/core/edit/edglbldc.cxx |4 +-
sw/source/core/edit/edtox.cxx |6 ++--
sw/source/core/frmedt/fews.cxx|4 +-
sw/source/core/inc/UndoSort.hxx |2 -
sw/source/core/inc/docsort.hxx| 20 +++---
sw/source/core/inc/doctxm.hxx |2 -
sw/source/core/undo/unsort.cxx|2 -
sw/source/core/unocore/unoidx.cxx |4 +-
sw/source/ui/index/cnttab.cxx |2 -
sw/source/ui/shells/textidx.cxx |2 -
16 files changed, 75 insertions(+), 75 deletions(-)
New commits:
commit 91b2da3bc41a09a4d3bbc608268236a7e42f2685
Author: Takeshi Abe
Date: Tue Nov 6 14:59:50 2012 +0900
sal_Bool to bool
Change-Id: I3e8b7db8422680b865c10c7ead4ad782e2d5c5e1
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 372f8b6..0183d1f 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1391,18 +1391,18 @@ public:
const SwTOXBaseSection* InsertTableOf( const SwPosition& rPos,
const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0,
-sal_Bool bExpand = sal_False );
+bool bExpand = false );
const SwTOXBaseSection* InsertTableOf( sal_uLong nSttNd, sal_uLong nEndNd,
const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0
);
const SwTOXBase* GetCurTOX( const SwPosition& rPos ) const;
const SwAttrSet& GetTOXBaseAttrSet(const SwTOXBase& rTOX) const;
-sal_Bool DeleteTOX( const SwTOXBase& rTOXBase, sal_Bool bDelNodes =
sal_False );
+bool DeleteTOX( const SwTOXBase& rTOXBase, bool bDelNodes = false );
String GetUniqueTOXBaseName( const SwTOXType& rType,
const String* pChkStr = 0 ) const;
-sal_Bool SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName);
+bool SetTOXBaseName(const SwTOXBase& rTOXBase, const String& rName);
void SetTOXBaseProtection(const SwTOXBase& rTOXBase, sal_Bool bProtect);
/// After reading file update all tables/indices.
@@ -1433,15 +1433,15 @@ public:
const SwTOXType* InsertTOXType( const SwTOXType& rTyp );
const SwTOXTypes& GetTOXTypes() const { return *pTOXTypes; }
-const SwTOXBase*GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate =
sal_False );
+const SwTOXBase*GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false
);
voidSetDefaultTOXBase(const SwTOXBase& rBase);
/// Key for management of index.
sal_uInt16 GetTOIKeys( SwTOIKeyType eTyp, std::vector& rArr )
const;
/// Sort table text.
-sal_Bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
-sal_Bool SortText(const SwPaM&, const SwSortOptions&);
+bool SortTbl(const SwSelBoxes& rBoxes, const SwSortOptions&);
+bool SortText(const SwPaM&, const SwSortOptions&);
// Correct the SwPosition-Objects that are registered with the document
// e. g. ::com::sun::star::text::Bookmarks or tables/indices.
@@ -1753,7 +1753,7 @@ public:
SwSectionFmts& GetSections() { return *pSectionFmtTbl; }
const SwSectionFmts& GetSections() const { return *pSectionFmtTbl; }
SwSectionFmt *MakeSectionFmt( SwSectionFmt *pDerivedFrom );
-void DelSectionFmt( SwSectionFmt *pFmt, sal_Bool bDelNodes = sal_False );
+void DelSectionFmt( SwSectionFmt *pFmt, bool bDelNodes = false );
void UpdateSection(sal_uInt16 const nSect, SwSectionData &,
SfxItemSet const*const = 0, bool const bPreventLinkUpdate = false);
String GetUniqueSectionName( const String* pChkStr = 0 ) const;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 65c19b8..a0c0ebb 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -435,7 +435,7 @@ public:
sal_BoolUpdateTableOf(const SwTOXBase& rTOX,
const SfxItemSet* pSet = 0);
const SwTOXBase*GetCurTOX() const;
-const SwTOXBase*GetDefaultTOXBase( TOXTypes eTyp, sal_Bool bCreate =
sal_False );
+const SwTOXBase*GetDefaultTOXBase( TOXTypes eTyp, bool bCreate = false
);
voidSetDefaultTOXBase(const SwTOXBase& rBase);
sal_BoolIsTOXBaseReadonly(const SwTOXBase& rTOXBase) const;
@@ -443,7 +443,7 @@ public:
sal_uInt16 GetTOXCount() const;
const SwTOXBase*GetTOX( sal_uInt16 nPos ) const;
-sal_BoolDeleteTOX( const SwTOXBase& rTOXBase, sal_Bool
bDelNodes = sal_False );
+bool
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/txatritr.hxx | 14 +++---
sw/source/core/txtnode/txatritr.cxx | 18 +-
2 files changed, 16 insertions(+), 16 deletions(-)
New commits:
commit efda195ac9a5f52c7df9dba1ace6c53b8da0f260
Author: Matteo Casalin
Date: Sun Nov 4 11:38:23 2012 +0100
sal_Bool to bool
Change-Id: I8a4890c6b0e466417387a09259e32dff57c640d6
Reviewed-on: https://gerrit.libreoffice.org/979
Reviewed-by: Norbert Thiebaud
Tested-by: Norbert Thiebaud
diff --git a/sw/inc/txatritr.hxx b/sw/inc/txatritr.hxx
index fd2c2fe..05ed48f 100644
--- a/sw/inc/txatritr.hxx
+++ b/sw/inc/txatritr.hxx
@@ -36,13 +36,13 @@ class SwScriptIterator
const String& rText;
xub_StrLen nChgPos;
sal_uInt16 nCurScript;
-sal_Bool bForward;
+bool bForward;
public:
SwScriptIterator( const String& rStr, xub_StrLen nStart = 0,
- sal_Bool bFrwrd = sal_True );
+ bool bFrwrd = true );
-sal_Bool Next();
+bool Next();
sal_uInt16 GetCurrScript() const{ return nCurScript; }
xub_StrLen GetScriptChgPos() const { return nChgPos; }
@@ -58,16 +58,16 @@ class SwTxtAttrIterator
const SfxPoolItem *pParaItem, *pCurItem;
xub_StrLen nChgPos;
sal_uInt16 nAttrPos, nWhichId;
-sal_Bool bIsUseGetWhichOfScript;
+bool bIsUseGetWhichOfScript;
void AddToStack( const SwTxtAttr& rAttr );
void SearchNextChg();
public:
SwTxtAttrIterator( const SwTxtNode& rTxtNd, sal_uInt16 nWhichId,
-xub_StrLen nStart = 0, sal_Bool bUseGetWhichOfScript =
sal_True );
+xub_StrLen nStart = 0, bool bUseGetWhichOfScript =
true );
-sal_Bool Next();
+bool Next();
const SfxPoolItem& GetAttr() const { return *pCurItem; }
xub_StrLen GetChgPos() const{ return nChgPos; }
@@ -79,7 +79,7 @@ class SwLanguageIterator : public SwTxtAttrIterator
public:
SwLanguageIterator( const SwTxtNode& rTxtNode, xub_StrLen nStart = 0,
sal_uInt16 nWhich = RES_CHRATR_LANGUAGE,
-sal_Bool bUseGetWhichOfScript = sal_True )
+bool bUseGetWhichOfScript = true )
: SwTxtAttrIterator( rTxtNode, nWhich, nStart, bUseGetWhichOfScript )
{}
diff --git a/sw/source/core/txtnode/txatritr.cxx
b/sw/source/core/txtnode/txatritr.cxx
index 5391295..cdb40b7 100644
--- a/sw/source/core/txtnode/txatritr.cxx
+++ b/sw/source/core/txtnode/txatritr.cxx
@@ -32,7 +32,7 @@
using namespace ::com::sun::star::i18n;
-SwScriptIterator::SwScriptIterator( const String& rStr, xub_StrLen nStt,
sal_Bool bFrwrd )
+SwScriptIterator::SwScriptIterator( const String& rStr, xub_StrLen nStt, bool
bFrwrd )
: rText( rStr ),
nChgPos( rStr.Len() ),
nCurScript( ScriptType::WEAK ),
@@ -65,9 +65,9 @@ SwScriptIterator::SwScriptIterator( const String& rStr,
xub_StrLen nStt, sal_Boo
}
}
-sal_Bool SwScriptIterator::Next()
+bool SwScriptIterator::Next()
{
-sal_Bool bRet = sal_False;
+bool bRet = false;
if( pBreakIt->GetBreakIter().is() )
{
if ( bForward && nChgPos < rText.Len() )
@@ -75,7 +75,7 @@ sal_Bool SwScriptIterator::Next()
nCurScript = pBreakIt->GetBreakIter()->getScriptType( rText,
nChgPos );
nChgPos = (xub_StrLen)pBreakIt->GetBreakIter()->endOfScript(
rText, nChgPos, nCurScript );
-bRet = sal_True;
+bRet = true;
}
else if ( ! bForward && nChgPos )
{
@@ -83,7 +83,7 @@ sal_Bool SwScriptIterator::Next()
nCurScript = pBreakIt->GetBreakIter()->getScriptType( rText,
nChgPos );
nChgPos = (xub_StrLen)pBreakIt->GetBreakIter()->beginOfScript(
rText, nChgPos, nCurScript );
-bRet = sal_True;
+bRet = true;
}
}
else
@@ -95,7 +95,7 @@ sal_Bool SwScriptIterator::Next()
SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode& rTNd, sal_uInt16
nWhchId,
xub_StrLen nStt,
-sal_Bool bUseGetWhichOfScript )
+bool bUseGetWhichOfScript )
: aSIter( rTNd.GetTxt(), nStt ), rTxtNd( rTNd ),
pParaItem( 0 ), nChgPos( nStt ), nAttrPos( 0 ), nWhichId( nWhchId ),
bIsUseGetWhichOfScript( bUseGetWhichOfScript )
@@ -103,12 +103,12 @@ SwTxtAttrIterator::SwTxtAttrIterator( const SwTxtNode&
rTNd, sal_uInt16 nWhchId,
SearchNextChg();
}
-sal_Bool SwTxtAttrIterator::Next()
+bool SwTxtAttrIterator::Next()
{
-sal_Bool bRet = sal_False;
+bool bRet = false;
if( nChgPos < aSIter.GetText().Len() )
{
-bRet = sal_True;
+bRet = true;
if( !aStack.empty() )
{
do {
___
Libreoffice-commits mailing list
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/node.hxx | 10 +-
sw/source/core/docnode/node.cxx |6 +++---
2 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit a4ec5de5ed537604ef0229990dc449821ad13a4f
Author: Michael Stahl
Date: Thu Nov 1 18:46:02 2012 +0100
SwNode: reorder that to avoid -Werror=reorder
Change-Id: Ic58a5503dc6b7991c8804feef05b814d1055bfb9
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 003d7b6..35ba3f2 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -91,11 +91,6 @@ class SW_DLLPUBLIC SwNode
{
friend class SwNodes;
-#ifdef DBG_UTIL
-static long s_nSerial;
-long m_nSerial;
-#endif
-
sal_uInt8 nNodeType;
/// For text nodes: level of auto format. Was put here because we had
still free bits.
@@ -103,6 +98,11 @@ class SW_DLLPUBLIC SwNode
bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent.
bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag
+#ifdef DBG_UTIL
+static long s_nSerial;
+long m_nSerial;
+#endif
+
protected:
SwStartNode* pStartOfSection;
diff --git a/sw/source/core/docnode/node.cxx b/sw/source/core/docnode/node.cxx
index 98afd80..eea21de 100644
--- a/sw/source/core/docnode/node.cxx
+++ b/sw/source/core/docnode/node.cxx
@@ -309,10 +309,10 @@ SwNode::SwNode( const SwNodeIndex &rWhere, const
sal_uInt8 nNdType )
, nAFmtNumLvl( 0 )
, bSetNumLSpace( false )
, bIgnoreDontExpand( false)
-, pStartOfSection( 0 )
#ifdef DBG_UTIL
, m_nSerial( s_nSerial++)
#endif
+, pStartOfSection( 0 )
{
SwNodes& rNodes = const_cast (rWhere.GetNodes());
if( rWhere.GetIndex() )
@@ -341,10 +341,10 @@ SwNode::SwNode( SwNodes& rNodes, sal_uLong nPos, const
sal_uInt8 nNdType )
, nAFmtNumLvl( 0 )
, bSetNumLSpace( false )
, bIgnoreDontExpand( false)
-, pStartOfSection( 0 )
#ifdef DBG_UTIL
-,m_nSerial( s_nSerial++)
+, m_nSerial( s_nSerial++)
#endif
+, pStartOfSection( 0 )
{
if( nPos )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/crsrsh.hxx |6 +-- sw/inc/doc.hxx | 24 ++--- sw/inc/editsh.hxx |4 +- sw/source/core/crsr/crsrsh.cxx |2 - sw/source/core/crsr/crstrvl.cxx|8 ++-- sw/source/core/doc/docglos.cxx |2 - sw/source/core/doc/doclay.cxx | 34 +- sw/source/core/doc/docnew.cxx |4 +- sw/source/core/doc/docnum.cxx | 68 ++--- sw/source/core/edit/ednumber.cxx | 14 +++ sw/source/core/frmedt/fefly1.cxx |2 - sw/source/core/undo/SwUndoFmt.cxx |8 ++-- sw/source/core/unocore/unoobj2.cxx |2 - sw/source/filter/html/htmlfly.cxx |2 - sw/source/filter/ww8/wrtww8gr.cxx |2 - sw/source/ui/shells/basesh.cxx |4 +- sw/source/ui/uiview/viewtab.cxx|8 ++-- 17 files changed, 97 insertions(+), 97 deletions(-) New commits: commit 3034266024e492f7c71dd52265429abd9df10a47 Author: Takeshi Abe Date: Thu Nov 1 08:19:50 2012 +0900 sal_Bool to bool Change-Id: I10f8d534d664c5f27a32214c00aeee890d993d18 diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx index d404424..138e94d 100644 --- a/sw/inc/crsrsh.hxx +++ b/sw/inc/crsrsh.hxx @@ -612,8 +612,8 @@ public: sal_Bool SelTbl(); -sal_Bool GotoNextNum(); -sal_Bool GotoPrevNum(); +bool GotoNextNum(); +bool GotoPrevNum(); bool GotoOutline( const String& rName ); // to the next/previous or the given OutlineNode @@ -805,7 +805,7 @@ public: const SwRedline* GotoRedline( sal_uInt16 nArrPos, sal_Bool bSelect = sal_False ); // is cursor or the point in/over a vertical formatted text? -sal_Bool IsInVerticalText( const Point* pPt = 0 ) const; +bool IsInVerticalText( const Point* pPt = 0 ) const; // is cursor or the point in/over a right to left formatted text? sal_Bool IsInRightToLeftText( const Point* pPt = 0 ) const; diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx index d90646e..86f90b5 100644 --- a/sw/inc/doc.hxx +++ b/sw/inc/doc.hxx @@ -601,7 +601,7 @@ private: // COMPATIBILITY FLAGS END // -sal_BoolmbStartIdleTimer; ///< idle timer mode start/stop +boolmbStartIdleTimer; ///< idle timer mode start/stop boolmbSetDrawDefaults; ///< set draw pool defaults for freshly created documents @@ -1046,8 +1046,8 @@ public: ( Start < Pos < End ) !!! (Required for Writers.) */ void GetAllFlyFmts( SwPosFlyFrms& rPosFlyFmts, const SwPaM* = 0, -sal_Bool bDrawAlso = sal_False, -sal_Bool bAsCharAlso = sal_False ) const; +bool bDrawAlso = false, +bool bAsCharAlso = false ) const; /// Because swrtf.cxx and define private public here now. SwFlyFrmFmt *MakeFlyFrmFmt (const String &rFmtName, SwFrmFmt *pDerivedFrom); @@ -1070,7 +1070,7 @@ public: const SwPosition* pAnchorPos, const SfxItemSet* pSet = 0, SwFrmFmt *pParent = 0, - sal_Bool bCalledFromShell = sal_False ); + bool bCalledFromShell = false ); SwFlyFrmFmt* MakeFlyAndMove( const SwPaM& rPam, const SfxItemSet& rSet, const SwSelBoxes* pSelBoxes = 0, SwFrmFmt *pParent = 0 ); @@ -1133,7 +1133,7 @@ public: bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const; short GetTextDirection( const SwPosition& rPos, const Point* pPt = 0 ) const; -sal_Bool IsInVerticalText( const SwPosition& rPos, +bool IsInVerticalText( const SwPosition& rPos, const Point* pPt = 0 ) const; /** Database and DB-Manager @@ -1522,20 +1522,20 @@ public: SwNumRule* FindNumRulePtr( const String& rName ) const; /// Deletion only possible if ::com::sun::star::chaos::Rule is not used! -sal_Bool RenameNumRule(const String & aOldName, const String & aNewName, - sal_Bool bBroadcast = sal_False); -sal_Bool DelNumRule( const String& rName, sal_Bool bBroadCast = sal_False ); +bool RenameNumRule(const String & aOldName, const String & aNewName, + bool bBroadcast = false); +bool DelNumRule( const String& rName, bool bBroadCast = false ); String GetUniqueNumRuleName( const String* pChkStr = 0, sal_Bool bAutoNum = sal_True ) const; void UpdateNumRule(); /// Update all invalids. void ChgNumRuleFmts( const SwNumRule& rRule, const String * pOldName = 0 ); -sal_Bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule, +bool ReplaceNumRule( const SwPosition& rPos, const String& rOldRule, const String& rNewRule ); /// Goto next/previous on same level. -
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx| 10 +-
sw/inc/editsh.hxx |2 +-
sw/inc/ftninfo.hxx|4 ++--
sw/inc/ndtxt.hxx |4 ++--
sw/source/core/doc/docfmt.cxx |8
sw/source/core/doc/docftn.cxx | 30 +++---
sw/source/core/doc/docglos.cxx|6 +++---
sw/source/core/doc/doclay.cxx |8
sw/source/core/edit/editsh.cxx|6 +++---
sw/source/core/frmedt/fecopy.cxx |8
sw/source/core/table/swtable.cxx |4 ++--
sw/source/core/txtnode/ndtxt.cxx |8
sw/source/core/undo/SwUndoFmt.cxx |4 ++--
sw/source/core/undo/unattr.cxx|4 ++--
sw/source/ui/dochdl/gloshdl.cxx |6 +++---
sw/source/ui/inc/gloshdl.hxx |2 +-
sw/source/ui/shells/textglos.cxx |2 +-
17 files changed, 58 insertions(+), 58 deletions(-)
New commits:
commit a94b902736ad2cc74224cad4ae64f83880ece632
Author: Takeshi Abe
Date: Sun Oct 28 23:38:30 2012 +0900
sal_Bool to bool
Change-Id: Ia71a4dc13e09a5fc42c282efc2b0d46b2ff007ab
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index b124a5a..6dc4bf2 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1198,7 +1198,7 @@ public:
const SfxPoolItem& GetDefault( sal_uInt16 nFmtHint ) const;
/// Do not expand text attributes.
-sal_Bool DontExpandFmt( const SwPosition& rPos, sal_Bool bFlag = sal_True
);
+bool DontExpandFmt( const SwPosition& rPos, bool bFlag = true );
/* Formats */
const SwFrmFmts* GetFrmFmts() const { return pFrmFmtTbl; }
@@ -1326,7 +1326,7 @@ public:
void SetGlossaryDoc( SwDoc* pDoc ) { pGlossaryDoc = pDoc; }
/// travel over PaM Ring
-sal_Bool InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
+bool InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
SwPaM& rPaM, SwCrsrShell* pShell = 0);
/** get the set of printable pages for the XRenderable API by
@@ -1925,8 +1925,8 @@ public:
void Unchain( SwFrmFmt &rFmt );
// For Copy/Move from FrmShell.
-SdrObject* CloneSdrObj( const SdrObject&, sal_Bool bMoveWithinDoc =
sal_False,
-sal_Bool bInsInPage = sal_True );
+SdrObject* CloneSdrObj( const SdrObject&, bool bMoveWithinDoc = false,
+bool bInsInPage = true );
//
// FeShell - Interface end --
@@ -1995,7 +1995,7 @@ public:
void ChgFmt(SwFmt & rFmt, const SfxItemSet & rSet);
void RenameFmt(SwFmt & rFmt, const String & sNewName,
- sal_Bool bBroadcast = sal_False);
+ bool bBroadcast = false);
/// Change a TOX undoable.
void ChgTOX(SwTOXBase & rTOX, const SwTOXBase & rNew);
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 2c76a42..1a73025 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -234,7 +234,7 @@ public:
/** If Cursor is at the end of a character style in which the
DontExpand-flag
is not yet set, the latter will be set (==> return TRUE). */
-sal_Bool DontExpandFmt();
+bool DontExpandFmt();
/** Apply / remove attributes.
@return attributs in required AttributeSet.
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index cccd6f7..b72338d 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -69,7 +69,7 @@ public:
SwClient *GetAnchorCharFmtDep() const { return
(SwClient*)&aAnchorCharFmtDep; }
SwEndNoteInfo & operator=(const SwEndNoteInfo&);
-sal_Bool operator==( const SwEndNoteInfo &rInf ) const;
+bool operator==( const SwEndNoteInfo &rInf ) const;
SwEndNoteInfo( SwTxtFmtColl *pTxtColl = 0);
SwEndNoteInfo(const SwEndNoteInfo&);
@@ -107,7 +107,7 @@ public:
SwFtnInfo& operator=(const SwFtnInfo&);
-sal_Bool operator==( const SwFtnInfo &rInf ) const;
+bool operator==( const SwFtnInfo &rInf ) const;
SwFtnInfo(SwTxtFmtColl* pTxtColl = 0);
SwFtnInfo(const SwFtnInfo&);
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index 603522c..895ff87 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -348,8 +348,8 @@ public:
SwCntntNode *AppendNode( const SwPosition & );
/// When appropriate set DontExpand-flag at INet or character styles
respectively.
-sal_Bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true,
-sal_Bool bFmtToTxtAttributes = sal_True );
+bool DontExpandFmt( const SwIndex& rIdx, bool bFlag = true,
+bool bFmtToTxtAttributes = true );
enum GetTxtAttrMode {
DEFAULT,/// DEFAULT: (Start < nIndex <= End)
diff --git a/sw/source/core/doc/docfmt.cxx b/sw/source/core/doc/docfmt.cxx
index bbf9aae..94e2758 100644
--- a/sw/source/core/doc/docfmt.cxx
+++ b/sw/source/core/doc/docfmt.cxx
@@ -375,7 +375,7 @@ void SwDoc::ResetAttrs( const SwPaM &rRg,
{
nPtPos = nMkPos = rSt.GetInde
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx | 34
sw/inc/editsh.hxx|6 ++--
sw/inc/format.hxx|6 ++--
sw/source/core/doc/docfmt.cxx| 48 +--
sw/source/core/doc/poolfmt.cxx |6 ++--
sw/source/core/edit/edattr.cxx | 10 +++
sw/source/core/inc/UndoAttribute.hxx |2 -
sw/source/core/undo/SwUndoFmt.cxx| 12
sw/source/core/undo/unattr.cxx |2 -
sw/source/filter/html/htmlcss1.cxx | 10 +++
sw/source/filter/ww8/ww8par3.cxx |3 --
sw/source/ui/app/docstyle.cxx|4 +-
sw/source/ui/config/uinums.cxx |2 -
sw/source/ui/dbui/dbmgr.cxx |6 ++--
sw/source/ui/shells/textsh1.cxx |4 +-
sw/source/ui/uiview/view2.cxx|2 -
16 files changed, 78 insertions(+), 79 deletions(-)
New commits:
commit 9e44e1a819cb919015a8e268029b7e979300ed5c
Author: Takeshi Abe
Date: Thu Oct 25 17:01:26 2012 +0900
sal_Bool to bool
Change-Id: I8b76ba6d6a27cebefca3307a648bd5baafd27262
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 2e7357c..b124a5a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -637,7 +637,7 @@ private:
const bool bCopyFlyAtFly = false ) const;
sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool
bNewFrms );
-typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, sal_Bool,
sal_Bool );
+typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, bool, bool );
SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
FNCopyFmt fnCopyFmt, const SwFmt& rDfltFmt );
void CopyFmtArr( const SwFmtsBase& rSourceArr, SwFmtsBase& rDestArr,
@@ -697,9 +697,9 @@ private:
void DoUpdateAllCharts();
DECL_LINK( DoUpdateModifiedOLE, Timer * );
- SwFmt *_MakeCharFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
- SwFmt *_MakeFrmFmt(const String &, SwFmt *, sal_Bool, sal_Bool );
- SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, sal_Bool, sal_Bool );
+ SwFmt *_MakeCharFmt(const String &, SwFmt *, bool, bool );
+ SwFmt *_MakeFrmFmt(const String &, SwFmt *, bool, bool );
+ SwFmt *_MakeTxtFmtColl(const String &, SwFmt *, bool, bool );
void InitTOXTypes();
void Paste( const SwDoc& );
@@ -1225,14 +1225,14 @@ public:
void RemoveAllFmtLanguageDependencies();
SwFrmFmt *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom,
- sal_Bool bBroadcast = sal_False, sal_Bool bAuto =
sal_True);
+ bool bBroadcast = false, bool bAuto = true);
void DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
SwFrmFmt* FindFrmFmtByName( const String& rName ) const
{ return (SwFrmFmt*)FindFmtByName( (SwFmtsBase&)*pFrmFmtTbl, rName
); }
SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
- sal_Bool bBroadcast = sal_False,
- sal_Bool bAuto = sal_True );
+ bool bBroadcast = false,
+ bool bAuto = true );
void DelCharFmt(sal_uInt16 nFmt, bool bBroadcast = false);
void DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
SwCharFmt* FindCharFmtByName( const String& rName ) const
@@ -1244,13 +1244,13 @@ public:
const SwTxtFmtColls *GetTxtFmtColls() const { return pTxtFmtCollTbl; }
SwTxtFmtColl *MakeTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
- sal_Bool bBroadcast = sal_False,
- sal_Bool bAuto = sal_True );
+ bool bBroadcast = false,
+ bool bAuto = true );
SwConditionTxtFmtColl* MakeCondTxtFmtColl( const String &rFmtName,
SwTxtFmtColl *pDerivedFrom,
- sal_Bool bBroadcast =
sal_False);
-void DelTxtFmtColl(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False);
-void DelTxtFmtColl( SwTxtFmtColl* pColl, sal_Bool bBroadcast = sal_False );
+ bool bBroadcast = false);
+void DelTxtFmtColl(sal_uInt16 nFmt, bool bBroadcast = false);
+void DelTxtFmtColl( SwTxtFmtColl* pColl, bool bBroadcast = false );
/** Add 4th optional parameter .
'side effect' of with is that the hard
attributes of the affected text nodes are cleared, except the break
@@ -1258,7 +1258,7 @@ public:
The new parameter indicates, if the list attributes
(list style, restart at and restart with) are cleared as well in case
that and the paragraph style has a list style attribute
set. */
-sal_Bool SetTxtFmtColl( const SwPaM &rRg, SwTxtFmtColl *pFmt,
+bool SetTxtFmtColl( const SwPaM &rRg, S
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx| 20 ++--
sw/inc/editsh.hxx |4 ++--
sw/inc/fesh.hxx |4 ++--
sw/source/core/SwNumberTree/SwNodeNum.cxx |2 +-
sw/source/core/doc/docfly.cxx | 14 +++---
sw/source/core/doc/docfmt.cxx | 26 +-
sw/source/core/doc/docnum.cxx |4 ++--
sw/source/core/doc/docruby.cxx|2 +-
sw/source/core/edit/edatmisc.cxx |2 +-
sw/source/core/edit/edfmt.cxx |4 ++--
sw/source/core/frmedt/feshview.cxx|4 ++--
sw/source/core/txtnode/ndtxt.cxx |2 +-
sw/source/core/undo/SwUndoFmt.cxx |8
sw/source/core/undo/unattr.cxx|4 ++--
sw/source/core/undo/unspnd.cxx|2 +-
sw/source/core/unocore/unochart.cxx |4 ++--
sw/source/core/unocore/unocoll.cxx| 20 ++--
sw/source/core/unocore/unocrsrhelper.cxx |2 +-
sw/source/core/unocore/unodraw.cxx|6 +++---
sw/source/core/unocore/unoobj.cxx |8
sw/source/core/unocore/unoparagraph.cxx |4 ++--
sw/source/ui/shells/drwbassh.cxx |4 ++--
sw/source/ui/utlui/content.cxx|8
23 files changed, 79 insertions(+), 79 deletions(-)
New commits:
commit cc64715977062d77ba9e3cb1c95138b0cc7639f8
Author: Takeshi Abe
Date: Tue Oct 23 18:35:04 2012 +0900
sal_Bool to bool
Change-Id: I47f376f431276396a9f3168a5e39e2c9e9e55cbe
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 88f13a8..2e7357c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1175,10 +1175,10 @@ public:
Introduce new optional parameter in order to
control, if the side effect "send data changed events" is triggered or
not. */
void ResetAttrs( const SwPaM &rRg,
- sal_Bool bTxtAttr = sal_True,
+ bool bTxtAttr = true,
const std::set &rAttrs =
std::set(),
const bool bSendDataChangedEvents = true );
-void RstTxtAttrs(const SwPaM &rRg, sal_Bool bInclRefToxMark = sal_False );
+void RstTxtAttrs(const SwPaM &rRg, bool bInclRefToxMark = false );
/** Set attribute in given format.
If Undo is activated, the old one is listed in Undo-History. */
@@ -1226,15 +1226,15 @@ public:
SwFrmFmt *MakeFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom,
sal_Bool bBroadcast = sal_False, sal_Bool bAuto =
sal_True);
-void DelFrmFmt( SwFrmFmt *pFmt, sal_Bool bBroadcast = sal_False );
+void DelFrmFmt( SwFrmFmt *pFmt, bool bBroadcast = false );
SwFrmFmt* FindFrmFmtByName( const String& rName ) const
{ return (SwFrmFmt*)FindFmtByName( (SwFmtsBase&)*pFrmFmtTbl, rName
); }
SwCharFmt *MakeCharFmt(const String &rFmtName, SwCharFmt *pDerivedFrom,
sal_Bool bBroadcast = sal_False,
sal_Bool bAuto = sal_True );
-void DelCharFmt(sal_uInt16 nFmt, sal_Bool bBroadcast = sal_False);
-void DelCharFmt(SwCharFmt* pFmt, sal_Bool bBroadcast = sal_False);
+void DelCharFmt(sal_uInt16 nFmt, bool bBroadcast = false);
+void DelCharFmt(SwCharFmt* pFmt, bool bBroadcast = false);
SwCharFmt* FindCharFmtByName( const String& rName ) const
{ return (SwCharFmt*)FindFmtByName( (SwFmtsBase&)*pCharFmtTbl, rName
); }
@@ -1276,8 +1276,8 @@ public:
/// Table formating
const SwFrmFmts* GetTblFrmFmts() const { return pTblFrmFmtTbl; }
SwFrmFmts* GetTblFrmFmts(){ return pTblFrmFmtTbl; }
-sal_uInt16 GetTblFrmFmtCount( sal_Bool bUsed ) const;
-SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, sal_Bool bUsed ) const;
+sal_uInt16 GetTblFrmFmtCount( bool bUsed ) const;
+SwFrmFmt& GetTblFrmFmt(sal_uInt16 nFmt, bool bUsed ) const;
SwTableFmt* MakeTblFrmFmt(const String &rFmtName, SwFrmFmt *pDerivedFrom);
voidDelTblFrmFmt( SwTableFmt* pFmt );
SwTableFmt* FindTblFmtByName( const String& rName, sal_Bool bAll =
sal_False ) const;
@@ -1887,10 +1887,10 @@ public:
// FeShell - Interfaces ---
// !!! These assume always an existing layout !!!
-sal_Bool ChgAnchor( const SdrMarkList& _rMrkList,
+bool ChgAnchor( const SdrMarkList& _rMrkList,
RndStdIds _eAnchorType,
-const sal_Bool _bSameOnly,
-const sal_Bool _bPosCorr );
+const bool _bSameOnly,
+const bool _bPosCorr );
void SetRowHeight( const SwCursor& rCursor, const SwFmtFrmSize &rNew );
void GetRowHeight( const SwCursor& rCursor, SwFmtFrmSize *& rpSz ) const;
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index ba5fcbd..3b1c1bb 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx | 10 ++---
sw/inc/fesh.hxx |4 +-
sw/source/core/doc/docfld.cxx | 62 ++--
sw/source/core/doc/docfly.cxx | 26 +++
sw/source/core/doc/doclay.cxx |6 +--
sw/source/core/docnode/nodes.cxx|2 -
sw/source/core/frmedt/fefly1.cxx|8 ++--
sw/source/core/inc/docfld.hxx | 14
sw/source/core/text/txtfrm.cxx |2 -
sw/source/core/txtnode/thints.cxx |6 +--
sw/source/core/unocore/unoframe.cxx |4 +-
sw/source/ui/app/docst.cxx |2 -
sw/source/ui/docvw/edtwin.cxx |2 -
13 files changed, 74 insertions(+), 74 deletions(-)
New commits:
commit ec9e661988c81b0424d4e848d24c745a7dc9e5ad
Author: Takeshi Abe
Date: Mon Oct 22 12:53:09 2012 +0900
sal_Bool to bool
Change-Id: I71842ace16eb65b3269754cc36408fe52843b2ea
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 740659a..88f13a8 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -635,7 +635,7 @@ private:
const xub_StrLen nEndContentIndex,
const SwNodeIndex& rStartIdx,
const bool bCopyFlyAtFly = false ) const;
-sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, sal_Bool
bNewFrms );
+sal_Int8 SetFlyFrmAnchor( SwFrmFmt& rFlyFmt, SfxItemSet& rSet, bool
bNewFrms );
typedef SwFmt* (SwDoc:: *FNCopyFmt)( const String&, SwFmt*, sal_Bool,
sal_Bool );
SwFmt* CopyFmt( const SwFmt& rFmt, const SwFmtsBase& rFmtArr,
@@ -665,7 +665,7 @@ private:
void AddUsedDBToList( std::vector& rDBNameList,
const std::vector& rUsedDBNames );
void AddUsedDBToList( std::vector& rDBNameList, const String&
rDBName );
-sal_Bool IsNameInArray( const std::vector& rOldNames, const
String& rName );
+bool IsNameInArray( const std::vector& rOldNames, const String&
rName );
void GetAllDBNames( std::vector& rAllDBNames );
void ReplaceUsedDBs( const std::vector& rUsedDBNames,
const String& rNewName, String& rFormel );
@@ -1082,10 +1082,10 @@ public:
sal_Bool bDelRedlines = sal_True,
sal_Bool bCopyFlyAtFly = sal_False ) const;
-sal_Bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
+bool SetFlyFrmAttr( SwFrmFmt& rFlyFmt, SfxItemSet& rSet );
-sal_Bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
-SfxItemSet* pSet = 0, sal_Bool bKeepOrient = sal_False
);
+bool SetFrmFmtToFly( SwFrmFmt& rFlyFmt, SwFrmFmt& rNewFmt,
+SfxItemSet* pSet = 0, bool bKeepOrient = false );
void SetFlyFrmTitle( SwFlyFrmFmt& rFlyFrmFmt,
const String& sNewTitle );
void SetFlyFrmDescription( SwFlyFrmFmt& rFlyFrmFmt,
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index 17f4655..81ebaae 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -355,7 +355,7 @@ public:
sal_Bool IsFrmSelected() const;
sal_Bool GetFlyFrmAttr( SfxItemSet &rSet ) const;
-sal_Bool SetFlyFrmAttr( SfxItemSet &rSet );
+bool SetFlyFrmAttr( SfxItemSet &rSet );
sal_Bool ResetFlyFrmAttr( sal_uInt16 nWhich, const SfxItemSet* pSet = 0 );
const SwFrmFmt *NewFlyFrm( const SfxItemSet &rSet, sal_Bool bAnchValid =
sal_False,
SwFrmFmt *pParent = 0 );
@@ -368,7 +368,7 @@ public:
sal_Bool IsFrmVertical(const sal_Bool bEnvironment, sal_Bool&
bRightToLeft, sal_Bool& bVertL2R) const;
SwFrmFmt* GetCurFrmFmt() const; ///< If frame then frame style, else 0.
-void SetFrmFmt( SwFrmFmt *pFmt, sal_Bool bKeepOrient = sal_False, Point*
pDocPos = 0 ); ///< If frame then set frame style.
+void SetFrmFmt( SwFrmFmt *pFmt, bool bKeepOrient = false, Point* pDocPos =
0 ); ///< If frame then set frame style.
const SwFlyFrm *GetCurrFlyFrm() const { return FindFlyFrm(); }
/// Find/delete fly containing the cursor.
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index d57e8ac..18953ad 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -1227,8 +1227,8 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool
bUpdRefFlds )
if( IsExpFldsLocked() || IsInReading() )
return;
-sal_Bool bOldInUpdateFlds = pUpdtFlds->IsInUpdateFlds();
-pUpdtFlds->SetInUpdateFlds( sal_True );
+bool bOldInUpdateFlds = pUpdtFlds->IsInUpdateFlds();
+pUpdtFlds->SetInUpdateFlds( true );
pUpdtFlds->MakeFldList( *this, sal_True, GETFLD_ALL );
mbNewFldLst = sal_False;
@@ -1239,7 +1239,7 @@ void SwDoc::UpdateExpFlds( SwTxtFld* pUpdtFld, bool
bUpdRefFlds )
UpdateRefFlds(NULL);
pUpdtFlds->SetInUpdateFlds( bOldInUpdateFlds );
-pUpdtFlds->SetFieldsDirty( sal_False );
+pUpdtFlds->SetFieldsDirty( false );
return ;
}
@@
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx | 14 +-
sw/inc/node.hxx| 12
sw/source/core/doc/doccomp.cxx | 40 ++--
sw/source/core/doc/docdde.cxx | 18 ++--
sw/source/core/doc/docdesc.cxx | 46 -
sw/source/core/doc/docdraw.cxx | 12
sw/source/core/doc/docedt.cxx | 26 +-
sw/source/core/doc/docfld.cxx |2 -
sw/source/core/docnode/node.cxx|4 +-
sw/source/core/edit/autofmt.cxx|2 -
sw/source/core/fields/reffld.cxx |6 ++--
sw/source/core/inc/mvsave.hxx |4 +-
sw/source/core/inc/txmsrt.hxx | 20 +++---
sw/source/core/tox/txmsrt.cxx | 38 +--
sw/source/core/txtnode/ndtxt.cxx |8 ++---
sw/source/core/undo/SwUndoPageDesc.cxx |8 ++---
sw/source/core/undo/unovwr.cxx | 16 +--
sw/source/filter/rtf/swparrtf.cxx |2 -
sw/source/filter/ww1/fltshell.cxx |2 -
19 files changed, 140 insertions(+), 140 deletions(-)
New commits:
commit bb80f99092c4ad6d5015165a60f7a239dcb2fbff
Author: Takeshi Abe
Date: Sat Oct 20 23:12:12 2012 +0900
sal_Bool to bool
Change-Id: Ideb46a876ef74f505b71e2a788d5f8da50e251af
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index ff43c12..740659a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1365,13 +1365,13 @@ public:
SwPageDesc * GetPageDesc( const String & rName );
void ChgPageDesc( const String & rName, const SwPageDesc& );
void ChgPageDesc( sal_uInt16 i, const SwPageDesc& );
-sal_Bool FindPageDesc( const String & rName, sal_uInt16 * pFound );
-void DelPageDesc( const String & rName, sal_Bool bBroadcast = sal_False);
-void DelPageDesc( sal_uInt16 i, sal_Bool bBroadcast = sal_False );
+bool FindPageDesc( const String & rName, sal_uInt16 * pFound );
+void DelPageDesc( const String & rName, bool bBroadcast = false);
+void DelPageDesc( sal_uInt16 i, bool bBroadcast = false );
void PreDelPageDesc(SwPageDesc * pDel);
sal_uInt16 MakePageDesc( const String &rName, const SwPageDesc* pCpy = 0,
- sal_Bool bRegardLanguage = sal_True,
- sal_Bool bBroadcast = sal_False);
+ bool bRegardLanguage = true,
+ bool bBroadcast = false);
void BroadcastStyleOperation(String rName, SfxStyleFamily eFamily,
sal_uInt16 nOp);
@@ -1783,7 +1783,7 @@ public:
bool IsInLoadAsynchron() const { return mbInLoadAsynchron; }
void SetInLoadAsynchron( bool bFlag ) { mbInLoadAsynchron = bFlag; }
-sal_Bool SelectServerObj( const String& rStr, SwPaM*& rpPam,
+bool SelectServerObj( const String& rStr, SwPaM*& rpPam,
SwNodeRange*& rpRange ) const;
/// For Drag&Move: (e.g. allow "moving" of RefMarks)
@@ -1792,7 +1792,7 @@ public:
SwDrawContact* GroupSelection( SdrView& );
void UnGroupSelection( SdrView& );
-sal_Bool DeleteSelection( SwDrawView& );
+bool DeleteSelection( SwDrawView& );
/// Invalidates OnlineSpell-WrongLists.
void SpellItAgainSam( bool bInvalid, bool bOnlyWrong, bool bSmartTags );
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index 9ac3045..003d7b6 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -100,8 +100,8 @@ class SW_DLLPUBLIC SwNode
/// For text nodes: level of auto format. Was put here because we had
still free bits.
sal_uInt8 nAFmtNumLvl : 3;
-sal_Bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent.
-sal_Bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the
flag
+bool bSetNumLSpace : 1; ///< For numbering: TRUE: set indent.
+bool bIgnoreDontExpand : 1; ///< for Text Attributes - ignore the flag
protected:
SwStartNode* pStartOfSection;
@@ -133,11 +133,11 @@ public:
inline sal_uInt8 GetAutoFmtLvl() const { return nAFmtNumLvl; }
inline void SetAutoFmtLvl( sal_uInt8 nVal ) { nAFmtNumLvl = nVal; }
-inline sal_Bool IsSetNumLSpace() const { return bSetNumLSpace; }
-inline void SetNumLSpace( sal_Bool bFlag ){ bSetNumLSpace = bFlag;
}
+inline bool IsSetNumLSpace() const { return bSetNumLSpace; }
+inline void SetNumLSpace( bool bFlag ){ bSetNumLSpace = bFlag; }
-inline sal_Bool IsIgnoreDontExpand() const { return bIgnoreDontExpand; }
-inline void SetIgnoreDontExpand( sal_Bool bNew ) { bIgnoreDontExpand =
bNew; }
+inline bool IsIgnoreDontExpand() const { return bIgnoreDontExpand; }
+inline void SetIgnoreDontExpand( bool bNew ) { bIgnoreDontExpand = bNew; }
sal_uInt8 GetNodeType() const { return nNodeType; }
diff --git a/sw/source/core/doc/doccomp.cxx b/sw/source/core/doc/doccomp.cxx
index
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/crsrsh.hxx |4 ++--
sw/inc/doc.hxx |8
sw/inc/swtable.hxx |8
sw/source/core/crsr/trvltbl.cxx|8
sw/source/core/doc/doc.cxx |8
sw/source/core/doc/docbasic.cxx| 10 +-
sw/source/core/doc/docbm.cxx | 24
sw/source/core/doc/docchart.cxx|8 +++-
sw/source/core/doc/docedt.cxx |2 +-
sw/source/core/doc/doclay.cxx | 10 +-
sw/source/core/frmedt/feshview.cxx |6 +++---
sw/source/core/inc/mvsave.hxx |2 +-
sw/source/core/table/swtable.cxx |8
sw/source/ui/app/docsh2.cxx|2 +-
sw/source/ui/docvw/edtwin.cxx |4 ++--
sw/source/ui/inc/swtablerep.hxx|5 ++---
sw/source/ui/inc/wrtsh.hxx |2 +-
sw/source/ui/table/swtablerep.cxx |2 +-
sw/source/ui/wrtsh/wrtsh2.cxx |4 ++--
sw/source/ui/wrtsh/wrtsh3.cxx |2 +-
20 files changed, 62 insertions(+), 65 deletions(-)
New commits:
commit 329d3287272bf4715244a3c03ca008f049e9132f
Author: Takeshi Abe
Date: Fri Oct 19 03:59:48 2012 +0900
sal_Bool to bool
Change-Id: Id3be1fbf289f04e175bb2fdd71754cad0c9672ce
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index fc421d2..74bc64a 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -594,8 +594,8 @@ public:
inline const SwPaM* GetTblCrs() const;
inlineSwPaM* GetTblCrs();
-sal_Bool IsTblComplex() const;
-sal_Bool IsTblComplexForChart();
+bool IsTblComplex() const;
+bool IsTblComplexForChart();
// get current table selection as text
String GetBoxNms() const;
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9649c7e..ff43c12 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1125,12 +1125,12 @@ public:
void SetGlossDoc( bool bGlssDc = true ) { mbGlossDoc = bGlssDc; }
bool IsInsOnlyTextGlossary() const { return mbInsOnlyTxtGlssry; }
-void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, sal_Bool
bImpress );
+void Summary( SwDoc* pExtDoc, sal_uInt8 nLevel, sal_uInt8 nPara, bool
bImpress );
void ChangeAuthorityData(const SwAuthEntry* pNewData);
bool IsInCallModified() const { return mbInCallModified; }
-sal_Bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const;
+bool IsInHeaderFooter( const SwNodeIndex& rIdx ) const;
short GetTextDirection( const SwPosition& rPos,
const Point* pPt = 0 ) const;
sal_Bool IsInVerticalText( const SwPosition& rPos,
@@ -1812,11 +1812,11 @@ public:
const SwFmtINetFmt* FindINetAttr( const String& rName ) const;
/// Call into intransparent Basic; expect possible Return String.
-sal_Bool ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray*
pArgs = 0 );
+bool ExecMacro( const SvxMacro& rMacro, String* pRet = 0, SbxArray* pArgs
= 0 );
/// Call into intransparent Basic / JavaScript.
sal_uInt16 CallEvent( sal_uInt16 nEvent, const SwCallMouseEvent&
rCallEvent,
-sal_Bool bChkPtr = sal_False, SbxArray* pArgs = 0,
+bool bChkPtr = false, SbxArray* pArgs = 0,
const Link* pCallBack = 0 );
/** Adjust left margin via object bar (similar to adjustment of
numerations).
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 709fce4..d6192c3 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -299,11 +299,11 @@ public:
const SwTableBox* GetTblBox( sal_uLong nSttIdx ) const
{ return ((SwTable*)this)->GetTblBox( nSttIdx ); }
-// Returns sal_True if table contains nestings.
-sal_Bool IsTblComplex() const;
+// Returns true if table contains nestings.
+bool IsTblComplex() const;
-// Returns sal_True if table or selection is balanced.
-sal_Bool IsTblComplexForChart( const String& rSel ) const;
+// Returns true if table or selection is balanced.
+bool IsTblComplexForChart( const String& rSel ) const;
// Search all content-bearing boxes of the base line on which this box
stands.
// rBoxes as a return value for immediate use.
diff --git a/sw/source/core/crsr/trvltbl.cxx b/sw/source/core/crsr/trvltbl.cxx
index 8260d2f..be9a9dc 100644
--- a/sw/source/core/crsr/trvltbl.cxx
+++ b/sw/source/core/crsr/trvltbl.cxx
@@ -706,18 +706,18 @@ sal_Bool SwCrsrShell::MoveTable( SwWhichTable fnWhichTbl,
SwPosTable fnPosTbl )
}
-sal_Bool SwCrsrShell::IsTblComplex() const
+bool SwCrsrShell::IsTblComplex() const
{
SwFrm *pFrm = GetCurrFrm( sal_False );
if ( pFrm && pFrm->IsInTab() )
return pFrm->FindTabFrm()->GetTable()->IsTblComplex();
-return sal_False;
+return false;
}
-sal_Bool SwCrsrShell::IsTblComplexForChart()
+bool SwCrsrShell::IsTblComplexForChart()
{
-sal_Bool bRet = sal_False;
+bool bRet = false;
// Here we
[Libreoffice-commits] .: sw/inc sw/qa sw/source
sw/inc/acmplwrd.hxx |2 +-
sw/inc/bparr.hxx|2 +-
sw/inc/doc.hxx |2 +-
sw/inc/ndarr.hxx|2 +-
sw/inc/swmodule.hxx |4 ++--
sw/qa/core/Test-BigPtrArray.cxx |2 +-
sw/source/core/bastyp/SwSmartTagMgr.cxx |4 ++--
sw/source/core/doc/acmplwrd.cxx |2 +-
sw/source/core/doc/doc.cxx | 14 ++
sw/source/core/doc/docedt.cxx |6 +++---
sw/source/core/doc/docfmt.cxx | 12 ++--
sw/source/core/docnode/nodes.cxx|6 +++---
sw/source/core/inc/rootfrm.hxx |2 +-
sw/source/core/layout/newfrm.cxx|2 +-
sw/source/ui/app/docsh2.cxx |4 ++--
sw/source/ui/app/swmodul1.cxx |8
sw/source/ui/docvw/edtwin.cxx |8
sw/source/ui/inc/edtwin.hxx |2 +-
sw/source/ui/uiview/view0.cxx |2 +-
sw/source/ui/uiview/view2.cxx |2 +-
sw/source/ui/uno/dlelstnr.cxx | 14 +++---
21 files changed, 50 insertions(+), 52 deletions(-)
New commits:
commit b1167e125076c8d088119585672105fd0bcbd6ee
Author: Takeshi Abe
Date: Tue Oct 16 18:29:11 2012 +0900
sal_Bool to bool
Change-Id: I89050a1aa899b1a6cd49800f805af9611fd0a9a7
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 09586c8..b267213 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -91,7 +91,7 @@ public:
// Returns all words matching a given prefix aMatch. If bIgnoreCurrentPos
is set, the current
// position within the tree is ignored and replaced by aMatch.
-bool GetWordsMatching(String aMatch, std::vector& aWords, sal_Bool
bIgnoreCurrentPos) const;
+bool GetWordsMatching(String aMatch, std::vector& aWords, bool
bIgnoreCurrentPos) const;
};
diff --git a/sw/inc/bparr.hxx b/sw/inc/bparr.hxx
index e5035a8..2a644d3 100644
--- a/sw/inc/bparr.hxx
+++ b/sw/inc/bparr.hxx
@@ -54,7 +54,7 @@ protected:
typedef BigPtrEntry* ElementPtr;
-typedef sal_Bool (*FnForEach)( const ElementPtr&, void* pArgs );
+typedef bool (*FnForEach)( const ElementPtr&, void* pArgs );
// 1000 entries per Block = a bit less then 4K
#define MAXENTRY 1000
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 76a7ef4..9649c7e 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1795,7 +1795,7 @@ public:
sal_Bool DeleteSelection( SwDrawView& );
/// Invalidates OnlineSpell-WrongLists.
-void SpellItAgainSam( sal_Bool bInvalid, sal_Bool bOnlyWrong, sal_Bool
bSmartTags );
+void SpellItAgainSam( bool bInvalid, bool bOnlyWrong, bool bSmartTags );
void InvalidateAutoCompleteFlag();
void SetCalcFieldValueHdl(Outliner* pOutliner);
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 2f393af..a7401a0 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -79,7 +79,7 @@ struct SwPosition;
//
typedef SwNode * SwNodePtr;
-typedef sal_Bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs );
+typedef bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs );
typedef struct _xmlTextWriter *xmlTextWriterPtr;
struct CompareSwOutlineNodes
diff --git a/sw/inc/swmodule.hxx b/sw/inc/swmodule.hxx
index 64584f5..e11ac47 100644
--- a/sw/inc/swmodule.hxx
+++ b/sw/inc/swmodule.hxx
@@ -232,8 +232,8 @@ public:
voidRemoveAttrPool();
// Invalidates online spell-wrong-lists if necessary.
-voidCheckSpellChanges( sal_Bool bOnlineSpelling,
-sal_Bool bIsSpellWrongAgain, sal_Bool bIsSpellAllAgain,
sal_Bool bSmartTags );
+voidCheckSpellChanges( bool bOnlineSpelling,
+bool bIsSpellWrongAgain, bool bIsSpellAllAgain, bool
bSmartTags );
inline ::com::sun::star::uno::Reference<
::com::sun::star::linguistic2::XLinguServiceEventListener >
diff --git a/sw/qa/core/Test-BigPtrArray.cxx b/sw/qa/core/Test-BigPtrArray.cxx
index 117c79a..d295238 100644
--- a/sw/qa/core/Test-BigPtrArray.cxx
+++ b/sw/qa/core/Test-BigPtrArray.cxx
@@ -78,7 +78,7 @@ namespace /* private */
sal_uLong count_;
};
-sal_Bool AddToCount(const ElementPtr& rElem, void* pArgs)
+bool AddToCount(const ElementPtr& rElem, void* pArgs)
{
BigPtrEntryMock* const pbem = static_cast(rElem);
pbem->setCount(pbem->getCount() + *((sal_uLong*)pArgs));
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx
b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index b2caf30..c35b646 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -62,7 +62,7 @@ void SwSmartTagMgr::modified( const lang::EventObject& rEO )
throw( RuntimeExcep
SolarMutexGuard aGuard;
// Installed recognizers have changed. We remove all existing smart tags:
-SW_MOD()->CheckSpellChanges( sal_False, sal_True, sal_True, sal_True );
+SW_MOD()->CheckSpellChanges( f
[Libreoffice-commits] .: sw/inc
sw/inc/acmplwrd.hxx |2 --
1 file changed, 2 deletions(-)
New commits:
commit 00e815bd0452f6c68e3ff7a2d4050b6ad410a098
Author: Takeshi Abe
Date: Fri Oct 12 22:37:24 2012 +0900
Drop undefined function
Change-Id: I474371f2c35b82a9785b7fa6254bd4e60b4a73e4
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 6d86722..09586c8 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -61,8 +61,6 @@ public:
bool InsertWord( const String& rWord, SwDoc& rDoc );
-sal_Bool GetRange( const String& rWord, sal_uInt16& rStt, sal_uInt16& rEnd
) const;
-
const String& operator[](size_t n) const
{ return m_WordList[n]->GetAutoCompleteString(); }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/helpid.h|1 -
sw/source/ui/dialog/uiregionsw.cxx | 16 +++-
2 files changed, 3 insertions(+), 14 deletions(-)
New commits:
commit b5c3743c7b412bef17be019e39e3fb09e9b9cca3
Author: Caolán McNamara
Date: Thu Oct 11 11:43:12 2012 +0100
drop SwTestPasswdDlg in favour of SfxPasswordDialog
Change-Id: I05b44c23cb38d89c7997e06634651325301ffbd8
diff --git a/sw/inc/helpid.h b/sw/inc/helpid.h
index 246896a..a915108 100644
--- a/sw/inc/helpid.h
+++ b/sw/inc/helpid.h
@@ -330,7 +330,6 @@
#define HID_LINGU_WORD_LANGUAGE
"SW_HID_LINGU_WORD_LANGUAGE"
#define HID_LINGU_PARA_LANGUAGE
"SW_HID_LINGU_PARA_LANGUAGE"
#define HID_MD_GLOS_DEFINE_TEXT
"SW_HID_MD_GLOS_DEFINE_TEXT"
-#define HID_DLG_PASSWD_SECTION
"SW_HID_DLG_PASSWD_SECTION"
#define HID_MD_COPY_TO_CLIPBOARD
"SW_HID_MD_COPY_TO_CLIPBOARD"
#define HID_MD_GLOS_IMPORT
"SW_HID_MD_GLOS_IMPORT"
#define HID_SMARTTAG_MAIN
"SW_HID_SMARTTAG_MAIN"// SMARTTAGS
diff --git a/sw/source/ui/dialog/uiregionsw.cxx
b/sw/source/ui/dialog/uiregionsw.cxx
index 87bf68e..2d1b6f4 100644
--- a/sw/source/ui/dialog/uiregionsw.cxx
+++ b/sw/source/ui/dialog/uiregionsw.cxx
@@ -136,16 +136,6 @@ void lcl_FillSubRegionList( SwWrtShell& rSh, ComboBox&
rSubRegions, ComboBox* pA
}
}
-class SwTestPasswdDlg : public SfxPasswordDialog
-{
-public:
-SwTestPasswdDlg(Window* pParent) :
-SfxPasswordDialog(pParent)
-{
-SetHelpId(HID_DLG_PASSWD_SECTION);
-}
-};
-
/*
Description: user data class for region information
*/
@@ -448,7 +438,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox)
if (!pRepr->GetTempPasswd().getLength()
&& pRepr->GetSectionData().GetPassword().getLength())
{
-SwTestPasswdDlg aPasswdDlg(this);
+SfxPasswordDialog aPasswdDlg(this);
bRet = sal_False;
if (aPasswdDlg.Execute())
{
@@ -1327,7 +1317,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *,
pBox )
{
if(!pRepr->GetTempPasswd().getLength() || bChange)
{
-SwTestPasswdDlg aPasswdDlg(this);
+SfxPasswordDialog aPasswdDlg(this);
aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
if(RET_OK == aPasswdDlg.Execute())
{
@@ -1782,7 +1772,7 @@ IMPL_LINK( SwInsertSectionTabPage, ChangePasswdHdl,
Button *, pButton )
{
if(!m_aNewPasswd.getLength() || bChange)
{
-SwTestPasswdDlg aPasswdDlg(this);
+SfxPasswordDialog aPasswdDlg(this);
aPasswdDlg.ShowExtras(SHOWEXTRAS_CONFIRM);
if(RET_OK == aPasswdDlg.Execute())
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/SwStyleNameMapper.hxx| 10 +++---
sw/source/core/doc/SwStyleNameMapper.cxx| 26 -
sw/source/core/docnode/ndnotxt.cxx |2 -
sw/source/core/docnode/node.cxx |4 +-
sw/source/core/layout/atrfrm.cxx|2 -
sw/source/core/text/EnhancedPDFExportHelper.cxx |8 ++---
sw/source/core/txtnode/fmtatr2.cxx | 12
sw/source/core/txtnode/ndtxt.cxx|4 +-
sw/source/core/unocore/SwXTextDefaults.cxx |2 -
sw/source/core/unocore/unocrsrhelper.cxx|4 +-
sw/source/core/unocore/unoidx.cxx | 24
sw/source/core/unocore/unoobj.cxx | 10 +++---
sw/source/core/unocore/unosett.cxx | 34 +++---
sw/source/core/unocore/unostyle.cxx | 36
sw/source/core/unocore/unotbl.cxx |4 +-
sw/source/filter/xml/xmlfmt.cxx |4 +-
sw/source/filter/xml/xmlfmte.cxx|2 -
sw/source/filter/xml/xmltexte.cxx |2 -
sw/source/ui/uno/unotxvw.cxx|4 +-
19 files changed, 97 insertions(+), 97 deletions(-)
New commits:
commit 7e1d03f0f6b68d4a955a6b5df94be77307e58476
Author: Takeshi Abe
Date: Wed Oct 10 07:34:19 2012 +0900
sal_Bool to bool
Change-Id: I2549e597bc11d0a4b4bcdc42c77914dda01a1c5f
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 4142ff9..34797ca 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -138,20 +138,20 @@ protected:
const SwTableEntry *pTable,
sal_uInt8 nCount);
-static void fillNameFromId ( sal_uInt16 nId, String &rName, sal_Bool
bProgName );
-static const String& getNameFromId ( sal_uInt16 nId, const String &rName,
sal_Bool bProgName );
-static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, sal_Bool
bProgName );
+static void fillNameFromId ( sal_uInt16 nId, String &rName, bool bProgName
);
+static const String& getNameFromId ( sal_uInt16 nId, const String &rName,
bool bProgName );
+static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, bool
bProgName );
static bool SuffixIsUser ( const String & rString );
static void CheckSuffixAndDelete ( String & rString );
public:
// This gets the UI Name from the programmatic name
static const String& GetUIName ( const String& rName, SwGetPoolIdFromName
);
-static void FillUIName ( const String& rName, String& rFillName,
SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False );
+static void FillUIName ( const String& rName, String& rFillName,
SwGetPoolIdFromName, bool bDisambiguate = false );
// Get the programmatic Name from the UI name
static const String& GetProgName ( const String& rName,
SwGetPoolIdFromName );
-static void FillProgName ( const String& rName, String& rFillName,
SwGetPoolIdFromName, sal_Bool bDisambiguate = sal_False );
+static void FillProgName ( const String& rName, String& rFillName,
SwGetPoolIdFromName, bool bDisambiguate = false );
// This gets the UI Name from the Pool ID
SW_DLLPUBLIC static void FillUIName ( sal_uInt16 nId, String&
rFillName );
diff --git a/sw/source/core/doc/SwStyleNameMapper.cxx
b/sw/source/core/doc/SwStyleNameMapper.cxx
index a565336..c4b4234 100644
--- a/sw/source/core/doc/SwStyleNameMapper.cxx
+++ b/sw/source/core/doc/SwStyleNameMapper.cxx
@@ -346,7 +346,7 @@ void SwStyleNameMapper::CheckSuffixAndDelete ( String &
rString )
rString.Erase ( nLen - 7, 7 );
}
}
-const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName
eFlags, sal_Bool bProgName )
+const NameToIdHash & SwStyleNameMapper::getHashTable ( SwGetPoolIdFromName
eFlags, bool bProgName )
{
NameToIdHash *pHash = 0;
const boost::ptr_vector *pStrings;
@@ -634,7 +634,7 @@ const String& SwStyleNameMapper::GetProgName( const String&
rName, SwGetPoolIdFr
}
// Get the programmatic name from the UI name in rName and put it into
rFillName
-void SwStyleNameMapper::FillProgName ( const String& rName, String& rFillName,
SwGetPoolIdFromName eFlags, sal_Bool bDisambiguate )
+void SwStyleNameMapper::FillProgName ( const String& rName, String& rFillName,
SwGetPoolIdFromName eFlags, bool bDisambiguate )
{
sal_uInt16 nId = GetPoolIdFromUIName ( rName, eFlags );
if ( bDisambiguate && nId == USHRT_MAX )
@@ -659,11 +659,11 @@ void SwStyleNameMapper::FillProgName ( const String&
rName, String& rFillName, S
else
{
// If we aren't trying to disambiguate, then just do a normal fill
-fillNameFromId ( nId, rFillName, sal_True);
+fillNameFromId ( nId, rFillName, true);
}
}
// Get the UI name from the programmatic nam
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/SwStyleNameMapper.hxx |2 -
sw/inc/acmplwrd.hxx |2 -
sw/inc/crsrsh.hxx|2 -
sw/inc/doc.hxx |4 +--
sw/inc/editsh.hxx|2 -
sw/inc/viscrs.hxx|8 +++---
sw/source/core/crsr/crsrsh.cxx |6 ++--
sw/source/core/crsr/unocrsr.cxx |2 -
sw/source/core/crsr/viscrs.cxx |6 ++--
sw/source/core/doc/SwStyleNameMapper.cxx | 18 ++---
sw/source/core/doc/acmplwrd.cxx |6 ++--
sw/source/core/doc/dbgoutsw.cxx |4 +--
sw/source/core/doc/doc.cxx | 40 +++
sw/source/core/edit/editsh.cxx |4 +--
sw/source/core/unocore/unochart.cxx |2 -
sw/source/core/unocore/unoftn.cxx|2 -
sw/source/core/unocore/unoobj.cxx|4 +--
sw/source/core/unocore/unoobj2.cxx | 10 +++
sw/source/core/unocore/unoparagraph.cxx |2 -
sw/source/core/unocore/unoportenum.cxx |4 +--
sw/source/core/unocore/unoredline.cxx|4 +--
sw/source/core/unocore/unotbl.cxx| 22 -
sw/source/core/unocore/unotext.cxx |4 +--
sw/source/ui/inc/navmgr.hxx |4 +--
sw/source/ui/wrtsh/navmgr.cxx|4 +--
25 files changed, 84 insertions(+), 84 deletions(-)
New commits:
commit 701db391b3d3b689af4ca5ab9d67c35b2459c1b3
Author: Takeshi Abe
Date: Sun Oct 7 09:44:43 2012 +0900
sal_Bool to bool
Change-Id: Ieeebcd89ae2728c6314f28413759bbb353c327bf
diff --git a/sw/inc/SwStyleNameMapper.hxx b/sw/inc/SwStyleNameMapper.hxx
index 893ec73..4142ff9 100644
--- a/sw/inc/SwStyleNameMapper.hxx
+++ b/sw/inc/SwStyleNameMapper.hxx
@@ -141,7 +141,7 @@ protected:
static void fillNameFromId ( sal_uInt16 nId, String &rName, sal_Bool
bProgName );
static const String& getNameFromId ( sal_uInt16 nId, const String &rName,
sal_Bool bProgName );
static const NameToIdHash& getHashTable ( SwGetPoolIdFromName, sal_Bool
bProgName );
-static sal_Bool SuffixIsUser ( const String & rString );
+static bool SuffixIsUser ( const String & rString );
static void CheckSuffixAndDelete ( String & rString );
public:
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 8e0dd75..6d86722 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -59,7 +59,7 @@ public:
SwAutoCompleteWord( sal_uInt16 nWords = 500, sal_uInt16 nMWrdLen = 10 );
~SwAutoCompleteWord();
-sal_Bool InsertWord( const String& rWord, SwDoc& rDoc );
+bool InsertWord( const String& rWord, SwDoc& rDoc );
sal_Bool GetRange( const String& rWord, sal_uInt16& rStt, sal_uInt16& rEnd
) const;
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index e8678e9..fc421d2 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -901,7 +901,7 @@ inline SwPaM* SwCrsrShell::GetTblCrs()
inline void SwCrsrShell::UnSetVisCrsr()
{
pVisCrsr->Hide();
-pVisCrsr->SetDragCrsr( sal_False );
+pVisCrsr->SetDragCrsr( false );
}
#endif // _CRSRSH_HXX
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 682a97a..76a7ef4 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1835,7 +1835,7 @@ public:
/// restore the invisible content if it's available on the undo stack
bool RestoreInvisibleContent();
-sal_Bool ConvertFieldsToText();
+bool ConvertFieldsToText();
/// Create sub-documents according to given collection.
/// If no collection is given, use chapter styles for 1st level.
@@ -1883,7 +1883,7 @@ public:
// Uno - Interfaces ---
const SwUnoCrsrTbl& GetUnoCrsrTbl() const { return *pUnoCrsrTbl; }
-SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, sal_Bool bTblCrsr =
sal_False );
+SwUnoCrsr* CreateUnoCrsr( const SwPosition& rPos, bool bTblCrsr = false );
// FeShell - Interfaces ---
// !!! These assume always an existing layout !!!
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 58d8bef..ba5fcbd 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -206,7 +206,7 @@ public:
sal_Bool RemoveInvisibleContent();
/// Replace fields by text - mailmerge support.
-sal_Bool ConvertFieldsToText();
+bool ConvertFieldsToText();
/// Set all numbering start points to a fixed value - mailmerge support.
void SetNumberingRestart();
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index f8b274b..f9ef4ea 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -43,8 +43,8 @@ class SwVisCrsr
friend void _InitCore();
friend void _FinitCore();
-sal_Bool bIsVisible : 1;
-sal_Bool bIsDragCrsr : 1;
+bool bIsVisible : 1;
+bool bIsDragCrsr : 1;
Cursor aTxtCrsr;
const SwCrsrShell* pCrsrShell;
@@ -58,8 +58,8 @@ public:
void Show();
void Hide();
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/pam.hxx | 12 ++--
sw/source/core/crsr/crsrsh.cxx | 30 +++---
sw/source/core/crsr/crstrvl.cxx | 10 +-
sw/source/core/crsr/findattr.cxx |6 +++---
sw/source/core/crsr/findtxt.cxx |4 ++--
sw/source/core/crsr/pam.cxx | 36 ++--
sw/source/core/crsr/swcrsr.cxx | 22 +++---
sw/source/core/crsr/trvlfnfl.cxx |4 ++--
sw/source/core/crsr/trvlreg.cxx |4 ++--
sw/source/core/crsr/trvltbl.cxx | 11 ++-
sw/source/core/crsr/unocrsr.cxx |6 +++---
sw/source/core/inc/pamtyp.hxx|2 +-
12 files changed, 74 insertions(+), 73 deletions(-)
New commits:
commit f0b5e02b323ac7520c9e1ec77ba603291e7ed325
Author: Takeshi Abe
Date: Thu Oct 4 00:15:11 2012 +0900
sal_Bool to bool
Change-Id: I6a4c4f4c8129100770ca976d508ca3a98e67a846
diff --git a/sw/inc/pam.hxx b/sw/inc/pam.hxx
index 3f49310..83e3489 100644
--- a/sw/inc/pam.hxx
+++ b/sw/inc/pam.hxx
@@ -74,12 +74,12 @@ struct SW_DLLPUBLIC SwPosition
*/
SwDoc * GetDoc() const;
-sal_Bool operator < (const SwPosition &) const;
-sal_Bool operator > (const SwPosition &) const;
-sal_Bool operator <=(const SwPosition &) const;
-sal_Bool operator >=(const SwPosition &) const;
-sal_Bool operator ==(const SwPosition &) const;
-sal_Bool operator !=(const SwPosition &) const;
+bool operator < (const SwPosition &) const;
+bool operator > (const SwPosition &) const;
+bool operator <=(const SwPosition &) const;
+bool operator >=(const SwPosition &) const;
+bool operator ==(const SwPosition &) const;
+bool operator !=(const SwPosition &) const;
};
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index e026f9b..f37a4b7 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -491,7 +491,7 @@ sal_Bool SwCrsrShell::LRMargin( sal_Bool bLeft, sal_Bool
bAPI)
if( pBlockCrsr )
pBlockCrsr->clearPoints();
-const sal_Bool bWasAtLM =
+const bool bWasAtLM =
( 0 == _GetCrsr()->GetPoint()->nContent.GetIndex() );
sal_Bool bRet = pTmpCrsr->LeftRightMargin( bLeft, bAPI );
@@ -1160,11 +1160,11 @@ void SwCrsrShell::Paint( const Rectangle &rRect)
// always switch off all cursors when painting
SwRect aRect( rRect );
-sal_Bool bVis = sal_False;
+bool bVis = false;
// if a cursor is visible then hide the SV cursor
if( pVisCrsr->IsVisible() && !aRect.IsOver( aCharRect ) )
{
-bVis = sal_True;
+bVis = true;
pVisCrsr->Hide();
}
@@ -1512,7 +1512,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool
bIdleEnd )
// are we perhaps in a protected / hidden Section ?
{
SwShellCrsr* pShellCrsr = getShellCrsr( true );
-sal_Bool bChgState = sal_True;
+bool bChgState = true;
const SwSectionNode* pSectNd =
pShellCrsr->GetNode()->FindSectionNode();
if( pSectNd && ( pSectNd->GetSection().IsHiddenFlag() ||
( !IsReadOnlyAvailable() &&
@@ -1526,7 +1526,7 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags, sal_Bool
bIdleEnd )
// everything protected/hidden -> special mode
if( bAllProtect && !IsReadOnlyAvailable() &&
pSectNd->GetSection().IsProtectFlag() )
-bChgState = sal_False;
+bChgState = false;
else
{
eMvState = MV_NONE; // state for cursor travelling
@@ -1590,15 +1590,15 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags,
sal_Bool bIdleEnd )
SwRect aOld( aCharRect );
-sal_Bool bFirst = sal_True;
+bool bFirst = true;
SwCntntFrm *pFrm;
int nLoopCnt = 100;
SwShellCrsr* pShellCrsr = getShellCrsr( true );
do {
-sal_Bool bAgainst;
+bool bAgainst;
do {
-bAgainst = sal_False;
+bAgainst = false;
pFrm = pShellCrsr->GetCntntNode()->getLayoutFrm( GetLayout(),
&pShellCrsr->GetPtPos(), pShellCrsr->GetPoint(),
sal_False );
// if the Frm doesn't exist anymore, the complete Layout has to be
@@ -1624,13 +1624,13 @@ void SwCrsrShell::UpdateCrsr( sal_uInt16 eFlags,
sal_Bool bIdleEnd )
!pDoc->GetDocShell()->IsReadOnly() || bAllProtect ) )
{
// look for a valid position
-sal_Bool bChgState = sal_True;
+bool bChgState = true;
if( !FindValidCntntNode(!HasDrawView() ||
0 ==
Imp()->GetDrawView()->GetMarkedObjectList().GetMarkCount()))
{
// everything is protected / hidden -> special Mode
if( bAllProtect )
-bChgState = sal_False;
+bChgState = false;
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/crsrsh.hxx|6 ---
sw/inc/viscrs.hxx| 14
sw/source/core/crsr/viscrs.cxx | 64 ---
sw/source/core/layout/layact.cxx |3 -
sw/source/ui/docvw/edtwin.cxx| 13 ---
5 files changed, 100 deletions(-)
New commits:
commit c2eb9698eff7412e6973e659f26e7e39eeaf2887
Author: Takeshi Abe
Date: Tue Oct 2 22:36:28 2012 +0900
Remove dead code
SW_CRSR_TIMER was undefined
Change-Id: Ib851170ea61547e0ceaa6721c0b2fb90fecaecd3
Reviewed-on: https://gerrit.libreoffice.org/747
Reviewed-by: Michael Stahl
Tested-by: Michael Stahl
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 4c7e48c..e8678e9 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -750,12 +750,6 @@ public:
// is the whole document protected/hidden (for UI...)
sal_Bool IsAllProtect() const { return bAllProtect; }
-#ifdef SW_CRSR_TIMER
-// Set flag at VisCrsr. Is it triggered by Timer (TRUE) or directly
(FALSE).
-// Default is triggert by Timer.
-sal_Bool ChgCrsrTimerFlag( sal_Bool bTimerOn = sal_True );
-#endif
-
sal_Bool BasicActionPend() const{ return nBasicActionCnt !=
nStartAction; }
sal_Bool GotoRegion( const String& rName );
diff --git a/sw/inc/viscrs.hxx b/sw/inc/viscrs.hxx
index 5b0b925..f8b274b 100644
--- a/sw/inc/viscrs.hxx
+++ b/sw/inc/viscrs.hxx
@@ -39,9 +39,6 @@ class SwShellCrsr;
// From here classes/methods for non-text cursor.
class SwVisCrsr
-#ifdef SW_CRSR_TIMER
-: private Timer
-#endif
{
friend void _InitCore();
friend void _FinitCore();
@@ -49,16 +46,9 @@ class SwVisCrsr
sal_Bool bIsVisible : 1;
sal_Bool bIsDragCrsr : 1;
-#ifdef SW_CRSR_TIMER
-sal_Bool bTimerOn : 1;
-#endif
-
Cursor aTxtCrsr;
const SwCrsrShell* pCrsrShell;
-#ifdef SW_CRSR_TIMER
-virtual void Timeout();
-#endif
void _SetPosAndShow();
public:
@@ -70,10 +60,6 @@ public:
sal_Bool IsVisible() const { return bIsVisible; }
void SetDragCrsr( sal_Bool bFlag = sal_True ) { bIsDragCrsr = bFlag; }
-
-#ifdef SW_CRSR_TIMER
-sal_Bool ChgTimerFlag( sal_Bool bTimerOn = sal_True );
-#endif
};
diff --git a/sw/source/core/crsr/viscrs.cxx b/sw/source/core/crsr/viscrs.cxx
index 09eebb7..88d8404 100644
--- a/sw/source/core/crsr/viscrs.cxx
+++ b/sw/source/core/crsr/viscrs.cxx
@@ -70,22 +70,12 @@ SwVisCrsr::SwVisCrsr( const SwCrsrShell * pCShell )
bIsVisible = aTxtCrsr.IsVisible();
bIsDragCrsr = sal_False;
aTxtCrsr.SetWidth( 0 );
-
-#ifdef SW_CRSR_TIMER
-bTimerOn = sal_True;
-SetTimeout( 50 ); // 50 millisecond delay
-#endif
}
SwVisCrsr::~SwVisCrsr()
{
-#ifdef SW_CRSR_TIMER
-if( bTimerOn )
-Stop(); // stop timer
-#endif
-
if( bIsVisible && aTxtCrsr.IsVisible() )
aTxtCrsr.Hide();
@@ -103,21 +93,7 @@ void SwVisCrsr::Show()
// display at all?
if( pCrsrShell->VisArea().IsOver( pCrsrShell->aCharRect ) )
-#ifdef SW_CRSR_TIMER
-{
-if( bTimerOn )
-Start();// start timer
-else
-{
-if( IsActive() )
-Stop(); // stop timer
-
-_SetPosAndShow();
-}
-}
-#else
_SetPosAndShow();
-#endif
}
}
@@ -129,51 +105,11 @@ void SwVisCrsr::Hide()
{
bIsVisible = sal_False;
-#ifdef SW_CRSR_TIMER
-if( IsActive() )
-Stop(); // stop timer
-#endif
-
if( aTxtCrsr.IsVisible() ) // Shouldn't the flags be in effect?
aTxtCrsr.Hide();
}
}
-#ifdef SW_CRSR_TIMER
-
-void SwVisCrsr::Timeout()
-{
-OSL_ENSURE( !bIsDragCrsr, "stop timer before" );
-if( bIsVisible )
-{
-if ( !pCrsrShell->GetWin() ) // SwFrmFmt::GetGraphic suspends Win
temporarily!
-Start();
-else
-_SetPosAndShow();
-}
-}
-
-sal_Bool SwCrsrShell::ChgCrsrTimerFlag( sal_Bool bTimerOn )
-{
-return pVisCrsr->ChgTimerFlag( bTimerOn );
-}
-
-
-sal_Bool SwVisCrsr::ChgTimerFlag( sal_Bool bFlag )
-{
-bOld = bTimerOn;
-if( !bFlag && bIsVisible && IsActive() )
-{
-Stop(); // stop timer
-_SetPosAndShow();
-}
-bTimerOn = bFlag;
-return bOld;
-}
-
-#endif
-
-
void SwVisCrsr::_SetPosAndShow()
{
SwRect aRect;
diff --git a/sw/source/core/layout/layact.cxx b/sw/source/core/layout/layact.cxx
index d542238..26de885 100644
--- a/sw/source/core/layout/layact.cxx
+++ b/sw/source/core/layout/layact.cxx
@@ -2330,9 +2330,6 @@ SwLayIdle::SwLayIdle( SwRootFrm *pRt, SwViewImp *pI ) :
sal_Bool bVis = sal_False;
if ( pSh->ISA(SwCrsrShell) )
{
-#ifdef SW_CRSR_TIMER
-((SwCrsrShell*)pSh)->ChgCrsrTimerFlag( sal_False );
-#endif
bVis =
((SwCrsrShell*)pSh)->GetCharRect().IsOver(pSh->VisArea());
}
aBools.push_back( bVis );
diff
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/crsrsh.hxx| 16 +++---
sw/inc/node.hxx |2 -
sw/source/core/crsr/crsrsh.cxx | 44 +++
sw/source/core/crsr/crstrvl.cxx |2 -
sw/source/core/crsr/trvltbl.cxx | 14 ++--
sw/source/core/docnode/node.cxx |2 -
sw/source/core/edit/editsh.cxx |2 -
sw/source/core/edit/edlingu.cxx | 14 ++--
sw/source/core/edit/ednumber.cxx |2 -
sw/source/core/frmedt/fetab.cxx | 25 ++
sw/source/ui/dochdl/swdtflvr.cxx |2 -
sw/source/ui/inc/wrtsh.hxx |4 +--
sw/source/ui/uiview/viewling.cxx |4 +--
sw/source/ui/wrtsh/wrtsh1.cxx|2 -
14 files changed, 67 insertions(+), 68 deletions(-)
New commits:
commit 30d33b126f47021a99fb8ca63d6c6be29407e9cc
Author: Takeshi Abe
Date: Thu Sep 27 13:21:50 2012 +0900
sal_Bool to bool
Change-Id: Ic05d9f062e7419d192b8cf6e56c91b3f9d97bfe0
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 632b021..4c7e48c 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -137,7 +137,7 @@ struct SwContentAtPos
nDist = 0; // #i23726#
}
-sal_Bool IsInProtectSect() const;
+bool IsInProtectSect() const;
bool IsInRTLText()const;
};
@@ -295,9 +295,9 @@ protected:
void PaMCorrAbs(const SwNodeIndex &rOldNode, const SwPosition &rNewPos,
const xub_StrLen nOffset = 0 );
-sal_Bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
+bool _SelTblRowOrCol( bool bRow, bool bRowSimple = false );
-bool SetInFrontOfLabel( sal_Bool bNew );
+bool SetInFrontOfLabel( bool bNew );
void RefreshBlockCursor();
@@ -321,7 +321,7 @@ public:
SwPaM * CreateCrsr();
///< delete the current cursor and make the following into the current
-sal_Bool DestroyCrsr();
+bool DestroyCrsr();
///< transform TableCursor to normal cursor, nullify Tablemode
void TblCrsrToCursor();
///< enter block mode, change normal cursor into block cursor
@@ -525,7 +525,7 @@ public:
// Check if selection is within one paragraph.
//Should WaitPtr be activated for Clipboard.
-sal_Bool ShouldWait() const;
+bool ShouldWait() const;
// Check if selection is within one paragraph.
inline sal_Bool IsSelOnePara() const;
@@ -728,11 +728,11 @@ public:
sal_Bool IsInWord( sal_Int16 nWordType =
com::sun::star::i18n::WordType::ANYWORD_IGNOREWHITESPACES ) const;
sal_Bool IsStartSentence() const;
sal_Bool IsEndSentence() const;
-sal_Bool IsSttPara() const;
-sal_Bool IsEndPara() const;
+bool IsSttPara() const;
+bool IsEndPara() const;
sal_Bool IsStartOfDoc() const;
sal_Bool IsEndOfDoc() const;
-sal_Bool IsInFrontOfLabel() const;
+bool IsInFrontOfLabel() const;
sal_Bool IsAtLeftMargin() const { return IsAtLRMargin( sal_True );
}
sal_Bool IsAtRightMargin(sal_Bool bAPI = sal_False) const { return
IsAtLRMargin( sal_False, bAPI ); }
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index a0fed72..9ac3045 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -268,7 +268,7 @@ public:
/// Is node in the visible area of the Shell?
sal_Bool IsInVisibleArea( ViewShell* pSh = 0 ) const;
/// Is node in an protected area?
-sal_Bool IsInProtectSect() const;
+bool IsInProtectSect() const;
/** Is node in something that is protected (range, frame,
table cells ... including anchor in case of frames or footnotes)? */
sal_Bool IsProtect() const;
diff --git a/sw/source/core/crsr/crsrsh.cxx b/sw/source/core/crsr/crsrsh.cxx
index 8a6a5bf..e026f9b 100644
--- a/sw/source/core/crsr/crsrsh.cxx
+++ b/sw/source/core/crsr/crsrsh.cxx
@@ -150,23 +150,23 @@ SwPaM * SwCrsrShell::CreateCrsr()
/**
* Delete current Cursor, making the following one the current.
* Note, this function does not delete anything if there is no other cursor.
- * @return - returns sal_True if there was another cursor and we deleted one.
+ * @return - returns true if there was another cursor and we deleted one.
*/
-sal_Bool SwCrsrShell::DestroyCrsr()
+bool SwCrsrShell::DestroyCrsr()
{
// don't delete Crsr within table selection
OSL_ENSURE( !IsTableMode(), "in table Selection" );
// Is there a next one? Don't do anything if not.
if(pCurCrsr->GetNext() == pCurCrsr)
-return sal_False;
+return false;
SwCallLink aLk( *this ); // watch Crsr-Moves
SwCursor* pNextCrsr = (SwCursor*)pCurCrsr->GetNext();
delete pCurCrsr;
pCurCrsr = dynamic_cast(pNextCrsr);
UpdateCrsr();
-return sal_True;
+return true;
}
@@ -365,7 +365,7 @@ sal_Bool SwCrsrShell::LeftRight( sal_Bool bLeft, sal_uInt16
nCnt, sal_uInt16 nMo
SwShellCrsr* pShellCrsr = getShellCrsr( true );
if ( !bLeft && pShellCrsr->IsInFrontOfLabel() )
{
-SetInFrontOfLabel( sal_False );
+SetInFrontOfLabel( false );
b
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/hintids.hxx|2 -
sw/inc/tabcol.hxx |2 -
sw/source/core/attr/format.cxx| 12 -
sw/source/core/attr/swatrset.cxx |6 ++--
sw/source/core/bastyp/calc.cxx| 48 +++---
sw/source/core/bastyp/swcache.cxx |4 +--
sw/source/core/bastyp/tabcol.cxx |6 ++--
7 files changed, 40 insertions(+), 40 deletions(-)
New commits:
commit 38b29bbc39efc74f4c6086378df7b9cc31440390
Author: Takeshi Abe
Date: Tue Sep 25 11:39:07 2012 +0900
sal_Bool to bool
Change-Id: Ib9a6f3ecbe38cdad6e28b4d8a9ae13d1f5bc4265
diff --git a/sw/inc/hintids.hxx b/sw/inc/hintids.hxx
index 9ea4bc4..46204f1 100644
--- a/sw/inc/hintids.hxx
+++ b/sw/inc/hintids.hxx
@@ -469,7 +469,7 @@ extern sal_uInt16 aCharAutoFmtSetRange[];
extern sal_uInt16 aPgFrmFmtSetRange[];
// check if ID is InRange of AttrSet-Ids
-sal_Bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId );
+bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId );
#endif
diff --git a/sw/inc/tabcol.hxx b/sw/inc/tabcol.hxx
index 6b896a6..9457d8f 100644
--- a/sw/inc/tabcol.hxx
+++ b/sw/inc/tabcol.hxx
@@ -68,7 +68,7 @@ public:
SwTabCols( sal_uInt16 nSize = 0 );
SwTabCols( const SwTabCols& );
SwTabCols &operator=( const SwTabCols& );
-sal_Bool operator==( const SwTabCols& rCmp ) const;
+bool operator==( const SwTabCols& rCmp ) const;
long& operator[]( sal_uInt16 nPos ) { return aData[nPos].nPos; }
long operator[]( sal_uInt16 nPos ) const { return aData[nPos].nPos; }
sal_uInt16 Count() const { return sal::static_int_cast< sal_uInt16
>(aData.size()); }
diff --git a/sw/source/core/attr/format.cxx b/sw/source/core/attr/format.cxx
index 083b923..c2e4fbe 100644
--- a/sw/source/core/attr/format.cxx
+++ b/sw/source/core/attr/format.cxx
@@ -249,7 +249,7 @@ SwFmt::~SwFmt()
void SwFmt::Modify( const SfxPoolItem* pOldValue, const SfxPoolItem* pNewValue
)
{
-sal_Bool bContinue = sal_True; // sal_True = pass on to dependent ones
+bool bContinue = true; // true = pass on to dependent ones
sal_uInt16 nWhich = pOldValue ? pOldValue->Which() :
pNewValue ? pNewValue->Which() : 0 ;
@@ -293,7 +293,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const
SfxPoolItem* pNewValue )
if( aNew.Count() )
NotifyClients( &aOld, &aNew );
-bContinue = sal_False;
+bContinue = false;
}
break;
case RES_FMT_CHG:
@@ -318,7 +318,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const
SfxPoolItem* pNewValue )
// pass Hint only to dependent formats (no Frames)
ModifyBroadcast( pOldValue, pNewValue, TYPE(SwFmt) );
-bContinue = sal_False;
+bContinue = false;
}
break;
default:
@@ -328,7 +328,7 @@ void SwFmt::Modify( const SfxPoolItem* pOldValue, const
SfxPoolItem* pNewValue )
{
// DropCaps might come into this block
OSL_ENSURE( RES_PARATR_DROP == nWhich, "Modify was sent
without sender" );
-bContinue = sal_False;
+bContinue = false;
}
}
}
@@ -529,7 +529,7 @@ sal_uInt16 SwFmt::ResetAllFmtAttr()
SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
aNew( *aSet.GetPool(), aSet.GetRanges() );
-sal_Bool bRet = 0 != aSet.ClearItem_BC( 0, &aOld, &aNew );
+bool bRet = 0 != aSet.ClearItem_BC( 0, &aOld, &aNew );
if( bRet )
{
SwAttrSetChg aChgOld( aSet, aOld );
@@ -566,7 +566,7 @@ void SwFmt::DelDiffs( const SfxItemSet& rSet )
SwAttrSet aOld( *aSet.GetPool(), aSet.GetRanges() ),
aNew( *aSet.GetPool(), aSet.GetRanges() );
-sal_Bool bRet = 0 != aSet.Intersect_BC( rSet, &aOld, &aNew );
+bool bRet = 0 != aSet.Intersect_BC( rSet, &aOld, &aNew );
if( bRet )
{
SwAttrSetChg aChgOld( aSet, aOld );
diff --git a/sw/source/core/attr/swatrset.cxx b/sw/source/core/attr/swatrset.cxx
index 8eb1daf..363abe2 100644
--- a/sw/source/core/attr/swatrset.cxx
+++ b/sw/source/core/attr/swatrset.cxx
@@ -373,15 +373,15 @@ void SwAttrSet::CopyToModify( SwModify& rMod ) const
}
/// check if ID is in range of attribute set IDs
-sal_Bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId )
+bool IsInRange( const sal_uInt16* pRange, const sal_uInt16 nId )
{
while( *pRange )
{
if( *pRange <= nId && nId <= *(pRange+1) )
-return sal_True;
+return true;
pRange += 2;
}
-return sal_False;
+return false;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index 47a6f78..8de93ef 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -671,13 +671,13 @@ SwCalcOper SwCalc::GetToken()
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx|1 -
sw/source/core/doc/docnew.cxx |3 ---
2 files changed, 4 deletions(-)
New commits:
commit 18bad3e45ce8ae41f3d75821ed9c70b189404b9b
Author: Arnaud Versini
Date: Sun Sep 23 21:23:28 2012 +0200
Remove unused member SwDoc::pMacroTable
Change-Id: Ic09b960b675d674a16f7f252ed2a974c4e25505b
Reviewed-on: https://gerrit.libreoffice.org/680
Tested-by: Bosdonnat Cedric
Reviewed-by: Bosdonnat Cedric
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 9346d04..682a97a 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -343,7 +343,6 @@ class SW_DLLPUBLIC SwDoc :
SwLineNumberInfo*pLineNumberInfo;
SwFtnIdxs *pFtnIdxs;
SwDocStat *pDocStat; ///< Statistics information.
-SvxMacroTableDtor *pMacroTable; ///< table of macros.
SwDocShell *pDocShell; ///< Ptr to SfxDocShell of Doc.
SfxObjectShellLock xTmpDocShell;///< A temporary shell that is used to
copy OLE-Nodes
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 73029d5..92b6edc 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -367,8 +367,6 @@ SwDoc::SwDoc()
// COMPATIBILITY FLAGS END
//
-pMacroTable = new SvxMacroTableDtor;
-
mpGrammarContact = ::createGrammarContact();
/*
@@ -574,7 +572,6 @@ SwDoc::~SwDoc()
// The BookMarks contain indices to the Content. These must be deleted
// before deleting the Nodes.
pMarkManager->clearAllMarks();
-DELETEZ( pMacroTable );
if( pExtInputRing )
{
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/unotbl.hxx |5 + 1 file changed, 1 insertion(+), 4 deletions(-) New commits: commit 6ba1a664a94cfbfbc7c280b15cee35122710ff86 Author: Michael Stahl Date: Fri Sep 21 22:03:02 2012 +0200 fuck you, SIZE_MAX. you'll rue the day i find out which .h defines you. rue!!! Change-Id: I9e2b05180ba64d1617b33423ceffc19bc996e335 diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 1d464ef..18a0029 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -29,9 +29,6 @@ #ifndef SW_UNOTBL_HXX #define SW_UNOTBL_HXX -#include -#include - #include #include #include @@ -102,7 +99,7 @@ class SwXCell : public SwXCellBaseClass, // table position where pBox was found last size_t nFndPos; -static size_t const NOTFOUND = SIZE_MAX; +static size_t const NOTFOUND = SAL_MAX_SIZE; protected: virtual const SwStartNode *GetStartNode() const; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/unotbl.hxx |1 + 1 file changed, 1 insertion(+) New commits: commit 6c7c11e2a8cbced9899f5a2da54215eaba92136e Author: Michael Stahl Date: Fri Sep 21 21:22:37 2012 +0200 the intarwebs say it may be hidden in limits.h... Change-Id: I79bb1cfae92982bc2909411ed4efd0d31352 diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 8554a04..1d464ef 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -29,6 +29,7 @@ #ifndef SW_UNOTBL_HXX #define SW_UNOTBL_HXX +#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/unotbl.hxx |7 +-- 1 file changed, 5 insertions(+), 2 deletions(-) New commits: commit fd3da62330243350e482c03187ecbe08686d14a0 Author: Michael Stahl Date: Fri Sep 21 20:38:23 2012 +0200 sigh... include stdint.h for SIZE_MAX Change-Id: I714149f8cf800ea0021cc72a4bb50d840076da66 diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 8b6c219..8554a04 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -25,8 +25,11 @@ * for a copy of the LGPLv3 License. * / -#ifndef _UNOTBL_HXX -#define _UNOTBL_HXX + +#ifndef SW_UNOTBL_HXX +#define SW_UNOTBL_HXX + +#include #include #include ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/unotbl.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 90d4f29d7e9e1294fc343baec275747e2c3c5b7b Author: Michael Stahl Date: Fri Sep 21 19:05:12 2012 +0200 "a function call cannot appear in a constant-expression" Change-Id: Ic1aecfb1071033d8e134649506f72c17833a206a diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx index 7c7f166..8b6c219 100644 --- a/sw/inc/unotbl.hxx +++ b/sw/inc/unotbl.hxx @@ -98,7 +98,7 @@ class SwXCell : public SwXCellBaseClass, // table position where pBox was found last size_t nFndPos; -static size_t const NOTFOUND = ::std::numeric_limits::max(); +static size_t const NOTFOUND = SIZE_MAX; protected: virtual const SwStartNode *GetStartNode() const; ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/accmap.hxx|8 +-
sw/source/core/access/accfrmobjmap.cxx |2
sw/source/core/access/accfrmobjmap.hxx |2
sw/source/core/access/accfrmobjslist.hxx | 10 +--
sw/source/core/access/accmap.cxx | 85 +++
5 files changed, 53 insertions(+), 54 deletions(-)
New commits:
commit 53f7f2a3e4269677d57d2ec2c7560a9524c3e692
Author: Takeshi Abe
Date: Thu Sep 20 09:11:25 2012 +0900
sal_Bool to bool
Change-Id: Id29032b3f2f228141e37f713c798d61cc20584c0
diff --git a/sw/inc/accmap.hxx b/sw/inc/accmap.hxx
index 5fb1d32..1134b6d 100644
--- a/sw/inc/accmap.hxx
+++ b/sw/inc/accmap.hxx
@@ -103,7 +103,7 @@ class SwAccessibleMap : public
accessibility::IAccessibleViewForwarder,
sal_Int32 mnEndnote;
-sal_Bool mbShapeSelected;
+bool mbShapeSelected;
void FireEvent( const SwAccessibleEvent_Impl& rEvent );
@@ -116,11 +116,11 @@ class SwAccessibleMap : public
accessibility::IAccessibleViewForwarder,
void DoInvalidateShapeFocus();
void InvalidateShapeSelection();
-void _InvalidateRelationSet( const SwFrm* pFrm, sal_Bool bFrom );
+void _InvalidateRelationSet( const SwFrm* pFrm, bool bFrom );
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
-_GetDocumentView( sal_Bool bPagePreview );
+_GetDocumentView( bool bPagePreview );
/** method to build up a new data structure of the accessible pararaphs,
which have a selection
@@ -250,7 +250,7 @@ public:
const Size& _rPrevwWinSize );
void InvalidatePreViewSelection( sal_uInt16 nSelPage );
-sal_Bool IsPageSelected( const SwPageFrm *pPageFrm ) const;
+bool IsPageSelected( const SwPageFrm *pPageFrm ) const;
void FireEvents();
diff --git a/sw/source/core/access/accfrmobjmap.cxx
b/sw/source/core/access/accfrmobjmap.cxx
index dc6e862..5b75d59 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -158,7 +158,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect&
rVisArea,
return _SwAccessibleChildMap::insert( aEntry );
}
-/* static */ sal_Bool SwAccessibleChildMap::IsSortingRequired( const SwFrm&
rFrm )
+/* static */ bool SwAccessibleChildMap::IsSortingRequired( const SwFrm& rFrm )
{
return ( rFrm.IsPageFrm() &&
static_cast< const SwPageFrm& >( rFrm ).GetSortedObjs() ) ||
diff --git a/sw/source/core/access/accfrmobjmap.hxx
b/sw/source/core/access/accfrmobjmap.hxx
index 9b19076..e324b33 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -80,7 +80,7 @@ public:
const SwFrm& rFrm,
SwAccessibleMap& rAccMap );
-static sal_Bool IsSortingRequired( const SwFrm& rFrm );
+static bool IsSortingRequired( const SwFrm& rFrm );
};
#endif
diff --git a/sw/source/core/access/accfrmobjslist.hxx
b/sw/source/core/access/accfrmobjslist.hxx
index 13885cb..d7ce57d 100644
--- a/sw/source/core/access/accfrmobjslist.hxx
+++ b/sw/source/core/access/accfrmobjslist.hxx
@@ -54,12 +54,12 @@ public:
, nNextObj( rIter.nNextObj )
{}
-inline sal_Bool operator==( const SwAccessibleChildSList_const_iterator& r
) const
+inline bool operator==( const SwAccessibleChildSList_const_iterator& r )
const
{
return aCurr == r.aCurr;
}
-inline sal_Bool operator!=(
+inline bool operator!=(
const SwAccessibleChildSList_const_iterator& r ) const
{
return !(*this == r);
@@ -78,7 +78,7 @@ class SwAccessibleChildSList
{
const SwRect maVisArea;
const SwFrm& mrFrm;
-const sal_Bool mbVisibleChildrenOnly;
+const bool mbVisibleChildrenOnly;
SwAccessibleMap& mrAccMap;
public:
@@ -89,7 +89,7 @@ public:
SwAccessibleMap& rAccMap )
: maVisArea()
, mrFrm( rFrm )
-, mbVisibleChildrenOnly( sal_False )
+, mbVisibleChildrenOnly( false )
, mrAccMap( rAccMap )
{}
@@ -118,7 +118,7 @@ public:
return mrFrm;
}
-inline sal_Bool IsVisibleChildrenOnly() const
+inline bool IsVisibleChildrenOnly() const
{
return mbVisibleChildrenOnly;
}
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index fd40aea..f47346c 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -78,7 +78,7 @@ using namespace ::sw::access;
struct SwFrmFunc
{
-sal_Bool operator()( const SwFrm * p1,
+bool operator()( const SwFrm * p1,
const SwFrm * p2) const
{
return p1 < p2;
@@ -92,12 +92,12 @@ class SwAccessibleContextMap_Impl: public
_SwAccessibleContextMap_Impl
public:
#if OSL_DEBUG_LEVEL > 0
-sal_Bool mbLocked;
+bool mbLocked;
#endif
SwAccessibleContextMap_Impl
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/swundo.hxx |3 ++-
sw/source/core/edit/edlingu.cxx |4 ++--
sw/source/core/undo/undo.hrc|3 ++-
sw/source/core/undo/undo.src|4
4 files changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 85b0beae596e3177e0435d313a0ee4e90a6fde77
Author: Caolán McNamara
Date: Wed Sep 12 15:45:04 2012 +0100
Resolves: fdo#40025 add text correction undo id
instead of a single overwrite foo so now the undo message is
"Text Correction" for a spell or grammar change
Change-Id: I0227780ba9024ff903632923dd94238719b65764
diff --git a/sw/inc/swundo.hxx b/sw/inc/swundo.hxx
index 9e07154..ade8718 100644
--- a/sw/inc/swundo.hxx
+++ b/sw/inc/swundo.hxx
@@ -178,7 +178,8 @@ enum SwUndoId
UNDO_UI_INSERT_URLTXT,
UNDO_UI_DELETE_INVISIBLECNTNT,
UNDO_UI_REPLACE_STYLE,
-UNDO_UI_DELETE_PAGE_BREAK
+UNDO_UI_DELETE_PAGE_BREAK,
+UNDO_UI_TEXT_CORRECTION
};
diff --git a/sw/source/core/edit/edlingu.cxx b/sw/source/core/edit/edlingu.cxx
index e0c30ec..17feb3e 100644
--- a/sw/source/core/edit/edlingu.cxx
+++ b/sw/source/core/edit/edlingu.cxx
@@ -1289,7 +1289,7 @@ void SwEditShell::ApplyChangedSentence(const
::svx::SpellPortions& rNewPortions,
// iterate over the new portions, beginning at the end to take
advantage of the previously
// saved content positions
-pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_OVERWRITE, NULL );
+pDoc->GetIDocumentUndoRedo().StartUndo( UNDO_UI_TEXT_CORRECTION, NULL
);
StartAction();
SwPaM *pCrsr = GetCrsr();
@@ -1418,7 +1418,7 @@ void SwEditShell::ApplyChangedSentence(const
::svx::SpellPortions& rNewPortions,
// set continuation position for spell/grammar checking to the end of
this sentence
pSpellIter->SetCurr( new SwPosition( *pCrsr->Start() ) );
-pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_OVERWRITE, NULL );
+pDoc->GetIDocumentUndoRedo().EndUndo( UNDO_UI_TEXT_CORRECTION, NULL );
EndAction();
}
}
diff --git a/sw/source/core/undo/undo.hrc b/sw/source/core/undo/undo.hrc
index 2bd47c6..57a56a3 100644
--- a/sw/source/core/undo/undo.hrc
+++ b/sw/source/core/undo/undo.hrc
@@ -161,7 +161,8 @@
#define STR_DELETE_INVISIBLECNTNT (UI_UNDO_BEGIN + 12)
#define STR_REPLACE_STYLE (UI_UNDO_BEGIN + 13)
#define STR_DELETE_PAGE_BREAK (UI_UNDO_BEGIN + 14)
-#define UI_UNDO_END STR_DELETE_PAGE_BREAK
+#define STR_TEXT_CORRECTION (UI_UNDO_BEGIN + 15)
+#define UI_UNDO_END STR_TEXT_CORRECTION
#define UNDO_MORE_STRINGS_BEGIN (UI_UNDO_END + 1)
#define STR_OCCURRENCES_OF (UNDO_MORE_STRINGS_BEGIN)
diff --git a/sw/source/core/undo/undo.src b/sw/source/core/undo/undo.src
index d1222fe..a8104f7 100644
--- a/sw/source/core/undo/undo.src
+++ b/sw/source/core/undo/undo.src
@@ -193,6 +193,10 @@ String STR_DELETE_PAGE_BREAK
{
Text [ en-US ] = "Delete page break" ;
};
+String STR_TEXT_CORRECTION
+{
+Text [ en-US ] = "Text Correction" ;
+};
String STR_OUTLINE_LR
{
Text [ en-US ] = "Promote/demote outline" ;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |1 +
sw/inc/doc.hxx |1 +
sw/source/core/doc/doc.cxx |5 +
sw/source/core/doc/docnew.cxx |1 +
sw/source/core/inc/frame.hxx|5 +++--
sw/source/core/layout/paintfrm.cxx | 18 --
sw/source/filter/xml/xmlimp.cxx |7 +++
sw/source/ui/uno/SwXDocumentSettings.cxx| 14 ++
writerfilter/source/filter/ImportFilter.cxx |1 +
9 files changed, 45 insertions(+), 8 deletions(-)
New commits:
commit 18b3feb8bef06bf7b126fd0bc743e19479cb8026
Author: Miklos Vajna
Date: Wed Sep 12 09:59:27 2012 +0200
n#778133 sw: add BackgroundParaOverDrawings compat flag
In Word, the layer that contains a background image is behind the layer
that contains the paragraph background. In Writer, the paragraph
background is painted before the hell layer. Add a compat flag to change
the order, so the DOCX importer can trigger that.
To reproduce, create an XShape, send it to the background, set some
color for a paragraph background, and notice that the background color
is missing where the shape is behind the text.
Change-Id: I9b1fffd9ac9a6e5a1c3d1f65371440047d125b38
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index b7d2c13..efddb59 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -85,6 +85,7 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
TAB_OVERFLOW,
UNBREAKABLE_NUMBERINGS,
CLIPPED_PICTURES,
+ BACKGROUND_PARA_OVER_DRAWINGS,
// COMPATIBILITY FLAGS END
BROWSE_MODE,
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 001ebf8..9346d04 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -592,6 +592,7 @@ private:
bool mbTabOverflow;
bool mbUnbreakableNumberings;
bool mbClippedPictures;
+bool mbBackgroundParaOverDrawings;
bool mbLastBrowseMode : 1;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 3dc4caf..de69e88 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -200,6 +200,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case TAB_OVERFLOW: return mbTabOverflow;
case UNBREAKABLE_NUMBERINGS: return mbUnbreakableNumberings;
case CLIPPED_PICTURES: return mbClippedPictures;
+case BACKGROUND_PARA_OVER_DRAWINGS: return
mbBackgroundParaOverDrawings;
case BROWSE_MODE: return mbLastBrowseMode; // Attention: normally the
ViewShell has to be asked!
case HTML_MODE: return mbHTMLMode;
@@ -351,6 +352,10 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/
bool value)
mbClippedPictures = value;
break;
+case BACKGROUND_PARA_OVER_DRAWINGS:
+mbBackgroundParaOverDrawings = value;
+break;
+
// COMPATIBILITY FLAGS END
case BROWSE_MODE: //can be used temporary (load/save) when no
ViewShell is avaiable
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index b2d07db..73029d5 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -359,6 +359,7 @@ SwDoc::SwDoc()
mbUnbreakableNumberings = false;
mbFloattableNomargins = false;
mbClippedPictures = false;
+mbBackgroundParaOverDrawings= false;
mEmbedFonts = false;
mEmbedSystemFonts = false;
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index b346b30..b72964c 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -492,11 +492,12 @@ public:
virtual void PaintBorder( const SwRect&, const SwPageFrm *pPage,
const SwBorderAttrs & ) const;
void PaintBaBo( const SwRect&, const SwPageFrm *pPage = 0,
-const sal_Bool bLowerBorder = sal_False ) const;
+const sal_Bool bLowerBorder = sal_False, const bool
bOnlyTxtBackground = false ) const;
void PaintBackground( const SwRect&, const SwPageFrm *pPage,
const SwBorderAttrs &,
const sal_Bool bLowerMode = sal_False,
- const sal_Bool bLowerBorder = sal_False ) const;
+ const sal_Bool bLowerBorder = sal_False,
+ const bool bOnlyTxtBackground = false ) const;
void PaintBorderLine( const SwRect&, const SwRect&, const SwPageFrm*,
const Color *pColor, const editeng::SvxBorderStyle =
::com::sun::star::table::BorderLineStyle::SOLID ) const;
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/acmplwrd.hxx | 16 -
sw/source/core/doc/acmplwrd.cxx | 44 -
sw/source/ui/docvw/edtwin.cxx | 126 +---
3 files changed, 160 insertions(+), 26 deletions(-)
New commits:
commit 51f9e894f46e718200a14bcd61e9e44c64bc5396
Author: Nico Weyand
Date: Sun Sep 2 22:09:38 2012 +0200
Improved usage of the auto-complete tree structure.
Auto-complete lookup structure remembers as-you-type the character
position in a word. Currently the whole word was always looked up
which was not necessary. This patch improves this.
Change-Id: I7dced25707979377ae3f696a5987956d2308aeec
diff --git a/sw/inc/acmplwrd.hxx b/sw/inc/acmplwrd.hxx
index 72421c3..8e0dd75 100644
--- a/sw/inc/acmplwrd.hxx
+++ b/sw/inc/acmplwrd.hxx
@@ -79,7 +79,21 @@ public:
void CheckChangedList(const editeng::SortedAutoCompleteStrings& rNewLst);
-bool GetWordsMatching(String aMatch, std::vector& aWords) const;
+// Resets the current position within the tree to its root node.
+void returnToRoot();
+
+// Advances to a given node within the AutoComplete tree.
+void gotoNode(OUString sNode);
+
+// Advances from the current position towards the node keyed with cKey.
+void advance(const sal_Unicode cKey);
+
+// Goes back one char within the tree, except if the current node is
already the root node.
+void goBack();
+
+// Returns all words matching a given prefix aMatch. If bIgnoreCurrentPos
is set, the current
+// position within the tree is ignored and replaced by aMatch.
+bool GetWordsMatching(String aMatch, std::vector& aWords, sal_Bool
bIgnoreCurrentPos) const;
};
diff --git a/sw/source/core/doc/acmplwrd.cxx b/sw/source/core/doc/acmplwrd.cxx
index d569e16..65ce21a 100644
--- a/sw/source/core/doc/acmplwrd.cxx
+++ b/sw/source/core/doc/acmplwrd.cxx
@@ -355,18 +355,52 @@ void SwAutoCompleteWord::SetMinWordLen( sal_uInt16 n )
nMinWrdLen = n;
}
-bool SwAutoCompleteWord::GetWordsMatching(String aMatch, std::vector&
aWords) const
+// Resets the current position within the tree to its root node.
+void SwAutoCompleteWord::returnToRoot()
{
-OUString aStringRoot = OUString(aMatch);
-m_LookupTree->gotoNode( aStringRoot );
+m_LookupTree->returnToRoot();
+}
+
+// Advances to a given node within the AutoComplete tree.
+void SwAutoCompleteWord::gotoNode(OUString sNode)
+{
+m_LookupTree->gotoNode( sNode );
+}
+
+// Advances from the current position towards the node keyed with cKey.
+void SwAutoCompleteWord::advance(const sal_Unicode cKey)
+{
+m_LookupTree->advance( cKey );
+}
+
+// Goes back one char within the tree, except if the current node is already
the root node.
+void SwAutoCompleteWord::goBack()
+{
+m_LookupTree->goBack();
+}
+
+// Returns all words matching a given prefix aMatch. If bIgnoreCurrentPos is
set, the current
+// position within the tree is ignored and replaced by aMatch.
+bool SwAutoCompleteWord::GetWordsMatching(String aMatch, std::vector&
aWords, sal_Bool bIgnoreCurrentPos) const
+{
+OUString aStringRoot = OUString( aMatch );
+
+// The lookup tree already contains the information about the root keyword
in most cases. Only if we don't trust that
+// information (e.g. if we need some autocompletion for a place other than
the main writing area), the location within
+// the tree needs to be refreshed.
+if (bIgnoreCurrentPos)
+{
+m_LookupTree->gotoNode( aStringRoot );
+}
+
OUString aAutocompleteWord = m_LookupTree->suggestAutoCompletion();
if (aAutocompleteWord.isEmpty())
+{
return false;
+}
OUString aCompleteWord = aStringRoot + aAutocompleteWord;
-
aWords.push_back( String(aCompleteWord) );
-
return true;
}
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 812d7bd..1ccb7fb 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -314,7 +314,9 @@ struct QuickHelpData
if( 0 == nCurArrPos-- )
nCurArrPos = (bEndLess && !m_bIsAutoText ) ?
m_aHelpStrings.size()-1 : 0;
}
-void FillStrArr( SwWrtShell& rSh, const String& rWord );
+
+// Fills internal structures with hopefully helpful information.
+void FillStrArr( SwWrtShell& rSh, const String& rWord, sal_Bool
bIgnoreCurrentPos );
void SortAndFilter();
};
@@ -1519,6 +1521,19 @@ void SwEditWin::KeyInput(const KeyEvent &rKEvt)
sal_Bool bStopKeyInputTimer = sal_True;
String sFmlEntry;
+enum SW_AutoCompleteAction { ACA_NoOp,// No maintenance
operation required for AutoComplete tree
+ ACA_ReturnToRoot,// Input of a char
marking the end of a word, like '.', ' ', etc.
+ ACA_SingleCharInput,
+ ACA_SingleBackspace,
+ ACA_Refresh }; // Refresh AutoComplete
information
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/fesh.hxx|2 ++
sw/source/core/frmedt/feshview.cxx | 17 +
sw/source/ui/docvw/edtwin.cxx |5 -
3 files changed, 23 insertions(+), 1 deletion(-)
New commits:
commit 1223dd3bc84899d8f77c46340c46565ca74cbe1b
Author: Miklos Vajna
Date: Thu Aug 30 16:44:56 2012 +0200
n#777337 SwEditWin::UpdatePointer: fix mouse pointer wrt. background images
When the image is in the background, just show the normal text cursor,
since we're able to select text as well in that situation.
Change-Id: I4b4303834245e402d40567cff4a2bf53a0a13e5e
diff --git a/sw/inc/fesh.hxx b/sw/inc/fesh.hxx
index c5c7543..058f912 100644
--- a/sw/inc/fesh.hxx
+++ b/sw/inc/fesh.hxx
@@ -262,6 +262,8 @@ public:
// The following two methods return enum SdrHdlKind.
// Declared as int in order to spare including SVDRAW.HXX.
bool IsObjSelectable( const Point& rPt );
+/// Same as IsObjSelectable(), but return the object as well.
+SdrObject* GetObjAt(const Point& rPt);
int IsInsideSelectedObj( const Point& rPt );//!! returns enum values
// Test if there is a draw object at that position and if it should be
selected.
diff --git a/sw/source/core/frmedt/feshview.cxx
b/sw/source/core/frmedt/feshview.cxx
index be852a9..ccd1d00 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -1113,6 +1113,23 @@ bool SwFEShell::IsObjSelectable( const Point& rPt )
return bRet;
}
+SdrObject* SwFEShell::GetObjAt( const Point& rPt )
+{
+SdrObject* pRet = 0;
+SET_CURR_SHELL(this);
+SwDrawView *pDView = Imp()->GetDrawView();
+if( pDView )
+{
+SdrPageView* pPV;
+sal_uInt16 nOld = pDView->GetHitTolerancePixel();
+pDView->SetHitTolerancePixel( pDView->GetMarkHdlSizePixel()/2 );
+
+pDView->PickObj( rPt, pDView->getHitTolLog(), pRet, pPV,
SDRSEARCH_PICKMARKABLE );
+pDView->SetHitTolerancePixel( nOld );
+}
+return pRet;
+}
+
// Test if there is a object at that position and if it should be selected.
sal_Bool SwFEShell::ShouldObjectBeSelected(const Point& rPt)
{
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 3fbc8c0..c496f0a 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -521,7 +521,10 @@ void SwEditWin::UpdatePointer(const Point &rLPt,
sal_uInt16 nModifier )
(rSh.IsObjSelected() || rSh.IsFrmSelected()) &&
(!rSh.IsSelObjProtected(FLYPROTECT_POS));
-eStyle = bMovable ? POINTER_MOVE : POINTER_ARROW;
+SdrObject* pSelectableObj = rSh.GetObjAt(rLPt);
+// Don't update pointer if this is a background
image only.
+if (pSelectableObj->GetLayer() !=
rSh.GetDoc()->GetHellId())
+eStyle = bMovable ? POINTER_MOVE :
POINTER_ARROW;
aActHitType = SDRHIT_OBJECT;
}
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source writerfilter/source
sw/inc/IDocumentSettingAccess.hxx |3 +-
sw/inc/doc.hxx |1
sw/source/core/doc/doc.cxx |4 ++
sw/source/core/doc/docnew.cxx |1
sw/source/core/layout/frmtool.cxx | 39 +++-
sw/source/ui/uno/SwXDocumentSettings.cxx| 16 ++-
writerfilter/source/filter/ImportFilter.cxx |2 +
7 files changed, 63 insertions(+), 3 deletions(-)
New commits:
commit 50a1df360c907d8419ce49f098b6bc87a37a9956
Author: Miklos Vajna
Date: Thu Aug 23 12:11:08 2012 +0200
n#775899 sw: add FloattableNomargins compat flag
The DOCX filter imports floating tables as frames containing a table.
Word ignores the margins of paragraphs next to such a table, Writer does
not. Add a compatibility flag the import filter can set that triggers
this weird behaviour.
Change-Id: Iaaa1d2a2e2f9d0eaea17832b2e418f9a845efffd
diff --git a/sw/inc/IDocumentSettingAccess.hxx
b/sw/inc/IDocumentSettingAccess.hxx
index dd907f2..8263ca6 100644
--- a/sw/inc/IDocumentSettingAccess.hxx
+++ b/sw/inc/IDocumentSettingAccess.hxx
@@ -94,7 +94,8 @@ namespace com { namespace sun { namespace star { namespace
i18n { struct Forbidd
PURGE_OLE,
KERN_ASIAN_PUNCTUATION,
MATH_BASELINE_ALIGNMENT,
- STYLES_NODEFAULT
+ STYLES_NODEFAULT,
+ FLOATTABLE_NOMARGINS
};
public:
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index c18635e..2702d1c 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -567,6 +567,7 @@ private:
// attribute
'WrapInfluenceOnObjPos'.
bool mbMathBaselineAlignment: 1;// TL 2010-10-29 #i972#
bool mbStylesNoDefault : 1;
+bool mbFloattableNomargins : 1; ///< If paragraph margins
next to a floating table should be ignored.
// non-ui-compatibility flags:
bool mbOldNumbering : 1;
diff --git a/sw/source/core/doc/doc.cxx b/sw/source/core/doc/doc.cxx
index 834bc96..45749b4 100644
--- a/sw/source/core/doc/doc.cxx
+++ b/sw/source/core/doc/doc.cxx
@@ -210,6 +210,7 @@ bool SwDoc::get(/*[in]*/ DocumentSettingId id) const
case DO_NOT_RESET_PARA_ATTRS_FOR_NUM_FONT: return
mbDoNotResetParaAttrsForNumFont;
case MATH_BASELINE_ALIGNMENT: return mbMathBaselineAlignment;
case STYLES_NODEFAULT: return mbStylesNoDefault;
+case FLOATTABLE_NOMARGINS: return mbFloattableNomargins;
default:
OSL_FAIL("Invalid setting id");
}
@@ -381,6 +382,9 @@ void SwDoc::set(/*[in]*/ DocumentSettingId id, /*[in]*/
bool value)
case STYLES_NODEFAULT:
mbStylesNoDefault = value;
break;
+case FLOATTABLE_NOMARGINS:
+mbFloattableNomargins = value;
+break;
default:
OSL_FAIL("Invalid setting id");
}
diff --git a/sw/source/core/doc/docnew.cxx b/sw/source/core/doc/docnew.cxx
index 878223c..1a89837 100644
--- a/sw/source/core/doc/docnew.cxx
+++ b/sw/source/core/doc/docnew.cxx
@@ -356,6 +356,7 @@ SwDoc::SwDoc()
mbSmallCapsPercentage66 = false;// hidden
mbTabOverflow = true;
mbUnbreakableNumberings = false;
+mbFloattableNomargins = false;
//
// COMPATIBILITY FLAGS END
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index 4d2e231..1f190aa 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1928,6 +1928,26 @@ long SwBorderAttrs::CalcRight( const SwFrm* pCaller )
const
return nRight;
}
+/// Tries to detect if this paragraph has a floating table attached.
+bool lcl_hasTabFrm(const SwTxtFrm* pTxtFrm)
+{
+if (pTxtFrm->GetDrawObjs())
+{
+const SwSortedObjs* pSortedObjs = pTxtFrm->GetDrawObjs();
+if (pSortedObjs->Count() > 0)
+{
+SwAnchoredObject* pObject = (*pSortedObjs)[0];
+if (pObject->IsA(TYPE(SwFlyFrm)))
+{
+SwFlyFrm* pFly = (SwFlyFrm*)pObject;
+if (pFly->Lower()->IsTabFrm())
+return true;
+}
+}
+}
+return false;
+}
+
long SwBorderAttrs::CalcLeft( const SwFrm *pCaller ) const
{
long nLeft=0;
@@ -1945,7 +1965,24 @@ long SwBorderAttrs::CalcLeft( const SwFrm *pCaller )
const
if ( pCaller->IsTxtFrm() && pCaller->IsRightToLeft() )
nLeft += rLR.GetRight();
else
-nLeft += rLR.GetLeft();
+{
+bool bIgnoreMargin = false;
+if (pCaller->IsTxtFrm())
+{
+const SwTxtFrm* pTxtFrm = (const SwTxtFrm*)pCaller;
+if
(pTxtFrm->GetTxtNode()->GetDoc()->get(IDocumentSettingAccess::FLOATTABLE_NOMARGINS))
+{
+// If this is explicitly requested, ignore the
[Libreoffice-commits] .: sw/inc sw/source unusedcode.easy
sw/inc/viewsh.hxx |4
sw/source/core/view/viewsh.cxx |1 -
unusedcode.easy|1 -
3 files changed, 6 deletions(-)
New commits:
commit c5cab0a3193ee286134b0d94dd68ccb7d2835381
Author: Julien Nabet
Date: Thu Aug 9 23:01:21 2012 +0200
Bin ViewShell::getIDocumentFieldsAccess()
Change-Id: Ib5c49b06a6aab7d578030c3486c9cab91c7f9b28
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index ab0e014..63ae581 100644
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -324,10 +324,6 @@ public:
const IDocumentLayoutAccess* getIDocumentLayoutAccess() const;
IDocumentLayoutAccess* getIDocumentLayoutAccess();
-/** Provides access to the document fields administration interface
- */
-const IDocumentFieldsAccess* getIDocumentFieldsAccess() const;
-
/** Provides access to the content operations interface
*/
IDocumentContentOperations* getIDocumentContentOperations();
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index fb9de45..59c60e7 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2471,7 +2471,6 @@ const IDocumentRedlineAccess*
ViewShell::getIDocumentRedlineAccess() const { ret
IDocumentRedlineAccess* ViewShell::getIDocumentRedlineAccess() { return pDoc; }
const IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() const {
return pDoc; }
IDocumentLayoutAccess* ViewShell::getIDocumentLayoutAccess() { return pDoc; }
-const IDocumentFieldsAccess* ViewShell::getIDocumentFieldsAccess() const {
return pDoc; }
IDocumentContentOperations* ViewShell::getIDocumentContentOperations() {
return pDoc; }
IDocumentStylePoolAccess* ViewShell::getIDocumentStylePoolAccess() { return
pDoc; }
const IDocumentStatistics* ViewShell::getIDocumentStatistics() const { return
pDoc; }
diff --git a/unusedcode.easy b/unusedcode.easy
index 0a25bec..4cfcc41 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -36,7 +36,6 @@
ThumbnailViewItemAcc::getImplementation(com::sun::star::uno::Reference&)
VCLXPrinterServer::getImplementationId()
VCLXPrinterServer::getTypes()
-ViewShell::getIDocumentFieldsAccess() const
VirtualDevice::SetOutputSizePixelScaleOffsetAndBuffer(Size const&, Fraction
const&, Point const&, boost::shared_array const&)
Window::PostUserEvent(unsigned long&, unsigned long, void*)
X11SalGraphics::SetMask(int&, int&, unsigned int&, unsigned int&, int&, int&,
unsigned long)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/ftnidx.hxx |2 +-
sw/source/core/doc/ftnidx.cxx |2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 9490643712a040a6f4433d145bc5d35d9d4335f5
Author: Cédric Bosdonnat
Date: Wed Aug 1 14:36:54 2012 +0200
Fix for a236f8318a0e05caeec53ccbee8b134f44a98008
To get footnotes sorted properly one need to:
* actually use the comparator class
* compare on the offsets value (and not there pointers)
Change-Id: Ie86802c7a92602bfbb4d2a603afe06f621e392a3
diff --git a/sw/inc/ftnidx.hxx b/sw/inc/ftnidx.hxx
index 0cc2efa..e2801c4 100644
--- a/sw/inc/ftnidx.hxx
+++ b/sw/inc/ftnidx.hxx
@@ -47,7 +47,7 @@ struct CompareSwFtnIdxs
bool operator()(SwTxtFtn* const& lhs, SwTxtFtn* const& rhs) const;
};
-class SwFtnIdxs : public o3tl::sorted_vector
+class SwFtnIdxs : public o3tl::sorted_vector
{
public:
SwFtnIdxs() {}
diff --git a/sw/source/core/doc/ftnidx.cxx b/sw/source/core/doc/ftnidx.cxx
index c47a4f9..50e7bde 100644
--- a/sw/source/core/doc/ftnidx.cxx
+++ b/sw/source/core/doc/ftnidx.cxx
@@ -43,7 +43,7 @@ bool CompareSwFtnIdxs::operator()(SwTxtFtn* const& lhs,
SwTxtFtn* const& rhs) co
{
sal_uLong nIdxLHS = _SwTxtFtn_GetIndex( lhs );
sal_uLong nIdxRHS = _SwTxtFtn_GetIndex( rhs );
-return ( nIdxLHS == nIdxRHS && lhs->GetStart() < rhs->GetStart() ) ||
nIdxLHS < nIdxRHS;
+return ( nIdxLHS == nIdxRHS && *lhs->GetStart() < *rhs->GetStart() ) ||
nIdxLHS < nIdxRHS;
}
void SwFtnIdxs::UpdateFtn( const SwNodeIndex& rStt )
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/unobaseclass.hxx |2 +-
sw/source/core/unocore/TextCursorHelper.cxx |2 +-
sw/source/core/unocore/unochart.cxx |2 +-
sw/source/core/unocore/unodraw.cxx |2 +-
sw/source/core/unocore/unofield.cxx |4 ++--
sw/source/core/unocore/unoframe.cxx |2 +-
sw/source/core/unocore/unoport.cxx |2 +-
sw/source/core/unocore/unoportenum.cxx |2 +-
sw/source/core/unocore/unosett.cxx |4 ++--
sw/source/core/unocore/unosrch.cxx |2 +-
sw/source/core/unocore/unostyle.cxx |2 +-
sw/source/core/unocore/unotbl.cxx |6 +++---
sw/source/filter/xml/xmlexp.cxx |2 +-
sw/source/filter/xml/xmlimp.cxx |2 +-
sw/source/ui/dochdl/swdtflvr.cxx|2 +-
sw/source/ui/uno/unoatxt.cxx|4 ++--
sw/source/ui/uno/unodispatch.cxx|2 +-
sw/source/ui/uno/unotxdoc.cxx |4 ++--
sw/source/ui/uno/unotxvw.cxx|2 +-
19 files changed, 25 insertions(+), 25 deletions(-)
New commits:
commit df9b0d2e930eb1f60e429301e5386f742a1676ff
Author: Arnaud Versini
Date: Sat Jul 28 17:56:59 2012 +0200
Use memcmp insteadof rtl_compareMemory in sw
Change-Id: Ie3a95f628387756d2fa941707bd5e224b41b5720
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 94cbf57..74caccc 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -146,7 +146,7 @@ namespace sw {
C *const pThis)
{
if ((rId.getLength() == 16) &&
-(0 == rtl_compareMemory(C::getUnoTunnelId().getConstArray(),
+(0 == memcmp(C::getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16)))
{
return ::sal::static_int_cast< sal_Int64 >(
diff --git a/sw/source/core/unocore/TextCursorHelper.cxx
b/sw/source/core/unocore/TextCursorHelper.cxx
index 009773f..daed15e 100644
--- a/sw/source/core/unocore/TextCursorHelper.cxx
+++ b/sw/source/core/unocore/TextCursorHelper.cxx
@@ -49,7 +49,7 @@ sal_Int64 SAL_CALL OTextCursorHelper::getSomething(
throw(uno::RuntimeException)
{
if( rId.getLength() == 16
-&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+&& 0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
return sal::static_int_cast< sal_Int64 >( reinterpret_cast<
sal_IntPtr >(this) );
diff --git a/sw/source/core/unocore/unochart.cxx
b/sw/source/core/unocore/unochart.cxx
index 732d94a..3602a4b 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -2042,7 +2042,7 @@ sal_Int64 SAL_CALL SwChartDataSequence::getSomething(
const uno::Sequence< sal_I
throw(uno::RuntimeException)
{
if( rId.getLength() == 16
-&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+&& 0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unodraw.cxx
b/sw/source/core/unocore/unodraw.cxx
index 267f6f2..43546dd 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -895,7 +895,7 @@ sal_Int64 SAL_CALL SwXShape::getSomething( const
uno::Sequence< sal_Int8 >& rId
throw(uno::RuntimeException)
{
if( rId.getLength() == 16
-&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+&& 0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr
>(this) );
diff --git a/sw/source/core/unocore/unofield.cxx
b/sw/source/core/unocore/unofield.cxx
index aa29873..d06f6a7 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -410,7 +410,7 @@ sal_Int64 SAL_CALL SwXFieldMaster::getSomething( const
uno::Sequence< sal_Int8 >
throw(uno::RuntimeException)
{
if( rId.getLength() == 16
-&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+&& 0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
return sal::static_int_cast< sal_Int64 >( reinterpret_cast< sal_IntPtr
>(this) );
@@ -1088,7 +1088,7 @@ sal_Int64 SAL_CALL SwXTextField::getSomething( const
uno::Sequence< sal_Int8 >&
throw(uno::RuntimeException)
{
if( rId.getLength() == 16
-&& 0 == rtl_compareMemory( getUnoTunnelId().getConstArray(),
+&& 0 == memcmp( getUnoTunnelId().getConstArray(),
rId.getConstArray(), 16 ) )
{
return sal::static_int_cast< sal_Int64 >(
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/expfld.hxx|2
sw/inc/reffld.hxx| 24
sw/source/core/fields/expfld.cxx | 19 --
sw/source/core/fields/reffld.cxx | 117 +--
4 files changed, 101 insertions(+), 61 deletions(-)
New commits:
commit 7dde426915ebbb7ea2ca3dc661f0a9ac70a26d5c
Author: Uray M. János
Date: Tue Jul 17 19:00:21 2012 +0200
fdo#50801 fix cross-reference text when Caption order is Numbering first
Change-Id: I7306f99c18d0f9cfb3b0ce147ecc200662d23b3d
diff --git a/sw/inc/expfld.hxx b/sw/inc/expfld.hxx
index c15e0a2..0663ef5 100644
--- a/sw/inc/expfld.hxx
+++ b/sw/inc/expfld.hxx
@@ -123,7 +123,7 @@ public:
virtual boolQueryValue( com::sun::star::uno::Any& rVal, sal_uInt16
nWhich ) const;
virtual boolPutValue( const com::sun::star::uno::Any& rVal,
sal_uInt16 nWhich );
-static sal_uInt16 GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc&
rDoc);
+static sal_uInt16 GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc&
rDoc, unsigned nHint = 0);
// #i82544#
voidSetLateInitialization() { bLateInitialization = true;}
};
diff --git a/sw/inc/reffld.hxx b/sw/inc/reffld.hxx
index 5d54b6d..6daf7f6 100644
--- a/sw/inc/reffld.hxx
+++ b/sw/inc/reffld.hxx
@@ -48,19 +48,19 @@ enum REFERENCESUBTYPE
enum REFERENCEMARK
{
REF_BEGIN,
-REF_PAGE = REF_BEGIN,
-REF_CHAPTER,
-REF_CONTENT,
-REF_UPDOWN,
-REF_PAGE_PGDESC,
-REF_ONLYNUMBER,
-REF_ONLYCAPTION,
-REF_ONLYSEQNO,
+REF_PAGE = REF_BEGIN, // "Page"
+REF_CHAPTER, // "Chapter"
+REF_CONTENT, // "Reference"
+REF_UPDOWN, // "Above/Below"
+REF_PAGE_PGDESC, // "As Page Style"
+REF_ONLYNUMBER, // "Category and Number"
+REF_ONLYCAPTION, // "Caption Text"
+REF_ONLYSEQNO,// "Numbering"
// --> #i81002#
// new reference format types for referencing bookmarks and set references
-REF_NUMBER,
-REF_NUMBER_NO_CONTEXT,
-REF_NUMBER_FULL_CONTEXT,
+REF_NUMBER, // "Number"
+REF_NUMBER_NO_CONTEXT, // "Number (no context)"
+REF_NUMBER_FULL_CONTEXT, // "Number (full context)"
REF_END
};
@@ -72,7 +72,7 @@ class SwGetRefFieldType : public SwFieldType
SwDoc* pDoc;
protected:
// Overlay in order to update all ref-fields.
- virtual void Modify( const SfxPoolItem*, const SfxPoolItem * );
+virtual void Modify( const SfxPoolItem*, const SfxPoolItem* );
public:
SwGetRefFieldType(SwDoc* pDoc );
virtual SwFieldType*Copy() const;
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index fee0e9c..29aa927 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -895,19 +895,21 @@ void SwGetExpField::SetValue( const double& rAny )
/* --
Description: Find the index of the reference text
following the current field
+nHint: search starting position after the current
+field (or 0 if default)
--*/
-xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc&
rDoc)
+xub_StrLen SwGetExpField::GetReferenceTextPos( const SwFmtFld& rFmt, SwDoc&
rDoc, unsigned nHint)
{
//
const SwTxtFld* pTxtFld = rFmt.GetTxtFld();
const SwTxtNode& rTxtNode = pTxtFld->GetTxtNode();
//
-xub_StrLen nRet = *pTxtFld->GetStart() + 1;
+xub_StrLen nRet = nHint ? nHint : *pTxtFld->GetStart() + 1;
String sNodeText = rTxtNode.GetTxt();
sNodeText.Erase(0, nRet);
if(sNodeText.Len())
{
-//now check if sNodeText starts with a non-alphanumeric character plus
a blank
+// now check if sNodeText starts with a non-alphanumeric character
plus blanks
sal_uInt16 nSrcpt = pBreakIt->GetRealScriptOfText( sNodeText, 0 );
static sal_uInt16 nIds[] =
@@ -934,11 +936,14 @@ xub_StrLen SwGetExpField::GetReferenceTextPos( const
SwFmtFld& rFmt, SwDoc& rDoc
if( !bIsAlphaNum ||
(c0 == ' ' || c0 == '\t'))
{
+// ignoring blanks
nRet++;
-if( sNodeText.Len() > 1 &&
-(sNodeText.GetChar(1) == ' ' ||
- sNodeText.GetChar(1) == '\t'))
-nRet++;
+unsigned i = 1;
+while (i < sNodeText.Len() &&
+(sNodeText.GetChar(i) == ' ' ||
+ sNodeText.GetChar(i) == '\t')
+)
+nRet++, i++;
}
}
}
diff --git a/sw/source/core/fields/reffld.cxx b/sw/source/core/fields/reffld.cxx
index c9f3bf1..420a445 100644
--- a/sw/source/core/fields/reffld.cxx
+++ b/sw/source/core/fields/reffld.cxx
@@ -67,6 +67,7 @@
#include
#include
+#include // min, max
#include
@@ -290,16 +291,28 @@ void SwGetRefFiel
[Libreoffice-commits] .: sw/inc sw/source vcl/inc
sw/inc/viewsh.hxx|6 +++--- sw/source/core/inc/flyfrm.hxx| 10 +- sw/source/ui/inc/HeaderFooterWin.hxx |2 +- sw/source/ui/inc/PageBreakWin.hxx|2 +- vcl/inc/svdata.hxx |2 +- 5 files changed, 11 insertions(+), 11 deletions(-) New commits: commit 73cf6f327517d59cbb5de428fe4ff221c70e85a2 Author: Jan Holesovsky Date: Tue Jul 17 14:23:29 2012 +0200 Doxygen needs ///< for inline comments, not only //<. Change-Id: Ib8db74de1f18342794713952470e26ba87bc75fe diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx index 85b17a4..fb9682f 100644 --- a/sw/inc/viewsh.hxx +++ b/sw/inc/viewsh.hxx @@ -163,9 +163,9 @@ class SW_DLLPUBLIC ViewShell : public Ring // of scrollbars. sal_Bool bEndActionByVirDev:1; // Paints from EndAction always via virtual device // (e.g. when browsing). -bool bShowHeaderSeparator:1; //< Flag to say that we are showing the header control -bool bShowFooterSeparator:1; //< Flag to say that we are showing the footer control -bool bHeaderFooterEdit:1; //< Flag to say that we are editing header or footer (according to the bShow(Header|Footer)Separator above) +bool bShowHeaderSeparator:1; ///< Flag to say that we are showing the header control +bool bShowFooterSeparator:1; ///< Flag to say that we are showing the footer control +bool bHeaderFooterEdit:1; ///< Flag to say that we are editing header or footer (according to the bShow(Header|Footer)Separator above) // boolean, indicating that class in in constructor. bool mbInConstructor:1; diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx index 3793cdb..5373eb3 100644 --- a/sw/source/core/inc/flyfrm.hxx +++ b/sw/source/core/inc/flyfrm.hxx @@ -115,12 +115,12 @@ protected: // but the width will not be re-evaluated based on the attributes. sal_Bool bFormatHeightOnly :1; -sal_Bool bInCnt :1;//< FLY_AS_CHAR, anchored as character -sal_Bool bAtCnt :1;//< FLY_AT_PARA, anchored at paragraph -sal_Bool bLayout :1; //< FLY_AT_PAGE, FLY_AT_FLY, at page or at frame -sal_Bool bAutoPosition :1; //< FLY_AT_CHAR, anchored at character +sal_Bool bInCnt :1;///< FLY_AS_CHAR, anchored as character +sal_Bool bAtCnt :1;///< FLY_AT_PARA, anchored at paragraph +sal_Bool bLayout :1; ///< FLY_AT_PAGE, FLY_AT_FLY, at page or at frame +sal_Bool bAutoPosition :1; ///< FLY_AT_CHAR, anchored at character -sal_Bool bNoShrink :1; //< temporary forbid shrinking to avoid loops +sal_Bool bNoShrink :1; ///< temporary forbid shrinking to avoid loops // If sal_True, the content of the fly frame will not be deleted when it // is moved to an invisible layer. sal_Bool bLockDeleteContent :1; diff --git a/sw/source/ui/inc/HeaderFooterWin.hxx b/sw/source/ui/inc/HeaderFooterWin.hxx index d6c250d..966074e 100644 --- a/sw/source/ui/inc/HeaderFooterWin.hxx +++ b/sw/source/ui/inc/HeaderFooterWin.hxx @@ -45,7 +45,7 @@ class SwHeaderFooterWin : public MenuButton, public SwFrameControl Window* m_pLine; bool m_bIsAppearing; int m_nFadeRate; -int m_nDelayAppearing; //< Before we show the control, let it transparent for a few timer ticks to avoid appearing with every mouse over. +int m_nDelayAppearing; ///< Before we show the control, let it transparent for a few timer ticks to avoid appearing with every mouse over. Timer m_aFadeTimer; public: diff --git a/sw/source/ui/inc/PageBreakWin.hxx b/sw/source/ui/inc/PageBreakWin.hxx index 63eef5a..c993d9d 100644 --- a/sw/source/ui/inc/PageBreakWin.hxx +++ b/sw/source/ui/inc/PageBreakWin.hxx @@ -45,7 +45,7 @@ class SwPageBreakWin : public MenuButton, public SwFrameControl Window* m_pLine; bool m_bIsAppearing; int m_nFadeRate; -int m_nDelayAppearing; //< Before we show the control, let it transparent for a few timer ticks to avoid appearing with every mouse over. +int m_nDelayAppearing; ///< Before we show the control, let it transparent for a few timer ticks to avoid appearing with every mouse over. Timer m_aFadeTimer; bool m_bDestroyed; diff --git a/vcl/inc/svdata.hxx b/vcl/inc/svdata.hxx index c0b8226..7af3132 100644 --- a/vcl/inc/svdata.hxx +++ b/vcl/inc/svdata.hxx @@ -301,7 +301,7 @@ struct ImplSVNWFData boolmbMenuBarDockingAreaCommonBG:1; // e.g. WinXP default theme boolmbDockingAreaSeparateTB:1; // individual toolbar backgrounds // instead of one for docking area -
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/fldbas.hxx|2 +-
sw/source/core/fields/expfld.cxx |2 +-
sw/source/core/fields/fldbas.cxx |2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 32c7ba61a9ce620c1c9544ac469ccfd143e60bb9
Author: Cédric Bosdonnat
Date: Tue Jul 10 13:44:33 2012 +0200
fdo#51793: FormatNumber can handle sal_uInt32 values after all...
Change-Id: I9d50bce0278a4aa65873aa816eb991473f556cee
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index 404dcfc..93c7495 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -230,7 +230,7 @@ extern sal_uInt16 aTypeTab[];
// General tools.
String GetResult(double nVal, sal_uInt32 nNumFmt, sal_uInt16 nLang =
LANGUAGE_SYSTEM);
voidSetErrorStr(const String& rStr);
-String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat);
+String FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat);
// Instances of SwFields and those derived from it occur 0 to n times.
// For each class there is one instance of the associated type class.
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index ba2754c..fee0e9c 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -880,7 +880,7 @@ void SwSetExpField::SetValue( const double& rAny )
SwValueField::SetValue(rAny);
if( IsSequenceFld() )
-sExpand = FormatNumber( (sal_uInt16)GetValue(), GetFormat() );
+sExpand = FormatNumber( (sal_uInt32)GetValue(), GetFormat() );
else
sExpand = ((SwValueFieldType*)GetTyp())->ExpandValue( rAny,
GetFormat(), GetLanguage());
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 3ca892e..2a693ea 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -434,7 +434,7 @@ SwField * SwField::CopyField() const
Beschreibung: Numerierung expandieren
*/
-String FormatNumber(sal_uInt16 nNum, sal_uInt32 nFormat)
+String FormatNumber(sal_uInt32 nNum, sal_uInt32 nFormat)
{
if(SVX_NUM_PAGEDESC == nFormat)
return String::CreateFromInt32( nNum );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/shellres.hxx |4
sw/source/core/bastyp/SwSmartTagMgr.cxx |5
sw/source/core/bastyp/bparr.cxx |5
sw/source/core/bastyp/breakit.cxx | 10 -
sw/source/core/bastyp/calc.cxx | 45
sw/source/core/bastyp/checkit.cxx |4
sw/source/core/bastyp/index.cxx |4
sw/source/core/bastyp/init.cxx | 175 +++-
sw/source/core/bastyp/swcache.cxx |2
sw/source/core/bastyp/swrect.cxx|6 -
sw/source/core/bastyp/swregion.cxx |2
sw/source/core/bastyp/swtypes.cxx | 35 +++---
sw/source/core/bastyp/tabcol.cxx|2
13 files changed, 150 insertions(+), 149 deletions(-)
New commits:
commit 4a9c5b336a95fd10261e8e24b22137eec2257a3f
Author: Philipp Riemer
Date: Mon Jul 2 02:23:04 2012 +0200
sorted all include statements alphabetically in sw/source/core/bastyp/
* fixing the missing include statements in shellres.hxx (bjoern-michaelsen)
Change-Id: I976586b346facf38905391bd336b7f08b218f4a4
diff --git a/sw/inc/shellres.hxx b/sw/inc/shellres.hxx
index 688fe08..654a541 100644
--- a/sw/inc/shellres.hxx
+++ b/sw/inc/shellres.hxx
@@ -28,9 +28,11 @@
#ifndef _SHELLRES_HXX
#define _SHELLRES_HXX
+#include
+#include
#include
+#include
#include
-#include
struct SW_DLLPUBLIC ShellResource : public Resource
{
diff --git a/sw/source/core/bastyp/SwSmartTagMgr.cxx
b/sw/source/core/bastyp/SwSmartTagMgr.cxx
index 389deac..b2caf30 100644
--- a/sw/source/core/bastyp/SwSmartTagMgr.cxx
+++ b/sw/source/core/bastyp/SwSmartTagMgr.cxx
@@ -28,11 +28,10 @@
#include "SwSmartTagMgr.hxx"
+#include
#include
-#include
#include
-
-#include
+#include
using namespace com::sun::star;
using namespace com::sun::star::uno;
diff --git a/sw/source/core/bastyp/bparr.cxx b/sw/source/core/bastyp/bparr.cxx
index 015a0d7..72d066e 100644
--- a/sw/source/core/bastyp/bparr.cxx
+++ b/sw/source/core/bastyp/bparr.cxx
@@ -26,10 +26,11 @@
*
/
-#include
-#include
#include "bparr.hxx"
+#include
+#include
+
/** Resize block management by this constant.
As a result there are approx. 20 * MAXENTRY == 2 entries available */
const sal_uInt16 nBlockGrowSize = 20;
diff --git a/sw/source/core/bastyp/breakit.cxx
b/sw/source/core/bastyp/breakit.cxx
index 1e4d398..805b342 100644
--- a/sw/source/core/bastyp/breakit.cxx
+++ b/sw/source/core/bastyp/breakit.cxx
@@ -27,15 +27,15 @@
/
#include "breakit.hxx"
-#include
-#include
+#include "swtypes.hxx"
+
#include
#include
-#include
-
+#include
#include
#include
-#include "swtypes.hxx"
+#include
+#include
using namespace com::sun::star;
diff --git a/sw/source/core/bastyp/calc.cxx b/sw/source/core/bastyp/calc.cxx
index a4676ec..47a6f78 100644
--- a/sw/source/core/bastyp/calc.cxx
+++ b/sw/source/core/bastyp/calc.cxx
@@ -26,38 +26,39 @@
*
/
-#include
#if defined(MACOSX)
#include
#endif
-#include
-#include
+
+#include
+#include
#include
-#include
-#include
-#include
-#include
-#include
+#include
#include
#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
-#include
+#include
+#include
#include
-#include
-#include
#include
#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
+#include
#include
+#include
+#include
+#include
+#include
+#include
using namespace ::com::sun::star;
diff --git a/sw/source/core/bastyp/checkit.cxx
b/sw/source/core/bastyp/checkit.cxx
index 93ac454..8d1881e 100644
--- a/sw/source/core/bastyp/checkit.cxx
+++ b/sw/source/core/bastyp/checkit.cxx
@@ -26,9 +26,9 @@
*
/
-#include
-#include
#include
+#include
+#include
using namespace ::com::sun::star::uno;
using namespace ::com::sun::star::lang;
diff --git a/sw/source/core/bastyp/index.cxx b/sw/source/core/bastyp/index.cxx
index 787d421..c9339dd 100644
--- a/sw/source/core/bastyp/index.cxx
+++ b/sw/source/core/bastyp/index.cxx
@@ -26,13 +26,13 @@
*
/
+#include "index.hxx"
+
#include
#include
#include
#include
-#include "index.hxx"
-
TYPEINIT0(SwIndexReg);
// ---
diff --git a/sw/source/core/bastyp/init.cxx b/sw/source/core/bastyp/init.cxx
index 1bfd194..71a5a89 100644
--- a/sw/source/core/bastyp/init.cxx
+++ b/sw/source/core/bastyp/init.cxx
@@ -26,115 +26,112 @@
*
/
-#include
-#include
-#include
-#include
-#include
-#include
+#incl
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/cellfml.hxx|6 +++---
sw/source/core/attr/cellatr.cxx |2 +-
sw/source/core/fields/cellfml.cxx |4 ++--
sw/source/core/fields/tblcalc.cxx |2 +-
4 files changed, 7 insertions(+), 7 deletions(-)
New commits:
commit b779da6fb73d7b235f4f7d032c7e463d97545e83
Author: Philipp Riemer
Date: Sat Jun 30 23:49:55 2012 +0200
renamed "MakeFormel" into "MakeFormula" (in sw/)
Change-Id: I1da8e5e7b8d12895c099a6c0cc259009e76aa341
diff --git a/sw/inc/cellfml.hxx b/sw/inc/cellfml.hxx
index 3a8566f..8373162 100644
--- a/sw/inc/cellfml.hxx
+++ b/sw/inc/cellfml.hxx
@@ -78,7 +78,7 @@ typedef void (SwTableFormula:: *FnScanFormel)( const
SwTable&, String&,
void* pPara = 0 ) const;
void BoxNmsToRelNm( const SwTable&, String&, String&, String* = 0,
void* pPara = 0 ) const;
-void _MakeFormel( const SwTable&, String&, String&, String* = 0,
+void _MakeFormula( const SwTable&, String&, String&, String* = 0,
void* pPara = 0 ) const;
void _GetFmlBoxes( const SwTable&, String&, String&, String* = 0,
void* pPara = 0 ) const;
@@ -109,9 +109,9 @@ protected:
SwTableFormula( const String& rFormel );
-String MakeFormel( SwTblCalcPara& rCalcPara ) const
+String MakeFormula( SwTblCalcPara& rCalcPara ) const
{
-return ScanString( &SwTableFormula::_MakeFormel,
+return ScanString( &SwTableFormula::_MakeFormula,
*rCalcPara.pTbl, &rCalcPara );
}
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 71641d3..dcc9c87 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -195,7 +195,7 @@ void SwTblBoxFormula::Calc( SwTblCalcPara& rCalcPara,
double& rValue )
{
// create pointers from box names
BoxNmToPtr( rCalcPara.pTbl );
-String sFml( MakeFormel( rCalcPara ));
+String sFml( MakeFormula( rCalcPara ));
if( !rCalcPara.rCalc.IsCalcError() )
rValue = rCalcPara.rCalc.Calculate( sFml ).GetDouble();
else
diff --git a/sw/source/core/fields/cellfml.cxx
b/sw/source/core/fields/cellfml.cxx
index 9ca66e1..6d45a44 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -311,7 +311,7 @@ SwTableFormula::~SwTableFormula()
{
}
-void SwTableFormula::_MakeFormel( const SwTable& rTbl, String& rNewStr,
+void SwTableFormula::_MakeFormula( const SwTable& rTbl, String& rNewStr,
String& rFirstBox, String* pLastBox, void* pPara ) const
{
SwTblCalcPara* pCalcPara = (SwTblCalcPara*)pPara;
@@ -651,7 +651,7 @@ String SwTableFormula::ScanString( FnScanFormel fnFormel,
const SwTable& rTbl,
// beim Bauen der Formel ist der TabellenName unerwuenscht
//JP 22.02.99: der CAST muss fuer den Linux-Compiler sein
-if( fnFormel != (FnScanFormel)&SwTableFormula::_MakeFormel
)
+if( fnFormel !=
(FnScanFormel)&SwTableFormula::_MakeFormula )
aStr += sTblNm;
nStt = nTrenner;
diff --git a/sw/source/core/fields/tblcalc.cxx
b/sw/source/core/fields/tblcalc.cxx
index e7975c0..4657e0f 100644
--- a/sw/source/core/fields/tblcalc.cxx
+++ b/sw/source/core/fields/tblcalc.cxx
@@ -61,7 +61,7 @@ void SwTblField::CalcField( SwTblCalcPara& rCalcPara )
// erzeuge aus den BoxNamen die Pointer
BoxNmToPtr( rCalcPara.pTbl );
-String sFml( MakeFormel( rCalcPara ));
+String sFml( MakeFormula( rCalcPara ));
SetValue( rCalcPara.rCalc.Calculate( sFml ).GetDouble() );
ChgValid( !rCalcPara.IsStackOverFlow() ); // ist der Wert wieder
gueltig?
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx |4
sw/source/core/doc/docdesc.cxx | 302 +++--
2 files changed, 117 insertions(+), 189 deletions(-)
New commits:
commit fb2eac0f8f65fc1f063ebec0ed19e2ed639e0b32
Author: Miklos Vajna
Date: Mon Jul 2 16:32:13 2012 +0200
SwDoc: kill copy&paste with CopyMasterHeader() and CopyMasterFooter()
Change-Id: I10480cc7977e7227a6abe84e7bf27f69a980f89a
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 290a288..1529b87 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -2082,6 +2082,10 @@ public:
private:
/// method to set new graphics pool defaults, must only be called by
SetDrawDefaults!
void UpdateDrawDefaults();
+/// Copies master header to left / first one, if necessary - used by
ChgPageDesc().
+void CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader &rHead,
SwPageDesc *pDesc, bool bLeft);
+/// Copies master footer to left / first one, if necessary - used by
ChgPageDesc().
+void CopyMasterFooter(const SwPageDesc &rChged, const SwFmtFooter &rFoot,
SwPageDesc *pDesc, bool bLeft);
};
// This method is called in Dtor of SwDoc and deletes cache of ContourObjects.
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 52934cd..23fe98a 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -184,82 +184,24 @@ void lcl_DescSetAttr( const SwFrmFmt &rSource, SwFrmFmt
&rDest,
rDest.SetPoolHlpFileId( rSource.GetPoolHlpFileId() );
}
-
-void SwDoc::ChgPageDesc( sal_uInt16 i, const SwPageDesc &rChged )
+void SwDoc::CopyMasterHeader(const SwPageDesc &rChged, const SwFmtHeader
&rHead, SwPageDesc *pDesc, bool bLeft)
{
-OSL_ENSURE( i < aPageDescs.size(), "PageDescs is out of range." );
-
-SwPageDesc *pDesc = aPageDescs[i];
-SwRootFrm* pTmpRoot = GetCurrentLayout();
-
-if (GetIDocumentUndoRedo().DoesUndo())
-{
-SwUndo *const pUndo(new SwUndoPageDesc(*pDesc, rChged, this));
-GetIDocumentUndoRedo().AppendUndo(pUndo);
-}
-::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
-
-// Mirror at first if needed.
-if ( rChged.GetUseOn() == nsUseOnPage::PD_MIRROR )
-((SwPageDesc&)rChged).Mirror();
-else
-// Or else transfer values from Master to Left.
-::lcl_DescSetAttr( ((SwPageDesc&)rChged).GetMaster(),
- ((SwPageDesc&)rChged).GetLeft() );
-
-// Take over NumType.
-if( rChged.GetNumType().GetNumberingType() !=
pDesc->GetNumType().GetNumberingType() )
-{
-pDesc->SetNumType( rChged.GetNumType() );
-// Notify page number fields that NumFormat has changed
-GetSysFldType( RES_PAGENUMBERFLD )->UpdateFlds();
-GetSysFldType( RES_REFPAGEGETFLD )->UpdateFlds();
-
-// If the numbering scheme has changed we could have QuoVadis/ErgoSum
texts
-// that refer to a changed page, so we invalidate foot notes.
-SwFtnIdxs& rFtnIdxs = GetFtnIdxs();
-for( sal_uInt16 nPos = 0; nPos < rFtnIdxs.Count(); ++nPos )
-{
-SwTxtFtn *pTxtFtn = rFtnIdxs[ nPos ];
-const SwFmtFtn &rFtn = pTxtFtn->GetFtn();
-pTxtFtn->SetNumber( rFtn.GetNumber(), &rFtn.GetNumStr());
-}
-}
-
-// Take over orientation
-pDesc->SetLandscape( rChged.GetLandscape() );
-
-// #i46909# no undo if header or footer changed
-bool bHeaderFooterChanged = false;
-
-// Synch header.
-const SwFmtHeader &rHead = rChged.GetMaster().GetHeader();
-if (undoGuard.UndoWasEnabled())
-{
-// #i46909# no undo if header or footer changed
-// Did something change in the nodes?
-const SwFmtHeader &rOldHead = pDesc->GetMaster().GetHeader();
-bHeaderFooterChanged |=
-( rHead.IsActive() != rOldHead.IsActive() ||
- rChged.IsHeaderShared() != pDesc->IsHeaderShared() ||
- rChged.IsHeaderSharedFirst() != pDesc->IsHeaderSharedFirst() );
-}
-pDesc->GetMaster().SetFmtAttr( rHead );
-if ( rChged.IsHeaderShared() || !rHead.IsActive() )
+SwFrmFmt& rDescFrmFmt = (bLeft ? pDesc->GetLeft() : pDesc->GetFirst());
+if ( (bLeft ? rChged.IsHeaderShared() : rChged.IsHeaderSharedFirst() ) ||
!rHead.IsActive() )
{
-// Left shares the header with the Master.
-pDesc->GetLeft().SetFmtAttr( pDesc->GetMaster().GetHeader() );
+// Left or first shares the header with the Master.
+rDescFrmFmt.SetFmtAttr( pDesc->GetMaster().GetHeader() );
}
else if ( rHead.IsActive() )
-{ // Left gets its own header if the Format doesn't alrady have one.
+{ // Left or first gets its own header if the Format doesn't alrady have
one.
// If it already has one and it points to the same Section as the
// Right one, it needs to get an own Header.
// The content is evidently copied.
-const SwFmtHeader &rLeftHead = pDesc->GetLeft().
[Libreoffice-commits] .: sw/inc
sw/inc/docufld.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 7eb0c9b056b648afd5bc216811892d058e352de6 Author: Philipp Riemer Date: Fri May 25 19:33:37 2012 +0200 Translate German comment in sw/inc/docufld.hxx diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index b110d68..03f5e52 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -684,7 +684,7 @@ class SwRefPageGetFieldType : public SwFieldType void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList ); protected: -// ueberlagert, um alle RefPageGet-Felder zu updaten +// overwritten to update all RefPageGet fields virtual void Modify( const SfxPoolItem*, const SfxPoolItem * ); public: SwRefPageGetFieldType( SwDoc* pDoc ); ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx |7 +++
sw/inc/editsh.hxx |6 +++---
sw/source/core/edit/edattr.cxx |3 +--
3 files changed, 7 insertions(+), 9 deletions(-)
New commits:
commit f9067ca632487c64d72bc378d9bb4ff6370a02c1
Author: Philipp Riemer
Date: Fri May 25 19:30:20 2012 +0200
Fix German "adjust left margin" comment in multiple files in
sw/{inc/,source/core}
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index a8c5c2e..ab09943 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1818,10 +1818,9 @@ public:
sal_Bool bChkPtr = sal_False, SbxArray* pArgs = 0,
const Link* pCallBack = 0 );
-// Adjust left margin via object bar.
-// linken Rand ueber Objectleiste einstellen (aenhlich dem Stufen von
-// Numerierungen), optional kann man "um" den Offset stufen oder "auf"
-// die Position gestuft werden (bModulus = sal_True).
+// Adjust left margin via object bar (similar to adjustment of
numerations).
+// One can either change the margin "by" adding or substracting a given
+// offset or set it "to" this position (bModulus = sal_True).
void MoveLeftMargin( const SwPaM& rPam, sal_Bool bRight = sal_True,
sal_Bool bModulus = sal_True );
diff --git a/sw/inc/editsh.hxx b/sw/inc/editsh.hxx
index 8455ad0..7c8c84a 100644
--- a/sw/inc/editsh.hxx
+++ b/sw/inc/editsh.hxx
@@ -871,9 +871,9 @@ public:
sfx2::LinkManager& GetLinkManager();
inline const sfx2::LinkManager& GetLinkManager() const;
-// linken Rand ueber Objectleiste einstellen (aenhlich dem Stufen von
-// Numerierungen), optional kann man "um" den Offset stufen oder "auf"
-// die Position gestuft werden (bModulus = sal_True)
+// Adjust left margin via object bar (similar to adjustment of
numerations).
+// One can either change the margin "by" adding or substracting a given
+// offset or set it "to" this position (bModulus = sal_True).
sal_Bool IsMoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus =
sal_True ) const;
void MoveLeftMargin( sal_Bool bRight = sal_True, sal_Bool bModulus =
sal_True );
diff --git a/sw/source/core/edit/edattr.cxx b/sw/source/core/edit/edattr.cxx
index d2b7a70..80d019f 100644
--- a/sw/source/core/edit/edattr.cxx
+++ b/sw/source/core/edit/edattr.cxx
@@ -379,8 +379,7 @@ sal_uInt16 SwEditShell::GetSeqFtnList( SwSeqFldList& rList,
bool bEndNotes )
}
-// linken Rand ueber Objectleiste einstellen (aenhlich dem Stufen von
-// Numerierungen)
+// Adjust left margin via object bar (similar to adjustment of numerations).
sal_Bool SwEditShell::IsMoveLeftMargin( sal_Bool bRight, sal_Bool bModulus )
const
{
sal_Bool bRet = sal_True;
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/ndarr.hxx|4 +---
sw/source/core/docnode/nodedump.cxx |3 +++
sw/source/core/inc/frame.hxx|4 +---
3 files changed, 5 insertions(+), 6 deletions(-)
New commits:
commit 3bf5ae903175615d67da18ab2990cf2a550899d3
Author: Michael Meeks
Date: Wed May 23 12:30:12 2012 +0100
add libxml forward definitions instead of direct includes
Change-Id: I33ffca788182cd24d148614ee03c5a884baccf84
diff --git a/sw/inc/ndarr.hxx b/sw/inc/ndarr.hxx
index 22c52ee..0faba74 100644
--- a/sw/inc/ndarr.hxx
+++ b/sw/inc/ndarr.hxx
@@ -41,9 +41,6 @@
#include
#include
-#include
-#include
-
class Graphic;
class GraphicObject;
class String;
@@ -83,6 +80,7 @@ struct SwPosition;
typedef SwNode * SwNodePtr;
typedef sal_Bool (*FnForEach_SwNodes)( const SwNodePtr&, void* pArgs );
+typedef struct _xmlTextWriter *xmlTextWriterPtr;
SV_DECL_PTRARR_SORT( SwOutlineNodes, SwNodePtr, 0 )
diff --git a/sw/source/core/docnode/nodedump.cxx
b/sw/source/core/docnode/nodedump.cxx
index 447967c..9db2f9b 100644
--- a/sw/source/core/docnode/nodedump.cxx
+++ b/sw/source/core/docnode/nodedump.cxx
@@ -29,6 +29,9 @@
#include "doc.hxx"
#include "ndtxt.hxx"
+#include
+#include
+
namespace
{
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index 0939c63..a0c620c 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -39,9 +39,6 @@
#include
#include "IDocumentDrawModelAccess.hxx"
-#include
-#include
-
class SwLayoutFrm;
class SwRootFrm;
class SwPageFrm;
@@ -68,6 +65,7 @@ class SwFmt;
class SwPrintData;
class SwSortedObjs;
class SwAnchoredObject;
+typedef struct _xmlTextWriter *xmlTextWriterPtr;
//Jeder FrmTyp findet sich hier in einem Bit wieder.
//Die Bits muessen so gesetzt werden, dass mit einer Maskierung festgestellt
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/swtypes.hxx |2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 898d64869f71ebf3ec1fa6f3b9e72e12343caec2 Author: Jan Holesovsky Date: Fri May 18 09:37:27 2012 +0200 writer UI: Decrease the size of the border around the document. This makes the horizontal scrollbar appear in smaller amount of cases, generally improving the user experience mainly on smaller screens. Change-Id: Ic4bf04484f26bd8be572512f6315ecc77d781d11 diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx index 827ee6e..7b47fcd 100644 --- a/sw/inc/swtypes.hxx +++ b/sw/inc/swtypes.hxx @@ -88,7 +88,7 @@ const SwTwips lMinBorder = 1134; // Margin left and above document. // Half of it is gap between the pages. -#define DOCUMENTBORDER 568L +#define DOCUMENTBORDER 284L #define GAPBETWEENPAGES 284L #define UNDO_ACTION_COUNT 20 ___ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc
sw/inc/tblafmt.hxx |2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit d202754abf01bafe24b3805ef678a495c16eb5a5
Author: Tor Lillqvist
Date: Thu May 17 14:30:47 2012 +0300
WaE: 'Impl' defined as a struct here but previously declared as a class
Change-Id: Ie1ca2df3e4b60c69a3c7860fe39aca4a505feffb
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index ae8399e..bb1eb3a 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -309,7 +309,7 @@ public:
class SW_DLLPUBLIC SwTableAutoFmtTbl
{
-class Impl;
+struct Impl;
::boost::scoped_ptr m_pImpl;
SW_DLLPRIVATE sal_Bool Load( SvStream& rStream );
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/swabstdlg.hxx |2 -
sw/inc/tblafmt.hxx| 23 +++
sw/source/core/doc/tblafmt.cxx| 56 +-
sw/source/core/unocore/unotbl.cxx |2 -
sw/source/ui/dialog/swdlgfact.cxx |2 -
sw/source/ui/dialog/swdlgfact.hxx |2 -
sw/source/ui/inc/convert.hxx |2 -
sw/source/ui/shells/basesh.cxx|4 +-
sw/source/ui/table/convert.cxx|2 -
sw/source/ui/table/tautofmt.cxx | 16 +-
10 files changed, 82 insertions(+), 29 deletions(-)
New commits:
commit 007f16ef7ad40ae932df884ba04f0de71928b852
Author: Michael Stahl
Date: Tue May 15 00:25:35 2012 +0200
SwTableAutoFmtTbl: try to fix MSVC tinderbox:
C:/lo/core/sw/inc\tblafmt.hxx(311) : error C2487:
'boost::ptr_container_detail::reversible_ptr_container::insert'
: member of dll interface class may not be declared with dll interface
Not really understanding what the problem is here, attempting to fix it
by not deriving SwTableAutoFmtTbl from the container, and trying to get
that to build somehow resulted in this commit.
diff --git a/sw/inc/swabstdlg.hxx b/sw/inc/swabstdlg.hxx
index ab6e8a5..2962991 100644
--- a/sw/inc/swabstdlg.hxx
+++ b/sw/inc/swabstdlg.hxx
@@ -240,7 +240,7 @@ class AbstractSwConvertTableDlg : public VclAbstractDialog
// add for SwConvert
public:
virtual void GetValues( sal_Unicode& rDelim,
SwInsertTableOptions& rInsTblFlags,
-SwTableAutoFmt *& prTAFmt ) = 0;
+SwTableAutoFmt const*& prTAFmt ) = 0;
};
class AbstractSwInsertDBColAutoPilot : public VclAbstractDialog // add for
SwInsertDBColAutoPilot
diff --git a/sw/inc/tblafmt.hxx b/sw/inc/tblafmt.hxx
index a185c0f..ae8399e 100644
--- a/sw/inc/tblafmt.hxx
+++ b/sw/inc/tblafmt.hxx
@@ -25,8 +25,8 @@
* for a copy of the LGPLv3 License.
*
/
-#ifndef _TBLAFMT_HXX
-#define _TBLAFMT_HXX
+#ifndef SW_TBLAFMT_HXX
+#define SW_TBLAFMT_HXX
/*
!!
@@ -37,6 +37,8 @@
!!
**/
+#include
+
#include
#include "hintids.hxx" // _Always_ before the solar-items!
#include
@@ -305,15 +307,24 @@ public:
sal_Bool Save( SvStream& rStream, sal_uInt16 fileVersion ) const;
};
-typedef boost::ptr_vector _SwTableAutoFmtTbl;
-
-class SW_DLLPUBLIC SwTableAutoFmtTbl : public _SwTableAutoFmtTbl
+class SW_DLLPUBLIC SwTableAutoFmtTbl
{
+class Impl;
+::boost::scoped_ptr m_pImpl;
+
SW_DLLPRIVATE sal_Bool Load( SvStream& rStream );
SW_DLLPRIVATE sal_Bool Save( SvStream& rStream ) const;
public:
-SwTableAutoFmtTbl();
+explicit SwTableAutoFmtTbl();
+~SwTableAutoFmtTbl();
+
+size_t size() const;
+SwTableAutoFmt const& operator[](size_t i) const;
+SwTableAutoFmt & operator[](size_t i);
+void InsertAutoFmt(size_t i, SwTableAutoFmt * pFmt);
+void EraseAutoFmt(size_t i);
+void MoveAutoFmt(size_t target, size_t source);
sal_Bool Load();
sal_Bool Save() const;
diff --git a/sw/source/core/doc/tblafmt.cxx b/sw/source/core/doc/tblafmt.cxx
index 747863d..893f7b4 100644
--- a/sw/source/core/doc/tblafmt.cxx
+++ b/sw/source/core/doc/tblafmt.cxx
@@ -1026,7 +1026,48 @@ sal_Bool SwTableAutoFmt::Save( SvStream& rStream,
sal_uInt16 fileVersion ) const
}
+struct SwTableAutoFmtTbl::Impl
+{
+boost::ptr_vector m_AutoFormats;
+};
+
+size_t SwTableAutoFmtTbl::size() const
+{
+return m_pImpl->m_AutoFormats.size();
+}
+
+SwTableAutoFmt const& SwTableAutoFmtTbl::operator[](size_t const i) const
+{
+return m_pImpl->m_AutoFormats[i];
+}
+SwTableAutoFmt & SwTableAutoFmtTbl::operator[](size_t const i)
+{
+return m_pImpl->m_AutoFormats[i];
+}
+
+void
+SwTableAutoFmtTbl::InsertAutoFmt(size_t const i, SwTableAutoFmt *const pFmt)
+{
+m_pImpl->m_AutoFormats.insert(m_pImpl->m_AutoFormats.begin() + i, pFmt);
+}
+
+void SwTableAutoFmtTbl::EraseAutoFmt(size_t const i)
+{
+m_pImpl->m_AutoFormats.erase(m_pImpl->m_AutoFormats.begin() + i);
+}
+
+void SwTableAutoFmtTbl::MoveAutoFmt(size_t const target, size_t source)
+{
+m_pImpl->m_AutoFormats.transfer(m_pImpl->m_AutoFormats.begin() + target,
+m_pImpl->m_AutoFormats.begin() + source, m_pImpl->m_AutoFormats);
+}
+
+SwTableAutoFmtTbl::~SwTableAutoFmtTbl()
+{
+}
+
SwTableAutoFmtTbl::SwTableAutoFmtTbl()
+: m_pImpl(new Impl)
{
String sNm;
SwTableAutoFmt* pNew = new SwTableAutoFmt(
@@ -1081,7 +1122,7 @@ SwTableAutoFmtTbl::SwTableAutoFmtTbl()
((SwBoxAutoFmt&)pNew->GetBoxFmt( i )).SetBox( aBox );
}
-push_back( pNew );
+m_pImpl->m_AutoFormats.push_back(pNew);
}
[Libreoffice-commits] .: sw/inc sw/source
sw/inc/doc.hxx|1 +
sw/source/core/doc/docfld.cxx | 14 ++
sw/source/ui/uiview/view.cxx | 13 -
3 files changed, 23 insertions(+), 5 deletions(-)
New commits:
commit cb235067de2bf7feef3c03eeb08492e60da0d083
Author: Caolán McNamara
Date: Mon May 14 16:07:05 2012 +0100
Resolves: fdo#49897 add+use SwDoc::containsUpdatableFields
Change-Id: I03ab6367a40ddc5748a499c4e2c7f108a3ef8a08
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 7f4a1cc..2552022 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -849,6 +849,7 @@ public:
@return pointer to field at the given position or NULL in case no field
is found
*/
static SwTxtFld* GetTxtFld(const SwPosition& rPos);
+bool containsUpdatableFields();
/** IDocumentContentOperations
*/
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index f19d64c..9290e02 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -411,6 +411,20 @@ void SwDoc::UpdateRefFlds( SfxPoolItem* pHt )
pFldType->ModifyNotification( 0, pHt );
}
+//For simplicity assume that all field types have updatable contents so
+//optimization currently only available when no fields exist.
+bool SwDoc::containsUpdatableFields()
+{
+for (sal_uInt16 i = 0; i < pFldTypes->Count(); ++i)
+{
+SwFieldType* pFldType = (*pFldTypes)[i];
+SwIterator aIter(*pFldType);
+if (aIter.First())
+return true;
+}
+return false;
+}
+
void SwDoc::UpdateTblFlds( SfxPoolItem* pHt )
{
OSL_ENSURE( !pHt || RES_TABLEFML_UPDATE == pHt->Which(),
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index bd9a726..93e643a 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -970,11 +970,14 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell*
pOldSh )
if( pWrtShell->GetDoc()->IsUpdateExpFld() )
{
-SET_CURR_SHELL( pWrtShell );
-pWrtShell->StartAction();
-pWrtShell->CalcLayout();
-pWrtShell->GetDoc()->UpdateFlds(NULL, false);
-pWrtShell->EndAction();
+if (pWrtShell->GetDoc()->containsUpdatableFields())
+{
+SET_CURR_SHELL( pWrtShell );
+pWrtShell->StartAction();
+pWrtShell->CalcLayout();
+pWrtShell->GetDoc()->UpdateFlds(NULL, false);
+pWrtShell->EndAction();
+}
pWrtShell->GetDoc()->SetUpdateExpFldStat( sal_False );
}
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
[Libreoffice-commits] .: sw/inc sw/source unusedcode.easy
sw/inc/crsrsh.hxx|1 -
sw/source/core/crsr/crstrvl1.cxx |4
unusedcode.easy |1 -
3 files changed, 6 deletions(-)
New commits:
commit 1fa4154c1c99dc06713da3ab03096ce4a05e74c4
Author: Julien Nabet
Date: Wed May 2 10:45:31 2012 +0200
Remove GoPrevSentence indicated in unused
Change-Id: I492677ed33cf21404b22c2d8770fe32d2cac3839
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 41f6b63..fa2b287 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -719,7 +719,6 @@ public:
sal_Bool GoNextWord();
sal_Bool GoPrevWord();
sal_Bool GoNextSentence();
-sal_Bool GoPrevSentence();
sal_Bool GoStartSentence();
sal_Bool GoEndSentence();
sal_Bool SelectWord( const Point* pPt = 0 );
diff --git a/sw/source/core/crsr/crstrvl1.cxx b/sw/source/core/crsr/crstrvl1.cxx
index d244c38..e9886b4 100644
--- a/sw/source/core/crsr/crstrvl1.cxx
+++ b/sw/source/core/crsr/crstrvl1.cxx
@@ -83,10 +83,6 @@ sal_Bool SwCrsrShell::GoEndSentence()
return CallCrsrFN( &SwCursor::GoEndSentence );
}
-sal_Bool SwCrsrShell::GoPrevSentence()
-{
-return CallCrsrFN( &SwCursor::GoPrevSentence );
-}
sal_Bool SwCrsrShell::GoStartSentence()
{
return CallCrsrFN( &SwCursor::GoStartSentence );
diff --git a/unusedcode.easy b/unusedcode.easy
index 56b1d1e..00cd6fa 100755
--- a/unusedcode.easy
+++ b/unusedcode.easy
@@ -144,7 +144,6 @@ SwContentArr::Insert(SwContent* const*, unsigned short)
SwContentArr::Insert(SwContentArr const*, unsigned short, unsigned short)
SwContentArr::Remove(SwContent* const&, unsigned short)
SwContentArr::Remove(unsigned short, unsigned short)
-SwCrsrShell::GoPrevSentence()
SwCurrShells::DeleteAndDestroy(unsigned short, unsigned short)
SwCurrShells::Insert(CurrShell* const&, unsigned short&)
SwCurrShells::Insert(CurrShell* const*, unsigned short)
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
