[Libreoffice-commits] core.git: sc/source

[Noel Grandin (via logerrit)]

 sc/source/ui/app/drwtrans.cxx  |   10 +++++-----
 sc/source/ui/inc/drwtrans.hxx  |    4 ++--
 sc/source/ui/inc/navipi.hxx    |    4 ++--
 sc/source/ui/navipi/navipi.cxx |   20 ++++++++++----------
 4 files changed, 19 insertions(+), 19 deletions(-)

New commits:
commit 8655fe6b9e19411f109c0dd75bfae0c734380e31
Author:     Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Mar 6 15:05:10 2023 +0200
Commit:     Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Mar 6 19:58:14 2023 +0000

    no need to allocate these separately
    
    they are all one or two words in size
    
    Change-Id: If233dfb315c4acc63849f92e5340d5e6561b5b4c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148340
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>

diff --git a/sc/source/ui/app/drwtrans.cxx b/sc/source/ui/app/drwtrans.cxx
index bdcddd616063..569fd6e0ab6a 100644
--- a/sc/source/ui/app/drwtrans.cxx
+++ b/sc/source/ui/app/drwtrans.cxx
@@ -167,7 +167,7 @@ ScDrawTransferObj::ScDrawTransferObj( 
std::unique_ptr<SdrModel> pClipModel, ScDo
                                             aLabel = sTmp;
                                         }
                                     }
-                                    m_pBookmark.reset( new INetBookmark( aAbs, 
aLabel ) );
+                                    m_oBookmark.emplace( aAbs, aLabel );
                                 }
                             }
                         }
@@ -225,7 +225,7 @@ ScDrawTransferObj::~ScDrawTransferObj()
     m_pModel.reset();
     m_aDrawPersistRef.clear();                    // after the model
 
-    m_pBookmark.reset();
+    m_oBookmark.reset();
     m_pDragSourceView.reset();
 }
 
@@ -285,7 +285,7 @@ void ScDrawTransferObj::AddSupportedFormats()
         AddFormat( SotClipboardFormatId::PNG );
         AddFormat( SotClipboardFormatId::BITMAP );
     }
-    else if ( m_pBookmark )       // url button
+    else if ( m_oBookmark )       // url button
     {
 //      AddFormat( SotClipboardFormatId::EMBED_SOURCE );
         AddFormat( SotClipboardFormatId::OBJECTDESCRIPTOR );
@@ -410,9 +410,9 @@ bool ScDrawTransferObj::GetData( const 
css::datatransfer::DataFlavor& rFlavor, c
                 bOK = SetObject( pEmbObj, SCDRAWTRANS_TYPE_DOCUMENT, rFlavor );
             }
         }
-        else if( m_pBookmark )
+        else if( m_oBookmark )
         {
-            bOK = SetINetBookmark( *m_pBookmark, rFlavor );
+            bOK = SetINetBookmark( *m_oBookmark, rFlavor );
         }
     }
     return bOK;
diff --git a/sc/source/ui/inc/drwtrans.hxx b/sc/source/ui/inc/drwtrans.hxx
index 49ec9e1e34d3..71213739dd2b 100644
--- a/sc/source/ui/inc/drwtrans.hxx
+++ b/sc/source/ui/inc/drwtrans.hxx
@@ -23,11 +23,11 @@
 #include <vcl/transfer.hxx>
 
 #include <sfx2/objsh.hxx>
+#include <svl/urlbmk.hxx>
 #include <charthelper.hxx>
 
 class SdrModel;
 class ScDocShell;
-class INetBookmark;
 class SdrObject;
 class SdrView;
 class ScDrawView;
@@ -45,7 +45,7 @@ private:
 
                                     // extracted from model in ctor:
     Size                            m_aSrcSize;
-    std::unique_ptr<INetBookmark>   m_pBookmark;
+    std::optional<INetBookmark>     m_oBookmark;
     bool                            m_bGraphic;
     bool                            m_bGrIsBit;
     bool                            m_bOleObj;
diff --git a/sc/source/ui/inc/navipi.hxx b/sc/source/ui/inc/navipi.hxx
index ecfe71cfd06d..95de25f267da 100644
--- a/sc/source/ui/inc/navipi.hxx
+++ b/sc/source/ui/inc/navipi.hxx
@@ -25,12 +25,12 @@
 #include <sfx2/childwin.hxx>
 #include <sfx2/navigat.hxx>
 #include <sfx2/sidebar/PanelLayout.hxx>
+#include <rangeutl.hxx>
 #include "content.hxx"
 
 class SfxPoolItem;
 class ScTabViewShell;
 class ScViewData;
-class ScArea;
 class ScScenarioWindow;
 class ScNavigatorControllerItem;
 class ScNavigatorDlg;
@@ -114,7 +114,7 @@ private:
     OUString        aStrHidden;
     OUString        aStrActiveWin;
 
-    std::unique_ptr<ScArea> pMarkArea;
+    std::optional<ScArea> moMarkArea;
     ScViewData*     pViewData;
 
     NavListMode     eListMode;
diff --git a/sc/source/ui/navipi/navipi.cxx b/sc/source/ui/navipi/navipi.cxx
index 6340c1a80f33..a5816dc7c045 100644
--- a/sc/source/ui/navipi/navipi.cxx
+++ b/sc/source/ui/navipi/navipi.cxx
@@ -464,7 +464,7 @@ ScNavigatorDlg::~ScNavigatorDlg()
 
     for (auto & p : mvBoundItems)
         p.reset();
-    pMarkArea.reset();
+    moMarkArea.reset();
 
     EndListening( *(SfxGetpApp()) );
     EndListening( rBindings );
@@ -811,7 +811,7 @@ void ScNavigatorDlg::SetListMode(NavListMode eMode)
         }
     }
 
-    if (pMarkArea)
+    if (moMarkArea)
         UnmarkDataArea();
 }
 
@@ -894,16 +894,16 @@ void ScNavigatorDlg::MarkDataArea()
     if ( !pViewSh )
         return;
 
-    if ( !pMarkArea )
-        pMarkArea.reset( new ScArea );
+    if ( !moMarkArea )
+        moMarkArea.emplace();
 
     pViewSh->MarkDataArea();
     const ScRange& aMarkRange = 
pViewSh->GetViewData().GetMarkData().GetMarkArea();
-    pMarkArea->nColStart = aMarkRange.aStart.Col();
-    pMarkArea->nRowStart = aMarkRange.aStart.Row();
-    pMarkArea->nColEnd = aMarkRange.aEnd.Col();
-    pMarkArea->nRowEnd = aMarkRange.aEnd.Row();
-    pMarkArea->nTab = aMarkRange.aStart.Tab();
+    moMarkArea->nColStart = aMarkRange.aStart.Col();
+    moMarkArea->nRowStart = aMarkRange.aStart.Row();
+    moMarkArea->nColEnd = aMarkRange.aEnd.Col();
+    moMarkArea->nRowEnd = aMarkRange.aEnd.Row();
+    moMarkArea->nTab = aMarkRange.aStart.Tab();
 }
 
 void ScNavigatorDlg::UnmarkDataArea()
@@ -913,7 +913,7 @@ void ScNavigatorDlg::UnmarkDataArea()
     if ( pViewSh )
     {
         pViewSh->Unmark();
-        pMarkArea.reset();
+        moMarkArea.reset();
     }
 }