summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/doc.hxx4
-rw-r--r--sw/qa/extras/tiledrendering/tiledrendering.cxx2
-rw-r--r--sw/source/core/doc/DocumentDeviceManager.cxx2
-rw-r--r--sw/source/core/unocore/unochart.cxx2
-rw-r--r--sw/source/core/unocore/unostyle.cxx4
-rw-r--r--sw/source/core/unocore/unotbl.cxx8
-rw-r--r--sw/source/core/unocore/unotext.cxx4
-rw-r--r--sw/source/filter/html/htmlatr.cxx2
-rw-r--r--sw/source/filter/ww8/ww8toolbar.cxx2
-rw-r--r--sw/source/ui/envelp/label1.cxx6
-rw-r--r--sw/source/ui/vba/vbafield.cxx2
-rw-r--r--sw/source/ui/vba/vbalistformat.cxx2
-rw-r--r--sw/source/uibase/app/docst.cxx2
-rw-r--r--sw/source/uibase/app/docstyle.cxx3
-rw-r--r--sw/source/uibase/misc/swruler.cxx4
-rw-r--r--sw/source/uibase/sidebar/PageSizeControl.cxx2
-rw-r--r--sw/source/uibase/sidebar/StylePresetsPanel.cxx6
17 files changed, 28 insertions, 29 deletions
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index 452a7aa214de..3878c4299b89 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -1225,8 +1225,8 @@ public:
// Change (replace) a table style named rName. Tracked by undo.
void ChgTableStyle(const OUString& rName, const SwTableAutoFormat& rNewFormat);
- const SwCellStyleTable& GetCellStyles() const { return *mpCellStyles.get(); }
- SwCellStyleTable& GetCellStyles() { return *mpCellStyles.get(); }
+ const SwCellStyleTable& GetCellStyles() const { return *mpCellStyles; }
+ SwCellStyleTable& GetCellStyles() { return *mpCellStyles; }
void AppendUndoForInsertFromDB( const SwPaM& rPam, bool bIsTable );
diff --git a/sw/qa/extras/tiledrendering/tiledrendering.cxx b/sw/qa/extras/tiledrendering/tiledrendering.cxx
index 06cd6bfa48b2..44489a1494ec 100644
--- a/sw/qa/extras/tiledrendering/tiledrendering.cxx
+++ b/sw/qa/extras/tiledrendering/tiledrendering.cxx
@@ -1712,7 +1712,7 @@ void SwTiledRenderingTest::testPaintCallbacks()
// Make sure that painting a tile in the second view doesn't invoke
// callbacks on the first view.
aView1.m_bCalled = false;
- pXTextDocument->paintTile(*pDevice.get(), nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
+ pXTextDocument->paintTile(*pDevice, nCanvasWidth, nCanvasHeight, /*nTilePosX=*/0, /*nTilePosY=*/0, /*nTileWidth=*/3840, /*nTileHeight=*/3840);
CPPUNIT_ASSERT(!aView1.m_bCalled);
mxComponent->dispose();
diff --git a/sw/source/core/doc/DocumentDeviceManager.cxx b/sw/source/core/doc/DocumentDeviceManager.cxx
index ae4083e59820..048b53825509 100644
--- a/sw/source/core/doc/DocumentDeviceManager.cxx
+++ b/sw/source/core/doc/DocumentDeviceManager.cxx
@@ -302,7 +302,7 @@ SfxPrinter& DocumentDeviceManager::CreatePrinter_() const
VclPtr<SfxPrinter> pNewPrt = VclPtr<SfxPrinter>::Create( std::move(pSet) );
const_cast<DocumentDeviceManager*>(this)->setPrinter( pNewPrt, true, true );
- return *mpPrt.get();
+ return *mpPrt;
}
void DocumentDeviceManager::PrtDataChanged()
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 0b2064cfa53b..ab597d0ae587 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -408,7 +408,7 @@ static void GetFormatAndCreateCursorFromRangeRep(
pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCursor->Move( fnMoveForward, GoInNode );
SwUnoTableCursor& rCursor =
- dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
// HACK: remove pending actions for old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
rCursor.MakeBoxSels();
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 8ce993467596..68d323c5f611 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -4239,7 +4239,7 @@ uno::Sequence< beans::PropertyValue > SwXAutoStyle::getProperties()
const SfxItemPropertyMap &rMap = pPropSet->getPropertyMap();
PropertyEntryVector_t aPropVector = rMap.getPropertyEntries();
- SfxItemSet& rSet = *mpSet.get();
+ SfxItemSet& rSet = *mpSet;
SfxItemIter aIter(rSet);
const SfxPoolItem* pItem = aIter.FirstItem();
@@ -4391,7 +4391,7 @@ void SwXTextTableStyle::SetPhysical()
uno::Reference<style::XStyle> xCellStyle(pOldBoxFormat->GetXObject(), uno::UNO_QUERY);
if (!xCellStyle.is())
continue;
- SwXTextCellStyle& rStyle = dynamic_cast<SwXTextCellStyle&>(*xCellStyle.get());
+ SwXTextCellStyle& rStyle = dynamic_cast<SwXTextCellStyle&>(*xCellStyle);
SwBoxAutoFormat& rNewBoxFormat = pTableAutoFormat->GetBoxFormat(aTableTemplateMap[i]);
rStyle.SetBoxFormat(&rNewBoxFormat);
rNewBoxFormat.SetXObject(xCellStyle);
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index f88e1389bcf8..4f2606c17fd5 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -2282,7 +2282,7 @@ uno::Reference<table::XCellRange> GetRangeByName(
pUnoCursor->SetMark();
pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCursor->Move( fnMoveForward, GoInNode );
- SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
// HACK: remove pending actions for selecting old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
rCursor.MakeBoxSels();
@@ -3359,7 +3359,7 @@ SwXCellRange::getCellRangeByPosition(
pUnoCursor->SetMark();
pUnoCursor->GetPoint()->nNode = *pBRBox->GetSttNd();
pUnoCursor->Move( fnMoveForward, GoInNode );
- SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
// HACK: remove pending actions for selecting old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
rCursor.MakeBoxSels();
@@ -4048,7 +4048,7 @@ void SwXTableRows::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
pUnoCursor->SetMark();
pUnoCursor->GetPoint()->nNode = *pBLBox->GetSttNd();
pUnoCursor->Move(fnMoveForward, GoInNode);
- SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
{
// HACK: remove pending actions for selecting old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
@@ -4205,7 +4205,7 @@ void SwXTableColumns::removeByIndex(sal_Int32 nIndex, sal_Int32 nCount)
pUnoCursor->SetMark();
pUnoCursor->GetPoint()->nNode = *pTRBox->GetSttNd();
pUnoCursor->Move(fnMoveForward, GoInNode);
- SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor.get());
+ SwUnoTableCursor& rCursor = dynamic_cast<SwUnoTableCursor&>(*pUnoCursor);
{
// HACK: remove pending actions for selecting old style tables
UnoActionRemoveContext aRemoveContext(rCursor);
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index e73c74e332c2..68d78213fb48 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -1670,7 +1670,7 @@ SwXText::convertToTextFrame(
const uno::Reference<text::XTextFrame> xNewFrame(
SwXTextFrame::CreateXTextFrame(*m_pImpl->m_pDoc, nullptr));
- SwXTextFrame& rNewFrame = dynamic_cast<SwXTextFrame&>(*xNewFrame.get());
+ SwXTextFrame& rNewFrame = dynamic_cast<SwXTextFrame&>(*xNewFrame);
rNewFrame.SetSelection( aStartPam );
try
{
@@ -2207,7 +2207,7 @@ SwXText::convertToTable(
assert(SwTable::FindTable(pTable->GetFrameFormat()) == pTable);
assert(pTable->GetFrameFormat() ==
- dynamic_cast<SwXTextTable&>(*xRet.get()).GetFrameFormat());
+ dynamic_cast<SwXTextTable&>(*xRet).GetFrameFormat());
return xRet;
}
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index f3c55482777a..e9153a61b691 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -1669,7 +1669,7 @@ void HTMLEndPosLst::InsertNoScript( const SfxPoolItem& rItem,
const SwFormatAutoFormat& rAutoFormat = static_cast<const SwFormatAutoFormat&>(rItem);
const std::shared_ptr<SfxItemSet>& pSet = rAutoFormat.GetStyleHandle();
if( pSet.get() )
- Insert( *pSet.get(), nStart, nEnd, rFormatInfos, true, bParaAttrs );
+ Insert( *pSet, nStart, nEnd, rFormatInfos, true, bParaAttrs );
}
break;
diff --git a/sw/source/filter/ww8/ww8toolbar.cxx b/sw/source/filter/ww8/ww8toolbar.cxx
index eeb6f4212601..ff3c874f7b75 100644
--- a/sw/source/filter/ww8/ww8toolbar.cxx
+++ b/sw/source/filter/ww8/ww8toolbar.cxx
@@ -517,7 +517,7 @@ SwTBC::ImportToolBarControl( SwCTBWrapper& rWrapper, const css::uno::Reference<
sal_Int16 cmdId = 0;
if ( cid.get() )
{
- const sal_uInt32 nCid = ( *( cid.get() ) & 0xFFFF );
+ const sal_uInt32 nCid = ( *cid & 0xFFFF );
const sal_uInt8 cmt = static_cast<sal_uInt8>( nCid & 0x7 );
const sal_Int16 arg2 = static_cast<sal_Int16>( nCid >> 3 );
diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx
index 7569bfa57e92..a2e1691a5aec 100644
--- a/sw/source/ui/envelp/label1.cxx
+++ b/sw/source/ui/envelp/label1.cxx
@@ -395,18 +395,18 @@ void SwLabPage::DisplayFormat()
{
ScopedVclPtrInstance< MetricField > aField(this, WinBits(0));
FieldUnit aMetric = ::GetDfltMetric(false);
- SetMetric(*aField.get(), aMetric);
+ SetMetric(*aField, aMetric);
aField->SetDecimalDigits(2);
aField->SetMin (0);
aField->SetMax (LONG_MAX);
SwLabRec* pRec = GetSelectedEntryPos();
aItem.m_aLstType = pRec->m_aType;
- SETFLDVAL(*aField.get(), pRec->m_nWidth);
+ SETFLDVAL(*aField, pRec->m_nWidth);
aField->Reformat();
const OUString aWString = aField->GetText();
- SETFLDVAL(*aField.get(), pRec->m_nHeight);
+ SETFLDVAL(*aField, pRec->m_nHeight);
aField->Reformat();
OUString aText = pRec->m_aType + ": " + aWString +
diff --git a/sw/source/ui/vba/vbafield.cxx b/sw/source/ui/vba/vbafield.cxx
index 14d5e5769a57..cb423ad07769 100644
--- a/sw/source/ui/vba/vbafield.cxx
+++ b/sw/source/ui/vba/vbafield.cxx
@@ -332,7 +332,7 @@ SwVbaFields::Add( const css::uno::Reference< ::ooo::vba::word::XRange >& Range,
throw uno::RuntimeException("Not implemented" );
}
- SwVbaRange& rVbaRange = dynamic_cast<SwVbaRange&>(*Range.get());
+ SwVbaRange& rVbaRange = dynamic_cast<SwVbaRange&>(*Range);
uno::Reference< text::XTextRange > xTextRange = rVbaRange.getXTextRange();
uno::Reference< text::XText > xText = xTextRange->getText();
xText->insertTextContent( xTextRange, xTextField, true );
diff --git a/sw/source/ui/vba/vbalistformat.cxx b/sw/source/ui/vba/vbalistformat.cxx
index 8fb67d9dda76..edecccf159a2 100644
--- a/sw/source/ui/vba/vbalistformat.cxx
+++ b/sw/source/ui/vba/vbalistformat.cxx
@@ -62,7 +62,7 @@ void SAL_CALL SwVbaListFormat::ApplyListTemplate( const css::uno::Reference< wor
if (!xEnum->hasMoreElements())
return;
- SwVbaListTemplate& rListTemplate = dynamic_cast<SwVbaListTemplate&>(*ListTemplate.get());
+ SwVbaListTemplate& rListTemplate = dynamic_cast<SwVbaListTemplate&>(*ListTemplate);
bool isFirstElement = true;
do
diff --git a/sw/source/uibase/app/docst.cxx b/sw/source/uibase/app/docst.cxx
index 9d77fed807e8..089b4aa99c20 100644
--- a/sw/source/uibase/app/docst.cxx
+++ b/sw/source/uibase/app/docst.cxx
@@ -819,7 +819,7 @@ void SwDocShell::Edit(
SW_MOD()->PutItem(SfxUInt16Item(SID_ATTR_METRIC, static_cast< sal_uInt16 >(eMetric)));
SwAbstractDialogFactory* pFact = SwAbstractDialogFactory::Create();
ScopedVclPtr<SfxAbstractApplyTabDialog> pDlg(pFact->CreateTemplateDialog(GetView()->GetViewFrame()->GetWindow().GetFrameWeld(),
- *(xTmp.get()), nFamily, sPage, pCurrShell, bNew));
+ *xTmp, nFamily, sPage, pCurrShell, bNew));
std::shared_ptr<ApplyStyle> pApplyStyleHelper(new ApplyStyle(*this, bNew, xTmp, nFamily, pDlg.get(), m_xBasePool, bModified));
pDlg->SetApplyHdl(LINK(pApplyStyleHelper.get(), ApplyStyle, ApplyHdl));
diff --git a/sw/source/uibase/app/docstyle.cxx b/sw/source/uibase/app/docstyle.cxx
index f7b254c42635..5979314905c8 100644
--- a/sw/source/uibase/app/docstyle.cxx
+++ b/sw/source/uibase/app/docstyle.cxx
@@ -2553,8 +2553,7 @@ bool SwDocStyleSheetPool::SetParent( SfxStyleFamily eFam,
else
mxStyleSheet->PresetFollow( OUString() );
- Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified,
- *(mxStyleSheet.get()) ) );
+ Broadcast( SfxStyleSheetHint( SfxHintId::StyleSheetModified, *mxStyleSheet ) );
}
}
diff --git a/sw/source/uibase/misc/swruler.cxx b/sw/source/uibase/misc/swruler.cxx
index 1784ac20dbcd..03acdf57c3ca 100644
--- a/sw/source/uibase/misc/swruler.cxx
+++ b/sw/source/uibase/misc/swruler.cxx
@@ -186,10 +186,10 @@ void SwCommentRuler::DrawCommentControl(vcl::RenderContext& rRenderContext)
// Draw arrow
// FIXME consistence of button colors. https://opengrok.libreoffice.org/xref/core/vcl/source/control/button.cxx#785
Color aArrowColor = GetFadedColor(COL_BLACK, rStyleSettings.GetShadowColor());
- ImplDrawArrow(*maVirDev.get(), aArrowPos.X(), aArrowPos.Y(), aArrowColor, bArrowToRight);
+ ImplDrawArrow(*maVirDev, aArrowPos.X(), aArrowPos.Y(), aArrowColor, bArrowToRight);
// Blit comment control
- rRenderContext.DrawOutDev(aControlRect.TopLeft(), aControlRect.GetSize(), Point(), aControlRect.GetSize(), *maVirDev.get());
+ rRenderContext.DrawOutDev(aControlRect.TopLeft(), aControlRect.GetSize(), Point(), aControlRect.GetSize(), *maVirDev);
}
// Just accept double-click outside comment control
diff --git a/sw/source/uibase/sidebar/PageSizeControl.cxx b/sw/source/uibase/sidebar/PageSizeControl.cxx
index 404640def978..48a668f25f0d 100644
--- a/sw/source/uibase/sidebar/PageSizeControl.cxx
+++ b/sw/source/uibase/sidebar/PageSizeControl.cxx
@@ -80,7 +80,7 @@ PageSizeControl::PageSizeControl( sal_uInt16 nId, vcl::Window* pParent )
maWidthHeightField->SetDecimalDigits(2);
maWidthHeightField->SetSpinSize(10);
maWidthHeightField->SetLast(9999);
- SetFieldUnit( *maWidthHeightField.get(), lcl_GetFieldUnit() );
+ SetFieldUnit( *maWidthHeightField, lcl_GetFieldUnit() );
maPaperList.push_back( PAPER_A3 );
maPaperList.push_back( PAPER_A4 );
diff --git a/sw/source/uibase/sidebar/StylePresetsPanel.cxx b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
index 0a663a365194..05bfa2be8356 100644
--- a/sw/source/uibase/sidebar/StylePresetsPanel.cxx
+++ b/sw/source/uibase/sidebar/StylePresetsPanel.cxx
@@ -107,18 +107,18 @@ BitmapEx GenerateStylePreview(SfxObjectShell& rSource, OUString const & aName)
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev.get(), "Title", nTitleHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, "Title", nTitleHeight, aRenderRect);
y += nTitleHeight;
}
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev.get(), "Heading 1", nHeadingHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, "Heading 1", nHeadingHeight, aRenderRect);
y += nHeadingHeight;
}
{
tools::Rectangle aRenderRect(Point(nMargin, y), aSize);
- renderPreview(pStyleManager, *pVirtualDev.get(), "Text Body", nTextBodyHeight, aRenderRect);
+ renderPreview(pStyleManager, *pVirtualDev, "Text Body", nTextBodyHeight, aRenderRect);
}
return pVirtualDev->GetBitmapEx(Point(), aSize);
generated by cgit (git 2.34.1) at 2024-12-26 12:20:30 +0000