sw/source/core/inc/bookmrk.hxx | 5 +----
sw/source/uibase/dochdl/swdtflvr.cxx | 12 ++++++------
2 files changed, 7 insertions(+), 10 deletions(-)
New commits:
commit df0592cfb16c28b22c0c0331306dd072e7678fce
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Oct 9 20:34:00 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Oct 9 21:35:59 2021 +0200
What's the interest to gain 1 letter? bDelBookmrk->bDelBookmark
At least, it'll be easier to search bookmark in whole code if there's a
bookmark pb
Change-Id: I25cbfb8dae823495b87d5bfcdd41cea479230eee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123319
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sw/source/uibase/dochdl/swdtflvr.cxx
b/sw/source/uibase/dochdl/swdtflvr.cxx
index 17b7e37df224..8a3182e1e8c0 100644
--- a/sw/source/uibase/dochdl/swdtflvr.cxx
+++ b/sw/source/uibase/dochdl/swdtflvr.cxx
@@ -180,7 +180,7 @@ class SwTransferDdeLink : public ::sfx2::SvBaseLink
SwTransferable& rTrnsfr;
SwDocShell* pDocShell;
sal_uLong nOldTimeOut;
- bool bDelBookmrk : 1;
+ bool bDelBookmark : 1;
bool bInDisconnect : 1;
bool FindDocShell();
@@ -4215,7 +4215,7 @@ SwTransferDdeLink::SwTransferDdeLink( SwTransferable&
rTrans, SwWrtShell& rSh )
: rTrnsfr(rTrans)
, pDocShell(nullptr)
, nOldTimeOut(0)
- , bDelBookmrk(false)
+ , bDelBookmark(false)
, bInDisconnect(false)
{
// we only end up here with table- or text selection
@@ -4239,7 +4239,7 @@ SwTransferDdeLink::SwTransferDdeLink( SwTransferable&
rTrans, SwWrtShell& rSh )
if(pMark)
{
sName = pMark->GetName();
- bDelBookmrk = true;
+ bDelBookmark = true;
if( !bIsModified )
rSh.ResetModified();
}
@@ -4347,7 +4347,7 @@ bool SwTransferDdeLink::WriteData( SvStream& rStrm )
rServerObject.SetDdeBookmark(*pNewMark);
}
- bDelBookmrk = false;
+ bDelBookmark = false;
return true;
}
@@ -4359,7 +4359,7 @@ void SwTransferDdeLink::Disconnect( bool
bRemoveDataAdvise )
bInDisconnect = true;
// destroy the unused bookmark again (without Undo!)?
- if( bDelBookmrk && refObj.is() && FindDocShell() )
+ if( bDelBookmark && refObj.is() && FindDocShell() )
{
SwDoc* pDoc = pDocShell->GetDoc();
::sw::UndoGuard const undoGuard(pDoc->GetIDocumentUndoRedo());
@@ -4378,7 +4378,7 @@ void SwTransferDdeLink::Disconnect( bool
bRemoveDataAdvise )
// #i58448#
pDoc->SetOle2Link( aSavedOle2Link );
- bDelBookmrk = false;
+ bDelBookmark = false;
}
if( refObj.is() )
commit 84a4e281c1a552b002b3a7162adfaece47761e88
Author: Julien Nabet <serval2...@yahoo.fr>
AuthorDate: Sat Oct 9 20:36:53 2021 +0200
Commit: Julien Nabet <serval2...@yahoo.fr>
CommitDate: Sat Oct 9 21:35:48 2021 +0200
tdf#143148 - Use pragma once instead of include guards
I changed this one only because the goal was above all to change filename
in a following patch to put bookmark.hxx instead
Change-Id: Ia224f32227404e5685e03efb134dd525a88b3917
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/123320
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2...@yahoo.fr>
diff --git a/sw/source/core/inc/bookmrk.hxx b/sw/source/core/inc/bookmrk.hxx
index 397a68ac3cca..ed7d5ad82180 100644
--- a/sw/source/core/inc/bookmrk.hxx
+++ b/sw/source/core/inc/bookmrk.hxx
@@ -17,8 +17,7 @@
* the License at http://www.apache.org/licenses/LICENSE-2.0 .
*/
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_BOOKMRK_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_BOOKMRK_HXX
+#pragma once
#include <cppuhelper/weakref.hxx>
#include <sfx2/Metadatable.hxx>
@@ -343,6 +342,4 @@ namespace sw::mark {
bool IsFieldmarkOverlap(SwPaM const& rPaM);
}
-#endif
-
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
