[Libreoffice-commits] core.git: include/svx svx/inc svx/source
Noel Grandin
noel at peralex.com
Tue Jun 28 06:25:58 UTC 2016
include/svx/float3d.hxx | 2
include/svx/fmsrcimp.hxx | 1
include/svx/fmtools.hxx | 1
include/svx/gridctrl.hxx | 2
include/svx/hdft.hxx | 1
include/svx/numvset.hxx | 1
include/svx/sdrpaintwindow.hxx | 6 -
include/svx/svdcrtv.hxx | 15 --
svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx | 4
svx/source/accessibility/ChildrenManagerImpl.cxx | 5
svx/source/accessibility/ChildrenManagerImpl.hxx | 5
svx/source/dialog/fntctrl.cxx | 17 +-
svx/source/dialog/hdft.cxx | 3
svx/source/dialog/svxbmpnumvalueset.cxx | 2
svx/source/engine3d/float3d.cxx | 86 +++++----------
svx/source/fmcomp/gridctrl.cxx | 9 -
svx/source/form/fmsrcimp.cxx | 86 +++++----------
svx/source/form/fmtools.cxx | 3
svx/source/form/formfeaturedispatcher.cxx | 17 --
svx/source/inc/formfeaturedispatcher.hxx | 11 -
svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx | 8 -
svx/source/sidebar/possize/PosSizePropertyPanel.cxx | 6 -
svx/source/sidebar/possize/PosSizePropertyPanel.hxx | 2
svx/source/svdraw/sdrpaintwindow.cxx | 5
svx/source/svdraw/svdcrtv.cxx | 11 -
svx/source/svdraw/svdmark.cxx | 1
svx/source/svdraw/svdopath.cxx | 11 -
svx/source/table/viewcontactoftableobj.cxx | 38 ++----
svx/source/tbxctrls/layctrl.cxx | 11 -
29 files changed, 101 insertions(+), 269 deletions(-)
New commits:
commit 4391d400e01e4a756d03d357d81e9769c34ae83b
Author: Noel Grandin <noel at peralex.com>
Date: Mon Jun 27 15:11:50 2016 +0200
loplugin:singlevalfields in svx
Change-Id: I7a2d11e1343f6382c3556c4536fc8ae40e210b74
Reviewed-on: https://gerrit.libreoffice.org/26710
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
diff --git a/include/svx/float3d.hxx b/include/svx/float3d.hxx
index ecbeb48..c395e75 100644
--- a/include/svx/float3d.hxx
+++ b/include/svx/float3d.hxx
@@ -186,8 +186,6 @@ private:
// ItemSet used to remember set 2d attributes
SfxItemSet* mpRemember2DAttributes;
- bool bOnly3DChanged;
-
DECL_LINK_TYPED( ClickViewTypeHdl, Button*, void );
DECL_LINK_TYPED( ClickUpdateHdl, Button*, void );
DECL_LINK_TYPED( ClickAssignHdl, Button*, void );
diff --git a/include/svx/fmsrcimp.hxx b/include/svx/fmsrcimp.hxx
index 8be0dea..b71e733 100644
--- a/include/svx/fmsrcimp.hxx
+++ b/include/svx/fmsrcimp.hxx
@@ -197,7 +197,6 @@ class SAL_WARN_UNUSED SVX_DLLPUBLIC FmSearchEngine
typedef std::vector<svxform::ControlTextWrapper*> ControlTextSuppliers;
ControlTextSuppliers m_aControlTexts;
- bool m_bUsingTextComponents;
CursorWrapper m_xOriginalIterator;
CursorWrapper m_xClonedIterator;
diff --git a/include/svx/fmtools.hxx b/include/svx/fmtools.hxx
index 34dec03..a4d2883 100644
--- a/include/svx/fmtools.hxx
+++ b/include/svx/fmtools.hxx
@@ -173,7 +173,6 @@ class SAL_WARN_UNUSED FmXDisposeMultiplexer : public ::cppu::WeakImplHelper1< cs
{
css::uno::Reference< css::lang::XComponent> m_xObject;
FmXDisposeListener* m_pListener;
- sal_Int16 m_nId;
virtual ~FmXDisposeMultiplexer();
public:
diff --git a/include/svx/gridctrl.hxx b/include/svx/gridctrl.hxx
index 2f3c409..d0945b5 100644
--- a/include/svx/gridctrl.hxx
+++ b/include/svx/gridctrl.hxx
@@ -282,11 +282,9 @@ private:
bool m_bDesignMode : 1; // default = sal_False
bool m_bRecordCountFinal : 1;
- bool m_bMultiSelection : 1;
bool m_bNavigationBar : 1;
bool m_bSynchDisplay : 1;
- bool m_bForceROController : 1;
bool m_bHandle : 1;
bool m_bFilterMode : 1;
bool m_bWantDestruction : 1;
diff --git a/include/svx/hdft.hxx b/include/svx/hdft.hxx
index fd09aaa..d95d0a9 100644
--- a/include/svx/hdft.hxx
+++ b/include/svx/hdft.hxx
@@ -90,7 +90,6 @@ protected:
SfxItemSet* pBBSet;
/// bitfield
bool mbDisableQueryBox : 1;
- bool mbEnableBackgroundSelector : 1;
bool mbEnableDrawingLayerFillStyles : 1;
void InitHandler();
diff --git a/include/svx/numvset.hxx b/include/svx/numvset.hxx
index 6546364..bbd8d91 100644
--- a/include/svx/numvset.hxx
+++ b/include/svx/numvset.hxx
@@ -58,7 +58,6 @@ enum class NumberingPageType
class SVX_DLLPUBLIC SvxNumValueSet : public ValueSet
{
NumberingPageType ePageType;
- bool bHTMLMode;
Rectangle aOrgRect;
VclPtr<VirtualDevice> pVDev;
diff --git a/include/svx/sdrpaintwindow.hxx b/include/svx/sdrpaintwindow.hxx
index 6519984..499bb65 100644
--- a/include/svx/sdrpaintwindow.hxx
+++ b/include/svx/sdrpaintwindow.hxx
@@ -87,12 +87,6 @@ private:
// #i72889# flag if this is only a temporary target for repaint, default is false
bool mbTemporaryTarget : 1;
- /** Remember whether the mxOverlayManager supports buffering. Using
- this flags expensive dynamic_casts on mxOverlayManager in order to
- detect this.
- */
- bool mbUseBuffer;
-
// helpers
void impCreateOverlayManager();
diff --git a/include/svx/svdcrtv.hxx b/include/svx/svdcrtv.hxx
index ea3535c..83fc407 100644
--- a/include/svx/svdcrtv.hxx
+++ b/include/svx/svdcrtv.hxx
@@ -54,7 +54,6 @@ protected:
bool bAutoTextEdit : 1; // Textedit after we start the creation of a text frame
bool b1stPointAsCenter : 1;
bool bUseIncompatiblePathCreateInterface : 1;
- bool bAutoClosePolys : 1;
void ImpClearConnectMarker();
@@ -121,26 +120,12 @@ public:
// Only the length of the tip is dragged
bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=nullptr, short nMinMov=-3, SdrPageView* pPV=nullptr);
- // If TextEditAfterCreate is sal_True (the default),
- // then after the creation of a TextFrame object (OBJ_TEXT,
- // OBJ_TEXTEXT, OBJ_OUTLINERTEXT, OBJ_TITLETEXT, OBJ_CAPTION)
- // automatically start a TextEdit (SdrObjEditView: SdrBeginTextEdit)
- bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
-
// Create a circle/rectangle/text frame with the first Point being
// the center of the object instead of the upper-left corner.
// Persistent flag. Default = FALSE.
bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
void SetCreate1stPointAsCenter(bool bOn) { b1stPointAsCenter = bOn; }
- // For polylines (OBJ_PLIN) and freehand lines (OBJ_FREELINE). If this
- // Flag is sal_True, these two types of objects are implicitly closed, and
- // converted to Polygon (OBJ_POLY) or freehand fill (OBJ_FREEFILL) if
- // the distance between the start point and end point of the
- // Object <= nAutoCloseDistPix pixels.
- // Default = TRUE.
- bool IsAutoClosePolys() const { return bAutoClosePolys; }
-
// Default = 5 Pixel
sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); }
diff --git a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
index ddba208..9c20464 100644
--- a/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
+++ b/svx/inc/sdr/primitive2d/sdrcustomshapeprimitive2d.hxx
@@ -48,9 +48,6 @@ namespace drawinglayer
// making exceptions with shadow generation
bool mb3DShape : 1;
- // #SJ# Allow text clipping against TextBox in special cases (used for SC)
- bool mbForceTextClipToTextRange : 1;
-
protected:
// local decomposition.
virtual Primitive2DContainer create2DDecomposition(const geometry::ViewInformation2D& aViewInformation) const override;
@@ -69,7 +66,6 @@ namespace drawinglayer
const basegfx::B2DHomMatrix& getTextBox() const { return maTextBox; }
bool getWordWrap() const { return mbWordWrap; }
bool get3DShape() const { return mb3DShape; }
- bool isForceTextClipToTextRange() const { return mbForceTextClipToTextRange; }
// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index b750b5d..ff5bc25 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -65,7 +65,6 @@ ChildrenManagerImpl::ChildrenManagerImpl (
mxParent (rxParent),
maShapeTreeInfo (rShapeTreeInfo),
mrContext (rContext),
- mnNewNameIndex(1),
mpFocusedShape(nullptr)
{
}
@@ -539,10 +538,6 @@ void ChildrenManagerImpl::ClearAccessibleShapeList()
uno::Any(),
uno::Any());
- // There are no accessible shapes left so the index assigned to new
- // accessible shapes can be reset.
- mnNewNameIndex = 1;
-
// Now the objects in the local lists can be safely disposed without
// having problems with callers that want to update their child lists.
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index e284ca6..35f61fd 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -344,11 +344,6 @@ protected:
void impl_dispose();
private:
- /** Names of new accessible objects are disambiguated with this index.
- It gets increased every time a new object is created and (at the
- moment) never reset.
- */
- sal_Int32 mnNewNameIndex;
ChildrenManagerImpl (const ChildrenManagerImpl&) = delete;
ChildrenManagerImpl& operator= (const ChildrenManagerImpl&) = delete;
diff --git a/svx/source/dialog/fntctrl.cxx b/svx/source/dialog/fntctrl.cxx
index 897fe70..367b3be 100644
--- a/svx/source/dialog/fntctrl.cxx
+++ b/svx/source/dialog/fntctrl.cxx
@@ -153,7 +153,6 @@ class FontPrevWin_Impl
bool mbSelection : 1;
bool mbGetSelection : 1;
bool mbUseResText : 1;
- bool mbPreviewBackgroundToCharacter : 1;
bool mbTwoLines : 1;
bool mbUseFontNameAsText : 1;
bool mbTextInited : 1;
@@ -175,7 +174,6 @@ public:
mbSelection(false),
mbGetSelection(false),
mbUseResText(false),
- mbPreviewBackgroundToCharacter(false),
mbTwoLines(false),
mbUseFontNameAsText(false),
mbTextInited(false)
@@ -1302,7 +1300,7 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet)
// Background
bool bTransparent;
- nWhich = rSet.GetPool()->GetWhich(pImpl->mbPreviewBackgroundToCharacter ? SID_ATTR_BRUSH : SID_ATTR_BRUSH_CHAR);
+ nWhich = SID_ATTR_BRUSH_CHAR;
if (ISITEMSET)
{
const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>( rSet.Get( nWhich ) );
@@ -1320,15 +1318,12 @@ void SvxFontPrevWindow::Init(const SfxItemSet& rSet)
rCTLFont.SetTransparent( bTransparent );
Color aBackCol( COL_TRANSPARENT );
- if (!pImpl->mbPreviewBackgroundToCharacter)
+ nWhich = rSet.GetPool()->GetWhich( SID_ATTR_BRUSH );
+ if (ISITEMSET)
{
- nWhich = rSet.GetPool()->GetWhich( SID_ATTR_BRUSH );
- if (ISITEMSET)
- {
- const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>(rSet.Get(nWhich));
- if (GPOS_NONE == rBrush.GetGraphicPos())
- aBackCol = rBrush.GetColor();
- }
+ const SvxBrushItem& rBrush = static_cast<const SvxBrushItem&>(rSet.Get(nWhich));
+ if (GPOS_NONE == rBrush.GetGraphicPos())
+ aBackCol = rBrush.GetColor();
}
SetBackColor(aBackCol);
diff --git a/svx/source/dialog/hdft.cxx b/svx/source/dialog/hdft.cxx
index e1f367b..182c6a1 100644
--- a/svx/source/dialog/hdft.cxx
+++ b/svx/source/dialog/hdft.cxx
@@ -149,7 +149,6 @@ SvxHFPage::SvxHFPage( vcl::Window* pParent, const SfxItemSet& rSet, sal_uInt16 n
pBBSet(nullptr),
// bitfield
mbDisableQueryBox(false),
- mbEnableBackgroundSelector(true),
mbEnableDrawingLayerFillStyles(false)
{
get(m_pCntSharedBox,"checkSameLR");
@@ -668,7 +667,7 @@ IMPL_LINK_NOARG_TYPED(SvxHFPage, BackgroundHdl, Button*, void)
SfxAbstractTabDialog* pDlg = pFact->CreateSvxBorderBackgroundDlg(
this,
*pBBSet,
- mbEnableBackgroundSelector,
+ true/*EnableBackgroundSelector*/,
mbEnableDrawingLayerFillStyles);
DBG_ASSERT(pDlg,"Dialog creation failed!");
diff --git a/svx/source/dialog/svxbmpnumvalueset.cxx b/svx/source/dialog/svxbmpnumvalueset.cxx
index 86f6920..dca1640 100644
--- a/svx/source/dialog/svxbmpnumvalueset.cxx
+++ b/svx/source/dialog/svxbmpnumvalueset.cxx
@@ -386,7 +386,6 @@ void SvxNumValueSet::UserDraw( const UserDrawEvent& rUDEvt )
SvxNumValueSet::SvxNumValueSet(vcl::Window* pParent, WinBits nWinBits)
: ValueSet(pParent, nWinBits)
, ePageType(NumberingPageType::BULLET)
- , bHTMLMode(false)
, pVDev(nullptr)
{
}
@@ -396,7 +395,6 @@ VCL_BUILDER_FACTORY_ARGS(SvxNumValueSet, WB_TABSTOP)
void SvxNumValueSet::init(NumberingPageType eType)
{
ePageType = eType;
- bHTMLMode = false;
pVDev = nullptr;
SetColCount( 4 );
diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx
index d5e1304..a1044fa 100644
--- a/svx/source/engine3d/float3d.cxx
+++ b/svx/source/engine3d/float3d.cxx
@@ -99,7 +99,6 @@ Svx3DWin::Svx3DWin(SfxBindings* pInBindings, SfxChildWindow *pCW, vcl::Window* p
, mpImpl(new Svx3DWinImpl())
, ePoolUnit(SFX_MAPUNIT_MM)
, mpRemember2DAttributes(nullptr)
- , bOnly3DChanged(false)
{
get(m_pBtnGeo, "geometry");
get(m_pBtnRepresentation, "representation");
@@ -1521,55 +1520,52 @@ void Svx3DWin::Update( SfxItemSet& rAttrs )
}
}
- if( !bUpdate && !bOnly3DChanged )
+ if( !bUpdate )
{
// however the 2D attributes may be different. Compare these and decide
bUpdate = true;
}
- if( bUpdate || bOnly3DChanged )
- {
- // Update preview
- SfxItemSet aSet(rAttrs);
+ // Update preview
+ SfxItemSet aSet(rAttrs);
- // set LineStyle hard to drawing::LineStyle_NONE when it's not set so that
- // the default (drawing::LineStyle_SOLID) is not used for 3d preview
- if(SfxItemState::SET != aSet.GetItemState(XATTR_LINESTYLE, false))
- aSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
+ // set LineStyle hard to drawing::LineStyle_NONE when it's not set so that
+ // the default (drawing::LineStyle_SOLID) is not used for 3d preview
+ if(SfxItemState::SET != aSet.GetItemState(XATTR_LINESTYLE, false))
+ aSet.Put(XLineStyleItem(drawing::LineStyle_NONE));
- // set FillColor hard to WHITE when it's SfxItemState::DONTCARE so that
- // the default (Blue7) is not used for 3d preview
- if(SfxItemState::DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, false))
- aSet.Put(XFillColorItem(OUString(), Color(COL_WHITE)));
+ // set FillColor hard to WHITE when it's SfxItemState::DONTCARE so that
+ // the default (Blue7) is not used for 3d preview
+ if(SfxItemState::DONTCARE == aSet.GetItemState(XATTR_FILLCOLOR, false))
+ aSet.Put(XFillColorItem(OUString(), Color(COL_WHITE)));
- m_pCtlPreview->Set3DAttributes(aSet);
- m_pCtlLightPreview->GetSvx3DLightControl().Set3DAttributes(aSet);
+ m_pCtlPreview->Set3DAttributes(aSet);
+ m_pCtlLightPreview->GetSvx3DLightControl().Set3DAttributes(aSet);
- // try to select light corresponding to active button
- sal_uInt32 nNumber(0xffffffff);
+ // try to select light corresponding to active button
+ sal_uInt32 nNumber(0xffffffff);
- if(m_pBtnLight1->IsChecked())
- nNumber = 0;
- else if(m_pBtnLight2->IsChecked())
- nNumber = 1;
- else if(m_pBtnLight3->IsChecked())
- nNumber = 2;
- else if(m_pBtnLight4->IsChecked())
- nNumber = 3;
- else if(m_pBtnLight5->IsChecked())
- nNumber = 4;
- else if(m_pBtnLight6->IsChecked())
- nNumber = 5;
- else if(m_pBtnLight7->IsChecked())
- nNumber = 6;
- else if(m_pBtnLight8->IsChecked())
- nNumber = 7;
+ if(m_pBtnLight1->IsChecked())
+ nNumber = 0;
+ else if(m_pBtnLight2->IsChecked())
+ nNumber = 1;
+ else if(m_pBtnLight3->IsChecked())
+ nNumber = 2;
+ else if(m_pBtnLight4->IsChecked())
+ nNumber = 3;
+ else if(m_pBtnLight5->IsChecked())
+ nNumber = 4;
+ else if(m_pBtnLight6->IsChecked())
+ nNumber = 5;
+ else if(m_pBtnLight7->IsChecked())
+ nNumber = 6;
+ else if(m_pBtnLight8->IsChecked())
+ nNumber = 7;
- if(nNumber != 0xffffffff)
- {
- m_pCtlLightPreview->GetSvx3DLightControl().SelectLight(nNumber);
- }
+ if(nNumber != 0xffffffff)
+ {
+ m_pCtlLightPreview->GetSvx3DLightControl().SelectLight(nNumber);
}
// handle state of converts possible
@@ -2719,20 +2715,6 @@ void Svx3DWin::UpdatePreview()
if( pModel == nullptr )
pModel = new FmFormModel();
- if(bOnly3DChanged)
- {
- // Execute slot
- SfxDispatcher* pDispatcher = LocalGetDispatcher(pBindings);
- if (pDispatcher != nullptr)
- {
- SfxBoolItem aItem( SID_3D_STATE, true );
- pDispatcher->ExecuteList(SID_3D_STATE,
- SfxCallMode::SYNCHRON | SfxCallMode::RECORD, { &aItem });
- }
- // Reset Flag
- bOnly3DChanged = false;
- }
-
// Get Itemset
SfxItemSet aSet( pModel->GetItemPool(), SDRATTR_START, SDRATTR_END);
diff --git a/svx/source/fmcomp/gridctrl.cxx b/svx/source/fmcomp/gridctrl.cxx
index e2992ee..5a735d35 100644
--- a/svx/source/fmcomp/gridctrl.cxx
+++ b/svx/source/fmcomp/gridctrl.cxx
@@ -961,10 +961,8 @@ DbGridControl::DbGridControl(
,m_nLastRowId(-1)
,m_bDesignMode(false)
,m_bRecordCountFinal(false)
- ,m_bMultiSelection(true)
,m_bNavigationBar(true)
,m_bSynchDisplay(true)
- ,m_bForceROController(false)
,m_bHandle(true)
,m_bFilterMode(false)
,m_bWantDestruction(false)
@@ -1553,10 +1551,7 @@ void DbGridControl::setDataSource(const Reference< XRowSet >& _xCursor, sal_uInt
m_nMode |= BrowserMode::HIDECURSOR;
}
- if ( m_bMultiSelection )
- m_nMode |= BrowserMode::MULTISELECTION;
- else
- m_nMode &= ~BrowserMode::MULTISELECTION;
+ m_nMode |= BrowserMode::MULTISELECTION;
adjustModeForScrollbars( m_nMode, m_bNavigationBar, m_bHideScrollbars );
@@ -2932,7 +2927,7 @@ CellController* DbGridControl::GetController(long /*nRow*/, sal_uInt16 nColumnId
bool bInsert = (m_xCurrentRow->IsNew() && (m_nOptions & OPT_INSERT));
bool bUpdate = (!m_xCurrentRow->IsNew() && (m_nOptions & OPT_UPDATE));
- if ((bInsert && !pColumn->IsAutoValue()) || bUpdate || m_bForceROController)
+ if ((bInsert && !pColumn->IsAutoValue()) || bUpdate)
{
pReturn = &pColumn->GetController();
if (pReturn)
diff --git a/svx/source/form/fmsrcimp.cxx b/svx/source/form/fmsrcimp.cxx
index 914872b..a50fe19 100644
--- a/svx/source/form/fmsrcimp.cxx
+++ b/svx/source/form/fmsrcimp.cxx
@@ -322,8 +322,6 @@ void FmSearchEngine::BuildAndInsertFieldInfo(const Reference< css::container::XI
OUString FmSearchEngine::FormatField(const FieldInfo& rField)
{
- DBG_ASSERT(!m_bUsingTextComponents, "FmSearchEngine::FormatField : im UsingTextComponents-Mode bitte FormatField(sal_Int32) benutzen !");
-
if (!m_xFormatter.is())
return OUString();
// sonst werden Datumsflder zum Beispiel zu irgendeinem Default-Wert formatiert
@@ -355,37 +353,20 @@ OUString FmSearchEngine::FormatField(const FieldInfo& rField)
OUString FmSearchEngine::FormatField(sal_Int32 nWhich)
{
- if (m_bUsingTextComponents)
- {
- DBG_ASSERT((sal_uInt32)nWhich < m_aControlTexts.size(), "FmSearchEngine::FormatField(sal_Int32) : invalid position !");
- DBG_ASSERT(m_aControlTexts[nWhich] != nullptr, "FmSearchEngine::FormatField(sal_Int32) : invalid object in array !");
- DBG_ASSERT(m_aControlTexts[nWhich]->getControl().is(), "FmSearchEngine::FormatField : invalid control !");
-
- if (m_nCurrentFieldIndex != -1)
- {
- DBG_ASSERT((nWhich == 0) || (nWhich == m_nCurrentFieldIndex), "FmSearchEngine::FormatField : Parameter nWhich ist ungueltig");
- // analoge Situation wie unten
- nWhich = m_nCurrentFieldIndex;
- }
+ DBG_ASSERT((sal_uInt32)nWhich < m_aControlTexts.size(), "FmSearchEngine::FormatField(sal_Int32) : invalid position !");
+ DBG_ASSERT(m_aControlTexts[nWhich] != nullptr, "FmSearchEngine::FormatField(sal_Int32) : invalid object in array !");
+ DBG_ASSERT(m_aControlTexts[nWhich]->getControl().is(), "FmSearchEngine::FormatField : invalid control !");
- DBG_ASSERT((nWhich >= 0) && ((sal_uInt32)nWhich < m_aControlTexts.size()),
- "FmSearchEngine::FormatField : invalid argument nWhich !");
- return m_aControlTexts[m_nCurrentFieldIndex == -1 ? nWhich : m_nCurrentFieldIndex]->getCurrentText();
- }
- else
+ if (m_nCurrentFieldIndex != -1)
{
- if (m_nCurrentFieldIndex != -1)
- {
- DBG_ASSERT((nWhich == 0) || (nWhich == m_nCurrentFieldIndex), "FmSearchEngine::FormatField : Parameter nWhich ist ungueltig");
- // ich bin im single-field-modus, da ist auch die richtige Feld-Nummer erlaubt, obwohl dann der richtige css::sdbcx::Index
- // fuer meinen Array-Zugriff natuerlich 0 ist
- nWhich = 0;
- }
-
- DBG_ASSERT((nWhich>=0) && (nWhich < (m_arrUsedFields.end() - m_arrUsedFields.begin())),
- "FmSearchEngine::FormatField : Parameter nWhich ist ungueltig");
- return FormatField(m_arrUsedFields[nWhich]);
+ DBG_ASSERT((nWhich == 0) || (nWhich == m_nCurrentFieldIndex), "FmSearchEngine::FormatField : Parameter nWhich ist ungueltig");
+ // analoge Situation wie unten
+ nWhich = m_nCurrentFieldIndex;
}
+
+ DBG_ASSERT((nWhich >= 0) && ((sal_uInt32)nWhich < m_aControlTexts.size()),
+ "FmSearchEngine::FormatField : invalid argument nWhich !");
+ return m_aControlTexts[m_nCurrentFieldIndex == -1 ? nWhich : m_nCurrentFieldIndex]->getCurrentText();
}
@@ -664,7 +645,6 @@ FmSearchEngine::FmSearchEngine(const Reference< XComponentContext >& _rxContext,
,m_aCharacterClassficator( _rxContext, SvtSysLocale().GetLanguageTag() )
,m_aStringCompare( _rxContext )
,m_nCurrentFieldIndex(-2) // -1 hat schon eine Bedeutung, also nehme ich -2 fuer 'ungueltig'
- ,m_bUsingTextComponents(true)
,m_xOriginalIterator(xCursor)
,m_xClonedIterator(m_xOriginalIterator, true)
,m_eSearchForType(SEARCHFOR_STRING)
@@ -860,36 +840,31 @@ void FmSearchEngine::SetFormatterUsing(bool bSet)
return;
m_bFormatter = bSet;
- if (m_bUsingTextComponents)
+ // ich benutzte keinen Formatter, sondern TextComponents -> der SearchIterator muss angepasst werden
+ try
{
- // ich benutzte keinen Formatter, sondern TextComponents -> der SearchIterator muss angepasst werden
- try
+ if (m_bFormatter)
{
- if (m_bFormatter)
- {
- DBG_ASSERT(m_xSearchCursor == m_xClonedIterator, "FmSearchEngine::SetFormatterUsing : inkonsistenter Zustand !");
- m_xSearchCursor = m_xOriginalIterator;
- m_xSearchCursor.moveToBookmark(m_xClonedIterator.getBookmark());
- // damit ich mit dem neuen Iterator wirklich dort weitermache, wo ich vorher aufgehoert habe
- }
- else
- {
- DBG_ASSERT(m_xSearchCursor == m_xOriginalIterator, "FmSearchEngine::SetFormatterUsing : inkonsistenter Zustand !");
- m_xSearchCursor = m_xClonedIterator;
- m_xSearchCursor.moveToBookmark(m_xOriginalIterator.getBookmark());
- }
+ DBG_ASSERT(m_xSearchCursor == m_xClonedIterator, "FmSearchEngine::SetFormatterUsing : inkonsistenter Zustand !");
+ m_xSearchCursor = m_xOriginalIterator;
+ m_xSearchCursor.moveToBookmark(m_xClonedIterator.getBookmark());
+ // damit ich mit dem neuen Iterator wirklich dort weitermache, wo ich vorher aufgehoert habe
}
- catch( const Exception& )
+ else
{
- DBG_UNHANDLED_EXCEPTION();
+ DBG_ASSERT(m_xSearchCursor == m_xOriginalIterator, "FmSearchEngine::SetFormatterUsing : inkonsistenter Zustand !");
+ m_xSearchCursor = m_xClonedIterator;
+ m_xSearchCursor.moveToBookmark(m_xOriginalIterator.getBookmark());
}
-
- // ich muss die Fields neu binden, da der Textaustausch eventuell ueber diese Fields erfolgt und sich der unterliegende Cursor
- // geaendert hat
- RebuildUsedFields(m_nCurrentFieldIndex, true);
}
- else
- InvalidatePreviousLoc();
+ catch( const Exception& )
+ {
+ DBG_UNHANDLED_EXCEPTION();
+ }
+
+ // ich muss die Fields neu binden, da der Textaustausch eventuell ueber diese Fields erfolgt und sich der unterliegende Cursor
+ // geaendert hat
+ RebuildUsedFields(m_nCurrentFieldIndex, true);
}
@@ -1098,7 +1073,6 @@ void FmSearchEngine::SwitchToContext(const Reference< css::sdbc::XResultSet > &
m_xSearchCursor = xCursor;
m_xOriginalIterator = xCursor;
m_xClonedIterator = CursorWrapper(m_xOriginalIterator, true);
- m_bUsingTextComponents = true;
fillControlTexts(arrFields);
diff --git a/svx/source/form/fmtools.cxx b/svx/source/form/fmtools.cxx
index 6b1301b..1c48052 100644
--- a/svx/source/form/fmtools.cxx
+++ b/svx/source/form/fmtools.cxx
@@ -287,7 +287,6 @@ void FmXDisposeListener::setAdapter(FmXDisposeMultiplexer* pAdapter)
FmXDisposeMultiplexer::FmXDisposeMultiplexer(FmXDisposeListener* _pListener, const Reference< css::lang::XComponent>& _rxObject)
:m_xObject(_rxObject)
,m_pListener(_pListener)
- ,m_nId(0)
{
m_pListener->setAdapter(this);
@@ -307,7 +306,7 @@ void FmXDisposeMultiplexer::disposing(const css::lang::EventObject& Source) thro
if (m_pListener)
{
- m_pListener->disposing(Source, m_nId);
+ m_pListener->disposing(Source, 0);
m_pListener->setAdapter(nullptr);
m_pListener = nullptr;
}
diff --git a/svx/source/form/formfeaturedispatcher.cxx b/svx/source/form/formfeaturedispatcher.cxx
index e45d21e..1e0688d 100644
--- a/svx/source/form/formfeaturedispatcher.cxx
+++ b/svx/source/form/formfeaturedispatcher.cxx
@@ -43,7 +43,6 @@ namespace svx
,m_aFeatureURL( _rFeatureURL )
,m_nFormFeature( _nFormFeature )
,m_bLastKnownEnabled( false )
- ,m_bDisposed( false )
{
}
@@ -123,7 +122,6 @@ namespace svx
void SAL_CALL OSingleFeatureDispatcher::dispatch( const URL& _rURL, const Sequence< PropertyValue >& _rArguments ) throw (RuntimeException, std::exception)
{
::osl::ClearableMutexGuard aGuard( m_rMutex );
- checkAlive();
OSL_ENSURE( _rURL.Complete == m_aFeatureURL.Complete, "OSingleFeatureDispatcher::dispatch: not responsible for this URL!" );
(void)_rURL;
@@ -168,13 +166,6 @@ namespace svx
return;
::osl::ClearableMutexGuard aGuard( m_rMutex );
- if ( m_bDisposed )
- {
- EventObject aDisposeEvent( *this );
- aGuard.clear();
- _rxControl->disposing( aDisposeEvent );
- return;
- }
m_aStatusListeners.addInterface( _rxControl );
@@ -192,19 +183,11 @@ namespace svx
return;
::osl::MutexGuard aGuard( m_rMutex );
- checkAlive();
m_aStatusListeners.removeInterface( _rxControl );
}
- void OSingleFeatureDispatcher::checkAlive() const
- {
- if ( m_bDisposed )
- throw DisposedException( OUString(), *const_cast< OSingleFeatureDispatcher* >( this ) );
- }
-
-
}
diff --git a/svx/source/inc/formfeaturedispatcher.hxx b/svx/source/inc/formfeaturedispatcher.hxx
index 58e1e77..e536415 100644
--- a/svx/source/inc/formfeaturedispatcher.hxx
+++ b/svx/source/inc/formfeaturedispatcher.hxx
@@ -45,7 +45,6 @@ namespace svx
css::uno::Any m_aLastKnownState;
const sal_Int16 m_nFormFeature;
bool m_bLastKnownEnabled;
- bool m_bDisposed;
public:
/** constructs the dispatcher
@@ -97,16 +96,6 @@ namespace svx
);
private:
- /** checks whether our instance is alive
-
- If the instance already received a <member>dispose</member> call, then a
- <type scope="css::lang">DisposedException</type> is thrown.
-
- @precond
- our Mutex is locked - else calling the method would not make sense, since
- its result could be out-of-date as soon as it's returned to the caller.
- */
- void checkAlive() const;
/** retrieves the current status of our feature, in a format which can be used
for UNO notifications
diff --git a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
index 47a6afe..df9b6e7 100644
--- a/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
+++ b/svx/source/sdr/primitive2d/sdrcustomshapeprimitive2d.cxx
@@ -50,7 +50,7 @@ namespace drawinglayer
attribute::SdrLineAttribute(),
false,
getWordWrap(),
- isForceTextClipToTextRange()));
+ false/*ForceTextClipToTextRange*/));
}
// add shadow
@@ -86,8 +86,7 @@ namespace drawinglayer
maSubPrimitives(rSubPrimitives),
maTextBox(rTextBox),
mbWordWrap(bWordWrap),
- mb3DShape(b3DShape),
- mbForceTextClipToTextRange(false)
+ mb3DShape(b3DShape)
{
}
@@ -101,8 +100,7 @@ namespace drawinglayer
&& getSubPrimitives() == rCompare.getSubPrimitives()
&& getTextBox() == rCompare.getTextBox()
&& getWordWrap() == rCompare.getWordWrap()
- && get3DShape() == rCompare.get3DShape()
- && isForceTextClipToTextRange() == rCompare.isForceTextClipToTextRange());
+ && get3DShape() == rCompare.get3DShape());
}
return false;
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
index 155e2a3..53f5e9d 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.cxx
@@ -59,7 +59,6 @@ PosSizePropertyPanel::PosSizePropertyPanel(
mpView(nullptr),
mlOldWidth(1),
mlOldHeight(1),
- meRP(RP_LT),
maAnchorPos(),
mlRotX(0),
mlRotY(0),
@@ -80,7 +79,6 @@ PosSizePropertyPanel::PosSizePropertyPanel(
m_aMetricCtl(SID_ATTR_METRIC, *pBindings, *this),
maContext(),
mpBindings(pBindings),
- mbMtrPosXMirror(false),
mbSizeProtected(false),
mbPositionProtected(false),
mbAutoWidth(false),
@@ -825,7 +823,7 @@ void PosSizePropertyPanel::executeSize()
// put Width & Height to itemset
SfxUInt32Item aWidthItem( SID_ATTR_TRANSFORM_WIDTH, (sal_uInt32) lWidth);
SfxUInt32Item aHeightItem( SID_ATTR_TRANSFORM_HEIGHT, (sal_uInt32) lHeight);
- SfxAllEnumItem aPointItem (SID_ATTR_TRANSFORM_SIZE_POINT, (sal_uInt16)meRP);
+ SfxAllEnumItem aPointItem (SID_ATTR_TRANSFORM_SIZE_POINT, (sal_uInt16)RP_LT);
const sal_Int32 nCombinedContext(maContext.GetCombinedContext_DI());
if( nCombinedContext == CombinedEnumContext(Application_WriterVariants, Context_Graphic)
@@ -856,8 +854,6 @@ void PosSizePropertyPanel::executePosX()
if ( mpMtrPosX->IsValueModified())
{
long lX = GetCoreValue( *mpMtrPosX, mePoolUnit );
- if( mbMtrPosXMirror )
- lX = -lX;
long lY = GetCoreValue( *mpMtrPosY, mePoolUnit );
Fraction aUIScale = mpView->GetModel()->GetUIScale();
diff --git a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
index 9ec990c..755c563 100644
--- a/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
+++ b/svx/source/sidebar/possize/PosSizePropertyPanel.hxx
@@ -113,7 +113,6 @@ private:
const SdrView* mpView;
sal_uInt32 mlOldWidth;
sal_uInt32 mlOldHeight;
- RECT_POINT meRP;
Point maAnchorPos; //anchor position
long mlRotX;
long mlRotY;
@@ -140,7 +139,6 @@ private:
SfxBindings* mpBindings;
/// bitfield
- bool mbMtrPosXMirror : 1;
bool mbSizeProtected : 1;
bool mbPositionProtected : 1;
bool mbAutoWidth : 1;
diff --git a/svx/source/svdraw/sdrpaintwindow.cxx b/svx/source/svdraw/sdrpaintwindow.cxx
index 21c771e..473da51 100644
--- a/svx/source/svdraw/sdrpaintwindow.cxx
+++ b/svx/source/svdraw/sdrpaintwindow.cxx
@@ -196,7 +196,7 @@ void SdrPaintWindow::impCreateOverlayManager()
{
vcl::Window& rWindow = dynamic_cast<vcl::Window&>(GetOutputDevice());
// decide which OverlayManager to use
- if(GetPaintView().IsBufferedOverlayAllowed() && mbUseBuffer && !rWindow.SupportsDoubleBuffering())
+ if(GetPaintView().IsBufferedOverlayAllowed() && !rWindow.SupportsDoubleBuffering())
{
// buffered OverlayManager, buffers its background and refreshes from there
// for pure overlay changes (no system redraw). The 3rd parameter specifies
@@ -242,8 +242,7 @@ SdrPaintWindow::SdrPaintWindow(SdrPaintView& rNewPaintView, OutputDevice& rOut,
mpWindow(pWindow),
mrPaintView(rNewPaintView),
mpPreRenderDevice(nullptr),
- mbTemporaryTarget(false), // #i72889#
- mbUseBuffer(true)
+ mbTemporaryTarget(false) // #i72889#
{
}
diff --git a/svx/source/svdraw/svdcrtv.cxx b/svx/source/svdraw/svdcrtv.cxx
index 6e1c619..7689ede 100644
--- a/svx/source/svdraw/svdcrtv.cxx
+++ b/svx/source/svdraw/svdcrtv.cxx
@@ -193,11 +193,9 @@ void SdrCreateView::ImpClearVars()
nAktIdent=OBJ_NONE;
pAktCreate=nullptr;
pCreatePV=nullptr;
- bAutoTextEdit=false;
b1stPointAsCenter=false;
aAktCreatePointer=Pointer(PointerStyle::Cross);
bUseIncompatiblePathCreateInterface=false;
- bAutoClosePolys=true;
nAutoCloseDistPix=5;
nFreeHandMinDistPix=10;
@@ -592,7 +590,6 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
{
bool bRet=false;
SdrObject* pObjMerk=pAktCreate;
- SdrPageView* pPVMerk=pCreatePV;
if (pAktCreate!=nullptr)
{
@@ -689,14 +686,6 @@ bool SdrCreateView::EndCreateObj(SdrCreateCmd eCmd)
bRet=true;
}
}
- if (bRet && pObjMerk!=nullptr && IsTextEditAfterCreate())
- {
- SdrTextObj* pText=dynamic_cast<SdrTextObj*>( pObjMerk );
- if (pText!=nullptr && pText->IsTextFrame())
- {
- SdrBeginTextEdit(pText, pPVMerk, nullptr, true);
- }
- }
}
return bRet;
}
diff --git a/svx/source/svdraw/svdmark.cxx b/svx/source/svdraw/svdmark.cxx
index bb164d7..63e8382 100644
--- a/svx/source/svdraw/svdmark.cxx
+++ b/svx/source/svdraw/svdmark.cxx
@@ -313,7 +313,6 @@ SdrMarkList& SdrMarkList::operator=(const SdrMarkList& rLst)
maPointName = rLst.maPointName;
mbPointNameOk = rLst.mbPointNameOk;
maGluePointName = rLst.maGluePointName;
- mbGluePointNameOk = rLst.mbGluePointNameOk;
mbSorted = rLst.mbSorted;
return *this;
}
diff --git a/svx/source/svdraw/svdopath.cxx b/svx/source/svdraw/svdopath.cxx
index 34a107bf..d7b1343 100644
--- a/svx/source/svdraw/svdopath.cxx
+++ b/svx/source/svdraw/svdopath.cxx
@@ -248,7 +248,6 @@ struct ImpPathCreateUser : public SdrDragStatUserData
long nCircRelAngle;
bool bBezier;
bool bBezHasCtrl0;
- bool bCurve;
bool bCircle;
bool bAngleSnap;
bool bLine;
@@ -261,15 +260,14 @@ struct ImpPathCreateUser : public SdrDragStatUserData
public:
ImpPathCreateUser(): nCircRadius(0),nCircStAngle(0),nCircRelAngle(0),
- bBezier(false),bBezHasCtrl0(false),bCurve(false),bCircle(false),bAngleSnap(false),bLine(false),bLine90(false),bRect(false),
+ bBezier(false),bBezHasCtrl0(false),bCircle(false),bAngleSnap(false),bLine(false),bLine90(false),bRect(false),
bMixedCreate(false),nBezierStartPoint(0),eStartKind(OBJ_NONE),eAktKind(OBJ_NONE) { }
- void ResetFormFlags() { bBezier=false; bCurve=false; bCircle=false; bLine=false; bRect=false; }
- bool IsFormFlag() const { return bBezier || bCurve || bCircle || bLine || bRect; }
+ void ResetFormFlags() { bBezier=false; bCircle=false; bLine=false; bRect=false; }
+ bool IsFormFlag() const { return bBezier || bCircle || bLine || bRect; }
XPolygon GetFormPoly() const;
void CalcBezier(const Point& rP1, const Point& rP2, const Point& rDir, bool bMouseDown);
XPolygon GetBezierPoly() const;
- static XPolygon GetCurvePoly() { return XPolygon(); }
void CalcCircle(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
XPolygon GetCirclePoly() const;
void CalcLine(const Point& rP1, const Point& rP2, const Point& rDir, SdrView* pView);
@@ -282,7 +280,6 @@ public:
XPolygon ImpPathCreateUser::GetFormPoly() const
{
if (bBezier) return GetBezierPoly();
- if (bCurve) return GetCurvePoly();
if (bCircle) return GetCirclePoly();
if (bLine) return GetLinePoly();
if (bRect) return GetRectPoly();
@@ -2251,7 +2248,7 @@ bool SdrPathObj::EndCreate(SdrDragStat& rStat, SdrCreateCmd eCmd)
{
SdrView* pView = rStat.GetView();
- if(pView && pView->IsAutoClosePolys() && !pView->IsUseIncompatiblePathCreateInterface())
+ if(pView && !pView->IsUseIncompatiblePathCreateInterface())
{
OutputDevice* pOut = pView->GetFirstOutputDevice();
diff --git a/svx/source/table/viewcontactoftableobj.cxx b/svx/source/table/viewcontactoftableobj.cxx
index dd8ad87..b181998 100644
--- a/svx/source/table/viewcontactoftableobj.cxx
+++ b/svx/source/table/viewcontactoftableobj.cxx
@@ -174,7 +174,6 @@ namespace drawinglayer
bool mbBottomIsOutside : 1;
bool mbRightIsOutside : 1;
bool mbTopIsOutside : 1;
- bool mbInTwips : 1;
protected:
// local decomposition.
@@ -216,8 +215,7 @@ namespace drawinglayer
mbLeftIsOutside(bLeftIsOutside),
mbBottomIsOutside(bBottomIsOutside),
mbRightIsOutside(bRightIsOutside),
- mbTopIsOutside(bTopIsOutside),
- mbInTwips(true)
+ mbTopIsOutside(bTopIsOutside)
{
}
@@ -231,7 +229,6 @@ namespace drawinglayer
bool getBottomIsOutside() const { return mbBottomIsOutside; }
bool getRightIsOutside() const { return mbRightIsOutside; }
bool getTopIsOutside() const { return mbTopIsOutside; }
- bool getInTwips() const { return mbInTwips; }
// compare operator
virtual bool operator==(const BasePrimitive2D& rPrimitive) const override;
@@ -291,7 +288,7 @@ namespace drawinglayer
{
Primitive2DContainer xRetval(4);
sal_uInt32 nInsert(0);
- const double fTwipsToMM(getInTwips() ? (127.0 / 72.0) : 1.0);
+ const double fTwipsToMM(127.0 / 72.0);
if(!getLeftLine().isEmpty())
{
@@ -300,7 +297,7 @@ namespace drawinglayer
basegfx::B2DPoint aEnd(getTransform() * basegfx::B2DPoint(0.0, 1.0));
// Move the left border to the left.
- double fOffset = getChangedValue(getLeftLine().GetDistance(), getInTwips());
+ double fOffset = getChangedValue(getLeftLine().GetDistance(), true/*InTwips*/);
aStart += basegfx::B2DPoint(-fOffset,-fOffset);
aEnd += basegfx::B2DPoint(-fOffset,fOffset);
@@ -314,9 +311,9 @@ namespace drawinglayer
xRetval[nInsert++] = Primitive2DReference(new BorderLinePrimitive2D(
aStart,
aEnd,
- getChangedValue(getLeftLine().GetOutWidth(), getInTwips()),
- getChangedValue(getLeftLine().GetDistance(), getInTwips()),
- getChangedValue(getLeftLine().GetInWidth(), getInTwips()),
+ getChangedValue(getLeftLine().GetOutWidth(), true/*InTwips*/),
+ getChangedValue(getLeftLine().GetDistance(), true/*InTwips*/),
+ getChangedValue(getLeftLine().GetInWidth(), true/*InTwips*/),
fExtendIS * fTwipsToMM,
fExtendIE * fTwipsToMM,
fExtendOS * fTwipsToMM,
@@ -345,9 +342,9 @@ namespace drawinglayer
xRetval[nInsert++] = Primitive2DReference(new BorderLinePrimitive2D(
aStart,
aEnd,
- getChangedValue(getBottomLine().GetOutWidth(), getInTwips()),
- getChangedValue(getBottomLine().GetDistance(), getInTwips()),
- getChangedValue(getBottomLine().GetInWidth(), getInTwips()),
+ getChangedValue(getBottomLine().GetOutWidth(), true/*InTwips*/),
+ getChangedValue(getBottomLine().GetDistance(), true/*InTwips*/),
+ getChangedValue(getBottomLine().GetInWidth(), true/*InTwips*/),
fExtendIS * fTwipsToMM,
fExtendIE * fTwipsToMM,
fExtendOS * fTwipsToMM,
@@ -376,9 +373,9 @@ namespace drawinglayer
xRetval[nInsert++] = Primitive2DReference(new BorderLinePrimitive2D(
aStart,
aEnd,
- getChangedValue(getRightLine().GetOutWidth(), getInTwips()),
- getChangedValue(getRightLine().GetDistance(), getInTwips()),
- getChangedValue(getRightLine().GetInWidth(), getInTwips()),
+ getChangedValue(getRightLine().GetOutWidth(), true/*InTwips*/),
+ getChangedValue(getRightLine().GetDistance(), true/*InTwips*/),
+ getChangedValue(getRightLine().GetInWidth(), true/*InTwips*/),
fExtendOS * fTwipsToMM,
fExtendOE * fTwipsToMM,
fExtendIS * fTwipsToMM,
@@ -398,7 +395,7 @@ namespace drawinglayer
basegfx::B2DPoint aEnd(getTransform() * basegfx::B2DPoint(1.0, 0.0));
// Move the top border up a bit.
- double fOffset = getChangedValue(getTopLine().GetDistance(), getInTwips());
+ double fOffset = getChangedValue(getTopLine().GetDistance(), true/*InTwips*/);
aStart += basegfx::B2DPoint(-fOffset,-fOffset);
aEnd += basegfx::B2DPoint(fOffset,-fOffset);
@@ -412,9 +409,9 @@ namespace drawinglayer
xRetval[nInsert++] = Primitive2DReference(new BorderLinePrimitive2D(
aStart,
aEnd,
- getChangedValue(getTopLine().GetOutWidth(), getInTwips()),
- getChangedValue(getTopLine().GetDistance(), getInTwips()),
- getChangedValue(getTopLine().GetInWidth(), getInTwips()),
+ getChangedValue(getTopLine().GetOutWidth(), true/*InTwips*/),
+ getChangedValue(getTopLine().GetDistance(), true/*InTwips*/),
+ getChangedValue(getTopLine().GetInWidth(), true/*InTwips*/),
fExtendOS * fTwipsToMM,
fExtendOE * fTwipsToMM,
fExtendIS * fTwipsToMM,
@@ -453,8 +450,7 @@ namespace drawinglayer
&& getLeftIsOutside() == rCompare.getLeftIsOutside()
&& getBottomIsOutside() == rCompare.getBottomIsOutside()
&& getRightIsOutside() == rCompare.getRightIsOutside()
- && getTopIsOutside() == rCompare.getTopIsOutside()
- && getInTwips() == rCompare.getInTwips());
+ && getTopIsOutside() == rCompare.getTopIsOutside());
}
return false;
diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx
index 74d355e..dd81069 100644
--- a/svx/source/tbxctrls/layctrl.cxx
+++ b/svx/source/tbxctrls/layctrl.cxx
@@ -52,7 +52,6 @@ private:
::Color aBackgroundColor;
long nCol;
long nLine;
- bool bInitialKeyInput;
bool m_bMod1;
Reference< XFrame > mxFrame;
OUString maCommand;
@@ -107,7 +106,6 @@ TableWindow::TableWindow( sal_uInt16 nSlotId, const OUString& rCmd, const OUStri
, aTableButton( VclPtr<PushButton>::Create(this) )
, nCol( 0 )
, nLine( 0 )
- , bInitialKeyInput(false)
, m_bMod1(false)
, mxFrame( rFrame )
, maCommand( rCmd )
@@ -221,15 +219,6 @@ void TableWindow::KeyInput( const KeyEvent& rKEvt )
}
if ( bHandled )
{
- //make sure that a table can initially be created
- if(bInitialKeyInput)
- {
- bInitialKeyInput = false;
- if(!nNewLine)
- nNewLine = 1;
- if(!nNewCol)
- nNewCol = 1;
- }
Update( nNewCol, nNewLine );
}
}
More information about the Libreoffice-commits
mailing list