You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by ms...@apache.org on 2025/02/26 16:22:50 UTC

(openoffice) branch AOO42X updated (1db5ec8575 -> 65ac37c42d)

This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a change to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git


    from 1db5ec8575 Fixed typo (disbaled), cleanup
     new 83c75f16f6 Cleanup
     new 65ac37c42d Markers for Industrial icon set - new revision

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../industrial/svx/res/markers.png                 | Bin 11221 -> 11264 bytes
 main/svx/inc/svx/svdhdl.hxx                        |  41 ++++------
 main/svx/inc/svx/svdstr.hrc                        |  86 ++++++++++-----------
 main/svx/source/svdraw/svdhdl.cxx                  |  10 +--
 main/svx/source/svdraw/svdstr.src                  |  12 ---
 5 files changed, 61 insertions(+), 88 deletions(-)


(openoffice) 01/02: Cleanup

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 83c75f16f6bef1992bfb704d87825e2dab6dc486
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Feb 26 17:17:01 2025 +0100

    Cleanup
    
    (cherry picked from commit d0a3696392cc1c6d4dbd32f3b15a32c7f4c3aba1)
---
 main/svx/inc/svx/svdhdl.hxx       | 41 ++++++++-----------
 main/svx/inc/svx/svdstr.hrc       | 86 ++++++++++++++++++---------------------
 main/svx/source/svdraw/svdhdl.cxx | 10 ++---
 main/svx/source/svdraw/svdstr.src | 12 ------
 4 files changed, 61 insertions(+), 88 deletions(-)

diff --git a/main/svx/inc/svx/svdhdl.hxx b/main/svx/inc/svx/svdhdl.hxx
index e692b14ef1..cc9b197086 100644
--- a/main/svx/inc/svx/svdhdl.hxx
+++ b/main/svx/inc/svx/svdhdl.hxx
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 #ifndef _SVDHDL_HXX
 #define _SVDHDL_HXX
 
@@ -55,17 +53,15 @@ class SdrObject;
 class SdrPageView;
 class MouseEvent;
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 // Jedes Objekt muss in der Lage seine Handles zu erzeugen. Diese werden dann
 // bei einer Selektion abgeholt, bei der View angemeldet und sichtbar gemacht.
-// Wird ein Handle von der Maus beruehrt (IsHit()), so wird von der View der
+// Wird ein Handle von der Maus berührt (IsHit()), so wird von der View der
 // entsprechende Mauszeiger vom Handle abgeholt und der App auf Anfrage zum
-// reinschalten uebergeben.
+// reinschalten übergeben.
 // Handles wie z.B. der Rotationsmittelpunkt oder die Spiegelachse werden von
 // der View generiert, wenn vom Controller der entsprechende Transformations-
 // Modus selektiert wird.
