Skip to content

C
core
Kaydet (Commit) db8ad987 authored tarafından Robert Roth's avatar Robert Roth Kaydeden (comit) Michael Meeks
Dosyalara gözat
Seçenekler

Bogus comments, commented lines removed, some german comments translated.

üst 43a36b36
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 195 deletions
sw/inc/HandleAnchorNodeChg.hxx
Dosyayı görüntüle @ db8ad987
......@@ -32,7 +32,6 @@ class SwFlyFrmFmt;
class SwFmtAnchor;
class SwFlyFrm;
// OD 2006-02-28 #125892#
// helper class to track change of anchor node of at-paragraph respectively
// at-character anchored fly frames
// if such a change happens, it has to be checked, if the count of the anchor
......
sw/inc/anchoredobject.hxx
Dosyayı görüntüle @ db8ad987
This diff is collapsed.
sw/inc/comcore.hrc
Dosyayı görüntüle @ db8ad987
......@@ -52,7 +52,7 @@
#define STR_HYPH_TITLE (RC_COMCORE_BEGIN + 16)
#define MSG_DISABLE_UNDO_QUESTION (RC_COMCORE_BEGIN + 17)
#define MSG_DISABLE_READLINE_QUESTION (RC_COMCORE_BEGIN + 18)
// -> #111827#
#define STR_REDLINE_INSERT (RC_COMCORE_BEGIN + 19)
#define STR_REDLINE_DELETE (RC_COMCORE_BEGIN + 20)
#define STR_REDLINE_FORMAT (RC_COMCORE_BEGIN + 21)
......@@ -68,8 +68,7 @@
#define STR_REDLINE_MULTIPLE (RC_COMCORE_BEGIN + 31)
#define STR_N_REDLINES (RC_COMCORE_BEGIN + 32)
#define STR_FIELD (RC_COMCORE_BEGIN + 33)
// <- #111827#
// -> #115575#
#define STR_FRAME (RC_COMCORE_BEGIN + 34)
#define STR_OLE (RC_COMCORE_BEGIN + 35)
#define STR_MATH_FORMULA (RC_COMCORE_BEGIN + 36)
......@@ -84,11 +83,9 @@
#define STR_DRAWING_OBJECTS (RC_COMCORE_BEGIN + 45)
#define STR_TABLE_NAME (RC_COMCORE_BEGIN + 46)
#define STR_PARAGRAPH_UNDO (RC_COMCORE_BEGIN + 47)
// <- #115575#
// -> PB #146850#
#define RID_GRAPHIC_REPLACEBMP_HC (RC_COMCORE_BEGIN + 48)
#define RID_GRAPHIC_ERRORBMP_HC (RC_COMCORE_BEGIN + 49)
// <- #146850#
// defines fuer die Autoformat Redline Kommentare
#define STR_AUTOFMTREDL_DEL_EMPTY_PARA 0
......
sw/inc/fesh.hxx
Dosyayı görüntüle @ db8ad987
......@@ -36,7 +36,6 @@
#include <editsh.hxx>
#include <flyenum.hxx>
// OD 25.06.2003 #108784#
#include <svx/svdtypes.hxx>
#include <svtools/embedhlp.hxx>
......@@ -171,7 +170,7 @@ struct SwGetCurColNumPara
#define SW_TABCOL_VERT 2
#define SW_TABROW_HORI 3
#define SW_TABROW_VERT 4
// --> FME 2004-07-30 #i32329# Enhanced table selection
#define SW_TABSEL_HORI 5
#define SW_TABSEL_HORI_RTL 6
#define SW_TABROWSEL_HORI 7
......@@ -180,7 +179,6 @@ struct SwGetCurColNumPara
#define SW_TABSEL_VERT 10
#define SW_TABROWSEL_VERT 11
#define SW_TABCOLSEL_VERT 12
// <--
class SdrDropMarkerOverlay;
......@@ -197,7 +195,6 @@ class SW_DLLPUBLIC SwFEShell : public SwEditShell
SW_DLLPRIVATE void ScrollTo( const Point &rPt );
// OD 25.06.2003 #108784# - correct type of 1st parameter
SW_DLLPRIVATE void ChangeOpaque( SdrLayerID nLayerId );
// Used for mouse operations on a table:
......@@ -273,7 +270,6 @@ public:
bool IsObjSelectable( const Point& rPt );
int IsInsideSelectedObj( const Point& rPt ); //!! returns enum values
// #107513#
// Test if there is a draw object at that position and if it should be selected.
// The 'should' is aimed at Writer text fly frames which may be in front of
// the draw object.
......@@ -293,7 +289,7 @@ public:
USHORT GetFrmType( const Point *pPt, BOOL bStopAtFly ) const;
USHORT GetSelFrmType() const; //Selektion (Drawing)
/** #108784# check whether selected frame contains a control;
/** check whether selected frame contains a control;
* companion method to GetSelFrmType, used for preventing
* drag&drop of controls into header */
bool IsSelContainsControl() const;
......@@ -305,11 +301,10 @@ public:
SwRect GetObjRect() const;
//Zum Verschieben von Flys mit der Tastatur
SwRect GetFlyRect() const;
// OD 18.09.2003 #i17567#, #108749#, #110354# - adjustments to allow
// negative vertical positions for fly frames anchored
// i#17567 - adjustments to allow negative vertical positions for fly frames anchored
// to paragraph or to character.
// OD 02.10.2003 #i18732# - adjustments for new option 'FollowTextFlow'
// OD 12.11.2003 #i22341# - adjustments for new vertical alignment at top of line
// i#18732 - adjustments for new option 'FollowTextFlow'
// i#22341 - adjustments for new vertical alignment at top of line
void CalcBoundRect( SwRect& _orRect,
const RndStdIds _nAnchorId,
const sal_Int16 _eHoriRelOrient = com::sun::star::text::RelOrientation::FRAME,
......@@ -356,12 +351,10 @@ public:
const Graphic *GetGrfAtPos( const Point &rDocPos,
String &rName, BOOL &rbLink ) const;
// --> OD 2009-07-13 #i73249#
const String GetObjTitle() const;
void SetObjTitle( const String& rTitle );
const String GetObjDescription() const;
void SetObjDescription( const String& rDescription );
// <--
//SS fuer Rahmen --------------------------------------------
......@@ -654,12 +647,9 @@ public:
void SetMouseTabCols( const SwTabCols &rNew, BOOL bCurRowOnly,
const Point &rPt );
// --> FME 2004-07-30 #i20126# Enhanced table selection
// pEnd will be used during MouseMove
bool SelTblRowCol( const Point& rPt, const Point* pEnd = 0, bool bRowDrag = false );
// <--
// #i24134# adjustment of table rows via Ruler
void GetTabRows( SwTabCols &rToFill ) const;
void SetTabRows( const SwTabCols &rNew, BOOL bCurColOnly );
void GetMouseTabRows( SwTabCols &rToFill, const Point &rPt ) const;
......@@ -744,7 +734,6 @@ public:
/** SwFEShell::GetShapeBackgrd
OD 02.09.2002 for #102450#:
method determines background color of the page the selected drawing
object is on and returns this color.
If no color is found, because no drawing object is selected or ...,
......@@ -759,7 +748,6 @@ public:
/** Is default horizontal text direction for selected drawing object right-to-left
OD 09.12.2002 #103045#
Because drawing objects only painted for each page only, the default
horizontal text direction of a drawing object is given by the corresponding
page property.
......@@ -773,14 +761,11 @@ public:
void ParkCursorInTab();
// -> #i23726#
SwTxtNode * GetNumRuleNodeAtPos(const Point &rPot);
BOOL IsNumLabel( const Point &rPt, int nMaxOffset = -1 );
// <- #i23726#
// --> OD 2005-02-21 #i42921#
bool IsVerticalModeAtNdAndPos( const SwTxtNode& _rTxtNode,
const Point& _rDocPos ) const;
// <--
};
......
sw/inc/fldbas.hxx
Dosyayı görüntüle @ db8ad987
......@@ -248,8 +248,6 @@ extern USHORT __FAR_DATA aTypeTab[];
String GetResult(double nVal, sal_uInt32 nNumFmt, USHORT nLang = LANGUAGE_SYSTEM);
void SetErrorStr(const String& rStr);
//String ExpandDate(const Date& rDate, ULONG nFmt, USHORT nLang);
//String ExpandTime(const Time& rTime, ULONG nFmt, USHORT nLang);
String FormatNumber(USHORT nNum, sal_uInt32 nFormat);
/*--------------------------------------------------------------------
......@@ -307,7 +305,7 @@ inline void SwFieldType::UpdateFlds() const
class SW_DLLPUBLIC SwField
{
private:
mutable String m_Cache; /// #i85766# cached expansion (for clipboard)
mutable String m_Cache; // cached expansion (for clipboard)
USHORT nLang; // Immer ueber SetLanguage aendern!
BOOL bIsAutomaticLanguage;
sal_uInt32 nFormat;
......@@ -421,7 +419,6 @@ public:
class SW_DLLPUBLIC SwValueField : public SwField
{
double fValue;
// String sExpand;
protected:
SwValueField( SwValueFieldType* pFldType, sal_uInt32 nFmt = 0, USHORT nLang = LANGUAGE_SYSTEM, const double fVal = 0.0 );
......@@ -432,8 +429,6 @@ public:
virtual SwFieldType* ChgTyp( SwFieldType* );
virtual void SetLanguage(USHORT nLng);
// os: wozu war das denn da?
// virtual void ChangeFormat(ULONG n);
inline SwDoc* GetDoc() const { return ((SwValueFieldType*)GetTyp())->GetDoc(); }
......
sw/inc/fmtcntnt.hxx
Dosyayı görüntüle @ db8ad987
......@@ -44,7 +44,6 @@ class SW_DLLPUBLIC SwFmtCntnt: public SfxPoolItem
SwFmtCntnt &operator=( const SwFmtCntnt & ); //Kopieren verboten
public:
// SwFmtCntnt( const SwNodeIndex *pStartNodeIdx = 0 );
SwFmtCntnt( const SwStartNode* pStartNode = 0 );
SwFmtCntnt( const SwFmtCntnt &rCpy );
~SwFmtCntnt();
......
sw/inc/fmtftntx.hxx
Dosyayı görüntüle @ db8ad987
......@@ -69,13 +69,6 @@ public:
virtual bool QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
virtual bool PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
// will be used at time??
// void FillVariable( SbxVariable &rVar,
// SfxMapUnit eCoreMetric,
// SfxMapUnit eUserMetric ) const;
// virtual SfxArgumentError SetVariable( const SbxVariable &rVal,
// SfxMapUnit eCoreMetric,
// SfxMapUnit eUserMetric );
virtual SfxItemPresentation GetPresentation( SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
SfxMapUnit ePresMetric,
......
sw/inc/frmfmt.hxx
Dosyayı görüntüle @ db8ad987
......@@ -28,9 +28,7 @@
#ifndef _FRMFMT_HXX
#define _FRMFMT_HXX
// --> OD 2004-08-06 #i28749#
#include <com/sun/star/text/PositionLayoutDir.hpp>
// <--
#include <cppuhelper/weakref.hxx>
......@@ -118,7 +116,6 @@ public:
BOOL IsLowerOf( const SwFrmFmt& rFmt ) const;
// --> OD 2004-07-27 #i31698#
enum tLayoutDir
{
HORI_L2R,
......@@ -129,12 +126,9 @@ public:
virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
// <--
// --> OD 2004-08-06 #i28749#
virtual sal_Int16 GetPositionLayoutDir() const;
virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
// <--
virtual String GetDescription() const;
......@@ -185,18 +179,16 @@ public:
virtual BOOL GetInfo( SfxPoolItem& rInfo ) const;
// --> OD 2009-07-14 #i73249#
const String GetObjTitle() const;
void SetObjTitle( const String& rTitle,
bool bBroadcast = false );
const String GetObjDescription() const;
void SetObjDescription( const String& rDescription,
bool bBroadcast = false );
// <--
/** SwFlyFrmFmt::IsBackgroundTransparent - for #99657#
OD 22.08.2002 - overloading virtual method and its default implementation,
overloading virtual method and its default implementation,
because format of fly frame provides transparent backgrounds.
Method determines, if background of fly frame is transparent.
......@@ -209,7 +201,7 @@ public:
/** SwFlyFrmFmt::IsBackgroundBrushInherited - for #103898#
OD 08.10.2002 - method to determine, if the brush for drawing the
method to determine, if the brush for drawing the
background is "inherited" from its parent/grandparent.
This is the case, if no background graphic is set and the background
color is "no fill"/"auto fill"
......@@ -236,46 +228,34 @@ class SW_DLLPUBLIC SwDrawFrmFmt: public SwFrmFmt
SwDrawFrmFmt( const SwDrawFrmFmt &rCpy );
SwDrawFrmFmt &operator=( const SwDrawFrmFmt &rCpy );
// --> OD 2004-07-27 #i31698#
SwFrmFmt::tLayoutDir meLayoutDir;
// <--
// --> OD 2004-08-06 #i28749#
sal_Int16 mnPositionLayoutDir;
// <--
// --> OD 2005-03-11 #i44334#, #i44681#
bool mbPosAttrSet;
// <--
protected:
SwDrawFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, pFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
pSdrObjCached(NULL),
// --> OD 2004-07-28 #i31698#
meLayoutDir( SwFrmFmt::HORI_L2R ),
// <--
// --> OD 2004-08-06 #i28749#
// --> OD 2005-03-10 #i44344#, #i44681# - undo change of issue #i36010#
mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
// <--
// --> OD 2005-03-11 #i44334#, #i44681#
mbPosAttrSet( false )
// <--
{}
SwDrawFrmFmt( SwAttrPool& rPool, const String &rFmtNm,
SwFrmFmt *pDrvdFrm )
: SwFrmFmt( rPool, rFmtNm, pDrvdFrm, RES_DRAWFRMFMT ),
pSdrObjCached(NULL),
// --> OD 2004-07-28 #i31698#
meLayoutDir( SwFrmFmt::HORI_L2R ),
// <--
// --> OD 2004-08-06 #i28749#
// --> OD 2005-03-10 #i44344#, #i44681# - undo change of issue #i36010#
mnPositionLayoutDir( com::sun::star::text::PositionLayoutDir::PositionInLayoutDirOfAnchor ),
// <--
// --> OD 2005-03-11 #i44334#, #i44681#
mbPosAttrSet( false )
// <--
{}
public:
......@@ -292,27 +272,19 @@ public:
virtual Graphic MakeGraphic( ImageMap* pMap = NULL );
// --> OD 2004-07-27 #i31698#
virtual SwFrmFmt::tLayoutDir GetLayoutDir() const;
virtual void SetLayoutDir( const SwFrmFmt::tLayoutDir _eLayoutDir );
// <--
// --> OD 2004-08-06 #i28749#
virtual sal_Int16 GetPositionLayoutDir() const;
virtual void SetPositionLayoutDir( const sal_Int16 _nPositionLayoutDir );
// <--
// --> OD 2005-03-11 #i44334#, #i44681#
inline bool IsPosAttrSet() const { return mbPosAttrSet; }
inline void PosAttrSet() { mbPosAttrSet = true; }
// <--
// --> OD 2005-08-16 #i53320#
inline void ResetPosAttr()
{
mbPosAttrSet = false;
}
// <--
virtual String GetDescription() const;
......
sw/inc/globals.hrc
Dosyayı görüntüle @ db8ad987
......@@ -29,8 +29,6 @@
#define _GLOBALS_HRC
// Versions-Definition wie in solar.h und swtypes.hxx
//#define SW_FILEFORMAT_40 3580
#include "rcid.hrc"
......
sw/inc/htmltbl.hxx
Dosyayı görüntüle @ db8ad987
......@@ -92,8 +92,6 @@ public:
BOOL HasNoBreakTag() const { return bNoBreakTag; }
};
/* */
class SwHTMLTableLayoutCell
{
SwHTMLTableLayoutCnts *pContents; // der Inhalt der Zelle
......@@ -131,8 +129,6 @@ public:
BOOL HasNoWrapOption() const { return bNoWrapOption; }
};
/* */
class SwHTMLTableLayoutColumn
{
// Zwischenwerte von AutoLayoutPass1
......@@ -185,8 +181,6 @@ public:
BOOL HasLeftBorder() const { return bLeftBorder; }
};
/* */
class SwHTMLTableLayout
{
Timer aResizeTimer; // Timer fuer DelayedResize
......@@ -250,9 +244,6 @@ class SwHTMLTableLayout
BOOL bMustNotRecalc : 1; // Tabelle darf nicht an Inhalt angepasst
// werden
// USHORT GetLeftBorderWidth( USHORT nCol ) const;
// USHORT GetRightBorderWidth( USHORT nCol, USHORT nColSpan ) const;
void AddBorderWidth( ULONG &rMin, ULONG &rMax, ULONG& rAbsMin,
USHORT nCol, USHORT nColSpan,
BOOL bSwBorders=TRUE ) const;
......@@ -378,8 +369,6 @@ public:
BOOL MayBeInFlyFrame() const { return bMayBeInFlyFrame; }
};
/* */
inline void SwHTMLTableLayoutCell::SetProtected()
{
nRowSpan = 1;
......@@ -388,8 +377,6 @@ inline void SwHTMLTableLayoutCell::SetProtected()
pContents = 0;
}
/* */
inline void SwHTMLTableLayoutColumn::MergeMinMaxNoAlign( ULONG nCMin,
ULONG nCMax, ULONG nAbsMin )
{
......@@ -429,8 +416,6 @@ inline void SwHTMLTableLayoutColumn::SetMinMax( ULONG nMn, ULONG nMx )
nMax = nMx;
}
/* */
inline USHORT SwHTMLTableLayout::GetInhCellSpace( USHORT nCol,
USHORT nColSpan ) const
{
......
sw/inc/itabenum.hxx
Dosyayı görüntüle @ db8ad987
......@@ -34,8 +34,6 @@ namespace tabopts
{
const USHORT DEFAULT_BORDER = 0x01;
const USHORT HEADLINE = 0x02;
// const USHORT REPEAT = 0x04;
// const USHORT HEADLINE_REPEAT = 0x06; // Headline + Repeat
const USHORT SPLIT_LAYOUT = 0x08;
const USHORT HEADLINE_NO_BORDER = HEADLINE | SPLIT_LAYOUT;
const USHORT ALL_TBL_INS_ATTR = DEFAULT_BORDER | HEADLINE | SPLIT_LAYOUT;
......
sw/inc/ndarr.hxx
Dosyayı görüntüle @ db8ad987
......@@ -39,7 +39,6 @@
#include <bparr.hxx>
#include <ndtyp.hxx>
class Graphic;
class GraphicObject;
class String;
......@@ -73,7 +72,6 @@ class SwUndoTblToTxt;
class SwUndoTxtToTbl;
struct SwPosition;
// --------------------
// class SwNodes
// --------------------
......@@ -91,13 +89,10 @@ class SW_DLLPUBLIC SwNodes: private BigPtrArray
SwNodeIndex* pRoot; // Liste aller Indizies auf Nodes
// --> OD 2008-05-14 #refactorlists# - removed <bSyncNumberAndNumRule>
void InsertNode( const SwNodePtr pNode,
const SwNodeIndex& rPos );
void InsertNode( const SwNodePtr pNode,
ULONG nPos );
// <--
SwDoc* pMyDoc; // in diesem Doc ist das Nodes-Array
......@@ -142,8 +137,8 @@ public:
SwNodePtr operator[]( ULONG n ) const
{ return (SwNodePtr)BigPtrArray::operator[] ( n ); }
//JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die
// neue Schnittstelle angepasst werden
// impl. steht im ndindex.hxx - sollte moeglichst bald auf die
// neue Schnittstelle angepasst werden
inline SwNodePtr operator[]( const SwNodeIndex& rIdx ) const;
ULONG Count() const { return BigPtrArray::Count(); }
......@@ -259,8 +254,7 @@ public:
// fuege die Nodes fuer die Tabelle ein
// wenn Lines angegeben, erzeuge die Matrix aus Lines & Boxen
// ansonsten nur die Anzahl von Boxen.
/* #109161#
/*
New parameter pAttrSet: If pAttrSet is non-null and contains an
adjust item it is propagated to the table cells. If there is an
adjust in pCntntTxtColl or pHeadlineTxtColl this adjust item
......@@ -339,17 +333,13 @@ public:
SwNode* FindPrvNxtFrmNode( SwNodeIndex& rFrmIdx,
const SwNode* pEnd = 0 ) const;
//-> #112139#
SwNode * DocumentSectionStartNode(SwNode * pNode) const;
SwNode * DocumentSectionEndNode(SwNode * pNode) const;
//<- #112139#
private:
// privater Constructor, weil nie kopiert werden darf !!
SwNodes( const SwNodes & rNodes );
};
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
sw/inc/ndgrf.hxx
Dosyayı görüntüle @ db8ad987
......@@ -49,7 +49,6 @@ class SW_DLLPUBLIC SwGrfNode: public SwNoTxtNode
GraphicObject aGrfObj;
::sfx2::SvBaseLinkRef refLink; // falls Grafik nur als Link, dann Pointer gesetzt
Size nGrfSize;
// String aStrmName; // SW3: Name des Storage-Streams fuer Embedded
String aNewStrmName; // SW3/XML: new stream name (either SW3 stream
// name or package url)
String aLowResGrf; // HTML: LowRes Grafik (Ersatzdarstellung bis
......
sw/inc/ndindex.hxx
Dosyayı görüntüle @ db8ad987
......@@ -242,8 +242,8 @@ inline SwNodeIndex& SwNodeIndex::operator=( ULONG nWert )
//JP 29.09.97: impl. steht im ndindex.hxx - sollte moeglichst bald auf die
// neue Schnittstelle angepasst werden
// impl. steht im ndindex.hxx - sollte moeglichst bald auf die
// neue Schnittstelle angepasst werden
inline SwNode* SwNodes::operator[]( const SwNodeIndex& rIdx ) const
{
return &rIdx.GetNode();
......
sw/inc/node.hxx
Dosyayı görüntüle @ db8ad987
......@@ -44,7 +44,7 @@
#include <fmtcol.hxx>
// ---------------------
// forward Deklarationen
// forward declarations
// ---------------------
class SvUShorts;
......@@ -82,9 +82,7 @@ class IDocumentLineNumberAccess;
class IDocumentLinksAdministration;
class IDocumentFieldsAccess;
class IDocumentContentOperations;
// --> OD 2007-10-31 #i83479#
class IDocumentListItems;
// <--
// --------------------
// class SwNode
......
sw/inc/numrule.hxx
Dosyayı görüntüle @ db8ad987
......@@ -261,10 +261,6 @@ public:
void SetSvxRule(const SvxNumRule&, SwDoc* pDoc);
SvxNumRule MakeSvxNumRule() const;
// refactoring: provide certain method for certain purpose
// void Indent(short aAmount, int nLevel = -1,
// int nReferenceLevel = -1, BOOL bRelative = TRUE,
// BOOL bFirstLine = TRUE, BOOL bCheckGtZero = TRUE);
// change indent of all list levels by given difference
void ChangeIndent( const short nDiff );
// set indent of certain list level to given value
......
sw/inc/shellres.hxx
Dosyayı görüntüle @ db8ad987
......@@ -58,10 +58,8 @@ struct SW_DLLPUBLIC ShellResource : public Resource
// fuers GetRefFeld - oben/unten
String aGetRefFld_Up;
String aGetRefFld_Down;
// --> OD 2007-09-13 #i81002#
// for GetRefField - referenced item not found
String aGetRefFld_RefItemNotFound;
// <--
// fuer dynamisches Menu - String "alle"
String aStrAllPageHeadFoot;
// fuer einige Listboxen - String "keine"
......@@ -84,10 +82,6 @@ struct SW_DLLPUBLIC ShellResource : public Resource
SvStringsDtor aDocInfoLst;
// Fly-Anker Bmps
// Bitmap aAnchorBmp;
// Bitmap aDragAnchorBmp;
// die AutoFormat-Redline-Kommentare
inline const SvStringsDtor& GetAutoFmtNameLst() const;
......
sw/inc/toxe.hxx
Dosyayı görüntüle @ db8ad987
......@@ -98,7 +98,6 @@ enum ToxAuthorityField
AUTH_FIELD_HOWPUBLISHED,
AUTH_FIELD_INSTITUTION,
AUTH_FIELD_JOURNAL,
// AUTH_FIELD_KEY, // BiBTeX - Field
AUTH_FIELD_MONTH,
AUTH_FIELD_NOTE,
AUTH_FIELD_NUMBER,
......
sw/inc/txtfld.hxx
Dosyayı görüntüle @ db8ad987
......@@ -57,13 +57,11 @@ public:
// enable notification that field content has changed and needs reformatting
void NotifyContentChange(SwFmtFld& rFmtFld);
// #111840#
/**
Returns position of this field.
@return position of this field. Has to be deleted explicitly.
*/
// SwPosition * GetPosition() const;
};
inline SwTxtNode& SwTxtFld::GetTxtNode() const
......
sw/inc/undobj.hxx
Dosyayı görüntüle @ db8ad987
This diff is collapsed.
sw/inc/unodraw.hxx
Dosyayı görüntüle @ db8ad987
......@@ -32,20 +32,16 @@
#include <calbck.hxx>
#include <frmfmt.hxx>
#include <com/sun/star/text/XTextContent.hpp>
// --> OD 2009-01-13 #i59051#
#include <com/sun/star/drawing/PolyPolygonBezierCoords.hpp>
// <--
#include <com/sun/star/drawing/XShape.hpp>
#include <com/sun/star/lang/XUnoTunnel.hpp>
#include <com/sun/star/beans/XPropertyState.hpp>
#include <com/sun/star/drawing/XShapes.hpp>
#include <cppuhelper/implbase3.hxx> // helper for implementations
#include <cppuhelper/implbase4.hxx> // helper for implementations
// --> OD 2004-07-22 #i31698#
#include <cppuhelper/implbase6.hxx> // helper for implementations
#include <com/sun/star/container/XEnumerationAccess.hpp>
#include <com/sun/star/drawing/HomogenMatrix3.hpp>
// <--
#include <svl/itemprop.hxx>
class SdrMarkList;
......@@ -70,7 +66,6 @@ public:
const SdrMarkList& PreGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapes > & xShapes);
void PreUnGroup(const ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShapeGroup > xShapeGroup);
// void PostGroup(); ?? wird es noch gebraucht ??
SdrView* GetDrawView() {return mpView;}
SdrPageView* GetPageView();
......@@ -131,9 +126,7 @@ public:
// renamed and outlined to detect where it's called
void InvalidateSwDoc(); // {pDoc = 0;}
};
/* -----------------22.01.99 10:20-------------------
*
* --------------------------------------------------*/
class SwShapeDescriptor_Impl;
class SwXGroupShape;
typedef
......@@ -144,9 +137,7 @@ cppu::WeakAggImplHelper6
::com::sun::star::text::XTextContent,
::com::sun::star::lang::XServiceInfo,
::com::sun::star::lang::XUnoTunnel,
// --> OD 2004-07-22 #i31698#
::com::sun::star::drawing::XShape
// <--
>
SwXShapeBaseClass;
class SwXShape : public SwXShapeBaseClass,
......@@ -158,10 +149,9 @@ class SwXShape : public SwXShapeBaseClass,
friend class SwXDrawPage;
::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation > xShapeAgg;
// --> OD 2004-07-23 #i31698# - reference to <XShape>, determined in the
// reference to <XShape>, determined in the
// constructor by <queryAggregation> at <xShapeAgg>.
::com::sun::star::uno::Reference< ::com::sun::star::drawing::XShape > mxShape;
// <--
const SfxItemPropertySet* m_pPropSet;
const SfxItemPropertyMapEntry* m_pPropertyMapEntries;
......@@ -177,16 +167,12 @@ class SwXShape : public SwXShapeBaseClass,
/** method to determine top group object
OD 2004-08-03 #i31698#
@author OD
*/
SdrObject* _GetTopGroupObj( SvxShape* _pSvxShape = 0L );
/** method to determine position according to the positioning attributes
OD 2004-08-03 #i31698#
@author OD
*/
com::sun::star::awt::Point _GetAttrPosition();
......@@ -194,8 +180,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to convert the position (translation) of the drawing object to
the layout direction horizontal left-to-right.
OD 2004-07-27 #i31698#
@author OD
*/
::com::sun::star::awt::Point _ConvertPositionToHoriL2R(
......@@ -205,8 +189,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to convert the transformation of the drawing object to the layout
direction, the drawing object is in
OD 2004-07-27 #i31698#
@author OD
*/
::com::sun::star::drawing::HomogenMatrix3 _ConvertTransformationToLayoutDir(
......@@ -214,8 +196,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to adjust the positioning properties
OD 2004-08-02 #i31698#
@author OD
@param _aPosition
......@@ -228,8 +208,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to convert start or end position of the drawing object to the
Writer specific position, which is the attribute position in layout direction
OD 2009-01-12 #i59051#
@author OD
*/
::com::sun::star::awt::Point _ConvertStartOrEndPosToLayoutDir(
......@@ -238,8 +216,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to convert PolyPolygonBezier of the drawing object to the
Writer specific position, which is the attribute position in layout direction
OD 2009-01-13 #i59051#
@author OD
*/
::com::sun::star::drawing::PolyPolygonBezierCoords _ConvertPolyPolygonBezierToLayoutDir(
......@@ -247,8 +223,6 @@ class SwXShape : public SwXShapeBaseClass,
/** method to get property from aggregation object
OD 2004-10-28 #i36248#
@author OD
*/
::com::sun::star::uno::Any _getPropAtAggrObj( const ::rtl::OUString& _rPropertyName )
......@@ -301,15 +275,11 @@ public:
virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
// --> OD 2004-07-22 #i31698# XShape
virtual ::com::sun::star::awt::Point SAL_CALL getPosition( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setPosition( const ::com::sun::star::awt::Point& aPosition ) throw (::com::sun::star::uno::RuntimeException);
virtual ::com::sun::star::awt::Size SAL_CALL getSize( ) throw (::com::sun::star::uno::RuntimeException);
virtual void SAL_CALL setSize( const ::com::sun::star::awt::Size& aSize ) throw (::com::sun::star::beans::PropertyVetoException, ::com::sun::star::uno::RuntimeException);
// <--
// --> OD 2004-07-22 #i31698# XShapeDescriptor - superclass of XShape
virtual ::rtl::OUString SAL_CALL getShapeType( ) throw (::com::sun::star::uno::RuntimeException);
// <--
//SwClient
virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
......@@ -320,9 +290,7 @@ public:
// helper
static void AddExistingShapeToFmt( SdrObject& _rObj );
};
/* -----------------------------31.05.01 09:54--------------------------------
---------------------------------------------------------------------------*/
class SwXGroupShape :
public SwXShape,
public ::com::sun::star::drawing::XShapes
......
sw/inc/unomap.hxx
Dosyayı görüntüle @ db8ad987
......@@ -250,9 +250,7 @@
#define WID_DOC_HAS_VALID_SIGNATURES 1017
#define WID_DOC_BUILDID 1024
#define WID_DOC_ISTEMPLATEID 1025
// --> OD 2006-03-21 #b6375613#
#define WID_APPLY_WORKAROUND_FOR_B6375613 1070
// <--
//MailMerge
#define WID_SELECTION 1071
......
sw/inc/unomid.h
Dosyayı görüntüle @ db8ad987
......@@ -152,7 +152,7 @@
#define MID_ENV_SHIFT_RIGHT 12
#define MID_ENV_SHIFT_DOWN 13
// OD 2004-05-04 #i28701# - SwFmtWrapInfluenceOnObjPos
// SwFmtWrapInfluenceOnObjPos
#define MID_WRAP_INFLUENCE 0
#endif
......
sw/inc/unosrch.hxx
Dosyayı görüntüle @ db8ad987
......@@ -47,9 +47,6 @@ namespace com{namespace sun{namespace star{namespace util{
}}}}
/*-----------------19.12.97 12:58-------------------
--------------------------------------------------*/
class SwXTextSearch : public cppu::WeakImplHelper3
<
::com::sun::star::util::XPropertyReplace,
......@@ -72,7 +69,6 @@ class SwXTextSearch : public cppu::WeakImplHelper3
sal_Bool bBack : 1;
sal_Bool bExpr : 1;
sal_Bool bCase : 1;
// sal_Bool bInSel: 1; // wie geht Suchen in Selektionen?
sal_Bool bStyles:1;
sal_Bool bSimilarity : 1;
sal_Bool bLevRelax :1;
......
sw/source/ui/uiview/view.cxx
Dosyayı görüntüle @ db8ad987
This diff is collapsed.
sw/source/ui/utlui/attrdesc.cxx
Dosyayı görüntüle @ db8ad987
......@@ -71,7 +71,7 @@ using namespace com::sun::star;
TYPEINIT2(SwFmtCharFmt,SfxPoolItem,SwClient);
// erfrage die Attribut-Beschreibung
// query the attribute descriptions
void SwAttrSet::GetPresentation(
SfxItemPresentation ePres,
SfxMapUnit eCoreMetric,
......@@ -911,20 +911,12 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation
switch( GetValue() )
{
case FTNEND_ATPGORDOCEND:
// rText = SW_RESSTR( STR_LAYOUT_FTN );
break;
case FTNEND_ATTXTEND:
break;
case FTNEND_ATTXTEND_OWNNUMSEQ:
{
// String sPrefix;
// String sSuffix;
// SvxNumberType aFmt;
// USHORT nOffset;
// rText +=
}
break;
}
}
......@@ -1062,20 +1054,6 @@ SfxItemPresentation SwHeaderAndFooterEatSpacingItem::GetPresentation
const IntlWrapper* /*pIntl*/
) const
{
// rText.Erase();
// switch ( ePres )
// {
// case SFX_ITEM_PRESENTATION_NONE:
// rText.Erase();
// break;
// case SFX_ITEM_PRESENTATION_NAMELESS:
// case SFX_ITEM_PRESENTATION_COMPLETE:
// {
// if ( GetValue() )
// rText = SW_RESSTR(STR_EDIT_IN_READONLY);
// return ePres;
// }
// }
return SFX_ITEM_PRESENTATION_NONE;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment