diff options
Diffstat (limited to 'sw/source/core/crsr')
| -rw-r--r-- | sw/source/core/crsr/bookmrk.cxx | 17 | ||||
| -rw-r--r-- | sw/source/core/crsr/crossrefbookmark.cxx | 16 |
2 files changed, 12 insertions, 21 deletions
diff --git a/sw/source/core/crsr/bookmrk.cxx b/sw/source/core/crsr/bookmrk.cxx index 5087c9cd7b75..bd5c50fc89a2 100644 --- a/sw/source/core/crsr/bookmrk.cxx +++ b/sw/source/core/crsr/bookmrk.cxx @@ -177,21 +177,16 @@ namespace sw { namespace mark } } - NavigatorReminder::NavigatorReminder(const SwPaM& rPaM) - : MarkBase(rPaM, our_sNamePrefix) + : MarkBase(rPaM, rtl::OUString("__NavigatorReminder__")) //<-- everything else uses MarkBase::GenerateNewName ? { } - const ::rtl::OUString NavigatorReminder::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__NavigatorReminder__")); - UnoMark::UnoMark(const SwPaM& aPaM) - : MarkBase(aPaM, MarkBase::GenerateNewName(our_sNamePrefix)) + : MarkBase(aPaM, MarkBase::GenerateNewName(rtl::OUString("__UnoMark__"))) { } - const ::rtl::OUString UnoMark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__UnoMark__")); - DdeBookmark::DdeBookmark(const SwPaM& aPaM) - : MarkBase(aPaM, MarkBase::GenerateNewName(our_sNamePrefix)) + : MarkBase(aPaM, MarkBase::GenerateNewName(rtl::OUString("__DdeLink__"))) , m_aRefObj(NULL) { } @@ -200,8 +195,6 @@ namespace sw { namespace mark m_aRefObj = pObj; } - const ::rtl::OUString DdeBookmark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__DdeLink__")); - void DdeBookmark::DeregisterFromDoc(SwDoc* const pDoc) { if(m_aRefObj.Is()) @@ -282,7 +275,7 @@ namespace sw { namespace mark Fieldmark::Fieldmark(const SwPaM& rPaM) - : MarkBase(rPaM, MarkBase::GenerateNewName(our_sNamePrefix)) + : MarkBase(rPaM, MarkBase::GenerateNewName(rtl::OUString("__Fieldmark__"))) { if(!IsExpanded()) SetOtherMarkPos(GetMarkPos()); @@ -315,8 +308,6 @@ namespace sw { namespace mark aPaM.InvalidatePaM(); } - const ::rtl::OUString Fieldmark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__Fieldmark__")); - TextFieldmark::TextFieldmark(const SwPaM& rPaM) : Fieldmark(rPaM) { } diff --git a/sw/source/core/crsr/crossrefbookmark.cxx b/sw/source/core/crsr/crossrefbookmark.cxx index 9f77b6c2c9cd..67e0dcb66ee3 100644 --- a/sw/source/core/crsr/crossrefbookmark.cxx +++ b/sw/source/core/crsr/crossrefbookmark.cxx @@ -70,32 +70,32 @@ namespace sw { namespace mark return *static_cast<SwPosition*>(NULL); } + const char CrossRefHeadingBookmark_NamePrefix[] = "__RefHeading__"; + CrossRefHeadingBookmark::CrossRefHeadingBookmark(const SwPaM& rPaM, const KeyCode& rCode, const OUString& rName, const OUString& rShortName) - : CrossRefBookmark(rPaM, rCode, rName, rShortName, our_sNamePrefix) + : CrossRefBookmark(rPaM, rCode, rName, rShortName, rtl::OUString(CrossRefHeadingBookmark_NamePrefix)) { } - const ::rtl::OUString CrossRefHeadingBookmark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__RefHeading__")); - bool CrossRefHeadingBookmark::IsLegalName(const ::rtl::OUString& rName) { - return rName.match(our_sNamePrefix); + return rName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(CrossRefHeadingBookmark_NamePrefix)); } + const char CrossRefNumItemBookmark_NamePrefix[] = "__RefNumPara__"; + CrossRefNumItemBookmark::CrossRefNumItemBookmark(const SwPaM& rPaM, const KeyCode& rCode, const OUString& rName, const OUString& rShortName) - : CrossRefBookmark(rPaM, rCode, rName, rShortName, our_sNamePrefix) + : CrossRefBookmark(rPaM, rCode, rName, rShortName, rtl::OUString(CrossRefNumItemBookmark_NamePrefix)) { } - const ::rtl::OUString CrossRefNumItemBookmark::our_sNamePrefix(RTL_CONSTASCII_USTRINGPARAM("__RefNumPara__")); - bool CrossRefNumItemBookmark::IsLegalName(const ::rtl::OUString& rName) { - return rName.match(our_sNamePrefix); + return rName.matchAsciiL(RTL_CONSTASCII_STRINGPARAM(CrossRefNumItemBookmark_NamePrefix)); } }} |