-// HDL_MOVE...HDL_LWRGT muessen im enum immer zusammen stehen bleiben!
+// HDL_MOVE...HDL_LWRGT müssen im enum immer zusammen stehen bleiben!
 
 enum SdrHdlKind
 {
@@ -152,16 +148,16 @@ enum BitmapMarkerKind
 
 class SVX_DLLPUBLIC SdrHdl
 {
-	friend class				SdrMarkView; // fuer den Zugriff auf nObjHdlNum
+	friend class				SdrMarkView; // für den Zugriff auf nObjHdlNum
 	friend class				SdrHdlList;
 
 	// #101928#
 	BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd, sal_Bool bFine, sal_Bool bIsHighContrast);
 
 protected:
-	SdrObject*					pObj; // Gehoert das Handle zu einem Objekt?
-	SdrPageView*				pPV; // Gehoert das Handle zu einem Objekt in einer bestimmten PageView?
-	SdrHdlList*					pHdlList; // Zum Feststellen der Handlegroesse
+	SdrObject*					pObj; // Gehört das Handle zu einem Objekt?
+	SdrPageView*				pPV; // Gehört das Handle zu einem Objekt in einer bestimmten PageView?
+	SdrHdlList*					pHdlList; // Zum Feststellen der Handlegröße
 
 	// OVERLAYMANAGER
 	::sdr::overlay::OverlayObjectList			maOverlayGroup;
@@ -171,14 +167,14 @@ protected:
 	SdrHdlKind					eKind;
 
 	long						nDrehWink; // Handles bzw. Mauszeiger drehen
-	sal_uInt32					nObjHdlNum; // wird von der MarkView benoetigt
+	sal_uInt32					nObjHdlNum; // wird von der MarkView benötigt
 	sal_uInt32					nPolyNum; // Polygonpunktes
 	sal_uInt32					nPPntNum; // Punktnummer des Polygons
-	sal_uInt32					nSourceHdlNum; // ist noch vollstaendig zu implementieren
+	sal_uInt32					nSourceHdlNum; // ist noch vollständig zu implementieren
 
 	unsigned					bSelect : 1; // Ein selektierter Polygonpunkt?
-	unsigned					b1PixMore : 1; // True=Handle wird 1 Pixel groesser dargestellt
-	unsigned					bPlusHdl : 1; // u.a. fuer Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ...
+	unsigned					b1PixMore : 1; // True=Handle wird 1 Pixel größer dargestellt
+	unsigned					bPlusHdl : 1; // u.a. für Hld-Paint Optimierung bei MarkPoint/UnmarkPoint, ...
 
 	bool						mbMoveOutside; // forces this handle to be moved outside of the selection rectangle
 
@@ -373,7 +369,7 @@ public:
 };
 
 // Ein SdrHdlBezWgt hat Kenntnis von seinem "BasisHandle". Seine Draw-Methode
-// zeichnet zusaetzlich eine Linie von seiner Position zur Position dieses
+// zeichnet zusätzlich eine Linie von seiner Position zur Position dieses
 // BasisHandles.
 class SdrHdlBezWgt: public SdrHdl
 {
@@ -463,7 +459,7 @@ protected:
 
 	unsigned					bRotateShear : 1;
 	unsigned					bDistortShear : 1;
-	unsigned					bMoveOutside : 1; // Handles nach aussen ruecken (fuer TextEdit)
+	unsigned					bMoveOutside : 1; // Handles nach außen rücken (für TextEdit)
 	unsigned					bFineHandles : 1;
 
 private:
@@ -504,13 +500,13 @@ public:
 	void     SetFineHdl(sal_Bool bOn);
 	sal_Bool IsFineHdl() const                        { return bFineHandles; }
 
-	// AddHdl uebernimmt das Handle in sein Eigentum. Es muss
+	// AddHdl übernimmt das Handle in sein Eigentum. Es muss
 	// also auf dem Heap stehen, da Clear() ein delete macht.
 	void    AddHdl(SdrHdl* pHdl, sal_Bool bAtBegin=sal_False);
 	SdrHdl* RemoveHdl(sal_uIntPtr nNum);
 
-	// Zuletzt eingefuegte Handles werden am ehesten getroffen
-	// (wenn Handles uebereinander liegen).
+	// Zuletzt eingefügte Handles werden am ehesten getroffen
+	// (wenn Handles übereinander liegen).
 	SdrHdl* IsHdlListHit(const Point& rPnt, sal_Bool bBack=sal_False, sal_Bool bNext=sal_False, SdrHdl* pHdl0=NULL) const;
 	SdrHdl* GetHdl(SdrHdlKind eKind1) const;
 };
@@ -567,9 +563,6 @@ protected:
 	virtual void CreateB2dIAObject();
 };
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
 #endif //_SVDHDL_HXX
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
-// eof
+/* vim: set noet sw=4 ts=4: */
diff --git a/main/svx/inc/svx/svdstr.hrc b/main/svx/inc/svx/svdstr.hrc
index d0c29a87ea..b11832fe57 100644
--- a/main/svx/inc/svx/svdstr.hrc
+++ b/main/svx/inc/svx/svdstr.hrc
@@ -1,5 +1,5 @@
 /**************************************************************
- * 
+ *
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -7,25 +7,22 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
- * 
+ *
  *************************************************************/
 
-
-
 #define SDR_ResourceBegin            2560
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
 // Achtung: Alle Strings zwischen SDR_StringCacheBegin und
