Kaydet (Commit) 06c5c7f0 authored tarafından Philipp Weissenbacher's avatar Philipp Weissenbacher Kaydeden (comit) Thorsten Behrens

Translate German comments, fix some WS

Change-Id: I5dcf6a911275e9fcb07d21b810591237a0f1ab9f
Reviewed-on: https://gerrit.libreoffice.org/4747Reviewed-by: 's avatarThorsten Behrens <tbehrens@suse.com>
Tested-by: 's avatarThorsten Behrens <tbehrens@suse.com>
üst 9a15f297
...@@ -21,12 +21,9 @@ ...@@ -21,12 +21,9 @@
#include <sfx2/childwin.hxx> #include <sfx2/childwin.hxx>
#include "svx/svxdllapi.h" #include "svx/svxdllapi.h"
/************************************************************************* /**
|* * Child of SfxChildWindow as a "container" for Controller
|* Ableitung vom SfxChildWindow als "Behaelter" fuer Controller */
|*
\************************************************************************/
class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow class SVX_DLLPUBLIC SvxColorChildWindow : public SfxChildWindow
{ {
public: public:
......
...@@ -38,10 +38,9 @@ ...@@ -38,10 +38,9 @@
#include <deque> #include <deque>
// =================================================================================================== /**
// = class FmSearchThread * class FmSearchThread
// =================================================================================================== */
class FmSearchEngine; class FmSearchEngine;
class FmSearchThread : public ::osl::Thread class FmSearchThread : public ::osl::Thread
{ {
...@@ -56,16 +55,15 @@ public: ...@@ -56,16 +55,15 @@ public:
void setTerminationHandler(Link aHdl) { m_aTerminationHdl = aHdl; } void setTerminationHandler(Link aHdl) { m_aTerminationHdl = aHdl; }
}; };
// =================================================================================================== /**
// = struct FmSearchProgress - the owner of SearchEngine receives this structure for status updates * struct FmSearchProgress - the owner of SearchEngine receives this structure for status updates
// = (at the end of the search) * (at the end of the search)
// =================================================================================================== */
struct FmSearchProgress struct FmSearchProgress
{ {
enum STATE { STATE_PROGRESS, STATE_PROGRESS_COUNTING, STATE_CANCELED, STATE_SUCCESSFULL, STATE_NOTHINGFOUND, STATE_ERROR }; enum STATE { STATE_PROGRESS, STATE_PROGRESS_COUNTING, STATE_CANCELED, STATE_SUCCESSFULL, STATE_NOTHINGFOUND, STATE_ERROR };
// (move to new record; progress during counting of records; cancelled; record found; nothing found; // (move to new record; progress during counting of records; cancelled; record found; nothing found;
// any non-processable error) // any non-processable error)
STATE aSearchState; STATE aSearchState;
// current record - always valid (e.g. of interest for continuing search in case of cancellation) // current record - always valid (e.g. of interest for continuing search in case of cancellation)
...@@ -79,11 +77,10 @@ struct FmSearchProgress ...@@ -79,11 +77,10 @@ struct FmSearchProgress
sal_Int32 nFieldIndex; sal_Int32 nFieldIndex;
}; };
// =================================================================================================== /**
// = class FmRecordCountListener - utility class for FmSearchEngine, listens at a certain cursor and provides * class FmRecordCountListener - utility class for FmSearchEngine, listens at a certain cursor and provides
// = the differences in RecordCount * the differences in RecordCount
// =================================================================================================== */
class FmRecordCountListener : public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener> class FmRecordCountListener : public ::cppu::WeakImplHelper1< ::com::sun::star::beans::XPropertyChangeListener>
{ {
// attribute // attribute
...@@ -97,16 +94,16 @@ public: ...@@ -97,16 +94,16 @@ public:
// methods // methods
public: public:
FmRecordCountListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& dbcCursor); FmRecordCountListener(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet >& dbcCursor);
// the set has to support the sdb::ResultSet service // the set has to support the sdb::ResultSet service
virtual ~FmRecordCountListener(); virtual ~FmRecordCountListener();
// DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject); // DECLARE_UNO3_AGG_DEFAULTS(FmPropertyListener, UsrObject);
// virtual sal_Bool queryInterface(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut); // virtual sal_Bool queryInterface(::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >& rOut);
// ::com::sun::star::lang::XEventListener // ::com::sun::star::lang::XEventListener
virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL disposing(const ::com::sun::star::lang::EventObject& Source) throw(::com::sun::star::uno::RuntimeException);
// ::com::sun::star::beans::XPropertyChangeListener // ::com::sun::star::beans::XPropertyChangeListener
virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException); virtual void SAL_CALL propertyChange(const ::com::sun::star::beans::PropertyChangeEvent& evt) throw(::com::sun::star::uno::RuntimeException);
void DisConnect(); void DisConnect();
...@@ -116,12 +113,12 @@ private: ...@@ -116,12 +113,12 @@ private:
}; };
// =================================================================================================== /**
// = class FmSearchEngine - Impl class for FmSearchDialog * class FmSearchEngine - Impl class for FmSearchDialog
// =================================================================================================== */
namespace svxform { namespace svxform {
// We have three possible control types we may search in, determined by the supported interfaces : ::com::sun::star::awt::XTextComponent, ::com::sun::star::awt::XListBox, ::com::sun::star::awt::XCheckBox. // We have three possible control types we may search in, determined by the supported interfaces : ::com::sun::star::awt::XTextComponent,
// ::com::sun::star::awt::XListBox, ::com::sun::star::awt::XCheckBox.
// While searching we don't want to do this distinction for every control in every round. So we need some helpers. // While searching we don't want to do this distinction for every control in every round. So we need some helpers.
class ControlTextWrapper class ControlTextWrapper
{ {
...@@ -172,8 +169,8 @@ class SVX_DLLPUBLIC FmSearchEngine ...@@ -172,8 +169,8 @@ class SVX_DLLPUBLIC FmSearchEngine
CursorWrapper m_xSearchCursor; CursorWrapper m_xSearchCursor;
std::deque<sal_Int32> m_arrFieldMapping; std::deque<sal_Int32> m_arrFieldMapping;
// since the iterator could have more columns, as managed here (in this field listbox), // Since the iterator could have more columns, as managed here (in this field listbox),
// a mapping of this ::com::sun::star::form keys on the indices of the respective columns is kept in the iterator // a mapping of this ::com::sun::star::form keys on the indices of the respective columns is kept in the iterator
// the formatter // the formatter
::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xFormatSupplier; ::com::sun::star::uno::Reference< ::com::sun::star::util::XNumberFormatsSupplier > m_xFormatSupplier;
...@@ -201,19 +198,19 @@ class SVX_DLLPUBLIC FmSearchEngine ...@@ -201,19 +198,19 @@ class SVX_DLLPUBLIC FmSearchEngine
CursorWrapper m_xOriginalIterator; CursorWrapper m_xOriginalIterator;
CursorWrapper m_xClonedIterator; CursorWrapper m_xClonedIterator;
// data for the decision in which field a "Found" is accepted // Data for the decision in which field a "Found" is accepted
::com::sun::star::uno::Any m_aPreviousLocBookmark; // position of the last finding ::com::sun::star::uno::Any m_aPreviousLocBookmark; // position of the last finding
FieldCollectionIterator m_iterPreviousLocField; // field of the last finding FieldCollectionIterator m_iterPreviousLocField; // field of the last finding
// Kommunikation mit dem Thread, der die eigentliche Suche durchfuehrt // Communication with the thread that does the actual searching
OUString m_strSearchExpression; // forward direction OUString m_strSearchExpression; // forward direction
SEARCHFOR_TYPE m_eSearchForType; // ditto SEARCHFOR_TYPE m_eSearchForType; // ditto
SEARCH_RESULT m_srResult; // backward direction SEARCH_RESULT m_srResult; // backward direction
// der Link, dem ich Fortschritte und Ergebnisse mitteile // The link we broadcast the progress and the result to
Link m_aProgressHandler; Link m_aProgressHandler;
sal_Bool m_bSearchingCurrently : 1; // is an (asynchronous) search running? sal_Bool m_bSearchingCurrently : 1; // is an (asynchronous) search running?
sal_Bool m_bCancelAsynchRequest : 1; // should be cancelled ? sal_Bool m_bCancelAsynchRequest : 1; // should be cancelled?
::osl::Mutex m_aCancelAsynchAccess; // access to_bCancelAsynchRequest (technically only ::osl::Mutex m_aCancelAsynchAccess; // access to_bCancelAsynchRequest (technically only
// relevant for m_eMode == SM_USETHREAD) // relevant for m_eMode == SM_USETHREAD)
FMSEARCH_MODE m_eMode; // current mode FMSEARCH_MODE m_eMode; // current mode
...@@ -273,14 +270,14 @@ public: ...@@ -273,14 +270,14 @@ public:
sal_uInt16 GetLevShorter() const { return m_nLevShorter; } sal_uInt16 GetLevShorter() const { return m_nLevShorter; }
void SetLevLonger(sal_uInt16 nHowMuch) { m_nLevLonger = nHowMuch; } void SetLevLonger(sal_uInt16 nHowMuch) { m_nLevLonger = nHowMuch; }
sal_uInt16 GetLevLonger() const { return m_nLevLonger; } sal_uInt16 GetLevLonger() const { return m_nLevLonger; }
// all Lev. values will only be considered in case of m_bLevenshtein==sal_True // all Lev. values will only be considered in case of m_bLevenshtein==sal_True
void SetTransliterationFlags(sal_Int32 _nFlags) { m_nTransliterationFlags = _nFlags; } void SetTransliterationFlags(sal_Int32 _nFlags) { m_nTransliterationFlags = _nFlags; }
sal_Int32 GetTransliterationFlags() const { return m_nTransliterationFlags; } sal_Int32 GetTransliterationFlags() const { return m_nTransliterationFlags; }
void SetPosition(sal_uInt16 nValue) { m_nPosition = nValue; } void SetPosition(sal_uInt16 nValue) { m_nPosition = nValue; }
sal_uInt16 GetPosition() const { return m_nPosition; } sal_uInt16 GetPosition() const { return m_nPosition; }
// position will be ignored in case of m_bWildCard==sal_True // position will be ignored in case of m_bWildCard==sal_True
FMSEARCH_MODE GetSearchMode() const { return m_eMode; } FMSEARCH_MODE GetSearchMode() const { return m_eMode; }
...@@ -345,7 +342,7 @@ protected: ...@@ -345,7 +342,7 @@ protected:
void Init(const OUString& strVisibleFields); void Init(const OUString& strVisibleFields);
void SearchNextImpl(); void SearchNextImpl();
// this Impl method is running in SearchThread // this Impl method is running in SearchThread
// start a thread-search (or call SearchNextImpl directly, depending on the search mode) // start a thread-search (or call SearchNextImpl directly, depending on the search mode)
void ImplStartNextSearch(); void ImplStartNextSearch();
...@@ -365,23 +362,23 @@ private: ...@@ -365,23 +362,23 @@ private:
const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd); const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
SVX_DLLPRIVATE void PropagateProgress(sal_Bool _bDontPropagateOverflow); SVX_DLLPRIVATE void PropagateProgress(sal_Bool _bDontPropagateOverflow);
// call the ProgressHandler with STATE_PROGRESS and the current position of the search iterator // call the ProgressHandler with STATE_PROGRESS and the current position of the search iterator
// helpers, that are needed several times // helpers, that are needed several times
SVX_DLLPRIVATE sal_Bool MoveCursor(); SVX_DLLPRIVATE sal_Bool MoveCursor();
// moves m_xSearchIterator with respect to direction/overflow cursor // moves m_xSearchIterator with respect to direction/overflow cursor
SVX_DLLPRIVATE sal_Bool MoveField(sal_Int32& nPos, FieldCollectionIterator& iter, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd); SVX_DLLPRIVATE sal_Bool MoveField(sal_Int32& nPos, FieldCollectionIterator& iter, const FieldCollectionIterator& iterBegin, const FieldCollectionIterator& iterEnd);
// moves the iterator with respect to the direction/overflow iterator/overflow cursor // moves the iterator with respect to the direction/overflow iterator/overflow cursor
SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAllFields, sal_Int32 nField); SVX_DLLPRIVATE void BuildAndInsertFieldInfo(const ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >& xAllFields, sal_Int32 nField);
// builds a FieldInfo in relation to field number nField (in xAllFields) and adds it to m_arrUsedFields // builds a FieldInfo in relation to field number nField (in xAllFields) and adds it to m_arrUsedFields
// xAllFields needs to support the DatabaseRecord service // xAllFields needs to support the DatabaseRecord service
SVX_DLLPRIVATE OUString FormatField(const FieldInfo& rField); SVX_DLLPRIVATE OUString FormatField(const FieldInfo& rField);
// formats the field with the NumberFormatter // formats the field with the NumberFormatter
SVX_DLLPRIVATE sal_Bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); } SVX_DLLPRIVATE sal_Bool HasPreviousLoc() { return m_aPreviousLocBookmark.hasValue(); }
DECL_LINK(OnSearchTerminated, FmSearchThread*); DECL_LINK(OnSearchTerminated, FmSearchThread*);
// is used by SearchThread, after the return from this handler the thread removes itself // is used by SearchThread, after the return from this handler the thread removes itself
DECL_LINK(OnNewRecordCount, void*); DECL_LINK(OnNewRecordCount, void*);
}; };
......
...@@ -781,7 +781,7 @@ typedef enum ...@@ -781,7 +781,7 @@ typedef enum
mso_sptActionButtonMovie = 200, mso_sptActionButtonMovie = 200,
mso_sptHostControl = 201, mso_sptHostControl = 201,
mso_sptTextBox = 202, mso_sptTextBox = 202,
//for pptx shape which not exist in ppt //for pptx shape which doesn't exist in ppt
mso_sptTearDrop = 203, mso_sptTearDrop = 203,
mso_sptMax = 0x0FFF, mso_sptMax = 0x0FFF,
mso_sptNil = mso_sptMax mso_sptNil = mso_sptMax
...@@ -858,14 +858,14 @@ enum MSO_TextFlow { ...@@ -858,14 +858,14 @@ enum MSO_TextFlow {
mso_txflBtoT, // Bottom to Top non-@ mso_txflBtoT, // Bottom to Top non-@
mso_txflTtoBN, // Top to Bottom non-@ mso_txflTtoBN, // Top to Bottom non-@
mso_txflHorzA, // Horizontal @-font mso_txflHorzA, // Horizontal @-font
mso_txflVertN // Vertical, non-@ mso_txflVertN // Vertical, non-@
}; };
// MSO_TXDIR - text direction (needed for Bi-Di support) // MSO_TXDIR - text direction (needed for Bi-Di support)
enum MSO_TextDir { enum MSO_TextDir {
mso_txdirLTR, // left-to-right text direction mso_txdirLTR, // left-to-right text direction
mso_txdirRTL, // right-to-left text direction mso_txdirRTL, // right-to-left text direction
mso_txdirContext // context text direction mso_txdirContext // context text direction
}; };
// MSO_SPCOT -- Callout Type // MSO_SPCOT -- Callout Type
...@@ -914,10 +914,10 @@ enum MSO_BlipFlags { ...@@ -914,10 +914,10 @@ enum MSO_BlipFlags {
mso_blipflagType = 3, // Mask to extract type mso_blipflagType = 3, // Mask to extract type
/* Or the following flags with any of the above. */ /* Or the following flags with any of the above. */
mso_blipflagDontSave = 4, // A "dont" is the depression in the metal mso_blipflagDontSave = 4, // A "dont" is the depression in the metal
// body work of an automobile caused when a // body work of an automobile caused when a
// cyclist violently thrusts his or her nose // cyclist violently thrusts his or her nose
// at it, thus a DontSave is another name for // at it, thus a DontSave is another name for
// a cycle lane. // a cycle lane.
mso_blipflagDoNotSave = 4, // For those who prefer English mso_blipflagDoNotSave = 4, // For those who prefer English
mso_blipflagLinkToFile = 8 mso_blipflagLinkToFile = 8
}; };
...@@ -925,7 +925,7 @@ enum MSO_BlipFlags { ...@@ -925,7 +925,7 @@ enum MSO_BlipFlags {
enum MSO_3DRenderMode { enum MSO_3DRenderMode {
mso_FullRender, // Generate a full rendering mso_FullRender, // Generate a full rendering
mso_Wireframe, // Generate a wireframe mso_Wireframe, // Generate a wireframe
mso_BoundingCube // Generate a bounding cube mso_BoundingCube // Generate a bounding cube
}; };
enum MSO_XFormType { enum MSO_XFormType {
...@@ -955,7 +955,7 @@ enum MSO_DZType { ...@@ -955,7 +955,7 @@ enum MSO_DZType {
mso_dztypeVFixed = 6, // Pixels, fixed aspect ratio mso_dztypeVFixed = 6, // Pixels, fixed aspect ratio
mso_dztypeShapeFixed = 7, // Proportion of shape, fixed aspect ratio mso_dztypeShapeFixed = 7, // Proportion of shape, fixed aspect ratio
mso_dztypeFixedAspectEnlarge mso_dztypeFixedAspectEnlarge
= 8, // Aspect ratio is fixed, favor larger size = 8, // Aspect ratio is fixed, favor larger size
mso_dztypeAFixedBig = 9, // EMUs, fixed aspect ratio mso_dztypeAFixedBig = 9, // EMUs, fixed aspect ratio
mso_dztypeVFixedBig = 10, // Pixels, fixed aspect ratio mso_dztypeVFixedBig = 10, // Pixels, fixed aspect ratio
mso_dztypeShapeFixedBig= 11, // Proportion of shape, fixed aspect ratio mso_dztypeShapeFixedBig= 11, // Proportion of shape, fixed aspect ratio
...@@ -971,9 +971,9 @@ enum MSO_FillType { ...@@ -971,9 +971,9 @@ enum MSO_FillType {
mso_fillShadeCenter, // Shade from bounding rectangle to end point mso_fillShadeCenter, // Shade from bounding rectangle to end point
mso_fillShadeShape, // Shade from shape outline to end point mso_fillShadeShape, // Shade from shape outline to end point
mso_fillShadeScale, // Similar to mso_fillShade, but the fillAngle mso_fillShadeScale, // Similar to mso_fillShade, but the fillAngle
// is additionally scaled by the aspect ratio of // is additionally scaled by the aspect ratio of
// the shape. If shape is square, it is the // the shape. If shape is square, it is the
// same as mso_fillShade. // same as mso_fillShade.
mso_fillShadeTitle, // special type - shade to title --- for PP mso_fillShadeTitle, // special type - shade to title --- for PP
mso_fillBackground // Use the background fill color/pattern mso_fillBackground // Use the background fill color/pattern
}; };
...@@ -1068,7 +1068,7 @@ enum MSO_LineCap { ...@@ -1068,7 +1068,7 @@ enum MSO_LineCap {
mso_lineEndCapSquare, // Square protrudes by half line width mso_lineEndCapSquare, // Square protrudes by half line width
mso_lineEndCapFlat // Line ends at end point mso_lineEndCapFlat // Line ends at end point
}; };
// verschiedene enums aus der OfficeDraw-Doku, Appendix D - Ende // Various enums from the OfficeDraw documentation Appendix D - End
// BStore-Container // BStore-Container
// FBSE - File Blip Store Entry // FBSE - File Blip Store Entry
...@@ -1076,9 +1076,9 @@ typedef struct _MSOF_BSE { ...@@ -1076,9 +1076,9 @@ typedef struct _MSOF_BSE {
sal_uInt8 btWin32; // Required type on Win32 sal_uInt8 btWin32; // Required type on Win32
sal_uInt8 btMacOS; // Required type on Mac sal_uInt8 btMacOS; // Required type on Mac
sal_uInt8 rgbUid[16]; // Identifier of blip sal_uInt8 rgbUid[16]; // Identifier of blip
sal_uInt16 tag; // currently unused sal_uInt16 tag; // currently unused
sal_uIntPtr size; // Blip size in stream sal_uIntPtr size; // Blip size in stream
sal_uIntPtr cRef; // Reference count on the blip sal_uIntPtr cRef; // Reference count on the blip
sal_uIntPtr /*MSOFO*/ foDelay; // File offset in the delay stream sal_uIntPtr /*MSOFO*/ foDelay; // File offset in the delay stream
sal_uInt8 usage; // How this blip is used (MSOBLIPUSAGE) sal_uInt8 usage; // How this blip is used (MSOBLIPUSAGE)
sal_uInt8 cbName; // length of the blip name sal_uInt8 cbName; // length of the blip name
...@@ -1092,7 +1092,7 @@ typedef enum { ...@@ -1092,7 +1092,7 @@ typedef enum {
mso_blipUsageMax = 255 // Since this is stored in a byte mso_blipUsageMax = 255 // Since this is stored in a byte
} MSO_BLIPUSAGE; } MSO_BLIPUSAGE;
typedef enum { // GEL provided types... typedef enum { // GEL provided types...
mso_blipERROR = 0, // An error occurred during loading mso_blipERROR = 0, // An error occurred during loading
mso_blipUNKNOWN, // An unknown blip type mso_blipUNKNOWN, // An unknown blip type
mso_blipEMF, // Windows Enhanced Metafile mso_blipEMF, // Windows Enhanced Metafile
...@@ -1171,7 +1171,7 @@ typedef enum { ...@@ -1171,7 +1171,7 @@ typedef enum {
mso_colorSubtract =0x0400, // Subtract grey level RGB(p,p,p) mso_colorSubtract =0x0400, // Subtract grey level RGB(p,p,p)
mso_colorReverseSubtract =0x0500, // Subtract from grey level RGB(p,p,p) mso_colorReverseSubtract =0x0500, // Subtract from grey level RGB(p,p,p)
/* In the following "black" means maximum component value, white minimum. /* In the following "black" means maximum component value, white minimum.
The operation is per component, to guarantee white combine with The operation is per component, to guarantee white combine with
mso_colorGray */ mso_colorGray */
mso_colorBlackWhite =0x0600, // Black if < uParam, else white (>=) mso_colorBlackWhite =0x0600, // Black if < uParam, else white (>=)
mso_colorInvert =0x2000, // Invert color (at the *end*) mso_colorInvert =0x2000, // Invert color (at the *end*)
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/sdmetitm.hxx> #include <svx/sdmetitm.hxx>
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
//------------------------------ /**
// class SdrEckenradiusItem * class SdrEckenradiusItem
//------------------------------ */
class SdrEckenradiusItem: public SdrMetricItem { class SdrEckenradiusItem: public SdrMetricItem {
public: public:
SdrEckenradiusItem(long nRadius=0): SdrMetricItem(SDRATTR_ECKENRADIUS,nRadius) {} SdrEckenradiusItem(long nRadius=0): SdrMetricItem(SDRATTR_ECKENRADIUS,nRadius) {}
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/sdooitm.hxx> #include <svx/sdooitm.hxx>
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
//------------------------------ /*
// class SdrShadowItem * class SdrShadowItem
//------------------------------ */
class SdrShadowItem: public SdrOnOffItem { class SdrShadowItem: public SdrOnOffItem {
public: public:
SdrShadowItem(sal_Bool bShadow=sal_False): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {} SdrShadowItem(sal_Bool bShadow=sal_False): SdrOnOffItem(SDRATTR_SHADOW, bShadow) {}
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/sdprcitm.hxx> #include <svx/sdprcitm.hxx>
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
//--------------------- /**
// class SdrShadowTransparenceItem * class SdrShadowTransparenceItem
//--------------------- */
class SdrShadowTransparenceItem: public SdrPercentItem { class SdrShadowTransparenceItem: public SdrPercentItem {
public: public:
SdrShadowTransparenceItem(sal_uInt16 nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {} SdrShadowTransparenceItem(sal_uInt16 nTransp=0): SdrPercentItem(SDRATTR_SHADOWTRANSPARENCE,nTransp) {}
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/sdooitm.hxx> #include <svx/sdooitm.hxx>
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
//------------------------------------ /*
// class SdrTextContourFrameItem * class SdrTextContourFrameItem
//------------------------------------ */
class SdrTextContourFrameItem: public SdrOnOffItem { class SdrTextContourFrameItem: public SdrOnOffItem {
public: public:
SdrTextContourFrameItem(sal_Bool bOn=sal_False): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {} SdrTextContourFrameItem(sal_Bool bOn=sal_False): SdrOnOffItem(SDRATTR_TEXT_CONTOURFRAME,bOn) {}
......
...@@ -23,13 +23,10 @@ ...@@ -23,13 +23,10 @@
#include <svx/obj3d.hxx> #include <svx/obj3d.hxx>
#include "svx/svxdllapi.h" #include "svx/svxdllapi.h"
/************************************************************************* /**
|* * SphereObject with diameter r3DSize.
|* Kugelobjekt mit Durchmesser r3DSize; Anzahl der Flaechen wird durch * The count of planes depends on the horizontal and vertical segment count.
|* die horizontale und vertikale Segmentanzahl vorgegeben */
|*
\************************************************************************/
class SVX_DLLPUBLIC E3dSphereObj : public E3dCompoundObject class SVX_DLLPUBLIC E3dSphereObj : public E3dCompoundObject
{ {
private: private:
...@@ -75,6 +72,6 @@ public: ...@@ -75,6 +72,6 @@ public:
virtual void TakeObjNamePlural(String& rName) const; virtual void TakeObjNamePlural(String& rName) const;
}; };
#endif // _E3D_SPHERE3D_HXX #endif // _E3D_SPHERE3D_HXX
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
...@@ -89,8 +89,7 @@ public: ...@@ -89,8 +89,7 @@ public:
void SetMeasureLayer(const String& rName) { aMeasureLayer=rName; } void SetMeasureLayer(const String& rName) { aMeasureLayer=rName; }
const String& GetMeasureLayer() const { return aMeasureLayer; } const String& GetMeasureLayer() const { return aMeasureLayer; }
// If the MeasureLayer is not set (empty string), then // If the MeasureLayer is not set (empty string), then use the active layer for measuring.
// use the active layer for measuring.
void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); } void SetEditMode(SdrViewEditMode eMode) { SdrDragView::SetEditMode(eMode); CheckEdgeMode(); }
void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); } void SetEditMode(sal_Bool bOn=sal_True) { SdrDragView::SetEditMode(bOn); CheckEdgeMode(); }
void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); } void SetCreateMode(sal_Bool bOn=sal_True) { SdrDragView::SetCreateMode(bOn); CheckEdgeMode(); }
...@@ -110,7 +109,7 @@ public: ...@@ -110,7 +109,7 @@ public:
sal_uInt32 GetCurrentObjInventor() const { return nAktInvent; } sal_uInt32 GetCurrentObjInventor() const { return nAktInvent; }
sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; } sal_uInt16 GetCurrentObjIdentifier() const { return nAktIdent; }
// Starten des normalen Create // Beginning the regular Create
sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); sal_Bool BegCreateObj(const Point& rPnt, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject); sal_Bool BegCreatePreparedObject(const Point& rPnt, sal_Int16 nMinMov, SdrObject* pPreparedFactoryObject);
void MovCreateObj(const Point& rPnt); void MovCreateObj(const Point& rPnt);
...@@ -122,7 +121,7 @@ public: ...@@ -122,7 +121,7 @@ public:
// BegCreateCaptionObj() creates a SdrCaptionObj (legend item). // BegCreateCaptionObj() creates a SdrCaptionObj (legend item).
// rObjSiz is the initial size of the legend text frame. // rObjSiz is the initial size of the legend text frame.
// only the length of the tip is dragged // Only the length of the tip is dragged
sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL); sal_Bool BegCreateCaptionObj(const Point& rPnt, const Size& rObjSiz, OutputDevice* pOut=NULL, short nMinMov=-3, SdrPageView* pPV=NULL);
// If TextEditAfterCreate is sal_True (the default), // If TextEditAfterCreate is sal_True (the default),
...@@ -132,7 +131,7 @@ public: ...@@ -132,7 +131,7 @@ public:
sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; } sal_Bool IsTextEditAfterCreate() const { return bAutoTextEdit; }
void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; } void SetTextEditAfterCreate(sal_Bool bOn) { bAutoTextEdit = bOn; }
// Create a circle / rectangle / text frame with the first Point being // Create a circle/rectangle/text frame with the first Point being
// the center of the object instead of the upper-left corner. // the center of the object instead of the upper-left corner.
// Persistent flag. Default = FALSE. // Persistent flag. Default = FALSE.
sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; } sal_Bool IsCreate1stPointAsCenter() const { return b1stPointAsCenter; }
...@@ -143,33 +142,34 @@ public: ...@@ -143,33 +142,34 @@ public:
// converted to Polygon (OBJ_POLY) or freehand fill (OBJ_FREEFILL) if // converted to Polygon (OBJ_POLY) or freehand fill (OBJ_FREEFILL) if
// the distance between the start point and end point of the // the distance between the start point and end point of the
// Object <= nAutoCloseDistPix pixels. // Object <= nAutoCloseDistPix pixels.
// Default is TRUE. // Default = TRUE.
sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; } sal_Bool IsAutoClosePolys() const { return bAutoClosePolys; }
void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; } void SetAutoClosePolys(sal_Bool bOn) { bAutoClosePolys=bOn; }
// Default=5 Pixel. // Default = 5 Pixel
sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); } sal_uInt16 GetAutoCloseDistPix() const { return sal_uInt16(nAutoCloseDistPix); }
void SetAutoCloseDistPix(sal_uInt16 nVal) { nAutoCloseDistPix=nVal; } void SetAutoCloseDistPix(sal_uInt16 nVal) { nAutoCloseDistPix=nVal; }
// Vorgabe des minimalen Pixelabstands zwischen 2 Bezierpunkten bei der // Setting for the minimum distantce in pixels between 2 bezier points when
// Erzeugung einer Freihandlinie. // creating a freehand line.
// Default=10 Pixel. // Default = 10 Pixel
sal_uInt16 GetFreeHandMinDistPix() const { return sal_uInt16(nFreeHandMinDistPix); } sal_uInt16 GetFreeHandMinDistPix() const { return sal_uInt16(nFreeHandMinDistPix); }
void SetFreeHandMinDistPix(sal_uInt16 nVal) { nFreeHandMinDistPix=nVal; } void SetFreeHandMinDistPix(sal_uInt16 nVal) { nFreeHandMinDistPix=nVal; }
// Wer das (zur restlichen Create-Funktionalitaet von SvDraw) inkompatible // FIXME: Whoever wants to keep the Create Interface for the PathObj which is
// Create-Interface am PathObj beibehalten moechte muss das nachfolgende // incompatible with the rest of the Create functionality of SvDraw, needs
// Flag setzen. Dieses wirkt sich aus bei den Objekttypen: // to set the following flag. It affects the following object types:
// OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL // OBJ_POLY, OBJ_PLIN, OBJ_PATHLINE, OBJ_PATHFILL
// Dieses Flag hat nur voruebergehenden Character. Die betroffenen //
// Applikationen sollten alsbald umgestellt werden. // This flag should be regarded as temporary. The affected applications should
// Default=sal_False; // be changed soon.
// Default = sal_False;
sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; } sal_Bool IsUseIncompatiblePathCreateInterface() const { return bUseIncompatiblePathCreateInterface; }
void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; } void SetUseIncompatiblePathCreateInterface(sal_Bool bOn) { bUseIncompatiblePathCreateInterface = bOn; }
void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV); void SetConnectMarker(const SdrObjConnection& rCon, const SdrPageView& rPV);
void HideConnectMarker(); void HideConnectMarker();
// Attribute des ggf. gerade in der Erzeugung befindlichen Objekts // Attributes of the object that is in the process of being created
/* new interface src537 */ /* new interface src537 */
sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const; sal_Bool GetAttributes(SfxItemSet& rTargetSet, sal_Bool bOnlyHardAttr=sal_False) const;
......
...@@ -22,10 +22,10 @@ ...@@ -22,10 +22,10 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sdmetitm.hxx> #include <svx/sdmetitm.hxx>
//------------------------------------ /**
// class SdrCaptionGapItem * class SdrCaptionGapItem
// Abstand des Linienanfangs vom Rect * Distance of the line start from the Rect
//------------------------------------ */
class SdrCaptionGapItem: public SdrMetricItem { class SdrCaptionGapItem: public SdrMetricItem {
public: public:
SdrCaptionGapItem(long nGap=0) : SdrMetricItem(SDRATTR_CAPTIONGAP,nGap) {} SdrCaptionGapItem(long nGap=0) : SdrMetricItem(SDRATTR_CAPTIONGAP,nGap) {}
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
// Formatstring (aehnl. Calc), z.B. "#.###,00km" // Format string (similar to Calc), e.g. "#.###,00km"
// ueberschreibt SdrMeasureUnitItem und SdrMeasureShowUnitItem (n.i.) // overwrites SdrMeasureUnitItem and SdrMeasureShowUnitItem
class SdrMeasureFormatStringItem: public SfxStringItem { class SdrMeasureFormatStringItem: public SfxStringItem {
public: public:
SdrMeasureFormatStringItem() : SfxStringItem() { SetWhich(SDRATTR_MEASUREFORMATSTRING); } SdrMeasureFormatStringItem() : SfxStringItem() { SetWhich(SDRATTR_MEASUREFORMATSTRING); }
......
...@@ -22,8 +22,8 @@ ...@@ -22,8 +22,8 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sdmetitm.hxx> #include <svx/sdmetitm.hxx>
// Ueberstand der Masslinie ueber die Masshilfslinien // Overlap of the measure line over the measure helper lines
// Nur wenn die Masspfeile aussen sind (n.i.) // Only of the measure arrows are on the outside
class SdrMeasureOverhangItem: public SdrMetricItem { class SdrMeasureOverhangItem: public SdrMetricItem {
public: public:
SdrMeasureOverhangItem(long nVal=0): SdrMetricItem(SDRATTR_MEASUREOVERHANG,nVal) {} SdrMeasureOverhangItem(long nVal=0): SdrMetricItem(SDRATTR_MEASUREOVERHANG,nVal) {}
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sxsiitm.hxx> #include <svx/sxsiitm.hxx>
// Massstabsvorgabe. Wenn bereits am Model ein Massstab (UIScale) gesetzt // Measure scale setting
// ist wird dieser nicht ueberschrieben. Stattdessen werden beide Massstaebe // We do not overwrite a measure scale (UIScale), If the model already has one set.
// miteinander multipliziert. // Instead, we multiply them with each other.
class SdrMeasureScaleItem: public SdrScaleItem { class SdrMeasureScaleItem: public SdrScaleItem {
public: public:
SdrMeasureScaleItem() : SdrScaleItem(SDRATTR_MEASURESCALE,Fraction(1,1)) {} SdrMeasureScaleItem() : SdrScaleItem(SDRATTR_MEASURESCALE,Fraction(1,1)) {}
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sdynitm.hxx> #include <svx/sdynitm.hxx>
// Die Masseinheit mit anzeigen // Include the unit of measure when displaying
class SdrMeasureShowUnitItem: public SdrYesNoItem { class SdrMeasureShowUnitItem: public SdrYesNoItem {
public: public:
SdrMeasureShowUnitItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURESHOWUNIT,bOn) {} SdrMeasureShowUnitItem(bool bOn=false): SdrYesNoItem(SDRATTR_MEASURESHOWUNIT,bOn) {}
......
...@@ -22,10 +22,9 @@ ...@@ -22,10 +22,9 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svl/stritem.hxx> #include <svl/stritem.hxx>
//------------------------------ /**
// class SdrObjectNameItem * class SdrObjectNameItem
//------------------------------ */
class SdrObjectNameItem: public SfxStringItem { class SdrObjectNameItem: public SfxStringItem {
public: public:
SdrObjectNameItem() : SfxStringItem() { SetWhich(SDRATTR_OBJECTNAME); } SdrObjectNameItem() : SfxStringItem() { SetWhich(SDRATTR_OBJECTNAME); }
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sdangitm.hxx> #include <svx/sdangitm.hxx>
//------------------------------ /**
// class SdrRotateAngleItem * class SdrRotateAngleItem
//------------------------------ */
class SdrRotateAngleItem: public SdrAngleItem { class SdrRotateAngleItem: public SdrAngleItem {
public: public:
SdrRotateAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEANGLE,nAngle) {} SdrRotateAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEANGLE,nAngle) {}
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sdangitm.hxx> #include <svx/sdangitm.hxx>
//------------------------------ /**
// class SdrRotateAllItem * class SdrRotateAllItem
//------------------------------ */
class SdrRotateAllItem: public SdrAngleItem { class SdrRotateAllItem: public SdrAngleItem {
public: public:
SdrRotateAllItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEALL,nAngle) {} SdrRotateAllItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEALL,nAngle) {}
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sdangitm.hxx> #include <svx/sdangitm.hxx>
//------------------------------ /**
// class SdrRotateOneItem * class SdrRotateOneItem
//------------------------------ */
class SdrRotateOneItem: public SdrAngleItem { class SdrRotateOneItem: public SdrAngleItem {
public: public:
SdrRotateOneItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEONE,nAngle) {} SdrRotateOneItem(long nAngle=0): SdrAngleItem(SDRATTR_ROTATEONE,nAngle) {}
......
...@@ -22,9 +22,9 @@ ...@@ -22,9 +22,9 @@
#include <svx/svddef.hxx> #include <svx/svddef.hxx>
#include <svx/sdangitm.hxx> #include <svx/sdangitm.hxx>
//------------------------------ /**
// class SdrShearAngleItem * class SdrShearAngleItem
//------------------------------ */
class SdrShearAngleItem: public SdrAngleItem { class SdrShearAngleItem: public SdrAngleItem {
public: public:
SdrShearAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_SHEARANGLE,nAngle) {} SdrShearAngleItem(long nAngle=0): SdrAngleItem(SDRATTR_SHEARANGLE,nAngle) {}
......
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