[Libreoffice-commits] core.git: 8 commits - filter/source slideshow/source svx/source sw/source unotools/source
Andre Fischer
af at apache.org
Wed Feb 19 11:17:30 CET 2014
filter/source/msfilter/msdffimp.cxx | 4
slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx | 42 ++++++----
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 23 +++++
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 12 ++
svx/source/svdraw/svdopath.cxx | 33 ++++++-
sw/source/ui/config/usrpref.cxx | 4
sw/source/ui/docvw/edtwin.cxx | 18 +++-
sw/source/ui/inc/edtwin.hxx | 16 +--
sw/source/ui/inc/gloslst.hxx | 6 +
unotools/source/config/securityoptions.cxx | 6 +
10 files changed, 135 insertions(+), 29 deletions(-)
New commits:
commit 5b9003372effe4ee4bc34f34ee20138ac6a6050f
Author: Andre Fischer <af at apache.org>
Date: Tue Feb 18 14:17:32 2014 +0000
Resolves: #i124216# Detect changes of the UI scale.
(cherry picked from commit 7e5783030c82f8ec87b88899869e9152cf5c3271)
Conflicts:
svx/source/sidebar/possize/PosSizePropertyPanel.hxx
Change-Id: Ia31d5645694ca9b9ebb36f38c650103905b346a8
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 291d71b..f320e3e 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -811,6 +811,7 @@ void PosSizePropertyPanel::NotifyItemUpdate(
case SID_ATTR_METRIC:
MetricState( eState, pState );
+ UpdateUIScale();
break;
default:
@@ -1162,4 +1163,26 @@ void PosSizePropertyPanel::DisableControls()
}
+
+
+void PosSizePropertyPanel::UpdateUIScale()
+{
+ const Fraction aUIScale (mpView->GetModel()->GetUIScale());
+ if (maUIScale != aUIScale)
+ {
+ // UI scale has changed.
+
+ // Remember the new UI scale.
+ maUIScale = aUIScale;
+
+ // The content of the position and size boxes is only updated when item changes are notified.
+ // Request such notifications without changing the actual item values.
+ GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_X, sal_True, sal_False);
+ GetBindings()->Invalidate(SID_ATTR_TRANSFORM_POS_Y, sal_True, sal_False);
+ GetBindings()->Invalidate(SID_ATTR_TRANSFORM_WIDTH, sal_True, sal_False);
+ GetBindings()->Invalidate(SID_ATTR_TRANSFORM_HEIGHT, sal_True, sal_False);
+ }
+}
+
+
} } // end of namespace svx::sidebar
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index f789282..5649a49 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -173,6 +173,18 @@ private:
void MetricState( SfxItemState eState, const SfxPoolItem* pState );
FieldUnit GetCurrentUnit( SfxItemState eState, const SfxPoolItem* pState );
void DisableControls();
+
+ /** Check if the UI scale has changed and handle such a change.
+ UI scale is an SD only feature. The UI scale is represented by items
+ ATTR_OPTIONS_SCALE_X and
+ ATTR_OPTIONS_SCALE_Y.
+ As we have no direct access (there is no dependency of svx on sd) we have to
+ use a small trick (aka hack):
+ a) call this method whenever a change of the metric item is notified,
+ b) check if the UI scale has changed (strangely, the UI scale value is available at the SdrModel.
+ c) invalidate the items for position and size to trigger notifications of their current values.
+ */
+ void UpdateUIScale();
};
commit aad580af924d477f90264d6d1a2365d8e0cf8c9c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 09:41:49 2014 +0000
coverity#738900 Uninitialized scalar field
Change-Id: I71eef3a4ffddac418b79866c0080c2d2d58a8226
diff --git a/sw/source/ui/config/usrpref.cxx b/sw/source/ui/config/usrpref.cxx
index acdcac3..e848580 100644
--- a/sw/source/ui/config/usrpref.cxx
+++ b/sw/source/ui/config/usrpref.cxx
@@ -50,7 +50,8 @@ SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) :
bIsHScrollMetricSet(sal_False),
bIsVScrollMetricSet(sal_False),
nDefTab( MM50 * 4 ),
- bIsSquaredPageMode(sal_False),
+ bIsSquaredPageMode(false),
+ bIsAlignMathObjectsToBaseline(false),
aContentConfig(bWeb, *this),
aLayoutConfig(bWeb, *this),
aGridConfig(bWeb, *this),
@@ -60,6 +61,7 @@ SwMasterUsrPref::SwMasterUsrPref(sal_Bool bWeb) :
{
MeasurementSystem eSystem = SvtSysLocale().GetLocaleData().getMeasurementSystemEnum();
eUserMetric = MEASURE_METRIC == eSystem ? FUNIT_CM : FUNIT_INCH;
+ eHScrollMetric = eVScrollMetric = eUserMetric;
aContentConfig.Load();
aLayoutConfig.Load();
commit df889fb50b1a6e52de054847943a34d56ce75221
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 09:39:01 2014 +0000
coverity#738901 Uninitialized scalar field
Change-Id: If11660802f7c37017aa60bf85be6d77ea6c63f40
diff --git a/sw/source/ui/docvw/edtwin.cxx b/sw/source/ui/docvw/edtwin.cxx
index af79875..47c17bf 100644
--- a/sw/source/ui/docvw/edtwin.cxx
+++ b/sw/source/ui/docvw/edtwin.cxx
@@ -4878,11 +4878,25 @@ SwEditWin::SwEditWin(Window *pParent, SwView &rMyView):
m_nDropAction( 0 ),
m_nDropDestination( 0 ),
+ m_eBezierMode(SID_BEZIER_INSERT),
m_nInsFrmColCount( 1 ),
m_eDrawMode(OBJ_NONE),
- m_bLockInput(sal_False),
- m_bObjectSelect( sal_False ),
+ m_bMBPressed(false),
+ m_bInsDraw(false),
+ m_bInsFrm(false),
+ m_bIsInMove(false),
+ m_bIsInDrag(false),
+ m_bOldIdle(false),
+ m_bOldIdleSet(false),
+ m_bTblInsDelMode(false),
+ m_bTblIsInsMode(false),
+ m_bChainMode(false),
+ m_bWasShdwCrsr(false),
+ m_bLockInput(false),
+ m_bIsRowDrag(false),
+ m_bUseInputLanguage(false),
+ m_bObjectSelect(false),
m_nKS_NUMDOWN_Count(0),
m_nKS_NUMINDENTINC_Count(0),
m_aFrameControlsManager( this )
diff --git a/sw/source/ui/inc/edtwin.hxx b/sw/source/ui/inc/edtwin.hxx
index 934c3f7..3d16206 100644
--- a/sw/source/ui/inc/edtwin.hxx
+++ b/sw/source/ui/inc/edtwin.hxx
@@ -111,12 +111,12 @@ friend void PageNumNotify( SwViewShell* pVwSh,
int m_aActHitType; // current mouse pointer
- sal_uLong m_nDropFormat; // format from the last QueryDrop
- sal_uInt16 m_nDropAction; // action from the last QueryDrop
- sal_uInt16 m_nDropDestination; // destination from the last QueryDrop
+ sal_uLong m_nDropFormat; // format from the last QueryDrop
+ sal_uInt16 m_nDropAction; // action from the last QueryDrop
+ sal_uInt16 m_nDropDestination; // destination from the last QueryDrop
- sal_uInt16 m_eBezierMode;
- sal_uInt16 m_nInsFrmColCount; // column number for interactive frame
+ sal_uInt16 m_eBezierMode;
+ sal_uInt16 m_nInsFrmColCount; // column number for interactive frame
SdrObjKind m_eDrawMode;
sal_Bool m_bMBPressed : 1,
m_bInsDraw : 1,
@@ -232,13 +232,13 @@ public:
inline void SetSdrDrawMode( SdrObjKind eSdrObjectKind ) { m_eDrawMode = eSdrObjectKind; SetObjectSelect( sal_False ); }
void StdDrawMode( SdrObjKind eSdrObjectKind, sal_Bool bObjSelect );
- sal_Bool IsFrmAction() { return (m_bInsFrm); }
- inline sal_uInt16 GetBezierMode() { return m_eBezierMode; }
+ bool IsFrmAction() const { return (m_bInsFrm); }
+ sal_uInt16 GetBezierMode() const { return m_eBezierMode; }
void SetBezierMode(sal_uInt16 eBezMode) { m_eBezierMode = eBezMode; }
void EnterDrawTextMode(const Point& aDocPos); // turn on DrawTextEditMode
void InsFrm(sal_uInt16 nCols);
void StopInsFrm();
- sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame
+ sal_uInt16 GetFrmColCount() const {return m_nInsFrmColCount;} // column number for interactive frame
void SetChainMode( sal_Bool bOn );
commit f49a97af3ec737f2465c18e6b682f2b495d9c43a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 09:34:05 2014 +0000
coverity#738908 Uninitialized scalar field
Change-Id: I3770ffbdf34f680de14a0a83ea3ec4631064399f
diff --git a/sw/source/ui/inc/gloslst.hxx b/sw/source/ui/inc/gloslst.hxx
index 09ea19e..82a5dce 100644
--- a/sw/source/ui/inc/gloslst.hxx
+++ b/sw/source/ui/inc/gloslst.hxx
@@ -36,7 +36,11 @@ struct AutoTextGroup
OUString sShortNames; // by 0x0A separated short names
DateTime aDateModified;
- AutoTextGroup() : aDateModified( DateTime::EMPTY ) {}
+ AutoTextGroup()
+ : nCount(0)
+ , aDateModified(DateTime::EMPTY)
+ {
+ }
};
commit 10985869bf327c6b9c8d67803d8fb487af3e871a
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 09:31:45 2014 +0000
coverity#984090 Uninitialized scalar field
Change-Id: I1df4f04b46e1b9c2d82d85aa915e4d04c5959e30
diff --git a/filter/source/msfilter/msdffimp.cxx b/filter/source/msfilter/msdffimp.cxx
index 696563d..ffc463e 100644
--- a/filter/source/msfilter/msdffimp.cxx
+++ b/filter/source/msfilter/msdffimp.cxx
@@ -5504,7 +5504,11 @@ SvxMSDffManager::SvxMSDffManager( SvStream& rStCtrl_, const OUString& rBaseURL )
nOffsDgg( 0 ),
nBLIPCount( USHRT_MAX ), // initialize with error, since we first have to check
nShapeCount( USHRT_MAX ), // whether the control stream contains the correct data
+ nGroupShapeFlags(0),
maBaseURL( rBaseURL ),
+ mnCurMaxShapeId(0),
+ mnDrawingsSaved(0),
+ mnIdClusters(0),
rStCtrl( rStCtrl_ ),
pStData( 0 ),
pStData2( 0 ),
commit 37a00689600cc9ec8bef109dc046579849a56bb8
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 09:29:43 2014 +0000
coverity#984143 Uninitialized scalar field
Change-Id: I2940b86ce45dfc6b7399b76c84f88c5658f4a923
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
index 52418cb..c5d086e 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionerImpl.cxx
@@ -1758,19 +1758,35 @@ void OGLTransitionerImpl::disposing()
mxView.clear();
}
-OGLTransitionerImpl::OGLTransitionerImpl() :
- OGLTransitionerImplBase(m_aMutex),
- GLleavingSlide( 0 ),
- GLenteringSlide( 0 ),
- pWindow( NULL ),
- mxView(),
- EnteringBytes(),
- LeavingBytes(),
- mbRestoreSync( false ),
- mbUseLeavingPixmap( false ),
- mbUseEnteringPixmap( false ),
- SlideBitmapLayout(),
- SlideSize()
+OGLTransitionerImpl::OGLTransitionerImpl()
+ : OGLTransitionerImplBase(m_aMutex)
+ , GLleavingSlide(0)
+ , GLenteringSlide(0)
+ , pWindow(NULL)
+ , mxView()
+ , EnteringBytes()
+ , LeavingBytes()
+#if defined( GLX_EXT_texture_from_pixmap )
+ , LeavingPixmap(0)
+ , EnteringPixmap(0)
+#endif
+ , mbRestoreSync(false)
+ , mbUseLeavingPixmap(false)
+ , mbUseEnteringPixmap(false)
+ , mbFreeLeavingPixmap(false)
+ , mbFreeEnteringPixmap(false)
+#ifdef UNX
+ , maLeavingPixmap(0)
+ , maEnteringPixmap(0)
+#endif
+ , SlideBitmapLayout()
+ , SlideSize()
+#ifdef UNX
+ , mnGLXVersion(0.0)
+#endif
+ , mbTextureFromPixmap(false)
+ , mbGenerateMipmap(false)
+ , mbHasTFPVisual(false)
{
memset(&GLWin, 0, sizeof(GLWin));
}
commit db03076476eb054db87e8d464d98799ca1bf661c
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 09:22:24 2014 +0000
coverity#984168 Uninitialized scalar field
Change-Id: I7c0af2de872bb0064a2e5cb269fd2a08f228ce3e
diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx
index 20df661..3a33933 100644
--- a/unotools/source/config/securityoptions.cxx
+++ b/unotools/source/config/securityoptions.cxx
@@ -253,6 +253,9 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
,m_bPrint ( sal_True )
,m_bCreatePDF ( sal_True )
,m_bRemoveInfo ( sal_True )
+ ,m_bRecommendPwd(false)
+ ,m_bCtrlClickHyperlink(false)
+ ,m_bBlockUntrustedRefererLinks(false)
,m_nSecLevel ( sal_True )
,m_seqTrustedAuthors ( DEFAULT_TRUSTEDAUTHORS )
,m_bDisableMacros ( sal_False )
@@ -262,6 +265,9 @@ SvtSecurityOptions_Impl::SvtSecurityOptions_Impl()
,m_bROPrint ( CFG_READONLY_DEFAULT )
,m_bROCreatePDF ( CFG_READONLY_DEFAULT )
,m_bRORemoveInfo ( CFG_READONLY_DEFAULT )
+ ,m_bRORecommendPwd(CFG_READONLY_DEFAULT)
+ ,m_bROCtrlClickHyperlink(CFG_READONLY_DEFAULT)
+ ,m_bROBlockUntrustedRefererLinks(CFG_READONLY_DEFAULT)
,m_bROSecLevel ( CFG_READONLY_DEFAULT )
,m_bROTrustedAuthors ( CFG_READONLY_DEFAULT )
,m_bRODisableMacros ( sal_True ) // currently is not intended to be changed
commit 6c272275c54488f231f7523c59fd4900af915fd7
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Feb 19 09:19:02 2014 +0000
coverity#1000868 Uninitialized scalar field
Change-Id: I23cac47887588ee9fd413f2c887a3db032287a4d
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index c49df14..ad7816e 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -114,10 +114,35 @@ public:
};
ImpSdrPathDragData::ImpSdrPathDragData(const SdrPathObj& rPO, const SdrHdl& rHdl, bool bMuPoDr, const SdrDragStat& rDrag)
-: aXP(5),
- mbMultiPointDrag(bMuPoDr),
- maOrig(rPO.GetPathPoly()),
- maHandles(0)
+ : aXP(5)
+ , bValid(false)
+ , bClosed(false)
+ , nPoly(0)
+ , nPnt(0)
+ , nPntAnz(0)
+ , nPntMax(0)
+ , bBegPnt(false)
+ , bEndPnt(false)
+ , nPrevPnt(0)
+ , nNextPnt(0)
+ , bPrevIsBegPnt(false)
+ , bNextIsEndPnt(false)
+ , nPrevPrevPnt(0)
+ , nNextNextPnt(0)
+ , bControl(false)
+ , bIsPrevControl(false)
+ , bIsNextControl(false)
+ , bPrevIsControl(false)
+ , bNextIsControl(false)
+ , nPrevPrevPnt0(0)
+ , nPrevPnt0(0)
+ , nPnt0(0)
+ , nNextPnt0(0)
+ , nNextNextPnt0(0)
+ , bEliminate(false)
+ , mbMultiPointDrag(bMuPoDr)
+ , maOrig(rPO.GetPathPoly())
+ , maHandles(0)
{
if(mbMultiPointDrag)
{
More information about the Libreoffice-commits
mailing list