[Libreoffice-commits] core.git: cui/source include/svx sw/source
Noel Grandin
noelgrandin at gmail.com
Fri Sep 25 11:19:08 PDT 2015
cui/source/factory/dlgfact.cxx | 4
cui/source/factory/dlgfact.hxx | 4
cui/source/inc/labdlg.hxx | 6 -
cui/source/inc/swpossizetabpage.hxx | 6 -
cui/source/inc/transfrm.hxx | 5 -
cui/source/tabpages/labdlg.cxx | 2
cui/source/tabpages/swpossizetabpage.cxx | 2
cui/source/tabpages/transfrm.cxx | 2
include/svx/svxdlg.hxx | 5 -
sw/source/uibase/inc/drwbassh.hxx | 2
sw/source/uibase/shells/drwbassh.cxx | 151 +++++++++++++++----------------
11 files changed, 96 insertions(+), 93 deletions(-)
New commits:
commit 825b9982a5de3ab94820ce5257bb446ea0a1c20a
Author: Noel Grandin <noelgrandin at gmail.com>
Date: Thu Sep 24 18:24:43 2015 +0200
convert Link<> to typed
Change-Id: I6de6c831e7401413149100784726ce6c986f8eea
Reviewed-on: https://gerrit.libreoffice.org/18852
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/cui/source/factory/dlgfact.cxx b/cui/source/factory/dlgfact.cxx
index 9f39f38..88806b3 100644
--- a/cui/source/factory/dlgfact.cxx
+++ b/cui/source/factory/dlgfact.cxx
@@ -518,7 +518,7 @@ OUString AbstractSvxTransformTabDialog_Impl::GetText() const
{
return pDlg->GetText();
}
-void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
+void AbstractSvxTransformTabDialog_Impl::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{
pDlg->SetValidateFramePosLink( rLink );
}
@@ -557,7 +557,7 @@ OUString AbstractSvxCaptionDialog_Impl::GetText() const
{
return pDlg->GetText();
}
-void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link<>& rLink )
+void AbstractSvxCaptionDialog_Impl::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{
pDlg->SetValidateFramePosLink( rLink );
}
diff --git a/cui/source/factory/dlgfact.hxx b/cui/source/factory/dlgfact.hxx
index 4c8b228..5477392 100644
--- a/cui/source/factory/dlgfact.hxx
+++ b/cui/source/factory/dlgfact.hxx
@@ -282,7 +282,7 @@ class AbstractSvxJSearchOptionsDialog_Impl :public AbstractSvxJSearchOptionsDial
class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
{
DECL_ABSTDLG_BASE(AbstractSvxTransformTabDialog_Impl,SvxTransformTabDialog)
- virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
+ virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) SAL_OVERRIDE;
virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE;
virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
@@ -295,7 +295,7 @@ class AbstractSvxTransformTabDialog_Impl : public AbstractSvxTransformTabDialog
class AbstractSvxCaptionDialog_Impl : public AbstractSvxCaptionDialog
{
DECL_ABSTDLG_BASE(AbstractSvxCaptionDialog_Impl,SvxCaptionTabDialog)
- virtual void SetValidateFramePosLink( const Link<>& rLink ) SAL_OVERRIDE;
+ virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) SAL_OVERRIDE;
virtual void SetCurPageId( sal_uInt16 nId ) SAL_OVERRIDE;
virtual void SetCurPageId( const OString& rName ) SAL_OVERRIDE;
virtual const SfxItemSet* GetOutputItemSet() const SAL_OVERRIDE;
diff --git a/cui/source/inc/labdlg.hxx b/cui/source/inc/labdlg.hxx
index 14469df..571559a 100644
--- a/cui/source/inc/labdlg.hxx
+++ b/cui/source/inc/labdlg.hxx
@@ -92,7 +92,7 @@ public:
};
// class SvxCaptionTabDialog ---------------------------------------------
-
+struct SvxSwFrameValidation;
class SvxCaptionTabDialog : public SfxTabDialog
{
private:
@@ -102,7 +102,7 @@ private:
sal_uInt16 m_nPositionSizePageId;
sal_uInt16 m_nCaptionPageId;
- Link<> aValidateLink;
+ Link<SvxSwFrameValidation&,void> aValidateLink;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
@@ -111,7 +111,7 @@ public:
sal_uInt16 nAnchorTypes = 0);
/// link for the Writer to validate positions
- void SetValidateFramePosLink( const Link<>& rLink );
+ void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink );
};
diff --git a/cui/source/inc/swpossizetabpage.hxx b/cui/source/inc/swpossizetabpage.hxx
index 10f6345..6003fc6 100644
--- a/cui/source/inc/swpossizetabpage.hxx
+++ b/cui/source/inc/swpossizetabpage.hxx
@@ -30,6 +30,8 @@
// SvxSwPosSizeTabPage - position and size page for Writer drawing objects
struct FrmMap;
class SdrView;
+struct SvxSwFrameValidation;
+
class SvxSwPosSizeTabPage : public SfxTabPage
{
using TabPage::DeactivatePage;
@@ -68,7 +70,7 @@ class SvxSwPosSizeTabPage : public SfxTabPage
VclPtr<SvxSwFrameExample> m_pExampleWN;
- Link<> m_aValidateLink;
+ Link<SvxSwFrameValidation&,void> m_aValidateLink;
//'string provider'
SvxSwFramePosString m_aFramePosString;
@@ -137,7 +139,7 @@ public:
void EnableAnchorTypes(sal_uInt16 nAnchorEnable);
- void SetValidateFramePosLink( const Link<>& rLink )
+ void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{m_aValidateLink = rLink;}
void SetView( const SdrView* pSdrView );
diff --git a/cui/source/inc/transfrm.hxx b/cui/source/inc/transfrm.hxx
index 6a96775..c128280 100644
--- a/cui/source/inc/transfrm.hxx
+++ b/cui/source/inc/transfrm.hxx
@@ -43,6 +43,7 @@ const sal_uInt16 SVX_OBJ_NORESIZE = 0x0100;
to disable the protect controls */
const sal_uInt16 SVX_OBJ_NOPROTECT = 0x0200;
+struct SvxSwFrameValidation;
class SvxTransformTabDialog : public SfxTabDialog
{
sal_uInt16 nPosSize;
@@ -53,7 +54,7 @@ private:
const SdrView* pView;
sal_uInt16 nAnchorCtrls;
- Link<> aValidateLink;
+ Link<SvxSwFrameValidation&,void> aValidateLink;
virtual void PageCreated( sal_uInt16 nId, SfxTabPage &rPage ) SAL_OVERRIDE;
@@ -64,7 +65,7 @@ public:
sal_uInt16 nAnchorTypes = 0);
//link for the Writer to validate positions
- void SetValidateFramePosLink( const Link<>& rLink );
+ void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink );
};
/*************************************************************************
diff --git a/cui/source/tabpages/labdlg.cxx b/cui/source/tabpages/labdlg.cxx
index 3a1c7fb..61ebffe 100644
--- a/cui/source/tabpages/labdlg.cxx
+++ b/cui/source/tabpages/labdlg.cxx
@@ -569,7 +569,7 @@ void SvxCaptionTabDialog::PageCreated( sal_uInt16 nId, SfxTabPage &rPage )
}
}
-void SvxCaptionTabDialog::SetValidateFramePosLink( const Link<>& rLink )
+void SvxCaptionTabDialog::SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink )
{
aValidateLink = rLink;
}
diff --git a/cui/source/tabpages/swpossizetabpage.cxx b/cui/source/tabpages/swpossizetabpage.cxx
index b51ef95..f2d48ac 100644
--- a/cui/source/tabpages/swpossizetabpage.cxx
+++ b/cui/source/tabpages/swpossizetabpage.cxx
@@ -1193,7 +1193,7 @@ IMPL_LINK_NOARG_TYPED(SvxSwPosSizeTabPage, RangeModifyHdl, Control&, void)
aVal.nHeight = nHeight;
if(m_aValidateLink.IsSet())
- m_aValidateLink.Call(&aVal);
+ m_aValidateLink.Call(aVal);
nWidth = aVal.nWidth;
nHeight = aVal.nHeight;
diff --git a/cui/source/tabpages/transfrm.cxx b/cui/source/tabpages/transfrm.cxx
index aa75a5d..7a8ea19 100644
--- a/cui/source/tabpages/transfrm.cxx
+++ b/cui/source/tabpages/transfrm.cxx
@@ -163,7 +163,7 @@ void SvxTransformTabDialog::PageCreated(sal_uInt16 nId, SfxTabPage &rPage)
-void SvxTransformTabDialog::SetValidateFramePosLink(const Link<>& rLink)
+void SvxTransformTabDialog::SetValidateFramePosLink(const Link<SvxSwFrameValidation&,void>& rLink)
{
aValidateLink = rLink;
}
diff --git a/include/svx/svxdlg.hxx b/include/svx/svxdlg.hxx
index 74b6597..459b61e 100644
--- a/include/svx/svxdlg.hxx
+++ b/include/svx/svxdlg.hxx
@@ -216,16 +216,17 @@ class AbstractSvxAreaTabDialog :public SfxAbstractTabDialog
{
};
+struct SvxSwFrameValidation;
class AbstractSvxTransformTabDialog : public SfxAbstractTabDialog
{
public:
- virtual void SetValidateFramePosLink( const Link<>& rLink ) = 0;
+ virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) = 0;
};
class AbstractSvxCaptionDialog : public SfxAbstractTabDialog
{
public:
- virtual void SetValidateFramePosLink( const Link<>& rLink ) = 0;
+ virtual void SetValidateFramePosLink( const Link<SvxSwFrameValidation&,void>& rLink ) = 0;
};
class AbstractSvxPostItDialog :public VclAbstractDialog
diff --git a/sw/source/uibase/inc/drwbassh.hxx b/sw/source/uibase/inc/drwbassh.hxx
index 01dbb55..e588695 100644
--- a/sw/source/uibase/inc/drwbassh.hxx
+++ b/sw/source/uibase/inc/drwbassh.hxx
@@ -31,7 +31,7 @@ struct SvxSwFrameValidation;
class SwDrawBaseShell: public SwBaseShell
{
DECL_LINK( CheckGroupShapeNameHdl, AbstractSvxNameDialog* );
- DECL_LINK(ValidatePosition, SvxSwFrameValidation* );
+ DECL_LINK_TYPED(ValidatePosition, SvxSwFrameValidation&, void );
public:
SwDrawBaseShell(SwView &rShell);
virtual ~SwDrawBaseShell();
diff --git a/sw/source/uibase/shells/drwbassh.cxx b/sw/source/uibase/shells/drwbassh.cxx
index 9a87a1a..71a4fa9 100644
--- a/sw/source/uibase/shells/drwbassh.cxx
+++ b/sw/source/uibase/shells/drwbassh.cxx
@@ -748,17 +748,17 @@ bool SwDrawBaseShell::Disable(SfxItemSet& rSet, sal_uInt16 nWhich)
// Validate of drawing positions
-IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation )
+IMPL_LINK_TYPED(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation&, rValidation, void )
{
SwWrtShell *pSh = &GetShell();
- pValidation->nMinHeight = MINFLY;
- pValidation->nMinWidth = MINFLY;
+ rValidation.nMinHeight = MINFLY;
+ rValidation.nMinWidth = MINFLY;
SwRect aBoundRect;
// OD 18.09.2003 #i18732# - adjustment for allowing vertical position
// aligned to page for fly frame anchored to paragraph or to character.
- const RndStdIds eAnchorType = static_cast<RndStdIds >(pValidation->nAnchorType);
+ const RndStdIds eAnchorType = static_cast<RndStdIds >(rValidation.nAnchorType);
const SwPosition* pContentPos = 0;
SdrView* pSdrView = pSh->GetDrawView();
const SdrMarkList& rMarkList = pSdrView->GetMarkedObjectList();
@@ -770,11 +770,11 @@ IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation
}
pSh->CalcBoundRect( aBoundRect, eAnchorType,
- pValidation->nHRelOrient,
- pValidation->nVRelOrient,
+ rValidation.nHRelOrient,
+ rValidation.nVRelOrient,
pContentPos,
- pValidation->bFollowTextFlow,
- pValidation->bMirror, NULL, &pValidation->aPercentSize);
+ rValidation.bFollowTextFlow,
+ rValidation.bMirror, NULL, &rValidation.aPercentSize);
bool bIsInVertical( false );
{
@@ -794,148 +794,147 @@ IMPL_LINK(SwDrawBaseShell, ValidatePosition, SvxSwFrameValidation*, pValidation
aSize.Height() = nTmp;
aBoundRect.Chg( aPos, aSize );
//exchange width/height to enable correct values
- nTmp = pValidation->nWidth;
- pValidation->nWidth = pValidation->nHeight;
- pValidation->nHeight = nTmp;
+ nTmp = rValidation.nWidth;
+ rValidation.nWidth = rValidation.nHeight;
+ rValidation.nHeight = nTmp;
}
if ((eAnchorType == FLY_AT_PAGE) || (eAnchorType == FLY_AT_FLY))
{
// MinimalPosition
- pValidation->nMinHPos = aBoundRect.Left();
- pValidation->nMinVPos = aBoundRect.Top();
- SwTwips nH = pValidation->nHPos;
- SwTwips nV = pValidation->nVPos;
+ rValidation.nMinHPos = aBoundRect.Left();
+ rValidation.nMinVPos = aBoundRect.Top();
+ SwTwips nH = rValidation.nHPos;
+ SwTwips nV = rValidation.nVPos;
- if (pValidation->nHPos + pValidation->nWidth > aBoundRect.Right())
+ if (rValidation.nHPos + rValidation.nWidth > aBoundRect.Right())
{
- if (pValidation->nHoriOrient == text::HoriOrientation::NONE)
+ if (rValidation.nHoriOrient == text::HoriOrientation::NONE)
{
- pValidation->nHPos -= ((pValidation->nHPos + pValidation->nWidth) - aBoundRect.Right());
- nH = pValidation->nHPos;
+ rValidation.nHPos -= ((rValidation.nHPos + rValidation.nWidth) - aBoundRect.Right());
+ nH = rValidation.nHPos;
}
else
- pValidation->nWidth = aBoundRect.Right() - pValidation->nHPos;
+ rValidation.nWidth = aBoundRect.Right() - rValidation.nHPos;
}
- if (pValidation->nHPos + pValidation->nWidth > aBoundRect.Right())
- pValidation->nWidth = aBoundRect.Right() - pValidation->nHPos;
+ if (rValidation.nHPos + rValidation.nWidth > aBoundRect.Right())
+ rValidation.nWidth = aBoundRect.Right() - rValidation.nHPos;
- if (pValidation->nVPos + pValidation->nHeight > aBoundRect.Bottom())
+ if (rValidation.nVPos + rValidation.nHeight > aBoundRect.Bottom())
{
- if (pValidation->nVertOrient == text::VertOrientation::NONE)
+ if (rValidation.nVertOrient == text::VertOrientation::NONE)
{
- pValidation->nVPos -= ((pValidation->nVPos + pValidation->nHeight) - aBoundRect.Bottom());
- nV = pValidation->nVPos;
+ rValidation.nVPos -= ((rValidation.nVPos + rValidation.nHeight) - aBoundRect.Bottom());
+ nV = rValidation.nVPos;
}
else
- pValidation->nHeight = aBoundRect.Bottom() - pValidation->nVPos;
+ rValidation.nHeight = aBoundRect.Bottom() - rValidation.nVPos;
}
- if (pValidation->nVPos + pValidation->nHeight > aBoundRect.Bottom())
- pValidation->nHeight = aBoundRect.Bottom() - pValidation->nVPos;
+ if (rValidation.nVPos + rValidation.nHeight > aBoundRect.Bottom())
+ rValidation.nHeight = aBoundRect.Bottom() - rValidation.nVPos;
- if ( pValidation->nVertOrient != text::VertOrientation::NONE )
+ if ( rValidation.nVertOrient != text::VertOrientation::NONE )
nV = aBoundRect.Top();
- if ( pValidation->nHoriOrient != text::HoriOrientation::NONE )
+ if ( rValidation.nHoriOrient != text::HoriOrientation::NONE )
nH = aBoundRect.Left();
- pValidation->nMaxHPos = aBoundRect.Right() - pValidation->nWidth;
- pValidation->nMaxHeight = aBoundRect.Bottom() - nV;
+ rValidation.nMaxHPos = aBoundRect.Right() - rValidation.nWidth;
+ rValidation.nMaxHeight = aBoundRect.Bottom() - nV;
- pValidation->nMaxVPos = aBoundRect.Bottom() - pValidation->nHeight;
- pValidation->nMaxWidth = aBoundRect.Right() - nH;
+ rValidation.nMaxVPos = aBoundRect.Bottom() - rValidation.nHeight;
+ rValidation.nMaxWidth = aBoundRect.Right() - nH;
}
else if ((eAnchorType == FLY_AT_PARA) || (eAnchorType == FLY_AT_CHAR))
{
- if (pValidation->nHPos + pValidation->nWidth > aBoundRect.Right())
+ if (rValidation.nHPos + rValidation.nWidth > aBoundRect.Right())
{
- if (pValidation->nHoriOrient == text::HoriOrientation::NONE)
+ if (rValidation.nHoriOrient == text::HoriOrientation::NONE)
{
- pValidation->nHPos -= ((pValidation->nHPos + pValidation->nWidth) - aBoundRect.Right());
+ rValidation.nHPos -= ((rValidation.nHPos + rValidation.nWidth) - aBoundRect.Right());
}
else
- pValidation->nWidth = aBoundRect.Right() - pValidation->nHPos;
+ rValidation.nWidth = aBoundRect.Right() - rValidation.nHPos;
}
// OD 29.09.2003 #i17567#, #i18732# - consider following the text flow
// and alignment at page areas.
- const bool bMaxVPosAtBottom = !pValidation->bFollowTextFlow ||
- pValidation->nVRelOrient == text::RelOrientation::PAGE_FRAME ||
- pValidation->nVRelOrient == text::RelOrientation::PAGE_PRINT_AREA;
+ const bool bMaxVPosAtBottom = !rValidation.bFollowTextFlow ||
+ rValidation.nVRelOrient == text::RelOrientation::PAGE_FRAME ||
+ rValidation.nVRelOrient == text::RelOrientation::PAGE_PRINT_AREA;
{
SwTwips nTmpMaxVPos = ( bMaxVPosAtBottom
? aBoundRect.Bottom()
: aBoundRect.Height() ) -
- pValidation->nHeight;
- if ( pValidation->nVPos > nTmpMaxVPos )
+ rValidation.nHeight;
+ if ( rValidation.nVPos > nTmpMaxVPos )
{
- if (pValidation->nVertOrient == text::VertOrientation::NONE)
+ if (rValidation.nVertOrient == text::VertOrientation::NONE)
{
- pValidation->nVPos = nTmpMaxVPos;
+ rValidation.nVPos = nTmpMaxVPos;
}
else
{
- pValidation->nHeight = ( bMaxVPosAtBottom
+ rValidation.nHeight = ( bMaxVPosAtBottom
? aBoundRect.Bottom()
- : aBoundRect.Height() ) - pValidation->nVPos;
+ : aBoundRect.Height() ) - rValidation.nVPos;
}
}
}
- pValidation->nMinHPos = aBoundRect.Left();
- pValidation->nMaxHPos = aBoundRect.Right() - pValidation->nWidth;
+ rValidation.nMinHPos = aBoundRect.Left();
+ rValidation.nMaxHPos = aBoundRect.Right() - rValidation.nWidth;
- pValidation->nMinVPos = aBoundRect.Top();
+ rValidation.nMinVPos = aBoundRect.Top();
// OD 26.09.2003 #i17567#, #i18732# - determine maximum vertical position
if ( bMaxVPosAtBottom )
{
- pValidation->nMaxVPos = aBoundRect.Bottom() - pValidation->nHeight;
+ rValidation.nMaxVPos = aBoundRect.Bottom() - rValidation.nHeight;
}
else
{
- pValidation->nMaxVPos = aBoundRect.Height() - pValidation->nHeight;
+ rValidation.nMaxVPos = aBoundRect.Height() - rValidation.nHeight;
}
// Maximum width height
- const SwTwips nH = ( pValidation->nHoriOrient != text::HoriOrientation::NONE )
+ const SwTwips nH = ( rValidation.nHoriOrient != text::HoriOrientation::NONE )
? aBoundRect.Left()
- : pValidation->nHPos;
- const SwTwips nV = ( pValidation->nVertOrient != text::VertOrientation::NONE )
+ : rValidation.nHPos;
+ const SwTwips nV = ( rValidation.nVertOrient != text::VertOrientation::NONE )
? aBoundRect.Top()
- : pValidation->nVPos;
- pValidation->nMaxHeight = pValidation->nMaxVPos + pValidation->nHeight - nV;
- pValidation->nMaxWidth = pValidation->nMaxHPos + pValidation->nWidth - nH;
+ : rValidation.nVPos;
+ rValidation.nMaxHeight = rValidation.nMaxVPos + rValidation.nHeight - nV;
+ rValidation.nMaxWidth = rValidation.nMaxHPos + rValidation.nWidth - nH;
}
else if (eAnchorType == FLY_AS_CHAR)
{
- pValidation->nMinHPos = 0;
- pValidation->nMaxHPos = 0;
+ rValidation.nMinHPos = 0;
+ rValidation.nMaxHPos = 0;
- pValidation->nMaxHeight = aBoundRect.Height();
- pValidation->nMaxWidth = aBoundRect.Width();
+ rValidation.nMaxHeight = aBoundRect.Height();
+ rValidation.nMaxWidth = aBoundRect.Width();
- pValidation->nMaxVPos = aBoundRect.Height();
- pValidation->nMinVPos = -aBoundRect.Height() + pValidation->nHeight;
- if (pValidation->nMaxVPos < pValidation->nMinVPos)
+ rValidation.nMaxVPos = aBoundRect.Height();
+ rValidation.nMinVPos = -aBoundRect.Height() + rValidation.nHeight;
+ if (rValidation.nMaxVPos < rValidation.nMinVPos)
{
- pValidation->nMinVPos = pValidation->nMaxVPos;
- pValidation->nMaxVPos = -aBoundRect.Height();
+ rValidation.nMinVPos = rValidation.nMaxVPos;
+ rValidation.nMaxVPos = -aBoundRect.Height();
}
}
if(bIsInVertical)
{
//restore width/height exchange
- long nTmp = pValidation->nWidth;
- pValidation->nWidth = pValidation->nHeight;
- pValidation->nHeight = nTmp;
+ long nTmp = rValidation.nWidth;
+ rValidation.nWidth = rValidation.nHeight;
+ rValidation.nHeight = nTmp;
}
- if (pValidation->nMaxWidth < pValidation->nWidth)
- pValidation->nWidth = pValidation->nMaxWidth;
- if (pValidation->nMaxHeight < pValidation->nHeight)
- pValidation->nHeight = pValidation->nMaxHeight;
- return 0;
+ if (rValidation.nMaxWidth < rValidation.nWidth)
+ rValidation.nWidth = rValidation.nMaxWidth;
+ if (rValidation.nMaxHeight < rValidation.nHeight)
+ rValidation.nHeight = rValidation.nMaxHeight;
}
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
More information about the Libreoffice-commits
mailing list