summaryrefslogtreecommitdiffstats
path: root/svx
diff options
context:
space:
mode:
Diffstat (limited to 'svx')
-rw-r--r--svx/source/dialog/framelinkarray.cxx8
-rw-r--r--svx/source/dialog/optgrid.cxx24
-rw-r--r--svx/source/dialog/svxruler.cxx2
-rw-r--r--svx/source/fmcomp/gridcell.cxx11
-rw-r--r--svx/source/form/fmpage.cxx31
-rw-r--r--svx/source/items/numfmtsh.cxx2
-rw-r--r--svx/source/svdraw/svdobj.cxx10
-rw-r--r--svx/source/svdraw/svdovirt.cxx20
8 files changed, 73 insertions, 35 deletions
diff --git a/svx/source/dialog/framelinkarray.cxx b/svx/source/dialog/framelinkarray.cxx
index fa58294386..8970126111 100644
--- a/svx/source/dialog/framelinkarray.cxx
+++ b/svx/source/dialog/framelinkarray.cxx
@@ -936,7 +936,7 @@ void Array::SetAddMergedLeftSize( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nAdd
return;
Cell aTempCell(*pTempCell);
aTempCell.mnAddLeft = nAddSize;
- mxImpl->PutCell( nCol, nRow, aTempCell );
+ mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
}
}
@@ -951,7 +951,7 @@ void Array::SetAddMergedRightSize( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nAd
return;
Cell aTempCell(*pTempCell);
aTempCell.mnAddRight = nAddSize;
- mxImpl->PutCell( nCol, nRow, aTempCell );
+ mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
}
}
@@ -966,7 +966,7 @@ void Array::SetAddMergedTopSize( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nAddS
return;
Cell aTempCell(*pTempCell);
aTempCell.mnAddTop = nAddSize;
- mxImpl->PutCell( nCol, nRow, aTempCell );
+ mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
}
}
@@ -981,7 +981,7 @@ void Array::SetAddMergedBottomSize( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nA
return;
Cell aTempCell(*pTempCell);
aTempCell.mnAddBottom = nAddSize;
- mxImpl->PutCell( nCol, nRow, aTempCell );
+ mxImpl->PutCell( aIt.Col(), aIt.Row(), aTempCell );
}
}
diff --git a/svx/source/dialog/optgrid.cxx b/svx/source/dialog/optgrid.cxx
index 2226eaa4e2..66ddc8c4e5 100644
--- a/svx/source/dialog/optgrid.cxx
+++ b/svx/source/dialog/optgrid.cxx
@@ -161,17 +161,19 @@ SvxGridTabPage::SvxGridTabPage(weld::Container* pPage, weld::DialogController* p
if (m_Emode != HTML_MODE)
{
- SfxViewFrame* pCurrent = SfxViewFrame::Current();
- OUString aModuleName = vcl::CommandInfoProvider::GetModuleIdentifier(pCurrent->GetFrame().GetFrameInterface());
- std::u16string_view sModulename = aModuleName.subView(aModuleName.lastIndexOf('.') + 1);
- if (sModulename.starts_with(u"Text"))
- m_Emode = WRITER_MODE;
- else if (sModulename.starts_with(u"Spreadsheet"))
- m_Emode = CALC_MODE;
- else if (sModulename.starts_with(u"Presentation"))
- m_Emode = IMPRESS_MODE;
- else if (sModulename.starts_with(u"Drawing"))
- m_Emode = DRAW_MODE;
+ if (SfxViewFrame* pCurrent = SfxViewFrame::Current())
+ {
+ OUString aModuleName = vcl::CommandInfoProvider::GetModuleIdentifier(pCurrent->GetFrame().GetFrameInterface());
+ std::u16string_view sModulename = aModuleName.subView(aModuleName.lastIndexOf('.') + 1);
+ if (sModulename.starts_with(u"Text"))
+ m_Emode = WRITER_MODE;
+ else if (sModulename.starts_with(u"Spreadsheet"))
+ m_Emode = CALC_MODE;
+ else if (sModulename.starts_with(u"Presentation"))
+ m_Emode = IMPRESS_MODE;
+ else if (sModulename.starts_with(u"Drawing"))
+ m_Emode = DRAW_MODE;
+ }
}
m_xCbxRotate->connect_toggled(LINK(this, SvxGridTabPage, ClickRotateHdl_Impl));
diff --git a/svx/source/dialog/svxruler.cxx b/svx/source/dialog/svxruler.cxx
index 6323583fd2..17c4edaa93 100644
--- a/svx/source/dialog/svxruler.cxx
+++ b/svx/source/dialog/svxruler.cxx
@@ -1033,7 +1033,7 @@ void SvxRuler::UpdateTabs()
lCurrentDefTabDist = mxTabStopItem->GetDefaultDistance();
tools::Long nDefTabDist = ConvertHPosPixel(lCurrentDefTabDist);
- const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > lRightIndent
+ const sal_uInt16 nDefTabBuf = lPosPixel > lRightIndent || lLastTab > lRightIndent || nDefTabDist == 0
? 0
: static_cast<sal_uInt16>( (lRightIndent - lPosPixel) / nDefTabDist );
diff --git a/svx/source/fmcomp/gridcell.cxx b/svx/source/fmcomp/gridcell.cxx
index e8c56fb0ac..2f17f7f3a4 100644
--- a/svx/source/fmcomp/gridcell.cxx
+++ b/svx/source/fmcomp/gridcell.cxx
@@ -2629,9 +2629,16 @@ void DbListBox::Init(BrowserDataWin& rParent, const Reference< XRowSet >& xCurso
DbCellControl::Init( rParent, xCursor );
}
-void DbListBox::implAdjustGenericFieldSetting( const Reference< XPropertySet >& /*rxModel*/ )
+void DbListBox::implAdjustGenericFieldSetting(const Reference<XPropertySet>& _rxModel)
{
- // ignore FM_PROP_LINECOUNT
+ DBG_ASSERT( m_pWindow, "DbListBox::implAdjustGenericFieldSetting: not to be called without window!" );
+ DBG_ASSERT( _rxModel.is(), "DbListBox::implAdjustGenericFieldSetting: invalid model!" );
+ if ( m_pWindow && _rxModel.is() )
+ {
+ sal_Int16 nLines = getINT16( _rxModel->getPropertyValue( FM_PROP_LINECOUNT ) );
+ weld::ComboBox& rComboBox = static_cast<ListBoxControl*>(m_pWindow.get())->get_widget();
+ rComboBox.set_max_drop_down_rows(nLines);
+ }
}
CellControllerRef DbListBox::CreateController() const
diff --git a/svx/source/form/fmpage.cxx b/svx/source/form/fmpage.cxx
index 8c24f3cc22..6e4f2093d0 100644
--- a/svx/source/form/fmpage.cxx
+++ b/svx/source/form/fmpage.cxx
@@ -139,22 +139,21 @@ bool FmFormPage::RequestHelp( vcl::Window* pWindow, SdrView const * pView,
}
}
}
- if ( !aHelpText.isEmpty() )
- {
- // display the help
- tools::Rectangle aItemRect = pObj->GetCurrentBoundRect();
- aItemRect = pWindow->LogicToPixel( aItemRect );
- Point aPt = pWindow->OutputToScreenPixel( aItemRect.TopLeft() );
- aItemRect.SetLeft( aPt.X() );
- aItemRect.SetTop( aPt.Y() );
- aPt = pWindow->OutputToScreenPixel( aItemRect.BottomRight() );
- aItemRect.SetRight( aPt.X() );
- aItemRect.SetBottom( aPt.Y() );
- if( rEvt.GetMode() == HelpEventMode::BALLOON )
- Help::ShowBalloon( pWindow, aItemRect.Center(), aItemRect, aHelpText);
- else
- Help::ShowQuickHelp( pWindow, aItemRect, aHelpText );
- }
+
+ // display the help
+ tools::Rectangle aItemRect = pObj->GetCurrentBoundRect();
+ aItemRect = pWindow->LogicToPixel( aItemRect );
+ Point aPt = pWindow->OutputToScreenPixel( aItemRect.TopLeft() );
+ aItemRect.SetLeft( aPt.X() );
+ aItemRect.SetTop( aPt.Y() );
+ aPt = pWindow->OutputToScreenPixel( aItemRect.BottomRight() );
+ aItemRect.SetRight( aPt.X() );
+ aItemRect.SetBottom( aPt.Y() );
+ if( rEvt.GetMode() == HelpEventMode::BALLOON )
+ Help::ShowBalloon( pWindow, aItemRect.Center(), aItemRect, aHelpText);
+ else
+ Help::ShowQuickHelp( pWindow, aItemRect, aHelpText );
+
return true;
}
diff --git a/svx/source/items/numfmtsh.cxx b/svx/source/items/numfmtsh.cxx
index 8605817491..a1a4c70cec 100644
--- a/svx/source/items/numfmtsh.cxx
+++ b/svx/source/items/numfmtsh.cxx
@@ -713,7 +713,7 @@ bool SvxNumberFormatShell::IsEssentialFormat_Impl(SvNumFormatType eType, sal_uIn
if (nKey == nCurFormatKey)
return true;
- const NfIndexTableOffset nIndex = pFormatter->GetIndexTableOffset(nKey);
+ const NfIndexTableOffset nIndex = SvNumberFormatter::GetIndexTableOffset(nKey);
switch (nIndex)
{
// These are preferred or edit formats.
diff --git a/svx/source/svdraw/svdobj.cxx b/svx/source/svdraw/svdobj.cxx
index f4d13219db..b23e18a6a4 100644
--- a/svx/source/svdraw/svdobj.cxx
+++ b/svx/source/svdraw/svdobj.cxx
@@ -2675,6 +2675,11 @@ void SdrObject::SetResizeProtect(bool bProt)
}
}
+bool SdrObject::IsPrintable() const
+{
+ return !m_bNoPrint;
+}
+
void SdrObject::SetPrintable(bool bPrn)
{
if( bPrn == m_bNoPrint )
@@ -2689,6 +2694,11 @@ void SdrObject::SetPrintable(bool bPrn)
}
}
+bool SdrObject::IsVisible() const
+{
+ return mbVisible;
+}
+
void SdrObject::SetVisible(bool bVisible)
{
if( bVisible != mbVisible )
diff --git a/svx/source/svdraw/svdovirt.cxx b/svx/source/svdraw/svdovirt.cxx
index b1fe6f5cb9..2e1641d386 100644
--- a/svx/source/svdraw/svdovirt.cxx
+++ b/svx/source/svdraw/svdovirt.cxx
@@ -97,6 +97,26 @@ void SdrVirtObj::NbcSetAnchorPos(const Point& rAnchorPos)
m_aAnchor=rAnchorPos;
}
+bool SdrVirtObj::IsPrintable() const
+{
+ return mxRefObj->IsPrintable();
+}
+
+void SdrVirtObj::SetPrintable(bool const isPrintable)
+{
+ mxRefObj->SetPrintable(isPrintable);
+}
+
+bool SdrVirtObj::IsVisible() const
+{
+ return mxRefObj->IsVisible();
+}
+
+void SdrVirtObj::SetVisible(bool const isVisible)
+{
+ mxRefObj->SetVisible(isVisible);
+}
+
void SdrVirtObj::TakeObjInfo(SdrObjTransformInfoRec& rInfo) const
{
mxRefObj->TakeObjInfo(rInfo);
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-07 04:53:35 +0000