diff options
author | Noel Grandin <noel@peralex.com> | 2015-09-30 11:06:04 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2015-10-01 06:57:19 +0000 |
commit | e209d115d41e25f5658dd52ae94ceb873b33013f (patch) | |
tree | 58b49bdcc833ec48bc8542f81b7918f50e07bb6d /sw/source/uibase | |
parent | 8e27c68847c6461c7bc0bdbff44412d6bfb0b1e8 (diff) |
remove old standalone Sun bug numbers
Sun bug numbers without any accompanying text are completely useless.
Fixed with
git grep -lP '//\s*#\d+#\s*$'
| xargs perl -i -ne'/\/\/\s*#\d+#\s*$/d or print'
And then hand-checking the result to restore places where it deleted code.
And then some more grepping and hand-editing to kill the others.
Change-Id: Ia96ce4466db8bb8da363ebf41f0ae7f45f28bf29
Reviewed-on: https://gerrit.libreoffice.org/19023
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sw/source/uibase')
-rw-r--r-- | sw/source/uibase/fldui/fldmgr.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/inc/conrect.hxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/inc/fldmgr.hxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/lingu/olmenu.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/misc/redlndlg.cxx | 2 | ||||
-rw-r--r-- | sw/source/uibase/ribbar/conrect.cxx | 1 | ||||
-rw-r--r-- | sw/source/uibase/uno/SwXDocumentSettings.cxx | 14 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/delete.cxx | 4 | ||||
-rw-r--r-- | sw/source/uibase/wrtsh/wrtsh1.cxx | 1 |
9 files changed, 7 insertions, 21 deletions
diff --git a/sw/source/uibase/fldui/fldmgr.cxx b/sw/source/uibase/fldui/fldmgr.cxx index 5e66db718a73..3ad6f9c3a988 100644 --- a/sw/source/uibase/fldui/fldmgr.cxx +++ b/sw/source/uibase/fldui/fldmgr.cxx @@ -1362,7 +1362,7 @@ bool SwFieldMgr::InsertField( void SwFieldMgr::UpdateCurField(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, - SwField * _pTmpField) // #111840# + SwField * _pTmpField) { // change format OSL_ENSURE(pCurField, "no field at CursorPos"); diff --git a/sw/source/uibase/inc/conrect.hxx b/sw/source/uibase/inc/conrect.hxx index 11ffecd024b8..c79753ad16b9 100644 --- a/sw/source/uibase/inc/conrect.hxx +++ b/sw/source/uibase/inc/conrect.hxx @@ -28,7 +28,6 @@ class ConstRectangle : public SwDrawBase bool bMarquee; bool bCapVertical; - // #93382# bool mbVertical; public: diff --git a/sw/source/uibase/inc/fldmgr.hxx b/sw/source/uibase/inc/fldmgr.hxx index 2f34a84300aa..fe4f06c90cb1 100644 --- a/sw/source/uibase/inc/fldmgr.hxx +++ b/sw/source/uibase/inc/fldmgr.hxx @@ -133,7 +133,7 @@ public: void UpdateCurField(sal_uLong nFormat, const OUString& rPar1, const OUString& rPar2, - SwField * _pField = 0); // #111840# + SwField * _pField = 0); OUString GetCurFieldPar1() const { return aCurPar1; } OUString GetCurFieldPar2() const { return aCurPar2; } diff --git a/sw/source/uibase/lingu/olmenu.cxx b/sw/source/uibase/lingu/olmenu.cxx index 18b49fafee90..b018074f9684 100644 --- a/sw/source/uibase/lingu/olmenu.cxx +++ b/sw/source/uibase/lingu/olmenu.cxx @@ -668,7 +668,6 @@ void SwSpellPopup::Execute( sal_uInt16 nId ) aTmp += "."; } - // #111827# SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, m_pSh->GetCrsrDescr()); diff --git a/sw/source/uibase/misc/redlndlg.cxx b/sw/source/uibase/misc/redlndlg.cxx index fadf770aa2e4..adc80f534b63 100644 --- a/sw/source/uibase/misc/redlndlg.cxx +++ b/sw/source/uibase/misc/redlndlg.cxx @@ -815,7 +815,6 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) SwWait aWait( *pSh->GetView().GetDocShell(), true ); pSh->StartAction(); - // #111827# if (aRedlines.size() > 1) { OUString aTmpStr; @@ -848,7 +847,6 @@ void SwRedlineAcceptDlg::CallAcceptReject( bool bSelect, bool bAccept ) (pSh->*FnAccRej)( nPosition ); } - // #111827# if (aRedlines.size() > 1) { pSh->EndUndo(); diff --git a/sw/source/uibase/ribbar/conrect.cxx b/sw/source/uibase/ribbar/conrect.cxx index 841e9ebb0b19..b042cf46dee7 100644 --- a/sw/source/uibase/ribbar/conrect.cxx +++ b/sw/source/uibase/ribbar/conrect.cxx @@ -41,7 +41,6 @@ ConstRectangle::ConstRectangle( SwWrtShell* pWrtShell, SwEditWin* pEditWin, : SwDrawBase( pWrtShell, pEditWin, pSwView ) , bMarquee(false) , bCapVertical(false) - // #93382# , mbVertical(false) { } diff --git a/sw/source/uibase/uno/SwXDocumentSettings.cxx b/sw/source/uibase/uno/SwXDocumentSettings.cxx index 78ad21e2b3f0..a48e970561ed 100644 --- a/sw/source/uibase/uno/SwXDocumentSettings.cxx +++ b/sw/source/uibase/uno/SwXDocumentSettings.cxx @@ -87,7 +87,7 @@ enum SwDocumentSettingsPropertyHandles HANDLE_IS_LABEL_DOC, HANDLE_IS_ADD_FLY_OFFSET, HANDLE_IS_ADD_EXTERNAL_LEADING, - HANDLE_OLD_NUMBERING, // #111955# + HANDLE_OLD_NUMBERING, HANDLE_OUTLINELEVEL_YIELDS_NUMBERING, /* Stampit It disable the print cancel button of the shown progress dialog. */ HANDLE_ALLOW_PRINTJOB_CANCEL, @@ -111,7 +111,6 @@ enum SwDocumentSettingsPropertyHandles HANDLE_TABS_RELATIVE_TO_INDENT, HANDLE_RSID, HANDLE_RSID_ROOT, - // #i89181# HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, HANDLE_MODIFYPASSWORDINFO, HANDLE_MATH_BASELINE_ALIGNMENT, @@ -161,7 +160,7 @@ static MasterPropertySetInfo * lcl_createSettingsInfo() { OUString("IsLabelDocument"), HANDLE_IS_LABEL_DOC, cppu::UnoType<bool>::get(), 0, 0}, { OUString("AddFrameOffsets"), HANDLE_IS_ADD_FLY_OFFSET, cppu::UnoType<bool>::get(), 0, 0}, { OUString("AddExternalLeading"), HANDLE_IS_ADD_EXTERNAL_LEADING, cppu::UnoType<bool>::get(), 0, 0}, - { OUString("UseOldNumbering"), HANDLE_OLD_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, // #111955# + { OUString("UseOldNumbering"), HANDLE_OLD_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, { OUString("OutlineLevelYieldsNumbering"), HANDLE_OUTLINELEVEL_YIELDS_NUMBERING, cppu::UnoType<bool>::get(), 0, 0}, /* Stampit It disable the print cancel button of the shown progress dialog. */ { OUString("AllowPrintJobCancel"), HANDLE_ALLOW_PRINTJOB_CANCEL, cppu::UnoType<bool>::get(), 0, 0}, @@ -185,7 +184,6 @@ static MasterPropertySetInfo * lcl_createSettingsInfo() { OUString("Rsid"), HANDLE_RSID, cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("RsidRoot"), HANDLE_RSID_ROOT, cppu::UnoType<sal_Int32>::get(), 0, 0}, { OUString("ProtectForm"), HANDLE_PROTECT_FORM, cppu::UnoType<bool>::get(), 0, 0}, - // #i89181# { OUString("TabAtLeftIndentForParagraphsInList"), HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST, cppu::UnoType<bool>::get(), 0, 0}, { OUString("ModifyPasswordInfo"), HANDLE_MODIFYPASSWORDINFO, cppu::UnoType< cppu::UnoSequenceType<css::beans::PropertyValue> >::get(), 0, 0}, { OUString("MathBaselineAlignment"), HANDLE_MATH_BASELINE_ALIGNMENT, cppu::UnoType<bool>::get(), 0, 0}, @@ -561,7 +559,7 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::ADD_EXT_LEADING, bTmp); } break; - case HANDLE_OLD_NUMBERING: // #111955# + case HANDLE_OLD_NUMBERING: { bool bTmp = *static_cast<sal_Bool const *>(rValue.getValue()); mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::OLD_NUMBERING, bTmp); @@ -708,7 +706,6 @@ void SwXDocumentSettings::_setSingleValue( const comphelper::PropertyInfo & rInf mpDoc->getIDocumentSettingAccess().set(DocumentSettingId::PROTECT_FORM, bTmp); } break; - // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { bool bTmp = *static_cast<sal_Bool const *>(rValue.getValue()); @@ -1029,12 +1026,12 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::ADD_EXT_LEADING); } break; - case HANDLE_OLD_NUMBERING: // #111955# + case HANDLE_OLD_NUMBERING: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::OLD_NUMBERING); } break; - case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: // #111955# + case HANDLE_OUTLINELEVEL_YIELDS_NUMBERING: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::OUTLINE_LEVEL_YIELDS_OUTLINE_RULE); } @@ -1144,7 +1141,6 @@ void SwXDocumentSettings::_getSingleValue( const comphelper::PropertyInfo & rInf rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::PROTECT_FORM); } break; - // #i89181# case HANDLE_TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST: { rValue <<= mpDoc->getIDocumentSettingAccess().get(DocumentSettingId::TAB_AT_LEFT_INDENT_FOR_PARA_IN_LIST); diff --git a/sw/source/uibase/wrtsh/delete.cxx b/sw/source/uibase/wrtsh/delete.cxx index 36cde06faa6f..d6dd03a8eb69 100644 --- a/sw/source/uibase/wrtsh/delete.cxx +++ b/sw/source/uibase/wrtsh/delete.cxx @@ -21,7 +21,6 @@ #include <crsskip.hxx> #include <swcrsr.hxx> #include <editeng/lrspitem.hxx> -// #134369# #include <view.hxx> #include <drawbase.hxx> @@ -359,10 +358,8 @@ long SwWrtShell::DelRight() LeaveSelFrmMode(); UnSelectFrm(); - // #134369# OSL_ENSURE( !IsFrmSelected(), "<SwWrtShell::DelRight(..)> - <SwWrtShell::UnSelectFrm()> should unmark all objects" ); - // #134369# // leave draw mode, if necessary. { if (GetView().GetDrawFuncPtr()) @@ -377,7 +374,6 @@ long SwWrtShell::DelRight() } } - // #134369# // <IsFrmSelected()> can't be true - see above. { nSelection = GetSelectionType(); diff --git a/sw/source/uibase/wrtsh/wrtsh1.cxx b/sw/source/uibase/wrtsh/wrtsh1.cxx index c0cc481d6478..719e23730eff 100644 --- a/sw/source/uibase/wrtsh/wrtsh1.cxx +++ b/sw/source/uibase/wrtsh/wrtsh1.cxx @@ -207,7 +207,6 @@ void SwWrtShell::Insert( const OUString &rStr ) // insert is already in parentheses at Editshell. StartAllAction(); - // #111827# SwRewriter aRewriter; aRewriter.AddRule(UndoArg1, GetCrsrDescr()); |