-// SDR_StringCacheEnd muessen buendig aneinander liegen.
+// SDR_StringCacheEnd müssen bündig aneinander liegen.
 //BFS06#define SDR_StringCacheBegin         (SDR_ResourceBegin)
 
 #define STR_ObjNameBegin             (SDR_ResourceBegin)
@@ -35,8 +32,8 @@
 #define STR_ObjNamePluralGRUP        (STR_ObjNameBegin +  3)
 #define STR_ObjNameSingulGRUPEMPTY   (STR_ObjNameBegin +  4)
 #define STR_ObjNamePluralGRUPEMPTY   (STR_ObjNameBegin +  5)
-#define STR_ObjNameSingulTable		 (STR_ObjNameBegin + 6)
-#define STR_ObjNamePluralTable		 (STR_ObjNameBegin + 7)
+#define STR_ObjNameSingulTable		 (STR_ObjNameBegin +  6)
+#define STR_ObjNamePluralTable		 (STR_ObjNameBegin +  7)
 #define STR_ObjNameSingulLINE        (STR_ObjNameBegin +  8)
 #define STR_ObjNameSingulLINE_Hori   (STR_ObjNameBegin +  9)
 #define STR_ObjNameSingulLINE_Vert   (STR_ObjNameBegin + 10)
@@ -151,7 +148,7 @@
 #define STR_ObjNameSingulUno         (STR_ObjNameBegin +119)
 #define STR_ObjNamePluralUno         (STR_ObjNameBegin +120)
 
-// Neu ab 537: Namen fuer 3D-Objekte
+// Neu ab 537: Namen für 3D-Objekte
 #define	STR_ObjNameSingulCube3d		(STR_ObjNameBegin + 121)
 #define	STR_ObjNamePluralCube3d		(STR_ObjNameBegin + 122)
 #define	STR_ObjNameSingulExtrude3d	(STR_ObjNameBegin + 123)
@@ -184,11 +181,11 @@
 #define STR_ObjNameSingulFONTWORK			(STR_ObjNameBegin+145)
 #define STR_ObjNamePluralFONTWORK			(STR_ObjNameBegin+146)
 
-// Svg support
-#define STR_ObjNameSingulGRAFSVG        (STR_ObjNameBegin + 147)
-#define STR_ObjNamePluralGRAFSVG        (STR_ObjNameBegin + 148)
+// SVG support
+#define STR_ObjNameSingulGRAFSVG			(STR_ObjNameBegin + 147)
+#define STR_ObjNamePluralGRAFSVG			(STR_ObjNameBegin + 148)
 
-#define STR_ObjNameEnd               		(STR_ObjNamePluralGRAFSVG)
+#define STR_ObjNameEnd						(STR_ObjNamePluralGRAFSVG)
 
 #define STR_EditBegin                (STR_ObjNameEnd+1)
 #define STR_EditWithCopy             (STR_EditBegin  +  0)
@@ -332,12 +329,10 @@
 // <--
 #define STR_UndoEnd                  (STR_UndoObjDescription)
 
-
 #define STR_LayerBegin               (STR_UndoEnd+1)
 #define STR_StandardLayerName        (STR_LayerBegin +0)
 #define STR_LayerEnd                 (STR_StandardLayerName)
 
-
 #define STR_ItemBegin                    (STR_LayerEnd+1)
 #define STR_ItemValBegin                 (STR_ItemBegin)
 #define STR_ItemValON                      (STR_ItemValBegin +  0)
@@ -427,24 +422,24 @@
 //BFS01#define STR_ItemNamSET_CAPTION           (STR_ItemNamBegin + 28)
 //BFS01#define STR_ItemNamSET_OUTLINER          (STR_ItemNamBegin + 29)
 
