[Libreoffice-commits] .: sd/inc sd/sdi sd/source slideshow/source
Cédric Bosdonnat
cbosdo at kemper.freedesktop.org
Tue Feb 8 10:12:38 PST 2011
sd/inc/drawdoc.hxx | 3
sd/inc/sdpage.hxx | 2
sd/sdi/SlideSorterController.sdi | 1
sd/sdi/_drvwsh.sdi | 1
sd/sdi/outlnvsh.sdi | 1
sd/source/core/drawdoc.cxx | 6 -
sd/source/core/drawdoc3.cxx | 28 +++---
sd/source/core/drawdoc4.cxx | 6 -
sd/source/core/sdpage.cxx | 28 +++---
sd/source/core/stlpool.cxx | 4
sd/source/filter/eppt/eppt.cxx | 2
sd/source/filter/eppt/epptso.cxx | 2
sd/source/filter/html/htmlex.cxx | 2
sd/source/filter/html/pubdlg.cxx | 2
sd/source/filter/ppt/pptin.cxx | 2
sd/source/filter/xml/sdxmlwrp.cxx | 6 -
sd/source/ui/accessibility/AccessibleOutlineView.cxx | 2
sd/source/ui/app/sdmod1.cxx | 6 -
sd/source/ui/app/sdmod2.cxx | 4
sd/source/ui/app/sdpopup.cxx | 4
sd/source/ui/app/tbxww.cxx | 2
sd/source/ui/dlg/animobjs.cxx | 2
sd/source/ui/dlg/dlgassim.cxx | 2
sd/source/ui/dlg/dlgfield.cxx | 4
sd/source/ui/dlg/docprev.cxx | 2
sd/source/ui/dlg/inspagob.cxx | 2
sd/source/ui/dlg/navigatr.cxx | 2
sd/source/ui/dlg/prltempl.cxx | 2
sd/source/ui/dlg/sdpreslt.cxx | 2
sd/source/ui/dlg/sdtreelb.cxx | 4
sd/source/ui/dlg/tpaction.cxx | 4
sd/source/ui/dlg/tpoption.cxx | 5 -
sd/source/ui/docshell/docshel4.cxx | 33 -------
sd/source/ui/docshell/docshell.cxx | 6 -
sd/source/ui/func/fuconarc.cxx | 1
sd/source/ui/func/fuconbez.cxx | 1
sd/source/ui/func/fuconcs.cxx | 4
sd/source/ui/func/fuconrec.cxx | 11 --
sd/source/ui/func/fuconuno.cxx | 1
sd/source/ui/func/fudspord.cxx | 4
sd/source/ui/func/fuinsert.cxx | 2
sd/source/ui/func/fupoor.cxx | 50 +++--------
sd/source/ui/func/fusel.cxx | 7 -
sd/source/ui/func/fusldlg.cxx | 2
sd/source/ui/func/futempl.cxx | 2
sd/source/ui/func/futext.cxx | 7 -
sd/source/ui/func/fuzoom.cxx | 4
sd/source/ui/func/undoback.cxx | 1
sd/source/ui/inc/DrawDocShell.hxx | 2
sd/source/ui/inc/ViewShell.hxx | 2
sd/source/ui/inc/Window.hxx | 3
sd/source/ui/inc/fucon3d.hxx | 2
sd/source/ui/inc/fuconarc.hxx | 1
sd/source/ui/inc/fuconbez.hxx | 1
sd/source/ui/inc/fuconcs.hxx | 1
sd/source/ui/inc/fuconrec.hxx | 1
sd/source/ui/inc/fuconuno.hxx | 1
sd/source/ui/inc/fupoor.hxx | 7 -
sd/source/ui/inc/futext.hxx | 2
sd/source/ui/inc/optsitem.hxx | 6 -
sd/source/ui/inc/unmodpg.hxx | 3
sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx | 6 -
sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx | 1
sd/source/ui/view/ViewShellBase.cxx | 4
sd/source/ui/view/drawview.cxx | 2
sd/source/ui/view/drtxtob.cxx | 11 --
sd/source/ui/view/drtxtob1.cxx | 8 -
sd/source/ui/view/drviews1.cxx | 8 -
sd/source/ui/view/drviews2.cxx | 7 -
sd/source/ui/view/drviews4.cxx | 1
sd/source/ui/view/drviews7.cxx | 17 +--
sd/source/ui/view/drviewsa.cxx | 4
sd/source/ui/view/drviewsc.cxx | 8 -
sd/source/ui/view/drviewse.cxx | 21 +---
sd/source/ui/view/drviewsh.cxx | 4
sd/source/ui/view/drviewsj.cxx | 2
sd/source/ui/view/outlnvsh.cxx | 1
sd/source/ui/view/sdview3.cxx | 30 +++---
sd/source/ui/view/unmodpg.cxx | 6 -
sd/source/ui/view/viewshe3.cxx | 9 -
slideshow/source/engine/shapes/drawinglayeranimation.cxx | 4
slideshow/source/engine/shapes/gdimtftools.cxx | 1
slideshow/source/engine/shapes/shapeimporter.cxx | 2
slideshow/source/engine/shapes/viewshape.cxx | 4
84 files changed, 180 insertions(+), 294 deletions(-)
New commits:
commit f497c0b48bff387538ddd6e3145cef9bd2da70a7
Author: Guillaume Poussel <gpoussel at gmail.com>
Date: Mon Feb 7 22:11:09 2011 +0100
Remove all bogus comments in impress.
diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx
index 7dc1165..83b2786 100644
--- a/sd/inc/drawdoc.hxx
+++ b/sd/inc/drawdoc.hxx
@@ -42,7 +42,6 @@
#include <com/sun/star/lang/Locale.hpp>
#include <com/sun/star/text/WritingMode.hpp>
-// #107844#
#include <svx/svdundo.hxx>
#include <vector>
@@ -196,7 +195,6 @@ private:
CharClass* mpCharClass;
::com::sun::star::lang::Locale* mpLocale;
- // #109538#
::std::auto_ptr<ImpDrawPageListWatcher> mpDrawPageListWatcher;
::std::auto_ptr<ImpMasterPageListWatcher> mpMasterPageListWatcher;
@@ -662,7 +660,6 @@ private:
BOOL bIsPageBack,
BOOL bIsPageObj);
- // #109538#
virtual void PageListChanged();
virtual void MasterPageListChanged();
};
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index 937d966..348cd65 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -218,7 +218,7 @@ public:
virtual SdrObject* NbcRemoveObject(ULONG nObjNum);
virtual SdrObject* RemoveObject(ULONG nObjNum);
- // #95876# Also overload ReplaceObject methods to realize when
+ // Also overload ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
virtual SdrObject* NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
virtual SdrObject* ReplaceObject(SdrObject* pNewObj, ULONG nObjNum);
diff --git a/sd/sdi/SlideSorterController.sdi b/sd/sdi/SlideSorterController.sdi
index 38115b8..00a3f73 100644
--- a/sd/sdi/SlideSorterController.sdi
+++ b/sd/sdi/SlideSorterController.sdi
@@ -283,7 +283,6 @@ interface SlideSorterView
StateMethod = GetCtrlState ;
]
- // #96090#
SID_GETUNDOSTRINGS // ole : no, status : ?
[
ExecMethod = FuSupport ;
diff --git a/sd/sdi/_drvwsh.sdi b/sd/sdi/_drvwsh.sdi
index c57424b..554dd88 100755
--- a/sd/sdi/_drvwsh.sdi
+++ b/sd/sdi/_drvwsh.sdi
@@ -1232,7 +1232,6 @@ interface DrawView
[
ExecMethod = FuPermanent ;
]
- // #98721#
SID_FM_CREATE_FIELDCONTROL
[
SlotType = SfxBoolItem ;
diff --git a/sd/sdi/outlnvsh.sdi b/sd/sdi/outlnvsh.sdi
index e4f3b2a..d2c9239 100755
--- a/sd/sdi/outlnvsh.sdi
+++ b/sd/sdi/outlnvsh.sdi
@@ -484,7 +484,6 @@ interface OutlineView
StateMethod = GetCtrlState ;
]
- // #96090#
SID_GETUNDOSTRINGS // ole : no, status : ?
[
ExecMethod = FuSupport ;
diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx
index 2049d9a..d103422 100644
--- a/sd/source/core/drawdoc.cxx
+++ b/sd/source/core/drawdoc.cxx
@@ -192,7 +192,7 @@ SdDrawDocument::SdDrawDocument(DocumentType eType, SfxObjectShell* pDrDocSh)
SdOptions* pOptions = SD_MOD()->GetSdOptions(meDocType);
pOptions->GetScale( nX, nY );
- // #92067# Allow UI scale only for draw documents.
+ // Allow UI scale only for draw documents.
if( eType == DOCUMENT_TYPE_DRAW )
SetUIUnit( (FieldUnit)pOptions->GetMetric(), Fraction( nX, nY ) ); // user-defined
else
@@ -569,7 +569,7 @@ void SdDrawDocument::SetChanged(sal_Bool bFlag)
void SdDrawDocument::NbcSetChanged(sal_Bool bFlag)
{
- // #100237# forward to baseclass
+ // forward to baseclass
FmFormModel::SetChanged(bFlag);
}
@@ -678,7 +678,7 @@ void SdDrawDocument::NewOrLoadCompleted(DocCreationMode eMode)
SdStyleSheetPool* pSPool = (SdStyleSheetPool*) GetStyleSheetPool();
USHORT nPage, nPageCount;
- // #96323# create missing layout style sheets for broken documents
+ // create missing layout style sheets for broken documents
// that where created with the 5.2
nPageCount = GetMasterSdPageCount( PK_STANDARD );
for (nPage = 0; nPage < nPageCount; nPage++)
diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx
index 6372822..71f7ab6 100644
--- a/sd/source/core/drawdoc3.cxx
+++ b/sd/source/core/drawdoc3.cxx
@@ -277,7 +277,7 @@ void SdDrawDocument::IterateBookmarkPages( SdDrawDocument* pBookmarkDoc, List* p
SdDrawDocument::InsertBookmarkAsPage_PageFunctorBase& rPageIterator )
{
//
- // #96029# Refactored copy'n'pasted layout name collection from InsertBookmarkAsPage
+ // Refactored copy'n'pasted layout name collection from InsertBookmarkAsPage
//
int nPos, nEndPos;
@@ -515,7 +515,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
List* pLayoutsToTransfer = new List;
//
- // #96029# Refactored copy'n'pasted layout name collection into IterateBookmarkPages
+ // Refactored copy'n'pasted layout name collection into IterateBookmarkPages
//
InsertBookmarkAsPage_FindDuplicateLayouts aSearchFunctor( pLayoutsToTransfer, pBookmarkDoc,
pBookmarkList, nBMSdPageCount );
@@ -591,12 +591,12 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
aNameList.Insert(new String(pName), nBMSdPage);
}
- // #95677# Have to check for duplicate names here, too
- // #67905# don't change name if source and dest model are the same!
+ // Have to check for duplicate names here, too
+ // don't change name if source and dest model are the same!
if( pBookmarkDoc != this &&
GetPageByName(pName, bIsMasterPage ) != SDRPAGE_NOTFOUND )
{
- // #95991# delay renaming *after* pages are copied (might destroy source otherwise)
+ // delay renaming *after* pages are copied (might destroy source otherwise)
aRenameSet.insert(nBMSdPage);
}
}
@@ -616,7 +616,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
SdPage* pNotesPage = (SdPage*) GetPage(nActualInsertPos+1);
String* pName = (String*) aNameList.GetObject(nBMSdPage);
- // #95991# delay renaming *after* pages are copied (might destroy source otherwise)
+ // delay renaming *after* pages are copied (might destroy source otherwise)
if( aRenameSet.find(nBMSdPage) != aRenameSet.end() )
{
// Seitenname schon vorhanden -> Defaultname
@@ -678,9 +678,9 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
**************************************************************/
sal_Bool bMustRename = sal_False;
- // #95991# delay renaming *after* pages are copied (might destroy source otherwise)
- // #67905# don't change name if source and dest model are the same!
- // #96029# avoid renaming if replacing the same page
+ // delay renaming *after* pages are copied (might destroy source otherwise)
+ // don't change name if source and dest model are the same!
+ // avoid renaming if replacing the same page
USHORT nPageSameName = GetPageByName(aPgName, bIsMasterPage);
if( pBookmarkDoc != this &&
nPageSameName != SDRPAGE_NOTFOUND &&
@@ -747,7 +747,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
{
if( bPreservePageNames )
{
- // #96029# Take old slide names for inserted pages
+ // Take old slide names for inserted pages
SdPage* pPage = (SdPage*) GetPage(nActualInsertPos);
pPage->SetName( pStandardPage->GetRealName() );
}
@@ -772,7 +772,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
{
if( bPreservePageNames )
{
- // #96029# Take old slide names for inserted pages
+ // Take old slide names for inserted pages
SdPage* pNewNotesPage = (SdPage*) GetPage(nActualInsertPos+1);
if( pNewNotesPage )
pNewNotesPage->SetName( pStandardPage->GetRealName() );
@@ -816,7 +816,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
SdPage* pTest = (SdPage*) GetMasterPage(nTest);
String aTest(pTest->GetLayoutName());
- // #96029# nInsertPos > 2 is always true when inserting into non-empty models
+ // nInsertPos > 2 is always true when inserting into non-empty models
if ( nInsertPos > 2 &&
aTest == aMPLayout &&
eKind == pTest->GetPageKind() )
@@ -834,7 +834,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
}
}
- // #96029# nInsertPos > 2 is always true when inserting into non-empty models
+ // nInsertPos > 2 is always true when inserting into non-empty models
if (nInsertPos > 0)
{
USHORT nSdPageStart = (nInsertPos - 1) / 2;
@@ -944,7 +944,7 @@ BOOL SdDrawDocument::InsertBookmarkAsPage(
}
}
- // #91146# Make absolutely sure no double masterpages are there
+ // Make absolutely sure no double masterpages are there
RemoveUnnecessaryMasterPages(NULL, TRUE, TRUE);
if( bUndo )
diff --git a/sd/source/core/drawdoc4.cxx b/sd/source/core/drawdoc4.cxx
index 35f2b3f..09b6157 100644
--- a/sd/source/core/drawdoc4.cxx
+++ b/sd/source/core/drawdoc4.cxx
@@ -1035,7 +1035,7 @@ IMPL_LINK(SdDrawDocument, OnlineSpellEventHdl, EditStatus*, pEditStat)
|*
\************************************************************************/
-// #91457# removed link and replaced with Imp method
+// removed link and replaced with Imp method
void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject* pObj, SdrOutliner* pOutl)
{
delete mpOnlineSearchItem;
@@ -1044,7 +1044,7 @@ void SdDrawDocument::ImpOnlineSpellCallback(SpellCallbackInfo* pInfo, SdrObject*
USHORT nCommand = pInfo->nCommand;
if (nCommand == SPELLCMD_IGNOREWORD
- // #91457# restart when add to dictionary takes place, too.
+ // restart when add to dictionary takes place, too.
|| nCommand == SPELLCMD_ADDTODICTIONARY)
{
if(pObj && pOutl && pObj->ISA(SdrTextObj))
@@ -1393,7 +1393,7 @@ void SdDrawDocument::getDefaultFonts( Font& rLatinFont, Font& rCJKFont, Font& rC
{
LanguageType eLatin = GetLanguage( EE_CHAR_LANGUAGE );
- // #108374# / #107782#: If the UI language is Korean, the default Latin font has to
+ // If the UI language is Korean, the default Latin font has to
// be queried for Korean, too (the Latin language from the document can't be Korean).
// This is the same logic as in SwDocShell::InitNew.
LanguageType eUiLanguage = Application::GetSettings().GetUILanguage();
diff --git a/sd/source/core/sdpage.cxx b/sd/source/core/sdpage.cxx
index b7b00eb..455229d 100644
--- a/sd/source/core/sdpage.cxx
+++ b/sd/source/core/sdpage.cxx
@@ -414,7 +414,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
if ( pSdrObj->ISA(SdrTextObj) )
{
- // #96243# Tell the object EARLY that it is vertical to have the
+ // Tell the object EARLY that it is vertical to have the
// defaults for AutoGrowWidth/Height reversed
if(bVertical)
((SdrTextObj*)pSdrObj)->SetVerticalWriting(TRUE);
@@ -430,7 +430,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
// Bei Praesentationsobjekten auf der MasterPage soll die
// Groesse vom Benutzwer frei waehlbar sein
- // #96243# potential problem: This action was still NOT
+ // potential problem: This action was still NOT
// adapted for vertical text. This sure needs to be done.
if(bVertical)
aTempAttr.Put(SdrTextAutoGrowWidthItem(FALSE));
@@ -513,7 +513,7 @@ SdrObject* SdPage::CreatePresObj(PresObjKind eObjKind, BOOL bVertical, const Rec
}
// Objekt am StyleSheet anmelden
- // #95114# Set style only when one was found (as in 5.2)
+ // Set style only when one was found (as in 5.2)
if( mePageKind != PK_HANDOUT )
{
SfxStyleSheet* pSheetForPresObj = GetStyleSheetForPresObj(eObjKind);
@@ -1660,7 +1660,7 @@ SdrObject* SdPage::NbcRemoveObject(ULONG nObjNum)
return FmFormPage::NbcRemoveObject(nObjNum);
}
-// #95876# Also overload ReplaceObject methods to realize when
+// Also overload ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
{
@@ -1668,7 +1668,7 @@ SdrObject* SdPage::NbcReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
return FmFormPage::NbcReplaceObject(pNewObj, nObjNum);
}
-// #95876# Also overload ReplaceObject methods to realize when
+// Also overload ReplaceObject methods to realize when
// objects are removed with this mechanism instead of RemoveObject
SdrObject* SdPage::ReplaceObject(SdrObject* pNewObj, ULONG nObjNum)
{
@@ -1858,7 +1858,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
if (pObj)
{
- // #88084# remember aTopLeft as original TopLeft
+ // remember aTopLeft as original TopLeft
Point aTopLeft(pObj->GetCurrentBoundRect().TopLeft());
if (!pObj->IsEdgeObj())
@@ -1868,7 +1868,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
**************************************************************/
if (mbScaleObjects)
{
- // #88084# use aTopLeft as original TopLeft
+ // use aTopLeft as original TopLeft
aRefPnt = aTopLeft;
}
@@ -2011,7 +2011,7 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
else if ( nScriptType == SCRIPTTYPE_COMPLEX )
nWhich = EE_CHAR_FONTHEIGHT_CTL;
- // #88084# use more modern method to scale the text height
+ // use more modern method to scale the text height
sal_uInt32 nFontHeight = ((SvxFontHeightItem&)pObj->GetMergedItem(nWhich)).GetHeight();
sal_uInt32 nNewFontHeight = sal_uInt32((double)nFontHeight * (double)aFractY);
@@ -2027,8 +2027,8 @@ void SdPage::ScaleObjects(const Size& rNewPageSize, const Rectangle& rNewBorderR
**************************************************************/
Point aNewPos;
- // #76447# corrected scaling; only distances may be scaled
- // #88084# use aTopLeft as original TopLeft
+ // corrected scaling; only distances may be scaled
+ // use aTopLeft as original TopLeft
aNewPos.X() = long((aTopLeft.X() - GetLftBorder()) * (double)aFractX) + nLeft;
aNewPos.Y() = long((aTopLeft.Y() - GetUppBorder()) * (double)aFractY) + nUpper;
@@ -2224,7 +2224,7 @@ SdrObject* SdPage::InsertAutoLayoutShape( SdrObject* pObj, PresObjKind eObjKind,
{
pTextObject->SetVerticalWriting( bVertical );
- // #94826# here make sure the correct anchoring is used when the object
+ // here make sure the correct anchoring is used when the object
// is re-used but orientation is changed
if(PRESOBJ_OUTLINE == eObjKind)
pTextObject->SetMergedItem(SdrTextHorzAdjustItem( bVertical ? SDRTEXTHORZADJUST_RIGHT : SDRTEXTHORZADJUST_BLOCK ));
@@ -2378,10 +2378,10 @@ void SdPage::SetObjText(SdrTextObj* pObj, SdrOutliner* pOutliner, PresObjKind eO
pOutl->SetUpdateMode(FALSE);
pOutl->SetParaAttribs( 0, pOutl->GetEmptyItemSet() );
- // #95114# Always set the object's StyleSheet at the Outliner to
+ // Always set the object's StyleSheet at the Outliner to
// use the current objects StyleSheet. Thus it's the same as in
// SetText(...).
- // #95114# Moved this implementation from where SetObjText(...) was called
+ // Moved this implementation from where SetObjText(...) was called
// to inside this method to work even when outliner is fetched here.
pOutl->SetStyleSheet(0, pObj->GetStyleSheet());
@@ -2846,7 +2846,7 @@ bool SdPage::RestoreDefaultText( SdrObject* pObj )
if( pOldPara )
{
- // #94826# Here, only the vertical flag for the
+ // Here, only the vertical flag for the
// OutlinerParaObjects needs to be changed. The
// AutoGrowWidth/Height items still exist in the
// not changed object.
diff --git a/sd/source/core/stlpool.cxx b/sd/source/core/stlpool.cxx
index 5ca163b..0b00871 100644
--- a/sd/source/core/stlpool.cxx
+++ b/sd/source/core/stlpool.cxx
@@ -614,7 +614,7 @@ void SdStyleSheetPool::CopySheets(SdStyleSheetPool& rSourcePool, SfxStyleFamily
xNewSheet->SetMask( xSheet->GetMask() );
- // #91588# Also set parent relation for copied style sheets
+ // Also set parent relation for copied style sheets
String aParent( xSheet->GetParent() );
if( aParent.Len() )
aNewStyles.push_back( std::pair< rtl::Reference< SfxStyleSheetBase >, String >( xNewSheet, aParent ) );
@@ -1017,7 +1017,7 @@ void SdStyleSheetPool::PutNumBulletItem( SfxStyleSheetBase* pSheet,
break;
case HID_PSEUDOSHEET_TITLE:
- /* #84013# title gets same bullet as subtitle and not that page symbol anymore */
+ /* title gets same bullet as subtitle and not that page symbol anymore */
case HID_PSEUDOSHEET_SUBTITLE :
{
// Untertitel-Vorlage
diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx
index 0a44080..9f25d7a 100644
--- a/sd/source/filter/eppt/eppt.cxx
+++ b/sd/source/filter/eppt/eppt.cxx
@@ -1350,7 +1350,7 @@ void PPTWriter::ImplWriteOLE( )
SvMemoryStream aStream;
SvStorageRef xCleanStorage( new SvStorage( FALSE, aStream ) );
xTempStorage->CopyTo( xCleanStorage );
- // SJ: #99809# create a dummy content stream, the dummy content is necessary for ppt, but not for
+ // create a dummy content stream, the dummy content is necessary for ppt, but not for
// doc files, so we can't share code.
SotStorageStreamRef xStm = xCleanStorage->OpenSotStream( aPersistStream, STREAM_STD_READWRITE );
*xStm << (sal_uInt32)0 // no ClipboardId
diff --git a/sd/source/filter/eppt/epptso.cxx b/sd/source/filter/eppt/epptso.cxx
index 874cc84..051cafc 100644
--- a/sd/source/filter/eppt/epptso.cxx
+++ b/sd/source/filter/eppt/epptso.cxx
@@ -1206,7 +1206,7 @@ void PPTWriter::ImplWriteTextStyleAtom( SvStream& rOut, int nTextInstance, sal_u
aFile = aUrl.PathToFileName();
else if ( INET_PROT_SMB == aUrl.GetProtocol() )
{
- // #n382718# (and #n261623#) Convert smb notation to '\\'
+ // Convert smb notation to '\\'
aFile = aUrl.GetMainURL( INetURLObject::NO_DECODE );
aFile = String( aFile.GetBuffer() + 4 ); // skip the 'smb:' part
aFile.SearchAndReplaceAll( '/', '\\' );
diff --git a/sd/source/filter/html/htmlex.cxx b/sd/source/filter/html/htmlex.cxx
index ae86ff4..26ea86a 100644
--- a/sd/source/filter/html/htmlex.cxx
+++ b/sd/source/filter/html/htmlex.cxx
@@ -1880,7 +1880,7 @@ bool HtmlExport::CreateContentPage()
aStr.AppendAscii( "<h2>" );
- // #92564# Solaris compiler bug workaround
+ // Solaris compiler bug workaround
if( mbFrames )
aStr += CreateLink( maFramePage,
RESTOHTML(STR_HTMLEXP_CLICKSTART) );
diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx
index 974069b..d6ec6f6 100644
--- a/sd/source/filter/html/pubdlg.cxx
+++ b/sd/source/filter/html/pubdlg.cxx
@@ -899,7 +899,7 @@ void SdPublishingDlg::GetParameterSequence( Sequence< PropertyValue >& rParams )
aValue.Value <<= OUString( pPage4_Email->GetText() );
aProps.push_back( aValue );
- // #92433# try to guess protocol for user's homepage
+ // try to guess protocol for user's homepage
INetURLObject aHomeURL( pPage4_WWW->GetText(),
INET_PROT_HTTP, // default proto is HTTP
INetURLObject::ENCODE_ALL );
diff --git a/sd/source/filter/ppt/pptin.cxx b/sd/source/filter/ppt/pptin.cxx
index 4dc6097..e2d38b0 100644
--- a/sd/source/filter/ppt/pptin.cxx
+++ b/sd/source/filter/ppt/pptin.cxx
@@ -431,7 +431,7 @@ sal_Bool ImplSdPPTImport::Import()
if ( !aPropItem.Read( pHyperlink->aTarget, VT_EMPTY ) )
break;
- // #n382718# (and #n261623#) Convert '\\' notation to 'smb://'
+ // Convert '\\' notation to 'smb://'
INetURLObject aUrl( pHyperlink->aTarget, INET_PROT_FILE );
pHyperlink->aTarget = aUrl.GetMainURL( INetURLObject::NO_DECODE );
diff --git a/sd/source/filter/xml/sdxmlwrp.cxx b/sd/source/filter/xml/sdxmlwrp.cxx
index e15e525..d488ced 100644
--- a/sd/source/filter/xml/sdxmlwrp.cxx
+++ b/sd/source/filter/xml/sdxmlwrp.cxx
@@ -67,7 +67,7 @@
#include <comphelper/propertysetinfo.hxx>
#include <unotools/saveopt.hxx>
-// #80365# include necessary for XML progress bar at load time
+// include necessary for XML progress bar at load time
#include <svl/itemset.hxx>
#include <svl/stritem.hxx>
#include <svtools/sfxecode.hxx>
@@ -493,7 +493,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
/** property map for export info set */
PropertyMapEntry aImportInfoMap[] =
{
- // #80365# necessary properties for XML progress bar at load time
+ // necessary properties for XML progress bar at load time
{ MAP_LEN( "ProgressRange" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ MAP_LEN( "ProgressMax" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
{ MAP_LEN( "ProgressCurrent" ), 0, &::getCppuType((const sal_Int32*)0), ::com::sun::star::beans::PropertyAttribute::MAYBEVOID, 0},
@@ -550,7 +550,7 @@ sal_Bool SdXMLFilter::Import( ErrCode& nError )
// -------------------------------------
- // #80365# try to get an XStatusIndicator from the Medium
+ // try to get an XStatusIndicator from the Medium
if( mbShowProgress )
{
SfxItemSet* pSet = mrMedium.GetItemSet();
diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
index 6d0c436..46ab61d 100644
--- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx
+++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx
@@ -111,7 +111,7 @@ AccessibleOutlineView::~AccessibleOutlineView (void)
void AccessibleOutlineView::Init (void)
{
- // #105479# Set event source _before_ starting to listen
+ // Set event source _before_ starting to listen
maTextHelper.SetEventSource(this);
AccessibleDocumentViewBase::Init ();
diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 48e5b82..a06eec3 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -220,7 +220,7 @@ void SdModule::Execute(SfxRequest& rReq)
case SID_NEWSD:
{
SfxFrame* pFrame = ExecuteNewDocument( rReq );
- // #94442# if a frame was created, set it as return value
+ // if a frame was created, set it as return value
if(pFrame)
rReq.SetReturnValue(SfxFrameItem(0, pFrame));
}
@@ -739,7 +739,7 @@ SfxFrame* SdModule::ExecuteNewDocument( SfxRequest& rReq )
pDocShell->SetUseUserData(TRUE);
- // #94652# clear UNDO stack after autopilot
+ // clear UNDO stack after autopilot
pDocShell->ClearUndoBuffer();
bMakeLayoutVisible = true;
@@ -1045,7 +1045,7 @@ void OutlineToImpressFinalizer::operator() (bool)
}
- // #97231# Undo-Stack needs to be cleared, else the user may remove the
+ // Undo-Stack needs to be cleared, else the user may remove the
// only drawpage and this is a state we cannot handle ATM.
::sd::DrawDocShell* pDocShell = mrDocument.GetDocSh();
if( pDocShell )
diff --git a/sd/source/ui/app/sdmod2.cxx b/sd/source/ui/app/sdmod2.cxx
index 14cf206..29c9c5e 100644
--- a/sd/source/ui/app/sdmod2.cxx
+++ b/sd/source/ui/app/sdmod2.cxx
@@ -620,7 +620,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
INT32 nY = ( (SfxInt32Item*) pItem )->GetValue();
pOptions->SetScale( nX, nY );
- // #92067# Apply to document only if doc type match
+ // Apply to document only if doc type match
if( pDocSh && pDoc && eDocType == pDoc->GetDocumentType() )
{
pDoc->SetUIScale( Fraction( nX, nY ) );
@@ -745,7 +745,7 @@ void SdModule::ApplyItemSet( USHORT nSlot, const SfxItemSet& rSet )
if (pViewShell)
{
- // #74495# make sure no one is in text edit mode, cause there
+ // make sure no one is in text edit mode, cause there
// are some pointers remembered else (!)
if(pViewShell->GetView())
pViewShell->GetView()->SdrEndTextEdit();
diff --git a/sd/source/ui/app/sdpopup.cxx b/sd/source/ui/app/sdpopup.cxx
index 73e578c..7a17495 100644
--- a/sd/source/ui/app/sdpopup.cxx
+++ b/sd/source/ui/app/sdpopup.cxx
@@ -297,7 +297,7 @@ SvxFieldData* SdFieldPopup::GetField()
if( pDocSh->HasName() )
aName = pDocSh->GetMedium()->GetName();
- // #91225# Get current filename, not the one stored in the old field
+ // Get current filename, not the one stored in the old field
pNewField = new SvxExtFileField( aName );
( (SvxExtFileField*) pNewField )->SetType( eType );
( (SvxExtFileField*) pNewField )->SetFormat( eFormat );
@@ -326,7 +326,7 @@ SvxFieldData* SdFieldPopup::GetField()
if( pAuthorField->GetFormat() != eFormat ||
pAuthorField->GetType() != eType )
{
- // #91225# Get current state of address, not the old one
+ // Get current state of address, not the old one
SvtUserOptions aUserOptions;
pNewField = new SvxAuthorField( aUserOptions.GetFirstName(), aUserOptions.GetLastName(), aUserOptions.GetID() );
( (SvxAuthorField*) pNewField )->SetType( eType );
diff --git a/sd/source/ui/app/tbxww.cxx b/sd/source/ui/app/tbxww.cxx
index ee3cd31..a32f290 100644
--- a/sd/source/ui/app/tbxww.cxx
+++ b/sd/source/ui/app/tbxww.cxx
@@ -155,7 +155,7 @@ void SdTbxControl::StateChanged( USHORT nSId,
{
TbxImageItem* pItem = PTR_CAST( TbxImageItem, pState );
// Im StarDesktop kann jetzt auch ein anderes Item ankommen,
- // das nicht ausgewertet werden darf (#33802# und #33838#)
+ // das nicht ausgewertet werden darf
if( pItem )
{
ToolBox& rTbx = GetToolBox();
diff --git a/sd/source/ui/dlg/animobjs.cxx b/sd/source/ui/dlg/animobjs.cxx
index aaa5b36..472dba1 100644
--- a/sd/source/ui/dlg/animobjs.cxx
+++ b/sd/source/ui/dlg/animobjs.cxx
@@ -595,7 +595,7 @@ void AnimationWindow::UpdateControl( ULONG nListPos, BOOL bDisableCtrls )
? ViewShell::OUTPUT_DRAWMODE_CONTRAST
: ViewShell::OUTPUT_DRAWMODE_COLOR );
aVD.Erase();
- pObject->SingleObjectPainter( aVD ); // #110094#-17
+ pObject->SingleObjectPainter( aVD );
aBmp = BitmapEx( aVD.GetBitmap( aObjRect.TopLeft(), aObjSize ) );
}
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 553ee56..ffdd68e 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -52,7 +52,7 @@ SdPageListControl::SdPageListControl(
// Tree-ListBox mit Linien versehen
SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES |
WB_HASBUTTONS | WB_HASLINESATROOT |
- WB_HSCROLL | // #31562#
+ WB_HSCROLL |
WB_HASBUTTONSATROOT ) );
SetNodeDefaultImages ();
diff --git a/sd/source/ui/dlg/dlgfield.cxx b/sd/source/ui/dlg/dlgfield.cxx
index 8aa0047..a29e96f 100644
--- a/sd/source/ui/dlg/dlgfield.cxx
+++ b/sd/source/ui/dlg/dlgfield.cxx
@@ -155,7 +155,7 @@ SvxFieldData* SdModifyFieldDlg::GetField()
if( pDocSh->HasName() )
aName = pDocSh->GetMedium()->GetName();
- // #91225# Get current filename, not the one stored in the old field
+ // Get current filename, not the one stored in the old field
pNewField = new SvxExtFileField( aName );
( (SvxExtFileField*) pNewField )->SetType( eType );
( (SvxExtFileField*) pNewField )->SetFormat( eFormat );
@@ -173,7 +173,7 @@ SvxFieldData* SdModifyFieldDlg::GetField()
eFormat = (SvxAuthorFormat) ( aLbFormat.GetSelectEntryPos() );
- // #91225# Get current state of address, not the old one
+ // Get current state of address, not the old one
SvtUserOptions aUserOptions;
pNewField = new SvxAuthorField( aUserOptions.GetFirstName(), aUserOptions.GetLastName(), aUserOptions.GetID() );
( (SvxAuthorField*) pNewField )->SetType( eType );
diff --git a/sd/source/ui/dlg/docprev.cxx b/sd/source/ui/dlg/docprev.cxx
index 317b6a2..f1b086a 100644
--- a/sd/source/ui/dlg/docprev.cxx
+++ b/sd/source/ui/dlg/docprev.cxx
@@ -238,7 +238,7 @@ void SdDocPreviewWin::updateViewSettings()
aVDev.SetMapMode( aMap );
- // #109058# Disable output, as we only want to record a metafile
+ // Disable output, as we only want to record a metafile
aVDev.EnableOutput( FALSE );
pMtf->Record( &aVDev );
diff --git a/sd/source/ui/dlg/inspagob.cxx b/sd/source/ui/dlg/inspagob.cxx
index 58d3c56..8c03da2 100644
--- a/sd/source/ui/dlg/inspagob.cxx
+++ b/sd/source/ui/dlg/inspagob.cxx
@@ -139,7 +139,7 @@ List* SdInsertPagesObjsDlg::GetList( USHORT nType )
// wird das gesamte Dokument (und nicht mehr!) eingefuegt.
if( aLbTree.GetSelectionCount() == 0 ||
( aLbTree.IsSelected( aLbTree.First() ) ) )
- return( NULL ); // #37350#
+ return( NULL );
}
return( aLbTree.GetSelectEntryList( nType ) );
}
diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
index b3e97fd..7425dd7 100644
--- a/sd/source/ui/dlg/navigatr.cxx
+++ b/sd/source/ui/dlg/navigatr.cxx
@@ -386,7 +386,7 @@ IMPL_LINK( SdNavigatorWin, ClickObjectHdl, void *, EMPTYARG )
mpBindings->GetDispatcher()->Execute(
SID_NAVIGATOR_OBJECT, SFX_CALLMODE_SLOT | SFX_CALLMODE_RECORD, &aItem, 0L );
- // #98821# moved here from SetGetFocusHdl. Reset the
+ // moved here from SetGetFocusHdl. Reset the
// focus only if something has been selected in the
// document.
SfxViewShell* pCurSh = SfxViewShell::Current();
diff --git a/sd/source/ui/dlg/prltempl.cxx b/sd/source/ui/dlg/prltempl.cxx
index bb9b47a..3f92b1c 100644
--- a/sd/source/ui/dlg/prltempl.cxx
+++ b/sd/source/ui/dlg/prltempl.cxx
@@ -181,7 +181,7 @@ SdPresLayoutTemplateDlg::SdPresLayoutTemplateDlg( SfxObjectShell* pDocSh,
break;
}
- // #112490# the tabpages Alignment, Tabs and Asian Typography are very
+ // the tabpages Alignment, Tabs and Asian Typography are very
// usefull, except for the background style
if( DlgId.GetId() != TAB_PRES_LAYOUT_TEMPLATE_BACKGROUND )
{
diff --git a/sd/source/ui/dlg/sdpreslt.cxx b/sd/source/ui/dlg/sdpreslt.cxx
index db829c5..96e40db 100644
--- a/sd/source/ui/dlg/sdpreslt.cxx
+++ b/sd/source/ui/dlg/sdpreslt.cxx
@@ -245,7 +245,7 @@ IMPL_LINK(SdPresLayoutDlg, ClickLoadHdl, void *, EMPTYARG)
}
USHORT nResult = pDlg->Execute();
- // #96072# OJ: Inserted update to force repaint
+ // Inserted update to force repaint
Update();
String aFile;
diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx
index eaa105c..3268edd 100644
--- a/sd/source/ui/dlg/sdtreelb.cxx
+++ b/sd/source/ui/dlg/sdtreelb.cxx
@@ -249,7 +249,7 @@ SdPageObjsTLB::SdPageObjsTLB( Window* pParentWin, const SdResId& rSdResId )
// Tree-ListBox mit Linien versehen
SetWindowBits( WinBits( WB_TABSTOP | WB_BORDER | WB_HASLINES |
WB_HASBUTTONS | // WB_HASLINESATROOT |
- WB_HSCROLL | // #31562#
+ WB_HSCROLL |
WB_HASBUTTONSATROOT ) );
SetNodeBitmaps( Bitmap( SdResId( BMP_EXPAND ) ),
Bitmap( SdResId( BMP_COLLAPSE ) ) );
@@ -995,7 +995,7 @@ void SdPageObjsTLB::DoDrag()
sal_Int8 nDNDActions = DND_ACTION_COPYMOVE;
if( eDragType == NAVIGATOR_DRAGTYPE_LINK )
- nDNDActions = DND_ACTION_LINK; // #93240# Either COPY *or* LINK, never both!
+ nDNDActions = DND_ACTION_LINK; // Either COPY *or* LINK, never both!
SvTreeListBox::ReleaseMouse();
diff --git a/sd/source/ui/dlg/tpaction.cxx b/sd/source/ui/dlg/tpaction.cxx
index 9aba5fe..0d9f3b4 100644
--- a/sd/source/ui/dlg/tpaction.cxx
+++ b/sd/source/ui/dlg/tpaction.cxx
@@ -483,8 +483,8 @@ void SdTPAction::OpenFileDialog()
aFileDialog.SetDisplayDirectory( aFile );
- // The following is a fix for #1008001# and a workarround for
- // #i4306#: The addition of the implicitely existing "all files"
+ // The following is a workarround for #i4306#:
+ // The addition of the implicitely existing "all files"
// filter makes the (Windows system) open file dialog follow
// links on the desktop to directories.
aFileDialog.AddFilter (
diff --git a/sd/source/ui/dlg/tpoption.cxx b/sd/source/ui/dlg/tpoption.cxx
index 71044c3..4597ccd 100644
--- a/sd/source/ui/dlg/tpoption.cxx
+++ b/sd/source/ui/dlg/tpoption.cxx
@@ -550,7 +550,6 @@ void SdTpOptionsMisc::Reset( const SfxItemSet& rAttrs )
aCbScale.SetText( GetScale( nX, nY ) );
- // #92067# broken feature disabled for 6.0
aFtOriginal.Hide();
aFtEquivalent.Hide();
aMtrFldOriginalWidth.Hide();
@@ -725,7 +724,7 @@ IMPL_LINK( SdTpOptionsMisc, ModifyOriginalScaleHdl, void *, EMPTYARG )
aFract = Fraction( aFract1.GetDenominator(), aFract1.GetNumerator() );
nValue = aFract;
- // #92067# Swap nominator and denominator
+ // Swap nominator and denominator
aCbScale.SetText( GetScale( nValue, 1 ) );
}
else
@@ -735,7 +734,7 @@ IMPL_LINK( SdTpOptionsMisc, ModifyOriginalScaleHdl, void *, EMPTYARG )
if( fValue > (double)nValue )
nValue++;
- // #92067# Swap nominator and denominator
+ // Swap nominator and denominator
aCbScale.SetText( GetScale( 1, nValue ) );
}
return( 0L );
diff --git a/sd/source/ui/docshell/docshel4.cxx b/sd/source/ui/docshell/docshel4.cxx
index 3635ea9..33c06c4 100644
--- a/sd/source/ui/docshell/docshel4.cxx
+++ b/sd/source/ui/docshell/docshel4.cxx
@@ -325,7 +325,7 @@ BOOL DrawDocShell::Load( SfxMedium& rMedium )
{
UpdateTablePointers();
- // #108451# If we're an embedded OLE object, use tight bounds
+ // If we're an embedded OLE object, use tight bounds
// for our visArea. No point in showing the user lots of empty
// space. Had to remove the check for empty VisArea below,
// since XML load always sets a VisArea before.
@@ -381,31 +381,6 @@ BOOL DrawDocShell::LoadFrom( SfxMedium& rMedium )
BOOL bRet = FALSE;
- /*
- // #90691# return to old behaviour (before #80365#): construct own medium
- SfxMedium aMedium(xStorage);
-
- // #90691# for having a progress bar nonetheless for XML copy it
- // from the local DocShell medium (GetMedium()) to the constructed one
- SfxMedium* pLocalMedium = GetMedium();
- if(pLocalMedium)
- {
- SfxItemSet* pLocalItemSet = pLocalMedium->GetItemSet();
- SfxItemSet* pDestItemSet = aMedium.GetItemSet();
-
- if(pLocalItemSet && pDestItemSet)
- {
- const SfxUnoAnyItem* pItem = static_cast<
- const SfxUnoAnyItem*>(
- pLocalItemSet->GetItem(SID_PROGRESS_STATUSBAR_CONTROL));
-
- if(pItem)
- {
- pDestItemSet->Put(*pItem);
- }
- }
- } */
-
mpDoc->NewOrLoadCompleted( NEW_DOC );
mpDoc->CreateFirstPages();
mpDoc->StopWorkStartupDelay();
@@ -571,7 +546,7 @@ BOOL DrawDocShell::Save()
if( bRet )
{
- // #86834# Call UpdateDocInfoForSave() before export
+ // Call UpdateDocInfoForSave() before export
UpdateDocInfoForSave();
bRet = SdXMLFilter( *GetMedium(), *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( GetMedium()->GetStorage() ) ).Export();
@@ -599,7 +574,7 @@ BOOL DrawDocShell::SaveAs( SfxMedium& rMedium )
if( bRet )
{
- // #86834# Call UpdateDocInfoForSave() before export
+ // Call UpdateDocInfoForSave() before export
UpdateDocInfoForSave();
bRet = SdXMLFilter( rMedium, *this, sal_True, SDXMLMODE_Normal, SotStorage::GetVersion( rMedium.GetStorage() ) ).Export();
}
@@ -882,7 +857,7 @@ BOOL DrawDocShell::GotoBookmark(const String& rBookmark)
// Make the bookmarked page the current page. This is done
// by using the API because this takes care of all the
// little things to be done. Especially writing the view
- // data to the frame view (see bug #107803#).
+ // data to the frame view.
USHORT nSdPgNum = (nPageNumber - 1) / 2;
Reference<drawing::XDrawView> xController (rBase.GetController(), UNO_QUERY);
if (xController.is())
diff --git a/sd/source/ui/docshell/docshell.cxx b/sd/source/ui/docshell/docshell.cxx
index 9d6ea7d..3c40042 100644
--- a/sd/source/ui/docshell/docshell.cxx
+++ b/sd/source/ui/docshell/docshell.cxx
@@ -522,8 +522,8 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ )
{
SfxObjectShell::SetModified( bSet );
- // #100237# change model state, too
- // #103182# only set the changed state if modification is enabled
+ // change model state, too
+ // only set the changed state if modification is enabled
if( IsEnableSetModified() )
{
if ( mpDoc )
@@ -539,7 +539,7 @@ void DrawDocShell::SetModified( BOOL bSet /* = TRUE */ )
|*
\************************************************************************/
-// #91457# ExecuteSpellPopup now handled by DrawDocShell. This is necessary
+// ExecuteSpellPopup now handled by DrawDocShell. This is necessary
// to get hands on the outliner and the text object.
IMPL_LINK(DrawDocShell, OnlineSpellCallback, SpellCallbackInfo*, pInfo)
{
diff --git a/sd/source/ui/func/fuconarc.cxx b/sd/source/ui/func/fuconarc.cxx
index afa0a29..bf4c8d6 100644
--- a/sd/source/ui/func/fuconarc.cxx
+++ b/sd/source/ui/func/fuconarc.cxx
@@ -52,7 +52,6 @@
#include "ViewShellBase.hxx"
#include "ToolBarManager.hxx"
-// #97016#
#include <svx/sxciaitm.hxx>
namespace sd {
diff --git a/sd/source/ui/func/fuconbez.cxx b/sd/source/ui/func/fuconbez.cxx
index 1aacd9c..a8f6ae4 100644
--- a/sd/source/ui/func/fuconbez.cxx
+++ b/sd/source/ui/func/fuconbez.cxx
@@ -384,7 +384,6 @@ void FuConstructBezierPolygon::SetEditMode(USHORT nMode)
rBindings.Invalidate(SID_BEZIER_INSERT);
}
-// #97016#
SdrObject* FuConstructBezierPolygon::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle)
{
// case SID_DRAW_POLYGON:
diff --git a/sd/source/ui/func/fuconcs.cxx b/sd/source/ui/func/fuconcs.cxx
index d0b5ef7..c36e163 100644
--- a/sd/source/ui/func/fuconcs.cxx
+++ b/sd/source/ui/func/fuconcs.cxx
@@ -60,15 +60,12 @@
#include <svx/svdoashp.hxx>
#include <svx/sdtagitm.hxx>
-// #88751#
#include <svx/svdocapt.hxx>
-// #97016#
#include <svx/svdomeas.hxx>
#include "ViewShell.hxx"
#include "ViewShellBase.hxx"
#include "ToolBarManager.hxx"
-// #109583#
#include <editeng/writingmodeitem.hxx>
#include <svx/gallery.hxx>
#include <svl/itempool.hxx>
@@ -315,7 +312,6 @@ void FuConstructCustomShape::SetAttributes( SdrObject* pObj )
}
}
-// #97016#
SdrObject* FuConstructCustomShape::CreateDefaultObject(const sal_uInt16, const Rectangle& rRectangle)
{
SdrObject* pObj = SdrObjFactory::MakeNewObject(
diff --git a/sd/source/ui/func/fuconrec.cxx b/sd/source/ui/func/fuconrec.cxx
index 8a5b82a..19417ac 100644
--- a/sd/source/ui/func/fuconrec.cxx
+++ b/sd/source/ui/func/fuconrec.cxx
@@ -56,15 +56,12 @@
#include <editeng/adjitem.hxx>
#include <svx/xtable.hxx>
-// #88751#
#include <svx/svdocapt.hxx>
-// #97016#
#include <svx/svdomeas.hxx>
#include "ViewShell.hxx"
#include "ViewShellBase.hxx"
#include "ToolBarManager.hxx"
-// #109583#
#include <editeng/writingmodeitem.hxx>
#include <basegfx/polygon/b2dpolygontools.hxx>
#include <basegfx/polygon/b2dpolygon.hxx>
@@ -278,7 +275,7 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
pObj->SetLayer(rAdmin.GetLayerID(aStr, FALSE));
}
- // #88751# init text position when vertica caption object is created
+ // init text position when vertica caption object is created
if(pObj->ISA(SdrCaptionObj) && SID_DRAW_CAPTION_VERTICAL == nSlotId)
{
// draw text object, needs to be initialized when vertical text is used
@@ -287,7 +284,6 @@ BOOL FuConstructRectangle::MouseButtonUp(const MouseEvent& rMEvt)
aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_CENTER));
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
- // #109583#
// Correct the value of SDRATTR_TEXTDIRECTION to avoid SetItemSet
// calling SetVerticalWriting() again since this item may not yet
// be set at the object and thus may differ from verical state of
@@ -548,7 +544,7 @@ void FuConstructRectangle::SetAttributes(SfxItemSet& rAttr, SdrObject* pObj)
rAttr.Put( SdrTextAutoGrowHeightItem( TRUE ) );
rAttr.Put( SdrTextAutoGrowWidthItem( TRUE ) );
- // #103516# Support full with for vertical caption objects, too
+ // Support full with for vertical caption objects, too
if(SID_DRAW_CAPTION == nSlotId)
rAttr.Put( SdrTextHorzAdjustItem( SDRTEXTHORZADJUST_BLOCK ) );
else
@@ -805,7 +801,6 @@ void FuConstructRectangle::SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj)
}
}
-// #97016#
SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle)
{
DBG_ASSERT( (nID != SID_DRAW_FONTWORK) && (nID != SID_DRAW_FONTWORK_VERTICAL ), "FuConstRectangle::CreateDefaultObject can not create Fontwork shapes!" );
@@ -988,7 +983,7 @@ SdrObject* FuConstructRectangle::CreateDefaultObject(const sal_uInt16 nID, const
pObj->SetMergedItemSet(aSet);
}
- // For task #105815# the default text is not inserted anymore.
+ // The default text is not inserted anymore.
// String aText(SdResId(STR_POOLSHEET_TEXT));
// ((SdrCaptionObj*)pObj)->SetText(aText);
diff --git a/sd/source/ui/func/fuconuno.cxx b/sd/source/ui/func/fuconuno.cxx
index 00474a0..4a43c96 100644
--- a/sd/source/ui/func/fuconuno.cxx
+++ b/sd/source/ui/func/fuconuno.cxx
@@ -200,7 +200,6 @@ void FuConstructUnoControl::Deactivate()
mpWindow->SetPointer( aOldPointer );
}
-// #97016#
SdrObject* FuConstructUnoControl::CreateDefaultObject(const sal_uInt16, const Rectangle& rRectangle)
{
// case SID_FM_CREATE_CONTROL:
diff --git a/sd/source/ui/func/fudspord.cxx b/sd/source/ui/func/fudspord.cxx
index e7665a8..ea1bdcd 100644
--- a/sd/source/ui/func/fudspord.cxx
+++ b/sd/source/ui/func/fudspord.cxx
@@ -94,7 +94,7 @@ FunctionReference FuDisplayOrder::Create( ViewShell* pViewSh, ::sd::Window* pWin
BOOL FuDisplayOrder::MouseButtonDown(const MouseEvent& rMEvt)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
return TRUE;
@@ -143,7 +143,7 @@ BOOL FuDisplayOrder::MouseMove(const MouseEvent& rMEvt)
BOOL FuDisplayOrder::MouseButtonUp(const MouseEvent& rMEvt)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
SdrPageView* pPV = NULL;
diff --git a/sd/source/ui/func/fuinsert.cxx b/sd/source/ui/func/fuinsert.cxx
index 2756579..2deabd7 100644
--- a/sd/source/ui/func/fuinsert.cxx
+++ b/sd/source/ui/func/fuinsert.cxx
@@ -639,7 +639,7 @@ void FuInsertOLE::DoExecute( SfxRequest& rReq )
if( mpView->InsertObjectAtView(pObj, *pPV, SDRINSERT_SETDEFLAYER) )
{
- // #73279# Math objects change their object size during InsertObject.
+ // Math objects change their object size during InsertObject.
// New size must be set in SdrObject, or a wrong scale will be set at
// ActivateObject.
diff --git a/sd/source/ui/func/fupoor.cxx b/sd/source/ui/func/fupoor.cxx
index 514c369..2f15f3e 100644
--- a/sd/source/ui/func/fupoor.cxx
+++ b/sd/source/ui/func/fupoor.cxx
@@ -64,10 +64,8 @@
#include <sfx2/viewfrm.hxx>
-// #97016# IV
#include <svx/svditer.hxx>
-// #98533#
#include <editeng/editeng.hxx>
using namespace ::com::sun::star;
@@ -102,7 +100,7 @@ FuPoor::FuPoor (
bScrollable (FALSE),
bDelayActive (FALSE),
bFirstMouseMove (FALSE),
- // #95491# remember MouseButton state
+ // remember MouseButton state
mnCode(0)
{
ReceiveRequest(rReq);
@@ -234,7 +232,7 @@ IMPL_LINK_INLINE_START( FuPoor, ScrollHdl, Timer *, EMPTYARG )
{
Point aPnt(mpWindow->GetPointerPosPixel());
- // #95491# use remembered MouseButton state to create correct
+ // use remembered MouseButton state to create correct
// MouseEvents for this artifical MouseMove.
MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode()));
@@ -259,7 +257,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
switch (nCode)
{
- // #97016# IV
case KEY_RETURN:
{
if(rKEvt.GetKeyCode().IsMod1())
@@ -314,8 +311,8 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
else
{
- // #98255# activate OLE object on RETURN for selected object
- // #98198# activate text edit on RETURN for selected object
+ // activate OLE object on RETURN for selected object
+ // activate text edit on RETURN for selected object
const SdrMarkList& rMarkList = mpView->GetMarkedObjectList();
if( !mpView->IsTextEdit() && 1 == rMarkList.GetMarkCount() )
@@ -343,13 +340,12 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
break;
- // #97016# II
case KEY_TAB:
{
- // #98994# handle Mod1 and Mod2 to get travelling running on different systems
+ // handle Mod1 and Mod2 to get travelling running on different systems
if(rKEvt.GetKeyCode().IsMod1() || rKEvt.GetKeyCode().IsMod2())
{
- // #97016# II do something with a selected handle?
+ // do something with a selected handle?
const SdrHdlList& rHdlList = mpView->GetHdlList();
sal_Bool bForward(!rKEvt.GetKeyCode().IsShift());
@@ -583,7 +579,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
break;
- // #97016# II change select state when focus is on poly point
+ // change select state when focus is on poly point
case KEY_SPACE:
{
const SdrHdlList& rHdlList = mpView->GetHdlList();
@@ -682,11 +678,9 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
if (mpView->AreObjectsMarked() && !rKEvt.GetKeyCode().IsMod1() &&
!mpDocSh->IsReadOnly())
{
- // #97016# II
const SdrHdlList& rHdlList = mpView->GetHdlList();
SdrHdl* pHdl = rHdlList.GetFocusHdl();
- // #109007#
sal_Bool bIsMoveOfConnectedHandle(sal_False);
sal_Bool bOldSuppress = false;
SdrEdgeObj* pEdgeObj = 0L;
@@ -711,7 +705,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
}
- // #109007#
if(pEdgeObj)
{
// Suppress default connects to inside object and object center
@@ -719,7 +712,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
pEdgeObj->SetSuppressDefaultConnect(sal_True);
}
- // #109007#
if(bIsMoveOfConnectedHandle)
{
sal_uInt16 nMarkHdSiz(mpView->GetMarkHdlSizePixel());
@@ -738,7 +730,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
else if(rKEvt.GetKeyCode().IsMod2())
{
- // #97016# move in 1 pixel distance
+ // move in 1 pixel distance
Size aLogicSizeOnePixel = (mpWindow) ? mpWindow->PixelToLogic(Size(1,1)) : Size(100, 100);
nX *= aLogicSizeOnePixel.Width();
nY *= aLogicSizeOnePixel.Height();
@@ -757,10 +749,10 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
if(0L == pHdl)
{
- // #67368# only take action when move is allowed
+ // only take action when move is allowed
if(mpView->IsMoveAllowed())
{
- // #90129# restrict movement to WorkArea
+ // restrict movement to WorkArea
const Rectangle& rWorkArea = mpView->GetWorkArea();
if(!rWorkArea.IsEmpty())
@@ -797,7 +789,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
{
mpView->MoveAllMarked(Size(nX, nY));
- // #97016# II
mpView->MakeVisible(mpView->GetAllMarkedRect(), *mpWindow);
}
}
@@ -842,7 +833,6 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
}
- // #109007#
if(pEdgeObj)
{
// Restore original suppress value
@@ -868,7 +858,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
mpWindow->ReleaseMouse();
}
- // #98198# when a text-editable object is selected and the
+ // when a text-editable object is selected and the
// input character is printable, activate text edit on that object
// and feed character to object
if(!bReturn && !mpDocSh->IsReadOnly())
@@ -883,8 +873,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
if(pObj->ISA(SdrTextObj) && pObj->HasTextEdit() && !pObj->ISA(SdrOle2Obj))
{
- // #98533# use common IsSimpleCharInput from
- // the EditEngine.
+ // use common IsSimpleCharInput from the EditEngine.
sal_Bool bPrintable(EditEngine::IsSimpleCharInput(rKEvt));
if(bPrintable)
@@ -905,7 +894,7 @@ BOOL FuPoor::KeyInput(const KeyEvent& rKEvt)
}
else
{
- // #99039# test if there is a title object there. If yes, try to
+ // test if there is a title object there. If yes, try to
// set it to edit mode and start typing...
if(mpViewShell->ISA(DrawViewShell)
&& EditEngine::IsSimpleCharInput(rKEvt))
@@ -965,7 +954,6 @@ BOOL FuPoor::MouseMove(const MouseEvent& )
return FALSE;
}
-// #97016# II
void FuPoor::SelectionHasChanged()
{
const SdrHdlList& rHdlList = mpView->GetHdlList();
@@ -1062,7 +1050,7 @@ IMPL_LINK_INLINE_START( FuPoor, DelayHdl, Timer *, EMPTYARG )
Point aPnt(mpWindow->GetPointerPosPixel());
- // #95491# use remembered MouseButton state to create correct
+ // use remembered MouseButton state to create correct
// MouseEvents for this artifical MouseMove.
MouseMove(MouseEvent(aPnt, 1, 0, GetMouseButtonCode()));
@@ -1078,7 +1066,7 @@ IMPL_LINK_INLINE_END( FuPoor, DelayHdl, Timer *, pTimer )
BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
aDelayToScrollTimer.Stop ();
@@ -1088,7 +1076,7 @@ BOOL FuPoor::MouseButtonUp (const MouseEvent& rMEvt)
BOOL FuPoor::MouseButtonDown(const MouseEvent& rMEvt)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
return FALSE;
@@ -1159,12 +1147,6 @@ void FuPoor::ReceiveRequest(SfxRequest& rReq)
}
}
-/*************************************************************************
-|*
-|* #97016#
-|*
-\************************************************************************/
-
SdrObject* FuPoor::CreateDefaultObject(const sal_uInt16, const Rectangle& )
{
// empty base implementation
diff --git a/sd/source/ui/func/fusel.cxx b/sd/source/ui/func/fusel.cxx
index 240d963..6d4e43f 100644
--- a/sd/source/ui/func/fusel.cxx
+++ b/sd/source/ui/func/fusel.cxx
@@ -80,7 +80,6 @@
#include "slideshow.hxx"
-// #108981#
#include <svx/svdundo.hxx>
#include <avmedia/mediawindow.hxx>
@@ -515,7 +514,7 @@ BOOL FuSelection::MouseButtonDown(const MouseEvent& rMEvt)
}
else
{
- // #90239# point IS marked and NO shift is pressed. Start
+ // point IS marked and NO shift is pressed. Start
// dragging of selected point(s)
pHdl = mpView->PickHandle(aMDPos);
if(pHdl)
@@ -793,7 +792,6 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
pPool->GetActualStyleSheet());
if (pStyleSheet != NULL && mpView->IsUndoEnabled() )
{
- // #108981#
// Added UNDOs for the WaterCan mode. This was never done in
// the past, thus it was missing all the time.
SdrUndoAction* pUndoAttr = mpDoc->GetSdrUndoFactory().CreateUndoAttrObject(*pWaterCanCandidate, sal_True, sal_True);
@@ -803,7 +801,6 @@ BOOL FuSelection::MouseButtonUp(const MouseEvent& rMEvt)
pWaterCanCandidate->SetStyleSheet (pStyleSheet, FALSE);
- // #108981#
mpView->EndUndo();
}
}
@@ -975,7 +972,7 @@ void FuSelection::Activate()
{
case SID_OBJECT_ROTATE:
{
- // (gemapter) Slot wird explizit auf Rotate gesetzt #31052#
+ // (gemapter) Slot wird explizit auf Rotate gesetzt
if( mpViewShell->ISA(DrawViewShell) )
{
USHORT* pSlotArray =
diff --git a/sd/source/ui/func/fusldlg.cxx b/sd/source/ui/func/fusldlg.cxx
index 4223ac1..2e0a602 100644
--- a/sd/source/ui/func/fusldlg.cxx
+++ b/sd/source/ui/func/fusldlg.cxx
@@ -110,7 +110,7 @@ void FuSlideShowDlg::DoExecute( SfxRequest& )
List* pCustomShowList = mpDoc->GetCustomShowList(); // No Create
BOOL bStartWithActualPage = SD_MOD()->GetSdOptions( mpDoc->GetDocumentType() )->IsStartWithActualPage();
-/* #109180# change in behaviour, even when always start with current page is enabled, range settings are
+/* change in behaviour, even when always start with current page is enabled, range settings are
still used
if( bStartWithActualPage )
{
diff --git a/sd/source/ui/func/futempl.cxx b/sd/source/ui/func/futempl.cxx
index e9c28ba..a2bbf2a 100644
--- a/sd/source/ui/func/futempl.cxx
+++ b/sd/source/ui/func/futempl.cxx
@@ -263,7 +263,7 @@ void FuTemplate::DoExecute( SfxRequest& rReq )
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_STYLE_FAMILY2 );
}
}
-/* #96983# GrabFocus moved to stylist
+/* GrabFocus moved to stylist
pWin->GrabFocus();
*/
break;
diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx
index 4304b1d..697c724 100644
--- a/sd/source/ui/func/futext.cxx
+++ b/sd/source/ui/func/futext.cxx
@@ -57,7 +57,6 @@
#include <editeng/outlobj.hxx>
#include <svtools/langtab.hxx>
-// #104122#
#include <editeng/frmdiritem.hxx>
#include <svx/svdetc.hxx>
@@ -564,7 +563,7 @@ void FuText::ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj)
// Set defaults for vertical klick-n'drag text object, pool defaults are:
// SdrTextVertAdjustItem: SDRTEXTVERTADJUST_TOP
// SdrTextHorzAdjustItem: SDRTEXTHORZADJUST_BLOCK
- // Analog to that (thus, #91508# was not completely correct):
+ // Analog to that:
aSet.Put(SdrTextVertAdjustItem(SDRTEXTVERTADJUST_BLOCK));
aSet.Put(SdrTextHorzAdjustItem(SDRTEXTHORZADJUST_RIGHT));
@@ -700,7 +699,6 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
|| nSlotId == SID_TEXT_FITTOSIZE_VERTICAL);
rOutl.SetVertical(bVertical);
- // #107235#
// Before ImpSetAttributesForNewTextObject the vertical writing mode
// needs to be set at the object. This is done here at the OutlinerParaObject
// directly to not mirror the layout text items involved. These items will be set
@@ -847,8 +845,7 @@ BOOL FuText::MouseButtonUp(const MouseEvent& rMEvt)
// Analog to the else case below, for vertical simple click texts
// one of the defaulted setted items from ImpSetAttributesForNewTextObject
- // needs to be adapted to non-block mode. This could have been done with the
- // #104122#, but was obviously overseen.
+ // needs to be adapted to non-block mode.
const SfxItemSet& rSet = mpView->GetDefaultAttr();
SvxFrameDirection eDirection = (SvxFrameDirection)((SvxFrameDirectionItem&)rSet.Get(EE_PARA_WRITINGDIR)).GetValue();
diff --git a/sd/source/ui/func/fuzoom.cxx b/sd/source/ui/func/fuzoom.cxx
index fe3e2fc..70f5325 100644
--- a/sd/source/ui/func/fuzoom.cxx
+++ b/sd/source/ui/func/fuzoom.cxx
@@ -105,7 +105,7 @@ FunctionReference FuZoom::Create( ViewShell* pViewSh, ::sd::Window* pWin, ::sd::
BOOL FuZoom::MouseButtonDown(const MouseEvent& rMEvt)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
mpWindow->CaptureMouse();
@@ -180,7 +180,7 @@ BOOL FuZoom::MouseMove(const MouseEvent& rMEvt)
BOOL FuZoom::MouseButtonUp(const MouseEvent& rMEvt)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode(rMEvt.GetButtons());
if (bVisible)
diff --git a/sd/source/ui/func/undoback.cxx b/sd/source/ui/func/undoback.cxx
index e5bc6ec..0f8f7b7 100644
--- a/sd/source/ui/func/undoback.cxx
+++ b/sd/source/ui/func/undoback.cxx
@@ -72,7 +72,6 @@ void SdBackgroundObjUndoAction::ImplRestoreBackgroundObj()
delete mpItemSet;
mpItemSet = pNew;
- // #110094#-15
// tell the page that it's visualization has changed
mrPage.ActionChanged();
}
diff --git a/sd/source/ui/inc/DrawDocShell.hxx b/sd/source/ui/inc/DrawDocShell.hxx
index 65d2865..b4012f5 100644
--- a/sd/source/ui/inc/DrawDocShell.hxx
+++ b/sd/source/ui/inc/DrawDocShell.hxx
@@ -203,7 +203,7 @@ public:
DECL_LINK( RenameSlideHdl, AbstractSvxNameDialog* );
- // #91457# ExecuteSpellPopup now handled by DrawDocShell
+ // ExecuteSpellPopup now handled by DrawDocShell
DECL_LINK( OnlineSpellCallback, SpellCallbackInfo* );
void ClearUndoBuffer();
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 7feada7..80d1751 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -508,7 +508,7 @@ protected:
::std::auto_ptr<Implementation> mpImpl;
- // #96090# Support methods for centralized UNDO/REDO
+ // Support methods for centralized UNDO/REDO
virtual SfxUndoManager* ImpGetUndoManager (void) const;
void ImpGetUndoStrings(SfxItemSet &rSet) const;
void ImpGetRedoStrings(SfxItemSet &rSet) const;
diff --git a/sd/source/ui/inc/Window.hxx b/sd/source/ui/inc/Window.hxx
index 986e207..64783ac 100644
--- a/sd/source/ui/inc/Window.hxx
+++ b/sd/source/ui/inc/Window.hxx
@@ -175,8 +175,7 @@ protected:
USHORT mnMinZoom;
USHORT mnMaxZoom;
/** This flag tells whether to re-calculate the minimal zoom factor
- depening on the current zoom factor. According to task #105436# its
- default value is now FALSE.
+ depening on the current zoom factor. Its default value is now FALSE.
*/
bool mbMinZoomAutoCalc;
bool mbCalcMinZoomByMinSide;
diff --git a/sd/source/ui/inc/fucon3d.hxx b/sd/source/ui/inc/fucon3d.hxx
index 4ad0430..be2c146 100644
--- a/sd/source/ui/inc/fucon3d.hxx
+++ b/sd/source/ui/inc/fucon3d.hxx
@@ -56,7 +56,6 @@ public:
virtual void Activate(); // Function aktivieren
virtual void Deactivate(); // Function deaktivieren
- // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
private:
@@ -67,7 +66,6 @@ private:
SdDrawDocument* pDoc,
SfxRequest& rReq);
- // #97016#
void ImpPrepareBasic3DShape(E3dCompoundObject* p3DObj, E3dScene *pScene);
E3dCompoundObject* ImpCreateBasic3DShape();
};
diff --git a/sd/source/ui/inc/fuconarc.hxx b/sd/source/ui/inc/fuconarc.hxx
index b2f653d..18c42dd 100644
--- a/sd/source/ui/inc/fuconarc.hxx
+++ b/sd/source/ui/inc/fuconarc.hxx
@@ -52,7 +52,6 @@ public:
virtual void Activate(); // Function aktivieren
virtual void Deactivate(); // Function deaktivieren
- // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
protected:
diff --git a/sd/source/ui/inc/fuconbez.hxx b/sd/source/ui/inc/fuconbez.hxx
index 2a2ea01..1c8fb42 100644
--- a/sd/source/ui/inc/fuconbez.hxx
+++ b/sd/source/ui/inc/fuconbez.hxx
@@ -64,7 +64,6 @@ public:
void SetEditMode(USHORT nMode);
USHORT GetEditMode() { return nEditMode; }
- // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
protected:
diff --git a/sd/source/ui/inc/fuconcs.hxx b/sd/source/ui/inc/fuconcs.hxx
index 6924db3..0c90d5f 100644
--- a/sd/source/ui/inc/fuconcs.hxx
+++ b/sd/source/ui/inc/fuconcs.hxx
@@ -64,7 +64,6 @@ public:
void SetAttributes( SdrObject* pObj );
- // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
// #i33136#
diff --git a/sd/source/ui/inc/fuconrec.hxx b/sd/source/ui/inc/fuconrec.hxx
index 268456a..14ee50c 100644
--- a/sd/source/ui/inc/fuconrec.hxx
+++ b/sd/source/ui/inc/fuconrec.hxx
@@ -66,7 +66,6 @@ public:
void SetAttributes(SfxItemSet& rAttr, SdrObject* pObj);
void SetLineEnds(SfxItemSet& rAttr, SdrObject* pObj);
- // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
protected:
diff --git a/sd/source/ui/inc/fuconuno.hxx b/sd/source/ui/inc/fuconuno.hxx
index e2d6f4d..98702cd 100644
--- a/sd/source/ui/inc/fuconuno.hxx
+++ b/sd/source/ui/inc/fuconuno.hxx
@@ -58,7 +58,6 @@ public:
virtual void Activate(); // Function aktivieren
virtual void Deactivate(); // Function deaktivieren
- // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
protected:
diff --git a/sd/source/ui/inc/fupoor.hxx b/sd/source/ui/inc/fupoor.hxx
index f13d50b..7febda8 100644
--- a/sd/source/ui/inc/fupoor.hxx
+++ b/sd/source/ui/inc/fupoor.hxx
@@ -66,7 +66,6 @@ public:
virtual void DoExecute( SfxRequest& rReq );
- // #95491# see member
void SetMouseButtonCode(sal_uInt16 nNew) { if(nNew != mnCode) mnCode = nNew; }
sal_uInt16 GetMouseButtonCode() const { return mnCode; }
@@ -82,7 +81,7 @@ public:
virtual BOOL MouseMove(const MouseEvent& );
virtual BOOL MouseButtonUp(const MouseEvent& rMEvt);
- // #95491# moved from inline to *.cxx
+ // moved from inline to *.cxx
virtual BOOL MouseButtonDown(const MouseEvent& rMEvt);
virtual BOOL Command(const CommandEvent& rCEvt);
@@ -98,7 +97,6 @@ public:
void SetWindow(::sd::Window* pWin) { mpWindow = pWin; }
- // #97016# II
virtual void SelectionHasChanged();
USHORT GetSlotID() const { return( nSlotId ); }
@@ -109,7 +107,6 @@ public:
void StartDelayToScrollTimer ();
- // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
/** is called when the currenct function should be aborted. <p>
@@ -195,7 +192,7 @@ protected:
BOOL bDelayActive;
BOOL bFirstMouseMove;
- // #95491# member to hold state of the mouse buttons for creation
+ // member to hold state of the mouse buttons for creation
// of own MouseEvents (like in ScrollHdl)
private:
diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx
index d169ac7..8c11763 100644
--- a/sd/source/ui/inc/futext.hxx
+++ b/sd/source/ui/inc/futext.hxx
@@ -74,7 +74,6 @@ public:
DECL_LINK(SpellError, void* );
- // #97016#
virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle);
/** is called when the currenct function should be aborted. <p>
@@ -103,7 +102,6 @@ protected:
SfxRequest& rRequest;
private:
- // #97016#
void ImpSetAttributesForNewTextObject(SdrTextObj* pTxtObj);
void ImpSetAttributesFitToSize(SdrTextObj* pTxtObj);
void ImpSetAttributesFitToSizeVertical(SdrTextObj* pTxtObj);
diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx
index cc76a08..f2cb5c6 100644
--- a/sd/source/ui/inc/optsitem.hxx
+++ b/sd/source/ui/inc/optsitem.hxx
@@ -249,7 +249,6 @@ class SD_DLLPUBLIC SdOptionsMisc : public SdOptionsGeneric
{
private:
- // #97016#
ULONG nDefaultObjectSizeWidth;
ULONG nDefaultObjectSizeHeight;
@@ -268,7 +267,6 @@ private:
BOOL bSolidDragging : 1; // Misc/ModifyWithAttributes
BOOL bSolidMarkHdl : 1; // /Misc/SimpleHandles
BOOL bSummationOfParagraphs : 1; // misc/SummationOfParagraphs
- // #90356#
BOOL bShowUndoDeleteWarning : 1; // Misc/ShowUndoDeleteWarning
// #i75315#
BOOL bSlideshowRespectZOrder : 1; // Misc/SlideshowRespectZOrder
@@ -323,10 +321,8 @@ public:
is disabled. Other values are reserved for future use.
*/
USHORT GetPrinterIndependentLayout() const { Init(); return mnPrinterIndependentLayout; };
- // #90356#
BOOL IsShowUndoDeleteWarning() const { Init(); return (BOOL) bShowUndoDeleteWarning; }
BOOL IsSlideshowRespectZOrder() const { Init(); return (BOOL) bSlideshowRespectZOrder; }
- // #97016#
ULONG GetDefaultObjectSizeWidth() const { Init(); return nDefaultObjectSizeWidth; }
ULONG GetDefaultObjectSizeHeight() const { Init(); return nDefaultObjectSizeHeight; }
@@ -359,10 +355,8 @@ public:
void SetPrinterIndependentLayout (USHORT nOn = 1 ){ if ( nOn != mnPrinterIndependentLayout ) { OptionsChanged(); mnPrinterIndependentLayout = nOn; } }
void SetSolidDragging( BOOL bOn = TRUE ) { if( bSolidDragging != bOn ) { OptionsChanged(); bSolidDragging = bOn; } }
void SetSolidMarkHdl( BOOL bOn = TRUE ) { if( bSolidMarkHdl != bOn ) { OptionsChanged(); bSolidMarkHdl = bOn; } }
- // #90356#
void SetShowUndoDeleteWarning( BOOL bOn = TRUE ) { if( bShowUndoDeleteWarning != bOn ) { OptionsChanged(); bShowUndoDeleteWarning = bOn; } }
void SetSlideshowRespectZOrder( BOOL bOn = TRUE ) { if( bSlideshowRespectZOrder != bOn ) { OptionsChanged(); bSlideshowRespectZOrder = bOn; } }
- // #97016#
void SetDefaultObjectSizeWidth( ULONG nWidth ) { if( nDefaultObjectSizeWidth != nWidth ) { OptionsChanged(); nDefaultObjectSizeWidth = nWidth; } }
void SetDefaultObjectSizeHeight( ULONG nHeight ) { if( nDefaultObjectSizeHeight != nHeight ) { OptionsChanged(); nDefaultObjectSizeHeight = nHeight; } }
diff --git a/sd/source/ui/inc/unmodpg.hxx b/sd/source/ui/inc/unmodpg.hxx
index 05aa0ce..fb1cd80 100644
--- a/sd/source/ui/inc/unmodpg.hxx
+++ b/sd/source/ui/inc/unmodpg.hxx
@@ -37,7 +37,6 @@ class SdPage;
class ModifyPageUndoAction : public SdUndoAction
{
- // #67720#
SfxUndoManager* mpManager;
SdPage* mpPage;
@@ -55,7 +54,7 @@ class ModifyPageUndoAction : public SdUndoAction
public:
TYPEINFO();
ModifyPageUndoAction(
- SfxUndoManager* pManager, // #67720#
+ SfxUndoManager* pManager,
SdDrawDocument* pTheDoc,
SdPage* pThePage,
String aTheNewName,
diff --git a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
index 1a4f14b..6852234 100644
--- a/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
+++ b/sd/source/ui/slidesorter/controller/SlsSelectionFunction.cxx
@@ -195,7 +195,7 @@ FunctionReference SelectionFunction::Create(
BOOL SelectionFunction::MouseButtonDown (const MouseEvent& rEvent)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode (rEvent.GetButtons());
mbProcessingMouseButtonDown = true;
@@ -260,7 +260,7 @@ BOOL SelectionFunction::MouseButtonUp (const MouseEvent& rEvent)
{
mrController.GetScrollBarManager().StopAutoScroll ();
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode (rEvent.GetButtons());
if (aDragTimer.IsActive())
@@ -691,7 +691,7 @@ void SelectionFunction::GotoNextPage (int nOffset)
void SelectionFunction::ProcessMouseEvent (sal_uInt32 nEventType, const MouseEvent& rEvent)
{
- // #95491# remember button state for creation of own MouseEvents
+ // remember button state for creation of own MouseEvents
SetMouseButtonCode (rEvent.GetButtons());
// 1. Compute some frequently used values relating to the event.
diff --git a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
index afdc634..a03e93d 100644
--- a/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
+++ b/sd/source/ui/slidesorter/shell/SlideSorterViewShell.cxx
@@ -664,7 +664,6 @@ void SlideSorterViewShell::SetZoomRect (const Rectangle& rZoomRect)
ViewShell::SetZoomRect(aRect);
- // #106268#
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER );
}
diff --git a/sd/source/ui/view/ViewShellBase.cxx b/sd/source/ui/view/ViewShellBase.cxx
index 16b0eb2..f504fb8 100644
--- a/sd/source/ui/view/ViewShellBase.cxx
+++ b/sd/source/ui/view/ViewShellBase.cxx
@@ -1011,8 +1011,8 @@ void ViewShellBase::UpdateBorder ( bool bForce /* = false */ )
// made only for the main view shell. This not only avoids unnecessary
// calls for the views in side panes but prevents calling an already
// dying SfxViewShell base class.
- // For issue #140703# we have to check the existence of the window,
- // too. The SfxViewFrame accesses the window without checking it.
+ // We have to check the existence of the window, too.
+ // The SfxViewFrame accesses the window without checking it.
ViewShell* pMainViewShell = GetMainViewShell().get();
if (pMainViewShell != NULL && GetWindow()!=NULL)
{
diff --git a/sd/source/ui/view/drawview.cxx b/sd/source/ui/view/drawview.cxx
index ea01586..0be35b8 100644
--- a/sd/source/ui/view/drawview.cxx
+++ b/sd/source/ui/view/drawview.cxx
@@ -409,7 +409,7 @@ void DrawView::Notify(SfxBroadcaster& rBC, const SfxHint& rHint)
mpDrawViewShell->ResetActualLayer();
}
- // #94278# switch to that page when it's not a master page
+ // switch to that page when it's not a master page
if(HINT_SWITCHTOPAGE == eHintKind)
{
const SdrPage* pPage = ((const SdrHint&)rHint).GetPage();
diff --git a/sd/source/ui/view/drtxtob.cxx b/sd/source/ui/view/drtxtob.cxx
index 5ec0aa4..a5d4241 100644
--- a/sd/source/ui/view/drtxtob.cxx
+++ b/sd/source/ui/view/drtxtob.cxx
@@ -195,7 +195,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
if( (nSlotId == SID_ATTR_CHAR_FONT) || (nSlotId == SID_ATTR_CHAR_FONTHEIGHT) )
{
- // #42732# input language should be preferred over
+ // input language should be preferred over
// current cursor position to detect script type
OutlinerView* pOLV = mpView->GetTextEditOutlinerView();
@@ -265,13 +265,12 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
List* pList = pOLV->CreateSelectionList();
Paragraph* pPara = (Paragraph*) pList->First();
- // #96539# find out if we are a OutlineView
+ // find out if we are a OutlineView
BOOL bIsOutlineView(OUTLINERMODE_OUTLINEVIEW == pOLV->GetOutliner()->GetMode());
- // #96539# This is ONLY for OutlineViews
+ // This is ONLY for OutlineViews
if(bIsOutlineView)
{
- // #96250# and #78665#
// allow move up if position is 2 or greater OR it
// is a title object (and thus depth==1)
if(pOutl->GetAbsPos(pPara) > 1 || ( pOutl->HasParaFlag(pPara,PARAFLAG_ISPAGE) && pOutl->GetAbsPos(pPara) > 0 ) )
@@ -282,7 +281,7 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
}
else
{
- // #96539# old behaviour for OUTLINERMODE_OUTLINEOBJECT
+ // old behaviour for OUTLINERMODE_OUTLINEOBJECT
if(pOutl->GetAbsPos(pPara) > 0)
{
// Nicht ganz oben
@@ -317,7 +316,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
bDisableDown = FALSE;
}
- // #96250# and #78665#
// disable when first para and 2nd is not a title
pPara = static_cast< Paragraph* >( pList->First() );
if(!bDisableDown && bIsOutlineView
@@ -514,7 +512,6 @@ void TextObjectBar::GetAttrState( SfxItemSet& rSet )
rSet.Put( SfxBoolItem( SID_ATTR_PARA_RIGHT_TO_LEFT, TRUE ) );
break;
- // #107865#
// The case for the superordinate object is missing.
case FRMDIR_ENVIRONMENT:
{
diff --git a/sd/source/ui/view/drtxtob1.cxx b/sd/source/ui/view/drtxtob1.cxx
index 31e6073..c8858cf 100644
--- a/sd/source/ui/view/drtxtob1.cxx
+++ b/sd/source/ui/view/drtxtob1.cxx
@@ -253,7 +253,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
// Ensure bold/italic etc. icon state updates
Invalidate();
- // #96551# trigger preview refresh
+ // trigger preview refresh
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
}
rReq.Done();
@@ -268,7 +268,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
// Ensure bold/italic etc. icon state updates
Invalidate();
- // #96551# trigger preview refresh
+ // trigger preview refresh
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
}
rReq.Done();
@@ -281,7 +281,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
pOLV->AdjustHeight( -1 );
- // #96551# trigger preview refresh
+ // trigger preview refresh
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
}
rReq.Done();
@@ -294,7 +294,7 @@ void TextObjectBar::Execute( SfxRequest &rReq )
{
pOLV->AdjustHeight( 1 );
- // #96551# trigger preview refresh
+ // trigger preview refresh
mpViewShell->GetViewFrame()->GetBindings().Invalidate( SID_PREVIEW_STATE, TRUE, FALSE );
}
rReq.Done();
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index e0b220e..7e8d4fc 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -122,7 +122,7 @@ void DrawViewShell::UIActivating( SfxInPlaceClient* pCli )
{
ViewShell::UIActivating(pCli);
- // #94252# Disable own controls
+ // Disable own controls
maTabControl.Disable();
if (GetLayerTabControl() != NULL)
GetLayerTabControl()->Disable();
@@ -130,7 +130,7 @@ void DrawViewShell::UIActivating( SfxInPlaceClient* pCli )
void DrawViewShell::UIDeactivated( SfxInPlaceClient* pCli )
{
- // #94252# Enable own controls
+ // Enable own controls
maTabControl.Enable();
if (GetLayerTabControl() != NULL)
GetLayerTabControl()->Enable();
@@ -283,7 +283,7 @@ void DrawViewShell::SelectionHasChanged (void)
GetViewShellBase().GetToolBarManager()->SelectionHasChanged(*this,*mpDrawView);
}
- // #96124# Invalidate for every subshell
+ // Invalidate for every subshell
GetViewShellBase().GetViewShellManager()->InvalidateAllSubShells(this);
mpDrawView->UpdateSelectionClipboard( FALSE );
@@ -596,7 +596,7 @@ SvxRuler* DrawViewShell::CreateVRuler(::sd::Window* pWin)
GetViewFrame()->GetBindings(), aWBits);
pRuler->SetSourceUnit(pWin->GetMapMode().GetMapUnit());
- // #96629# Metric same as HRuler, use document setting
+ // Metric same as HRuler, use document setting
UINT16 nMetric = (UINT16)GetDoc()->GetUIUnit();
if( nMetric == 0xffff )
diff --git a/sd/source/ui/view/drviews2.cxx b/sd/source/ui/view/drviews2.cxx
index d5a2233..0a46bd2 100644
--- a/sd/source/ui/view/drviews2.cxx
+++ b/sd/source/ui/view/drviews2.cxx
@@ -83,7 +83,6 @@
#include "fuvect.hxx"
#include "stlpool.hxx"
-// #90356#
#include "optsitem.hxx"
#include "sdabstdlg.hxx"
#include <com/sun/star/drawing/XMasterPagesSupplier.hpp>
@@ -171,7 +170,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
BOOL bMergeUndo = FALSE;
SfxUndoManager* pUndoManager = GetDocSh()->GetUndoManager();
- // Anpassungen Start/EndWidth #63083#
+ // Anpassungen Start/EndWidth
if(nSId == SID_ATTR_LINE_WIDTH)
{
SdrObject* pObj = NULL;
@@ -192,7 +191,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
{
BOOL bSetItemSet(FALSE);
- // #86265# do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET
+ // do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET
if(SFX_ITEM_DONTCARE != aAttr.GetItemState(XATTR_LINESTARTWIDTH))
{
INT32 nValAct = ((const XLineStartWidthItem&)aAttr.Get(XATTR_LINESTARTWIDTH)).GetValue();
@@ -203,7 +202,7 @@ void DrawViewShell::FuTemporary(SfxRequest& rReq)
aAttr.Put(XLineStartWidthItem(nValNew));
}
- // #86265# do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET
+ // do this for SFX_ITEM_DEFAULT and for SFX_ITEM_SET
if(SFX_ITEM_DONTCARE != aAttr.GetItemState(XATTR_LINEENDWIDTH))
{
INT32 nValAct = ((const XLineEndWidthItem&)aAttr.Get(XATTR_LINEENDWIDTH)).GetValue();
diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx
index d752a14..68339ba 100644
--- a/sd/source/ui/view/drviews4.cxx
+++ b/sd/source/ui/view/drviews4.cxx
@@ -475,7 +475,6 @@ void DrawViewShell::Command(const CommandEvent& rCEvt, ::sd::Window* pWin)
// menu from an inplace client is closed. Now we have the chance to
// deactivate the inplace client without any problem regarding parent
// windows and code on the stack.
- // For more information, see #126086# and #128122#
SfxInPlaceClient* pIPClient = GetViewShell()->GetIPClient();
BOOL bIsOleActive = ( pIPClient && pIPClient->IsObjectInPlaceActive() );
if ( bIsOleActive && ( rCEvt.GetCommand() == COMMAND_CONTEXTMENU ))
diff --git a/sd/source/ui/view/drviews7.cxx b/sd/source/ui/view/drviews7.cxx
index e59525a..110a8cf 100644
--- a/sd/source/ui/view/drviews7.cxx
+++ b/sd/source/ui/view/drviews7.cxx
@@ -220,8 +220,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
if (mpDrawView == NULL)
{
- // This assertion and return are here to prevent crashes like that
- // of issue #126202#.
+ // This assertion and return are here to prevent crashes.
DBG_ASSERT(mpDrawView!=NULL, "Please report this assertion to the Impress team.");
return;
}
@@ -597,7 +596,7 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
{
if ( !mpClipEvtLstnr )
{
- // SSA: #108717# avoid clipboard initialization for
+ // avoid clipboard initialization for
// read-only presentation views (workaround for NT4.0
// clipboard prob...)
if( !ISA(PresentationViewShell) )
@@ -635,9 +634,8 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
if (mpDrawView == NULL)
{
- // When we come to this line then we probably have another
- // incarnation of issue #126202#. The mpDrawView was not NULL but is
- // now. The reason for this may be that the DrawViewShell has been
+ // The mpDrawView was not NULL but is now.
+ // The reason for this may be that the DrawViewShell has been
// destroyed in the mean time.
// We can only return immediately and hope that the deleted
// DrawViewShell is not called again.
@@ -1466,11 +1464,6 @@ void DrawViewShell::GetMenuState( SfxItemSet &rSet )
rSet.DisableItem (SID_ATTR_GRAF_CROP);
}
- // #96090# moved SID_UNDO to ViewShell::GetMenuState()
- // #96090# moved SID_REDO to ViewShell::GetMenuState()
- // #96090# moved SID_GETUNDOSTRINGS to ViewShell::GetMenuState()
- // #96090# moved SID_GETREDOSTRINGS to ViewShell::GetMenuState()
-
///////////////////////////////////////////////////////////////////////
// Menuoption: Edit->Hyperlink
// Disable, if there is no hyperlink
@@ -1607,7 +1600,7 @@ void DrawViewShell::GetModeSwitchingMenuState (SfxItemSet &rSet)
rSet.Put(SfxBoolItem(SID_HANDOUTMODE, FALSE));
}
- // #101976# Removed [GetDocSh()->GetCurrentFunction() ||] from the following
+ // Removed [GetDocSh()->GetCurrentFunction() ||] from the following
// clause because the current function of the docshell can only be
// search and replace or spell checking and in that case switching the
// view mode is allowed.
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index 00c806e..7fd6df0 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -164,7 +164,7 @@ DrawViewShell::~DrawViewShell()
if( mxScannerListener.is() )
static_cast< ScannerEventListener* >( mxScannerListener.get() )->ParentDestroyed();
- // #96642# Remove references to items within Svx3DWin
+ // Remove references to items within Svx3DWin
// (maybe do a listening sometime in Svx3DWin)
USHORT nId = Svx3DChildWindow::GetChildWindowId();
SfxChildWindow* pWindow = GetViewFrame() ? GetViewFrame()->GetChildWindow(nId) : NULL;
@@ -203,7 +203,7 @@ DrawViewShell::~DrawViewShell()
if ( mpClipEvtLstnr )
{
mpClipEvtLstnr->AddRemoveListener( GetActiveWindow(), FALSE );
- mpClipEvtLstnr->ClearCallbackLink(); // #103849# prevent callback if another thread is waiting
+ mpClipEvtLstnr->ClearCallbackLink(); // prevent callback if another thread is waiting
mpClipEvtLstnr->release();
}
diff --git a/sd/source/ui/view/drviewsc.cxx b/sd/source/ui/view/drviewsc.cxx
index d99a8b4..dd2d4d9 100644
--- a/sd/source/ui/view/drviewsc.cxx
+++ b/sd/source/ui/view/drviewsc.cxx
@@ -203,7 +203,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
case SID_COMBINE: // BASIC
{
- // #88224# End text edit to avoid conflicts
+ // End text edit to avoid conflicts
if(mpDrawView->IsTextEdit())
mpDrawView->SdrEndTextEdit();
@@ -240,7 +240,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
case SID_POLY_MERGE:
{
- // #88224# End text edit to avoid conflicts
+ // End text edit to avoid conflicts
if(mpDrawView->IsTextEdit())
mpDrawView->SdrEndTextEdit();
@@ -261,7 +261,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
case SID_POLY_SUBSTRACT:
{
- // #88224# End text edit to avoid conflicts
+ // End text edit to avoid conflicts
if(mpDrawView->IsTextEdit())
mpDrawView->SdrEndTextEdit();
@@ -282,7 +282,7 @@ void DrawViewShell::FuTemp03(SfxRequest& rReq)
case SID_POLY_INTERSECT:
{
- // #88224# End text edit to avoid conflicts
+ // End text edit to avoid conflicts
if(mpDrawView->IsTextEdit())
mpDrawView->SdrEndTextEdit();
diff --git a/sd/source/ui/view/drviewse.cxx b/sd/source/ui/view/drviewse.cxx
index c846ee3..17a01f7 100644
--- a/sd/source/ui/view/drviewse.cxx
+++ b/sd/source/ui/view/drviewse.cxx
@@ -125,7 +125,7 @@ namespace sd {
void ImpAddPrintableCharactersToTextEdit(SfxRequest& rReq, ::sd::View* pView)
{
- // #98198# evtl. feed characters to activated textedit
+ // evtl. feed characters to activated textedit
const SfxItemSet* pSet = rReq.GetArgs();
if(pSet)
@@ -183,7 +183,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
Invalidate();
- // #98198# evtl. feed characters to activated textedit
+ // evtl. feed characters to activated textedit
if(SID_ATTR_CHAR == nSId && GetView() && GetView()->IsTextEdit())
ImpAddPrintableCharactersToTextEdit(rReq, GetView());
@@ -265,7 +265,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
rBindings.Invalidate( SID_TEXT_FITTOSIZE );
rBindings.Invalidate( SID_TEXT_FITTOSIZE_VERTICAL );
- // #98198# evtl. feed characters to activated textedit
+ // evtl. feed characters to activated textedit
if(SID_ATTR_CHAR == nSId && GetView() && GetView()->IsTextEdit())
ImpAddPrintableCharactersToTextEdit(rReq, GetView());
@@ -280,7 +280,6 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
}
break;
- // #98721#
case SID_FM_CREATE_FIELDCONTROL:
{
SFX_REQUEST_ARG( rReq, pDescriptorItem, SfxUnoAnyItem, SID_FM_DATACCESS_DESCRIPTOR, sal_False );
@@ -571,7 +570,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
// Jetzt explizit der letzte Slot incl. Update()
Invalidate();
- // #97016# III CTRL-SID_OBJECT_SELECT -> select first draw object if none is selected yet
+ // CTRL-SID_OBJECT_SELECT -> select first draw object if none is selected yet
if(SID_OBJECT_SELECT == nSId && HasCurrentFunction() && (rReq.GetModifier() & KEY_MOD1))
{
if(!GetView()->AreObjectsMarked())
@@ -586,7 +585,7 @@ void DrawViewShell::FuPermanent(SfxRequest& rReq)
}
}
- // #97016# with qualifier construct directly
+ // with qualifier construct directly
if(HasCurrentFunction() && (rReq.GetModifier() & KEY_MOD1))
{
// get SdOptions
@@ -1045,7 +1044,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
{
const SfxItemSet* pReqArgs = rReq.GetArgs();
- // #97516# Remember old ruler state
+ // Remember old ruler state
BOOL bOldHasRuler(HasRuler());
if ( pReqArgs )
@@ -1055,7 +1054,7 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
}
else SetRuler (!HasRuler());
- // #97516# Did ruler state change? Tell that to SdOptions, too.
+ // Did ruler state change? Tell that to SdOptions, too.
BOOL bHasRuler(HasRuler());
if(bOldHasRuler != bHasRuler)
@@ -1460,13 +1459,13 @@ void DrawViewShell::FuSupport(SfxRequest& rReq)
// #UndoRedo#
case SID_UNDO :
{
- // #96090# moved implementation to BaseClass
+ // moved implementation to BaseClass
ImpSidUndo(TRUE, rReq);
}
break;
case SID_REDO :
{
- // #96090# moved implementation to BaseClass
+ // moved implementation to BaseClass
ImpSidRedo(TRUE, rReq);
}
break;
@@ -1578,7 +1577,6 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), Any( form::FormButtonType_URL ) );
if ( ::avmedia::MediaWindow::isMediaURL( rURL ) )
{
- // #105638# OJ
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), Any( sal_True ) );
}
}
@@ -1612,7 +1610,6 @@ void DrawViewShell::InsertURLButton(const String& rURL, const String& rText,
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "TargetFrame" )), Any( OUString( rTarget ) ) );
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "ButtonType" )), Any( form::FormButtonType_URL ) );
- // #105638# OJ
if ( ::avmedia::MediaWindow::isMediaURL( rURL ) )
xPropSet->setPropertyValue( OUString( RTL_CONSTASCII_USTRINGPARAM( "DispatchURLInternal" )), Any( sal_True ) );
diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx
index 2dc9602..c67313c 100644
--- a/sd/source/ui/view/drviewsh.cxx
+++ b/sd/source/ui/view/drviewsh.cxx
@@ -85,7 +85,7 @@ BOOL DrawViewShell::GotoBookmark(const String& rBookmark)
void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin)
{
- // #98568# In older versions, if in X or Y the size of the object was
+ // In older versions, if in X or Y the size of the object was
// smaller than the visible area, the user-defined zoom was
// changed. This was decided to be a bug for 6.x, thus I developed a
// version which instead handles X/Y bigger/smaller and visibility
@@ -117,7 +117,7 @@ void DrawViewShell::MakeVisible(const Rectangle& rRect, ::Window& rWin)
}
else
{
- // #98568# allow a mode for move-only visibility without zooming.
+ // allow a mode for move-only visibility without zooming.
const sal_Int32 nPercentBorder(30);
const Rectangle aInnerRectangle(
aVisArea.Left() + ((aVisAreaSize.Width() * nPercentBorder) / 200),
diff --git a/sd/source/ui/view/drviewsj.cxx b/sd/source/ui/view/drviewsj.cxx
index 1d01f04..14ae755 100644
--- a/sd/source/ui/view/drviewsj.cxx
+++ b/sd/source/ui/view/drviewsj.cxx
@@ -130,7 +130,7 @@ void DrawViewShell::GetMenuStateSel( SfxItemSet &rSet )
pObj->TakeObjInfo( aInfoRec );
- // #91929#; don't show original size entry if not possible
+ // don't show original size entry if not possible
if ( pObj->ISA( SdrOle2Obj ) )
{
SdrOle2Obj* pOleObj = PTR_CAST(SdrOle2Obj, pObj);
diff --git a/sd/source/ui/view/outlnvsh.cxx b/sd/source/ui/view/outlnvsh.cxx
index 6902c0f..c9cdbb5 100644
--- a/sd/source/ui/view/outlnvsh.cxx
+++ b/sd/source/ui/view/outlnvsh.cxx
@@ -1234,7 +1234,6 @@ void OutlineViewShell::SetZoomRect(const Rectangle& rZoomRect)
pOutlinerView->SetOutputArea(aWin);
}
- // #106268#
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOM );
GetViewFrame()->GetBindings().Invalidate( SID_ATTR_ZOOMSLIDER );
}
diff --git a/sd/source/ui/view/sdview3.cxx b/sd/source/ui/view/sdview3.cxx
index c23892f..81d22f2 100644
--- a/sd/source/ui/view/sdview3.cxx
+++ b/sd/source/ui/view/sdview3.cxx
@@ -109,7 +109,6 @@ namespace sd {
|*
\************************************************************************/
-// #83525#
struct ImpRememberOrigAndClone
{
SdrObject* pOrig;
@@ -126,7 +125,7 @@ SdrObject* ImpGetClone(Container& aConnectorContainer, SdrObject* pConnObj)
return 0L;
}
-// #90129# restrict movement to WorkArea
+// restrict movement to WorkArea
void ImpCheckInsertPos(Point& rPos, const Size& rSize, const Rectangle& rWorkArea)
{
if(!rWorkArea.IsEmpty())
@@ -251,7 +250,7 @@ bool View::InsertMetaFile( TransferableDataHelper& rDataHelper, const Point& rPo
if( !bVector && (aGraphic.GetType() == GRAPHIC_NONE) )
bVector = true;
- // #90129# restrict movement to WorkArea
+ // restrict movement to WorkArea
Point aInsertPos( rPos );
Size aImageSize;
aImageSize = bVector ? aMtf.GetPrefSize() : aGraphic.GetSizePixel();
@@ -440,7 +439,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
pMarkList->ForceSort();
- // #83525# stuff to remember originals and clones
+ // stuff to remember originals and clones
Container aConnectorContainer(0);
sal_uInt32 a, nConnectorCount(0L);
Point aCurPos;
@@ -470,7 +469,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
{
if(!bDropOnTabBar)
{
- // #83525# do a NbcMove(...) instead of setting SnapRects here
+ // do a NbcMove(...) instead of setting SnapRects here
pObj->NbcMove(aVector);
}
@@ -483,7 +482,6 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
EndUndo();
}
- // #83525#
ImpRememberOrigAndClone* pRem = new ImpRememberOrigAndClone;
pRem->pOrig = pM->GetMarkedSdrObj();
pRem->pClone = pObj;
@@ -494,7 +492,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
}
}
- // #83525# try to re-establish connections at clones
+ // try to re-establish connections at clones
if(nConnectorCount)
{
for(a = 0; a < aConnectorContainer.Count(); a++)
@@ -573,7 +571,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
}
}
- // #83525# cleanup remember classes
+ // cleanup remember classes
for(a = 0; a < aConnectorContainer.Count(); a++)
delete (ImpRememberOrigAndClone*)aConnectorContainer.GetObject(a);
@@ -631,7 +629,7 @@ BOOL View::InsertData( const TransferableDataHelper& rDataHelper,
pWorkPage->SetRectsDirty();
... etc. - the rest is truncated
More information about the Libreoffice-commits
mailing list