summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx3
-rw-r--r--svx/inc/svx/svdhdl.hxx6
-rw-r--r--svx/source/sdr/contact/viewcontactofsdrobj.cxx10
-rw-r--r--svx/source/sdr/primitive2d/sdrprimitivetools.cxx89
-rw-r--r--svx/source/svdraw/svddrgmt.cxx5
-rw-r--r--svx/source/svdraw/svdhdl.cxx12
6 files changed, 11 insertions, 114 deletions
diff --git a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
index 8bd35f2d5233..feadaf99d02c 100644
--- a/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
+++ b/svx/inc/svx/sdr/primitive2d/sdrprimitivetools.hxx
@@ -48,9 +48,6 @@ namespace drawinglayer
{
// create a 3x3 cross in given color as BitmapEx
BitmapEx createDefaultCross_3x3(const basegfx::BColor& rBColor);
-
- // create a 7x7 gluepoint symbol in given colors as BitmapEx
- BitmapEx createDefaultGluepoint_7x7(const basegfx::BColor& rBColorA, const basegfx::BColor& rBColorB);
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/svx/inc/svx/svdhdl.hxx b/svx/inc/svx/svdhdl.hxx
index a9069cec6c9a..4dbde6dc9f8b 100644
--- a/svx/inc/svx/svdhdl.hxx
+++ b/svx/inc/svx/svdhdl.hxx
@@ -151,8 +151,7 @@ class SVX_DLLPUBLIC SdrHdl
friend class SdrMarkView; // fuer den Zugriff auf nObjHdlNum
friend class SdrHdlList;
- // #101928#
- BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
+ static BitmapEx ImpGetBitmapEx(BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd);
protected:
SdrObject* pObj; // Gehoert das Handle zu einem Objekt?
@@ -254,6 +253,9 @@ public:
virtual void onMouseLeave();
bool isMouseOver() const;
+
+ static BitmapEx createGluePointBitmap() { return ImpGetBitmapEx(Glue_Deselected, 0); }
+
};
////////////////////////////////////////////////////////////////////////////////////////////////////
diff --git a/svx/source/sdr/contact/viewcontactofsdrobj.cxx b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
index 1d83ee3ef81a..c9cce9df6246 100644
--- a/svx/source/sdr/contact/viewcontactofsdrobj.cxx
+++ b/svx/source/sdr/contact/viewcontactofsdrobj.cxx
@@ -42,7 +42,7 @@
#include <svx/sdr/contact/objectcontactofpageview.hxx>
#include <svx/sdrpagewindow.hxx>
#include <svx/sdrpaintwindow.hxx>
-#include <svx/sdr/primitive2d/sdrprimitivetools.hxx>
+#include <svx/svdhdl.hxx>
//////////////////////////////////////////////////////////////////////////////
@@ -176,11 +176,9 @@ namespace sdr
if(!aGluepointVector.empty())
{
- const basegfx::BColor aBackPen(1.0, 1.0, 1.0);
- const basegfx::BColor aRGBFrontColor(0.0, 0.0, 1.0); // COL_LIGHTBLUE
- const drawinglayer::primitive2d::Primitive2DReference xReference(new drawinglayer::primitive2d::MarkerArrayPrimitive2D(
- aGluepointVector,
- drawinglayer::primitive2d::createDefaultGluepoint_7x7(aBackPen, aRGBFrontColor)));
+ const drawinglayer::primitive2d::Primitive2DReference xReference(
+ new drawinglayer::primitive2d::MarkerArrayPrimitive2D(
+ aGluepointVector, SdrHdl::createGluePointBitmap()));
xRetval = drawinglayer::primitive2d::Primitive2DSequence(&xReference, 1);
}
}
diff --git a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
index 38aadfe36516..8fb19acbb147 100644
--- a/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
+++ b/svx/source/sdr/primitive2d/sdrprimitivetools.cxx
@@ -81,95 +81,6 @@ namespace drawinglayer
return aRetVal.get() ? *aRetVal.get() : BitmapEx();
}
-
- BitmapEx createDefaultGluepoint_7x7(const basegfx::BColor& rBColorA, const basegfx::BColor& rBColorB)
- {
- static vcl::DeleteOnDeinit< BitmapEx > aRetVal(0);
- static basegfx::BColor aColorA;
- static basegfx::BColor aColorB;
- ::osl::Mutex m_mutex;
-
- if(!aRetVal.get() || rBColorA != aColorA || rBColorB != aColorB)
- {
- // copy values
- aColorA = rBColorA;
- aColorB = rBColorB;
-
- // create bitmap
- Bitmap aContent(Size(7, 7), 24);
- Bitmap aMask(Size(7, 7), 1);
- BitmapWriteAccess* pWContent = aContent.AcquireWriteAccess();
- BitmapWriteAccess* pWMask = aMask.AcquireWriteAccess();
- OSL_ENSURE(pWContent && pWMask, "No WriteAccess to bitmap (!)");
- const Color aColA(aColorA);
- const Color aColB(aColorB);
- const BitmapColor aPixColorA(aColA);
- const BitmapColor aPixColorB(aColB);
- const BitmapColor aMaskColor(0x01);
-
- // Y,X unusual order (!)
- pWContent->SetPixel(0, 1, aPixColorA);
- pWContent->SetPixel(0, 5, aPixColorA);
- pWContent->SetPixel(1, 0, aPixColorA);
- pWContent->SetPixel(1, 2, aPixColorA);
- pWContent->SetPixel(1, 4, aPixColorA);
- pWContent->SetPixel(1, 6, aPixColorA);
- pWContent->SetPixel(2, 1, aPixColorA);
- pWContent->SetPixel(2, 3, aPixColorA);
- pWContent->SetPixel(2, 5, aPixColorA);
- pWContent->SetPixel(3, 2, aPixColorA);
- pWContent->SetPixel(3, 4, aPixColorA);
- pWContent->SetPixel(4, 1, aPixColorA);
- pWContent->SetPixel(4, 3, aPixColorA);
- pWContent->SetPixel(4, 5, aPixColorA);
- pWContent->SetPixel(5, 0, aPixColorA);
- pWContent->SetPixel(5, 2, aPixColorA);
- pWContent->SetPixel(5, 4, aPixColorA);
- pWContent->SetPixel(5, 6, aPixColorA);
- pWContent->SetPixel(6, 1, aPixColorA);
- pWContent->SetPixel(6, 5, aPixColorA);
-
- pWContent->SetPixel(1, 1, aPixColorB);
- pWContent->SetPixel(1, 5, aPixColorB);
- pWContent->SetPixel(2, 2, aPixColorB);
- pWContent->SetPixel(2, 4, aPixColorB);
- pWContent->SetPixel(3, 3, aPixColorB);
- pWContent->SetPixel(4, 2, aPixColorB);
- pWContent->SetPixel(4, 4, aPixColorB);
- pWContent->SetPixel(5, 1, aPixColorB);
- pWContent->SetPixel(5, 5, aPixColorB);
-
- pWMask->SetPixel(0, 0, aMaskColor);
- pWMask->SetPixel(0, 2, aMaskColor);
- pWMask->SetPixel(0, 3, aMaskColor);
- pWMask->SetPixel(0, 4, aMaskColor);
- pWMask->SetPixel(0, 6, aMaskColor);
- pWMask->SetPixel(1, 3, aMaskColor);
- pWMask->SetPixel(2, 0, aMaskColor);
- pWMask->SetPixel(2, 6, aMaskColor);
- pWMask->SetPixel(3, 0, aMaskColor);
- pWMask->SetPixel(3, 1, aMaskColor);
- pWMask->SetPixel(3, 5, aMaskColor);
- pWMask->SetPixel(3, 6, aMaskColor);
- pWMask->SetPixel(4, 0, aMaskColor);
- pWMask->SetPixel(4, 6, aMaskColor);
- pWMask->SetPixel(5, 3, aMaskColor);
- pWMask->SetPixel(6, 0, aMaskColor);
- pWMask->SetPixel(6, 2, aMaskColor);
- pWMask->SetPixel(6, 3, aMaskColor);
- pWMask->SetPixel(6, 4, aMaskColor);
- pWMask->SetPixel(6, 6, aMaskColor);
-
- aContent.ReleaseAccess(pWContent);
- aMask.ReleaseAccess(pWMask);
-
- // create and exchange at aRetVal
- delete aRetVal.set(new BitmapEx(aContent, aMask));
- }
-
- return aRetVal.get() ? *aRetVal.get() : BitmapEx();
- }
-
} // end of namespace primitive2d
} // end of namespace drawinglayer
diff --git a/svx/source/svdraw/svddrgmt.cxx b/svx/source/svdraw/svddrgmt.cxx
index 3984e1dea170..34afa05a1e30 100644
--- a/svx/source/svdraw/svddrgmt.cxx
+++ b/svx/source/svdraw/svddrgmt.cxx
@@ -290,12 +290,9 @@ drawinglayer::primitive2d::Primitive2DSequence SdrDragEntryPointGlueDrag::create
}
else
{
- const basegfx::BColor aBackPen(1.0, 1.0, 1.0);
- const basegfx::BColor aRGBFrontColor(0.0, 0.0, 1.0); // COL_LIGHTBLUE
drawinglayer::primitive2d::Primitive2DReference aMarkerArrayPrimitive2D(
new drawinglayer::primitive2d::MarkerArrayPrimitive2D(aTransformedPositions,
- drawinglayer::primitive2d::createDefaultGluepoint_7x7(aBackPen, aRGBFrontColor)));
-
+ SdrHdl::createGluePointBitmap()));
aRetval = drawinglayer::primitive2d::Primitive2DSequence(&aMarkerArrayPrimitive2D, 1);
}
}
diff --git a/svx/source/svdraw/svdhdl.cxx b/svx/source/svdraw/svdhdl.cxx
index 39c2af5ed9ac..2cfb2cccd403 100644
--- a/svx/source/svdraw/svdhdl.cxx
+++ b/svx/source/svdraw/svdhdl.cxx
@@ -268,14 +268,6 @@ const BitmapEx& SdrHdlBitmapSet::GetBitmapEx(BitmapMarkerKind eKindOfMarker, sal
////////////////////////////////////////////////////////////////////////////////////////////////////
-SdrHdlBitmapSet& getModernSet()
-{
- static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
- return *aModernSet.get();
-}
-
-////////////////////////////////////////////////////////////////////////////////////////////////////
-
SdrHdl::SdrHdl():
pObj(NULL),
pPV(NULL),
@@ -635,10 +627,10 @@ BitmapMarkerKind SdrHdl::GetNextBigger(BitmapMarkerKind eKnd) const
return eRetval;
}
-// #101928#
BitmapEx SdrHdl::ImpGetBitmapEx( BitmapMarkerKind eKindOfMarker, sal_uInt16 nInd)
{
- return getModernSet().GetBitmapEx(eKindOfMarker, nInd);
+ static vcl::DeleteOnDeinit< SdrHdlBitmapSet > aModernSet(new SdrHdlBitmapSet(SIP_SA_MARKERS));
+ return aModernSet.get()->GetBitmapEx(eKindOfMarker, nInd);
}
::sdr::overlay::OverlayObject* SdrHdl::CreateOverlayObject(
generated by cgit (git 2.34.1) at 2025-02-10 11:12:28 +0000