-#define STR_ItemNam_ECKENRADIUS          (STR_ItemNamBegin + 30)
-#define STR_ItemNam_TEXT_LEFTDIST        (STR_ItemNamBegin + 31)
-#define STR_ItemNam_TEXT_RIGHTDIST       (STR_ItemNamBegin + 32)
-#define STR_ItemNam_TEXT_UPPERDIST       (STR_ItemNamBegin + 33)
-#define STR_ItemNam_TEXT_LOWERDIST       (STR_ItemNamBegin + 34)
-#define STR_ItemNam_TEXT_AUTOGROWHEIGHT  (STR_ItemNamBegin + 35)
-#define STR_ItemNam_TEXT_MINFRAMEHEIGHT  (STR_ItemNamBegin + 36)
-#define STR_ItemNam_TEXT_MAXFRAMEHEIGHT  (STR_ItemNamBegin + 37)
-#define STR_ItemNam_TEXT_AUTOGROWWIDTH   (STR_ItemNamBegin + 38)
-#define STR_ItemNam_TEXT_MINFRAMEWIDTH   (STR_ItemNamBegin + 39)
-#define STR_ItemNam_TEXT_MAXFRAMEWIDTH   (STR_ItemNamBegin + 40)
-#define STR_ItemNam_TEXT_VERTADJUST      (STR_ItemNamBegin + 41)
-#define STR_ItemNam_TEXT_HORZADJUST      (STR_ItemNamBegin + 42)
-#define STR_ItemNam_TEXT_FITTOSIZE       (STR_ItemNamBegin + 43)
+#define STR_ItemNam_ECKENRADIUS			 (STR_ItemNamBegin + 30)
+#define STR_ItemNam_TEXT_LEFTDIST		 (STR_ItemNamBegin + 31)
+#define STR_ItemNam_TEXT_RIGHTDIST		 (STR_ItemNamBegin + 32)
+#define STR_ItemNam_TEXT_UPPERDIST		 (STR_ItemNamBegin + 33)
+#define STR_ItemNam_TEXT_LOWERDIST		 (STR_ItemNamBegin + 34)
+#define STR_ItemNam_TEXT_AUTOGROWHEIGHT	 (STR_ItemNamBegin + 35)
+#define STR_ItemNam_TEXT_MINFRAMEHEIGHT	 (STR_ItemNamBegin + 36)
+#define STR_ItemNam_TEXT_MAXFRAMEHEIGHT	 (STR_ItemNamBegin + 37)
+#define STR_ItemNam_TEXT_AUTOGROWWIDTH	 (STR_ItemNamBegin + 38)
+#define STR_ItemNam_TEXT_MINFRAMEWIDTH	 (STR_ItemNamBegin + 39)
+#define STR_ItemNam_TEXT_MAXFRAMEWIDTH	 (STR_ItemNamBegin + 40)
+#define STR_ItemNam_TEXT_VERTADJUST		 (STR_ItemNamBegin + 41)
+#define STR_ItemNam_TEXT_HORZADJUST		 (STR_ItemNamBegin + 42)
+#define STR_ItemNam_TEXT_FITTOSIZE		 (STR_ItemNamBegin + 43)
 #define STR_ItemNam_GRAFRED				 (STR_ItemNamBegin + 44)
 #define STR_ItemNam_GRAFGREEN			 (STR_ItemNamBegin + 45)
 #define STR_ItemNam_GRAFBLUE			 (STR_ItemNamBegin + 46)
-#define STR_ItemNam_GRAFLUMINANCE        (STR_ItemNamBegin + 47)
+#define STR_ItemNam_GRAFLUMINANCE		 (STR_ItemNamBegin + 47)
 #define STR_ItemNam_GRAFCONTRAST		 (STR_ItemNamBegin + 48)
 #define STR_ItemNam_GRAFGAMMA			 (STR_ItemNamBegin + 49)
 #define STR_ItemNam_GRAFTRANSPARENCE	 (STR_ItemNamBegin + 50)
@@ -455,11 +450,11 @@
 #define STR_ItemNam_GRAFRESERVE4		 (STR_ItemNamBegin + 55)
 #define STR_ItemNam_GRAFRESERVE5		 (STR_ItemNamBegin + 56)
 #define STR_ItemNam_GRAFRESERVE6		 (STR_ItemNamBegin + 57)
