[Libreoffice-commits] .: 2 commits - sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Mon Jan 7 17:11:18 PST 2013
sw/source/core/frmedt/feshview.cxx | 4 ++--
sw/source/ui/app/swmodul1.cxx | 16 ++++++++--------
sw/source/ui/app/swmodule.cxx | 2 +-
sw/source/ui/cctrl/actctrl.cxx | 4 ++--
sw/source/ui/chrdlg/drpcps.cxx | 12 ++++++------
sw/source/ui/chrdlg/numpara.cxx | 4 ++--
sw/source/ui/chrdlg/pardlg.cxx | 2 +-
sw/source/ui/docvw/edtdd.cxx | 4 ++--
sw/source/ui/docvw/edtwin.cxx | 34 ++++++++++++++++++----------------
sw/source/ui/ribbar/conform.cxx | 4 ++--
sw/source/ui/ribbar/drawbase.cxx | 16 ++++++++--------
sw/source/ui/ribbar/dselect.cxx | 2 --
sw/source/ui/shells/textfld.cxx | 6 +++---
sw/source/ui/uiview/view.cxx | 6 +++---
sw/source/ui/wrtsh/wrtsh3.cxx | 6 +++---
15 files changed, 61 insertions(+), 61 deletions(-)
New commits:
commit ff927ba4272aa8f115472577ec9393df19016f2a
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Jan 8 10:09:22 2013 +0900
sal_Bool to bool
Change-Id: I4e4063321da69d45d14a2fc870c33ea8ae46e4ef
diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
index 048eb1d3..de5622c 100644
--- a/sw/source/core/frmedt/feshview.cxx
+++ b/sw/source/core/frmedt/feshview.cxx
@@ -110,13 +110,13 @@ static void lcl_GrabCursor( SwFEShell* pSh, SwFlyFrm* pOldSelFly)
{
// now call set macro if applicable
pSh->GetFlyMacroLnk().Call( (void*)pFlyFmt );
-extern sal_Bool bNoInterrupt; // in swapp.cxx
+extern bool bNoInterrupt; // in swapp.cxx
// if a dialog was started inside a macro, then
// MouseButtonUp arrives at macro and not to us. Therefore
// flag is always set here and will never be switched to
// respective Shell !!!!!!!
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
}
else if( !pFlyFmt || RES_DRAWFRMFMT == pFlyFmt->Which() )
{
diff --git a/sw/source/ui/app/swmodul1.cxx b/sw/source/ui/app/swmodul1.cxx
index 3c1388f..9337d9c 100644
--- a/sw/source/ui/app/swmodul1.cxx
+++ b/sw/source/ui/app/swmodul1.cxx
@@ -74,9 +74,9 @@ using namespace ::com::sun::star::lang;
static void lcl_SetUIPrefs(const SwViewOption &rPref, SwView* pView, ViewShell* pSh )
{
// in FrameSets the actual visibility can differ from the ViewOption's setting
- sal_Bool bVScrollChanged = rPref.IsViewVScrollBar() != pSh->GetViewOptions()->IsViewVScrollBar();
- sal_Bool bHScrollChanged = rPref.IsViewHScrollBar() != pSh->GetViewOptions()->IsViewHScrollBar();
- sal_Bool bVAlignChanged = rPref.IsVRulerRight() != pSh->GetViewOptions()->IsVRulerRight();
+ bool bVScrollChanged = rPref.IsViewVScrollBar() != pSh->GetViewOptions()->IsViewVScrollBar();
+ bool bHScrollChanged = rPref.IsViewHScrollBar() != pSh->GetViewOptions()->IsViewHScrollBar();
+ bool bVAlignChanged = rPref.IsVRulerRight() != pSh->GetViewOptions()->IsVRulerRight();
pSh->SetUIOptions(rPref);
const SwViewOption* pNewPref = pSh->GetViewOptions();
@@ -156,7 +156,7 @@ void SwModule::ApplyUsrPref(const SwViewOption &rUsrPref, SwView* pActView,
pCurrView && pCurrView->ISA(SwWebView) ));
// with Uno, only sdbcx::View, but not the Module should be changed
- sal_Bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
+ bool bViewOnly = VIEWOPT_DEST_VIEW_ONLY == nDest;
// fob PreView off
SwPagePreView* pPPView;
if( !pCurrView && 0 != (pPPView = PTR_CAST( SwPagePreView, SfxViewShell::Current())) )
@@ -303,11 +303,11 @@ void SwModule::ApplyUserCharUnit(sal_Bool bApplyChar, sal_Bool bWeb)
pPref = pUsrPref;
}
sal_Bool bOldApplyCharUnit = pPref->IsApplyCharUnit();
- sal_Bool bHasChanged = sal_False;
+ bool bHasChanged = false;
if(bOldApplyCharUnit != bApplyChar)
{
pPref->SetApplyCharUnit(bApplyChar);
- bHasChanged = sal_True;
+ bHasChanged = true;
}
if( !bHasChanged )
@@ -460,7 +460,7 @@ static void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet &rSet,
sizeof( aColArr[0] )) ] );
}
- sal_Bool bBackGr = COL_NONE == rAttr.nColor;
+ bool bBackGr = COL_NONE == rAttr.nColor;
switch (rAttr.nItemId)
{
@@ -503,7 +503,7 @@ static void lcl_FillAuthorAttr( sal_uInt16 nAuthor, SfxItemSet &rSet,
case SID_ATTR_BRUSH:
rSet.Put( SvxBrushItem( aCol, RES_CHRATR_BACKGROUND ));
- bBackGr = sal_True;
+ bBackGr = true;
break;
}
diff --git a/sw/source/ui/app/swmodule.cxx b/sw/source/ui/app/swmodule.cxx
index 0add2ed..3c61ac7 100644
--- a/sw/source/ui/app/swmodule.cxx
+++ b/sw/source/ui/app/swmodule.cxx
@@ -128,7 +128,7 @@
#include <app.hrc>
#include <svx/xmlsecctrl.hxx>
ResMgr *pSwResMgr = 0;
-sal_Bool bNoInterrupt = sal_False;
+bool bNoInterrupt = false;
#include <sfx2/app.hxx>
diff --git a/sw/source/ui/cctrl/actctrl.cxx b/sw/source/ui/cctrl/actctrl.cxx
index d930a46..d4a8d0e 100644
--- a/sw/source/ui/cctrl/actctrl.cxx
+++ b/sw/source/ui/cctrl/actctrl.cxx
@@ -68,12 +68,12 @@ NoSpaceEdit::~NoSpaceEdit()
void NoSpaceEdit::KeyInput(const KeyEvent& rEvt)
{
- sal_Bool bCallParent = sal_True;
+ bool bCallParent = true;
if(rEvt.GetCharCode())
{
rtl::OUString sKey(rEvt.GetCharCode());
if( STRING_NOTFOUND != sForbiddenChars.Search(sKey))
- bCallParent = sal_False;
+ bCallParent = false;
}
if(bCallParent)
Edit::KeyInput(rEvt);
diff --git a/sw/source/ui/chrdlg/drpcps.cxx b/sw/source/ui/chrdlg/drpcps.cxx
index 566161e..5672ac4 100644
--- a/sw/source/ui/chrdlg/drpcps.cxx
+++ b/sw/source/ui/chrdlg/drpcps.cxx
@@ -78,7 +78,7 @@ class SwDropCapsPict : public Control
sal_uInt16 mnDistance;
sal_Int32 mnLeading;
Printer* mpPrinter;
- sal_Bool mbDelPrinter;
+ bool mbDelPrinter;
/// The _ScriptInfo structure holds information on where we change from one
/// script to another.
struct _ScriptInfo
@@ -113,7 +113,7 @@ public:
, mnLineH(0)
, mnTextH(0)
, mpPrinter( NULL )
- , mbDelPrinter( sal_False )
+ , mbDelPrinter( false )
{}
~SwDropCapsPict();
@@ -496,7 +496,7 @@ void SwDropCapsPict::_InitPrinter()
if ( !mpPrinter )
{
mpPrinter = new Printer;
- mbDelPrinter = sal_True;
+ mbDelPrinter = true;
}
}
@@ -716,7 +716,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
if (pEdit == &aDropCapsField)
{
sal_uInt16 nVal;
- sal_Bool bSetText = sal_False;
+ bool bSetText = false;
if (!aWholeWordCB.IsChecked())
nVal = (sal_uInt16)aDropCapsField.GetValue();
@@ -727,7 +727,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
sPreview = GetDefaultString(nVal);
else
{
- bSetText = sal_True;
+ bSetText = true;
sPreview = rSh.GetDropTxt(nVal);
}
@@ -736,7 +736,7 @@ IMPL_LINK( SwDropCapsPage, ModifyHdl, Edit *, pEdit )
if (sEdit.Len() && sPreview.CompareTo(sEdit, sEdit.Len()) != COMPARE_EQUAL)
{
sPreview = sEdit.Copy(0, sPreview.Len());
- bSetText = sal_False;
+ bSetText = false;
}
if (bSetText)
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index 0fc749f..4482edd 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -160,7 +160,7 @@ sal_Bool SwParagraphNumTabPage::FillItemSet( SfxItemSet& rSet )
void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
{
- sal_Bool bHasNumberStyle = sal_False;
+ bool bHasNumberStyle = false;
SfxItemState eItemState = rSet.GetItemState( GetWhich(SID_ATTR_PARA_OUTLINE_LEVEL) );
@@ -195,7 +195,7 @@ void SwParagraphNumTabPage::Reset( const SfxItemSet& rSet )
else
aNumberStyleLB.SelectEntry( aStyle );
- bHasNumberStyle = sal_True;
+ bHasNumberStyle = true;
}
else
{
diff --git a/sw/source/ui/chrdlg/pardlg.cxx b/sw/source/ui/chrdlg/pardlg.cxx
index 7c04aab..e083812 100644
--- a/sw/source/ui/chrdlg/pardlg.cxx
+++ b/sw/source/ui/chrdlg/pardlg.cxx
@@ -104,7 +104,7 @@ SwParaDlg::SwParaDlg(Window *pParent,
RemoveTabPage(TP_PARA_ASIAN);
sal_uInt16 nWhich(rCoreSet.GetPool()->GetWhich(SID_ATTR_LRSPACE));
- sal_Bool bLRValid = SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(nWhich);
+ bool bLRValid = SFX_ITEM_AVAILABLE <= rCoreSet.GetItemState(nWhich);
if(bHtmlMode || !bLRValid)
RemoveTabPage(TP_TABULATOR);
else
diff --git a/sw/source/ui/docvw/edtdd.cxx b/sw/source/ui/docvw/edtdd.cxx
index 0cdafc1..e607878 100644
--- a/sw/source/ui/docvw/edtdd.cxx
+++ b/sw/source/ui/docvw/edtdd.cxx
@@ -44,7 +44,7 @@ using namespace ::com::sun::star;
// no include "dbgoutsw.hxx" here!!!!!!
-extern sal_Bool bNoInterrupt;
+extern bool bNoInterrupt;
extern sal_Bool bFrmDrag;
extern sal_Bool bDDTimerStarted;
@@ -160,7 +160,7 @@ void SwEditWin::DropCleanup()
SwWrtShell &rSh = rView.GetWrtShell();
// reset statuses
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
if ( bOldIdleSet )
{
((SwViewOption*)rSh.GetViewOptions())->SetIdle( bOldIdle );
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index 3ceee26..20ea534 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -150,7 +150,7 @@ using namespace ::com::sun::star;
--------------------------------------------------------------------*/
static bool bInputLanguageSwitched = false;
-extern sal_Bool bNoInterrupt; // in mainwn.cxx
+extern bool bNoInterrupt; // in mainwn.cxx
// Usually in MouseButtonUp a selection is revoked when the selection is
// not currently being pulled open. Unfortunately in MouseButtonDown there
@@ -2711,7 +2711,8 @@ void SwEditWin::RstMBDownFlags()
// of the modal dialog (like on WINDOWS).
// So reset the statuses here and release the mouse
// for the dialog.
- bMBPressed = bNoInterrupt = sal_False;
+ bMBPressed = sal_False;
+ bNoInterrupt = false;
EnterArea();
ReleaseMouse();
}
@@ -2984,7 +2985,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if ( MOUSE_LEFT == rMEvt.GetButtons() )
{
sal_Bool bOnlyText = sal_False;
- bMBPressed = bNoInterrupt = sal_True;
+ bMBPressed = sal_True;
+ bNoInterrupt = true;
nKS_NUMDOWN_Count = 0;
CaptureMouse();
@@ -3013,7 +3015,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
}
if ( EnterDrawMode( rMEvt, aDocPos ) )
{
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
return;
}
else if ( rView.GetDrawFuncPtr() && bInsFrm )
@@ -3046,7 +3048,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
}
bFrmDrag = sal_True;
}
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
return;
}
}
@@ -3400,7 +3402,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
rSh.GetDrawView()->PickHandle( aDocPos ))
{
bFrmDrag = sal_True;
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
return;
}
}
@@ -3429,7 +3431,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
rSh.GetDrawView()->PickHandle( aDocPos ))
{
bFrmDrag = sal_True;
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
return;
}
else
@@ -3572,8 +3574,8 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if ( !bOverSelect )
{
- const sal_Bool bTmpNoInterrupt = bNoInterrupt;
- bNoInterrupt = sal_False;
+ const bool bTmpNoInterrupt = bNoInterrupt;
+ bNoInterrupt = false;
if( !rSh.IsViewLocked() && bLockView )
rSh.LockView( sal_True );
@@ -4172,7 +4174,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
rSh.EndDrag( &aDocPt, false );
bFrmDrag = sal_False;
}
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
ReleaseMouse();
return;
}
@@ -4224,7 +4226,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
else if (rMEvt.GetButtons() == MOUSE_RIGHT && rSh.IsDrawCreate())
rView.GetDrawFuncPtr()->BreakCreate(); // abort drawing
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
ReleaseMouse();
return;
}
@@ -4356,8 +4358,8 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
SwContentAtPos aFieldAtPos ( SwContentAtPos::SW_FIELD );
if ( !rSh.IsInSelect() && rSh.ChgCurrPam( aDocPt ) && !rSh.GetContentAtPos( aDocPt, aFieldAtPos ) )
{
- const sal_Bool bTmpNoInterrupt = bNoInterrupt;
- bNoInterrupt = sal_False;
+ const bool bTmpNoInterrupt = bNoInterrupt;
+ bNoInterrupt = false;
{ // create only temporary move context because otherwise
// the query to the content form doesn't work!!!
SwMvContext aMvContext( &rSh );
@@ -4681,7 +4683,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
//sicherheitshalber aufrufen, da jetzt das Selektieren bestimmt zu Ende ist.
//Andernfalls koennte der Timeout des Timers Kummer machen.
EnterArea();
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
if (bCallBase)
Window::MouseButtonUp(rMEvt);
@@ -4973,10 +4975,10 @@ void SwEditWin::Command( const CommandEvent& rCEvt )
SET_CURR_SHELL( &rSh );
if (!pApplyTempl)
{
- if (bNoInterrupt == sal_True)
+ if (bNoInterrupt)
{
ReleaseMouse();
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
bMBPressed = sal_False;
}
if ( rCEvt.IsMouseEvent() )
diff --git a/sw/source/ui/ribbar/conform.cxx b/sw/source/ui/ribbar/conform.cxx
index ca2e22a..2a0d494 100644
--- a/sw/source/ui/ribbar/conform.cxx
+++ b/sw/source/ui/ribbar/conform.cxx
@@ -27,7 +27,7 @@
#include "drawbase.hxx"
#include "conform.hxx"
-extern sal_Bool bNoInterrupt; // in mainwn.cxx
+extern bool bNoInterrupt; // in mainwn.cxx
/*************************************************************************
|*
@@ -76,7 +76,7 @@ sal_Bool ConstFormControl::MouseButtonDown(const MouseEvent& rMEvt)
if (rMEvt.IsLeft() && !m_pWin->IsDrawAction() &&
(eHit == SDRHIT_UNMARKEDOBJECT || eHit == SDRHIT_NONE || m_pSh->IsDrawCreate()))
{
- bNoInterrupt = sal_True;
+ bNoInterrupt = true;
m_pWin->CaptureMouse();
m_pWin->SetPointer(Pointer(POINTER_DRAW_RECT));
diff --git a/sw/source/ui/ribbar/drawbase.cxx b/sw/source/ui/ribbar/drawbase.cxx
index 4f68558..78fe5d5 100644
--- a/sw/source/ui/ribbar/drawbase.cxx
+++ b/sw/source/ui/ribbar/drawbase.cxx
@@ -40,7 +40,7 @@
using namespace ::com::sun::star;
-extern sal_Bool bNoInterrupt; // in mainwn.cxx
+extern bool bNoInterrupt; // in mainwn.cxx
#define MINMOVE ((sal_uInt16)m_pSh->GetOut()->PixelToLogic(Size(m_pSh->GetDrawView()->GetMarkHdlSizePixel()/2,0)).Width())
@@ -112,7 +112,7 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
{
if (IsCreateObj() && (eHit == SDRHIT_UNMARKEDOBJECT || eHit == SDRHIT_NONE || m_pSh->IsDrawCreate()))
{
- bNoInterrupt = sal_True;
+ bNoInterrupt = true;
m_pWin->CaptureMouse();
m_aStartPos = m_pWin->PixelToLogic(rMEvt.GetPosPixel());
@@ -138,7 +138,7 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
/******************************************************************
* Handle draggen
******************************************************************/
- bNoInterrupt = sal_True;
+ bNoInterrupt = true;
bReturn = pSdrView->BegDragObj(m_aStartPos, (OutputDevice*) NULL, aVEvt.pHdl);
m_pWin->SetDrawAction(sal_True);
}
@@ -147,7 +147,7 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
/******************************************************************
* Klebepunkt einfuegen
******************************************************************/
- bNoInterrupt = sal_True;
+ bNoInterrupt = true;
bReturn = pSdrView->BegInsObjPoint(m_aStartPos, rMEvt.IsMod1());
m_pWin->SetDrawAction(sal_True);
}
@@ -198,7 +198,7 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
if (pHdl)
{
- bNoInterrupt = sal_True;
+ bNoInterrupt = true;
pSdrView->MarkPoint(*pHdl);
}
}
@@ -213,12 +213,12 @@ sal_Bool SwDrawBase::MouseButtonDown(const MouseEvent& rMEvt)
if (pSdrView->HasMarkablePoints())
pSdrView->UnmarkAllPoints();
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
// Drag im edtwin verwenden
return sal_False;
}
- bNoInterrupt = sal_True;
+ bNoInterrupt = true;
if (m_pSh->IsObjSelected())
{
@@ -514,7 +514,7 @@ void SwDrawBase::Deactivate()
m_pWin->SetDrawAction(sal_False);
m_pWin->ReleaseMouse();
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
if(m_pWin->GetApplyTemplate())
m_pWin->SetApplyTemplate(SwApplyTemplate());
diff --git a/sw/source/ui/shells/textfld.cxx b/sw/source/ui/shells/textfld.cxx
index 9c0a61b..124be9b 100644
--- a/sw/source/ui/shells/textfld.cxx
+++ b/sw/source/ui/shells/textfld.cxx
@@ -72,7 +72,7 @@
using namespace nsSwDocInfoSubType;
-extern sal_Bool bNoInterrupt; // in mainwn.cxx
+extern bool bNoInterrupt; // in mainwn.cxx
static String& lcl_AppendRedlineStr( String& rStr, sal_uInt16 nRedlId )
{
@@ -470,7 +470,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
}
rSh.SetCareWin(pDlg->GetWindow());
- bNoInterrupt = sal_True;
+ bNoInterrupt = true;
if ( pDlg->Execute() == RET_OK )
{
@@ -483,7 +483,7 @@ void SwTextShell::ExecField(SfxRequest &rReq)
delete pDlg;
rSh.SetCareWin(NULL);
- bNoInterrupt = sal_False;
+ bNoInterrupt = false;
rSh.ClearMark();
GetView().AttrChangedNotify(GetShellPtr());
}
diff --git a/sw/source/ui/uiview/view.cxx b/sw/source/ui/uiview/view.cxx
index 96623d9..44fa043 100644
--- a/sw/source/ui/uiview/view.cxx
+++ b/sw/source/ui/uiview/view.cxx
@@ -113,7 +113,7 @@ using namespace ::com::sun::star::scanner;
using ::rtl::OUString;
using ::rtl::OUStringBuffer;
-extern sal_Bool bNoInterrupt; // in mainwn.cxx
+extern bool bNoInterrupt; // in mainwn.cxx
#define SWVIEWFLAGS ( SFX_VIEW_CAN_PRINT| \
SFX_VIEW_HAS_PRINTOPTIONS)
@@ -886,8 +886,8 @@ SwView::SwView( SfxViewFrame *_pFrame, SfxViewShell* pOldSh )
// Im CTOR duerfen keine Shell wechsel erfolgen, die muessen ueber
// den Timer "zwischen gespeichert" werden. Sonst raeumt der SFX
// sie wieder vom Stack!
- sal_Bool bOld = bNoInterrupt;
- bNoInterrupt = sal_True;
+ bool bOld = bNoInterrupt;
+ bNoInterrupt = true;
pHRuler->SetActive( sal_True );
pVRuler->SetActive( sal_True );
diff --git a/sw/source/ui/wrtsh/wrtsh3.cxx b/sw/source/ui/wrtsh/wrtsh3.cxx
index f0f6e79..2469589 100644
--- a/sw/source/ui/wrtsh/wrtsh3.cxx
+++ b/sw/source/ui/wrtsh/wrtsh3.cxx
@@ -40,7 +40,7 @@
using namespace ::com::sun::star;
using ::rtl::OUString;
-extern sal_Bool bNoInterrupt; // in mainwn.cxx
+extern bool bNoInterrupt; // in mainwn.cxx
sal_Bool SwWrtShell::MoveBookMark( BookMarkMove eFuncId, const ::sw::mark::IMark* const pMark)
{
@@ -121,8 +121,8 @@ void SwWrtShell::DrawSelChanged( )
GetView().GetViewFrame()->GetBindings().Invalidate(aInval);
- sal_Bool bOldVal = bNoInterrupt;
- bNoInterrupt = sal_True; // Trick, um AttrChangedNotify ueber Timer auszufuehren
+ bool bOldVal = bNoInterrupt;
+ bNoInterrupt = true; // Trick, um AttrChangedNotify ueber Timer auszufuehren
GetView().AttrChangedNotify(this);
bNoInterrupt = bOldVal;
}
commit dce241f933f076e256ef8f2c3e8b8e5e9e3efa7f
Author: Takeshi Abe <tabe at fixedpoint.jp>
Date: Tue Jan 8 10:06:58 2013 +0900
Remove unused extern
Change-Id: Ib3dc0693031975c4f797000ad383853092727cc8
diff --git a/sw/source/ui/ribbar/dselect.cxx b/sw/source/ui/ribbar/dselect.cxx
index ab03a41..cd52505 100644
--- a/sw/source/ui/ribbar/dselect.cxx
+++ b/sw/source/ui/ribbar/dselect.cxx
@@ -25,8 +25,6 @@
#include "drawbase.hxx"
#include "dselect.hxx"
-extern sal_Bool bNoInterrupt; // in mainwn.cxx
-
/*************************************************************************
|*
|* Konstruktor
More information about the Libreoffice-commits
mailing list