-#define STR_ItemNam_RESERVE19            (STR_ItemNamBegin + 58)
-#define STR_ItemNamSET_MISC              (STR_ItemNamBegin + 59)
-#define STR_ItemNam_OBJMOVEPROTECT       (STR_ItemNamBegin + 60)
-#define STR_ItemNam_OBJSIZEPROTECT       (STR_ItemNamBegin + 61)
-#define STR_ItemNam_OBJPRINTABLE         (STR_ItemNamBegin + 62)
+#define STR_ItemNam_RESERVE19			 (STR_ItemNamBegin + 58)
+#define STR_ItemNamSET_MISC				 (STR_ItemNamBegin + 59)
+#define STR_ItemNam_OBJMOVEPROTECT		 (STR_ItemNamBegin + 60)
+#define STR_ItemNam_OBJSIZEPROTECT		 (STR_ItemNamBegin + 61)
+#define STR_ItemNam_OBJPRINTABLE		 (STR_ItemNamBegin + 62)
 #define STR_ItemNam_LAYERID              (STR_ItemNamBegin + 63)
 #define STR_ItemNam_LAYERNAME            (STR_ItemNamBegin + 64)
 #define STR_ItemNam_OBJECTNAME           (STR_ItemNamBegin + 65)
@@ -474,7 +469,7 @@
 #define STR_ItemNamEnd                   (STR_ItemNam_SHEARANGLE)
 #define STR_ItemEnd                      STR_ItemNamEnd
 
-// 64 Resource-Id's reserviert fuer kompatible Erweiterungen
+// 64 Resource-Id's reserviert für kompatible Erweiterungen
 //BFS06#define STR_SvDraw_CacheReserve_Begin    (STR_ItemEnd+1)
 //BFS06#define STR_SvDraw_CacheReserve_End      (STR_SvDraw_CacheReserve_Begin+63)
 //BFS06#define SDR_StringCacheEnd               (STR_SvDraw_CacheReserve_Begin-1)
@@ -487,14 +482,14 @@
 //BFS06#define STR_ErrorEnd                     STR_SvDraw_ErrorReserve_End
 //BFS06#define STR_ErrorEnd                     (STR_ErrorBegin + 2)
 
-// 22-05-98: 2 Eintraege fuer die Bitmaps von der StrErrorReserve abgeknapst
+// 22-05-98: 2 Eintraege für die Bitmaps von der StrErrorReserve abgeknapst
 //BFS06#define BMAP_Begin                       (STR_ErrorEnd+1)
 #define BMAP_Begin                       (STR_ItemEnd+1)
 #define BMAP_GrafikEi                    (BMAP_Begin +0)
 #define BMAP_GrafikDe                    (BMAP_Begin +1)
 #define BMAP_End                         (BMAP_GrafikDe)
 
-// Strings fuer den Vorlagen-Dialog
+// Strings für den Vorlagen-Dialog
 #define	SIP_Begin							(BMAP_End)
 
 #define	SIP_UNKNOWN_ATTR					(SIP_Begin +   0)
@@ -757,7 +752,7 @@
 #define SIP_SA_GRAFRESERVE6					(SIP_Begin + 257)
 //BFS01#define SIP_SDRATTRSET_GRAF					(SIP_Begin + 258)
 
-#define SIP_SA_MARKERS						(SIP_Begin + 258)
+//#define SIP_SA_MARKERS						(SIP_Begin + 258)
 #define SIP_SA_PAGESHADOW35X35				(SIP_Begin + 259)
 #define SIP_SA_FINE_MARKERS					(SIP_Begin + 260)
 
@@ -780,15 +775,14 @@
 #define STR_TABLE_DISTRIBUTE_COLUMNS		(SIP_Begin + 273)
 #define STR_TABLE_STYLE						(SIP_Begin + 274)
 #define STR_TABLE_STYLE_SETTINGS			(SIP_Begin + 275)
-#define SIP_SA_CROP_MARKERS					(SIP_Begin + 276)
+//#define SIP_SA_CROP_MARKERS					(SIP_Begin + 276)
 #define SIP_SA_CROP_FINE_MARKERS			(SIP_Begin + 277)
 #define SIP_SA_ACCESSIBILITY_CROP_MARKERS	(SIP_Begin + 278)
-#define IMG_DIACONTROL_NORMAL               (SIP_Begin + 279)
-#define IMG_DIACONTROL_H                    (SIP_Begin + 280)
-
+#define IMG_DIACONTROL_NORMAL				(SIP_Begin + 279)
+#define IMG_DIACONTROL_H					(SIP_Begin + 280)
 
 #define	SIP_End								(IMG_DIACONTROL_H)
 
 #define SDR_ResourceEnd						(SIP_End)
 
-////////////////////////////////////////////////////////////////////////////////////////////////////
+// ********************************************************************** EOF
diff --git a/main/svx/source/svdraw/svdhdl.cxx b/main/svx/source/svdraw/svdhdl.cxx
index a8fdbedae7..608277c955 100644
--- a/main/svx/source/svdraw/svdhdl.cxx
+++ b/main/svx/source/svdraw/svdhdl.cxx
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_svx.hxx"
 
@@ -279,9 +277,9 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
 }
 
 
-SdrHdlBitmapSet& getSimpleSet()
+SdrHdlBitmapSet& getSimpleSet() // redirects to Fine Handles now
 {
-	static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aSimpleSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
+	static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aSimpleSet(new SdrHdlBitmapSet(SIP_SA_FINE_MARKERS));
 	return *aSimpleSet.get();
 }
 
@@ -2337,9 +2335,9 @@ BitmapEx SdrCropHdl::GetHandlesBitmap( bool bIsFineHdl, bool bIsHighContrast )
 	}
 	else
 	{
-		static BitmapEx* pSimpleBitmap = 0;
+		static BitmapEx* pSimpleBitmap = 0; //redirects to Fine Handles now
 		if( pSimpleBitmap == 0 )
-			pSimpleBitmap = new BitmapEx(ResId(SIP_SA_CROP_MARKERS, *ImpGetResMgr()));
+			pSimpleBitmap = new BitmapEx(ResId(SIP_SA_CROP_FINE_MARKERS, *ImpGetResMgr()));
 		return *pSimpleBitmap;
 	}
 }
diff --git a/main/svx/source/svdraw/svdstr.src b/main/svx/source/svdraw/svdstr.src
index 59114de597..efb39bb2dd 100644
--- a/main/svx/source/svdraw/svdstr.src
+++ b/main/svx/source/svdraw/svdstr.src
@@ -19,8 +19,6 @@
  *
  *************************************************************/
 
-
-
 #include "svx/svdstr.hrc"
 // Beginning of cached strings
 String STR_ObjNameSingulNONE
@@ -2748,11 +2746,6 @@ Bitmap SIP_SA_PAGESHADOW35X35
 	File = "pageshadow35x35.png" ;
 };
 
-Bitmap SIP_SA_MARKERS
-{
-	File = "markers.png" ;
-};
-
 Bitmap SIP_SA_FINE_MARKERS
 {
 	File = "markers.png" ;
@@ -2847,11 +2840,6 @@ String STR_ObjNamePluralTable
 	Text [ en-US ] = "Tables" ;
 };
 
-Bitmap SIP_SA_CROP_MARKERS
-{
-	File = "cropmarkers.png" ;
-};
-
 Bitmap SIP_SA_CROP_FINE_MARKERS
 {
 	File = "cropmarkers.png" ;


(openoffice) 02/02: Markers for Industrial icon set - new revision

Posted by ms...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

mseidel pushed a commit to branch AOO42X
in repository https://gitbox.apache.org/repos/asf/openoffice.git

commit 65ac37c42d213ce42cf10aaa43432820e7c0524e
Author: mseidel <ms...@apache.org>
AuthorDate: Wed Feb 26 17:20:16 2025 +0100

    Markers for Industrial icon set - new revision
    
    (cherry picked from commit f047155beaf1f06084be5664c6c8c7e556591be1)
---
 .../industrial/svx/res/markers.png                  | Bin 11221 -> 11264 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/main/ooo_custom_images/industrial/svx/res/markers.png b/main/ooo_custom_images/industrial/svx/res/markers.png
index 20447a7dd0..4a8474d3ba 100644
Binary files a/main/ooo_custom_images/industrial/svx/res/markers.png and b/main/ooo_custom_images/industrial/svx/res/markers.png differ